@caupulican/pi-adaptative 0.78.2 → 0.78.4

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

@@ -58,6 +58,8 @@ import { SessionSelectorComponent } from "./components/session-selector.js";
 import { SettingsSelectorComponent } from "./components/settings-selector.js";
 import { SkillInvocationMessageComponent } from "./components/skill-invocation-message.js";
 import { ToolExecutionComponent } from "./components/tool-execution.js";
+import { ToolGroupComponent } from "./components/tool-group.js";
+import { getToolPanelActionKey, ToolPanelRegistry } from "./components/tool-panel-registry.js";
 import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
@@ -166,8 +168,8 @@ export class InteractiveMode {
     // Streaming message tracking
     streamingComponent = undefined;
     streamingMessage = undefined;
-    // Tool execution tracking: toolCallId -> component
-    pendingTools = new Map();
+    // Tool execution tracking and session-scoped reusable panels
+    toolPanels = new ToolPanelRegistry();
     // Tool output expansion state
     toolOutputExpanded = false;
     // Thinking block visibility state
@@ -1249,7 +1251,7 @@ export class InteractiveMode {
         this.compactionQueuedMessages = [];
         this.streamingComponent = undefined;
         this.streamingMessage = undefined;
-        this.pendingTools.clear();
+        this.clearRenderedToolPanelState();
         this.renderInitialMessages();
     }
     /**
@@ -1258,6 +1260,60 @@ export class InteractiveMode {
     getRegisteredToolDefinition(toolName) {
         return this.session.getToolDefinition(toolName);
     }
+    getToolPanelScope() {
+        return {
+            sessionId: this.sessionManager.getSessionId?.(),
+            sessionFile: this.sessionManager.getSessionFile?.(),
+            cwd: this.sessionManager.getCwd(),
+        };
+    }
+    appendToolExecutionComponent(component, allowGrouping) {
+        const toolGroup = allowGrouping ? component.toolGroup?.trim() : undefined;
+        if (!toolGroup) {
+            this.chatContainer.addChild(component);
+            return;
+        }
+        const children = this.chatContainer.children;
+        const lastChild = children[children.length - 1];
+        if (lastChild instanceof ToolGroupComponent && lastChild.toolGroup === toolGroup) {
+            lastChild.addTool(component);
+            return;
+        }
+        if (lastChild instanceof ToolExecutionComponent && lastChild.toolGroup?.trim() === toolGroup) {
+            const group = new ToolGroupComponent(toolGroup, [lastChild, component]);
+            group.setExpanded(this.toolOutputExpanded);
+            children[children.length - 1] = group;
+            return;
+        }
+        this.chatContainer.addChild(component);
+    }
+    attachToolExecutionComponent(toolName, toolCallId, args) {
+        const actionKey = getToolPanelActionKey(this.getToolPanelScope(), toolName, args);
+        const toolDefinition = this.getRegisteredToolDefinition(toolName);
+        const existing = this.toolPanels.getReusable(actionKey);
+        if (existing) {
+            this.chatContainer.removeChild(existing);
+            existing.resetInvocation(toolName, toolCallId, args, toolDefinition);
+            existing.setExpanded(this.toolOutputExpanded);
+            this.chatContainer.addChild(existing);
+            this.toolPanels.register(toolCallId, existing, actionKey);
+            return existing;
+        }
+        const component = new ToolExecutionComponent(toolName, toolCallId, args, {
+            showImages: this.settingsManager.getShowImages(),
+            imageWidthCells: this.settingsManager.getImageWidthCells(),
+        }, toolDefinition, this.ui, this.sessionManager.getCwd());
+        component.setExpanded(this.toolOutputExpanded);
+        this.appendToolExecutionComponent(component, !actionKey);
+        this.toolPanels.register(toolCallId, component, actionKey);
+        return component;
+    }
+    clearActiveToolCalls() {
+        this.toolPanels.clearActive();
+    }
+    clearRenderedToolPanelState() {
+        this.toolPanels.clearAll();
+    }
     /**
      * Set up keyboard shortcuts registered by extensions.
      */
@@ -1813,7 +1869,7 @@ export class InteractiveMode {
             this.editorContainer.clear();
             this.editorContainer.addChild(this.editor);
             this.editor.setText(savedText);
-            this.ui.setFocus(this.editor);
+            this.ui.restoreFocus(this.editor);
             this.ui.requestRender();
         };
         return new Promise((resolve, reject) => {
@@ -1941,7 +1997,7 @@ export class InteractiveMode {
         this.defaultEditor.onAction("app.model.cycleBackward", () => this.cycleModel("backward"));
         // Global debug handler on TUI (works regardless of focus)
         this.ui.onDebug = () => this.handleDebugCommand();
-        this.defaultEditor.onAction("app.model.select", () => this.showModelSelector());
+        this.defaultEditor.onAction("app.model.select", () => void this.showModelSelector());
         this.defaultEditor.onAction("app.tools.expand", () => this.toggleToolOutputExpansion());
         this.defaultEditor.onAction("app.thinking.toggle", () => this.toggleThinkingBlockVisibility());
         this.defaultEditor.onAction("app.editor.external", () => this.openExternalEditor());
@@ -2045,14 +2101,14 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
-            if (text === "/fork") {
-                this.showUserMessageSelector();
+            if (text === "/fork" || text.startsWith("/fork ")) {
+                this.showUserMessageSelector(text.slice("/fork".length).trim() || undefined);
                 this.editor.setText("");
                 return;
             }
-            if (text === "/clone") {
+            if (text === "/clone" || text.startsWith("/clone ")) {
                 this.editor.setText("");
-                await this.handleCloneCommand();
+                await this.handleCloneCommand(text.slice("/clone".length).trim() || undefined);
                 return;
             }
             if (text === "/tree") {
@@ -2070,9 +2126,9 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
-            if (text === "/new") {
+            if (text === "/new" || text.startsWith("/new ")) {
                 this.editor.setText("");
-                await this.handleClearCommand();
+                await this.handleClearCommand(text.slice("/new".length).trim() || undefined);
                 return;
             }
             if (text === "/compact" || text.startsWith("/compact ")) {
@@ -2174,7 +2230,7 @@ export class InteractiveMode {
         this.footer.invalidate();
         switch (event.type) {
             case "agent_start":
-                this.pendingTools.clear();
+                this.clearActiveToolCalls();
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(true);
                 }
@@ -2236,17 +2292,11 @@ export class InteractiveMode {
                     this.streamingComponent.updateContent(this.streamingMessage);
                     for (const content of this.streamingMessage.content) {
                         if (content.type === "toolCall") {
-                            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.chatContainer.addChild(component);
-                                this.pendingTools.set(content.id, component);
+                            if (!this.toolPanels.hasActive(content.id)) {
+                                this.attachToolExecutionComponent(content.name, content.id, content.arguments);
                             }
                             else {
-                                const component = this.pendingTools.get(content.id);
+                                const component = this.toolPanels.getActive(content.id);
                                 if (component) {
                                     component.updateArgs(content.arguments);
                                 }
@@ -2275,17 +2325,17 @@ export class InteractiveMode {
                         if (!errorMessage) {
                             errorMessage = this.streamingMessage.errorMessage || "Error";
                         }
-                        for (const [, component] of this.pendingTools.entries()) {
+                        for (const [, component] of this.toolPanels.activeEntries()) {
                             component.updateResult({
                                 content: [{ type: "text", text: errorMessage }],
                                 isError: true,
                             });
                         }
-                        this.pendingTools.clear();
+                        this.clearActiveToolCalls();
                     }
                     else {
                         // Args are now complete - trigger diff computation for edit tools
-                        for (const [, component] of this.pendingTools.entries()) {
+                        for (const [, component] of this.toolPanels.activeEntries()) {
                             component.setArgsComplete();
                         }
                     }
@@ -2296,22 +2346,15 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 break;
             case "tool_execution_start": {
-                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.chatContainer.addChild(component);
-                    this.pendingTools.set(event.toolCallId, component);
-                }
+                let component = this.toolPanels.getActive(event.toolCallId);
+                if (!component)
+                    component = this.attachToolExecutionComponent(event.toolName, event.toolCallId, event.args);
                 component.markExecutionStarted();
                 this.ui.requestRender();
                 break;
             }
             case "tool_execution_update": {
-                const component = this.pendingTools.get(event.toolCallId);
+                const component = this.toolPanels.getActive(event.toolCallId);
                 if (component) {
                     component.updateResult({ ...event.partialResult, isError: false }, true);
                     this.ui.requestRender();
@@ -2319,10 +2362,10 @@ export class InteractiveMode {
                 break;
             }
             case "tool_execution_end": {
-                const component = this.pendingTools.get(event.toolCallId);
+                const component = this.toolPanels.getActive(event.toolCallId);
                 if (component) {
                     component.updateResult({ ...event.result, isError: event.isError });
-                    this.pendingTools.delete(event.toolCallId);
+                    this.toolPanels.finish(event.toolCallId);
                     this.ui.requestRender();
                 }
                 break;
@@ -2341,7 +2384,7 @@ export class InteractiveMode {
                     this.streamingComponent = undefined;
                     this.streamingMessage = undefined;
                 }
-                this.pendingTools.clear();
+                this.clearActiveToolCalls();
                 await this.checkShutdownRequested();
                 this.ui.requestRender();
                 break;
@@ -2564,7 +2607,7 @@ export class InteractiveMode {
      * @param options.populateHistory Add user messages to editor history
      */
     renderSessionContext(sessionContext, options = {}) {
-        this.pendingTools.clear();
+        this.clearRenderedToolPanelState();
         const renderedPendingTools = new Map();
         if (options.updateFooter) {
             this.footer.invalidate();
@@ -2577,12 +2620,7 @@ 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.chatContainer.addChild(component);
+                        const component = this.attachToolExecutionComponent(content.name, content.id, content.arguments);
                         if (message.stopReason === "aborted" || message.stopReason === "error") {
                             let errorMessage;
                             if (message.stopReason === "aborted") {
@@ -2596,6 +2634,7 @@ export class InteractiveMode {
                                 errorMessage = message.errorMessage || "Error";
                             }
                             component.updateResult({ content: [{ type: "text", text: errorMessage }], isError: true });
+                            this.toolPanels.finish(content.id);
                         }
                         else {
                             renderedPendingTools.set(content.id, component);
@@ -2609,6 +2648,7 @@ export class InteractiveMode {
                 if (component) {
                     component.updateResult(message);
                     renderedPendingTools.delete(message.toolCallId);
+                    this.toolPanels.finish(message.toolCallId);
                 }
             }
             else {
@@ -2616,9 +2656,6 @@ export class InteractiveMode {
                 this.addMessageToChat(message, options);
             }
         }
-        for (const [toolCallId, component] of renderedPendingTools) {
-            this.pendingTools.set(toolCallId, component);
-        }
         this.ui.requestRender();
     }
     renderInitialMessages() {
@@ -3215,7 +3252,7 @@ export class InteractiveMode {
         const done = () => {
             this.editorContainer.clear();
             this.editorContainer.addChild(this.editor);
-            this.ui.setFocus(this.editor);
+            this.ui.restoreFocus(this.editor);
         };
         const { component, focus } = create(done);
         this.editorContainer.clear();
@@ -3260,7 +3297,7 @@ export class InteractiveMode {
                 onShowImagesChange: (enabled) => {
                     this.settingsManager.setShowImages(enabled);
                     for (const child of this.chatContainer.children) {
-                        if (child instanceof ToolExecutionComponent) {
+                        if (child instanceof ToolExecutionComponent || child instanceof ToolGroupComponent) {
                             child.setShowImages(enabled);
                         }
                     }
@@ -3268,7 +3305,7 @@ export class InteractiveMode {
                 onImageWidthCellsChange: (width) => {
                     this.settingsManager.setImageWidthCells(width);
                     for (const child of this.chatContainer.children) {
-                        if (child instanceof ToolExecutionComponent) {
+                        if (child instanceof ToolExecutionComponent || child instanceof ToolGroupComponent) {
                             child.setImageWidthCells(width);
                         }
                     }
@@ -3382,7 +3419,7 @@ export class InteractiveMode {
     }
     async handleModelCommand(searchTerm) {
         if (!searchTerm) {
-            this.showModelSelector();
+            await this.showModelSelector();
             return;
         }
         const model = await this.findExactModelMatch(searchTerm);
@@ -3400,7 +3437,7 @@ export class InteractiveMode {
             }
             return;
         }
-        this.showModelSelector(searchTerm);
+        await this.showModelSelector(searchTerm);
     }
     async findExactModelMatch(searchTerm) {
         const models = await this.getModelCandidates();
@@ -3452,7 +3489,19 @@ export class InteractiveMode {
             // Ignore auth lookup failures for warning-only checks.
         }
     }
-    showModelSelector(initialSearchInput) {
+    async showModelSelector(initialSearchInput) {
+        try {
+            await this.session.extensionRunner.emit({
+                type: "model_selector_open",
+                currentModel: this.session.model,
+                scopedModels: this.session.scopedModels,
+                initialSearchInput,
+            });
+        }
+        catch (error) {
+            this.showError(error instanceof Error ? error.message : String(error));
+            return;
+        }
         this.showSelector((done) => {
             const selector = new ModelSelectorComponent(this.ui, this.session.model, this.settingsManager, this.session.modelRegistry, this.session.scopedModels, async (model) => {
                 try {
@@ -3541,7 +3590,7 @@ export class InteractiveMode {
             return { component: selector, focus: selector };
         });
     }
-    showUserMessageSelector() {
+    showUserMessageSelector(newSessionName) {
         const userMessages = this.session.getUserMessagesForForking();
         if (userMessages.length === 0) {
             this.showStatus("No messages to fork from");
@@ -3558,9 +3607,12 @@ export class InteractiveMode {
                         return;
                     }
                     this.renderCurrentSessionState();
+                    if (newSessionName) {
+                        this.session.setSessionName(newSessionName);
+                    }
                     this.editor.setText(result.selectedText ?? "");
                     done();
-                    this.showStatus("Forked to new session");
+                    this.showStatus(newSessionName ? `Forked to new session: ${newSessionName}` : "Forked to new session");
                 }
                 catch (error) {
                     done();
@@ -3573,7 +3625,7 @@ export class InteractiveMode {
             return { component: selector, focus: selector.getMessageList() };
         });
     }
-    async handleCloneCommand() {
+    async handleCloneCommand(newSessionName) {
         const leafId = this.sessionManager.getLeafId();
         if (!leafId) {
             this.showStatus("Nothing to clone yet");
@@ -3586,8 +3638,11 @@ export class InteractiveMode {
                 return;
             }
             this.renderCurrentSessionState();
+            if (newSessionName) {
+                this.session.setSessionName(newSessionName);
+            }
             this.editor.setText("");
-            this.showStatus("Cloned to new session");
+            this.showStatus(newSessionName ? `Cloned to new session: ${newSessionName}` : "Cloned to new session");
         }
         catch (error) {
             this.showError(error instanceof Error ? error.message : String(error));
@@ -4537,7 +4592,7 @@ export class InteractiveMode {
         this.chatContainer.addChild(new DynamicBorder());
         this.ui.requestRender();
     }
-    async handleClearCommand() {
+    async handleClearCommand(newSessionName) {
         if (this.loadingAnimation) {
             this.loadingAnimation.stop();
             this.loadingAnimation = undefined;
@@ -4549,8 +4604,12 @@ export class InteractiveMode {
                 return;
             }
             this.renderCurrentSessionState();
+            if (newSessionName) {
+                this.session.setSessionName(newSessionName);
+            }
             this.chatContainer.addChild(new Spacer(1));
-            this.chatContainer.addChild(new Text(`${theme.fg("accent", "✓ New session started")}`, 1, 1));
+            const label = newSessionName ? `✓ New session started: ${newSessionName}` : "✓ New session started";
+            this.chatContainer.addChild(new Text(`${theme.fg("accent", label)}`, 1, 1));
             this.ui.requestRender();
         }
         catch (error) {