@leanandmean/coding-agent 0.74.1-scramjet.24 → 0.74.1-scramjet.26

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

@@ -19,7 +19,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 { describeRuntimeError } from "../../core/resource-loader.js";
-import { parseScramjetCommandBlock } from "../../core/scramjet-command-parser.js"; // SCRAMJET-DIVERGENCE: scramjet-command block parsing (issue 82)
+import { indexScramjetCommandStarts, parseScramjetCommandBlock, restoreScramjetCommandInvocation, } from "../../core/scramjet-command-parser.js"; // SCRAMJET-DIVERGENCE: scramjet-command restoration (issues 82, 414)
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
@@ -108,7 +108,9 @@ export class InteractiveMode {
     options;
     runtimeHost;
     ui;
+    committedChatContainer;
     chatContainer;
+    mutableChatComponents = new Set();
     pendingMessagesContainer;
     statusContainer;
     defaultEditor;
@@ -150,6 +152,8 @@ export class InteractiveMode {
     streamingMessage = undefined;
     // Tool execution tracking: toolCallId -> component
     pendingTools = new Map();
+    pendingToolFinalizations = new Set();
+    agentRunGeneration = 0;
     // Tool output expansion state
     toolOutputExpanded = false;
     // Thinking block visibility state
@@ -217,9 +221,10 @@ export class InteractiveMode {
             await this.rebindCurrentSession();
         });
         this.version = VERSION;
-        this.ui = new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor());
-        this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
+        // SCRAMJET-DIVERGENCE: mandatory committed/live rendering and injectable terminals (#389).
+        this.ui = new TUI(options.terminal ?? new ProcessTerminal(), this.settingsManager.getShowHardwareCursor());
         this.headerContainer = new Container();
+        this.committedChatContainer = new Container();
         this.chatContainer = new Container();
         this.pendingMessagesContainer = new Container();
         this.statusContainer = new Container();
@@ -250,6 +255,73 @@ export class InteractiveMode {
         this.detectedClassification = detectThemeFromEnvironment()?.theme;
         initTheme(this.settingsManager.getTheme(), true);
     }
+    // SCRAMJET-DIVERGENCE: finalized transcript components are promoted atomically into append-only history (#389).
+    promoteFinalizedChatPrefix() {
+        let promoted = false;
+        while (this.chatContainer.children.length > 0) {
+            const child = this.chatContainer.children[0];
+            if (this.mutableChatComponents.has(child))
+                break;
+            this.chatContainer.removeChild(child);
+            if (child instanceof ToolExecutionComponent)
+                child.markCommitted();
+            this.committedChatContainer.addChild(child);
+            promoted = true;
+        }
+        if (promoted)
+            this.ui.commit();
+    }
+    setChatComponentMutable(component, mutable) {
+        if (mutable)
+            this.mutableChatComponents.add(component);
+        else
+            this.mutableChatComponents.delete(component);
+    }
+    sealStatus() {
+        if (this.lastStatusSpacer)
+            this.mutableChatComponents.delete(this.lastStatusSpacer);
+        if (this.lastStatusText)
+            this.mutableChatComponents.delete(this.lastStatusText);
+        this.lastStatusSpacer = undefined;
+        this.lastStatusText = undefined;
+        this.promoteFinalizedChatPrefix();
+    }
+    clearTranscript() {
+        this.pendingToolFinalizations = new Set();
+        const tools = new Set([
+            ...this.pendingTools.values(),
+            ...this.committedChatContainer.children.filter((component) => component instanceof ToolExecutionComponent),
+            ...this.chatContainer.children.filter((component) => component instanceof ToolExecutionComponent),
+        ]);
+        for (const tool of tools)
+            tool.detach();
+        this.committedChatContainer.clear();
+        this.chatContainer.clear();
+        this.mutableChatComponents.clear();
+        this.lastStatusSpacer = undefined;
+        this.lastStatusText = undefined;
+        this.ui.rebuild();
+    }
+    updateToolImagePresentation(update) {
+        for (const container of [this.committedChatContainer, this.chatContainer]) {
+            for (const child of container.children) {
+                if (child instanceof ToolExecutionComponent)
+                    update(child);
+            }
+        }
+        this.ui.rebuild();
+    }
+    commitFinalizedChatOutput() {
+        this.sealStatus();
+        this.ui.requestRender();
+    }
+    bindThemeChangeHandler() {
+        onThemeChange(() => {
+            this.ui.invalidate();
+            this.updateEditorBorderColor();
+            this.ui.rebuild();
+        });
+    }
     // SCRAMJET-DIVERGENCE: re-resolve the theme after extension themes register (or after a reload),
     // so scramjet-dark can take effect once it becomes available. An explicit user setting still wins
     // via the resolver; the captured classification (env-seeded + OSC-updated) drives auto-detection.
