npm - @code-yeongyu/senpi - Versions diffs - 2026.7.25 → 2026.7.26 - Mend

@code-yeongyu/senpi 2026.7.25 → 2026.7.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (575) hide show

package/dist/core/extensions/builtin/websearch/websearch/renderers.js CHANGED Viewed

@@ -1,4 +1,5 @@
 import { Text } from "@earendil-works/pi-tui";
+import { providerEntryLabel } from "./search.js";
 function shorten(value, max) {
     return value.length <= max ? value : `${value.slice(0, max - 1)}…`;
 }
@@ -8,10 +9,24 @@ function durationText(durationMs) {
 function attemptLabel(attempts) {
     return attempts
         ? attempts
-            .map((attempt) => `${attempt.entryId ? `${attempt.provider}/${attempt.entryId}` : attempt.provider}:${attempt.error ? "failed" : attempt.resultsCount}`)
+            .map((attempt) => `${providerEntryLabel(attempt)}:${attempt.error ? "failed" : attempt.resultsCount}`)
             .join(" -> ")
         : "";
 }
+function routeStateLabel(details) {
+    const labels = details.routeLabels ?? details.providerLabels;
+    if (labels.length === 0)
+        return "";
+    const attempts = details.attempts ?? [];
+    return labels
+        .map((label, index) => {
+        const attempt = attempts[index];
+        if (attempt)
+            return `${label}:${attempt.error ? "failed" : attempt.resultsCount}`;
+        return `${label}:${index === attempts.length ? "searching" : "pending"}`;
+    })
+        .join(" -> ");
+}
 function isSearchProgressDetails(details) {
     return details !== undefined && "phase" in details && details.phase === "searching";
 }
@@ -30,12 +45,9 @@ export function renderSearchResult(result, options, theme) {
         const details = result.details;
         if (isSearchProgressDetails(details)) {
             if (details.currentProvider) {
-                const total = details.providerLabels.length;
-                const position = Math.min((details.attempts?.length ?? 0) + 1, Math.max(total, 1));
-                const step = total > 1 ? ` [${position}/${total}]` : "";
-                const line = theme.fg("warning", `Searching "${shorten(details.query, 80)}" via ${details.currentProvider}${step} (max ${details.maxResults})`);
-                const attempts = attemptLabel(details.attempts);
-                const rows = options.expanded && attempts ? [line, theme.fg("muted", `route ${attempts}`)] : [line];
+                const line = theme.fg("warning", `Searching "${shorten(details.query, 80)}" via ${details.currentProvider} (max ${details.maxResults})`);
+                const route = routeStateLabel(details);
+                const rows = options.expanded && route ? [line, theme.fg("muted", `route ${route}`)] : [line];
                 return new Text(rows.join("\n"), 0, 0);
             }
             const route = details.providerLabels.length > 0 ? details.providerLabels.join(" -> ") : "configured providers";
@@ -53,7 +65,7 @@ export function renderSearchResult(result, options, theme) {
     if (details.error)
         return new Text(theme.fg("error", details.error), 0, 0);
     const count = details.results.length;
-    const provider = details.entryId ? `${details.provider}/${details.entryId}` : details.provider;
+    const provider = providerEntryLabel(details);
     const summary = theme.fg("success", `${count} result${count === 1 ? "" : "s"}`) +
         theme.fg("muted", ` via ${provider}${details.strategy ? ` (${details.strategy})` : ""} in ${durationText(details.durationMs)}`) +
         (details.truncated ? theme.fg("warning", " (truncated)") : "");

package/dist/core/extensions/builtin/websearch/websearch/renderers.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"renderers.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/websearch/websearch/renderers.ts"],"names":[],"mappings":"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","sourcesContent":["import { Text } from \"@earendil-works/pi-tui\";\n\nimport type { SearchDetails, SearchErrorDetails, SearchProgressDetails, SearchRenderDetails } from \"./types.ts\";\n\ninterface ThemeLike {\n\tbold(value: string): string;\n\tfg(key: string, value: string): string;\n}\n\ninterface SearchArgs {\n\tquery: string;\n\tallowed_domains?: string[];\n\tblocked_domains?: string[];\n}\n\ninterface ResultLike<TDetails> {\n\tcontent: ReadonlyArray<{ type: string; text?: string }>;\n\tdetails?: TDetails;\n}\n\ninterface RenderResultOptions {\n\texpanded?: boolean;\n\tisPartial?: boolean;\n}\n\nfunction shorten(value: string, max: number): string {\n\treturn value.length <= max ? value : `${value.slice(0, max - 1)}…`;\n}\n\nfunction durationText(durationMs: number): string {\n\treturn durationMs >= 1000 ? `${Math.round(durationMs / 1000)}s` : `${durationMs}ms`;\n}\n\nfunction attemptLabel(attempts: SearchDetails[\"attempts\"]): string {\n\treturn attempts\n\t\t? attempts\n\t\t\t\t.map(\n\t\t\t\t\t(attempt) =>\n\t\t\t\t\t\t`${attempt.entryId ? `${attempt.provider}/${attempt.entryId}` : attempt.provider}:${attempt.error ? \"failed\" : attempt.resultsCount}`,\n\t\t\t\t)\n\t\t\t\t.join(\" -> \")\n\t\t: \"\";\n}\n\nfunction isSearchProgressDetails(details: SearchRenderDetails \| undefined): details is SearchProgressDetails {\n\treturn details !== undefined && \"phase\" in details && details.phase === \"searching\";\n}\n\nfunction isSearchErrorDetails(details: SearchRenderDetails): details is SearchErrorDetails {\n\treturn \"phase\" in details && details.phase === \"error\";\n}\n\nexport function renderSearchCall(args: SearchArgs, theme: ThemeLike): Text {\n\tconst head = theme.fg(\"toolTitle\", theme.bold(\"web_search \"));\n\tconst query = theme.fg(\"accent\", `\"${shorten(args.query, 90)}\"`);\n\tconst domains = args.allowed_domains ?? args.blocked_domains;\n\tconst filter = domains?.length ? theme.fg(\"muted\", ` domains:${domains.length}`) : \"\";\n\treturn new Text(head + query + filter, 0, 0);\n}\n\nexport function renderSearchResult(\n\tresult: ResultLike<SearchRenderDetails>,\n\toptions: RenderResultOptions,\n\ttheme: ThemeLike,\n): Text {\n\tif (options.isPartial) {\n\t\tconst details = result.details;\n\t\tif (isSearchProgressDetails(details)) {\n\t\t\tif (details.currentProvider) {\n\t\t\t\tconst total = details.providerLabels.length;\n\t\t\t\tconst position = Math.min((details.attempts?.length ?? 0) + 1, Math.max(total, 1));\n\t\t\t\tconst step = total > 1 ? ` [${position}/${total}]` : \"\";\n\t\t\t\tconst line = theme.fg(\n\t\t\t\t\t\"warning\",\n\t\t\t\t\t`Searching \"${shorten(details.query, 80)}\" via ${details.currentProvider}${step} (max ${details.maxResults})`,\n\t\t\t\t);\n\t\t\t\tconst attempts = attemptLabel(details.attempts);\n\t\t\t\tconst rows = options.expanded && attempts ? [line, theme.fg(\"muted\", `route ${attempts}`)] : [line];\n\t\t\t\treturn new Text(rows.join(\"\\n\"), 0, 0);\n\t\t\t}\n\t\t\tconst route = details.providerLabels.length > 0 ? details.providerLabels.join(\" -> \") : \"configured providers\";\n\t\t\treturn new Text(\n\t\t\t\ttheme.fg(\"warning\", `Searching \"${shorten(details.query, 80)}\" via ${route} (max ${details.maxResults})`),\n\t\t\t\t0,\n\t\t\t\t0,\n\t\t\t);\n\t\t}\n\t\treturn new Text(theme.fg(\"warning\", result.content[0]?.text ?? \"Searching the web...\"), 0, 0);\n\t}\n\n\tconst details = result.details;\n\tif (!details) return new Text(theme.fg(\"muted\", result.content[0]?.text ?? \"\"), 0, 0);\n\tif (isSearchProgressDetails(details)) return new Text(theme.fg(\"muted\", result.content[0]?.text ?? \"\"), 0, 0);\n\tif (isSearchErrorDetails(details)) return new Text(theme.fg(\"error\", details.error), 0, 0);\n\tif (details.error) return new Text(theme.fg(\"error\", details.error), 0, 0);\n\n\tconst count = details.results.length;\n\tconst provider = details.entryId ? `${details.provider}/${details.entryId}` : details.provider;\n\tconst summary =\n\t\ttheme.fg(\"success\", `${count} result${count === 1 ? \"\" : \"s\"}`) +\n\t\ttheme.fg(\n\t\t\t\"muted\",\n\t\t\t` via ${provider}${details.strategy ? ` (${details.strategy})` : \"\"} in ${durationText(details.durationMs)}`,\n\t\t) +\n\t\t(details.truncated ? theme.fg(\"warning\", \" (truncated)\") : \"\");\n\n\tif (count === 0) return new Text(summary, 0, 0);\n\n\tconst attempts = attemptLabel(details.attempts);\n\tconst rows = options.expanded && attempts ? [summary, theme.fg(\"muted\", `route ${attempts}`)] : [summary];\n\tconst visibleLimit = options.expanded ? 8 : 3;\n\tfor (const item of details.results.slice(0, visibleLimit)) {\n\t\trows.push(`${theme.fg(\"accent\", shorten(item.title, 80))} ${theme.fg(\"dim\", shorten(item.url, 100))}`);\n\t\tif (item.snippet) rows.push(theme.fg(\"muted\", ` ${shorten(item.snippet, 140)}`));\n\t}\n\tif (details.results.length > visibleLimit) {\n\t\trows.push(theme.fg(\"dim\", `… ${details.results.length - visibleLimit} more sources`));\n\t}\n\treturn new Text(rows.join(\"\\n\"), 0, 0);\n}\n"]}
1	+ {"version":3,"file":"renderers.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/websearch/websearch/renderers.ts"],"names":[],"mappings":"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","sourcesContent":["import { Text } from \"@earendil-works/pi-tui\";\n\nimport { providerEntryLabel } from \"./search.ts\";\nimport type { SearchDetails, SearchErrorDetails, SearchProgressDetails, SearchRenderDetails } from \"./types.ts\";\n\ninterface ThemeLike {\n\tbold(value: string): string;\n\tfg(key: string, value: string): string;\n}\n\ninterface SearchArgs {\n\tquery: string;\n\tallowed_domains?: string[];\n\tblocked_domains?: string[];\n}\n\ninterface ResultLike<TDetails> {\n\tcontent: ReadonlyArray<{ type: string; text?: string }>;\n\tdetails?: TDetails;\n}\n\ninterface RenderResultOptions {\n\texpanded?: boolean;\n\tisPartial?: boolean;\n}\n\nfunction shorten(value: string, max: number): string {\n\treturn value.length <= max ? value : `${value.slice(0, max - 1)}…`;\n}\n\nfunction durationText(durationMs: number): string {\n\treturn durationMs >= 1000 ? `${Math.round(durationMs / 1000)}s` : `${durationMs}ms`;\n}\n\nfunction attemptLabel(attempts: SearchDetails[\"attempts\"]): string {\n\treturn attempts\n\t\t? attempts\n\t\t\t\t.map((attempt) => `${providerEntryLabel(attempt)}:${attempt.error ? \"failed\" : attempt.resultsCount}`)\n\t\t\t\t.join(\" -> \")\n\t\t: \"\";\n}\n\nfunction routeStateLabel(details: SearchProgressDetails): string {\n\tconst labels = details.routeLabels ?? details.providerLabels;\n\tif (labels.length === 0) return \"\";\n\tconst attempts = details.attempts ?? [];\n\treturn labels\n\t\t.map((label, index) => {\n\t\t\tconst attempt = attempts[index];\n\t\t\tif (attempt) return `${label}:${attempt.error ? \"failed\" : attempt.resultsCount}`;\n\t\t\treturn `${label}:${index === attempts.length ? \"searching\" : \"pending\"}`;\n\t\t})\n\t\t.join(\" -> \");\n}\n\nfunction isSearchProgressDetails(details: SearchRenderDetails \| undefined): details is SearchProgressDetails {\n\treturn details !== undefined && \"phase\" in details && details.phase === \"searching\";\n}\n\nfunction isSearchErrorDetails(details: SearchRenderDetails): details is SearchErrorDetails {\n\treturn \"phase\" in details && details.phase === \"error\";\n}\n\nexport function renderSearchCall(args: SearchArgs, theme: ThemeLike): Text {\n\tconst head = theme.fg(\"toolTitle\", theme.bold(\"web_search \"));\n\tconst query = theme.fg(\"accent\", `\"${shorten(args.query, 90)}\"`);\n\tconst domains = args.allowed_domains ?? args.blocked_domains;\n\tconst filter = domains?.length ? theme.fg(\"muted\", ` domains:${domains.length}`) : \"\";\n\treturn new Text(head + query + filter, 0, 0);\n}\n\nexport function renderSearchResult(\n\tresult: ResultLike<SearchRenderDetails>,\n\toptions: RenderResultOptions,\n\ttheme: ThemeLike,\n): Text {\n\tif (options.isPartial) {\n\t\tconst details = result.details;\n\t\tif (isSearchProgressDetails(details)) {\n\t\t\tif (details.currentProvider) {\n\t\t\t\tconst line = theme.fg(\n\t\t\t\t\t\"warning\",\n\t\t\t\t\t`Searching \"${shorten(details.query, 80)}\" via ${details.currentProvider} (max ${details.maxResults})`,\n\t\t\t\t);\n\t\t\t\tconst route = routeStateLabel(details);\n\t\t\t\tconst rows = options.expanded && route ? [line, theme.fg(\"muted\", `route ${route}`)] : [line];\n\t\t\t\treturn new Text(rows.join(\"\\n\"), 0, 0);\n\t\t\t}\n\t\t\tconst route = details.providerLabels.length > 0 ? details.providerLabels.join(\" -> \") : \"configured providers\";\n\t\t\treturn new Text(\n\t\t\t\ttheme.fg(\"warning\", `Searching \"${shorten(details.query, 80)}\" via ${route} (max ${details.maxResults})`),\n\t\t\t\t0,\n\t\t\t\t0,\n\t\t\t);\n\t\t}\n\t\treturn new Text(theme.fg(\"warning\", result.content[0]?.text ?? \"Searching the web...\"), 0, 0);\n\t}\n\n\tconst details = result.details;\n\tif (!details) return new Text(theme.fg(\"muted\", result.content[0]?.text ?? \"\"), 0, 0);\n\tif (isSearchProgressDetails(details)) return new Text(theme.fg(\"muted\", result.content[0]?.text ?? \"\"), 0, 0);\n\tif (isSearchErrorDetails(details)) return new Text(theme.fg(\"error\", details.error), 0, 0);\n\tif (details.error) return new Text(theme.fg(\"error\", details.error), 0, 0);\n\n\tconst count = details.results.length;\n\tconst provider = providerEntryLabel(details);\n\tconst summary =\n\t\ttheme.fg(\"success\", `${count} result${count === 1 ? \"\" : \"s\"}`) +\n\t\ttheme.fg(\n\t\t\t\"muted\",\n\t\t\t` via ${provider}${details.strategy ? ` (${details.strategy})` : \"\"} in ${durationText(details.durationMs)}`,\n\t\t) +\n\t\t(details.truncated ? theme.fg(\"warning\", \" (truncated)\") : \"\");\n\n\tif (count === 0) return new Text(summary, 0, 0);\n\n\tconst attempts = attemptLabel(details.attempts);\n\tconst rows = options.expanded && attempts ? [summary, theme.fg(\"muted\", `route ${attempts}`)] : [summary];\n\tconst visibleLimit = options.expanded ? 8 : 3;\n\tfor (const item of details.results.slice(0, visibleLimit)) {\n\t\trows.push(`${theme.fg(\"accent\", shorten(item.title, 80))} ${theme.fg(\"dim\", shorten(item.url, 100))}`);\n\t\tif (item.snippet) rows.push(theme.fg(\"muted\", ` ${shorten(item.snippet, 140)}`));\n\t}\n\tif (details.results.length > visibleLimit) {\n\t\trows.push(theme.fg(\"dim\", `… ${details.results.length - visibleLimit} more sources`));\n\t}\n\treturn new Text(rows.join(\"\\n\"), 0, 0);\n}\n"]}

package/dist/core/extensions/builtin/websearch/websearch/search.d.ts CHANGED Viewed

@@ -4,7 +4,12 @@ export interface SearchRoutingState {
     successCounts: number[];
 }
 export declare function createSearchRoutingState(providerCount: number): SearchRoutingState;
-export type SearchAttemptListener = (providerLabel: string, attempts: readonly SearchAttempt[]) => void;
+export declare function providerEntryLabel(entry: {
+    readonly provider: string;
+    readonly id?: string;
+    readonly entryId?: string;
+}): string;
+export type SearchAttemptListener = (providerLabel: string, attempts: readonly SearchAttempt[], routeLabels: readonly string[]) => void;
 export declare function performSearch(config: WebsearchConfig, request: SearchRequest, signal?: AbortSignal, routingState?: SearchRoutingState, onAttempt?: SearchAttemptListener): Promise<SearchDetails>;
 export declare function formatSearchText(details: SearchDetails): string;
 //# sourceMappingURL=search.d.ts.map

package/dist/core/extensions/builtin/websearch/websearch/search.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/websearch/websearch/search.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGX,aAAa,EACb,aAAa,EAEb,aAAa,EACb,eAAe,EACf,MAAM,YAAY,CAAC;AAyEpB,MAAM,WAAW,kBAAkB;IAClC,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,MAAM,GAAG,kBAAkB,CAElF;~~AA6JD~~,MAAM,MAAM,qBAAqB,GAAG,~~CAAC~~,aAAa,EAAE,MAAM,~~EAAE~~,QAAQ,EAAE,SAAS,aAAa,EAAE,~~KAAK~~,IAAI,CAAC;~~AAExG~~,wBAAsB,aAAa,CAClC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,aAAa,EACtB,MAAM,CAAC,EAAE,WAAW,EACpB,YAAY,CAAC,EAAE,kBAAkB,EACjC,SAAS,CAAC,EAAE,qBAAqB,GAC/B,OAAO,CAAC,aAAa,CAAC,~~CAiExB~~;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,MAAM,CA0B/D"}
1	+ {"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/websearch/websearch/search.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGX,aAAa,EACb,aAAa,EAEb,aAAa,EACb,eAAe,EACf,MAAM,YAAY,CAAC;AAyEpB,MAAM,WAAW,kBAAkB;IAClC,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,MAAM,GAAG,kBAAkB,CAElF;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE;IACzC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC1B,GAAG,MAAM,CAKT;AAuJD,MAAM,MAAM,qBAAqB,GAAG,CACnC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,SAAS,aAAa,EAAE,EAClC,WAAW,EAAE,SAAS,MAAM,EAAE,KAC1B,IAAI,CAAC;AAEV,wBAAsB,aAAa,CAClC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,aAAa,EACtB,MAAM,CAAC,EAAE,WAAW,EACpB,YAAY,CAAC,EAAE,kBAAkB,EACjC,SAAS,CAAC,EAAE,qBAAqB,GAC/B,OAAO,CAAC,aAAa,CAAC,CAqExB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,MAAM,CA0B/D"}

package/dist/core/extensions/builtin/websearch/websearch/search.js CHANGED Viewed

@@ -58,17 +58,17 @@ function searchAbortSignal(outerSignal, timeoutMs) {
     };
 }
 function noResultsMessage(config, request) {
-    return `Search provider ${entryLabel(config)} returned no results for "${request.query}".`;
+    return `Search provider ${providerEntryLabel(config)} returned no results for "${request.query}".`;
 }
 export function createSearchRoutingState(providerCount) {
     return { roundRobinCursor: 0, successCounts: Array.from({ length: providerCount }, () => 0) };
 }
