wuxu/codeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复acp返回空用量信息导致会话中断

Browse Source
This commit is contained in:
xintaofei
2026-03-31 22:18:14 +08:00
parent 296b0c7806
commit 80a5f8c589
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src-tauri/src/acp/connection.rs
View File

@@ -21,7 +21,8 @@ use sacp::schema::{
};
use sacp::util::MatchDispatch;
use sacp::{
on_receive_request, Agent, Client, ConnectionTo, Responder, SessionMessage, UntypedMessage,
on_receive_request, Agent, Client, ConnectionTo, Dispatch, Responder, SessionMessage,
UntypedMessage,
};
use sacp_tokio::AcpAgent;
use tokio::sync::mpsc;
@@ -752,6 +753,7 @@ async fn run_connection(
if let SessionMessage::SessionMessage(dispatch) = msg {
let cid = conn_id.clone();
let h = emitter_clone.clone();
let dispatch = fix_usage_update_nulls(dispatch);
let _ = MatchDispatch::new(dispatch)
.if_notification(async |notif: SessionNotification| {
if matches!(
@@ -1552,6 +1554,7 @@ async fn run_conversation_loop<'a>(
let cid = conn_id.to_string();
let h = emitter.clone();
let cwd_opt = Some(cwd);
let dispatch = fix_usage_update_nulls(dispatch);
let _ = MatchDispatch::new(dispatch)
.if_notification(
async |notif: SessionNotification| {
@@ -1637,6 +1640,7 @@ async fn run_conversation_loop<'a>(
let runtime = terminal_runtime.clone();
let session_id = sid.clone();
let cwd_opt = Some(cwd);
let dispatch = fix_usage_update_nulls(dispatch);
if let Err(e) = MatchDispatch::new(dispatch)
.if_notification(
async |notif: SessionNotification| {
@@ -2123,6 +2127,27 @@ fn map_plan_entries(plan: &Plan) -> Vec<PlanEntryInfo> {
.collect()
}
/// Fix null fields in `usage_update` notifications that would otherwise fail deserialization.
///
/// Some ACP agents send `"used": null` in usage_update notifications, but the
/// upstream schema expects `u64`. This function patches the raw JSON params
/// so that `null` numeric fields default to `0`.
fn fix_usage_update_nulls(mut dispatch: Dispatch) -> Dispatch {
if let Dispatch::Notification(ref mut msg) = dispatch {
if let Some(update) = msg.params.get_mut("update") {
if update.get("sessionUpdate").and_then(|v| v.as_str()) == Some("usage_update") {
if update.get("used").map(|v| v.is_null()).unwrap_or(false) {
update["used"] = serde_json::Value::from(0u64);
}
if update.get("size").map(|v| v.is_null()).unwrap_or(false) {
update["size"] = serde_json::Value::from(0u64);
}
}
}
}
dispatch
}
/// Convert a SessionUpdate into AcpEvent(s) and emit to frontend.
fn emit_conversation_update(
connection_id: &str,