Merge 5d82aeefcc into sapling-pr-archive-bolinfest

This commit is contained in:
Michael Bolin
2026-04-30 05:32:32 -07:00
committed by GitHub
3 changed files with 10 additions and 3 deletions

1
codex-rs/Cargo.lock generated
View File

@@ -4161,6 +4161,7 @@ dependencies = [
"codex-model-provider-info",
"codex-models-manager",
"codex-protocol",
"codex-sandboxing",
"codex-utils-absolute-path",
"codex-utils-cargo-bin",
"ctor 0.6.3",

View File

@@ -23,6 +23,7 @@ codex-login = { workspace = true }
codex-model-provider-info = { workspace = true }
codex-models-manager = { workspace = true }
codex-protocol = { workspace = true }
codex-sandboxing = { workspace = true }
codex-utils-absolute-path = { workspace = true }
codex-utils-cargo-bin = { workspace = true }
ctor = { workspace = true }

View File

@@ -39,6 +39,7 @@ use codex_protocol::protocol::SessionConfiguredEvent;
use codex_protocol::protocol::SessionSource;
use codex_protocol::protocol::TurnEnvironmentSelection;
use codex_protocol::user_input::UserInput;
use codex_sandboxing::compatibility_sandbox_policy_for_permission_profile;
use codex_utils_absolute_path::AbsolutePathBuf;
use futures::future::BoxFuture;
use serde_json::Value;
@@ -209,9 +210,13 @@ pub fn turn_permission_fields(
permission_profile: PermissionProfile,
cwd: &Path,
) -> (SandboxPolicy, Option<PermissionProfile>) {
let sandbox_policy = permission_profile
.to_legacy_sandbox_policy(cwd)
.unwrap_or_else(|_| SandboxPolicy::new_read_only_policy());
let file_system_sandbox_policy = permission_profile.file_system_sandbox_policy();
let sandbox_policy = compatibility_sandbox_policy_for_permission_profile(
&permission_profile,
&file_system_sandbox_policy,
permission_profile.network_sandbox_policy(),
cwd,
);
(sandbox_policy, Some(permission_profile))
}