@astralyn/pi 0.82.6 → 0.83.0

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

@@ -186,6 +186,8 @@ export class InteractiveMode {
     onInputCallback;
     pendingUserInputs = [];
     activeStatusIndicator = undefined;
+    activeSelector = null;
+    activeSelectorCleanup = null;
     idleStatus = new IdleStatus();
     workingMessage = undefined;
     workingVisible = true;
@@ -1108,7 +1110,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
@@ -1252,7 +1259,7 @@ export class InteractiveMode {
                     if (result.cancelled) {
                         return { cancelled: true };
                     }
-                    this.chatContainer.clear();
+                    this.clearChat();
                     this.renderInitialMessages();
                     if (result.editorText && !this.editor.getText().trim()) {
                         this.editor.setText(result.editorText);
@@ -1308,16 +1315,19 @@ export class InteractiveMode {
         }
     }
     async rebindCurrentSession(options = {}) {
+        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();
         }
         await this.updateAvailableProviderCount();
@@ -1331,14 +1341,34 @@ export class InteractiveMode {
         this.stop();
         process.exit(1);
     }
+    disposeChatToolComponents() {
+        for (const child of this.chatContainer.children) {
+            if (child instanceof ToolExecutionComponent ||
+                child instanceof ToolGroupComponent ||
+                child instanceof ArminComponent ||
+                child instanceof DaxnutsComponent) {
+                child.dispose();
+            }
+        }
+    }
+    clearChat() {
+        this.disposeChatToolComponents();
+        this.chatContainer.clear();
+    }
+    clearPendingTools() {
+        for (const component of this.pendingTools.values()) {
+            component.dispose();
+        }
+        this.pendingTools.clear();
+    }
     renderCurrentSessionState() {
         this.loadedResourcesContainer.clear();
-        this.chatContainer.clear();
+        this.clearChat();
         this.pendingMessagesContainer.clear();
         this.compactionQueuedMessages = [];
         this.streamingComponent = undefined;
         this.streamingMessage = undefined;
-        this.pendingTools.clear();
+        this.clearPendingTools();
         this.renderInitialMessages();
     }
     /**
@@ -1391,6 +1421,7 @@ export class InteractiveMode {
             sessionManager: this.sessionManager,
             modelRegistry: extensionRunner.getModelRegistry(),
             model: this.session.model,
+            scopedModels: this.session.scopedModels,
             thinkingLevel: this.session.thinkingLevel,
             isIdle: () => this.session.isIdle,
             isProjectTrusted: () => this.settingsManager.isProjectTrusted(),
@@ -2326,7 +2357,7 @@ export class InteractiveMode {
             case "agent_start":
                 this.agentRunActive = true;
                 this.coalescingTerminal.setScrollbackPreservation(true);
-                this.pendingTools.clear();
+                this.clearPendingTools();
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(true);
                 }
@@ -2495,7 +2526,7 @@ export class InteractiveMode {
                     this.streamingComponent = undefined;
                     this.streamingMessage = undefined;
                 }
-                this.pendingTools.clear();
+                this.clearPendingTools();
                 this.ui.requestRender();
                 break;
             case "agent_settled":
@@ -2537,7 +2568,7 @@ export class InteractiveMode {
                 }
                 else {
                     if (event.result) {
-                        this.chatContainer.clear();
+                        this.clearChat();
                         this.rebuildChatFromMessages();
                         this.addMessageToChat(createCompactionSummaryMessage(event.result.summary, event.result.tokensBefore, new Date().toISOString()));
                         this.footer.invalidate();
@@ -2733,7 +2764,7 @@ export class InteractiveMode {
         }
     }
     renderSessionItems(items, options = {}) {
-        this.pendingTools.clear();
+        this.clearPendingTools();
         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.
@@ -2882,7 +2913,7 @@ export class InteractiveMode {
         });
     }
     rebuildChatFromMessages() {
-        this.chatContainer.clear();
+        this.clearChat();
         this.renderSessionEntries(this.sessionManager.buildContextEntries());
     }
     // =========================================================================
@@ -3166,7 +3197,7 @@ export class InteractiveMode {
                 }
             }
         }
-        this.ui.requestRender();
+        this.showStatus(`Tool output: ${expanded ? "expanded" : "collapsed"}`);
     }
     toggleThinkingBlockVisibility() {
         this.hideThinkingBlock = !this.hideThinkingBlock;
@@ -3174,7 +3205,7 @@ export class InteractiveMode {
         // Same reasoning as setToolsExpanded.
         this.coalescingTerminal.passNextFullRedraw();
         // Rebuild chat from session messages
-        this.chatContainer.clear();
+        this.clearChat();
         this.rebuildChatFromMessages();
         // If streaming, re-add the streaming component with updated visibility and re-render
         if (this.streamingComponent && this.streamingMessage) {
@@ -3422,15 +3453,42 @@ export class InteractiveMode {
      * @param create Factory that receives a `done` callback and returns the component and focus target
      */
     showSelector(create) {
+        this.activeSelectorCleanup?.();
+        this.activeSelectorCleanup = null;
+        this.activeSelector = null;
+        let selector;
+        let disposed = false;
+        let closed = false;
+        const dispose = () => {
+            if (disposed || !selector)
+                return;
+            disposed = true;
+            selector.dispose?.();
+        };
         const done = () => {
-            this.editorContainer.clear();
-            this.editorContainer.addChild(this.editor);
-            this.ui.setFocus(this.editor);
+            if (closed)
+                return;
+            closed = true;
+            dispose();
+            if (!selector || this.activeSelector === selector) {
+                this.activeSelector = null;
+                this.activeSelectorCleanup = null;
+                this.editorContainer.clear();
+                this.editorContainer.addChild(this.editor);
+                this.ui.setFocus(this.editor);
+            }
         };
-        const { component, focus } = create(done);
+        const created = create(done);
+        selector = created.component;
+        if (closed) {
+            dispose();
+            return;
+        }
+        this.activeSelector = selector;
+        this.activeSelectorCleanup = dispose;
         this.editorContainer.clear();
-        this.editorContainer.addChild(component);
-        this.ui.setFocus(focus);
+        this.editorContainer.addChild(selector);
+        this.ui.setFocus(created.focus);
         this.ui.requestRender();
     }
     showSettingsSelector() {
@@ -3530,7 +3588,7 @@ export class InteractiveMode {
                             child.setHideThinkingBlock(hidden);
                         }
                     }
-                    this.chatContainer.clear();
+                    this.clearChat();
                     this.rebuildChatFromMessages();
                 },
                 onShowCacheMissNoticesChange: (shown) => {
@@ -3889,7 +3947,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;
@@ -3924,6 +3982,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;
@@ -3952,7 +4015,7 @@ export class InteractiveMode {
                         return;
                     }
                     // Update UI
-                    this.chatContainer.clear();
+                    this.clearChat();
                     this.renderInitialMessages();
                     if (result.editorText && !this.editor.getText().trim()) {
                         this.editor.setText(result.editorText);
@@ -3975,7 +4038,7 @@ export class InteractiveMode {
             }, (entryId, label) => {
                 this.sessionManager.appendLabelChange(entryId, label);
                 this.ui.requestRender();
-            }, initialSelectedId, initialFilterMode);
+            }, initialSelectedId, initialFilterMode, () => this.ui.requestRender());
             selector.onCopy = async (text) => {
                 if (!text) {
                     this.showError("Selected entry has no text to copy");
@@ -5082,12 +5145,17 @@ export class InteractiveMode {
         }
     }
     stop() {
+        this.activeSelectorCleanup?.();
+        this.activeSelectorCleanup = null;
+        this.activeSelector = null;
         if (this.settingsManager.getShowTerminalProgress()) {
             this.ui.terminal.setProgress(false);
         }
         this.clearStatusIndicator();
         this.themeController.disableAutoSync();
         this.clearExtensionTerminalInputListeners();
+        this.clearPendingTools();
+        this.disposeChatToolComponents();
         this.footer.dispose();
         this.footerDataProvider.dispose();
         if (this.unsubscribe) {