@ashx-j/lunr 0.2.22 → 0.2.23

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

@@ -257,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
@@ -1386,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);
@@ -1505,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;
@@ -2687,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
@@ -2714,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);
@@ -2754,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 {
@@ -2794,6 +2820,7 @@ export class InteractiveMode {
         }
     }
     stopSmoothStreaming() {
+        this.setThinkingAnimation(false);
         this.clearSmoothStreamingTimer();
         this.streamingTargetMessage = undefined;
         this.streamingDisplayedLength = 0;
@@ -2833,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);
                 }
@@ -2885,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, { requestRender: () => this.ui.requestRender() });
+                    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);
@@ -2992,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;
@@ -3034,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());
@@ -3252,7 +3283,10 @@ export class InteractiveMode {
                 break;
             }
             case "assistant": {
-                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.thinkingCollapse, { requestRender: () => this.ui.requestRender() });
+                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));
@@ -3272,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.
@@ -3294,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") {
@@ -3334,6 +3377,8 @@ export class InteractiveMode {
                 }
             }
             else {
+                if (message.role === "user")
+                    browserActivityComponent = undefined;
                 // All other messages use standard rendering
                 this.addMessageToChat(message, options);
             }
@@ -3424,7 +3469,7 @@ export class InteractiveMode {
         });
     }
     rebuildChatFromMessages() {
-        this.chatContainer.clear();
+        this.clearChatContainer();
         this.renderSessionEntries(this.sessionManager.buildContextEntries());
     }
     // =========================================================================
@@ -3755,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
@@ -3768,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.
@@ -3946,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();
@@ -4072,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(),
@@ -4185,7 +4255,6 @@ export class InteractiveMode {
                             child.setHideThinkingBlock(hidden);
                         }
                     }
-                    this.chatContainer.clear();
                     this.rebuildChatFromMessages();
                 },
                 onThinkingCollapseChange: (collapse) => {
@@ -4196,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();
@@ -4935,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);
@@ -5795,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 };
@@ -5838,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);
@@ -6949,6 +7026,7 @@ ${toggleThinking ? `| \`${toggleThinking}\` | Toggle thinking block visibility |
         }
     }
     stop() {
+        this.setThinkingAnimation(false);
         this.stopCatalogRefresh?.();
         this.stopCatalogRefresh = undefined;
         if (this.settingsManager.getShowTerminalProgress()) {
@@ -6959,6 +7037,7 @@ ${toggleThinking ? `| \`${toggleThinking}\` | Toggle thinking block visibility |
         this.clearExtensionTerminalInputListeners();
         this.footer.dispose();
         this.footerDataProvider.dispose();
+        this.disposeChatToolComponents();
         if (this.unsubscribe) {
             this.unsubscribe();
         }