From 31811265b0a176d92d679932d08b9e74156010d9 Mon Sep 17 00:00:00 2001
From: won <won@openai.com>
Date: Sat, 22 Aug 2026 11:50:53 -0700
Subject: [PATCH] Preserve Guardian cancellation in legacy shell handler

---
 codex-rs/core/src/tools/handlers/shell.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/codex-rs/core/src/tools/handlers/shell.rs b/codex-rs/core/src/tools/handlers/shell.rs
index accd129e33..481e810cba 100644
--- a/codex-rs/core/src/tools/handlers/shell.rs
+++ b/codex-rs/core/src/tools/handlers/shell.rs
@@ -146,6 +146,7 @@ async fn run_exec_like(args: RunExecLikeArgs) -> Result<FunctionToolOutput, Func
         turn_environment.clone(),
         session.clone(),
         Arc::clone(&step_context),
+        cancellation_token.clone(),
         Some(&tracker),
         &call_id,
         tool_name.name.as_str(),
@@ -198,7 +199,7 @@ async fn run_exec_like(args: RunExecLikeArgs) -> Result<FunctionToolOutput, Func
         hook_command,
         cwd: exec_params.cwd.clone(),
         timeout_ms: exec_params.expiration.timeout_ms(),
-        cancellation_token,
+        cancellation_token: cancellation_token.clone(),
         env,
         explicit_env_overrides,
         network: exec_params.network.clone(),
@@ -217,6 +218,7 @@ async fn run_exec_like(args: RunExecLikeArgs) -> Result<FunctionToolOutput, Func
         step_context,
         call_id: call_id.clone(),
         tool_name,
+        cancellation_token,
     };
     let out = orchestrator
         .run(&mut runtime, &req, &tool_ctx, &turn, turn.approval_policy())