From 7fd7ae959fc72f1d7a4fd683e095941fad7170f5 Mon Sep 17 00:00:00 2001 From: David Wiesen Date: Tue, 14 Apr 2026 11:02:57 -0700 Subject: [PATCH] fix: skip WindowsApps helper roots in sandbox refresh --- .../src/setup_orchestrator.rs | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/codex-rs/windows-sandbox-rs/src/setup_orchestrator.rs b/codex-rs/windows-sandbox-rs/src/setup_orchestrator.rs index f6583e0de4..087e3fa8ee 100644 --- a/codex-rs/windows-sandbox-rs/src/setup_orchestrator.rs +++ b/codex-rs/windows-sandbox-rs/src/setup_orchestrator.rs @@ -334,6 +334,7 @@ fn gather_helper_read_roots(codex_home: &Path) -> Vec { let mut roots = Vec::new(); if let Ok(exe) = std::env::current_exe() && let Some(dir) = exe.parent() + && !is_windowsapps_install_path(dir) { roots.push(dir.to_path_buf()); } @@ -343,6 +344,15 @@ fn gather_helper_read_roots(codex_home: &Path) -> Vec { roots } +fn is_windowsapps_install_path(path: &Path) -> bool { + path.components().any(|component| { + component + .as_os_str() + .to_string_lossy() + .eq_ignore_ascii_case("WindowsApps") + }) +} + fn gather_legacy_full_read_roots( command_cwd: &Path, policy: &SandboxPolicy, @@ -1009,6 +1019,16 @@ mod tests { assert!(roots.contains(&expected)); } + #[test] + fn windowsapps_install_paths_are_skipped_for_helper_roots() { + assert!(is_windowsapps_install_path(Path::new( + r"C:\Program Files\WindowsApps\OpenAI.Codex_1.0.0_x64__token\app\resources" + ))); + assert!(!is_windowsapps_install_path(Path::new( + r"C:\Program Files\OpenAI\Codex\app\resources" + ))); + } + #[test] fn restricted_read_roots_skip_platform_defaults_when_disabled() { let tmp = TempDir::new().expect("tempdir");