@psnext/slingcli 2.5.20260707-1 → 2.5.20260718-1

package/node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/interactive-mode.js

@@ -6,27 +6,26 @@ 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";
 import { APP_NAME, APP_TITLE, CONFIG_DIR_NAME, 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 { CACHE_TTL_MS, collectCacheMisses, computeCacheWaste, detectCacheMiss, } from "../../core/cache-stats.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { configureHttpDispatcher, formatHttpIdleTimeoutMs } from "../../core/http-dispatcher.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 { 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";
@@ -49,11 +48,11 @@ import { EarendilAnnouncementComponent } from "./components/earendil-announcemen
 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 { FooterComponent, formatTokens } from "./components/footer.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";
+import { formatAuthSelectorProviderType, OAuthSelectorComponent, } from "./components/oauth-selector.js";
 import { ScopedModelsSelectorComponent } from "./components/scoped-models-selector.js";
 import { SessionSelectorComponent } from "./components/session-selector.js";
 import { SettingsSelectorComponent } from "./components/settings-selector.js";
@@ -93,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");
 }
@@ -124,16 +123,41 @@ 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;
+const AUTH_TYPE_ORDER = { oauth: 0, api_key: 1 };
+function createFuzzyAutocompleteItems(items, prefix, getSearchText, toAutocompleteItem) {
+    const filtered = fuzzyFilter(items, prefix, getSearchText);
+    if (filtered.length === 0)
+        return null;
+    return filtered.map(toAutocompleteItem);
+}
+function getLoginProviderCompletionOptions(providerOptions) {
+    const byId = new Map();
+    for (const provider of providerOptions) {
+        const existing = byId.get(provider.id);
+        if (existing) {
+            if (!existing.authTypes.includes(provider.authType)) {
+                existing.authTypes.push(provider.authType);
+                existing.authTypes.sort((a, b) => AUTH_TYPE_ORDER[a] - AUTH_TYPE_ORDER[b]);
+            }
+            continue;
+        }
+        byId.set(provider.id, {
+            id: provider.id,
+            name: provider.name,
+            authTypes: [provider.authType],
+        });
     }
-    return !oauthProviderIds.has(providerId);
+    return Array.from(byId.values()).sort((a, b) => a.name.localeCompare(b.name));
+}
+function getLoginProviderSearchText(provider) {
+    const authTypes = provider.authTypes
+        .map((authType) => `${authType} ${formatAuthSelectorProviderType(authType)}`)
+        .join(" ");
+    return `${provider.id} ${provider.name} ${authTypes}`;
+}
+function formatLoginProviderCompletionDescription(provider) {
+    const authTypes = provider.authTypes.map(formatAuthSelectorProviderType).join("/");
+    return provider.name === provider.id ? authTypes : `${provider.name} · ${authTypes}`;
 }
 export class InteractiveMode {
     runtimeHost;
@@ -321,14 +345,15 @@ export class InteractiveMode {
         const slashCommands = BUILTIN_SLASH_COMMANDS.map((command) => ({
             name: command.name,
             description: command.description,
+            ...(command.argumentHint && { argumentHint: command.argumentHint }),
         }));
         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
@@ -338,17 +363,24 @@ export class InteractiveMode {
                     name: m.name,
                     label: `${m.provider}/${m.id}`,
                 }));
-                // Fuzzy filter by model ID + provider in either order.
-                const filtered = fuzzyFilter(items, prefix, getModelSearchText);
-                if (filtered.length === 0)
-                    return null;
-                return filtered.map((item) => ({
+                return createFuzzyAutocompleteItems(items, prefix, getModelSearchText, (item) => ({
                     value: item.label,
                     label: item.id,
                     description: item.provider,
                 }));
             };
         }
+        const loginCommand = slashCommands.find((command) => command.name === "login");
+        if (loginCommand) {
+            loginCommand.getArgumentCompletions = (prefix) => {
+                const providers = getLoginProviderCompletionOptions(this.getLoginProviderOptions().filter((p) => p.id === "slingshot" || p.id === "ollama"));
+                return createFuzzyAutocompleteItems(providers, prefix, getLoginProviderSearchText, (provider) => ({
+                    value: provider.id,
+                    label: provider.id,
+                    description: formatLoginProviderCompletionDescription(provider),
+                }));
+            };
+        }
         // Convert prompt templates to SlashCommand format for autocomplete
         const templateCommands = this.session.promptTemplates.map((cmd) => ({
             name: cmd.name,
@@ -396,32 +428,6 @@ export class InteractiveMode {
             this.editor.setAutocompleteProvider?.(provider);
         }
     }
-    showStartupNoticesIfNeeded() {
-        if (this.startupNoticesShown) {
-            return;
-        }
-        this.startupNoticesShown = true;
-        if (!this.changelogMarkdown) {
-            return;
-        }
-        if (this.chatContainer.children.length > 0) {
-            this.chatContainer.addChild(new Spacer(1));
-        }
-        this.chatContainer.addChild(new DynamicBorder());
-        if (this.settingsManager.getCollapseChangelog()) {
-            const versionMatch = this.changelogMarkdown.match(/##\s+\[?(\d+\.\d+\.\d+)\]?/);
-            const latestVersion = versionMatch ? versionMatch[1] : this.version;
-            const condensedText = `Updated to v${latestVersion}. Use ${theme.bold("/changelog")} to view full changelog.`;
-            this.chatContainer.addChild(new Text(condensedText, 1, 0));
-        }
-        else {
-            this.chatContainer.addChild(new Text(theme.bold(theme.fg("accent", "What's New")), 1, 0));
-            this.chatContainer.addChild(new Spacer(1));
-            this.chatContainer.addChild(new Markdown(this.changelogMarkdown.trim(), 1, 0, this.getMarkdownThemeWithSettings()));
-            this.chatContainer.addChild(new Spacer(1));
-        }
-        this.chatContainer.addChild(new DynamicBorder());
-    }
     async init() {
         if (this.isInitialized)
             return;
@@ -487,7 +493,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 = [
@@ -554,10 +560,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) => {
@@ -570,7 +584,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}`);
         }
@@ -665,7 +679,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. Pi 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. sling works best with csi-u. Add `set -g extended-keys-format csi-u` to ~/.tmux.conf and restart tmux.";
         }
         return undefined;
     }
@@ -1022,7 +1036,10 @@ export class InteractiveMode {
         const promptsResult = this.session.resourceLoader.getPrompts();
         const themesResult = this.session.resourceLoader.getThemes();
         const extensions = options?.extensions ??
-            this.session.resourceLoader.getExtensions().extensions.map((extension) => ({
+            this.session.resourceLoader
+                .getExtensions()
+                .extensions.filter((extension) => !extension.hidden)
+                .map((extension) => ({
                 path: extension.path,
                 sourceInfo: extension.sourceInfo,
             }));
@@ -1159,7 +1176,7 @@ export class InteractiveMode {
                 this.restoreQueuedMessagesToEditor({ abort: true });
             },
             commandContextActions: {
-                waitForIdle: () => this.session.agent.waitForIdle(),
+                waitForIdle: () => this.session.waitForIdle(),
                 newSession: async (options) => {
                     this.clearStatusIndicator();
                     try {
@@ -1210,7 +1227,7 @@ export class InteractiveMode {
             },
             shutdownHandler: () => {
                 this.shutdownRequested = true;
-                if (!this.session.isStreaming) {
+                if (this.session.isIdle) {
                     void this.shutdown();
                 }
             },
@@ -1223,7 +1240,7 @@ export class InteractiveMode {
         const extensionRunner = this.session.extensionRunner;
         this.setupExtensionShortcuts(extensionRunner);
         this.showLoadedResources({ force: false, showDiagnosticsWhenQuiet: true });
-        this.showStartupNoticesIfNeeded();
+        //this.showStartupNoticesIfNeeded();
     }
     applyRuntimeSettings() {
         configureHttpDispatcher(this.settingsManager.getHttpIdleTimeoutMs());
@@ -1301,9 +1318,9 @@ 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.isStreaming,
+            isIdle: () => this.session.isIdle,
             isProjectTrusted: () => this.settingsManager.isProjectTrusted(),
             signal: this.session.agent.signal,
             abort: () => {
@@ -1989,6 +2006,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());
@@ -2002,26 +2020,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.)
@@ -2109,9 +2131,10 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
-            if (text === "/login") {
-                this.showOAuthSelector("login");
+            if (text === "/login" || text.startsWith("/login ")) {
+                const providerRef = text.startsWith("/login ") ? text.slice(7).trim() : undefined;
                 this.editor.setText("");
+                await this.handleLoginCommand(providerRef || "slingshot");
                 return;
             }
             if (text === "/logout") {
@@ -2336,6 +2359,7 @@ export class InteractiveMode {
                         for (const [, component] of this.pendingTools.entries()) {
                             component.setArgsComplete();
                         }
+                        this.maybeShowCacheMissNotice(this.streamingMessage);
                     }
                     this.streamingComponent = undefined;
                     this.streamingMessage = undefined;
@@ -2386,9 +2410,11 @@ export class InteractiveMode {
                     this.streamingMessage = undefined;
                 }
                 this.pendingTools.clear();
-                await this.checkShutdownRequested();
                 this.ui.requestRender();
                 break;
+            case "agent_settled":
+                await this.checkShutdownRequested();
+                break;
             case "compaction_start": {
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(true);
@@ -2595,6 +2621,11 @@ export class InteractiveMode {
     renderSessionItems(items, options = {}) {
         this.pendingTools.clear();
         const renderedPendingTools = new Map();
+        // 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.modelRuntime)
+            : new Map();
         if (options.updateFooter) {
             this.footer.invalidate();
             this.updateEditorBorderColor();
@@ -2636,6 +2667,11 @@ export class InteractiveMode {
                         }
                     }
                 }
+                if (message.stopReason !== "aborted" && message.stopReason !== "error") {
+                    const miss = cacheMisses.get(message);
+                    if (miss)
+                        this.addCacheMissNotice(miss);
+                }
             }
             else if (message.role === "toolResult") {
                 // Match tool results to pending tool components
@@ -2670,6 +2706,35 @@ export class InteractiveMode {
         });
         this.renderSessionItems(items, options);
     }
+    /**
+     * Show a transcript notice when a completed assistant message paid for a
+     * significant cache miss. Only states observable facts: the miss itself,
+     * a model switch, or an idle gap past the cache TTL.
+     */
+    maybeShowCacheMissNotice(message) {
+        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.modelRuntime);
+        if (miss)
+            this.addCacheMissNotice(miss);
+    }
+    addCacheMissNotice(miss) {
+        if (miss.missedTokens < 20_000 && miss.missedCost < 0.1)
+            return;
+        const cost = miss.missedCost >= 0.01 ? ` (~$${miss.missedCost.toFixed(2)})` : "";
+        const reBilled = `${formatTokens(miss.missedTokens)} tokens re-billed${cost}`;
+        let label = "Cache miss";
+        if (miss.modelChanged) {
+            label = "Cache miss after model switch";
+        }
+        else if (miss.idleMs >= CACHE_TTL_MS) {
+            label = `Cache miss after ${Math.round(miss.idleMs / 60_000)}m idle`;
+        }
+        const text = theme.fg("warning", `${label}: ${reBilled}`);
+        this.chatContainer.addChild(new Spacer(1));
+        this.chatContainer.addChild(new Text(text, 1, 0));
+    }
     renderInitialMessages() {
         const entries = this.sessionManager.buildContextEntries();
         this.renderSessionEntries(entries, {
@@ -3009,7 +3074,7 @@ export class InteractiveMode {
             return;
         }
         const currentText = this.editor.getExpandedText?.() ?? this.editor.getText();
-        const tmpFile = path.join(os.tmpdir(), `pi-editor-${Date.now()}.pi.md`);
+        const tmpFile = path.join(os.tmpdir(), `sling-editor-${Date.now()}.sling.md`);
         try {
             // Write current content to temp file
             fs.writeFileSync(tmpFile, currentText, "utf-8");
@@ -3233,8 +3298,10 @@ export class InteractiveMode {
             for (const message of preCommands) {
                 await this.session.prompt(message.text);
             }
-            // Send first prompt (starts streaming)
-            const promptPromise = this.session.prompt(firstPrompt.text).catch((error) => {
+            // Start a prompt when idle, or queue it into a run still finishing compaction.
+            const promptPromise = this.session
+                .prompt(firstPrompt.text, { streamingBehavior: firstPrompt.mode })
+                .catch((error) => {
                 restoreQueue(error);
             });
             // Queue remaining messages
@@ -3307,6 +3374,7 @@ export class InteractiveMode {
                 doubleEscapeAction: this.settingsManager.getDoubleEscapeAction(),
                 treeFilterMode: this.settingsManager.getTreeFilterMode(),
                 showHardwareCursor: this.settingsManager.getShowHardwareCursor(),
+                showCacheMissNotices: this.settingsManager.getShowCacheMissNotices(),
                 defaultProjectTrust: this.settingsManager.getDefaultProjectTrust(),
                 editorPaddingX: this.settingsManager.getEditorPaddingX(),
                 outputPad: this.settingsManager.getOutputPad(),
@@ -3382,6 +3450,10 @@ export class InteractiveMode {
                     this.chatContainer.clear();
                     this.rebuildChatFromMessages();
                 },
+                onShowCacheMissNoticesChange: (shown) => {
+                    this.settingsManager.setShowCacheMissNotices(shown);
+                    this.rebuildChatFromMessages();
+                },
                 onCollapseChangelogChange: (collapsed) => {
                     this.settingsManager.setCollapseChangelog(collapsed);
                 },
@@ -3486,9 +3558,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 [];
@@ -3510,14 +3582,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;
             }
@@ -3563,7 +3634,7 @@ export class InteractiveMode {
                 onSelect: (selection) => {
                     trustStore.setMany(selection.updates);
                     done();
-                    this.showStatus(`Saved trust decision: ${selection.trusted ? "trusted" : "untrusted"}. Restart pi for this to take effect.`);
+                    this.showStatus(`Saved trust decision: ${selection.trusted ? "trusted" : "untrusted"}. Restart sling for this to take effect.`);
                 },
                 onCancel: () => {
                     done();
@@ -3575,7 +3646,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();
@@ -3598,8 +3669,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;
@@ -3617,7 +3688,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}`);
             }
         }
@@ -3625,7 +3696,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,
@@ -3671,19 +3742,17 @@ export class InteractiveMode {
         const initialSelectedId = userMessages[userMessages.length - 1]?.entryId;
         this.showSelector((done) => {
             const selector = new UserMessageSelectorComponent(userMessages.map((m) => ({ id: m.entryId, text: m.text })), async (entryId) => {
+                done();
                 try {
                     const result = await this.runtimeHost.fork(entryId);
                     if (result.cancelled) {
-                        done();
                         this.ui.requestRender();
                         return;
                     }
                     this.editor.setText(result.selectedText ?? "");
-                    done();
                     this.showStatus("Forked to new session");
                 }
                 catch (error) {
-                    done();
                     this.showError(error instanceof Error ? error.message : String(error));
                 }
             }, () => {
@@ -3810,6 +3879,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 };
         });
     }
@@ -3874,51 +3956,125 @@ 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;
+        const options = [];
+        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: "api_key",
-            });
         }
-        const filteredOptions = authType ? options.filter((option) => option.authType === authType) : options;
-        return filteredOptions.sort((a, b) => a.name.localeCompare(b.name));
+        return options.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;
+    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) {
+            return [];
+        }
+        return this.getLoginProviderOptions().filter((provider) => provider.id.toLowerCase() === normalizedProviderRef ||
+            provider.name.toLowerCase() === normalizedProviderRef);
+    }
+    async handleLoginCommand(providerRef) {
+        await this.session.modelRuntime.getAvailable();
+        if (!providerRef) {
+            this.showLoginAuthTypeSelector();
+            return;
+        }
+        const providerOptions = this.findLoginProviderOptions(providerRef);
+        if (providerOptions.length === 1) {
+            await this.startProviderLogin(providerOptions[0]);
+            return;
+        }
+        if (providerOptions.length > 1) {
+            const providerIds = new Set(providerOptions.map((provider) => provider.id));
+            if (providerIds.size === 1) {
+                this.showLoginAuthTypeSelector(providerOptions);
+                return;
             }
-            options.push({
-                id: providerId,
-                name: this.session.modelRegistry.getProviderDisplayName(providerId),
-                authType: credential.type,
-            });
         }
-        return options.sort((a, b) => a.name.localeCompare(b.name));
+        this.showLoginProviderSelector(undefined, providerRef);
+    }
+    async startProviderLogin(providerOption) {
+        if (providerOption.authType === "oauth") {
+            await this.showLoginDialog(providerOption.id, providerOption.name);
+        }
+        else if (providerOption.method?.login) {
+            await this.showApiKeyLoginDialog(providerOption.id, providerOption.name);
+        }
+        else {
+            this.showAmbientAuthDialog(providerOption);
+        }
     }
