pi-web-providers 3.0.0 → 3.1.0

package/dist/index.js

@@ -2,14 +2,14 @@
 import { randomUUID } from "node:crypto";
 import { mkdir as mkdir2, writeFile as writeFile2 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { dirname as dirname2, join as join2, relative } from "node:path";
+import { basename, dirname as dirname2, join as join2, relative } from "node:path";
 import {
   DEFAULT_MAX_BYTES,
   DEFAULT_MAX_LINES,
-  formatSize,
+  formatSize as formatSize2,
   getMarkdownTheme,
   truncateHead
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import {
   Box,
   Editor,
@@ -21,13 +21,13 @@ import {
   truncateToWidth,
   visibleWidth,
   wrapTextWithAnsi
-} from "@mariozechner/pi-tui";
+} from "@earendil-works/pi-tui";
 import { Type as Type16 } from "typebox";
 
 // src/config.ts
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
-import { getAgentDir } from "@mariozechner/pi-coding-agent";
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
 
 // src/config-values.ts
 import { execSync } from "node:child_process";
@@ -117,7 +117,13 @@ function asJsonObject(value) {
 function formatJson(value) {
   return JSON.stringify(value, null, 2);
 }
-function getApiKeyStatus(apiKeyReference) {
+function getApiKeyStatus(apiKeyReference, options = {}) {
+  if (!apiKeyReference) {
+    return { state: "missing_api_key" };
+  }
+  if (options.resolveSecrets === false && isSecretReference(apiKeyReference)) {
+    return { state: "deferred_secret" };
+  }
   try {
     return resolveConfigValue(apiKeyReference) ? { state: "ready" } : { state: "missing_api_key" };
   } catch (error) {
@@ -127,6 +133,9 @@ function getApiKeyStatus(apiKeyReference) {
     };
   }
 }
+function isSecretReference(reference) {
+  return reference.startsWith("!") || /^[A-Z][A-Z0-9_]*$/.test(reference);
+}
 function formatConfigValueError(error) {
   const message = error instanceof Error ? error.message : String(error);
   return message.replace(/\s+/g, " ").trim() || "Failed to resolve config value";
@@ -385,8 +394,14 @@ var braveSearchPromptGuidelines = [
 ];
 var braveAnswerOptionsSchema = Type.Object(
   {
+    model: Type.Optional(
+      Type.Enum({ brave: "brave", bravePro: "brave-pro" }, {
+        description: "Brave Answers model. Defaults to 'brave'."
+      })
+    ),
     country: Type.Optional(Type.String()),
     language: Type.Optional(Type.String()),
+    safesearch: safesearchOption,
     enable_citations: Type.Optional(Type.Boolean()),
     enable_entities: Type.Optional(Type.Boolean()),
     max_completion_tokens: Type.Optional(Type.Integer({ minimum: 1 }))
@@ -395,8 +410,14 @@ var braveAnswerOptionsSchema = Type.Object(
 );
 var braveResearchOptionsSchema = Type.Object(
   {
+    model: Type.Optional(
+      Type.Enum({ brave: "brave", bravePro: "brave-pro" }, {
+        description: "Brave Answers model. Defaults to 'brave'."
+      })
+    ),
     country: Type.Optional(Type.String()),
     language: Type.Optional(Type.String()),
+    safesearch: safesearchOption,
     enable_entities: Type.Optional(Type.Boolean()),
     enable_citations: Type.Optional(
       Type.Boolean({
@@ -448,19 +469,19 @@ var braveImplementation = {
       options: {}
     };
   },
-  getCapabilityStatus(config, _cwd, tool) {
+  getCapabilityStatus(config, _cwd, tool, options) {
     const key = tool === "answer" || tool === "research" ? config?.credentials?.answers : config?.credentials?.search;
-    try {
-      if (tool)
-        return resolveConfigValue(key) ? { state: "ready" } : { state: "missing_api_key" };
-      return [
-        config?.credentials?.search,
-        config?.credentials?.answers,
-        config?.credentials?.autosuggest
-      ].some((v) => resolveConfigValue(v)) ? { state: "ready" } : { state: "missing_api_key" };
-    } catch (error) {
-      return { state: "invalid_config", detail: formatConfigValueError(error) };
-    }
+    if (tool) {
+      return getApiKeyStatus(key, options);
+    }
+    const statuses = [
+      config?.credentials?.search,
+      config?.credentials?.answers,
+      config?.credentials?.autosuggest
+    ].map((value) => getApiKeyStatus(value, options));
+    return statuses.find((status) => status.state === "ready") ?? statuses.find((status) => status.state === "deferred_secret") ?? statuses.find((status) => status.state === "invalid_config") ?? {
+      state: "missing_api_key"
+    };
   },
   async search(query2, maxResults, config, context, options) {
     const apiKey = requireKey(config.credentials?.search, "Brave search");
@@ -945,25 +966,25 @@ function placeRating(place, details) {
   return rating === void 0 ? void 0 : `Rating: ${rating}`;
 }
 function buildAnswerRequest(raw) {
-  const answerOptions = pick(raw, [
+  const webSearchOptions = pick(raw, [
     "country",
     "language",
     "safesearch",
     "enable_entities",
     "enable_citations"
   ]);
-  if (answerOptions.enable_citations === void 0) {
-    answerOptions.enable_citations = true;
+  if (webSearchOptions.enable_citations === void 0) {
+    webSearchOptions.enable_citations = true;
   }
-  const stream = answerOptions.enable_citations === true || answerOptions.enable_entities === true;
+  const stream = webSearchOptions.enable_citations === true || webSearchOptions.enable_entities === true;
   return {
     stream,
-    ...pick(raw, ["max_completion_tokens", "metadata", "seed"]),
-    ...answerOptions
+    ...pick(raw, ["model", "max_completion_tokens", "metadata", "seed"]),
+    web_search_options: webSearchOptions
   };
 }
 function buildResearchRequest(raw) {
-  const researchOptions = pick(raw, [
+  const webSearchOptions = pick(raw, [
     "country",
     "language",
     "safesearch",
@@ -975,12 +996,12 @@ function buildResearchRequest(raw) {
     "research_maximum_number_of_seconds",
     "research_maximum_number_of_results_per_query"
   ]);
+  webSearchOptions.enable_research = true;
+  webSearchOptions.enable_citations = false;
   return {
     stream: true,
-    ...pick(raw, ["max_completion_tokens", "metadata", "seed"]),
-    ...researchOptions,
-    enable_research: true,
-    enable_citations: false
+    ...pick(raw, ["model", "max_completion_tokens", "metadata", "seed"]),
+    web_search_options: webSearchOptions
   };
 }
 async function completion(input, config, context, request) {
@@ -1197,10 +1218,11 @@ var braveProvider = defineProvider({
     },
     optionCapabilities: ["search", "answer", "research"]
   },
-  getCapabilityStatus: (config, cwd, tool) => braveImplementation.getCapabilityStatus(
+  getCapabilityStatus: (config, cwd, tool, options) => braveImplementation.getCapabilityStatus(
     config,
     cwd,
-    tool
+    tool,
+    options
   ),
   capabilities: {
     search: defineCapability({
@@ -1666,10 +1688,12 @@ var cloudflareImplementation = {
       }
     };
   },
-  getCapabilityStatus(config) {
-    const apiTokenStatus = getApiKeyStatus(config?.credentials?.api);
+  getCapabilityStatus(config, _cwd, _tool, options) {
+    const apiTokenStatus = getApiKeyStatus(config?.credentials?.api, options);
     if (apiTokenStatus.state !== "ready") {
-      return apiTokenStatus;
+      if (apiTokenStatus.state !== "deferred_secret") {
+        return apiTokenStatus;
+      }
     }
     try {
       if (!resolveConfigValue(config?.accountId)) {
@@ -1681,7 +1705,7 @@ var cloudflareImplementation = {
         detail: formatConfigValueError(error)
       };
     }
-    return { state: "ready" };
+    return apiTokenStatus.state === "deferred_secret" ? apiTokenStatus : { state: "ready" };
   },
   async contents(urls, config, context, options) {
     const client = createClient(config);
@@ -1740,10 +1764,11 @@ var cloudflareProvider = defineProvider({
     createTemplate: () => cloudflareImplementation.createTemplate(),
     fields: ["credentials", "accountId", "options", "settings"]
   },
-  getCapabilityStatus: (config, cwd, tool) => cloudflareImplementation.getCapabilityStatus(
+  getCapabilityStatus: (config, cwd, tool, options) => cloudflareImplementation.getCapabilityStatus(
     config,
     cwd,
-    tool
+    tool,
+    options
   ),
   capabilities: {
     contents: defineCapability({
@@ -2876,8 +2901,8 @@ var exaImplementation = {
       }
     };
   },
-  getCapabilityStatus(config) {
-    return getApiKeyStatus(config?.credentials?.api);
+  getCapabilityStatus(config, _cwd, _tool, options) {
+    return getApiKeyStatus(config?.credentials?.api, options);
   },
   async search(query2, maxResults, config, _context, searchOptions) {
     const client = createClient2(config);
@@ -3012,10 +3037,11 @@ var exaProvider = defineProvider({
     fields: ["credentials", "baseUrl", "options", "settings"],
     optionCapabilities: ["search"]
   },
-  getCapabilityStatus: (config, cwd, tool) => exaImplementation.getCapabilityStatus(
+  getCapabilityStatus: (config, cwd, tool, options) => exaImplementation.getCapabilityStatus(
     config,
     cwd,
-    tool
+    tool,
+    options
   ),
   capabilities: {
     search: defineCapability({
@@ -3070,6 +3096,7 @@ var exaProvider = defineProvider({
 // src/providers/firecrawl.ts
 import FirecrawlClient from "@mendable/firecrawl-js";
 import { Type as Type7 } from "typebox";
+var FIRECRAWL_CLOUD_HOST = "api.firecrawl.dev";
 var firecrawlSearchOptionsSchema = Type7.Object(
   {
     lang: Type7.Optional(
@@ -3201,8 +3228,8 @@ var firecrawlImplementation = {
       }
     };
   },
-  getCapabilityStatus(config) {
-    return getApiKeyStatus(config?.credentials?.api);
+  getCapabilityStatus(config, _cwd, _tool, options) {
+    return getFirecrawlCapabilityStatus(config, options);
   },
   async search(query2, maxResults, config, _context, options) {
     const client = createClient3(config);
@@ -3255,15 +3282,26 @@ var firecrawlImplementation = {
   }
 };
 function createClient3(config) {
+  const apiUrl = resolveConfigValue(config.baseUrl);
   const apiKey = resolveConfigValue(config.credentials?.api);
-  if (!apiKey) {
+  if (isFirecrawlCloudApiUrl(apiUrl) && !apiKey) {
     throw new Error("is missing an API key");
   }
   return new FirecrawlClient({
     apiKey,
-    apiUrl: resolveConfigValue(config.baseUrl)
+    apiUrl
   });
 }
+function getFirecrawlCapabilityStatus(config, options) {
+  if (!config?.baseUrl || isFirecrawlCloudApiUrl(config.baseUrl)) {
+    return getApiKeyStatus(config?.credentials?.api, options);
+  }
+  const apiKeyStatus = getApiKeyStatus(config.credentials?.api, options);
+  return apiKeyStatus.state === "missing_api_key" ? { state: "ready" } : apiKeyStatus;
+}
+function isFirecrawlCloudApiUrl(apiUrl) {
+  return !apiUrl || apiUrl.includes(FIRECRAWL_CLOUD_HOST);
+}
 function flattenSearchResults(response) {
   return ["web", "news", "images"].flatMap(
     (source) => (response[source] ?? []).map((entry) => toSearchResult(source, entry)).filter((entry) => entry !== null)
@@ -3321,10 +3359,11 @@ var firecrawlProvider = defineProvider({
     createTemplate: () => firecrawlImplementation.createTemplate(),
     fields: ["credentials", "baseUrl", "options", "settings"]
   },
-  getCapabilityStatus: (config, cwd, tool) => firecrawlImplementation.getCapabilityStatus(
+  getCapabilityStatus: (config, cwd, tool, options) => firecrawlImplementation.getCapabilityStatus(
     config,
     cwd,
-    tool
+    tool,
+    options
   ),
   capabilities: {
     search: defineCapability({
@@ -3479,8 +3518,8 @@ var geminiImplementation = {
       }
     };
   },
-  getCapabilityStatus(config) {
-    return getApiKeyStatus(config?.credentials?.api);
+  getCapabilityStatus(config, _cwd, _tool, options) {
+    return getApiKeyStatus(config?.credentials?.api, options);
   },
   async search(query2, maxResults, config, context, options) {
     const ai = this.createClient(config);
@@ -4109,10 +4148,11 @@ var geminiProvider = defineProvider({
     createTemplate: () => geminiImplementation.createTemplate(),
     fields: ["credentials", "options", "settings"]
   },
-  getCapabilityStatus: (config, cwd, tool) => geminiImplementation.getCapabilityStatus(
+  getCapabilityStatus: (config, cwd, tool, options) => geminiImplementation.getCapabilityStatus(
     config,
     cwd,
-    tool
+    tool,
+    options
   ),
   capabilities: {
     search: defineCapability({
@@ -4220,8 +4260,8 @@ var linkupImplementation = {
       credentials: { api: "LINKUP_API_KEY" }
     };
   },
-  getCapabilityStatus(config) {
-    return getApiKeyStatus(config?.credentials?.api);
+  getCapabilityStatus(config, _cwd, _tool, options) {
+    return getApiKeyStatus(config?.credentials?.api, options);
   },
   async search(query2, maxResults, config, _context, options) {
     const client = createClient4(config);
@@ -4365,10 +4405,11 @@ var linkupProvider = defineProvider({
     createTemplate: () => linkupImplementation.createTemplate(),
     fields: ["credentials", "baseUrl", "options", "settings"]
   },
-  getCapabilityStatus: (config, cwd, tool) => linkupImplementation.getCapabilityStatus(
+  getCapabilityStatus: (config, cwd, tool, options) => linkupImplementation.getCapabilityStatus(
     config,
     cwd,
-    tool
+    tool,
+    options
   ),
   capabilities: {
     search: defineCapability({
@@ -4414,8 +4455,8 @@ var ollamaProvider = defineProvider({
     },
     fields: ["credentials", "baseUrl", "settings"]
   },
-  getCapabilityStatus(config) {
-    return getApiKeyStatus(config?.credentials?.api);
+  getCapabilityStatus(config, _cwd, _tool, options) {
+    return getApiKeyStatus(config?.credentials?.api, options);
   },
   capabilities: {
     search: defineCapability({
@@ -4679,8 +4720,8 @@ var openaiImplementation = {
       }
     };
   },
-  getCapabilityStatus(config) {
-    return getApiKeyStatus(config?.credentials?.api);
+  getCapabilityStatus(config, _cwd, _tool, options) {
+    return getApiKeyStatus(config?.credentials?.api, options);
   },
   async search(query2, maxResults, config, context, options) {
     const client = createClient5(config);
@@ -5036,10 +5077,11 @@ var openaiProvider = defineProvider({
     fields: ["credentials", "baseUrl", "options", "settings"],
     optionCapabilities: ["search", "answer", "research"]
   },
-  getCapabilityStatus: (config, cwd, tool) => openaiImplementation.getCapabilityStatus(
+  getCapabilityStatus: (config, cwd, tool, options) => openaiImplementation.getCapabilityStatus(
     config,
     cwd,
-    tool
+    tool,
+    options
   ),
   capabilities: {
     search: defineCapability({
@@ -5134,8 +5176,8 @@ var parallelImplementation = {
       }
     };
   },
-  getCapabilityStatus(config) {
-    return getApiKeyStatus(config?.credentials?.api);
+  getCapabilityStatus(config, _cwd, _tool, options) {
+    return getApiKeyStatus(config?.credentials?.api, options);
   },
   async search(query2, maxResults, config, context, options) {
     const client = createClient6(config);
@@ -5219,10 +5261,11 @@ var parallelProvider = defineProvider({
     createTemplate: () => parallelImplementation.createTemplate(),
     fields: ["credentials", "baseUrl", "options", "settings"]
   },
-  getCapabilityStatus: (config, cwd, tool) => parallelImplementation.getCapabilityStatus(
+  getCapabilityStatus: (config, cwd, tool, options) => parallelImplementation.getCapabilityStatus(
     config,
     cwd,
-    tool
+    tool,
+    options
   ),
   capabilities: {
     search: defineCapability({
@@ -5327,8 +5370,8 @@ var perplexityImplementation = {
       }
     };
   },
-  getCapabilityStatus(config) {
-    return getApiKeyStatus(config?.credentials?.api);
+  getCapabilityStatus(config, _cwd, _tool, options) {
+    return getApiKeyStatus(config?.credentials?.api, options);
   },
   async search(query2, maxResults, config, context, options) {
     const client = createClient7(config);
@@ -5538,10 +5581,11 @@ var perplexityProvider = defineProvider({
     createTemplate: () => perplexityImplementation.createTemplate(),
     fields: ["credentials", "baseUrl", "options", "settings"]
   },
-  getCapabilityStatus: (config, cwd, tool) => perplexityImplementation.getCapabilityStatus(
+  getCapabilityStatus: (config, cwd, tool, options) => perplexityImplementation.getCapabilityStatus(
     config,
     cwd,
-    tool
+    tool,
+    options
   ),
   capabilities: {
     search: defineCapability({
@@ -5584,9 +5628,103 @@ var perplexityProvider = defineProvider({
 
 // src/providers/serper.ts
 import { Type as Type13 } from "typebox";
+
+// src/types.ts
+var TOOLS = ["search", "contents", "answer", "research"];
+var SERPER_SEARCH_MODE_VALUES = {
+  search: "search",
+  images: "images",
+  videos: "videos",
+  places: "places",
+  maps: "maps",
+  reviews: "reviews",
+  news: "news",
+  shopping: "shopping",
+  productReviews: "product-reviews",
+  lens: "lens",
+  scholar: "scholar",
+  patents: "patents",
+  autocomplete: "autocomplete",
+  webpage: "webpage"
+};
+
+// src/providers/serper.ts
 var DEFAULT_BASE_URL3 = "https://google.serper.dev";
+var DEFAULT_SCRAPE_URL = "https://scrape.serper.dev";
+var SERPER_SEARCH_MODES = Object.values(SERPER_SEARCH_MODE_VALUES);
+var SERPER_SEARCH_MODE_SET = new Set(SERPER_SEARCH_MODES);
+var RESERVED_REQUEST_OPTION_KEYS = [
+  "q",
+  "num",
+  "mode",
+  "url",
+  "productId",
+  "nextPageToken",
+  "ll",
+  "placeId",
+  "cid",
+  "fid",
+  "sortBy",
+  "topicId",
+  "includeMarkdown",
+  "includeImages",
+  "includeLinks",
+  "includeVideos",
+  "location",
+  "gl",
+  "hl",
+  "tbs",
+  "page",
+  "autocorrect"
+];
+var PRIMARY_RESULT_FIELDS_BY_MODE = {
+  search: ["organic"],
+  images: ["images"],
+  videos: ["videos"],
+  places: ["places"],
+  maps: ["maps", "places"],
+  reviews: ["reviews"],
+  news: ["news"],
+  shopping: ["shopping"],
+  "product-reviews": ["reviews", "productReviews"],
+  lens: ["visualMatches", "organic", "images"],
+  scholar: ["organic"],
+  patents: ["organic"],
+  autocomplete: ["suggestions"],
+  webpage: []
+};
+var CONTEXT_ARRAY_FIELDS = [
+  "peopleAlsoAsk",
+  "relatedSearches",
+  "topStories",
+  "news",
+  "images",
+  "videos",
+  "places",
+  "maps",
+  "shopping",
+  "reviews",
+  "productReviews",
+  "visualMatches",
+  "suggestions"
+];
+var serperSearchPromptGuidelines = [
+  "Use Serper news mode for recent journalism, current events, announcements, or time-sensitive reporting.",
+  "Use Serper images or videos mode when the user asks for visual references, screenshots, diagrams, clips, tutorials, or media results.",
+  "Use Serper places or maps mode for local businesses, venues, addresses, ratings, phone numbers, opening details, or nearby/in-location searches.",
+  "Use Serper reviews mode when the task needs Google business reviews. Prefer cid, fid, or placeId from a maps or places result when available; otherwise use the search query as the place identifier.",
+  "Use Serper shopping mode for product listings, prices, merchants, offers, or purchase comparisons, and use product-reviews mode when the task needs reviews for a known product ID.",
+  "Use Serper scholar mode for academic papers and patents mode for patent searches.",
+  "Use Serper autocomplete mode when the task is to discover search suggestions or query completions rather than source pages.",
+  "Use Serper lens mode for reverse image search with an image URL, and use webpage mode to scrape a specific URL. Webpage mode includes Markdown by default."
+];
 var serperSearchOptionsSchema = Type13.Object(
   {
+    mode: Type13.Optional(
+      Type13.Enum(SERPER_SEARCH_MODE_VALUES, {
+        description: "Serper search type. Use 'search' for web results, 'news' for recent journalism/current events, 'images' for visual references, 'videos' for clips/tutorials, 'places' or 'maps' for local businesses/venues, 'reviews' for Google business reviews by place ID/CID/FID or query, 'shopping' for products, 'product-reviews' for product reviews, 'lens' for reverse image search, 'scholar' for scholarly articles, 'patents' for patents, 'autocomplete' for suggestions, and 'webpage' to scrape a URL."
+      })
+    ),
     gl: Type13.Optional(
       Type13.String({
         description: "Country code hint for Google results (for example 'us')."
@@ -5608,10 +5746,63 @@ var serperSearchOptionsSchema = Type13.Object(
         description: "1-based results page to request from Serper."
       })
     ),
+    tbs: Type13.Optional(
+      Type13.String({
+        description: "Google time/date or vertical-specific filter string passed through to Serper, for example 'qdr:d' for past day."
+      })
+    ),
     autocorrect: Type13.Optional(
       Type13.Boolean({
         description: "Enable or disable Serper query autocorrection."
       })
+    ),
+    url: Type13.Optional(
+      Type13.String({
+        description: "URL for modes that need one: image URL for 'lens', or page URL for 'webpage'. Defaults to the query string when omitted."
+      })
+    ),
+    ll: Type13.Optional(
+      Type13.String({
+        description: "Google Maps latitude/longitude/zoom hint, for example '@40.6973709,-74.1444871,11z'."
+      })
+    ),
+    placeId: Type13.Optional(
+      Type13.String({ description: "Google place ID for maps or reviews." })
+    ),
+    cid: Type13.Optional(
+      Type13.String({ description: "Google CID for maps or reviews." })
+    ),
+    fid: Type13.Optional(Type13.String({ description: "Google FID for reviews." })),
+    sortBy: Type13.Optional(
+      Type13.String({ description: "Review sort order for reviews mode." })
+    ),
+    topicId: Type13.Optional(
+      Type13.String({ description: "Review topic ID for reviews mode." })
+    ),
+    productId: Type13.Optional(
+      Type13.String({
+        description: "Google product ID for product-reviews mode. Defaults to the query string when omitted."
+      })
+    ),
+    nextPageToken: Type13.Optional(
+      Type13.String({
+        description: "Pagination token for reviews or product-reviews modes."
+      })
+    ),
+    includeMarkdown: Type13.Optional(
+      Type13.Boolean({
+        default: true,
+        description: "Include Markdown content in webpage mode. Defaults to true."
+      })
+    ),
+    includeImages: Type13.Optional(
+      Type13.Boolean({ description: "Include image metadata in webpage mode." })
+    ),
+    includeLinks: Type13.Optional(
+      Type13.Boolean({ description: "Include link metadata in webpage mode." })
+    ),
+    includeVideos: Type13.Optional(
+      Type13.Boolean({ description: "Include video metadata in webpage mode." })
     )
   },
   { description: "Serper search options." }
@@ -5631,58 +5822,218 @@ var serperImplementation = {
   createTemplate() {
     return {
       credentials: { api: "SERPER_API_KEY" },
-      options: {}
+      options: {
+        search: {
+          includeMarkdown: true
+        }
+      }
     };
   },
-  getCapabilityStatus(config) {
-    return getApiKeyStatus(config?.credentials?.api);
+  getCapabilityStatus(config, _cwd, _tool, options) {
+    return getApiKeyStatus(config?.credentials?.api, options);
   },
   async search(query2, maxResults, config, context, options) {
     const apiKey = resolveConfigValue(config.credentials?.api);
     if (!apiKey) {
       throw new Error("is missing an API key");
     }
-    const defaults = asJsonObject(config.options?.search) ?? {};
+    const defaults = asJsonObject(config.options?.search);
     const callOptions = asJsonObject(options);
-    const {
-      q: _ignoredQuery,
-      num: _ignoredNum,
-      ...providerOptions
-    } = {
+    const requestOptions = readRequestOptions({
       ...defaults,
-      ...callOptions ?? {}
-    };
-    const response = await fetch(joinUrl(resolveConfigValue(config.baseUrl)), {
-      method: "POST",
-      headers: {
-        "content-type": "application/json",
-        "x-api-key": apiKey
-      },
-      body: JSON.stringify({
-        q: query2,
-        num: clampMaxResults2(maxResults),
-        ...providerOptions
-      }),
-      signal: context.signal
+      ...callOptions
     });
+    const requestBody = buildRequestBody(
+      query2,
+      clampMaxResults2(maxResults),
+      requestOptions
+    );
+    const response = await fetch(
+      joinUrl(resolveConfigValue(config.baseUrl), requestOptions.mode),
+      {
+        method: "POST",
+        headers: {
+          "content-type": "application/json",
+          "x-api-key": apiKey
+        },
+        body: JSON.stringify(requestBody),
+        signal: context.signal
+      }
+    );
     if (!response.ok) {
       throw new Error(await buildHttpError2(response));
     }
     const payload = await response.json();
-    const responseRecord = asRecord3(payload) ?? {};
-    const organic = asArray(responseRecord.organic) ?? [];
-    const searchContext = buildSearchContext(responseRecord);
+    const responseRecord = enrichResponseRecord(
+      asRecord3(payload) ?? {},
+      requestOptions.mode,
+      requestBody
+    );
+    const results = readPrimaryResults(responseRecord, requestOptions.mode);
+    const searchContext = buildSearchContext(
+      responseRecord,
+      requestOptions.mode
+    );
     return {
       provider: serperImplementation.id,
-      results: organic.map((entry) => toSearchResult3(entry, searchContext)).filter(
+      results: results.map(
+        (entry) => toSearchResult3(entry, searchContext, requestOptions.mode)
+      ).filter(
         (result) => result !== null
       ).slice(0, clampMaxResults2(maxResults))
     };
   }
 };
-function joinUrl(baseUrl) {
+function joinUrl(baseUrl, mode = "search") {
   const base2 = (baseUrl ?? DEFAULT_BASE_URL3).replace(/\/+$/, "");
-  return `${base2}/search`;
+  if (mode === "webpage" && base2 === DEFAULT_BASE_URL3) {
+    return DEFAULT_SCRAPE_URL;
+  }
+  return `${base2}/${mode}`;
+}
+function readRequestOptions(options) {
+  const result = {
+    mode: readSearchMode(options.mode),
+    extra: extractExtraMetadata(options, RESERVED_REQUEST_OPTION_KEYS)
+  };
+  copyStringOption(result, "gl", options.gl);
+  copyStringOption(result, "hl", options.hl);
+  copyStringOption(result, "location", options.location);
+  copyStringOption(result, "tbs", options.tbs);
+  copyStringOption(result, "url", options.url);
+  copyStringOption(result, "ll", options.ll);
+  copyStringOption(result, "placeId", options.placeId);
+  copyStringOption(result, "cid", options.cid);
+  copyStringOption(result, "fid", options.fid);
+  copyStringOption(result, "sortBy", options.sortBy);
+  copyStringOption(result, "topicId", options.topicId);
+  copyStringOption(result, "productId", options.productId);
+  copyStringOption(result, "nextPageToken", options.nextPageToken);
+  copyBooleanOption(result, "autocorrect", options.autocorrect);
+  copyBooleanOption(result, "includeMarkdown", options.includeMarkdown);
+  copyBooleanOption(result, "includeImages", options.includeImages);
+  copyBooleanOption(result, "includeLinks", options.includeLinks);
+  copyBooleanOption(result, "includeVideos", options.includeVideos);
+  const page = readInteger2(options.page);
+  if (page !== void 0) {
+    result.page = Math.max(1, page);
+  }
+  return result;
+}
+function buildRequestBody(query2, maxResults, options) {
+  const common = omitUndefined({
+    location: options.location,
+    gl: options.gl,
+    hl: options.hl
+  });
+  const withExtra = (body) => ({
+    ...body,
+    ...options.extra
+  });
+  switch (options.mode) {
+    case "webpage":
+      return withExtra(
+        omitUndefined({
+          url: options.url ?? query2,
+          includeMarkdown: options.includeMarkdown ?? true,
+          includeImages: options.includeImages,
+          includeLinks: options.includeLinks,
+          includeVideos: options.includeVideos
+        })
+      );
+    case "product-reviews":
+      return withExtra(
+        omitUndefined({
+          productId: options.productId ?? query2,
+          nextPageToken: options.nextPageToken,
+          ...common,
+          num: maxResults
+        })
+      );
+    case "autocomplete":
+      return withExtra({ q: query2, ...common });
+    case "maps":
+      return withExtra(
+        omitUndefined({
+          q: query2,
+          num: maxResults,
+          ...common,
+          ll: options.ll,
+          placeId: options.placeId,
+          cid: options.cid,
+          page: options.page
+        })
+      );
+    case "reviews": {
+      const hasExplicitPlaceIdentifier = firstNonEmptyString(options.cid, options.fid, options.placeId) !== void 0;
+      return withExtra(
+        omitUndefined({
+          q: hasExplicitPlaceIdentifier ? void 0 : query2,
+          cid: options.cid,
+          fid: options.fid,
+          placeId: options.placeId,
+          gl: options.gl,
+          hl: options.hl,
+          sortBy: options.sortBy,
+          topicId: options.topicId,
+          nextPageToken: options.nextPageToken
+        })
+      );
+    }
+    case "lens":
+      return withExtra(
+        omitUndefined({
+          url: options.url ?? query2,
+          ...common,
+          tbs: options.tbs
+        })
+      );
+    case "scholar":
+      return withExtra(
+        omitUndefined({
+          q: query2,
+          ...common,
+          autocorrect: options.autocorrect,
+          tbs: options.tbs,
+          page: options.page
+        })
+      );
+    default:
+      return withExtra(
+        omitUndefined({
+          q: query2,
+          num: maxResults,
+          ...common,
+          autocorrect: options.autocorrect,
+          tbs: options.tbs,
+          page: options.page
+        })
+      );
+  }
+}
+function enrichResponseRecord(response, mode, requestBody) {
+  if (mode !== "webpage") {
+    return response;
+  }
+  return omitUndefined({
+    ...response,
+    url: readString4(response.url) ?? readString4(requestBody.url)
+  });
+}
+function readSearchMode(value) {
+  return typeof value === "string" && SERPER_SEARCH_MODE_SET.has(value) ? value : "search";
+}
+function readPrimaryResults(response, mode) {
+  if (mode === "webpage") {
+    return [response];
+  }
+  for (const field of PRIMARY_RESULT_FIELDS_BY_MODE[mode]) {
+    const values = asArray(response[field]);
+    if (values) {
+      return values;
+    }
+  }
+  return [];
 }
 function clampMaxResults2(value) {
   return Math.max(1, Math.min(20, Math.trunc(value || 0)));
@@ -5709,18 +6060,52 @@ async function readErrorDetail2(response) {
     return text;
   }
 }
-function toSearchResult3(entry, searchContext) {
+function toSearchResult3(entry, searchContext, mode) {
+  if (typeof entry === "string") {
+    return {
+      title: entry,
+      url: mode === "autocomplete" ? toGoogleSearchUrl(entry) : "",
+      snippet: entry,
+      metadata: {
+        source: mode,
+        ...searchContext ? { searchContext } : {}
+      }
+    };
+  }
   const record = asRecord3(entry);
   if (!record) {
     return null;
   }
-  const url2 = readString4(record.link) ?? "";
-  const title = readString4(record.title) || url2 || "Untitled";
+  const responseMetadata = asRecord3(record.metadata);
+  const user = asRecord3(record.user);
+  const resultUrl = firstString(record.link, record.website, record.url, record.imageUrl) ?? "";
+  const title = firstNonEmptyString(
+    record.title,
+    responseMetadata?.title,
+    record.name,
+    record.query,
+    record.value,
+    user?.name,
+    formatReviewTitle(record, user),
+    resultUrl
+  ) ?? "Untitled";
+  const url2 = resultUrl || (mode === "autocomplete" ? toGoogleSearchUrl(title) : "");
   const snippet = trimSnippet(
-    readString4(record.snippet) ?? readString4(record.richSnippet) ?? readString4(record.date) ?? ""
+    firstNonEmptyString(
+      record.snippet,
+      record.richSnippet,
+      record.markdown,
+      record.text,
+      record.address,
+      record.price,
+      record.date,
+      record.name,
+      record.value,
+      record.url
+    ) ?? ""
   );
   const metadata = omitUndefined({
-    source: "organic",
+    source: readString4(record.source) ?? (mode === "search" ? "organic" : mode),
     position: readNumber(record.position),
     date: readString4(record.date),
     attributes: asRecord3(record.attributes),
@@ -5728,7 +6113,16 @@ function toSearchResult3(entry, searchContext) {
     rating: readNumber(record.rating),
     ratingCount: readNumber(record.ratingCount),
     cid: readString4(record.cid),
-    ...extractExtraMetadata(record, ["title", "link", "snippet"]),
+    ...extractExtraMetadata(record, [
+      "title",
+      "name",
+      "query",
+      "value",
+      "link",
+      "website",
+      "url",
+      "snippet"
+    ]),
     ...searchContext ? { searchContext } : {}
   });
   return {
@@ -5738,23 +6132,72 @@ function toSearchResult3(entry, searchContext) {
     ...Object.keys(metadata).length > 0 ? { metadata } : {}
   };
 }
-function buildSearchContext(response) {
+function buildSearchContext(response, mode) {
   const context = omitUndefined({
     searchParameters: asRecord3(response.searchParameters),
     searchInformation: asRecord3(response.searchInformation),
     credits: readNumber(response.credits),
     answerBox: asRecord3(response.answerBox),
-    knowledgeGraph: asRecord3(response.knowledgeGraph),
-    peopleAlsoAsk: asArray(response.peopleAlsoAsk),
-    relatedSearches: asArray(response.relatedSearches),
-    topStories: asArray(response.topStories),
-    news: asArray(response.news),
-    images: asArray(response.images),
-    videos: asArray(response.videos),
-    places: asArray(response.places)
+    knowledgeGraph: asRecord3(response.knowledgeGraph)
   });
+  const primaryResultFields = new Set(
+    PRIMARY_RESULT_FIELDS_BY_MODE[mode]
+  );
+  for (const field of CONTEXT_ARRAY_FIELDS) {
+    if (primaryResultFields.has(field)) {
+      continue;
+    }
+    const value = asArray(response[field]);
+    if (value) {
+      context[field] = value;
+    }
+  }
   return Object.keys(context).length > 0 ? context : void 0;
 }
+function copyStringOption(target, key, value) {
+  const text = readString4(value);
+  if (text !== void 0) {
+    target[key] = text;
+  }
+}
+function copyBooleanOption(target, key, value) {
+  const flag = readBoolean(value);
+  if (flag !== void 0) {
+    target[key] = flag;
+  }
+}
+function firstString(...values) {
+  return values.find((value) => typeof value === "string");
+}
+function toGoogleSearchUrl(query2) {
+  return `https://www.google.com/search?q=${encodeURIComponent(query2)}`;
+}
+function formatReviewTitle(record, user) {
+  const userName = readString4(user?.name);
+  const rating = readNumber(record.rating);
+  const date = readString4(record.date) ?? readString4(record.isoDate);
+  if (userName && rating !== void 0) {
+    return `${userName} (${rating}-star review)`;
+  }
+  if (userName) {
+    return `${userName}'s review`;
+  }
+  if (rating !== void 0 && date) {
+    return `${rating}-star review from ${date}`;
+  }
+  if (rating !== void 0) {
+    return `${rating}-star review`;
+  }
+  if (date) {
+    return `Review from ${date}`;
+  }
+  return void 0;
+}
+function firstNonEmptyString(...values) {
+  return values.find(
+    (value) => typeof value === "string" && value.length > 0
+  );
+}
 function extractExtraMetadata(record, ignoredKeys) {
   return Object.fromEntries(
     Object.entries(record).filter(
@@ -5779,6 +6222,12 @@ function readString4(value) {
 function readNumber(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
+function readInteger2(value) {
+  return typeof value === "number" && Number.isInteger(value) ? value : void 0;
+}
+function readBoolean(value) {
+  return typeof value === "boolean" ? value : void 0;
+}
 var serperProvider = defineProvider({
   id: "serper",
   label: serperImplementation.label,
@@ -5788,14 +6237,16 @@ var serperProvider = defineProvider({
     fields: ["credentials", "baseUrl", "options", "settings"],
     optionCapabilities: ["search"]
   },
-  getCapabilityStatus: (config, cwd, tool) => serperImplementation.getCapabilityStatus(
+  getCapabilityStatus: (config, cwd, tool, options) => serperImplementation.getCapabilityStatus(
     config,
     cwd,
-    tool
+    tool,
+    options
   ),
   capabilities: {
     search: defineCapability({
       options: serperImplementation.getToolOptionsSchema?.("search"),
+      promptGuidelines: serperSearchPromptGuidelines,
       async execute(input, ctx) {
         const { query: query2, maxResults, options } = input;
         return await serperImplementation.search(
@@ -5920,8 +6371,8 @@ var tavilyImplementation = {
       }
     };
   },
-  getCapabilityStatus(config) {
-    return getApiKeyStatus(config?.credentials?.api);
+  getCapabilityStatus(config, _cwd, _tool, options) {
+    return getApiKeyStatus(config?.credentials?.api, options);
   },
   async search(query2, maxResults, config, _context, options) {
     const client = createClient8(config);
@@ -6019,10 +6470,11 @@ var tavilyProvider = defineProvider({
     createTemplate: () => tavilyImplementation.createTemplate(),
     fields: ["credentials", "baseUrl", "options", "settings"]
   },
-  getCapabilityStatus: (config, cwd, tool) => tavilyImplementation.getCapabilityStatus(
+  getCapabilityStatus: (config, cwd, tool, options) => tavilyImplementation.getCapabilityStatus(
     config,
     cwd,
-    tool
+    tool,
+    options
   ),
   capabilities: {
     search: defineCapability({
@@ -6126,8 +6578,8 @@ var valyuImplementation = {
       }
     };
   },
-  getCapabilityStatus(config) {
-    return getApiKeyStatus(config?.credentials?.api);
+  getCapabilityStatus(config, _cwd, _tool, options) {
+    return getApiKeyStatus(config?.credentials?.api, options);
   },
   async search(query2, maxResults, config, _context, searchOptions) {
     const client = createClient9(config);
@@ -6302,10 +6754,11 @@ var valyuProvider = defineProvider({
     fields: ["credentials", "baseUrl", "options", "settings"],
     optionCapabilities: ["search", "answer", "research"]
   },
-  getCapabilityStatus: (config, cwd, tool) => valyuImplementation.getCapabilityStatus(
+  getCapabilityStatus: (config, cwd, tool, options) => valyuImplementation.getCapabilityStatus(
     config,
     cwd,
-    tool
+    tool,
+    options
   ),
   capabilities: {
     search: defineCapability({
@@ -6380,9 +6833,6 @@ var PROVIDERS_BY_ID = PROVIDERS;
 var PROVIDER_LIST = Object.values(PROVIDERS);
 var PROVIDER_IDS = Object.keys(PROVIDERS);
 
-// src/types.ts
-var TOOLS = ["search", "contents", "answer", "research"];
-
 // src/provider-tools.ts
 var TOOL_INFO = {
   search: {
@@ -7138,17 +7588,21 @@ function isPlainObject4(value) {
 function getMappedProviderIdForTool(config, tool) {
   return getMappedProviderForTool(config, tool);
 }
-function getProviderCapabilityStatus(config, cwd, providerId, tool) {
+function getProviderCapabilityStatus(config, cwd, providerId, tool, options) {
   const provider = PROVIDERS[providerId];
   return provider.getCapabilityStatus(
     getEffectiveProviderConfig(config, providerId),
     cwd,
-    tool
+    tool,
+    options
   );
 }
 function isProviderCapabilityReady(status) {
   return status.state === "ready";
 }
+function isProviderCapabilityExposable(status) {
+  return status.state === "ready" || status.state === "deferred_secret";
+}
 function getProviderSetupState(config, providerId) {
   if (providerId === "claude" || providerId === "codex") {
     return "builtin";
@@ -7163,12 +7617,17 @@ function getProviderSetupState(config, providerId) {
   if (providerId === "cloudflare") {
     return providerConfig.credentials !== void 0 || providerConfig.accountId !== void 0 ? "configured" : "none";
   }
+  if (providerId === "firecrawl") {
+    return providerConfig.credentials !== void 0 || providerConfig.baseUrl !== void 0 ? "configured" : "none";
+  }
   return providerConfig.credentials !== void 0 ? "configured" : "none";
 }
 function formatProviderCapabilityStatus(status, providerId, tool) {
   switch (status.state) {
     case "ready":
       return "Ready";
+    case "deferred_secret":
+      return "Secret resolved on first use";
     case "missing_api_key":
       return "Missing API key";
     case "missing_executable":
@@ -8812,6 +9271,158 @@ function cleanupCapabilityOptions(config, keys) {
   cleanupEmpty(config, "options");
 }
 
+// src/tool-display.ts
+import { formatSize } from "@earendil-works/pi-coding-agent";
+var ANSWER_EXCERPT_MAX_LENGTH = 100;
+function buildSearchToolDisplay(details) {
+  return buildToolDisplay(details.provider, buildSearchSummaryParts(details));
+}
+function buildProgressDisplay(providerId, action) {
+  return {
+    provider: getProviderDisplay(providerId),
+    progress: { action }
+  };
+}
+function buildProviderToolDisplay({
+  capability,
+  providerId,
+  details,
+  text,
+  outputBytes,
+  outputTruncated,
+  failedItemCount
+}) {
+  const summary = capability === "contents" && details.tool === "web_contents" ? buildContentsDisplaySummary(details, text, {
+    outputBytes,
+    outputTruncated,
+    failedItemCount
+  }) : capability === "research" && text ? { success: text } : buildCollapsedProviderToolSummaryParts(details, text);
+  return buildToolDisplay(providerId, summary);
+}
+function buildCollapsedProviderToolSummary(details, text) {
+  const summary = buildCollapsedProviderToolSummaryParts(details, text);
+  return summary.failure ? `${summary.success}, ${summary.failure}` : summary.success;
+}
+function buildCollapsedProviderToolSummaryParts(details, text) {
+  if (details?.tool === "web_answer") {
+    return buildAnswerCollapsedSummary(details, text);
+  }
+  if (details?.tool === "web_contents") {
+    return buildContentsSummary(details, text);
+  }
+  const baseSummary = getCompactProviderToolSummary(details) ?? getFirstLine(text) ?? `${details?.tool ?? "tool"} output available`;
+  return { success: baseSummary };
+}
+function buildSearchSummaryParts({
+  queryCount,
+  resultCount,
+  failedQueryCount
+}) {
+  const success = typeof resultCount === "number" ? `${resultCount} result${resultCount === 1 ? "" : "s"}` : "Search output available";
+  if (failedQueryCount && failedQueryCount > 0 && queryCount) {
+    return {
+      success,
+      failure: `${failedQueryCount} of ${queryCount} ${queryCount === 1 ? "query" : "queries"} failed`
+    };
+  }
+  return { success };
+}
+function buildToolDisplay(providerId, outcome) {
+  return {
+    provider: getProviderDisplay(providerId),
+    outcome
+  };
+}
+function getProviderDisplay(providerId) {
+  const provider = PROVIDERS_BY_ID[providerId];
+  return { id: providerId, label: provider?.label ?? providerId };
+}
+function buildContentsDisplaySummary(details, text, metadata) {
+  const totalCount = details.itemCount ?? inferContentsPageCount(text);
+  const failedCount = metadata.failedItemCount ?? inferContentsFailureCount(text);
+  const successCount = totalCount === void 0 ? void 0 : Math.max(0, totalCount - (failedCount ?? 0));
+  const sizeSummary = typeof metadata.outputBytes === "number" ? `${formatSize(metadata.outputBytes)}${metadata.outputTruncated ? " (truncated)" : ""}` : void 0;
+  const success = successCount === void 0 ? sizeSummary ?? "Contents output available" : successCount === 1 && sizeSummary ? sizeSummary : `${successCount} page${successCount === 1 ? "" : "s"}${sizeSummary ? `, ${sizeSummary}` : ""}`;
+  if (failedCount && failedCount > 0 && totalCount) {
+    return {
+      success,
+      failure: `${failedCount} of ${totalCount} ${totalCount === 1 ? "page" : "pages"} failed`
+    };
+  }
+  return { success };
+}
+function buildAnswerCollapsedSummary(details, text) {
+  if (typeof details.queryCount === "number" && (details.queryCount > 1 || (details.failedQueryCount ?? 0) > 0)) {
+    return buildAnswerSummary(details);
+  }
+  return { success: buildAnswerExcerpt(text) ?? "Answer output available" };
+}
+function buildAnswerSummary(details) {
+  const queryCount = details.queryCount ?? 0;
+  const failedQueryCount = details.failedQueryCount ?? 0;
+  const answerCount = Math.max(0, queryCount - failedQueryCount);
+  const success = `${answerCount} answer${answerCount === 1 ? "" : "s"}`;
+  if (failedQueryCount > 0) {
+    return {
+      success,
+      failure: `${failedQueryCount} of ${queryCount} ${queryCount === 1 ? "question" : "questions"} failed`
+    };
+  }
+  return { success };
+}
+function buildAnswerExcerpt(text) {
+  const excerpt = getFirstLine(text);
+  if (!excerpt) {
+    return void 0;
+  }
+  if (excerpt.length <= ANSWER_EXCERPT_MAX_LENGTH) {
+    return excerpt;
+  }
+  return `${excerpt.slice(0, ANSWER_EXCERPT_MAX_LENGTH - 1).trimEnd()}\u2026`;
+}
+function buildContentsSummary(details, text) {
+  const totalCount = details.itemCount ?? inferContentsPageCount(text);
+  const failedCount = inferContentsFailureCount(text);
+  const successCount = totalCount === void 0 ? void 0 : Math.max(0, totalCount - (failedCount ?? 0));
+  const success = successCount === void 0 ? "Contents output available" : `${successCount} page${successCount === 1 ? "" : "s"}`;
+  if (failedCount && failedCount > 0 && totalCount) {
+    return {
+      success,
+      failure: `${failedCount} of ${totalCount} ${totalCount === 1 ? "page" : "pages"} failed`
+    };
+  }
+  return { success };
+}
+function getCompactProviderToolSummary(details) {
+  if (!details) {
+    return void 0;
+  }
+  if (details.tool === "web_contents" && typeof details.itemCount === "number") {
+    return `${details.itemCount} page${details.itemCount === 1 ? "" : "s"}`;
+  }
+  if (details.tool === "web_research") {
+    return "Research";
+  }
+  return void 0;
+}
+function inferContentsPageCount(text) {
+  if (!text) {
+    return void 0;
+  }
+  const pageMatches = text.match(/^##\s+/gm);
+  return pageMatches?.length;
+}
+function inferContentsFailureCount(text) {
+  if (!text) {
+    return void 0;
+  }
+  const failureMatches = text.match(/^##\s+(?:\d+\.\s+)?Error:/gm);
+  return failureMatches?.length;
+}
+function getFirstLine(text) {
+  return text?.split("\n").map((line) => line.trim()).find((line) => line.length > 0);
+}
+
 // src/index.ts
 var DEFAULT_MAX_RESULTS = 5;
 var MAX_ALLOWED_RESULTS = 20;
@@ -8828,6 +9439,10 @@ var CAPABILITY_TOOL_NAMES = {
   research: "web_research"
 };
 var MANAGED_TOOL_NAMES = Object.values(CAPABILITY_TOOL_NAMES);
+var DEFAULT_SUMMARY_SYMBOLS = {
+  success: "\u2714",
+  failure: "\u2718"
+};
 function webProvidersExtension(pi) {
   const activeWebResearchRequests = /* @__PURE__ */ new Map();
   let latestWidgetContext;
@@ -8873,7 +9488,7 @@ function webProvidersExtension(pi) {
   if ("registerMessageRenderer" in pi) {
     pi.registerMessageRenderer(
       WEB_RESEARCH_RESULT_MESSAGE_TYPE,
-      renderWebResearchResultMessage
+      (message, state, theme) => renderWebResearchResultMessage(message, state, theme)
     );
   }
   pi.registerCommand("web-providers", {
@@ -8934,7 +9549,7 @@ function registerWebSearchTool(pi, providerIds) {
   pi.registerTool({
     name: "web_search",
     label: "Web Search",
-    description: `Find likely sources on the public web for up to ${MAX_SEARCH_QUERIES} queries in a single call and return titles, URLs, and snippets grouped by query. Output is truncated to ${DEFAULT_MAX_LINES} lines or ${formatSize(DEFAULT_MAX_BYTES)} when needed.`,
+    description: `Find likely sources on the public web for up to ${MAX_SEARCH_QUERIES} queries in a single call and return titles, URLs, and snippets grouped by query. Output is truncated to ${DEFAULT_MAX_LINES} lines or ${formatSize2(DEFAULT_MAX_BYTES)} when needed.`,
     promptGuidelines: buildPromptGuidelines("search", selectedProviderId, [
       "Batch related searches when grouped comparison matters; use separate sibling web_search calls when independent results should surface as soon as they are ready."
     ]),
@@ -9179,12 +9794,20 @@ function getAvailableProviderIdsForCapability(config, cwd, capability) {
   if (!providerId) {
     return [];
   }
-  try {
-    resolveProviderForTool(config, cwd, capability);
-    return [providerId];
-  } catch {
+  const provider = PROVIDERS_BY_ID[providerId];
+  if (!supportsTool2(provider, capability)) {
     return [];
   }
+  const status = getProviderCapabilityStatus(
+    config,
+    cwd,
+    providerId,
+    capability,
+    {
+      resolveSecrets: false
+    }
+  );
+  return isProviderCapabilityExposable(status) ? [providerId] : [];
 }
 function getProviderStatusForTool(config, cwd, providerId, capability) {
   return getProviderCapabilityStatus(config, cwd, providerId, capability);
@@ -9324,6 +9947,7 @@ async function executeSearchToolInternal({
   );
   const batchProgress = searchQueries.length > 1 ? createBatchCompletionReporter(
     "Searching",
+    provider.id,
     provider.label,
     searchQueries.length,
     progressReporter.report
@@ -9372,7 +9996,7 @@ async function executeSearchToolInternal({
     progressReporter.stop();
   }
   if (outcomes.every((outcome) => outcome.error !== void 0)) {
-    throw buildSearchBatchError(outcomes);
+    throw buildSearchBatchError(outcomes, provider.label);
   }
   const prefetch = prefetchOptions !== void 0 && executionOverrides === void 0 ? await startContentsPrefetch({
     config,
@@ -9384,9 +10008,11 @@ async function executeSearchToolInternal({
     formatSearchResponses(outcomes, prefetch),
     "web-search"
   );
+  const details = buildWebSearchDetails(provider.id, outcomes);
   return {
     content: [{ type: "text", text: rendered }],
-    details: buildWebSearchDetails(provider.id, outcomes)
+    details,
+    display: buildSearchToolDisplay2(details)
   };
 }
 async function executeRawProviderRequest({
@@ -9461,16 +10087,22 @@ async function executeRawProviderRequest({
     input
   });
 }
-function buildSearchBatchError(outcomes) {
+function buildSearchBatchError(outcomes, providerLabel) {
   const failed = outcomes.filter((outcome) => outcome.error !== void 0);
   if (failed.length === 1) {
-    return new Error(failed[0]?.error ?? "web_search failed.");
+    return new Error(
+      formatProviderCapabilityFailure(
+        providerLabel,
+        "search",
+        failed[0]?.error ?? ""
+      )
+    );
   }
   const summary = failed.map(
     (outcome, index) => `${index + 1}. ${formatQuotedPreview(outcome.query, 40)} \u2014 ${outcome.error}`
   ).join("; ");
   return new Error(
-    `All ${failed.length} web_search queries failed: ${summary}`
+    `${providerLabel} search failed for ${failed.length} queries: ${summary}`
   );
 }
 async function executeSingleSearchQuery({
@@ -9546,6 +10178,7 @@ async function executeAnswerToolInternal({
   );
   const batchProgress = answerQueries.length > 1 ? createBatchCompletionReporter(
     "Answering",
+    provider.id,
     provider.label,
     answerQueries.length,
     progressReporter.report
@@ -9588,7 +10221,7 @@ async function executeAnswerToolInternal({
     progressReporter.stop();
   }
   if (outcomes.every((outcome) => outcome.error !== void 0)) {
-    throw buildAnswerBatchError(outcomes);
+    throw buildAnswerBatchError(outcomes, provider.label);
   }
   const text = await truncateAndSave(
     formatAnswerResponses(outcomes),
@@ -9597,19 +10230,31 @@ async function executeAnswerToolInternal({
   const details = buildWebAnswerDetails(provider.id, outcomes);
   return {
     content: [{ type: "text", text }],
-    details
+    details,
+    display: buildProviderToolDisplay2({
+      capability: "answer",
+      providerId: provider.id,
+      details,
+      text
+    })
   };
 }
-function buildAnswerBatchError(outcomes) {
+function buildAnswerBatchError(outcomes, providerLabel) {
   const failed = outcomes.filter((outcome) => outcome.error !== void 0);
   if (failed.length === 1) {
-    return new Error(failed[0]?.error ?? "web_answer failed.");
+    return new Error(
+      formatProviderCapabilityFailure(
+        providerLabel,
+        "answer",
+        failed[0]?.error ?? ""
+      )
+    );
   }
   const summary = failed.map(
     (outcome, index) => `${index + 1}. ${formatQuotedPreview(outcome.query, 40)} \u2014 ${outcome.error}`
   ).join("; ");
   return new Error(
-    `All ${failed.length} web_answer queries failed: ${summary}`
+    `${providerLabel} answer failed for ${failed.length} questions: ${summary}`
   );
 }
 function formatAnswerResponses(outcomes) {
@@ -9671,13 +10316,24 @@ async function executeProviderOperation({
     });
   }
   if (capability === "contents") {
+    const urlCount = (urls ?? []).length;
     onProgress?.(
-      `Fetching contents via ${provider.label} for ${(urls ?? []).length} URL(s)`
+      `Fetching contents via ${provider.label} for ${urlCount} URL(s)`,
+      buildProgressDisplay2(
+        provider.id,
+        urlCount === 1 ? "Fetching page" : `Fetching ${urlCount} pages`
+      )
     );
   } else if (capability === "answer") {
-    onProgress?.(`Answering via ${provider.label}`);
+    onProgress?.(
+      `Answering via ${provider.label}`,
+      buildProgressDisplay2(provider.id, "Answering")
+    );
   } else if (capability === "research") {
-    onProgress?.(`Researching via ${provider.label}`);
+    onProgress?.(
+      `Researching via ${provider.label}`,
+      buildProgressDisplay2(provider.id, "Researching")
+    );
   }
   const result = executionOverride ? await executeProviderExecution(executionOverride, {
     cwd: ctx.cwd,
@@ -9782,18 +10438,36 @@ async function executeProviderToolInternal({
   } finally {
     progressReporter.stop();
   }
-  const details = {
-    tool: `web_${capability}`,
-    provider: response.provider,
-    itemCount: isContentsResponse2(response) ? response.answers.length : response.itemCount
-  };
-  const text = await truncateAndSave(
+  const rendered = await truncateAndSaveWithMetadata(
     isContentsResponse2(response) ? formatContentsResponse(response) : response.text,
     capability
   );
+  const details = isContentsResponse2(response) ? {
+    tool: "web_contents",
+    provider: response.provider,
+    itemCount: response.answers.length
+  } : capability === "answer" ? {
+    tool: "web_answer",
+    provider: response.provider,
+    itemCount: response.itemCount,
+    queryCount: 1,
+    failedQueryCount: 0
+  } : {
+    tool: "web_research",
+    provider: response.provider
+  };
   return {
-    content: [{ type: "text", text }],
-    details
+    content: [{ type: "text", text: rendered.text }],
+    details,
+    display: buildProviderToolDisplay2({
+      capability,
+      providerId: response.provider,
+      details,
+      text: rendered.text,
+      outputBytes: capability === "contents" ? rendered.totalBytes : void 0,
+      outputTruncated: capability === "contents" ? rendered.truncated : void 0,
+      failedItemCount: isContentsResponse2(response) ? response.answers.filter((answer) => answer.error !== void 0).length : void 0
+    })
   };
 }
 async function dispatchWebResearch({
@@ -9857,7 +10531,13 @@ async function dispatchWebResearchInternal({
         text: `Started web research via ${provider.label}.`
       }
     ],
-    details: request
+    details: request,
+    display: buildProviderToolDisplay2({
+      capability: "research",
+      providerId: provider.id,
+      details: { tool: "web_research", provider: provider.id },
+      text: "started"
+    })
   };
 }
 async function runDispatchedWebResearch({
@@ -10089,6 +10769,7 @@ async function executeBatchedContentsTool({
   }
   const batchProgress = createBatchCompletionReporter(
     "Fetching contents",
+    provider.id,
     provider.label,
     urls.length,
     progressReport
@@ -10140,7 +10821,11 @@ async function executeBatchedContentsTool({
   );
   if (successful.length === 0 && failures.length > 0) {
     throw new Error(
-      failures.length === 1 ? failures[0]?.error ?? "web_contents failed." : `web_contents failed for all ${failures.length} URL(s): ${failures.map(
+      failures.length === 1 ? formatProviderCapabilityFailure(
+        provider.label,
+        "contents",
+        failures[0]?.error ?? ""
+      ) : `${provider.label} fetch failed for ${failures.length} pages: ${failures.map(
         (failure, index) => `${index + 1}. ${failure.url} \u2014 ${failure.error}`
       ).join("; ")}`
     );
@@ -10205,10 +10890,11 @@ function createProgressEmitter(onUpdate) {
   if (!onUpdate) {
     return void 0;
   }
-  return (message) => {
+  return (message, display) => {
     onUpdate({
       content: [{ type: "text", text: message }],
-      details: {}
+      details: {},
+      display
     });
   };
 }
@@ -10217,7 +10903,7 @@ function createToolProgressReporter(capability, providerId, progress) {
     return { report: void 0, stop: () => {
     } };
   }
-  const emit = (message) => progress(message);
+  const emit = (message, display) => progress(message, display);
   const startedAt = Date.now();
   let lastUpdateAt = startedAt;
   let timer;
@@ -10228,14 +10914,17 @@ function createToolProgressReporter(capability, providerId, progress) {
       }
       const providerLabel = PROVIDERS_BY_ID[providerId]?.label ?? providerId;
       const elapsed = formatElapsed(Date.now() - startedAt);
-      emit(`Researching via ${providerLabel} (${elapsed} elapsed)`);
+      emit(
+        `Researching via ${providerLabel} (${elapsed} elapsed)`,
+        buildProgressDisplay2(providerId, `Researching ${elapsed}`)
+      );
       lastUpdateAt = Date.now();
     }, RESEARCH_HEARTBEAT_MS);
   }
   return {
-    report: (message) => {
+    report: (message, display) => {
       lastUpdateAt = Date.now();
-      emit(message);
+      emit(message, display);
     },
     stop: () => {
       if (timer) {
@@ -10306,77 +10995,125 @@ function renderQuestionCallHeader(params, theme) {
   );
 }
 function renderResearchCallHeader(params, theme) {
-  return renderListCallHeader("web_research", [params.input], theme);
+  return renderListCallHeader(
+    "web_research",
+    [params.input],
+    theme,
+    void 0,
+    { quoteSingleItem: true }
+  );
 }
-function renderSearchToolResult(result, expanded, isPartial, theme) {
+function renderWebToolResult(result, state, theme, config, symbols = DEFAULT_SUMMARY_SYMBOLS) {
   const text = extractTextContent(result.content);
-  const isError = Boolean(result.isError);
-  if (isPartial) {
-    return renderSimpleText(text ?? "Working\u2026", theme, "warning");
+  if (state.isPartial) {
+    return renderToolProgress(result.display, text, theme);
   }
-  if (isError) {
-    return renderBlockText(text ?? "web_search failed", theme, "error");
+  if (result.isError) {
+    return renderFailureText(
+      buildFailureSummary({
+        text,
+        details: result.details,
+        capability: config.capability,
+        fallback: config.failureText
+      }),
+      theme,
+      symbols
+    );
   }
-  const details = result.details;
-  if (!details || expanded) {
-    return renderMarkdownBlock(text ?? "");
+  const details = config.getDetails(result.details);
+  if (state.expanded) {
+    return config.renderExpanded(details, text);
   }
-  return renderCollapsedSearchSummary(details, text, theme);
+  const summary = config.preferDisplaySummary === false ? config.getCollapsedSummary(details, text) : getDisplaySummaryParts(result.display) ?? config.getCollapsedSummary(details, text);
+  return renderCollapsedSummary(summary, theme, symbols);
 }
-function renderWebResearchDispatchResult(result, expanded, theme) {
-  const text = extractTextContent(result.content) ?? "Started web research.";
-  const details = isWebResearchRequest(result.details) ? result.details : void 0;
-  if (expanded) {
-    const expandedText = details ? [
-      text,
-      "",
-      "## Research brief",
-      "",
-      details.input,
-      "",
-      "## Report path",
-      "",
-      `\`${details.outputPath}\``
-    ].join("\n") : text;
-    return renderMarkdownBlock(expandedText);
-  }
-  const summary = details ? `Started web research via ${PROVIDERS_BY_ID[details.provider]?.label ?? details.provider}` : text;
-  let summaryText = theme.fg("success", summary);
-  summaryText += theme.fg("muted", ` (${getExpandHint()})`);
-  return new Text(summaryText, 0, 0);
+function renderSearchToolResult(result, expanded, isPartial, theme, symbols = DEFAULT_SUMMARY_SYMBOLS) {
+  return renderWebToolResult(
+    result,
+    { expanded, isPartial },
+    theme,
+    {
+      capability: "search",
+      failureText: "web_search failed",
+      getDetails: (details) => details,
+      getCollapsedSummary: (details, text) => details ? buildSearchSummaryParts2(details) : { success: getFirstLine2(text) ?? "web_search output available" },
+      renderExpanded: (_details, text) => renderMarkdownBlock(text ?? "")
+    },
+    symbols
+  );
 }
-function renderWebResearchResultMessage(message, { expanded }, theme) {
+function renderWebResearchDispatchResult(result, expanded, theme, symbols = DEFAULT_SUMMARY_SYMBOLS) {
+  return renderWebToolResult(
+    result,
+    { expanded },
+    theme,
+    {
+      capability: "research",
+      failureText: "web_research failed",
+      getDetails: (details) => isWebResearchRequest(details) ? details : void 0,
+      getCollapsedSummary: () => ({ success: "started" }),
+      renderExpanded: (details, text) => renderMarkdownBlock(
+        details ? renderWebResearchRequestMarkdown(details) : text ?? "Started web research."
+      ),
+      preferDisplaySummary: false
+    },
+    symbols
+  );
+}
+function renderWebResearchResultMessage(message, { expanded }, theme, symbols = DEFAULT_SUMMARY_SYMBOLS) {
   const text = typeof message.content === "string" ? message.content : extractTextContent(message.content);
   const details = isWebResearchResult(message.details) ? message.details : void 0;
   const isSuccess = details?.status === "completed";
   const accent = isSuccess ? "success" : "error";
   const box = new Box(1, 1, (value) => theme.bg("customMessageBg", value));
   if (!expanded) {
-    const lines = details ? buildWebResearchResultSummaryLines(details, theme) : [theme.fg(accent, "Web research update")];
-    lines.push(theme.fg("muted", `(${getExpandHint()})`));
-    box.addChild(new Text(lines.join("\n"), 0, 0));
+    const summary = details ? buildWebResearchResultSummaryLine(details, theme, symbols) : theme.fg(accent, "Web research update");
+    box.addChild(
+      new Text(`${summary}${theme.fg("muted", ` (${getExpandHint()})`)}`, 0, 0)
+    );
     return box;
   }
   box.addChild(
-    isSuccess ? renderMarkdownBlock(text ?? "") : renderBlockText(text ?? "", theme, "error")
+    details ? renderMarkdownBlock(renderWebResearchResultMarkdown(details)) : isSuccess ? renderMarkdownBlock(text ?? "") : renderBlockText(text ?? "", theme, "error")
   );
   return box;
 }
-function buildWebResearchResultSummaryLines(result, theme) {
+function renderWebResearchRequestMarkdown(request) {
+  return [
+    "### Web research",
+    "",
+    `**Brief:** ${request.input}`,
+    "",
+    "**Status:** running  ",
+    `**Elapsed:** ${formatSummaryElapsed(Date.now() - Date.parse(request.startedAt))}  `,
+    `**Artifact:** \`${request.outputPath}\``
+  ].join("\n");
+}
+function renderWebResearchResultMarkdown(result) {
+  const status = result.status === "completed" ? "completed" : result.status;
+  return [
+    "### Web research",
+    "",
+    `**Brief:** ${result.input}`,
+    "",
+    `**Status:** ${status}  `,
+    `**Duration:** ${formatSummaryElapsed(result.elapsedMs)}  `,
+    `**Artifact:** \`${result.outputPath}\``,
+    ...result.error ? ["", `**Error:** ${result.error}`] : []
+  ].join("\n");
+}
+function buildWebResearchResultSummaryLine(result, theme, symbols) {
   const providerLabel = PROVIDERS_BY_ID[result.provider]?.label ?? result.provider;
-  const statusLine = result.status === "completed" ? `Web research completed via ${providerLabel}` : `Web research failed via ${providerLabel}`;
-  const lines = [
-    theme.fg(result.status === "completed" ? "success" : "error", statusLine)
-  ];
-  lines.push(
-    theme.fg("muted", `\u25CB start: ${result.startedAt}`),
-    theme.fg("muted", `\u25F4 duration: ${formatElapsed(result.elapsedMs)}`),
-    theme.fg("muted", `\u21B3 file: ${result.outputPath}`)
-  );
-  if (result.error) {
-    lines.push(theme.fg("muted", `\u2715 error: ${result.error}`));
+  if (result.status === "completed") {
+    return renderSuccessSummary(
+      `${formatSummaryElapsed(result.elapsedMs)} \xB7 ${basename(result.outputPath)}`,
+      theme,
+      symbols
+    );
   }
-  return lines;
+  const statusText = result.status === "cancelled" ? `${providerLabel} research canceled after ${formatSummaryElapsed(result.elapsedMs)}` : `${providerLabel} research failed after ${formatSummaryElapsed(result.elapsedMs)}`;
+  const errorSuffix = result.error ? `: ${normalizeProviderFailureDetail(providerLabel, result.error)}` : "";
+  return renderFailureSummary(`${statusText}${errorSuffix}`, theme, symbols);
 }
 function isWebResearchRequest(details) {
   return typeof details === "object" && details !== null && "tool" in details && details.tool === "web_research" && "startedAt" in details && "outputPath" in details && !("status" in details);
@@ -10385,48 +11122,58 @@ function isWebResearchResult(details) {
   return typeof details === "object" && details !== null && "tool" in details && details.tool === "web_research" && "status" in details && "completedAt" in details;
 }
 function renderProviderToolResult(result, expanded, isPartial, failureText, theme, options = {}) {
-  const text = extractTextContent(result.content);
-  if (isPartial) {
-    return renderSimpleText(text ?? "Working\u2026", theme, "warning");
-  }
-  if (result.isError) {
-    return renderBlockText(text ?? failureText, theme, "error");
-  }
-  if (expanded) {
-    return options.markdownWhenExpanded ? renderMarkdownBlock(text ?? "") : renderBlockText(text ?? "", theme, "toolOutput");
-  }
-  const details = result.details;
-  const summary = renderCollapsedProviderToolSummary(details, text);
-  let summaryText = theme.fg("success", summary);
-  summaryText += theme.fg("muted", ` (${getExpandHint()})`);
-  return new Text(summaryText, 0, 0);
+  return renderWebToolResult(
+    result,
+    { expanded, isPartial },
+    theme,
+    {
+      capability: toolFromFailureText(failureText),
+      failureText,
+      getDetails: (details) => details,
+      getCollapsedSummary: buildCollapsedProviderToolSummary2,
+      renderExpanded: (_details, text) => options.markdownWhenExpanded ? renderMarkdownBlock(text ?? "") : renderBlockText(text ?? "", theme, "toolOutput")
+    },
+    options.symbols
+  );
 }
 function renderCollapsedProviderToolSummary(details, text) {
-  if (details?.tool === "web_answer" && typeof details.queryCount === "number" && details.queryCount > 1) {
-    const providerLabel = PROVIDERS_BY_ID[details.provider]?.label ?? details.provider;
-    const failureSuffix = details.failedQueryCount && details.failedQueryCount > 0 ? `, ${details.failedQueryCount} failed` : "";
-    return `${details.queryCount} questions via ${providerLabel}${failureSuffix}`;
-  }
-  const baseSummary = getCompactProviderToolSummary(details) ?? getFirstLine(text) ?? `${details?.tool ?? "tool"} output available`;
-  if (!details?.provider) {
-    return baseSummary;
-  }
-  return appendProviderSummary(baseSummary, details.provider);
+  return buildCollapsedProviderToolSummary(details, text);
 }
-function getCompactProviderToolSummary(details) {
-  if (!details) {
-    return void 0;
-  }
-  if (details.tool === "web_contents" && typeof details.itemCount === "number") {
-    return `${details.itemCount} page${details.itemCount === 1 ? "" : "s"}`;
-  }
-  if (details.tool === "web_answer") {
-    return "Answer";
-  }
-  if (details.tool === "web_research") {
-    return "Research";
-  }
-  return void 0;
+function buildCollapsedProviderToolSummary2(details, text) {
+  return buildCollapsedProviderToolSummaryParts(details, text);
+}
+function renderCollapsedSummary(summary, theme, symbols = DEFAULT_SUMMARY_SYMBOLS) {
+  let rendered = renderSummary(summary, theme, symbols);
+  rendered += theme.fg("muted", ` (${getExpandHint()})`);
+  return new Text(rendered, 0, 0);
+}
+function getDisplaySummaryParts(display) {
+  return display?.outcome;
+}
+function buildSearchToolDisplay2(details) {
+  return buildSearchToolDisplay(details);
+}
+function buildProgressDisplay2(providerId, action) {
+  return buildProgressDisplay(providerId, action);
+}
+function buildProviderToolDisplay2({
+  capability,
+  providerId,
+  details,
+  text,
+  outputBytes,
+  outputTruncated,
+  failedItemCount
+}) {
+  return buildProviderToolDisplay({
+    capability,
+    providerId,
+    details,
+    text,
+    outputBytes,
+    outputTruncated,
+    failedItemCount
+  });
 }
 function getProviderSettings(providerId) {
   return getProviderConfigManifest(providerId).settings;
@@ -10486,12 +11233,19 @@ function resolveProviderSelectionValue(providerIds, value) {
   );
 }
 function getReadyCompatibleProvidersForTool(config, cwd, toolId) {
+  const mappedProviderId = getMappedProviderIdForTool(config, toolId);
   return sortProviderIdsForSettings(
-    getCompatibleProviders(toolId).filter(
-      (providerId) => isProviderCapabilityReady(
-        getProviderCapabilityStatus(config, cwd, providerId, toolId)
-      )
-    )
+    getCompatibleProviders(toolId).filter((providerId) => {
+      const setupState = getProviderSetupState(config, providerId);
+      if (setupState === "none" && providerId !== mappedProviderId) {
+        return false;
+      }
+      return isProviderCapabilityExposable(
+        getProviderCapabilityStatus(config, cwd, providerId, toolId, {
+          resolveSecrets: false
+        })
+      );
+    })
   );
 }
 function sortProviderIdsForSettings(providerIds) {
@@ -10571,6 +11325,9 @@ function ensureSettings(config) {
   return config.settings;
 }
 function cleanupSettings(config) {
+  if (config.settings?.search && Object.keys(config.settings.search).length === 0) {
+    delete config.settings.search;
+  }
   if (config.settings && Object.keys(config.settings).length === 0) {
     delete config.settings;
   }
@@ -10718,19 +11475,21 @@ var WebProvidersSettingsView = class {
         id: `tool:${toolId}`,
         label: TOOL_INFO[toolId].label,
         currentValue,
-        description: `Press Enter to configure web_${toolId}. ${TOOL_INFO[toolId].help} Route web_${toolId} to one compatible provider or turn it off.` + (compatibleLabels.length > 0 ? ` Ready compatible providers: ${compatibleLabels.join(", ")}.` : ""),
+        description: `Press Enter to configure web_${toolId}. ${TOOL_INFO[toolId].help} Route web_${toolId} to one compatible provider or turn it off.` + (compatibleLabels.length > 0 ? ` Compatible providers: ${compatibleLabels.join(", ")}.` : ""),
         kind: "action"
       };
     });
   }
   buildSettingsSectionItems() {
-    return SETTING_IDS.map((id) => ({
-      id: `settings:${id}`,
-      label: SETTING_META[id].label,
-      currentValue: getSharedSettingDisplayValue(this.config, id),
-      description: SETTING_META[id].help,
-      kind: "text"
-    }));
+    return [
+      ...SETTING_IDS.map((id) => ({
+        id: `settings:${id}`,
+        label: SETTING_META[id].label,
+        currentValue: getSharedSettingDisplayValue(this.config, id),
+        description: SETTING_META[id].help,
+        kind: "text"
+      }))
+    ];
   }
   getSectionEntries(section) {
     if (section === "provider") return this.buildProviderSectionItems();
@@ -11040,7 +11799,7 @@ var ToolSettingsSubmenu = class {
         id: "provider",
         label: "Provider",
         currentValue: currentProviderValue,
-        description: `Route web_${this.toolId} to one compatible ready provider or turn it off.`,
+        description: `Route web_${this.toolId} to one compatible provider or turn it off.`,
         kind: "cycle",
         values: providerValues
       }
@@ -11452,17 +12211,24 @@ function formatProviderSetupState(state) {
 function getProviderReadinessSummary(config, cwd, providerId) {
   const tools = getProviderTools(providerId);
   const statuses = tools.map(
-    (tool) => getProviderCapabilityStatus(config, cwd, providerId, tool)
+    (tool) => getProviderCapabilityStatus(config, cwd, providerId, tool, {
+      resolveSecrets: false
+    })
   );
   if (statuses.some((status) => status.state === "ready")) {
     return "Ready";
   }
+  if (statuses.some((status) => status.state === "deferred_secret")) {
+    return "Secrets resolved on first use";
+  }
   return formatProviderCapabilityStatus(statuses[0], providerId, tools[0]);
 }
 function getProviderReadinessSummaryForProviderConfig(providerId, providerConfig) {
   const status = PROVIDERS_BY_ID[providerId].getCapabilityStatus(
     providerConfig ?? PROVIDERS_BY_ID[providerId].config.createTemplate(),
-    ""
+    "",
+    void 0,
+    { resolveSecrets: false }
   );
   return formatProviderCapabilityStatus(status, providerId);
 }
@@ -11511,7 +12277,7 @@ function getSearchQueriesForDisplay(queries) {
 function getAnswerQueriesForDisplay(queries) {
   return getSearchQueriesForDisplay(queries);
 }
-function createBatchCompletionReporter(verb, providerLabel, total, report) {
+function createBatchCompletionReporter(verb, providerId, providerLabel, total, report) {
   if (!report) {
     return {
       start: () => {
@@ -11529,7 +12295,8 @@ function createBatchCompletionReporter(verb, providerLabel, total, report) {
     if (failedCount > 0) {
       message += `, ${failedCount} failed`;
     }
-    report(message);
+    const action = verb === "Fetching contents" ? `Fetching ${completedCount}/${total} pages` : `${verb} ${completedCount}/${total}`;
+    report(message, buildProgressDisplay2(providerId, action));
   };
   return {
     start: emit,
@@ -11590,34 +12357,52 @@ ${rendered}`, 0, 0);
 function renderSimpleText(text, theme, color) {
   return new Text(theme.fg(color, text), 0, 0);
 }
-function renderCollapsedSearchSummary(details, text, theme) {
+function renderSummary(summary, theme, symbols) {
+  let rendered = renderSuccessSummary(summary.success, theme, symbols);
+  if (summary.failure) {
+    rendered += `, ${renderFailureSummary(summary.failure, theme, symbols)}`;
+  }
+  return rendered;
+}
+function renderSuccessSummary(text, theme, symbols) {
+  return theme.fg("success", prefixWithSymbol(text, symbols.success));
+}
+function renderFailureSummary(text, theme, symbols) {
+  return theme.fg("error", prefixWithSymbol(text, symbols.failure));
+}
+function renderFailureText(text, theme, symbols) {
+  return new Text(renderFailureSummary(text, theme, symbols), 0, 0);
+}
+function prefixWithSymbol(text, symbol) {
+  return symbol ? `${symbol} ${text}` : text;
+}
+function renderToolProgress(display, fallbackText, theme) {
+  const progress = display?.progress;
+  const providerLabel = display?.provider?.label;
+  if (!progress || !providerLabel) {
+    return renderSimpleText(fallbackText ?? "Working\u2026", theme, "warning");
+  }
+  return new Text(
+    `${theme.fg("warning", progress.action)} ${theme.fg("muted", `via ${providerLabel}`)}`,
+    0,
+    0
+  );
+}
+function renderCollapsedSearchSummary(details, text, theme, symbols = DEFAULT_SUMMARY_SYMBOLS) {
   const queryCount = typeof details?.queryCount === "number" ? details.queryCount : inferSearchQueryCount(text);
   const resultCount = typeof details?.resultCount === "number" ? details.resultCount : inferSearchResultCount(text);
   const failedQueryCount = typeof details?.failedQueryCount === "number" ? details.failedQueryCount : inferSearchFailureCount(text);
-  const providerLabel = typeof details?.provider === "string" ? PROVIDERS_BY_ID[details.provider]?.label ?? details.provider : void 0;
-  let base2 = buildSearchSummaryText({
+  const summary = buildSearchSummaryParts2({
     queryCount,
-    resultCount
+    resultCount,
+    failedQueryCount
   });
-  if (providerLabel) {
-    base2 = `${base2} via ${providerLabel}`;
-  }
-  if (failedQueryCount && failedQueryCount > 0) {
-    base2 += `, ${failedQueryCount} failed`;
-  }
-  let summary = theme.fg("success", base2);
-  summary += theme.fg("muted", ` (${getExpandHint()})`);
-  return new Text(summary, 0, 0);
+  let rendered = renderSummary(summary, theme, symbols);
+  rendered += theme.fg("muted", ` (${getExpandHint()})`);
+  return new Text(rendered, 0, 0);
 }
-function buildSearchSummaryText({
-  queryCount,
-  resultCount
-}) {
-  const countSummary = typeof resultCount === "number" ? `${resultCount} result${resultCount === 1 ? "" : "s"}` : "Search output available";
-  if (queryCount && queryCount > 1) {
-    return `${queryCount} queries, ${countSummary}`;
-  }
-  return countSummary;
+function buildSearchSummaryParts2(options) {
+  return buildSearchSummaryParts(options);
 }
 function inferSearchQueryCount(text) {
   if (!text) {
@@ -11643,12 +12428,77 @@ function inferSearchFailureCount(text) {
   const failureMatches = text.match(/^Search failed:/gm);
   return failureMatches?.length;
 }
-function appendProviderSummary(summary, provider) {
-  const providerLabel = PROVIDERS_BY_ID[provider]?.label ?? provider;
-  const providerSuffix = `via ${providerLabel}`;
-  return summary.toLowerCase().includes(providerSuffix.toLowerCase()) ? summary : `${summary} ${providerSuffix}`;
+function buildFailureSummary({
+  text,
+  details,
+  capability,
+  fallback
+}) {
+  const detail = stripTrailingSentencePunctuation(getFirstLine2(text) ?? "");
+  const providerLabel = details?.provider !== void 0 ? PROVIDERS_BY_ID[details.provider]?.label ?? details.provider : void 0;
+  if (!providerLabel) {
+    return detail || fallback;
+  }
+  return formatProviderCapabilityFailure(providerLabel, capability, detail);
 }
-function getFirstLine(text) {
+function formatProviderCapabilityFailure(providerLabel, capability, detail) {
+  const action = getFailureAction(capability);
+  const base2 = `${providerLabel} ${action} failed`;
+  if (!detail || detail === base2) {
+    return base2;
+  }
+  if (detail.toLowerCase().startsWith(base2.toLowerCase())) {
+    return detail;
+  }
+  const normalizedDetail = normalizeProviderFailureDetail(
+    providerLabel,
+    detail
+  );
+  return `${base2}: ${normalizedDetail}`;
+}
+function normalizeProviderFailureDetail(providerLabel, detail) {
+  const normalized = stripTrailingSentencePunctuation(detail);
+  const providerPrefix = `${providerLabel}:`;
+  return normalized.toLowerCase().startsWith(providerPrefix.toLowerCase()) ? normalized.slice(providerPrefix.length).trim() : normalized;
+}
+function getFailureAction(capability) {
+  switch (capability) {
+    case "contents":
+      return "fetch";
+    case "search":
+    case "answer":
+    case "research":
+      return capability;
+  }
+}
+function toolFromFailureText(text) {
+  if (text.startsWith("web_contents")) {
+    return "contents";
+  }
+  if (text.startsWith("web_answer")) {
+    return "answer";
+  }
+  if (text.startsWith("web_research")) {
+    return "research";
+  }
+  return "search";
+}
+function stripTrailingSentencePunctuation(text) {
+  return text.trim().replace(/[.\s]+$/u, "");
+}
+function formatSummaryElapsed(ms) {
+  const totalSeconds = Math.max(0, Math.floor(ms / 1e3));
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  if (minutes > 0 && seconds === 0) {
+    return `${minutes}m`;
+  }
+  if (minutes > 0) {
+    return `${minutes}m ${seconds}s`;
+  }
+  return `${seconds}s`;
+}
+function getFirstLine2(text) {
   if (!text) {
     return void 0;
   }
@@ -11729,18 +12579,32 @@ function escapeMarkdownText(text) {
   return text.replaceAll("\\", "\\\\").replaceAll("*", "\\*").replaceAll("_", "\\_").replaceAll("`", "\\`").replaceAll("#", "\\#").replaceAll("[", "\\[").replaceAll("]", "\\]");
 }
 async function truncateAndSave(text, prefix) {
+  return (await truncateAndSaveWithMetadata(text, prefix)).text;
+}
+async function truncateAndSaveWithMetadata(text, prefix) {
+  const totalBytes = Buffer.byteLength(text, "utf-8");
   const truncation = truncateHead(text, {
     maxLines: DEFAULT_MAX_LINES,
     maxBytes: DEFAULT_MAX_BYTES
   });
-  if (!truncation.truncated) return truncation.content;
+  if (!truncation.truncated) {
+    return {
+      text: truncation.content,
+      totalBytes,
+      truncated: false
+    };
+  }
   const dir = join2(tmpdir(), `pi-web-providers-${prefix}-${Date.now()}`);
   await mkdir2(dir, { recursive: true });
   const fullPath = join2(dir, "output.txt");
   await writeFile2(fullPath, text, "utf-8");
-  return truncation.content + `
+  return {
+    text: truncation.content + `
 
-[Output truncated: ${truncation.outputLines} of ${truncation.totalLines} lines (${formatSize(truncation.outputBytes)} of ${formatSize(truncation.totalBytes)}). Full output saved to: ${fullPath}]`;
+[Output truncated: ${truncation.outputLines} of ${truncation.totalLines} lines (${formatSize2(truncation.outputBytes)} of ${formatSize2(truncation.totalBytes)}). Full output saved to: ${fullPath}]`,
+    totalBytes,
+    truncated: true
+  };
 }
 function truncateInline(text, maxLength) {
   if (text.length <= maxLength) return text;