mirror of
https://github.com/openai/codex.git
synced 2026-11-18 22:20:48 +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:
@@ -56,14 +56,14 @@ impl ChatWidget {
|
||||
}
|
||||
|
||||
#[cfg_attr(not(target_os = "windows"), allow(dead_code))]
|
||||
pub(crate) fn set_windows_sandbox_mode(&mut self, mode: Option<WindowsSandboxModeToml>) {
|
||||
self.config.permissions.windows_sandbox_mode = mode;
|
||||
pub(crate) fn set_windows_sandbox_mode(&mut self, mode: Option<WindowsSandboxSetupMode>) {
|
||||
self.windows_sandbox_config.mode = mode;
|
||||
#[cfg(target_os = "windows")]
|
||||
self.bottom_pane
|
||||
.set_windows_degraded_sandbox_active(matches!(
|
||||
crate::windows_sandbox::level_from_config(&self.config),
|
||||
WindowsSandboxLevel::RestrictedToken
|
||||
));
|
||||
{
|
||||
let enabled = self.builtin_command_flags().allow_elevate_sandbox;
|
||||
self.bottom_pane
|
||||
.set_windows_degraded_sandbox_active(enabled);
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg_attr(not(target_os = "windows"), allow(dead_code))]
|
||||
@@ -118,17 +118,6 @@ impl ChatWidget {
|
||||
if feature == Feature::PreventIdleSleep {
|
||||
self.turn_lifecycle.set_prevent_idle_sleep(enabled);
|
||||
}
|
||||
#[cfg(target_os = "windows")]
|
||||
if matches!(
|
||||
feature,
|
||||
Feature::WindowsSandbox | Feature::WindowsSandboxElevated
|
||||
) {
|
||||
self.bottom_pane
|
||||
.set_windows_degraded_sandbox_active(matches!(
|
||||
crate::windows_sandbox::level_from_config(&self.config),
|
||||
WindowsSandboxLevel::RestrictedToken
|
||||
));
|
||||
}
|
||||
enabled
|
||||
}
|
||||
|
||||
@@ -494,6 +483,15 @@ impl ChatWidget {
|
||||
self.refresh_status_surfaces();
|
||||
self.sync_service_tier_commands();
|
||||
if cwd_changed {
|
||||
#[cfg(target_os = "windows")]
|
||||
if self.windows_sandbox_local_server
|
||||
&& let Some(thread_id) = self.thread_id
|
||||
{
|
||||
self.windows_sandbox_config = Default::default();
|
||||
self.set_windows_sandbox_mode(/*mode*/ None);
|
||||
self.app_event_tx
|
||||
.send(AppEvent::RefreshWindowsSandbox { thread_id });
|
||||
}
|
||||
self.invalidate_connector_scope();
|
||||
self.refresh_skills_for_current_cwd(/*force_reload*/ true);
|
||||
self.refresh_connector_mentions(/*force_refresh*/ false);
|
||||
|
||||
Reference in New Issue
Block a user