-    showLoginAuthTypeSelector() {
-        const subscriptionLabel = "Use a subscription";
-        const apiKeyLabel = "Use an API key";
+    showLoginAuthTypeSelector(providerOptions) {
+        const oauthProvider = providerOptions?.find((provider) => provider.authType === "oauth");
+        const oauthLoginLabel = oauthProvider?.method && "loginLabel" in oauthProvider.method ? oauthProvider.method.loginLabel : undefined;
+        const subscriptionLabel = oauthLoginLabel ?? "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"]);
+        const options = [];
+        if (availableAuthTypes.has("oauth")) {
+            options.push(subscriptionLabel);
+        }
+        if (availableAuthTypes.has("api_key")) {
+            options.push(apiKeyLabel);
+        }
+        if (options.length === 0) {
+            this.showStatus("No login methods available.");
+            return;
+        }
+        if (providerOptions && options.length === 1) {
+            const providerOption = providerOptions[0];
+            if (providerOption) {
+                void this.startProviderLogin(providerOption);
+            }
+            return;
+        }
+        const title = providerOptions?.[0]
+            ? `Select authentication method for ${providerOptions[0].name}:`
+            : "Select authentication method:";
         this.showSelector((done) => {
-            const selector = new ExtensionSelectorComponent("Select authentication method:", [subscriptionLabel, apiKeyLabel], (option) => {
+            const selector = new ExtensionSelectorComponent(title, options, (option) => {
                 done();
                 const authType = option === subscriptionLabel ? "oauth" : "api_key";
+                if (providerOptions) {
+                    const providerOption = providerOptions.find((provider) => provider.authType === authType);
+                    if (providerOption) {
+                        void this.startProviderLogin(providerOption);
+                    }
+                    return;
+                }
                 this.showLoginProviderSelector(authType);
             }, () => {
                 done();
@@ -3927,32 +4083,34 @@ export class InteractiveMode {
             return { component: selector, focus: selector };
         });
     }
-    showLoginProviderSelector(authType) {
+    showLoginProviderSelector(authType, initialSearchInput) {
         const providerOptions = this.getLoginProviderOptions(authType);
         if (providerOptions.length === 0) {
-            this.showStatus(authType === "oauth" ? "No subscription providers available." : "No API key providers available.");
+            const message = authType === "oauth"
+                ? "No subscription providers available."
+                : authType === "api_key"
+                    ? "No API key providers available."
+                    : "No login providers available.";
+            this.showStatus(message);
             return;
         }
         this.showSelector((done) => {
-            const selector = new OAuthSelectorComponent("login", this.session.modelRegistry.authStorage, providerOptions, async (providerId) => {
+            const selector = new OAuthSelectorComponent("login", providerOptions, async (providerId, selectedAuthType) => {
                 done();
-                const providerOption = providerOptions.find((provider) => provider.id === providerId);
+                const providerOption = providerOptions.find((provider) => provider.id === providerId && provider.authType === selectedAuthType);
                 if (!providerOption) {
                     return;
                 }
-                if (providerOption.authType === "oauth") {
-                    await this.showLoginDialog(providerOption.id, providerOption.name);
-                }
-                else if (providerOption.id === BEDROCK_PROVIDER_ID) {
-                    this.showBedrockSetupDialog(providerOption.id, providerOption.name);
+                await this.startProviderLogin(providerOption);
+            }, () => {
+                done();
+                if (authType) {
+                    this.showLoginAuthTypeSelector();
                 }
                 else {
-                    await this.showApiKeyLoginDialog(providerOption.id, providerOption.name);
+                    this.ui.requestRender();
                 }
-            }, () => {
-                done();
-                this.showLoginAuthTypeSelector();
-            }, (providerId) => this.session.modelRegistry.getProviderAuthStatus(providerId));
+            }, initialSearchInput);
             return { component: selector, focus: selector };
         });
     }
@@ -3961,21 +4119,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}`
@@ -3993,12 +4150,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.`;
@@ -4042,20 +4199,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);
@@ -4066,6 +4218,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);
@@ -4077,11 +4236,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);
         }
@@ -4093,8 +4248,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);
@@ -4104,10 +4259,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);
@@ -4115,30 +4274,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);
@@ -4146,43 +4339,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);
         }
