@code-yeongyu/senpi 2026.6.30 → 2026.7.3

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

@@ -7,7 +7,7 @@ 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/compat";
-import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@earendil-works/pi-tui";
+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";
@@ -20,7 +20,7 @@ import { createCompactionSummaryMessage } from "../../core/messages.js";
 import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScope, } from "../../core/model-resolver.js";
 import { BUILT_IN_PROVIDER_DISPLAY_NAMES } from "../../core/provider-display-names.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
-import { SessionManager } from "../../core/session-manager.js";
+import { SessionManager, sessionEntryToContextMessages } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { isInstallTelemetryEnabled } from "../../core/telemetry.js";
 import { hasTrustRequiringProjectResources, ProjectTrustStore } from "../../core/trust-manager.js";
@@ -39,8 +39,8 @@ 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 { CustomEntryComponent } from "./components/custom-entry.js";
 import { CustomMessageComponent } from "./components/custom-message.js";
 import { DaxnutsComponent } from "./components/daxnuts.js";
 import { DynamicBorder } from "./components/dynamic-border.js";
@@ -58,6 +58,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";
@@ -87,6 +88,9 @@ function formatToolHookTerminalTitle(event) {
     const statusMessage = sanitizeWorkingStatusPlainText(event.statusMessage);
     return `${APP_TITLE} - ${hookName}: ${statusMessage}`;
 }
+function isCustomSessionEntry(item) {
+    return "type" in item && item.type === "custom";
+}
 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;
