Keyboard-select composer controls with hold-modifier hints

[colonelpanic8]

What

Makes every selector in the thread first-prompt composer keyboard-operable through the app's existing customizable keybindings system, extending the pattern already used by modelPicker.toggle.

Command	Default	Control
modelOptionsPicker.toggle	mod+shift+e	Reasoning effort / model traits menu
runtimeModePicker.toggle	mod+shift+a	Access level (Supervised / Auto-accept / Full access)
planMode.toggle	mod+shift+p	Plan ↔ Build toggle
environmentPicker.toggle	mod+shift+v	Branch toolbar environment
envModePicker.toggle	mod+shift+l	Local vs worktree
branchPicker.toggle	mod+shift+b	Branch selector

(mod = Ctrl on Linux/Windows, Cmd on macOS.)

All six are rebindable in Settings → Keybindings — they flow through the existing command registry, so their labels are derived by commandLabel and they're upserted into existing user configs by the server's startup sync. No new settings surface was added.

Hold-modifier hints

Holding the platform mod key reveals small Kbd hint badges for each control (mirroring the existing thread-jump number hints). For the composer controls the badge floats just below its trigger (a detached anchored tooltip), so the current values — model, effort, access level, Plan/Build — stay fully visible; the branch toolbar controls keep inline badges. Visibility is computed once via a new shouldShowComposerControlHintsForModifiers, which deliberately uses subset modifier matching (not the exact-match used by thread jumps) so that holding a bare Ctrl/Cmd reveals the full mod+shift+* chords.

Fallbacks

• Compact footer: the effort/runtime toggles open CompactComposerControlsMenu; the Plan/Build toggle still flips directly.
• Mobile: environment / env-mode open the combined MobileRunContextSelector menu.
• Each toggle reports whether its control was actually available; when it wasn't (locked provider, approval pending, collapsed, etc.) the command no-ops without calling preventDefault, so the browser default still fires.

Tests

Extended keybinding coverage in packages/contracts, apps/web (mac vs non-mac, subset semantics, customized bindings, no-binding, label resolution), and apps/server defaults enumeration. Typecheck, lint, and full test suites pass (contracts 190, shared 272, web 1411, server keybindings 22).

🤖 Generated with Claude Code

Exact-head evidence

Revalidated at d0c50d2 on current main (9a0a071): focused tests, vp check, and vp run typecheck passed. The capture uses only disposable local projects.

---

Note

Medium Risk
Touches global keydown handling and many UI state paths (compact vs desktop, mobile, locked env); incorrect availability or picker coordination could cause stuck overlays or swallowed shortcuts, but changes are mostly additive with tests.

Overview
Adds six rebindable commands (modelOptionsPicker, runtimeModePicker, planMode, environmentPicker, envModePicker, branchPicker) with default mod+shift+* chords, wired through contracts/shared defaults and handled in ChatView via imperative toggles on ChatComposer and BranchToolbar.

Composer and branch UI now use single active picker state (composer pickers + compact menu + branch toolbar overlays), with logic to replace rather than stack overlays, ignore stale close events, and reset on layout changes via useLayoutScopedOpenState. Mobile routes environment/env-mode shortcuts to the combined run-context menu.

Hold-modifier hints show Kbd labels when held modifiers are a subset of each binding (shouldShowCommandHintForModifiers), including terminal-focus when rules; composer controls use anchored ComposerControlShortcutHint tooltips. Toggles return false when unavailable so preventDefault is skipped and browser defaults still work.

^{Reviewed by Cursor Bugbot for commit d5ca73b. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add keyboard shortcuts to toggle composer and branch toolbar controls with modifier-held hints

• Adds six default keybindings (mod+shift+e/a/p/v/l/b) mapped to modelOptionsPicker.toggle, runtimeModePicker.toggle, planMode.toggle, environmentPicker.toggle, envModePicker.toggle, and branchPicker.toggle in keybindings.ts.
• Keyboard shortcut hints (Kbd badges) appear on composer and branch toolbar controls while the user holds the modifier keys; visibility is driven by new shouldShowComposerControlHintsForModifiers and shouldShowCommandHintForModifiers helpers in keybindings.ts.
• Composer pickers (model, traits, runtime mode, compact controls menu) are now managed as mutually exclusive open states via resolveComposerPickerOpenChange in composerProviderState.tsx; only one picker can be open at a time.
• Branch toolbar pickers (environment, env-mode, branch, mobile run-context) follow the same single-active-picker pattern, and BranchToolbar exposes an imperative BranchToolbarHandle for programmatic toggling from ChatViewContent.
• A new useLayoutScopedOpenState hook in useLayoutScopedOpenState.ts ensures picker open state resets automatically on layout changes (e.g. mobile ↔ desktop).

^{Macroscope summarized d5ca73b.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: c29daa7e-a3d7-48d7-bdd5-21340646dc9d

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

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

[macroscopeapp]

Approvability

Verdict: Needs human review

This PR introduces a new feature adding keyboard shortcuts and visual hold-modifier hints for composer controls. New features with new user-facing behavior warrant human review, especially given the modifications to core components like ChatComposer and BranchToolbar.

^{You can customize Macroscope's approvability policy. Learn more.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 3a03660. Configure here.}