From cdab454523f0c47f1b3ccb76e9e2abc95e52bb54 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Thu, 12 Nov 2026 07:55:26 +1100 Subject: [PATCH] fix(release): Clear import and ACP guardrail regressions --- crates/jcode-base/src/import_codex_tools.rs | 14 ++++++++------ src/cli/acp/session.rs | 9 +++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/crates/jcode-base/src/import_codex_tools.rs b/crates/jcode-base/src/import_codex_tools.rs index b7e8b922869..2d71a49904e 100644 --- a/crates/jcode-base/src/import_codex_tools.rs +++ b/crates/jcode-base/src/import_codex_tools.rs @@ -14,10 +14,9 @@ pub(super) fn append_tool(session: &mut Session, value: &serde_json::Value) -> b let Some(payload) = value.get("payload") else { return false; }; - let kind = payload - .get("type") - .and_then(|v| v.as_str()) - .unwrap_or_default(); + let Some(kind) = payload.get("type").and_then(|v| v.as_str()) else { + return false; + }; let Some(id) = payload .get("call_id") .and_then(|v| v.as_str()) @@ -38,7 +37,7 @@ pub(super) fn append_tool(session: &mut Session, value: &serde_json::Value) -> b None => serde_json::json!({}), } } else { - serde_json::json!({"input": payload.get("input").cloned().unwrap_or_default()}) + serde_json::json!({"input": payload.get("input").cloned().unwrap_or(serde_json::Value::Null)}) }; ( Role::Assistant, @@ -51,7 +50,10 @@ pub(super) fn append_tool(session: &mut Session, value: &serde_json::Value) -> b ) } "function_call_output" | "custom_tool_call_output" => { - let output = payload.get("output").cloned().unwrap_or_default(); + let output = payload + .get("output") + .cloned() + .unwrap_or(serde_json::Value::Null); ( Role::User, ContentBlock::ToolResult { diff --git a/src/cli/acp/session.rs b/src/cli/acp/session.rs index 8b4c46afd4e..72e2d4dcb14 100644 --- a/src/cli/acp/session.rs +++ b/src/cli/acp/session.rs @@ -11,10 +11,8 @@ pub(super) struct DaemonSession { pub(super) socket_path: Option, /// Shared with the router, which builds steer recovery requests itself. pub(super) next_request_id: Arc, - /// Client instance id of this logical attachment: `{process}/{n}`. Socket - /// replacement retains ownership; separate sessions - /// in one adapter process must not look like each other's peer, so the - /// per-process id is not enough. + /// Logical attachment id: `{process}/{n}`. Socket replacement retains ownership; + /// separate sessions in one adapter process must not appear as each other's peer. pub(super) instance_id: String, /// Event routing state, shared with this connection's reader task. The /// reader owns clones of the shared state, never the session itself, so @@ -27,8 +25,7 @@ pub(super) struct DaemonSession { pub(super) prompt_tasks_done: tokio::sync::Notify, pub(super) catalog_refresh: Mutex<()>, pub(super) ui_state: Arc>, - /// Workspace root reported by the ACP client, used to compose the - /// project-local skill overlay for slash-skill resolution. + /// ACP workspace root for the project-local slash-skill overlay. pub(super) working_dir: Option, /// Sticky skill selection, resent with every prompt. The daemon treats a /// missing `active_skill` as "clear the selection", mirroring the TUI.