From b588849f0ad52e22a9c1eb35202f1773fb51e978 Mon Sep 17 00:00:00 2001
From: kevin zhao <zhao@openai.com>
Date: Tue, 18 Nov 2025 09:46:47 -0800
Subject: [PATCH] fix rebase error

---
 codex-rs/core/src/tools/handlers/shell.rs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/codex-rs/core/src/tools/handlers/shell.rs b/codex-rs/core/src/tools/handlers/shell.rs
index ac9e76f284..559c9ad83f 100644
--- a/codex-rs/core/src/tools/handlers/shell.rs
+++ b/codex-rs/core/src/tools/handlers/shell.rs
@@ -304,17 +304,13 @@ impl ShellHandler {
             env: exec_params.env.clone(),
             with_escalated_permissions: exec_params.with_escalated_permissions,
             justification: exec_params.justification.clone(),
-            approval_requirement: if is_user_shell_command {
-                ApprovalRequirement::Skip
-            } else {
-                approval_requirement_for_command(
-                    turn.exec_policy.as_deref(),
-                    &exec_params.command,
-                    turn.approval_policy,
-                    &turn.sandbox_policy,
-                    exec_params.with_escalated_permissions.unwrap_or(false),
-                )
-            },
+            approval_requirement: approval_requirement_for_command(
+                turn.exec_policy.as_deref(),
+                &exec_params.command,
+                turn.approval_policy,
+                &turn.sandbox_policy,
+                exec_params.with_escalated_permissions.unwrap_or(false),
+            ),
         };
         let mut orchestrator = ToolOrchestrator::new();
         let mut runtime = ShellRuntime::new();