config: remove dead profile sandbox fallback

This commit is contained in:
Michael Bolin
2026-06-02 14:31:35 -07:00
parent f6d64bd6ab
commit 1cb5f32051
3 changed files with 3 additions and 16 deletions
+2 -5
View File
@@ -724,16 +724,13 @@ impl ConfigToml {
pub async fn derive_permission_profile(
&self,
sandbox_mode_override: Option<SandboxMode>,
profile_sandbox_mode: Option<SandboxMode>,
windows_sandbox_level: WindowsSandboxLevel,
active_project: Option<&ProjectConfig>,
permission_profile_constraint: Option<&crate::Constrained<PermissionProfile>>,
) -> 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
+1 -10
View File
@@ -165,7 +165,6 @@ fn http_mcp(url: &str) -> McpServerConfig {
async fn derive_legacy_sandbox_policy_for_test(
cfg: &ConfigToml,
sandbox_mode_override: Option<SandboxMode>,
profile_sandbox_mode: Option<SandboxMode>,
windows_sandbox_level: WindowsSandboxLevel,
active_project: Option<&ProjectConfig>,
permission_profile_constraint: Option<&Constrained<PermissionProfile>>,
@@ -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,
@@ -3530,7 +3528,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,
@@ -3551,7 +3548,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,
@@ -3583,7 +3579,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,
@@ -3623,7 +3618,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,
@@ -4999,7 +4993,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(
@@ -8587,7 +8581,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,
@@ -8644,7 +8637,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),
@@ -8697,7 +8689,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),
-1
View File
@@ -2936,7 +2936,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),