@earendil-works/pi-coding-agent 0.80.6 → 0.80.8

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

@@ -6,7 +6,6 @@ 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 "@earendil-works/pi-ai/compat";
 import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@earendil-works/pi-tui";
 import chalk from "chalk";
 import { spawn, spawnSync } from "child_process";
@@ -20,14 +19,13 @@ 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 { BUILT_IN_PROVIDER_DISPLAY_NAMES } from "../../core/provider-display-names.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager, sessionEntryToContextMessages } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { isInstallTelemetryEnabled } from "../../core/telemetry.js";
 import { hasTrustRequiringProjectResources, ProjectTrustStore } from "../../core/trust-manager.js";
 import { getChangelogPath, getNewEntries, normalizeChangelogLinks, parseChangelog } from "../../utils/changelog.js";
-import { copyToClipboard } from "../../utils/clipboard.js";
+import { copyToClipboard, readClipboardText } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
 import { parseGitUrl } from "../../utils/git.js";
 import { getCwdRelativePath } from "../../utils/paths.js";
@@ -94,7 +92,7 @@ function isDeadTerminalError(error) {
     const code = error.code;
     return code !== undefined && DEAD_TERMINAL_ERROR_CODES.has(code);
 }
-const ANTHROPIC_SUBSCRIPTION_AUTH_WARNING = "Anthropic subscription auth is active. Third-party harness usage draws from extra usage and is billed per token, not your Claude plan limits. Manage extra usage at https://claude.ai/settings/usage.";
+const ANTHROPIC_SUBSCRIPTION_AUTH_WARNING = "Anthropic subscription auth is active. Third-party harness usage draws from extra usage and is billed per token, not your Claude plan limits. Manage extra usage at https://claude.ai/settings/usage. Disable this warning in /settings.";
 function isAnthropicSubscriptionAuthKey(apiKey) {
     return typeof apiKey === "string" && apiKey.startsWith("sk-ant-oat");
 }
