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

Fix post-rebase merge fallout

Browse Source 
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 <noreply@openai.com>
This commit is contained in:
Charles Cunningham
2026-03-13 04:02:14 -07:00
parent 0e77d775e0
commit 877d86ac78
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
codex-rs/core/src/exec_policy.rs
View File

@@ -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

2
codex-rs/core/src/tools/handlers/mod.rs
View File

@@ -169,7 +169,7 @@ pub(super) fn implicit_granted_permissions(
additional_permissions: Option<&PermissionProfile>,
effective_additional_permissions: &EffectiveAdditionalPermissions,
) -> Option<PermissionProfile> {
if !sandbox_permissions.requires_additional_permissions()
if !sandbox_permissions.uses_additional_permissions()
&& !matches!(sandbox_permissions, SandboxPermissions::RequireEscalated)
&& additional_permissions.is_none()
{