mirror of
https://github.com/openai/codex.git
synced 2026-11-19 22:30:42 +00:00
Use app-server state for TUI Windows sandbox decisions (#45821)
## Why Windows sandbox setup and permission choices need to reflect the connected app server's requirements and the active thread's executors. ## What changed - Refresh sandbox configuration and requirements for the current working directory when threads or directories change, before setup, and after setup completes. - Use the thread's observed environments to determine whether sandbox setup is local, remote, mixed, or unknown. - Defer initial prompt submission while requirements load and preserve the draft if loading fails or required setup is unavailable. - Hide sandbox setup choices and elevation commands that requirements or executor selection disallow. ## Testing Add coverage for observed thread hosts, app-server configuration reads, draft preservation and recovery after read failures, deferred initial prompts, and non-admin-only setup choices. GitOrigin-RevId: d85ac66d18951b752e71d1a6bf25404eeedcad02
This commit is contained in:
+1
-16
@@ -64,8 +64,6 @@ use codex_protocol::auth::AuthMode;
|
||||
use codex_protocol::config_types::AltScreenMode;
|
||||
use codex_protocol::config_types::ForcedLoginMethod;
|
||||
use codex_protocol::config_types::SandboxMode;
|
||||
#[cfg(target_os = "windows")]
|
||||
use codex_protocol::config_types::WindowsSandboxLevel;
|
||||
use codex_rollout::StateDbHandle;
|
||||
use codex_rollout::state_db;
|
||||
use codex_state::log_db;
|
||||
@@ -1810,20 +1808,7 @@ async fn run_ratatui_app(
|
||||
set_default_client_residency_requirement(config.enforce_residency.value());
|
||||
let should_show_trust_screen = should_show_trust_screen(&config);
|
||||
#[cfg(target_os = "windows")]
|
||||
let windows_sandbox_level = crate::windows_sandbox::level_from_config(&config);
|
||||
#[cfg(target_os = "windows")]
|
||||
let required_elevated_sandbox_needs_setup = windows_sandbox_level
|
||||
== WindowsSandboxLevel::Elevated
|
||||
&& config
|
||||
.config_layer_stack
|
||||
.requirements()
|
||||
.windows_sandbox_mode
|
||||
.source
|
||||
.is_some();
|
||||
#[cfg(target_os = "windows")]
|
||||
let should_prompt_windows_sandbox_nux_at_startup = (trust_decision_was_made
|
||||
&& windows_sandbox_level == WindowsSandboxLevel::Disabled)
|
||||
|| required_elevated_sandbox_needs_setup;
|
||||
let should_prompt_windows_sandbox_nux_at_startup = trust_decision_was_made;
|
||||
#[cfg(not(target_os = "windows"))]
|
||||
let should_prompt_windows_sandbox_nux_at_startup = false;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user