gsd-pi 2.24.0 → 2.26.0

package/packages/pi-coding-agent/dist/modes/interactive/interactive-mode.js

@@ -885,6 +885,32 @@ export class InteractiveMode {
         const registeredTool = tools.find((t) => t.definition.name === toolName);
         return registeredTool?.definition;
     }
+    /**
+     * Format web search result content for display in the TUI.
+     */
+    formatWebSearchResult(content) {
+        if (!content)
+            return "Web search completed";
+        // Error result
+        if (typeof content === "object" && "type" in content && content.type === "web_search_tool_result_error") {
+            const error = content;
+            return `Search error: ${error.error_code || "unknown"}`;
+        }
+        // Array of search results
+        if (Array.isArray(content)) {
+            const results = content.filter((r) => r.type === "web_search_result");
+            if (results.length === 0)
+                return "No results found";
+            return results
+                .map((r) => {
+                const title = r.title || "Untitled";
+                const url = r.url || "";
+                return `${title}\n  ${url}`;
+            })
+                .join("\n");
+        }
+        return "Web search completed";
+    }
     /**
      * Set up keyboard shortcuts registered by extensions.
      */
@@ -1649,6 +1675,12 @@ export class InteractiveMode {
                 this.handleThinkingCommand(arg);
                 return;
             }
+            if (text === "/edit-mode" || text.startsWith("/edit-mode ")) {
+                const arg = text.startsWith("/edit-mode ") ? text.slice(11).trim() : undefined;
+                this.editor.setText("");
+                this.handleEditModeCommand(arg);
+                return;
+            }
             if (text === "/debug") {
                 this.handleDebugCommand();
                 this.editor.setText("");
@@ -1793,6 +1825,31 @@ export class InteractiveMode {
                                 }
                             }
                         }
+                        else if (content.type === "serverToolUse") {
+                            // Server-side tool (e.g., native web search) — show as pending tool execution
+                            if (!this.pendingTools.has(content.id)) {
+                                const component = new ToolExecutionComponent(content.name, content.input ?? {}, {
+                                    showImages: this.settingsManager.getShowImages(),
+                                }, undefined, this.ui);
+                                component.setExpanded(this.toolOutputExpanded);
+                                this.chatContainer.addChild(component);
+                                this.pendingTools.set(content.id, component);
+                            }
+                        }
+                        else if (content.type === "webSearchResult") {
+                            // Server-side tool result — resolve the pending server tool execution
+                            const component = this.pendingTools.get(content.toolUseId);
+                            if (component) {
+                                const searchContent = content.content;
+                                const isError = searchContent && typeof searchContent === "object" && "type" in searchContent && searchContent.type === "web_search_tool_result_error";
+                                const resultText = this.formatWebSearchResult(searchContent);
+                                component.updateResult({
+                                    content: [{ type: "text", text: resultText }],
+                                    isError: !!isError,
+                                });
+                                this.pendingTools.delete(content.toolUseId);
+                            }
+                        }
                     }
                     this.ui.requestRender();
                 }
@@ -2129,6 +2186,27 @@ export class InteractiveMode {
                             this.pendingTools.set(content.id, component);
                         }
                     }
+                    else if (content.type === "serverToolUse") {
+                        // Server-side tool (e.g., native web search)
+                        const component = new ToolExecutionComponent(content.name, content.input ?? {}, { showImages: this.settingsManager.getShowImages() }, undefined, this.ui);
+                        component.setExpanded(this.toolOutputExpanded);
+                        this.chatContainer.addChild(component);
+                        // Find matching webSearchResult in this message's content
+                        const resultBlock = message.content.find((c) => c.type === "webSearchResult" && c.toolUseId === content.id);
+                        if (resultBlock && resultBlock.type === "webSearchResult") {
+                            const searchContent = resultBlock.content;
+                            const isError = searchContent && typeof searchContent === "object" && "type" in searchContent && searchContent.type === "web_search_tool_result_error";
+                            const resultText = this.formatWebSearchResult(searchContent);
+                            component.updateResult({
+                                content: [{ type: "text", text: resultText }],
+                                isError: !!isError,
+                            });
+                        }
+                        else {
+                            // No result yet (aborted stream?) — show as pending
+                            this.pendingTools.set(content.id, component);
+                        }
+                    }
                 }
             }
             else if (message.role === "toolResult") {
@@ -2316,6 +2394,24 @@ export class InteractiveMode {
         }
         this.showThinkingSelector();
     }
