@eminent337/aery 0.1.117 → 0.1.119

package/dist/modes/interactive/interactive-mode.js

@@ -6,30 +6,28 @@ import * as crypto from "node:crypto";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { getProviders } from "@eminent337/aery-ai";
-import { CombinedAutocompleteProvider, Container, fuzzyFilter, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@eminent337/aery-tui";
+import { getProviders, } from "@eminent337/aery-ai";
+import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@eminent337/aery-tui";
 import { spawn, spawnSync } from "child_process";
-import { collectCapabilitiesReport, formatCapabilitiesReport } from "../../cli/capabilities.js";
-import { formatCurrentCoreExtensionsReport } from "../../cli/doctor.js";
-import { APP_NAME, getAgentDir, getAuthPath, getDebugLogPath, getModelsPath, getShareViewerUrl, getUpdateInstruction, VERSION, } from "../../config.js";
+import { APP_NAME, APP_TITLE, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
 import { parseSkillBlock } from "../../core/agent-session.js";
 import { SessionImportFileNotFoundError } from "../../core/agent-session-runtime.js";
-import { CUSTOM_OPENAI_COMPATIBLE_PROVIDER_ID, saveCustomOpenAICompatibleProvider, } from "../../core/custom-openai-compatible.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
 import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScope } from "../../core/model-resolver.js";
 import { DefaultPackageManager } from "../../core/package-manager.js";
-import { checkProviderSetup } from "../../core/provider-setup-check.js";
+import { BUILT_IN_PROVIDER_DISPLAY_NAMES } from "../../core/provider-display-names.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { isInstallTelemetryEnabled } from "../../core/telemetry.js";
-import { wireCoreExtensions } from "../../migrations.js";
 import { getChangelogPath, getNewEntries, parseChangelog } from "../../utils/changelog.js";
 import { copyToClipboard } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
 import { parseGitUrl } from "../../utils/git.js";
+import { getCwdRelativePath } from "../../utils/paths.js";
+import { getPiUserAgent } from "../../utils/pi-user-agent.js";
 import { killTrackedDetachedChildren } from "../../utils/shell.js";
 import { ensureTool } from "../../utils/tools-manager.js";
 import { checkForNewPiVersion } from "../../utils/version-check.js";
@@ -49,7 +47,7 @@ import { ExtensionEditorComponent } from "./components/extension-editor.js";
 import { ExtensionInputComponent } from "./components/extension-input.js";
 import { ExtensionSelectorComponent } from "./components/extension-selector.js";
 import { FooterComponent } from "./components/footer.js";
-import { keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
+import { formatKeyText, keyDisplayText, keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
 import { LoginDialogComponent } from "./components/login-dialog.js";
 import { ModelSelectorComponent } from "./components/model-selector.js";
 import { OAuthSelectorComponent } from "./components/oauth-selector.js";
@@ -95,47 +93,17 @@ function isUnknownModel(model) {
 function hasDefaultModelProvider(providerId) {
     return providerId in defaultModelPerProvider;
 }
-const API_KEY_PROVIDER_NAMES = {
-    anthropic: "Anthropic",
-    "azure-openai-responses": "Azure OpenAI Responses",
-    cerebras: "Cerebras",
-    "cloudflare-workers-ai": "Cloudflare Workers AI",
-    fireworks: "Fireworks",
-    google: "Google Gemini",
-    "google-vertex": "Google Vertex AI",
-    groq: "Groq",
-    huggingface: "Hugging Face",
-    "kimi-coding": "Kimi For Coding",
-    mistral: "Mistral",
-    minimax: "MiniMax",
-    "minimax-cn": "MiniMax (China)",
-    opencode: "OpenCode Zen",
-    "opencode-go": "OpenCode Go",
-    openai: "OpenAI",
-    openrouter: "OpenRouter",
-    "vercel-ai-gateway": "Vercel AI Gateway",
-    xai: "xAI",
-    zai: "ZAI",
-};
-const API_KEY_LOGIN_PROVIDER_BLOCKLIST = new Set(["amazon-bedrock", "llama.cpp", "lmstudio", "ollama"]);
-const CUSTOM_OPENAI_COMPATIBLE_PROVIDER_LABEL = "Custom OpenAI-compatible";
-const AERY_GATEWAY_PROVIDER_ID = "__aery-gateway__";
-const AERY_GATEWAY_BASE_URL = "https://aery-gateway.eminent337.workers.dev/v1";
-const AERY_GATEWAY_PROVIDER_APIS = {
-    anthropic: "anthropic-messages",
-    "google-generative-ai": "google-generative-ai",
-    "openai-responses": "openai-responses",
-};
-export function isApiKeyLoginProvider(providerId, oauthProviderIds, builtInProviderIds = new Set(getProviders())) {
-    if (API_KEY_PROVIDER_NAMES[providerId])
+const BEDROCK_PROVIDER_ID = "amazon-bedrock";
+const BUILT_IN_MODEL_PROVIDERS = new Set(getProviders());
+export function isApiKeyLoginProvider(providerId, oauthProviderIds, builtInProviderIds = BUILT_IN_MODEL_PROVIDERS) {
+    if (BUILT_IN_PROVIDER_DISPLAY_NAMES[providerId]) {
         return true;
-    if (builtInProviderIds.has(providerId))
+    }
+    if (builtInProviderIds.has(providerId)) {
         return false;
+    }
     return !oauthProviderIds.has(providerId);
 }
-export function getApiKeyProviderDisplayName(providerId) {
-    return API_KEY_PROVIDER_NAMES[providerId] ?? providerId;
-}
 export class InteractiveMode {
     options;
     runtimeHost;
@@ -145,7 +113,7 @@ export class InteractiveMode {
     statusContainer;
     defaultEditor;
     editor;
-    customEditorFactory;
+    editorComponentFactory;
     autocompleteProvider;
     autocompleteProviderWrappers = [];
     fdPath;
@@ -457,7 +425,7 @@ export class InteractiveMode {
                 hint("app.tools.expand", "more"),
             ].join(theme.fg("muted", " · "));
             const compactOnboarding = theme.fg("dim", `Press ${keyText("app.tools.expand")} to show full startup help and loaded resources.`);
-            const onboarding = theme.fg("dim", `Aery can explain its own features and look up its docs. Ask it how to use or extend Aery.`);
+            const onboarding = theme.fg("dim", `Pi can explain its own features and look up its docs. Ask it how to use or extend Pi.`);
             this.builtInHeader = new ExpandableText(() => `${logo}\n${compactInstructions}\n${compactOnboarding}\n\n${onboarding}`, () => `${logo}\n${expandedInstructions}\n\n${onboarding}`, this.getStartupExpansionState(), 1, 0);
             // Setup UI layout
             this.headerContainer.addChild(new Spacer(1));
@@ -507,10 +475,10 @@ export class InteractiveMode {
         const cwdBasename = path.basename(this.sessionManager.getCwd());
         const sessionName = this.sessionManager.getSessionName();
         if (sessionName) {
-            this.ui.terminal.setTitle(`⌬ aery - ${sessionName} - ${cwdBasename}`);
+            this.ui.terminal.setTitle(`${APP_TITLE} - ${sessionName} - ${cwdBasename}`);
         }
         else {
-            this.ui.terminal.setTitle(`⌬ aery - ${cwdBasename}`);
+            this.ui.terminal.setTitle(`${APP_TITLE} - ${cwdBasename}`);
         }
     }
     /**
@@ -637,7 +605,7 @@ export class InteractiveMode {
             return "tmux extended-keys is off. Modified Enter keys may not work. Add `set -g extended-keys on` to ~/.tmux.conf and restart tmux.";
         }
         if (extendedKeysFormat === "xterm") {
-            return "tmux extended-keys-format is xterm. Aery works best with csi-u. Add `set -g extended-keys-format csi-u` to ~/.tmux.conf and restart tmux.";
+            return "tmux extended-keys-format is xterm. Pi works best with csi-u. Add `set -g extended-keys-format csi-u` to ~/.tmux.conf and restart tmux.";
         }
         return undefined;
     }
@@ -657,8 +625,6 @@ export class InteractiveMode {
             // Fresh install - record the version, send telemetry, don't show changelog
             this.settingsManager.setLastChangelogVersion(VERSION);
             this.reportInstallTelemetry(VERSION);
-            // Auto-install core extension pack on fresh install
-            this.installCorePackIfNeeded();
             return undefined;
         }
         const newEntries = getNewEntries(entries, lastVersion);
@@ -676,37 +642,15 @@ export class InteractiveMode {
         if (!isInstallTelemetryEnabled(this.settingsManager)) {
             return;
         }
-        void fetch(`https://aery.dev/install?version=${encodeURIComponent(version)}`, {
+        void fetch(`https://eminent337.github.io/api/report-install?version=${encodeURIComponent(version)}`, {
+            headers: {
+                "User-Agent": getPiUserAgent(version),
+            },
             signal: AbortSignal.timeout(5000),
         })
             .then(() => undefined)
             .catch(() => undefined);
     }
-    installCorePackIfNeeded() {
-        // Fire-and-forget: install core extension pack on fresh install
-        void (async () => {
-            try {
-                const { execFile } = await import("node:child_process");
-                const { promisify } = await import("node:util");
-                const { existsSync, readFileSync, writeFileSync } = await import("node:fs");
-                const { join } = await import("node:path");
-                const { homedir } = await import("node:os");
-                const exec = promisify(execFile);
-                await exec("aery", ["install", "https://github.com/eminent337/aery-extensions"], {
-                    timeout: 30000,
-                });
-                // Wire core extensions into settings.json
-                const repoPath = join(homedir(), ".aery", "agent", "git", "github.com", "eminent337", "aery-extensions");
-                const settingsPath = join(homedir(), ".aery", "agent", "settings.json");
-                wireCoreExtensions(repoPath, settingsPath);
-                const settings = existsSync(settingsPath) ? JSON.parse(readFileSync(settingsPath, "utf-8")) : {};
-                writeFileSync(settingsPath, `${JSON.stringify({ ...settings, quietStartup: true }, null, 2)}\n`);
-            }
-            catch {
-                // Silent fail — user can install manually
-            }
-        })();
-    }
     getMarkdownThemeWithSettings() {
         return {
             ...getMarkdownTheme(),
@@ -733,13 +677,9 @@ export class InteractiveMode {
     formatContextPath(p) {
         const cwd = path.resolve(this.sessionManager.getCwd());
         const absolutePath = path.isAbsolute(p) ? path.resolve(p) : path.resolve(cwd, p);
-        const relativePath = path.relative(cwd, absolutePath);
-        const isInsideCwd = relativePath === "" ||
-            (!relativePath.startsWith("..") &&
-                !relativePath.startsWith(`..${path.sep}`) &&
-                !path.isAbsolute(relativePath));
-        if (isInsideCwd) {
-            return relativePath || ".";
+        const relativePath = getCwdRelativePath(absolutePath, cwd);
+        if (relativePath !== undefined) {
+            return relativePath;
         }
         return this.formatDisplayPath(absolutePath);
     }
@@ -1601,7 +1541,7 @@ export class InteractiveMode {
                 this.setupAutocompleteProvider();
             },
             setEditorComponent: (factory) => this.setCustomEditorComponent(factory),
-            getEditorComponent: () => this.customEditorFactory,
+            getEditorComponent: () => this.editorComponentFactory,
             get theme() {
                 return theme;
             },
@@ -1648,7 +1588,7 @@ export class InteractiveMode {
                 opts?.signal?.removeEventListener("abort", onAbort);
                 this.hideExtensionSelector();
                 resolve(undefined);
-            }, { tui: this.ui, timeout: opts?.timeout });
+            }, { tui: this.ui, timeout: opts?.timeout, onToggleToolsExpanded: () => this.toggleToolOutputExpansion() });
             this.editorContainer.clear();
             this.editorContainer.addChild(this.extensionSelector);
             this.ui.setFocus(this.extensionSelector);
@@ -1750,7 +1690,7 @@ export class InteractiveMode {
      * Pass undefined to restore the default editor.
      */
     setCustomEditorComponent(factory) {
-        this.customEditorFactory = factory;
+        this.editorComponentFactory = factory;
         // Save text from current editor before switching
         const currentText = this.editor.getText();
         this.editorContainer.clear();
@@ -1986,7 +1926,7 @@ export class InteractiveMode {
             // Write to temp file
             const tmpDir = os.tmpdir();
             const ext = extensionForImageMimeType(image.mimeType) ?? "png";
-            const fileName = `aery-clipboard-${crypto.randomUUID()}.${ext}`;
+            const fileName = `pi-clipboard-${crypto.randomUUID()}.${ext}`;
             const filePath = path.join(tmpDir, fileName);
             fs.writeFileSync(filePath, Buffer.from(image.bytes));
             // Insert file path directly
@@ -2049,11 +1989,6 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
-            if (text === "/capabilities") {
-                this.handleCapabilitiesCommand();
-                this.editor.setText("");
-                return;
-            }
             if (text === "/changelog") {
                 this.handleChangelogCommand();
                 this.editor.setText("");
@@ -2079,11 +2014,6 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
-            if (text === "/extensions doctor" || text === "/extensions") {
-                this.handleExtensionsDoctorCommand();
-                this.editor.setText("");
-                return;
-            }
             if (text === "/login") {
                 this.showOAuthSelector("login");
                 this.editor.setText("");
@@ -2195,6 +2125,7 @@ export class InteractiveMode {
         this.footer.invalidate();
         switch (event.type) {
             case "agent_start":
+                this.pendingTools.clear();
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(true);
                 }
@@ -2228,6 +2159,10 @@ export class InteractiveMode {
                 this.footer.invalidate();
                 this.ui.requestRender();
                 break;
+            case "thinking_level_changed":
+                this.footer.invalidate();
+                this.updateEditorBorderColor();
+                break;
             case "message_start":
                 if (event.message.role === "custom") {
                     this.addMessageToChat(event.message);
@@ -2581,6 +2516,7 @@ export class InteractiveMode {
      */
     renderSessionContext(sessionContext, options = {}) {
         this.pendingTools.clear();
+        const renderedPendingTools = new Map();
         if (options.updateFooter) {
             this.footer.invalidate();
             this.updateEditorBorderColor();
@@ -2613,17 +2549,17 @@ export class InteractiveMode {
                             component.updateResult({ content: [{ type: "text", text: errorMessage }], isError: true });
                         }
                         else {
-                            this.pendingTools.set(content.id, component);
+                            renderedPendingTools.set(content.id, component);
                         }
                     }
                 }
             }
             else if (message.role === "toolResult") {
                 // Match tool results to pending tool components
-                const component = this.pendingTools.get(message.toolCallId);
+                const component = renderedPendingTools.get(message.toolCallId);
                 if (component) {
                     component.updateResult(message);
-                    this.pendingTools.delete(message.toolCallId);
+                    renderedPendingTools.delete(message.toolCallId);
                 }
             }
             else {
@@ -2631,6 +2567,9 @@ export class InteractiveMode {
                 this.addMessageToChat(message, options);
             }
         }
+        for (const [toolCallId, component] of renderedPendingTools) {
+            this.pendingTools.set(toolCallId, component);
+        }
         this.ui.requestRender();
     }
     renderInitialMessages() {
@@ -2704,6 +2643,38 @@ export class InteractiveMode {
         // extension cleanup can write restore sequences and re-trigger EIO.
         process.exit(129);
     }
+    /**
+     * Last-resort handler for uncaught exceptions. The TUI puts stdin into raw
+     * mode and hides the cursor; without this handler, an uncaught throw from
+     * anywhere (e.g. an extension's async `ChildProcess.on("exit")` callback)
+     * tears down the process while leaving the terminal in raw mode with no
+     * cursor, requiring `stty sane && reset` to recover.
+     *
+     * Unlike emergencyTerminalExit, the terminal is still alive here, so we
+     * call ui.stop() to restore cooked mode, the cursor, and disable bracketed
+     * paste / Kitty / modifyOtherKeys sequences.
+     */
+    uncaughtCrash(error) {
+        if (this.isShuttingDown) {
+            process.exit(1);
+        }
+        this.isShuttingDown = true;
+        try {
+            this.unregisterSignalHandlers();
+        }
+        catch { }
+        try {
+            killTrackedDetachedChildren();
+        }
+        catch { }
+        try {
+            this.ui.stop();
+        }
+        catch { }
+        console.error("pi exiting due to uncaughtException:");
+        console.error(error);
+        process.exit(1);
+    }
     /**
      * Check if shutdown was requested and perform shutdown if so.
      */
@@ -2739,6 +2710,12 @@ export class InteractiveMode {
         process.stderr.on("error", terminalErrorHandler);
         this.signalCleanupHandlers.push(() => process.stdout.off("error", terminalErrorHandler));
         this.signalCleanupHandlers.push(() => process.stderr.off("error", terminalErrorHandler));
+        // Restore the terminal before the process dies on any uncaught throw.
+        // Without this, an unhandled exception from extension code (or anywhere
+        // in pi) leaves the terminal in raw mode with no cursor.
+        const uncaughtExceptionHandler = (error) => this.uncaughtCrash(error);
+        process.prependListener("uncaughtException", uncaughtExceptionHandler);
+        this.signalCleanupHandlers.push(() => process.off("uncaughtException", uncaughtExceptionHandler));
     }
     unregisterSignalHandlers() {
         for (const cleanup of this.signalCleanupHandlers) {
@@ -2805,6 +2782,7 @@ export class InteractiveMode {
         }
         // If not streaming, Alt+Enter acts like regular Enter (trigger onSubmit)
         else if (this.editor.onSubmit) {
+            this.editor.setText("");
             this.editor.onSubmit(text);
         }
     }
@@ -2895,7 +2873,7 @@ export class InteractiveMode {
             return;
         }
         const currentText = this.editor.getExpandedText?.() ?? this.editor.getText();
-        const tmpFile = path.join(os.tmpdir(), `aery-editor-${Date.now()}.aery.md`);
+        const tmpFile = path.join(os.tmpdir(), `pi-editor-${Date.now()}.pi.md`);
         try {
             // Write current content to temp file
             fs.writeFileSync(tmpFile, currentText, "utf-8");
@@ -2939,6 +2917,7 @@ export class InteractiveMode {
     showError(errorMessage) {
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(theme.fg("error", `Error: ${errorMessage}`), 1, 0));
+        this.chatContainer.addChild(new Spacer(1));
         this.ui.requestRender();
     }
     showWarning(warningMessage) {
@@ -2947,10 +2926,13 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     showNewVersionNotification(newVersion) {
-        const action = theme.fg("accent", getUpdateInstruction("@eminent337/aery"));
-        const updateInstruction = theme.fg("muted", `New version ${newVersion} is available. `) + action;
-        const changelogUrl = theme.fg("accent", "https://github.com/eminent337/aery/blob/main/packages/coding-agent/CHANGELOG.md");
-        const changelogLine = theme.fg("muted", "Changelog: ") + changelogUrl;
+        const action = theme.fg("accent", `${APP_NAME} update`);
+        const updateInstruction = theme.fg("muted", `New version ${newVersion} is available. Run `) + action;
+        const changelogUrl = "https://github.com/eminent337/aery/blob/main/packages/coding-agent/CHANGELOG.md";
+        const changelogLink = getCapabilities().hyperlinks
+            ? hyperlink(theme.fg("accent", "open changelog"), changelogUrl)
+            : theme.fg("accent", changelogUrl);
+        const changelogLine = theme.fg("muted", "Changelog: ") + changelogLink;
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("warning", text)));
         this.chatContainer.addChild(new Text(`${theme.bold(theme.fg("warning", "Update Available"))}\n${updateInstruction}\n${changelogLine}`, 1, 0));
@@ -3689,24 +3671,12 @@ export class InteractiveMode {
         }));
         const modelProviders = new Set(this.session.modelRegistry.getAll().map((model) => model.provider));
         for (const providerId of modelProviders) {
-            if (oauthProviderIds.has(providerId) || API_KEY_LOGIN_PROVIDER_BLOCKLIST.has(providerId)) {
+            if (!isApiKeyLoginProvider(providerId, oauthProviderIds)) {
                 continue;
             }
             options.push({
                 id: providerId,
-                name: getApiKeyProviderDisplayName(providerId),
-                authType: "api_key",
-            });
-        }
-        if (!authType || authType === "api_key") {
-            options.push({
-                id: AERY_GATEWAY_PROVIDER_ID,
-                name: "Aery Gateway",
-                authType: "api_key",
-            });
-            options.push({
-                id: CUSTOM_OPENAI_COMPATIBLE_PROVIDER_ID,
-                name: CUSTOM_OPENAI_COMPATIBLE_PROVIDER_LABEL,
+                name: this.session.modelRegistry.getProviderDisplayName(providerId),
                 authType: "api_key",
             });
         }
@@ -3715,7 +3685,6 @@ export class InteractiveMode {
     }
     getLogoutProviderOptions() {
         const authStorage = this.session.modelRegistry.authStorage;
-        const oauthNameById = new Map(authStorage.getOAuthProviders().map((provider) => [provider.id, provider.name]));
         const options = [];
         for (const providerId of authStorage.list()) {
             const credential = authStorage.get(providerId);
@@ -3724,9 +3693,7 @@ export class InteractiveMode {
             }
             options.push({
                 id: providerId,
-                name: credential.type === "oauth"
-                    ? (oauthNameById.get(providerId) ?? providerId)
-                    : getApiKeyProviderDisplayName(providerId),
+                name: this.session.modelRegistry.getProviderDisplayName(providerId),
                 authType: credential.type,
             });
         }
@@ -3760,22 +3727,19 @@ export class InteractiveMode {
                 if (!providerOption) {
                     return;
                 }
-                if (providerOption.id === AERY_GATEWAY_PROVIDER_ID) {
-                    await this.showAeryGatewayLoginDialog();
-                }
-                else if (providerOption.id === CUSTOM_OPENAI_COMPATIBLE_PROVIDER_ID) {
-                    await this.showCustomOpenAICompatibleLoginDialog();
-                }
-                else if (providerOption.authType === "oauth") {
+                if (providerOption.authType === "oauth") {
                     await this.showLoginDialog(providerOption.id, providerOption.name);
                 }
+                else if (providerOption.id === BEDROCK_PROVIDER_ID) {
+                    this.showBedrockSetupDialog(providerOption.id, providerOption.name);
+                }
                 else {
                     await this.showApiKeyLoginDialog(providerOption.id, providerOption.name);
                 }
             }, () => {
                 done();
                 this.showLoginAuthTypeSelector();
-            });
+            }, (providerId) => this.session.modelRegistry.getProviderAuthStatus(providerId));
             return { component: selector, focus: selector };
         });
     }
@@ -3786,7 +3750,7 @@ export class InteractiveMode {
         }
         const providerOptions = this.getLogoutProviderOptions();
         if (providerOptions.length === 0) {
-            this.showStatus("No providers logged in. Use /login first.");
+            this.showStatus("No stored credentials to remove. /logout only removes credentials saved by /login; environment variables and models.json config are unchanged.");
             return;
         }
         this.showSelector((done) => {
@@ -3802,7 +3766,7 @@ export class InteractiveMode {
                     await this.updateAvailableProviderCount();
                     const message = providerOption.authType === "oauth"
                         ? `Logged out of ${providerOption.name}`
-                        : `Removed API key for ${providerOption.name}`;
+                        : `Removed stored API key for ${providerOption.name}. Environment variables and models.json config are unchanged.`;
                     this.showStatus(message);
                 }
                 catch (error) {
@@ -3864,117 +3828,31 @@ export class InteractiveMode {
                 void this.maybeWarnAboutAnthropicSubscriptionAuth();
             }
         }
-        const providerCheck = checkProviderSetup(providerId, providerName, this.session.modelRegistry);
-        if (providerCheck.level === "ok") {
-            this.showStatus(providerCheck.message);
-        }
-        else if (providerCheck.level === "warning") {
-            this.showWarning(providerCheck.message);
-        }
-        else {
-            this.showError(providerCheck.message);
-        }
     }
-    async showApiKeyLoginDialog(providerId, providerName) {
-        const previousModel = this.session.model;
-        const dialog = new LoginDialogComponent(this.ui, providerId, (_success, _message) => {
-            // Completion handled below
-        }, providerName);
-        this.editorContainer.clear();
-        this.editorContainer.addChild(dialog);
-        this.ui.setFocus(dialog);
-        this.ui.requestRender();
+    showBedrockSetupDialog(providerId, providerName) {
         const restoreEditor = () => {
             this.editorContainer.clear();
             this.editorContainer.addChild(this.editor);
             this.ui.setFocus(this.editor);
             this.ui.requestRender();
         };
-        try {
-            const apiKeyPrompt = providerId === "cloudflare-workers-ai" ? "Enter Cloudflare API token:" : "Enter API key:";
-            const apiKey = (await dialog.showPrompt(apiKeyPrompt)).trim();
-            if (!apiKey) {
-                throw new Error("API key cannot be empty.");
-            }
-            if (providerId === "cloudflare-workers-ai") {
-                const accountId = (await dialog.showPrompt("Enter Cloudflare account ID:")).trim();
-                if (!accountId) {
-                    throw new Error("Cloudflare account ID cannot be empty.");
-                }
-                this.session.modelRegistry.authStorage.set(providerId, { type: "api_key", key: apiKey, accountId });
-                this.session.modelRegistry.refresh();
-            }
-            else {
-                this.session.modelRegistry.authStorage.set(providerId, { type: "api_key", key: apiKey });
-            }
-            restoreEditor();
-            await this.completeProviderAuthentication(providerId, providerName, "api_key", previousModel);
-        }
-        catch (error) {
-            restoreEditor();
-            const errorMsg = error instanceof Error ? error.message : String(error);
-            if (errorMsg !== "Login cancelled") {
-                this.showError(`Failed to save API key for ${providerName}: ${errorMsg}`);
-            }
-        }
-    }
-    async showAeryGatewayLoginDialog() {
-        const dialog = new LoginDialogComponent(this.ui, AERY_GATEWAY_PROVIDER_ID, (_success, _message) => { }, "Connect to Aery Gateway");
+        const dialog = new LoginDialogComponent(this.ui, providerId, () => restoreEditor(), providerName, "Amazon Bedrock setup");
+        dialog.showInfo([
+            theme.fg("text", "Amazon Bedrock uses AWS credentials instead of a single API key."),
+            theme.fg("text", "Configure an AWS profile, IAM keys, bearer token, or role-based credentials."),
+            theme.fg("muted", "See:"),
+            theme.fg("accent", `  ${path.join(getDocsPath(), "providers.md")}`),
+        ]);
         this.editorContainer.clear();
         this.editorContainer.addChild(dialog);
         this.ui.setFocus(dialog);
         this.ui.requestRender();
-        const restoreEditor = () => {
-            this.editorContainer.clear();
-            this.editorContainer.addChild(this.editor);
-            this.ui.setFocus(this.editor);
-            this.ui.requestRender();
-        };
-        try {
-            const aeryKey = (await dialog.showPrompt("Enter your Aery key:", "aery_...")).trim();
-            if (!aeryKey)
-                throw new Error("Aery key cannot be empty.");
-            const provider = (await dialog.showPrompt("Provider to route through (e.g. anthropic, openai, openrouter):", "anthropic")).trim();
-            if (!provider)
-                throw new Error("Provider cannot be empty.");
-            const modelId = (await dialog.showPrompt("Model ID:", "claude-sonnet-4-5")).trim();
-            if (!modelId)
-                throw new Error("Model ID cannot be empty.");
-            const baseUrl = `${AERY_GATEWAY_BASE_URL}/${provider}`;
-            const saved = saveCustomOpenAICompatibleProvider({
-                modelsPath: getModelsPath(),
-                baseUrl,
-                modelId,
-                api: AERY_GATEWAY_PROVIDER_APIS[provider] ?? "openai-completions",
-            });
-            this.session.modelRegistry.authStorage.set(saved.providerId, { type: "api_key", key: aeryKey });
-            this.session.modelRegistry.refresh();
-            restoreEditor();
-            await this.updateAvailableProviderCount();
-            this.footer.invalidate();
-            this.updateEditorBorderColor();
-            const model = this.session.modelRegistry.find(saved.providerId, saved.modelId);
-            if (model) {
-                try {
-                    await this.session.setModel(model);
-                    this.showStatus(`Connected to Aery Gateway → ${provider}/${modelId}.`);
-                }
-                catch {
-                    this.showStatus(`Aery Gateway configured. Use /model to select ${saved.providerId}/${modelId}.`);
-                }
-            }
-        }
-        catch (error) {
-            restoreEditor();
-            const errorMsg = error instanceof Error ? error.message : String(error);
-            if (errorMsg !== "Login cancelled") {
-                this.showError(`Failed to connect to Aery Gateway: ${errorMsg}`);
-            }
-        }
     }
-    async showCustomOpenAICompatibleLoginDialog() {
+    async showApiKeyLoginDialog(providerId, providerName) {
         const previousModel = this.session.model;
-        const dialog = new LoginDialogComponent(this.ui, CUSTOM_OPENAI_COMPATIBLE_PROVIDER_ID, (_success, _message) => { }, `Configure ${CUSTOM_OPENAI_COMPATIBLE_PROVIDER_LABEL}`);
+        const dialog = new LoginDialogComponent(this.ui, providerId, (_success, _message) => {
+            // Completion handled below
+        }, providerName);
         this.editorContainer.clear();
         this.editorContainer.addChild(dialog);
         this.ui.setFocus(dialog);
@@ -3986,58 +3864,44 @@ export class InteractiveMode {
             this.ui.requestRender();
         };
         try {
-            const baseUrl = (await dialog.showPrompt("Enter base URL:", "https://api.example.com/v1")).trim();
-            if (!baseUrl) {
-                throw new Error("Base URL cannot be empty.");
-            }
-            const modelId = (await dialog.showPrompt("Enter model ID:", "gpt-4o-mini")).trim();
-            if (!modelId) {
-                throw new Error("Model ID cannot be empty.");
-            }
-            const apiKey = (await dialog.showPrompt("Enter API key:", "sk-...")).trim();
+            const apiKey = (await dialog.showPrompt("Enter API key:")).trim();
             if (!apiKey) {
                 throw new Error("API key cannot be empty.");
             }
-            const saved = saveCustomOpenAICompatibleProvider({
-                modelsPath: getModelsPath(),
-                baseUrl,
-                modelId,
-            });
-            this.session.modelRegistry.authStorage.set(saved.providerId, { type: "api_key", key: apiKey });
-            this.session.modelRegistry.refresh();
+            this.session.modelRegistry.authStorage.set(providerId, { type: "api_key", key: apiKey });
             restoreEditor();
-            await this.updateAvailableProviderCount();
-            this.footer.invalidate();
-            this.updateEditorBorderColor();
-            const model = this.session.modelRegistry.find(saved.providerId, saved.modelId);
-            let selectedModel = false;
-            if (model) {
-                try {
-                    await this.session.setModel(model);
-                    selectedModel = true;
-                }
-                catch (error) {
-                    this.showError(`Saved ${saved.providerId}/${saved.modelId}, but selecting it failed: ${error instanceof Error ? error.message : String(error)}. Use /model to select it manually.`);
-                }
-            }
-            if (selectedModel) {
-                this.showStatus(`Configured ${saved.providerId}/${saved.modelId}. Provider saved to ${saved.modelsPath}; API key saved to ${getAuthPath()}.`);
-            }
-            else {
-                this.showStatus(`Configured ${saved.providerId}/${saved.modelId}. Provider saved to ${saved.modelsPath}; API key saved to ${getAuthPath()}. Use /model to select it.`);
-            }
-            if (isUnknownModel(previousModel) && !selectedModel) {
-                this.showWarning(`Custom provider ${saved.providerId} is available, but no model was selected automatically.`);
-            }
+            await this.completeProviderAuthentication(providerId, providerName, "api_key", previousModel);
         }
         catch (error) {
             restoreEditor();
             const errorMsg = error instanceof Error ? error.message : String(error);
             if (errorMsg !== "Login cancelled") {
-                this.showError(`Failed to configure ${CUSTOM_OPENAI_COMPATIBLE_PROVIDER_LABEL}: ${errorMsg}`);
+                this.showError(`Failed to save API key for ${providerName}: ${errorMsg}`);
             }
         }
     }
+    showOAuthLoginSelect(dialog, prompt) {
+        return new Promise((resolve) => {
+            const restoreDialog = () => {
+                this.editorContainer.clear();
+                this.editorContainer.addChild(dialog);
+                this.ui.setFocus(dialog);
+                this.ui.requestRender();
+            };
+            const labels = prompt.options.map((option) => option.label);
+            const selector = new ExtensionSelectorComponent(prompt.message, labels, (optionLabel) => {
+                restoreDialog();
+                resolve(prompt.options.find((option) => option.label === optionLabel)?.id);
+            }, () => {
+                restoreDialog();
+                resolve(undefined);
+            });
+            this.editorContainer.clear();
+            this.editorContainer.addChild(selector);
+            this.ui.setFocus(selector);
+            this.ui.requestRender();
+        });
+    }
     async showLoginDialog(providerId, providerName) {
         const providerInfo = this.session.modelRegistry.authStorage
             .getOAuthProviders()
@@ -4075,7 +3939,7 @@ export class InteractiveMode {
                     if (usesCallbackServer) {
                         // Show input for manual paste, racing with callback
                         dialog
-                            .showManualInput("Open the URL in your browser, log in, then paste the redirect URL here.\n(WSL/remote users: after login, copy the full URL from the browser address bar and paste it below)")
+                            .showManualInput("Paste redirect URL below, or complete login in browser:")
                             .then((value) => {
                             if (value && manualCodeResolve) {
                                 manualCodeResolve(value);
@@ -4101,6 +3965,7 @@ export class InteractiveMode {
                 onProgress: (message) => {
                     dialog.showProgress(message);
                 },
+                onSelect: (prompt) => this.showOAuthLoginSelect(dialog, prompt),
                 onManualCodeInput: () => manualCodePromise,
                 signal: dialog.signal,
             });
@@ -4451,43 +4316,17 @@ export class InteractiveMode {
         this.chatContainer.addChild(new DynamicBorder());
         this.ui.requestRender();
     }
-    handleExtensionsDoctorCommand() {
-        this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(formatCurrentCoreExtensionsReport(), 1, 0));
-        this.ui.requestRender();
-    }
-    handleCapabilitiesCommand() {
-        const report = collectCapabilitiesReport({
-            session: this.session,
-            services: this.runtimeHost.services,
-        });
-        this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(formatCapabilitiesReport(report), 1, 0));
-        this.ui.requestRender();
-    }
-    /**
-     * Capitalize keybinding for display (e.g., "ctrl+c" -> "Ctrl+C").
-     */
-    capitalizeKey(key) {
-        return key
-            .split("/")
-            .map((k) => k
-            .split("+")
-            .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
-            .join("+"))
-            .join("/");
-    }
     /**
      * Get capitalized display string for an app keybinding action.
      */
     getAppKeyDisplay(action) {
-        return this.capitalizeKey(keyText(action));
+        return keyDisplayText(action);
     }
     /**
      * Get capitalized display string for an editor keybinding action.
      */
     getEditorKeyDisplay(action) {
-        return this.capitalizeKey(keyText(action));
+        return keyDisplayText(action);
     }
     handleHotkeysCommand() {
         // Navigation keybindings
@@ -4586,7 +4425,7 @@ export class InteractiveMode {
 `;
             for (const [key, shortcut] of shortcuts) {
                 const description = shortcut.description ?? shortcut.extensionPath;
-                const keyDisplay = key.replace(/\b\w/g, (c) => c.toUpperCase());
+                const keyDisplay = formatKeyText(key, { capitalize: true });
                 hotkeys += `| \`${keyDisplay}\` | ${description} |\n`;
             }
         }