Name /connect on the model picker hint and pin Esc paths

The footer still advertised only Alt+A, which is a dead chord on
layouts whose Option+A is not å/Å. Tests now cover closed-prompt å,
other composed glyphs, sequence-only å, typed /connect Esc, and
Alt+A Esc through the key path.

Author: TheGreatAxios

docs/TUI.md

@@ -410,14 +410,19 @@ not-yet-configured provider kind, filtered out once that kind had any
 connected account. That filtering made a second OAuth account (a second
 Codex or xAI login) unreachable — OAuth accounts are per-profile, so
 kind-level "already connected" filtering hid the connect path the moment the
-first profile existed. **Alt+A** now opens `add_provider`
+first profile existed. **Alt+A** (US-style Option+A, including composed å/Å)
+and **/connect** now open `add_provider`
 (`src/tui/overlays.ts:openAddProviderOverlay`), a separate `PrimaryOverlayKind`
 listing every first-class provider kind from `providerChoices()` — OAuth,
 API-key, and Custom alike — each annotated with its live connected-account
-count and none of them filtered out. Custom uses the full manual form (name,
+count and none of them filtered out. `/connect` is the layout-proof path:
+layouts whose Option+A is not å/Å still type a printable glyph, so Alt+A
+is a dead chord there. Custom uses the full manual form (name,
 base URL, key, model); first-class kinds keep their auth-only or browser
-login paths. Esc returns to the model list through the same
-`openModels()` entry point the picker itself uses. Picking a row runs the
+login paths. Esc after Alt+A from `/model` returns to the model list through
+the same `openModels()` entry point the picker itself uses. Esc after
+`/connect` from a closed prompt dismisses the selector without reopening
+`/model`. Picking a row runs the
 existing inline connect flow (`provider-connect.ts`); first-class kinds (OAuth
 and API-key) both ask for an instance/account name before auth so multiple
 instances coexist as `kind/slug` catalog rows, and reusing a name confirms

src/tui/overlay-paint.test.ts

@@ -100,14 +100,14 @@ describe("overlay host never shares cells with the prompt border", () => {
             kind: "model_picker",
             title: "model",
             items: ITEMS,
-            // Mirror production /model, which always wires Alt+A.
+            // Mirror production /model, which always wires add-provider.
             addProviderHint: true,
           }),
         size,
       );
 
       const expected = [
-        " model · Esc cancel · Enter choose · Alt+A add provider",
+        " model · Esc cancel · Enter choose · Alt+A /connect add provider",
         ` > ${ITEMS[0]}`,
         ...ITEMS.slice(1).map((i) => `   ${i}`),
       ];

src/tui/overlays.ts

