Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 85 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ wasmtime = { version = "43.0.0", default-features = false, features = ["std", "r
rusqlite = { version = "0.39", features = ["bundled"] }
axum = { version = "0.8", default-features = false, features = ["http1", "json", "tokio"] }
which = "8"
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt", "json"] }

[profile.release]
lto = "thin"
Expand Down
1 change: 1 addition & 0 deletions crates/app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ prost = { version = "0.14", optional = true }
rustls = { version = "0.23", default-features = false, features = ["ring"], optional = true }
tokio-tungstenite = { version = "0.29", features = ["rustls-tls-native-roots"], optional = true }
libc = "0.2"
tracing.workspace = true

[dev-dependencies]
axum.workspace = true
Expand Down
2 changes: 2 additions & 0 deletions crates/app/src/acp/acpx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1998,6 +1998,7 @@ mod tests {
#[tokio::test]
#[cfg(unix)]
async fn doctor_accepts_fake_version_command() {
let _env = crate::test_support::ScopedEnv::new();
let temp_dir = unique_temp_dir("loongclaw-acpx-probe");
let script_path = temp_dir.join("fake-acpx");
write_executable_script_atomically(&script_path, "#!/bin/sh\necho 'acpx 0.1.16'\n")
Expand Down Expand Up @@ -2069,6 +2070,7 @@ mod tests {
#[tokio::test]
#[cfg(unix)]
async fn runtime_backend_uses_agent_proxy_when_mcp_servers_requested() {
let _env = crate::test_support::ScopedEnv::new();
let temp_dir = unique_temp_dir("loongclaw-acpx-mcp-proxy");
let log_path = temp_dir.join("calls.log");
let script_path = write_fake_acpx_script(
Expand Down
70 changes: 66 additions & 4 deletions crates/app/src/acp/manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ use crate::CliResult;
use crate::config::LoongClawConfig;

use super::backend::{
ACP_SESSION_METADATA_ACTIVATION_ORIGIN, AcpAbortController, AcpConfigPatch, AcpDoctorReport,
AcpRoutingOrigin, AcpSessionBootstrap, AcpSessionHandle, AcpSessionMetadata, AcpSessionMode,
AcpSessionState, AcpSessionStatus, AcpTurnEventSink, AcpTurnRequest, AcpTurnResult,
BufferedAcpTurnEventSink, CompositeAcpTurnEventSink,
ACP_SESSION_METADATA_ACTIVATION_ORIGIN, ACP_TURN_METADATA_TRACE_ID, AcpAbortController,
AcpConfigPatch, AcpDoctorReport, AcpRoutingOrigin, AcpSessionBootstrap, AcpSessionHandle,
AcpSessionMetadata, AcpSessionMode, AcpSessionState, AcpSessionStatus, AcpTurnEventSink,
AcpTurnRequest, AcpTurnResult, BufferedAcpTurnEventSink, CompositeAcpTurnEventSink,
};
use super::binding::AcpSessionBindingScope;
use super::merge_turn_events;
Expand Down Expand Up @@ -115,9 +115,25 @@ impl AcpSessionManager {
self.cleanup_idle_sessions(config).await?;

let selection = resolve_acp_backend_selection(config);
tracing::debug!(
target: "loongclaw.acp",
session_key = %bootstrap.session_key,
backend_id = %selection.id,
conversation_id = ?bootstrap.conversation_id.as_deref(),
mode = ?bootstrap.mode,
binding = ?AcpSessionBindingScope::from_bootstrap(bootstrap),
"ensuring ACP session"
);
if let Some(existing) =
self.resolve_existing_session(config, selection.id.as_str(), bootstrap)?
{
tracing::debug!(
target: "loongclaw.acp",
session_key = %existing.session_key,
backend_id = %existing.backend_id,
state = ?existing.state,
"reused ACP session"
);
return Ok(existing);
}

Expand All @@ -136,6 +152,13 @@ impl AcpSessionManager {
.get(ACP_SESSION_METADATA_ACTIVATION_ORIGIN)
.and_then(|value| AcpRoutingOrigin::parse(value));
self.store.upsert(metadata.clone())?;
tracing::debug!(
target: "loongclaw.acp",
session_key = %metadata.session_key,
backend_id = %metadata.backend_id,
activation_origin = ?metadata.activation_origin.map(AcpRoutingOrigin::as_str),
"created ACP session"
);
Ok(metadata)
}

Expand All @@ -156,11 +179,25 @@ impl AcpSessionManager {
request: &AcpTurnRequest,
sink: Option<&dyn AcpTurnEventSink>,
) -> CliResult<AcpTurnResult> {
let started_at = std::time::Instant::now();
let actor_key = actor_key_for_bootstrap(bootstrap);
let _turn_queue_guard = self.acquire_turn_queue_guard(actor_key.clone()).await?;
self.cleanup_idle_sessions(config).await?;

let mut metadata = self.ensure_session(config, bootstrap).await?;
let trace_id = request
.metadata
.get(ACP_TURN_METADATA_TRACE_ID)
.map(String::as_str);
tracing::debug!(
target: "loongclaw.acp",
session_key = %bootstrap.session_key,
backend_id = %metadata.backend_id,
trace_id = ?trace_id,
input_len = request.input.chars().count(),
sink_enabled = sink.is_some(),
"starting ACP turn"
);
let backend = resolve_acp_backend(Some(metadata.backend_id.as_str()))?;
metadata.state = AcpSessionState::Busy;
metadata.clear_error();
Expand Down Expand Up @@ -209,11 +246,27 @@ impl AcpSessionManager {
Ok(mut result) => {
self.record_turn_completion(turn_started_ms, true)?;
let streamed_events = buffered_sink.snapshot()?;
let duration_ms = started_at.elapsed().as_millis();
let reported_event_count = result.events.len();
let streamed_event_count = streamed_events.len();
result.events = merge_turn_events(&result.events, &streamed_events);
metadata.state = result.state;
metadata.clear_error();
metadata.touch();
self.store.upsert(metadata)?;
tracing::debug!(
target: "loongclaw.acp",
session_key = %bootstrap.session_key,
backend_id = %handle.backend_id,
trace_id = ?trace_id,
state = ?result.state,
stop_reason = ?result.stop_reason,
reported_event_count,
streamed_event_count,
merged_event_count = result.events.len(),
duration_ms,
"ACP turn completed"
);
Ok(result)
}
Err(error) => {
Expand All @@ -222,6 +275,15 @@ impl AcpSessionManager {
metadata.state = AcpSessionState::Error;
metadata.set_error(error.clone());
self.store.upsert(metadata)?;
tracing::warn!(
target: "loongclaw.acp",
session_key = %bootstrap.session_key,
backend_id = %handle.backend_id,
trace_id = ?trace_id,
duration_ms = started_at.elapsed().as_millis(),
error = %crate::observability::summarize_error(error.as_str()),
"ACP turn failed"
);
Err(error)
}
}
Expand Down
39 changes: 37 additions & 2 deletions crates/app/src/channel/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4241,16 +4241,51 @@ pub(super) async fn process_inbound_with_provider(
kernel_ctx: &KernelContext,
feedback_policy: ChannelTurnFeedbackPolicy,
) -> CliResult<String> {
let started_at = std::time::Instant::now();
let turn_config = reload_channel_turn_config(config, resolved_path)?;
let runtime = DefaultConversationRuntime::from_config_or_env(&turn_config)?;
process_inbound_with_runtime_and_feedback(
let result = process_inbound_with_runtime_and_feedback(
&turn_config,
&runtime,
message,
ConversationRuntimeBinding::kernel(kernel_ctx),
feedback_policy,
)
.await
.await;
let duration_ms = started_at.elapsed().as_millis();
match &result {
Ok(reply) => {
tracing::debug!(
target: "loongclaw.channel",
platform = %message.session.platform.as_str(),
conversation_id = %message.session.conversation_id,
configured_account_id = ?message.session.configured_account_id.as_deref(),
account_id = ?message.session.account_id.as_deref(),
source_message_id = ?message.delivery.source_message_id.as_deref(),
ack_cursor = ?message.delivery.ack_cursor.as_deref(),
text_len = message.text.chars().count(),
reply_len = reply.chars().count(),
duration_ms,
"channel inbound processed"
);
}
Err(error) => {
tracing::warn!(
target: "loongclaw.channel",
platform = %message.session.platform.as_str(),
conversation_id = %message.session.conversation_id,
configured_account_id = ?message.session.configured_account_id.as_deref(),
account_id = ?message.session.account_id.as_deref(),
source_message_id = ?message.delivery.source_message_id.as_deref(),
ack_cursor = ?message.delivery.ack_cursor.as_deref(),
text_len = message.text.chars().count(),
duration_ms,
error = %crate::observability::summarize_error(error),
"channel inbound failed"
);
}
}
result
}

#[cfg(any(
Expand Down
3 changes: 3 additions & 0 deletions crates/app/src/channel/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9432,6 +9432,9 @@ mod tests {

#[test]
fn discord_status_splits_config_backed_send_and_stub_serve() {
let mut env = crate::test_support::ScopedEnv::new();
env.remove(crate::config::DISCORD_BOT_TOKEN_ENV);

let mut config = LoongClawConfig::default();
config.discord.enabled = true;

Expand Down
1 change: 1 addition & 0 deletions crates/app/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ pub mod crypto;
pub mod feishu;
pub mod memory;
pub mod migration;
pub(crate) mod observability;
pub mod presentation;
pub mod prompt;
pub mod provider;
Expand Down
Loading
Loading