Repository navigation
Conversation
KeymapFile created a command's entry only while pushing its first keystroke, so `[]` left no entry and the template's keys stayed bound: there was no way to remove a shortcut, even by editing the file. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Recording began whenever a row took focus and ended on its own, a single plain key could not be recorded (the row waited for a second one and saved "k then j"), and the result replaced every key the command had. Recording now starts from a + button and says so; a modifier combination ends it at once, a plain key after Mousetrap's one-second sequence timeout; Esc cancels; the key joins the command's existing ones; focus returns to the button. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… or all Each key is a chip with an x that removes it (and any other spelling of the same key), a command the user keymap changed gets a Reset back to the template, each section has a Clear, and Clear All (confirmed) empties every command. A command left with no keys is written as `[]`, which unbinds it. "None" is localized now that it shows on cleared commands. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Every command bound to a key runs when it is pressed, so adding "s" to Archive while Star has "s" made one key archive and star. The Shortcuts page now marks both keys, says on the row the key was added to which other command it runs, offers to remove it from either, and counts these at the top. The defaults' own shared keys (Outlook's Ctrl+U underlines in the composer and marks unread in the list) are not flagged: KeymapManager keeps each command's keys from before the user keymap so a key the user added can be told from one the template gave. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Keys are drawn as keycaps at the small text size rather than run together in a monospace line, the add button says "+ Add", a dot marks a command changed from the default, rows highlight on hover with their x buttons, and the sections flow into one column in a narrow window and two in a wide one instead of a fixed 800px split. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A search box above the list narrows it to commands whose name matches or that have a matching key as written (ctrl+r, and cmd/control/option for the modifier names), hiding empty sections. Find by key listens for one shortcut and lists the commands it runs, or says nothing does. Section Clear links hide while searching so they never clear rows out of sight. The key recorder and key formatting move out of the row into ShortcutRecorder and keystrokes.tsx so the row and the search share them. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A switch on the Shortcuts page, core.keymapSingleKeys, stops every shortcut typed without Ctrl,
Alt or Cmd ("e", "shift+3", "g i") from running a command or appearing as a menu accelerator,
while leaving them in the list, struck through, to come back when it is turned on. Someone
dictating the letter "e" would otherwise archive a message; others turn them off to avoid
typing into the wrong place.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…onflict count A Show menu beside the search lists every command, only those the user keymap changes, or only those in a conflict, each with its count, and combines with the search. The conflict count at the top becomes a link to the Conflicts view. Section Clear links hide whenever the list is narrowed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Oct 8, 2026
added 13 commits
October 10, 2026 06:34
added 30 commits
November 12, 2026 09:26
# Conflicts: # app/lang/en.json
# Conflicts: # app/lang/en.json
# Conflicts: # app/lang/en.json
# Conflicts: # app/lang/en.json
# Conflicts: # app/lang/en.json
# Conflicts: # app/src/menu-manager.ts
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
With #2955 the Shortcuts page tells you how many keys you added also run another command, but not which ones, so you scroll looking for amber keys. You also can't see at a glance what you've changed from the template. VS Code filters its shortcut list with
@source:user, and Obsidian made its "N commands with conflicts" counter clickable to show only those.findConflictsreports. It combines with the text search and with Find by key.Stacked on #2958. This is the last of the Shortcuts page series (#2950–#2958).
Verified: the conflicts spec's page (Archive given Star's
s) checks the menu's counts (Changed 1, Conflicts 2), Changed showing only Archive, Conflicts showing Archive and Star with Clear hidden, Show all bringing back the rest and Clear, the menu narrowed further by a search, and the count link switching to Conflicts and clearing a typed search. Every statement and condition added was mutated: 11 of 11 red. Live, in this branch's build on a copy of a Gmail-template config (Electron 44.5.1, DevTools input): withson Archive the menu read Changed (1) and Conflicts (2), clicking the count listed Archive and Star, and Changed listed Archive. Lint, prettier and tsc clean; full suite 2510 passing.Screenshot: after clicking the conflict count, which shows only the conflicting commands:
Shortcuts page series (one concern each; merge in this order): #2950
[]unbinds, #2951 mail held behind Preferences, #2952 record with +, #2953 remove keys, #2955 conflict warnings, #2956 visual pass, #2957 search, #2958 single-key switch, #2959 Show filter.🤖 Generated with Claude Code