@psnext/slingcli 2.5.20260623-1 → 2.5.20260705-1

package/node_modules/@earendil-works/pi-coding-agent/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, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
@@ -21,7 +21,7 @@ import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScop
 import { DefaultPackageManager } from "../../core/package-manager.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";
@@ -40,8 +40,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 { ScopedModelsSelectorComponent } from "./components/scoped-models-select
 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";
@@ -81,6 +82,9 @@ class ExpandableText extends Text {
         this.setText(expanded ? this.getExpandedText() : this.getCollapsedText());
     }
 }
+function isCustomSessionEntry(item) {
+    return "type" in item && item.type === "custom";
+}
 const DEAD_TERMINAL_ERROR_CODES = new Set(["EIO", "EPIPE", "ENOTCONN"]);
 function isDeadTerminalError(error) {
     if (!error || typeof error !== "object" || !("code" in error)) {
@@ -134,6 +138,7 @@ export function isApiKeyLoginProvider(providerId, oauthProviderIds, builtInProvi
 export class InteractiveMode {
     runtimeHost;
     ui;
+    loadedResourcesContainer;
     chatContainer;
     pendingMessagesContainer;
     statusContainer;
@@ -152,7 +157,8 @@ export class InteractiveMode {
     isInitialized = false;
     onInputCallback;
     pendingUserInputs = [];
-    loadingAnimation = undefined;
+    activeStatusIndicator = undefined;
+    idleStatus = new IdleStatus();
     workingMessage = undefined;
     workingVisible = true;
     workingIndicatorOptions = undefined;
@@ -176,6 +182,7 @@ export class InteractiveMode {
     toolOutputExpanded = false;
     // Thinking block visibility state
     hideThinkingBlock = false;
+    outputPad = 1;
     // Skill commands: command name -> skill file path
     skillCommands = new Map();
     // Agent subscription unsubscribe function
@@ -188,11 +195,8 @@ export class InteractiveMode {
     // Track pending bash components (shown in pending area, moved to chat on submit)
     pendingBashComponents = [];
     // Auto-compaction state
-    autoCompactionLoader = undefined;
     autoCompactionEscapeHandler;
     // Auto-retry state
-    retryLoader = undefined;
-    retryCountdown = undefined;
     retryEscapeHandler;
     // Messages queued while compaction is running
     compactionQueuedMessages = [];
@@ -246,6 +250,7 @@ export class InteractiveMode {
         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();
@@ -267,6 +272,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());
@@ -439,8 +445,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);
@@ -490,7 +498,7 @@ export class InteractiveMode {
                 hint("app.tools.expand", "more"),
             ].join(theme.fg("muted", " · "));
             const compactOnboarding = theme.fg("dim", `Press ${keyText("app.tools.expand")} to show full startup help and loaded resources.`);
-            const onboarding = theme.fg("dim", `Sling can explain its own features and look up its docs. Ask it how to use or extend Sling.`);
+            const onboarding = theme.fg("dim", `Pi can explain its own features and look up its docs. Ask it how to use or extend Pi.`);
             this.builtInHeader = new ExpandableText(() => `${logo}\n${compactInstructions}\n${compactOnboarding}\n\n${onboarding}`, () => `${logo}\n${expandedInstructions}\n\n${onboarding}`, this.getStartupExpansionState(), 1, 0);
             // Setup UI layout
             this.headerContainer.addChild(new Spacer(1));
@@ -657,7 +665,7 @@ export class InteractiveMode {
             return "tmux extended-keys is off. Modified Enter keys may not work. Add `set -g extended-keys on` to ~/.tmux.conf and restart tmux.";
         }
         if (extendedKeysFormat === "xterm") {
-            return "tmux extended-keys-format is xterm. Sling works best with csi-u. Add `set -g extended-keys-format csi-u` to ~/.tmux.conf and restart tmux.";
+            return "tmux extended-keys-format is xterm. Pi works best with csi-u. Add `set -g extended-keys-format csi-u` to ~/.tmux.conf and restart tmux.";
         }
         return undefined;
     }
@@ -990,6 +998,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) {
@@ -1005,8 +1015,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();
@@ -1040,7 +1050,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");
@@ -1103,14 +1113,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;
@@ -1126,14 +1136,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));
             }
         }
     }
