@crouton-kit/crouter 0.3.78 → 0.3.79

package/dist/commands/sys/setup.js

@@ -1,8 +1,16 @@
 import { defineLeaf } from '../../core/command.js';
 import { getMarkdownTheme, getSelectListTheme, getSettingsListTheme } from '@earendil-works/pi-coding-agent';
 import { TUI, ProcessTerminal, Input, matchesKey, truncateToWidth, visibleWidth } from '@earendil-works/pi-tui';
+import { AuthStorage, LoginDialogComponent, ModelRegistry } from '@earendil-works/pi-coding-agent';
+import { loginAnthropic, loginOpenAICodex } from '@earendil-works/pi-ai/oauth';
+import { execFile } from 'node:child_process';
+import { join } from 'node:path';
 import { applyTheme, defaultAgentDir } from '../../clients/attach/config-load.js';
-import { buildLoginPicker, summarizeProviderAuth } from '../../clients/attach/auth-pickers.js';
+import { ANTHROPIC_PROVIDER_ID, OPENAI_CODEX_PROVIDER_ID, promoteSubscription, readSubscriptionPool, commitManagedLogin, renameSubscription, } from '../../core/subscription-state.js';
+import { removeProviderRow } from '../../core/provider-management.js';
+import { readRawScopeConfig } from '../../core/config.js';
+import { BINDING_CATALOG, formatBinding, formatGesture, matchesPiTuiInput, persistUserKeybindings, resolveKeybindings, KeybindingConcurrentEditError, KeybindingValidationError, } from '../../core/keybindings/index.js';
+import { installTmuxBindings } from '../../core/runtime/tmux-chrome.js';
 const ANSI_GREEN = (s) => `\x1b[32m${s}\x1b[39m`;
 const ANSI_YELLOW = (s) => `\x1b[33m${s}\x1b[39m`;
 const theme = {
@@ -33,7 +41,7 @@ const theme = {
         return getMarkdownTheme().bold(text);
     },
 };
-import { buildSetupInitialState, executeSetupSubmission, formatSetupExecutionSummary, renderSetupStaticInstructions, resolveExaKeyPath, resolveComposioKeyPath, } from './setup-core.js';
+import { buildSetupInitialState, executeSetupSubmission, formatSetupExecutionSummary, renderSetupStaticInstructions, resolveExaKeyPath, resolveComposioKeyPath, detectExaKey, detectComposioKey, SetupKeybindingsDraft, } from './setup-core.js';
 function wrapText(text, width) {
     const clean = text.trim();
     if (clean === '')
@@ -67,6 +75,15 @@ function currentWidth() {
 function toolLabel(tool) {
     return tool === 'nvim' ? 'nvim' : 'tmux';
 }
+/** Inline badge for an optional API-key tab header: green ✓ when a key is
+ *  already resolvable (naming its source so an env-provided key isn't mistaken
+ *  for the writable file), dim — when absent. */
+function keyStatusBadge(presence, envVar) {
+    if (!presence.present)
+        return theme.fg('dim', '  · not set');
+    const where = presence.source === 'env' ? `${envVar} env` : 'saved';
+    return theme.fg('success', `  ✓ configured (${where})`);
+}
 function renderRows(lines, width) {
     return lines.map((line) => truncateToWidth(line, width));
 }
@@ -97,34 +114,386 @@ function framed(lines, width) {
     });
     return [top, ...body, bottom];
 }
