From 877d86ac788c3f28de037c8c7c27a65eb3c4b29b Mon Sep 17 00:00:00 2001 From: Charles Cunningham Date: Fri, 13 Mar 2026 04:02:14 -0700 Subject: [PATCH] Fix post-rebase merge fallout Clean up leftover conflict markers and restore the current sandbox-permissions helper calls after rebasing context fragment work onto origin/main. Co-authored-by: Codex --- codex-rs/core/src/exec_policy.rs | 9 --------- codex-rs/core/src/tools/handlers/mod.rs | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/codex-rs/core/src/exec_policy.rs b/codex-rs/core/src/exec_policy.rs index 10349e53d1..aa0691f888 100644 --- a/codex-rs/core/src/exec_policy.rs +++ b/codex-rs/core/src/exec_policy.rs @@ -24,11 +24,6 @@ use codex_protocol::approvals::ExecPolicyAmendment; use codex_protocol::permissions::FileSystemSandboxKind; use codex_protocol::permissions::FileSystemSandboxPolicy; use codex_protocol::protocol::AskForApproval; -<<<<<<< HEAD -use codex_protocol::protocol::FileSystemSandboxKind; -use codex_protocol::protocol::FileSystemSandboxPolicy; -======= ->>>>>>> 8a34b897a (Drop permission policy changes from context fragment PR) use codex_protocol::protocol::SandboxPolicy; use thiserror::Error; use tokio::fs; @@ -566,11 +561,7 @@ pub fn render_decision_for_unmatched_command( Decision::Allow } FileSystemSandboxKind::Restricted => { -<<<<<<< HEAD - if sandbox_permissions.requires_additional_permissions() { -======= if sandbox_permissions.requests_sandbox_override() { ->>>>>>> 8a34b897a (Drop permission policy changes from context fragment PR) Decision::Prompt } else { Decision::Allow diff --git a/codex-rs/core/src/tools/handlers/mod.rs b/codex-rs/core/src/tools/handlers/mod.rs index 47759d74f0..7ae1d1428d 100644 --- a/codex-rs/core/src/tools/handlers/mod.rs +++ b/codex-rs/core/src/tools/handlers/mod.rs @@ -169,7 +169,7 @@ pub(super) fn implicit_granted_permissions( additional_permissions: Option<&PermissionProfile>, effective_additional_permissions: &EffectiveAdditionalPermissions, ) -> Option { - if !sandbox_permissions.requires_additional_permissions() + if !sandbox_permissions.uses_additional_permissions() && !matches!(sandbox_permissions, SandboxPermissions::RequireEscalated) && additional_permissions.is_none() {