Lightweight coding agent that runs in your terminal
Rust
Remove the plus separator after Option symbols in TUI key hints (#49136)
Benjamin Carlssond7f7fa410698
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__owned_transcript__tests__owned_history_loading_footer.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__owned_transcript__tests__owned_history_loading_footer.snapindex da3be283b3..c1cfae6862 100644--- a/codex-rs/tui/src/app/snapshots/codex_tui__app__owned_transcript__tests__owned_history_loading_footer.snap+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__owned_transcript__tests__owned_history_loading_footer.snap@@ -9,7 +9,7 @@ expression: "snapshots.join(\"\\n\\n\")"↑ Loading earlier messages… · esc latest80 columns · Failed- Retry history: ⌥+</ctrl+home. esc latest+ Retry history: ⌥</ctrl+home. esc latest80 columns · Completeesc latest@@ -21,7 +21,7 @@ expression: "snapshots.join(\"\\n\\n\")"↑ Loading… · esc latest40 columns · Failed- Retry: ⌥+</ctrl+home+ Retry: ⌥</ctrl+home40 columns · Completeesc latest@@ -33,7 +33,7 @@ expression: "snapshots.join(\"\\n\\n\")"↑ Loading… · esc latest28 columns · Failed- Retry: ⌥+</ctrl+home+ Retry: ⌥</ctrl+home28 columns · Completeesc latestdiff --git a/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs b/codex-rs/tui/src/app/tests/session_lifecycle_requests.rsindex c4ceee02cf..0007879bd2 100644--- a/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs+++ b/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs@@ -4370,7 +4370,7 @@ fn session_lifecycle_avoids_redundant_subagent_metadata_reads() -> Result<()> {.replace(&child_thread_id.to_string(), "[child]"),@r###"Subagents- Select an agent to watch. ⌥+← previous, ⌥+→ next.+ Select an agent to watch. ⌥← previous, ⌥→ next.› 1. • Main [default] (current) [root]diff --git a/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__sparkle__tests__shortcut_help_hides_visible_sparkles_without_restarting_their_deadline.snap b/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__sparkle__tests__shortcut_help_hides_visible_sparkles_without_restarting_their_deadline.snapindex 3016ed7189..79185244d1 100644--- a/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__sparkle__tests__shortcut_help_hides_visible_sparkles_without_restarting_their_deadline.snap+++ b/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__sparkle__tests__shortcut_help_hides_visible_sparkles_without_restarting_their_deadline.snap@@ -13,18 +13,18 @@ shortcut help:Compose Session/ Commands tab Send message- @ Mention files ⌥+, Less reasoning- ! Shell command ⌥+. More reasoning+ @ Mention files ⌥, Less reasoning+ ! Shell command ⌥. More reasoningctrl+j New line f4 Inspect activityctrl+v Paste image ctrl+c Quitctrl+g External editorctrl+r Search history Transcript (open first)- esc esc Edit last message ctrl+t Open transcript- f3 Find text- pgup / pgdn Scroll- ctrl+space Start selection- ctrl+home / ctrl+end Top / latest- shift+⌥+, / shift+⌥+. Top / latest+ esc esc Edit last message ctrl+t Open transcript+ f3 Find text+ pgup / pgdn Scroll+ ctrl+space Start selection+ ctrl+home / ctrl+end Top / latest+ shift+⌥, / shift+⌥. Top / latest/keymap customize@@ -48,18 +48,18 @@ shortcut help:Compose Session/ Commands tab Send message- @ Mention files ⌥+, Less reasoning- ! Shell command ⌥+. More reasoning+ @ Mention files ⌥, Less reasoning+ ! Shell command ⌥. More reasoningctrl+j New line f4 Inspect activityctrl+v Paste image ctrl+c Quitctrl+g External editorctrl+r Search history Transcript (open first)- esc esc Edit last message ctrl+t Open transcript- f3 Find text- pgup / pgdn Scroll- ctrl+space Start selection- ctrl+home / ctrl+end Top / latest- shift+⌥+, / shift+⌥+. Top / latest+ esc esc Edit last message ctrl+t Open transcript+ f3 Find text+ pgup / pgdn Scroll+ ctrl+space Start selection+ ctrl+home / ctrl+end Top / latest+ shift+⌥, / shift+⌥. Top / latest/keymap customizediff --git a/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__sparkle__tests__shortcut_help_preserves_an_unused_sparkle_but_literal_question_marks_do_not.snap b/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__sparkle__tests__shortcut_help_preserves_an_unused_sparkle_but_literal_question_marks_do_not.snapindex bcebcd4bb5..0e43b92df4 100644--- a/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__sparkle__tests__shortcut_help_preserves_an_unused_sparkle_but_literal_question_marks_do_not.snap+++ b/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__sparkle__tests__shortcut_help_preserves_an_unused_sparkle_but_literal_question_marks_do_not.snap@@ -7,18 +7,18 @@ shortcut help:Compose Session/ Commands tab Send message- @ Mention files ⌥+, Less reasoning- ! Shell command ⌥+. More reasoning+ @ Mention files ⌥, Less reasoning+ ! Shell command ⌥. More reasoningctrl+j New line f4 Inspect activityctrl+v Paste image ctrl+c Quitctrl+g External editorctrl+r Search history Transcript (open first)- esc esc Edit last message ctrl+t Open transcript- f3 Find text- pgup / pgdn Scroll- ctrl+space Start selection- ctrl+home / ctrl+end Top / latest- shift+⌥+, / shift+⌥+. Top / latest+ esc esc Edit last message ctrl+t Open transcript+ f3 Find text+ pgup / pgdn Scroll+ ctrl+space Start selection+ ctrl+home / ctrl+end Top / latest+ shift+⌥, / shift+⌥. Top / latest/keymap customizediff --git a/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__status_surface__tests__activity_shortcut_help_follows_runtime_binding.snap b/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__status_surface__tests__activity_shortcut_help_follows_runtime_binding.snapindex 1d3d9c8311..bdd1b21550 100644--- a/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__status_surface__tests__activity_shortcut_help_follows_runtime_binding.snap+++ b/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__status_surface__tests__activity_shortcut_help_follows_runtime_binding.snap@@ -14,12 +14,12 @@ expression: "snapshots.join(\"\\n---\\n\")"Keyboard shortcutsCompose Session Transcript (open first)- / Commands tab Send message ctrl+t Open transcript- @ Mention files ⌥+, Less reasoning f3 Find text- ! Shell command ⌥+. More reasoning pgup / pgdn Scroll- ctrl+j New line f4 Inspect activity ctrl+space Start selection- ctrl+v Paste image ctrl+c Quit ctrl+home / ctrl+end Top / latest- ctrl+g External editor shift+⌥+, / shift+⌥+. Top / latest+ / Commands tab Send message ctrl+t Open transcript+ @ Mention files ⌥, Less reasoning f3 Find text+ ! Shell command ⌥. More reasoning pgup / pgdn Scroll+ ctrl+j New line f4 Inspect activity ctrl+space Start selection+ ctrl+v Paste image ctrl+c Quit ctrl+home / ctrl+end Top / latest+ ctrl+g External editor shift+⌥, / shift+⌥. Top / latestctrl+r Search historyesc esc Edit last message@@ -42,12 +42,12 @@ expression: "snapshots.join(\"\\n---\\n\")"Keyboard shortcutsCompose Session Transcript (open first)- / Commands tab Send message ctrl+t Open transcript- @ Mention files ⌥+, Less reasoning f3 Find text- ! Shell command ⌥+. More reasoning pgup / pgdn Scroll- ctrl+j New line ctrl+x t Inspect activity ctrl+space Start selection- ctrl+v Paste image ctrl+c Quit ctrl+home / ctrl+end Top / latest- ctrl+g External editor shift+⌥+, / shift+⌥+. Top / latest+ / Commands tab Send message ctrl+t Open transcript+ @ Mention files ⌥, Less reasoning f3 Find text+ ! Shell command ⌥. More reasoning pgup / pgdn Scroll+ ctrl+j New line ctrl+x t Inspect activity ctrl+space Start selection+ ctrl+v Paste image ctrl+c Quit ctrl+home / ctrl+end Top / latest+ ctrl+g External editor shift+⌥, / shift+⌥. Top / latestctrl+r Search historyesc esc Edit last message@@ -70,12 +70,12 @@ expression: "snapshots.join(\"\\n---\\n\")"Keyboard shortcutsCompose Session Transcript (open first)- / Commands tab Send message ctrl+t Open transcript- @ Mention files ⌥+, Less reasoning f3 Find text- ! Shell command ⌥+. More reasoning pgup / pgdn Scroll- ctrl+j New line ctrl+c Quit ctrl+space Start selection- ctrl+v Paste image ctrl+home / ctrl+end Top / latest- ctrl+g External editor shift+⌥+, / shift+⌥+. Top / latest+ / Commands tab Send message ctrl+t Open transcript+ @ Mention files ⌥, Less reasoning f3 Find text+ ! Shell command ⌥. More reasoning pgup / pgdn Scroll+ ctrl+j New line ctrl+c Quit ctrl+space Start selection+ ctrl+v Paste image ctrl+home / ctrl+end Top / latest+ ctrl+g External editor shift+⌥, / shift+⌥. Top / latestctrl+r Search historyesc esc Edit last messagediff --git a/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__status_surface__tests__shortcut_help_above_narrow.snap b/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__status_surface__tests__shortcut_help_above_narrow.snapindex 84f7c14204..cb5cc69d5e 100644--- a/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__status_surface__tests__shortcut_help_above_narrow.snap+++ b/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__status_surface__tests__shortcut_help_above_narrow.snap@@ -24,18 +24,18 @@ expression: textSessiontab Send message- ⌥+, Less reasoning- ⌥+. More reasoning+ ⌥, Less reasoning+ ⌥. More reasoningf4 Inspect activityctrl+c QuitTranscript (open first)- ctrl+t Open transcript- f3 Find text- pgup / pgdn Scroll- ctrl+space Start selection- ctrl+home / ctrl+end Top / latest- shift+⌥+, / shift+⌥+. Top / latest+ ctrl+t Open transcript+ f3 Find text+ pgup / pgdn Scroll+ ctrl+space Start selection+ ctrl+home / ctrl+end Top / latest+ shift+⌥, / shift+⌥. Top / latest/keymap customizediff --git a/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__status_surface__tests__shortcut_help_above_wide.snap b/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__status_surface__tests__shortcut_help_above_wide.snapindex 304ad3ed39..e7493456d0 100644--- a/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__status_surface__tests__shortcut_help_above_wide.snap+++ b/codex-rs/tui/src/bottom_pane/chat_composer/snapshots/codex_tui__bottom_pane__chat_composer__status_surface__tests__shortcut_help_above_wide.snap@@ -13,12 +13,12 @@ expression: textKeyboard shortcutsCompose Session Transcript (open first)- / Commands tab Send message ctrl+t Open transcript- @ Mention files ⌥+, Less reasoning f3 Find text- ! Shell command ⌥+. More reasoning pgup / pgdn Scroll- ctrl+j New line f4 Inspect activity ctrl+space Start selection- ctrl+v Paste image ctrl+c Quit ctrl+home / ctrl+end Top / latest- ctrl+g External editor shift+⌥+, / shift+⌥+. Top / latest+ / Commands tab Send message ctrl+t Open transcript+ @ Mention files ⌥, Less reasoning f3 Find text+ ! Shell command ⌥. More reasoning pgup / pgdn Scroll+ ctrl+j New line f4 Inspect activity ctrl+space Start selection+ ctrl+v Paste image ctrl+c Quit ctrl+home / ctrl+end Top / latest+ ctrl+g External editor shift+⌥, / shift+⌥. Top / latestctrl+r Search historyesc esc Edit last messagediff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__agents_navigation_help.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__agents_navigation_help.snapindex 4fd8fbc9a1..5ebf53ced5 100644--- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__agents_navigation_help.snap+++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__agents_navigation_help.snap@@ -6,19 +6,19 @@ expression: terminal.backend()" "" Compose Session "" / Commands tab Send message "-" @ Mention files ⌥+, Less reasoning "-" ! Shell command ⌥+. More reasoning "+" @ Mention files ⌥, Less reasoning "+" ! Shell command ⌥. More reasoning "" ctrl+j New line ← Agents (empty prompt) "" ctrl+v Paste image f4 Inspect activity "" ctrl+g External editor ctrl+c Quit "" ctrl+r Search history "" esc esc Edit last message Transcript (open first) "-" ctrl+t Open transcript "-" f3 Find text "-" pgup / pgdn Scroll "-" ctrl+space Start selection "-" ctrl+home / ctrl+end Top / latest "-" shift+⌥+, / shift+⌥+. Top / latest "+" ctrl+t Open transcript "+" f3 Find text "+" pgup / pgdn Scroll "+" ctrl+space Start selection "+" ctrl+home / ctrl+end Top / latest "+" shift+⌥, / shift+⌥. Top / latest "" "" /keymap customize "" "diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__footer_mode_configured_key_chords.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__footer_mode_configured_key_chords.snapindex ac5dc30da6..bd11f949ed 100644--- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__footer_mode_configured_key_chords.snap+++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__footer_mode_configured_key_chords.snap@@ -6,18 +6,18 @@ expression: terminal.backend()" "" Compose Session "" / Commands tab Send message "-" @ Mention files ⌥+, Less reasoning "-" ! Shell command ⌥+. More reasoning "+" @ Mention files ⌥, Less reasoning "+" ! Shell command ⌥. More reasoning "" ctrl+x enter New line f4 Inspect activity "" ctrl+v Paste image ctrl+c Quit "" ctrl+g ctrl+g External editor "" ctrl+r Search history Transcript (open first) "-" esc esc Edit last message ctrl+t Open transcript "-" f3 Find text "-" pgup / pgdn Scroll "-" ctrl+space Start selection "-" ctrl+home / ctrl+end Top / latest "-" shift+⌥+, / shift+⌥+. Top / latest "+" esc esc Edit last message ctrl+t Open transcript "+" f3 Find text "+" pgup / pgdn Scroll "+" ctrl+space Start selection "+" ctrl+home / ctrl+end Top / latest "+" shift+⌥, / shift+⌥. Top / latest "" "" /keymap customize "" "diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__footer_mode_shortcut_overlay.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__footer_mode_shortcut_overlay.snapindex 3b60d2cf47..ad70ddb279 100644--- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__footer_mode_shortcut_overlay.snap+++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__footer_mode_shortcut_overlay.snap@@ -6,18 +6,18 @@ expression: terminal.backend()" "" Compose Session "" / Commands tab Send message "-" @ Mention files ⌥+, Less reasoning "-" ! Shell command ⌥+. More reasoning "+" @ Mention files ⌥, Less reasoning "+" ! Shell command ⌥. More reasoning "" shift+enter New line f4 Inspect activity "" ctrl+v Paste image ctrl+c Quit "" ctrl+g External editor "" ctrl+r Search history Transcript (open first) "-" esc Edit last message ctrl+t Open transcript "-" f3 Find text "-" pgup / pgdn Scroll "-" ctrl+space Start selection "-" ctrl+home / ctrl+end Top / latest "-" shift+⌥+, / shift+⌥+. Top / latest "+" esc Edit last message ctrl+t Open transcript "+" f3 Find text "+" pgup / pgdn Scroll "+" ctrl+space Start selection "+" ctrl+home / ctrl+end Top / latest "+" shift+⌥, / shift+⌥. Top / latest "" "" /keymap customize "" "diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__footer_mode_shortcut_overlay_queue_submissions.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__footer_mode_shortcut_overlay_queue_submissions.snapindex 2c3774ef66..3729a7708f 100644--- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__footer_mode_shortcut_overlay_queue_submissions.snap+++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__footer_mode_shortcut_overlay_queue_submissions.snap@@ -6,18 +6,18 @@ expression: terminal.backend()" "" Compose Session "" / Commands tab Queue message "-" @ Mention files ⌥+, Less reasoning "-" ! Shell command ⌥+. More reasoning "+" @ Mention files ⌥, Less reasoning "+" ! Shell command ⌥. More reasoning "" shift+enter New line f4 Inspect activity "" ctrl+v Paste image ctrl+c Quit "" ctrl+g External editor "" ctrl+r Search history Transcript (open first) "-" esc esc Edit last message ctrl+t Open transcript "-" f3 Find text "-" pgup / pgdn Scroll "-" ctrl+space Start selection "-" ctrl+home / ctrl+end Top / latest "-" shift+⌥+, / shift+⌥+. Top / latest "+" esc esc Edit last message ctrl+t Open transcript "+" f3 Find text "+" pgup / pgdn Scroll "+" ctrl+space Start selection "+" ctrl+home / ctrl+end Top / latest "+" shift+⌥, / shift+⌥. Top / latest "" "" /keymap customize "" "diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__footer__tests__footer_shortcuts_collaboration_modes_enabled.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__footer__tests__footer_shortcuts_collaboration_modes_enabled.snapindex 191f6faff5..400c4dd0a4 100644--- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__footer__tests__footer_shortcuts_collaboration_modes_enabled.snap+++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__footer__tests__footer_shortcuts_collaboration_modes_enabled.snap@@ -7,18 +7,18 @@ expression: terminal.backend()" Compose Session "" / Commands tab Send message "" @ Mention files shift+tab Change mode "-" ! Shell command ⌥+, Less reasoning "-" ctrl+j New line ⌥+. More reasoning "+" ! Shell command ⌥, Less reasoning "+" ctrl+j New line ⌥. More reasoning "" ctrl+v Paste image f8 Voice "" ctrl+g External editor f4 Inspect activity "" ctrl+r Search history ctrl+c Quit "" esc esc Edit last message "" Transcript (open first) "-" ctrl+t Open transcript "-" f3 Find text "-" pgup / pgdn Scroll "-" ctrl+space Start selection "-" ctrl+home / ctrl+end Top / latest "-" shift+⌥+, / shift+⌥+. Top / latest "+" ctrl+t Open transcript "+" f3 Find text "+" pgup / pgdn Scroll "+" ctrl+space Start selection "+" ctrl+home / ctrl+end Top / latest "+" shift+⌥, / shift+⌥. Top / latest "" "" /keymap customize "diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__footer__tests__footer_shortcuts_running.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__footer__tests__footer_shortcuts_running.snapindex 96ca5ec3f8..24675e60be 100644--- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__footer__tests__footer_shortcuts_running.snap+++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__footer__tests__footer_shortcuts_running.snap@@ -6,18 +6,18 @@ expression: terminal.backend()" "" Compose Session "" / Commands tab Queue message "-" @ Mention files ⌥+, Less reasoning "-" ! Shell command ⌥+. More reasoning "+" @ Mention files ⌥, Less reasoning "+" ! Shell command ⌥. More reasoning "" ctrl+j New line f8 Voice "" ctrl+v Paste image f4 Inspect activity "" ctrl+g External editor ctrl+c Interrupt "" ctrl+r Search history "" esc esc Edit last message Transcript (open first) "-" ctrl+t Open transcript "-" f3 Find text "-" pgup / pgdn Scroll "-" ctrl+space Start selection "-" ctrl+home / ctrl+end Top / latest "-" shift+⌥+, / shift+⌥+. Top / latest "+" ctrl+t Open transcript "+" f3 Find text "+" pgup / pgdn Scroll "+" ctrl+space Start selection "+" ctrl+home / ctrl+end Top / latest "+" shift+⌥, / shift+⌥. Top / latest "" "" /keymap customize "diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__footer__tests__footer_shortcuts_shift_and_esc.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__footer__tests__footer_shortcuts_shift_and_esc.snapindex 5ecba9d728..8728b00f08 100644--- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__footer__tests__footer_shortcuts_shift_and_esc.snap+++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__footer__tests__footer_shortcuts_shift_and_esc.snap@@ -6,18 +6,18 @@ expression: terminal.backend()" "" Compose Session "" / Commands tab Send message "-" @ Mention files ⌥+, Less reasoning "-" ! Shell command ⌥+. More reasoning "+" @ Mention files ⌥, Less reasoning "+" ! Shell command ⌥. More reasoning "" shift+enter New line f8 Voice "" ctrl+v Paste image f4 Inspect activity "" ctrl+g External editor ctrl+c Quit "" ctrl+r Search history "" esc Edit last message Transcript (open first) "-" ctrl+t Open transcript "-" f3 Find text "-" pgup / pgdn Scroll "-" ctrl+space Start selection "-" ctrl+home / ctrl+end Top / latest "-" shift+⌥+, / shift+⌥+. Top / latest "+" ctrl+t Open transcript "+" f3 Find text "+" pgup / pgdn Scroll "+" ctrl+space Start selection "+" ctrl+home / ctrl+end Top / latest "+" shift+⌥, / shift+⌥. Top / latest "" "" /keymap customize "diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__shortcut_overlay__tests__shortcut_overlay_customized_wsl.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__shortcut_overlay__tests__shortcut_overlay_customized_wsl.snapindex 44e3afb8fe..9cf8743531 100644--- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__shortcut_overlay__tests__shortcut_overlay_customized_wsl.snap+++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__shortcut_overlay__tests__shortcut_overlay_customized_wsl.snap@@ -7,18 +7,18 @@ expression: terminal.backend()" Compose Session "" / Commands tab Send message "" @ Mention files shift+tab Change mode "-" ! Shell command ⌥+. More reasoning "+" ! Shell command ⌥. More reasoning "" shift+enter New line f8 Voice "-" ctrl+⌥+v Paste image ← Agents (empty prompt) "+" ctrl+⌥v Paste image ← Agents (empty prompt) "" ctrl+x ctrl+e External editor f4 Inspect activity "" esc Edit last message ctrl+c Quit "" "" Transcript (open first) "-" ctrl+t Open transcript "-" f3 Find text "-" pgup / pgdn Scroll "-" ctrl+space Start selection "-" ctrl+home / ctrl+end Top / latest "-" shift+⌥+, / shift+⌥+. Top / latest "+" ctrl+t Open transcript "+" f3 Find text "+" pgup / pgdn Scroll "+" ctrl+space Start selection "+" ctrl+home / ctrl+end Top / latest "+" shift+⌥, / shift+⌥. Top / latest "" "" /keymap customize "diff --git a/codex-rs/tui/src/chatwidget/tests/snapshots/codex_tui__chatwidget__tests__questions_tests__question_queue_hint_Up.snap b/codex-rs/tui/src/chatwidget/tests/snapshots/codex_tui__chatwidget__tests__questions_tests__question_queue_hint_Up.snapindex 0a07dbe628..9e4b422a7a 100644--- a/codex-rs/tui/src/chatwidget/tests/snapshots/codex_tui__chatwidget__tests__questions_tests__question_queue_hint_Up.snap+++ b/codex-rs/tui/src/chatwidget/tests/snapshots/codex_tui__chatwidget__tests__questions_tests__question_queue_hint_Up.snap@@ -11,4 +11,4 @@ expression: "render_bottom_popup(&chat, 100)"Type your answer- enter submit ctrl+] skip ⌥+↓ main prompt ⌥+↑ next question+ enter submit ctrl+] skip ⌥↓ main prompt ⌥↑ next questiondiff --git a/codex-rs/tui/src/key_hint.rs b/codex-rs/tui/src/key_hint.rsindex f9e2c41b50..1a46573714 100644--- a/codex-rs/tui/src/key_hint.rs+++ b/codex-rs/tui/src/key_hint.rs@@ -89,7 +89,9 @@ impl KeyBinding {] {if self.modifiers.contains(modifier) {label.push_str(name);- label.push('+');+ if !matches!(name, "⌥" | "⌘" | "^") {+ label.push('+');+ }}}let key = match self.key {diff --git a/codex-rs/tui/src/key_hint_label_tests.rs b/codex-rs/tui/src/key_hint_label_tests.rsindex be15328df9..d717f8b387 100644--- a/codex-rs/tui/src/key_hint_label_tests.rs+++ b/codex-rs/tui/src/key_hint_label_tests.rs@@ -11,9 +11,9 @@ use ratatui::widgets::Paragraph;fn modifier_combinations_stay_compact_inside_chords() {let cases = [(KeyModifiers::CONTROL, "ctrl+t"),- (KeyModifiers::ALT, "⌥+t"),+ (KeyModifiers::ALT, "⌥t"),(KeyModifiers::CONTROL | KeyModifiers::SHIFT, "ctrl+shift+t"),- (KeyModifiers::CONTROL | KeyModifiers::ALT, "ctrl+⌥+t"),+ (KeyModifiers::CONTROL | KeyModifiers::ALT, "ctrl+⌥t"),];for (modifiers, expected) in cases {let prefix = KeyBinding::new(KeyCode::Char('t'), modifiers);diff --git a/codex-rs/tui/src/keymap/chords_tests.rs b/codex-rs/tui/src/keymap/chords_tests.rsindex 148259f52e..451faa5778 100644--- a/codex-rs/tui/src/keymap/chords_tests.rs+++ b/codex-rs/tui/src/keymap/chords_tests.rs@@ -589,8 +589,8 @@ fn pending_hint_skips_whole_oversized_configured_completions() {assert_eq!(scenes,[- "80: ctrl+x then · shift+⌥+f11 activity · ctrl+shift+⌥+f12 copy · esc cancel",- "32: shift+⌥+f11 inspect · esc cancel",+ "80: ctrl+x then · shift+⌥f11 activity · ctrl+shift+⌥f12 copy · esc cancel",+ "32: shift+⌥f11 inspect · esc cancel","12: esc cancel",]);diff --git a/codex-rs/tui/src/pager_overlay/snapshots/codex_tui__pager_overlay__transcript_tests__transcript_overlay_paginated_history_states.snap b/codex-rs/tui/src/pager_overlay/snapshots/codex_tui__pager_overlay__transcript_tests__transcript_overlay_paginated_history_states.snapindex 94e53e1df6..2fcab53e1a 100644--- a/codex-rs/tui/src/pager_overlay/snapshots/codex_tui__pager_overlay__transcript_tests__transcript_overlay_paginated_history_states.snap+++ b/codex-rs/tui/src/pager_overlay/snapshots/codex_tui__pager_overlay__transcript_tests__transcript_overlay_paginated_history_states.snap@@ -1,6 +1,5 @@---source: tui/src/pager_overlay/transcript_tests.rs-assertion_line: 417expression: snapshots------ loading ---@@ -32,7 +31,7 @@ recent transcript-Retry history: ⌥+</ctrl+home.+Retry history: ⌥</ctrl+home.diff --git a/codex-rs/tui/src/pager_overlay/snapshots/codex_tui__pager_overlay__transcript_tests__transcript_overlay_paginated_history_states_non_macos.snap b/codex-rs/tui/src/pager_overlay/snapshots/codex_tui__pager_overlay__transcript_tests__transcript_overlay_paginated_history_states_non_macos.snapindex 94e53e1df6..b47f785c93 100644--- a/codex-rs/tui/src/pager_overlay/snapshots/codex_tui__pager_overlay__transcript_tests__transcript_overlay_paginated_history_states_non_macos.snap+++ b/codex-rs/tui/src/pager_overlay/snapshots/codex_tui__pager_overlay__transcript_tests__transcript_overlay_paginated_history_states_non_macos.snap@@ -32,7 +32,7 @@ recent transcript-Retry history: ⌥+</ctrl+home.+Retry history: ⌥</ctrl+home.diff --git a/codex-rs/tui/src/snapshots/codex_tui__app__tests__path_backed_agent_picker.snap b/codex-rs/tui/src/snapshots/codex_tui__app__tests__path_backed_agent_picker.snapindex ab3252682c..38f1898fc5 100644--- a/codex-rs/tui/src/snapshots/codex_tui__app__tests__path_backed_agent_picker.snap+++ b/codex-rs/tui/src/snapshots/codex_tui__app__tests__path_backed_agent_picker.snap@@ -3,7 +3,7 @@ source: tui/src/app/tests.rsexpression: "render_bottom_popup(&app.chat_widget, 80)"---Subagents- Select an agent to watch. ⌥+← previous, ⌥+→ next.+ Select an agent to watch. ⌥← previous, ⌥→ next.› 1. • /root/worker 00000000-0000-0000-0000-000000000123diff --git a/codex-rs/tui/src/snapshots/codex_tui__app__tests__untracked_thread_notifications_agent_picker.snap b/codex-rs/tui/src/snapshots/codex_tui__app__tests__untracked_thread_notifications_agent_picker.snapindex c2024241e8..8a986b13e0 100644--- a/codex-rs/tui/src/snapshots/codex_tui__app__tests__untracked_thread_notifications_agent_picker.snap+++ b/codex-rs/tui/src/snapshots/codex_tui__app__tests__untracked_thread_notifications_agent_picker.snap@@ -3,7 +3,7 @@ source: tui/src/app/tests.rsexpression: "render_bottom_popup(&app.chat_widget, 80)"---Subagents- Select an agent to watch. ⌥+← previous, ⌥+→ next.+ Select an agent to watch. ⌥← previous, ⌥→ next.› 1. • Main [default] (current) 00000000-0000-0000-0000-000000000123diff --git a/codex-rs/tui/src/tooltips/snapshots/codex_tui__tooltips__keybinding_tests__configured_shortcut_tips_render_at_narrow_width.snap b/codex-rs/tui/src/tooltips/snapshots/codex_tui__tooltips__keybinding_tests__configured_shortcut_tips_render_at_narrow_width.snapindex 8eb1c85b91..f90948016d 100644--- a/codex-rs/tui/src/tooltips/snapshots/codex_tui__tooltips__keybinding_tests__configured_shortcut_tips_render_at_narrow_width.snap+++ b/codex-rs/tui/src/tooltips/snapshots/codex_tui__tooltips__keybinding_tests__configured_shortcut_tips_render_at_narrow_width.snap@@ -1,6 +1,5 @@---source: tui/src/tooltips/keybinding_tests.rs-assertion_line: 42expression: "lines.iter().map(|line| format!(\"{line:?}\")).collect::<Vec<_>>().join(\"\\n\")"---Line::from("Default")@@ -24,8 +23,8 @@ Line::from_iter([Span::from("Tip:").bold(), Span::from(" Press "), Span::from("cLine::from("entered prompts.")Line::default()Line::from_iter([Span::from("Tip:").bold(), Span::from(" For models with adjustable")])-Line::from_iter([Span::from("reasoning, press "), Span::from("⌥+.").fg(Color::Rgb(166, 227, 161)), Span::from(" to increase")])-Line::from_iter([Span::from("reasoning effort or "), Span::from("⌥+,").fg(Color::Rgb(166, 227, 161)), Span::from(" to decrease it.")])+Line::from_iter([Span::from("reasoning, press "), Span::from("⌥.").fg(Color::Rgb(166, 227, 161)), Span::from(" to increase")])+Line::from_iter([Span::from("reasoning effort or "), Span::from("⌥,").fg(Color::Rgb(166, 227, 161)), Span::from(" to decrease it.")])Line::default()Line::from("Remapped")Line::from_iter([Span::from("Tip:").bold(), Span::from(" Press "), Span::from("ctrl+x q").fg(Color::Rgb(166, 227, 161)), Span::from(" to queue a message")])diff --git a/codex-rs/tui/src/transcript_view/footer_tests.rs b/codex-rs/tui/src/transcript_view/footer_tests.rsindex fd42877a39..db8e030d4a 100644--- a/codex-rs/tui/src/transcript_view/footer_tests.rs+++ b/codex-rs/tui/src/transcript_view/footer_tests.rs@@ -301,7 +301,7 @@ fn loading_completion_restores_unseen_activity_and_failure_stops_motion() {let failed = view.footer(/*width*/ 80, MotionMode::Reduced).expect("failed history footer");- insta::assert_snapshot!(failed.text.to_string(), @"New activity · Retry history: ⌥+</ctrl+home. esc latest");+ insta::assert_snapshot!(failed.text.to_string(), @"New activity · Retry history: ⌥</ctrl+home. esc latest");view.history = TranscriptHistoryState::Complete;assert!(!view.is_loading_history());assert_eq!(diff --git a/codex-rs/tui/src/transcript_view/snapshots/codex_tui__transcript_view__footer__tests__compact_navigation_hints.snap b/codex-rs/tui/src/transcript_view/snapshots/codex_tui__transcript_view__footer__tests__compact_navigation_hints.snapindex f92b0ef3fd..b74a9cff6f 100644--- a/codex-rs/tui/src/transcript_view/snapshots/codex_tui__transcript_view__footer__tests__compact_navigation_hints.snap+++ b/codex-rs/tui/src/transcript_view/snapshots/codex_tui__transcript_view__footer__tests__compact_navigation_hints.snap@@ -1,17 +1,16 @@---source: tui/src/transcript_view/footer_tests.rs-assertion_line: 240expression: "snapshots.join(\"\\n\")"---26 columns, LoadingOlder: ↑ Loading… · esc latest26 columns, LoadingBeginning: ↑ Loading… · esc latest-26 columns, Failed: Retry: ⌥+</ctrl+home+26 columns, Failed: Retry: ⌥</ctrl+home26 columns, Complete: New activity · esc latest38 columns, LoadingOlder: ↑ Loading… · esc latest38 columns, LoadingBeginning: ↑ Loading… · esc latest-38 columns, Failed: Retry: ⌥+</ctrl+home+38 columns, Failed: Retry: ⌥</ctrl+home38 columns, Complete: New activity · esc latest78 columns, LoadingOlder: ↑ Loading earlier messages… · New activity · esc latest78 columns, LoadingBeginning: ↑ Loading earlier messages… · New activity · esc latest-78 columns, Failed: New activity · Retry history: ⌥+</ctrl+home. esc latest+78 columns, Failed: New activity · Retry history: ⌥</ctrl+home. esc latest78 columns, Complete: New activity · esc latest