From 2e7e4f6ea634b43b3e19d240ed8f50568bd2eb8e Mon Sep 17 00:00:00 2001
From: jif-oai <jif@openai.com>
Date: Wed, 17 Dec 2025 13:55:13 +0000
Subject: [PATCH] nit: drop dead branch with `unified_exec` tool (#8182)

---
 codex-rs/core/src/tools/context.rs               |  4 ----
 codex-rs/core/src/tools/handlers/unified_exec.rs | 14 ++++++--------
 codex-rs/core/src/tools/router.rs                |  7 +------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/codex-rs/core/src/tools/context.rs b/codex-rs/core/src/tools/context.rs
index b226fb11e..abe488681 100644
--- a/codex-rs/core/src/tools/context.rs
+++ b/codex-rs/core/src/tools/context.rs
@@ -37,9 +37,6 @@ pub enum ToolPayload {
     LocalShell {
         params: ShellToolCallParams,
     },
-    UnifiedExec {
-        arguments: String,
-    },
     Mcp {
         server: String,
         tool: String,
@@ -53,7 +50,6 @@ impl ToolPayload {
             ToolPayload::Function { arguments } => Cow::Borrowed(arguments),
             ToolPayload::Custom { input } => Cow::Borrowed(input),
             ToolPayload::LocalShell { params } => Cow::Owned(params.command.join(" ")),
-            ToolPayload::UnifiedExec { arguments } => Cow::Borrowed(arguments),
             ToolPayload::Mcp { raw_arguments, .. } => Cow::Borrowed(raw_arguments),
         }
     }
diff --git a/codex-rs/core/src/tools/handlers/unified_exec.rs b/codex-rs/core/src/tools/handlers/unified_exec.rs
index e81c35186..00418d8a6 100644
--- a/codex-rs/core/src/tools/handlers/unified_exec.rs
+++ b/codex-rs/core/src/tools/handlers/unified_exec.rs
@@ -77,16 +77,15 @@ impl ToolHandler for UnifiedExecHandler {
     }
 
     fn matches_kind(&self, payload: &ToolPayload) -> bool {
-        matches!(
-            payload,
-            ToolPayload::Function { .. } | ToolPayload::UnifiedExec { .. }
-        )
+        matches!(payload, ToolPayload::Function { .. })
     }
 
     async fn is_mutating(&self, invocation: &ToolInvocation) -> bool {
-        let (ToolPayload::Function { arguments } | ToolPayload::UnifiedExec { arguments }) =
-            &invocation.payload
-        else {
+        let ToolPayload::Function { arguments } = &invocation.payload else {
+            tracing::error!(
+                "This should never happen, invocation payload is wrong: {:?}",
+                invocation.payload
+            );
             return true;
         };
 
@@ -110,7 +109,6 @@ impl ToolHandler for UnifiedExecHandler {
 
         let arguments = match payload {
             ToolPayload::Function { arguments } => arguments,
-            ToolPayload::UnifiedExec { arguments } => arguments,
             _ => {
                 return Err(FunctionCallError::RespondToModel(
                     "unified_exec handler received unsupported payload".to_string(),
diff --git a/codex-rs/core/src/tools/router.rs b/codex-rs/core/src/tools/router.rs
index 9d83b5a63..2bc19ddd0 100644
--- a/codex-rs/core/src/tools/router.rs
+++ b/codex-rs/core/src/tools/router.rs
@@ -78,15 +78,10 @@ impl ToolRouter {
                         },
                     }))
                 } else {
-                    let payload = if name == "unified_exec" {
-                        ToolPayload::UnifiedExec { arguments }
-                    } else {
-                        ToolPayload::Function { arguments }
-                    };
                     Ok(Some(ToolCall {
                         tool_name: name,
                         call_id,
-                        payload,
+                        payload: ToolPayload::Function { arguments },
                     }))
                 }
             }