Dismiss add-provider from /connect without reopening models

Esc from /connect was reopening the model picker because the opener
always wired onCancel to openModels. Only Alt+A from an already-open
picker needs that return path.

Author: TheGreatAxios

docs/IMPLEMENTATION.md

@@ -303,7 +303,7 @@ Profiles supply per-project or named-profile overrides for `model` and `systemPr
 
 Providers and credentials are read exclusively from settings files: the global `~/.corbits/settings.json` (definitions + credentials) and the per-repo `.corbits/settings.json` (selection only). There are no `OPENAI_COMPATIBLE_*` environment-variable overrides, and `index.ts` does not load `.env` files — a deliberately stale or exported key can no longer shadow the configured provider.
 
-**Models-first connect.** There is no standalone `/login` command. `/model` opens on a flat **models-only** list (Recent, Favorites, then connected provider/model rows) built by `buildModelsFirstList` (`src/tui/model-picker.ts`); type-to-filter owns printable keys. Selecting a row runs `applyLiveModelSwitch` (`src/session/live-model-switch.ts`) so inference sources, permission-gate identity, grant persistence identity, and advertised tool schemas cut over together. **Alt+A** opens Connect via `addProviderSelectorChoices` (`src/tui/provider-setup.ts`), which lists every first-class kind including Custom — never bare `c` / Ctrl+A, and never in-list “connect →” rows. First-class API-key rows use a named-instance + auth-only form (instance name, key; catalog base URL is display-only); Custom keeps the full manual form. **Alt+F** toggles favorites; recent/favorite pairs live in global settings (`recentModels` / `favoriteModels`). **Alt+D** sets the default via `setDefaultModel` (global `defaultProvider` + that provider's `defaultModel`) plus `persistConnectedSelection` without switching the live session. First-class providers ship from `packages/first-class-providers` (corbits-agnostic defs) and `packages/opencode-go` (Go catalog, auth validate, multi-protocol endpoints, usage). OAuth providers open the existing browser login modal with a named account step; API-key providers share the same multi-instance naming and pre-seed models on save so selection works without restart. Both OAuth and API-key (including Custom) connects share `persistConnectedSelection` in `provider-setup-submit.ts` so project-local provider/model selection is written alongside global credentials. OpenCode Go forces `OPENCODE_GO_BASE_URL` when `opencodeGo` is set so subscription traffic is not billed as Zen PAYG.
+**Models-first connect.** There is no standalone `/login` command. `/model` opens on a flat **models-only** list (Recent, Favorites, then connected provider/model rows) built by `buildModelsFirstList` (`src/tui/model-picker.ts`); type-to-filter owns printable keys. Selecting a row runs `applyLiveModelSwitch` (`src/session/live-model-switch.ts`) so inference sources, permission-gate identity, grant persistence identity, and advertised tool schemas cut over together. **Alt+A** or `/connect` opens Connect via `addProviderSelectorChoices` (`src/tui/provider-setup.ts`), which lists every first-class kind including Custom — never bare `c` / Ctrl+A, and never in-list “connect →” rows. First-class API-key rows use a named-instance + auth-only form (instance name, key; catalog base URL is display-only); Custom keeps the full manual form. **Alt+F** toggles favorites; recent/favorite pairs live in global settings (`recentModels` / `favoriteModels`). **Alt+D** sets the default via `setDefaultModel` (global `defaultProvider` + that provider's `defaultModel`) plus `persistConnectedSelection` without switching the live session. First-class providers ship from `packages/first-class-providers` (corbits-agnostic defs) and `packages/opencode-go` (Go catalog, auth validate, multi-protocol endpoints, usage). OAuth providers open the existing browser login modal with a named account step; API-key providers share the same multi-instance naming and pre-seed models on save so selection works without restart. Both OAuth and API-key (including Custom) connects share `persistConnectedSelection` in `provider-setup-submit.ts` so project-local provider/model selection is written alongside global credentials. OpenCode Go forces `OPENCODE_GO_BASE_URL` when `opencodeGo` is set so subscription traffic is not billed as Zen PAYG.
 
 **OpenCode Go multi-protocol.** Each Go model carries protocol metadata (`chat-completions`, `responses`, or `messages`). `buildGoSource` / `resolveGoEndpoint` pick the adapter and base URL per model (not a single provider-wide OpenAI route). When Go is the active provider, subscription usage is fetched for the status bar and omitted on auth/network failure.
 

docs/PRODUCT.md

@@ -103,11 +103,11 @@ recovery line instead of dumping the file path and parse details.
 
 ## Slash Commands (TUI)
 
-The TUI has an extensible slash-command framework. Built-ins include `/help` (shortcut + command overlay), `/model` (models-only picker for connected accounts; **Alt+A** adds a provider), `/settings`, `/permissions`, `/plugins`, `/clear`, `/new`, `/mcp`, and `/yolo` (persists as the user-global skip-permissions default; `--dangerously-skip-permissions` still forces this process; secret-guard and authz still apply; `/yolo [on|off|toggle]`, bare `/yolo` toggles), plus a `/<name>` command per available workflow. When a session starts with the persisted default already on, the TUI shows a startup notice ("Permission prompts are disabled by your saved default…") so the silent machine-wide default is never invisible; `corbits exec` prints the equivalent warning to stderr. Plugins can register additional commands.
+The TUI has an extensible slash-command framework. Built-ins include `/help` (shortcut + command overlay), `/model` (models-only picker for connected accounts; **Alt+A** or `/connect` adds a provider), `/settings`, `/permissions`, `/plugins`, `/clear`, `/new`, `/mcp`, and `/yolo` (persists as the user-global skip-permissions default; `--dangerously-skip-permissions` still forces this process; secret-guard and authz still apply; `/yolo [on|off|toggle]`, bare `/yolo` toggles), plus a `/<name>` command per available workflow. When a session starts with the persisted default already on, the TUI shows a startup notice ("Permission prompts are disabled by your saved default…") so the silent machine-wide default is never invisible; `corbits exec` prints the equivalent warning to stderr. Plugins can register additional commands.
 
 **Default skills** exist out of the gate as first-party slash **actions**, not director names: `/implement`, `/plan`, `/refactor`, `/review`, `/pull-request-review`, `/create-issue`, `/scribe`, `/interview`, `/ast-grep`. Each one is a how-to playbook — the slash sends the skill body to the primary, which follows the steps. Skills do not assign identity or route the fleet; that stays on director system prompts. `/review` is how to review a branch; `/scribe` is how to maintain PRODUCT / ARCHITECTURE / IMPLEMENTATION; `/implement` is the per-commit review/build/critique loop; `/plan` authors an eng change plan (files, AC, non-goals, risks, ordered steps) and does not implement. `/create-issue` remains the tracker command: Linear MCP when available; otherwise it `ask_operator`s for the platform (GitHub etc.) and persists `Preferred issue tracker` in `.corbits/MEMORY.md` (GitHub via `gh issue create`). There is no first-party dispatch skill — Skywalker orchestrates natively. `git-rebase`, `linear-issue-workflow`, `style`, `philosophy`, `typescript`, and `opsh` stay `use_skill` only (`user-invocable: false`). Draper and emil are not slashes; they remain closed directors via `task(agent=…)`. There is no catch-all worker. Slash names are also available to the model via `use_skill`. Disable the catalog in `/plugins` (`corbits-skills`) if you want them gone.
 
-Providers are **models-first**: there is no standalone `/login` command. `/model` opens a **models-only list** (Recent, Favorites, then connected provider/model rows) — type-to-filter owns printable keys, so Connect is never a bare letter. **Alt+A** opens a dedicated add-provider selector over every first-class kind (OpenAI dual-path ChatGPT OAuth or API key, xAI, OpenCode Zen, Anthropic, Google, OpenCode Go, Z.AI Coding Plan, Custom), each annotated with its live account count and never filtered out for “already connected.” **Alt+F** toggles favorite on the highlighted model. **Alt+D** persists the highlighted pair as the default without switching the live session. Advanced provider drill-down (edit/delete/tiers) stays on the advanced surface, not a bare printable key while the model list is filtering. OAuth providers open their existing browser login with a named account step so multiple accounts per kind coexist (`codex/work`, …). API-key providers use the same named-instance step before the key (auth-only form: instance name + key + fixed catalog base URL), so personal and team keys land as distinct catalog rows (`openai/default`, `anthropic/work`, …); reusing a name re-keys that instance after confirm. Custom remains a free-form single endpoint (full manual form). Successful connect refreshes the catalog and reopens the model list focused on the new account’s default model. OpenCode Go routes each model by its protocol metadata (chat completions, OpenAI responses, or Anthropic messages) and can show subscription usage in the status bar when active (rolling 5h / weekly / monthly windows when the usage API responds; omitted on auth or network failure). When Go returns a quota or rate-limit error — including some HTTP 400 responses that carry limit payloads — Corbits classifies them so quota aborts cleanly and short provider rate limits remain retryable. On a free-tier or subscription quota hit, wait for the window to reset or use OpenCode Zen free models.
+Providers are **models-first**: there is no standalone `/login` command. `/model` opens a **models-only list** (Recent, Favorites, then connected provider/model rows) — type-to-filter owns printable keys, so Connect is never a bare letter. **Alt+A** or `/connect` opens a dedicated add-provider selector over every first-class kind (OpenAI dual-path ChatGPT OAuth or API key, xAI, OpenCode Zen, Anthropic, Google, OpenCode Go, Z.AI Coding Plan, Custom), each annotated with its live account count and never filtered out for “already connected.” **Alt+F** toggles favorite on the highlighted model. **Alt+D** persists the highlighted pair as the default without switching the live session. Advanced provider drill-down (edit/delete/tiers) stays on the advanced surface, not a bare printable key while the model list is filtering. OAuth providers open their existing browser login with a named account step so multiple accounts per kind coexist (`codex/work`, …). API-key providers use the same named-instance step before the key (auth-only form: instance name + key + fixed catalog base URL), so personal and team keys land as distinct catalog rows (`openai/default`, `anthropic/work`, …); reusing a name re-keys that instance after confirm. Custom remains a free-form single endpoint (full manual form). Successful connect refreshes the catalog and reopens the model list focused on the new account’s default model. OpenCode Go routes each model by its protocol metadata (chat completions, OpenAI responses, or Anthropic messages) and can show subscription usage in the status bar when active (rolling 5h / weekly / monthly windows when the usage API responds; omitted on auth or network failure). When Go returns a quota or rate-limit error — including some HTTP 400 responses that carry limit payloads — Corbits classifies them so quota aborts cleanly and short provider rate limits remain retryable. On a free-tier or subscription quota hit, wait for the window to reset or use OpenCode Zen free models.
 
 `/model` opens a dedicated full-screen modal — the single place agent configuration lives. The default view is models-only (Recent / Favorites / connected models); add-provider, tiers, and profiles remain reachable from the same surface without in-list “connect →” rows. A switch applies to the running session immediately (no restart): inference, permission identity, grant persistence identity, and advertised tool schemas cut over together, and the choice can be saved as this project's default (written to the per-repo selection file). Recent and favorite model pairs are stored in global settings (no credentials).
 

src/tui/command-surfaces.ts

@@ -167,8 +167,8 @@ export interface CommandSurfaceDeps {
   readonly settings?: SettingsSurfaceDeps;
   /** Opens the host's model/provider picker (owned by the product host). */
   readonly openModels?: () => void;
-  /** Opens the host's add-provider selector (owned by the product host). */
-  readonly openAddProvider?: () => void;
+  /** Opens the host's add-provider selector (owned by the product host). `/connect` omits returnToModels. */
+  readonly openAddProvider?: (opts?: { returnToModels?: boolean }) => void;
   /** Fallback channel for surfaces with no live data source. */
   readonly notify: (text: string) => void;
 }

src/tui/overlays.ts

@@ -208,7 +208,7 @@ export interface OpenAddProviderOpts {
   readonly onAccept?: (selection: OverlaySelection) => void;
   /** Description-zone source, keyed by the focused row's id. */
   readonly describe?: (itemId: string) => ItemDescription | null;
-  /** Per-open Esc/dismiss — the caller returns to the model list. */
+  /** Per-open Esc/dismiss. Set when Esc should return to the model list (Alt+A). */
   readonly onCancel?: () => void;
 }
 

src/tui/product-host.test.ts

@@ -911,6 +911,26 @@ describe("flat type-to-filter model picker", () => {
     }
   });
 
+  test("Esc after openAddProvider from a closed prompt does not reopen the model list", async () => {
+    const { harness, host } = await mountPicker({
+      onConnectProvider: () => {},
+      addProviderChoices: () => [{ id: "codex", label: "Codex", hint: "", accountCount: 1 }],
+    });
+    try {
+      expect(host.shell.overlayKind).toBeNull();
+      host.openAddProvider?.();
+      await harness.renderOnce();
+      expect(host.shell.overlayKind).toBe("add_provider");
+      closeInsetOverlay(host.shell);
+      await harness.renderOnce();
+      expect(host.shell.overlayKind).not.toBe("model_picker");
+      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/product-host.ts

@@ -207,8 +207,11 @@ export interface ProductHost {
   readonly openModels?: (focusId?: string) => void;
   /**
    * Opens the add-provider selector; absent when connect choices are not wired.
+   * Pass `returnToModels: true` when opening from the model picker (Alt+A) so
+   * Esc returns there. `/connect` and other closed-prompt callers omit it so
+   * Esc dismisses to a closed overlay.
    */
-  readonly openAddProvider?: () => void;
+  readonly openAddProvider?: (opts?: { returnToModels?: boolean }) => void;
   /** Swap the picker's rows/descriptions in place (e.g. after a provider connects). */
   readonly setModels?: (
     models: readonly ProductHostModelOption[],
@@ -518,7 +521,7 @@ export async function mountProductHost(config: ProductHostConfig): Promise<Produ
   let currentModels = config.models ?? [];
   let currentDescribeModel = config.describeModel;
   let openModels: ((focusId?: string) => void) | undefined;
-  let openAddProvider: (() => void) | undefined;
+  let openAddProvider: ((opts?: { returnToModels?: boolean }) => void) | undefined;
   if (config.onModelSelect) {
     const onSelect = config.onModelSelect;
     const onConnect = config.onConnectProvider;
@@ -535,7 +538,7 @@ export async function mountProductHost(config: ProductHostConfig): Promise<Produ
     // which does not apply here.
     openAddProvider =
       addProviderChoices !== undefined && onConnect !== undefined
-        ? (): void => {
+        ? (opts?: { returnToModels?: boolean }): void => {
             const rows = addProviderChoices();
             closeInsetOverlay(shell);
             openAddProviderOverlay(shell, {
@@ -558,9 +561,10 @@ export async function mountProductHost(config: ProductHostConfig): Promise<Produ
                   tone: "plain",
                 };
               },
-              // Esc returns to the model list through the same entry point
-              // Alt+A itself, /model, and a completed connect all use.
-              onCancel: () => openModels?.(),
+              // Alt+A from the model picker: Esc returns through the same entry
+              // point Alt+A itself, /model, and a completed connect all use.
+              // /connect from a closed prompt omits this so Esc dismisses.
+              ...(opts?.returnToModels === true ? { onCancel: () => openModels?.() } : {}),
             });
           }
         : undefined;
@@ -595,7 +599,7 @@ export async function mountProductHost(config: ProductHostConfig): Promise<Produ
                 // Alt+A / composed Option+A (å/Å) — never bare ASCII `a`;
                 // type-to-filter claims ordinary printables.
                 if (openAddProvider !== undefined && isAddProviderShortcutKey(key)) {
-                  openAddProvider();
+                  openAddProvider({ returnToModels: true });
                   return true;
                 }
                 if (!(key.meta || key.option)) return false;

src/tui/runner.ts

@@ -2173,7 +2173,8 @@ export async function runTUI(initialConfig: Config): Promise<number> {
           return;
         case "overlay":
           if (!host.openSurface(result.overlay)) {
-            systemNotice(`No surface for /${result.overlay}.`);
+            const named = result.overlay === "add-provider" ? "connect" : result.overlay;
+            systemNotice(`No surface for /${named}.`);
           }
           return;
         case "modal":