@dreb/coding-agent 2.25.3 → 2.27.2

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

@@ -6,6 +6,7 @@ import * as crypto from "node:crypto";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
+import { supportsAdaptiveThinking } from "@dreb/ai";
 import { CombinedAutocompleteProvider, Container, fuzzyFilter, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@dreb/tui";
 import { spawn, spawnSync } from "child_process";
 import { APP_NAME, getAgentDir, getAuthPath, getDebugLogPath, getUpdateInstruction, VERSION } from "../../config.js";
@@ -22,6 +23,7 @@ import { DefaultPackageManager } from "../../core/package-manager.js";
 import { SessionManager } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { restoreStderr, takeOverStderr } from "../../core/stderr-guard.js";
+import { resolveThinkingDisplay } from "../../core/thinking.js";
 import { resolveToCwd } from "../../core/tools/path-utils.js";
 import { abortBackgroundAgents, discoverAgentTypes, getRunningBackgroundAgents } from "../../core/tools/subagent.js";
 import { getChangelogPath, getNewEntries, parseChangelog } from "../../utils/changelog.js";
@@ -68,6 +70,7 @@ export class InteractiveMode {
     options;
     session;
     ui;
+    committedChatContainer;
     chatContainer;
     pendingMessagesContainer;
     statusContainer;
@@ -98,6 +101,8 @@ export class InteractiveMode {
     streamingMessage = undefined;
     // Tool execution tracking: toolCallId -> component
     pendingTools = new Map();
+    // Deferred commit: set to true when components finalize, commit runs after next render
+    commitNeeded = false;
     // Tool output expansion state
     toolOutputExpanded = false;
     // Thinking block visibility state
@@ -188,6 +193,7 @@ export class InteractiveMode {
         });
         this.ui = new TUI(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();
@@ -413,6 +419,7 @@ export class InteractiveMode {
                 this.headerContainer.addChild(new Text(condensedText, 1, 0));
             }
         }
+        this.ui.addChild(this.committedChatContainer);
         this.ui.addChild(this.chatContainer);
         this.ui.addChild(this.pendingMessagesContainer);
         this.ui.addChild(this.statusContainer);
@@ -423,6 +430,20 @@ export class InteractiveMode {
         this.ui.addChild(this.widgetContainerBelow);
         this.ui.addChild(this.footer);
         this.ui.setFocus(this.editor);
+        // Mark header + committedChatContainer as committed to scrollback.
+        // The differential renderer will only manage children after this boundary.
+        this.ui.setCommittedChildCount(2);
+        // Wire up deferred commit: after each render cycle, commit any finalized
+        // components that were painted with their final state. This ensures
+        // components are committed to scrollback only AFTER their final content
+        // has been rendered to the terminal (not before, which would freeze
+        // stale/intermediate content in scrollback).
+        this.ui.onPostRender = () => {
+            if (this.commitNeeded) {
+                this.commitNeeded = false;
+                this.tryCommitPrefix();
+            }
+        };
         this.setupKeyHandlers();
         this.setupEditorSubmitHandler();
         // Start the UI before initializing extensions so session_start handlers can use interactive dialogs
@@ -433,8 +454,14 @@ export class InteractiveMode {
         this.activateStderrGuard();
         // Initialize extensions first so resources are shown before messages
         await this.initExtensions();
-        // Render initial messages AFTER showing loaded resources
+        // Render initial messages AFTER showing loaded resources.
+        // Do NOT call resetChatDisplay() here — initExtensions() already populated
+        // chatContainer with Context/Memory/Skills via showLoadedResources().
+        // Clearing would erase that content. Just append session messages, commit,
+        // and repaint.
         this.renderInitialMessages();
+        this.tryCommitPrefix();
+        this.ui.recommitAll();
         // Set terminal title
         this.updateTerminalTitle();
         // Initialize tab title auto-generation
@@ -447,7 +474,8 @@ export class InteractiveMode {
         onThemeChange(() => {
             this.ui.invalidate();
             this.updateEditorBorderColor();
-            this.ui.requestRender();
+            // Theme affects committed content — full re-commit to repaint
+            this.ui.recommitAll();
         });
         // Set up git branch watcher (uses provider instead of footer)
         this.footerDataProvider.onBranchChange(() => {
@@ -480,11 +508,17 @@ export class InteractiveMode {
             return;
         this.tabTitleGenerator = new TabTitleGenerator(settings, {
             setTitle: (title) => this.ui.terminal.setTitle(title),
+            setSessionName: (name) => {
+                this.sessionManager.appendSessionInfo(name);
+            },
             getMessages: () => this.session.state.messages,
             getModel: () => this.session.model,
             getModelRegistry: () => this.session.modelRegistry,
             getProvider: () => this.session.model?.provider,
             getAgentModelsOverride: (name) => this.settingsManager.getAgentModelsForAgent(name),
+            getBranch: () => this.footerDataProvider.getGitBranch(),
+            getRepo: () => path.basename(process.cwd()),
+            getCwd: () => process.cwd(),
         });
     }
     /**
@@ -994,15 +1028,13 @@ export class InteractiveMode {
                     }
                     // Clear UI state
                     this.editor.setGhostText?.(null);
-                    this.chatContainer.clear();
                     this.pendingMessagesContainer.clear();
                     this.compactionQueuedMessages = [];
                     this.streamingComponent = undefined;
                     this.streamingMessage = undefined;
                     this.pendingTools.clear();
-                    // Render any messages added via setup, or show empty session
-                    this.renderInitialMessages();
-                    this.ui.requestRender();
+                    // Re-render from new session state
+                    this.resetChatDisplay();
                     return { cancelled: false };
                 },
                 fork: async (entryId) => {
@@ -1010,8 +1042,7 @@ export class InteractiveMode {
                     if (result.cancelled) {
                         return { cancelled: true };
                     }
-                    this.chatContainer.clear();
-                    this.renderInitialMessages();
+                    this.resetChatDisplay();
                     this.editor.setText(result.selectedText);
                     this.showStatus("Forked to new session");
                     return { cancelled: false };
@@ -1026,8 +1057,7 @@ export class InteractiveMode {
                     if (result.cancelled) {
                         return { cancelled: true };
                     }
-                    this.chatContainer.clear();
-                    this.renderInitialMessages();
+                    this.resetChatDisplay();
                     if (result.editorText && !this.editor.getText().trim()) {
                         this.editor.setText(result.editorText);
                     }
@@ -1295,7 +1325,9 @@ export class InteractiveMode {
                 this.headerContainer.children[index] = this.builtInHeader;
             }
         }
-        this.ui.requestRender();
+        // Header is committed content (child 0 of the TUI, before committedChildCount);
+        // requestRender() only re-renders the live region and would silently drop this change.
+        this.ui.recommitAll();
     }
     addExtensionTerminalInputListener(handler) {
         const unsubscribe = this.ui.addInputListener(handler);
@@ -1404,11 +1436,8 @@ export class InteractiveMode {
      */
     hideExtensionSelector() {
         this.extensionSelector?.dispose();
-        this.editorContainer.clear();
-        this.editorContainer.addChild(this.editor);
         this.extensionSelector = undefined;
-        this.ui.setFocus(this.editor);
-        this.ui.requestRender();
+        this.restoreEditorComponent();
     }
     /**
      * Show a confirmation dialog for extensions.
@@ -1451,11 +1480,8 @@ export class InteractiveMode {
      */
     hideExtensionInput() {
         this.extensionInput?.dispose();
-        this.editorContainer.clear();
-        this.editorContainer.addChild(this.editor);
         this.extensionInput = undefined;
-        this.ui.setFocus(this.editor);
-        this.ui.requestRender();
+        this.restoreEditorComponent();
     }
     /**
      * Show a multi-line editor for extensions (with Ctrl+G support).
@@ -1479,11 +1505,8 @@ export class InteractiveMode {
      * Hide the extension editor.
      */
     hideExtensionEditor() {
-        this.editorContainer.clear();
-        this.editorContainer.addChild(this.editor);
         this.extensionEditor = undefined;
-        this.ui.setFocus(this.editor);
-        this.ui.requestRender();
+        this.restoreEditorComponent();
     }
     /**
      * Set a custom editor component from an extension.
@@ -1563,11 +1586,8 @@ export class InteractiveMode {
         const savedText = this.editor.getText();
         const isOverlay = options?.overlay ?? false;
         const restoreEditor = () => {
-            this.editorContainer.clear();
-            this.editorContainer.addChild(this.editor);
             this.editor.setText(savedText);
-            this.ui.setFocus(this.editor);
-            this.ui.requestRender();
+            this.restoreEditorComponent();
         };
         return new Promise((resolve, reject) => {
             let component;
@@ -2055,6 +2075,10 @@ export class InteractiveMode {
                 }
                 // Capture assistant response for buddy context
                 this.buddyController.handleEvent(event);
+                // Capture context for tab title generation
+                this.tabTitleGenerator?.onMessageEnd(event.message);
+                // Defer commit until after the next render paints the final state
+                this.commitNeeded = true;
                 this.ui.requestRender();
                 break;
             case "tool_execution_start": {
@@ -2084,12 +2108,19 @@ export class InteractiveMode {
                 if (component) {
                     component.updateResult({ ...event.result, isError: event.isError });
                     this.pendingTools.delete(event.toolCallId);
+                    // Wire up Kitty conversion callback for deferred commit
+                    component.onConversionComplete = () => {
+                        this.commitNeeded = true;
+                        this.ui.requestRender();
+                    };
+                    // Defer commit until after the next render paints the final state
+                    this.commitNeeded = true;
                     this.ui.requestRender();
                 }
                 // Buddy context + reaction for tool execution
                 this.buddyController.handleEvent(event);
                 // Tab title auto-generation
-                this.tabTitleGenerator?.onToolEnd();
+                this.tabTitleGenerator?.onToolEnd(event);
                 break;
             }
             case "agent_end":
@@ -2108,6 +2139,9 @@ export class InteractiveMode {
                     this.streamingMessage = undefined;
                 }
                 this.pendingTools.clear();
+                // Defer final commit sweep — all remaining finalized components will
+                // move to scrollback after the next render paints their final state
+                this.commitNeeded = true;
                 await this.checkShutdownRequested();
                 // Buddy reaction: session wrap-up quip
                 this.buddyController.handleEvent(event);
@@ -2147,8 +2181,9 @@ export class InteractiveMode {
                 }
                 else if (event.result) {
                     // Rebuild chat to show compacted state
-                    this.chatContainer.clear();
                     this.rebuildChatFromMessages();
+                    this.tryCommitPrefix();
+                    this.ui.recommitAll();
                     // Add compaction component at bottom so user sees it without scrolling
                     this.addMessageToChat({
                         role: "compactionSummary",
@@ -2212,19 +2247,9 @@ export class InteractiveMode {
                     this.chatContainer.removeChild(component);
                 }
                 this.pendingTools.clear();
-                // Show retry status
-                this.statusContainer.clear();
-                if (this.loadingAnimation) {
-                    this.loadingAnimation.stop();
-                    this.loadingAnimation = undefined;
-                }
-                if (this.retryLoader) {
-                    this.retryLoader.stop();
-                    this.retryLoader = undefined;
-                }
-                this.retryLoader = new Loader(this.ui, (spinner) => theme.fg("warning", spinner), (text) => theme.fg("muted", text), `Stream dropped, retrying (${event.attempt}/${event.maxAttempts})... (${keyText("app.interrupt")} to cancel)`);
-                this.statusContainer.addChild(this.retryLoader);
-                this.ui.requestRender();
+                // Warn in the chat scrollback — keep the working spinner running so ESC
+                // aborts via the normal loadingAnimation path (same AbortController).
+                this.showWarning(`Stream dropped, retrying (${event.attempt}/${event.maxAttempts})…`);
                 break;
             }
             case "length_retry": {
@@ -2239,19 +2264,9 @@ export class InteractiveMode {
                     this.chatContainer.removeChild(component);
                 }
                 this.pendingTools.clear();
-                // Show retry status
-                this.statusContainer.clear();
-                if (this.loadingAnimation) {
-                    this.loadingAnimation.stop();
-                    this.loadingAnimation = undefined;
-                }
-                if (this.retryLoader) {
-                    this.retryLoader.stop();
-                    this.retryLoader = undefined;
-                }
-                this.retryLoader = new Loader(this.ui, (spinner) => theme.fg("warning", spinner), (text) => theme.fg("muted", text), `Response truncated, retrying with larger token budget (${event.attempt}/${event.maxAttempts})... (${keyText("app.interrupt")} to cancel)`);
-                this.statusContainer.addChild(this.retryLoader);
-                this.ui.requestRender();
+                // Warn in the chat scrollback — keep the working spinner running so ESC
+                // aborts via the normal loadingAnimation path (same AbortController).
+                this.showWarning(`Response truncated, retrying with larger token budget (${event.attempt}/${event.maxAttempts})…`);
                 break;
             }
             case "background_agent_start":
@@ -2487,6 +2502,10 @@ export class InteractiveMode {
         });
     }
     rebuildChatFromMessages() {
+        // Clear both containers (committed content will be re-committed after rebuild).
+        // Callers that use this for global actions should also call
+        // tryCommitPrefix() + ui.recommitAll() after.
+        this.committedChatContainer.clear();
         this.chatContainer.clear();
         const context = this.sessionManager.buildSessionContext();
         this.renderSessionContext(context);
@@ -2556,7 +2575,9 @@ export class InteractiveMode {
             process.removeListener("SIGINT", ignoreSigint);
             this.ui.start();
             this.activateStderrGuard();
-            this.ui.requestRender(true);
+            // stop() moved the cursor, so hardwareCursorRow is stale. recommitAll()
+            // uses position-independent sequences (2J/H/3J) — safe after terminal takeover.
+            this.ui.recommitAll();
         });
         try {
             // Stop the TUI (restore terminal to normal mode)
@@ -2654,23 +2675,81 @@ export class InteractiveMode {
         this.ui.requestRender();
         this.showStatus(`Tasks panel: ${this.tasksPanel.visible ? "visible" : "hidden"}`);
     }
+    /**
+     * Clear committed and live chat, re-render from session state, commit the
+     * finalized prefix, and repaint everything. Used after session switches,
+     * imports, resumes, and navigation — any operation that replaces the
+     * displayed transcript with a different session's content.
+     */
+    resetChatDisplay() {
+        this.committedChatContainer.clear();
+        this.chatContainer.clear();
+        this.renderInitialMessages();
+        this.tryCommitPrefix();
+        this.ui.recommitAll();
+    }
+    /**
+     * Scan the live chatContainer for the longest contiguous prefix of fully-finalized
+     * components, move them to committedChatContainer, and advance the TUI's committed
+     * boundary. This prevents the differential renderer from replaying history.
+     *
+     * A component is "finalized" if:
+     * - AssistantMessageComponent: not the active streamingComponent
+     * - ToolExecutionComponent: not in pendingTools AND no pending Kitty conversions
+     * - Any other component (Spacer, Text, etc.): always finalized
+     */
+    tryCommitPrefix() {
+        let commitCount = 0;
+        for (const child of this.chatContainer.children) {
+            if (child instanceof AssistantMessageComponent) {
+                if (child === this.streamingComponent)
+                    break; // still streaming
+                commitCount++;
+            }
+            else if (child instanceof ToolExecutionComponent) {
+                if (this.pendingTools.has(child.getToolCallId()))
+                    break; // still executing
+                if (child.hasPendingConversions())
+                    break; // Kitty conversion pending
+                commitCount++;
+            }
+            else {
+                commitCount++; // Spacer, Text, etc. — always safe
+            }
+        }
+        if (commitCount === 0)
+            return;
+        // Move the finalized prefix from chatContainer to committedChatContainer
+        const toCommit = this.chatContainer.children.splice(0, commitCount);
+        for (const c of toCommit) {
+            this.committedChatContainer.addChild(c);
+        }
+        // Update the TUI's committed line tracking
+        this.ui.commit();
+    }
     toggleToolOutputExpansion() {
         this.setToolsExpanded(!this.toolOutputExpanded);
     }
     setToolsExpanded(expanded) {
         this.toolOutputExpanded = expanded;
+        // Expand/collapse in both committed and live containers
+        for (const child of this.committedChatContainer.children) {
+            if (isExpandable(child)) {
+                child.setExpanded(expanded);
+            }
+        }
         for (const child of this.chatContainer.children) {
             if (isExpandable(child)) {
                 child.setExpanded(expanded);
             }
         }
-        this.ui.requestRender();
+        // Committed content changed — full re-commit to repaint
+        this.ui.recommitAll();
     }
     toggleThinkingBlockVisibility() {
         this.hideThinkingBlock = !this.hideThinkingBlock;
         this.settingsManager.setHideThinkingBlock(this.hideThinkingBlock);
-        // Rebuild chat from session messages
-        this.chatContainer.clear();
+        // Full rebuild: rebuildChatFromMessages() clears both containers internally
         this.rebuildChatFromMessages();
         // If streaming, re-add the streaming component with updated visibility and re-render
         if (this.streamingComponent && this.streamingMessage) {
@@ -2678,6 +2757,9 @@ export class InteractiveMode {
             this.streamingComponent.updateContent(this.streamingMessage);
             this.chatContainer.addChild(this.streamingComponent);
         }
+        // Committed content rebuilt — full re-commit to repaint
+        this.tryCommitPrefix();
+        this.ui.recommitAll();
         this.showStatus(`Thinking blocks: ${this.hideThinkingBlock ? "hidden" : "visible"}`);
     }
     openExternalEditor() {
@@ -2720,8 +2802,9 @@ export class InteractiveMode {
             // Restart TUI and re-intercept stderr
             this.ui.start();
             this.activateStderrGuard();
-            // Force full re-render since external editor uses alternate screen
-            this.ui.requestRender(true);
+            // stop() moved the cursor, so hardwareCursorRow is stale. recommitAll()
+            // uses position-independent sequences (2J/H/3J) — safe after terminal takeover.
+            this.ui.recommitAll();
         }
     }
     // =========================================================================
@@ -2952,15 +3035,31 @@ export class InteractiveMode {
     // =========================================================================
     // Selectors
     // =========================================================================
+    /**
+     * Restore an editor component into the editor container after an inline modal
+     * (selector, dialog, input, loader) was shown in its place, and repaint.
+     *
+     * Uses recommitAll() rather than requestRender(): an inline modal can grow the
+     * live region tall enough to push committed content up into terminal scrollback.
+     * Closing it shrinks the live region, and a differential redraw can't pull that
+     * committed content back down — leaving ghost whitespace below the prompt.
+     * recommitAll() repaints the whole transcript with position-independent sequences.
+     * Safe here: these modals are interactive and the user is at the bottom with no
+     * agent streaming.
+     */
+    restoreEditorComponent(editor = this.editor) {
+        this.editorContainer.clear();
+        this.editorContainer.addChild(editor);
+        this.ui.setFocus(editor);
+        this.ui.recommitAll();
+    }
     /**
      * Shows a selector component in place of the editor.
      * @param create Factory that receives a `done` callback and returns the component and focus target
      */
     showSelector(create) {
         const done = () => {
-            this.editorContainer.clear();
-            this.editorContainer.addChild(this.editor);
-            this.ui.setFocus(this.editor);
+            this.restoreEditorComponent();
         };
         const { component, focus } = create(done);
         this.editorContainer.clear();
@@ -2975,6 +3074,12 @@ export class InteractiveMode {
             const agentNames = Array.from(agentTypes.keys()).sort();
             const availableModels = this.session.modelRegistry.getAvailable();
             const availableModelIds = availableModels.map((m) => `${m.provider}/${m.id}`);
+            const currentModel = this.session.model;
+            const thinkingDisplaySupported = currentModel ? supportsAdaptiveThinking(currentModel) : false;
+            const thinkingDisplay = currentModel
+                ? (resolveThinkingDisplay(currentModel, this.settingsManager.getModelThinkingDisplay(currentModel.id)) ??
+                    "summarized")
+                : "summarized";
             const selector = new SettingsSelectorComponent({
                 autoCompact: this.session.autoCompactionEnabled,
                 showImages: this.settingsManager.getShowImages(),
@@ -2989,6 +3094,8 @@ export class InteractiveMode {
                 currentTheme: this.settingsManager.getTheme() || "dark",
                 availableThemes: getAvailableThemes(),
                 hideThinkingBlock: this.hideThinkingBlock,
+                thinkingDisplaySupported,
+                thinkingDisplay,
                 collapseChangelog: this.settingsManager.getCollapseChangelog(),
                 doubleEscapeAction: this.settingsManager.getDoubleEscapeAction(),
                 treeFilterMode: this.settingsManager.getTreeFilterMode(),
@@ -3006,11 +3113,18 @@ export class InteractiveMode {
                 },
                 onShowImagesChange: (enabled) => {
                     this.settingsManager.setShowImages(enabled);
+                    for (const child of this.committedChatContainer.children) {
+                        if (child instanceof ToolExecutionComponent) {
+                            child.setShowImages(enabled);
+                        }
+                    }
                     for (const child of this.chatContainer.children) {
                         if (child instanceof ToolExecutionComponent) {
                             child.setShowImages(enabled);
                         }
                     }
+                    // Committed content changed — full re-commit to repaint
+                    this.ui.recommitAll();
                 },
                 onAutoResizeImagesChange: (enabled) => {
                     this.settingsManager.setImageAutoResize(enabled);
@@ -3055,13 +3169,26 @@ export class InteractiveMode {
                 onHideThinkingBlockChange: (hidden) => {
                     this.hideThinkingBlock = hidden;
                     this.settingsManager.setHideThinkingBlock(hidden);
-                    for (const child of this.chatContainer.children) {
-                        if (child instanceof AssistantMessageComponent) {
-                            child.setHideThinkingBlock(hidden);
-                        }
-                    }
-                    this.chatContainer.clear();
+                    // Full rebuild: rebuildChatFromMessages() clears both containers
                     this.rebuildChatFromMessages();
+                    this.tryCommitPrefix();
+                    this.ui.recommitAll();
+                },
+                onThinkingDisplayChange: (display) => {
+                    const model = this.session.model;
+                    if (!model)
+                        return;
+                    this.settingsManager.setModelThinkingDisplay(model.id, display);
+                    // Refresh the live agent so the change takes effect this session.
+                    const effective = resolveThinkingDisplay(model, this.settingsManager.getModelThinkingDisplay(model.id));
+                    this.session.agent.thinkingDisplay = effective;
+                    // The toggle writes to GLOBAL settings, but getModelThinkingDisplay
+                    // resolves project-over-global. If a project-level modelSettings
+                    // override exists in .dreb/settings.json, it shadows the toggle and
+                    // the change silently has no effect. Fail loudly instead.
+                    if (supportsAdaptiveThinking(model) && effective !== display) {
+                        this.showWarning(`Thinking display for "${model.id}" was not changed: a project-level "modelSettings" override in .dreb/settings.json takes precedence (effective: "${effective}"). Remove or edit that override to use this toggle.`);
+                    }
                 },
                 onCollapseChangelogChange: (collapsed) => {
                     this.settingsManager.setCollapseChangelog(collapsed);
@@ -3304,8 +3431,7 @@ export class InteractiveMode {
                     this.ui.requestRender();
                     return;
                 }
-                this.chatContainer.clear();
-                this.renderInitialMessages();
+                this.resetChatDisplay();
                 this.editor.setText(result.selectedText);
                 done();
                 this.showStatus("Branched to new session");
@@ -3390,8 +3516,7 @@ export class InteractiveMode {
                         return;
                     }
                     // Update UI
-                    this.chatContainer.clear();
-                    this.renderInitialMessages();
+                    this.resetChatDisplay();
                     if (result.editorText && !this.editor.getText().trim()) {
                         this.editor.setText(result.editorText);
                     }
@@ -3459,8 +3584,7 @@ export class InteractiveMode {
         await this.session.switchSession(sessionPath);
         await this.footerDataProvider.refreshDailyCost();
         // Clear and re-render the chat
-        this.chatContainer.clear();
-        this.renderInitialMessages();
+        this.resetChatDisplay();
         this.showStatus("Resumed session");
     }
     async showOAuthSelector(mode) {
@@ -3524,10 +3648,7 @@ export class InteractiveMode {
         });
         // Restore editor helper
         const restoreEditor = () => {
-            this.editorContainer.clear();
-            this.editorContainer.addChild(this.editor);
-            this.ui.setFocus(this.editor);
-            this.ui.requestRender();
+            this.restoreEditorComponent();
         };
         try {
             await this.session.modelRegistry.authStorage.login(providerId, {
@@ -3602,10 +3723,7 @@ export class InteractiveMode {
         this.ui.requestRender();
         const dismissLoader = (editor) => {
             loader.dispose();
-            this.editorContainer.clear();
-            this.editorContainer.addChild(editor);
-            this.ui.setFocus(editor);
-            this.ui.requestRender();
+            this.restoreEditorComponent(editor);
         };
         try {
             await this.session.reload();
@@ -3632,6 +3750,9 @@ export class InteractiveMode {
                 this.setupExtensionShortcuts(runner);
             }
             this.rebuildChatFromMessages();
+            this.tryCommitPrefix();
+            // dismissLoader() restores the editor and calls recommitAll(), which
+            // repaints the rebuilt committed content — no separate recommit needed.
             dismissLoader(this.editor);
             this.showLoadedResources({
                 force: false,
@@ -3696,8 +3817,7 @@ export class InteractiveMode {
                 return;
             }
             // Clear and re-render the chat
-            this.chatContainer.clear();
-            this.renderInitialMessages();
+            this.resetChatDisplay();
             this.showStatus(`Session imported from: ${inputPath}`);
         }
         catch (error) {
@@ -3983,6 +4103,7 @@ ${cycleModelForward || cycleModelBackward ? `| \`${cycleModelForward}\` / \`${cy
         await this.footerDataProvider.refreshDailyCost();
         // Clear UI state
         this.headerContainer.clear();
+        this.committedChatContainer.clear();
         this.chatContainer.clear();
         this.pendingMessagesContainer.clear();
         this.compactionQueuedMessages = [];
@@ -3991,7 +4112,7 @@ ${cycleModelForward || cycleModelBackward ? `| \`${cycleModelForward}\` / \`${cy
         this.pendingTools.clear();
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(`${theme.fg("accent", "✓ New session started")}`, 1, 1));
-        this.ui.requestRender();
+        this.ui.recommitAll();
     }
     handleDebugCommand() {
         const width = this.ui.terminal.columns;
@@ -4267,6 +4388,8 @@ ${cycleModelForward || cycleModelBackward ? `| \`${cycleModelForward}\` / \`${cy
             result = await this.session.compact(customInstructions);
             // Rebuild UI
             this.rebuildChatFromMessages();
+            this.tryCommitPrefix();
+            this.ui.recommitAll();
             // Add compaction component at bottom so user sees it without scrolling
             const msg = createCompactionSummaryMessage(result.summary, result.tokensBefore, new Date().toISOString());
             this.addMessageToChat(msg);