@@ -1151,11 +1161,7 @@ export class InteractiveMode {
             commandContextActions: {
                 waitForIdle: () => this.session.agent.waitForIdle(),
                 newSession: async (options) => {
-                    if (this.loadingAnimation) {
-                        this.loadingAnimation.stop();
-                        this.loadingAnimation = undefined;
-                    }
-                    this.statusContainer.clear();
+                    this.clearStatusIndicator();
                     try {
                         return await this.runtimeHost.newSession(options);
                     }
@@ -1225,8 +1231,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);
@@ -1261,6 +1272,7 @@ export class InteractiveMode {
         process.exit(1);
     }
     renderCurrentSessionState() {
+        this.loadedResourcesContainer.clear();
         this.chatContainer.clear();
         this.pendingMessagesContainer.clear();
         this.compactionQueuedMessages = [];
@@ -1338,36 +1350,41 @@ export class InteractiveMode {
         this.footerDataProvider.setExtensionStatus(key, text);
         this.ui.requestRender();
     }
-    getWorkingLoaderMessage() {
-        return this.workingMessage ?? this.defaultWorkingMessage;
-    }
-    createWorkingLoader() {
-        return new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), this.getWorkingLoaderMessage(), this.workingIndicatorOptions);
+    showStatusIndicator(indicator) {
+        this.activeStatusIndicator?.dispose();
+        this.activeStatusIndicator = indicator;
+        this.statusContainer.clear();
+        this.statusContainer.addChild(indicator);
     }
-    stopWorkingLoader() {
-        if (this.loadingAnimation) {
-            this.loadingAnimation.stop();
-            this.loadingAnimation = undefined;
+    clearStatusIndicator(kind) {
+        if (kind && this.activeStatusIndicator?.kind !== kind) {
+            return;
         }
+        const hadActiveStatusIndicator = this.activeStatusIndicator !== undefined;
+        this.activeStatusIndicator?.dispose();
+        this.activeStatusIndicator = 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.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.workingIndicatorOptions));
         }
         this.ui.requestRender();
     }
     setWorkingIndicator(options) {
         this.workingIndicatorOptions = options;
-        this.loadingAnimation?.setIndicator(options);
+        if (this.activeStatusIndicator?.kind === "working") {
+            this.activeStatusIndicator.setIndicator(options);
+        }
         this.ui.requestRender();
     }
     setHiddenThinkingLabel(label) {
@@ -1455,8 +1472,8 @@ export class InteractiveMode {
         this.workingMessage = undefined;
         this.workingVisible = true;
         this.setWorkingIndicator();
-        if (this.loadingAnimation) {
-            this.loadingAnimation.setMessage(`${this.defaultWorkingMessage} (${keyText("app.interrupt")} to interrupt)`);
+        if (this.activeStatusIndicator?.kind === "working") {
+            this.activeStatusIndicator.setMessage(`${this.defaultWorkingMessage} (${keyText("app.interrupt")} to interrupt)`);
         }
         this.setHiddenThinkingLabel();
     }
@@ -1596,8 +1613,8 @@ export class InteractiveMode {
             setStatus: (key, text) => this.setExtensionStatus(key, text),
             setWorkingMessage: (message) => {
                 this.workingMessage = message;
-                if (this.loadingAnimation) {
-                    this.loadingAnimation.setMessage(message ?? this.defaultWorkingMessage);
+                if (this.activeStatusIndicator?.kind === "working") {
+                    this.activeStatusIndicator.setMessage(message ?? this.defaultWorkingMessage);
                 }
             },
             setWorkingVisible: (visible) => this.setWorkingVisible(visible),
@@ -1741,7 +1758,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);
@@ -2216,18 +2233,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.loadingAnimation = this.createWorkingLoader();
-                    this.statusContainer.addChild(this.loadingAnimation);
+                    this.showStatusIndicator(new WorkingStatusIndicator(this.ui, this.workingMessage ?? this.defaultWorkingMessage, this.workingIndicatorOptions));
+                }
+                else {
+                    this.clearStatusIndicator();
                 }
                 this.ui.requestRender();
                 break;
@@ -2235,6 +2245,12 @@ export class InteractiveMode {
                 this.updatePendingMessagesDisplay();
                 this.ui.requestRender();
                 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();
@@ -2255,7 +2271,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.streamingMessage = event.message;
                     this.chatContainer.addChild(this.streamingComponent);
                     this.streamingComponent.updateContent(this.streamingMessage);
@@ -2363,11 +2379,7 @@ export class InteractiveMode {
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(false);
                 }
-                if (this.loadingAnimation) {
-                    this.loadingAnimation.stop();
-                    this.loadingAnimation = undefined;
-                    this.statusContainer.clear();
-                }
+                this.clearStatusIndicator("working");
                 if (this.streamingComponent) {
                     this.chatContainer.removeChild(this.streamingComponent);
                     this.streamingComponent = undefined;
@@ -2386,13 +2398,7 @@ export class InteractiveMode {
                 this.defaultEditor.onEscape = () => {
                     this.session.abortCompaction();
                 };
-                this.statusContainer.clear();
-                const cancelHint = `(${keyText("app.interrupt")} to cancel)`;
-                const label = event.reason === "manual"
-                    ? `Compacting context... ${cancelHint}`
-                    : `${event.reason === "overflow" ? "Context overflow detected, " : ""}Auto-compacting... ${cancelHint}`;
-                this.autoCompactionLoader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), label);
-                this.statusContainer.addChild(this.autoCompactionLoader);
+                this.showStatusIndicator(new CompactionStatusIndicator(this.ui, event.reason));
                 this.ui.requestRender();
                 break;
             }
@@ -2404,11 +2410,7 @@ export class InteractiveMode {
                     this.defaultEditor.onEscape = this.autoCompactionEscapeHandler;
                     this.autoCompactionEscapeHandler = undefined;
                 }
-                if (this.autoCompactionLoader) {
-                    this.autoCompactionLoader.stop();
-                    this.autoCompactionLoader = undefined;
-                    this.statusContainer.clear();
-                }
+                this.clearStatusIndicator("compaction");
                 if (event.aborted) {
                     if (event.reason === "manual") {
                         this.showError("Compaction cancelled");
@@ -2442,17 +2444,7 @@ export class InteractiveMode {
                 this.defaultEditor.onEscape = () => {
                     this.session.abortRetry();
                 };
-                // 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;
             }
@@ -2462,16 +2454,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"}`);
@@ -2513,6 +2496,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": {
@@ -2562,12 +2564,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) {
@@ -2577,7 +2579,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);
                 this.chatContainer.addChild(assistantComponent);
                 break;
             }
@@ -2590,20 +2592,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.pendingTools.clear();
         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);
@@ -2654,10 +2655,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,
         });
