@code-yeongyu/senpi 2026.7.31 → 2026.8.3

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

@@ -6,7 +6,8 @@ import * as crypto from "node:crypto";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Markdown, matchesKey, outerKittyGraphicsMode, ProcessTerminal, Spacer, sanitizeTerminalLabel, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@earendil-works/pi-tui";
+import * as TuiLayouts from "@earendil-works/pi-tui";
+import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Markdown, matchesKey, outerKittyGraphicsMode, ProcessTerminal, Spacer, sanitizeTerminalLabel, setKeybindings, Text, TruncatedText, TuiAltScreen, TuiMainScreen, visibleWidth, } from "@earendil-works/pi-tui";
 import chalk from "chalk";
 import { spawn, spawnSync } from "child_process";
 import { APP_NAME, APP_TITLE, CONFIG_DIR_NAME, expandTildePath, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
@@ -35,6 +36,7 @@ import { getChangelogPath, getNewEntries, normalizeChangelogLinks, parseChangelo
 import { copyToClipboard, readClipboardText } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
 import { parseGitUrl } from "../../utils/git.js";
+import { openBrowser } from "../../utils/open-browser.js";
 import { getCwdRelativePath } from "../../utils/paths.js";
 import { getPiUserAgent } from "../../utils/pi-user-agent.js";
 import { killTrackedDetachedChildren } from "../../utils/shell.js";
@@ -47,6 +49,7 @@ 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 { ContinuityNoticeTracker } from "./components/continuity-notice.js";
 import { CustomEditor } from "./components/custom-editor.js";
 import { CustomEntryComponent } from "./components/custom-entry.js";
 import { CustomMessageComponent } from "./components/custom-message.js";
@@ -250,6 +253,14 @@ function formatLoginProviderCompletionDescription(provider) {
     const authTypes = provider.authTypes.map(formatAuthSelectorProviderType).join("/");
     return provider.name === provider.id ? authTypes : `${provider.name} · ${authTypes}`;
 }
+/** Composition root for selecting the interactive terminal renderer. */
+export function createInteractiveTui(options) {
+    const terminal = options.terminal ?? new ProcessTerminal({ onExternalStdoutWrite: appendHiddenTuiStdout });
+    if (options.uiMode === "fullscreen") {
+        return new TuiAltScreen(terminal, options.showHardwareCursor, options.logDirectory, { openUrl: openBrowser });
+    }
+    return new TuiMainScreen(terminal, options.showHardwareCursor, options.logDirectory);
+}
 export class InteractiveMode {
     static restoreCompactionEscapeOverride(host) {
         if (!host.compactionEscapeOverrideActive)
@@ -281,6 +292,7 @@ export class InteractiveMode {
         this.sessionShownTipIds = new Set();
         this.lastEditorText = "";
         this.lastInputWasPaste = false;
+        this.continuityNotices = new ContinuityNoticeTracker();
         this.turnWorkingTip = new WorkingTipCache();
         this.autocompleteProviderWrappers = [];
         this.isInitialized = false;
@@ -360,7 +372,8 @@ export class InteractiveMode {
          */
         this.isShuttingDown = false;
         this.runtimeHost = runtimeHost;
-        this.options = options;
+        const uiMode = options.uiMode ?? runtimeHost.session.settingsManager.getUiMode();
+        this.options = { ...options, uiMode };
         this.chrome = options.chrome === "grok" ? new GrokChrome() : options.chrome;
         this.autoTrustOnReloadCwd = options.autoTrustOnReloadCwd;
         this.runtimeHost.setBeforeSessionInvalidate(() => {
@@ -371,7 +384,11 @@ export class InteractiveMode {
             await this.rebindCurrentSession({ renderBeforeBind: true });
         });
         this.version = VERSION;
-        this.ui = new TUI(new ProcessTerminal({ onExternalStdoutWrite: appendHiddenTuiStdout }), this.settingsManager.getShowHardwareCursor());
+        this.ui = createInteractiveTui({
+            uiMode,
+            showHardwareCursor: this.settingsManager.getShowHardwareCursor(),
+            logDirectory: getAgentDir(),
+        });
         this.streamingReveal = new StreamingRevealController({
             getSmoothStreaming: () => this.settingsManager.getSmoothStreaming(),
             getSmoothStreamingFps: () => this.settingsManager.getSmoothStreamingFps(),
@@ -393,6 +410,10 @@ export class InteractiveMode {
         this.headerContainer = new Container();
         this.loadedResourcesContainer = new Container();
         this.chatContainer = new Container();
+        this.documentContainer = new Container();
+        this.documentContainer.addChild(this.headerContainer);
+        this.documentContainer.addChild(this.loadedResourcesContainer);
+        this.documentContainer.addChild(this.chatContainer);
         this.pendingMessagesContainer = new Container();
         this.statusContainer = new Container();
         this.hookStatusContainer = new Container();
@@ -424,6 +445,8 @@ export class InteractiveMode {
             ? this.chrome.createFooter(this.session, this.footerDataProvider)
             : new FooterComponent(this.session, this.footerDataProvider);
         this.footer.setAutoCompactEnabled(this.session.autoCompactionEnabled);
+        this.footerContainer = new Container();
+        this.footerContainer.addChild(this.footer);
         // Load hide thinking block setting
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
         this.outputPad = this.settingsManager.getOutputPad();
@@ -620,23 +643,45 @@ export class InteractiveMode {
                 this.widgetContainerAbove,
                 this.editorContainer,
                 this.widgetContainerBelow,
-                this.footer,
+                this.footerContainer,
             ], this.ui)) {
                 this.ui.addChild(component);
             }
         }
         else {
-            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);
-            this.ui.addChild(this.hookStatusContainer);
             this.renderWidgets(); // Initialize with default spacer
-            this.ui.addChild(this.widgetContainerAbove);
-            this.ui.addChild(this.editorContainer);
-            this.ui.addChild(this.widgetContainerBelow);
-            this.ui.addChild(this.footer);
+            if (TuiLayouts.isViewportTUI(this.ui)) {
+                this.transcriptScrollView = new TuiLayouts.ScrollView(this.documentContainer, {
+                    follow: "end",
+                    primary: true,
+                    overscroll: "chain",
+                    scrollbar: this.settingsManager.getFullscreenScrollbar(),
+                    scrollbarStyle: (text) => theme.bg("selectedBg", text),
+                });
+                const dock = new TuiLayouts.VStack([
+                    { component: this.pendingMessagesContainer, shrink: 1, minSize: 0 },
+                    { component: this.statusContainer, shrink: 1, minSize: 0 },
+                    { component: this.hookStatusContainer, shrink: 1, minSize: 0 },
+                    { component: this.widgetContainerAbove, shrink: 1, minSize: 0 },
+                    { component: this.editorContainer, shrink: 1, minSize: 3 },
+                    { component: this.widgetContainerBelow, shrink: 1, minSize: 0 },
+                    { component: this.footerContainer, shrink: 1, minSize: 1 },
+                ]);
+                this.ui.setLayoutRoot(new TuiLayouts.VStack([
+                    { component: this.transcriptScrollView, basis: 0, grow: 1, shrink: 1, minSize: 1 },
+                    { component: dock, basis: "auto", grow: 0, shrink: 1, minSize: 1 },
+                ]));
+            }
+            else {
+                this.ui.addChild(this.documentContainer);
+                this.ui.addChild(this.pendingMessagesContainer);
+                this.ui.addChild(this.statusContainer);
+                this.ui.addChild(this.hookStatusContainer);
+                this.ui.addChild(this.widgetContainerAbove);
+                this.ui.addChild(this.editorContainer);
+                this.ui.addChild(this.widgetContainerBelow);
+                this.ui.addChild(this.footerContainer);
+            }
         }
         this.ui.setFocus(this.editor);
         this.setupKeyHandlers();
@@ -1354,7 +1399,12 @@ export class InteractiveMode {
             }
         }
         if (showListing) {
-            const contextFiles = this.session.resourceLoader.getAgentsFiles().agentsFiles;
+            const systemPromptSource = this.session.resourceLoader.getSystemPromptSource();
+            const contextFiles = [
+                ...(systemPromptSource ? [systemPromptSource] : []),
+                ...this.session.resourceLoader.getAppendSystemPromptSources(),
+                ...this.session.resourceLoader.getAgentsFiles().agentsFiles,
+            ];
             if (contextFiles.length > 0) {
                 this.loadedResourcesContainer.addChild(new Spacer(1));
                 const contextList = contextFiles
@@ -1531,8 +1581,12 @@ export class InteractiveMode {
         this.showLoadedResources({ force: false, showDiagnosticsWhenQuiet: true });
         this.showStartupNoticesIfNeeded();
     }
+    applyFullscreenScrollbarSetting() {
+        this.transcriptScrollView?.setScrollbar(this.settingsManager.getFullscreenScrollbar());
+    }
     applyRuntimeSettings() {
         configureHttpDispatcher(this.settingsManager.getHttpIdleTimeoutMs());
+        this.applyFullscreenScrollbarSetting();
         this.footer.setSession(this.session);
         this.footer.setAutoCompactEnabled(this.session.autoCompactionEnabled);
         this.footerDataProvider.setCwd(this.sessionManager.getCwd());
@@ -1556,16 +1610,19 @@ export class InteractiveMode {
     }
     async rebindCurrentSession(options = {}) {
         InteractiveMode.restoreCompactionEscapeOverride(this);
+        const session = this.session;
         this.unsubscribe?.();
         this.unsubscribe = undefined;
         this.applyRuntimeSettings();
         if (options.renderBeforeBind) {
             this.renderCurrentSessionState();
             this.subscribeToAgent();
-            await this.bindCurrentSessionExtensions();
         }
-        else {
-            await this.bindCurrentSessionExtensions();
+        await this.bindCurrentSessionExtensions();
+        if (this.session !== session) {
+            return;
+        }
+        if (!options.renderBeforeBind) {
             this.subscribeToAgent();
         }
         this.updateAvailableProviderCount();
@@ -1604,6 +1661,9 @@ export class InteractiveMode {
     getRegisteredToolDefinition(toolName) {
         return this.session.getToolDefinition(toolName);
     }
+    getMarkdownTransformers() {
+        return this.session.extensionRunner.getMarkdownTransformers();
+    }
     /**
      * Set up keyboard shortcuts registered by extensions.
      */
@@ -1617,10 +1677,12 @@ export class InteractiveMode {
             mode: "tui",
             hasUI: true,
             cwd: this.sessionManager.getCwd(),
+            agentDir: this.session.agentDir,
             sessionManager: this.sessionManager,
             modelRegistry: extensionRunner.getModelRegistry(),
             model: this.session.model,
             serviceTier: this.session.serviceTier,
+            scopedModels: this.session.scopedModels,
             thinkingLevel: this.session.thinkingLevel,
             isIdle: () => this.session.isIdle,
             isProjectTrusted: () => this.settingsManager.isProjectTrusted(),
@@ -1902,7 +1964,7 @@ export class InteractiveMode {
             this.workingStartedAt = undefined;
         }
         this.statusContainer.clear();
-        if (hadActiveStatusIndicator && this.ui.getClearOnShrink()) {
+        if (hadActiveStatusIndicator && this.options.uiMode === "regular" && this.ui.getClearOnShrink()) {
             this.statusContainer.addChild(this.idleStatus);
         }
     }
@@ -2055,22 +2117,16 @@ export class InteractiveMode {
         if (this.customFooter?.dispose) {
             this.customFooter.dispose();
         }
-        // Remove current footer from UI
-        if (this.customFooter) {
-            this.ui.removeChild(this.customFooter);
-        }
-        else {
-            this.ui.removeChild(this.footer);
-        }
+        this.footerContainer.clear();
         if (factory) {
             // Create and add custom footer, passing the data provider
             this.customFooter = factory(this.ui, theme, this.footerDataProvider);
-            this.ui.addChild(this.customFooter);
+            this.footerContainer.addChild(this.customFooter);
         }
         else {
             // Restore built-in footer
             this.customFooter = undefined;
-            this.ui.addChild(this.footer);
+            this.footerContainer.addChild(this.footer);
         }
         this.ui.requestRender();
     }
@@ -2360,6 +2416,9 @@ export class InteractiveMode {
             if (newEditor.setPaddingX !== undefined) {
                 newEditor.setPaddingX(this.defaultEditor.getPaddingX());
             }
+            if (newEditor.setAutocompleteMaxVisible !== undefined) {
+                newEditor.setAutocompleteMaxVisible(this.defaultEditor.getAutocompleteMaxVisible());
+            }
             // Set autocomplete if supported
             if (newEditor.setAutocompleteProvider && this.autocompleteProvider) {
                 newEditor.setAutocompleteProvider(this.autocompleteProvider);
@@ -2889,7 +2948,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.outputPad);
+                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers());
                     this.streamingComponent.setExpanded(this.toolOutputExpanded);
                     this.streamingMessage = event.message;
                     this.chatContainer.addChild(this.streamingComponent);
@@ -2943,7 +3002,8 @@ export class InteractiveMode {
                         errorMessage = abortedErrorLabel(undefined, this.session.retryAttempt);
                         this.streamingMessage.errorMessage = errorMessage;
                     }
-                    this.streamingComponent.updateContent(this.streamingMessage);
+                    this.streamingComponent.updateContent(this.streamingMessage, false);
+                    this.addContinuityNotice(this.streamingMessage);
                     if (this.streamingMessage.stopReason === "aborted" || this.streamingMessage.stopReason === "error") {
                         if (!errorMessage) {
                             errorMessage = this.streamingMessage.errorMessage || "Error";
@@ -3258,6 +3318,25 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 break;
             }
+            case "retry_probe_scheduled": {
+                const secondsAway = Math.max(0, Math.round((event.atMs - Date.now()) / 1000));
+                this.showStatus(`Probing ${sanitizeTerminalLabel(event.selector)} at +${secondsAway}s (#${event.probeIndex})`);
+                this.ui.requestRender();
+                break;
+            }
+            case "retry_probe_result": {
+                if (event.ok) {
+                    this.showStatus(`Recovered ${sanitizeTerminalLabel(event.selector)} - will restore on next turn`);
+                }
+                else if (event.errorMessage === "auth-unavailable") {
+                    this.showStatus(`Probe for ${sanitizeTerminalLabel(event.selector)} skipped - auth unavailable, staying on fallback`);
+                }
+                else {
+                    this.showStatus(`Probe for ${sanitizeTerminalLabel(event.selector)} failed - staying on fallback`);
+                }
+                this.ui.requestRender();
+                break;
+            }
         }
     }
     showRetryStatusIndicator(event) {
@@ -3364,12 +3443,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(), this.outputPad);
+                            const userComponent = new UserMessageComponent(skillBlock.userMessage, this.getMarkdownThemeWithSettings(), this.outputPad, this.getMarkdownTransformers());
                             this.chatContainer.addChild(userComponent);
                         }
                     }
                     else {
-                        const userComponent = new UserMessageComponent(textContent, this.getMarkdownThemeWithSettings(), this.outputPad);
+                        const userComponent = new UserMessageComponent(textContent, this.getMarkdownThemeWithSettings(), this.outputPad, this.getMarkdownTransformers());
                         this.chatContainer.addChild(userComponent);
                     }
                     if (options?.populateHistory) {
@@ -3379,7 +3458,7 @@ export class InteractiveMode {
                 break;
             }
             case "assistant": {
-                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad);
+                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers());
                 assistantComponent.setExpanded(this.toolOutputExpanded);
                 this.chatContainer.addChild(assistantComponent);
                 break;
@@ -3408,6 +3487,13 @@ export class InteractiveMode {
     }
     renderSessionItems(items, options = {}) {
         this.clearPendingTools();
+        // The rebuilt transcript re-derives continuity notices from persisted
+        // messages, so the tracker's suppression state must not survive the
+        // rebuild (or a session switch) — otherwise the first disabled notice
+        // would silently disappear from the rebuilt transcript.
+        // Optional-chained: renderSessionItems is exercised by tests with a
+        // minimal `this` that has no tracker instance.
+        this.continuityNotices?.reset?.();
         const renderedPendingTools = new Map();
         // Cache-miss notices are not persisted; re-derive them from the full entry
         // list and re-inject them after the assistant messages that paid for them.
@@ -3453,6 +3539,10 @@ export class InteractiveMode {
                     if (miss)
                         this.addCacheMissNotice(miss);
                 }
+                // Continuity notices are not persisted either; re-inject them while
+                // rendering persisted assistant messages the same way the live
+                // streaming path does. Optional-chained for minimal-`this` tests.
+                this.addContinuityNotice?.(message);
             }
             else if (message.role === "toolResult") {
                 // Match tool results to pending tool components
@@ -3492,6 +3582,14 @@ export class InteractiveMode {
      * significant cache miss. Only states observable facts: the miss itself,
      * a model switch, or an idle gap past the cache TTL.
      */
+    /** Muted single-line notice for degraded session continuity; healthy turns stay silent. */
+    addContinuityNotice(message) {
+        const notice = this.continuityNotices.noticeFor(message);
+        if (!notice)
+            return;
+        this.chatContainer.addChild(new Spacer(1));
+        this.chatContainer.addChild(new Text(notice, 1, 0));
+    }
     maybeShowCacheMissNotice(message) {
         if (!this.settingsManager.getShowCacheMissNotices())
             return;
@@ -3822,7 +3920,7 @@ export class InteractiveMode {
                 this.updateEditorBorderColor();
                 const thinkingStr = result.model.reasoning && result.thinkingLevel !== "off" ? ` (thinking: ${result.thinkingLevel})` : "";
                 const systemPromptStr = result.systemPromptChange?.systemPromptName
-                    ? `, system prompt: ${result.systemPromptChange.systemPromptName}`
+                    ? `, optimized system prompt applied: ${result.systemPromptChange.systemPromptName}`
                     : "";
                 this.showStatus(`Switched to ${result.model.name || result.model.id}${thinkingStr}${systemPromptStr}`);
                 this.showRiskyMainModelWarning(result.model);
@@ -3837,6 +3935,8 @@ export class InteractiveMode {
         this.setToolsExpanded(!this.toolOutputExpanded);
     }
     setToolsExpanded(expanded) {
+        if (expanded === this.toolOutputExpanded)
+            return;
         this.toolOutputExpanded = expanded;
         const activeHeader = this.customHeader ?? this.builtInHeader;
         if (isExpandable(activeHeader)) {
@@ -3849,7 +3949,7 @@ export class InteractiveMode {
                 }
             }
         }
-        this.ui.requestRender();
+        this.showStatus(`Tool output: ${expanded ? "expanded" : "collapsed"}`);
     }
     toggleThinkingBlockVisibility() {
         this.hideThinkingBlock = !this.hideThinkingBlock;
@@ -3921,7 +4021,7 @@ export class InteractiveMode {
             return;
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("error", text)));
-        this.chatContainer.addChild(new Text(`${theme.bold(theme.fg("error", "위험한 모델 경고"))}\n${theme.fg("error", RISKY_MAIN_MODEL_WARNING)}`, 1, 0));
+        this.chatContainer.addChild(new Text(`${theme.bold(theme.fg("error", "Risky model warning"))}\n${theme.fg("error", RISKY_MAIN_MODEL_WARNING)}`, 1, 0));
         this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("error", text)));
         this.ui.requestRender();
     }
@@ -3965,8 +4065,17 @@ export class InteractiveMode {
      * Clear all queued messages and return their contents.
      * Clears both session queue and compaction queue.
      */
-    clearAllQueues() {
-        const { steering, followUp } = this.session.clearQueue();
+    clearAllQueues(options = { abortWillFollow: false }) {
+        const clearedNative = this.session.clearQueue(options);
+        const { steering, followUp } = clearedNative;
+        const nativeMessages = clearedNative.ordered ?? [
+            ...steering.map((text, enqueueOrder) => ({ text, mode: "steer", enqueueOrder })),
+            ...followUp.map((text, index) => ({
+                text,
+                mode: "followUp",
+                enqueueOrder: steering.length + index,
+            })),
+        ];
         const compactionMessages = [...this.compactionInFlightMessages, ...this.compactionQueuedMessages];
         const compactionSteering = compactionMessages.filter((msg) => msg.mode === "steer").map((msg) => msg.text);
         const compactionFollowUp = compactionMessages.filter((msg) => msg.mode === "followUp").map((msg) => msg.text);
@@ -3975,10 +4084,20 @@ export class InteractiveMode {
         this.compactionInFlightMessages = [];
         this.compactionTransferAbortControllers.clear();
         this.compactionQueuedMessages = [];
-        return {
+        const fallbackOrder = nativeMessages.reduce((maximum, message) => Math.max(maximum, message.enqueueOrder), 0);
+        const ordered = [
+            ...nativeMessages,
+            ...compactionMessages.map((message, index) => ({
+                ...message,
+                enqueueOrder: message.enqueueOrder ?? fallbackOrder + index + 1,
+            })),
+        ].sort((a, b) => a.enqueueOrder - b.enqueueOrder);
+        const cleared = {
             steering: [...steering, ...compactionSteering],
             followUp: [...followUp, ...compactionFollowUp],
         };
+        Object.defineProperty(cleared, "ordered", { value: ordered, enumerable: false });
+        return cleared;
     }
     updatePendingMessagesDisplay() {
         this.pendingMessagesContainer.clear();
@@ -3999,8 +4118,8 @@ export class InteractiveMode {
         }
     }
     restoreQueuedMessagesToEditor(options) {
-        const { steering, followUp } = this.clearAllQueues();
-        const allQueued = [...steering, ...followUp];
+        const { steering, followUp, ordered } = this.clearAllQueues({ abortWillFollow: options?.abort === true });
+        const allQueued = ordered?.map((message) => message.text) ?? [...steering, ...followUp];
         if (allQueued.length === 0) {
             this.updatePendingMessagesDisplay();
             if (options?.abort) {
@@ -4028,8 +4147,8 @@ export class InteractiveMode {
      * - The helper never auto-prompts restored queue text; the user decides whether to send it.
      */
     async abortAndFireQueuedMessages() {
-        const { steering, followUp } = this.clearAllQueues();
-        const allQueued = [...steering, ...followUp];
+        const { steering, followUp, ordered } = this.clearAllQueues({ abortWillFollow: true });
+        const allQueued = ordered?.map((message) => message.text) ?? [...steering, ...followUp];
         this.updatePendingMessagesDisplay();
         await this.session.abort();
         if (allQueued.length === 0) {
@@ -4042,7 +4161,7 @@ export class InteractiveMode {
         return allQueued.length;
     }
     queueCompactionMessage(text, mode) {
-        this.compactionQueuedMessages.push({ text, mode });
+        this.compactionQueuedMessages.push({ text, mode, enqueueOrder: this.session.reserveQueuedInputOrder() });
         this.getSessionLogger().debug("compaction_queue_enqueue", { mode, count: this.compactionQueuedMessages.length });
         this.editor.addToHistory?.(text);
         this.editor.setText("");
@@ -4109,7 +4228,14 @@ export class InteractiveMode {
                         return;
                     this.showError(`Queued prompt failed after acceptance: ${error instanceof Error ? error.message : String(error)}`);
                 }),
-                deliverQueued: (message) => message.mode === "followUp" ? session.followUp(message.text) : session.steer(message.text),
+                deliverQueued: (message) => {
+                    if (message.enqueueOrder === undefined) {
+                        return message.mode === "followUp" ? session.followUp(message.text) : session.steer(message.text);
+                    }
+                    return message.mode === "followUp"
+                        ? session.followUp(message.text, undefined, { enqueueOrder: message.enqueueOrder })
+                        : session.steer(message.text, undefined, { enqueueOrder: message.enqueueOrder });
+                },
                 reportFailure: (error, undeliveredCount) => {
                     this.showError(`Failed to send queued message${undeliveredCount === 1 ? "" : "s"}: ${error instanceof Error ? error.message : String(error)}`);
                 },
@@ -4188,6 +4314,8 @@ export class InteractiveMode {
                 quietStartup: this.settingsManager.getQuietStartup(),
                 clearOnShrink: this.settingsManager.getClearOnShrink(),
                 showTerminalProgress: this.settingsManager.getShowTerminalProgress(),
+                uiMode: this.settingsManager.getUiMode(),
+                fullscreenScrollbar: this.settingsManager.getFullscreenScrollbar(),
                 warnings: this.settingsManager.getWarnings(),
             }, {
                 onAutoCompactChange: (enabled) => {
@@ -4354,6 +4482,14 @@ export class InteractiveMode {
                 onShowTerminalProgressChange: (enabled) => {
                     this.settingsManager.setShowTerminalProgress(enabled);
                 },
+                onUiModeChange: (mode) => {
+                    this.settingsManager.setUiMode(mode);
+                    this.showStatus(`UI mode: ${mode} (restart required)`);
+                },
+                onFullscreenScrollbarChange: (mode) => {
+                    this.settingsManager.setFullscreenScrollbar(mode);
+                    this.applyFullscreenScrollbarSetting();
+                },
                 onWarningsChange: (warnings) => {
                     this.settingsManager.setWarnings(warnings);
                 },
@@ -4405,7 +4541,7 @@ export class InteractiveMode {
             this.updateEditorBorderColor();
             done?.();
             const systemPromptStr = systemPromptChange?.systemPromptName
-                ? ` (system prompt: ${systemPromptChange.systemPromptName})`
+                ? ` (optimized system prompt applied: ${systemPromptChange.systemPromptName})`
                 : "";
             this.showStatus(`Model: ${model.id}${systemPromptStr}`);
             this.showRiskyMainModelWarning(model);
@@ -4646,7 +4782,7 @@ export class InteractiveMode {
         this.showSelector((done) => {
             const selector = new TreeSelectorComponent(tree, realLeafId, this.ui.terminal.rows, async (entryId) => {
                 // Selecting the current leaf is a no-op (already there)
-                if (entryId === realLeafId) {
+                if (entryId === this.sessionManager.getLeafId()) {
                     done();
                     this.showStatus("Already at this point");
                     return;
@@ -4681,6 +4817,11 @@ export class InteractiveMode {
                         break;
                     }
                 }
+                // The user committed to navigating: stop the active response first.
+                if (this.session.isStreaming) {
+                    this.restoreQueuedMessagesToEditor();
+                    await this.session.abort();
+                }
                 // Set up escape handler and status indicator if summarizing
                 let showingSummaryIndicator = false;
                 const originalOnEscape = this.defaultEditor.onEscape;
@@ -5269,7 +5410,6 @@ export class InteractiveMode {
                 return;
             }
             restoreChatBeforeSessionStart();
-            configureHttpDispatcher(this.settingsManager.getHttpIdleTimeoutMs());
             this.keybindings.reload();
             const activeHeader = this.customHeader ?? this.builtInHeader;
             if (isExpandable(activeHeader)) {
@@ -5277,20 +5417,7 @@ export class InteractiveMode {
             }
             setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
             await this.themeController.applyFromSettings();
-            const editorPaddingX = this.settingsManager.getEditorPaddingX();
-            const autocompleteMaxVisible = this.settingsManager.getAutocompleteMaxVisible();
-            this.defaultEditor.setPaddingX(editorPaddingX);
-            this.defaultEditor.setAutocompleteMaxVisible(autocompleteMaxVisible);
-            if (this.editor !== this.defaultEditor) {
-                this.editor.setPaddingX?.(editorPaddingX);
-                this.editor.setAutocompleteMaxVisible?.(autocompleteMaxVisible);
-            }
-            this.ui.setShowHardwareCursor(this.settingsManager.getShowHardwareCursor());
-            const clearOnShrink = this.settingsManager.getClearOnShrink();
-            this.ui.setClearOnShrink(clearOnShrink);
-            if (!clearOnShrink && !this.activeStatusIndicator) {
-                this.statusContainer.clear();
-            }
+            this.applyRuntimeSettings();
             this.setupAutocompleteProvider();
             const runner = this.session.extensionRunner;
             this.setupExtensionShortcuts(runner);