@@ -408,6 +480,7 @@ export class InteractiveMode {
             this.chatContainer.addChild(new Spacer(1));
         }
         this.chatContainer.addChild(new DynamicBorder());
+        this.promoteFinalizedChatPrefix();
     }
     async init() {
         if (this.isInitialized)
@@ -434,7 +507,9 @@ export class InteractiveMode {
         }
         // Add header container as first child (content built after theme detection below)
         this.ui.addChild(this.headerContainer);
+        this.ui.addChild(this.committedChatContainer);
         this.ui.addChild(this.chatContainer);
+        this.ui.setLiveRegionStart(this.chatContainer);
         this.ui.addChild(this.pendingMessagesContainer);
         this.ui.addChild(this.statusContainer);
         this.renderWidgets(); // Initialize with default spacer
@@ -512,11 +587,7 @@ export class InteractiveMode {
         // Render initial messages AFTER showing loaded resources
         this.renderInitialMessages();
         // Set up theme file watcher
-        onThemeChange(() => {
-            this.ui.invalidate();
-            this.updateEditorBorderColor();
-            this.ui.requestRender();
-        });
+        this.bindThemeChangeHandler();
         // Set up git branch watcher (uses provider instead of footer)
         this.footerDataProvider.onBranchChange(() => {
             this.ui.requestRender();
@@ -1169,7 +1240,7 @@ export class InteractiveMode {
                     if (result.cancelled) {
                         return { cancelled: true };
                     }
-                    this.chatContainer.clear();
+                    this.clearTranscript();
                     this.renderInitialMessages();
                     if (result.editorText && !this.editor.getText().trim()) {
                         this.editor.setText(result.editorText);
@@ -1204,6 +1275,7 @@ export class InteractiveMode {
         this.setupExtensionShortcuts(extensionRunner);
         this.showLoadedResources({ force: false, showDiagnosticsWhenQuiet: true });
         this.showStartupNoticesIfNeeded();
+        this.promoteFinalizedChatPrefix();
     }
     applyRuntimeSettings() {
         this.footer.setSession(this.session);
@@ -1211,7 +1283,6 @@ export class InteractiveMode {
         this.footerDataProvider.setCwd(this.sessionManager.getCwd());
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
         this.ui.setShowHardwareCursor(this.settingsManager.getShowHardwareCursor());
-        this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
         const editorPaddingX = this.settingsManager.getEditorPaddingX();
         const autocompleteMaxVisible = this.settingsManager.getAutocompleteMaxVisible();
         this.defaultEditor.setPaddingX(editorPaddingX);
@@ -1262,7 +1333,7 @@ export class InteractiveMode {
         process.exit(1);
     }
     renderCurrentSessionState() {
-        this.chatContainer.clear();
+        this.clearTranscript();
         this.pendingMessagesContainer.clear();
         this.compactionQueuedMessages = [];
         this.streamingComponent = undefined;
@@ -1372,7 +1443,7 @@ export class InteractiveMode {
     }
     setHiddenThinkingLabel(label) {
         this.hiddenThinkingLabel = label ?? this.defaultHiddenThinkingLabel;
-        for (const child of this.chatContainer.children) {
+        for (const child of [...this.committedChatContainer.children, ...this.chatContainer.children]) {
             if (child instanceof AssistantMessageComponent) {
                 child.setHiddenThinkingLabel(this.hiddenThinkingLabel);
             }
@@ -1380,7 +1451,7 @@ export class InteractiveMode {
         if (this.streamingComponent) {
             this.streamingComponent.setHiddenThinkingLabel(this.hiddenThinkingLabel);
         }
-        this.ui.requestRender();
+        this.ui.rebuild();
     }
     /**
      * Set an extension widget (string array or custom component).
@@ -1554,7 +1625,7 @@ export class InteractiveMode {
                 this.headerContainer.children[index] = this.builtInHeader;
             }
         }
-        this.ui.requestRender();
+        this.ui.rebuild();
     }
     addExtensionTerminalInputListener(handler) {
         const unsubscribe = this.ui.addInputListener(handler);
@@ -1913,7 +1984,7 @@ export class InteractiveMode {
                 this.chatContainer.addChild(new Text(stackLines, 1, 0));
             }
         }
-        this.ui.requestRender();
+        this.commitFinalizedChatOutput();
     }
     // =========================================================================
     // Key Handlers
@@ -2187,7 +2258,9 @@ export class InteractiveMode {
         this.footer.invalidate();
         switch (event.type) {
             case "agent_start":
+                this.agentRunGeneration += 1;
                 this.pendingTools.clear();
+                this.pendingToolFinalizations = new Set();
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(true);
                 }
@@ -2226,6 +2299,7 @@ export class InteractiveMode {
                 this.updateEditorBorderColor();
                 break;
             case "message_start":
+                this.sealStatus();
                 if (event.message.role === "custom") {
                     this.addMessageToChat(event.message);
                     this.ui.requestRender();
@@ -2236,9 +2310,10 @@ 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, false);
                     this.streamingMessage = event.message;
                     this.chatContainer.addChild(this.streamingComponent);
+                    this.setChatComponentMutable(this.streamingComponent, true);
                     this.streamingComponent.updateContent(this.streamingMessage);
                     this.ui.requestRender();
                 }
@@ -2256,6 +2331,7 @@ export class InteractiveMode {
                                 }, this.getRegisteredToolDefinition(content.name), this.ui, this.sessionManager.getCwd());
                                 component.setExpanded(this.toolOutputExpanded);
                                 this.chatContainer.addChild(component);
+                                this.setChatComponentMutable(component, true);
                                 this.pendingTools.set(content.id, component);
                             }
                             else {
@@ -2284,6 +2360,8 @@ export class InteractiveMode {
                         this.streamingMessage.errorMessage = errorMessage;
                     }
                     this.streamingComponent.updateContent(this.streamingMessage);
+                    this.streamingComponent.setFinalized(true);
+                    this.setChatComponentMutable(this.streamingComponent, false);
                     if (this.streamingMessage.stopReason === "aborted" || this.streamingMessage.stopReason === "error") {
                         if (!errorMessage) {
                             errorMessage = this.streamingMessage.errorMessage || "Error";
@@ -2293,6 +2371,8 @@ export class InteractiveMode {
                                 content: [{ type: "text", text: errorMessage }],
                                 isError: true,
                             });
+                            component.seal();
+                            this.setChatComponentMutable(component, false);
                         }
                         this.pendingTools.clear();
                     }
@@ -2302,6 +2382,7 @@ export class InteractiveMode {
                             component.setArgsComplete();
                         }
                     }
+                    this.promoteFinalizedChatPrefix();
                     this.streamingComponent = undefined;
                     this.streamingMessage = undefined;
                     this.footer.invalidate();
@@ -2309,6 +2390,7 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 break;
             case "tool_execution_start": {
+                this.sealStatus();
                 let component = this.pendingTools.get(event.toolCallId);
                 if (!component) {
                     component = new ToolExecutionComponent(event.toolName, event.toolCallId, event.args, {
@@ -2317,6 +2399,7 @@ export class InteractiveMode {
                     }, this.getRegisteredToolDefinition(event.toolName), this.ui, this.sessionManager.getCwd());
                     component.setExpanded(this.toolOutputExpanded);
                     this.chatContainer.addChild(component);
+                    this.setChatComponentMutable(component, true);
                     this.pendingTools.set(event.toolCallId, component);
                 }
                 component.markExecutionStarted();
@@ -2335,12 +2418,34 @@ export class InteractiveMode {
                 const component = this.pendingTools.get(event.toolCallId);
                 if (component) {
                     component.updateResult({ ...event.result, isError: event.isError });
-                    this.pendingTools.delete(event.toolCallId);
-                    this.ui.requestRender();
+                    const pendingToolFinalizations = this.pendingToolFinalizations;
+                    const finalization = component.waitForImageConversions().then(() => {
+                        component.seal();
+                        if (this.pendingTools.get(event.toolCallId) === component) {
+                            this.pendingTools.delete(event.toolCallId);
+                        }
+                        if (this.mutableChatComponents.has(component) && this.chatContainer.children.includes(component)) {
+                            this.setChatComponentMutable(component, false);
+                            this.promoteFinalizedChatPrefix();
+                            this.ui.requestRender();
+                        }
+                    });
+                    pendingToolFinalizations.add(finalization);
+                    try {
+                        await finalization;
+                    }
+                    finally {
+                        pendingToolFinalizations.delete(finalization);
+                    }
                 }
                 break;
             }
-            case "agent_end":
+            case "agent_end": {
+                const runGeneration = this.agentRunGeneration;
+                const pendingToolFinalizations = this.pendingToolFinalizations;
+                await Promise.all(pendingToolFinalizations);
+                if (runGeneration !== this.agentRunGeneration || pendingToolFinalizations !== this.pendingToolFinalizations)
+                    break;
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(false);
                 }
@@ -2351,13 +2456,20 @@ export class InteractiveMode {
                 }
                 if (this.streamingComponent) {
                     this.chatContainer.removeChild(this.streamingComponent);
+                    this.setChatComponentMutable(this.streamingComponent, false);
                     this.streamingComponent = undefined;
                     this.streamingMessage = undefined;
                 }
+                for (const component of this.pendingTools.values()) {
+                    component.seal();
+                    this.setChatComponentMutable(component, false);
+                }
                 this.pendingTools.clear();
+                this.promoteFinalizedChatPrefix();
                 await this.checkShutdownRequested();
                 this.ui.requestRender();
                 break;
+            }
             case "compaction_start": {
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(true);
@@ -2399,7 +2511,6 @@ export class InteractiveMode {
                     }
                 }
                 else if (event.result) {
-                    this.chatContainer.clear();
                     this.rebuildChatFromMessages();
                     this.addMessageToChat(createCompactionSummaryMessage(event.result.summary, event.result.tokensBefore, new Date().toISOString()));
                     this.footer.invalidate();
@@ -2411,6 +2522,7 @@ export class InteractiveMode {
                     else {
                         this.chatContainer.addChild(new Spacer(1));
                         this.chatContainer.addChild(new Text(theme.fg("error", event.errorMessage), 1, 0));
+                        this.commitFinalizedChatOutput();
                     }
                 }
                 void this.flushCompactionQueue({ willRetry: event.willRetry });
@@ -2496,11 +2608,14 @@ export class InteractiveMode {
         const text = new Text(theme.fg("dim", message), 1, 0);
         this.chatContainer.addChild(spacer);
         this.chatContainer.addChild(text);
+        this.setChatComponentMutable(spacer, true);
+        this.setChatComponentMutable(text, true);
         this.lastStatusSpacer = spacer;
         this.lastStatusText = text;
         this.ui.requestRender();
     }
     addMessageToChat(message, options) {
+        this.sealStatus();
         switch (message.role) {
             case "bashExecution": {
                 const component = new BashExecutionComponent(message.command, this.ui, message.excludeFromContext);
@@ -2551,9 +2666,10 @@ export class InteractiveMode {
                             this.chatContainer.addChild(userComponent);
                         }
                         if (options?.populateHistory) {
-                            const compactForm = scramjetBlock.userContext
-                                ? `/${scramjetBlock.name} ${scramjetBlock.userContext}`
-                                : `/${scramjetBlock.name}`;
+                            const compactForm = options.historyText ??
+                                (scramjetBlock.userContext
+                                    ? `/${scramjetBlock.name} ${scramjetBlock.userContext}`
+                                    : `/${scramjetBlock.name}`);
                             this.editor.addToHistory?.(compactForm);
                         }
                     }
@@ -2592,6 +2708,7 @@ export class InteractiveMode {
                 const _exhaustive = message;
             }
         }
+        this.promoteFinalizedChatPrefix();
     }
     /**
      * Render session context to chat. Used for initial load and rebuild after compaction.
@@ -2602,6 +2719,11 @@ export class InteractiveMode {
     renderSessionContext(sessionContext, options = {}) {
         this.pendingTools.clear();
         const renderedPendingTools = new Map();
+        const entries = options.populateHistory ? this.sessionManager.getEntries() : [];
+        const commandStarts = indexScramjetCommandStarts(entries);
+        const entriesByMessage = new Map(entries
+            .filter((entry) => entry.type === "message")
+            .map((entry) => [entry.message, entry]));
         if (options.updateFooter) {
             this.footer.invalidate();
             this.updateEditorBorderColor();
@@ -2619,6 +2741,7 @@ export class InteractiveMode {
                         }, this.getRegisteredToolDefinition(content.name), this.ui, this.sessionManager.getCwd());
                         component.setExpanded(this.toolOutputExpanded);
                         this.chatContainer.addChild(component);
+                        this.setChatComponentMutable(component, true);
                         if (message.stopReason === "aborted" || message.stopReason === "error") {
                             let errorMessage;
                             if (message.stopReason === "aborted") {
@@ -2632,6 +2755,8 @@ export class InteractiveMode {
                                 errorMessage = message.errorMessage || "Error";
                             }
                             component.updateResult({ content: [{ type: "text", text: errorMessage }], isError: true });
+                            component.seal();
+                            this.setChatComponentMutable(component, false);
                         }
                         else {
                             renderedPendingTools.set(content.id, component);
@@ -2647,16 +2772,41 @@ export class InteractiveMode {
                     component.setArgsComplete();
                     component.updateResult(message);
                     renderedPendingTools.delete(message.toolCallId);
+                    if (component.hasPendingImageConversions()) {
+                        const pendingToolFinalizations = this.pendingToolFinalizations;
+                        const finalization = component.waitForImageConversions().then(() => {
+                            if (!this.mutableChatComponents.has(component) ||
+                                !this.chatContainer.children.includes(component)) {
+                                component.seal();
+                                return;
+                            }
+                            component.seal();
+                            this.setChatComponentMutable(component, false);
+                            this.promoteFinalizedChatPrefix();
+                            this.ui.requestRender();
+                        });
+                        pendingToolFinalizations.add(finalization);
+                        void finalization.finally(() => pendingToolFinalizations.delete(finalization));
+                    }
+                    else {
+                        component.seal();
+                        this.setChatComponentMutable(component, false);
+                    }
                 }
             }
             else {
                 // All other messages use standard rendering
-                this.addMessageToChat(message, options);
+                const entry = entriesByMessage.get(message);
+                this.addMessageToChat(message, {
+                    ...options,
+                    historyText: entry ? restoreScramjetCommandInvocation(entry, commandStarts) : undefined,
+                });
             }
         }
         for (const [toolCallId, component] of renderedPendingTools) {
             this.pendingTools.set(toolCallId, component);
         }
+        this.promoteFinalizedChatPrefix();
         this.ui.requestRender();
     }
     renderInitialMessages() {
@@ -2683,7 +2833,7 @@ export class InteractiveMode {
         });
     }
     rebuildChatFromMessages() {
-        this.chatContainer.clear();
+        this.clearTranscript();
         const context = this.sessionManager.buildSessionContext();
         this.renderSessionContext(context);
     }
@@ -2828,7 +2978,7 @@ export class InteractiveMode {
             clearInterval(suspendKeepAlive);
             process.removeListener("SIGINT", ignoreSigint);
             this.ui.start();
-            this.ui.requestRender(true);
+            this.ui.rebuild();
         });
         try {
             // Stop the TUI (restore terminal to normal mode)
@@ -2931,24 +3081,24 @@ export class InteractiveMode {
         if (isExpandable(activeHeader)) {
             activeHeader.setExpanded(expanded);
         }
-        for (const child of this.chatContainer.children) {
+        for (const child of [...this.committedChatContainer.children, ...this.chatContainer.children]) {
             if (isExpandable(child)) {
                 child.setExpanded(expanded);
             }
         }
-        this.ui.requestRender();
+        this.ui.rebuild();
     }
     toggleThinkingBlockVisibility() {
         this.hideThinkingBlock = !this.hideThinkingBlock;
         this.settingsManager.setHideThinkingBlock(this.hideThinkingBlock);
         // Rebuild chat from session messages
-        this.chatContainer.clear();
         this.rebuildChatFromMessages();
         // If streaming, re-add the streaming component with updated visibility and re-render
         if (this.streamingComponent && this.streamingMessage) {
             this.streamingComponent.setHideThinkingBlock(this.hideThinkingBlock);
             this.streamingComponent.updateContent(this.streamingMessage);
             this.chatContainer.addChild(this.streamingComponent);
+            this.setChatComponentMutable(this.streamingComponent, true);
         }
         this.showStatus(`Thinking blocks: ${this.hideThinkingBlock ? "hidden" : "visible"}`);
     }
@@ -2990,8 +3140,7 @@ export class InteractiveMode {
             }
             // Restart TUI
             this.ui.start();
-            // Force full re-render since external editor uses alternate screen
-            this.ui.requestRender(true);
+            this.ui.rebuild();
         }
     }
     // =========================================================================
@@ -3002,14 +3151,18 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     showError(errorMessage) {
+        this.sealStatus();
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(theme.fg("error", `Error: ${errorMessage}`), 1, 0));
         this.chatContainer.addChild(new Spacer(1));
+        this.promoteFinalizedChatPrefix();
         this.ui.requestRender();
     }
     showWarning(warningMessage) {
+        this.sealStatus();
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(theme.fg("warning", `Warning: ${warningMessage}`), 1, 0));
+        this.promoteFinalizedChatPrefix();
         this.ui.requestRender();
     }
     // SCRAMJET-DIVERGENCE: showNewVersionNotification removed (version check gutted).
@@ -3021,7 +3174,7 @@ export class InteractiveMode {
         this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("warning", text)));
         this.chatContainer.addChild(new Text(`${theme.bold(theme.fg("warning", "Package Updates Available"))}\n${updateInstruction}\n${theme.fg("muted", "Packages:")}\n${packageLines}`, 1, 0));
         this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("warning", text)));
-        this.ui.requestRender();
+        this.commitFinalizedChatOutput();
     }
     /**
      * Get all queued messages (read-only).
@@ -3181,11 +3334,14 @@ export class InteractiveMode {
     }
     /** Move pending bash components from pending area to chat */
     flushPendingBashComponents() {
+        if (this.pendingBashComponents.length > 0)
+            this.sealStatus();
         for (const component of this.pendingBashComponents) {
             this.pendingMessagesContainer.removeChild(component);
             this.chatContainer.addChild(component);
         }
         this.pendingBashComponents = [];
+        this.promoteFinalizedChatPrefix();
     }
     // =========================================================================
     // Selectors
@@ -3232,7 +3388,6 @@ export class InteractiveMode {
                 editorPaddingX: this.settingsManager.getEditorPaddingX(),
                 autocompleteMaxVisible: this.settingsManager.getAutocompleteMaxVisible(),
                 quietStartup: this.settingsManager.getQuietStartup(),
-                clearOnShrink: this.settingsManager.getClearOnShrink(),
                 showTerminalProgress: this.settingsManager.getShowTerminalProgress(),
                 warnings: this.settingsManager.getWarnings(),
             }, {
@@ -3242,19 +3397,11 @@ export class InteractiveMode {
                 },
                 onShowImagesChange: (enabled) => {
                     this.settingsManager.setShowImages(enabled);
-                    for (const child of this.chatContainer.children) {
-                        if (child instanceof ToolExecutionComponent) {
-                            child.setShowImages(enabled);
-                        }
-                    }
+                    this.updateToolImagePresentation((component) => component.setShowImages(enabled));
                 },
                 onImageWidthCellsChange: (width) => {
                     this.settingsManager.setImageWidthCells(width);
-                    for (const child of this.chatContainer.children) {
-                        if (child instanceof ToolExecutionComponent) {
-                            child.setImageWidthCells(width);
-                        }
-                    }
+                    this.updateToolImagePresentation((component) => component.setImageWidthCells(width));
                 },
                 onAutoResizeImagesChange: (enabled) => {
                     this.settingsManager.setImageAutoResize(enabled);
@@ -3300,12 +3447,11 @@ export class InteractiveMode {
                 onHideThinkingBlockChange: (hidden) => {
                     this.hideThinkingBlock = hidden;
                     this.settingsManager.setHideThinkingBlock(hidden);
-                    for (const child of this.chatContainer.children) {
+                    for (const child of [...this.committedChatContainer.children, ...this.chatContainer.children]) {
                         if (child instanceof AssistantMessageComponent) {
                             child.setHideThinkingBlock(hidden);
                         }
                     }
-                    this.chatContainer.clear();
                     this.rebuildChatFromMessages();
                 },
                 onCollapseChangelogChange: (collapsed) => {
@@ -3341,10 +3487,6 @@ export class InteractiveMode {
                         this.editor.setAutocompleteMaxVisible(maxVisible);
                     }
                 },
-                onClearOnShrinkChange: (enabled) => {
-                    this.settingsManager.setClearOnShrink(enabled);
-                    this.ui.setClearOnShrink(enabled);
-                },
                 onShowTerminalProgressChange: (enabled) => {
                     this.settingsManager.setShowTerminalProgress(enabled);
                 },
@@ -3646,7 +3788,7 @@ export class InteractiveMode {
                         return;
                     }
                     // Update UI
-                    this.chatContainer.clear();
+                    this.clearTranscript();
                     this.renderInitialMessages();
                     if (result.editorText && !this.editor.getText().trim()) {
                         this.editor.setText(result.editorText);
@@ -4081,7 +4223,7 @@ export class InteractiveMode {
         this.editorContainer.clear();
         this.editorContainer.addChild(reloadBox);
         this.ui.setFocus(reloadBox);
-        this.ui.requestRender(true);
+        this.ui.rebuild();
         await new Promise((resolve) => process.nextTick(resolve));
         const dismissReloadBox = (editor) => {
             this.editorContainer.clear();
@@ -4111,7 +4253,6 @@ export class InteractiveMode {
                 this.editor.setAutocompleteMaxVisible?.(autocompleteMaxVisible);
             }
             this.ui.setShowHardwareCursor(this.settingsManager.getShowHardwareCursor());
-            this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
             this.setupAutocompleteProvider();
             const runner = this.session.extensionRunner;
             this.setupExtensionShortcuts(runner);
@@ -4247,13 +4388,13 @@ export class InteractiveMode {
             else {
                 this.showWarning("Usage: /name <name>");
             }
-            this.ui.requestRender();
+            this.commitFinalizedChatOutput();
             return;
         }
         this.session.setSessionName(name);
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(theme.fg("dim", `Session name set: ${name}`), 1, 0));
-        this.ui.requestRender();
+        this.commitFinalizedChatOutput();
     }
     handleSessionCommand() {
         const stats = this.session.getSessionStats();
@@ -4286,7 +4427,7 @@ export class InteractiveMode {
         }
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(info, 1, 0));
-        this.ui.requestRender();
+        this.commitFinalizedChatOutput();
     }
     handleChangelogCommand() {
         const changelogPath = getChangelogPath();
@@ -4303,7 +4444,7 @@ export class InteractiveMode {
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Markdown(changelogMarkdown, 1, 1, this.getMarkdownThemeWithSettings()));
         this.chatContainer.addChild(new DynamicBorder());
-        this.ui.requestRender();
+        this.commitFinalizedChatOutput();
     }
     /**
      * Get capitalized display string for an app keybinding action.
@@ -4424,7 +4565,7 @@ export class InteractiveMode {
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Markdown(hotkeys.trim(), 1, 1, this.getMarkdownThemeWithSettings()));
         this.chatContainer.addChild(new DynamicBorder());
-        this.ui.requestRender();
+        this.commitFinalizedChatOutput();
     }
     async handleClearCommand() {
         if (this.loadingAnimation) {
@@ -4440,7 +4581,7 @@ export class InteractiveMode {
             this.renderCurrentSessionState();
             this.chatContainer.addChild(new Spacer(1));
             this.chatContainer.addChild(new Text(`${theme.fg("accent", "✓ New session started")}`, 1, 1));
-            this.ui.requestRender();
+            this.commitFinalizedChatOutput();
         }
         catch (error) {
             await this.handleFatalRuntimeError("Failed to create session", error);
@@ -4471,22 +4612,38 @@ export class InteractiveMode {
         fs.writeFileSync(debugLogPath, debugData);
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(`${theme.fg("accent", "✓ Debug log written")}\n${theme.fg("muted", debugLogPath)}`, 1, 1));
-        this.ui.requestRender();
+        this.commitFinalizedChatOutput();
     }
     handleArminSaysHi() {
+        const component = new ArminComponent(this.ui, () => {
+            if (!this.mutableChatComponents.has(component) || !this.chatContainer.children.includes(component))
+                return;
+            this.setChatComponentMutable(component, false);
+            this.promoteFinalizedChatPrefix();
+            this.ui.requestRender();
+        });
         this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new ArminComponent(this.ui));
-        this.ui.requestRender();
+        this.chatContainer.addChild(component);
+        this.setChatComponentMutable(component, true);
+        this.commitFinalizedChatOutput();
     }
     handleDementedDelves() {
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new EarendilAnnouncementComponent());
-        this.ui.requestRender();
+        this.commitFinalizedChatOutput();
     }
     handleDaxnuts() {
+        const component = new DaxnutsComponent(this.ui, () => {
+            if (!this.mutableChatComponents.has(component) || !this.chatContainer.children.includes(component))
+                return;
+            this.setChatComponentMutable(component, false);
+            this.promoteFinalizedChatPrefix();
+            this.ui.requestRender();
+        });
         this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new DaxnutsComponent(this.ui));
-        this.ui.requestRender();
+        this.chatContainer.addChild(component);
+        this.setChatComponentMutable(component, true);
+        this.commitFinalizedChatOutput();
     }
     checkDaxnutsEasterEgg(model) {
         if (model.provider === "opencode" && model.id.toLowerCase().includes("kimi-k2.5")) {
@@ -4512,6 +4669,7 @@ export class InteractiveMode {
                 this.pendingBashComponents.push(this.bashComponent);
             }
             else {
+                this.sealStatus();
                 this.chatContainer.addChild(this.bashComponent);
             }
             // Show output and complete
@@ -4521,6 +4679,7 @@ export class InteractiveMode {
             this.bashComponent.setComplete(result.exitCode, result.cancelled, result.truncated ? { truncated: true, content: result.output } : undefined, result.fullOutputPath);
             // Record the result in session
             this.session.recordBashResult(command, result, { excludeFromContext });
+            this.promoteFinalizedChatPrefix();
             this.bashComponent = undefined;
             this.ui.requestRender();
             return;
@@ -4528,6 +4687,7 @@ export class InteractiveMode {
         // Normal execution path (possibly with custom operations)
         const isDeferred = this.session.isStreaming;
         this.bashComponent = new BashExecutionComponent(command, this.ui, excludeFromContext);
+        this.setChatComponentMutable(this.bashComponent, true);
         if (isDeferred) {
             // Show in pending area when agent is streaming
             this.pendingMessagesContainer.addChild(this.bashComponent);
@@ -4535,6 +4695,7 @@ export class InteractiveMode {
         }
         else {
             // Show in chat immediately when agent is idle
+            this.sealStatus();
             this.chatContainer.addChild(this.bashComponent);
         }
         this.ui.requestRender();
@@ -4555,6 +4716,9 @@ export class InteractiveMode {
             }
             this.showError(`Bash command failed: ${error instanceof Error ? error.message : "Unknown error"}`);
         }
+        if (this.bashComponent)
+            this.setChatComponentMutable(this.bashComponent, false);
+        this.promoteFinalizedChatPrefix();
         this.bashComponent = undefined;
         this.ui.requestRender();
     }