Merge remote-tracking branch 'origin/main' into jif/sandbox-1

# Conflicts: # codex-rs/core/src/codex.rs
2026-10-30 19:18:49 +00:00 · 2025-09-30 12:45:23 +01:00
parent 43c0abb31e 5b038135de
commit 4533dceafa
198 changed files with 20572 additions and 1538 deletions
@@ -46,12 +46,13 @@ pub(crate) async fn apply_patch(
        &turn_context.sandbox_policy,
        &turn_context.cwd,
    ) {
-        SafetyCheck::AutoApprove { .. } => {
-            InternalApplyPatchInvocation::DelegateToExec(ApplyPatchExec {
-                action,
-                user_explicitly_approved_this_action: false,
-            })
-        }
+        SafetyCheck::AutoApprove {
+            user_explicitly_approved,
+            ..
+        } => InternalApplyPatchInvocation::DelegateToExec(ApplyPatchExec {
+            action,
+            user_explicitly_approved_this_action: user_explicitly_approved,
+        }),
        SafetyCheck::AskUser => {
            // Compute a readable summary of path changes to include in the
            // approval request so the user can make an informed decision.