-function entryLabel(entry) {
-    if ("entryId" in entry && entry.entryId)
-        return `${entry.provider}/${entry.entryId}`;
-    if ("id" in entry && entry.id)
-        return `${entry.provider}/${entry.id}`;
-    return entry.provider;
+export function providerEntryLabel(entry) {
+    const id = entry.entryId ?? entry.id;
+    if (!id || id === entry.provider)
+        return entry.provider;
+    const nativePrefix = `native-${entry.provider}-`;
+    return `${entry.provider}/${id.startsWith(nativePrefix) ? "native" : id}`;
 }
 function sortedPriorityIndices(providers) {
     return providers
@@ -230,13 +230,17 @@ export async function performSearch(config, request, signal, routingState, onAtt
     const state = routingState ?? createSearchRoutingState(config.providers.length);
     const order = selectOrder(config.strategy, config.providers, state);
     const attempts = [];
+    const routeLabels = order.flatMap((index) => {
+        const provider = config.providers[index];
+        return provider ? [providerEntryLabel(provider)] : [];
+    });
     const collected = new Map();
     let selectedDetails;
     for (const index of order) {
         const provider = config.providers[index];
         if (!provider)
             continue;
-        onAttempt?.(entryLabel(provider), attempts);
+        onAttempt?.(providerEntryLabel(provider), attempts, routeLabels);
         const details = await performProviderSearch(provider, request, signal);
         attempts.push(attemptFromDetails(details));
         if (details.error) {
@@ -286,7 +290,7 @@ export async function performSearch(config, request, signal, routingState, onAtt
         durationMs: Date.now() - startedAt,
         strategy: config.strategy,
         attempts,
-        error: `All configured search providers failed: ${attempts.map((attempt) => `${entryLabel(attempt)} ${attempt.error ?? "failed"}`).join("; ")}`,
+        error: `All configured search providers failed: ${attempts.map((attempt) => `${providerEntryLabel(attempt)} ${attempt.error ?? "failed"}`).join("; ")}`,
     };
 }
 export function formatSearchText(details) {
@@ -295,12 +299,12 @@ export function formatSearchText(details) {
     if (details.results.length === 0)
         return `No web search results found for "${details.query}".`;
     const route = details.strategy
-        ? ` via ${details.entryId ? `${details.provider}/${details.entryId}` : details.provider} (${details.strategy})`
+        ? ` via ${providerEntryLabel(details)} (${details.strategy})`
         : ` via ${details.provider}`;
     const lines = [`Web search results for "${details.query}"${route}:`, ""];
     if (details.attempts && details.attempts.length > 0) {
         lines.push(`Routing attempts: ${details.attempts
-            .map((attempt) => `${entryLabel(attempt)} ${attempt.error ? `failed: ${attempt.error}` : `${attempt.resultsCount} result${attempt.resultsCount === 1 ? "" : "s"}`}`)
+            .map((attempt) => `${providerEntryLabel(attempt)} ${attempt.error ? `failed: ${attempt.error}` : `${attempt.resultsCount} result${attempt.resultsCount === 1 ? "" : "s"}`}`)
             .join(" -> ")}`, "");
     }
     for (const [index, item] of details.results.entries()) {

package/dist/core/extensions/builtin/websearch/websearch/search.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/websearch/websearch/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAW7E,MAAM,uBAAuB,GAAG,GAAG,CAAC;AACpC,MAAM,2BAA2B,GAAG,MAAM,CAAC;AAE3C,SAAS,YAAY,CAAC,KAAc;IACnC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC7E,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,GAAW;IAC3C,OAAO,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;AACnE,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAgB,EAAE,QAAgB;IAC7D,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,MAAM,GAAG,GAAG,OAAO,CAAC;QACpB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;QACxB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,QAAQ,CAAC,KAAK,EAAE,uBAAuB,CAAC,CAAC;QACnG,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YAC9B,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;gBAAE,OAAO,QAAQ,CAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC;QAC1G,CAAC;QACD,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC5B,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,QAAQ,CAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC;IAC1G,CAAC;IACD,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;IAChC,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IACxB,OAAO,QAAQ,CAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAc,EAAE,OAAgB,EAAE,QAAgB;IAC3E,MAAM,MAAM,GAAG,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACrD,OAAO,MAAM,CAAC,CAAC,CAAC,2BAA2B,MAAM,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,2BAA2B,MAAM,EAAE,CAAC;AACtG,CAAC;AAED,SAAS,WAAW,CAAC,MAAmB;IACvC,OAAO,MAAM,CAAC,MAAM,IAAI,IAAI,YAAY,CAAC,4BAA4B,EAAE,YAAY,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,YAAY,CAAC,MAA2B;IAChD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,IAAI,2BAA2B,CAAC,CAAC,CAAC;AACjF,CAAC;AAED,SAAS,sBAAsB,CAAC,SAAiB;IAChD,OAAO,0BAA0B,SAAS,IAAI,CAAC;AAChD,CAAC;AAED,SAAS,iBAAiB,CACzB,WAAoC,EACpC,SAAiB;IAEjB,IAAI,WAAW,EAAE,OAAO;QAAE,MAAM,WAAW,CAAC,WAAW,CAAC,CAAC;IAEzD,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;QAC/B,UAAU,CAAC,KAAK,CAAC,IAAI,YAAY,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;IACvF,CAAC,EAAE,SAAS,CAAC,CAAC;IACd,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC3F,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAEhE,OAAO;QACN,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,OAAO,EAAE,GAAG,EAAE;YACb,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,WAAW,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACpD,CAAC;KACD,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,MAA2B,EAAE,OAAsB;IAC5E,OAAO,mBAAmB,UAAU,CAAC,MAAM,CAAC,6BAA6B,OAAO,CAAC,KAAK,IAAI,CAAC;AAC5F,CAAC;AAOD,MAAM,UAAU,wBAAwB,CAAC,aAAqB;IAC7D,OAAO,EAAE,gBAAgB,EAAE,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AAC/F,CAAC;AAED,SAAS,UAAU,CAAC,KAAmE;IACtF,IAAI,SAAS,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO;QAAE,OAAO,GAAG,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;IACrF,IAAI,IAAI,IAAI,KAAK,IAAI,KAAK,CAAC,EAAE;QAAE,OAAO,GAAG,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC;IACtE,OAAO,KAAK,CAAC,QAAQ,CAAC;AACvB,CAAC;AAED,SAAS,qBAAqB,CAAC,SAAgC;IAC9D,OAAO,SAAS;SACd,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,KAAK,EAAE,CAAC,CAAC;SAC3E,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;SACjF,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,eAAe,CAAC,SAAgC;IACxD,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;QACrD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7D,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,EAAE,KAAK,IAAI,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;AAClF,CAAC;AAED,SAAS,YAAY,CAAC,OAAiB,EAAE,KAAa,EAAE,aAAqB;IAC5E,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,EAAE,CAAC;QAC3D,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACtE,CAAC;IACD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,aAAa,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACvD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAS,WAAW,CAAC,QAAyB,EAAE,SAAgC,EAAE,KAAyB;IAC1G,IAAI,QAAQ,KAAK,UAAU;QAAE,OAAO,qBAAqB,CAAC,SAAS,CAAC,CAAC;IACrE,IAAI,QAAQ,KAAK,aAAa,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,gBAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;QAC/F,KAAK,CAAC,gBAAgB,GAAG,CAAC,KAAK,CAAC,gBAAgB,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;QACvE,OAAO,KAAK,CAAC;IACd,CAAC;IAED,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,IAAI,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAChD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAC1D,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,KAAK,GAAG,aAAa,EAAE,CAAC;YAC3B,QAAQ,GAAG,KAAK,CAAC;YACjB,aAAa,GAAG,KAAK,CAAC;QACvB,CAAC;IACF,CAAC;IACD,OAAO,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC;AACxG,CAAC;AAED,KAAK,UAAU,qBAAqB,CACnC,MAA2B,EAC3B,OAAsB,EACtB,MAAoB;IAEpB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,KAAK,GAAG,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACnD,IAAI,QAAkB,CAAC;IACvB,IAAI,CAAC;QACJ,MAAM,IAAI,GAAgB;YACzB,GAAG,KAAK,CAAC,IAAI;YACb,MAAM,EAAE,KAAK,CAAC,MAAM;SACpB,CAAC;QACF,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;YAAE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrE,QAAQ,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,IAAI,MAAM,EAAE,OAAO;YAAE,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAkB;YAC9B,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;YAClC,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAuB;SACvE,CAAC;QACF,IAAI,MAAM,CAAC,EAAE,KAAK,SAAS;YAAE,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC;QACzD,OAAO,OAAO,CAAC;IAChB,CAAC;IAED,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,IAAI,CAAC;QACJ,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,IAAI,MAAM,EAAE,OAAO;YAAE,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAkB;YAC9B,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;YAClC,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,6BAA6B;SAC7E,CAAC;QACF,IAAI,MAAM,CAAC,EAAE,KAAK,SAAS;YAAE,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC;QACzD,OAAO,OAAO,CAAC;IAChB,CAAC;YAAS,CAAC;QACV,KAAK,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IACD,IAAI,OAAO,GAAY,EAAE,CAAC;IAC1B,IAAI,MAAM,CAAC,QAAQ,KAAK,iBAAiB,EAAE,CAAC;QAC3C,OAAO,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC9B,CAAC;SAAM,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,IAAI,CAAC;YACJ,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;QAAC,MAAM,CAAC;YACR,OAAO,GAAG,EAAE,CAAC;QACd,CAAC;IACF,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QAClB,MAAM,OAAO,GAAkB;YAC9B,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;YAClC,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;SAC3D,CAAC;QACF,IAAI,MAAM,CAAC,EAAE,KAAK,SAAS;YAAE,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC;QACzD,OAAO,OAAO,CAAC;IAChB,CAAC;IAED,MAAM,OAAO,GAAG,uBAAuB,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAClE,MAAM,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAC/B,MAAM,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAkB;QAC9B,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,OAAO,EAAE,cAAc;QACvB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;QAClC,SAAS,EAAE,OAAO,CAAC,MAAM,GAAG,GAAG;KAC/B,CAAC;IACF,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,KAAK,GAAG,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnF,IAAI,MAAM,CAAC,EAAE,KAAK,SAAS;QAAE,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC;IACzD,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAsB;IACjD,MAAM,OAAO,GAAkB;QAC9B,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,YAAY,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM;KACpC,CAAC;IACF,IAAI,OAAO,CAAC,OAAO;QAAE,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IACvD,IAAI,OAAO,CAAC,KAAK;QAAE,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IACjD,OAAO,OAAO,CAAC;AAChB,CAAC;AAID,MAAM,CAAC,KAAK,UAAU,aAAa,CAClC,MAAuB,EACvB,OAAsB,EACtB,MAAoB,EACpB,YAAiC,EACjC,SAAiC;IAEjC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,KAAK,GAAG,YAAY,IAAI,wBAAwB,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAChF,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAoB,EAAE,CAAC;IACrC,MAAM,SAAS,GAAG,IAAI,GAAG,EAA4C,CAAC;IACtE,IAAI,eAA0C,CAAC;IAE/C,KAAK,MAAM,KAAK,IAAI,KAAK,EAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ;YAAE,SAAS;QACxB,SAAS,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,qBAAqB,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACvE,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;QAE3C,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YACnB,IAAI,CAAC,MAAM,CAAC,QAAQ;gBAAE,OAAO,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC;YACjF,eAAe,GAAG,OAAO,CAAC;YAC1B,SAAS;QACV,CAAC;QAED,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QAEnE,IAAI,MAAM,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;YACtC,OAAO,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC;QAC5D,CAAC;QAED,eAAe,GAAG,OAAO,CAAC;QAC1B,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpC,IAAI,SAAS,CAAC,IAAI,IAAI,OAAO,CAAC,UAAU;gBAAE,MAAM;YAChD,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC/B,CAAC;QACD,IAAI,SAAS,CAAC,IAAI,IAAI,OAAO,CAAC,UAAU;YAAE,MAAM;IACjD,CAAC;IAED,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,IAAI,eAAe,EAAE,CAAC;QAC3C,MAAM,OAAO,GAAG,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QACxC,MAAM,OAAO,GAAkB;YAC9B,QAAQ,EAAE,eAAe,CAAC,QAAQ;YAClC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,OAAO;YACP,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;YAClC,SAAS,EAAE,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,UAAU;YAC/C,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,QAAQ;SACR,CAAC;QACF,IAAI,eAAe,CAAC,OAAO,KAAK,SAAS;YAAE,OAAO,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;QACrF,OAAO,OAAO,CAAC;IAChB,CAAC;IAED,MAAM,MAAM,GAAG,eAAe,IAAI;QACjC,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,IAAI,KAAK;QAChD,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,OAAO,EAAE,EAAE;QACX,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;QAClC,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE,yCAAyC;KAChD,CAAC;IACF,OAAO;QACN,GAAG,MAAM;QACT,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;QAClC,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ;QACR,KAAK,EAAE,2CAA2C,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,KAAK,IAAI,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;KAC/I,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAsB;IACtD,IAAI,OAAO,CAAC,KAAK;QAAE,OAAO,OAAO,CAAC,KAAK,CAAC;IACxC,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,oCAAoC,OAAO,CAAC,KAAK,IAAI,CAAC;IAE/F,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ;QAC7B,CAAC,CAAC,QAAQ,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ,GAAG;QAC/G,CAAC,CAAC,QAAQ,OAAO,CAAC,QAAQ,EAAE,CAAC;IAC9B,MAAM,KAAK,GAAG,CAAC,2BAA2B,OAAO,CAAC,KAAK,IAAI,KAAK,GAAG,EAAE,EAAE,CAAC,CAAC;IACzE,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrD,KAAK,CAAC,IAAI,CACT,qBAAqB,OAAO,CAAC,QAAQ;aACnC,GAAG,CACH,CAAC,OAAO,EAAE,EAAE,CACX,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,UAAU,OAAO,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAClJ;aACA,IAAI,CAAC,MAAM,CAAC,EAAE,EAChB,EAAE,CACF,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;QACvD,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1C,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAC7B,IAAI,IAAI,CAAC,OAAO;YAAE,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACpD,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,6EAA6E,CAAC,CAAC;IAC9F,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC","sourcesContent":["import { buildSearchRequest, normalizeSearchResponse } from \"./providers.ts\";\nimport type {\n\tJsonObject,\n\tRoutingStrategy,\n\tSearchAttempt,\n\tSearchDetails,\n\tSearchProviderEntry,\n\tSearchRequest,\n\tWebsearchConfig,\n} from \"./types.ts\";\n\nconst MAX_ERROR_DETAIL_LENGTH = 500;\nconst DEFAULT_PROVIDER_TIMEOUT_MS = 60_000;\n\nfunction isJsonObject(value: unknown): value is JsonObject {\n\treturn typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\nfunction truncate(value: string, max: number): string {\n\treturn value.length > max ? `${value.slice(0, max - 1)}…` : value;\n}\n\nfunction extractErrorDetail(payload: unknown, bodyText: string): string {\n\tif (isJsonObject(payload)) {\n\t\tconst obj = payload;\n\t\tconst error = obj.error;\n\t\tif (typeof error === \"string\" && error.length > 0) return truncate(error, MAX_ERROR_DETAIL_LENGTH);\n\t\tif (isJsonObject(error)) {\n\t\t\tconst message = error.message;\n\t\t\tif (typeof message === \"string\" && message.length > 0) return truncate(message, MAX_ERROR_DETAIL_LENGTH);\n\t\t}\n\t\tconst message = obj.message;\n\t\tif (typeof message === \"string\" && message.length > 0) return truncate(message, MAX_ERROR_DETAIL_LENGTH);\n\t}\n\tconst trimmed = bodyText.trim();\n\tif (!trimmed) return \"\";\n\treturn truncate(trimmed, MAX_ERROR_DETAIL_LENGTH);\n}\n\nfunction httpErrorMessage(status: number, payload: unknown, bodyText: string): string {\n\tconst detail = extractErrorDetail(payload, bodyText);\n\treturn detail ? `Search failed with HTTP ${status}: ${detail}` : `Search failed with HTTP ${status}`;\n}\n\nfunction abortReason(signal: AbortSignal): unknown {\n\treturn signal.reason ?? new DOMException(\"The operation was aborted.\", \"AbortError\");\n}\n\nfunction timeoutMsFor(config: SearchProviderEntry): number {\n\treturn Math.max(1, Math.trunc(config.timeoutMs ?? DEFAULT_PROVIDER_TIMEOUT_MS));\n}\n\nfunction providerTimeoutMessage(timeoutMs: number): string {\n\treturn `Search timed out after ${timeoutMs}ms`;\n}\n\nfunction searchAbortSignal(\n\touterSignal: AbortSignal \| undefined,\n\ttimeoutMs: number,\n): { signal: AbortSignal; cleanup: () => void } {\n\tif (outerSignal?.aborted) throw abortReason(outerSignal);\n\n\tconst controller = new AbortController();\n\tconst timeout = setTimeout(() => {\n\t\tcontroller.abort(new DOMException(providerTimeoutMessage(timeoutMs), \"TimeoutError\"));\n\t}, timeoutMs);\n\tconst onAbort = () => controller.abort(outerSignal ? abortReason(outerSignal) : undefined);\n\touterSignal?.addEventListener(\"abort\", onAbort, { once: true });\n\n\treturn {\n\t\tsignal: controller.signal,\n\t\tcleanup: () => {\n\t\t\tclearTimeout(timeout);\n\t\t\touterSignal?.removeEventListener(\"abort\", onAbort);\n\t\t},\n\t};\n}\n\nfunction noResultsMessage(config: SearchProviderEntry, request: SearchRequest): string {\n\treturn `Search provider ${entryLabel(config)} returned no results for \"${request.query}\".`;\n}\n\nexport interface SearchRoutingState {\n\troundRobinCursor: number;\n\tsuccessCounts: number[];\n}\n\nexport function createSearchRoutingState(providerCount: number): SearchRoutingState {\n\treturn { roundRobinCursor: 0, successCounts: Array.from({ length: providerCount }, () => 0) };\n}\n\nfunction entryLabel(entry: Pick<SearchProviderEntry, \"provider\" \| \"id\"> \| SearchAttempt): string {\n\tif (\"entryId\" in entry && entry.entryId) return `${entry.provider}/${entry.entryId}`;\n\tif (\"id\" in entry && entry.id) return `${entry.provider}/${entry.id}`;\n\treturn entry.provider;\n}\n\nfunction sortedPriorityIndices(providers: SearchProviderEntry[]): number[] {\n\treturn providers\n\t\t.map((provider, index) => ({ index, priority: provider.priority ?? index }))\n\t\t.sort((left, right) => left.priority - right.priority \|\| left.index - right.index)\n\t\t.map((item) => item.index);\n}\n\nfunction weightedIndices(providers: SearchProviderEntry[]): number[] {\n\tconst indices: number[] = [];\n\tfor (const [index, provider] of providers.entries()) {\n\t\tconst weight = Math.max(1, Math.trunc(provider.weight ?? 1));\n\t\tfor (let count = 0; count < weight; count += 1) indices.push(index);\n\t}\n\treturn indices.length > 0 ? indices : providers.map((_provider, index) => index);\n}\n\nfunction rotateUnique(indices: number[], start: number, providerCount: number): number[] {\n\tconst order: number[] = [];\n\tfor (let offset = 0; offset < indices.length; offset += 1) {\n\t\tconst index = indices[(start + offset) % indices.length];\n\t\tif (index !== undefined && !order.includes(index)) order.push(index);\n\t}\n\tfor (let index = 0; index < providerCount; index += 1) {\n\t\tif (!order.includes(index)) order.push(index);\n\t}\n\treturn order;\n}\n\nfunction selectOrder(strategy: RoutingStrategy, providers: SearchProviderEntry[], state: SearchRoutingState): number[] {\n\tif (strategy === \"priority\") return sortedPriorityIndices(providers);\n\tif (strategy === \"round-robin\") {\n\t\tconst indices = weightedIndices(providers);\n\t\tconst order = rotateUnique(indices, state.roundRobinCursor % indices.length, providers.length);\n\t\tstate.roundRobinCursor = (state.roundRobinCursor + 1) % indices.length;\n\t\treturn order;\n\t}\n\n\tlet selected = 0;\n\tlet selectedCount = state.successCounts[0] ?? 0;\n\tfor (let index = 1; index < providers.length; index += 1) {\n\t\tconst count = state.successCounts[index] ?? 0;\n\t\tif (count < selectedCount) {\n\t\t\tselected = index;\n\t\t\tselectedCount = count;\n\t\t}\n\t}\n\treturn [selected, ...providers.map((_provider, index) => index).filter((index) => index !== selected)];\n}\n\nasync function performProviderSearch(\n\tconfig: SearchProviderEntry,\n\trequest: SearchRequest,\n\tsignal?: AbortSignal,\n): Promise<SearchDetails> {\n\tconst startedAt = Date.now();\n\tconst built = buildSearchRequest(config, request);\n\tconst timeoutMs = timeoutMsFor(config);\n\tconst abort = searchAbortSignal(signal, timeoutMs);\n\tlet response: Response;\n\ttry {\n\t\tconst init: RequestInit = {\n\t\t\t...built.init,\n\t\t\tsignal: abort.signal,\n\t\t};\n\t\tif (built.body !== undefined) init.body = JSON.stringify(built.body);\n\t\tresponse = await fetch(built.url, init);\n\t} catch (error) {\n\t\tabort.cleanup();\n\t\tif (signal?.aborted) throw abortReason(signal);\n\t\tconst details: SearchDetails = {\n\t\t\tprovider: config.provider,\n\t\t\tquery: request.query,\n\t\t\tresults: [],\n\t\t\tdurationMs: Date.now() - startedAt,\n\t\t\ttruncated: false,\n\t\t\terror: error instanceof Error ? error.message : \"Search request failed\",\n\t\t};\n\t\tif (config.id !== undefined) details.entryId = config.id;\n\t\treturn details;\n\t}\n\n\tlet bodyText = \"\";\n\ttry {\n\t\tbodyText = await response.text();\n\t} catch (error) {\n\t\tabort.cleanup();\n\t\tif (signal?.aborted) throw abortReason(signal);\n\t\tconst details: SearchDetails = {\n\t\t\tprovider: config.provider,\n\t\t\tquery: request.query,\n\t\t\tresults: [],\n\t\t\tdurationMs: Date.now() - startedAt,\n\t\t\ttruncated: false,\n\t\t\terror: error instanceof Error ? error.message : \"Search response read failed\",\n\t\t};\n\t\tif (config.id !== undefined) details.entryId = config.id;\n\t\treturn details;\n\t} finally {\n\t\tabort.cleanup();\n\t}\n\tlet payload: unknown = {};\n\tif (config.provider === \"duckduckgo-html\") {\n\t\tpayload = { html: bodyText };\n\t} else if (bodyText.length > 0) {\n\t\ttry {\n\t\t\tpayload = JSON.parse(bodyText);\n\t\t} catch {\n\t\t\tpayload = {};\n\t\t}\n\t}\n\tif (!response.ok) {\n\t\tconst details: SearchDetails = {\n\t\t\tprovider: config.provider,\n\t\t\tquery: request.query,\n\t\t\tresults: [],\n\t\t\tdurationMs: Date.now() - startedAt,\n\t\t\ttruncated: false,\n\t\t\terror: httpErrorMessage(response.status, payload, bodyText),\n\t\t};\n\t\tif (config.id !== undefined) details.entryId = config.id;\n\t\treturn details;\n\t}\n\n\tconst results = normalizeSearchResponse(config.provider, payload);\n\tconst max = request.maxResults;\n\tconst limitedResults = results.slice(0, max);\n\tconst details: SearchDetails = {\n\t\tprovider: config.provider,\n\t\tquery: request.query,\n\t\tresults: limitedResults,\n\t\tdurationMs: Date.now() - startedAt,\n\t\ttruncated: results.length > max,\n\t};\n\tif (limitedResults.length === 0) details.error = noResultsMessage(config, request);\n\tif (config.id !== undefined) details.entryId = config.id;\n\treturn details;\n}\n\nfunction attemptFromDetails(details: SearchDetails): SearchAttempt {\n\tconst attempt: SearchAttempt = {\n\t\tprovider: details.provider,\n\t\tdurationMs: details.durationMs,\n\t\tresultsCount: details.results.length,\n\t};\n\tif (details.entryId) attempt.entryId = details.entryId;\n\tif (details.error) attempt.error = details.error;\n\treturn attempt;\n}\n\nexport type SearchAttemptListener = (providerLabel: string, attempts: readonly SearchAttempt[]) => void;\n\nexport async function performSearch(\n\tconfig: WebsearchConfig,\n\trequest: SearchRequest,\n\tsignal?: AbortSignal,\n\troutingState?: SearchRoutingState,\n\tonAttempt?: SearchAttemptListener,\n): Promise<SearchDetails> {\n\tconst startedAt = Date.now();\n\tconst state = routingState ?? createSearchRoutingState(config.providers.length);\n\tconst order = selectOrder(config.strategy, config.providers, state);\n\tconst attempts: SearchAttempt[] = [];\n\tconst collected = new Map<string, SearchDetails[\"results\"][number]>();\n\tlet selectedDetails: SearchDetails \| undefined;\n\n\tfor (const index of order) {\n\t\tconst provider = config.providers[index];\n\t\tif (!provider) continue;\n\t\tonAttempt?.(entryLabel(provider), attempts);\n\t\tconst details = await performProviderSearch(provider, request, signal);\n\t\tattempts.push(attemptFromDetails(details));\n\n\t\tif (details.error) {\n\t\t\tif (!config.fallback) return { ...details, strategy: config.strategy, attempts };\n\t\t\tselectedDetails = details;\n\t\t\tcontinue;\n\t\t}\n\n\t\tstate.successCounts[index] = (state.successCounts[index] ?? 0) + 1;\n\n\t\tif (config.strategy !== \"fill-first\") {\n\t\t\treturn { ...details, strategy: config.strategy, attempts };\n\t\t}\n\n\t\tselectedDetails = details;\n\t\tfor (const item of details.results) {\n\t\t\tif (collected.size >= request.maxResults) break;\n\t\t\tcollected.set(item.url, item);\n\t\t}\n\t\tif (collected.size >= request.maxResults) break;\n\t}\n\n\tif (collected.size > 0 && selectedDetails) {\n\t\tconst results = [...collected.values()];\n\t\tconst details: SearchDetails = {\n\t\t\tprovider: selectedDetails.provider,\n\t\t\tquery: request.query,\n\t\t\tresults,\n\t\t\tdurationMs: Date.now() - startedAt,\n\t\t\ttruncated: results.length >= request.maxResults,\n\t\t\tstrategy: config.strategy,\n\t\t\tattempts,\n\t\t};\n\t\tif (selectedDetails.entryId !== undefined) details.entryId = selectedDetails.entryId;\n\t\treturn details;\n\t}\n\n\tconst failed = selectedDetails ?? {\n\t\tprovider: config.providers[0]?.provider ?? \"exa\",\n\t\tquery: request.query,\n\t\tresults: [],\n\t\tdurationMs: Date.now() - startedAt,\n\t\ttruncated: false,\n\t\terror: \"All configured search providers failed.\",\n\t};\n\treturn {\n\t\t...failed,\n\t\tdurationMs: Date.now() - startedAt,\n\t\tstrategy: config.strategy,\n\t\tattempts,\n\t\terror: `All configured search providers failed: ${attempts.map((attempt) => `${entryLabel(attempt)} ${attempt.error ?? \"failed\"}`).join(\"; \")}`,\n\t};\n}\n\nexport function formatSearchText(details: SearchDetails): string {\n\tif (details.error) return details.error;\n\tif (details.results.length === 0) return `No web search results found for \"${details.query}\".`;\n\n\tconst route = details.strategy\n\t\t? ` via ${details.entryId ? `${details.provider}/${details.entryId}` : details.provider} (${details.strategy})`\n\t\t: ` via ${details.provider}`;\n\tconst lines = [`Web search results for \"${details.query}\"${route}:`, \"\"];\n\tif (details.attempts && details.attempts.length > 0) {\n\t\tlines.push(\n\t\t\t`Routing attempts: ${details.attempts\n\t\t\t\t.map(\n\t\t\t\t\t(attempt) =>\n\t\t\t\t\t\t`${entryLabel(attempt)} ${attempt.error ? `failed: ${attempt.error}` : `${attempt.resultsCount} result${attempt.resultsCount === 1 ? \"\" : \"s\"}`}`,\n\t\t\t\t)\n\t\t\t\t.join(\" -> \")}`,\n\t\t\t\"\",\n\t\t);\n\t}\n\tfor (const [index, item] of details.results.entries()) {\n\t\tlines.push(`${index + 1}. ${item.title}`);\n\t\tlines.push(` ${item.url}`);\n\t\tif (item.snippet) lines.push(` ${item.snippet}`);\n\t}\n\tlines.push(\"\", \"REMINDER: Include relevant sources from the URLs above in the final answer.\");\n\treturn lines.join(\"\\n\");\n}\n"]}
1	+ {"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/websearch/websearch/search.ts"],"names":[],"mappings":"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","sourcesContent":["import { buildSearchRequest, normalizeSearchResponse } from \"./providers.ts\";\nimport type {\n\tJsonObject,\n\tRoutingStrategy,\n\tSearchAttempt,\n\tSearchDetails,\n\tSearchProviderEntry,\n\tSearchRequest,\n\tWebsearchConfig,\n} from \"./types.ts\";\n\nconst MAX_ERROR_DETAIL_LENGTH = 500;\nconst DEFAULT_PROVIDER_TIMEOUT_MS = 60_000;\n\nfunction isJsonObject(value: unknown): value is JsonObject {\n\treturn typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\nfunction truncate(value: string, max: number): string {\n\treturn value.length > max ? `${value.slice(0, max - 1)}…` : value;\n}\n\nfunction extractErrorDetail(payload: unknown, bodyText: string): string {\n\tif (isJsonObject(payload)) {\n\t\tconst obj = payload;\n\t\tconst error = obj.error;\n\t\tif (typeof error === \"string\" && error.length > 0) return truncate(error, MAX_ERROR_DETAIL_LENGTH);\n\t\tif (isJsonObject(error)) {\n\t\t\tconst message = error.message;\n\t\t\tif (typeof message === \"string\" && message.length > 0) return truncate(message, MAX_ERROR_DETAIL_LENGTH);\n\t\t}\n\t\tconst message = obj.message;\n\t\tif (typeof message === \"string\" && message.length > 0) return truncate(message, MAX_ERROR_DETAIL_LENGTH);\n\t}\n\tconst trimmed = bodyText.trim();\n\tif (!trimmed) return \"\";\n\treturn truncate(trimmed, MAX_ERROR_DETAIL_LENGTH);\n}\n\nfunction httpErrorMessage(status: number, payload: unknown, bodyText: string): string {\n\tconst detail = extractErrorDetail(payload, bodyText);\n\treturn detail ? `Search failed with HTTP ${status}: ${detail}` : `Search failed with HTTP ${status}`;\n}\n\nfunction abortReason(signal: AbortSignal): unknown {\n\treturn signal.reason ?? new DOMException(\"The operation was aborted.\", \"AbortError\");\n}\n\nfunction timeoutMsFor(config: SearchProviderEntry): number {\n\treturn Math.max(1, Math.trunc(config.timeoutMs ?? DEFAULT_PROVIDER_TIMEOUT_MS));\n}\n\nfunction providerTimeoutMessage(timeoutMs: number): string {\n\treturn `Search timed out after ${timeoutMs}ms`;\n}\n\nfunction searchAbortSignal(\n\touterSignal: AbortSignal \| undefined,\n\ttimeoutMs: number,\n): { signal: AbortSignal; cleanup: () => void } {\n\tif (outerSignal?.aborted) throw abortReason(outerSignal);\n\n\tconst controller = new AbortController();\n\tconst timeout = setTimeout(() => {\n\t\tcontroller.abort(new DOMException(providerTimeoutMessage(timeoutMs), \"TimeoutError\"));\n\t}, timeoutMs);\n\tconst onAbort = () => controller.abort(outerSignal ? abortReason(outerSignal) : undefined);\n\touterSignal?.addEventListener(\"abort\", onAbort, { once: true });\n\n\treturn {\n\t\tsignal: controller.signal,\n\t\tcleanup: () => {\n\t\t\tclearTimeout(timeout);\n\t\t\touterSignal?.removeEventListener(\"abort\", onAbort);\n\t\t},\n\t};\n}\n\nfunction noResultsMessage(config: SearchProviderEntry, request: SearchRequest): string {\n\treturn `Search provider ${providerEntryLabel(config)} returned no results for \"${request.query}\".`;\n}\n\nexport interface SearchRoutingState {\n\troundRobinCursor: number;\n\tsuccessCounts: number[];\n}\n\nexport function createSearchRoutingState(providerCount: number): SearchRoutingState {\n\treturn { roundRobinCursor: 0, successCounts: Array.from({ length: providerCount }, () => 0) };\n}\n\nexport function providerEntryLabel(entry: {\n\treadonly provider: string;\n\treadonly id?: string;\n\treadonly entryId?: string;\n}): string {\n\tconst id = entry.entryId ?? entry.id;\n\tif (!id \|\| id === entry.provider) return entry.provider;\n\tconst nativePrefix = `native-${entry.provider}-`;\n\treturn `${entry.provider}/${id.startsWith(nativePrefix) ? \"native\" : id}`;\n}\n\nfunction sortedPriorityIndices(providers: SearchProviderEntry[]): number[] {\n\treturn providers\n\t\t.map((provider, index) => ({ index, priority: provider.priority ?? index }))\n\t\t.sort((left, right) => left.priority - right.priority \|\| left.index - right.index)\n\t\t.map((item) => item.index);\n}\n\nfunction weightedIndices(providers: SearchProviderEntry[]): number[] {\n\tconst indices: number[] = [];\n\tfor (const [index, provider] of providers.entries()) {\n\t\tconst weight = Math.max(1, Math.trunc(provider.weight ?? 1));\n\t\tfor (let count = 0; count < weight; count += 1) indices.push(index);\n\t}\n\treturn indices.length > 0 ? indices : providers.map((_provider, index) => index);\n}\n\nfunction rotateUnique(indices: number[], start: number, providerCount: number): number[] {\n\tconst order: number[] = [];\n\tfor (let offset = 0; offset < indices.length; offset += 1) {\n\t\tconst index = indices[(start + offset) % indices.length];\n\t\tif (index !== undefined && !order.includes(index)) order.push(index);\n\t}\n\tfor (let index = 0; index < providerCount; index += 1) {\n\t\tif (!order.includes(index)) order.push(index);\n\t}\n\treturn order;\n}\n\nfunction selectOrder(strategy: RoutingStrategy, providers: SearchProviderEntry[], state: SearchRoutingState): number[] {\n\tif (strategy === \"priority\") return sortedPriorityIndices(providers);\n\tif (strategy === \"round-robin\") {\n\t\tconst indices = weightedIndices(providers);\n\t\tconst order = rotateUnique(indices, state.roundRobinCursor % indices.length, providers.length);\n\t\tstate.roundRobinCursor = (state.roundRobinCursor + 1) % indices.length;\n\t\treturn order;\n\t}\n\n\tlet selected = 0;\n\tlet selectedCount = state.successCounts[0] ?? 0;\n\tfor (let index = 1; index < providers.length; index += 1) {\n\t\tconst count = state.successCounts[index] ?? 0;\n\t\tif (count < selectedCount) {\n\t\t\tselected = index;\n\t\t\tselectedCount = count;\n\t\t}\n\t}\n\treturn [selected, ...providers.map((_provider, index) => index).filter((index) => index !== selected)];\n}\n\nasync function performProviderSearch(\n\tconfig: SearchProviderEntry,\n\trequest: SearchRequest,\n\tsignal?: AbortSignal,\n): Promise<SearchDetails> {\n\tconst startedAt = Date.now();\n\tconst built = buildSearchRequest(config, request);\n\tconst timeoutMs = timeoutMsFor(config);\n\tconst abort = searchAbortSignal(signal, timeoutMs);\n\tlet response: Response;\n\ttry {\n\t\tconst init: RequestInit = {\n\t\t\t...built.init,\n\t\t\tsignal: abort.signal,\n\t\t};\n\t\tif (built.body !== undefined) init.body = JSON.stringify(built.body);\n\t\tresponse = await fetch(built.url, init);\n\t} catch (error) {\n\t\tabort.cleanup();\n\t\tif (signal?.aborted) throw abortReason(signal);\n\t\tconst details: SearchDetails = {\n\t\t\tprovider: config.provider,\n\t\t\tquery: request.query,\n\t\t\tresults: [],\n\t\t\tdurationMs: Date.now() - startedAt,\n\t\t\ttruncated: false,\n\t\t\terror: error instanceof Error ? error.message : \"Search request failed\",\n\t\t};\n\t\tif (config.id !== undefined) details.entryId = config.id;\n\t\treturn details;\n\t}\n\n\tlet bodyText = \"\";\n\ttry {\n\t\tbodyText = await response.text();\n\t} catch (error) {\n\t\tabort.cleanup();\n\t\tif (signal?.aborted) throw abortReason(signal);\n\t\tconst details: SearchDetails = {\n\t\t\tprovider: config.provider,\n\t\t\tquery: request.query,\n\t\t\tresults: [],\n\t\t\tdurationMs: Date.now() - startedAt,\n\t\t\ttruncated: false,\n\t\t\terror: error instanceof Error ? error.message : \"Search response read failed\",\n\t\t};\n\t\tif (config.id !== undefined) details.entryId = config.id;\n\t\treturn details;\n\t} finally {\n\t\tabort.cleanup();\n\t}\n\tlet payload: unknown = {};\n\tif (config.provider === \"duckduckgo-html\") {\n\t\tpayload = { html: bodyText };\n\t} else if (bodyText.length > 0) {\n\t\ttry {\n\t\t\tpayload = JSON.parse(bodyText);\n\t\t} catch {\n\t\t\tpayload = {};\n\t\t}\n\t}\n\tif (!response.ok) {\n\t\tconst details: SearchDetails = {\n\t\t\tprovider: config.provider,\n\t\t\tquery: request.query,\n\t\t\tresults: [],\n\t\t\tdurationMs: Date.now() - startedAt,\n\t\t\ttruncated: false,\n\t\t\terror: httpErrorMessage(response.status, payload, bodyText),\n\t\t};\n\t\tif (config.id !== undefined) details.entryId = config.id;\n\t\treturn details;\n\t}\n\n\tconst results = normalizeSearchResponse(config.provider, payload);\n\tconst max = request.maxResults;\n\tconst limitedResults = results.slice(0, max);\n\tconst details: SearchDetails = {\n\t\tprovider: config.provider,\n\t\tquery: request.query,\n\t\tresults: limitedResults,\n\t\tdurationMs: Date.now() - startedAt,\n\t\ttruncated: results.length > max,\n\t};\n\tif (limitedResults.length === 0) details.error = noResultsMessage(config, request);\n\tif (config.id !== undefined) details.entryId = config.id;\n\treturn details;\n}\n\nfunction attemptFromDetails(details: SearchDetails): SearchAttempt {\n\tconst attempt: SearchAttempt = {\n\t\tprovider: details.provider,\n\t\tdurationMs: details.durationMs,\n\t\tresultsCount: details.results.length,\n\t};\n\tif (details.entryId) attempt.entryId = details.entryId;\n\tif (details.error) attempt.error = details.error;\n\treturn attempt;\n}\n\nexport type SearchAttemptListener = (\n\tproviderLabel: string,\n\tattempts: readonly SearchAttempt[],\n\trouteLabels: readonly string[],\n) => void;\n\nexport async function performSearch(\n\tconfig: WebsearchConfig,\n\trequest: SearchRequest,\n\tsignal?: AbortSignal,\n\troutingState?: SearchRoutingState,\n\tonAttempt?: SearchAttemptListener,\n): Promise<SearchDetails> {\n\tconst startedAt = Date.now();\n\tconst state = routingState ?? createSearchRoutingState(config.providers.length);\n\tconst order = selectOrder(config.strategy, config.providers, state);\n\tconst attempts: SearchAttempt[] = [];\n\tconst routeLabels = order.flatMap((index) => {\n\t\tconst provider = config.providers[index];\n\t\treturn provider ? [providerEntryLabel(provider)] : [];\n\t});\n\tconst collected = new Map<string, SearchDetails[\"results\"][number]>();\n\tlet selectedDetails: SearchDetails \| undefined;\n\n\tfor (const index of order) {\n\t\tconst provider = config.providers[index];\n\t\tif (!provider) continue;\n\t\tonAttempt?.(providerEntryLabel(provider), attempts, routeLabels);\n\t\tconst details = await performProviderSearch(provider, request, signal);\n\t\tattempts.push(attemptFromDetails(details));\n\n\t\tif (details.error) {\n\t\t\tif (!config.fallback) return { ...details, strategy: config.strategy, attempts };\n\t\t\tselectedDetails = details;\n\t\t\tcontinue;\n\t\t}\n\n\t\tstate.successCounts[index] = (state.successCounts[index] ?? 0) + 1;\n\n\t\tif (config.strategy !== \"fill-first\") {\n\t\t\treturn { ...details, strategy: config.strategy, attempts };\n\t\t}\n\n\t\tselectedDetails = details;\n\t\tfor (const item of details.results) {\n\t\t\tif (collected.size >= request.maxResults) break;\n\t\t\tcollected.set(item.url, item);\n\t\t}\n\t\tif (collected.size >= request.maxResults) break;\n\t}\n\n\tif (collected.size > 0 && selectedDetails) {\n\t\tconst results = [...collected.values()];\n\t\tconst details: SearchDetails = {\n\t\t\tprovider: selectedDetails.provider,\n\t\t\tquery: request.query,\n\t\t\tresults,\n\t\t\tdurationMs: Date.now() - startedAt,\n\t\t\ttruncated: results.length >= request.maxResults,\n\t\t\tstrategy: config.strategy,\n\t\t\tattempts,\n\t\t};\n\t\tif (selectedDetails.entryId !== undefined) details.entryId = selectedDetails.entryId;\n\t\treturn details;\n\t}\n\n\tconst failed = selectedDetails ?? {\n\t\tprovider: config.providers[0]?.provider ?? \"exa\",\n\t\tquery: request.query,\n\t\tresults: [],\n\t\tdurationMs: Date.now() - startedAt,\n\t\ttruncated: false,\n\t\terror: \"All configured search providers failed.\",\n\t};\n\treturn {\n\t\t...failed,\n\t\tdurationMs: Date.now() - startedAt,\n\t\tstrategy: config.strategy,\n\t\tattempts,\n\t\terror: `All configured search providers failed: ${attempts.map((attempt) => `${providerEntryLabel(attempt)} ${attempt.error ?? \"failed\"}`).join(\"; \")}`,\n\t};\n}\n\nexport function formatSearchText(details: SearchDetails): string {\n\tif (details.error) return details.error;\n\tif (details.results.length === 0) return `No web search results found for \"${details.query}\".`;\n\n\tconst route = details.strategy\n\t\t? ` via ${providerEntryLabel(details)} (${details.strategy})`\n\t\t: ` via ${details.provider}`;\n\tconst lines = [`Web search results for \"${details.query}\"${route}:`, \"\"];\n\tif (details.attempts && details.attempts.length > 0) {\n\t\tlines.push(\n\t\t\t`Routing attempts: ${details.attempts\n\t\t\t\t.map(\n\t\t\t\t\t(attempt) =>\n\t\t\t\t\t\t`${providerEntryLabel(attempt)} ${attempt.error ? `failed: ${attempt.error}` : `${attempt.resultsCount} result${attempt.resultsCount === 1 ? \"\" : \"s\"}`}`,\n\t\t\t\t)\n\t\t\t\t.join(\" -> \")}`,\n\t\t\t\"\",\n\t\t);\n\t}\n\tfor (const [index, item] of details.results.entries()) {\n\t\tlines.push(`${index + 1}. ${item.title}`);\n\t\tlines.push(` ${item.url}`);\n\t\tif (item.snippet) lines.push(` ${item.snippet}`);\n\t}\n\tlines.push(\"\", \"REMINDER: Include relevant sources from the URLs above in the final answer.\");\n\treturn lines.join(\"\\n\");\n}\n"]}

package/dist/core/extensions/builtin/websearch/websearch/tool.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/websearch/websearch/tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;~~AAK~~/C,OAAO,KAAK,EACX,gBAAgB,~~EAIhB~~,mBAAmB,EAEnB,MAAM,YAAY,CAAC;AAEpB,QAAA,MAAM,MAAM;;;;EAWX,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC;AACpD,KAAK,aAAa,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,OAAO,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC;~~AAoCvF~~,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,cAAc,GAAG,aAAa,~~CAuE5E~~;AAED,eAAO,MAAM,UAAU;;;;yFAIpB,CAAC"}
1	+ {"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/websearch/websearch/tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAW/C,OAAO,KAAK,EACX,gBAAgB,EAGhB,mBAAmB,EAEnB,MAAM,YAAY,CAAC;AAEpB,QAAA,MAAM,MAAM;;;;EAWX,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC;AACpD,KAAK,aAAa,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,OAAO,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC;AA6BvF,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,cAAc,GAAG,aAAa,CA8E5E;AAED,eAAO,MAAM,UAAU;;;;yFAIpB,CAAC"}

package/dist/core/extensions/builtin/websearch/websearch/tool.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { Type } from "typebox";
 import { defineTool } from "../../../types.js";
 import { buildNativeEntries } from "./native.js";
 import { renderSearchCall, renderSearchResult } from "./renderers.js";
-import { createSearchRoutingState, formatSearchText, performSearch } from "./search.js";
+import { createSearchRoutingState, formatSearchText, performSearch, providerEntryLabel, } from "./search.js";
 const Params = Type.Object({
     query: Type.String({ minLength: 2, description: "The search query to use" }),
     allowed_domains: Type.Optional(Type.Array(Type.String(), { description: "Only include search results from these domains" })),
@@ -14,15 +14,9 @@ async function configWithNativeRoute(config, ctx, signal) {
     const nativeEntries = await buildNativeEntries(ctx?.model, ctx?.modelRegistry, signal);
     return nativeEntries.length > 0 ? { ...config, providers: [...nativeEntries, ...config.providers] } : config;
 }
-function providerLabel(provider) {
-    return provider.id ? `${provider.id}/${provider.provider}` : provider.provider;
-}
 function formatSearchProgressText(details) {
     if (details.currentProvider) {
-        const total = details.providerLabels.length;
-        const position = Math.min((details.attempts?.length ?? 0) + 1, Math.max(total, 1));
-        const step = total > 1 ? ` [${position}/${total}]` : "";
-        return `Searching "${details.query}" via ${details.currentProvider}${step} (max ${details.maxResults})`;
+        return `Searching "${details.query}" via ${details.currentProvider} (max ${details.maxResults})`;
     }
     const route = details.providerLabels.length > 0 ? details.providerLabels.join(" -> ") : "configured providers";
     return `Searching "${details.query}" via ${route} (max ${details.maxResults})`;
@@ -56,7 +50,7 @@ export function createWebSearchTool(getConfig) {
             const progressDetails = {
                 phase: "searching",
                 query: params.query,
-                providerLabels: config.providers.map(providerLabel),
+                providerLabels: config.providers.map(providerEntryLabel),
                 maxResults,
                 strategy: config.strategy,
                 ...(params.allowed_domains ? { allowedDomains: params.allowed_domains } : {}),
@@ -79,11 +73,12 @@ export function createWebSearchTool(getConfig) {
                 ...(params.allowed_domains === undefined ? {} : { allowedDomains: params.allowed_domains }),
                 ...(params.blocked_domains === undefined ? {} : { blockedDomains: params.blocked_domains }),
             };
-            const details = await performSearch(config, request, signal, routingState, (providerLabel, attempts) => {
+            const details = await performSearch(config, request, signal, routingState, (providerLabel, attempts, routeLabels) => {
                 const attemptProgress = {
                     ...progressDetails,
                     currentProvider: providerLabel,
                     attempts: [...attempts],
+                    routeLabels: [...routeLabels],
                 };
                 onUpdate?.({
                     content: [{ type: "text", text: formatSearchProgressText(attemptProgress) }],

package/dist/core/extensions/builtin/websearch/websearch/tool.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tool.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/websearch/websearch/tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,kBAAkB,EAAkD,MAAM,aAAa,CAAC;AACjG,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,aAAa,EAA2B,MAAM,aAAa,CAAC;AAUjH,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CACzB;IACC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,WAAW,EAAE,yBAAyB,EAAE,CAAC;IAC5E,eAAe,EAAE,IAAI,CAAC,QAAQ,CAC7B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,gDAAgD,EAAE,CAAC,CAC5F;IACD,eAAe,EAAE,IAAI,CAAC,QAAQ,CAC7B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,iDAAiD,EAAE,CAAC,CAC7F;CACD,EACD,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAC/B,CAAC;AAUF,KAAK,UAAU,qBAAqB,CACnC,MAAuB,EACvB,GAAqC,EACrC,MAA+B;IAE/B,IAAI,CAAC,MAAM,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC;IAChC,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IACvF,OAAO,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,SAAS,EAAE,CAAC,GAAG,aAAa,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;AAC9G,CAAC;AAED,SAAS,aAAa,CAAC,QAA6B;IACnD,OAAO,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,EAAE,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;AAChF,CAAC;AAED,SAAS,wBAAwB,CAAC,OAA8B;IAC/D,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;QACnF,MAAM,IAAI,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,OAAO,cAAc,OAAO,CAAC,KAAK,SAAS,OAAO,CAAC,eAAe,GAAG,IAAI,SAAS,OAAO,CAAC,UAAU,GAAG,CAAC;IACzG,CAAC;IACD,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC;IAC/G,OAAO,cAAc,OAAO,CAAC,KAAK,SAAS,KAAK,SAAS,OAAO,CAAC,UAAU,GAAG,CAAC;AAChF,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAa,EAAE,KAAa,EAAE,MAAqC;IAC9F,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,SAAyB;IAC5D,IAAI,YAA4C,CAAC;IACjD,IAAI,UAAU,GAAG,EAAE,CAAC;IAEpB,OAAO,UAAU,CAAqC;QACrD,IAAI,EAAE,YAAY;QAClB,KAAK,EAAE,YAAY;QACnB,WAAW,EAAE,6EAA6E;QAC1F,aAAa,EAAE,iFAAiF;QAChG,gBAAgB,EAAE,CAAC,0EAA0E,CAAC;QAC9F,UAAU,EAAE,MAAM;QAClB,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAA0B;YAC9E,IAAI,MAAM,CAAC,eAAe,EAAE,MAAM,IAAI,MAAM,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC;gBACtE,MAAM,OAAO,GAAG,oFAAoF,CAAC;gBACrG,MAAM,OAAO,GAAG,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBAC1D,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC;YAChE,CAAC;YAED,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBAChB,MAAM,OAAO,GAAG,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;gBAChF,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC;YACvE,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,IAAI,EAAE,CAAC;YAChE,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;YACvE,MAAM,eAAe,GAA0B;gBAC9C,KAAK,EAAE,WAAW;gBAClB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,cAAc,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC;gBACnD,UAAU;gBACV,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7E,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC7E,CAAC;YACF,QAAQ,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,wBAAwB,CAAC,eAAe,CAAC,EAAE,CAAC;gBAC5E,OAAO,EAAE,eAAe;aACxB,CAAC,CAAC;YAEH,MAAM,cAAc,GAAG,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC9H,IACC,CAAC,YAAY;gBACb,UAAU,KAAK,cAAc;gBAC7B,YAAY,CAAC,aAAa,CAAC,MAAM,KAAK,MAAM,CAAC,SAAS,CAAC,MAAM,EAC5D,CAAC;gBACF,YAAY,GAAG,wBAAwB,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBACjE,UAAU,GAAG,cAAc,CAAC;YAC7B,CAAC;YACD,MAAM,OAAO,GAAG;gBACf,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,UAAU;gBACV,GAAG,CAAC,MAAM,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC;gBAC3F,GAAG,CAAC,MAAM,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC;aAC3F,CAAC;YACF,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,aAAa,EAAE,QAAQ,EAAE,EAAE;gBACtG,MAAM,eAAe,GAA0B;oBAC9C,GAAG,eAAe;oBAClB,eAAe,EAAE,aAAa;oBAC9B,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC;iBACvB,CAAC;gBACF,QAAQ,EAAE,CAAC;oBACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,wBAAwB,CAAC,eAAe,CAAC,EAAE,CAAC;oBAC5E,OAAO,EAAE,eAAe;iBACxB,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC;QAClF,CAAC;QACD,UAAU,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC;QAC1D,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC;KACpF,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,mBAAmB,CAAC,GAAG,EAAE,CAAC,CAAC;IACpD,EAAE,EAAE,KAAK;IACT,MAAM,EAAE,gBAAgB;IACxB,OAAO,EAAE,iGAAiG;CAC1G,CAAC,CAAC,CAAC","sourcesContent":["import { Type } from \"typebox\";\nimport { defineTool } from \"../../../types.ts\";\n\nimport { buildNativeEntries, type NativeModelInfo, type NativeModelRegistry } from \"./native.ts\";\nimport { renderSearchCall, renderSearchResult } from \"./renderers.ts\";\nimport { createSearchRoutingState, formatSearchText, performSearch, type SearchRoutingState } from \"./search.ts\";\nimport type {\n\tConfigLoadResult,\n\tSearchErrorDetails,\n\tSearchProgressDetails,\n\tSearchProviderEntry,\n\tSearchRenderDetails,\n\tWebsearchConfig,\n} from \"./types.ts\";\n\nconst Params = Type.Object(\n\t{\n\t\tquery: Type.String({ minLength: 2, description: \"The search query to use\" }),\n\t\tallowed_domains: Type.Optional(\n\t\t\tType.Array(Type.String(), { description: \"Only include search results from these domains\" }),\n\t\t),\n\t\tblocked_domains: Type.Optional(\n\t\t\tType.Array(Type.String(), { description: \"Never include search results from these domains\" }),\n\t\t),\n\t},\n\t{ additionalProperties: false },\n);\n\nexport type ConfigProvider = () => ConfigLoadResult;\ntype WebSearchTool = ReturnType<typeof defineTool<typeof Params, SearchRenderDetails>>;\n\ninterface WebSearchToolContext {\n\tmodel: NativeModelInfo \| undefined;\n\tmodelRegistry: NativeModelRegistry;\n}\n\nasync function configWithNativeRoute(\n\tconfig: WebsearchConfig,\n\tctx: WebSearchToolContext \| undefined,\n\tsignal: AbortSignal \| undefined,\n): Promise<WebsearchConfig> {\n\tif (!config.auto) return config;\n\tconst nativeEntries = await buildNativeEntries(ctx?.model, ctx?.modelRegistry, signal);\n\treturn nativeEntries.length > 0 ? { ...config, providers: [...nativeEntries, ...config.providers] } : config;\n}\n\nfunction providerLabel(provider: SearchProviderEntry): string {\n\treturn provider.id ? `${provider.id}/${provider.provider}` : provider.provider;\n}\n\nfunction formatSearchProgressText(details: SearchProgressDetails): string {\n\tif (details.currentProvider) {\n\t\tconst total = details.providerLabels.length;\n\t\tconst position = Math.min((details.attempts?.length ?? 0) + 1, Math.max(total, 1));\n\t\tconst step = total > 1 ? ` [${position}/${total}]` : \"\";\n\t\treturn `Searching \"${details.query}\" via ${details.currentProvider}${step} (max ${details.maxResults})`;\n\t}\n\tconst route = details.providerLabels.length > 0 ? details.providerLabels.join(\" -> \") : \"configured providers\";\n\treturn `Searching \"${details.query}\" via ${route} (max ${details.maxResults})`;\n}\n\nfunction searchErrorDetails(query: string, error: string, reason?: SearchErrorDetails[\"reason\"]): SearchErrorDetails {\n\treturn { phase: \"error\", query, error, ...(reason ? { reason } : {}) };\n}\n\nexport function createWebSearchTool(getConfig: ConfigProvider): WebSearchTool {\n\tlet routingState: SearchRoutingState \| undefined;\n\tlet routingKey = \"\";\n\n\treturn defineTool<typeof Params, SearchRenderDetails>({\n\t\tname: \"web_search\",\n\t\tlabel: \"Web Search\",\n\t\tdescription: \"Search the web for current information and return source URLs for citation.\",\n\t\tpromptSnippet: \"Search the web for current information, documentation, news, or external facts.\",\n\t\tpromptGuidelines: [\"After using web_search, cite relevant returned URLs in the final answer.\"],\n\t\tparameters: Params,\n\t\tasync execute(_toolCallId, params, signal, onUpdate, ctx?: WebSearchToolContext) {\n\t\t\tif (params.allowed_domains?.length && params.blocked_domains?.length) {\n\t\t\t\tconst message = \"Error: Cannot specify both allowed_domains and blocked_domains in the same request\";\n\t\t\t\tconst details = searchErrorDetails(params.query, message);\n\t\t\t\treturn { content: [{ type: \"text\", text: message }], details };\n\t\t\t}\n\n\t\t\tconst loaded = getConfig();\n\t\t\tif (!loaded.ok) {\n\t\t\t\tconst details = searchErrorDetails(params.query, loaded.message, loaded.reason);\n\t\t\t\treturn { content: [{ type: \"text\", text: loaded.message }], details };\n\t\t\t}\n\n\t\t\tconst maxResults = loaded.config.providers[0]?.maxResults ?? 10;\n\t\t\tconst config = await configWithNativeRoute(loaded.config, ctx, signal);\n\t\t\tconst progressDetails: SearchProgressDetails = {\n\t\t\t\tphase: \"searching\",\n\t\t\t\tquery: params.query,\n\t\t\t\tproviderLabels: config.providers.map(providerLabel),\n\t\t\t\tmaxResults,\n\t\t\t\tstrategy: config.strategy,\n\t\t\t\t...(params.allowed_domains ? { allowedDomains: params.allowed_domains } : {}),\n\t\t\t\t...(params.blocked_domains ? { blockedDomains: params.blocked_domains } : {}),\n\t\t\t};\n\t\t\tonUpdate?.({\n\t\t\t\tcontent: [{ type: \"text\", text: formatSearchProgressText(progressDetails) }],\n\t\t\t\tdetails: progressDetails,\n\t\t\t});\n\n\t\t\tconst nextRoutingKey = `${config.strategy}:${config.providers.map((provider) => provider.id ?? provider.provider).join(\"\|\")}`;\n\t\t\tif (\n\t\t\t\t!routingState \|\|\n\t\t\t\troutingKey !== nextRoutingKey \|\|\n\t\t\t\troutingState.successCounts.length !== config.providers.length\n\t\t\t) {\n\t\t\t\troutingState = createSearchRoutingState(config.providers.length);\n\t\t\t\troutingKey = nextRoutingKey;\n\t\t\t}\n\t\t\tconst request = {\n\t\t\t\tquery: params.query,\n\t\t\t\tmaxResults,\n\t\t\t\t...(params.allowed_domains === undefined ? {} : { allowedDomains: params.allowed_domains }),\n\t\t\t\t...(params.blocked_domains === undefined ? {} : { blockedDomains: params.blocked_domains }),\n\t\t\t};\n\t\t\tconst details = await performSearch(config, request, signal, routingState, (providerLabel, attempts) => {\n\t\t\t\tconst attemptProgress: SearchProgressDetails = {\n\t\t\t\t\t...progressDetails,\n\t\t\t\t\tcurrentProvider: providerLabel,\n\t\t\t\t\tattempts: [...attempts],\n\t\t\t\t};\n\t\t\t\tonUpdate?.({\n\t\t\t\t\tcontent: [{ type: \"text\", text: formatSearchProgressText(attemptProgress) }],\n\t\t\t\t\tdetails: attemptProgress,\n\t\t\t\t});\n\t\t\t});\n\t\t\treturn { content: [{ type: \"text\", text: formatSearchText(details) }], details };\n\t\t},\n\t\trenderCall: (args, theme) => renderSearchCall(args, theme),\n\t\trenderResult: (result, options, theme) => renderSearchResult(result, options, theme),\n\t});\n}\n\nexport const web_search = createWebSearchTool(() => ({\n\tok: false,\n\treason: \"missing_config\",\n\tmessage: \"Missing websearch config. Create .pi/websearch.json or ~/.pi/websearch.json before starting pi.\",\n}));\n"]}
1	+ {"version":3,"file":"tool.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/websearch/websearch/tool.ts"],"names":[],"mappings":"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","sourcesContent":["import { Type } from \"typebox\";\nimport { defineTool } from \"../../../types.ts\";\n\nimport { buildNativeEntries, type NativeModelInfo, type NativeModelRegistry } from \"./native.ts\";\nimport { renderSearchCall, renderSearchResult } from \"./renderers.ts\";\nimport {\n\tcreateSearchRoutingState,\n\tformatSearchText,\n\tperformSearch,\n\tproviderEntryLabel,\n\ttype SearchRoutingState,\n} from \"./search.ts\";\nimport type {\n\tConfigLoadResult,\n\tSearchErrorDetails,\n\tSearchProgressDetails,\n\tSearchRenderDetails,\n\tWebsearchConfig,\n} from \"./types.ts\";\n\nconst Params = Type.Object(\n\t{\n\t\tquery: Type.String({ minLength: 2, description: \"The search query to use\" }),\n\t\tallowed_domains: Type.Optional(\n\t\t\tType.Array(Type.String(), { description: \"Only include search results from these domains\" }),\n\t\t),\n\t\tblocked_domains: Type.Optional(\n\t\t\tType.Array(Type.String(), { description: \"Never include search results from these domains\" }),\n\t\t),\n\t},\n\t{ additionalProperties: false },\n);\n\nexport type ConfigProvider = () => ConfigLoadResult;\ntype WebSearchTool = ReturnType<typeof defineTool<typeof Params, SearchRenderDetails>>;\n\ninterface WebSearchToolContext {\n\tmodel: NativeModelInfo \| undefined;\n\tmodelRegistry: NativeModelRegistry;\n}\n\nasync function configWithNativeRoute(\n\tconfig: WebsearchConfig,\n\tctx: WebSearchToolContext \| undefined,\n\tsignal: AbortSignal \| undefined,\n): Promise<WebsearchConfig> {\n\tif (!config.auto) return config;\n\tconst nativeEntries = await buildNativeEntries(ctx?.model, ctx?.modelRegistry, signal);\n\treturn nativeEntries.length > 0 ? { ...config, providers: [...nativeEntries, ...config.providers] } : config;\n}\n\nfunction formatSearchProgressText(details: SearchProgressDetails): string {\n\tif (details.currentProvider) {\n\t\treturn `Searching \"${details.query}\" via ${details.currentProvider} (max ${details.maxResults})`;\n\t}\n\tconst route = details.providerLabels.length > 0 ? details.providerLabels.join(\" -> \") : \"configured providers\";\n\treturn `Searching \"${details.query}\" via ${route} (max ${details.maxResults})`;\n}\n\nfunction searchErrorDetails(query: string, error: string, reason?: SearchErrorDetails[\"reason\"]): SearchErrorDetails {\n\treturn { phase: \"error\", query, error, ...(reason ? { reason } : {}) };\n}\n\nexport function createWebSearchTool(getConfig: ConfigProvider): WebSearchTool {\n\tlet routingState: SearchRoutingState \| undefined;\n\tlet routingKey = \"\";\n\n\treturn defineTool<typeof Params, SearchRenderDetails>({\n\t\tname: \"web_search\",\n\t\tlabel: \"Web Search\",\n\t\tdescription: \"Search the web for current information and return source URLs for citation.\",\n\t\tpromptSnippet: \"Search the web for current information, documentation, news, or external facts.\",\n\t\tpromptGuidelines: [\"After using web_search, cite relevant returned URLs in the final answer.\"],\n\t\tparameters: Params,\n\t\tasync execute(_toolCallId, params, signal, onUpdate, ctx?: WebSearchToolContext) {\n\t\t\tif (params.allowed_domains?.length && params.blocked_domains?.length) {\n\t\t\t\tconst message = \"Error: Cannot specify both allowed_domains and blocked_domains in the same request\";\n\t\t\t\tconst details = searchErrorDetails(params.query, message);\n\t\t\t\treturn { content: [{ type: \"text\", text: message }], details };\n\t\t\t}\n\n\t\t\tconst loaded = getConfig();\n\t\t\tif (!loaded.ok) {\n\t\t\t\tconst details = searchErrorDetails(params.query, loaded.message, loaded.reason);\n\t\t\t\treturn { content: [{ type: \"text\", text: loaded.message }], details };\n\t\t\t}\n\n\t\t\tconst maxResults = loaded.config.providers[0]?.maxResults ?? 10;\n\t\t\tconst config = await configWithNativeRoute(loaded.config, ctx, signal);\n\t\t\tconst progressDetails: SearchProgressDetails = {\n\t\t\t\tphase: \"searching\",\n\t\t\t\tquery: params.query,\n\t\t\t\tproviderLabels: config.providers.map(providerEntryLabel),\n\t\t\t\tmaxResults,\n\t\t\t\tstrategy: config.strategy,\n\t\t\t\t...(params.allowed_domains ? { allowedDomains: params.allowed_domains } : {}),\n\t\t\t\t...(params.blocked_domains ? { blockedDomains: params.blocked_domains } : {}),\n\t\t\t};\n\t\t\tonUpdate?.({\n\t\t\t\tcontent: [{ type: \"text\", text: formatSearchProgressText(progressDetails) }],\n\t\t\t\tdetails: progressDetails,\n\t\t\t});\n\n\t\t\tconst nextRoutingKey = `${config.strategy}:${config.providers.map((provider) => provider.id ?? provider.provider).join(\"\|\")}`;\n\t\t\tif (\n\t\t\t\t!routingState \|\|\n\t\t\t\troutingKey !== nextRoutingKey \|\|\n\t\t\t\troutingState.successCounts.length !== config.providers.length\n\t\t\t) {\n\t\t\t\troutingState = createSearchRoutingState(config.providers.length);\n\t\t\t\troutingKey = nextRoutingKey;\n\t\t\t}\n\t\t\tconst request = {\n\t\t\t\tquery: params.query,\n\t\t\t\tmaxResults,\n\t\t\t\t...(params.allowed_domains === undefined ? {} : { allowedDomains: params.allowed_domains }),\n\t\t\t\t...(params.blocked_domains === undefined ? {} : { blockedDomains: params.blocked_domains }),\n\t\t\t};\n\t\t\tconst details = await performSearch(\n\t\t\t\tconfig,\n\t\t\t\trequest,\n\t\t\t\tsignal,\n\t\t\t\troutingState,\n\t\t\t\t(providerLabel, attempts, routeLabels) => {\n\t\t\t\t\tconst attemptProgress: SearchProgressDetails = {\n\t\t\t\t\t\t...progressDetails,\n\t\t\t\t\t\tcurrentProvider: providerLabel,\n\t\t\t\t\t\tattempts: [...attempts],\n\t\t\t\t\t\trouteLabels: [...routeLabels],\n\t\t\t\t\t};\n\t\t\t\t\tonUpdate?.({\n\t\t\t\t\t\tcontent: [{ type: \"text\", text: formatSearchProgressText(attemptProgress) }],\n\t\t\t\t\t\tdetails: attemptProgress,\n\t\t\t\t\t});\n\t\t\t\t},\n\t\t\t);\n\t\t\treturn { content: [{ type: \"text\", text: formatSearchText(details) }], details };\n\t\t},\n\t\trenderCall: (args, theme) => renderSearchCall(args, theme),\n\t\trenderResult: (result, options, theme) => renderSearchResult(result, options, theme),\n\t});\n}\n\nexport const web_search = createWebSearchTool(() => ({\n\tok: false,\n\treason: \"missing_config\",\n\tmessage: \"Missing websearch config. Create .pi/websearch.json or ~/.pi/websearch.json before starting pi.\",\n}));\n"]}

package/dist/core/extensions/builtin/websearch/websearch/types.d.ts CHANGED Viewed

@@ -74,6 +74,7 @@ export interface SearchProgressDetails {
     maxResults: number;
     currentProvider?: string;
     attempts?: SearchAttempt[];
+    routeLabels?: string[];
     strategy?: RoutingStrategy;
     allowedDomains?: string[];
     blockedDomains?: string[];

package/dist/core/extensions/builtin/websearch/websearch/types.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/websearch/websearch/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GACvB,KAAK,GACL,QAAQ,GACR,OAAO,GACP,iBAAiB,GACjB,QAAQ,GACR,YAAY,GACZ,MAAM,GACN,QAAQ,GACR,OAAO,GACP,WAAW,GACX,YAAY,GACZ,KAAK,GACL,MAAM,CAAC;AAEV,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;AAC1D,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,MAAM,CAAC;AAChD,MAAM,MAAM,eAAe,GAAG,UAAU,GAAG,aAAa,GAAG,YAAY,CAAC;AAExE,MAAM,WAAW,oBAAoB;IACpC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,cAAc,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAoB,SAAQ,oBAAoB;IAChE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAC/B,QAAQ,EAAE,eAAe,CAAC;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,mBAAmB,EAAE,CAAC;CACjC;AAED,MAAM,WAAW,kBAAkB;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAkB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE;QACL,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC;QACvB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAChC,CAAC;IACF,IAAI,CAAC,EAAE,UAAU,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC7B,QAAQ,EAAE,cAAc,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,qBAAqB;IACrC,KAAK,EAAE,WAAW,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,MAAM,MAAM,uBAAuB,GAChC,gBAAgB,GAChB,gBAAgB,GAChB,iBAAiB,GACjB,wBAAwB,CAAC;AAE5B,MAAM,WAAW,kBAAkB;IAClC,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,uBAAuB,CAAC;CACjC;AAED,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG,qBAAqB,GAAG,kBAAkB,CAAC;AAE7F,MAAM,WAAW,aAAa;IAC7B,QAAQ,EAAE,cAAc,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,UAAU,GAAG,SAAS,EAAE,CAAC;AAEpF,MAAM,WAAW,UAAU;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;CACzB;AAED,MAAM,MAAM,gBAAgB,GACzB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,eAAe,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACrD;IACA,EAAE,EAAE,KAAK,CAAC;IACV,MAAM,EAAE,uBAAuB,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEL,MAAM,MAAM,wBAAwB,GACjC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAA;CAAE,GACzC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,gBAAgB,GAAG,iBAAiB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC"}
1	+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/websearch/websearch/types.ts"],"names":[],"mappings":"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"}

package/dist/core/extensions/builtin/websearch/websearch/types.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/websearch/websearch/types.ts"],"names":[],"mappings":"","sourcesContent":["export type SearchProvider =\n\t\| \"exa\"\n\t\| \"tavily\"\n\t\| \"brave\"\n\t\| \"duckduckgo-html\"\n\t\| \"serper\"\n\t\| \"google-cse\"\n\t\| \"z-ai\"\n\t\| \"openai\"\n\t\| \"codex\"\n\t\| \"anthropic\"\n\t\| \"perplexity\"\n\t\| \"xai\"\n\t\| \"kimi\";\n\nexport type SearchContextSize = \"low\" \| \"medium\" \| \"high\";\nexport type CodexSearchMode = \"cached\" \| \"live\";\nexport type RoutingStrategy = \"priority\" \| \"round-robin\" \| \"fill-first\";\n\nexport interface SearchProviderConfig {\n\tid?: string;\n\tprovider: SearchProvider;\n\tapiKey?: string;\n\tbaseUrl?: string;\n\tsearchEngineId?: string;\n\tmaxResults?: number;\n\tmodel?: string;\n\tcodexMode?: CodexSearchMode;\n\tsearchContextSize?: SearchContextSize;\n\tallowedDomains?: string[];\n\tblockedDomains?: string[];\n\tuserLocation?: SearchUserLocation;\n\ttimeoutMs?: number;\n}\n\nexport interface SearchProviderEntry extends SearchProviderConfig {\n\tpriority?: number;\n\tweight?: number;\n}\n\nexport interface WebsearchConfig {\n\tstrategy: RoutingStrategy;\n\tfallback: boolean;\n\tauto: boolean;\n\tproviders: SearchProviderEntry[];\n}\n\nexport interface SearchUserLocation {\n\tcountry?: string;\n\tregion?: string;\n\tcity?: string;\n\ttimezone?: string;\n}\n\nexport interface SearchRequest {\n\tquery: string;\n\tmaxResults: number;\n\tallowedDomains?: string[];\n\tblockedDomains?: string[];\n}\n\nexport interface BuiltSearchRequest {\n\turl: string;\n\tinit: {\n\t\tmethod: \"GET\" \| \"POST\";\n\t\theaders: Record<string, string>;\n\t};\n\tbody?: JsonObject;\n}\n\nexport interface SearchResultItem {\n\ttitle: string;\n\turl: string;\n\tsnippet?: string;\n\tscore?: number;\n\tsource?: string;\n\tpublishedAt?: string;\n}\n\nexport interface SearchDetails {\n\tprovider: SearchProvider;\n\tentryId?: string;\n\tquery: string;\n\tresults: SearchResultItem[];\n\tdurationMs: number;\n\ttruncated: boolean;\n\tstrategy?: RoutingStrategy;\n\tattempts?: SearchAttempt[];\n\tanswer?: string;\n\terror?: string;\n}\n\nexport interface SearchProgressDetails {\n\tphase: \"searching\";\n\tquery: string;\n\tproviderLabels: string[];\n\tmaxResults: number;\n\tcurrentProvider?: string;\n\tattempts?: SearchAttempt[];\n\tstrategy?: RoutingStrategy;\n\tallowedDomains?: string[];\n\tblockedDomains?: string[];\n}\n\nexport type ConfigLoadFailureReason =\n\t\| \"missing_config\"\n\t\| \"invalid_config\"\n\t\| \"missing_api_key\"\n\t\| \"provider_native_bypass\";\n\nexport interface SearchErrorDetails {\n\tphase: \"error\";\n\tquery: string;\n\terror: string;\n\treason?: ConfigLoadFailureReason;\n}\n\nexport type SearchRenderDetails = SearchDetails \| SearchProgressDetails \| SearchErrorDetails;\n\nexport interface SearchAttempt {\n\tprovider: SearchProvider;\n\tentryId?: string;\n\tdurationMs: number;\n\tresultsCount: number;\n\terror?: string;\n}\n\nexport type JsonValue = string \| number \| boolean \| null \| JsonObject \| JsonValue[];\n\nexport interface JsonObject {\n\t[key: string]: JsonValue;\n}\n\nexport type ConfigLoadResult =\n\t\| { ok: true; config: WebsearchConfig; source: string }\n\t\| {\n\t\t\tok: false;\n\t\t\treason: ConfigLoadFailureReason;\n\t\t\tmessage: string;\n\t\t\tsource?: string;\n\t };\n\nexport type ProviderValidationResult =\n\t\| { ok: true; config: SearchProviderEntry }\n\t\| { ok: false; reason: \"invalid_config\" \| \"missing_api_key\"; message: string };\n"]}
1	+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/websearch/websearch/types.ts"],"names":[],"mappings":"","sourcesContent":["export type SearchProvider =\n\t\| \"exa\"\n\t\| \"tavily\"\n\t\| \"brave\"\n\t\| \"duckduckgo-html\"\n\t\| \"serper\"\n\t\| \"google-cse\"\n\t\| \"z-ai\"\n\t\| \"openai\"\n\t\| \"codex\"\n\t\| \"anthropic\"\n\t\| \"perplexity\"\n\t\| \"xai\"\n\t\| \"kimi\";\n\nexport type SearchContextSize = \"low\" \| \"medium\" \| \"high\";\nexport type CodexSearchMode = \"cached\" \| \"live\";\nexport type RoutingStrategy = \"priority\" \| \"round-robin\" \| \"fill-first\";\n\nexport interface SearchProviderConfig {\n\tid?: string;\n\tprovider: SearchProvider;\n\tapiKey?: string;\n\tbaseUrl?: string;\n\tsearchEngineId?: string;\n\tmaxResults?: number;\n\tmodel?: string;\n\tcodexMode?: CodexSearchMode;\n\tsearchContextSize?: SearchContextSize;\n\tallowedDomains?: string[];\n\tblockedDomains?: string[];\n\tuserLocation?: SearchUserLocation;\n\ttimeoutMs?: number;\n}\n\nexport interface SearchProviderEntry extends SearchProviderConfig {\n\tpriority?: number;\n\tweight?: number;\n}\n\nexport interface WebsearchConfig {\n\tstrategy: RoutingStrategy;\n\tfallback: boolean;\n\tauto: boolean;\n\tproviders: SearchProviderEntry[];\n}\n\nexport interface SearchUserLocation {\n\tcountry?: string;\n\tregion?: string;\n\tcity?: string;\n\ttimezone?: string;\n}\n\nexport interface SearchRequest {\n\tquery: string;\n\tmaxResults: number;\n\tallowedDomains?: string[];\n\tblockedDomains?: string[];\n}\n\nexport interface BuiltSearchRequest {\n\turl: string;\n\tinit: {\n\t\tmethod: \"GET\" \| \"POST\";\n\t\theaders: Record<string, string>;\n\t};\n\tbody?: JsonObject;\n}\n\nexport interface SearchResultItem {\n\ttitle: string;\n\turl: string;\n\tsnippet?: string;\n\tscore?: number;\n\tsource?: string;\n\tpublishedAt?: string;\n}\n\nexport interface SearchDetails {\n\tprovider: SearchProvider;\n\tentryId?: string;\n\tquery: string;\n\tresults: SearchResultItem[];\n\tdurationMs: number;\n\ttruncated: boolean;\n\tstrategy?: RoutingStrategy;\n\tattempts?: SearchAttempt[];\n\tanswer?: string;\n\terror?: string;\n}\n\nexport interface SearchProgressDetails {\n\tphase: \"searching\";\n\tquery: string;\n\tproviderLabels: string[];\n\tmaxResults: number;\n\tcurrentProvider?: string;\n\tattempts?: SearchAttempt[];\n\trouteLabels?: string[];\n\tstrategy?: RoutingStrategy;\n\tallowedDomains?: string[];\n\tblockedDomains?: string[];\n}\n\nexport type ConfigLoadFailureReason =\n\t\| \"missing_config\"\n\t\| \"invalid_config\"\n\t\| \"missing_api_key\"\n\t\| \"provider_native_bypass\";\n\nexport interface SearchErrorDetails {\n\tphase: \"error\";\n\tquery: string;\n\terror: string;\n\treason?: ConfigLoadFailureReason;\n}\n\nexport type SearchRenderDetails = SearchDetails \| SearchProgressDetails \| SearchErrorDetails;\n\nexport interface SearchAttempt {\n\tprovider: SearchProvider;\n\tentryId?: string;\n\tdurationMs: number;\n\tresultsCount: number;\n\terror?: string;\n}\n\nexport type JsonValue = string \| number \| boolean \| null \| JsonObject \| JsonValue[];\n\nexport interface JsonObject {\n\t[key: string]: JsonValue;\n}\n\nexport type ConfigLoadResult =\n\t\| { ok: true; config: WebsearchConfig; source: string }\n\t\| {\n\t\t\tok: false;\n\t\t\treason: ConfigLoadFailureReason;\n\t\t\tmessage: string;\n\t\t\tsource?: string;\n\t };\n\nexport type ProviderValidationResult =\n\t\| { ok: true; config: SearchProviderEntry }\n\t\| { ok: false; reason: \"invalid_config\" \| \"missing_api_key\"; message: string };\n"]}

package/dist/core/extensions/loader.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/extensions/loader.ts"],"names":[],"mappings":"AACA;;;GAGG;AAyBH,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAMhE,OAAO,KAAK,EAEX,SAAS,EAET,gBAAgB,EAChB,gBAAgB,EAChB,oBAAoB,EAEpB,2BAA2B,EAK3B,MAAM,YAAY,CAAC;AA4IpB,MAAM,MAAM,wBAAwB,GAAG,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,gBAAgB,GAAG,SAAS,CAAC;AAiBrH,wBAAgB,mBAAmB,IAAI,IAAI,CAE1C;AAyBD;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,gBAAgB,~~CAkEzD~~;AAED;;;;;;;GAOG;AACH,wBAAgB,iCAAiC,CAAC,OAAO,EAAE,gBAAgB,GAAG,2BAA2B,EAAE,CAS1G;~~AAgSD~~;;GAEG;AACH,wBAAsB,wBAAwB,CAC7C,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,gBAAgB,EACzB,aAAa,SAAa,GACxB,OAAO,CAAC,SAAS,CAAC,CAOpB;AAqDD,wBAAsB,cAAc,CACnC,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,QAAQ,EACnB,OAAO,CAAC,EAAE,gBAAgB,EAC1B,OAAO,CAAC,EAAE;IAAE,eAAe,CAAC,EAAE,wBAAwB,CAAA;CAAE,GACtD,OAAO,CAAC,oBAAoB,CAAC,CAE/B;AAED,wBAAsB,oBAAoB,CACzC,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,QAAQ,EACnB,OAAO,CAAC,EAAE,gBAAgB,GACxB,OAAO,CAAC,oBAAoB,CAAC,CAE/B;AA+GD;;GAEG;AACH,wBAAsB,yBAAyB,CAC9C,eAAe,EAAE,MAAM,EAAE,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAAsB,EAChC,QAAQ,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,oBAAoB,CAAC,CA2C/B"}
1	+ {"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/extensions/loader.ts"],"names":[],"mappings":"AACA;;;GAGG;AAyBH,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAMhE,OAAO,KAAK,EAEX,SAAS,EAET,gBAAgB,EAChB,gBAAgB,EAChB,oBAAoB,EAEpB,2BAA2B,EAK3B,MAAM,YAAY,CAAC;AA4IpB,MAAM,MAAM,wBAAwB,GAAG,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,gBAAgB,GAAG,SAAS,CAAC;AAiBrH,wBAAgB,mBAAmB,IAAI,IAAI,CAE1C;AAyBD;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,gBAAgB,CAmEzD;AAED;;;;;;;GAOG;AACH,wBAAgB,iCAAiC,CAAC,OAAO,EAAE,gBAAgB,GAAG,2BAA2B,EAAE,CAS1G;AA4SD;;GAEG;AACH,wBAAsB,wBAAwB,CAC7C,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,gBAAgB,EACzB,aAAa,SAAa,GACxB,OAAO,CAAC,SAAS,CAAC,CAOpB;AAqDD,wBAAsB,cAAc,CACnC,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,QAAQ,EACnB,OAAO,CAAC,EAAE,gBAAgB,EAC1B,OAAO,CAAC,EAAE;IAAE,eAAe,CAAC,EAAE,wBAAwB,CAAA;CAAE,GACtD,OAAO,CAAC,oBAAoB,CAAC,CAE/B;AAED,wBAAsB,oBAAoB,CACzC,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,QAAQ,EACnB,OAAO,CAAC,EAAE,gBAAgB,GACxB,OAAO,CAAC,oBAAoB,CAAC,CAE/B;AA+GD;;GAEG;AACH,wBAAsB,yBAAyB,CAC9C,eAAe,EAAE,MAAM,EAAE,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAAsB,EAChC,QAAQ,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,oBAAoB,CAAC,CA2C/B"}

package/dist/core/extensions/loader.js CHANGED Viewed

@@ -179,6 +179,7 @@ export function createExtensionRuntime() {
         setActiveTools: notInitialized,
         // registerTool() is valid during extension load; refresh is only needed post-bind.
         refreshTools: () => { },
+        registerRemovedToolHint: () => { },
         getCommands: notInitialized,
         setModel: () => Promise.reject(new Error("Extension runtime not initialized")),
         getThinkingLevel: notInitialized,
@@ -256,6 +257,16 @@ function createExtensionAPI(extension, runtime, cwd, eventBus) {
             });
             runtime.refreshTools();
         },
+        registerRemovedToolHint(name, hint) {
+            runtime.assertActive();
+            let hints = extension.removedToolHints;
+            if (!hints) {
+                hints = new Map();
+                extension.removedToolHints = hints;
+            }
+            hints.set(name, hint);
+            runtime.registerRemovedToolHint(name, hint);
+        },
         registerCommand(name, options) {
             runtime.assertActive();
             extension.commands.set(name, {
@@ -429,6 +440,7 @@ function createExtension(extensionPath, resolvedPath, registrationCwd) {
         sourceInfo: createSyntheticSourceInfo(extensionPath, { source, baseDir }),
         handlers: new Map(),
         tools: new Map(),
+        removedToolHints: new Map(),
         messageRenderers: new Map(),
         entryRenderers: undefined,
         commands: new Map(),