pi-ui-extend 0.1.71 → 0.1.74

package/dist/app/app.d.ts

@@ -62,6 +62,7 @@ export declare class PiUiExtendApp {
     private subagentsPanelExpanded;
     private allThinkingExpanded;
     private superCompactTools;
+    private internalClipboardText;
     private voicePartialText;
     private resumeSessions;
     private resumeLoading;
@@ -86,6 +87,7 @@ export declare class PiUiExtendApp {
     private restoreTabInputState;
     private clearPersistedInputDraft;
     private insertVoiceTranscript;
+    private pasteInternalClipboard;
     private setVoicePartialTranscript;
     private addVoiceSystemMessage;
     private resetSessionView;

package/dist/app/app.js

@@ -132,6 +132,7 @@ export class PiUiExtendApp {
     subagentsPanelExpanded = true;
     allThinkingExpanded = false;
     superCompactTools = false;
+    internalClipboardText;
     voicePartialText;
     resumeSessions = [];
     resumeLoading = false;
@@ -310,6 +311,7 @@ export class PiUiExtendApp {
             voiceStatusWidgetActive: () => this.voiceController.statusWidgetActive(),
             conversationQuickScrollDirections: () => this.conversationQuickScrollDirections(),
             queueableInputActive: () => this.inputEditor.promptText.trimEnd().length > 0 || this.inputEditor.images.length > 0,
+            internalClipboardActive: () => Boolean(this.internalClipboardText),
             userMessageJumpMenuActive: () => this.popupMenus.directMenu === "user-message-jump",
             allThinkingExpandedActive: () => this.allThinkingExpanded,
             superCompactToolsActive: () => this.superCompactTools,
@@ -613,6 +615,10 @@ export class PiUiExtendApp {
                     this.render();
                 });
             },
+            pasteInternalClipboard: () => this.pasteInternalClipboard(),
+            setInternalClipboardText: (text) => {
+                this.internalClipboardText = text;
+            },
             scrollConversationQuick: (direction) => this.scrollConversationQuick(direction),
             toggleAllThinkingExpanded: () => {
                 this.allThinkingExpanded = !this.allThinkingExpanded;
@@ -792,6 +798,7 @@ export class PiUiExtendApp {
                 this.mouseController.statusContextTarget = undefined;
                 this.mouseController.statusModelUsageTarget = undefined;
                 this.mouseController.statusDraftQueueTarget = undefined;
+                this.mouseController.statusInternalClipboardTarget = undefined;
                 this.mouseController.statusUserJumpTarget = undefined;
                 this.mouseController.statusThinkingExpandTarget = undefined;
                 this.mouseController.statusCompactToolsTarget = undefined;
@@ -966,6 +973,16 @@ export class PiUiExtendApp {
         this.inputEditor.insert(`${prefix}${transcript}${suffix}`);
         this.render();
     }
+    pasteInternalClipboard() {
+        if (!this.internalClipboardText) {
+            this.showToast("Nothing has been copied inside Pix yet.", "info");
+            return;
+        }
+        this.requestHistory.resetNavigation();
+        this.popupMenus.resetInputMenuDismissals();
+        this.inputEditor.attachPastedText(this.internalClipboardText);
+        this.render();
+    }
     setVoicePartialTranscript(text) {
         if (this.voicePartialText === text)
             return;

package/dist/app/commands/command-model-actions.js

@@ -67,7 +67,7 @@ export class ModelCommandActions {
         const parsed = parseScopedModelRef(modelRef);
         if (!parsed)
             throw new Error("Model must use provider/model[:thinking] format");
-        await runtime.services.modelRuntime.reloadConfig();
+        await runtime.services.modelRuntime.refresh();
         if (!isCommandScopeActive(this.host, scope))
             return;
         const model = runtime.services.modelRuntime.getModel(parsed.provider, parsed.modelId);
@@ -108,7 +108,7 @@ export class ModelCommandActions {
         const parsed = parseScopedModelRef(modelRef);
         if (!parsed)
             throw new Error("Model must use provider/model[:thinking] format");
-        await runtime.services.modelRuntime.reloadConfig();
+        await runtime.services.modelRuntime.refresh();
         if (!isCommandScopeActive(this.host, scope))
             return;
         const model = runtime.services.modelRuntime.getModel(parsed.provider, parsed.modelId);
@@ -132,7 +132,7 @@ export class ModelCommandActions {
         const parsed = parseScopedModelRef(modelRef);
         if (!parsed)
             throw new Error("Model must use provider/model[:thinking] format, or run /autocomplete with no arguments to disable");
-        await runtime.services.modelRuntime.reloadConfig();
+        await runtime.services.modelRuntime.refresh();
         if (!isCommandScopeActive(this.host, scope))
             return;
         const model = runtime.services.modelRuntime.getModel(parsed.provider, parsed.modelId);
@@ -216,7 +216,7 @@ export class ModelCommandActions {
         const refs = value.split(/[,\s]+/).map((ref) => ref.trim()).filter(Boolean);
         const scopedModels = [];
         const invalidRefs = [];
-        await runtime.services.modelRuntime.reloadConfig();
+        await runtime.services.modelRuntime.refresh();
         if (!isCommandScopeActive(this.host, scope))
             return;
         for (const ref of refs) {

package/dist/app/icons.d.ts

@@ -23,6 +23,7 @@ declare const NERD_FONT_ICONS: {
     readonly volumeOff: "󰖁";
     readonly user: "󰀄";
     readonly compactTools: "󰍜";
+    readonly clipboardPaste: "󰆒";
     readonly thinkingExpanded: "󰌵";
     readonly stopCircle: "󰙥";
     readonly timerSand: "󰔟";

package/dist/app/icons.js

@@ -34,6 +34,7 @@ const NERD_FONT_ICONS = {
     volumeOff: "\u{f0581}",
     user: "\u{f0004}",
     compactTools: "\u{f035c}",
+    clipboardPaste: "\u{f0192}",
     thinkingExpanded: "\u{f0335}",
     stopCircle: "\u{f0665}",
     timerSand: "\u{f051f}",
@@ -66,6 +67,7 @@ const FALLBACK_ICONS = {
     volumeOff: "ø",
     user: "@",
     compactTools: "≡",
+    clipboardPaste: "P",
     thinkingExpanded: ">",
     stopCircle: "■",
     timerSand: "⏳",

package/dist/app/input/autocomplete-controller.js

@@ -142,7 +142,7 @@ export async function completeInputWithPi(runtime, draft, config, signal) {
     const modelRuntime = runtime.services.modelRuntime;
     let model = modelRuntime.getModel(parsedModel.provider, parsedModel.modelId);
     if (!model) {
-        await modelRuntime.reloadConfig();
+        await modelRuntime.refresh();
         model = modelRuntime.getModel(parsedModel.provider, parsedModel.modelId);
     }
     if (!model)

package/dist/app/input/prompt-enhancer-controller.js

@@ -144,7 +144,7 @@ async function enhancePromptWithPi(runtime, draft, config) {
             systemPrompt: PROMPT_ENHANCER_SYSTEM_PROMPT,
         },
     });
-    await services.modelRuntime.reloadConfig();
+    await services.modelRuntime.refresh();
     const model = services.modelRuntime.getModel(parsedModel.provider, parsedModel.modelId);
     if (!model) {
         throw new Error(modelNotFoundMessage(parsedModel.provider, parsedModel.modelId, services.modelRuntime.getModels()));

package/dist/app/rendering/render-controller.js

@@ -268,6 +268,7 @@ export class AppRenderController {
         this.deps.mouseController.statusContextTarget = this.deps.statusLineRenderer.contextTarget(statusLayout.text, statusRow, statusLayout);
         this.deps.mouseController.statusModelUsageTarget = this.deps.statusLineRenderer.modelUsageTarget(statusLayout.text, statusRow, statusLayout);
         this.deps.mouseController.statusDraftQueueTarget = this.deps.statusLineRenderer.draftQueueTarget?.(statusLayout, statusRow);
+        this.deps.mouseController.statusInternalClipboardTarget = this.deps.statusLineRenderer.internalClipboardTarget?.(statusLayout, statusRow);
         this.deps.mouseController.statusUserJumpTarget = this.deps.statusLineRenderer.userJumpTarget?.(statusLayout, statusRow);
         this.deps.mouseController.statusThinkingExpandTarget = this.deps.statusLineRenderer.thinkingExpandTarget?.(statusLayout, statusRow);
         this.deps.mouseController.statusCompactToolsTarget = this.deps.statusLineRenderer.compactToolsTarget?.(statusLayout, statusRow);

package/dist/app/rendering/status-line-renderer.d.ts

@@ -1,6 +1,6 @@
 import type { AgentSession } from "@earendil-works/pi-coding-agent";
 import type { Theme } from "../../theme.js";
-import type { SessionActivity, StatusCompactToolsTarget, StatusContextTarget, StatusDraftQueueTarget, StatusLineLayout, StatusModelTarget, StatusModelUsageTarget, StatusPromptEnhancerTarget, StatusQuickScrollTarget, StatusSessionTarget, StatusTerminalBellSoundTarget, StatusThinkingExpandTarget, StatusThinkingTarget, StatusUserJumpTarget, StatusVoiceLanguageTarget, StatusVoiceMicTarget } from "../types.js";
+import type { SessionActivity, StatusCompactToolsTarget, StatusContextTarget, StatusDraftQueueTarget, StatusInternalClipboardTarget, StatusLineLayout, StatusModelTarget, StatusModelUsageTarget, StatusPromptEnhancerTarget, StatusQuickScrollTarget, StatusSessionTarget, StatusTerminalBellSoundTarget, StatusThinkingExpandTarget, StatusThinkingTarget, StatusUserJumpTarget, StatusVoiceLanguageTarget, StatusVoiceMicTarget } from "../types.js";
 import type { ScreenStyler } from "../screen/screen-styler.js";
 import { type ModelColorsConfig } from "../../config.js";
 export type StatusLineRendererHost = {
@@ -31,6 +31,7 @@ export type StatusLineRendererHost = {
         down: boolean;
     };
     queueableInputActive?(): boolean;
+    internalClipboardActive?(): boolean;
     userMessageJumpMenuActive?(): boolean;
     allThinkingExpandedActive?(): boolean;
     superCompactToolsActive?(): boolean;
@@ -52,6 +53,7 @@ export declare class StatusLineRenderer {
     voiceLanguageTarget(layout: StatusLineLayout, row: number): StatusVoiceLanguageTarget | undefined;
     userJumpTarget(layout: StatusLineLayout, row: number): StatusUserJumpTarget | undefined;
     draftQueueTarget(layout: StatusLineLayout, row: number): StatusDraftQueueTarget | undefined;
+    internalClipboardTarget(layout: StatusLineLayout, row: number): StatusInternalClipboardTarget | undefined;
     thinkingExpandTarget(layout: StatusLineLayout, row: number): StatusThinkingExpandTarget | undefined;
     compactToolsTarget(layout: StatusLineLayout, row: number): StatusCompactToolsTarget | undefined;
     quickScrollUpTarget(layout: StatusLineLayout, row: number): StatusQuickScrollTarget | undefined;

package/dist/app/rendering/status-line-renderer.js

@@ -65,6 +65,9 @@ export class StatusLineRenderer {
         appendWidget(draftQueueButton ? this.iconButtonText(draftQueueButton) : "", (column, text) => {
             layout.draftQueueWidget = this.widgetLayout(column, text);
         });
+        appendWidget(this.iconButtonText(APP_ICONS.clipboardPaste), (column, text) => {
+            layout.internalClipboardWidget = this.widgetLayout(column, text);
+        });
         const promptEnhancerWidgetText = this.host.promptEnhancerStatusWidgetText();
         appendWidget(promptEnhancerWidgetText ? this.iconButtonText(promptEnhancerWidgetText) : "", (column, text) => {
             layout.promptEnhancerWidget = this.widgetLayout(column, text);
@@ -141,6 +144,7 @@ export class StatusLineRenderer {
             });
         };
         pushWidgetSegment(layout.draftQueueWidget, colors.info);
+        pushWidgetSegment(layout.internalClipboardWidget, this.host.internalClipboardActive?.() ? colors.info : colors.muted);
         pushWidgetSegment(layout.promptEnhancerWidget, this.host.promptEnhancerStatusWidgetActive()
             ? colors.warning
             : this.host.promptEnhancerStatusWidgetEnabled()
@@ -251,6 +255,12 @@ export class StatusLineRenderer {
             return undefined;
         return { row, startColumn: widget.startColumn, endColumn: widget.endColumn };
     }
+    internalClipboardTarget(layout, row) {
+        const widget = layout.internalClipboardWidget;
+        if (!widget)
+            return undefined;
+        return { row, startColumn: widget.startColumn, endColumn: widget.endColumn };
+    }
     thinkingExpandTarget(layout, row) {
         const widget = layout.thinkingExpandWidget;
         if (!widget)
@@ -339,6 +349,7 @@ export class StatusLineRenderer {
         const colors = this.host.theme.colors;
         const widgets = [
             { widget: layout.draftQueueWidget, foreground: colors.info },
+            { widget: layout.internalClipboardWidget, foreground: this.host.internalClipboardActive?.() ? colors.info : colors.muted },
             { widget: layout.promptEnhancerWidget, foreground: this.host.promptEnhancerStatusWidgetActive()
                     ? colors.warning
                     : this.host.promptEnhancerStatusWidgetEnabled()

package/dist/app/runtime.js

@@ -239,7 +239,7 @@ export async function createPixRuntime(options, runtimeOptions = {}) {
                 config,
                 ...(runtimeOptions.eventBus === undefined ? {} : { eventBus: runtimeOptions.eventBus }),
             });
-        await services.modelRuntime.reloadConfig();
+        await services.modelRuntime.refresh();
         const model = parsedModel ? services.modelRuntime.getModel(parsedModel.provider, parsedModel.modelId) : undefined;
         if (parsedModel && !model) {
             throw new Error(`Model not found: ${parsedModel.provider}/${parsedModel.modelId}`);

package/dist/app/screen/mouse-controller.d.ts

@@ -6,7 +6,7 @@ import type { ToastEntry, ToastVariant } from "../../ui.js";
 import type { AppPopupActionController } from "../popup/popup-action-controller.js";
 import type { AppPopupMenuController } from "../popup/popup-menu-controller.js";
 import type { AppScrollController } from "./scroll-controller.js";
-import type { Entry, ImageClickTarget, MouseEvent, MouseSelection, StatusContextTarget, StatusCompactToolsTarget, StatusDraftQueueTarget, StatusModelTarget, StatusModelUsageTarget, StatusPromptEnhancerTarget, StatusQuickScrollTarget, StatusSessionTarget, StatusTerminalBellSoundTarget, TabLineMouseTarget, StatusThinkingExpandTarget, StatusThinkingTarget, StatusUserJumpTarget, StatusVoiceLanguageTarget, StatusVoiceMicTarget } from "../types.js";
+import type { Entry, ImageClickTarget, MouseEvent, MouseSelection, StatusContextTarget, StatusCompactToolsTarget, StatusDraftQueueTarget, StatusInternalClipboardTarget, StatusModelTarget, StatusModelUsageTarget, StatusPromptEnhancerTarget, StatusQuickScrollTarget, StatusSessionTarget, StatusTerminalBellSoundTarget, TabLineMouseTarget, StatusThinkingExpandTarget, StatusThinkingTarget, StatusUserJumpTarget, StatusVoiceLanguageTarget, StatusVoiceMicTarget } from "../types.js";
 import { type RenderedLink } from "./file-links.js";
 import type { AgentSession } from "@earendil-works/pi-coding-agent";
 type ClickFlash = {
@@ -56,6 +56,8 @@ export type AppMouseControllerHost = {
     refreshModelUsageStatus(): void | Promise<void>;
     refreshUserMessageJumpMenuItems?(): Promise<void>;
     queueInputFromStatus?(): void | Promise<void>;
+    pasteInternalClipboard?(): void;
+    setInternalClipboardText?(text: string): void;
     scrollConversationQuick(direction: "up" | "down"): void | Promise<void>;
     toggleAllThinkingExpanded?(): void;
     toggleSuperCompactTools?(): void;
@@ -102,6 +104,7 @@ export declare class AppMouseController {
     statusModelUsageTarget: StatusModelUsageTarget | undefined;
     statusUserJumpTarget: StatusUserJumpTarget | undefined;
     statusDraftQueueTarget: StatusDraftQueueTarget | undefined;
+    statusInternalClipboardTarget: StatusInternalClipboardTarget | undefined;
     statusThinkingExpandTarget: StatusThinkingExpandTarget | undefined;
     statusCompactToolsTarget: StatusCompactToolsTarget | undefined;
     statusQuickScrollUpTarget: StatusQuickScrollTarget | undefined;
@@ -161,6 +164,7 @@ export declare class AppMouseController {
     private handleInputBorderStatusClick;
     private openStatusUserJumpMenu;
     private handleStatusDraftQueueClick;
+    private handleStatusInternalClipboardClick;
     private handleStatusThinkingExpandClick;
     private handleStatusCompactToolsClick;
     private handleStatusTerminalBellSoundClick;

package/dist/app/screen/mouse-controller.js

@@ -26,6 +26,7 @@ export class AppMouseController {
     statusModelUsageTarget;
     statusUserJumpTarget;
     statusDraftQueueTarget;
+    statusInternalClipboardTarget;
     statusThinkingExpandTarget;
     statusCompactToolsTarget;
     statusQuickScrollUpTarget;
@@ -317,6 +318,7 @@ export class AppMouseController {
             this.statusContextTarget,
             this.statusModelUsageTarget,
             this.statusDraftQueueTarget,
+            this.statusInternalClipboardTarget,
             this.statusUserJumpTarget,
             this.statusThinkingExpandTarget,
             this.statusCompactToolsTarget,
@@ -496,6 +498,7 @@ export class AppMouseController {
     }
     handleInputBorderStatusClick(event) {
         return this.handleStatusDraftQueueClick(event)
+            || this.handleStatusInternalClipboardClick(event)
             || this.handleStatusUserJumpClick(event)
             || this.handleStatusThinkingExpandClick(event)
             || this.handleStatusCompactToolsClick(event)
@@ -525,6 +528,12 @@ export class AppMouseController {
         void this.host.queueInputFromStatus?.();
         return true;
     }
+    handleStatusInternalClipboardClick(event) {
+        if (!this.statusTargetContains(this.statusInternalClipboardTarget, event))
+            return false;
+        this.host.pasteInternalClipboard?.();
+        return true;
+    }
     handleStatusThinkingExpandClick(event) {
         if (!this.statusTargetContains(this.statusThinkingExpandTarget, event))
             return false;
@@ -682,9 +691,12 @@ export class AppMouseController {
             return false;
         }
         const selectedText = this.getSelectedText(selection);
-        this.host.render();
-        if (selectedText.trim().length === 0)
+        if (selectedText.trim().length === 0) {
+            this.host.render();
             return true;
+        }
+        this.host.setInternalClipboardText?.(selectedText);
+        this.host.render();
         try {
             this.copyTextToClipboard(selectedText);
             this.host.showToast("Copied to clipboard", "success");

package/dist/app/types.d.ts

@@ -279,6 +279,7 @@ export type StatusLineLayout = {
     quickScrollDownWidget?: StatusQuickScrollWidgetLayout;
     userJumpWidget?: StatusUserJumpWidgetLayout;
     draftQueueWidget?: StatusDraftQueueWidgetLayout;
+    internalClipboardWidget?: StatusInternalClipboardWidgetLayout;
     thinkingExpandWidget?: StatusThinkingExpandWidgetLayout;
     compactToolsWidget?: StatusCompactToolsWidgetLayout;
     terminalBellSoundWidget?: StatusTerminalBellSoundWidgetLayout;
@@ -297,6 +298,10 @@ export type StatusDraftQueueWidgetLayout = {
     startColumn: number;
     endColumn: number;
 };
+export type StatusInternalClipboardWidgetLayout = {
+    startColumn: number;
+    endColumn: number;
+};
 export type StatusThinkingExpandWidgetLayout = {
     startColumn: number;
     endColumn: number;
@@ -594,6 +599,11 @@ export type StatusDraftQueueTarget = {
     startColumn: number;
     endColumn: number;
 };
+export type StatusInternalClipboardTarget = {
+    row: number;
+    startColumn: number;
+    endColumn: number;
+};
 export type StatusThinkingExpandTarget = {
     row: number;
     startColumn: number;

package/external/pi-tools-suite/README.md

@@ -15,7 +15,7 @@ This package keeps shared Pi tools as ordinary source folders under `src/` and r
 - `src/todo` — `todo` tool, `/todos`, `/todos-persist`, and `/todos-scope`; supports parent/subtask hierarchy, blockers, ready-task filtering, deferred out-of-scope items, batch operations, JSON/Markdown import/export, automatic clearing when all visible todos are completed, and optional project persistence via `/todos persist on` or `/todos-persist on`; localization/i18n has been removed
 - `src/model-tools` — model-specific tool aliases such as Claude/GLM-style `Read` / `Edit` / `Write` / `Bash` / `Grep` / `Glob` / `LS`, GPT/Codex-style `shell`, and model-gated `apply_patch`
 - `src/usage` — `/usage` command and startup hint for read-only AI quota checks across OpenAI, Zhipu AI, Z.ai, and Google Antigravity, including Antigravity quota by model
-- `src/web-search` — `web_search` and `web_fetch` tools migrated from `@ollama/pi-web-search`; calls the local Ollama experimental web search/fetch APIs, honors `OLLAMA_HOST`, supports request timeouts via `timeout_ms` / `PI_WEB_SEARCH_TIMEOUT_MS`, and reports targeted `ollama signin`, unsupported-endpoint, invalid-response, timeout, DNS, and Ollama-not-running errors
+- `src/web-search` — `web_search` and `web_fetch` tools migrated from `@ollama/pi-web-search`; uses local Ollama by default or the official Ollama cloud API when an API key is configured, supports Tavily Search/Extract fallback, provides `/web-credentials` for secure user-level key storage, honors `OLLAMA_HOST`, supports request timeouts via `timeout_ms` / `PI_WEB_SEARCH_TIMEOUT_MS`, and reports provider-specific errors
 - `src/dcp` — headless Dynamic Context Pruning ported from `opencode-dynamic-context-pruning` for the Pi SDK: explicit `compress` tool with range and message modes, `/dcp` commands (context, stats, sweep, manual, decompress, recompress, compress), same-call overlap validation, recoverable compressed-block rollups, grouped message-mode skip diagnostics, stable raw-message anchors when available, protected user/tool preservation, deduplication, error purging, and context nudges; visualization is left to `compress` tool responses and the renderer-owned context-percent click dialog
 - `src/prompt-commands` — user slash-command builder: `/prompt-commands` opens a CRUD menu for saved prompt-backed slash commands, stores them under `promptCommands` in `~/.config/pi/pi-tools-suite.jsonc`, reloads after edits, and runs each saved prompt as a normal user message
 - `src/skill-installer` — `/install-skill [name]` installs a personal skill folder from `~/.agents/local_skills` into the current project's `.pi/skills/` so it activates as a project-local skill, then automatically runs `/reload` so the new skill is picked up without a manual step; `/export-skill [name]` does the reverse, copying a project-local skill back to `~/.agents/local_skills/` for reuse in other projects (no reload, since the library lives outside the project); with no argument either command shows an interactive menu of available skills (folders containing `SKILL.md`), and the `<name>` form installs/exports it directly (headless-safe); existing destinations prompt to overwrite in the UI and are refused in headless mode; `.DS_Store` files are skipped
@@ -305,22 +305,49 @@ Runtime logs are minimized by default: successful agents do not keep `events.jso
 
 ## Web search
 
-`src/web-search` registers two Ollama-backed tools:
+`src/web-search` registers two Ollama-first tools and the `/web-credentials` setup command:
 
-- `web_search` posts `{ query, max_results }` to `/api/experimental/web_search` and returns formatted title/URL/snippet results plus structured `details.results`.
-- `web_fetch` posts `{ url }` to `/api/experimental/web_fetch` and returns extracted page text plus title/link metadata.
+- `web_search` posts `{ query, max_results }` and returns formatted title/URL/snippet results plus structured `details.results`.
+- `web_fetch` posts `{ url }` and returns extracted page text plus title/link metadata.
+- `/web-credentials` can set, inspect, or clear stored Ollama and Tavily API keys. Notifications and status output never display key values.
 
-Both tools default to `http://localhost:11434`; set `OLLAMA_HOST` to point at another Ollama instance. Requests time out after 30 seconds by default. Override globally with `PI_WEB_SEARCH_TIMEOUT_MS` or per call with `timeout_ms` (maximum 120000 ms). Tool results include `host`, `timeoutMs`, and truncation metadata in `details`.
+Without an Ollama API key, both tools default to `http://localhost:11434/api/experimental/...`; set `OLLAMA_HOST` to point at another Ollama instance. With an Ollama API key and no explicit `OLLAMA_HOST`, they use the official `https://ollama.com/api/web_search` and `/api/web_fetch` endpoints with bearer authentication. Requests time out after 30 seconds by default. Override globally with `PI_WEB_SEARCH_TIMEOUT_MS` or per call with `timeout_ms` (maximum 120000 ms). Tool results include `host`, `timeoutMs`, and truncation metadata in `details`.
+
+Configure a Tavily key to enable automatic fallback for both tools. Ollama remains the primary provider; if any Ollama request or response fails, `web_search` retries through `https://api.tavily.com/search` and `web_fetch` retries through `https://api.tavily.com/extract`. The Tavily key is sent only in Tavily's bearer authorization header and is never accepted as a tool parameter or included in result details. Fallback results set `details.provider` to `tavily` and include the primary Ollama error under `details.fallbackFrom`; ordinary results set `details.provider` to `ollama`.
+
+The recommended interactive setup is:
+
+```text
+/web-credentials
+```
+
+Choose Ollama or Tavily, paste the key, and it becomes active for later calls without a reload. Keys are stored in `~/.config/pi/pi-tools-suite-credentials.json` with mode `0600`. The same command can show configuration sources or clear stored keys without displaying them.
+
+The command displays the official key pages before opening its menu:
+
+- Ollama: <https://ollama.com/settings/keys>
+- Tavily: <https://app.tavily.com/home>
+
+Environment variables remain supported and take precedence over stored keys:
+
+```bash
+export OLLAMA_API_KEY="..."
+export TAVILY_API_KEY="tvly-..."
+```
+
+The timeout applies independently to each provider attempt, so a failed Ollama request followed by Tavily can take up to roughly twice the configured timeout. Tavily Search fallback uses basic search and clamps `max_results` to Tavily's documented maximum of 20. Tavily Extract does not return page title/link metadata, so fallback uses the requested URL as the title and reports no links.
 
 Troubleshooting:
 
 | Symptom | Fix |
 | --- | --- |
 | `Could not connect to Ollama` | Start Ollama and check `OLLAMA_HOST`. |
-| `Unauthorized by Ollama ... Run ollama signin` | Run `ollama signin`, then retry. |
+| `Unauthorized by Ollama` | Run `ollama signin` for local Ollama, or update the Ollama key through `/web-credentials` / `OLLAMA_API_KEY`. |
 | `endpoint is not available` | Update Ollama and make sure the experimental web search/fetch feature is enabled for that install. |
 | `timed out after ...` | Increase per-call `timeout_ms` or `PI_WEB_SEARCH_TIMEOUT_MS` if the local web endpoint is slow. |
 | `invalid JSON` / `unexpected response` | Check the Ollama version and the raw endpoint behavior; the tool reports the bad response shape instead of failing with a generic parser error. |
+| `Tavily ... rejected TAVILY_API_KEY` | Update the Tavily key through `/web-credentials` or `TAVILY_API_KEY`. |
+| `Tavily ... limit was exceeded` | Check Tavily usage/plan limits in the Tavily dashboard. |
 
 Do not send secrets, tokens, private repository text, or credential-bearing URLs through these tools; Ollama may query external web services to satisfy the request.
 

package/external/pi-tools-suite/package.json

@@ -43,9 +43,9 @@
     "vscode-languageserver-protocol": "^3.17.5"
   },
   "peerDependencies": {
-    "@earendil-works/pi-ai": "0.81.1",
-    "@earendil-works/pi-coding-agent": "0.81.1",
-    "@earendil-works/pi-tui": "0.81.1",
+    "@earendil-works/pi-ai": "0.82.1",
+    "@earendil-works/pi-coding-agent": "0.82.1",
+    "@earendil-works/pi-tui": "0.82.1",
     "typebox": "*"
   },
   "devDependencies": {

package/external/pi-tools-suite/src/tool-descriptions.ts

@@ -246,8 +246,8 @@ export const WEB_SEARCH_TOOL_DESCRIPTIONS = {
 		name: "web_search",
 		label: "web-search",
 		description:
-			"Search the web for real-time information using your local Ollama instance's web_search API. Requires Ollama running locally with web search enabled; supports per-call timeout_ms and PI_WEB_SEARCH_TIMEOUT_MS.",
-		promptSnippet: "Search the web for current or real-time information through the local Ollama web_search API.",
+			"Search the web for real-time information through Ollama, with automatic configured Tavily fallback. Credentials come from /web-credentials or environment variables. Supports per-call timeout_ms and PI_WEB_SEARCH_TIMEOUT_MS.",
+		promptSnippet: "Search the web for current or real-time information through Ollama, with Tavily fallback when configured.",
 		promptGuidelines: [
 			"Use web_search only for current public web information; keep queries focused and set max_results only when useful.",
 			"Never include secrets, tokens, or private repository data; do not use web_search for repo-local discovery—use repo_* or file/search tools.",
@@ -257,8 +257,8 @@ export const WEB_SEARCH_TOOL_DESCRIPTIONS = {
 		name: "web_fetch",
 		label: "web-fetch",
 		description:
-			"Fetch and extract text content from a web page URL using your local Ollama instance's web_fetch API. Requires Ollama running locally with web fetch enabled; supports per-call timeout_ms and PI_WEB_SEARCH_TIMEOUT_MS.",
-		promptSnippet: "Fetch and extract text from a specific URL through the local Ollama web_fetch API.",
+			"Fetch and extract text content from a web page URL through Ollama, with automatic configured Tavily Extract fallback. Credentials come from /web-credentials or environment variables. Supports per-call timeout_ms and PI_WEB_SEARCH_TIMEOUT_MS.",
+		promptSnippet: "Fetch and extract text from a specific URL through Ollama, with Tavily Extract fallback when configured.",
 		promptGuidelines: [
 			"Use web_fetch for user-provided URLs or web_search results needing deeper reading; never pass secret/private-credential URLs, and use read for local files.",
 		],

package/external/pi-tools-suite/src/web-search/index.ts

@@ -1,6 +1,9 @@
 import { spawn } from "node:child_process";
+import { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
 
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize, truncateHead } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
@@ -25,6 +28,22 @@ interface FetchResponse {
 }
 
 type Operation = "Search" | "Fetch";
+type Provider = "ollama" | "tavily";
+
+interface ProviderResponse<T> {
+	data: T;
+	provider: Provider;
+	host: string;
+	fallbackFrom?: {
+		provider: "ollama";
+		error: string;
+	};
+}
+
+interface OllamaTarget {
+	host: string;
+	apiKey?: string;
+}
 
 class OllamaEndpointUnavailableError extends Error {
 	constructor(message: string, readonly status: number) {
@@ -34,6 +53,14 @@ class OllamaEndpointUnavailableError extends Error {
 }
 
 const DEFAULT_OLLAMA_HOST = "http://localhost:11434";
+const OLLAMA_CLOUD_HOST = "https://ollama.com";
+const OLLAMA_API_KEY_ENV = "OLLAMA_API_KEY";
+const OLLAMA_API_KEYS_URL = "https://ollama.com/settings/keys";
+const TAVILY_API_HOST = "https://api.tavily.com";
+const TAVILY_API_KEY_ENV = "TAVILY_API_KEY";
+const TAVILY_API_KEYS_URL = "https://app.tavily.com/home";
+const CREDENTIAL_PATH_ENV = "PI_TOOLS_SUITE_WEB_CREDENTIALS_PATH";
+const TAVILY_MAX_SEARCH_RESULTS = 20;
 const DEFAULT_REQUEST_TIMEOUT_MS = 30_000;
 const MAX_REQUEST_TIMEOUT_MS = 120_000;
 const REQUEST_TIMEOUT_ENV = "PI_WEB_SEARCH_TIMEOUT_MS";
@@ -48,8 +75,71 @@ function normalizeOllamaHost(host: string | undefined): string {
 	return /^https?:\/\//i.test(trimmed) ? trimmed.replace(/\/+$/, "") : `http://${trimmed.replace(/\/+$/, "")}`;
 }
 
-function getOllamaHost(): string {
-	return normalizeOllamaHost(process.env.OLLAMA_HOST);
+interface StoredCredentials {
+	ollama?: string;
+	tavily?: string;
+}
+
+type StoredCredentialName = keyof StoredCredentials;
+
+function credentialPath(): string {
+	return process.env[CREDENTIAL_PATH_ENV]?.trim() || join(homedir(), ".config", "pi", "pi-tools-suite-credentials.json");
+}
+
+function readStoredCredentials(): StoredCredentials {
+	try {
+		const value = JSON.parse(readFileSync(credentialPath(), "utf8")) as unknown;
+		if (!isRecord(value)) return {};
+		return {
+			ollama: optionalString(value.ollama)?.trim() || undefined,
+			tavily: optionalString(value.tavily)?.trim() || undefined,
+		};
+	} catch (error) {
+		if ((error as NodeJS.ErrnoException).code === "ENOENT") return {};
+		throw error;
+	}
+}
+
+function writeStoredCredentials(credentials: StoredCredentials): void {
+	const path = credentialPath();
+	mkdirSync(dirname(path), { recursive: true, mode: 0o700 });
+	const tempPath = `${path}.${process.pid}.${Date.now()}.tmp`;
+
+	try {
+		writeFileSync(tempPath, `${JSON.stringify(credentials, null, 2)}\n`, { encoding: "utf8", flag: "wx", mode: 0o600 });
+		renameSync(tempPath, path);
+		chmodSync(path, 0o600);
+	} finally {
+		if (existsSync(tempPath)) unlinkSync(tempPath);
+	}
+}
+
+function updateStoredCredential(name: StoredCredentialName, apiKey: string | undefined): void {
+	const credentials = readStoredCredentials();
+	if (apiKey) credentials[name] = apiKey;
+	else delete credentials[name];
+	writeStoredCredentials(credentials);
+}
+
+function resolveApiKey(envName: string, credentialName: StoredCredentialName): string | undefined {
+	const envKey = process.env[envName]?.trim();
+	if (envKey) return envKey;
+	return readStoredCredentials()[credentialName];
+}
+
+function resolveOllamaTarget(): OllamaTarget {
+	const apiKey = resolveApiKey(OLLAMA_API_KEY_ENV, "ollama");
+	const configuredHost = process.env.OLLAMA_HOST?.trim();
+
+	return {
+		host: normalizeOllamaHost(configuredHost || (apiKey ? OLLAMA_CLOUD_HOST : undefined)),
+		apiKey,
+	};
+}
+
+function ollamaRequestUrl(target: OllamaTarget, endpoint: "web_search" | "web_fetch"): string {
+	const apiPath = target.host === OLLAMA_CLOUD_HOST ? `/api/${endpoint}` : `/api/experimental/${endpoint}`;
+	return `${target.host}${apiPath}`;
 }
 
 function parseTimeoutMs(value: unknown, source: string): number {
@@ -225,6 +315,10 @@ function operationNoun(operation: Operation): "search" | "fetch" {
 	return operation === "Search" ? "search" : "fetch";
 }
 
+function tavilyEndpoint(operation: Operation): "search" | "extract" {
+	return operation === "Search" ? "search" : "extract";
+}
+
 function formatErrorBody(body: string): string {
 	const normalized = body.trim().replace(/\s+/g, " ");
 	if (!normalized) return "";
@@ -237,7 +331,10 @@ function createHttpError(response: Response, operation: Operation, host: string,
 	const withBody = bodySuffix ? ` Response: ${bodySuffix}` : "";
 
 	if (response.status === 401) {
-		return new Error(`Unauthorized by Ollama ${apiName} API at ${host}. Run \`ollama signin\` to authenticate.`);
+		return new Error(
+			`Unauthorized by Ollama ${apiName} API at ${host}. ` +
+			`Run \`ollama signin\` for local Ollama, or update ${OLLAMA_API_KEY_ENV} through /web-credentials or the launch environment.`,
+		);
 	}
 
 	if (response.status === 403) {
@@ -333,13 +430,17 @@ function normalizeOllamaError(error: unknown, operation: Operation, host: string
 	return error instanceof Error ? error : new Error(String(error));
 }
 
-async function postOllamaJson<T>(host: string, endpoint: "web_search" | "web_fetch", body: Record<string, unknown>, operation: Operation, signal: AbortSignal | undefined, timeoutMs: number, retryEndpointUnavailable = true): Promise<T> {
+async function postOllamaJson<T>(target: OllamaTarget, endpoint: "web_search" | "web_fetch", body: Record<string, unknown>, operation: Operation, signal: AbortSignal | undefined, timeoutMs: number, retryEndpointUnavailable = true): Promise<T> {
+	const { host } = target;
 	const requestSignal = createRequestSignal(signal, timeoutMs);
 
 	try {
-		const response = await fetch(`${host}/api/experimental/${endpoint}`, {
+		const response = await fetch(ollamaRequestUrl(target, endpoint), {
 			method: "POST",
-			headers: { "Content-Type": "application/json" },
+			headers: {
+				...(target.apiKey ? { Authorization: `Bearer ${target.apiKey}` } : {}),
+				"Content-Type": "application/json",
+			},
 			body: JSON.stringify(body),
 			signal: requestSignal.signal,
 		});
@@ -349,12 +450,12 @@ async function postOllamaJson<T>(host: string, endpoint: "web_search" | "web_fet
 		if (isConnectionRefused(error) && isLoopbackHost(host)) {
 			requestSignal.cleanup();
 			await ensureOllamaRunning(host, timeoutMs, signal);
-			return waitForEndpointReady(() => postOllamaJson<T>(host, endpoint, body, operation, signal, timeoutMs, false), host, operation, timeoutMs, signal);
+			return waitForEndpointReady(() => postOllamaJson<T>(target, endpoint, body, operation, signal, timeoutMs, false), host, operation, timeoutMs, signal);
 		}
 
 		if (retryEndpointUnavailable && isEndpointUnavailable(error) && isLoopbackHost(host)) {
 			requestSignal.cleanup();
-			return waitForEndpointReady(() => postOllamaJson<T>(host, endpoint, body, operation, signal, timeoutMs, false), host, operation, timeoutMs, signal);
+			return waitForEndpointReady(() => postOllamaJson<T>(target, endpoint, body, operation, signal, timeoutMs, false), host, operation, timeoutMs, signal);
 		}
 
 		throw normalizeOllamaError(error, operation, host, timeoutMs, requestSignal.timedOut(), signal);
@@ -363,6 +464,85 @@ async function postOllamaJson<T>(host: string, endpoint: "web_search" | "web_fet
 	}
 }
 
+function createTavilyHttpError(response: Response, operation: Operation, body: string): Error {
+	const endpoint = tavilyEndpoint(operation);
+	const bodySuffix = formatErrorBody(body);
+	const withBody = bodySuffix ? ` Response: ${bodySuffix}` : "";
+
+	if (response.status === 401) {
+		return new Error(`Tavily ${endpoint} API rejected ${TAVILY_API_KEY_ENV} (HTTP 401). Check that the API key is valid.`);
+	}
+
+	if (response.status === 429 || response.status === 432 || response.status === 433) {
+		return new Error(`Tavily ${endpoint} API limit was exceeded (HTTP ${response.status}).${withBody}`);
+	}
+
+	return new Error(`Tavily ${endpoint} API returned HTTP ${response.status}.${withBody || ` ${response.statusText}`}`);
+}
+
+function normalizeTavilyError(error: unknown, operation: Operation, timeoutMs: number, timedOut: boolean, parentSignal: AbortSignal | undefined): Error {
+	const endpoint = tavilyEndpoint(operation);
+
+	if (timedOut) {
+		return new Error(
+			`Tavily ${endpoint} request timed out after ${timeoutMs}ms. ` +
+				`Increase timeout_ms or ${REQUEST_TIMEOUT_ENV} if the fallback endpoint is slow.`,
+		);
+	}
+
+	if (isAbortError(error) && parentSignal?.aborted) {
+		return new Error(`Tavily ${endpoint} request was cancelled.`);
+	}
+
+	if (errorIncludes(error, "ENOTFOUND", "EAI_AGAIN")) {
+		return new Error(`Could not resolve Tavily host ${TAVILY_API_HOST}.`);
+	}
+
+	if (errorIncludes(error, "ECONNREFUSED", "ECONNRESET", "ETIMEDOUT", "UND_ERR_SOCKET", "UND_ERR_CONNECT_TIMEOUT")) {
+		const details = collectErrorText(error);
+		return new Error(`Connection to Tavily failed while calling ${endpoint}.${details ? ` ${details}` : ""}`);
+	}
+
+	if (error instanceof TypeError && error.message.toLowerCase().includes("fetch")) {
+		return new Error(`Request to Tavily failed while calling ${endpoint}: ${error.message}`);
+	}
+
+	return error instanceof Error ? error : new Error(String(error));
+}
+
+async function postTavilyJson<T>(apiKey: string, operation: Operation, body: Record<string, unknown>, signal: AbortSignal | undefined, timeoutMs: number): Promise<T> {
+	const endpoint = tavilyEndpoint(operation);
+	const requestSignal = createRequestSignal(signal, timeoutMs);
+
+	try {
+		const response = await fetch(`${TAVILY_API_HOST}/${endpoint}`, {
+			method: "POST",
+			headers: {
+				Authorization: `Bearer ${apiKey}`,
+				"Content-Type": "application/json",
+			},
+			body: JSON.stringify(body),
+			signal: requestSignal.signal,
+		});
+		const responseBody = await response.text().catch(() => "");
+
+		if (!response.ok) throw createTavilyHttpError(response, operation, responseBody);
+		if (!responseBody.trim()) throw new Error(`Tavily ${endpoint} API returned an empty response.`);
+
+		try {
+			return JSON.parse(responseBody) as T;
+		} catch (error) {
+			const parseMessage = error instanceof Error ? error.message : String(error);
+			const bodySuffix = formatErrorBody(responseBody);
+			throw new Error(`Tavily ${endpoint} API returned invalid JSON: ${parseMessage}.${bodySuffix ? ` Body: ${bodySuffix}` : ""}`);
+		}
+	} catch (error) {
+		throw normalizeTavilyError(error, operation, timeoutMs, requestSignal.timedOut(), signal);
+	} finally {
+		requestSignal.cleanup();
+	}
+}
+
 function isRecord(value: unknown): value is Record<string, unknown> {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -371,17 +551,17 @@ function optionalString(value: unknown): string | undefined {
 	return typeof value === "string" ? value : undefined;
 }
 
-function parseSearchResponse(data: unknown): SearchResponse {
+function parseSearchResponse(data: unknown, providerName = "Ollama"): SearchResponse {
 	if (!isRecord(data) || !Array.isArray(data.results)) {
-		throw new Error("Ollama web_search API returned an unexpected response: missing results array.");
+		throw new Error(`${providerName} web_search API returned an unexpected response: missing results array.`);
 	}
 
 	return {
 		results: data.results.map((item, index) => {
-			if (!isRecord(item)) throw new Error(`Ollama web_search API returned an invalid result at index ${index}.`);
+			if (!isRecord(item)) throw new Error(`${providerName} web_search API returned an invalid result at index ${index}.`);
 
 			const url = optionalString(item.url);
-			if (!url) throw new Error(`Ollama web_search API returned an invalid result at index ${index}: missing url.`);
+			if (!url) throw new Error(`${providerName} web_search API returned an invalid result at index ${index}: missing url.`);
 
 			return {
 				title: optionalString(item.title) || "Untitled",
@@ -392,6 +572,156 @@ function parseSearchResponse(data: unknown): SearchResponse {
 	};
 }
 
+function parseTavilyExtractResponse(data: unknown, requestedUrl: string): FetchResponse {
+	if (!isRecord(data) || !Array.isArray(data.results)) {
+		throw new Error("Tavily extract API returned an unexpected response: missing results array.");
+	}
+
+	const result = data.results.find((item) => isRecord(item) && item.url === requestedUrl) ?? data.results[0];
+	if (!isRecord(result) || typeof result.raw_content !== "string") {
+		const failedResult = Array.isArray(data.failed_results)
+			? data.failed_results.find((item) => isRecord(item) && item.url === requestedUrl) ?? data.failed_results[0]
+			: undefined;
+		const failedMessage = isRecord(failedResult) ? optionalString(failedResult.error) : undefined;
+		throw new Error(`Tavily extract API did not return content for ${requestedUrl}.${failedMessage ? ` ${failedMessage}` : ""}`);
+	}
+
+	return {
+		title: requestedUrl,
+		content: result.raw_content,
+		links: [],
+	};
+}
+
+function errorMessage(error: unknown): string {
+	return error instanceof Error ? error.message : String(error);
+}
+
+async function withTavilyFallback<T>(
+	operation: Operation,
+	signal: AbortSignal | undefined,
+	ollamaHost: string,
+	tavilyApiKey: string | undefined,
+	ollamaRequest: () => Promise<T>,
+	tavilyRequest: (apiKey: string) => Promise<T>,
+): Promise<ProviderResponse<T>> {
+	try {
+		return { data: await ollamaRequest(), provider: "ollama", host: ollamaHost };
+	} catch (ollamaError) {
+		if (signal?.aborted) throw ollamaError;
+
+		if (!tavilyApiKey) throw ollamaError;
+
+		try {
+			return {
+				data: await tavilyRequest(tavilyApiKey),
+				provider: "tavily",
+				host: TAVILY_API_HOST,
+				fallbackFrom: { provider: "ollama", error: errorMessage(ollamaError) },
+			};
+		} catch (tavilyError) {
+			if (signal?.aborted) throw tavilyError;
+
+			throw new Error(
+				`Ollama ${endpointName(operation)} failed: ${errorMessage(ollamaError)} ` +
+					`Tavily ${tavilyEndpoint(operation)} fallback also failed: ${errorMessage(tavilyError)}`,
+			);
+		}
+	}
+}
+
+type CredentialChoice =
+	| "Set Ollama API key"
+	| "Set Tavily API key"
+	| "Show credential status"
+	| "Clear stored Ollama key"
+	| "Clear stored Tavily key";
+
+const CREDENTIAL_CHOICES: CredentialChoice[] = [
+	"Set Ollama API key",
+	"Set Tavily API key",
+	"Show credential status",
+	"Clear stored Ollama key",
+	"Clear stored Tavily key",
+];
+
+function storedCredentialConfigured(name: StoredCredentialName): boolean {
+	return Boolean(readStoredCredentials()[name]);
+}
+
+function credentialSource(envName: string, credentialName: StoredCredentialName): string {
+	if (process.env[envName]?.trim()) return `environment (${envName})`;
+	return storedCredentialConfigured(credentialName) ? "stored in pi-tools-suite credentials" : "not configured";
+}
+
+function showCredentialStatus(ctx: ExtensionCommandContext): void {
+	const ollama = credentialSource(OLLAMA_API_KEY_ENV, "ollama");
+	const tavily = credentialSource(TAVILY_API_KEY_ENV, "tavily");
+	ctx.ui.notify(`Web credentials\nOllama: ${ollama}\nTavily: ${tavily}`, "info");
+}
+
+function showCredentialLinks(ctx: ExtensionCommandContext): void {
+	ctx.ui.notify(
+		`Get API keys\nOllama: ${OLLAMA_API_KEYS_URL}\nTavily: ${TAVILY_API_KEYS_URL}`,
+		"info",
+	);
+}
+
+async function setCredential(
+	ctx: ExtensionCommandContext,
+	provider: "Ollama" | "Tavily",
+	credentialName: StoredCredentialName,
+): Promise<void> {
+	const key = (await ctx.ui.input(`${provider} API key`, "Paste the API key; Escape cancels"))?.trim();
+	if (!key) {
+		ctx.ui.notify(`${provider} credential was not changed.`, "warning");
+		return;
+	}
+
+	updateStoredCredential(credentialName, key);
+	ctx.ui.notify(`${provider} credential saved securely and active for future web tool calls.`, "info");
+}
+
+function clearCredential(
+	ctx: ExtensionCommandContext,
+	provider: "Ollama" | "Tavily",
+	credentialName: StoredCredentialName,
+	envName: string,
+): void {
+	updateStoredCredential(credentialName, undefined);
+	const envSuffix = process.env[envName]?.trim() ? ` ${envName} is still set and remains active.` : "";
+	ctx.ui.notify(`Stored ${provider} credential removed.${envSuffix}`, "info");
+}
+
+function registerCredentialCommand(pi: ExtensionAPI): void {
+	pi.registerCommand("web-credentials", {
+		description: "Configure Ollama and Tavily API keys for web_search/web_fetch",
+		handler: async (_args, ctx) => {
+			if (!ctx.hasUI) return;
+			showCredentialLinks(ctx);
+
+			const choice = await ctx.ui.select("Web search credentials", CREDENTIAL_CHOICES) as CredentialChoice | undefined;
+			switch (choice) {
+				case "Set Ollama API key":
+					await setCredential(ctx, "Ollama", "ollama");
+					break;
+				case "Set Tavily API key":
+					await setCredential(ctx, "Tavily", "tavily");
+					break;
+				case "Show credential status":
+					showCredentialStatus(ctx);
+					break;
+				case "Clear stored Ollama key":
+					clearCredential(ctx, "Ollama", "ollama", OLLAMA_API_KEY_ENV);
+					break;
+				case "Clear stored Tavily key":
+					clearCredential(ctx, "Tavily", "tavily", TAVILY_API_KEY_ENV);
+					break;
+			}
+		},
+	});
+}
+
 function parseFetchResponse(data: unknown): FetchResponse {
 	if (!isRecord(data) || typeof data.content !== "string") {
 		throw new Error("Ollama web_fetch API returned an unexpected response: missing content string.");
@@ -464,30 +794,37 @@ function timeoutParameter() {
 	);
 }
 
-function searchResultDetails(data: SearchResponse, host: string, timeoutMs: number, truncated: boolean) {
+function searchResultDetails(response: ProviderResponse<SearchResponse>, timeoutMs: number, truncated: boolean) {
 	return {
-		results: data.results,
-		resultCount: data.results.length,
-		host,
+		results: response.data.results,
+		resultCount: response.data.results.length,
+		provider: response.provider,
+		host: response.host,
+		fallbackFrom: response.fallbackFrom,
 		timeoutMs,
 		truncated,
 	};
 }
 
-function fetchResultDetails(data: FetchResponse, host: string, timeoutMs: number, truncated: boolean) {
+function fetchResultDetails(response: ProviderResponse<FetchResponse>, timeoutMs: number, truncated: boolean) {
+	const data = response.data;
 	return {
 		title: data.title,
 		content: data.content,
 		contentBytes: contentByteLength(data.content),
 		links: data.links ?? [],
 		linkCount: data.links?.length ?? 0,
-		host,
+		provider: response.provider,
+		host: response.host,
+		fallbackFrom: response.fallbackFrom,
 		timeoutMs,
 		truncated,
 	};
 }
 
 export default function webSearch(pi: ExtensionAPI) {
+	registerCredentialCommand(pi);
+
 	pi.registerTool({
 		...WEB_SEARCH_TOOL_DESCRIPTIONS.webSearch,
 		parameters: Type.Object({
@@ -497,16 +834,30 @@ export default function webSearch(pi: ExtensionAPI) {
 		}),
 		async execute(_toolCallId, params, signal) {
 			const maxResults = params.max_results ?? 5;
-			const host = getOllamaHost();
+			const ollamaTarget = resolveOllamaTarget();
+			const tavilyApiKey = resolveApiKey(TAVILY_API_KEY_ENV, "tavily");
 			const timeoutMs = resolveRequestTimeoutMs(params.timeout_ms);
 
-			const rawData = await postOllamaJson<unknown>(host, "web_search", { query: params.query, max_results: maxResults }, "Search", signal, timeoutMs);
-			const data = parseSearchResponse(rawData);
-			const formatted = truncateForTool(formatSearchResults(data.results));
+			const response = await withTavilyFallback(
+				"Search",
+				signal,
+				ollamaTarget.host,
+				tavilyApiKey,
+				async () => parseSearchResponse(await postOllamaJson<unknown>(ollamaTarget, "web_search", { query: params.query, max_results: maxResults }, "Search", signal, timeoutMs)),
+				async (apiKey) => parseSearchResponse(
+					await postTavilyJson<unknown>(apiKey, "Search", {
+						query: params.query,
+						max_results: Math.max(0, Math.min(TAVILY_MAX_SEARCH_RESULTS, Math.trunc(maxResults))),
+						search_depth: "basic",
+					}, signal, timeoutMs),
+					"Tavily",
+				),
+			);
+			const formatted = truncateForTool(formatSearchResults(response.data.results));
 
 			return {
 				content: [{ type: "text", text: formatted.text }],
-				details: searchResultDetails(data, host, timeoutMs, formatted.truncated),
+				details: searchResultDetails(response, timeoutMs, formatted.truncated),
 			};
 		},
 	});
@@ -518,16 +869,30 @@ export default function webSearch(pi: ExtensionAPI) {
 			timeout_ms: timeoutParameter(),
 		}),
 		async execute(_toolCallId, params, signal) {
-			const host = getOllamaHost();
+			const ollamaTarget = resolveOllamaTarget();
+			const tavilyApiKey = resolveApiKey(TAVILY_API_KEY_ENV, "tavily");
 			const timeoutMs = resolveRequestTimeoutMs(params.timeout_ms);
 
-			const rawData = await postOllamaJson<unknown>(host, "web_fetch", { url: params.url }, "Fetch", signal, timeoutMs);
-			const data = parseFetchResponse(rawData);
-			const formatted = truncateForTool(formatFetchResult(data));
+			const response = await withTavilyFallback(
+				"Fetch",
+				signal,
+				ollamaTarget.host,
+				tavilyApiKey,
+				async () => parseFetchResponse(await postOllamaJson<unknown>(ollamaTarget, "web_fetch", { url: params.url }, "Fetch", signal, timeoutMs)),
+				async (apiKey) => parseTavilyExtractResponse(
+					await postTavilyJson<unknown>(apiKey, "Fetch", {
+						urls: [params.url],
+						extract_depth: "basic",
+						format: "markdown",
+					}, signal, timeoutMs),
+					params.url,
+				),
+			);
+			const formatted = truncateForTool(formatFetchResult(response.data));
 
 			return {
 				content: [{ type: "text", text: formatted.text }],
-				details: fetchResultDetails(data, host, timeoutMs, formatted.truncated),
+				details: fetchResultDetails(response, timeoutMs, formatted.truncated),
 			};
 		},
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-ui-extend",
-  "version": "0.1.71",
+  "version": "0.1.74",
   "description": "Pix: a workspace-first terminal UI for Pi with tabs, readable tool activity, voice input, and bundled agent tools.",
   "private": false,
   "repository": {
@@ -75,9 +75,9 @@
     "prepublishOnly": "npm run check && npm run build:pix && npm run generate-schemas"
   },
   "dependencies": {
-    "@earendil-works/pi-ai": "0.81.1",
-    "@earendil-works/pi-coding-agent": "0.81.1",
-    "@earendil-works/pi-tui": "0.81.1",
+    "@earendil-works/pi-ai": "0.82.1",
+    "@earendil-works/pi-coding-agent": "0.82.1",
+    "@earendil-works/pi-tui": "0.82.1",
     "@mariozechner/clipboard": "^0.3.9",
     "jsonc-parser": "3.3.1",
     "typebox": "1.1.38",