@ashx-j/lunr 0.2.21 → 0.2.23

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

@@ -36,10 +36,12 @@ import * as processRegistry from "../../core/process-registry.js";
 import { captureTreeChanges, clearRollback, disableRollbackForSession, enableRollbackForSession, initRollback, isRollbackEnabled, isRollbackSessionForceEnabled, migrateRollbackSession, peekRollbackTurnsConsumed, beginTurn as rollbackBeginTurn, rollbackLastTurn, setRollbackWarningHandler, } from "../../core/rollback.js";
 import { getSearchCuratorSetting, setSearchCuratorSetting } from "../../core/search-curator.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
+import { cancelSessionHandoff, markSessionHandoff, recordTuiActivity, registerTransferHandler, requestSessionTransfer, } from "../../core/session-handoff.js";
 import { SessionManager, sessionEntryToContextMessages } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { getSubagentCancellation, SubagentEscapeSequence } from "../../core/subagent-cancellation.js";
 import { time } from "../../core/timings.js";
+import { notifyTodosEnabledChanged } from "../../core/todo-settings.js";
 import { hasTrustRequiringProjectResources, ProjectTrustStore } from "../../core/trust-manager.js";
 import { checkForUpdate, markUpdateNotified } from "../../core/update-check.js";
 import { getAllPlanUsageResults, getUsageServiceBridge } from "../../core/usage-service.js";
@@ -255,8 +257,10 @@ export class InteractiveMode {
     streamingTargetMessage = undefined;
     streamingDisplayedLength = 0;
     smoothStreamingTimer = undefined;
+    thinkingAnimationTimer;
     // Tool execution tracking: toolCallId -> component
     pendingTools = new Map();
+    browserActivityComponent;
     // Tool output expansion state
     toolOutputExpanded = false;
     // Thinking block visibility state
@@ -360,7 +364,9 @@ export class InteractiveMode {
             await this.rebindCurrentSession({ renderBeforeBind: true });
             // lunr: re-init rollback for the new session id + re-apply auto force-enable.
             initRollback(this.settingsManager, this.sessionManager.getSessionId());
-            this.syncPermissionModeEffects(this.settingsManager.getDefaultPermissionMode());
+            const mode = this.sessionManager.getPermissionMode() ?? this.settingsManager.getDefaultPermissionMode();
+            resetPermissions(mode);
+            this.syncPermissionModeEffects(mode);
         });
         this.version = VERSION;
         this.ui = options.startupView?.ui ?? new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor());
@@ -371,8 +377,7 @@ export class InteractiveMode {
             enterGoalAuto: () => this.enterGoalAuto(),
             leaveGoalAuto: () => this.leaveGoalAuto(),
         });
