Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Refine the agent command center layout and metadata editing (#46838)

Eric Traut569888ac65e1
diff --git a/codex-rs/tui/src/app/agent_center/render.rs b/codex-rs/tui/src/app/agent_center/render.rs
index 8a5721bd28..79a606f122 100644
--- a/codex-rs/tui/src/app/agent_center/render.rs
+++ b/codex-rs/tui/src/app/agent_center/render.rs
@@ -1,7 +1,8 @@
-//! Clipped rectangles and text shared by task rows and the dashboard layout.
+//! Task rows, metadata editing and read-only details share a wide/narrow layout.
use super::*;
use crate::line_truncation::truncate_line_with_ellipsis_if_overflow;
+use unicode_segmentation::UnicodeSegmentation;
pub(super) fn row(area: Rect, offset: u16, height: u16) -> Rect {
let offset = offset.min(area.height);
@@ -19,3 +20,205 @@ pub(super) fn line(text: impl Into<Line<'static>>, area: Rect, buf: &mut Buffer)
.render(row(area, /*offset*/ 0, /*height*/ 1), buf);
}
}
+
+fn visible_suffix(input: &str, available: usize) -> &str {
+ let mut start = input.len();
+ let mut visible_width = 0;
+ for (offset, grapheme) in input.grapheme_indices(/*is_extended*/ true).rev() {
+ let width = grapheme.width();
+ if visible_width + width > available {
+ break;
+ }
+ visible_width += width;
+ start = offset;
+ }
+ &input[start..]
+}
+
+struct CenterLayout {
+ header: Rect,
+ list: Rect,
+ gap: Rect,
+ details: Rect,
+ search: Rect,
+ footer: Rect,
+}
+
+impl AgentsOverviewView {
+ fn center_layout(&self, area: Rect) -> CenterLayout {
+ let footer_height = (self.footer_lines(area.width.saturating_sub(4)).len() as u16)
+ .min(area.height.saturating_sub(4));
+ let state = self.state();
+ let header_height = if area.height >= 6 { 3 } else { 0 };
+ let footer = row(area, area.height - footer_height, footer_height);
+ let header = row(area, /*offset*/ 0, header_height);
+ let body = row(area, header_height, footer.y - header.bottom())
+ .inner(Margin::new(/*horizontal*/ 2, /*vertical*/ 0));
+ let [list, gap, details] = if body.width >= 90 {
+ Layout::horizontal([
+ Constraint::Min(46),
+ Constraint::Length(3),
+ Constraint::Length(38),
+ ])
+ .areas(body)
+ } else {
+ [body, Rect::default(), Rect::default()]
+ };
+ let search = row(
+ list,
+ /*offset*/ 0,
+ u16::from(list.height >= 3 || state.editing_metadata()),
+ );
+ let list = row(
+ list,
+ search.height,
+ list.height.saturating_sub(search.height),
+ );
+ CenterLayout {
+ header,
+ list,
+ gap,
+ details,
+ search,
+ footer,
+ }
+ }
+}
+
+impl Renderable for AgentsOverviewView {
+ fn desired_height(&self, _width: u16) -> u16 {
+ 24
+ }
+
+ fn cursor_pos(&self, area: Rect) -> Option<(u16, u16)> {
+ let layout = self.center_layout(area);
+ let state = self.state();
+ if state.editing_metadata() && !layout.search.is_empty() {
+ let input = if state.renaming {
+ &state.input
+ } else {
+ &state.search
+ };
+ let prefix = if state.renaming {
+ "Rename › "
+ } else {
+ "Search › "
+ };
+ let available = usize::from(layout.search.width).saturating_sub(prefix.width() + 1);
+ return Some((
+ layout.search.x
+ + (prefix.width() + visible_suffix(input, available).width())
+ .min(usize::from(layout.search.width.saturating_sub(/*rhs*/ 1)))
+ as u16,
+ layout.search.y,
+ ));
+ }
+ None
+ }
+
+ fn render(&self, area: Rect, buf: &mut Buffer) {
+ Clear.render(area, buf);
+ let layout = self.center_layout(area);
+ let inset =
+ |area: Rect| area.inner(Margin::new(/*horizontal*/ 2, /*vertical*/ 0));
+ let footer_lines = self.footer_lines(area.width.saturating_sub(4));
+ let search_key = self
+ .agents_keymap
+ .primary_hint("search", &self.agents_keymap.search)
+ .map(ShortcutHint::display_label)
+ .unwrap_or_default();
+ let state = self.state();
+ let grouping = match state.grouping {
+ AgentsOverviewGrouping::Project => "Project",
+ AgentsOverviewGrouping::Status => "Status",
+ AgentsOverviewGrouping::Model => "Model",
+ };
+ let group_key = self
+ .agents_keymap
+ .primary_hint("toggle_grouping", &self.agents_keymap.toggle_grouping)
+ .map(ShortcutHint::display_label)
+ .unwrap_or_default();
+ line(
+ vec![
+ "Agent command center".bold(),
+ format!(" Group: {grouping} {group_key}").dim(),
+ ],
+ inset(layout.header),
+ buf,
+ );
+ let (needs_you, working, ready) = self.rows.iter().fold((0, 0, 0), |counts, row| {
+ let (needs_you, working, ready) = counts;
+ match row.group {
+ AgentsOverviewGroup::NeedsYou => (needs_you + 1, working, ready),
+ AgentsOverviewGroup::Working => (needs_you, working + 1, ready),
+ AgentsOverviewGroup::Ready => (needs_you, working, ready + 1),
+ AgentsOverviewGroup::Finished => counts,
+ }
+ });
+ line(
+ format!("{needs_you} need input {working} working {ready} ready").dim(),
+ inset(row(layout.header, /*offset*/ 1, /*height*/ 1)),
+ buf,
+ );
+ line(
+ "─"
+ .repeat(usize::from(area.width.saturating_sub(/*rhs*/ 4)))
+ .dim(),
+ inset(row(layout.header, /*offset*/ 2, /*height*/ 1)),
+ buf,
+ );
+ if state.editing_metadata() {
+ let (label, input) = if state.renaming {
+ ("Rename › ", &state.input)
+ } else {
+ ("Search › ", &state.search)
+ };
+ let available = usize::from(layout.search.width).saturating_sub(label.width() + 1);
+ buf.set_style(layout.search, crate::bottom_pane::active_tab_style());
+ line(
+ vec![
+ label.cyan().bold(),
+ visible_suffix(input, available).to_owned().into(),
+ ],
+ layout.search,
+ buf,
+ );
+ } else {
+ let search_label = if search_key.is_empty() {
+ "Search unavailable".to_owned()
+ } else {
+ format!("Search tasks · {search_key}")
+ };
+ line(search_label.dim(), layout.search, buf);
+ }
+ let notice = state
+ .connection_notice
+ .map(str::to_owned)
+ .or_else(|| {
+ state
+ .creating_worktree
+ .then(|| "Creating worktree…".to_owned())
+ })
+ .or_else(|| {
+ (state.refresh_failed && !state.loading).then(|| "Error loading tasks".to_owned())
+ })
+ .or_else(|| state.server_version_notice.clone());
+ if let Some(notice) = notice.filter(|_| state.key_chord_hint.is_none()) {
+ line(notice.dim(), inset(layout.footer), buf);
+ } else {
+ Paragraph::new(footer_lines).render(inset(layout.footer), buf);
+ }
+ drop(state);
+ for y in layout.gap.y..layout.gap.bottom() {
+ if layout.gap.width > 1 {
+ buf[(layout.gap.x + 1, y)]
+ .set_symbol("│")
+ .set_style(Style::default().dim());
+ }
+ }
+ self.render_center_rows(layout.list, buf);
+ if !layout.details.is_empty() {
+ self.render_details(layout.details, buf);
+ }
+ }
+}
diff --git a/codex-rs/tui/src/app/agent_center/rows.rs b/codex-rs/tui/src/app/agent_center/rows.rs
index 0720ebcec3..f8ce3bdefc 100644
--- a/codex-rs/tui/src/app/agent_center/rows.rs
+++ b/codex-rs/tui/src/app/agent_center/rows.rs
@@ -35,11 +35,7 @@ fn columns(area: Rect) -> (Rect, Rect, Rect) {
}
impl AgentsOverviewView {
- pub(in crate::app::agents_overview_view) fn render_center_rows(
- &self,
- area: Rect,
- buf: &mut Buffer,
- ) {
+ pub(super) fn render_center_rows(&self, area: Rect, buf: &mut Buffer) {
let row_width = area.width;
let area = Rect {
width: row_width.saturating_sub(/*rhs*/ 1),
@@ -54,6 +50,8 @@ impl AgentsOverviewView {
line(
if state.connection_notice.is_some() {
"Reconnecting…"
+ } else if state.loading && self.rows.is_empty() {
+ "Loading tasks…"
} else if state.refresh_failed {
"Could not load tasks"
} else if self.rows.is_empty() {
diff --git a/codex-rs/tui/src/app/agent_center_tests.rs b/codex-rs/tui/src/app/agent_center_tests.rs
index 9dd7d9f126..08b0692367 100644
--- a/codex-rs/tui/src/app/agent_center_tests.rs
+++ b/codex-rs/tui/src/app/agent_center_tests.rs
@@ -131,3 +131,36 @@ async fn live_center_pages_visible_rows_without_wrapping() {
);
}
}
+
+#[tokio::test]
+async fn live_center_metadata_clips_at_grapheme_boundaries() {
+ let app = make_test_app().await;
+ let mut view = app.agents_overview_view(
+ vec![overview_thread(
+ ThreadId::new(),
+ /*parent_thread_id*/ None,
+ "Retained task",
+ ThreadStatus::Idle,
+ )],
+ /*selected_thread_id*/ None,
+ );
+ let input = format!("{}日本語 e\u{301} 👩\u{200d}💻", "界".repeat(/*n*/ 100_000));
+ for (key, label) in [('r', "Rename › "), ('f', "Search › ")] {
+ view.handle_key_event(KeyCode::Char(key).into());
+ view.handle_paste(input.clone());
+ let rendered = screen(&view, /*width*/ 40, /*height*/ 18);
+ let prompt = rendered.lines().find(|line| line.contains(label)).unwrap();
+ assert!(prompt.contains("e\u{301}"));
+ assert!(prompt.ends_with("👩\u{200d}💻"));
+ assert_eq!(
+ view.cursor_pos(Rect::new(
+ /*x*/ 0, /*y*/ 0, /*width*/ 40, /*height*/ 18
+ )),
+ Some((36, 3))
+ );
+ if key == 'r' {
+ insta::assert_snapshot!("live_center_narrow_rename", rendered);
+ }
+ view.handle_key_event(KeyCode::Esc.into());
+ }
+}
diff --git a/codex-rs/tui/src/app/agents_overview.rs b/codex-rs/tui/src/app/agents_overview.rs
index 9fe8fcbcf6..d67acc4471 100644
--- a/codex-rs/tui/src/app/agents_overview.rs
+++ b/codex-rs/tui/src/app/agents_overview.rs
@@ -21,7 +21,6 @@ use crate::app_event::AgentsOverviewThreadRefresh;
use crate::bottom_pane::SelectionDescriptionLayout;
use crate::bottom_pane::SelectionItem;
use crate::bottom_pane::SelectionViewParams;
-use crate::bottom_pane::popup_consts::picker_hint_line_for_keymap;
use crate::chatwidget::ThreadInputStateRestoreMode;
use crate::startup_draft::StartupDraftPump;
use codex_app_server_protocol::SessionSource;
@@ -91,7 +90,6 @@ impl App {
.dim(),
)
}),
- footer_hint: Some(picker_hint_line_for_keymap(&self.keymap.list)),
items: [
#[cfg(any(unix, windows))]
(!workload_identity_selected).then(|| SelectionItem {
@@ -115,7 +113,7 @@ impl App {
description_layout: SelectionDescriptionLayout::HideWhenNarrow {
min_description_width: 28,
},
- ..Default::default()
+ ..SelectionViewParams::picker()
});
return;
}
@@ -144,13 +142,17 @@ impl App {
}
self.agents_overview.request_id = None;
self.agents_overview.refresh_task = None;
- self.agents_overview
- .view_state
- .lock()
- .unwrap_or_else(std::sync::PoisonError::into_inner)
- .refresh_failed = !result
- .as_ref()
- .is_ok_and(|refresh| refresh.recent_seed_complete);
+ {
+ let mut state = self
+ .agents_overview
+ .view_state
+ .lock()
+ .unwrap_or_else(std::sync::PoisonError::into_inner);
+ state.loading = false;
+ state.refresh_failed = !result
+ .as_ref()
+ .is_ok_and(|refresh| refresh.recent_seed_complete);
+ }
match result {
Ok(refresh) => {
self.agents_overview.initialized = refresh.recent_seed_complete;
diff --git a/codex-rs/tui/src/app/agents_overview_actions_tests.rs b/codex-rs/tui/src/app/agents_overview_actions_tests.rs
index 8020052173..a2ab9785e8 100644
--- a/codex-rs/tui/src/app/agents_overview_actions_tests.rs
+++ b/codex-rs/tui/src/app/agents_overview_actions_tests.rs
@@ -298,7 +298,6 @@ async fn hidden_task_stays_hidden_through_activity_and_seed_until_explicit_resum
let mut tui = crate::tui::test_support::make_test_tui()?;
let view = app.agents_overview_view(vec![thread.clone()], Some(id));
app.chat_widget.show_bottom_pane_view(Box::new(view));
- app.chat_widget.handle_key_event(KeyCode::Esc.into());
app.chat_widget
.handle_key_event(KeyEvent::new(KeyCode::Char('h'), KeyModifiers::NONE));
let hide = std::iter::from_fn(|| rx.try_recv().ok())
diff --git a/codex-rs/tui/src/app/agents_overview_input.rs b/codex-rs/tui/src/app/agents_overview_input.rs
deleted file mode 100644
index a2f6b10e7b..0000000000
--- a/codex-rs/tui/src/app/agents_overview_input.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-//! Layout for the agent list and its optional search or rename field.
-
-use super::*;
-
-impl AgentsOverviewView {
- pub(super) fn layout_areas(&self, area: Rect) -> [Rect; 6] {
- let metadata_height = u16::from(self.state().editing_metadata());
- let footer_height = (self.footer_lines(area.width.saturating_sub(4)).len() as u16)
- .min(area.height.saturating_sub(6 + metadata_height));
- let header_height = self
- .state()
- .server_version_notice
- .as_deref()
- .map(|notice| {
- textwrap::wrap(notice, usize::from(area.width.saturating_sub(4).max(1))).len()
- as u16
- })
- .unwrap_or(1)
- .min(
- area.height
- .saturating_sub(footer_height + metadata_height + 3)
- .max(1),
- );
- Layout::vertical([
- Constraint::Length(header_height),
- Constraint::Length(1),
- Constraint::Length(1),
- Constraint::Min(1),
- Constraint::Length(metadata_height),
- Constraint::Length(footer_height),
- ])
- .areas(area)
- }
-}
diff --git a/codex-rs/tui/src/app/agents_overview_render.rs b/codex-rs/tui/src/app/agents_overview_render.rs
index 5d9253ff08..d3349fae80 100644
--- a/codex-rs/tui/src/app/agents_overview_render.rs
+++ b/codex-rs/tui/src/app/agents_overview_render.rs
@@ -208,121 +208,3 @@ impl AgentsOverviewView {
.collect()
}
}
-
-impl Renderable for AgentsOverviewView {
- fn desired_height(&self, _width: u16) -> u16 {
- 24
- }
-
- fn cursor_pos(&self, area: Rect) -> Option<(u16, u16)> {
- if area.width < 12 || area.height < 8 {
- return None;
- }
- let [_, _, _, _, prompt, _] = self.layout_areas(area);
- let state = self.state();
- if !state.editing_metadata() {
- return None;
- }
- let (label, input) = if state.searching {
- (" Search › ", &state.search)
- } else {
- (" Rename › ", &state.input)
- };
- let x = area
- .x
- .saturating_add((label.width() + input.width()) as u16)
- .min(area.right().saturating_sub(3));
- Some((x, prompt.y))
- }
-
- fn render(&self, area: Rect, buf: &mut Buffer) {
- if area.width < 12 || area.height < 8 {
- return;
- }
- Clear.render(area, buf);
- let [header, summary, divider, body, prompt, footer] = self.layout_areas(area);
- let inset =
- |rect: Rect| rect.inner(Margin::new(/*horizontal*/ 2, /*vertical*/ 0));
- if let Some(notice) = &self.state().server_version_notice {
- let header = inset(header);
- let lines = textwrap::wrap(notice, usize::from(header.width.max(1)));
- if lines.len() > usize::from(header.height) {
- Line::from("Old srv".cyan()).render(header, buf);
- } else {
- for (offset, line) in lines.iter().enumerate() {
- Line::from(line.as_ref().cyan()).render(
- Rect::new(header.x, header.y + offset as u16, header.width, 1),
- buf,
- );
- }
- }
- } else {
- Line::from("Agent command center".bold()).render(inset(header), buf);
- }
- let (needs_you, working, ready) = self.rows.iter().fold((0, 0, 0), |counts, row| {
- let (needs_you, working, ready) = counts;
- match row.group {
- AgentsOverviewGroup::NeedsYou => (needs_you + 1, working, ready),
- AgentsOverviewGroup::Working => (needs_you, working + 1, ready),
- AgentsOverviewGroup::Ready => (needs_you, working, ready + 1),
- AgentsOverviewGroup::Finished => counts,
- }
- });
- let attention = format!("{needs_you} need input");
- if self.state().creating_worktree {
- Line::from("Creating worktree…".cyan()).render(inset(summary), buf);
- } else if let Some(notice) = self.state().connection_notice {
- Line::from(notice.cyan()).render(inset(summary), buf);
- } else if self.state().refresh_failed {
- Line::from("Error loading tasks".red()).render(inset(summary), buf);
- } else {
- Line::from(format!("{attention} {working} working {ready} ready").dim())
- .render(inset(summary), buf);
- }
- Line::from("─".repeat(usize::from(area.width.saturating_sub(4))).dim())
- .render(inset(divider), buf);
- let body = inset(body);
- if body.width >= 90 {
- let [list, gap, details] = Layout::horizontal([
- Constraint::Min(46),
- Constraint::Length(3),
- Constraint::Length(38),
- ])
- .areas(body);
- for y in gap.y..gap.bottom() {
- buf[(gap.x + 1, y)]
- .set_symbol("│")
- .set_style(Style::new().dim());
- }
- self.render_center_rows(list, buf);
- self.render_details(details, buf);
- } else {
- self.render_center_rows(body, buf);
- }
- let state = self.state();
- let (label, input) = if state.searching {
- ("Search › ", &state.search)
- } else {
- ("Rename › ", &state.input)
- };
- let available_width = usize::from(inset(prompt).width)
- .saturating_sub(label.width())
- .saturating_sub(1);
- let mut visible_start = input.len();
- let mut visible_width = 0;
- for (index, character) in input.char_indices().rev() {
- let width = character.width().unwrap_or(0);
- if visible_width + width > available_width {
- break;
- }
- visible_width += width;
- visible_start = index;
- }
- if state.editing_metadata() {
- Line::from(vec![label.cyan().bold(), input[visible_start..].into()])
- .render(inset(prompt), buf);
- }
- drop(state);
- Paragraph::new(self.footer_lines(inset(footer).width)).render(inset(footer), buf);
- }
-}
diff --git a/codex-rs/tui/src/app/agents_overview_tests.rs b/codex-rs/tui/src/app/agents_overview_tests.rs
index de18530d0d..4217010405 100644
--- a/codex-rs/tui/src/app/agents_overview_tests.rs
+++ b/codex-rs/tui/src/app/agents_overview_tests.rs
@@ -15,13 +15,20 @@ async fn overview_worktree_creation_busy_state() {
.lock()
.unwrap()
.creating_worktree = true;
+ {
+ let mut state = app.agents_overview.view_state.lock().unwrap();
+ state.server_version_notice = Some("Older server".into());
+ }
let mut view = app.agents_overview_view(Vec::new(), /*selected_thread_id*/ None);
for key in ['n', 'w', 'o', 'r', 'x', 'h', 'a'] {
view.handle_key_event(KeyCode::Char(key).into());
}
assert!(rx.try_recv().is_err());
app.chat_widget.show_bottom_pane_view(Box::new(view));
- insta::assert_snapshot!(render_bottom_popup(&app.chat_widget, /*width*/ 80));
+ insta::assert_snapshot!(normalize_agent_center_snapshot(render_bottom_popup(
+ &app.chat_widget,
+ /*width*/ 80,
+ )));
}
#[tokio::test]
@@ -56,7 +63,7 @@ async fn overview_thread_colors_match_footer_and_respect_color_suppression() {
let x = text[..x].chars().count();
snapshot.push(format!(
"{} | title style: {:?}",
- crate::chatwidget::tests::helpers::normalize_agent_center_snapshot(&text),
+ normalize_agent_center_snapshot(&text),
row[x].style()
));
}
@@ -75,9 +82,8 @@ async fn older_server_notice_is_visible_in_agents_overview() {
insta::assert_snapshot!(
rendered
.lines()
- .take(/*n*/ 2)
- .collect::<Vec<_>>()
- .join("\n")
+ .find(|line| line.contains("Service v0.153.0") || line.contains("Service v0.152.1"))
+ .unwrap()
);
}
@@ -89,8 +95,7 @@ async fn server_version_overview_notice_updates_and_clears() {
let view = app.agents_overview_view(Vec::new(), /*selected_thread_id*/ None);
app.chat_widget.show_bottom_pane_view(Box::new(view));
let rendered = render_bottom_popup(&app.chat_widget, /*width*/ 80);
- insta::assert_snapshot!(rendered.lines().take(/*n*/ 2).collect::<Vec<_>>().join("\n"), @" Service v0.151.0 < Codex CLI v0.153.0
- 0 need input 0 working 0 ready");
+ insta::assert_snapshot!(rendered.lines().find(|line| line.contains("Service v0.151.0")).unwrap(), @" Service v0.151.0 < Codex CLI v0.153.0");
app.update_server_version_overview_notice("0.153.0", /*server_version*/ None);
let view = app.agents_overview_view(Vec::new(), /*selected_thread_id*/ None);
@@ -100,7 +105,7 @@ async fn server_version_overview_notice_updates_and_clears() {
}
#[tokio::test]
-async fn older_server_notice_wraps_in_narrow_overview() {
+async fn older_server_notice_truncates_in_narrow_overview() {
let mut app = make_test_app().await;
app.update_server_version_overview_notice("0.153.0", Some("0.152.1"));
let view = app.agents_overview_view(Vec::new(), /*selected_thread_id*/ None);
@@ -111,24 +116,6 @@ async fn older_server_notice_wraps_in_narrow_overview() {
);
}
-#[tokio::test]
-async fn older_server_notice_falls_back_in_short_overview() {
- let mut app = make_test_app().await;
- app.update_server_version_overview_notice("0.153.0", Some("0.152.1"));
- let view = app.agents_overview_view(Vec::new(), /*selected_thread_id*/ None);
- let area = ratatui::layout::Rect::new(
- /*x*/ 0, /*y*/ 0, /*width*/ 12, /*height*/ 8,
- );
- let mut buffer = ratatui::buffer::Buffer::empty(area);
- view.render(area, &mut buffer);
- let header = buffer
- .content()
- .iter()
- .take(usize::from(area.width))
- .map(ratatui::buffer::Cell::symbol)
- .collect::<String>();
- insta::assert_snapshot!(header.trim_end(), @" Old srv");
-}
use crate::app::test_support::make_test_app;
use crate::app_event::AgentsOverviewThreadRefresh;
use crate::bottom_pane::BottomPaneView;
@@ -194,11 +181,6 @@ async fn overview_right_opens_current_or_highlighted_task() {
let view = app.agents_overview_view(threads.clone(), /*selected_thread_id*/ None);
app.chat_widget.show_bottom_pane_view(Box::new(view));
- let rendered = render_bottom_popup(&app.chat_widget, /*width*/ 96);
- insta::assert_snapshot!(
- "overview_empty_prompt_right_hint",
- rendered.lines().last().unwrap()
- );
app.chat_widget.handle_key_event(KeyCode::Right.into());
assert!(
matches!(rx.try_recv(), Ok(AppEvent::SelectAgentsOverviewThread { thread_id }) if thread_id == current)
@@ -206,14 +188,8 @@ async fn overview_right_opens_current_or_highlighted_task() {
assert!(!app.chat_widget.no_modal_or_popup_active());
let mut view = app.agents_overview_view(threads, /*selected_thread_id*/ None);
- view.handle_key_event(KeyCode::Esc.into());
view.handle_key_event(KeyCode::Down.into());
app.chat_widget.show_bottom_pane_view(Box::new(view));
- let rendered = render_bottom_popup(&app.chat_widget, /*width*/ 96);
- insta::assert_snapshot!(
- "overview_right_open_hint",
- rendered.lines().find(|line| line.contains("open")).unwrap()
- );
app.chat_widget.handle_key_event(KeyCode::Right.into());
assert!(
matches!(rx.try_recv(), Ok(AppEvent::SelectAgentsOverviewThread { thread_id }) if thread_id == other)
@@ -237,7 +213,6 @@ async fn overview_right_preserves_editors_and_offline_state() {
)],
Some(thread_id),
);
- view.handle_key_event(KeyCode::Esc.into());
view.handle_key_event(KeyEvent::new(KeyCode::Char('r'), KeyModifiers::NONE));
view.handle_key_event(KeyCode::Right.into());
assert!(app.agents_overview.view_state.lock().unwrap().renaming);
@@ -1429,8 +1404,6 @@ async fn filtered_dashboard_actions_use_configured_shortcuts() {
view.handle_key_event(KeyEvent::new(KeyCode::F(10), KeyModifiers::NONE));
assert!(event_rx.try_recv().is_err());
- view.handle_key_event(KeyEvent::new(KeyCode::Esc, KeyModifiers::NONE));
- view.handle_key_event(KeyCode::Esc.into());
for (key, expected) in [('v', second), ('k', first), ('j', first)] {
view.handle_key_event(KeyCode::Char(key).into());
let selected = &view.rows[view.selected_index().unwrap()];
@@ -1456,7 +1429,6 @@ async fn filtered_dashboard_actions_use_configured_shortcuts() {
Ok(AppEvent::SelectAgentsOverviewThread { thread_id }) if thread_id == second
));
assert!(event_rx.try_recv().is_err());
- view.handle_key_event(KeyCode::Esc.into());
for offline in [false, true] {
app.agents_overview
.view_state
@@ -2002,7 +1974,6 @@ async fn cancelling_resume_picker_preserves_command_center_state() -> Result<()>
let view = app.agents_overview_view(threads.into(), Some(selected));
app.chat_widget.show_bottom_pane_view(Box::new(view));
for key in [
- KeyCode::Esc.into(),
KeyEvent::new(KeyCode::Char('g'), KeyModifiers::NONE),
KeyEvent::new(KeyCode::Char('f'), KeyModifiers::NONE),
KeyEvent::new(KeyCode::Char('S'), KeyModifiers::NONE),
@@ -2044,7 +2015,7 @@ async fn cancelling_resume_picker_preserves_command_center_state() -> Result<()>
}
#[tokio::test]
-async fn command_center_cursor_tracks_wrapped_footer() {
+async fn command_center_cursor_tracks_fixed_footer() {
let app = make_test_app().await;
let mut view = app.agents_overview_view(
vec![overview_thread(
@@ -2089,7 +2060,6 @@ async fn empty_command_center_can_open_resume_picker() {
app.app_event_tx = crate::app_event_sender::AppEventSender::new(event_tx);
let view = app.agents_overview_view(Vec::new(), /*selected_thread_id*/ None);
app.chat_widget.show_bottom_pane_view(Box::new(view));
- app.chat_widget.handle_key_event(KeyCode::Esc.into());
while event_rx.try_recv().is_ok() {}
app.chat_widget
.handle_key_event(KeyEvent::new(KeyCode::Char('o'), KeyModifiers::NONE));
@@ -2098,7 +2068,9 @@ async fn empty_command_center_can_open_resume_picker() {
Ok(AppEvent::OpenResumePicker)
));
// Crossterm labels forward Delete as "fwd del" on macOS and "del" elsewhere.
- let rendered = render_bottom_popup(&app.chat_widget, /*width*/ 48).replace("fwd del", "del");
+ let rendered =
+ normalize_agent_center_snapshot(render_bottom_popup(&app.chat_widget, /*width*/ 48))
+ .replace("fwd del", "del");
insta::with_settings!({snapshot_path => "../snapshots"}, {
insta::assert_snapshot!("agents_overview_empty_narrow", rendered);
});
@@ -2540,12 +2512,11 @@ async fn command_center_refresh_failure_is_inline_and_clears_on_success() -> Res
}
let notice = render_bottom_popup(&app.chat_widget, /*width*/ 32)
.lines()
- .take(2)
- .collect::<Vec<_>>()
- .join("\n");
+ .last()
+ .unwrap()
+ .to_owned();
insta::assert_snapshot!(notice, @r"
- Agent command center
- Error loading tasks
+ Error loading tasks
");
let request_id = Uuid::new_v4();
app.agents_overview.request_id = Some(request_id);
diff --git a/codex-rs/tui/src/app/agents_overview_threads.rs b/codex-rs/tui/src/app/agents_overview_threads.rs
index a8e3043969..b2f8949fc6 100644
--- a/codex-rs/tui/src/app/agents_overview_threads.rs
+++ b/codex-rs/tui/src/app/agents_overview_threads.rs
@@ -210,6 +210,11 @@ impl App {
let mut thread_ids = std::mem::take(&mut self.agents_overview.refresh_thread_ids);
let request_handle = app_server.request_handle();
let app_event_tx = self.app_event_tx.clone();
+ self.agents_overview
+ .view_state
+ .lock()
+ .unwrap_or_else(std::sync::PoisonError::into_inner)
+ .loading = !initialized;
let refresh_task = tokio::spawn(async move {
let result = async {
let mut threads = HashMap::new();
diff --git a/codex-rs/tui/src/app/agents_overview_view.rs b/codex-rs/tui/src/app/agents_overview_view.rs
index 64885452d5..cbf19e6bf2 100644
--- a/codex-rs/tui/src/app/agents_overview_view.rs
+++ b/codex-rs/tui/src/app/agents_overview_view.rs
@@ -6,8 +6,6 @@ pub(super) mod command_center;
#[path = "agents_overview_grouping.rs"]
mod grouping;
-#[path = "agents_overview_input.rs"]
-mod input;
#[path = "agents_overview_render.rs"]
mod render;
@@ -55,7 +53,6 @@ use std::sync::Arc;
use std::sync::Mutex;
use std::sync::MutexGuard;
use std::sync::PoisonError;
-use unicode_width::UnicodeWidthChar;
use unicode_width::UnicodeWidthStr;
#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]
@@ -141,6 +138,7 @@ pub(super) struct AgentsOverviewViewState {
pub(super) key_chord_hint: Option<Vec<(String, String)>>,
pub(super) creating_worktree: bool,
pub(super) refresh_failed: bool,
+ pub(super) loading: bool,
pub(super) connection_notice: Option<&'static str>,
pub(super) server_version_notice: Option<String>,
search: String,
diff --git a/codex-rs/tui/src/app/daemon_menu_tests.rs b/codex-rs/tui/src/app/daemon_menu_tests.rs
index 546a07cffa..59c4cc773f 100644
--- a/codex-rs/tui/src/app/daemon_menu_tests.rs
+++ b/codex-rs/tui/src/app/daemon_menu_tests.rs
@@ -31,7 +31,14 @@ async fn daemon_version_notice_preserves_manual_update_guidance() {
))
);
let overview = render_bottom_popup(&app.chat_widget, /*width*/ 100);
- notices.push(overview.lines().next().unwrap().trim().to_string());
+ notices.push(
+ overview
+ .lines()
+ .find(|line| line.contains("Service v"))
+ .unwrap()
+ .trim()
+ .to_string(),
+ );
assert_eq!(app.pending_update_action, None);
app.local_settings.tui.show_server_version_notice = false;
@@ -80,7 +87,7 @@ async fn daemon_menu_is_read_only_and_confirmation_can_cancel_or_handoff() {
let view = app.agents_overview_view(Vec::new(), /*selected_thread_id*/ None);
app.chat_widget.show_bottom_pane_view(Box::new(view));
let overview = render_bottom_popup(&app.chat_widget, /*width*/ 80);
- insta::assert_snapshot!(overview.lines().next().unwrap().trim(), @"Service v0.153.0 < Codex CLI v0.154.0 · /daemon");
+ insta::assert_snapshot!(overview.lines().find(|line| line.contains("Service v")).unwrap().trim(), @"Service v0.153.0 < Codex CLI v0.154.0 · /daemon");
let executable = app.daemon_cli_executable.clone();
for (width, source, snapshot) in [
(
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__actions__agents_custom_lifecycle_chords.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__actions__agents_custom_lifecycle_chords.snap
index 3c56224955..db19dd1665 100644
--- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__actions__agents_custom_lifecycle_chords.snap
+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__actions__agents_custom_lifecycle_chords.snap
@@ -2,9 +2,10 @@
source: tui/src/app/agents_overview_actions_tests.rs
expression: "render_bottom_popup(&app.chat_widget,\n48).replace(&test_path_display(\"/tmp/project\"), \"/tmp/project\")"
---
- Agent command center
+ Agent command center Group: Project g
0 need input 0 working 1 ready
────────────────────────────────────────────
+ Search tasks · f
Tasks
/tmp/project 1
› ○ Task
@@ -21,7 +22,6 @@ expression: "render_bottom_popup(&app.chat_widget,\n48).replace(&test_path_displ
-
↑↓ navigate o resume enter open n new
w new worktree f search g group: project
r rename x stop f5 f8 hide f5 f6 archive
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_markdown.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_markdown.snap
index 7aaf70a93b..1fe7686385 100644
--- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_markdown.snap
+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_markdown.snap
@@ -2,13 +2,13 @@
source: tui/src/app/agents_overview_tests.rs
expression: normalize_agent_center_snapshot(&cached)
---
-" Agent command center "
+" Agent command center Group: Project g "
" 0 need input 0 working 1 ready "
" ──────────────────────────────────────────────────────────────────────────────────────────── "
-" Tasks │ Task details "
-" /tmp/project 1 │ "
-" › ○ Review parser │ Review parser "
-" │ ○ Ready "
+" Search tasks · f │ Task details "
+" Tasks │ "
+" /tmp/project 1 │ Review parser "
+" › ○ Review parser │ ○ Ready "
" │ "
" │ Last message "
" │ ## Findings "
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_markdown_long_lines.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_markdown_long_lines.snap
index f665e5081e..db96314953 100644
--- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_markdown_long_lines.snap
+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_markdown_long_lines.snap
@@ -2,13 +2,13 @@
source: tui/src/app/agents_overview_tests.rs
expression: "normalize_agent_center_snapshot(render_bottom_popup(&app.chat_widget, 96))"
---
- Agent command center
+ Agent command center Group: Project g
0 need input 0 working 1 ready
────────────────────────────────────────────────────────────────────────────────────────────
- Tasks │ Task details
- /tmp/project 1 │
- › ○ Review parser │ Review parser
- │ ○ Ready
+ Search tasks · f │ Task details
+ Tasks │
+ /tmp/project 1 │ Review parser
+ › ○ Review parser │ ○ Ready
│
│ Last message
│ let explanation = "A long code line
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_markdown_table.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_markdown_table.snap
index 0c6a05b8a3..f1019f032d 100644
--- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_markdown_table.snap
+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_markdown_table.snap
@@ -2,13 +2,13 @@
source: tui/src/app/agents_overview_tests.rs
expression: "normalize_agent_center_snapshot(render_bottom_popup(&app.chat_widget, 96))"
---
- Agent command center
+ Agent command center Group: Project g
0 need input 0 working 1 ready
────────────────────────────────────────────────────────────────────────────────────────────
- Tasks │ Task details
- /tmp/project 1 │
- › ○ Review parser │ Review parser
- │ ○ Ready
+ Search tasks · f │ Task details
+ Tasks │
+ /tmp/project 1 │ Review parser
+ › ○ Review parser │ ○ Ready
│
│ Last message
│ Check Result
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_model_grouping.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_model_grouping.snap
index 16086d7067..77598313f1 100644
--- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_model_grouping.snap
+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_model_grouping.snap
@@ -2,20 +2,20 @@
source: tui/src/app/agents_overview_tests.rs
expression: "render_bottom_popup(&app.chat_widget,\n100).replace(&test_path_display(\"/tmp/project\"),\n\"/tmp/project\").replace(\"fwd del\", \"del\")"
---
- Agent command center
+ Agent command center Group: Model g
0 need input 0 working 4 ready
────────────────────────────────────────────────────────────────────────────────────────────────
- Tasks │ Task details
- Unknown 1 │
- › ○ Legacy task │ Legacy task
- │ ○ Ready
- model-a 2 │
- ○ Recent task │ Project
- ○ Older task │ /tmp/project
- │ Model: Unknown
- model-b 1 │
- ○ Other model │ Prompt
- │ Legacy task
+ Search tasks · f │ Task details
+ Tasks │
+ Unknown 1 │ Legacy task
+ › ○ Legacy task │ ○ Ready
+ │
+ model-a 2 │ Project
+ ○ Recent task │ /tmp/project
+ ○ Older task │ Model: Unknown
+ │
+ model-b 1 │ Prompt
+ ○ Other model │ Legacy task
│
│
│
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_recent_sessions.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_recent_sessions.snap
index 6e299653e0..b21c468df9 100644
--- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_recent_sessions.snap
+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__agents_overview_recent_sessions.snap
@@ -2,9 +2,10 @@
source: tui/src/app/agents_overview_tests.rs
expression: "age.replace_all(&rendered, \" [age]\")"
---
- Agent command center
+ Agent command center Group: Project g
0 need input 0 working 0 ready
────────────────────────────────────────────────────────────────────────────
+ Search tasks · f
Tasks Status Updated
/ 10
› ○ Task 12 Inactive [age]
@@ -23,6 +24,5 @@ expression: "age.replace_all(&rendered, \" [age]\")"
-
↑↓ navigate o resume enter open n new w new worktree f search
g group: project r rename x stop h hide a archive del delete ctrl+c quit
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__command_center__live_center_columns.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__command_center__live_center_columns.snap
index 49450af685..4b273a121d 100644
--- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__command_center__live_center_columns.snap
+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__command_center__live_center_columns.snap
@@ -2,18 +2,18 @@
source: tui/src/app/agent_center_tests.rs
expression: "screen(&view, 160, 22)"
---
- Agent command center
+ Agent command center Group: Project g
2 need input 1 working 2 ready
────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
- Tasks Status Updated │ Task details
- /tmp/project 6 │
- › ○ Current task current Ready now │ Current task
- ○ A longer task title that uses the available column Ready 5m ago │ ○ Ready
- ! Failed task Error 1h ago │
- ● Needs an answer Needs input 2h ago │ Project
- ● Working task Working 1d ago │ /tmp/project
- ○ Unloaded task Inactive 2d ago │ Model: Unknown
- │
+ Search tasks · f │ Task details
+ Tasks Status Updated │
+ /tmp/project 6 │ Current task
+ › ○ Current task current Ready now │ ○ Ready
+ ○ A longer task title that uses the available column Ready 5m ago │
+ ! Failed task Error 1h ago │ Project
+ ● Needs an answer Needs input 2h ago │ /tmp/project
+ ● Working task Working 1d ago │ Model: Unknown
+ ○ Unloaded task Inactive 2d ago │
│ Prompt
│ Current task
│
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__command_center__live_center_narrow_rename.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__command_center__live_center_narrow_rename.snap
new file mode 100644
index 0000000000..388b76c2e8
--- /dev/null
+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__command_center__live_center_narrow_rename.snap
@@ -0,0 +1,22 @@
+---
+source: tui/src/app/agent_center_tests.rs
+expression: rendered
+---
+ Agent command center Group: Projec…
+ 0 need input 0 working 1 ready
+ ────────────────────────────────────
+ Rename › 界 界 界 界 界 界 界 日 本 語 é 👩‍💻
+ Tasks
+ /tmp/project 1
+ › ○ Retained task
+
+
+
+
+
+
+
+
+
+
+ enter rename esc cancel
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__older_server_narrow_overview.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__older_server_narrow_overview.snap
index 92dbb8fa0d..c62aa8ed41 100644
--- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__older_server_narrow_overview.snap
+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__older_server_narrow_overview.snap
@@ -2,13 +2,10 @@
source: tui/src/app/agents_overview_tests.rs
expression: "render_bottom_popup(&app.chat_widget, 12)"
---
- Service
- v0.152.1
- < Codex
- CLI
- v0.153.0
- 0 need i
+ Agent c…
+ 0 need …
────────
+ Search …
No tas…
@@ -20,9 +17,7 @@ expression: "render_bottom_popup(&app.chat_widget, 12)"
- n new
- w new
- worktree
- f search
- ctrl+c
- quit
+
+
+
+ Service…
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__older_server_notice_is_visible_in_agents_overview.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__older_server_notice_is_visible_in_agents_overview.snap
index 6f4e1bcce3..4e581bcd3e 100644
--- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__older_server_notice_is_visible_in_agents_overview.snap
+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__older_server_notice_is_visible_in_agents_overview.snap
@@ -1,7 +1,5 @@
---
source: tui/src/app/agents_overview_tests.rs
-assertion_line: 10
-expression: "rendered.lines().take(2).collect::<Vec<_>>().join(\"\\n\")"
+expression: "rendered.lines().find(|line| line.contains(\"Service v0.153.0\") ||\nline.contains(\"Service v0.152.1\")).unwrap()"
---
Service v0.152.1 < Codex CLI v0.153.0
- 0 need input 0 working 0 ready
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__overview_empty_prompt_right_hint.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__overview_empty_prompt_right_hint.snap
deleted file mode 100644
index 21a2fa6d88..0000000000
--- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__overview_empty_prompt_right_hint.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tui/src/app/agents_overview_tests.rs
-expression: rendered.lines().last().unwrap()
----
- x stop h hide a archive del delete ctrl+c quit
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__overview_right_open_hint.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__overview_right_open_hint.snap
deleted file mode 100644
index 23f26d9805..0000000000
--- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__overview_right_open_hint.snap
+++ /dev/null
@@ -1,5 +0,0 @@
----
-source: tui/src/app/agents_overview_tests.rs
-expression: "rendered.lines().find(|line| line.contains(\"open\")).unwrap()"
----
- ↑↓ navigate o resume enter open n new w new worktree f search g group: project r rename
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__overview_thread_colors_match_footer_and_respect_color_suppression.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__overview_thread_colors_match_footer_and_respect_color_suppression.snap
index 06ae317732..ed3e7dc962 100644
--- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__overview_thread_colors_match_footer_and_respect_color_suppression.snap
+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__overview_thread_colors_match_footer_and_respect_color_suppression.snap
@@ -2,5 +2,5 @@
source: tui/src/app/agents_overview_tests.rs
expression: "snapshot.join(\"\\n\")"
---
- ○ Named task │ Selected task | title style: Style::new().fg(Color::Rgb(242, 205, 205)).bg(Color::Reset).underline_color(Color::Reset)
- ○ Named task │ Selected task | title style: Style::new().fg(Color::Reset).bg(Color::Reset).underline_color(Color::Reset)
+ ○ Named task │ ○ Ready | title style: Style::new().fg(Color::Rgb(242, 205, 205)).bg(Color::Reset).underline_color(Color::Reset)
+ ○ Named task │ ○ Ready | title style: Style::new().fg(Color::Reset).bg(Color::Reset).underline_color(Color::Reset)
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__overview_worktree_creation_busy_state.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__overview_worktree_creation_busy_state.snap
index 24bd1f8a10..7dc83315bf 100644
--- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__overview_worktree_creation_busy_state.snap
+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__overview_worktree_creation_busy_state.snap
@@ -1,10 +1,11 @@
---
source: tui/src/app/agents_overview_tests.rs
-expression: "render_bottom_popup(&app.chat_widget, 80)"
+expression: "normalize_agent_center_snapshot(render_bottom_popup(&app.chat_widget, 80,))"
---
- Agent command center
- Creating worktree…
+ Agent command center Group: Project g
+ 0 need input 0 working 0 ready
────────────────────────────────────────────────────────────────────────────
+ Search tasks · f
No tasks yet
@@ -24,5 +25,4 @@ expression: "render_bottom_popup(&app.chat_widget, 80)"
-
- Creating worktree… ctrl+c quit
+ Creating worktree…
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__usage__agents_overview_usage.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__usage__agents_overview_usage.snap
index 1b01e2fd62..9b50e76d0e 100644
--- a/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__usage__agents_overview_usage.snap
+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__agents_overview__tests__usage__agents_overview_usage.snap
@@ -2,14 +2,14 @@
source: tui/src/app/agents_overview_usage_tests.rs
expression: "render_bottom_popup(&app.chat_widget,\n96).replace(&format!(\"{project} 2\"),\n&group).replace(&project, \"/tmp/project\").replace(\"fwd del\", \"del\")"
---
- Agent command center
+ Agent command center Group: Project g
1 need input 0 working 1 ready
────────────────────────────────────────────────────────────────────────────────────────────
- Tasks │ Task details
- /tmp/project 2 │
- › ● Review parser │ Review parser
- ○ Other task │ ● Needs input
- │
+ Search tasks · f │ Task details
+ Tasks │
+ /tmp/project 2 │ Review parser
+ › ● Review parser │ ● Needs input
+ ○ Other task │
│ Needs attention
│ Which dependency version should I use?
│ Open task to review.
diff --git a/codex-rs/tui/src/app/tests/disconnect_tests.rs b/codex-rs/tui/src/app/tests/disconnect_tests.rs
index b1ed8d1e6b..2903d844c9 100644
--- a/codex-rs/tui/src/app/tests/disconnect_tests.rs
+++ b/codex-rs/tui/src/app/tests/disconnect_tests.rs
@@ -2,6 +2,7 @@
use super::*;
use crate::app_server_session::ThreadParamsMode;
+use crate::chatwidget::tests::helpers::normalize_agent_center_snapshot;
use codex_app_server_protocol::JSONRPCMessage;
use codex_app_server_protocol::JSONRPCRequest;
use futures::SinkExt;
@@ -199,9 +200,6 @@ async fn disconnected_command_center_keeps_input_and_blocks_actions() -> Result<
};
let view = app.agents_overview_view(Vec::new(), /*selected_thread_id*/ None);
app.chat_widget.show_bottom_pane_view(Box::new(view));
- app.chat_widget.handle_paste("task draft".into());
- app.chat_widget
- .handle_key_event(KeyEvent::new(KeyCode::Esc, KeyModifiers::NONE));
let mut tui = crate::tui::test_support::make_test_tui()?;
app.handle_tui_event(
&mut tui,
@@ -216,6 +214,11 @@ async fn disconnected_command_center_keeps_input_and_blocks_actions() -> Result<
)
.await?;
assert!(app.begin_reconnect());
+ app.handle_tui_event(&mut tui, &mut session, TuiEvent::Paste("!".into()))
+ .await?;
+ let searching =
+ normalize_agent_center_snapshot(render_bottom_popup(&app.chat_widget, /*width*/ 100));
+ assert!(searching.contains("Search › search query!"));
for key in [
KeyEvent::new(KeyCode::Esc, KeyModifiers::NONE),
KeyEvent::new(KeyCode::Char('n'), KeyModifiers::NONE),
@@ -225,8 +228,6 @@ async fn disconnected_command_center_keeps_input_and_blocks_actions() -> Result<
app.handle_tui_event(&mut tui, &mut session, TuiEvent::Key(key))
.await?;
}
- app.handle_tui_event(&mut tui, &mut session, TuiEvent::Paste("!".into()))
- .await?;
app.handle_tui_event(
&mut tui,
&mut session,
@@ -241,10 +242,9 @@ async fn disconnected_command_center_keeps_input_and_blocks_actions() -> Result<
| AppEvent::OpenResumePicker
))
);
- assert_snapshot!(
- "offline_command_center",
- render_bottom_popup(&app.chat_widget, /*width*/ 100)
- );
+ assert!(app.chat_widget.has_active_view());
+ assert!(!render_bottom_popup(&app.chat_widget, /*width*/ 100).contains("Search ›"));
+ assert_snapshot!("offline_command_center", searching);
session.shutdown().await?;
Ok(())
}
diff --git a/codex-rs/tui/src/app/tests/key_chords.rs b/codex-rs/tui/src/app/tests/key_chords.rs
index fc86ae0f5a..4e9507f9d8 100644
--- a/codex-rs/tui/src/app/tests/key_chords.rs
+++ b/codex-rs/tui/src/app/tests/key_chords.rs
@@ -677,6 +677,11 @@ async fn physical_chords_route_list_and_mixed_request_input_modals() -> Result<(
#[tokio::test]
async fn dashboard_chord_hint_survives_refresh_and_clears_on_cancel() -> Result<()> {
let mut app = make_test_app().await;
+ app.agents_overview
+ .view_state
+ .lock()
+ .unwrap()
+ .server_version_notice = Some("Older server".into());
app.keymap =
RuntimeKeymap::from_config(&toml::from_str("[agents]\nnew_task = [\"ctrl-x n\"]")?)
.unwrap();
diff --git a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__disconnect__offline_command_center.snap b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__disconnect__offline_command_center.snap
index 36217138f5..317635ae84 100644
--- a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__disconnect__offline_command_center.snap
+++ b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__disconnect__offline_command_center.snap
@@ -1,10 +1,11 @@
---
source: tui/src/app/tests/disconnect_tests.rs
-expression: "render_bottom_popup(&app.chat_widget, 100)"
+expression: searching
---
- Agent command center
- Reconnecting — agent list is stale
+ Agent command center Group: Project g
+ 0 need input 0 working 0 ready
────────────────────────────────────────────────────────────────────────────────────────────────
+ Search › search query! │
Reconnecting… │
│
│
@@ -24,5 +25,4 @@ expression: "render_bottom_popup(&app.chat_widget, 100)"
│
│
│
- │
- ctrl+c quit · actions paused until the list is refreshed
+ Reconnecting — agent list is stale
diff --git a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__navigation_reconnect__daemon_command_center_failed.snap b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__navigation_reconnect__daemon_command_center_failed.snap
index a30c430a48..d6aaeaea36 100644
--- a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__navigation_reconnect__daemon_command_center_failed.snap
+++ b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__navigation_reconnect__daemon_command_center_failed.snap
@@ -2,14 +2,14 @@
source: tui/src/app/tests/navigation_reconnect_tests.rs
expression: "render_bottom_popup(&app.chat_widget, 100)"
---
- Agent command center
- Reconnect failed — agent list is stale; relaunch to retry
+ Agent command center Group: Project g
+ 0 need input 1 working 1 ready
────────────────────────────────────────────────────────────────────────────────────────────────
- Tasks │ Task details
- /tmp/project 2 │
- › ● Selected task │ Selected task
- ○ Vanished task │ ● Working
- │
+ Rename › Keep this task draft! │ Task details
+ Tasks │
+ /tmp/project 2 │ Selected task
+ › ● Selected task │ ● Working
+ ○ Vanished task │
│ Project
│ /tmp/project
│ Model: Unknown
@@ -24,5 +24,5 @@ expression: "render_bottom_popup(&app.chat_widget, 100)"
│
│
│
- Rename › Keep this task draft!
- esc cancel · actions paused until reconnected
+ │
+ Reconnect failed — agent list is stale; relaunch to retry
diff --git a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__navigation_reconnect__daemon_command_center_reconnecting.snap b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__navigation_reconnect__daemon_command_center_reconnecting.snap
index dac2cb43de..7f9fc9290b 100644
--- a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__navigation_reconnect__daemon_command_center_reconnecting.snap
+++ b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__navigation_reconnect__daemon_command_center_reconnecting.snap
@@ -2,14 +2,14 @@
source: tui/src/app/tests/navigation_reconnect_tests.rs
expression: "render_bottom_popup(&app.chat_widget, 100)"
---
- Agent command center
- Reconnecting — agent list is stale
+ Agent command center Group: Project g
+ 0 need input 1 working 1 ready
────────────────────────────────────────────────────────────────────────────────────────────────
- Tasks │ Task details
- /tmp/project 2 │
- › ● Selected task │ Selected task
- ○ Vanished task │ ● Working
- │
+ Rename › Keep this task draft! │ Task details
+ Tasks │
+ /tmp/project 2 │ Selected task
+ › ● Selected task │ ● Working
+ ○ Vanished task │
│ Project
│ /tmp/project
│ Model: Unknown
@@ -24,5 +24,5 @@ expression: "render_bottom_popup(&app.chat_widget, 100)"
│
│
│
- Rename › Keep this task draft!
- esc cancel · actions paused until reconnected
+ │
+ Reconnecting — agent list is stale
diff --git a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__navigation_reconnect__daemon_command_center_vanished_rename.snap b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__navigation_reconnect__daemon_command_center_vanished_rename.snap
index dcdba4b934..42107d8c50 100644
--- a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__navigation_reconnect__daemon_command_center_vanished_rename.snap
+++ b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__navigation_reconnect__daemon_command_center_vanished_rename.snap
@@ -2,14 +2,14 @@
source: tui/src/app/tests/navigation_reconnect_tests.rs
expression: "render_bottom_popup(&app.chat_widget, 100)"
---
- Service v2.0.0 ≠ Codex CLI v0.0.0 · /daemon
+ Agent command center Group: Project g
0 need input 1 working 1 ready
────────────────────────────────────────────────────────────────────────────────────────────────
- Tasks │ Task details
- /tmp/project 2 │
- › ● New task │ New task
- ○ Selected task │ ● Working
- │
+ Search tasks · f │ Task details
+ Tasks │
+ /tmp/project 2 │ New task
+ › ● New task │ ● Working
+ ○ Selected task │
│ Project
│ /tmp/project
│ Model: Unknown
@@ -24,5 +24,4 @@ expression: "render_bottom_popup(&app.chat_widget, 100)"
│
│
│
- ↑↓ navigate o resume enter open n new w new worktree f search g group: project r rename x stop
- h hide a archive del delete ctrl+c quit
+ Service v2.0.0 ≠ Codex CLI v0.0.0 · /daemon
diff --git a/codex-rs/tui/src/app/tests/startup.rs b/codex-rs/tui/src/app/tests/startup.rs
index 2de17ffac1..c5f43238be 100644
--- a/codex-rs/tui/src/app/tests/startup.rs
+++ b/codex-rs/tui/src/app/tests/startup.rs
@@ -1219,8 +1219,7 @@ async fn remote_overview_startup_hides_disabled_older_server_notice() -> Result<
let view = app.agents_overview_view(Vec::new(), /*selected_thread_id*/ None);
app.chat_widget.show_bottom_pane_view(Box::new(view));
let rendered = render_bottom_popup(&app.chat_widget, /*width*/ 80);
- insta::assert_snapshot!(rendered.lines().take(/*n*/ 2).collect::<Vec<_>>().join("\n"), @" Agent command center
- 0 need input 0 working 0 ready");
+ assert!(!rendered.contains("Service v"));
app.chat_widget.remote_connection =
crate::status::remote_connection::remote_connection_status_value(
&app.app_server_target,
@@ -1237,8 +1236,7 @@ async fn remote_overview_startup_hides_disabled_older_server_notice() -> Result<
app.local_settings.tui.show_server_version_notice = true;
app.refresh_server_version_overview_notice("2.1.0");
let rendered = render_bottom_popup(&app.chat_widget, /*width*/ 80);
- insta::assert_snapshot!(rendered.lines().take(/*n*/ 2).collect::<Vec<_>>().join("\n"), @" Service v2.0.0 < Codex CLI v2.1.0
- 0 need input 0 working 0 ready");
+ assert!(rendered.contains("Service v2.0.0 < Codex CLI v2.1.0"));
app.pending_server_version_notice =
Some(crate::status::remote_connection::ServerVersionNotice {
message: "Older service".to_string(),
diff --git a/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview.snap b/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview.snap
index 153095b16d..5f12e8d8d5 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview.snap
+++ b/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview.snap
@@ -2,15 +2,15 @@
source: tui/src/app/agents_overview_tests.rs
expression: "render_bottom_popup(&app.chat_widget,\n96).replace(&format!(\"{project} 3\"),\n&normalized_project_group).replace(&project, \"/tmp/project\")"
---
- Agent command center
+ Agent command center Group: Project g
1 need input 1 working 0 ready
────────────────────────────────────────────────────────────────────────────────────────────
- Tasks │ Task details
- /tmp/project 3 │
- › ● Build the dashboard current │ Build the dashboard
- ● Repair authentication │ ● Needs input
- ○ Review yesterday's changes │
- │ Agent: Inspect keyboard shortcuts
+ Search tasks · f │ Task details
+ Tasks │
+ /tmp/project 3 │ Build the dashboard
+ › ● Build the dashboard current │ ● Needs input
+ ● Repair authentication │
+ ○ Review yesterday's changes │ Agent: Inspect keyboard shortcuts
│ Open task to review.
│ Waiting for approval.
│
diff --git a/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_attention.snap b/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_attention.snap
index c3eef4eb15..33dfc744e9 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_attention.snap
+++ b/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_attention.snap
@@ -2,14 +2,14 @@
source: tui/src/app/agents_overview_tests.rs
expression: "render_bottom_popup(&app.chat_widget,\n96).replace(&format!(\"{project} 2\"),\n&normalized_group).replace(&project, \"/tmp/project\")"
---
- Agent command center
+ Agent command center Group: Project g
1 need input 0 working 0 ready
────────────────────────────────────────────────────────────────────────────────────────────
- Tasks │ Task details
- /tmp/project 2 │
- › ● Repair authentication │ Repair authentication
- ○ Investigate parser │ ● Needs input
- │
+ Search tasks · f │ Task details
+ Tasks │
+ /tmp/project 2 │ Repair authentication
+ › ● Repair authentication │ ● Needs input
+ ○ Investigate parser │
│ Agent: Check dependencies
│ Which dependency version should I use?
│ Open task to review.
diff --git a/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_empty_narrow.snap b/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_empty_narrow.snap
index 55df77cbf9..efc038313c 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_empty_narrow.snap
+++ b/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_empty_narrow.snap
@@ -2,9 +2,10 @@
source: tui/src/app/agents_overview_tests.rs
expression: rendered
---
- Agent command center
+ Agent command center Group: Project g
0 need input 0 working 0 ready
────────────────────────────────────────────
+ Search tasks · f
No tasks yet
@@ -21,7 +22,6 @@ expression: rendered
-
↑↓ navigate o resume enter open n new
w new worktree f search g group: project
r rename x stop h hide a archive del delete
diff --git a/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_last_message.snap b/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_last_message.snap
index 215a9ceeab..5fd18ef273 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_last_message.snap
+++ b/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_last_message.snap
@@ -2,14 +2,14 @@
source: tui/src/app/agents_overview_tests.rs
expression: "render_bottom_popup(&app.chat_widget,\n96).replace(&format!(\"{project} 2\"),\n&normalized_group).replace(&project, \"/tmp/project\")"
---
- Agent command center
+ Agent command center Group: Project g
1 need input 0 working 0 ready
────────────────────────────────────────────────────────────────────────────────────────────
- Tasks │ Task details
- /tmp/project 2 │
- ● Repair authentication │ Investigate parser
- › ○ Investigate parser │ ○ Inactive
- │
+ Search tasks · f │ Task details
+ Tasks │
+ /tmp/project 2 │ Investigate parser
+ ● Repair authentication │ ○ Inactive
+ › ○ Investigate parser │
│ Last message
│ Found the regression in the parser.
│ Found the regression in the parser.
diff --git a/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_live_activity.snap b/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_live_activity.snap
index 4be39e95d7..22318bd4ce 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_live_activity.snap
+++ b/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_live_activity.snap
@@ -2,13 +2,13 @@
source: tui/src/app/agents_overview_tests.rs
expression: "render_bottom_popup(&app.chat_widget,\n96).replace(&format!(\"{project} 1\"),\n&normalized_group).replace(&project, \"/tmp/project\")"
---
- Agent command center
+ Agent command center Group: Project g
0 need input 1 working 0 ready
────────────────────────────────────────────────────────────────────────────────────────────
- Tasks │ Task details
- /tmp/project 1 │
- › ● Check startup performance │ Check startup performance
- │ ● Working
+ Search tasks · f │ Task details
+ Tasks │
+ /tmp/project 1 │ Check startup performance
+ › ● Check startup performance │ ● Working
│
│ Latest activity
│ Checking cold-start regressions
diff --git a/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_worktree_grouping.snap b/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_worktree_grouping.snap
index 23542cb4c8..4f061440cb 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_worktree_grouping.snap
+++ b/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_worktree_grouping.snap
@@ -2,9 +2,10 @@
source: tui/src/app/agents_overview_tests.rs
expression: normalize_agent_center_snapshot(grouping)
---
- Agent command center
+ Agent command center Group: Project g
0 need input 0 working 4 ready
────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+ Search tasks · f
Tasks Status Updated
/tmp/worktree-root/primary 2
› ○ Task Ready 2m ago
@@ -24,5 +25,4 @@ expression: normalize_agent_center_snapshot(grouping)
-
↑↓ navigate o resume enter open n new w new worktree f search g group: project r rename x stop h hide a archive del delete ctrl+c quit
diff --git a/codex-rs/tui/tests/suite/directory_trust.rs b/codex-rs/tui/tests/suite/directory_trust.rs
index 9132dd4eb6..dd067d9265 100644
--- a/codex-rs/tui/tests/suite/directory_trust.rs
+++ b/codex-rs/tui/tests/suite/directory_trust.rs
@@ -149,7 +149,7 @@ async fn connected_trust_cancellation_and_acceptance_control_task_creation() ->
let mut terminal = PtyCodex::start(
&repo_root,
codex_home,
- &["do not submit this launch prompt"],
+ &["--no-alt-screen", "do not submit this launch prompt"],
)?;
let prompt = if trust_level.is_some() {
"Open restricted"
@@ -158,17 +158,16 @@ async fn connected_trust_cancellation_and_acceptance_control_task_creation() ->
};
for (expected, input) in [
(prompt, b"\x1b".as_slice()),
- ("n new", b"\x1b"),
("Launch-folder task", b"\x1b[Bn"),
(prompt, b"\x1b"),
("n new", b"n"),
("Folder access", b"\x1b"),
- ("o resume", b"o"),
+ ("Search tasks", b"o"),
("Resume a previous session", b"\x1b[C"),
("Untrusted saved task", b"\r"),
("Open existing task", b"\r"),
("moved-folder", b"\x1b"),
- ("o resume", b"n"),
+ ("Search tasks", b"n"),
(prompt, b"\r"),
] {
let is_consent = expected == prompt
@@ -182,10 +181,11 @@ async fn connected_trust_cancellation_and_acceptance_control_task_creation() ->
terminal
.screen_contents()
.lines()
- .skip_while(|line| line.trim() != "Folder access")
- .nth(/*n*/ 1)
- .map(str::trim),
- Some(repo_root.display().to_string().as_str())
+ .map(str::trim)
+ .skip_while(|line| *line != "Folder access")
+ .skip(/*n*/ 1)
+ .find(|line| !line.is_empty()),
+ Some(repo_root.to_string_lossy().as_ref())
);
}
if is_consent {