From 5556d563bbe69a674a45e6f4eea29bcc63540bad Mon Sep 17 00:00:00 2001
From: jif-oai <jif@openai.com>
Date: Tue, 21 Apr 2026 16:18:30 +0100
Subject: [PATCH] Preserve dynamic tool namespace in compact turns

---
 codex-rs/app-server/src/bespoke_event_handling.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/codex-rs/app-server/src/bespoke_event_handling.rs b/codex-rs/app-server/src/bespoke_event_handling.rs
index d8700a9137..61cef80bde 100644
--- a/codex-rs/app-server/src/bespoke_event_handling.rs
+++ b/codex-rs/app-server/src/bespoke_event_handling.rs
@@ -2120,6 +2120,7 @@ fn compact_turn_completed_item(item: ThreadItem) -> ThreadItem {
         },
         ThreadItem::DynamicToolCall {
             id,
+            namespace,
             tool,
             arguments,
             status,
@@ -2128,6 +2129,7 @@ fn compact_turn_completed_item(item: ThreadItem) -> ThreadItem {
             duration_ms,
         } => ThreadItem::DynamicToolCall {
             id,
+            namespace,
             tool,
             arguments,
             status,
@@ -4143,6 +4145,7 @@ mod tests {
                 },
                 ThreadItem::DynamicToolCall {
                     id: "tool-1".to_string(),
+                    namespace: Some("custom-tools".to_string()),
                     tool: "custom".to_string(),
                     arguments: json!({"q":"hi"}),
                     status: DynamicToolCallStatus::Completed,
@@ -4198,6 +4201,7 @@ mod tests {
                 },
                 ThreadItem::DynamicToolCall {
                     id: "tool-1".to_string(),
+                    namespace: Some("custom-tools".to_string()),
                     tool: "custom".to_string(),
                     arguments: json!({"q":"hi"}),
                     status: DynamicToolCallStatus::Completed,