-class SetupWizard {
+class ProviderPanel {
+    tui;
+    agentDir;
+    renameInput = new Input();
+    rows = [];
+    selected = 0;
+    mode = 'list';
+    notice = '';
+    catalog = [];
+    catalogIndex = 0;
+    loginProvider;
+    loginLabel = '';
+    dialog;
+    loginFlow;
+    // Wired by the host wizard to bust its render-line cache. The panel proxies pi's
+    // LoginDialogComponent (it is not a real pi TUI child), so the host only repaints on
+    // synchronous input. startLogin drives OAuth through async promise chains whose state
+    // transitions land between keystrokes; notifyChange() lets each one force a fresh frame.
+    onChange;
+    constructor(tui, agentDir) {
+        this.tui = tui;
+        this.agentDir = agentDir;
+        this.renameInput.onSubmit = () => this.rename();
+        this.renameInput.onEscape = () => { this.mode = 'list'; };
+        this.reload();
+    }
+    // Repaint the host after an async login transition: bust the wizard's cached lines
+    // (onChange) so render() recomputes the NEW state, then ask pi's loop to draw a frame.
+    notifyChange() {
+        this.onChange?.();
+        this.tui.requestRender();
+    }
+    providerCatalog(auth, registry) {
+        const oauth = auth.getOAuthProviders();
+        const oauthIds = new Set(oauth.map((provider) => provider.id));
+        const seen = new Set();
+        return [
+            ...oauth.map((provider) => ({ providerId: provider.id, name: provider.name, managed: provider.id === ANTHROPIC_PROVIDER_ID || provider.id === OPENAI_CODEX_PROVIDER_ID, authType: 'oauth' })),
+            ...registry.getAll().map((model) => ({ providerId: model.provider, name: registry.getProviderDisplayName(model.provider), managed: model.provider === ANTHROPIC_PROVIDER_ID || model.provider === OPENAI_CODEX_PROVIDER_ID, authType: oauthIds.has(model.provider) ? 'oauth' : 'api_key' })),
+        ].filter((provider) => !seen.has(provider.providerId) && Boolean(seen.add(provider.providerId)));
+    }
+    reload() {
+        const auth = AuthStorage.create(join(this.agentDir, 'auth.json'));
+        const registry = ModelRegistry.create(auth, join(this.agentDir, 'models.json'));
+        const rows = [];
+        for (const provider of this.providerCatalog(auth, registry)) {
+            const status = auth.getAuthStatus(provider.providerId);
+            if (provider.managed) {
+                const pool = readSubscriptionPool(provider.providerId);
+                if (pool.length === 0 && !status.source)
+                    continue;
+                rows.push({ ...provider, configured: pool.length > 0 || status.configured, source: status.source, sourceLabel: status.label });
+                pool.forEach((account, index) => rows.push({ ...provider, label: account.label === provider.providerId ? 'Default account' : account.label, preferred: index === 0, cooldownUntil: account.rateLimitedUntil, accountId: account.accountId }));
+                continue;
+            }
+            if (!status.source)
+                continue;
+            const stored = auth.get(provider.providerId);
+            rows.push({ ...provider, configured: status.configured, source: status.source, sourceLabel: status.label, accountId: typeof stored?.accountId === 'string' ? stored.accountId : undefined });
+        }
+        this.rows = rows;
+        this.selected = Math.min(this.selected, Math.max(0, rows.length));
+    }
+    selectedRow() { return this.rows[this.selected]; }
+    openBrowser(url) {
+        const command = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'cmd' : 'xdg-open';
+        const args = process.platform === 'win32' ? ['/c', 'start', '', url] : [url];
+        execFile(command, args, { timeout: 5_000 }, () => { });
+    }
+    openCatalog() {
+        const auth = AuthStorage.create(join(this.agentDir, 'auth.json'));
+        this.catalog = this.providerCatalog(auth, ModelRegistry.create(auth, join(this.agentDir, 'models.json')));
+        this.catalogIndex = 0;
+        this.mode = 'catalog';
+    }
+    startLogin(provider, label = provider.providerId) {
+        this.loginProvider = provider;
+        this.loginLabel = label;
+        const auth = AuthStorage.create(join(this.agentDir, 'auth.json'));
+        let flow;
+        const complete = (message) => {
+            if (!flow.active || this.loginFlow !== flow)
+                return;
+            flow.active = false;
+            this.loginFlow = undefined;
+            this.dialog = undefined;
+            this.mode = 'list';
+            this.notice = message;
+            this.reload();
+            this.notifyChange();
+        };
+        const dialog = new LoginDialogComponent(this.tui, provider.providerId, (success, message) => {
+            if (!success)
+                complete(message ? `Login failed: ${message}` : 'Login cancelled');
+        }, provider.name);
+        flow = { dialog, active: true };
+        this.loginFlow = flow;
+        this.dialog = dialog;
+        this.mode = 'login';
+        const isActive = () => flow.active && this.loginFlow === flow && !dialog.signal.aborted;
+        const fail = (error) => {
+            complete(error.name === 'AbortError' ? 'Login cancelled' : `Login error: ${error instanceof Error ? error.message : String(error)}`);
+        };
+        if (provider.authType === 'api_key') {
+            void dialog.showPrompt(`Enter API key for ${provider.name}:`, 'sk-...').then((key) => {
+                if (!isActive())
+                    return;
+                if (!key.trim()) {
+                    complete('No key entered — login cancelled');
+                    return;
+                }
+                auth.set(provider.providerId, { type: 'api_key', key: key.trim() });
+                complete(`API key saved for ${provider.name}`);
+            }).catch(fail);
+            return;
+        }
+        if (!provider.managed) {
+            void auth.login(provider.providerId, {
+                onAuth: (info) => { if (isActive()) {
+                    dialog.showAuth(info.url, info.instructions);
+                    this.openBrowser(info.url);
+                    this.notifyChange();
+                } },
+                onDeviceCode: (info) => { if (isActive()) {
+                    dialog.showDeviceCode(info);
+                    this.openBrowser(info.verificationUri);
+                    this.notifyChange();
+                } },
+                onPrompt: (prompt) => { const answer = dialog.showPrompt(prompt.message, prompt.placeholder); this.notifyChange(); return answer; },
+                onProgress: (message) => { if (isActive()) {
+                    dialog.showProgress(message);
+                    this.notifyChange();
+                } },
+                onManualCodeInput: () => { const answer = dialog.showManualInput('Paste the code or URL:'); this.notifyChange(); return answer; },
+                onSelect: async (prompt) => { const answer = dialog.showPrompt(`${prompt.message}\n${prompt.options.map((option, index) => `${index + 1}. ${option.label}`).join('\n')}`, '1'); this.notifyChange(); return prompt.options[(Number.parseInt(await answer, 10) || 1) - 1]?.id; },
+                signal: dialog.signal,
+            }).then(() => { if (isActive())
+                complete(`Logged in to ${provider.name}`); }).catch(fail);
+            return;
+        }
+        const login = provider.providerId === ANTHROPIC_PROVIDER_ID ? loginAnthropic : loginOpenAICodex;
+        // Snapshot the default slot's rate-limit timestamp BEFORE OAuth begins: a strictly newer
+        // concurrent 429 recorded during the login must survive a same-account re-login.
+        const defaultLastRateLimitedAt = readSubscriptionPool(provider.providerId).find((entry) => entry.label === provider.providerId)?.lastRateLimitedAt ?? 0;
+        void login({
+            onAuth: ({ url, instructions }) => { if (isActive()) {
+                dialog.showAuth(url, instructions);
+                this.openBrowser(url);
+                this.notifyChange();
+            } },
+            onPrompt: async (prompt) => { const answer = dialog.showPrompt(prompt.message, prompt.placeholder); this.notifyChange(); return answer; },
+            onProgress: (message) => { if (isActive()) {
+                dialog.showProgress(message);
+                this.notifyChange();
+            } },
+            onManualCodeInput: () => { const answer = dialog.showManualInput('Paste the code or URL:'); this.notifyChange(); return answer; },
+        }).then((credential) => {
+            if (!isActive())
+                return;
+            const accountId = typeof credential.accountId === 'string' && credential.accountId.trim() ? credential.accountId.trim() : undefined;
+            commitManagedLogin(provider.providerId, this.loginLabel, { refresh: credential.refresh, access: credential.access, expires: credential.expires, accountId, defaultLastRateLimitedAt });
+            if (isActive())
+                complete(`Logged in to ${provider.name}`);
+        }).catch(fail);
+    }
+    isNestedFlowActive() { return this.mode === 'login'; }
+    dispose() {
+        const flow = this.loginFlow;
+        if (!flow)
+            return;
+        flow.active = false;
+        this.loginFlow = undefined;
+        this.dialog = undefined;
+        flow.dialog.handleInput('\u001b');
+    }
+    rename() {
+        const row = this.selectedRow();
+        if (!row?.managed || !row.label || row.label === 'Default account')
+            return;
+        try {
+            renameSubscription(row.providerId, row.label, this.renameInput.getValue());
+            this.notice = `Renamed ${row.name} account`;
+            this.mode = 'list';
+            this.reload();
+        }
+        catch (error) {
+            this.notice = error instanceof Error ? error.message : String(error);
+            this.mode = 'list';
+        }
+    }
+    handleInput(data) {
+        if (this.mode === 'login') {
+            this.dialog?.handleInput(data);
+            return true;
+        }
+        if (this.mode === 'rename' || this.mode === 'label') {
+            this.renameInput.handleInput(data);
+            return true;
+        }
+        if (this.mode === 'catalog') {
+            if (matchesKey(data, 'escape')) {
+                this.mode = 'list';
+                return true;
+            }
+            if (matchesKey(data, 'j') || matchesKey(data, 'down')) {
+                this.catalogIndex = Math.min(this.catalog.length - 1, this.catalogIndex + 1);
+                return true;
+            }
+            if (matchesKey(data, 'k') || matchesKey(data, 'up')) {
+                this.catalogIndex = Math.max(0, this.catalogIndex - 1);
+                return true;
+            }
+            if (matchesKey(data, 'enter')) {
+                const provider = this.catalog[this.catalogIndex];
+                if (provider.managed) {
+                    this.loginProvider = provider;
+                    this.renameInput.setValue('');
+                    this.renameInput.onSubmit = () => { const label = this.renameInput.getValue().trim(); if (label)
+                        this.startLogin(provider, label); };
+                    this.mode = 'label';
+                }
+                else
+                    this.startLogin(provider);
+                return true;
+            }
+            return true;
+        }
+        if (this.mode === 'remove') {
+            if (matchesKey(data, 'y') || matchesKey(data, 'enter')) {
+                const row = this.selectedRow();
+                if (row && (row.managed || row.configured)) {
+                    try {
+                        this.notice = removeProviderRow(this.agentDir, row);
+                        this.reload();
+                    }
+                    catch (error) {
+                        this.notice = error instanceof Error ? error.message : String(error);
+                    }
+                }
+            }
+            this.mode = 'list';
+            return true;
+        }
+        if (matchesKey(data, 'j') || matchesKey(data, 'down')) {
+            this.selected = Math.min(this.rows.length, this.selected + 1);
+            return true;
+        }
+        if (matchesKey(data, 'k') || matchesKey(data, 'up')) {
+            this.selected = Math.max(0, this.selected - 1);
+            return true;
+        }
+        const row = this.selectedRow();
+        if (matchesKey(data, 'p') && row?.managed && row.label) {
+            try {
+                promoteSubscription(row.providerId, row.label === 'Default account' ? row.providerId : row.label);
+                this.notice = `Preferred ${row.name} account`;
+                this.reload();
+            }
+            catch (error) {
+                this.notice = error instanceof Error ? error.message : String(error);
+            }
+            return true;
+        }
+        if (matchesKey(data, 'r') && row?.managed && row.label && row.label !== 'Default account') {
+            this.renameInput.setValue(row.label);
+            this.renameInput.onSubmit = () => this.rename();
+            this.mode = 'rename';
+            return true;
+        }
+        if (matchesKey(data, 'x') && (row?.managed || row?.configured)) {
+            this.mode = 'remove';
+            return true;
+        }
+        if (matchesKey(data, 'a')) {
+            this.openCatalog();
+            return true;
+        }
+        const viewOnly = row?.source === 'environment' || row?.source === 'runtime';
+        if (matchesKey(data, 'l') && row && !viewOnly) {
+            if (row.managed && row.label)
+                this.startLogin(row, row.label === 'Default account' ? row.providerId : row.label);
+            else
+                this.startLogin(row);
+            return true;
+        }
+        if (matchesKey(data, 'enter')) {
+            if (row && !viewOnly)
+                this.startLogin(row, row.managed && row.label ? (row.label === 'Default account' ? row.providerId : row.label) : row.providerId);
+            else if (!row)
+                this.openCatalog();
+            return true;
+        }
+        return false;
+    }
+    render(width) {
+        const body = [theme.fg('accent', theme.bold('Providers')), theme.fg('dim', `${this.rows.filter((row) => row.label === undefined).length} configured`)];
+        if (this.mode === 'login')
+            return framed(this.dialog?.render(Math.max(1, width - 4)) ?? [], width);
+        if (this.mode === 'rename' || this.mode === 'label')
+            body.push('', theme.fg('accent', this.mode === 'rename' ? 'Rename account' : `Name the ${this.loginProvider?.name ?? 'provider'} account`), ...this.renameInput.render(Math.max(1, width - 8)));
+        else if (this.mode === 'catalog') {
+            body.push('', theme.fg('dim', 'Select a provider to add · esc back'));
+            this.catalog.forEach((provider, index) => body.push(`${index === this.catalogIndex ? theme.fg('accent', '▶') : ' '} ${provider.name}`));
+        }
+        else if (this.mode === 'remove') {
+            const target = this.selectedRow();
+            const label = target?.label ?? (target?.managed ? `${target.name} · all accounts` : target?.name ?? 'account');
+            body.push('', theme.fg('warning', `Remove ${label}? y/enter confirm · any other key cancel`));
+        }
+        else {
+            if (this.rows.length === 0)
+                body.push('', theme.fg('warning', 'No provider configured yet.'));
+            for (let index = 0; index < this.rows.length; index++) {
+                const row = this.rows[index];
+                const selected = index === this.selected ? theme.fg('accent', '▶') : ' ';
+                if (!row.label) {
+                    const state = row.managed
+                        ? `${this.rows.filter((item) => item.providerId === row.providerId && item.label).length} accounts`
+                        : row.source === 'environment' || row.source === 'runtime'
+                            ? `${row.source}${row.sourceLabel ? ` · ${row.sourceLabel}` : ''} (view only)`
+                            : 'configured';
+                    body.push(`${selected} ${theme.fg('accent', row.name)}${theme.fg('dim', `  ${state}`)}`);
+                }
+                else {
+                    const health = row.cooldownUntil && row.cooldownUntil > Date.now() ? `cooldown ${Math.ceil((row.cooldownUntil - Date.now()) / 60000)}m` : 'ready';
+                    const identity = row.accountId ? ` · ${row.accountId.length > 12 ? `${row.accountId.slice(0, 8)}…${row.accountId.slice(-4)}` : row.accountId}` : '';
+                    body.push(`${selected}   ${row.preferred ? theme.fg('success', '●') : ' '} ${row.label}${theme.fg('dim', identity)}  ${theme.fg('dim', health)}${row.preferred ? theme.fg('accent', '  preferred') : ''}`);
+                }
+            }
+            body.push('', `${this.selected === this.rows.length ? theme.fg('accent', '▶') : ' '} ${theme.fg('accent', '＋ Add provider')}`);
+            if (this.notice)
+                body.push('', theme.fg('dim', this.notice));
+        }
+        return framed(body, width);
+    }
+}
+export class SetupWizard {
     manifest;
     installedPackageIds;
     systemTools;
     exaInput = new Input();
     composioInput = new Input();
+    keyInput = new Input();
+    openingBindings;
+    keyDraft;
+    terminalRows;
     selectedPackageIds = new Set();
     selectedSystemTools = new Set();
-    authSummary;
-    reloadAuthSummary;
-    notice;
-    onOpenLogin;
+    providers;
     activeTab = 0;
     pluginIndex = 0;
     systemIndex = 0;
     expandedPluginId = null;
     confirming = false;
+    keyIndex = 0;
+    keyScroll = 0;
+    keyFilter = '';
+    filteringKeys = false;
+    editingKey = null;
+    keyEditError;
+    keyDiagnostics = [];
+    keyConfirm = null;
+    keyNotice;
     cachedWidth;
     cachedLines;
     _focused = false;
     onSubmit;
     onCancel;
-    constructor(manifest, installedPackageIds, systemTools, authSummary, reloadAuthSummary) {
+    constructor(manifest, installedPackageIds, systemTools, tui, agentDir, openingBindings, rawKeybindings, terminalRows) {
         this.manifest = manifest;
+        this.providers = new ProviderPanel(tui, agentDir);
+        // The panel drives OAuth async; bust our line cache when it transitions so the panel's
+        // requestRender repaints the NEW frame (progress → success notice → roster) without a keypress.
+        this.providers.onChange = () => this.invalidate();
         this.installedPackageIds = installedPackageIds;
         this.systemTools = systemTools;
-        this.authSummary = authSummary;
-        this.reloadAuthSummary = reloadAuthSummary;
+        this.terminalRows = terminalRows;
+        this.openingBindings = openingBindings;
+        this.keyDraft = new SetupKeybindingsDraft(rawKeybindings);
+        this.keyDiagnostics = this.keyDraft.resolution().diagnostics;
         for (const entry of this.manifest)
             this.selectedPackageIds.add(entry.id);
         for (const tool of this.systemTools) {
@@ -137,11 +506,17 @@ class SetupWizard {
         this.exaInput.onEscape = () => this.cancel();
         this.composioInput.onSubmit = () => this.finalize();
         this.composioInput.onEscape = () => this.cancel();
+        // Edit-mode Enter/Escape are routed through the opening snapshot's
+        // `crtr.setup.keybindings.commit-edit` / `.cancel-edit` bindings in
+        // handleKeybindingsInput (before the pi Input sees them), so the pi Input's
+        // own submit/escape handlers stay unset — those catalog rows are honored
+        // even when remapped away from Enter/Escape.
     }
     set focused(value) {
         this._focused = value;
         this.exaInput.focused = value && this.activeTab === 3 && !this.confirming;
         this.composioInput.focused = value && this.activeTab === 4 && !this.confirming;
+        this.keyInput.focused = value && this.activeTab === 5 && this.editingKey !== null;
     }
     get focused() {
         return this._focused;
@@ -150,24 +525,15 @@ class SetupWizard {
         this.cachedWidth = undefined;
         this.cachedLines = undefined;
     }
-    /** Show a one-line notice on the login tab (login success/failure feedback). */
-    setNotice(message) {
-        this.notice = message;
-        this.invalidate();
-    }
-    /** Recompute provider auth status after a login flow closes. */
-    refreshAuth() {
-        this.authSummary = this.reloadAuthSummary();
-        this.invalidate();
-    }
     setTab(next) {
         this.activeTab = next;
         this.exaInput.focused = this.focused && next === 3 && !this.confirming;
         this.composioInput.focused = this.focused && next === 4 && !this.confirming;
+        this.keyInput.focused = this.focused && next === 5 && this.editingKey !== null;
         this.invalidate();
     }
     moveTab(delta) {
-        const next = ((this.activeTab + delta + 5) % 5);
+        const next = ((this.activeTab + delta + 6) % 6);
         this.setTab(next);
     }
     cancel() {
@@ -176,14 +542,38 @@ class SetupWizard {
             this.invalidate();
             return;
         }
+        this.providers.dispose();
         this.onCancel?.();
     }
+    dispose() { this.providers.dispose(); }
+    matches(id, data) {
+        return matchesPiTuiInput(this.openingBindings, id, data, (input, gesture) => matchesKey(input, gesture));
+    }
+    /** Human hint label for an action, derived from the opening snapshot so footers
+     *  reflect the effective (possibly remapped) gestures the wizard actually honors. */
+    label(id) {
+        return formatBinding(this.openingBindings, id);
+    }
+    /** Like `label`, but drops gestures a focused pi text Input consumes as data
+     *  (single printable chars and the arrow keys), so the Exa/Composio footers do
+     *  not claim keys that never reach the wizard while a field owns focus. */
+    fieldSafeLabel(id) {
+        const survives = this.openingBindings.gestures(id).filter((gesture) => {
+            if (gesture.includes(' > '))
+                return true;
+            const key = gesture.split('+').pop();
+            if (key === 'up' || key === 'down' || key === 'left' || key === 'right')
+                return false;
+            return key.length > 1 || gesture.includes('+');
+        });
+        return survives.length === 0 ? 'Disabled' : survives.map(formatGesture).join(' / ');
+    }
     handleGlobalTabSwitch(data) {
-        if (matchesKey(data, 'tab') || matchesKey(data, 'right')) {
+        if (this.matches('crtr.setup.tab-next', data)) {
             this.moveTab(1);
             return true;
         }
-        if (matchesKey(data, 'shift+tab') || matchesKey(data, 'left')) {
+        if (this.matches('crtr.setup.tab-previous', data)) {
             this.moveTab(-1);
             return true;
         }
@@ -267,85 +657,378 @@ class SetupWizard {
         }
         this.onSubmit?.(this.buildSubmission());
     }
+    filteredKeybindings() {
+        const resolution = this.keyDraft.resolution();
+        const needle = this.keyFilter.trim().toLowerCase();
+        if (needle === '')
+            return BINDING_CATALOG;
+        return BINDING_CATALOG.filter((definition) => {
+            const rendered = formatBinding(resolution, definition.id);
+            return [definition.name, definition.id, definition.group, definition.description, rendered]
+                .some((value) => value.toLowerCase().includes(needle));
+        });
+    }
+    selectedKeybinding() {
+        const rows = this.filteredKeybindings();
+        if (rows.length === 0)
+            return undefined;
+        this.keyIndex = Math.max(0, Math.min(this.keyIndex, rows.length - 1));
+        return rows[this.keyIndex];
+    }
+    moveKey(delta) {
+        const rows = this.filteredKeybindings();
+        if (rows.length === 0)
+            return;
+        this.keyIndex = Math.max(0, Math.min(rows.length - 1, this.keyIndex + delta));
+        const page = this.keyPageSize();
+        if (this.keyIndex < this.keyScroll)
+            this.keyScroll = this.keyIndex;
+        if (this.keyIndex >= this.keyScroll + page)
+            this.keyScroll = this.keyIndex - page + 1;
+        this.keyEditError = undefined;
+        this.invalidate();
+    }
+    // Max output lines the row region may emit before it starts clipping the
+    // confirm prompt / notice / footer. Budgets the fixed chrome around the list:
+    // header (3) + blank + tab header/count (2) + blank + footer (1) plus a small
+    // reserve for a diagnostic line and the notice/confirm block.
+    keyViewportLines() {
+        return Math.max(4, this.terminalRows() - 11);
+    }
+    // Rows moved per PageUp/PageDown and used for scroll clamping. Kept below the
+    // raw viewport so interleaved group-heading lines and the selected row's
+    // diagnostic line cannot push the selection off-screen.
+    keyPageSize() {
+        return Math.max(3, this.keyViewportLines() - 4);
+    }
+    beginKeyEdit() {
+        const row = this.selectedKeybinding();
+        if (!row)
+            return;
+        if (this.keyDraft.hasInvalidRoot()) {
+            this.keyNotice = `Saved keybindings root is invalid — ${this.label('crtr.setup.keybindings.reset-all')} (reset all) before editing.`;
+            this.invalidate();
+            return;
+        }
+        this.editingKey = row.id;
+        this.keyInput.setValue(this.keyDraft.expression(row.id));
+        // pi Input.setValue only clamps the cursor; seed it, then send ctrl+e
+        // (cursorLineEnd) so the cursor sits at end-of-value and the first keystroke
+        // appends after the seed instead of prepending before it.
+        this.keyInput.handleInput('\x05');
+        this.keyInput.focused = this.focused;
+        this.keyEditError = undefined;
+        this.invalidate();
+    }
+    commitKeyEdit() {
+        if (this.editingKey === null)
+            return;
+        const result = this.keyDraft.edit(this.editingKey, this.keyInput.getValue());
+        if (!result.ok) {
+            this.keyEditError = result.diagnostics[0]?.message ?? 'Invalid keybinding';
+            this.keyDiagnostics = result.diagnostics;
+            this.invalidate();
+            return;
+        }
+        this.editingKey = null;
+        this.keyInput.focused = false;
+        this.keyEditError = undefined;
+        this.keyDiagnostics = this.keyDraft.resolution().diagnostics;
+        this.keyNotice = undefined;
+        this.invalidate();
+    }
+    cancelKeyEdit() {
+        this.editingKey = null;
+        this.keyInput.focused = false;
+        this.keyEditError = undefined;
+        // Drop the rejected edit's collision diagnostics: the draft never took the
+        // offending value, so restore diagnostics from the committed draft state.
+        this.keyDiagnostics = this.keyDraft.resolution().diagnostics;
+        this.invalidate();
+    }
+    saveKeybindings() {
+        const resolution = this.keyDraft.resolution();
+        this.keyDiagnostics = resolution.diagnostics;
+        const errors = resolution.diagnostics.filter((diagnostic) => diagnostic.severity === 'error');
+        if (errors.length > 0) {
+            this.keyNotice = errors[0].message;
+            this.invalidate();
+            return;
+        }
+        try {
+            const saved = persistUserKeybindings(this.keyDraft.overrides(), {
+                expectedKeybindings: this.keyDraft.expectedKeybindings(),
+            });
+            this.keyDraft.markSaved(saved.overrides);
+            this.keyNotice = 'Saved. Reload attach and reopen active views to apply changes; refreshing tmux…';
+            // The config is already persisted; a tmux-refresh failure (installer throw)
+            // must land in the notice, never as an unhandled rejection that tears down
+            // the wizard mid-TUI right after a good save.
+            void this.refreshTmuxBindingsAfterSave().catch((error) => {
+                this.keyNotice = `Saved, but tmux refresh failed: ${error instanceof Error ? error.message : String(error)}`;
+                this.invalidate();
+            });
+        }
+        catch (error) {
+            if (error instanceof KeybindingConcurrentEditError) {
+                this.keyNotice = 'Keybindings changed on disk. Reopen setup before saving.';
+            }
+            else if (error instanceof KeybindingValidationError) {
+                this.keyDiagnostics = error.diagnostics;
+                this.keyNotice = error.message;
+            }
+            else {
+                this.keyNotice = error instanceof Error ? error.message : String(error);
+            }
+        }
+        this.invalidate();
+    }
+    async refreshTmuxBindingsAfterSave() {
+        // Unit 2's frozen tmux-chrome seam: no-arg install re-reads the
+        // just-persisted user config and reconciles the crouter-owned bindings.
+        const result = installTmuxBindings();
+        const occupied = result.diagnostics.filter((diagnostic) => diagnostic.code === 'occupied');
+        if (result.ok && occupied.length === 0) {
+            this.keyNotice = 'Saved and applied to tmux. Reload attach and reopen active views.';
+        }
+        else if (result.ok) {
+            this.keyNotice = `Saved; tmux kept occupied keys: ${occupied.map((diagnostic) => diagnostic.message).join('; ')}`;
+        }
+        else {
+            this.keyNotice = `Saved, but tmux refresh failed: ${result.diagnostics.find((diagnostic) => diagnostic.code === 'tmux-error')?.message ?? 'tmux unavailable'}`;
+        }
+        this.invalidate();
+    }
+    confirmKeyAction() {
+        if (this.keyConfirm === 'reset-all') {
+            this.keyDraft.resetAll();
+            this.keyDiagnostics = [];
+            this.keyNotice = 'All rows reset to catalog defaults. Press save to write.';
+        }
+        else if (this.keyConfirm === 'discard') {
+            this.keyDraft.discard();
+            this.keyDiagnostics = this.keyDraft.resolution().diagnostics;
+            this.keyNotice = 'Unsaved keybinding changes discarded.';
+        }
+        this.keyConfirm = null;
+        this.invalidate();
+    }
+    handleKeybindingsInput(data) {
+        if (this.keyConfirm !== null) {
+            if (this.matches('crtr.setup.confirm.accept', data))
+                this.confirmKeyAction();
+            else if (this.matches('crtr.setup.confirm.back', data)) {
+                this.keyConfirm = null;
+                this.invalidate();
+            }
+            return;
+        }
+        if (this.editingKey !== null) {
+            // Honor the catalog rows for commit/cancel BEFORE the pi Input sees the
+            // keystroke, so a remap of `commit-edit`/`cancel-edit` takes effect.
+            if (this.matches('crtr.setup.keybindings.commit-edit', data)) {
+                this.commitKeyEdit();
+                return;
+            }
+            if (this.matches('crtr.setup.keybindings.cancel-edit', data)) {
+                this.cancelKeyEdit();
+                return;
+            }
+            if (this.matches('crtr.setup.keybindings.page-up', data)) {
+                this.moveKey(-this.keyPageSize());
+                return;
+            }
+            if (this.matches('crtr.setup.keybindings.page-down', data)) {
+                this.moveKey(this.keyPageSize());
+                return;
+            }
+            this.keyInput.handleInput(data);
+            this.invalidate();
+            return;
+        }
+        if (this.filteringKeys) {
+            if (this.matches('crtr.setup.keybindings.filter-clear', data)) {
+                this.keyFilter = '';
+                this.filteringKeys = false;
+                this.keyIndex = 0;
+                this.keyScroll = 0;
+            }
+            else if (this.matches('crtr.setup.keybindings.edit', data)) {
+                // Enter commits the filter: leave filter-entry but KEEP keyFilter so the
+                // narrowed list can be navigated and its rows edited.
+                this.filteringKeys = false;
+            }
+            else if (this.matches('crtr.setup.keybindings.filter-delete', data)) {
+                this.keyFilter = this.keyFilter.slice(0, -1);
+                this.keyIndex = 0;
+                this.keyScroll = 0;
+            }
+            else if (data.length === 1 && data.charCodeAt(0) >= 32) {
+                this.keyFilter += data;
+                this.keyIndex = 0;
+                this.keyScroll = 0;
+            }
+            this.invalidate();
+            return;
+        }
+        if (this.matches('crtr.setup.keybindings.filter', data)) {
+            this.filteringKeys = true;
+        }
+        else if (this.matches('crtr.setup.list-down', data)) {
+            this.moveKey(1);
+            return;
+        }
+        else if (this.matches('crtr.setup.list-up', data)) {
+            this.moveKey(-1);
+            return;
+        }
+        else if (this.matches('crtr.setup.keybindings.page-up', data)) {
+            this.moveKey(-this.keyPageSize());
+            return;
+        }
+        else if (this.matches('crtr.setup.keybindings.page-down', data)) {
+            this.moveKey(this.keyPageSize());
+            return;
+        }
+        else if (this.matches('crtr.setup.keybindings.edit', data)) {
+            this.beginKeyEdit();
+            return;
+        }
+        else if (this.matches('crtr.setup.keybindings.unbind', data)) {
+            const row = this.selectedKeybinding();
+            if (row) {
+                const result = this.keyDraft.unbind(row.id);
+                this.keyDiagnostics = result.ok ? this.keyDraft.resolution().diagnostics : result.diagnostics;
+                this.keyEditError = result.ok ? undefined : result.diagnostics[0]?.message;
+            }
+        }
+        else if (this.matches('crtr.setup.keybindings.reset-row', data)) {
+            const row = this.selectedKeybinding();
+            if (row)
+                this.keyDraft.resetRow(row.id);
+            this.keyDiagnostics = this.keyDraft.resolution().diagnostics;
+        }
+        else if (this.matches('crtr.setup.keybindings.reset-all', data)) {
+            this.keyConfirm = 'reset-all';
+        }
+        else if (this.matches('crtr.setup.keybindings.save', data)) {
+            this.saveKeybindings();
+            return;
+        }
+        else if (this.matches('crtr.setup.keybindings.discard', data)) {
+            // A committed (kept) filter is cleared first, before discard is considered.
+            if (this.keyFilter !== '') {
+                this.keyFilter = '';
+                this.keyIndex = 0;
+                this.keyScroll = 0;
+                this.keyNotice = undefined;
+            }
+            else if (this.keyDraft.dirty)
+                this.keyConfirm = 'discard';
+            else
+                this.keyNotice = 'No unsaved keybinding changes.';
+        }
+        else {
+            return;
+        }
+        this.invalidate();
+    }
     handleInput(data) {
+        // A nested provider login owns all input until it settles. In particular, do not let
+        // wizard-wide q/Tab navigation abandon the panel while its OAuth promise can still resolve.
+        if (this.activeTab === 0 && this.providers.isNestedFlowActive()) {
+            if (this.providers.handleInput(data))
+                this.invalidate();
+            return;
+        }
         if (this.confirming) {
-            if (matchesKey(data, 'enter') || matchesKey(data, 'y')) {
+            if (this.matches('crtr.setup.confirm.accept', data)) {
                 this.onSubmit?.(this.buildSubmission());
                 return;
             }
-            if (matchesKey(data, 'n') || matchesKey(data, 'escape') || matchesKey(data, 'q')) {
+            if (this.matches('crtr.setup.confirm.back', data)) {
                 this.confirming = false;
                 this.invalidate();
-                return;
             }
             return;
         }
-        if (matchesKey(data, 'ctrl+c') || matchesKey(data, 'ctrl+d') || matchesKey(data, 'q')) {
+        // Keybindings sub-states (editing / filtering / confirm) own input before the
+        // wizard-level cancel and tab gestures can steal it.
+        if (this.activeTab === 5 && (this.editingKey !== null || this.filteringKeys || this.keyConfirm !== null)) {
+            this.handleKeybindingsInput(data);
+            return;
+        }
+        // Printable chars and arrows on the API-key tabs go to the focused field.
+        if ((this.activeTab === 3 || this.activeTab === 4)
+            && ((data.length === 1 && data.charCodeAt(0) >= 32)
+                || matchesKey(data, 'left') || matchesKey(data, 'right') || matchesKey(data, 'up') || matchesKey(data, 'down'))) {
+            (this.activeTab === 3 ? this.exaInput : this.composioInput).handleInput(data);
+            this.invalidate();
+            return;
+        }
+        // On the keybindings tab in list mode, a dirty draft must not be dropped
+        // silently by the wizard-level cancel gesture — route it through the same
+        // discard-confirm the discard path uses.
+        if (this.activeTab === 5 && this.keyDraft.dirty && this.matches('crtr.setup.cancel', data)) {
+            this.keyConfirm = 'discard';
+            this.invalidate();
+            return;
+        }
+        if (this.matches('crtr.setup.cancel', data)) {
             this.cancel();
             return;
         }
         if (this.handleGlobalTabSwitch(data))
             return;
         if (this.activeTab === 0) {
-            if (matchesKey(data, 'enter')) {
-                this.onOpenLogin?.();
-                return;
-            }
+            if (this.providers.handleInput(data))
+                this.invalidate();
             return;
         }
         if (this.activeTab === 1) {
-            if (matchesKey(data, 'j') || matchesKey(data, 'down')) {
+            if (this.matches('crtr.setup.list-down', data))
                 this.movePlugin(1);
-                return;
-            }
-            if (matchesKey(data, 'k') || matchesKey(data, 'up')) {
+            else if (this.matches('crtr.setup.list-up', data))
                 this.movePlugin(-1);
-                return;
-            }
-            if (matchesKey(data, 'space')) {
+            else if (this.matches('crtr.setup.toggle', data))
                 this.togglePackage();
-                return;
-            }
-            if (matchesKey(data, '?')) {
+            else if (this.matches('crtr.setup.details', data))
                 this.toggleDetails();
-                return;
-            }
-            if (matchesKey(data, 'enter')) {
+            else if (this.matches('crtr.setup.advance', data))
                 this.moveTab(1);
-                return;
-            }
             return;
         }
         if (this.activeTab === 2) {
-            if (matchesKey(data, 'j') || matchesKey(data, 'down')) {
+            if (this.matches('crtr.setup.list-down', data))
                 this.moveSystem(1);
-                return;
-            }
-            if (matchesKey(data, 'k') || matchesKey(data, 'up')) {
+            else if (this.matches('crtr.setup.list-up', data))
                 this.moveSystem(-1);
-                return;
-            }
-            if (matchesKey(data, 'space')) {
+            else if (this.matches('crtr.setup.toggle', data))
                 this.toggleSystem();
-                return;
-            }
-            if (matchesKey(data, 'enter')) {
+            else if (this.matches('crtr.setup.advance', data))
                 this.moveTab(1);
-                return;
-            }
             return;
         }
         if (this.activeTab === 3) {
             this.exaInput.handleInput(data);
+            this.invalidate();
             return;
         }
-        this.composioInput.handleInput(data);
+        if (this.activeTab === 4) {
+            this.composioInput.handleInput(data);
+            this.invalidate();
+            return;
+        }
+        this.handleKeybindingsInput(data);
     }
     renderHeader(width) {
-        const tabs = ['Login', 'Plugins', 'System deps', 'Exa key', 'Composio key'];
-        const tabLine = tabs
-            .map((label, index) => tabPill(`${index + 1}. ${label}`, index === this.activeTab))
+        const tabs = ['Providers', 'Plugins', 'System', 'Exa', 'Composio', 'Keybindings'];
+        const fullTabLine = tabs
+            .map((label, index) => tabPill(label, index === this.activeTab))
             .join(theme.fg('dim', '  ·  '));
+        const tabLine = visibleWidth(fullTabLine) <= width
+            ? fullTabLine
+            : `${theme.fg('dim', `${this.activeTab + 1}/${tabs.length}`)} ${tabPill(tabs[this.activeTab], true)}`;
         return [
             truncateToWidth(theme.fg('accent', theme.bold('crtr sys setup')), width),
             truncateToWidth(tabLine, width),
@@ -353,43 +1036,32 @@ class SetupWizard {
         ];
     }
     renderFooter(width) {
+        const tabs = `${this.label('crtr.setup.tab-next')} next · ${this.label('crtr.setup.tab-previous')} prev`;
         const line = this.confirming
-            ? 'y/enter confirm · n/esc go back · q cancel'
-            : this.activeTab === 0
-                ? 'enter log in · Tab/→ next · q cancel'
-                : this.activeTab === 1
-                    ? 'j/k or ↑/↓ move · space toggle · ? details · enter/Tab advance · ←/→ switch tabs · q cancel'
-                    : this.activeTab === 2
-                        ? 'j/k or ↑/↓ move · space toggle · enter/Tab advance · ←/→ switch tabs · q cancel'
-                        : this.activeTab === 3
-                            ? 'type EXA_API_KEY · enter finish · Tab/Shift-Tab or ←/→ switch tabs · q cancel'
-                            : 'type COMPOSIO_API_KEY · enter finish · Tab/Shift-Tab or ←/→ switch tabs · q cancel';
+            ? `${this.label('crtr.setup.confirm.accept')} confirm · ${this.label('crtr.setup.confirm.back')} go back`
+            : this.activeTab === 0 && this.providers.isNestedFlowActive()
+                ? 'OAuth in progress · esc cancel'
+                : this.activeTab === 0
+                    ? `↑/↓ select · a add · p prefer · r rename · l re-login · x remove · ${this.label('crtr.setup.tab-next')} next · ${this.label('crtr.setup.cancel')} cancel`
+                    : this.activeTab === 1
+                        ? `${this.label('crtr.setup.list-down')}/${this.label('crtr.setup.list-up')} move · ${this.label('crtr.setup.toggle')} toggle · ${this.label('crtr.setup.details')} details · ${this.label('crtr.setup.advance')} advance · ${tabs} · ${this.label('crtr.setup.cancel')} cancel`
+                        : this.activeTab === 2
+                            ? `${this.label('crtr.setup.list-down')}/${this.label('crtr.setup.list-up')} move · ${this.label('crtr.setup.toggle')} toggle · ${this.label('crtr.setup.advance')} advance · ${tabs} · ${this.label('crtr.setup.cancel')} cancel`
+                            : this.activeTab === 3
+                                ? `type EXA_API_KEY · Enter finish · ${this.fieldSafeLabel('crtr.setup.tab-next')}/${this.fieldSafeLabel('crtr.setup.tab-previous')} switch tabs · Esc or ${this.fieldSafeLabel('crtr.setup.cancel')} cancel`
+                                : this.activeTab === 4
+                                    ? `type COMPOSIO_API_KEY · Enter finish · ${this.fieldSafeLabel('crtr.setup.tab-next')}/${this.fieldSafeLabel('crtr.setup.tab-previous')} switch tabs · Esc or ${this.fieldSafeLabel('crtr.setup.cancel')} cancel`
+                                    : this.keyConfirm !== null
+                                        ? `${this.label('crtr.setup.confirm.accept')} confirm · ${this.label('crtr.setup.confirm.back')} go back`
+                                        : this.editingKey !== null
+                                            ? `type gestures separated by commas · ${this.label('crtr.setup.keybindings.commit-edit')} commit · ${this.label('crtr.setup.keybindings.cancel-edit')} cancel · ${this.label('crtr.setup.keybindings.page-up')}/${this.label('crtr.setup.keybindings.page-down')} scroll`
+                                            : this.filteringKeys
+                                                ? `filter: ${this.keyFilter || 'type to search'} · ${this.label('crtr.setup.keybindings.edit')} keep · ${this.label('crtr.setup.keybindings.filter-delete')} delete · ${this.label('crtr.setup.keybindings.filter-clear')} clear`
+                                                : `${this.label('crtr.setup.list-down')}/${this.label('crtr.setup.list-up')} move · ${this.label('crtr.setup.keybindings.edit')} edit · ${this.label('crtr.setup.keybindings.unbind')} disable · ${this.label('crtr.setup.keybindings.reset-row')} reset · ${this.label('crtr.setup.keybindings.reset-all')} reset all · ${this.label('crtr.setup.keybindings.filter')} filter · ${this.label('crtr.setup.keybindings.save')} save · ${this.label('crtr.setup.keybindings.discard')} ${this.keyFilter !== '' ? 'clear filter' : 'discard'}`;
         return [truncateToWidth(theme.fg('dim', line), width)];
     }
-    renderLogin(width) {
-        const out = [];
-        out.push(truncateToWidth(`${theme.fg('accent', theme.bold('Login'))}${theme.fg('dim', '  optional · same providers as /login')}`, width));
-        for (const line of wrapText('Log in to a model provider so crtr can run turns. With no provider configured, nodes fail to start when you first use the app.', Math.max(1, width))) {
-            out.push(truncateToWidth(theme.fg('muted', line), width));
-        }
-        out.push('');
-        const configured = this.authSummary.filter((p) => p.configured);
-        if (configured.length > 0) {
-            out.push(truncateToWidth(theme.fg('success', `✓ Configured: ${configured.map((p) => p.name).join(', ')}`), width));
-        }
-        else {
-            out.push(truncateToWidth(theme.fg('warning', 'No provider configured yet.'), width));
-        }
-        out.push('');
-        out.push(...framed([
-            theme.fg('accent', theme.bold('Press Enter to open the provider picker')),
-            theme.fg('dim', 'Pick a provider, then complete its OAuth or API-key login.'),
-        ], width));
-        if (this.notice !== undefined) {
-            out.push('');
-            out.push(truncateToWidth(theme.fg('success', this.notice), width));
-        }
-        return out;
+    renderProviders(width) {
+        return this.providers.render(width);
     }
     renderPlugins(width) {
         const out = [];
@@ -433,24 +1105,24 @@ class SetupWizard {
     }
     renderExa(width) {
         const out = [];
-        out.push(truncateToWidth(`${theme.fg('accent', theme.bold('Exa key'))}${theme.fg('dim', '  optional')}`, width));
+        out.push(truncateToWidth(`${theme.fg('accent', theme.bold('Exa key'))}${theme.fg('dim', '  optional')}${keyStatusBadge(detectExaKey(), 'EXA_API_KEY')}`, width));
         out.push(truncateToWidth(`${theme.fg('mdLink', 'Create a key: ')}${theme.fg('mdLinkUrl', 'https://dashboard.exa.ai/api-keys')}`, width));
         out.push(truncateToWidth(theme.fg('dim', `Will write to: ${resolveExaKeyPath()}`), width));
         out.push(...framed([
             theme.fg('accent', theme.bold('Paste EXA_API_KEY here')),
-            theme.fg('dim', 'Leave blank to skip.'),
+            theme.fg('dim', detectExaKey().present ? 'Leave blank to keep the existing key; paste to replace it.' : 'Leave blank to skip.'),
             ...this.exaInput.render(Math.max(1, width - 4)),
         ], width));
         return out;
     }
     renderComposio(width) {
         const out = [];
-        out.push(truncateToWidth(`${theme.fg('accent', theme.bold('Composio key'))}${theme.fg('dim', '  optional · powers /v1/connectors third-party service access')}`, width));
+        out.push(truncateToWidth(`${theme.fg('accent', theme.bold('Composio key'))}${theme.fg('dim', '  optional · powers /v1/connectors third-party service access')}${keyStatusBadge(detectComposioKey(), 'COMPOSIO_API_KEY')}`, width));
         out.push(truncateToWidth(`${theme.fg('mdLink', 'Create a key: ')}${theme.fg('mdLinkUrl', 'https://platform.composio.dev/developers')}`, width));
         out.push(truncateToWidth(theme.fg('dim', `Will write to: ${resolveComposioKeyPath()}`), width));
         out.push(...framed([
             theme.fg('accent', theme.bold('Paste COMPOSIO_API_KEY here')),
-            theme.fg('dim', 'Leave blank to skip.'),
+            theme.fg('dim', detectComposioKey().present ? 'Leave blank to keep the existing key; paste to replace it.' : 'Leave blank to skip.'),
             ...this.composioInput.render(Math.max(1, width - 4)),
         ], width));
         return out;
@@ -459,7 +1131,7 @@ class SetupWizard {
         const out = [truncateToWidth(theme.fg('warning', theme.bold('Confirm installs')), width)];
         const submission = this.buildSubmission();
         if (submission.packages.length === 0 && submission.systemDeps.length === 0 && submission.exaKey === '' && submission.composioKey === '') {
-            out.push(truncateToWidth(theme.fg('success', 'Nothing to install; press enter to finish.'), width));
+            out.push(truncateToWidth(theme.fg('success', `Nothing to install; ${this.label('crtr.setup.confirm.accept')} finish.`), width));
             return out;
         }
         if (submission.packages.length > 0) {
@@ -483,7 +1155,119 @@ class SetupWizard {
         if (submission.composioKey !== '') {
             out.push(truncateToWidth(`${theme.fg('accent', 'Composio key')} ${theme.fg('dim', '→')} ${theme.fg('warning', `write ${submission.composioKeyPath}`)}`, width));
         }
-        out.push(truncateToWidth(theme.fg('dim', 'y/enter confirm · n/esc go back'), width));
+        out.push(truncateToWidth(theme.fg('dim', `${this.label('crtr.setup.confirm.accept')} confirm · ${this.label('crtr.setup.confirm.back')} go back`), width));
+        return out;
+    }
+    // Does the row at `index` contribute a diagnostic line in the current state?
+    // Mirrors the emit loop's `message` computation so the line-cost accounting
+    // and the render stay in lockstep.
+    keyRowHasMessage(rows, index) {
+        const definition = rows[index];
+        const selected = index === this.keyIndex;
+        const editing = this.editingKey === definition.id;
+        if (!selected && !editing)
+            return false;
+        if (editing && this.keyEditError)
+            return true;
+        const diagnostic = this.keyDiagnostics.find((entry) => entry.bindingId === definition.id || entry.relatedBindingIds?.includes(definition.id));
+        return diagnostic !== undefined;
+    }
+    // Output lines the visible rows [start..end] cost, counting the per-row group
+    // heading (the first visible row always re-emits its heading) and any
+    // diagnostic line. Used to clamp the scroll so the anchor row always renders.
+    keyLineCost(rows, start, end) {
+        let lines = 0;
+        let previousGroup;
+        for (let index = start; index <= end; index += 1) {
+            const definition = rows[index];
+            lines += (definition.group !== previousGroup ? 1 : 0) + 1 + (this.keyRowHasMessage(rows, index) ? 1 : 0);
+            previousGroup = definition.group;
+        }
+        return lines;
+    }
+    renderKeybindings(width) {
+        const out = [];
+        const rows = this.filteredKeybindings();
+        const resolution = this.keyDraft.resolution();
+        const viewport = this.keyViewportLines();
+        const pageSize = this.keyPageSize();
+        const maxScroll = Math.max(0, rows.length - pageSize);
+        this.keyScroll = Math.max(0, Math.min(this.keyScroll, maxScroll));
+        if (this.keyIndex < this.keyScroll)
+            this.keyScroll = this.keyIndex;
+        if (this.keyIndex >= this.keyScroll + pageSize)
+            this.keyScroll = Math.max(0, this.keyIndex - pageSize + 1);
+        // Anchor that must stay on screen: the row being edited (so the editor never
+        // vanishes while paging moves the selection — m3), else the selection itself.
+        // Injected group-heading and diagnostic lines can make a pageSize-row window
+        // exceed the raw viewport, so instead of a fixed reserve, clamp the scroll
+        // dynamically until the anchor is guaranteed to render within `viewport`.
+        const editIndex = this.editingKey !== null ? rows.findIndex((row) => row.id === this.editingKey) : -1;
+        const anchor = editIndex >= 0 ? editIndex : this.keyIndex;
+        if (anchor >= 0) {
+            if (anchor < this.keyScroll)
+                this.keyScroll = anchor;
+            while (this.keyScroll < anchor && this.keyLineCost(rows, this.keyScroll, anchor) > viewport) {
+                this.keyScroll += 1;
+            }
+        }
+        const dirty = this.keyDraft.dirty ? theme.fg('warning', 'unsaved') : theme.fg('success', 'saved');
+        out.push(truncateToWidth(`${theme.fg('accent', theme.bold('Keybindings'))}${theme.fg('dim', '  crouter-owned only · ')}${dirty}`, width));
+        out.push(truncateToWidth(theme.fg('dim', this.keyFilter === ''
+            ? `${rows.length} actions`
+            : `${rows.length} matches for “${this.keyFilter}”${this.filteringKeys ? '' : ` · ${this.label('crtr.setup.keybindings.discard')} clears filter`}`), width));
+        if (resolution.diagnostics.some((diagnostic) => diagnostic.code === 'invalid-keybindings')) {
+            out.push(truncateToWidth(theme.fg('warning', theme.bold(`Saved keybindings root is invalid — ${this.label('crtr.setup.keybindings.reset-all')} (reset all) to clear it before editing.`)), width));
+        }
+        if (rows.length === 0) {
+            out.push('');
+            out.push(truncateToWidth(theme.fg('warning', 'No matching keybindings.'), width));
+            return out;
+        }
+        const nameWidth = Math.max(16, Math.min(28, Math.floor(width * 0.28)));
+        const keyWidth = Math.max(18, Math.min(34, Math.floor(width * 0.34)));
+        const showDescription = width >= 72;
+        let emitted = 0;
+        let previousGroup;
+        for (let index = this.keyScroll; index < rows.length; index += 1) {
+            const definition = rows[index];
+            const selected = index === this.keyIndex;
+            const editing = this.editingKey === definition.id;
+            const diagnostics = (selected || editing)
+                ? this.keyDiagnostics.filter((diagnostic) => diagnostic.bindingId === definition.id || diagnostic.relatedBindingIds?.includes(definition.id))
+                : [];
+            const message = editing ? (this.keyEditError ?? diagnostics[0]?.message) : (selected ? diagnostics[0]?.message : undefined);
+            // Budget output lines (heading + row + optional diagnostic) so the list
+            // never clips the confirm prompt / notice / footer below it.
+            const cost = (definition.group !== previousGroup ? 1 : 0) + 1 + (message ? 1 : 0);
+            if (emitted > 0 && emitted + cost > viewport)
+                break;
+            if (definition.group !== previousGroup) {
+                out.push(truncateToWidth(theme.fg('accent', definition.group), width));
+                previousGroup = definition.group;
+            }
+            const marker = selected ? theme.fg('accent', '▶') : ' ';
+            const sourceMark = resolution.get(definition.id).source === 'user' ? theme.fg('warning', '•') : ' ';
+            const name = padAnsi(selected ? theme.fg('accent', definition.name) : definition.name, nameWidth);
+            // Render the edit field whenever THIS row is the one being edited — even if
+            // paging has moved the selection elsewhere — so the active editor stays
+            // visible while it captures input.
+            const keyText = editing ? (this.keyInput.render(keyWidth)[0] ?? '') : formatBinding(resolution, definition.id);
+            const key = padAnsi(keyText, keyWidth);
+            const description = showDescription ? ` ${theme.fg('dim', definition.description)}` : '';
+            out.push(truncateToWidth(`${marker}${sourceMark} ${name} ${key}${description}`, width));
+            if (message)
+                out.push(truncateToWidth(theme.fg('warning', `   ${message}`), width));
+            emitted += cost;
+        }
+        if (this.keyConfirm !== null) {
+            out.push('');
+            out.push(truncateToWidth(theme.fg('warning', theme.bold(this.keyConfirm === 'reset-all'
+                ? 'Reset every keybinding to its catalog default?'
+                : 'Discard every unsaved keybinding change?')), width));
+        }
+        if (this.keyNotice)
+            out.push(truncateToWidth(theme.fg('muted', this.keyNotice), width));
         return out;
     }
     render(width) {
@@ -495,14 +1279,16 @@ class SetupWizard {
             ...(this.confirming
                 ? this.renderConfirm(width)
                 : this.activeTab === 0
-                    ? this.renderLogin(width)
+                    ? this.renderProviders(width)
                     : this.activeTab === 1
                         ? this.renderPlugins(width)
                         : this.activeTab === 2
                             ? this.renderSystems(width)
                             : this.activeTab === 3
                                 ? this.renderExa(width)
-                                : this.renderComposio(width)),
+                                : this.activeTab === 4
+                                    ? this.renderComposio(width)
+                                    : this.renderKeybindings(width)),
             '',
             ...this.renderFooter(width),
         ];
@@ -511,52 +1297,6 @@ class SetupWizard {
         return this.cachedLines;
     }
 }
-const LOGIN_OVERLAY_OPTIONS = { anchor: 'center', width: '80%', maxHeight: '85%' };
-/** Mount pi's real `/login` provider picker + login dialog as a centered overlay
- *  over the setup wizard, driving the SAME OAuth/API-key flow the in-app /login
- *  uses (`buildLoginPicker`). Credentials write to `agentDir`'s auth.json; on
- *  close, focus returns to the wizard and its auth summary refreshes. */
-function openLoginOverlay(tui, wizard, agentDir) {
-    let handle;
-    let current;
-    let done = false;
-    const disposeCurrent = () => {
-        const disposable = current?.component;
-        try {
-            disposable?.dispose?.();
-        }
-        catch {
-            /* ignore dispose errors during teardown */
-        }
-    };
-    const mount = (p) => {
-        handle = tui.showOverlay(p.component, LOGIN_OVERLAY_OPTIONS);
-        tui.setFocus(p.focus);
-    };
-    const unmount = () => handle?.hide();
-    const replace = (component, focus) => {
-        if (done)
-            return;
-        disposeCurrent();
-        unmount();
-        current = { component, focus };
-        mount(current);
-        tui.requestRender();
-    };
-    const close = () => {
-        if (done)
-            return;
-        done = true;
-        disposeCurrent();
-        unmount();
-        wizard.refreshAuth();
-        tui.setFocus(wizard);
-        tui.requestRender();
-    };
-    current = buildLoginPicker(tui, agentDir, () => wizard.refreshAuth(), (msg) => wizard.setNotice(msg), { close, replace });
-    mount(current);
-    tui.requestRender();
-}
 async function runSetup() {
     const state = buildSetupInitialState();
     if (!process.stdout.isTTY) {
@@ -565,18 +1305,12 @@ async function runSetup() {
     }
     applyTheme({ cwd: process.cwd() });
     const agentDir = defaultAgentDir();
-    const loadAuthSummary = () => {
-        try {
-            return summarizeProviderAuth(agentDir);
-        }
-        catch {
-            return [];
-        }
-    };
+    const rawUserConfig = readRawScopeConfig('user');
+    const rawKeybindings = rawUserConfig?.keybindings;
+    const openingBindings = resolveKeybindings(rawKeybindings);
     const terminal = new ProcessTerminal();
     const tui = new TUI(terminal, true);
-    const wizard = new SetupWizard(state.manifest, state.installedPackageIds, state.systemTools, loadAuthSummary(), loadAuthSummary);
-    wizard.onOpenLogin = () => openLoginOverlay(tui, wizard, agentDir);
+    const wizard = new SetupWizard(state.manifest, state.installedPackageIds, state.systemTools, tui, agentDir, openingBindings, rawKeybindings, () => terminal.rows);
     tui.addChild(wizard);
     tui.setFocus(wizard);
     await new Promise((resolve, reject) => {
@@ -585,6 +1319,7 @@ async function runSetup() {
             if (restored)
                 return;
             restored = true;
+            wizard.dispose();
             try {
                 tui.stop();
             }
@@ -612,6 +1347,21 @@ async function runSetup() {
         process.once('SIGTERM', onSignal);
         process.once('SIGHUP', onSignal);
         process.once('SIGINT', onSignal);
+        // Emergency cancel: the control gestures of `crtr.setup.cancel` (ctrl+c /
+        // ctrl+d in the shipped catalog) must always exit setup — from filter entry,
+        // the confirm prompts, or while a nested ProviderPanel login flow owns focus —
+        // where the focused component would otherwise swallow them. Matching is driven
+        // by the opening snapshot; the control-char guard keeps printable cancel gestures
+        // (e.g. q) as data for text fields and the filter buffer, which the wizard
+        // handles as cancel only in its own non-text states.
+        tui.addInputListener((data) => {
+            if (data.length > 0 && data.charCodeAt(0) < 32
+                && matchesPiTuiInput(openingBindings, 'crtr.setup.cancel', data, (input, gesture) => matchesKey(input, gesture))) {
+                finish();
+                return { consume: true };
+            }
+            return undefined;
+        });
         wizard.onCancel = finish;
         wizard.onSubmit = (submission) => {
             restore();
@@ -624,13 +1374,6 @@ async function runSetup() {
                 resolve();
             }, fail);
         };
-        tui.addInputListener((data) => {
-            if (matchesKey(data, 'ctrl+c') || matchesKey(data, 'ctrl+d')) {
-                finish();
-                return { consume: true };
-            }
-            return undefined;
-        });
         try {
             tui.start();
         }
@@ -641,17 +1384,18 @@ async function runSetup() {
 }
 export const sysSetupLeaf = defineLeaf({
     name: 'setup',
-    description: 'log in to a model provider, install the bundled pi plugins, system deps, and Exa + Composio key setup',
-    whenToUse: 'you want to bootstrap this machine for crtr in one pass: log in to a model provider (same flow as /login), install the vendored pi plugins, confirm tmux and nvim, and save your Exa and Composio API keys.',
+    description: 'manage model providers, install bundled pi plugins and system deps, save Exa + Composio keys, and edit crouter keybindings',
+    whenToUse: 'you want to bootstrap this machine in one pass: inspect and manage configured model providers, install vendored pi plugins, confirm tmux and nvim, save Exa and Composio API keys, and edit crouter-owned keybindings.',
     help: {
         name: 'sys setup',
-        summary: 'open the multi-tab setup wizard for provider login, bundled pi plugins, system deps, and Exa + Composio keys',
+        summary: 'open the multi-tab setup wizard for provider management, bundled pi plugins, system deps, Exa + Composio keys, and crouter-owned keybindings',
         inputNote: 'No input parameters.',
         output: [],
         outputKind: 'object',
         effects: [
             'Opens a pi-tui wizard whose first tab logs in to a model provider (pi\'s real OAuth/API-key flow, same as in-app /login) so a fresh install has credentials before running any node.',
-            'Collects companion package installs, system dependency installs, an Exa API key, and a Composio API key across the remaining tabs.',
+            'Collects companion package installs, system dependency installs, API keys, and sparse user overrides for crouter-owned keybindings across the remaining tabs.',
+            'Saves validated keybinding changes atomically in the user config and refreshes crouter-owned tmux bindings without overwriting occupied user keys.',
             'Runs the bundled pi CLI to install the selected companion packages, writes EXA_API_KEY to ~/.crouter/exa.key and COMPOSIO_API_KEY to ~/.crouter/composio.key when provided, and prints a summary.',
         ],
     },