@code-yeongyu/senpi 2026.7.23 → 2026.7.25-2

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

@@ -25,6 +25,7 @@ import { SessionManager, sessionEntryToContextMessages } from "../../core/sessio
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { isInstallTelemetryEnabled } from "../../core/telemetry.js";
 import { hasTrustRequiringProjectResources, ProjectTrustStore } from "../../core/trust-manager.js";
+import { getUsageCostBreakdown } from "../../core/usage-totals.js";
 import { getChangelogPath, getNewEntries, normalizeChangelogLinks, parseChangelog } from "../../utils/changelog.js";
 import { copyToClipboard, readClipboardText } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
@@ -66,6 +67,7 @@ import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { TrustSelectorComponent } from "./components/trust-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
+import { editInExternalEditor } from "./external-editor.js";
 import { restoreInteractiveStderr, takeOverInteractiveStderr } from "./interactive-stderr-guard.js";
 import { getModelSearchText } from "./model-search.js";
 import { resolveStartupToolPaths } from "./startup-tools.js";
@@ -102,6 +104,14 @@ function formatToolHookTerminalTitle(event) {
     const statusMessage = sanitizeWorkingStatusPlainText(event.statusMessage);
     return `${APP_TITLE} - ${hookName}: ${statusMessage}`;
 }
+function sanitizeTuiErrorMessage(value) {
+    return value
+        .replace(/\u001b\][\s\S]*?(?:\u0007|\u001b\\|\u009c|$)/g, "")
+        .replace(/(?:\u001b\[|\u009b)[0-?]*[ -/]*[@-~]/g, "")
+        .replace(/\r\n?/g, "\n")
+        .replace(/[\u0000-\u0008\u000b-\u001f\u007f-\u009f]/g, "")
+        .replace(/[ \t\f\v]+/g, " ");
+}
 function isCustomSessionEntry(item) {
     return "type" in item && item.type === "custom";
 }
