@code-yeongyu/senpi 2026.5.16 → 2026.5.18-2

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

@@ -58,9 +58,10 @@ import { ToolExecutionComponent } from "./components/tool-execution.js";
 import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
+import { formatSessionInfo } from "./session-info-format.js";
 import { resolveStartupToolPaths } from "./startup-tools.js";
 import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, initTheme, onThemeChange, setRegisteredThemes, setTheme, setThemeInstance, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
-import { formatWorkingStatusMessageFrame } from "./working-status.js";
+import { blendWorkingStatusShimmerRgbColor, formatWorkingStatusMessageFrame, } from "./working-status.js";
 function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
@@ -101,17 +102,6 @@ function parseAnsiRgbForeground(ansi) {
 function isWorkingLightTheme() {
     return theme.name?.toLowerCase().includes("light") ?? false;
 }
-function clampColorChannel(value) {
-    return Math.max(0, Math.min(255, Math.round(value)));
-}
-function mixRgbColor(base, highlight, amount) {
-    const clampedAmount = Math.max(0, Math.min(1, amount));
-    return {
-        r: clampColorChannel(base.r + (highlight.r - base.r) * clampedAmount),
-        g: clampColorChannel(base.g + (highlight.g - base.g) * clampedAmount),
-        b: clampColorChannel(base.b + (highlight.b - base.b) * clampedAmount),
-    };
-}
 function formatWorkingStatusShimmerText(text, intensity) {
     if (theme.getColorMode() !== "truecolor") {
         if (intensity < 0.2) {
@@ -123,11 +113,11 @@ function formatWorkingStatusShimmerText(text, intensity) {
         return theme.bold(theme.fg("text", text));
     }
     const lightTheme = isWorkingLightTheme();
-    const base = parseAnsiRgbForeground(theme.getFgAnsi("dim")) ??
+    const highlight = parseAnsiRgbForeground(theme.getFgAnsi("dim")) ??
         (lightTheme ? LIGHT_DEFAULT_WORKING_BASE_RGB : DARK_DEFAULT_WORKING_BASE_RGB);
-    const highlight = parseAnsiRgbForeground(theme.getFgAnsi("text")) ??
+    const base = parseAnsiRgbForeground(theme.getFgAnsi("text")) ??
         (lightTheme ? LIGHT_DEFAULT_WORKING_TEXT_RGB : DARK_DEFAULT_WORKING_TEXT_RGB);
-    const color = mixRgbColor(base, highlight, intensity * 0.9);
+    const color = blendWorkingStatusShimmerRgbColor(highlight, base, intensity * 0.9);
     return `\x1b[1m\x1b[38;2;${color.r};${color.g};${color.b}m${text}\x1b[39m\x1b[22m`;
 }
 function isDeadTerminalError(error) {
@@ -448,6 +438,19 @@ export class InteractiveMode {
         // Startup should never wait for tool downloads. Missing tools are resolved
         // lazily by the tools that need them.
         this.fdPath = resolveStartupToolPaths().fdPath;
+        if (this.session.scopedModels.length > 0 && (this.options.verbose || !this.settingsManager.getQuietStartup())) {
+            const modelList = this.session.scopedModels
+                .map((sm) => {
+                const thinkingStr = sm.thinkingLevel ? `:${sm.thinkingLevel}` : "";
+                return `${sm.model.id}${thinkingStr}`;
+            })
+                .join(", ");
+            const cycleKeys = this.keybindings.getKeys("app.model.cycleForward");
+            const cycleHint = cycleKeys.length > 0
+                ? theme.fg("muted", ` (${formatKeyText(cycleKeys.join("/"), { capitalize: true })} to cycle)`)
+                : "";
+            console.log(theme.fg("dim", `Model scope: ${modelList}${cycleHint}`));
+        }
         // Add header container as first child
         this.ui.addChild(this.headerContainer);
         // Add header with keybindings from config (unless silenced)
@@ -1947,8 +1950,8 @@ export class InteractiveMode {
         // Set up handlers on defaultEditor - they use this.editor for text access
         // so they work correctly regardless of which editor is active
         this.defaultEditor.onEscape = () => {
-            if (this.session.isStreaming) {
-                this.restoreQueuedMessagesToEditor({ abort: true });
+            if (this.session.isStreaming || this.session.retryAttempt > 0) {
+                void this.abortAndFireQueuedMessages();
             }
             else if (this.session.isBashRunning) {
                 this.session.abortBash();
@@ -2470,11 +2473,11 @@ export class InteractiveMode {
                 break;
             }
             case "auto_retry_start": {
-                // Set up escape to abort retry
-                this.retryEscapeHandler = this.defaultEditor.onEscape;
-                this.defaultEditor.onEscape = () => {
-                    this.session.abortRetry();
-                };
+                // During retry waits, isStreaming flips false between attempts. The main Esc handler
+                // keys off both isStreaming and retryAttempt so we keep the same close-out path here;
+                // no separate retry-only handler is installed (the prior one only called
+                // session.abortRetry() and left queued steering messages stranded).
+                this.retryEscapeHandler = undefined;
                 // Show retry indicator
                 this.statusContainer.clear();
                 this.retryCountdown?.dispose();
@@ -3142,6 +3145,35 @@ export class InteractiveMode {
         }
         return allQueued.length;
     }
+    /**
+     * User-abort path that drains the queue, aborts the active run (and any in-flight retry),
+     * waits for settle, then re-fires queued messages as a single fresh prompt.
+     *
+     * Behavior contract:
+     * - clearAllQueues() is called synchronously so the pending-messages display empties immediately.
+     * - `await session.abort()` ensures the previous run is fully idle before the fresh prompt fires,
+     *   so it starts a new turn instead of being re-queued as steering behind the dying run.
+     * - When no messages were queued, the helper is just a sync clear + abort (no fresh prompt).
+     * - Failures from the fresh prompt are surfaced via showError but do not throw.
+     */
+    async abortAndFireQueuedMessages() {
+        const { steering, followUp } = this.clearAllQueues();
+        const allQueued = [...steering, ...followUp];
+        this.updatePendingMessagesDisplay();
+        await this.session.abort();
+        if (allQueued.length === 0) {
+            return 0;
+        }
+        const queuedText = allQueued.join("\n\n");
+        try {
+            await this.session.prompt(queuedText);
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+            this.showError(`Failed to fire queued message: ${errorMessage}`);
+        }
+        return allQueued.length;
+    }
     queueCompactionMessage(text, mode) {
         this.compactionQueuedMessages.push({ text, mode });
         this.editor.addToHistory?.(text);
@@ -4398,32 +4430,7 @@ export class InteractiveMode {
     handleSessionCommand() {
         const stats = this.session.getSessionStats();
         const sessionName = this.sessionManager.getSessionName();
-        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", "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.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`;
-        }
-        info += `${theme.fg("dim", "Total:")} ${stats.tokens.total.toLocaleString()}\n`;
-        if (stats.cost > 0) {
-            info += `\n${theme.bold("Cost")}\n`;
-            info += `${theme.fg("dim", "Total:")} ${stats.cost.toFixed(4)}`;
-        }
+        const info = formatSessionInfo(stats, sessionName);
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(info, 1, 0));
         this.ui.requestRender();