fix(tui): unify transcript-nav shortcuts under Alt+<key>; stop eating first letters
v0.8.29 spot-fixed `g` with a gg double-tap (commit c13ddb04d), but
the underlying bug class still affected `G`, `[`, `]`, `?`, `l`, and
both `v`/`V`: bare press on an empty composer hijacked the keystroke
for transcript navigation, swallowing the first character of a
message. Even the gg fix itself only suppressed the SCROLL — the
first `g` was still eaten, so typing "good morning" produced "ood
morning" with no whale and no warning.
Unified fix: all seven bindings now require the `Alt` modifier (same
pattern as the existing `Alt+R` history search and `Alt+V` tool
details). Plain letters always insert as text:
Alt+G → scroll to top
Alt+Shift+G → scroll to bottom
Alt+[ / Alt+] → previous / next tool output
Alt+? → open searchable help (F1 / Ctrl+/ also bound)
Alt+L → pager for the last message
Alt+V → tool-details pager (was already bound; only path now)
The `App::transcript_pending_g` field from the v0.8.29 half-fix is
removed along with its Esc / Enter / Char-catch-all resets. The
existing helper `details_shortcut_modifiers` (which accepted bare,
Shift, and Alt-only — the permissive predicate that ate the bare `v`
keystroke) is replaced by `alt_nav_modifiers`, which requires `Alt`,
allows `Shift`, and blocks `Ctrl` / `Super` so the bindings don't
collide with platform clipboard or window-management shortcuts.
Same modifier vocabulary as `Alt+R` / `Alt+P` / `Alt+1..3`, so this
makes the keymap more consistent rather than introducing a new
convention.
Regression-guarded by `alt_nav_modifiers_require_alt_and_exclude_ctrl_super`
in `crates/tui/src/tui/ui/tests.rs`, which exercises every modifier
combination the predicate needs to accept or reject. Full
`cargo test -p deepseek-tui` (2751 tests) passes; clippy clean; fmt
clean.
User-facing migration: any user who learned the bare-letter nav
shortcuts in v0.8.x needs to add `Alt+`. The trade-off is unambiguous
— losing the first letter of "good", "great", "let", "list", "very",
"verify", and anything starting with `?` was burning more users than
the bare-letter shortcuts were serving.
This commit is contained in:
Hunter Bown
@@ -883,12 +883,6 @@ pub struct App {
|
||||
/// Esc primes, second Esc opens the live-transcript overlay scoped to
|
||||
/// previous user messages so the user can rewind a turn.
|
||||
pub backtrack: crate::tui::backtrack::BacktrackState,
|
||||
/// Pending 'gg' second keystroke for vim-style jump-to-top of the
|
||||
/// transcript. Set by the first bare 'g' with an empty composer and
|
||||
/// consumed on the second 'g' to scroll to line 0. Any other
|
||||
/// navigation key resets it, so typing 'g' as the first character
|
||||
/// of a message only arms this flag without scrolling.
|
||||
pub transcript_pending_g: bool,
|
||||
/// Current session ID for auto-save updates
|
||||
pub current_session_id: Option<String>,
|
||||
/// Metadata-only registry of large tool outputs produced in this session.
|
||||
@@ -1478,7 +1472,6 @@ impl App {
|
||||
},
|
||||
view_stack: ViewStack::new(),
|
||||
backtrack: crate::tui::backtrack::BacktrackState::new(),
|
||||
transcript_pending_g: false,
|
||||
current_session_id: None,
|
||||
session_artifacts: Vec::new(),
|
||||
trust_mode: initial_mode == AppMode::Yolo,
|
||||
|
||||
+44
-45
@@ -2230,19 +2230,17 @@ async fn run_event_loop(
|
||||
continue;
|
||||
}
|
||||
KeyCode::Char('l')
|
||||
if key.modifiers.is_empty()
|
||||
if alt_nav_modifiers(key.modifiers)
|
||||
&& app.input.is_empty()
|
||||
&& open_pager_for_last_message(app) =>
|
||||
{
|
||||
continue;
|
||||
}
|
||||
KeyCode::Char('v') | KeyCode::Char('V')
|
||||
if details_shortcut_modifiers(key.modifiers)
|
||||
&& app.input.is_empty()
|
||||
&& open_tool_details_pager(app) =>
|
||||
{
|
||||
continue;
|
||||
}
|
||||
// Bare `v` / `V` no longer opens the tool-details pager — that
|
||||
// path is owned exclusively by `Alt+V` at the lower arm, so
|
||||
// the letter `v` is freely usable as the first character of
|
||||
// a message. `details_shortcut_modifiers` previously allowed
|
||||
// empty/Shift here, eating the keystroke on empty composers.
|
||||
KeyCode::Char('o')
|
||||
if key.modifiers.contains(KeyModifiers::CONTROL)
|
||||
&& app.input.is_empty()
|
||||
@@ -2392,7 +2390,6 @@ async fn run_event_loop(
|
||||
app.mention_menu_selected = 0;
|
||||
}
|
||||
KeyCode::Esc => {
|
||||
app.transcript_pending_g = false;
|
||||
match next_escape_action(app, slash_menu_open) {
|
||||
EscapeAction::CloseSlashMenu => {
|
||||
// A popup-style action wins over backtrack — clear
|
||||
@@ -2572,34 +2569,35 @@ async fn run_event_loop(
|
||||
KeyCode::BackTab => {
|
||||
app.cycle_effort();
|
||||
}
|
||||
// Transcript-nav shortcuts now require Alt, leaving the bare
|
||||
// letters free to insert as text. Before v0.8.30, bare `g`,
|
||||
// `G`, `[`, `]`, `?`, `l`, and `v` on an empty composer were
|
||||
// hijacked for navigation — typing "good" yielded "ood" with
|
||||
// no whale and no warning. The Alt-prefixed shortcuts mirror
|
||||
// the Alt+R / Alt+V / Alt+C pattern already in use. Shift is
|
||||
// permitted so capital-letter forms (e.g. `Alt+Shift+G` for
|
||||
// bottom) work; Ctrl/Super are blocked so the bindings don't
|
||||
// collide with platform clipboard / window shortcuts.
|
||||
KeyCode::Char('g')
|
||||
if key.modifiers.is_empty() && app.input.is_empty() && !slash_menu_open =>
|
||||
if alt_nav_modifiers(key.modifiers)
|
||||
&& app.input.is_empty()
|
||||
&& !slash_menu_open =>
|
||||
{
|
||||
// Vim-style 'gg' — double-tap 'g' to jump to top.
|
||||
// First 'g' arms the pending flag; second executes the scroll.
|
||||
// This prevents a single 'g' (the first letter of a message)
|
||||
// from hijacking the transcript scroll.
|
||||
if app.transcript_pending_g {
|
||||
if let Some(anchor) = TranscriptScroll::anchor_for(
|
||||
app.viewport.transcript_cache.line_meta(),
|
||||
0,
|
||||
) {
|
||||
app.viewport.transcript_scroll = anchor;
|
||||
}
|
||||
app.transcript_pending_g = false;
|
||||
} else {
|
||||
app.transcript_pending_g = true;
|
||||
if let Some(anchor) =
|
||||
TranscriptScroll::anchor_for(app.viewport.transcript_cache.line_meta(), 0)
|
||||
{
|
||||
app.viewport.transcript_scroll = anchor;
|
||||
}
|
||||
}
|
||||
KeyCode::Char('G')
|
||||
if (key.modifiers.is_empty() || key.modifiers == KeyModifiers::SHIFT)
|
||||
if alt_nav_modifiers(key.modifiers)
|
||||
&& app.input.is_empty()
|
||||
&& !slash_menu_open =>
|
||||
{
|
||||
app.scroll_to_bottom();
|
||||
}
|
||||
KeyCode::Char('[')
|
||||
if key.modifiers.is_empty()
|
||||
if alt_nav_modifiers(key.modifiers)
|
||||
&& app.input.is_empty()
|
||||
&& !slash_menu_open
|
||||
&& !jump_to_adjacent_tool_cell(app, SearchDirection::Backward) =>
|
||||
@@ -2607,20 +2605,19 @@ async fn run_event_loop(
|
||||
app.status_message = Some("No previous tool output".to_string());
|
||||
}
|
||||
KeyCode::Char(']')
|
||||
if key.modifiers.is_empty()
|
||||
if alt_nav_modifiers(key.modifiers)
|
||||
&& app.input.is_empty()
|
||||
&& !slash_menu_open
|
||||
&& !jump_to_adjacent_tool_cell(app, SearchDirection::Forward) =>
|
||||
{
|
||||
app.status_message = Some("No next tool output".to_string());
|
||||
}
|
||||
// `?` opens the searchable help overlay (#93). Gated on the
|
||||
// composer being empty so typing `?` mid-question is treated
|
||||
// as text. `Shift` is permitted because US layouts produce
|
||||
// `?` as `Shift+/`. Help-modal toggling lives next to the
|
||||
// F1 / Ctrl+/ branch above; here we only open.
|
||||
// `Alt+?` opens the searchable help overlay (#93). F1 and
|
||||
// Ctrl+/ are also bound; bare `?` is reserved as text input
|
||||
// so users can start a message with "?" without losing the
|
||||
// first character.
|
||||
KeyCode::Char('?')
|
||||
if (key.modifiers.is_empty() || key.modifiers == KeyModifiers::SHIFT)
|
||||
if alt_nav_modifiers(key.modifiers)
|
||||
&& app.input.is_empty()
|
||||
&& !slash_menu_open =>
|
||||
{
|
||||
@@ -2688,7 +2685,6 @@ async fn run_event_loop(
|
||||
}
|
||||
}
|
||||
KeyCode::Enter => {
|
||||
app.transcript_pending_g = false;
|
||||
// #573: when the user typed a slash-command prefix that
|
||||
// the popup is matching (e.g. `/mo` → `/model`), Enter
|
||||
// should run the *highlighted match* rather than
|
||||
@@ -3000,11 +2996,6 @@ async fn run_event_loop(
|
||||
// absorb — Visual mode not yet fully implemented
|
||||
}
|
||||
KeyCode::Char(c) => {
|
||||
// Any typed character after a pending 'g' means the user
|
||||
// is composing a message, not navigating — disarm the
|
||||
// 'gg' double-tap so the next bare 'g' on an empty
|
||||
// composer starts a new sequence.
|
||||
app.transcript_pending_g = false;
|
||||
app.insert_char(c);
|
||||
}
|
||||
_ => {}
|
||||
@@ -8836,12 +8827,20 @@ fn tool_details_shortcut_label() -> &'static str {
|
||||
}
|
||||
}
|
||||
|
||||
fn details_shortcut_modifiers(modifiers: KeyModifiers) -> bool {
|
||||
modifiers.is_empty()
|
||||
|| modifiers == KeyModifiers::SHIFT
|
||||
|| (modifiers.contains(KeyModifiers::ALT)
|
||||
&& !modifiers.contains(KeyModifiers::CONTROL)
|
||||
&& !modifiers.contains(KeyModifiers::SUPER))
|
||||
/// Modifier predicate for the v0.8.30 family of `Alt+<letter>` transcript-
|
||||
/// nav shortcuts (`Alt+G` / `Alt+Shift+G` / `Alt+[` / `Alt+]` / `Alt+?` /
|
||||
/// `Alt+L` / `Alt+V`). Requires `Alt` and disallows `Ctrl` / `Super` so the
|
||||
/// bindings don't collide with platform clipboard / window-management
|
||||
/// shortcuts. `Shift` is permitted so the capital-letter forms work on
|
||||
/// any keyboard layout that produces them as `Alt+Shift+key`.
|
||||
///
|
||||
/// Plain `Char` events (no modifier, or modifier=`Shift` alone for the
|
||||
/// uppercase form) fall through to text insertion, which is the whole
|
||||
/// point — typing "good morning" no longer eats the first `g`.
|
||||
fn alt_nav_modifiers(modifiers: KeyModifiers) -> bool {
|
||||
modifiers.contains(KeyModifiers::ALT)
|
||||
&& !modifiers.contains(KeyModifiers::CONTROL)
|
||||
&& !modifiers.contains(KeyModifiers::SUPER)
|
||||
}
|
||||
|
||||
fn is_macos_option_v_legacy_key(key: &KeyEvent) -> bool {
|
||||
|
||||
@@ -2984,17 +2984,20 @@ fn active_rlm_task_entries_surface_foreground_rlm_work() {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn details_shortcut_modifiers_accept_plain_shift_and_alt_only() {
|
||||
assert!(details_shortcut_modifiers(KeyModifiers::NONE));
|
||||
assert!(details_shortcut_modifiers(KeyModifiers::SHIFT));
|
||||
assert!(details_shortcut_modifiers(KeyModifiers::ALT));
|
||||
assert!(details_shortcut_modifiers(
|
||||
KeyModifiers::ALT | KeyModifiers::SHIFT
|
||||
));
|
||||
assert!(!details_shortcut_modifiers(KeyModifiers::CONTROL));
|
||||
assert!(!details_shortcut_modifiers(
|
||||
fn alt_nav_modifiers_require_alt_and_exclude_ctrl_super() {
|
||||
// v0.8.30 — transcript-nav shortcuts (`Alt+G`, `Alt+[`, etc.) require
|
||||
// Alt, allow Shift for capital-letter forms, and block Ctrl/Super so
|
||||
// they don't collide with clipboard / window shortcuts. Bare and
|
||||
// Shift-only modifiers fall through to text insertion now.
|
||||
assert!(!alt_nav_modifiers(KeyModifiers::NONE));
|
||||
assert!(!alt_nav_modifiers(KeyModifiers::SHIFT));
|
||||
assert!(alt_nav_modifiers(KeyModifiers::ALT));
|
||||
assert!(alt_nav_modifiers(KeyModifiers::ALT | KeyModifiers::SHIFT));
|
||||
assert!(!alt_nav_modifiers(KeyModifiers::CONTROL));
|
||||
assert!(!alt_nav_modifiers(
|
||||
KeyModifiers::ALT | KeyModifiers::CONTROL
|
||||
));
|
||||
assert!(!alt_nav_modifiers(KeyModifiers::ALT | KeyModifiers::SUPER));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
Reference in New Issue
Block a user