@code-yeongyu/senpi 2026.6.21 → 2026.6.30-2

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

@@ -6,8 +6,8 @@ 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";
-import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@earendil-works/pi-tui";
+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, expandTildePath, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
@@ -31,7 +31,7 @@ import { parseGitUrl } from "../../utils/git.js";
 import { getCwdRelativePath } from "../../utils/paths.js";
 import { getPiUserAgent } from "../../utils/pi-user-agent.js";
 import { killTrackedDetachedChildren } from "../../utils/shell.js";
-import { checkForNewPiVersion } from "../../utils/version-check.js";
+import { checkForNewPiVersion, getReleaseChangelogUrl } from "../../utils/version-check.js";
 import { abortedErrorLabel } from "./aborted-error-label.js";
 import { ArminComponent } from "./components/armin.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
@@ -39,7 +39,6 @@ import { BashExecutionComponent } from "./components/bash-execution.js";
 import { BorderedLoader } from "./components/bordered-loader.js";
 import { BranchSummaryMessageComponent } from "./components/branch-summary-message.js";
 import { CompactionSummaryMessageComponent } from "./components/compaction-summary-message.js";
-import { CountdownTimer } from "./components/countdown-timer.js";
 import { CustomEditor } from "./components/custom-editor.js";
 import { CustomMessageComponent } from "./components/custom-message.js";
 import { DaxnutsComponent } from "./components/daxnuts.js";
@@ -58,6 +57,7 @@ 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";
+import { BranchSummaryStatusIndicator, CompactionStatusIndicator, IdleStatus, RetryStatusIndicator, WorkingStatusIndicator, } from "./components/status-indicator.js";
 import { ToolExecutionComponent } from "./components/tool-execution.js";
 import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { TrustSelectorComponent } from "./components/trust-selector.js";