+    handleEditModeCommand(arg) {
+        const modes = ["standard", "hashline"];
+        if (arg) {
+            const mode = arg.toLowerCase();
+            if (!modes.includes(mode)) {
+                this.showStatus(`Invalid edit mode "${arg}". Available: standard, hashline`);
+                return;
+            }
+            this.session.setEditMode(mode);
+            this.showStatus(`Edit mode: ${mode}${mode === "hashline" ? " (LINE#ID anchored edits)" : " (text-match edits)"}`);
+            return;
+        }
+        // Toggle
+        const current = this.session.editMode;
+        const next = current === "standard" ? "hashline" : "standard";
+        this.session.setEditMode(next);
+        this.showStatus(`Edit mode: ${next}${next === "hashline" ? " (LINE#ID anchored edits)" : " (text-match edits)"}`);
+    }
     showThinkingSelector() {
         const availableLevels = this.session.getAvailableThinkingLevels();
         this.showSelector((done) => {
@@ -3165,41 +3261,50 @@ export class InteractiveMode {
             }
         }
         this.showSelector((done) => {
-            const selector = new OAuthSelectorComponent(mode, this.session.modelRegistry.authStorage, async (providerId) => {
+            const selector = new OAuthSelectorComponent(mode, this.session.modelRegistry.authStorage, (providerId) => {
                 done();
-                if (mode === "login") {
-                    await this.showLoginDialog(providerId);
-                }
-                else {
-                    // Logout flow
-                    const providerInfo = this.session.modelRegistry.authStorage
-                        .getOAuthProviders()
-                        .find((p) => p.id === providerId);
-                    const providerName = providerInfo?.name || providerId;
-                    try {
-                        this.session.modelRegistry.authStorage.logout(providerId);
-                        this.session.modelRegistry.refresh();
-                        await this.updateAvailableProviderCount();
-                        // Auto-switch model if current model belongs to the logged-out provider
-                        const currentModel = this.session.model;
-                        if (currentModel?.provider === providerId) {
-                            try {
-                                const available = this.session.modelRegistry.getAvailable();
-                                const fallback = available.find((m) => m.provider !== providerId);
-                                if (fallback) {
-                                    await this.session.setModel(fallback);
+                // OAuthSelectorComponent calls this synchronously (no await),
+                // so we must catch async errors here to prevent unhandled rejections
+                // when the user cancels the login dialog (#821).
+                const handleAsync = async () => {
+                    if (mode === "login") {
+                        await this.showLoginDialog(providerId);
+                    }
+                    else {
+                        // Logout flow
+                        const providerInfo = this.session.modelRegistry.authStorage
+                            .getOAuthProviders()
+                            .find((p) => p.id === providerId);
+                        const providerName = providerInfo?.name || providerId;
+                        try {
+                            this.session.modelRegistry.authStorage.logout(providerId);
+                            this.session.modelRegistry.refresh();
+                            await this.updateAvailableProviderCount();
+                            // Auto-switch model if current model belongs to the logged-out provider
+                            const currentModel = this.session.model;
+                            if (currentModel?.provider === providerId) {
+                                try {
+                                    const available = this.session.modelRegistry.getAvailable();
+                                    const fallback = available.find((m) => m.provider !== providerId);
+                                    if (fallback) {
+                                        await this.session.setModel(fallback);
+                                    }
+                                }
+                                catch {
+                                    // Model switch failed — user can manually switch via /model
                                 }
                             }
-                            catch {
-                                // Model switch failed — user can manually switch via /model
-                            }
+                            this.showStatus(`Logged out of ${providerName}`);
+                        }
+                        catch (error) {
+                            this.showError(`Logout failed: ${error instanceof Error ? error.message : String(error)}`);
                         }
-                        this.showStatus(`Logged out of ${providerName}`);
-                    }
-                    catch (error) {
-                        this.showError(`Logout failed: ${error instanceof Error ? error.message : String(error)}`);
                     }
-                }
+                };
+                handleAsync().catch(() => {
+                    // Swallow — showLoginDialog already handles its own errors.
+                    // This prevents unhandled rejections when login is cancelled.
+                });
             }, () => {
                 done();
                 this.ui.requestRender();