mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +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:
@@ -119,7 +119,9 @@ impl ChatWidget {
|
||||
}
|
||||
#[cfg(any(target_os = "windows", test))]
|
||||
if self.windows_sandbox_host == crate::app::WindowsSandboxHost::Local
|
||||
&& self.elevated_windows_sandbox_setup_required()
|
||||
&& (self.windows_sandbox_local_server
|
||||
&& self.windows_sandbox_config.requirements.is_none()
|
||||
|| self.elevated_windows_sandbox_setup_required())
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -138,14 +140,23 @@ impl ChatWidget {
|
||||
return;
|
||||
}
|
||||
#[cfg(any(target_os = "windows", test))]
|
||||
if self.windows_sandbox_local_server
|
||||
&& self.windows_sandbox_host != crate::app::WindowsSandboxHost::Remote
|
||||
&& self.windows_sandbox_config.requirements.is_none()
|
||||
{
|
||||
return;
|
||||
}
|
||||
#[cfg(any(target_os = "windows", test))]
|
||||
if self.windows_sandbox_host == crate::app::WindowsSandboxHost::Local
|
||||
&& self.elevated_windows_sandbox_setup_required()
|
||||
{
|
||||
return;
|
||||
}
|
||||
#[cfg(any(target_os = "windows", test))]
|
||||
if self.windows_sandbox_host == crate::app::WindowsSandboxHost::Mixed
|
||||
&& self.elevated_windows_sandbox_setup_required()
|
||||
if matches!(
|
||||
self.windows_sandbox_host,
|
||||
crate::app::WindowsSandboxHost::Mixed | crate::app::WindowsSandboxHost::Unknown
|
||||
) && self.elevated_windows_sandbox_setup_required()
|
||||
{
|
||||
if let Some(user_message) = self.initial_user_message.take() {
|
||||
self.restore_user_message_to_composer(user_message);
|
||||
|
||||
Reference in New Issue
Block a user