@@ -125,17 +123,6 @@ export function formatResumeCommand(sessionManager) {
 function hasDefaultModelProvider(providerId) {
     return providerId in defaultModelPerProvider;
 }
-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)) {
-        return false;
-    }
-    return !oauthProviderIds.has(providerId);
-}
 const AUTH_TYPE_ORDER = { oauth: 0, api_key: 1 };
 function createFuzzyAutocompleteItems(items, prefix, getSearchText, toAutocompleteItem) {
     const filtered = fuzzyFilter(items, prefix, getSearchText);
@@ -362,11 +349,11 @@ export class InteractiveMode {
         }));
         const modelCommand = slashCommands.find((command) => command.name === "model");
         if (modelCommand) {
-            modelCommand.getArgumentCompletions = (prefix) => {
+            modelCommand.getArgumentCompletions = async (prefix) => {
                 // Get available models (scoped or from registry)
                 const models = this.session.scopedModels.length > 0
                     ? this.session.scopedModels.map((s) => s.model)
-                    : this.session.modelRegistry.getAvailable();
+                    : await this.session.modelRuntime.getAvailable();
                 if (models.length === 0)
                     return null;
                 // Create items with provider/id format
@@ -532,7 +519,7 @@ export class InteractiveMode {
                 rawKeyHint("!!", "to run bash (no context)"),
                 hint("app.message.followUp", "to queue follow-up"),
                 hint("app.message.dequeue", "to edit all queued messages"),
-                hint("app.clipboard.pasteImage", "to paste image"),
+                hint("app.clipboard.pasteImage", "to paste image (with text fallback)"),
                 rawKeyHint("drop files", "to attach"),
             ].join("\n");
             const compactInstructions = [
@@ -599,10 +586,18 @@ export class InteractiveMode {
             }
         });
         // Start package update check asynchronously
-        this.checkForPackageUpdates().then((updates) => {
+        this.checkForPackageUpdates()
+            .then((updates) => {
             if (updates.length > 0) {
                 this.showPackageUpdateNotification(updates);
             }
+        })
+            .finally(() => {
+            // On Windows, npm can overwrite the shared console title while checking
+            // extension package versions. Restore Pi's title after the startup check.
+            if (process.platform === "win32" && this.isInitialized) {
+                this.updateTerminalTitle();
+            }
         });
         // Check tmux keyboard setup asynchronously
         this.checkTmuxKeyboardSetup().then((warning) => {
@@ -615,7 +610,7 @@ export class InteractiveMode {
         if (migratedProviders && migratedProviders.length > 0) {
             this.showWarning(`Migrated credentials to auth.json: ${migratedProviders.join(", ")}`);
         }
-        const modelsJsonError = this.session.modelRegistry.getError();
+        const modelsJsonError = this.session.modelRuntime.getError();
         if (modelsJsonError) {
             this.showError(`models.json error: ${modelsJsonError}`);
         }
@@ -1346,7 +1341,7 @@ export class InteractiveMode {
             hasUI: true,
             cwd: this.sessionManager.getCwd(),
             sessionManager: this.sessionManager,
-            modelRegistry: this.session.modelRegistry,
+            modelRegistry: extensionRunner.getModelRegistry(),
             model: this.session.model,
             isIdle: () => this.session.isIdle,
             isProjectTrusted: () => this.settingsManager.isProjectTrusted(),
@@ -2034,6 +2029,7 @@ export class InteractiveMode {
         this.defaultEditor.onAction("app.tools.expand", () => this.toggleToolOutputExpansion());
         this.defaultEditor.onAction("app.thinking.toggle", () => this.toggleThinkingBlockVisibility());
         this.defaultEditor.onAction("app.editor.external", () => this.openExternalEditor());
+        this.defaultEditor.onAction("app.message.copy", () => void this.handleCopyCommand());
         this.defaultEditor.onAction("app.message.followUp", () => this.handleFollowUp());
         this.defaultEditor.onAction("app.message.dequeue", () => this.handleDequeue());
         this.defaultEditor.onAction("app.session.new", () => this.handleClearCommand());
@@ -2047,26 +2043,30 @@ export class InteractiveMode {
                 this.updateEditorBorderColor();
             }
         };
-        // Handle clipboard image paste (triggered on Ctrl+V)
+        // Handle clipboard paste (triggered on Ctrl+V). Images are attached by path;
+        // otherwise, paste plain text from the system clipboard.
         this.defaultEditor.onPasteImage = () => {
-            this.handleClipboardImagePaste();
+            void this.handleClipboardPaste();
         };
     }
-    async handleClipboardImagePaste() {
+    async handleClipboardPaste() {
         try {
             const image = await readClipboardImage();
-            if (!image) {
+            if (image) {
+                const tmpDir = os.tmpdir();
+                const ext = extensionForImageMimeType(image.mimeType) ?? "png";
+                const fileName = `pi-clipboard-${crypto.randomUUID()}.${ext}`;
+                const filePath = path.join(tmpDir, fileName);
+                fs.writeFileSync(filePath, Buffer.from(image.bytes));
+                this.editor.insertTextAtCursor?.(filePath);
+                this.ui.requestRender();
                 return;
             }
-            // Write to temp file
-            const tmpDir = os.tmpdir();
-            const ext = extensionForImageMimeType(image.mimeType) ?? "png";
-            const fileName = `pi-clipboard-${crypto.randomUUID()}.${ext}`;
-            const filePath = path.join(tmpDir, fileName);
-            fs.writeFileSync(filePath, Buffer.from(image.bytes));
-            // Insert file path directly
-            this.editor.insertTextAtCursor?.(filePath);
-            this.ui.requestRender();
+            const text = await readClipboardText();
+            if (text) {
+                this.editor.insertTextAtCursor?.(text);
+                this.ui.requestRender();
+            }
         }
         catch {
             // Silently ignore clipboard errors (may not have permission, etc.)
@@ -2647,7 +2647,7 @@ export class InteractiveMode {
         // Cache-miss notices are not persisted; re-derive them from the full entry
         // list and re-inject them after the assistant messages that paid for them.
         const cacheMisses = this.settingsManager.getShowCacheMissNotices()
-            ? collectCacheMisses(this.sessionManager.getEntries(), this.session.modelRegistry)
+            ? collectCacheMisses(this.sessionManager.getEntries(), this.session.modelRuntime)
             : new Map();
         if (options.updateFooter) {
             this.footer.invalidate();
@@ -2738,7 +2738,7 @@ export class InteractiveMode {
         if (!this.settingsManager.getShowCacheMissNotices())
             return;
         // Entries don't contain `message` yet: message_end fires before persistence.
-        const miss = detectCacheMiss(this.sessionManager.getEntries(), message, this.session.modelRegistry);
+        const miss = detectCacheMiss(this.sessionManager.getEntries(), message, this.session.modelRuntime);
         if (miss)
             this.addCacheMissNotice(miss);
     }
@@ -3579,9 +3579,9 @@ export class InteractiveMode {
         if (this.session.scopedModels.length > 0) {
             return this.session.scopedModels.map((scoped) => scoped.model);
         }
-        this.session.modelRegistry.refresh();
         try {
-            return await this.session.modelRegistry.getAvailable();
+            await this.session.modelRuntime.refresh();
+            return [...(await this.session.modelRuntime.getAvailable())];
         }
         catch {
             return [];
@@ -3603,14 +3603,13 @@ export class InteractiveMode {
         if (!model || model.provider !== "anthropic") {
             return;
         }
-        const storedCredential = this.session.modelRegistry.authStorage.get("anthropic");
-        if (storedCredential?.type === "oauth") {
-            this.anthropicSubscriptionWarningShown = true;
-            this.showWarning(ANTHROPIC_SUBSCRIPTION_AUTH_WARNING);
-            return;
-        }
         try {
-            const apiKey = await this.session.modelRegistry.getApiKeyForProvider(model.provider);
+            if ((await this.session.modelRuntime.checkAuth("anthropic"))?.type === "oauth") {
+                this.anthropicSubscriptionWarningShown = true;
+                this.showWarning(ANTHROPIC_SUBSCRIPTION_AUTH_WARNING);
+                return;
+            }
+            const apiKey = (await this.session.modelRuntime.getAuth(model.provider))?.auth.apiKey;
             if (!isAnthropicSubscriptionAuthKey(apiKey)) {
                 return;
             }
@@ -3668,7 +3667,7 @@ export class InteractiveMode {
     }
     showModelSelector(initialSearchInput) {
         this.showSelector((done) => {
-            const selector = new ModelSelectorComponent(this.ui, this.session.model, this.settingsManager, this.session.modelRegistry, this.session.scopedModels, async (model) => {
+            const selector = new ModelSelectorComponent(this.ui, this.session.model, this.settingsManager, this.session.modelRuntime, this.session.scopedModels, async (model) => {
                 try {
                     await this.session.setModel(model);
                     this.footer.invalidate();
@@ -3691,8 +3690,8 @@ export class InteractiveMode {
     }
     async showModelsSelector() {
         // Get all available models
-        this.session.modelRegistry.refresh();
-        const allModels = this.session.modelRegistry.getAvailable();
+        await this.session.modelRuntime.refresh();
+        const allModels = [...(await this.session.modelRuntime.getAvailable())];
         if (allModels.length === 0) {
             this.showStatus("No models available");
             return;
@@ -3710,7 +3709,7 @@ export class InteractiveMode {
             // Fall back to settings
             const patterns = this.settingsManager.getEnabledModels();
             if (patterns !== undefined && patterns.length > 0) {
-                const scopedModels = await resolveModelScope(patterns, this.session.modelRegistry);
+                const scopedModels = await resolveModelScope(patterns, this.session.modelRuntime);
                 currentEnabledIds = scopedModels.map((scoped) => `${scoped.model.provider}/${scoped.model.id}`);
             }
         }
@@ -3718,7 +3717,7 @@ export class InteractiveMode {
         const updateSessionModels = async (enabledIds) => {
             currentEnabledIds = enabledIds === null ? null : [...enabledIds];
             if (enabledIds && enabledIds.length > 0 && enabledIds.length < allModels.length) {
-                const newScopedModels = await resolveModelScope(enabledIds, this.session.modelRegistry);
+                const newScopedModels = await resolveModelScope(enabledIds, this.session.modelRuntime);
                 this.session.setScopedModels(newScopedModels.map((sm) => ({
                     model: sm.model,
                     thinkingLevel: sm.thinkingLevel,
@@ -3901,6 +3900,19 @@ export class InteractiveMode {
                 this.sessionManager.appendLabelChange(entryId, label);
                 this.ui.requestRender();
             }, initialSelectedId, initialFilterMode);
+            selector.onCopy = async (text) => {
+                if (!text) {
+                    this.showError("Selected entry has no text to copy");
+                    return;
+                }
+                try {
+                    await copyToClipboard(text);
+                    this.showStatus("Copied selected message to clipboard");
+                }
+                catch (error) {
+                    this.showError(error instanceof Error ? error.message : String(error));
+                }
+            };
             return { component: selector, focus: selector };
         });
     }
@@ -3965,44 +3977,46 @@ export class InteractiveMode {
         }
     }
     getLoginProviderOptions(authType) {
-        const authStorage = this.session.modelRegistry.authStorage;
-        const oauthProviders = authStorage.getOAuthProviders();
-        const oauthProviderIds = new Set(oauthProviders.map((provider) => provider.id));
-        const options = oauthProviders.map((provider) => ({
-            id: provider.id,
-            name: provider.name,
-            authType: "oauth",
-        }));
-        const modelProviders = new Set(this.session.modelRegistry.getAll().map((model) => model.provider));
-        for (const providerId of modelProviders) {
-            if (!isApiKeyLoginProvider(providerId, oauthProviderIds)) {
-                continue;
-            }
-            options.push({
-                id: providerId,
-                name: this.session.modelRegistry.getProviderDisplayName(providerId),
-                authType: "api_key",
-            });
-        }
-        const filteredOptions = authType ? options.filter((option) => option.authType === authType) : options;
-        return filteredOptions.sort((a, b) => a.name.localeCompare(b.name));
-    }
-    getLogoutProviderOptions() {
-        const authStorage = this.session.modelRegistry.authStorage;
         const options = [];
-        for (const providerId of authStorage.list()) {
-            const credential = authStorage.get(providerId);
-            if (!credential) {
-                continue;
+        for (const provider of this.session.modelRuntime.getProviders()) {
+            const authStatus = this.session.modelRuntime.getProviderAuthStatus(provider.id);
+            const status = authStatus.configured
+                ? {
+                    type: this.session.modelRuntime.isUsingOAuth(provider.id) ? "oauth" : "api_key",
+                    source: authStatus.label ?? authStatus.source,
+                }
+                : undefined;
+            if ((!authType || authType === "oauth") && provider.auth.oauth) {
+                options.push({
+                    id: provider.id,
+                    name: provider.name,
+                    authType: "oauth",
+                    method: provider.auth.oauth,
+                    status,
+                });
+            }
+            if ((!authType || authType === "api_key") && provider.auth.apiKey) {
+                options.push({
+                    id: provider.id,
+                    name: provider.name,
+                    authType: "api_key",
+                    method: provider.auth.apiKey,
+                    status,
+                });
             }
-            options.push({
-                id: providerId,
-                name: this.session.modelRegistry.getProviderDisplayName(providerId),
-                authType: credential.type,
-            });
         }
         return options.sort((a, b) => a.name.localeCompare(b.name));
     }
+    async getLogoutProviderOptions() {
+        return (await this.session.modelRuntime.listCredentials())
+            .map(({ providerId, type }) => ({
+            id: providerId,
+            name: this.session.modelRuntime.getProvider(providerId)?.name ?? providerId,
+            authType: type,
+            status: { type, source: "stored credential" },
+        }))
+            .sort((a, b) => a.name.localeCompare(b.name));
+    }
     findLoginProviderOptions(providerRef) {
         const normalizedProviderRef = providerRef.trim().toLowerCase();
         if (!normalizedProviderRef) {
@@ -4012,6 +4026,7 @@ export class InteractiveMode {
             provider.name.toLowerCase() === normalizedProviderRef);
     }
     async handleLoginCommand(providerRef) {
+        await this.session.modelRuntime.getAvailable();
         if (!providerRef) {
             this.showLoginAuthTypeSelector();
             return;
@@ -4034,16 +4049,16 @@ export class InteractiveMode {
         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 if (providerOption.method?.login) {
+            await this.showApiKeyLoginDialog(providerOption.id, providerOption.name);
         }
         else {
-            await this.showApiKeyLoginDialog(providerOption.id, providerOption.name);
+            this.showAmbientAuthDialog(providerOption);
         }
     }
     showLoginAuthTypeSelector(providerOptions) {
-        const subscriptionLabel = "Use a subscription";
-        const apiKeyLabel = "Use an API key";
+        const subscriptionLabel = "Sign in with an account";
+        const apiKeyLabel = "Sign in with an API key";
         const availableAuthTypes = providerOptions
             ? new Set(providerOptions.map((provider) => provider.authType))
             : new Set(["oauth", "api_key"]);
@@ -4099,7 +4114,7 @@ export class InteractiveMode {
             return;
         }
         this.showSelector((done) => {
-            const selector = new OAuthSelectorComponent("login", this.session.modelRegistry.authStorage, providerOptions, async (providerId, selectedAuthType) => {
+            const selector = new OAuthSelectorComponent("login", providerOptions, async (providerId, selectedAuthType) => {
                 done();
                 const providerOption = providerOptions.find((provider) => provider.id === providerId && provider.authType === selectedAuthType);
                 if (!providerOption) {
@@ -4114,7 +4129,7 @@ export class InteractiveMode {
                 else {
                     this.ui.requestRender();
                 }
-            }, (providerId) => this.session.modelRegistry.getProviderAuthStatus(providerId), initialSearchInput);
+            }, initialSearchInput);
             return { component: selector, focus: selector };
         });
     }
@@ -4123,21 +4138,20 @@ export class InteractiveMode {
             this.showLoginAuthTypeSelector();
             return;
         }
-        const providerOptions = this.getLogoutProviderOptions();
+        const providerOptions = await this.getLogoutProviderOptions();
         if (providerOptions.length === 0) {
             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) => {
-            const selector = new OAuthSelectorComponent(mode, this.session.modelRegistry.authStorage, providerOptions, async (providerId) => {
+            const selector = new OAuthSelectorComponent(mode, providerOptions, async (providerId) => {
                 done();
                 const providerOption = providerOptions.find((provider) => provider.id === providerId);
                 if (!providerOption) {
                     return;
                 }
                 try {
-                    this.session.modelRegistry.authStorage.logout(providerOption.id);
-                    this.session.modelRegistry.refresh();
+                    await this.session.modelRuntime.logout(providerOption.id);
                     await this.updateAvailableProviderCount();
                     const message = providerOption.authType === "oauth"
                         ? `Logged out of ${providerOption.name}`
@@ -4155,12 +4169,12 @@ export class InteractiveMode {
         });
     }
     async completeProviderAuthentication(providerId, providerName, authType, previousModel) {
-        this.session.modelRegistry.refresh();
+        await this.session.modelRuntime.getAvailable();
         const actionLabel = authType === "oauth" ? `Logged in to ${providerName}` : `Saved API key for ${providerName}`;
         let selectedModel;
         let selectionError;
         if (isUnknownModel(previousModel)) {
-            const availableModels = this.session.modelRegistry.getAvailable();
+            const availableModels = await this.session.modelRuntime.getAvailable();
             const providerModels = availableModels.filter((model) => model.provider === providerId);
             if (!hasDefaultModelProvider(providerId)) {
                 selectionError = `${actionLabel}, but no default model is configured for provider "${providerId}". Use /model to select a model.`;
@@ -4204,20 +4218,15 @@ export class InteractiveMode {
             }
         }
     }
-    showBedrockSetupDialog(providerId, providerName) {
+    showAmbientAuthDialog(providerOption) {
         const restoreEditor = () => {
             this.editorContainer.clear();
             this.editorContainer.addChild(this.editor);
             this.ui.setFocus(this.editor);
             this.ui.requestRender();
         };
-        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")}`),
-        ]);
+        const dialog = new LoginDialogComponent(this.ui, providerOption.id, () => restoreEditor(), providerOption.name, `${providerOption.name} setup`);
+        dialog.showInfo(`${providerOption.method?.name ?? "Authentication"} is configured outside pi.`, [], true);
         this.editorContainer.clear();
         this.editorContainer.addChild(dialog);
         this.ui.setFocus(dialog);
@@ -4228,6 +4237,13 @@ export class InteractiveMode {
         const dialog = new LoginDialogComponent(this.ui, providerId, (_success, _message) => {
             // Completion handled below
         }, providerName);
+        if (providerId === "amazon-bedrock") {
+            dialog.showDetails([
+                theme.fg("text", "You can also use an AWS profile, IAM keys, 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);
@@ -4239,11 +4255,7 @@ export class InteractiveMode {
             this.ui.requestRender();
         };
         try {
-            const apiKey = (await dialog.showPrompt("Enter API key:")).trim();
-            if (!apiKey) {
-                throw new Error("API key cannot be empty.");
-            }
-            this.session.modelRegistry.authStorage.set(providerId, { type: "api_key", key: apiKey });
+            await this.loginProvider(dialog, providerId, "api_key");
             restoreEditor();
             await this.completeProviderAuthentication(providerId, providerName, "api_key", previousModel);
         }
@@ -4255,8 +4267,8 @@ export class InteractiveMode {
             }
         }
     }
-    showOAuthLoginSelect(dialog, prompt) {
-        return new Promise((resolve) => {
+    showAuthSelect(dialog, prompt) {
+        return new Promise((resolve, reject) => {
             const restoreDialog = () => {
                 this.editorContainer.clear();
                 this.editorContainer.addChild(dialog);
@@ -4266,10 +4278,14 @@ export class InteractiveMode {
             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);
+                const id = prompt.options.find((option) => option.label === optionLabel)?.id;
+                if (id)
+                    resolve(id);
+                else
+                    reject(new Error("Login cancelled"));
             }, () => {
                 restoreDialog();
-                resolve(undefined);
+                reject(new Error("Login cancelled"));
             });
             this.editorContainer.clear();
             this.editorContainer.addChild(selector);
@@ -4277,30 +4293,64 @@ export class InteractiveMode {
             this.ui.requestRender();
         });
     }
+    async showAuthPrompt(dialog, prompt) {
+        let response;
+        if (prompt.type === "select") {
+            response = this.showAuthSelect(dialog, prompt);
+        }
+        else if (prompt.type === "manual_code") {
+            response = dialog.showManualInput(prompt.message);
+        }
+        else {
+            response = dialog.showPrompt(prompt.message, prompt.placeholder);
+        }
+        if (!prompt.signal)
+            return response;
+        if (prompt.signal.aborted)
+            throw new Error("Login cancelled");
+        const signal = prompt.signal;
+        let onAbort;
+        const aborted = new Promise((_resolve, reject) => {
+            onAbort = () => reject(new Error("Login cancelled"));
+            signal.addEventListener("abort", onAbort, { once: true });
+        });
+        try {
+            return await Promise.race([response, aborted]);
+        }
+        finally {
+            if (onAbort)
+                signal.removeEventListener("abort", onAbort);
+        }
+    }
+    notifyAuthDialog(dialog, event) {
+        if (event.type === "auth_url") {
+            dialog.showAuth(event.url, event.instructions);
+        }
+        else if (event.type === "device_code") {
+            dialog.showDeviceCode(event);
+            dialog.showWaiting("Waiting for authentication...");
+        }
+        else if (event.type === "info") {
+            dialog.showInfo(event.message, event.links);
+        }
+        else {
+            dialog.showProgress(event.message);
+        }
+    }
+    async loginProvider(dialog, providerId, method) {
+        await this.session.modelRuntime.login(providerId, method, {
+            signal: dialog.signal,
+            prompt: (prompt) => this.showAuthPrompt(dialog, prompt),
+            notify: (event) => this.notifyAuthDialog(dialog, event),
+        });
+    }
     async showLoginDialog(providerId, providerName) {
-        const providerInfo = this.session.modelRegistry.authStorage
-            .getOAuthProviders()
-            .find((provider) => provider.id === providerId);
         const previousModel = this.session.model;
-        // Providers that use callback servers (can paste redirect URL)
-        const usesCallbackServer = providerInfo?.usesCallbackServer ?? false;
-        // Create login dialog component
-        const dialog = new LoginDialogComponent(this.ui, providerId, (_success, _message) => {
-            // Completion handled below
-        }, providerName);
-        // Show dialog in editor container
+        const dialog = new LoginDialogComponent(this.ui, providerId, (_success, _message) => { }, providerName);
         this.editorContainer.clear();
         this.editorContainer.addChild(dialog);
         this.ui.setFocus(dialog);
         this.ui.requestRender();
-        // Promise for manual code input (racing with callback server)
-        let manualCodeResolve;
-        let manualCodeReject;
-        const manualCodePromise = new Promise((resolve, reject) => {
-            manualCodeResolve = resolve;
-            manualCodeReject = reject;
-        });
-        // Restore editor helper
         const restoreEditor = () => {
             this.editorContainer.clear();
             this.editorContainer.addChild(this.editor);
@@ -4308,43 +4358,7 @@ export class InteractiveMode {
             this.ui.requestRender();
         };
         try {
-            await this.session.modelRegistry.authStorage.login(providerId, {
-                onAuth: (info) => {
-                    dialog.showAuth(info.url, info.instructions);
-                    if (usesCallbackServer) {
-                        // Show input for manual paste, racing with callback
-                        dialog
-                            .showManualInput("Paste redirect URL below, or complete login in browser:")
-                            .then((value) => {
-                            if (value && manualCodeResolve) {
-                                manualCodeResolve(value);
-                                manualCodeResolve = undefined;
-                            }
-                        })
-                            .catch(() => {
-                            if (manualCodeReject) {
-                                manualCodeReject(new Error("Login cancelled"));
-                                manualCodeReject = undefined;
-                            }
-                        });
-                    }
-                    // For Anthropic: onPrompt is called immediately after
-                },
-                onDeviceCode: (info) => {
-                    dialog.showDeviceCode(info);
-                    dialog.showWaiting("Waiting for authentication...");
-                },
-                onPrompt: async (prompt) => {
-                    return dialog.showPrompt(prompt.message, prompt.placeholder);
-                },
-                onProgress: (message) => {
-                    dialog.showProgress(message);
-                },
-                onSelect: (prompt) => this.showOAuthLoginSelect(dialog, prompt),
-                onManualCodeInput: () => manualCodePromise,
-                signal: dialog.signal,
-            });
-            // Success
+            await this.loginProvider(dialog, providerId, "oauth");
             restoreEditor();
             await this.completeProviderAuthentication(providerId, providerName, "oauth", previousModel);
         }
@@ -4432,7 +4446,7 @@ export class InteractiveMode {
                 showDiagnosticsWhenQuiet: true,
             });
             const savedImplicitProjectTrust = this.maybeSaveImplicitProjectTrustAfterReload();
-            const modelsJsonError = this.session.modelRegistry.getError();
+            const modelsJsonError = this.session.modelRuntime.getError();
             if (modelsJsonError) {
                 this.showError(`models.json error: ${modelsJsonError}`);
             }
@@ -4660,7 +4674,7 @@ export class InteractiveMode {
         const stats = this.session.getSessionStats();
         const sessionName = this.sessionManager.getSessionName();
         const entries = this.sessionManager.getEntries();
-        const cacheWaste = computeCacheWaste(entries, this.session.modelRegistry);
+        const cacheWaste = computeCacheWaste(entries, this.session.modelRuntime);
         // Cost/token totals per provider/model actually used (e.g. OpenRouter `auto`
         // resolves to a concrete responseModel), sorted by cost descending.
         const perModelMap = new Map();
@@ -4793,6 +4807,7 @@ export class InteractiveMode {
         const toggleThinking = this.getAppKeyDisplay("app.thinking.toggle");
         const externalEditor = this.getAppKeyDisplay("app.editor.external");
         const cycleModelBackward = this.getAppKeyDisplay("app.model.cycleBackward");
+        const copyMessage = this.getAppKeyDisplay("app.message.copy");
         const followUp = this.getAppKeyDisplay("app.message.followUp");
         const dequeue = this.getAppKeyDisplay("app.message.dequeue");
         const pasteImage = this.getAppKeyDisplay("app.clipboard.pasteImage");
@@ -4835,9 +4850,10 @@ export class InteractiveMode {
 | \`${expandTools}\` | Toggle tool output expansion |
 | \`${toggleThinking}\` | Toggle thinking block visibility |
 | \`${externalEditor}\` | Edit message in external editor |
+| \`${copyMessage}\` | Copy last assistant message |
 | \`${followUp}\` | Queue follow-up message |
 | \`${dequeue}\` | Restore queued messages |
-| \`${pasteImage}\` | Paste image from clipboard |
+| \`${pasteImage}\` | Paste image or text from clipboard |
 | \`/\` | Slash commands |
 | \`!\` | Run bash command |
 | \`!!\` | Run bash command (excluded from context) |