@ashx-j/lunr 0.2.20 → 0.2.22

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";
@@ -88,6 +90,7 @@ import { TrustSelectorComponent } from "./components/trust-selector.js";
 import { renderUsageBox } from "./components/usage-view.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
+import { orderedExtensionWidgets, replaceExtensionWidget, widgetSeparatorNeedsSpacer, } from "./extension-widget-order.js";
 import { getModelSearchText } from "./model-search.js";
 import { wrapSkillTagAutocomplete } from "./skill-tag-autocomplete.js";
 import { computeSmoothRevealStep, countGraphemesBeforeToolCall, countMessageGraphemes, sliceMessageContent, } from "./smooth-streaming.js";
@@ -359,7 +362,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());
@@ -370,8 +375,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));
@@ -626,7 +630,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)
@@ -1451,8 +1455,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();
@@ -1616,21 +1638,8 @@ export class InteractiveMode {
      */
     setExtensionWidget(key, content, options) {
         const placement = options?.placement ?? "aboveEditor";
-        const removeExisting = (map) => {
-            const existing = map.get(key);
-            if (existing?.dispose)
-                existing.dispose();
-            map.delete(key);
-        };
-        removeExisting(this.extensionWidgetsAbove);
-        removeExisting(this.extensionWidgetsBelow);
-        if (content === undefined) {
-            this.renderWidgets();
-            return;
-        }
         let component;
         if (Array.isArray(content)) {
-            // Wrap string array in a Container with Text components
             const container = new Container();
             for (const line of content.slice(0, InteractiveMode.MAX_WIDGET_LINES)) {
                 container.addChild(new Text(line, 1, 0));
@@ -1640,12 +1649,10 @@ export class InteractiveMode {
             }
             component = container;
         }
-        else {
-            // Factory function - create component
+        else if (content) {
             component = content(this.ui, theme);
         }
-        const targetMap = placement === "belowEditor" ? this.extensionWidgetsBelow : this.extensionWidgetsAbove;
-        targetMap.set(key, component);
+        replaceExtensionWidget(this.extensionWidgetsAbove, this.extensionWidgetsBelow, key, component, placement);
         this.renderWidgets();
     }
     clearExtensionWidgets() {
@@ -1712,13 +1719,14 @@ export class InteractiveMode {
         if (leadingSpacer) {
             container.addChild(new Spacer(1));
         }
-        let first = true;
-        for (const component of widgets.values()) {
-            if (!first) {
-                container.addChild(new Spacer(1));
+        let previousKey;
+        for (const [key, component] of orderedExtensionWidgets(widgets)) {
+            if (previousKey !== undefined) {
+                if (widgetSeparatorNeedsSpacer(previousKey, key))
+                    container.addChild(new Spacer(1));
                 container.addChild(new DynamicBorder((s) => theme.fg("dim", s)));
             }
-            first = false;
+            previousKey = key;
             container.addChild(component);
         }
     }
@@ -2407,6 +2415,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;
@@ -2832,7 +2885,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.thinkingCollapse);
+                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.thinkingCollapse, { requestRender: () => this.ui.requestRender() });
                     // lunr: collapsible reasoning — fresh timing array for this message.
                     this.thinkingRunTimings = [];
                     this.streamingComponent.setThinkingTimings(this.thinkingRunTimings);
@@ -3199,7 +3252,7 @@ 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() });
                 // lunr: collapsible reasoning — re-attach live timings when this
                 // message was streamed in this session (undefined = history).
                 assistantComponent.setThinkingTimings(this.thinkingTimingsByMessage.get(message));
@@ -3401,6 +3454,7 @@ export class InteractiveMode {
         if (this.isShuttingDown)
             return;
         this.isShuttingDown = true;
+        this.unregisterSessionTransfer?.();
         this.stopSmoothStreaming();
         if (this.planUsageTimer) {
             clearInterval(this.planUsageTimer);
@@ -3588,6 +3642,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;
@@ -3642,6 +3700,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");
@@ -3655,6 +3716,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) {
@@ -4019,6 +4083,7 @@ export class InteractiveMode {
                 autocompleteMaxVisible: this.settingsManager.getAutocompleteMaxVisible(),
                 quietStartup: this.settingsManager.getQuietStartup(),
                 smoothStreaming: this.settingsManager.getSmoothStreaming(),
+                subagentSpinner: this.settingsManager.getSubagentSpinner(),
                 sessionRetentionDays: this.settingsManager.getSessionRetentionDays(),
                 clearOnShrink: this.settingsManager.getClearOnShrink(),
                 showTerminalProgress: this.settingsManager.getShowTerminalProgress(),
@@ -4027,8 +4092,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(),
@@ -4145,6 +4212,10 @@ export class InteractiveMode {
                 onSmoothStreamingChange: (enabled) => {
                     this.applySmoothStreamingSettingChange(enabled);
                 },
+                onSubagentSpinnerChange: (spinner) => {
+                    this.settingsManager.setSubagentSpinner(spinner);
+                    this.ui.requestRender();
+                },
                 onSessionRetentionDaysChange: (days) => {
                     this.settingsManager.setSessionRetentionDays(days);
                 },
@@ -4232,11 +4303,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.");
@@ -4276,6 +4356,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);
                 },
@@ -4305,6 +4415,7 @@ export class InteractiveMode {
                     autoManage: () => this.settingsManager.getAutoManageSubscriptions(),
                     requestRender: () => this.ui.requestRender(),
                 },
+                requestRender: () => this.ui.requestRender(),
                 createModelTierPicker: (_tier, currentModelRef, done) => {
                     const selector = new ModelSelectorComponent(this.ui, this.resolveModelReference(currentModelRef), this.settingsManager, this.session.modelRuntime, this.session.scopedModels, (model) => {
                         done(`${model.provider}/${model.id}`);
@@ -4505,6 +4616,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) => {
@@ -4697,6 +4810,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");
@@ -4745,6 +4860,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();
@@ -4875,8 +4992,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,
@@ -6307,6 +6433,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);
         }
@@ -6334,6 +6463,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;
@@ -6672,6 +6805,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.