Lightweight coding agent that runs in your terminal
Rust
Preserve blank TUI sessions when switching tasks (#48628)
Eric Traut8f195c93d7e7
diff --git a/codex-rs/tui/src/app/agents_overview.rs b/codex-rs/tui/src/app/agents_overview.rsindex a4516cef25..9b18f3d494 100644--- a/codex-rs/tui/src/app/agents_overview.rs+++ b/codex-rs/tui/src/app/agents_overview.rs@@ -381,6 +381,7 @@ impl App {if startup_draft.is_none() {loading::draw(tui)?;}+ let mut restored_blank_session = false;if self.primary_thread_id != Some(root_thread_id) {let previous_displayed_thread_id = self.current_displayed_thread_id();if let Some(id) = previous_displayed_thread_id@@ -560,7 +561,10 @@ impl App {{// An untouched task has no rollout for thread/resume yet. Its live// subscription and saved settings are sufficient to restore the editor.- (blank.clone(), false)+ restored_blank_session = true;+ let mut blank = blank.clone();+ blank.session.thread_name.clone_from(&target_thread.name);+ (blank, false)} else {match app_server.resume_thread(@@ -778,8 +782,12 @@ impl App {.await;}if self.current_displayed_thread_id() == Some(root_thread_id)- && let Some(input_state) = self.agents_overview.input_states.remove(&root_thread_id)+ && let Some(mut input_state) = self.agents_overview.input_states.remove(&root_thread_id){+ // A saved draft includes model settings, so apply newer server settings after it.+ let pending_settings = restored_blank_session+ .then(|| input_state.pending_thread_settings.take())+ .flatten();let preserve_in_flight_turn = !read_only&& self.active_turn_id_for_thread(root_thread_id)@@ -791,6 +799,9 @@ impl App {preserve_in_flight_turn,},);+ if let Some(settings) = pending_settings {+ self.chat_widget.on_thread_settings_updated(settings);+ }if !preserve_in_flight_turn {self.chat_widget.maybe_send_next_queued_input();}diff --git a/codex-rs/tui/src/app/app_server_events.rs b/codex-rs/tui/src/app/app_server_events.rsindex cf6e42e3d4..5fb53fdc8c 100644--- a/codex-rs/tui/src/app/app_server_events.rs+++ b/codex-rs/tui/src/app/app_server_events.rs@@ -220,6 +220,18 @@ impl App {.or_default();}self.track_agents_overview_notification(¬ification);+ // Retained blank sessions stay subscribed after their event channels are cleared.+ if let ServerNotification::ThreadSettingsUpdated(settings) = ¬ification+ && let Ok(thread_id) = ThreadId::from_string(&settings.thread_id)+ && self.agents_overview.blank_sessions.contains_key(&thread_id)+ && !self.thread_event_channels.contains_key(&thread_id)+ {+ self.apply_thread_settings_to_cached_session(thread_id, &settings.thread_settings)+ .await;+ if let Some(input) = self.agents_overview.input_states.get_mut(&thread_id) {+ input.pending_thread_settings = Some(settings.clone());+ }+ }if matches!(¬ification,ServerNotification::ThreadStarted(_)diff --git a/codex-rs/tui/src/app/session_lifecycle.rs b/codex-rs/tui/src/app/session_lifecycle.rsindex 75f70aa48e..6e73c002e4 100644--- a/codex-rs/tui/src/app/session_lifecycle.rs+++ b/codex-rs/tui/src/app/session_lifecycle.rs@@ -895,6 +895,22 @@ impl App {if started.blocks_direct_input {self.mark_primary_thread_parent_owned(thread_id);}+ // Lifecycle notifications may arrive before the thread/start response.+ if !self.config.ephemeral+ && !matches!(self.app_server_target, AppServerTarget::Embedded)+ && !self.pending_primary_events.iter().any(|event| {+ matches!(event, ThreadBufferedEvent::Notification(notification)+ if matches!(notification.as_ref(),+ ServerNotification::TurnStarted(_)+ | ServerNotification::ThreadClosed(_)+ | ServerNotification::ThreadArchived(_)+ | ServerNotification::ThreadDeleted(_)))+ })+ {+ self.agents_overview+ .blank_sessions+ .insert(thread_id, started.clone());+ }// A full usage read can finish before thread/start. Apply its cached fallback// after attachment but before the initial prompt or queued draft is submitted.let recovery_was_pending = self.chat_widget.hold_rate_limit_recovery();@@ -975,6 +991,18 @@ impl App {.await{Ok(mut started) => {+ if let Some(thread_id) = self.current_displayed_thread_id()+ && let Some(blank) = self.agents_overview.blank_sessions.get_mut(&thread_id)+ {+ if let Some(channel) = self.thread_event_channels.get(&thread_id)+ && let Some(session) = channel.store.lock().await.session.as_ref()+ {+ blank.session = session.clone();+ }+ if let Some(input) = self.chat_widget.capture_thread_input_state() {+ self.agents_overview.input_states.insert(thread_id, input);+ }+ }self.detach_current_thread_for_navigation(app_server,Some(started.session.thread_id),@@ -998,6 +1026,14 @@ impl App {} else {None};+ let thread_id = started.session.thread_id;+ if !self.config.ephemeral+ && !matches!(self.app_server_target, AppServerTarget::Embedded)+ {+ self.agents_overview+ .blank_sessions+ .insert(thread_id, started.clone());+ }if let Err(err) = self.replace_chat_widget_with_app_server_thread(tui,@@ -1007,6 +1043,7 @@ impl App {).await{+ self.agents_overview.blank_sessions.remove(&thread_id);self.chat_widget.add_error_message(format!("Failed to attach to fresh app-server thread: {err}"));diff --git a/codex-rs/tui/src/app/tests/background_task_defaults_tests.rs b/codex-rs/tui/src/app/tests/background_task_defaults_tests.rsindex 2a17d7aeec..cbb1932c5d 100644--- a/codex-rs/tui/src/app/tests/background_task_defaults_tests.rs+++ b/codex-rs/tui/src/app/tests/background_task_defaults_tests.rs@@ -809,16 +809,51 @@ async fn command_center_new_restores_blank_drafts_and_builtin_permissions() -> R.await?;let mut tui = make_test_tui()?;tui.pause_events();+ let started = server.start_thread(&app.config).await?;+ let startup = started.session.thread_id;+ app.pending_startup_thread_start = true;+ app.handle_startup_thread_started(&mut server, Ok(started))+ .await?;app.new_agents_overview_session(&mut tui, &mut server, /*cwd*/ None).await?;+ app.select_agents_overview_thread(&mut tui, &mut server, startup)+ .await?;+ assert_eq!(app.chat_widget.thread_id(), Some(startup));+ app.chat_widget.set_model("gpt-local-choice");+ app.start_fresh_session_with_summary_hint(+ &mut tui,+ &mut server,+ /*session_start_source*/ None,+ /*initial_user_message*/ None,+ /*new_thread_name*/ None,+ )+ .await;let first = app.chat_widget.thread_id().unwrap();+ server+ .thread_set_name(first, "Blank session".into())+ .await?;app.chat_widget.insert_str("Keep this unsent draft");app.new_agents_overview_session(&mut tui, &mut server, /*cwd*/ None).await?;let other = app.chat_widget.thread_id().unwrap();+ app.select_agents_overview_thread(&mut tui, &mut server, startup)+ .await?;+ assert_eq!(app.chat_widget.current_model(), "gpt-local-choice");app.select_agents_overview_thread(&mut tui, &mut server, first).await?;assert_eq!(app.chat_widget.thread_id(), Some(first));+ assert_eq!(+ app.chat_widget.thread_name().as_deref(),+ Some("Blank session")+ );+ assert!(recorded_params(&requests, "thread/resume").is_empty());+ assert!(+ recorded_params(&requests, "thread/unsubscribe")+ .iter()+ .all(|params| {+ params["threadId"] != startup.to_string() && params["threadId"] != first.to_string()+ })+ );assert_eq!(app.chat_widget.composer_text_with_pending(),"Keep this unsent draft"@@ -897,6 +932,57 @@ async fn command_center_new_restores_blank_drafts_and_builtin_permissions() -> R"Keep this unsent draft");assert!(recorded_params(&requests, "turn/start").is_empty());+ app.select_agents_overview_thread(&mut tui, &mut server, startup)+ .await?;+ app.chat_widget.insert_str("Background draft");+ app.select_agents_overview_thread(&mut tui, &mut server, first)+ .await?;+ assert!(+ server+ .thread_settings_update(codex_app_server_protocol::ThreadSettingsUpdateParams {+ thread_id: startup.to_string(),+ approval_policy: Some(AskForApproval::OnRequest),+ approvals_reviewer: Some(codex_app_server_protocol::ApprovalsReviewer::User),+ permissions: Some(":read-only".into()),+ model: Some("gpt-5.5".into()),+ ..Default::default()+ })+ .await?+ );+ let settings = next_thread_settings_updated(&mut server, startup).await;+ app.handle_app_server_event(+ &server,+ codex_app_server_client::AppServerEvent::ServerNotification(Box::new(+ ServerNotification::ThreadSettingsUpdated(settings),+ )),+ )+ .await;+ app.select_agents_overview_thread(&mut tui, &mut server, startup)+ .await?;+ assert_eq!(+ app.chat_widget.composer_text_with_pending(),+ "Background draft"+ );+ assert_eq!(app.chat_widget.current_model(), "gpt-5.5");+ let op = app+ .chat_widget+ .submit_user_message_as_plain_user_turn(crate::chatwidget::UserMessage::from("Hello"))+ .expect("submit the first turn");+ app.submit_thread_op(&mut server, startup, op).await?;+ let turns = recorded_params(&requests, "turn/start");+ let params = turns.last().expect("turn/start was sent");+ assert_eq!(+ (+ ¶ms["permissions"],+ ¶ms["approvalPolicy"],+ ¶ms["model"]+ ),+ (+ &serde_json::json!(":read-only"),+ &serde_json::json!("on-request"),+ &serde_json::json!("gpt-5.5")+ )+ );server.shutdown().await?;proxy.await??;Ok(())diff --git a/codex-rs/tui/src/chatwidget/input_restore.rs b/codex-rs/tui/src/chatwidget/input_restore.rsindex 114118f711..565a56d950 100644--- a/codex-rs/tui/src/chatwidget/input_restore.rs+++ b/codex-rs/tui/src/chatwidget/input_restore.rs@@ -562,6 +562,7 @@ impl ChatWidget {.questions.as_deref_mut().map(crate::bottom_pane::AsyncQuestions::capture),+ pending_thread_settings: None,composer: composer.has_content().then_some(composer),safety_buffering_prompt: self.safety_buffering_prompt.clone(),safety_buffering_source: self.safety_buffering_source,diff --git a/codex-rs/tui/src/chatwidget/tests/composer_submission.rs b/codex-rs/tui/src/chatwidget/tests/composer_submission.rsindex a5c107a4de..9c70a5593d 100644--- a/codex-rs/tui/src/chatwidget/tests/composer_submission.rs+++ b/codex-rs/tui/src/chatwidget/tests/composer_submission.rs@@ -1809,6 +1809,7 @@ async fn restore_thread_input_state_applies_running_state_policy() {});let input_state = ThreadInputState {questions: None,+ pending_thread_settings: None,composer: Some(ThreadComposerState {text: "composer draft".to_string(),..Default::default()diff --git a/codex-rs/tui/src/chatwidget/tests/review_mode.rs b/codex-rs/tui/src/chatwidget/tests/review_mode.rsindex 2806de703f..3410dabed2 100644--- a/codex-rs/tui/src/chatwidget/tests/review_mode.rs+++ b/codex-rs/tui/src/chatwidget/tests/review_mode.rs@@ -378,6 +378,7 @@ async fn restore_thread_input_state_restores_pending_steers_without_downgrading_chat.restore_thread_input_state(Some(ThreadInputState {+ pending_thread_settings: None,questions: None,composer: None,safety_buffering_prompt: None,diff --git a/codex-rs/tui/src/chatwidget/user_messages.rs b/codex-rs/tui/src/chatwidget/user_messages.rsindex 533e0eaf02..84756b682f 100644--- a/codex-rs/tui/src/chatwidget/user_messages.rs+++ b/codex-rs/tui/src/chatwidget/user_messages.rs@@ -133,6 +133,8 @@ impl ThreadComposerState {#[derive(Debug, Clone, PartialEq)]pub(crate) struct ThreadInputState {pub(crate) questions: Option<crate::bottom_pane::QuestionState>,+ pub(crate) pending_thread_settings:+ Option<codex_app_server_protocol::ThreadSettingsUpdatedNotification>,pub(super) composer: Option<ThreadComposerState>,pub(super) safety_buffering_prompt: Option<UserMessage>,pub(super) safety_buffering_source: UserMessageSource,