mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
Preserve TUI drafts after app-server disconnects (#41911)
## Why Losing an external app-server connection can leave a submission's outcome uncertain. The TUI must preserve local work without retrying it or allowing stale server events to trigger more actions. ## What changed - Enter an offline state when an external app-server transport disconnects during startup, event streaming, or submission. - Keep conversation drafts, queued input, expanded pastes, attachments, and agent-overview input editable while blocking submissions, remote actions, and automatic queue replay. - Show a connection-lost notice that directs users to copy their work and relaunch, while retaining `Ctrl-C` and an empty-composer `Ctrl-D` as quit shortcuts. - Cancel pending views and asynchronous work, and ignore stale completions after the disconnect. Embedded app-server behavior is unchanged. ## Testing Added unit, snapshot, and pseudo-terminal coverage for lost startup and mutation replies, offline draft editing, queued-input recovery, stale-event quarantine, agent-overview behavior, and end-to-end preservation without reconnection or resubmission. GitOrigin-RevId: 7219a95fad676dda447d625db9e465345b469d58
This commit is contained in:
@@ -143,6 +143,7 @@ impl ChatWidget {
|
||||
|| self.misalignment_policy_violation
|
||||
|| self.input_queue.suppress_queue_autosend
|
||||
|| self.input_queue.rate_limit_recovery_pending
|
||||
|| self.input_queue.recovered_queue
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -44,6 +44,7 @@ pub(super) struct InputQueueState {
|
||||
pub(super) suppress_queue_autosend: bool,
|
||||
/// Hold submissions while a usage failure or backend-directed model fallback is resolved.
|
||||
pub(super) rate_limit_recovery_pending: bool,
|
||||
pub(super) recovered_queue: bool,
|
||||
}
|
||||
|
||||
impl InputQueueState {
|
||||
@@ -52,6 +53,7 @@ impl InputQueueState {
|
||||
}
|
||||
|
||||
pub(super) fn clear(&mut self) {
|
||||
self.recovered_queue = false;
|
||||
self.queued_user_messages.clear();
|
||||
self.queued_user_message_history_records.clear();
|
||||
self.user_turn_pending_start = false;
|
||||
|
||||
@@ -179,6 +179,8 @@ impl ChatWidget {
|
||||
|
||||
pub(super) fn pop_latest_queued_composer_state(&mut self) -> Option<ThreadComposerState> {
|
||||
if let Some(user_message) = self.input_queue.queued_user_messages.pop_back() {
|
||||
self.input_queue.recovered_queue &= self.input_queue.has_queued_follow_up_messages()
|
||||
|| !self.input_queue.pending_steers.is_empty();
|
||||
let history_record = self
|
||||
.input_queue
|
||||
.queued_user_message_history_records
|
||||
@@ -195,6 +197,8 @@ impl ChatWidget {
|
||||
))
|
||||
} else {
|
||||
let user_message = self.input_queue.rejected_steers_queue.pop_back()?;
|
||||
self.input_queue.recovered_queue &= self.input_queue.has_queued_follow_up_messages()
|
||||
|| !self.input_queue.pending_steers.is_empty();
|
||||
let history_record = self
|
||||
.input_queue
|
||||
.rejected_steer_history_records
|
||||
@@ -467,6 +471,7 @@ impl ChatWidget {
|
||||
.input_queue
|
||||
.queued_user_message_history_records
|
||||
.clone(),
|
||||
recovered_queue: self.input_queue.recovered_queue,
|
||||
user_turn_pending_start: self.input_queue.user_turn_pending_start,
|
||||
submit_pending_steers_after_interrupt: self
|
||||
.input_queue
|
||||
@@ -487,6 +492,7 @@ impl ChatWidget {
|
||||
let restored_task_running =
|
||||
preserve_in_flight_turn && input_state.as_ref().is_some_and(|state| state.task_running);
|
||||
if let Some(input_state) = input_state {
|
||||
self.input_queue.recovered_queue = input_state.recovered_queue;
|
||||
self.current_collaboration_mode = input_state.current_collaboration_mode;
|
||||
self.active_collaboration_mask = input_state.active_collaboration_mask;
|
||||
self.safety_buffering_prompt = input_state.safety_buffering_prompt;
|
||||
@@ -559,6 +565,8 @@ impl ChatWidget {
|
||||
self.input_queue.clear();
|
||||
self.restore_composer_state(Default::default());
|
||||
}
|
||||
self.input_queue.recovered_queue &= self.input_queue.has_queued_follow_up_messages()
|
||||
|| !self.input_queue.pending_steers.is_empty();
|
||||
let effort = self.effective_reasoning_effort();
|
||||
self.bottom_pane
|
||||
.set_active_reasoning_effort_baseline(effort.as_ref());
|
||||
|
||||
@@ -245,6 +245,10 @@ impl ChatWidget {
|
||||
self.bottom_pane.selected_index_for_present_view(view_id)
|
||||
}
|
||||
|
||||
pub(crate) fn selected_index_for_active_view(&self, view_id: &'static str) -> Option<usize> {
|
||||
self.bottom_pane.selected_index_for_active_view(view_id)
|
||||
}
|
||||
|
||||
pub(crate) fn replace_selection_view_if_present(
|
||||
&mut self,
|
||||
view_id: &'static str,
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
//! Disconnects preserve editable input but never automatically retry queued submissions.
|
||||
|
||||
use super::*;
|
||||
|
||||
impl ChatWidget {
|
||||
pub(crate) fn pause_for_disconnect(&mut self) {
|
||||
self.input_queue.recovered_queue = true;
|
||||
self.input_queue.suppress_queue_autosend = true;
|
||||
self.set_initial_user_message_submit_suppressed(/*suppressed*/ true);
|
||||
if let Some(message) = self.initial_user_message.take() {
|
||||
self.restore_user_message_to_composer(message);
|
||||
}
|
||||
self.bottom_pane.ensure_status_indicator();
|
||||
self.bottom_pane
|
||||
.set_interrupt_hint_visible(/*visible*/ false);
|
||||
self.set_status_header("Connection lost — copy your draft, then relaunch".to_string());
|
||||
self.set_footer_hint_override(Some(vec![("ctrl+c".into(), "quit".into())]));
|
||||
self.add_error_message("Connection lost.".into());
|
||||
}
|
||||
|
||||
pub(crate) fn handle_disconnected_view_key(&mut self, key: KeyEvent) {
|
||||
self.bottom_pane.handle_key_event(key);
|
||||
}
|
||||
|
||||
pub(crate) fn handle_disconnected_key(&mut self, key: KeyEvent) {
|
||||
if key.kind == KeyEventKind::Press && self.chat_keymap.edit_queued_message.is_pressed(key) {
|
||||
if let Some(composer) = self.pop_latest_queued_composer_state() {
|
||||
self.restore_composer_state(composer);
|
||||
} else if let Some(steer) = self.input_queue.pending_steers.pop_back() {
|
||||
self.restore_user_message_to_composer(user_message_for_restore(
|
||||
steer.user_message,
|
||||
&steer.history_record,
|
||||
));
|
||||
self.input_queue.recovered_queue &= !self.input_queue.pending_steers.is_empty();
|
||||
}
|
||||
self.bottom_pane
|
||||
.handle_disconnected_key(KeyEvent::new(KeyCode::Null, KeyModifiers::NONE));
|
||||
self.refresh_pending_input_preview();
|
||||
self.request_redraw();
|
||||
} else {
|
||||
self.bottom_pane.handle_disconnected_key(key);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -304,6 +304,17 @@ async fn parent_owned_thread_blocks_settings_shortcuts() {
|
||||
assert_chatwidget_snapshot!("parent_owned_thread_rejects_settings_shortcuts", rendered);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn disconnect_restores_initial_prompt_without_submitting_it() {
|
||||
let (mut chat, _events, mut ops) = make_chatwidget_manual(/*model_override*/ None).await;
|
||||
chat.initial_user_message = Some("CLI prompt".into());
|
||||
chat.restore_user_message_to_composer("typed draft".into());
|
||||
chat.pause_for_disconnect();
|
||||
chat.submit_initial_user_message_if_pending();
|
||||
assert_eq!(chat.composer_text_with_pending(), "CLI prompt\ntyped draft");
|
||||
assert_no_submit_op(&mut ops);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn parent_owned_thread_restores_pending_initial_prompt() {
|
||||
let (mut chat, _rx, mut op_rx) = make_chatwidget_manual(/*model_override*/ Some("gpt-5")).await;
|
||||
@@ -1757,6 +1768,7 @@ async fn restore_thread_input_state_applies_running_state_policy() {
|
||||
rejected_steer_history_records: VecDeque::new(),
|
||||
queued_user_messages: VecDeque::from([UserMessage::from("already queued").into()]),
|
||||
queued_user_message_history_records: VecDeque::from([queued_history.clone()]),
|
||||
recovered_queue: false,
|
||||
user_turn_pending_start: true,
|
||||
submit_pending_steers_after_interrupt: true,
|
||||
current_collaboration_mode: chat.current_collaboration_mode.clone(),
|
||||
@@ -1790,6 +1802,21 @@ async fn restore_thread_input_state_applies_running_state_policy() {
|
||||
Some(UserMessage::from("buffered prompt"))
|
||||
);
|
||||
|
||||
chat.pause_for_disconnect();
|
||||
chat.handle_disconnected_key(KeyEvent::new(KeyCode::Up, KeyModifiers::ALT));
|
||||
assert!(!chat.has_queued_follow_up_messages());
|
||||
// Editing the last queued draft must not release the uncertain steer for replay.
|
||||
assert!(chat.capture_thread_input_state().unwrap().recovered_queue);
|
||||
chat.handle_disconnected_key(KeyEvent::new(KeyCode::Up, KeyModifiers::ALT));
|
||||
assert_eq!(
|
||||
chat.composer_text_with_pending(),
|
||||
"submitted history\nqueued history"
|
||||
);
|
||||
assert!(chat.input_queue.pending_steers.is_empty());
|
||||
assert!(!chat.capture_thread_input_state().unwrap().recovered_queue);
|
||||
assert_no_submit_op(&mut op_rx);
|
||||
chat.set_queue_autosend_suppressed(/*suppressed*/ false);
|
||||
|
||||
chat.restore_thread_input_state(
|
||||
Some(input_state),
|
||||
ThreadInputStateRestoreMode {
|
||||
|
||||
@@ -384,6 +384,7 @@ async fn restore_thread_input_state_restores_pending_steers_without_downgrading_
|
||||
rejected_steer_history_records: VecDeque::new(),
|
||||
queued_user_messages,
|
||||
queued_user_message_history_records: VecDeque::new(),
|
||||
recovered_queue: false,
|
||||
user_turn_pending_start: false,
|
||||
submit_pending_steers_after_interrupt: false,
|
||||
current_collaboration_mode: chat.current_collaboration_mode.clone(),
|
||||
|
||||
@@ -131,6 +131,7 @@ pub(crate) struct ThreadInputState {
|
||||
pub(super) rejected_steer_history_records: VecDeque<UserMessageHistoryRecord>,
|
||||
pub(super) queued_user_messages: VecDeque<QueuedUserMessage>,
|
||||
pub(super) queued_user_message_history_records: VecDeque<UserMessageHistoryRecord>,
|
||||
pub(crate) recovered_queue: bool,
|
||||
pub(super) user_turn_pending_start: bool,
|
||||
pub(super) submit_pending_steers_after_interrupt: bool,
|
||||
pub(super) current_collaboration_mode: CollaborationMode,
|
||||
|
||||
Reference in New Issue
Block a user