From 746c8c3abf6f51c257dea725b3d2613ff9ef1bd0 Mon Sep 17 00:00:00 2001
From: David Wiesen <iceweasel@openai.com>
Date: Tue, 24 Mar 2026 09:23:27 -0700
Subject: [PATCH] fix: preserve private desktop for elevated ipc spawns

---
 .../src/elevated/command_runner_win.rs        | 49 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/codex-rs/windows-sandbox-rs/src/elevated/command_runner_win.rs b/codex-rs/windows-sandbox-rs/src/elevated/command_runner_win.rs
index 87b0e2a812..67ad14d5d5 100644
--- a/codex-rs/windows-sandbox-rs/src/elevated/command_runner_win.rs
+++ b/codex-rs/windows-sandbox-rs/src/elevated/command_runner_win.rs
@@ -289,7 +289,7 @@ fn spawn_ipc_process(
             &req.env,
             stdin_mode,
             StderrMode::Separate,
-            false,
+            use_private_desktop_for_spawn(req),
         )?;
         (
             pipe_handles.process,
@@ -315,6 +315,10 @@ fn spawn_ipc_process(
     })
 }
 
+fn use_private_desktop_for_spawn(req: &codex_windows_sandbox::ipc_framed::SpawnRequest) -> bool {
+    req.use_private_desktop
+}
+
 /// Stream stdout/stderr from the child into Output frames.
 fn spawn_output_reader(
     writer: Arc<StdMutex<File>>,
@@ -552,3 +556,46 @@ pub fn main() -> Result<()> {
 
     std::process::exit(exit_code);
 }
+
+#[cfg(test)]
+mod tests {
+    use super::use_private_desktop_for_spawn;
+    use codex_windows_sandbox::ipc_framed::SpawnRequest;
+    use std::collections::HashMap;
+    use std::path::PathBuf;
+
+    fn spawn_request(tty: bool, use_private_desktop: bool) -> SpawnRequest {
+        SpawnRequest {
+            command: vec!["cmd".into(), "/c".into(), "echo".into(), "hi".into()],
+            cwd: PathBuf::from("C:/workspace"),
+            env: HashMap::new(),
+            policy_json_or_preset: "workspace-write".into(),
+            sandbox_policy_cwd: PathBuf::from("C:/workspace"),
+            codex_home: PathBuf::from("C:/codex-home"),
+            real_codex_home: PathBuf::from("C:/codex-home"),
+            cap_sids: Vec::new(),
+            timeout_ms: None,
+            tty,
+            stdin_open: false,
+            use_private_desktop,
+        }
+    }
+
+    #[test]
+    fn non_tty_spawn_preserves_private_desktop_request() {
+        let req = spawn_request(false, true);
+        assert!(use_private_desktop_for_spawn(&req));
+    }
+
+    #[test]
+    fn tty_spawn_preserves_private_desktop_request() {
+        let req = spawn_request(true, true);
+        assert!(use_private_desktop_for_spawn(&req));
+    }
+
+    #[test]
+    fn desktop_request_can_be_disabled() {
+        let req = spawn_request(false, false);
+        assert!(!use_private_desktop_for_spawn(&req));
+    }
+}