Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Fix Escape navigation in read-only agent sessions (#47320)

Eric Traut2c087a0cc2ef
diff --git a/codex-rs/tui/src/app.rs b/codex-rs/tui/src/app.rs
index eba13d510d..3f1a31e041 100644
--- a/codex-rs/tui/src/app.rs
+++ b/codex-rs/tui/src/app.rs
@@ -970,7 +970,13 @@ impl App {
&& self.chat_widget.no_modal_or_popup_active()
&& self.keymap.app.open_warnings.is_pressed(*key))
{
- if self.reconnect.presentation == reconnect::ReconnectPresentation::Overview {
+ if self.overlay.is_none()
+ && self.chat_widget.no_modal_or_popup_active()
+ && self.chat_widget.is_external_writer_view()
+ && crate::key_hint::plain(KeyCode::Esc).is_press(*key)
+ {
+ self.open_agents_overview(app_server);
+ } else if self.reconnect.presentation == reconnect::ReconnectPresentation::Overview {
self.chat_widget.handle_disconnected_view_key(*key);
if self
.chat_widget
diff --git a/codex-rs/tui/src/app/agents_overview.rs b/codex-rs/tui/src/app/agents_overview.rs
index 1d0b713a34..a36b7c3d2a 100644
--- a/codex-rs/tui/src/app/agents_overview.rs
+++ b/codex-rs/tui/src/app/agents_overview.rs
@@ -130,7 +130,22 @@ impl App {
let view = self.agents_overview_view(threads, /*selected_thread_id*/ None);
self.agents_overview.visible_thread_ids = view.thread_ids();
self.chat_widget.show_bottom_pane_view(Box::new(view));
- self.refresh_agents_overview_threads(app_server);
+ if self.reconnect.offline {
+ self.reconnect.presentation = reconnect::ReconnectPresentation::Overview;
+ let mut state = self
+ .agents_overview
+ .view_state
+ .lock()
+ .unwrap_or_else(std::sync::PoisonError::into_inner);
+ state.loading = false;
+ state.connection_notice = Some(if self.reconnect.failed {
+ "Reconnect failed — agent list is stale; relaunch to retry"
+ } else {
+ "Reconnecting — agent list is stale"
+ });
+ } else {
+ self.refresh_agents_overview_threads(app_server);
+ }
}
pub(super) fn apply_agents_overview_thread_refresh(
diff --git a/codex-rs/tui/src/app/input.rs b/codex-rs/tui/src/app/input.rs
index 8116c1c446..8cc78733dc 100644
--- a/codex-rs/tui/src/app/input.rs
+++ b/codex-rs/tui/src/app/input.rs
@@ -714,7 +714,8 @@ impl App {
}
pub(crate) fn should_handle_backtrack_esc(&self, key_event: KeyEvent) -> bool {
- !self.chat_widget.side_conversation_active()
+ !self.chat_widget.is_external_writer_view()
+ && !self.chat_widget.side_conversation_active()
&& !self.chat_widget.shortcut_overlay_visible()
&& self.chat_widget.is_normal_backtrack_mode()
&& self.chat_widget.composer_is_empty()
diff --git a/codex-rs/tui/src/app/owned_transcript.rs b/codex-rs/tui/src/app/owned_transcript.rs
index e9ede1a999..515310a309 100644
--- a/codex-rs/tui/src/app/owned_transcript.rs
+++ b/codex-rs/tui/src/app/owned_transcript.rs
@@ -292,6 +292,15 @@ impl App {
{
self.chat_widget.end_composer_drag();
}
+ // Read-only Escape belongs to session navigation, even when the transcript is scrolled.
+ // Search and selection still consume Escape first to dismiss their interaction.
+ if let TuiEvent::Key(key) = event
+ && !self.transcript_view.has_active_interaction()
+ && self.chat_widget.is_external_writer_view()
+ && crate::key_hint::plain(KeyCode::Esc).is_press(*key)
+ {
+ return Ok(false);
+ }
// Visible shortcut help owns Escape before returning a paused viewport to latest.
// A transcript search or selection still owns Escape while it replaces the help footer.
if let TuiEvent::Key(key) = event
diff --git a/codex-rs/tui/src/app/owned_transcript_tests.rs b/codex-rs/tui/src/app/owned_transcript_tests.rs
index 26b304e377..9387338e66 100644
--- a/codex-rs/tui/src/app/owned_transcript_tests.rs
+++ b/codex-rs/tui/src/app/owned_transcript_tests.rs
@@ -73,6 +73,81 @@ pub(super) fn buffer_text(buffer: &Buffer) -> String {
.join("\n")
}
+#[tokio::test]
+async fn external_writer_escape_returns_to_command_center_without_editing() -> Result<()> {
+ for (detailed, scrolled, offline) in [
+ (false, false, false),
+ (false, true, false),
+ (true, false, false),
+ (false, false, true),
+ ] {
+ let mut app = crate::app::test_support::make_test_app().await;
+ attach_thread(&mut app, ThreadId::new());
+ app.transcript_cells = vec![user_cell("First prompt"), user_cell("Second prompt")];
+ app.app_server_target = AppServerTarget::Remote {
+ endpoint: crate::resolve_remote_addr("ws://127.0.0.1:4500")?,
+ };
+ app.chat_widget.show_external_writer_thread();
+ if offline {
+ assert!(app.begin_reconnect());
+ }
+ let mut app_server =
+ Box::pin(crate::start_embedded_app_server_for_picker(&app.config)).await?;
+ let mut tui = crate::tui::test_support::make_test_tui()?;
+ tui.set_owned_screen(/*owned*/ true)?;
+ if detailed {
+ app.open_transcript_overlay(&mut tui);
+ }
+ if scrolled {
+ app.transcript_view
+ .jump_to_entry(&app.transcript_cells, /*index*/ 0);
+ }
+
+ app.handle_tui_event(
+ &mut tui,
+ &mut app_server,
+ TuiEvent::Key(KeyCode::Esc.into()),
+ )
+ .await?;
+
+ assert!(app.chat_widget.has_active_view());
+ assert_eq!(
+ (
+ app.backtrack.primed,
+ app.backtrack.overlay_preview_active,
+ app.chat_widget.composer_text_with_pending(),
+ ),
+ (false, false, String::new()),
+ );
+ if offline {
+ assert!(app.agents_overview.request_id.is_none());
+ assert!(app.reconnect.presentation == reconnect::ReconnectPresentation::Overview);
+ insta::assert_snapshot!(
+ "external_writer_escape_offline_command_center",
+ crate::chatwidget::tests::helpers::normalize_agent_center_snapshot(
+ crate::chatwidget::tests::helpers::render_bottom_popup(
+ &app.chat_widget,
+ /*width*/ 96,
+ )
+ )
+ );
+ } else if !detailed && !scrolled {
+ insta::assert_snapshot!(
+ "external_writer_escape_command_center",
+ crate::chatwidget::tests::helpers::normalize_agent_center_snapshot(
+ crate::chatwidget::tests::helpers::render_bottom_popup(
+ &app.chat_widget,
+ /*width*/ 96,
+ )
+ )
+ );
+ }
+ tui.set_owned_screen(/*owned*/ false)?;
+ app_server.shutdown().await?;
+ }
+ Ok(())
+}
+
#[tokio::test]
async fn list_spacing_completion_preserves_the_scrolled_reader() -> Result<()> {
let mut app = crate::app::test_support::make_test_app().await;
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__owned_transcript__tests__external_writer_escape_command_center.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__owned_transcript__tests__external_writer_escape_command_center.snap
new file mode 100644
index 0000000000..5d53e4c526
--- /dev/null
+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__owned_transcript__tests__external_writer_escape_command_center.snap
@@ -0,0 +1,28 @@
+---
+source: tui/src/app/owned_transcript_tests.rs
+expression: "crate::chatwidget::tests::helpers::normalize_agent_center_snapshot(crate::chatwidget::tests::helpers::render_bottom_popup(&app.chat_widget,\n96,))"
+---
+ Agent command center Group: Project g
+ All 0 Needs you 0 Working 0 Ready 0 Inactive 0 tab/shift+tab filter
+ ────────────────────────────────────────────────────────────────────────────────────────────
+ Loading tasks… │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ ? help esc back ↑/↓ move enter open n new
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__owned_transcript__tests__external_writer_escape_offline_command_center.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__owned_transcript__tests__external_writer_escape_offline_command_center.snap
new file mode 100644
index 0000000000..dd363be954
--- /dev/null
+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__owned_transcript__tests__external_writer_escape_offline_command_center.snap
@@ -0,0 +1,28 @@
+---
+source: tui/src/app/owned_transcript_tests.rs
+expression: "crate::chatwidget::tests::helpers::normalize_agent_center_snapshot(crate::chatwidget::tests::helpers::render_bottom_popup(&app.chat_widget,\n96,))"
+---
+ Agent command center Group: Project g
+ All 0 Needs you 0 Working 0 Ready 0 Inactive 0 tab/shift+tab filter
+ ────────────────────────────────────────────────────────────────────────────────────────────
+ Reconnecting… │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ │
+ Reconnecting — agent list is stale
diff --git a/codex-rs/tui/src/app/tests/background_exit_tests.rs b/codex-rs/tui/src/app/tests/background_exit_tests.rs
index 706e2c0057..c18dc1194d 100644
--- a/codex-rs/tui/src/app/tests/background_exit_tests.rs
+++ b/codex-rs/tui/src/app/tests/background_exit_tests.rs
@@ -56,6 +56,13 @@ async fn external_writer_view_preserves_draft_from_keys_and_paste() -> Result<()
},
};
app.ensure_thread_channel(thread_id).mark_external_writer();
+ app.transcript_cells
+ .push(Arc::new(history_cell::new_user_prompt(
+ "Existing prompt".to_string(),
+ Vec::new(),
+ Vec::new(),
+ Vec::new(),
+ )));
app.chat_widget.insert_str("Retained draft");
app.chat_widget.show_external_writer_thread();
let mut app_server = crate::start_embedded_app_server_for_picker(&app.config).await?;
@@ -85,6 +92,21 @@ async fn external_writer_view_preserves_draft_from_keys_and_paste() -> Result<()
)
.await?;
assert!(app.overlay.is_some());
+ app.handle_tui_event(
+ &mut tui,
+ &mut app_server,
+ TuiEvent::Key(KeyCode::Esc.into()),
+ )
+ .await?;
+ assert!(app.overlay.is_none());
+ assert_eq!(
+ (
+ app.backtrack.primed,
+ app.backtrack.overlay_preview_active,
+ app.chat_widget.composer_text_with_pending(),
+ ),
+ (false, false, "Retained draft".to_string()),
+ );
Ok(())
}
diff --git a/codex-rs/tui/src/app_backtrack/legacy_input.rs b/codex-rs/tui/src/app_backtrack/legacy_input.rs
index dcd567de7d..00ad989f76 100644
--- a/codex-rs/tui/src/app_backtrack/legacy_input.rs
+++ b/codex-rs/tui/src/app_backtrack/legacy_input.rs
@@ -95,7 +95,13 @@ impl App {
code: KeyCode::Esc,
kind: KeyEventKind::Press,
..
- }) => self.begin_overlay_backtrack_preview(tui),
+ }) => {
+ if self.chat_widget.is_external_writer_view() {
+ self.close_transcript_overlay(tui);
+ } else {
+ self.begin_overlay_backtrack_preview(tui);
+ }
+ }
event => self.overlay_forward_event(tui, event)?,
}
}