Skip to content

Remove the plus separator after Option symbols in TUI key hints #49136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copyberry merged 1 commit into from
Sep 29, 2026
+142 −143
Merged

Remove the plus separator after Option symbols in TUI key hints #49136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Remove the plus separator after Option symbols in TUI key hints (#49136) 
## What changed

Render macOS Option shortcuts as `⌥t` and `ctrl+⌥t` instead of `⌥+t` and `ctrl+⌥+t`. Keep `+` separators after text modifier labels such as `ctrl`, `shift`, and `alt`.

## Testing

Update key-label and chord assertions and UI snapshots to expect the compact labels across shortcut help, navigation hints, and tooltips.

GitOrigin-RevId: 7d52088ebce3dfa3f8bdad65eb159ca0fead8a31
  • Loading branch information
@bc-openai copyberry
bc-openai authored and copyberry committed Sep 29, 2026
commit d7f7fa410698fbbb75548cde553a4fbf43fc268e
6 changes: 3 additions & 3 deletions .../app/snapshots/codex_tui__app__owned_transcript__tests__owned_history_loading_footer.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ expression: "snapshots.join(\"\\n\\n\")"
↑ Loading earlier messages… · esc latest

80 columns · Failed
Retry history: ⌥+</ctrl+home. esc latest
Retry history: ⌥</ctrl+home. esc latest

80 columns · Complete
esc latest
Expand All @@ -21,7 +21,7 @@ expression: "snapshots.join(\"\\n\\n\")"
↑ Loading… · esc latest

40 columns · Failed
Retry: ⌥+</ctrl+home
Retry: ⌥</ctrl+home

40 columns · Complete
esc latest
Expand All @@ -33,7 +33,7 @@ expression: "snapshots.join(\"\\n\\n\")"
↑ Loading… · esc latest

28 columns · Failed
Retry: ⌥+</ctrl+home
Retry: ⌥</ctrl+home

28 columns · Complete
esc latest
2 changes: 1 addition & 1 deletion codex-rs/tui/src/app/tests/session_lifecycle_requests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
32 changes: 16 additions & 16 deletions ...arkle__tests__shortcut_help_hides_visible_sparkles_without_restarting_their_deadline.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 reasoning
ctrl+j 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

Expand All @@ -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 reasoning
ctrl+j 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

Expand Down
16 changes: 8 additions & 8 deletions ...__tests__shortcut_help_preserves_an_unused_sparkle_but_literal_question_marks_do_not.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 reasoning
ctrl+j 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

Expand Down
36 changes: 18 additions & 18 deletions ...chat_composer__status_surface__tests__activity_shortcut_help_follows_runtime_binding.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ expression: "snapshots.join(\"\\n---\\n\")"
Keyboard shortcuts

Compose 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 / latest
ctrl+r Search history
esc esc Edit last message

Expand All @@ -42,12 +42,12 @@ expression: "snapshots.join(\"\\n---\\n\")"
Keyboard shortcuts

Compose 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 / latest
ctrl+r Search history
esc esc Edit last message

Expand All @@ -70,12 +70,12 @@ expression: "snapshots.join(\"\\n---\\n\")"
Keyboard shortcuts

Compose 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 / latest
ctrl+r Search history
esc esc Edit last message

Expand Down
16 changes: 8 additions & 8 deletions ...x_tui__bottom_pane__chat_composer__status_surface__tests__shortcut_help_above_narrow.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ expression: text

Session
tab Send message
⌥+, Less reasoning
⌥+. More reasoning
⌥, Less reasoning
⌥. More reasoning
f4 Inspect activity
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

Expand Down
12 changes: 6 additions & 6 deletions ...dex_tui__bottom_pane__chat_composer__status_surface__tests__shortcut_help_above_wide.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ expression: text
Keyboard shortcuts

Compose 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 / latest
ctrl+r Search history
esc esc Edit last message

Expand Down
16 changes: 8 additions & 8 deletions ..._pane/snapshots/codex_tui__bottom_pane__chat_composer__tests__agents_navigation_help.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
" "
Expand Down
16 changes: 8 additions & 8 deletions ...hots/codex_tui__bottom_pane__chat_composer__tests__footer_mode_configured_key_chords.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
" "
Expand Down
16 changes: 8 additions & 8 deletions ...snapshots/codex_tui__bottom_pane__chat_composer__tests__footer_mode_shortcut_overlay.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
" "
Expand Down
Loading
Loading