-        // lunr: reset permission mode to configured default on startup.
-        resetPermissions(this.settingsManager.getDefaultPermissionMode());
+        resetPermissions(this.sessionManager.getPermissionMode() ?? this.settingsManager.getDefaultPermissionMode());
         this.headerContainer = new Container();
         if (options.startupView) {
             this.headerContainer.addChild(new Spacer(1));
@@ -627,7 +632,7 @@ export class InteractiveMode {
         // lunr: initialize rollback service for this session.
         initRollback(this.settingsManager, this.sessionManager.getSessionId());
         setRollbackWarningHandler((msg) => this.showStatus(msg));
-        this.syncPermissionModeEffects(this.settingsManager.getDefaultPermissionMode());
+        this.syncPermissionModeEffects(this.sessionManager.getPermissionMode() ?? this.settingsManager.getDefaultPermissionMode());
         await this.themeController.applyFromSettings();
         this.headerContainer.clear();
         // Add boot screen header (unless silenced)
@@ -1383,7 +1388,7 @@ export class InteractiveMode {
                     if (result.cancelled) {
                         return { cancelled: true };
                     }
-                    this.chatContainer.clear();
+                    this.clearChatContainer();
                     this.renderInitialMessages();
                     if (result.editorText && !this.editor.getText().trim()) {
                         this.restoreEditorFromTreeResult(result);
@@ -1452,8 +1457,26 @@ export class InteractiveMode {
         }
         return bootRows;
     }
+    unregisterSessionTransfer;
+    transferInProgress = false;
+    detachedDraft = "";
     async rebindCurrentSession(options = {}) {
         await this.waitForDeferredBuiltins();
+        this.unregisterSessionTransfer?.();
+        recordTuiActivity(this.sessionManager, this.runtimeHost.services.agentDir);
+        this.unregisterSessionTransfer = registerTransferHandler(this.sessionManager, async ({ stop, signal }) => {
+            this.transferInProgress = true;
+            try {
+                this.detachedDraft = this.editor.getText();
+                await this.runtimeHost.releaseForTransfer({ stop, signal });
+                this.editor.setText(this.detachedDraft);
+                this.unregisterSessionTransfer?.();
+                this.showStatus("Session released for remote continuation. Draft retained. Use /reclaim to continue here.");
+            }
+            finally {
+                this.transferInProgress = false;
+            }
+        });
         this.unsubscribe?.();
         this.unsubscribe = undefined;
         this.applyRuntimeSettings();
@@ -1484,7 +1507,7 @@ export class InteractiveMode {
     renderCurrentSessionState() {
         this.ui.setChatScroll(0);
         this.loadedResourcesContainer.clear();
-        this.chatContainer.clear();
+        this.clearChatContainer();
         this.pendingMessagesContainer.clear();
         this.compactionQueuedMessages = [];
         this.pendingCompactionRender = undefined;
@@ -2394,6 +2417,51 @@ export class InteractiveMode {
     setupEditorSubmitHandler() {
         this.defaultEditor.onSubmit = async (text) => {
             text = text.trim();
+            if (text === "/reclaim" || text === "/reclaim stop") {
+                const file = this.sessionManager.getSessionFile();
+                try {
+                    if (!file)
+                        throw new Error("This session is not saved.");
+                    if (!this.runtimeHost.isDetached) {
+                        this.showStatus("This terminal already owns the session.");
+                        return;
+                    }
+                    const draft = this.editor.getText();
+                    await requestSessionTransfer(file, { stop: text === "/reclaim stop" });
+                    await this.runtimeHost.switchSession(file);
+                    this.editor.setText(draft === text ? this.detachedDraft : draft);
+                    this.showStatus("Session reclaimed.");
+                }
+                catch (error) {
+                    this.showError(error instanceof Error ? error.message : String(error));
+                }
+                return;
+            }
+            if ((this.runtimeHost.isDetached || this.transferInProgress) && !["/quit", "/exit"].includes(text)) {
+                this.showError("Session is detached or transferring. Draft retained. Use /reclaim, /reclaim stop, or /quit.");
+                return;
+            }
+            if (text === "/handoff" || text === "/handoff cancel") {
+                try {
+                    if (text === "/handoff cancel")
+                        cancelSessionHandoff(this.sessionManager, this.runtimeHost.services.agentDir);
+                    else
+                        markSessionHandoff(this.sessionManager, this.runtimeHost.services.agentDir);
+                    this.showStatus(text === "/handoff cancel"
+                        ? "Handoff mark cancelled."
+                        : "Marked for phone continuation for 8 hours. Busy work must finish or be explicitly stopped before transfer.");
+                }
+                catch (error) {
+                    this.showError(error instanceof Error ? error.message : String(error));
+                }
+                return;
+            }
+            if (text &&
+                !this.runtimeHost.isDetached &&
+                (!text.startsWith("/") ||
+                    /^\/(?:model|thinking|effort|reasoning|off|minimal|low|medium|high|xhigh|max|mode|plan|manual|yolo|auto|name|title|undo|edit|redo|tree|compact)(?:\s|$)/.test(text))) {
+                recordTuiActivity(this.sessionManager, this.runtimeHost.services.agentDir);
+            }
             if (!text) {
                 this.takeSubmittedImages(text);
                 return;
@@ -2621,15 +2689,30 @@ export class InteractiveMode {
                 }
                 return;
             }
-            // If streaming, use prompt() with steer behavior
-            // This handles extension commands (execute immediately), prompt template expansion, and queueing
-            if (this.session.isStreaming) {
-                this.editor.addToHistory?.(text);
-                this.editor.setText("");
-                await this.promptAfterDeferredBuiltins(text, { streamingBehavior: "steer", images });
-                this.updatePendingMessagesDisplay();
-                this.ui.requestRender();
-                return;
+            // While streaming or settling a wait handoff, reserve normal Enter for subagent_wait when possible.
+            // Extension commands keep their existing path.
+            if (this.session.isStreaming || this.session.isWaitPromptHandoffActive) {
+                if (!this.isExtensionCommand(text)) {
+                    await this.awaitDeferredBuiltinsForPrompt();
+                    const handoff = await this.session.interruptSubagentWaitWithPrompt(text, { images });
+                    if (handoff) {
+                        this.editor.addToHistory?.(text);
+                        this.editor.setText("");
+                        void handoff.completion.catch((error) => {
+                            this.showError(error instanceof Error ? error.message : String(error));
+                        });
+                        this.ui.requestRender();
+                        return;
+                    }
+                }
+                if (this.session.isStreaming) {
+                    this.editor.addToHistory?.(text);
+                    this.editor.setText("");
+                    await this.promptAfterDeferredBuiltins(text, { streamingBehavior: "steer", images });
+                    this.updatePendingMessagesDisplay();
+                    this.ui.requestRender();
+                    return;
+                }
             }
             // Normal message submission
             // First, move any pending bash components to chat
@@ -2648,6 +2731,18 @@ export class InteractiveMode {
     getSmoothStreamingOptions() {
         return { hideThinking: this.hideThinkingBlock };
     }
+    setThinkingAnimation(active) {
+        if (!active) {
+            if (this.thinkingAnimationTimer)
+                clearInterval(this.thinkingAnimationTimer);
+            this.thinkingAnimationTimer = undefined;
+            return;
+        }
+        if (this.thinkingAnimationTimer)
+            return;
+        this.thinkingAnimationTimer = setInterval(() => this.ui.requestRender(), 33);
+        this.thinkingAnimationTimer.unref?.();
+    }
     clearSmoothStreamingTimer() {
         if (this.smoothStreamingTimer) {
             clearInterval(this.smoothStreamingTimer);
@@ -2688,12 +2783,9 @@ export class InteractiveMode {
             if (content.type !== "toolCall" || !revealedIds.has(content.id))
                 continue;
             if (!this.pendingTools.has(content.id)) {
-                const component = new ToolExecutionComponent(content.name, content.id, content.arguments, {
-                    showImages: this.settingsManager.getShowImages(),
-                    imageWidthCells: this.settingsManager.getImageWidthCells(),
-                }, this.getRegisteredToolDefinition(content.name), this.ui, this.sessionManager.getCwd());
-                component.setExpanded(this.toolOutputExpanded);
-                this.addToolComponentToChat(component);
+                const component = content.name === "browser" && this.browserActivityComponent
+                    ? this.browserActivityComponent
+                    : this.createToolExecutionComponent(content.name, content.id, content.arguments);
                 this.pendingTools.set(content.id, component);
             }
             else {
@@ -2728,6 +2820,7 @@ export class InteractiveMode {
         }
     }
     stopSmoothStreaming() {
+        this.setThinkingAnimation(false);
         this.clearSmoothStreamingTimer();
         this.streamingTargetMessage = undefined;
         this.streamingDisplayedLength = 0;
@@ -2767,6 +2860,7 @@ export class InteractiveMode {
         switch (event.type) {
             case "agent_start":
                 this.pendingTools.clear();
+                this.browserActivityComponent = undefined;
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(true);
                 }
@@ -2819,7 +2913,11 @@ 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.thinkingCollapse);
+                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.thinkingCollapse, {
+                        requestRender: () => this.ui.requestRender(),
+                        reasoningDisplay: this.settingsManager.getReasoningDisplay(),
+                        onThinkingAnimationChange: (active) => this.setThinkingAnimation(active),
+                    });
                     // lunr: collapsible reasoning — fresh timing array for this message.
                     this.thinkingRunTimings = [];
                     this.streamingComponent.setThinkingTimings(this.thinkingRunTimings);
@@ -2926,14 +3024,12 @@ export class InteractiveMode {
                 }
                 let component = this.pendingTools.get(event.toolCallId);
                 if (!component) {
-                    component = new ToolExecutionComponent(event.toolName, event.toolCallId, event.args, {
-                        showImages: this.settingsManager.getShowImages(),
-                        imageWidthCells: this.settingsManager.getImageWidthCells(),
-                    }, this.getRegisteredToolDefinition(event.toolName), this.ui, this.sessionManager.getCwd());
-                    component.setExpanded(this.toolOutputExpanded);
-                    this.addToolComponentToChat(component);
+                    component = this.createToolExecutionComponent(event.toolName, event.toolCallId, event.args);
                     this.pendingTools.set(event.toolCallId, component);
                 }
+                else if (event.toolName === "browser" && !component.matchesToolCall(event.toolCallId)) {
+                    component.beginNextExecution(event.toolCallId, event.args);
+                }
                 component.markExecutionStarted();
                 this.ui.requestRender();
                 break;
@@ -2968,6 +3064,7 @@ export class InteractiveMode {
                     this.streamingMessage = undefined;
                 }
                 this.pendingTools.clear();
+                this.browserActivityComponent = undefined;
                 this.maybeAutoNameSession();
                 // lunr: capture tree-scope changes at turn boundary (bash side-effects).
                 captureTreeChanges(this.sessionManager.getCwd(), this.sessionManager.getSessionId());
@@ -3186,7 +3283,10 @@ export class InteractiveMode {
                 break;
             }
             case "assistant": {
-                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.thinkingCollapse);
+                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.thinkingCollapse, {
+                    requestRender: () => this.ui.requestRender(),
+                    reasoningDisplay: this.settingsManager.getReasoningDisplay(),
+                });
                 // lunr: collapsible reasoning — re-attach live timings when this
                 // message was streamed in this session (undefined = history).
                 assistantComponent.setThinkingTimings(this.thinkingTimingsByMessage.get(message));
@@ -3206,6 +3306,7 @@ export class InteractiveMode {
     }
     renderSessionItems(items, options = {}) {
         this.pendingTools.clear();
+        let browserActivityComponent;
         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.
@@ -3228,12 +3329,20 @@ export class InteractiveMode {
                 // Render tool call components
                 for (const content of message.content) {
                     if (content.type === "toolCall") {
-                        const component = new ToolExecutionComponent(content.name, content.id, content.arguments, {
-                            showImages: this.settingsManager.getShowImages(),
-                            imageWidthCells: this.settingsManager.getImageWidthCells(),
-                        }, this.getRegisteredToolDefinition(content.name), this.ui, this.sessionManager.getCwd());
-                        component.setExpanded(this.toolOutputExpanded);
-                        this.addToolComponentToChat(component);
+                        let component = content.name === "browser" ? browserActivityComponent : undefined;
+                        if (component) {
+                            component.beginNextExecution(content.id, content.arguments);
+                        }
+                        else {
+                            component = new ToolExecutionComponent(content.name, content.id, content.arguments, {
+                                showImages: this.settingsManager.getShowImages(),
+                                imageWidthCells: this.settingsManager.getImageWidthCells(),
+                            }, this.getRegisteredToolDefinition(content.name), this.ui, this.sessionManager.getCwd());
+                            component.setExpanded(this.toolOutputExpanded);
+                            this.addToolComponentToChat(component);
+                            if (content.name === "browser")
+                                browserActivityComponent = component;
+                        }
                         if (message.stopReason === "aborted" || message.stopReason === "error") {
                             let errorMessage;
                             if (message.stopReason === "aborted") {
@@ -3268,6 +3377,8 @@ export class InteractiveMode {
                 }
             }
             else {
+                if (message.role === "user")
+                    browserActivityComponent = undefined;
                 // All other messages use standard rendering
                 this.addMessageToChat(message, options);
             }
@@ -3358,7 +3469,7 @@ export class InteractiveMode {
         });
     }
     rebuildChatFromMessages() {
-        this.chatContainer.clear();
+        this.clearChatContainer();
         this.renderSessionEntries(this.sessionManager.buildContextEntries());
     }
     // =========================================================================
@@ -3388,6 +3499,7 @@ export class InteractiveMode {
         if (this.isShuttingDown)
             return;
         this.isShuttingDown = true;
+        this.unregisterSessionTransfer?.();
         this.stopSmoothStreaming();
         if (this.planUsageTimer) {
             clearInterval(this.planUsageTimer);
@@ -3575,6 +3687,10 @@ export class InteractiveMode {
         }
     }
     async handleFollowUp() {
+        if (this.runtimeHost.isDetached || this.transferInProgress) {
+            this.showError("Use /reclaim before sending more work. Draft retained.");
+            return;
+        }
         const text = (this.editor.getExpandedText?.() ?? this.editor.getText()).trim();
         if (!text)
             return;
@@ -3629,6 +3745,9 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     cycleThinkingLevel() {
+        if (this.runtimeHost.isDetached || this.transferInProgress)
+            return;
+        recordTuiActivity(this.sessionManager, this.runtimeHost.services.agentDir);
         const newLevel = this.session.cycleThinkingLevel();
         if (newLevel === undefined) {
             this.showStatus("Current model does not support thinking");
@@ -3642,6 +3761,9 @@ export class InteractiveMode {
         this.applyPermissionMode(nextPermissionMode(getPermissionMode()), { silent: true });
     }
     async cycleModel(direction) {
+        if (this.runtimeHost.isDetached || this.transferInProgress)
+            return;
+        recordTuiActivity(this.sessionManager, this.runtimeHost.services.agentDir);
         try {
             const result = await this.session.cycleModel(direction);
             if (result === undefined) {
@@ -3678,6 +3800,32 @@ export class InteractiveMode {
         globalThis[Symbol.for("@lunr/tools-expanded-changed")]?.(expanded);
         this.ui.requestRender();
     }
+    createToolExecutionComponent(toolName, toolCallId, args) {
+        if (toolName === "browser" && this.browserActivityComponent) {
+            this.browserActivityComponent.beginNextExecution(toolCallId, args);
+            return this.browserActivityComponent;
+        }
+        const component = new ToolExecutionComponent(toolName, toolCallId, args, {
+            showImages: this.settingsManager.getShowImages(),
+            imageWidthCells: this.settingsManager.getImageWidthCells(),
+        }, this.getRegisteredToolDefinition(toolName), this.ui, this.sessionManager.getCwd());
+        component.setExpanded(this.toolOutputExpanded);
+        this.addToolComponentToChat(component);
+        if (toolName === "browser")
+            this.browserActivityComponent = component;
+        return component;
+    }
+    disposeChatToolComponents() {
+        for (const child of this.chatContainer.children) {
+            if (child instanceof ToolExecutionComponent)
+                child.dispose();
+        }
+        this.browserActivityComponent = undefined;
+    }
+    clearChatContainer() {
+        this.disposeChatToolComponents();
+        this.chatContainer.clear();
+    }
     // lunr: consecutive same-tool grouping — a tool component appended right after
     // another component for the SAME tool becomes a group continuation (no top
     // spacer / top pad); the previous card drops its bottom pad. Mixed neighbors
@@ -3691,7 +3839,6 @@ export class InteractiveMode {
         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.
         // Re-slice to the current revealed length so hide-thinking does not dump the tail.
@@ -3869,7 +4016,6 @@ export class InteractiveMode {
         return !!extensionRunner.getCommand(commandName);
     }
     renderCompactionResult(result) {
-        this.chatContainer.clear();
         this.rebuildChatFromMessages();
         this.addMessageToChat(createCompactionSummaryMessage(result.summary, result.tokensBefore, new Date().toISOString()));
         this.footer.invalidate();
@@ -3995,6 +4141,7 @@ export class InteractiveMode {
                 availableThemes: getAvailableThemes(),
                 hideThinkingBlock: this.hideThinkingBlock,
                 thinkingCollapse: this.thinkingCollapse,
+                reasoningDisplay: this.settingsManager.getReasoningDisplay(),
                 cacheRetention: this.settingsManager.getCacheRetention() ?? "short",
                 doubleEscapeAction: this.settingsManager.getDoubleEscapeAction(),
                 treeFilterMode: this.settingsManager.getTreeFilterMode(),
@@ -4015,8 +4162,10 @@ export class InteractiveMode {
                 globalInstructionsPath: getGlobalInstructionsPath(getAgentDir()),
                 modelInstructionsPath: getModelInstructionsPath(getAgentDir(), this.session.model?.id ?? "no-model-selected"),
                 confirmLargeSubagentLaunches: this.settingsManager.getConfirmLargeSubagentLaunches(),
+                browserEnabled: this.settingsManager.getBrowserEnabled(),
                 memoryEnabled: this.settingsManager.getMemoryEnabled(),
                 memoryCharCap: this.settingsManager.getMemoryCharCap(),
+                todosEnabled: this.settingsManager.getTodosEnabled(),
                 searchCurator: getSearchCuratorSetting(),
                 // lunr: TUI customize settings
                 footerMcp: this.settingsManager.getFooterMcp(),
@@ -4106,7 +4255,6 @@ export class InteractiveMode {
                             child.setHideThinkingBlock(hidden);
                         }
                     }
-                    this.chatContainer.clear();
                     this.rebuildChatFromMessages();
                 },
                 onThinkingCollapseChange: (collapse) => {
@@ -4117,9 +4265,17 @@ export class InteractiveMode {
                             child.setThinkingCollapse(collapse);
                         }
                     }
-                    this.chatContainer.clear();
                     this.rebuildChatFromMessages();
                 },
+                onReasoningDisplayChange: (display) => {
+                    this.settingsManager.setReasoningDisplay(display);
+                    for (const child of this.chatContainer.children) {
+                        if (child instanceof AssistantMessageComponent) {
+                            child.setReasoningDisplay(this.settingsManager.getReasoningDisplay());
+                        }
+                    }
+                    this.ui.requestRender();
+                },
                 onShowCacheMissNoticesChange: (shown) => {
                     this.settingsManager.setShowCacheMissNotices(shown);
                     this.rebuildChatFromMessages();
@@ -4224,11 +4380,20 @@ export class InteractiveMode {
                 onMemoryCharCapChange: (cap) => {
                     this.settingsManager.setMemoryCharCap(cap);
                 },
+                onBrowserEnabledChange: (enabled) => {
+                    this.settingsManager.setBrowserEnabled(enabled);
+                    this.session.refreshToolRegistry();
+                },
                 onMemoryEnabledChange: (enabled) => {
                     this.settingsManager.setMemoryEnabled(enabled);
                     this.session.refreshToolRegistry();
                     this.showStatus(`Agent memory: ${enabled ? "on" : "off"}`);
                 },
+                onTodosEnabledChange: (enabled) => {
+                    this.settingsManager.setTodosEnabled(enabled);
+                    notifyTodosEnabledChanged(enabled);
+                    this.session.refreshToolRegistry();
+                },
                 onSearchCuratorChange: (setting) => {
                     if (!setSearchCuratorSetting(setting)) {
                         this.showError("pi-web-access is not loaded; curator setting unavailable.");
@@ -4268,6 +4433,36 @@ export class InteractiveMode {
                 onPlanUsageWindowChange: (window) => {
                     this.settingsManager.setPlanUsageWindow(window);
                 },
+                onGatewayAction: (action) => {
+                    void (async () => {
+                        if (this.session.isStreaming) {
+                            this.showStatus("Wait for the current turn before managing the gateway.");
+                            return;
+                        }
+                        if (action === "status") {
+                            this.showStatus((await import("../../gateway/service.js")).serviceStatusText());
+                            return;
+                        }
+                        this.ui.stop();
+                        try {
+                            await new Promise((resolve, reject) => {
+                                const child = spawn(process.execPath, [process.argv[1], "gateway", ...action.split(" ")], {
+                                    stdio: "inherit",
+                                    env: process.env,
+                                });
+                                child.once("error", reject);
+                                child.once("exit", (code) => code === 0
+                                    ? resolve()
+                                    : reject(new Error(`Gateway command exited with code ${code}. Run lunr gateway doctor.`)));
+                            });
+                        }
+                        finally {
+                            this.ui.start();
+                            this.ui.requestRender(true);
+                        }
+                        this.showStatus((await import("../../gateway/service.js")).serviceStatusText());
+                    })().catch((error) => this.showStatus(error instanceof Error ? error.message : String(error)));
+                },
                 onDefaultPermissionModeChange: (mode) => {
                     this.settingsManager.setDefaultPermissionMode(mode);
                 },
@@ -4498,6 +4693,8 @@ export class InteractiveMode {
         });
     }
     async showModelSelector(initialSearchInput) {
+        if (this.runtimeHost.isDetached || this.transferInProgress)
+            return;
         // lunr: prefetch active subscription names so row rendering stays synchronous.
         const subscriptionNames = await this.getActiveSubscriptionNames();
         this.showSelector((done) => {
@@ -4690,6 +4887,8 @@ export class InteractiveMode {
         });
     }
     showUserMessageSelector() {
+        if (this.runtimeHost.isDetached || this.transferInProgress)
+            return;
         const userMessages = this.session.getUserMessagesForForking();
         if (userMessages.length === 0) {
             this.showStatus("No messages to fork from");
@@ -4738,6 +4937,8 @@ export class InteractiveMode {
         }
     }
     showTreeSelector(initialSelectedId) {
+        if (this.runtimeHost.isDetached || this.transferInProgress)
+            return;
         const tree = this.sessionManager.getTree();
         const realLeafId = this.sessionManager.getLeafId();
         const initialFilterMode = this.settingsManager.getTreeFilterMode();
@@ -4811,7 +5012,7 @@ export class InteractiveMode {
                         return;
                     }
                     // Update UI
-                    this.chatContainer.clear();
+                    this.clearChatContainer();
                     this.renderInitialMessages();
                     if (result.editorText && !this.editor.getText().trim()) {
                         this.restoreEditorFromTreeResult(result);
@@ -4868,8 +5069,17 @@ export class InteractiveMode {
                     const next = (nextName ?? "").trim();
                     if (!next)
                         return;
+                    if (sessionFilePath === this.sessionManager.getSessionFile() && !this.runtimeHost.isDetached) {
+                        this.sessionManager.appendSessionInfo(next);
+                        return;
+                    }
                     const mgr = SessionManager.open(sessionFilePath);
-                    mgr.appendSessionInfo(next);
+                    try {
+                        mgr.appendSessionInfo(next);
+                    }
+                    finally {
+                        mgr.dispose();
+                    }
                 },
                 showRenameHint: true,
                 keybindings: this.keybindings,
@@ -5662,7 +5872,7 @@ export class InteractiveMode {
             if (leafId) {
                 this.redoStack.push(leafId);
             }
-            this.chatContainer.clear();
+            this.clearChatContainer();
             this.renderInitialMessages();
             void this.flushCompactionQueue({ willRetry: false });
             return { editorText: result.editorText, editorImages: result.editorImages };
@@ -5705,7 +5915,7 @@ export class InteractiveMode {
                 this.showStatus("Navigation cancelled");
                 return;
             }
-            this.chatContainer.clear();
+            this.clearChatContainer();
             this.renderInitialMessages();
             if (result.editorText && !this.editor.getText().trim()) {
                 this.restoreEditorFromTreeResult(result);
@@ -6300,6 +6510,9 @@ export class InteractiveMode {
     }
     /** Apply addendum + auto-rollback for a mode without a status toast. */
     syncPermissionModeEffects(mode) {
+        if (this.runtimeHost.isDetached || this.transferInProgress)
+            return;
+        this.sessionManager.setPermissionMode(mode);
         if (mode === "plan") {
             this.session.setSystemPromptAppend(PLAN_MODE_ADDENDUM);
         }
@@ -6327,6 +6540,10 @@ export class InteractiveMode {
         }
     }
     applyPermissionMode(mode, opts) {
+        if (this.runtimeHost.isDetached || this.transferInProgress)
+            return;
+        this.sessionManager.setPermissionMode(mode);
+        recordTuiActivity(this.sessionManager, this.runtimeHost.services.agentDir);
         const prev = getPermissionMode();
         if (mode === "plan" && prev !== "plan") {
             this.previousPermissionMode = prev;
@@ -6665,6 +6882,10 @@ ${toggleThinking ? `| \`${toggleThinking}\` | Toggle thinking block visibility |
         this.ui.requestRender();
     }
     async handleClearCommand() {
+        if (this.runtimeHost.isDetached || this.transferInProgress) {
+            this.showError("Use /reclaim first, or /quit to leave this terminal.");
+            return;
+        }
         this.clearStatusIndicator();
         this.ui.setChatScroll(0);
         // Deferred factories must be on builtinRoster before /new rebuilds the runtime.
@@ -6805,6 +7026,7 @@ ${toggleThinking ? `| \`${toggleThinking}\` | Toggle thinking block visibility |
         }
     }
     stop() {
+        this.setThinkingAnimation(false);
         this.stopCatalogRefresh?.();
         this.stopCatalogRefresh = undefined;
         if (this.settingsManager.getShowTerminalProgress()) {
@@ -6815,6 +7037,7 @@ ${toggleThinking ? `| \`${toggleThinking}\` | Toggle thinking block visibility |
         this.clearExtensionTerminalInputListeners();
         this.footer.dispose();
         this.footerDataProvider.dispose();
+        this.disposeChatToolComponents();
         if (this.unsubscribe) {
             this.unsubscribe();
         }