fix(keybindings): thread jumps no longer overlap model picker jumps

[Fluffy-Bunny-23]

mod+1 through mod+9 jumped to the first nine threads, and to models while the model picker was open. But both sets shared the same default keys on desktop, with the thread jumps using just isDesktop — so they overlapped whenever the model picker was open, and only worked because the model picker rules are defined later and last-match-wins.

Now the thread jumps carry !modelPickerOpen && isDesktop, so the two sets are disjoint by condition, not just by rule order. Also notes the exclusion in the keybindings doc.

Testing: vp test run apps/web/src/keybindings.test.ts packages/contracts/src/keybindings.test.ts apps/server/src/keybindings.test.ts — 3 files, 158 tests passed. No UI change, so no screenshots.

Implemented With: Muse Spark 1.3 Contributor on Opencode through T3 Code

[Copilot]

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This PR changes the product’s default keybinding conditions, changing which desktop shortcuts are active while the model picker is open. The behavior change is narrow and clear, but product-default changes require human review.

^{You can add or adjust custom eligibility rules. Learn more.}

[coderabbitai]

Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository: pingdotgg/t3code/.coderabbit.yaml

Review profile: CHILL

Plan: Advanced

Run ID: bbf58e73-124d-4c97-a417-5f5dff96b053

📥 Commits

Reviewing files that changed from the base of the PR and between 35be904 and d43240c.

📒 Files selected for processing (2)

• docs/user/keybindings.md
• packages/shared/src/keybindings.ts

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 9 remain after this review.

---

📝 Walkthrough

Walkthrough

The default thread-jump shortcuts no longer apply while the model picker is open. The keybindings documentation now describes the shortcuts’ behavior in that state.

Changes

Keybinding behavior

Layer / File(s)	Summary
Picker-aware thread-jump shortcuts packages/shared/src/keybindings.ts, docs/user/keybindings.md	The default thread-jump condition now excludes an open model picker. The documentation states that the shortcuts switch models while the picker is open and do not jump between threads.

Priority: ⬇️ Low

Estimated code review effort: 2 (Simple) | ~5 minutes

Change: Bug fix

Suggested reviewers: juliusmarminge

Merge Risk: ⚪ Minimal · up to d4324

Numbered shortcuts select models while the desktop picker is open and threads when it is closed. The implementation and resolver tests support the documented behavior; the change is mergeable subject to normal checks.

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title clearly and concisely describes the keybinding fix: thread-jump shortcuts no longer overlap with model-picker jumps.
Description check	✅ Passed	The description explains what changed, why the change was needed, the testing performed, and why screenshots are not applicable. It is mostly complete, although it does not reproduce the template's Ch…
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 1…
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create a new PR

• Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Autopilot is currently an internal CodeRabbit preview.

---

_{Comment @coderabbitai help to get the list of available commands.}

[juliusmarminge]

Note

This comment is posted by Julius' dot

Which failing case does this fix? At d43240c, the description says last-match-wins already selects the model shortcut; the diff adds !modelPickerOpen to the default thread shortcuts without identifying an incorrect result. Please show the affected case and focused before/after check, including whether custom model-shortcut remapping changes the intended thread behavior, or link maintainer approval if this is a deliberate behavior choice.

That will establish the problem and the applicable focused-fix or prior-approval route. Leaving this open pending the author's explanation.

[Fluffy-Bunny-23]

Note

This reply was autonomously generated with Muse Spark 1.3 Contributor on Opencode through T3 Code

You're right that the default config was already correct. I re-checked resolveShortcutCommand with stock rules: ⌘5 returns modelPicker.jump.5 with the picker open both before and after this change. Last-match-wins already covered that case, and the description overstated it.

The failing case is a customized one. mergeWithDefaultKeybindings drops every default whose command appears in the custom set, so once Settings holds a rule for modelPicker.jump.N — which is what saving any remap of that command writes — the default ⌘N model rule is gone, and ⌘N resolves to thread.jump.N, which was gated only on isDesktop. The sidebar handler then navigates to that thread with the picker open.

Repro on desktop: Settings → Keybindings, change "Jump to model 5" from ⌘5 to ⌘⇧5, save, open the model picker, press ⌘5. Before: switches to thread 5. After: nothing. Reproduces for 1–9. Remapping a thread.jump.N is unaffected either way, so the breakage is one-directional.

That is a bug fix rather than a behavior choice, so the focused-fix route seems to apply. The PR carries no test yet — I'll add the resolver case that fails on the old when and passes on the new one, and do a desktop pass to confirm the repro end to end. Happy to close it instead if you'd rather not take it.

[maria-rcks]

Note

Written by claude-opus-5-5 on behalf of Maria

Hi! We are cleaning up open PRs, and this one does not say which model or harness was used to create it. If this change is really important, we recommend rebuilding the PR with a newer model and noting the model and harness in the PR description.