@@ -4211,7 +4368,7 @@ export class InteractiveMode {
         const borderColor = (s) => theme.fg("border", s);
         reloadBox.addChild(new DynamicBorder(borderColor));
         reloadBox.addChild(new Spacer(1));
-        reloadBox.addChild(new Text(theme.fg("muted", "Reloading keybindings, extensions, skills, prompts, themes..."), 1, 0));
+        reloadBox.addChild(new Text(theme.fg("muted", "Reloading keybindings, extensions, skills, prompts, themes, and context files..."), 1, 0));
         reloadBox.addChild(new Spacer(1));
         reloadBox.addChild(new DynamicBorder(borderColor));
         const previousEditor = this.editor;
@@ -4270,13 +4427,13 @@ 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}`);
             }
             this.showStatus(savedImplicitProjectTrust
-                ? "Reloaded keybindings, extensions, skills, prompts, themes; saved project trust"
-                : "Reloaded keybindings, extensions, skills, prompts, themes");
+                ? "Reloaded keybindings, extensions, skills, prompts, themes, and context files; saved project trust"
+                : "Reloaded keybindings, extensions, skills, prompts, themes, and context files");
             dismissReloadBox(this.editor);
             reloadBoxDismissed = true;
         }
@@ -4497,6 +4654,26 @@ export class InteractiveMode {
     handleSessionCommand() {
         const stats = this.session.getSessionStats();
         const sessionName = this.sessionManager.getSessionName();
+        const entries = this.sessionManager.getEntries();
+        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();
+        for (const entry of entries) {
+            if (entry.type !== "message" || entry.message.role !== "assistant")
+                continue;
+            const message = entry.message;
+            const usage = message.usage;
+            const key = `${message.provider}/${message.responseModel ?? message.model}`;
+            let bucket = perModelMap.get(key);
+            if (!bucket) {
+                bucket = { key, cost: 0, tokens: 0 };
+                perModelMap.set(key, bucket);
+            }
+            bucket.cost += usage.cost.total;
+            bucket.tokens += usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
+        }
+        const perModel = Array.from(perModelMap.values()).sort((a, b) => b.cost - a.cost);
         let info = `${theme.bold("Session Info")}\n\n`;
         if (sessionName) {
             info += `${theme.fg("dim", "Name:")} ${sessionName}\n`;
@@ -4504,24 +4681,42 @@ export class InteractiveMode {
         info += `${theme.fg("dim", "File:")} ${stats.sessionFile ?? "In-memory"}\n`;
         info += `${theme.fg("dim", "ID:")} ${stats.sessionId}\n\n`;
         info += `${theme.bold("Messages")}\n`;
+        info += `${theme.fg("dim", "Total:")} ${stats.totalMessages}\n`;
         info += `${theme.fg("dim", "User:")} ${stats.userMessages}\n`;
         info += `${theme.fg("dim", "Assistant:")} ${stats.assistantMessages}\n`;
-        info += `${theme.fg("dim", "Tool Calls:")} ${stats.toolCalls}\n`;
-        info += `${theme.fg("dim", "Tool Results:")} ${stats.toolResults}\n`;
-        info += `${theme.fg("dim", "Total:")} ${stats.totalMessages}\n\n`;
+        info += `${theme.fg("dim", "Tools:")} ${stats.toolCalls} calls, ${stats.toolResults} results\n\n`;
         info += `${theme.bold("Tokens")}\n`;
-        info += `${theme.fg("dim", "Input:")} ${stats.tokens.input.toLocaleString()}\n`;
-        info += `${theme.fg("dim", "Output:")} ${stats.tokens.output.toLocaleString()}\n`;
-        if (stats.tokens.cacheRead > 0) {
-            info += `${theme.fg("dim", "Cache Read:")} ${stats.tokens.cacheRead.toLocaleString()}\n`;
-        }
-        if (stats.tokens.cacheWrite > 0) {
-            info += `${theme.fg("dim", "Cache Write:")} ${stats.tokens.cacheWrite.toLocaleString()}\n`;
+        // "Input" is the full prompt volume. With cache activity, split it into
+        // cached (served from cache) vs uncached (everything else) - the only
+        // provider-independent split. Cache writes, where reported, are a detail
+        // of the uncached portion.
+        const { input, cacheRead, cacheWrite } = stats.tokens;
+        const promptTokens = input + cacheRead + cacheWrite;
+        info += `${theme.fg("dim", "Input:")} ${promptTokens.toLocaleString()}\n`;
+        if (promptTokens > 0 && (cacheRead > 0 || cacheWrite > 0)) {
+            const hitRate = theme.fg("dim", `(${((cacheRead / promptTokens) * 100).toFixed(1)}%)`);
+            info += `  ${theme.fg("dim", "Cached:")} ${cacheRead.toLocaleString()} ${hitRate}\n`;
+            const written = cacheWrite > 0 ? ` ${theme.fg("dim", `(${cacheWrite.toLocaleString()} written to cache)`)}` : "";
+            info += `  ${theme.fg("dim", "Uncached:")} ${(input + cacheWrite).toLocaleString()}${written}\n`;
         }
+        info += `${theme.fg("dim", "Output:")} ${stats.tokens.output.toLocaleString()}\n`;
         info += `${theme.fg("dim", "Total:")} ${stats.tokens.total.toLocaleString()}\n`;
-        if (stats.cost > 0) {
+        if (stats.cost > 0 || cacheWaste.missedTokens > 0) {
             info += `\n${theme.bold("Cost")}\n`;
-            info += `${theme.fg("dim", "Total:")} ${stats.cost.toFixed(4)}`;
+            info += `${theme.fg("dim", "Total:")} $${stats.cost.toFixed(3)}`;
+            if (perModel.length > 1) {
+                for (const entry of perModel) {
+                    info += `\n  ${theme.fg("dim", `${entry.key}:`)} $${entry.cost.toFixed(3)} ${theme.fg("dim", `(${formatTokens(entry.tokens)} tokens)`)}`;
+                }
+            }
+            if (cacheWaste.missedTokens > 0) {
+                const missLabel = cacheWaste.missCount === 1 ? "1 miss" : `${cacheWaste.missCount} misses`;
+                const detail = `${cacheWaste.missedTokens.toLocaleString()} tokens, ${missLabel}`;
+                info +=
+                    cacheWaste.missedCost >= 0.0001
+                        ? `\n${theme.fg("dim", "Cache Re-billed:")} $${cacheWaste.missedCost.toFixed(3)} ${theme.fg("dim", `(${detail})`)}`
+                        : `\n${theme.fg("dim", "Cache Re-billed:")} ${detail}`;
+            }
         }
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(info, 1, 0));
@@ -4593,6 +4788,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");
@@ -4635,9 +4831,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) |