@@ -175,7 +175,7 @@ export interface OpenModelPickerOpts {
    * as you type. Off by default so other list overlays keep j/k.
    */
   readonly typeToFilter?: boolean;
-  /** Advertise Alt+A in the footer — only when the caller wired the handler. */
+  /** Advertise Alt+A /connect in the footer — only when the caller wired the handler. */
   readonly addProviderHint?: boolean;
   /** Advertise Alt+D in the footer — only when the caller wired the handler. */
   readonly setDefaultHint?: boolean;

src/tui/product-host.test.ts

@@ -10,7 +10,6 @@ import { AGENTS_PANEL_LINGER_MS } from "./chrome-state.js";
 import { createHarness } from "./harness.js";
 import {
   acceptOverlaySelection,
-  closeInsetOverlay,
   handleListFilterKey,
   moveOverlaySelection,
   runOverlayAction,
@@ -690,7 +689,7 @@ describe("flat type-to-filter model picker", () => {
 
   const altA = { name: "a", ctrl: false, meta: false, option: true } as KeyEvent;
 
-  test("the model picker footer advertises Alt+A", async () => {
+  test("the model picker footer advertises Alt+A and /connect", async () => {
     const { harness, host } = await mountPicker({
       // The hint requires the full wiring — choices AND the connect handler —
       // because that is exactly when the key actually works.
@@ -700,7 +699,9 @@ describe("flat type-to-filter model picker", () => {
     try {
       host.openModels?.();
       await harness.renderOnce();
-      expect(harness.captureCharFrame()).toContain("Alt+A");
+      const frame = harness.captureCharFrame();
+      expect(frame).toContain("Alt+A");
+      expect(frame).toContain("/connect");
     } finally {
       host.dispose();
       harness.destroy();
@@ -799,6 +800,74 @@ describe("flat type-to-filter model picker", () => {
     }
   });
 
+  test("closed-prompt å stays in the prompt and does not open add-provider", async () => {
+    const { harness, host } = await mountPicker({
+      onConnectProvider: () => {},
+      addProviderChoices: () => [{ id: "codex", label: "Codex", hint: "", accountCount: 0 }],
+    });
+    try {
+      expect(host.shell.overlayKind).toBeNull();
+      harness.pressKey("å");
+      await harness.renderOnce();
+      expect(host.shell.overlayKind).toBeNull();
+      expect(host.shell.prompt.value).toContain("å");
+    } finally {
+      host.dispose();
+      harness.destroy();
+    }
+  });
+
+  test("other composed glyphs still type-to-filter in the model picker", async () => {
+    const { harness, host } = await mountPicker({
+      onConnectProvider: () => {},
+      addProviderChoices: () => [{ id: "codex", label: "Codex", hint: "", accountCount: 0 }],
+    });
+    try {
+      host.openModels?.();
+      await harness.renderOnce();
+      for (const glyph of ["ø", "ä", "æ"] as const) {
+        const composed = {
+          name: glyph,
+          sequence: glyph,
+          ctrl: false,
+          meta: false,
+          option: false,
+        } as KeyEvent;
+        expect(handleListFilterKey(host.shell, composed)).toBe(true);
+        expect(host.shell.overlayKind).toBe("model_picker");
+      }
+    } finally {
+      host.dispose();
+      harness.destroy();
+    }
+  });
+
+  test("sequence-only å with name a opens add-provider from the model picker", async () => {
+    // Terminals can report Option+A as sequence å while name stays ASCII a
+    // and option/meta stay false (#482).
+    const { harness, host } = await mountPicker({
+      onConnectProvider: () => {},
+      addProviderChoices: () => [{ id: "codex", label: "Codex", hint: "", accountCount: 0 }],
+    });
+    try {
+      host.openModels?.();
+      await harness.renderOnce();
+      const sequenceOnly = {
+        name: "a",
+        sequence: "å",
+        ctrl: false,
+        meta: false,
+        option: false,
+      } as KeyEvent;
+      expect(handleListFilterKey(host.shell, sequenceOnly)).toBe(false);
+      expect(runOverlayAction(host.shell, sequenceOnly)).toBe(true);
+      expect(host.shell.overlayKind).toBe("add_provider");
+    } finally {
+      host.dispose();
+      harness.destroy();
+    }
+  });
+
   test("composed å still type-to-filters when add-provider is not wired", async () => {
     const { harness, host } = await mountPicker();
     try {
@@ -901,7 +970,8 @@ describe("flat type-to-filter model picker", () => {
       runOverlayAction(host.shell, altA);
       await harness.renderOnce();
       expect(host.shell.overlayKind).toBe("add_provider");
-      closeInsetOverlay(host.shell);
+      harness.pressKey("Escape");
+      await new Promise((r) => setTimeout(r, 60));
       await harness.renderOnce();
       expect(host.shell.overlayKind).toBe("model_picker");
       expect(host.shell.overlayItems).toEqual(modelItems);
@@ -921,7 +991,8 @@ describe("flat type-to-filter model picker", () => {
       host.openAddProvider?.();
       await harness.renderOnce();
       expect(host.shell.overlayKind).toBe("add_provider");
-      closeInsetOverlay(host.shell);
+      harness.pressKey("Escape");
+      await new Promise((r) => setTimeout(r, 60));
       await harness.renderOnce();
       expect(host.shell.overlayKind).not.toBe("model_picker");
       expect(host.shell.overlayKind).toBeNull();
@@ -931,6 +1002,41 @@ describe("flat type-to-filter model picker", () => {
     }
   });
 
+  test("typed /connect then Enter opens add-provider and Esc leaves overlay null", async () => {
+    const queued: { open?: () => void } = {};
+    const { harness, host } = await mountPicker({
+      onConnectProvider: () => {},
+      addProviderChoices: () => [{ id: "codex", label: "Codex", hint: "", accountCount: 1 }],
+      commands: [
+        {
+          id: "connect",
+          label: "/connect",
+          description: "Add a provider account",
+          keywords: ["connect", "Add a provider account", "slash", "command"],
+        },
+      ],
+      onCommand: (name) => {
+        if (name === "connect") queued.open?.();
+      },
+    });
+    queued.open = () => host.openAddProvider?.();
+    try {
+      expect(host.shell.overlayKind).toBeNull();
+      for (const ch of "/connect") harness.pressKey(ch);
+      await harness.renderOnce();
+      harness.pressKey("Enter");
+      await harness.renderOnce();
+      expect(host.shell.overlayKind).toBe("add_provider");
+      harness.pressKey("Escape");
+      await new Promise((r) => setTimeout(r, 60));
+      await harness.renderOnce();
+      expect(host.shell.overlayKind).toBeNull();
+    } finally {
+      host.dispose();
+      harness.destroy();
+    }
+  });
+
   test("Enter on an add-provider row runs the connect flow for that provider", async () => {
     const connected: string[] = [];
     const { harness, host } = await mountPicker({

src/tui/shell.ts

@@ -1332,8 +1332,8 @@ const DEFAULT_OVERLAY_HINTS = ["Esc cancel · Enter choose", "Esc · Enter"] as
  */
 /** Model picker only: same three-tier fallback shape as DEFAULT_OVERLAY_HINTS. */
 const MODEL_PICKER_HINTS = [
-  "Esc cancel · Enter choose · Alt+A add provider",
-  "Esc · Enter · Alt+A add",
+  "Esc cancel · Enter choose · Alt+A /connect add provider",
+  "Esc · Enter · Alt+A /connect",
   "Esc · Enter",
 ] as const;
 
@@ -1355,8 +1355,8 @@ function overlayHints(shell: AppShell): readonly string[] {
       const setDefault = bag?.overlaySetDefaultHint === true;
       if (addProvider && setDefault) {
         return [
-          "Esc cancel · Enter choose · Alt+A add provider · Alt+D set default",
-          "Esc · Enter · Alt+A add · Alt+D default",
+          "Esc cancel · Enter choose · Alt+A /connect add provider · Alt+D set default",
+          "Esc · Enter · Alt+A /connect · Alt+D default",
           "Esc · Enter · Alt+A · Alt+D",
           "Esc · Enter",
         ];
@@ -3569,9 +3569,9 @@ export interface OpenListOverlayOpts {
    */
   readonly typeToFilter?: boolean;
   /**
-   * Advertise Alt+A in the footer and yield composed Option+A (å/Å) from
-   * type-to-filter. Set only when the caller actually wired an Alt+A handler
-   * via `onAction`, so the hint can never name a key that is a dead end.
+   * Advertise Alt+A and /connect in the footer and yield composed Option+A
+   * (å/Å) from type-to-filter. Set only when the caller actually wired an
+   * add-provider handler via `onAction`, so the hint never names a dead chord.
    */
   readonly addProviderHint?: boolean;
   /**