@@ -229,6 +239,13 @@ function formatLoginProviderCompletionDescription(provider) {
     return provider.name === provider.id ? authTypes : `${provider.name} · ${authTypes}`;
 }
 export class InteractiveMode {
+    static restoreCompactionEscapeOverride(host) {
+        if (!host.compactionEscapeOverrideActive)
+            return;
+        host.defaultEditor.onEscape = host.autoCompactionEscapeHandler;
+        host.autoCompactionEscapeHandler = undefined;
+        host.compactionEscapeOverrideActive = false;
+    }
     requestStreamingRender() {
         this.ui.requestRender();
     }
@@ -295,6 +312,7 @@ export class InteractiveMode {
         this.bashComponent = undefined;
         // Track pending bash components (shown in pending area, moved to chat on submit)
         this.pendingBashComponents = [];
+        this.compactionEscapeOverrideActive = false;
         this.autoCompactionProgressText = "";
         this.fallbackAppliedBeforeRetryStart = false;
         this.pendingZeroDelayRetryIndicator = undefined;
@@ -329,6 +347,7 @@ export class InteractiveMode {
         this.options = options;
         this.autoTrustOnReloadCwd = options.autoTrustOnReloadCwd;
         this.runtimeHost.setBeforeSessionInvalidate(() => {
+            InteractiveMode.restoreCompactionEscapeOverride(this);
             this.resetExtensionUI();
         });
         this.runtimeHost.setRebindSession(async () => {
@@ -675,6 +694,12 @@ export class InteractiveMode {
      */
     async run() {
         await this.init();
+        if (!process.env.PI_OFFLINE) {
+            void this.session.modelRuntime
+                .refresh()
+                .then(() => this.updateAvailableProviderCount())
+                .catch(() => { });
+        }
         // Start version check asynchronously
         checkForNewPiVersion(this.version).then((newVersion) => {
             if (newVersion) {
@@ -892,8 +917,15 @@ export class InteractiveMode {
      * Get a short path relative to the package root for display.
      */
     getShortPath(fullPath, sourceInfo) {
+        const normalizedFullPath = fullPath.replace(/\\/g, "/");
         const baseDir = sourceInfo?.baseDir;
         if (baseDir && this.isPackageSource(sourceInfo)) {
+            const normalizedBaseDir = baseDir.replace(/\\/g, "/");
+            const npmRootMatch = normalizedBaseDir.match(/^(.*\/node_modules)\/(@?[^/]+(?:\/[^/]+)?)$/);
+            // If fullPath is under the same node_modules root as baseDir, preserve that relative topology.
+            if (npmRootMatch?.[1] && normalizedFullPath.startsWith(`${npmRootMatch[1]}/`)) {
+                return path.posix.relative(normalizedBaseDir, normalizedFullPath);
+            }
             const relativePath = path.relative(path.resolve(baseDir), path.resolve(fullPath));
             if (relativePath &&
                 relativePath !== "." &&
@@ -904,11 +936,11 @@ export class InteractiveMode {
             }
         }
         const source = sourceInfo?.source ?? "";
-        const npmMatch = fullPath.match(/node_modules\/(@?[^/]+(?:\/[^/]+)?)\/(.*)/);
+        const npmMatch = normalizedFullPath.match(/node_modules\/(@?[^/]+(?:\/[^/]+)?)\/(.*)/);
         if (npmMatch && source.startsWith("npm:")) {
             return npmMatch[2];
         }
-        const gitMatch = fullPath.match(/git\/[^/]+\/[^/]+\/(.*)/);
+        const gitMatch = normalizedFullPath.match(/git\/[^/]+\/[^/]+\/(.*)/);
         if (gitMatch && source.startsWith("git:")) {
             return gitMatch[1];
         }
@@ -1394,6 +1426,7 @@ export class InteractiveMode {
         }
     }
     async rebindCurrentSession(options = {}) {
+        InteractiveMode.restoreCompactionEscapeOverride(this);
         this.unsubscribe?.();
         this.unsubscribe = undefined;
         this.applyRuntimeSettings();
@@ -1459,6 +1492,7 @@ export class InteractiveMode {
             modelRegistry: extensionRunner.getModelRegistry(),
             model: this.session.model,
             serviceTier: this.session.serviceTier,
+            thinkingLevel: this.session.thinkingLevel,
             isIdle: () => this.session.isIdle,
             isProjectTrusted: () => this.settingsManager.isProjectTrusted(),
             signal: this.session.agent.signal,
@@ -2356,7 +2390,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.editor.external", () => void this.handleOpenExternalEditor());
         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());
@@ -2739,6 +2773,9 @@ export class InteractiveMode {
                 }
                 this.ui.requestRender();
                 break;
+            case "bash_execution_update":
+                // The bash execution callback handles TUI output rendering.
+                break;
             case "tool_execution_start": {
                 this.handleToolExecutionStart(event);
                 let component = this.pendingTools.get(event.toolCallId);
@@ -2820,7 +2857,10 @@ export class InteractiveMode {
                     this.ui.terminal.setProgress(true);
                 }
                 // Keep editor active; submissions are queued during compaction.
-                this.autoCompactionEscapeHandler = this.defaultEditor.onEscape;
+                if (!this.compactionEscapeOverrideActive) {
+                    this.autoCompactionEscapeHandler = this.defaultEditor.onEscape;
+                    this.compactionEscapeOverrideActive = true;
+                }
                 this.defaultEditor.onEscape = () => {
                     this.session.abortCompaction();
                 };
@@ -2841,10 +2881,7 @@ export class InteractiveMode {
                     break;
                 this.autoCompactionProgressText = nextText;
                 const preview = nextText.length > 4_000 ? `...${nextText.slice(nextText.length - 4_000)}` : nextText;
-                this.statusContainer.clear();
-                this.statusContainer.addChild(this.activeStatusIndicator);
-                this.statusContainer.addChild(new Spacer(1));
-                this.statusContainer.addChild(new Text(theme.fg("muted", preview), 1, 0));
+                this.activeStatusIndicator.setProgressText(sanitizeTerminalLabel(preview));
                 this.ui.requestRender();
                 break;
             }
@@ -2852,23 +2889,20 @@ export class InteractiveMode {
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(false);
                 }
-                if (this.autoCompactionEscapeHandler) {
-                    this.defaultEditor.onEscape = this.autoCompactionEscapeHandler;
-                    this.autoCompactionEscapeHandler = undefined;
-                }
+                InteractiveMode.restoreCompactionEscapeOverride(this);
                 this.clearStatusIndicator("compaction");
                 this.autoCompactionProgressText = "";
                 if (event.aborted) {
                     // Prefer the extension-provided reason over the generic "cancelled"
                     // label so per-turn-cap / circuit-breaker / provider-error cancels are
                     // no longer indistinguishable from a user-triggered abort.
-                    const cancelMessage = event.errorMessage ?? "Compaction cancelled";
+                    const cancelMessage = sanitizeTerminalLabel(event.errorMessage ?? "Compaction cancelled");
                     if (event.reason === "manual") {
                         this.showError(cancelMessage);
                     }
                     else if (event.errorMessage) {
                         this.chatContainer.addChild(new Spacer(1));
-                        this.chatContainer.addChild(new Text(theme.fg("error", event.errorMessage), 1, 0));
+                        this.chatContainer.addChild(new Text(theme.fg("error", cancelMessage), 1, 0));
                     }
                     else {
                         this.showStatus("Auto-compaction cancelled");
@@ -2877,16 +2911,16 @@ export class InteractiveMode {
                 else if (event.result) {
                     this.chatContainer.clear();
                     this.rebuildChatFromMessages();
-                    this.addMessageToChat(createCompactionSummaryMessage(event.result.summary, event.result.tokensBefore, new Date().toISOString(), event.result.details));
+                    this.addMessageToChat(createCompactionSummaryMessage(sanitizeTerminalLabel(event.result.summary), event.result.tokensBefore, new Date().toISOString(), event.result.details));
                     this.footer.invalidate();
                 }
                 else if (event.errorMessage) {
+                    const errorMessage = sanitizeTerminalLabel(event.errorMessage);
                     if (event.reason === "manual") {
-                        this.showError(event.errorMessage);
+                        this.showError(errorMessage);
                     }
                     else {
-                        this.chatContainer.addChild(new Spacer(1));
-                        this.chatContainer.addChild(new Text(theme.fg("error", event.errorMessage), 1, 0));
+                        this.chatContainer.addChild(new Text(theme.fg("error", errorMessage), 1, 0));
                     }
                 }
                 else if (event.accepted === false) {
@@ -2903,7 +2937,12 @@ export class InteractiveMode {
                         this.chatContainer.addChild(new Text(theme.fg("error", message), 1, 0));
                     }
                 }
-                void this.flushCompactionQueue({ willRetry: event.willRetry });
+                // Only an accepted compaction transfers editor-owned input to the
+                // session. Rejections and aborts retain the draft for an explicit
+                // user retry while the UI cleanup above still always runs.
+                if (event.accepted === true || event.result !== undefined) {
+                    void this.flushCompactionQueue({ willRetry: event.willRetry });
+                }
                 this.ui.requestRender();
                 break;
             }
@@ -2929,6 +2968,11 @@ export class InteractiveMode {
                 this.showError(`Fallback chain exhausted for ${event.chainKey}: ${event.lastError}`);
                 this.setExtensionStatus(FALLBACK_STATUS_KEY, undefined);
                 break;
+            case "server_fallback_aborted":
+                this.showWarning(event.chainConfigured
+                    ? `Server fallback ${event.from} -> ${event.to} aborted; retrying on your fallback chain`
+                    : `Server fallback ${event.from} -> ${event.to} aborted; no chain configured (set one with /fallback)`);
+                break;
             case "auto_retry_start": {
                 // 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;
@@ -2970,6 +3014,28 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 break;
             }
+            case "summarization_retry_scheduled": {
+                this.showError(event.errorMessage);
+                this.showStatusIndicator(new RetryStatusIndicator(this.ui, event.attempt, event.maxAttempts, event.delayMs));
+                this.ui.requestRender();
+                break;
+            }
+            case "summarization_retry_attempt_start": {
+                this.clearStatusIndicator("retry");
+                if (event.source === "branchSummary") {
+                    this.showStatusIndicator(new BranchSummaryStatusIndicator(this.ui));
+                }
+                else {
+                    this.showStatusIndicator(new CompactionStatusIndicator(this.ui, event.reason));
+                }
+                this.ui.requestRender();
+                break;
+            }
+            case "summarization_retry_finished": {
+                this.clearStatusIndicator("retry");
+                this.ui.requestRender();
+                break;
+            }
         }
     }
     showRetryStatusIndicator(event) {
@@ -3041,7 +3107,7 @@ export class InteractiveMode {
             case "custom": {
                 if (message.display) {
                     const renderer = this.session.extensionRunner.getMessageRenderer(message.customType);
-                    const component = new CustomMessageComponent(message, renderer, this.getMarkdownThemeWithSettings());
+                    const component = new CustomMessageComponent(message, renderer, this.getMarkdownThemeWithSettings(), this.outputPad);
                     component.setExpanded(this.toolOutputExpanded);
                     this.chatContainer.addChild(component);
                 }
@@ -3552,53 +3618,23 @@ export class InteractiveMode {
         }
         this.showStatus(`Thinking blocks: ${this.hideThinkingBlock ? "hidden" : "visible"}`);
     }
-    async openExternalEditor() {
+    async handleOpenExternalEditor() {
         const editorCmd = this.settingsManager.getExternalEditorCommand();
-        if (!editorCmd) {
-            this.showWarning("No editor configured. Set externalEditor in settings.json or $VISUAL/$EDITOR.");
-            return;
-        }
-        const currentText = this.editor.getExpandedText?.() ?? this.editor.getText();
-        const tmpFile = path.join(os.tmpdir(), `pi-editor-${Date.now()}.pi.md`);
+        const content = this.editor.getExpandedText?.() ?? this.editor.getText();
+        this.ui.stop();
+        restoreInteractiveStderr();
         try {
-            // Write current content to temp file
-            fs.writeFileSync(tmpFile, currentText, "utf-8");
-            // Stop TUI to release terminal
-            restoreInteractiveStderr();
-            this.ui.stop();
-            // Split by space to support editor arguments (e.g., "code --wait")
-            const [editor, ...editorArgs] = editorCmd.split(" ");
-            process.stdout.write(`Launching external editor: ${editorCmd}\nPi will resume when the editor exits.\n`);
-            // Do not use spawnSync here. On Windows, synchronous child_process calls can keep
-            // Node/libuv's console input read active after ui.stop() pauses stdin, racing
-            // vim/nvim for the console input buffer until Ctrl+C cancels the pending read.
-            const status = await new Promise((resolve) => {
-                const child = spawn(editor, [...editorArgs, tmpFile], {
-                    stdio: "inherit",
-                    shell: process.platform === "win32",
-                });
-                child.on("error", () => resolve(null));
-                child.on("close", (code) => resolve(code));
+            const result = await editInExternalEditor({
+                command: editorCmd,
+                content,
             });
-            // On successful exit (status 0), replace editor content
-            if (status === 0) {
-                const newContent = fs.readFileSync(tmpFile, "utf-8").replace(/\n$/, "");
-                this.editor.setText(newContent);
+            if (result.status === "complete") {
+                this.editor.setText(result.content);
             }
-            // On non-zero exit, keep original text (no action needed)
         }
         finally {
-            // Clean up temp file
-            try {
-                fs.unlinkSync(tmpFile);
-            }
-            catch {
-                // Ignore cleanup errors
-            }
-            // Restart TUI
             takeOverInteractiveStderr();
             this.ui.start();
-            // Force full re-render since external editor uses alternate screen
             this.ui.requestRender(true);
         }
     }
@@ -3611,7 +3647,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 Text(theme.fg("error", `Error: ${sanitizeTuiErrorMessage(errorMessage)}`), 1, 0));
         this.ui.requestRender();
     }
     showWarning(warningMessage) {
@@ -4018,7 +4054,9 @@ export class InteractiveMode {
                     this.outputPad = padding;
                     if (this.streamingComponent || this.session.isStreaming) {
                         for (const child of this.chatContainer.children) {
-                            if (child instanceof AssistantMessageComponent || child instanceof UserMessageComponent) {
+                            if (child instanceof AssistantMessageComponent ||
+                                child instanceof CustomMessageComponent ||
+                                child instanceof UserMessageComponent) {
                                 child.setOutputPad(padding);
                             }
                         }
@@ -5203,23 +5241,9 @@ export class InteractiveMode {
         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);
+        // resolves to a concrete responseModel). Usage without model attribution is
+        // grouped separately so the breakdown reconciles with the session total.
+        const usageBreakdown = getUsageCostBreakdown(entries);
         let info = `${theme.bold("Session Info")}\n\n`;
         if (sessionName) {
             info += `${theme.fg("dim", "Name:")} ${sessionName}\n`;
@@ -5250,8 +5274,8 @@ export class InteractiveMode {
         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) {
+            if (usageBreakdown.length > 1) {
+                for (const entry of usageBreakdown) {
                     info += `\n  ${theme.fg("dim", `${entry.key}:`)} $${entry.cost.toFixed(3)} ${theme.fg("dim", `(${formatTokens(entry.tokens)} tokens)`)}`;
                 }
             }
@@ -5553,6 +5577,7 @@ export class InteractiveMode {
         }
     }
     stop() {
+        InteractiveMode.restoreCompactionEscapeOverride(this);
         this.streamingReveal.stop();
         this.toolResultReveal.stop();
         if (this.settingsManager.getShowTerminalProgress()) {