diff --git a/codex-rs/config/src/config_toml.rs b/codex-rs/config/src/config_toml.rs index a537f78e4c..aee259e6fd 100644 --- a/codex-rs/config/src/config_toml.rs +++ b/codex-rs/config/src/config_toml.rs @@ -724,16 +724,13 @@ impl ConfigToml { pub async fn derive_permission_profile( &self, sandbox_mode_override: Option, - profile_sandbox_mode: Option, windows_sandbox_level: WindowsSandboxLevel, active_project: Option<&ProjectConfig>, permission_profile_constraint: Option<&crate::Constrained>, ) -> PermissionProfile { - let sandbox_mode_was_explicit = sandbox_mode_override.is_some() - || profile_sandbox_mode.is_some() - || self.sandbox_mode.is_some(); + let sandbox_mode_was_explicit = + sandbox_mode_override.is_some() || self.sandbox_mode.is_some(); let resolved_sandbox_mode = sandbox_mode_override - .or(profile_sandbox_mode) .or(self.sandbox_mode) .or(if sandbox_mode_was_explicit { None diff --git a/codex-rs/core/src/config/config_tests.rs b/codex-rs/core/src/config/config_tests.rs index 2bb0c3691c..3e10f8d7ab 100644 --- a/codex-rs/core/src/config/config_tests.rs +++ b/codex-rs/core/src/config/config_tests.rs @@ -165,7 +165,6 @@ fn http_mcp(url: &str) -> McpServerConfig { async fn derive_legacy_sandbox_policy_for_test( cfg: &ConfigToml, sandbox_mode_override: Option, - profile_sandbox_mode: Option, windows_sandbox_level: WindowsSandboxLevel, active_project: Option<&ProjectConfig>, permission_profile_constraint: Option<&Constrained>, @@ -173,7 +172,6 @@ async fn derive_legacy_sandbox_policy_for_test( let permission_profile = cfg .derive_permission_profile( sandbox_mode_override, - profile_sandbox_mode, windows_sandbox_level, active_project, permission_profile_constraint, @@ -3574,7 +3572,6 @@ network_access = false # This should be ignored. let resolution = derive_legacy_sandbox_policy_for_test( &sandbox_full_access_cfg, sandbox_mode_override, - /*profile_sandbox_mode*/ None, WindowsSandboxLevel::Disabled, /*active_project*/ None, /*permission_profile_constraint*/ None, @@ -3595,7 +3592,6 @@ network_access = true # This should be ignored. let resolution = derive_legacy_sandbox_policy_for_test( &sandbox_read_only_cfg, sandbox_mode_override, - /*profile_sandbox_mode*/ None, WindowsSandboxLevel::Disabled, /*active_project*/ None, /*permission_profile_constraint*/ None, @@ -3627,7 +3623,6 @@ trust_level = "trusted" let resolution = derive_legacy_sandbox_policy_for_test( &sandbox_workspace_write_cfg, sandbox_mode_override, - /*profile_sandbox_mode*/ None, WindowsSandboxLevel::Disabled, /*active_project*/ None, /*permission_profile_constraint*/ None, @@ -3667,7 +3662,6 @@ exclude_slash_tmp = true let resolution = derive_legacy_sandbox_policy_for_test( &sandbox_workspace_write_cfg, sandbox_mode_override, - /*profile_sandbox_mode*/ None, WindowsSandboxLevel::Disabled, /*active_project*/ None, /*permission_profile_constraint*/ None, @@ -5043,7 +5037,7 @@ model = "gpt-project-local" } #[tokio::test] -async fn unselected_profile_sandbox_mode_is_ignored() -> std::io::Result<()> { +async fn unselected_legacy_profile_sandbox_setting_is_ignored() -> std::io::Result<()> { let codex_home = TempDir::new()?; let mut profiles = HashMap::new(); profiles.insert( @@ -8631,7 +8625,6 @@ trust_level = "untrusted" let resolution = derive_legacy_sandbox_policy_for_test( &cfg, /*sandbox_mode_override*/ None, - /*profile_sandbox_mode*/ None, WindowsSandboxLevel::Disabled, Some(&active_project), /*permission_profile_constraint*/ None, @@ -8680,7 +8673,6 @@ async fn derive_sandbox_policy_falls_back_to_read_only_for_implicit_defaults() - let resolution = derive_legacy_sandbox_policy_for_test( &cfg, /*sandbox_mode_override*/ None, - /*profile_sandbox_mode*/ None, WindowsSandboxLevel::Disabled, Some(&active_project), Some(&constrained), @@ -8733,7 +8725,6 @@ async fn derive_sandbox_policy_preserves_windows_downgrade_for_unsupported_fallb let resolution = derive_legacy_sandbox_policy_for_test( &cfg, /*sandbox_mode_override*/ None, - /*profile_sandbox_mode*/ None, WindowsSandboxLevel::Disabled, Some(&active_project), Some(&constrained), diff --git a/codex-rs/core/src/config/mod.rs b/codex-rs/core/src/config/mod.rs index 0fe434c34d..592c9f73ff 100644 --- a/codex-rs/core/src/config/mod.rs +++ b/codex-rs/core/src/config/mod.rs @@ -2930,7 +2930,6 @@ impl Config { let mut permission_profile = cfg .derive_permission_profile( sandbox_mode, - /*profile_sandbox_mode*/ None, windows_sandbox_level, Some(&active_project), Some(&constrained_permission_profile),