@code-yeongyu/senpi 2026.7.9-2 → 2026.7.9

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

@@ -13,7 +13,6 @@ import { APP_NAME, APP_TITLE, CONFIG_DIR_NAME, expandTildePath, getAuthPath, get
 import { parseSkillBlock } from "../../core/agent-session.js";
 import { SessionImportFileNotFoundError } from "../../core/agent-session-runtime.js";
 import { isApiKeyLoginProvider } from "../../core/auth-providers.js";
-import { CACHE_TTL_MS, collectCacheMisses, computeCacheWaste, detectCacheMiss, } from "../../core/cache-stats.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { appendHiddenTuiStdout } from "../../core/hidden-stdout-log.js";
 import { configureHttpDispatcher, formatHttpIdleTimeoutMs } from "../../core/http-dispatcher.js";
@@ -50,12 +49,12 @@ import { ExtensionEditorComponent } from "./components/extension-editor.js";
 import { ExtensionInputComponent } from "./components/extension-input.js";
 import { ExtensionSelectorComponent } from "./components/extension-selector.js";
 import { FavoriteModelsSelectorComponent } from "./components/favorite-models-selector.js";
-import { FooterComponent, formatTokens } from "./components/footer.js";
+import { FooterComponent } from "./components/footer.js";
 import { formatKeyText, keyDisplayText, keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
 import { LoginDialogComponent } from "./components/login-dialog.js";
 import { getModelFullId } from "./components/model-favorites.js";
 import { ModelSelectorComponent } from "./components/model-selector.js";
-import { formatAuthSelectorProviderType, OAuthSelectorComponent, } from "./components/oauth-selector.js";
+import { OAuthSelectorComponent } from "./components/oauth-selector.js";
 import { SessionSelectorComponent } from "./components/session-selector.js";
 import { SettingsSelectorComponent } from "./components/settings-selector.js";
 import { SkillInvocationMessageComponent } from "./components/skill-invocation-message.js";
@@ -67,6 +66,7 @@ import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
 import { restoreInteractiveStderr, takeOverInteractiveStderr } from "./interactive-stderr-guard.js";
 import { getModelSearchText } from "./model-search.js";
+import { formatSessionInfo } from "./session-info-format.js";
 import { resolveStartupToolPaths } from "./startup-tools.js";
 import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, onThemeChange, setRegisteredThemes, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
 import { InteractiveThemeController } from "./theme/theme-controller.js";
@@ -179,42 +179,6 @@ const BEDROCK_PROVIDER_ID = "amazon-bedrock";
 // keep the existing public import (test/oauth-selector.test.ts) working, and used
 // locally by getLoginProviderOptions below.
 export { isApiKeyLoginProvider };
-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 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 {
     requestStreamingRender() {
         this.ui.requestRender();
@@ -386,7 +350,6 @@ 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) {
@@ -404,24 +367,17 @@ export class InteractiveMode {
                     name: m.name,
                     label: `${m.provider}/${m.id}`,
                 }));
-                return createFuzzyAutocompleteItems(items, prefix, getModelSearchText, (item) => ({
+                // 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) => ({
                     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());
-                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,
@@ -1249,7 +1205,7 @@ export class InteractiveMode {
                 this.restoreQueuedMessagesToEditor({ abort: true });
             },
             commandContextActions: {
-                waitForIdle: () => this.session.waitForIdle(),
+                waitForIdle: () => this.session.agent.waitForIdle(),
                 newSession: async (options) => {
                     this.clearStatusIndicator();
                     try {
@@ -1300,7 +1256,7 @@ export class InteractiveMode {
             },
             shutdownHandler: () => {
                 this.shutdownRequested = true;
-                if (this.session.isIdle) {
+                if (!this.session.isStreaming) {
                     void this.shutdown();
                 }
             },
@@ -1395,7 +1351,7 @@ export class InteractiveMode {
             modelRegistry: this.session.modelRegistry,
             model: this.session.model,
             serviceTier: this.session.serviceTier,
-            isIdle: () => this.session.isIdle,
+            isIdle: () => !this.session.isStreaming,
             isProjectTrusted: () => this.settingsManager.isProjectTrusted(),
             signal: this.session.agent.signal,
             abort: () => this.session.abort(),
@@ -2391,10 +2347,9 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
-            if (text === "/login" || text.startsWith("/login ")) {
-                const providerRef = text.startsWith("/login ") ? text.slice(7).trim() : undefined;
+            if (text === "/login") {
+                this.showOAuthSelector("login");
                 this.editor.setText("");
-                await this.handleLoginCommand(providerRef);
                 return;
             }
             if (text === "/logout") {
@@ -2627,7 +2582,6 @@ export class InteractiveMode {
                         for (const [, component] of this.pendingTools.entries()) {
                             component.setArgsComplete();
                         }
-                        this.maybeShowCacheMissNotice(this.streamingMessage);
                     }
                     this.streamingComponent = undefined;
                     this.streamingMessage = undefined;
@@ -2685,10 +2639,8 @@ export class InteractiveMode {
                     this.streamingMessage = undefined;
                 }
                 this.clearPendingTools();
-                this.ui.requestRender();
-                break;
-            case "agent_settled":
                 await this.checkShutdownRequested();
+                this.ui.requestRender();
                 break;
             case "compaction_start": {
                 if (this.settingsManager.getShowTerminalProgress()) {
@@ -2919,11 +2871,6 @@ export class InteractiveMode {
     renderSessionItems(items, options = {}) {
         this.clearPendingTools();
         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.modelRegistry)
-            : new Map();
         if (options.updateFooter) {
             this.footer.invalidate();
             this.updateEditorBorderColor();
@@ -2961,11 +2908,6 @@ 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
@@ -3000,35 +2942,6 @@ 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.modelRegistry);
-        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, {
@@ -3683,7 +3596,6 @@ 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(),
@@ -3760,10 +3672,6 @@ export class InteractiveMode {
                     this.chatContainer.clear();
                     this.rebuildChatFromMessages();
                 },
-                onShowCacheMissNoticesChange: (shown) => {
-                    this.settingsManager.setShowCacheMissNotices(shown);
-                    this.rebuildChatFromMessages();
-                },
                 onCollapseChangelogChange: (collapsed) => {
                     this.settingsManager.setCollapseChangelog(collapsed);
                 },
@@ -4067,17 +3975,19 @@ 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));
                 }
             }, () => {
@@ -4306,82 +4216,13 @@ export class InteractiveMode {
         }
         return options.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) {
-        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;
-            }
-        }
-        this.showLoginProviderSelector(undefined, providerRef);
-    }
-    async startProviderLogin(providerOption) {
-        if (providerOption.authType === "oauth") {
-            await this.showLoginDialog(providerOption.id, providerOption.name);
-        }
-        else if (providerOption.id === BEDROCK_PROVIDER_ID) {
-            this.showBedrockSetupDialog(providerOption.id, providerOption.name);
-        }
-        else {
-            await this.showApiKeyLoginDialog(providerOption.id, providerOption.name);
-        }
-    }
-    showLoginAuthTypeSelector(providerOptions) {
+    showLoginAuthTypeSelector() {
         const subscriptionLabel = "Use a subscription";
         const apiKeyLabel = "Use 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(title, options, (option) => {
+            const selector = new ExtensionSelectorComponent("Select authentication method:", [subscriptionLabel, apiKeyLabel], (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();
@@ -4390,34 +4231,32 @@ export class InteractiveMode {
             return { component: selector, focus: selector };
         });
     }
-    showLoginProviderSelector(authType, initialSearchInput) {
+    showLoginProviderSelector(authType) {
         const providerOptions = this.getLoginProviderOptions(authType);
         if (providerOptions.length === 0) {
-            const message = authType === "oauth"
-                ? "No subscription providers available."
-                : authType === "api_key"
-                    ? "No API key providers available."
-                    : "No login providers available.";
-            this.showStatus(message);
+            this.showStatus(authType === "oauth" ? "No subscription providers available." : "No API key providers available.");
             return;
         }
         this.showSelector((done) => {
-            const selector = new OAuthSelectorComponent("login", this.session.modelRegistry.authStorage, providerOptions, async (providerId, selectedAuthType) => {
+            const selector = new OAuthSelectorComponent("login", this.session.modelRegistry.authStorage, providerOptions, async (providerId) => {
                 done();
-                const providerOption = providerOptions.find((provider) => provider.id === providerId && provider.authType === selectedAuthType);
+                const providerOption = providerOptions.find((provider) => provider.id === providerId);
                 if (!providerOption) {
                     return;
                 }
-                await this.startProviderLogin(providerOption);
-            }, () => {
-                done();
-                if (authType) {
-                    this.showLoginAuthTypeSelector();
+                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 {
-                    this.ui.requestRender();
+                    await this.showApiKeyLoginDialog(providerOption.id, providerOption.name);
                 }
-            }, (providerId) => this.session.modelRegistry.getProviderAuthStatus(providerId), initialSearchInput);
+            }, () => {
+                done();
+                this.showLoginAuthTypeSelector();
+            }, (providerId) => this.session.modelRegistry.getProviderAuthStatus(providerId));
             return { component: selector, focus: selector };
         });
     }
@@ -4678,7 +4517,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, and context files..."), 1, 0));
+        reloadBox.addChild(new Text(theme.fg("muted", "Reloading keybindings, extensions, skills, prompts, themes..."), 1, 0));
         reloadBox.addChild(new Spacer(1));
         reloadBox.addChild(new DynamicBorder(borderColor));
         const previousEditor = this.editor;
@@ -4742,8 +4581,8 @@ export class InteractiveMode {
                 this.showError(`models.json error: ${modelsJsonError}`);
             }
             this.showStatus(savedImplicitProjectTrust
-                ? "Reloaded keybindings, extensions, skills, prompts, themes, and context files; saved project trust"
-                : "Reloaded keybindings, extensions, skills, prompts, themes, and context files");
+                ? "Reloaded keybindings, extensions, skills, prompts, themes; saved project trust"
+                : "Reloaded keybindings, extensions, skills, prompts, themes");
             dismissReloadBox(this.editor);
             reloadBoxDismissed = true;
         }
@@ -4964,70 +4803,7 @@ 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.modelRegistry);
-        // 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`;
-        }
-        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", "Tools:")} ${stats.toolCalls} calls, ${stats.toolResults} results\n\n`;
-        info += `${theme.bold("Tokens")}\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 || cacheWaste.missedTokens > 0) {
-            info += `\n${theme.bold("Cost")}\n`;
-            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}`;
-            }
-        }
+        const info = formatSessionInfo(stats, sessionName);
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(info, 1, 0));
         this.ui.requestRender();