clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 22:54:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
jimmyfraiture
2025-09-30 12:56:30 +01:00
parent 4533dceafa
commit 9c194dc0f9
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
codex-rs/core/src/executor/sandbox.rs
View File

@@ -102,10 +102,19 @@ async fn select_shell_sandbox(
);
match safety {
SafetyCheck::AutoApprove { sandbox_type } => Ok(SandboxDecision::auto(
SafetyCheck::AutoApprove {
sandbox_type,
should_escalate_on_failure(approval_policy, sandbox_type),
)),
user_explicitly_approved,
} => {
let mut decision = SandboxDecision::auto(
sandbox_type,
should_escalate_on_failure(approval_policy, sandbox_type),
);
if user_explicitly_approved {
decision.record_session_approval = true;
}
Ok(decision)
}
SafetyCheck::AskUser => {
let decision = session
.request_command_approval(
@@ -146,7 +155,7 @@ fn select_apply_patch_sandbox(
&config.sandbox_policy,
&config.sandbox_cwd,
) {
SafetyCheck::AutoApprove { sandbox_type } => Ok(SandboxDecision::auto(
SafetyCheck::AutoApprove { sandbox_type, .. } => Ok(SandboxDecision::auto(
sandbox_type,
should_escalate_on_failure(approval_policy, sandbox_type),
)),