Fix add provider shortcut on composed macOS input

Author: TheGreatAxios

CHANGELOG.md

@@ -13,6 +13,12 @@ parallel copies under `docs/` or `scripts/notes/`. At cut time: rename
 
 ## [Unreleased]
 
+### Fixed
+
+- `/model` Alt+A opens Add Provider on non-US macOS layouts that emit å/Å
+  for Option+A without the option modifier, instead of type-to-filter
+  claiming the glyph.
+
 ## [0.3.11] - 2026-08-31
 
 ### Changed

src/tui/product-host.test.ts

@@ -11,6 +11,7 @@ import { createHarness } from "./harness.js";
 import {
   acceptOverlaySelection,
   closeInsetOverlay,
+  handleListFilterKey,
   moveOverlaySelection,
   runOverlayAction,
 } from "./shell.js";
@@ -732,6 +733,55 @@ describe("flat type-to-filter model picker", () => {
     }
   });
 
+  test("composed Option+A (å) opens add-provider and is not claimed by type-to-filter", async () => {
+    // Non-US macOS layouts often emit å/Å for Option+A without meta/option set.
+    // Type-to-filter used to claim that printable before runOverlayAction ran.
+    const { harness, host } = await mountPicker({
+      onConnectProvider: () => {},
+      addProviderChoices: () => [{ id: "codex", label: "Codex", hint: "", accountCount: 0 }],
+    });
+    try {
+      host.openModels?.();
+      await harness.renderOnce();
+      const composed = {
+        name: "å",
+        sequence: "å",
+        ctrl: false,
+        meta: false,
+        option: false,
+      } as KeyEvent;
+      expect(handleListFilterKey(host.shell, composed)).toBe(false);
+      expect(runOverlayAction(host.shell, composed)).toBe(true);
+      expect(host.shell.overlayKind).toBe("add_provider");
+    } finally {
+      host.dispose();
+      harness.destroy();
+    }
+  });
+
+  test("ordinary letters still type-to-filter when add-provider is wired", async () => {
+    const { harness, host } = await mountPicker({
+      onConnectProvider: () => {},
+      addProviderChoices: () => [{ id: "codex", label: "Codex", hint: "", accountCount: 0 }],
+    });
+    try {
+      host.openModels?.();
+      await harness.renderOnce();
+      const letter = {
+        name: "g",
+        sequence: "g",
+        ctrl: false,
+        meta: false,
+        option: false,
+      } as KeyEvent;
+      expect(handleListFilterKey(host.shell, letter)).toBe(true);
+      expect(host.shell.overlayKind).toBe("model_picker");
+    } finally {
+      host.dispose();
+      harness.destroy();
+    }
+  });
+
   test("Enter on a Custom add-provider row runs the connect flow for custom", async () => {
     const connected: string[] = [];
     const { harness, host } = await mountPicker({

src/tui/product-host.ts

@@ -43,6 +43,7 @@ import {
   clearTranscript,
   closeInsetOverlay,
   createAppShell,
+  isAddProviderShortcutKey,
   paintChrome,
   setChromeZones,
   setHeader,
@@ -585,13 +586,16 @@ export async function mountProductHost(config: ProductHostConfig): Promise<Produ
         onSetDefault !== undefined
           ? {
               onAction: (itemId, key) => {
-                if (key.ctrl || !(key.meta || key.option)) return false;
-                const name = typeof key.name === "string" ? key.name.toLowerCase() : "";
-                // Alt+A / Alt+F / Alt+D, never bare — type-to-filter claims printable keys.
-                if (name === "a" && openAddProvider !== undefined) {
+                if (key.ctrl) return false;
+                // Alt+A / composed Option+A (å/Å) — never bare ASCII `a`;
+                // type-to-filter claims ordinary printables.
+                if (openAddProvider !== undefined && isAddProviderShortcutKey(key)) {
                   openAddProvider();
                   return true;
                 }
+                if (!(key.meta || key.option)) return false;
+                const name = typeof key.name === "string" ? key.name.toLowerCase() : "";
+                // Alt+F / Alt+D, never bare — type-to-filter claims printable keys.
                 if (name === "f" && onFavoriteToggle !== undefined) {
                   // Empty id is the "(no matches)" filter sentinel — not a model.
                   if (itemId.length === 0) return false;

src/tui/shell.ts

@@ -3866,6 +3866,26 @@ export function handlePaletteFilterKey(shell: AppShell, key: KeyEvent): boolean
   return true;
 }
 
+/**
+ * Glyphs macOS emits for Option+A on common layouts (US, ABC, Nordic).
+ * Non-US input sources often deliver these without meta/option set.
+ */
+const OPTION_A_COMPOSED_CHARS = new Set(["å", "Å"]);
+
+/**
+ * True when a key event is the model-picker Alt+A add-provider chord.
+ * US layouts send name `"a"` with meta/option; non-US layouts often emit
+ * å/Å with neither modifier, so type-to-filter would otherwise claim them.
+ */
+export function isAddProviderShortcutKey(key: KeyEvent): boolean {
+  if (key.ctrl) return false;
+  const name = typeof key.name === "string" ? key.name : "";
+  const seq = typeof key.sequence === "string" ? key.sequence : "";
+  if ((key.meta || key.option) && name.toLowerCase() === "a") return true;
+  if (OPTION_A_COMPOSED_CHARS.has(name) || OPTION_A_COMPOSED_CHARS.has(seq)) return true;
+  return false;
+}
+
 /**
  * Keys a type-to-filter list overlay claims while open, so the `>` row
  * narrows as you type. Mirrors the palette filter, but updates the open
@@ -3879,6 +3899,16 @@ export function handleListFilterKey(shell: AppShell, key: KeyEvent): boolean {
   if (shell.overlayKind === "palette") return false;
   if (key.ctrl || key.meta || key.option) return false;
 
+  // When Alt+A add-provider is wired, leave Option+A composed glyphs (å/Å)
+  // for runOverlayAction — non-US macOS layouts emit them without meta/option.
+  if (
+    bag?.overlayAddProviderHint === true &&
+    shell.overlayKind === "model_picker" &&
+    isAddProviderShortcutKey(key)
+  ) {
+    return false;
+  }
+
   if (key.name === "backspace") {
     if (state.query.length === 0) return true;
     state.query = state.query.slice(0, -1);