From 77c8747150d0e140fa3fb303ed5339eb8165aa9f Mon Sep 17 00:00:00 2001 From: Fluffy-Bunny-23 <193831219+Fluffy-Bunny-23@users.noreply.github.com> Date: Sat, 10 Oct 2026 20:01:13 -0700 Subject: [PATCH] fix(keybindings): thread jumps no longer overlap model picker jumps (#14475) --- docs/user/keybindings.md | 3 ++- packages/shared/src/keybindings.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/user/keybindings.md b/docs/user/keybindings.md index 5523b5aa3c9c083555c7fc1f31a957a8c6489df1..5a0a699e10da8e34e67043f8b72c481cbef4910b 100644 --- a/docs/user/keybindings.md +++ b/docs/user/keybindings.md @@ -111,7 +111,8 @@ the keyboard. `isWeb` is true in a browser tab. `isDesktop` is true in the desktop app. Unknown keys evaluate to `false`. `mod+1` through `mod+9` jump to the first nine threads, and to models while the -model picker is open. Those defaults use `isDesktop` so they do not steal the +model picker is open. The thread jumps do not run while the model picker is open. +Those defaults use `isDesktop` so they do not steal the browser's tab-switch shortcuts. Remove that condition in Settings if you want the same jumps in a browser. diff --git a/packages/shared/src/keybindings.ts b/packages/shared/src/keybindings.ts index 7620b2432a776edb05d5f4beb4011130fc6c15d2..53a2aa5d3efe419dcf273ac2cf53816866ab5d89 100644 --- a/packages/shared/src/keybindings.ts +++ b/packages/shared/src/keybindings.ts @@ -193,7 +193,7 @@ export const DEFAULT_KEYBINDINGS: ReadonlyArray = [ ...THREAD_JUMP_KEYBINDING_COMMANDS.map((command, index) => ({ key: `mod+${index + 1}`, command, - when: "isDesktop", + when: "!modelPickerOpen && isDesktop", })), ...MODEL_PICKER_JUMP_KEYBINDING_COMMANDS.map((command, index) => ({ key: `mod+${index + 1}`, -- 2.54.0