@@ -2677,7 +2692,7 @@ export class InteractiveMode {
         if (this.chatContainer.children.length > 0) {
             this.chatContainer.addChild(new Spacer(1));
         }
-        this.chatContainer.addChild(new Text(theme.fg("warning", `This project is not trusted. Project ${CONFIG_DIR_NAME} resources and packages are ignored. Use /trust to save a trust decision, then restart sling.`), 1, 0));
+        this.chatContainer.addChild(new Text(theme.fg("warning", `This project is not trusted. Project ${CONFIG_DIR_NAME} resources and packages are ignored. Use /trust to save a trust decision, then restart pi.`), 1, 0));
     }
     async getUserInput() {
         const queuedInput = this.pendingUserInputs.shift();
@@ -2693,8 +2708,7 @@ export class InteractiveMode {
     }
     rebuildChatFromMessages() {
         this.chatContainer.clear();
-        const context = this.sessionManager.buildSessionContext();
-        this.renderSessionContext(context);
+        this.renderSessionEntries(this.sessionManager.buildContextEntries());
     }
     // =========================================================================
     // Key handlers
@@ -2791,7 +2805,7 @@ export class InteractiveMode {
             this.ui.stop();
         }
         catch { }
-        console.error("sling exiting due to uncaughtException:");
+        console.error("pi exiting due to uncaughtException:");
         console.error(error);
         process.exit(1);
     }