@@ -197,12 +201,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 +234,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 +244,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
@@ -305,6 +305,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());
@@ -1200,7 +1201,7 @@ export class InteractiveMode {
             commandContextActions: {
                 waitForIdle: () => this.session.agent.waitForIdle(),
                 newSession: async (options) => {
-                    this.stopWorkingLoader();
+                    this.clearStatusIndicator();
                     try {
                         return await this.runtimeHost.newSession(options);
                     }
@@ -1270,8 +1271,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);
@@ -1387,31 +1393,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;
@@ -1419,6 +1400,7 @@ export class InteractiveMode {
         this.hookStatusIntervalId = setInterval(() => {
             this.refreshToolHookStatuses();
         }, DEFAULT_WORKING_STATUS_MESSAGE_ANIMATION_INTERVAL_MS);
+        this.hookStatusIntervalId.unref();
     }
     stopToolHookStatusTimer() {
         if (this.hookStatusIntervalId) {
@@ -1522,6 +1504,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", "◦")],
@@ -1539,36 +1538,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) {
@@ -1660,7 +1676,7 @@ export class InteractiveMode {
         this.workingMessage = undefined;
         this.workingVisible = true;
         this.setWorkingIndicator();
-        this.refreshWorkingLoaderMessage();
+        this.updateWorkingIndicatorMessage();
         this.setHiddenThinkingLabel();
         this.clearToolHookStatuses();
     }
@@ -1800,7 +1816,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),
@@ -2443,19 +2459,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;
@@ -2466,6 +2474,12 @@ export class InteractiveMode {
             case "system_prompt_change":
                 this.showStatus(event.systemPromptName ? `System prompt: ${event.systemPromptName}` : "System prompt changed");
                 break;
+            case "entry_appended":
+                if (event.entry.type === "custom") {
+                    this.addCustomEntryToChat(event.entry);
+                    this.ui.requestRender();
+                }
+                break;
             case "session_info_changed":
                 this.updateTerminalTitle();
                 this.footer.invalidate();
@@ -2486,7 +2500,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);
@@ -2596,7 +2610,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) {
@@ -2617,23 +2631,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)
@@ -2641,7 +2649,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();
@@ -2655,12 +2663,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");
@@ -2694,17 +2698,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;
             }
@@ -2714,16 +2708,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"}`);
@@ -2765,6 +2750,25 @@ export class InteractiveMode {
         this.lastStatusText = text;
         this.ui.requestRender();
     }
+    addCustomEntryToChat(entry) {
+        const renderer = this.session.extensionRunner.getEntryRenderer(entry.customType);
+        if (!renderer) {
+            return;
+        }
+        const component = new CustomEntryComponent(entry, renderer);
+        component.setExpanded(this.toolOutputExpanded);
+        if (!component.hasContent()) {
+            return;
+        }
+        if (this.streamingComponent) {
+            const streamingIndex = this.chatContainer.children.indexOf(this.streamingComponent);
+            if (streamingIndex >= 0) {
+                this.chatContainer.children.splice(streamingIndex, 0, component);
+                return;
+            }
+        }
+        this.chatContainer.addChild(component);
+    }
     addMessageToChat(message, options) {
         switch (message.role) {
             case "bashExecution": {
@@ -2814,12 +2818,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) {
@@ -2829,7 +2833,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;
@@ -2844,20 +2848,19 @@ export class InteractiveMode {
             }
         }
     }
-    /**
-     * Render session context to chat. Used for initial load and rebuild after compaction.
-     * @param sessionContext Session context to render
-     * @param options.updateFooter Update footer state
-     * @param options.populateHistory Add user messages to editor history
-     */
-    renderSessionContext(sessionContext, options = {}) {
+    renderSessionItems(items, options = {}) {
         this.clearPendingTools();
         const renderedPendingTools = new Map();
         if (options.updateFooter) {
             this.footer.invalidate();
             this.updateEditorBorderColor();
         }
-        for (const message of sessionContext.messages) {
+        for (const item of items) {
+            if (isCustomSessionEntry(item)) {
+                this.addCustomEntryToChat(item);
+                continue;
+            }
+            const message = item;
             // Assistant messages need special handling for tool calls
             if (message.role === "assistant") {
                 this.addMessageToChat(message);
@@ -2904,10 +2907,24 @@ export class InteractiveMode {
         }
         this.ui.requestRender();
     }
+    /**
+     * Render session entries to chat. Used for initial load and rebuild after compaction.
+     * @param entries Compaction-aware session entries to render
+     * @param options.updateFooter Update footer state
+     * @param options.populateHistory Add user messages to editor history
+     */
+    renderSessionEntries(entries, options = {}) {
+        const items = entries.flatMap((entry) => {
+            if (entry.type === "custom") {
+                return [entry];
+            }
+            return sessionEntryToContextMessages(entry);
+        });
+        this.renderSessionItems(items, options);
+    }
     renderInitialMessages() {
-        // Get aligned messages and entries from session context
-        const context = this.sessionManager.buildSessionContext();
-        this.renderSessionContext(context, {
+        const entries = this.sessionManager.buildContextEntries();
+        this.renderSessionEntries(entries, {
             updateFooter: true,
             populateHistory: true,
         });
@@ -2942,8 +2959,7 @@ export class InteractiveMode {
     }
     rebuildChatFromMessages() {
         this.chatContainer.clear();
-        const context = this.sessionManager.buildSessionContext();
-        this.renderSessionContext(context);
+        this.renderSessionEntries(this.sessionManager.buildContextEntries());
     }
     // =========================================================================
     // Key handlers
@@ -3557,6 +3573,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(),
@@ -3658,6 +3675,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);
@@ -3668,6 +3702,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);
@@ -3999,16 +4036,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 {
@@ -4039,9 +4076,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;
                 }
@@ -4082,7 +4118,7 @@ export class InteractiveMode {
         });
     }
     async handleResumeSession(sessionPath, options) {
-        this.stopWorkingLoader();
+        this.clearStatusIndicator();
         try {
             const result = await this.runtimeHost.switchSession(sessionPath, {
                 withSession: options?.withSession,
@@ -4477,6 +4513,7 @@ export class InteractiveMode {
                 return;
             }
             this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
+            this.outputPad = this.settingsManager.getOutputPad();
             this.rebuildChatFromMessages();
             chatRestoredBeforeSessionStart = true;
         };
@@ -4500,7 +4537,11 @@ 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);
@@ -4579,7 +4620,7 @@ export class InteractiveMode {
             return;
         }
         try {
-            this.stopWorkingLoader();
+            this.clearStatusIndicator();
             const result = await this.runtimeHost.importFromJsonl(inputPath);
             if (result.cancelled) {
                 this.showStatus("Import cancelled");
@@ -4882,7 +4923,7 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     async handleClearCommand() {
-        this.stopWorkingLoader();
+        this.clearStatusIndicator();
         try {
             const result = await this.runtimeHost.newSession();
             if (result.cancelled) {
@@ -5015,8 +5056,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);
         }
@@ -5028,7 +5068,7 @@ export class InteractiveMode {
         if (this.settingsManager.getShowTerminalProgress()) {
             this.ui.terminal.setProgress(false);
         }
-        this.stopWorkingLoader();
+        this.clearStatusIndicator();
         this.clearPendingTools();
         this.clearActiveToolExecutionStatus();
         this.clearToolHookStatuses();