Lightweight coding agent that runs in your terminal
Rust
Fix TUI permission selection and session state handling (#55682)
Eric Traut7389eebf45df
diff --git a/codex-rs/tui/src/app/config_persistence.rs b/codex-rs/tui/src/app/config_persistence.rsindex 4b5d22f8f6..ef5b912785 100644--- a/codex-rs/tui/src/app/config_persistence.rs+++ b/codex-rs/tui/src/app/config_persistence.rs@@ -416,8 +416,6 @@ impl App {.selected_permission_profiles.get(&thread_id)!= Some(&active.id)- && self.app_server_target.thread_params_mode()- == crate::app_server_session::ThreadParamsMode::Embedded&& self.config.custom_permission_profilesdiff --git a/codex-rs/tui/src/app/event_dispatch.rs b/codex-rs/tui/src/app/event_dispatch.rsindex 89bdf72a00..6687d053b4 100644--- a/codex-rs/tui/src/app/event_dispatch.rs+++ b/codex-rs/tui/src/app/event_dispatch.rs@@ -2204,7 +2204,8 @@ impl App {self.app_event_tx.send(AppEvent::SettingsSelectionSettled);}AppEvent::SettingsSelectionSettled => {- if self.chat_widget.no_modal_or_popup_active()+ if !self.chat_widget.permission_popup_pending+ && self.chat_widget.no_modal_or_popup_active()&& !self.chat_widget.inline_permission_profile_selection_pending()@@ -2290,8 +2291,10 @@ impl App {}AppEvent::ModelsLoaded { request_id, result }| AppEvent::ApiKeyCompatModelsLoaded { request_id, result } => {- if self.chat_widget.on_models_loaded(request_id, result) {- self.model_catalog = self.chat_widget.model_catalog();+ self.chat_widget.on_models_loaded(request_id, result);+ let catalog = self.chat_widget.model_catalog();+ if !Arc::ptr_eq(&self.model_catalog, &catalog) {+ self.model_catalog = catalog;app_server.set_available_models(self.model_catalog.try_list_models()?);self.sync_active_thread_service_tier_to_cached_session().await;}@@ -3239,7 +3242,9 @@ impl App {.select_permission_profile(&profile_id);}AppEvent::OpenPermissionsPopup | AppEvent::OpenApprovalsPopup => {+ self.chat_widget.permission_popup_pending = false;if self.reject_pending_permission_change() {+ self.app_event_tx.send(AppEvent::SettingsSelectionClosed);return Ok(AppRunControl::Continue);}#[cfg(any(target_os = "windows", test))]@@ -3248,6 +3253,7 @@ impl App {&& self.chat_widget.windows_sandbox_config.requirements.is_none()&& !self.refresh_windows_sandbox_config(app_server).await{+ self.app_event_tx.send(AppEvent::SettingsSelectionClosed);return Ok(AppRunControl::Continue);}if app_server.uses_remote_workspace() {diff --git a/codex-rs/tui/src/app/tests.rs b/codex-rs/tui/src/app/tests.rsindex 214aea0fb3..5ccd4bf751 100644--- a/codex-rs/tui/src/app/tests.rs+++ b/codex-rs/tui/src/app/tests.rs@@ -9601,7 +9601,7 @@ async fn override_turn_context_sends_thread_settings_update() {#[tokio::test]async fn selecting_cyber_model_defaults_active_thread_to_auto_review() {Box::pin(async {- let mut app = make_test_app().await;+ let (mut app, mut events, _) = make_test_app_with_channels().await;app.config.permissions.approval_policy@@ -9633,6 +9633,8 @@ async fn selecting_cyber_model_defaults_active_thread_to_auto_review() {);assert_eq!(started.session.approvals_reviewer, ApprovalsReviewer::User);let thread_id = started.session.thread_id;+ app.chat_widget+ .handle_thread_session_quiet(started.session.clone());app.enqueue_primary_thread_session(started.session, started.turns).await.expect("primary thread should be registered");@@ -9677,6 +9679,20 @@ async fn selecting_cyber_model_defaults_active_thread_to_auto_review() {.requested_permission_profiles.contains_key(&thread_id));+ while events.try_recv().is_ok() {}+ // Until the cyber model's permissions are confirmed, do not offer another selection.+ app.chat_widget.handle_paste("/permissions".into());+ app.chat_widget.handle_key_event(KeyCode::Enter.into());+ let event = std::iter::from_fn(|| events.try_recv().ok())+ .find(|event| matches!(event, AppEvent::OpenPermissionsPopup))+ .expect("slash permissions goes through app permission guards");+ app.handle_event(&mut tui, &mut app_server, event)+ .await+ .expect("permissions menu");+ insta::assert_snapshot!(+ next_history_message(&mut events),+ @"■ Wait for permissions to update before changing permissions."+ );let notification = next_thread_settings_updated(&mut app_server, thread_id).await;assert_eq!(notification.thread_settings.approval_policy,diff --git a/codex-rs/tui/src/app/tests/model_catalog.rs b/codex-rs/tui/src/app/tests/model_catalog.rsindex 273725c2f2..ec429d4388 100644--- a/codex-rs/tui/src/app/tests/model_catalog.rs+++ b/codex-rs/tui/src/app/tests/model_catalog.rs@@ -1,4 +1,5 @@use super::*;+use crate::status::StatusAccountDisplay;use assert_matches::assert_matches;use codex_config::types::ModelAvailabilityNuxConfig;use codex_model_provider::create_model_provider;@@ -88,6 +89,10 @@ async fn model_picker_refresh_updates_app_catalog_from_app_server() -> Result<()model.default_service_tier = model.is_default.then(|| ServiceTier::Fast.request_value().to_string());+ model.available_access_programs =+ Some(codex_protocol::openai_models::ModelAccessPrograms {+ cyber: vec![codex_protocol::turn_input::CyberAccessProgram::Standard],+ });}let expected = models.clone();Box::pin(app.handle_event(&mut tui, &mut app_server, loaded)).await?;@@ -120,6 +125,30 @@ async fn model_picker_refresh_updates_app_catalog_from_app_server() -> Result<()),(expected.clone(), expected));+ app.chat_widget.update_account_state(+ Some(StatusAccountDisplay::ApiKey),+ /*plan_type*/ None,+ /*has_chatgpt_account*/ false,+ /*has_codex_backend_auth*/ false,+ );+ let request_id = std::iter::from_fn(|| rx.try_recv().ok())+ .filter_map(|event| match event {+ AppEvent::FetchModels { request_id } => Some(request_id),+ _ => None,+ })+ .last()+ .expect("account-scoped model refresh");+ let stripped = app.chat_widget.model_catalog().try_list_models()?;+ Box::pin(app.handle_event(+ &mut tui,+ &mut app_server,+ AppEvent::ApiKeyCompatModelsLoaded {+ request_id,+ result: Ok(stripped.clone()),+ },+ ))+ .await?;+ assert_eq!(app.model_catalog.try_list_models()?, stripped);let mut config = app.config.clone();config.service_tier = None;config.features.enable(Feature::FastMode)?;diff --git a/codex-rs/tui/src/app/tests/permission_selection_tests.rs b/codex-rs/tui/src/app/tests/permission_selection_tests.rsindex 077624d923..d9f43a5b17 100644--- a/codex-rs/tui/src/app/tests/permission_selection_tests.rs+++ b/codex-rs/tui/src/app/tests/permission_selection_tests.rs@@ -70,6 +70,19 @@ proxy_url = "http://127.0.0.1:43128".contains_key(&thread_id));insta::assert_snapshot!(next_history_message(&mut events).replace(profile_id, "<PROFILE>"), @"• Permission selection requested: <PROFILE>");+ // Another permissions menu and prompt are queued as this selection closes.+ app.chat_widget+ .set_queue_autosend_suppressed(/*suppressed*/ true);+ for text in ["/permissions", "after permissions"] {+ app.chat_widget+ .restore_user_message_to_composer(text.into());+ app.chat_widget.handle_key_event(KeyCode::Tab.into());+ }+ app.chat_widget.handle_server_notification(+ turn_completed_notification(thread_id, "turn-1", TurnStatus::Completed),+ /*replay_kind*/ None,+ );+ app.app_event_tx.send(AppEvent::SettingsSelectionClosed);let settings = next_thread_settings_updated(&mut server, thread_id).await;app.enqueue_thread_notification(thread_id,@@ -96,6 +109,16 @@ proxy_url = "http://127.0.0.1:43128"app.runtime_permission_profile_override,Some(RuntimePermissionProfileOverride::from_config(&app.config)));+ let mut tui = crate::tui::test_support::make_test_tui()?;+ loop {+ let event = events.try_recv().expect("queued permissions menu");+ if matches!(event, AppEvent::OpenPermissionsPopup) {+ // Neither the old picker's close nor its confirmation may release this prompt.+ assert!(app.chat_widget.has_queued_follow_up_messages());+ break;+ }+ app.handle_event(&mut tui, &mut server, event).await?;+ }server.shutdown().await?;Ok(())}diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rsindex 30e7cf8d7d..4b9d285d29 100644--- a/codex-rs/tui/src/chatwidget.rs+++ b/codex-rs/tui/src/chatwidget.rs@@ -544,6 +544,8 @@ pub(crate) struct ChatWidget {has_codex_backend_auth: bool,model_catalog: Arc<ModelCatalog>,model_popup_request_id: Option<uuid::Uuid>,+ /// An app event has been queued to open the permissions picker, but no view exists yet.+ pub(crate) permission_popup_pending: bool,permission_popup_request_id: Option<uuid::Uuid>,permission_discovery: Option<crate::permission_discovery::PermissionDiscovery>,inline_permission_profile_selection:@@ -1034,7 +1036,11 @@ impl ChatWidget {self.thread_id.is_some_and(|thread_id| thread_id.to_string() == request_thread_id)}) && self.interrupts.remove_resolved_prompt(request);+ let had_modal_or_popup = !self.bottom_pane.no_modal_or_popup_active();let removed_visible = self.bottom_pane.dismiss_app_server_request(request);+ if removed_visible && had_modal_or_popup && self.bottom_pane.no_modal_or_popup_active() {+ self.on_modal_or_popup_closed();+ }if removed_deferred || removed_visible {self.request_redraw();}diff --git a/codex-rs/tui/src/chatwidget/constructor.rs b/codex-rs/tui/src/chatwidget/constructor.rsindex 34ee1ec53d..8d4bbbd182 100644--- a/codex-rs/tui/src/chatwidget/constructor.rs+++ b/codex-rs/tui/src/chatwidget/constructor.rs@@ -128,6 +128,7 @@ impl ChatWidget {has_codex_backend_auth,model_catalog,model_popup_request_id: None,+ permission_popup_pending: false,permission_popup_request_id: None,permission_discovery: None,inline_permission_profile_selection: None,diff --git a/codex-rs/tui/src/chatwidget/permission_discovery.rs b/codex-rs/tui/src/chatwidget/permission_discovery.rsindex 343186d0af..9ad6179e17 100644--- a/codex-rs/tui/src/chatwidget/permission_discovery.rs+++ b/codex-rs/tui/src/chatwidget/permission_discovery.rs@@ -170,8 +170,10 @@ impl ChatWidget {pub(super) fn invalidate_permission_discovery(&mut self) {self.permission_popup_request_id = None;- self.bottom_pane.dismiss_view_by_id(VIEW_ID);- if self.recover_inline_permission_profile_selection() {+ let dismissed = self.bottom_pane.dismiss_view_by_id(VIEW_ID);+ if self.recover_inline_permission_profile_selection()+ || (dismissed && self.input_queue.suppress_queue_autosend)+ {self.app_event_tx.send(AppEvent::SettingsSelectionClosed);}}diff --git a/codex-rs/tui/src/chatwidget/session_flow.rs b/codex-rs/tui/src/chatwidget/session_flow.rsindex 15f6a354cd..ba33beb6e4 100644--- a/codex-rs/tui/src/chatwidget/session_flow.rs+++ b/codex-rs/tui/src/chatwidget/session_flow.rs@@ -93,8 +93,7 @@ impl ChatWidget {self.bottom_pane.set_queue_submissions(/*queue_submissions*/ false);if previous_thread_id != self.thread_id {- if (previous_thread_id.is_some()- || (self.remote_connection.is_some() && self.config.cwd != session.cwd))+ if (previous_thread_id.is_some() || self.config.cwd != session.cwd)&& self.status_account_display == Some(StatusAccountDisplay::ApiKey){self.refresh_account_scoped_models();diff --git a/codex-rs/tui/src/chatwidget/slash_dispatch.rs b/codex-rs/tui/src/chatwidget/slash_dispatch.rsindex fd56394f6b..e9ea6e42fe 100644--- a/codex-rs/tui/src/chatwidget/slash_dispatch.rs+++ b/codex-rs/tui/src/chatwidget/slash_dispatch.rs@@ -415,16 +415,10 @@ impl ChatWidget {self.app_event_tx.send(AppEvent::OpenAgentPicker);}SlashCommand::Permissions => {- if self.remote_connection.is_some()- || self.windows_sandbox_local_server- && self.windows_sandbox_host != WindowsSandboxHost::Remote- && self.windows_sandbox_config.requirements.is_none()- {- self.app_event_tx.send(AppEvent::OpenPermissionsPopup);- } else {- self.open_permissions_popup();- }- self.defer_input_until_settings_applied();+ // Hold queued prompts while the app checks whether it can open the menu.+ self.set_queue_autosend_suppressed(/*suppressed*/ true);+ self.permission_popup_pending = true;+ self.app_event_tx.send(AppEvent::OpenPermissionsPopup);}SlashCommand::Vim => {self.toggle_vim_mode_and_notify();diff --git a/codex-rs/tui/src/chatwidget/tests/history_replay.rs b/codex-rs/tui/src/chatwidget/tests/history_replay.rsindex e1b6cc0f22..8e1e0a525b 100644--- a/codex-rs/tui/src/chatwidget/tests/history_replay.rs+++ b/codex-rs/tui/src/chatwidget/tests/history_replay.rs@@ -44,7 +44,21 @@ async fn resumed_initial_messages_render_history() {rollout_path: Some(rollout_file.path().to_path_buf()),};+ // The first attachment can change project credentials even with an in-process server.+ chat.status_account_display = Some(StatusAccountDisplay::ApiKey);+ let mut model = crate::test_support::TEST_MODEL_PRESETS[0].clone();+ model.available_access_programs = Some(codex_protocol::openai_models::ModelAccessPrograms {+ cyber: vec![codex_protocol::turn_input::CyberAccessProgram::Standard],+ });+ chat.model_catalog = Arc::new(ModelCatalog::new(vec![model]));chat.handle_thread_session(configured.clone());+ assert!(+ chat.model_catalog+ .models+ .iter()+ .all(|model| model.available_access_programs.is_none()),+ "access from the launch directory must not carry over to the attached project"+ );assert!(!chat.daybreak_enabled);insta::assert_snapshot!(drain_insert_history(&mut rx).into_iter().flatten()diff --git a/codex-rs/tui/src/chatwidget/tests/permissions.rs b/codex-rs/tui/src/chatwidget/tests/permissions.rsindex edc6565840..ba06f624ed 100644--- a/codex-rs/tui/src/chatwidget/tests/permissions.rs+++ b/codex-rs/tui/src/chatwidget/tests/permissions.rs@@ -294,7 +294,7 @@ async fn inline_permission_discovery_retry_preserves_profile_id() {#[tokio::test]async fn permission_discovery_discards_stale_results_and_preserves_covering_modal() {- let (mut chat, _rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await;+ let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await;chat.config.explicit_permission_profile_mode = true;chat.open_permissions_popup();let first = chat.permission_popup_request_id.unwrap();@@ -302,6 +302,8 @@ async fn permission_discovery_discards_stale_results_and_preserves_covering_modachat.on_permission_profiles_loaded(first, Ok(Discovery::local(&chat.config)));assert!(!chat.bottom_pane.has_active_view());chat.permission_discovery = None;+ chat.dispatch_command(SlashCommand::Permissions);+ while rx.try_recv().is_ok() {}chat.open_permissions_popup();let second = chat.permission_popup_request_id.unwrap();chat.on_permission_profiles_loaded(first, Ok(Discovery::local(&chat.config)));@@ -312,19 +314,35 @@ async fn permission_discovery_discards_stale_results_and_preserves_covering_moda);chat.on_permission_profiles_loaded(second, Ok(Discovery::local(&chat.config)));assert!(!chat.bottom_pane.has_active_view());+ assert!(+ std::iter::from_fn(|| rx.try_recv().ok())+ .any(|event| matches!(event, AppEvent::SettingsSelectionClosed)),+ "an invalidated menu must settle the input hold"+ );chat.permission_discovery = None;chat.open_permissions_popup();let request_id = chat.permission_popup_request_id.unwrap();- chat.bottom_pane.show_selection_view(SelectionViewParams {- view_id: Some("other-modal"),- title: Some("Other modal".to_string()),- ..Default::default()+ chat.on_request_user_input(ToolRequestUserInputParams {+ thread_id: "thread-1".into(),+ turn_id: "turn-1".into(),+ item_id: "question".into(),+ questions: Vec::new(),+ is_blocking: true,+ auto_resolution_ms: None,});chat.on_permission_profiles_loaded(request_id, Ok(Discovery::local(&chat.config)));- assert_eq!(chat.bottom_pane.active_view_id(), Some("other-modal"));- chat.handle_key_event(KeyEvent::from(KeyCode::Esc));+ assert!(chat.bottom_pane.has_active_view());+ while rx.try_recv().is_ok() {}+ chat.dismiss_app_server_request(&ResolvedAppServerRequest::UserInput {+ call_id: "question".into(),+ });assert!(!chat.bottom_pane.has_active_view());+ assert!(+ std::iter::from_fn(|| rx.try_recv().ok())+ .any(|event| matches!(event, AppEvent::SettingsSelectionClosed)),+ "resolving the covering request must release the permissions hold"+ );}#[tokio::test]diff --git a/codex-rs/tui/src/chatwidget/tests/slash_commands.rs b/codex-rs/tui/src/chatwidget/tests/slash_commands.rsindex 38716fdeb9..900ad18062 100644--- a/codex-rs/tui/src/chatwidget/tests/slash_commands.rs+++ b/codex-rs/tui/src/chatwidget/tests/slash_commands.rs@@ -418,6 +418,15 @@ async fn assert_cancelled_queued_menu_drains_next_input(complete_turn_with_message(&mut chat, "turn-1", Some("done"));assert_eq!(chat.input_queue.queued_user_messages.len(), 1);+ if command.trim() == "/permissions" {+ assert!(+ std::iter::from_fn(|| rx.try_recv().ok())+ .any(|event| matches!(event, AppEvent::OpenPermissionsPopup)),+ "permission menu must go through the app"+ );+ assert_matches!(op_rx.try_recv(), Err(TryRecvError::Empty));+ chat.open_permissions_popup();+ }let popup = render_bottom_popup(&chat, /*width*/ 80);assert!(popup.contains(expected_popup_text),diff --git a/codex-rs/tui/src/named_session_lookup.rs b/codex-rs/tui/src/named_session_lookup.rsindex 0f1a1044e9..d594fc58dd 100644--- a/codex-rs/tui/src/named_session_lookup.rs+++ b/codex-rs/tui/src/named_session_lookup.rs@@ -119,12 +119,8 @@ pub(super) async fn lookup(else {return Err(err);};- if source.message == format!("thread not loaded: {thread_id}") {- if app_server.uses_embedded_app_server() {- continue;- }- thread.clone()- } else if (source.message.starts_with("failed to read thread: thread-store internal error: session metadata ")+ if source.message == format!("thread not loaded: {thread_id}")+ || (source.message.starts_with("failed to read thread: thread-store internal error: session metadata ")&& source.message.contains(" belongs to thread ")&& source.message.ends_with(&format!(", expected {thread_id}")))|| thread.path.as_ref().is_some_and(|path| {@@ -135,9 +131,8 @@ pub(super) async fn lookup(}){continue;- } else {- return Err(err);}+ return Err(err);}};if current.id != thread.id || display_label(¤t) != name {diff --git a/codex-rs/tui/src/named_session_lookup_tests.rs b/codex-rs/tui/src/named_session_lookup_tests.rsindex 6541b49a67..994256b8a8 100644--- a/codex-rs/tui/src/named_session_lookup_tests.rs+++ b/codex-rs/tui/src/named_session_lookup_tests.rs@@ -416,7 +416,7 @@ async fn skips_stale_listed_thread_before_valid_label() -> color_eyre::Result<()}#[tokio::test]-async fn uses_listed_thread_when_older_server_cannot_read_it() -> color_eyre::Result<()> {+async fn verifies_name_uniqueness_across_server_pages() -> color_eyre::Result<()> {let temp_dir = TempDir::new()?;let config = build_config(&temp_dir).await?;let runtime = state_runtime(&config).await?;@@ -464,6 +464,9 @@ async fn uses_listed_thread_when_older_server_cannot_read_it() -> color_eyre::Relet listener = tokio::net::TcpListener::bind("127.0.0.1:0").await?;let url = format!("ws://{}", listener.local_addr()?);let listed_for_server = listed.clone();+ let mut unreadable = listed.clone();+ let unreadable_id = ThreadId::new();+ unreadable.id = unreadable_id.to_string();let paginated = next_cursor.is_some();let server = tokio::spawn(async move {let (stream, _) = listener.accept().await.unwrap();@@ -479,7 +482,7 @@ async fn uses_listed_thread_when_older_server_cannot_read_it() -> color_eyre::Re.is_some_and(|params| params["cursor"].is_string());let response = match request.method.as_str() {"initialize" => {- json!({"id": request.id, "result": {"userAgent": "legacy-test"}})+ json!({"id": request.id, "result": {"userAgent": "lookup-test"}})}"thread/list" => {assert_eq!(@@ -493,25 +496,33 @@ async fn uses_listed_thread_when_older_server_cannot_read_it() -> color_eyre::Relet data = if last_page {Vec::new()} else {- vec![listed_for_server.clone()]+ vec![unreadable.clone(), listed_for_server.clone()]};let cursor = if last_page { None } else { next_cursor.clone() };json!({"id": request.id, "result": {"data": data, "nextCursor": cursor}})}- "thread/read" => json!({- "id": request.id,- "error": {+ "thread/read"+ if request.params.as_ref().unwrap()["threadId"] == unreadable.id =>+ {+ json!({"id": request.id, "error": {"code": -32603,- "message": format!("thread not loaded: {thread_id}")- }- }),+ "message": format!("thread not loaded: {unreadable_id}")+ }})+ }+ "thread/read" => {+ json!({"id": request.id, "result": {"thread": listed_for_server}})+ }other => panic!("unexpected request: {other}"),};socket.send(Message::Text(response.to_string().into())).await.unwrap();- if last_page || (!paginated && request.method == "thread/read") {+ if last_page+ || (!paginated+ && request.method == "thread/read"+ && request.params.as_ref().unwrap()["threadId"] == listed_for_server.id)+ {break;}}@@ -521,7 +532,7 @@ async fn uses_listed_thread_when_older_server_cannot_read_it() -> color_eyre::Rewebsocket_url: url,auth_token: None,},- client_name: "legacy-test".to_string(),+ client_name: "lookup-test".to_string(),client_version: "0.0.0".to_string(),experimental_api: true,mcp_server_openai_form_elicitation: false,