From d6a09dddcd7a42aaf74a1709c0b45fe252e77f15 Mon Sep 17 00:00:00 2001 From: Felipe Coury Date: Fri, 10 Apr 2026 18:57:31 -0300 Subject: [PATCH] test(tui): update keymap copy snapshots Use a non-copy chord in the queue shadowing regression test so it still reaches the intended composer conflict after `global.copy` claimed `ctrl-o`. Accept the keymap picker snapshots now that Copy is part of the configurable global keymap actions. --- codex-rs/tui/src/keymap.rs | 4 ++-- ...ap_setup__tests__keymap_picker_first_actions.snap | 2 +- ...i__keymap_setup__tests__keymap_picker_narrow.snap | 2 +- ...tui__keymap_setup__tests__keymap_picker_wide.snap | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/codex-rs/tui/src/keymap.rs b/codex-rs/tui/src/keymap.rs index 65a3f18b5c..5ae82babf7 100644 --- a/codex-rs/tui/src/keymap.rs +++ b/codex-rs/tui/src/keymap.rs @@ -1187,8 +1187,8 @@ mod tests { #[test] fn rejects_shadowing_composer_queue_in_app_scope() { let mut keymap = TuiKeymap::default(); - keymap.global.open_external_editor = Some(one("ctrl-o")); - keymap.composer.queue = Some(one("ctrl-o")); + keymap.global.open_external_editor = Some(one("ctrl-l")); + keymap.composer.queue = Some(one("ctrl-l")); let err = RuntimeKeymap::from_config(&keymap).expect_err("expected shadowing conflict"); assert!(err.contains("composer.queue")); diff --git a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_first_actions.snap b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_first_actions.snap index 9f44dd0475..5d06e15ecd 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_first_actions.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_first_actions.snap @@ -4,6 +4,7 @@ expression: snapshot --- Open Transcript | ctrl-t | Global open_transcript Open Transcript Open the transcript overlay. ctrl-t Open External Editor | ctrl-g | Global open_external_editor Open External Editor Open the current draft in an external editor. ctrl-g +Copy | ctrl-o | Global copy Copy Copy the last agent response to the clipboard. ctrl-o Toggle Vim Mode | unbound | Global toggle_vim_mode Toggle Vim Mode Turn Vim composer mode on or off. unbound Edit Previous Message | esc | Chat edit_previous_message Edit Previous Message Begin or advance edit-previous-message when the composer is empty. esc Confirm Edit Previous Message | enter | Chat confirm_edit_previous_message Confirm Edit Previous Message Confirm the selected previous message to edit. enter @@ -13,4 +14,3 @@ Toggle Shortcuts | ?, shift-? | Composer toggle_shortcuts Toggle Shortcuts Show Insert Newline | ctrl-j, ctrl-m, enter, shift-enter | Editor insert_newline Insert Newline Insert a newline in the editor. ctrl-j, ctrl-m, enter, shift-enter Move Left | left, ctrl-b | Editor move_left Move Left Move the cursor left. left, ctrl-b Move Right | right, ctrl-f | Editor move_right Move Right Move the cursor right. right, ctrl-f -Move Up | up, ctrl-p | Editor move_up Move Up Move the cursor up. up, ctrl-p diff --git a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_narrow.snap b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_narrow.snap index a707835579..262a4fcb81 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_narrow.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_narrow.snap @@ -9,12 +9,12 @@ expression: "render_picker(params, 78)" Search actions... › Global Open Transcript ctrl-t Global Open External Editor ctrl-g + Global Copy ctrl-o Global Toggle Vim Mode unbound Chat Edit Previous Message esc Chat Confirm Edit Previous Message enter Composer Submit enter Composer Queue tab - Composer Toggle Shortcuts ?, shift-? Open the transcript overlay. diff --git a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_wide.snap b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_wide.snap index ff074cf367..7fd77daf26 100644 --- a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_wide.snap +++ b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_picker_wide.snap @@ -9,12 +9,12 @@ expression: "render_picker(params, 120)" Search actions... Global global.open_transcript › Global Open Transcript ctrl-t Global Open External Editor ctrl-g Current: ctrl-t - Global Toggle Vim Mode unbound Source: default keymap - Chat Edit Previous Message esc - Chat Confirm Edit Previous Message enter Open the transcript overlay. - Composer Submit enter - Composer Queue tab Enter edits this shortcut - Composer Toggle Shortcuts ?, shift-? + Global Copy ctrl-o Source: default keymap + Global Toggle Vim Mode unbound + Chat Edit Previous Message esc Open the transcript overlay. + Chat Confirm Edit Previous Message enter + Composer Submit enter Enter edits this shortcut + Composer Queue tab Saves to root `tui.keymap.*` so shortcuts stay consistent across profiles. Press enter to confirm or esc to go back