@code-yeongyu/senpi 2026.5.15 → 2026.5.18

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

@@ -58,8 +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 { blendWorkingStatusShimmerRgbColor, formatWorkingStatusMessageFrame, } from "./working-status.js";
 function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
@@ -76,6 +78,48 @@ class ExpandableText extends Text {
     }
 }
 const DEAD_TERMINAL_ERROR_CODES = new Set(["EIO", "EPIPE", "ENOTCONN"]);
+const DEFAULT_WORKING_STATUS_REFRESH_INTERVAL_MS = 600;
+const DEFAULT_WORKING_STATUS_MESSAGE_ANIMATION_INTERVAL_MS = 32;
+const RGB_FOREGROUND_PATTERN = /\x1b\[38;2;(\d+);(\d+);(\d+)m/;
+const DARK_DEFAULT_WORKING_TEXT_RGB = { r: 229, g: 229, b: 231 };
+const LIGHT_DEFAULT_WORKING_TEXT_RGB = { r: 17, g: 17, b: 17 };
+const DARK_DEFAULT_WORKING_BASE_RGB = { r: 102, g: 102, b: 102 };
+const LIGHT_DEFAULT_WORKING_BASE_RGB = { r: 118, g: 118, b: 118 };
+function parseAnsiRgbForeground(ansi) {
+    const match = RGB_FOREGROUND_PATTERN.exec(ansi);
+    const red = match?.[1];
+    const green = match?.[2];
+    const blue = match?.[3];
+    if (red === undefined || green === undefined || blue === undefined) {
+        return undefined;
+    }
+    return {
+        r: Number.parseInt(red, 10),
+        g: Number.parseInt(green, 10),
+        b: Number.parseInt(blue, 10),
+    };
+}
+function isWorkingLightTheme() {
+    return theme.name?.toLowerCase().includes("light") ?? false;
+}
+function formatWorkingStatusShimmerText(text, intensity) {
+    if (theme.getColorMode() !== "truecolor") {
+        if (intensity < 0.2) {
+            return theme.fg("dim", text);
+        }
+        if (intensity < 0.6) {
+            return theme.fg("text", text);
+        }
+        return theme.bold(theme.fg("text", text));
+    }
+    const lightTheme = isWorkingLightTheme();
+    const highlight = parseAnsiRgbForeground(theme.getFgAnsi("dim")) ??
+        (lightTheme ? LIGHT_DEFAULT_WORKING_BASE_RGB : DARK_DEFAULT_WORKING_BASE_RGB);
+    const base = parseAnsiRgbForeground(theme.getFgAnsi("text")) ??
+        (lightTheme ? LIGHT_DEFAULT_WORKING_TEXT_RGB : DARK_DEFAULT_WORKING_TEXT_RGB);
+    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) {
     if (!error || typeof error !== "object" || !("code" in error)) {
         return false;
@@ -129,7 +173,9 @@ export class InteractiveMode {
     workingMessage = undefined;
     workingVisible = true;
     workingIndicatorOptions = undefined;
-    defaultWorkingMessage = "Working...";
+    workingStartedAt = undefined;
+    workingElapsedIntervalId = undefined;
+    defaultWorkingMessage = "Working";
     defaultHiddenThinkingLabel = "Thinking...";
     hiddenThinkingLabel = this.defaultHiddenThinkingLabel;
     lastSigintTime = 0;
@@ -166,6 +212,7 @@ export class InteractiveMode {
     // Auto-compaction state
     autoCompactionLoader = undefined;
     autoCompactionEscapeHandler;
+    autoCompactionProgressText = "";
     // Auto-retry state
     retryLoader = undefined;
     retryCountdown = undefined;
@@ -391,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)
@@ -1097,11 +1157,7 @@ export class InteractiveMode {
             commandContextActions: {
                 waitForIdle: () => this.session.agent.waitForIdle(),
                 newSession: async (options) => {
-                    if (this.loadingAnimation) {
-                        this.loadingAnimation.stop();
-                        this.loadingAnimation = undefined;
-                    }
-                    this.statusContainer.clear();
+                    this.stopWorkingLoader();
                     try {
                         const result = await this.runtimeHost.newSession(options);
                         if (!result.cancelled) {
@@ -1285,10 +1341,48 @@ export class InteractiveMode {
     getWorkingLoaderMessage() {
         return this.workingMessage ?? this.defaultWorkingMessage;
     }
+    getWorkingElapsedSeconds() {
+        if (this.workingStartedAt === undefined) {
+            return 0;
+        }
+        return Math.max(0, Math.floor((Date.now() - this.workingStartedAt) / 1000));
+    }
+    refreshWorkingLoaderMessage() {
+        this.loadingAnimation?.setMessage(this.getWorkingLoaderMessage());
+    }
+    startWorkingElapsedTimer() {
+        this.stopWorkingElapsedTimer();
+        this.workingStartedAt = Date.now();
+        this.workingElapsedIntervalId = setInterval(() => {
+            this.refreshWorkingLoaderMessage();
+        }, DEFAULT_WORKING_STATUS_REFRESH_INTERVAL_MS);
+    }
+    stopWorkingElapsedTimer() {
+        if (this.workingElapsedIntervalId) {
+            clearInterval(this.workingElapsedIntervalId);
+            this.workingElapsedIntervalId = undefined;
+        }
+    }
+    getWorkingIndicatorOptions() {
+        return (this.workingIndicatorOptions ?? {
+            frames: [theme.fg("accent", "•")],
+            intervalMs: DEFAULT_WORKING_STATUS_REFRESH_INTERVAL_MS,
+            messageFormatter: (message, animationElapsedMs) => formatWorkingStatusMessageFrame(message, this.getWorkingElapsedSeconds(), keyText("app.interrupt"), animationElapsedMs, {
+                base: (text) => theme.fg("dim", text),
+                glow: (text) => theme.fg("text", text),
+                highlight: (text) => theme.bold(theme.fg("text", text)),
+                shimmer: formatWorkingStatusShimmerText,
+                suffix: (text) => theme.fg("dim", text),
+            }),
+            messageIntervalMs: DEFAULT_WORKING_STATUS_MESSAGE_ANIMATION_INTERVAL_MS,
+        });
+    }
     createWorkingLoader() {
-        return new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), this.getWorkingLoaderMessage(), this.workingIndicatorOptions);
+        return new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), this.getWorkingLoaderMessage(), this.getWorkingIndicatorOptions());
     }
     stopWorkingLoader() {
+        this.stopWorkingElapsedTimer();
+        this.workingStartedAt = undefined;
         if (this.loadingAnimation) {
             this.loadingAnimation.stop();
             this.loadingAnimation = undefined;
@@ -1304,6 +1398,7 @@ export class InteractiveMode {
         }
         if (this.session.isStreaming && !this.loadingAnimation) {
             this.statusContainer.clear();
+            this.startWorkingElapsedTimer();
             this.loadingAnimation = this.createWorkingLoader();
             this.statusContainer.addChild(this.loadingAnimation);
         }
@@ -1311,7 +1406,7 @@ export class InteractiveMode {
     }
     setWorkingIndicator(options) {
         this.workingIndicatorOptions = options;
-        this.loadingAnimation?.setIndicator(options);
+        this.loadingAnimation?.setIndicator(this.getWorkingIndicatorOptions());
         this.ui.requestRender();
     }
     setHiddenThinkingLabel(label) {
@@ -1399,9 +1494,7 @@ export class InteractiveMode {
         this.workingMessage = undefined;
         this.workingVisible = true;
         this.setWorkingIndicator();
-        if (this.loadingAnimation) {
-            this.loadingAnimation.setMessage(`${this.defaultWorkingMessage} (${keyText("app.interrupt")} to interrupt)`);
-        }
+        this.refreshWorkingLoaderMessage();
         this.setHiddenThinkingLabel();
     }
     // Maximum total widget lines to prevent viewport overflow
@@ -1526,9 +1619,7 @@ export class InteractiveMode {
             setStatus: (key, text) => this.setExtensionStatus(key, text),
             setWorkingMessage: (message) => {
                 this.workingMessage = message;
-                if (this.loadingAnimation) {
-                    this.loadingAnimation.setMessage(message ?? this.defaultWorkingMessage);
-                }
+                this.refreshWorkingLoaderMessage();
             },
             setWorkingVisible: (visible) => this.setWorkingVisible(visible),
             setWorkingIndicator: (options) => this.setWorkingIndicator(options),
@@ -1859,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();
@@ -2149,6 +2240,7 @@ export class InteractiveMode {
                 }
                 this.stopWorkingLoader();
                 if (this.workingVisible) {
+                    this.startWorkingElapsedTimer();
                     this.loadingAnimation = this.createWorkingLoader();
                     this.statusContainer.addChild(this.loadingAnimation);
                 }
@@ -2290,11 +2382,7 @@ export class InteractiveMode {
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(false);
                 }
-                if (this.loadingAnimation) {
-                    this.loadingAnimation.stop();
-                    this.loadingAnimation = undefined;
-                    this.statusContainer.clear();
-                }
+                this.stopWorkingLoader();
                 if (this.streamingComponent) {
                     this.chatContainer.removeChild(this.streamingComponent);
                     this.streamingComponent = undefined;
@@ -2315,11 +2403,31 @@ export class InteractiveMode {
                 };
                 this.statusContainer.clear();
                 const cancelHint = `(${keyText("app.interrupt")} to cancel)`;
-                const label = event.reason === "manual"
-                    ? `Compacting context... ${cancelHint}`
-                    : `${event.reason === "overflow" ? "Context overflow detected, " : ""}Auto-compacting... ${cancelHint}`;
+                const label = event.reason === "threshold"
+                    ? `Auto-compacting... ${cancelHint}`
+                    : event.reason === "overflow"
+                        ? `Context overflow detected, compacting... ${cancelHint}`
+                        : event.reason === "pre_prompt"
+                            ? `Compacting before next prompt... ${cancelHint}`
+                            : `Compacting context... ${cancelHint}`;
                 this.autoCompactionLoader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), label);
                 this.statusContainer.addChild(this.autoCompactionLoader);
+                this.autoCompactionProgressText = "";
+                this.ui.requestRender();
+                break;
+            }
+            case "compaction_progress": {
+                if (!this.autoCompactionLoader)
+                    break;
+                const nextText = event.text !== undefined ? event.text : `${this.autoCompactionProgressText}${event.delta ?? ""}`;
+                if (!nextText)
+                    break;
+                this.autoCompactionProgressText = nextText;
+                const preview = nextText.length > 4_000 ? `...${nextText.slice(nextText.length - 4_000)}` : nextText;
+                this.statusContainer.clear();
+                this.statusContainer.addChild(this.autoCompactionLoader);
+                this.statusContainer.addChild(new Spacer(1));
+                this.statusContainer.addChild(new Text(theme.fg("muted", preview), 1, 0));
                 this.ui.requestRender();
                 break;
             }
@@ -2334,6 +2442,7 @@ export class InteractiveMode {
                 if (this.autoCompactionLoader) {
                     this.autoCompactionLoader.stop();
                     this.autoCompactionLoader = undefined;
+                    this.autoCompactionProgressText = "";
                     this.statusContainer.clear();
                 }
                 if (event.aborted) {
@@ -2347,7 +2456,7 @@ export class InteractiveMode {
                 else if (event.result) {
                     this.chatContainer.clear();
                     this.rebuildChatFromMessages();
-                    this.addMessageToChat(createCompactionSummaryMessage(event.result.summary, event.result.tokensBefore, new Date().toISOString()));
+                    this.addMessageToChat(createCompactionSummaryMessage(event.result.summary, event.result.tokensBefore, new Date().toISOString(), event.result.details));
                     this.footer.invalidate();
                 }
                 else if (event.errorMessage) {
@@ -2364,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();
@@ -2932,6 +3041,7 @@ export class InteractiveMode {
     showError(errorMessage) {
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(theme.fg("error", `Error: ${errorMessage}`), 1, 0));
+        this.chatContainer.addChild(new Spacer(1));
         this.ui.requestRender();
     }
     showWarning(warningMessage) {
@@ -3021,7 +3131,7 @@ export class InteractiveMode {
         if (allQueued.length === 0) {
             this.updatePendingMessagesDisplay();
             if (options?.abort) {
-                this.agent.abort();
+                void this.session.abort();
             }
             return 0;
         }
@@ -3031,7 +3141,36 @@ export class InteractiveMode {
         this.editor.setText(combinedText);
         this.updatePendingMessagesDisplay();
         if (options?.abort) {
-            this.agent.abort();
+            void this.session.abort();
+        }
+        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;
     }
@@ -3651,11 +3790,7 @@ export class InteractiveMode {
         });
     }
     async handleResumeSession(sessionPath, options) {
-        if (this.loadingAnimation) {
-            this.loadingAnimation.stop();
-            this.loadingAnimation = undefined;
-        }
-        this.statusContainer.clear();
+        this.stopWorkingLoader();
         try {
             const result = await this.runtimeHost.switchSession(sessionPath, {
                 withSession: options?.withSession,
@@ -4140,11 +4275,7 @@ export class InteractiveMode {
             return;
         }
         try {
-            if (this.loadingAnimation) {
-                this.loadingAnimation.stop();
-                this.loadingAnimation = undefined;
-            }
-            this.statusContainer.clear();
+            this.stopWorkingLoader();
             const result = await this.runtimeHost.importFromJsonl(inputPath);
             if (result.cancelled) {
                 this.showStatus("Import cancelled");
@@ -4299,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();
@@ -4468,11 +4574,7 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     async handleClearCommand() {
-        if (this.loadingAnimation) {
-            this.loadingAnimation.stop();
-            this.loadingAnimation = undefined;
-        }
-        this.statusContainer.clear();
+        this.stopWorkingLoader();
         try {
             const result = await this.runtimeHost.newSession();
             if (result.cancelled) {
@@ -4606,11 +4708,7 @@ export class InteractiveMode {
             this.showWarning("Nothing to compact (no messages yet)");
             return;
         }
-        if (this.loadingAnimation) {
-            this.loadingAnimation.stop();
-            this.loadingAnimation = undefined;
-        }
-        this.statusContainer.clear();
+        this.stopWorkingLoader();
         try {
             await this.session.compact(customInstructions);
         }
@@ -4623,10 +4721,7 @@ export class InteractiveMode {
         if (this.settingsManager.getShowTerminalProgress()) {
             this.ui.terminal.setProgress(false);
         }
-        if (this.loadingAnimation) {
-            this.loadingAnimation.stop();
-            this.loadingAnimation = undefined;
-        }
+        this.stopWorkingLoader();
         this.clearExtensionTerminalInputListeners();
         this.footer.dispose();
         this.footerDataProvider.dispose();