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:
@@ -9,6 +9,12 @@ impl ChatWidget {
|
||||
display: SessionConfiguredDisplay,
|
||||
fork_parent_title: Option<String>,
|
||||
) {
|
||||
self.windows_sandbox_host =
|
||||
if !self.windows_sandbox_local_server && self.remote_connection.is_some() {
|
||||
crate::app::WindowsSandboxHost::Remote
|
||||
} else {
|
||||
session.windows_sandbox_host
|
||||
};
|
||||
self.invalidate_permission_discovery();
|
||||
self.permission_profiles_menu_opened = false;
|
||||
self.transcript.reset_copy_history();
|
||||
@@ -24,6 +30,16 @@ impl ChatWidget {
|
||||
let connector_scope_changed = previous_thread_id != Some(session.thread_id)
|
||||
|| self.config.cwd.as_path() != session.cwd.as_path();
|
||||
self.thread_id = Some(session.thread_id);
|
||||
#[cfg(target_os = "windows")]
|
||||
if self.windows_sandbox_local_server
|
||||
&& matches!(self.codex_op_target, CodexOpTarget::AppEvent)
|
||||
{
|
||||
self.windows_sandbox_config = Default::default();
|
||||
self.set_windows_sandbox_mode(/*mode*/ None);
|
||||
self.app_event_tx.send(AppEvent::RefreshWindowsSandbox {
|
||||
thread_id: session.thread_id,
|
||||
});
|
||||
}
|
||||
self.realtime_conversation_available_for_thread =
|
||||
self.config.features.enabled(Feature::RealtimeConversation)
|
||||
&& codex_realtime_webrtc::RealtimeWebrtcSession::is_supported();
|
||||
|
||||
Reference in New Issue
Block a user