From 39f436fd69fc1d73be4d9d73b4a61722e3f30117 Mon Sep 17 00:00:00 2001
From: Charles Cunningham <ccunningham@openai.com>
Date: Fri, 13 Mar 2026 13:08:06 -0700
Subject: [PATCH] tui: complete legacy sandbox preflight asynchronously

Co-authored-by: Codex <noreply@openai.com>
---
 codex-rs/tui/src/app.rs       | 71 ++++++++++++++++++++++-------------
 codex-rs/tui/src/app_event.rs |  7 ++++
 2 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/codex-rs/tui/src/app.rs b/codex-rs/tui/src/app.rs
index fadc843683..af0724dcfa 100644
--- a/codex-rs/tui/src/app.rs
+++ b/codex-rs/tui/src/app.rs
@@ -2930,45 +2930,62 @@ impl App {
                     let env_map: std::collections::HashMap<String, String> =
                         std::env::vars().collect();
                     let codex_home = self.config.codex_home.clone();
+                    let tx = self.app_event_tx.clone();
 
-                    let result = tokio::task::spawn_blocking(move || {
-                        codex_core::windows_sandbox::run_legacy_setup_preflight(
+                    tokio::task::spawn_blocking(move || {
+                        let preset_for_error = preset.clone();
+                        let result = codex_core::windows_sandbox::run_legacy_setup_preflight(
                             &policy,
                             policy_cwd.as_path(),
                             command_cwd.as_path(),
                             &env_map,
                             codex_home.as_path(),
-                        )
-                    })
-                    .await
-                    .map_err(|join_err| {
-                        anyhow::anyhow!("legacy Windows sandbox setup task failed: {join_err}")
-                    })?;
-
-                    match result {
-                        Ok(()) => {
-                            self.app_event_tx
-                                .send(AppEvent::EnableWindowsSandboxForAgentMode {
-                                    preset,
-                                    mode: WindowsSandboxEnableMode::Legacy,
-                                });
-                        }
-                        Err(err) => {
-                            tracing::error!(
-                                error = %err,
-                                "failed to run legacy Windows sandbox setup preflight"
-                            );
-                            self.chat_widget.add_error_message(format!(
-                                "Failed to enable the Windows sandbox feature: {err}"
-                            ));
-                        }
-                    }
+                        );
+                        let event = match result {
+                            Ok(()) => AppEvent::WindowsSandboxLegacySetupCompleted {
+                                preset,
+                                error: None,
+                            },
+                            Err(err) => {
+                                tracing::error!(
+                                    error = %err,
+                                    "failed to run legacy Windows sandbox setup preflight"
+                                );
+                                AppEvent::WindowsSandboxLegacySetupCompleted {
+                                    preset: preset_for_error,
+                                    error: Some(err.to_string()),
+                                }
+                            }
+                        };
+                        tx.send(event);
+                    });
                 }
                 #[cfg(not(target_os = "windows"))]
                 {
                     let _ = preset;
                 }
             }
+            AppEvent::WindowsSandboxLegacySetupCompleted { preset, error } => {
+                #[cfg(target_os = "windows")]
+                match error {
+                    None => {
+                        self.app_event_tx
+                            .send(AppEvent::EnableWindowsSandboxForAgentMode {
+                                preset,
+                                mode: WindowsSandboxEnableMode::Legacy,
+                            });
+                    }
+                    Some(err) => {
+                        self.chat_widget.add_error_message(format!(
+                            "Failed to enable the Windows sandbox feature: {err}"
+                        ));
+                    }
+                }
+                #[cfg(not(target_os = "windows"))]
+                {
+                    let _ = (preset, error);
+                }
+            }
             AppEvent::BeginWindowsSandboxGrantReadRoot { path } => {
                 #[cfg(target_os = "windows")]
                 {
diff --git a/codex-rs/tui/src/app_event.rs b/codex-rs/tui/src/app_event.rs
index a15e0b068e..2f8da68070 100644
--- a/codex-rs/tui/src/app_event.rs
+++ b/codex-rs/tui/src/app_event.rs
@@ -300,6 +300,13 @@ pub(crate) enum AppEvent {
         preset: ApprovalPreset,
     },
 
+    /// Result of the non-elevated Windows sandbox setup flow.
+    #[cfg_attr(not(target_os = "windows"), allow(dead_code))]
+    WindowsSandboxLegacySetupCompleted {
+        preset: ApprovalPreset,
+        error: Option<String>,
+    },
+
     /// Begin a non-elevated grant of read access for an additional directory.
     #[cfg_attr(not(target_os = "windows"), allow(dead_code))]
     BeginWindowsSandboxGrantReadRoot {