@@ -197,12 +197,12 @@ export class InteractiveMode {
         this.autocompleteProviderWrappers = [];
         this.isInitialized = false;
         this.pendingUserInputs = [];
-        this.loadingAnimation = undefined;
+        this.activeStatusIndicator = undefined;
+        this.idleStatus = new IdleStatus();
         this.workingMessage = undefined;
         this.workingVisible = true;
         this.workingIndicatorOptions = undefined;
         this.workingStartedAt = undefined;
-        this.workingElapsedIntervalId = undefined;
         this.defaultWorkingMessage = "Working";
         this.defaultHiddenThinkingLabel = "Thinking...";
         this.hiddenThinkingLabel = this.defaultHiddenThinkingLabel;
@@ -230,6 +230,7 @@ export class InteractiveMode {
         this.toolOutputExpanded = false;
         // Thinking block visibility state
         this.hideThinkingBlock = false;
+        this.outputPad = 1;
         // Skill commands: command name -> skill file path
         this.skillCommands = new Map();
         this.signalCleanupHandlers = [];
@@ -239,12 +240,7 @@ export class InteractiveMode {
         this.bashComponent = undefined;
         // Track pending bash components (shown in pending area, moved to chat on submit)
         this.pendingBashComponents = [];
-        // Auto-compaction state
-        this.autoCompactionLoader = undefined;
         this.autoCompactionProgressText = "";
-        // Auto-retry state
-        this.retryLoader = undefined;
-        this.retryCountdown = undefined;
         // Messages queued while compaction is running
         this.compactionQueuedMessages = [];
         // Shutdown state
@@ -276,12 +272,13 @@ export class InteractiveMode {
             this.resetExtensionUI();
         });
         this.runtimeHost.setRebindSession(async () => {
-            await this.rebindCurrentSession();
+            await this.rebindCurrentSession({ renderBeforeBind: true });
         });
         this.version = VERSION;
         this.ui = new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor());
         this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
         this.headerContainer = new Container();
+        this.loadedResourcesContainer = new Container();
         this.chatContainer = new Container();
         this.pendingMessagesContainer = new Container();
         this.statusContainer = new Container();
@@ -304,6 +301,7 @@ export class InteractiveMode {
         this.footer.setAutoCompactEnabled(this.session.autoCompactionEnabled);
         // Load hide thinking block setting
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
+        this.outputPad = this.settingsManager.getOutputPad();
         // Register themes from resource loader and initialize
         setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
         this.themeController = new InteractiveThemeController(this.ui, this.settingsManager, (message) => this.showError(message), () => this.updateEditorBorderColor());
@@ -475,8 +473,10 @@ export class InteractiveMode {
                 : "";
             console.log(theme.fg("dim", `Model scope: ${modelList}${cycleHint}`));
         }
-        // Add header container as first child. Populate it after detectThemeIfUnset.
+        // Add header container as first child. Populate it after applying theme settings.
+        // Keep loaded resources before chat so restored session messages never precede them.
         this.ui.addChild(this.headerContainer);
+        this.ui.addChild(this.loadedResourcesContainer);
         this.ui.addChild(this.chatContainer);
         this.ui.addChild(this.pendingMessagesContainer);
         this.ui.addChild(this.statusContainer);
@@ -1034,6 +1034,8 @@ export class InteractiveMode {
         return lines.join("\n");
     }
     showLoadedResources(options) {
+        // Resource rendering is idempotent; chat clears no longer clear this separate container.
+        this.loadedResourcesContainer.clear();
         const showListing = options?.force || this.options.verbose || !this.settingsManager.getQuietStartup();
         const showDiagnostics = showListing || options?.showDiagnosticsWhenQuiet === true;
         if (!showListing && !showDiagnostics) {
@@ -1049,8 +1051,8 @@ export class InteractiveMode {
         };
         const addLoadedSection = (name, collapsedBody, expandedBody = collapsedBody, color = "mdHeading") => {
             const section = new ExpandableText(() => `${sectionHeader(name, color)}\n${collapsedBody}`, () => `${sectionHeader(name, color)}\n${expandedBody}`, this.getStartupExpansionState(), 0, 0);
-            this.chatContainer.addChild(section);
-            this.chatContainer.addChild(new Spacer(1));
+            this.loadedResourcesContainer.addChild(section);
+            this.loadedResourcesContainer.addChild(new Spacer(1));
         };
         const skillsResult = this.session.resourceLoader.getSkills();
         const promptsResult = this.session.resourceLoader.getPrompts();
@@ -1084,7 +1086,7 @@ export class InteractiveMode {
         if (showListing) {
             const contextFiles = this.session.resourceLoader.getAgentsFiles().agentsFiles;
             if (contextFiles.length > 0) {
-                this.chatContainer.addChild(new Spacer(1));
+                this.loadedResourcesContainer.addChild(new Spacer(1));
                 const contextList = contextFiles
                     .map((f) => theme.fg("dim", `  ${this.formatDisplayPath(f.path)}`))
                     .join("\n");
@@ -1147,14 +1149,14 @@ export class InteractiveMode {
             const skillDiagnostics = skillsResult.diagnostics;
             if (skillDiagnostics.length > 0) {
                 const warningLines = this.formatDiagnostics(skillDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Skill conflicts]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
+                this.loadedResourcesContainer.addChild(new Text(`${theme.fg("warning", "[Skill conflicts]")}\n${warningLines}`, 0, 0));
+                this.loadedResourcesContainer.addChild(new Spacer(1));
             }
             const promptDiagnostics = promptsResult.diagnostics;
             if (promptDiagnostics.length > 0) {
                 const warningLines = this.formatDiagnostics(promptDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Prompt conflicts]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
+                this.loadedResourcesContainer.addChild(new Text(`${theme.fg("warning", "[Prompt conflicts]")}\n${warningLines}`, 0, 0));
+                this.loadedResourcesContainer.addChild(new Spacer(1));
             }
             const extensionDiagnostics = [];
             const extensionErrors = this.session.resourceLoader.getExtensions().errors;
@@ -1170,14 +1172,14 @@ export class InteractiveMode {
             extensionDiagnostics.push(...shortcutDiagnostics);
             if (extensionDiagnostics.length > 0) {
                 const warningLines = this.formatDiagnostics(extensionDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Extension issues]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
+                this.loadedResourcesContainer.addChild(new Text(`${theme.fg("warning", "[Extension issues]")}\n${warningLines}`, 0, 0));
+                this.loadedResourcesContainer.addChild(new Spacer(1));
             }
             const themeDiagnostics = themesResult.diagnostics;
             if (themeDiagnostics.length > 0) {
                 const warningLines = this.formatDiagnostics(themeDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Theme conflicts]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
+                this.loadedResourcesContainer.addChild(new Text(`${theme.fg("warning", "[Theme conflicts]")}\n${warningLines}`, 0, 0));
+                this.loadedResourcesContainer.addChild(new Spacer(1));
             }
         }
     }
@@ -1195,14 +1197,9 @@ export class InteractiveMode {
             commandContextActions: {
                 waitForIdle: () => this.session.agent.waitForIdle(),
                 newSession: async (options) => {
-                    this.stopWorkingLoader();
+                    this.clearStatusIndicator();
                     try {
-                        const result = await this.runtimeHost.newSession(options);
-                        if (!result.cancelled) {
-                            this.renderCurrentSessionState();
-                            this.ui.requestRender();
-                        }
-                        return result;
+                        return await this.runtimeHost.newSession(options);
                     }
                     catch (error) {
                         return this.handleFatalRuntimeError("Failed to create session", error);
@@ -1212,7 +1209,6 @@ export class InteractiveMode {
                     try {
                         const result = await this.runtimeHost.fork(entryId, options);
                         if (!result.cancelled) {
-                            this.renderCurrentSessionState();
                             this.editor.setText(result.selectedText ?? "");
                             this.showStatus("Forked to new session");
                         }
@@ -1271,8 +1267,13 @@ export class InteractiveMode {
         this.footer.setAutoCompactEnabled(this.session.autoCompactionEnabled);
         this.footerDataProvider.setCwd(this.sessionManager.getCwd());
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
+        this.outputPad = this.settingsManager.getOutputPad();
         this.ui.setShowHardwareCursor(this.settingsManager.getShowHardwareCursor());
-        this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
+        const clearOnShrink = this.settingsManager.getClearOnShrink();
+        this.ui.setClearOnShrink(clearOnShrink);
+        if (!clearOnShrink && !this.activeStatusIndicator) {
+            this.statusContainer.clear();
+        }
         const editorPaddingX = this.settingsManager.getEditorPaddingX();
         const autocompleteMaxVisible = this.settingsManager.getAutocompleteMaxVisible();
         this.defaultEditor.setPaddingX(editorPaddingX);
@@ -1282,12 +1283,19 @@ export class InteractiveMode {
             this.editor.setAutocompleteMaxVisible?.(autocompleteMaxVisible);
         }
     }
-    async rebindCurrentSession() {
+    async rebindCurrentSession(options = {}) {
         this.unsubscribe?.();
         this.unsubscribe = undefined;
         this.applyRuntimeSettings();
-        await this.bindCurrentSessionExtensions();
-        this.subscribeToAgent();
+        if (options.renderBeforeBind) {
+            this.renderCurrentSessionState();
+            this.subscribeToAgent();
+            await this.bindCurrentSessionExtensions();
+        }
+        else {
+            await this.bindCurrentSessionExtensions();
+            this.subscribeToAgent();
+        }
         await this.updateAvailableProviderCount();
         this.updateEditorBorderColor();
         this.updateTerminalTitle();
@@ -1300,6 +1308,7 @@ export class InteractiveMode {
         process.exit(1);
     }
     renderCurrentSessionState() {
+        this.loadedResourcesContainer.clear();
         this.chatContainer.clear();
         this.pendingMessagesContainer.clear();
         this.compactionQueuedMessages = [];
@@ -1380,31 +1389,6 @@ export class InteractiveMode {
         this.footerDataProvider.setExtensionStatus(key, text);
         this.ui.requestRender();
     }
-    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;
-        }
-    }
     startToolHookStatusTimer() {
         if (this.hookStatusIntervalId) {
             return;
@@ -1515,6 +1499,23 @@ export class InteractiveMode {
         this.hookStatusContainer.clear();
         this.stopToolHookStatusTimer();
     }
+    getWorkingElapsedSeconds() {
+        if (this.workingStartedAt === undefined) {
+            return 0;
+        }
+        return Math.max(0, Math.floor((Date.now() - this.workingStartedAt) / 1000));
+    }
+    getWorkingLoaderMessage() {
+        return this.workingMessage ?? this.defaultWorkingMessage;
+    }
+    refreshWorkingLoaderMessage() {
+        if (this.activeStatusIndicator?.kind === "working") {
+            this.activeStatusIndicator.setMessage(this.getWorkingLoaderMessage());
+            return;
+        }
+        const legacyLoader = this.loadingAnimation;
+        legacyLoader?.setMessage(this.getWorkingLoaderMessage());
+    }
     getWorkingIndicatorOptions() {
         return (this.workingIndicatorOptions ?? {
             frames: theme.getColorMode() === "truecolor" ? ["•"] : [theme.fg("accent", "•"), theme.fg("muted", "◦")],
@@ -1532,36 +1533,53 @@ export class InteractiveMode {
             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.getWorkingIndicatorOptions());
+    showStatusIndicator(indicator) {
+        if (indicator.kind === "working") {
+            this.workingStartedAt = Date.now();
+        }
+        this.activeStatusIndicator?.dispose();
+        this.activeStatusIndicator = indicator;
+        this.statusContainer.clear();
+        this.statusContainer.addChild(indicator);
     }
-    stopWorkingLoader() {
-        this.stopWorkingElapsedTimer();
-        this.workingStartedAt = undefined;
-        if (this.loadingAnimation) {
-            this.loadingAnimation.stop();
-            this.loadingAnimation = undefined;
+    updateWorkingIndicatorMessage() {
+        if (this.activeStatusIndicator?.kind === "working") {
+            this.activeStatusIndicator.setMessage(this.workingMessage ?? this.defaultWorkingMessage);
+        }
+    }
+    clearStatusIndicator(kind) {
+        if (kind && this.activeStatusIndicator?.kind !== kind) {
+            return;
+        }
+        const hadActiveStatusIndicator = this.activeStatusIndicator !== undefined;
+        const isClearingWorking = this.activeStatusIndicator?.kind === "working";
+        this.activeStatusIndicator?.dispose();
+        this.activeStatusIndicator = undefined;
+        if (isClearingWorking) {
+            this.workingStartedAt = undefined;
         }
         this.statusContainer.clear();
+        if (hadActiveStatusIndicator && this.ui.getClearOnShrink()) {
+            this.statusContainer.addChild(this.idleStatus);
+        }
     }
     setWorkingVisible(visible) {
         this.workingVisible = visible;
         if (!visible) {
-            this.stopWorkingLoader();
+            this.clearStatusIndicator("working");
             this.ui.requestRender();
             return;
         }
-        if (this.session.isStreaming && !this.loadingAnimation) {
-            this.statusContainer.clear();
-            this.startWorkingElapsedTimer();
-            this.loadingAnimation = this.createWorkingLoader();
-            this.statusContainer.addChild(this.loadingAnimation);
+        if (this.session.isStreaming && this.activeStatusIndicator?.kind !== "working") {
+            this.showStatusIndicator(new WorkingStatusIndicator(this.ui, this.workingMessage ?? this.defaultWorkingMessage, this.getWorkingIndicatorOptions()));
         }
         this.ui.requestRender();
     }
     setWorkingIndicator(options) {
         this.workingIndicatorOptions = options;
-        this.loadingAnimation?.setIndicator(this.getWorkingIndicatorOptions());
+        if (this.activeStatusIndicator?.kind === "working") {
+            this.activeStatusIndicator.setIndicator(this.getWorkingIndicatorOptions());
+        }
         this.ui.requestRender();
     }
     setHiddenThinkingLabel(label) {
@@ -1653,7 +1671,7 @@ export class InteractiveMode {
         this.workingMessage = undefined;
         this.workingVisible = true;
         this.setWorkingIndicator();
-        this.refreshWorkingLoaderMessage();
+        this.updateWorkingIndicatorMessage();
         this.setHiddenThinkingLabel();
         this.clearToolHookStatuses();
     }
@@ -1793,7 +1811,7 @@ export class InteractiveMode {
             setStatus: (key, text) => this.setExtensionStatus(key, text),
             setWorkingMessage: (message) => {
                 this.workingMessage = message;
-                this.refreshWorkingLoaderMessage();
+                this.updateWorkingIndicatorMessage();
             },
             setWorkingVisible: (visible) => this.setWorkingVisible(visible),
             setWorkingIndicator: (options) => this.setWorkingIndicator(options),
@@ -1939,7 +1957,7 @@ export class InteractiveMode {
             }, () => {
                 this.hideExtensionEditor();
                 resolve(undefined);
-            });
+            }, undefined, this.settingsManager.getExternalEditorCommand());
             this.editorContainer.clear();
             this.editorContainer.addChild(this.extensionEditor);
             this.ui.setFocus(this.extensionEditor);
@@ -2436,19 +2454,11 @@ export class InteractiveMode {
                     this.defaultEditor.onEscape = this.retryEscapeHandler;
                     this.retryEscapeHandler = undefined;
                 }
-                if (this.retryCountdown) {
-                    this.retryCountdown.dispose();
-                    this.retryCountdown = undefined;
-                }
-                if (this.retryLoader) {
-                    this.retryLoader.stop();
-                    this.retryLoader = undefined;
-                }
-                this.stopWorkingLoader();
                 if (this.workingVisible) {
-                    this.startWorkingElapsedTimer();
-                    this.loadingAnimation = this.createWorkingLoader();
-                    this.statusContainer.addChild(this.loadingAnimation);
+                    this.showStatusIndicator(new WorkingStatusIndicator(this.ui, this.workingMessage ?? this.defaultWorkingMessage, this.getWorkingIndicatorOptions()));
+                }
+                else {
+                    this.clearStatusIndicator();
                 }
                 this.ui.requestRender();
                 break;
@@ -2479,7 +2489,7 @@ export class InteractiveMode {
                     this.ui.requestRender();
                 }
                 else if (event.message.role === "assistant") {
-                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel);
+                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad);
                     this.streamingComponent.setExpanded(this.toolOutputExpanded);
                     this.streamingMessage = event.message;
                     this.chatContainer.addChild(this.streamingComponent);
@@ -2589,7 +2599,7 @@ export class InteractiveMode {
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(false);
                 }
-                this.stopWorkingLoader();
+                this.clearStatusIndicator("working");
                 this.clearActiveToolExecutionStatus();
                 this.clearToolHookStatuses();
                 if (this.streamingComponent) {
@@ -2610,23 +2620,17 @@ export class InteractiveMode {
                 this.defaultEditor.onEscape = () => {
                     this.session.abortCompaction();
                 };
+                const indicator = new CompactionStatusIndicator(this.ui, event.reason);
+                this.activeStatusIndicator?.dispose();
+                this.activeStatusIndicator = indicator;
                 this.statusContainer.clear();
-                const cancelHint = `(${keyText("app.interrupt")} to cancel)`;
-                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.statusContainer.addChild(indicator);
                 this.autoCompactionProgressText = "";
                 this.ui.requestRender();
                 break;
             }
             case "compaction_progress": {
-                if (!this.autoCompactionLoader)
+                if (this.activeStatusIndicator?.kind !== "compaction")
                     break;
                 const nextText = event.text !== undefined ? event.text : `${this.autoCompactionProgressText}${event.delta ?? ""}`;
                 if (!nextText)
@@ -2634,7 +2638,7 @@ export class InteractiveMode {
                 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(this.activeStatusIndicator);
                 this.statusContainer.addChild(new Spacer(1));
                 this.statusContainer.addChild(new Text(theme.fg("muted", preview), 1, 0));
                 this.ui.requestRender();
@@ -2648,12 +2652,8 @@ export class InteractiveMode {
                     this.defaultEditor.onEscape = this.autoCompactionEscapeHandler;
                     this.autoCompactionEscapeHandler = undefined;
                 }
-                if (this.autoCompactionLoader) {
-                    this.autoCompactionLoader.stop();
-                    this.autoCompactionLoader = undefined;
-                    this.autoCompactionProgressText = "";
-                    this.statusContainer.clear();
-                }
+                this.clearStatusIndicator("compaction");
+                this.autoCompactionProgressText = "";
                 if (event.aborted) {
                     if (event.reason === "manual") {
                         this.showError("Compaction cancelled");
@@ -2687,17 +2687,7 @@ export class InteractiveMode {
                 // 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();
-                const retryMessage = (seconds) => `Retrying (${event.attempt}/${event.maxAttempts}) in ${seconds}s... (${keyText("app.interrupt")} to cancel)`;
-                this.retryLoader = new Loader(this.ui, (spinner) => theme.fg("warning", spinner), (text) => theme.fg("muted", text), retryMessage(Math.ceil(event.delayMs / 1000)));
-                this.retryCountdown = new CountdownTimer(event.delayMs, this.ui, (seconds) => {
-                    this.retryLoader?.setMessage(retryMessage(seconds));
-                }, () => {
-                    this.retryCountdown = undefined;
-                });
-                this.statusContainer.addChild(this.retryLoader);
+                this.showStatusIndicator(new RetryStatusIndicator(this.ui, event.attempt, event.maxAttempts, event.delayMs));
                 this.ui.requestRender();
                 break;
             }
@@ -2707,16 +2697,7 @@ export class InteractiveMode {
                     this.defaultEditor.onEscape = this.retryEscapeHandler;
                     this.retryEscapeHandler = undefined;
                 }
-                if (this.retryCountdown) {
-                    this.retryCountdown.dispose();
-                    this.retryCountdown = undefined;
-                }
-                // Stop loader
-                if (this.retryLoader) {
-                    this.retryLoader.stop();
-                    this.retryLoader = undefined;
-                    this.statusContainer.clear();
-                }
+                this.clearStatusIndicator("retry");
                 // Show error only on final failure (success shows normal response)
                 if (!event.success) {
                     this.showError(`Retry failed after ${event.attempt} attempts: ${event.finalError || "Unknown error"}`);
@@ -2807,12 +2788,12 @@ export class InteractiveMode {
                         // Render user message separately if present
                         if (skillBlock.userMessage) {
                             this.chatContainer.addChild(new Spacer(1));
-                            const userComponent = new UserMessageComponent(skillBlock.userMessage, this.getMarkdownThemeWithSettings());
+                            const userComponent = new UserMessageComponent(skillBlock.userMessage, this.getMarkdownThemeWithSettings(), this.outputPad);
                             this.chatContainer.addChild(userComponent);
                         }
                     }
                     else {
-                        const userComponent = new UserMessageComponent(textContent, this.getMarkdownThemeWithSettings());
+                        const userComponent = new UserMessageComponent(textContent, this.getMarkdownThemeWithSettings(), this.outputPad);
                         this.chatContainer.addChild(userComponent);
                     }
                     if (options?.populateHistory) {
@@ -2822,7 +2803,7 @@ export class InteractiveMode {
                 break;
             }
             case "assistant": {
-                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel);
+                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad);
                 assistantComponent.setExpanded(this.toolOutputExpanded);
                 this.chatContainer.addChild(assistantComponent);
                 break;
@@ -2906,8 +2887,7 @@ export class InteractiveMode {
         });
         this.renderProjectTrustWarningIfNeeded();
         // Show compaction info if session was compacted
-        const allEntries = this.sessionManager.getEntries();
-        const compactionCount = allEntries.filter((e) => e.type === "compaction").length;
+        const compactionCount = this.sessionManager.countCompactions();
         if (compactionCount > 0) {
             const times = compactionCount === 1 ? "1 time" : `${compactionCount} times`;
             this.showStatus(`Session compacted ${times}`);
@@ -3207,9 +3187,11 @@ export class InteractiveMode {
         if (isExpandable(activeHeader)) {
             activeHeader.setExpanded(expanded);
         }
-        for (const child of this.chatContainer.children) {
-            if (isExpandable(child)) {
-                child.setExpanded(expanded);
+        for (const container of [this.loadedResourcesContainer, this.chatContainer]) {
+            for (const child of container.children) {
+                if (isExpandable(child)) {
+                    child.setExpanded(expanded);
+                }
             }
         }
         this.ui.requestRender();
@@ -3229,10 +3211,9 @@ export class InteractiveMode {
         this.showStatus(`Thinking blocks: ${this.hideThinkingBlock ? "hidden" : "visible"}`);
     }
     async openExternalEditor() {
-        // Determine editor (respect $VISUAL, then $EDITOR)
-        const editorCmd = process.env.VISUAL || process.env.EDITOR;
+        const editorCmd = this.settingsManager.getExternalEditorCommand();
         if (!editorCmd) {
-            this.showWarning("No editor configured. Set $VISUAL or $EDITOR environment variable.");
+            this.showWarning("No editor configured. Set externalEditor in settings.json or $VISUAL/$EDITOR.");
             return;
         }
         const currentText = this.editor.getExpandedText?.() ?? this.editor.getText();
@@ -3297,7 +3278,7 @@ export class InteractiveMode {
     showNewVersionNotification(newVersion) {
         const action = theme.fg("accent", `${APP_NAME} update`);
         const updateInstruction = theme.fg("muted", `New version ${newVersion} is available. Run `) + action;
-        const changelogUrl = "https://github.com/earendil-works/pi-mono/blob/main/packages/coding-agent/CHANGELOG.md";
+        const changelogUrl = getReleaseChangelogUrl(newVersion);
         const changelogLink = getCapabilities().hyperlinks
             ? hyperlink(theme.fg("accent", changelogUrl), changelogUrl)
             : theme.fg("accent", changelogUrl);
@@ -3550,6 +3531,7 @@ export class InteractiveMode {
                 showHardwareCursor: this.settingsManager.getShowHardwareCursor(),
                 defaultProjectTrust: this.settingsManager.getDefaultProjectTrust(),
                 editorPaddingX: this.settingsManager.getEditorPaddingX(),
+                outputPad: this.settingsManager.getOutputPad(),
                 autocompleteMaxVisible: this.settingsManager.getAutocompleteMaxVisible(),
                 quietStartup: this.settingsManager.getQuietStartup(),
                 clearOnShrink: this.settingsManager.getClearOnShrink(),
@@ -3651,6 +3633,23 @@ export class InteractiveMode {
                         this.editor.setPaddingX(padding);
                     }
                 },
+                onOutputPadChange: (padding) => {
+                    this.settingsManager.setOutputPad(padding);
+                    this.outputPad = padding;
+                    if (this.streamingComponent || this.session.isStreaming) {
+                        for (const child of this.chatContainer.children) {
+                            if (child instanceof AssistantMessageComponent || child instanceof UserMessageComponent) {
+                                child.setOutputPad(padding);
+                            }
+                        }
+                        if (this.streamingComponent) {
+                            this.streamingComponent.setOutputPad(padding);
+                        }
+                        this.ui.requestRender();
+                        return;
+                    }
+                    this.rebuildChatFromMessages();
+                },
                 onAutocompleteMaxVisibleChange: (maxVisible) => {
                     this.settingsManager.setAutocompleteMaxVisible(maxVisible);
                     this.defaultEditor.setAutocompleteMaxVisible(maxVisible);
@@ -3661,6 +3660,9 @@ export class InteractiveMode {
                 onClearOnShrinkChange: (enabled) => {
                     this.settingsManager.setClearOnShrink(enabled);
                     this.ui.setClearOnShrink(enabled);
+                    if (!enabled && !this.activeStatusIndicator) {
+                        this.statusContainer.clear();
+                    }
                 },
                 onShowTerminalProgressChange: (enabled) => {
                     this.settingsManager.setShowTerminalProgress(enabled);
@@ -3912,7 +3914,6 @@ export class InteractiveMode {
                         this.ui.requestRender();
                         return;
                     }
-                    this.renderCurrentSessionState();
                     this.editor.setText(result.selectedText ?? "");
                     done();
                     this.showStatus("Forked to new session");
@@ -3940,7 +3941,6 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 return;
             }
-            this.renderCurrentSessionState();
             this.editor.setText("");
             this.showStatus("Cloned to new session");
         }
@@ -3994,16 +3994,16 @@ export class InteractiveMode {
                         break;
                     }
                 }
-                // Set up escape handler and loader if summarizing
-                let summaryLoader;
+                // Set up escape handler and status indicator if summarizing
+                let showingSummaryIndicator = false;
                 const originalOnEscape = this.defaultEditor.onEscape;
                 if (wantsSummary) {
                     this.defaultEditor.onEscape = () => {
                         this.session.abortBranchSummary();
                     };
                     this.chatContainer.addChild(new Spacer(1));
-                    summaryLoader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), `Summarizing branch... (${keyText("app.interrupt")} to cancel)`);
-                    this.statusContainer.addChild(summaryLoader);
+                    this.showStatusIndicator(new BranchSummaryStatusIndicator(this.ui));
+                    showingSummaryIndicator = true;
                     this.ui.requestRender();
                 }
                 try {
@@ -4034,9 +4034,8 @@ export class InteractiveMode {
                     this.showError(error instanceof Error ? error.message : String(error));
                 }
                 finally {
-                    if (summaryLoader) {
-                        summaryLoader.stop();
-                        this.statusContainer.clear();
+                    if (showingSummaryIndicator) {
+                        this.clearStatusIndicator("branchSummary");
                     }
                     this.defaultEditor.onEscape = originalOnEscape;
                 }
@@ -4077,7 +4076,7 @@ export class InteractiveMode {
         });
     }
     async handleResumeSession(sessionPath, options) {
-        this.stopWorkingLoader();
+        this.clearStatusIndicator();
         try {
             const result = await this.runtimeHost.switchSession(sessionPath, {
                 withSession: options?.withSession,
@@ -4086,7 +4085,6 @@ export class InteractiveMode {
             if (result.cancelled) {
                 return result;
             }
-            this.renderCurrentSessionState();
             this.showStatus("Resumed session");
             return result;
         }
@@ -4105,7 +4103,6 @@ export class InteractiveMode {
                 if (result.cancelled) {
                     return result;
                 }
-                this.renderCurrentSessionState();
                 this.showStatus("Resumed session in current cwd");
                 return result;
             }
@@ -4467,8 +4464,20 @@ export class InteractiveMode {
             this.ui.setFocus(editor);
             this.ui.requestRender();
         };
+        let chatRestoredBeforeSessionStart = false;
+        let reloadBoxDismissed = false;
+        const restoreChatBeforeSessionStart = () => {
+            if (chatRestoredBeforeSessionStart) {
+                return;
+            }
+            this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
+            this.outputPad = this.settingsManager.getOutputPad();
+            this.rebuildChatFromMessages();
+            chatRestoredBeforeSessionStart = true;
+        };
         try {
-            await this.session.reload();
+            await this.session.reload({ beforeSessionStart: restoreChatBeforeSessionStart });
+            restoreChatBeforeSessionStart();
             configureHttpDispatcher(this.settingsManager.getHttpIdleTimeoutMs());
             this.keybindings.reload();
             const activeHeader = this.customHeader ?? this.builtInHeader;
@@ -4476,7 +4485,6 @@ export class InteractiveMode {
                 activeHeader.setExpanded(this.toolOutputExpanded);
             }
             setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
-            this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
             await this.themeController.applyFromSettings();
             const editorPaddingX = this.settingsManager.getEditorPaddingX();
             const autocompleteMaxVisible = this.settingsManager.getAutocompleteMaxVisible();
@@ -4487,12 +4495,14 @@ export class InteractiveMode {
                 this.editor.setAutocompleteMaxVisible?.(autocompleteMaxVisible);
             }
             this.ui.setShowHardwareCursor(this.settingsManager.getShowHardwareCursor());
-            this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
+            const clearOnShrink = this.settingsManager.getClearOnShrink();
+            this.ui.setClearOnShrink(clearOnShrink);
+            if (!clearOnShrink && !this.activeStatusIndicator) {
+                this.statusContainer.clear();
+            }
             this.setupAutocompleteProvider();
             const runner = this.session.extensionRunner;
             this.setupExtensionShortcuts(runner);
-            this.rebuildChatFromMessages();
-            dismissReloadBox(this.editor);
             this.showLoadedResources({
                 force: false,
                 showDiagnosticsWhenQuiet: true,
@@ -4505,9 +4515,13 @@ export class InteractiveMode {
             this.showStatus(savedImplicitProjectTrust
                 ? "Reloaded keybindings, extensions, skills, prompts, themes; saved project trust"
                 : "Reloaded keybindings, extensions, skills, prompts, themes");
+            dismissReloadBox(this.editor);
+            reloadBoxDismissed = true;
         }
         catch (error) {
-            dismissReloadBox(previousEditor);
+            if (!reloadBoxDismissed) {
+                dismissReloadBox(previousEditor);
+            }
             this.showError(`Reload failed: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
@@ -4564,13 +4578,12 @@ export class InteractiveMode {
             return;
         }
         try {
-            this.stopWorkingLoader();
+            this.clearStatusIndicator();
             const result = await this.runtimeHost.importFromJsonl(inputPath);
             if (result.cancelled) {
                 this.showStatus("Import cancelled");
                 return;
             }
-            this.renderCurrentSessionState();
             this.showStatus(`Session imported from: ${inputPath}`);
         }
         catch (error) {
@@ -4585,7 +4598,6 @@ export class InteractiveMode {
                     this.showStatus("Import cancelled");
                     return;
                 }
-                this.renderCurrentSessionState();
                 this.showStatus(`Session imported from: ${inputPath}`);
                 return;
             }
@@ -4712,8 +4724,12 @@ export class InteractiveMode {
             return;
         }
         this.session.setSessionName(name);
+        const sessionName = this.sessionManager.getSessionName();
+        if (sessionName !== name) {
+            this.showWarning(`Session name was normalized from ${JSON.stringify(name)} to ${JSON.stringify(sessionName)}`);
+        }
         this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(theme.fg("dim", `Session name set: ${name}`), 1, 0));
+        this.chatContainer.addChild(new Text(theme.fg("dim", `Session name set: ${sessionName ?? name}`), 1, 0));
         this.ui.requestRender();
     }
     handleSessionCommand() {
@@ -4865,13 +4881,12 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     async handleClearCommand() {
-        this.stopWorkingLoader();
+        this.clearStatusIndicator();
         try {
             const result = await this.runtimeHost.newSession();
             if (result.cancelled) {
                 return;
             }
-            this.renderCurrentSessionState();
             this.chatContainer.addChild(new Spacer(1));
             this.chatContainer.addChild(new Text(`${theme.fg("accent", "✓ New session started")}`, 1, 1));
             this.ui.requestRender();
@@ -4999,8 +5014,7 @@ export class InteractiveMode {
             this.showWarning("Nothing to compact (no messages yet)");
             return;
         }
-        this.stopWorkingLoader();
-        this.statusContainer.clear();
+        this.clearStatusIndicator();
         try {
             await this.session.compact(customInstructions);
         }
@@ -5012,7 +5026,7 @@ export class InteractiveMode {
         if (this.settingsManager.getShowTerminalProgress()) {
             this.ui.terminal.setProgress(false);
         }
-        this.stopWorkingLoader();
+        this.clearStatusIndicator();
         this.clearPendingTools();
         this.clearActiveToolExecutionStatus();
         this.clearToolHookStatuses();