Fix keybinding source/default matching for commands with multiple bindings and remove unused parameter from buildWhenVariableOptions

- sourceForBinding now matches by command, shortcut, and when clause instead
  of only command, preventing false 'Custom' labels on secondary default bindings
- defaultBindingForBinding finds the exact matching default entry with cascading
  fallback (exact match > same when > same command)
- buildWhenVariableOptions no longer accepts an unused _keybindings parameter;
  callers updated to pass no args with an empty useMemo dependency array

Author: cursoragent

apps/web/src/components/settings/KeybindingsSettings.logic.test.ts

@@ -124,24 +124,7 @@ describe("KeybindingsSettings.logic", () => {
   });
 
   it("builds known when variable options from defaults without frontend labels", () => {
-    const options = buildWhenVariableOptions([
-      {
-        command: "terminal.toggle",
-        shortcut: {
-          key: "j",
-          modKey: true,
-          metaKey: false,
-          ctrlKey: false,
-          altKey: false,
-          shiftKey: false,
-        },
-        whenAst: {
-          type: "and",
-          left: { type: "identifier", name: "terminalOpen" },
-          right: { type: "identifier", name: "customModeActive" },
-        },
-      },
-    ] satisfies ResolvedKeybindingsConfig);
+    const options = buildWhenVariableOptions();
 
     expect(options).toEqual(
       expect.arrayContaining(["terminalFocus", "terminalOpen", "modelPickerOpen", "true", "false"]),

apps/web/src/components/settings/KeybindingsSettings.logic.ts

@@ -91,22 +91,38 @@ function sourceForBinding(binding: ResolvedKeybindingRule): KeybindingSource {
     return "Project";
   }
 
-  const defaultBinding = DEFAULT_RESOLVED_KEYBINDINGS.find(
-    (entry) => entry.command === binding.command,
+  const bindingKey = shortcutToKeybindingInput(binding.shortcut);
+  const bindingWhen = whenAstToExpression(binding.whenAst);
+
+  const isDefault = DEFAULT_RESOLVED_KEYBINDINGS.some(
+    (entry) =>
+      entry.command === binding.command &&
+      shortcutToKeybindingInput(entry.shortcut) === bindingKey &&
+      whenAstToExpression(entry.whenAst) === bindingWhen,
   );
-  if (!defaultBinding) {
-    return "Custom";
-  }
 
-  return shortcutToKeybindingInput(defaultBinding.shortcut) ===
-    shortcutToKeybindingInput(binding.shortcut) &&
-    whenAstToExpression(defaultBinding.whenAst) === whenAstToExpression(binding.whenAst)
-    ? "Default"
-    : "Custom";
+  return isDefault ? "Default" : "Custom";
 }
 
-function defaultBindingForCommand(command: KeybindingCommand): ResolvedKeybindingRule | undefined {
-  return DEFAULT_RESOLVED_KEYBINDINGS.find((entry) => entry.command === command);
+function defaultBindingForBinding(
+  binding: ResolvedKeybindingRule,
+): ResolvedKeybindingRule | undefined {
+  const bindingKey = shortcutToKeybindingInput(binding.shortcut);
+  const bindingWhen = whenAstToExpression(binding.whenAst);
+
+  return (
+    DEFAULT_RESOLVED_KEYBINDINGS.find(
+      (entry) =>
+        entry.command === binding.command &&
+        shortcutToKeybindingInput(entry.shortcut) === bindingKey &&
+        whenAstToExpression(entry.whenAst) === bindingWhen,
+    ) ??
+    DEFAULT_RESOLVED_KEYBINDINGS.find(
+      (entry) =>
+        entry.command === binding.command && whenAstToExpression(entry.whenAst) === bindingWhen,
+    ) ??
+    DEFAULT_RESOLVED_KEYBINDINGS.find((entry) => entry.command === binding.command)
+  );
 }
 
 export function buildKeybindingRows(
@@ -115,7 +131,7 @@ export function buildKeybindingRows(
 ): ReadonlyArray<KeybindingRow> {
   const normalizedQuery = query.trim().toLowerCase();
   const rows = keybindings.map((binding) => {
-    const defaultBinding = defaultBindingForCommand(binding.command);
+    const defaultBinding = defaultBindingForBinding(binding);
     const key = shortcutToKeybindingInput(binding.shortcut);
     const when = whenAstToExpression(binding.whenAst);
     return {
@@ -179,9 +195,7 @@ export function unknownWhenVariables(node: KeybindingWhenNode | undefined): Read
   return [...identifiers].filter((identifier) => !isKnownWhenVariable(identifier)).toSorted();
 }
 
-export function buildWhenVariableOptions(
-  _keybindings: ResolvedKeybindingsConfig,
-): ReadonlyArray<WhenVariableOption> {
+export function buildWhenVariableOptions(): ReadonlyArray<WhenVariableOption> {
   return [...KNOWN_WHEN_VARIABLES].toSorted((left, right) => {
     const leftCoreIndex = CORE_WHEN_VARIABLES.indexOf(left as (typeof CORE_WHEN_VARIABLES)[number]);
     const rightCoreIndex = CORE_WHEN_VARIABLES.indexOf(

apps/web/src/components/settings/KeybindingsSettings.tsx

@@ -852,7 +852,7 @@ export function KeybindingsSettingsPanel() {
   const searchInputRef = useRef<HTMLInputElement>(null);
   const [savingCommand, setSavingCommand] = useState<KeybindingCommand | null>(null);
   const rows = useMemo(() => buildKeybindingRows(keybindings, query), [keybindings, query]);
-  const whenVariables = useMemo(() => buildWhenVariableOptions(keybindings), [keybindings]);
+  const whenVariables = useMemo(() => buildWhenVariableOptions(), []);
 
   useEffect(() => {
     const handleKeyDown = (event: globalThis.KeyboardEvent) => {