@@ -2965,9 +2979,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();
@@ -2987,10 +3003,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();
@@ -3294,6 +3309,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(),
@@ -3395,6 +3411,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);
@@ -3405,6 +3438,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);
@@ -3527,7 +3563,7 @@ export class InteractiveMode {
                 onSelect: (selection) => {
                     trustStore.setMany(selection.updates);
                     done();
-                    this.showStatus(`Saved trust decision: ${selection.trusted ? "trusted" : "untrusted"}. Restart sling for this to take effect.`);
+                    this.showStatus(`Saved trust decision: ${selection.trusted ? "trusted" : "untrusted"}. Restart pi for this to take effect.`);
                 },
                 onCancel: () => {
                     done();
@@ -3722,16 +3758,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 {
@@ -3762,9 +3798,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;
                 }
@@ -3805,11 +3840,7 @@ export class InteractiveMode {
         });
     }
     async handleResumeSession(sessionPath, options) {
-        if (this.loadingAnimation) {
-            this.loadingAnimation.stop();
-            this.loadingAnimation = undefined;
-        }
-        this.statusContainer.clear();
+        this.clearStatusIndicator();
         try {
             const result = await this.runtimeHost.switchSession(sessionPath, {
                 withSession: options?.withSession,
@@ -4202,6 +4233,7 @@ export class InteractiveMode {
                 return;
             }
             this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
+            this.outputPad = this.settingsManager.getOutputPad();
             this.rebuildChatFromMessages();
             chatRestoredBeforeSessionStart = true;
         };
@@ -4225,7 +4257,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);
@@ -4304,11 +4340,7 @@ export class InteractiveMode {
             return;
         }
         try {
-            if (this.loadingAnimation) {
-                this.loadingAnimation.stop();
-                this.loadingAnimation = undefined;
-            }
-            this.statusContainer.clear();
+            this.clearStatusIndicator();
             const result = await this.runtimeHost.importFromJsonl(inputPath);
             if (result.cancelled) {
                 this.showStatus("Import cancelled");
@@ -4454,8 +4486,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() {
@@ -4630,11 +4666,7 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     async handleClearCommand() {
-        if (this.loadingAnimation) {
-            this.loadingAnimation.stop();
-            this.loadingAnimation = undefined;
-        }
-        this.statusContainer.clear();
+        this.clearStatusIndicator();
         try {
             const result = await this.runtimeHost.newSession();
             if (result.cancelled) {
@@ -4761,11 +4793,7 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     async handleCompactCommand(customInstructions) {
-        if (this.loadingAnimation) {
-            this.loadingAnimation.stop();
-            this.loadingAnimation = undefined;
-        }
-        this.statusContainer.clear();
+        this.clearStatusIndicator();
         try {
             await this.session.compact(customInstructions);
         }
@@ -4777,10 +4805,7 @@ export class InteractiveMode {
         if (this.settingsManager.getShowTerminalProgress()) {
             this.ui.terminal.setProgress(false);
         }
-        if (this.loadingAnimation) {
-            this.loadingAnimation.stop();
-            this.loadingAnimation = undefined;
-        }
+        this.clearStatusIndicator();
         this.themeController.disableAutoSync();
         this.clearExtensionTerminalInputListeners();
         this.footer.dispose();