npm - @code-yeongyu/senpi - Versions diffs - 2026.7.17 → 2026.7.20-2 - Mend

@code-yeongyu/senpi 2026.7.17 → 2026.7.20-2

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 (738) hide show

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

@@ -225,7 +225,7 @@ function attemptFromDetails(details) {
         attempt.error = details.error;
     return attempt;
 }
-export async function performSearch(config, request, signal, routingState) {
+export async function performSearch(config, request, signal, routingState, onAttempt) {
     const startedAt = Date.now();
     const state = routingState ?? createSearchRoutingState(config.providers.length);
     const order = selectOrder(config.strategy, config.providers, state);
@@ -236,6 +236,7 @@ export async function performSearch(config, request, signal, routingState) {
         const provider = config.providers[index];
         if (!provider)
             continue;
+        onAttempt?.(entryLabel(provider), attempts);
         const details = await performProviderSearch(provider, request, signal);
         attempts.push(attemptFromDetails(details));
         if (details.error) {

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":"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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 ${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 async function performSearch(\n\tconfig: WebsearchConfig,\n\trequest: SearchRequest,\n\tsignal?: AbortSignal,\n\troutingState?: SearchRoutingState,\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\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 ${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"]}

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;~~AA8BvF~~,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,cAAc,GAAG,aAAa,~~CA6D5E~~;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;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"}

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

@@ -18,6 +18,12 @@ 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})`;
+    }
     const route = details.providerLabels.length > 0 ? details.providerLabels.join(" -> ") : "configured providers";
     return `Searching "${details.query}" via ${route} (max ${details.maxResults})`;
 }
@@ -73,7 +79,17 @@ 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);
+            const details = await performSearch(config, request, signal, routingState, (providerLabel, attempts) => {
+                const attemptProgress = {
+                    ...progressDetails,
+                    currentProvider: providerLabel,
+                    attempts: [...attempts],
+                };
+                onUpdate?.({
+                    content: [{ type: "text", text: formatSearchProgressText(attemptProgress) }],
+                    details: attemptProgress,
+                });
+            });
             return { content: [{ type: "text", text: formatSearchText(details) }], details };
         },
         renderCall: (args, theme) => renderSearchCall(args, theme),

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":"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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 { 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\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);\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 { 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"]}

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

@@ -72,6 +72,8 @@ export interface SearchProgressDetails {
     query: string;
     providerLabels: string[];
     maxResults: number;
+    currentProvider?: string;
+    attempts?: SearchAttempt[];
     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":"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"}
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"}

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\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\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/index.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@
  */
 export type { SlashCommandInfo, SlashCommandSource } from "../slash-commands.ts";
 export type { SourceInfo } from "../source-info.ts";
+export type { McpServerDeclaration } from "./builtin/mcp/config-schema.ts";
 export { createExtensionRuntime, discoverAndLoadExtensions, loadExtensionFromFactory, loadExtensions, } from "./loader.ts";
 export type { ExtensionErrorListener, ExtensionToolHookLifecycleEvent, ExtensionToolHookLifecycleObserver, ExtensionToolHookLifecycleStatus, ExtensionToolHookName, ForkHandler, NavigateTreeHandler, NewSessionHandler, ShutdownHandler, SwitchSessionHandler, } from "./runner.ts";
 export { ExtensionRunner } from "./runner.ts";

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

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/extensions/index.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/extensions/index.ts"],"names":[],"mappings":"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"}

package/dist/core/extensions/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/extensions/index.ts"],"names":[],"mappings":"AAAA;;GAEG;~~AAIH~~,OAAO,EACN,sBAAsB,EACtB,yBAAyB,EACzB,wBAAwB,EACxB,cAAc,GACd,MAAM,aAAa,CAAC;AAarB,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AA8J9C,cAAc;AACd,OAAO,EACN,UAAU,EACV,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,GACjB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC","sourcesContent":["/*\n Extension system for lifecycle events and custom tools.\n */\n\nexport type { SlashCommandInfo, SlashCommandSource } from \"../slash-commands.ts\";\nexport type { SourceInfo } from \"../source-info.ts\";\nexport {\n\tcreateExtensionRuntime,\n\tdiscoverAndLoadExtensions,\n\tloadExtensionFromFactory,\n\tloadExtensions,\n} from \"./loader.ts\";\nexport type {\n\tExtensionErrorListener,\n\tExtensionToolHookLifecycleEvent,\n\tExtensionToolHookLifecycleObserver,\n\tExtensionToolHookLifecycleStatus,\n\tExtensionToolHookName,\n\tForkHandler,\n\tNavigateTreeHandler,\n\tNewSessionHandler,\n\tShutdownHandler,\n\tSwitchSessionHandler,\n} from \"./runner.ts\";\nexport { ExtensionRunner } from \"./runner.ts\";\nexport type {\n\tAfterProviderResponseEvent,\n\tAgentEndEvent,\n\tAgentSettledEvent,\n\tAgentStartEvent,\n\t// Re-exports\n\tAgentToolResult,\n\tAgentToolUpdateCallback,\n\tAppendEntryHandler,\n\t// App keybindings (for custom editors)\n\tAppKeybinding,\n\tAutocompleteProviderFactory,\n\t// Events - Tool (ToolCallEvent types)\n\tBashToolCallEvent,\n\tBashToolResultEvent,\n\tBeforeAgentStartEvent,\n\tBeforeAgentStartEventResult,\n\tBeforeProviderHeadersEvent,\n\tBeforeProviderRequestEvent,\n\tBeforeProviderRequestEventResult,\n\tBuildSystemPromptOptions,\n\t// Context\n\tCompactOptions,\n\t// Events - Agent\n\tContextEvent,\n\t// Event Results\n\tContextEventResult,\n\tContextUsage,\n\tCustomToolCallEvent,\n\tCustomToolResultEvent,\n\tEditorFactory,\n\tEditToolCallEvent,\n\tEditToolResultEvent,\n\t// Message and Entry Rendering\n\tEntryRenderer,\n\tEntryRenderOptions,\n\tExecOptions,\n\tExecResult,\n\tExecuteToolErrorCode,\n\tExecuteToolHandler,\n\tExecuteToolOptions,\n\tExecuteToolResult,\n\tExecuteToolUpdateCallback,\n\tExtension,\n\tExtensionActions,\n\t// API\n\tExtensionAPI,\n\tExtensionCommandContext,\n\tExtensionCommandContextActions,\n\tExtensionContext,\n\tExtensionContextActions,\n\t// Errors\n\tExtensionError,\n\tExtensionEvent,\n\tExtensionFactory,\n\tExtensionFlag,\n\tExtensionHandler,\n\tExtensionMode,\n\t// Runtime\n\tExtensionRuntime,\n\tExtensionShortcut,\n\tExtensionUIContext,\n\tExtensionUIDialogOptions,\n\tExtensionWidgetOptions,\n\tFindToolCallEvent,\n\tFindToolResultEvent,\n\tGetActiveToolsHandler,\n\tGetAllToolsHandler,\n\tGetCommandsHandler,\n\tGetThinkingLevelHandler,\n\tGrepToolCallEvent,\n\tGrepToolResultEvent,\n\tInlineExtension,\n\t// Events - Input\n\tInputEvent,\n\tInputEventResult,\n\tInputSource,\n\tKeybindingsManager,\n\tLoadExtensionsResult,\n\tLsToolCallEvent,\n\tLsToolResultEvent,\n\t// Events - Message\n\tMessageEndEvent,\n\tMessageRenderer,\n\tMessageRenderOptions,\n\tMessageStartEvent,\n\tMessageUpdateEvent,\n\tModelSelectEvent,\n\tModelSelectEventResult,\n\tModelSelectSource,\n\tProjectTrustContext,\n\tProjectTrustEvent,\n\tProjectTrustEventDecision,\n\tProjectTrustEventResult,\n\tProjectTrustHandler,\n\t// Provider Registration\n\tProviderConfig,\n\tProviderModelConfig,\n\tReadToolCallEvent,\n\tReadToolResultEvent,\n\t// Commands\n\tRegisteredCommand,\n\tRegisteredTool,\n\tReplacedSessionContext,\n\tResolvedCommand,\n\t// Events - Resources\n\tResourcesDiscoverEvent,\n\tResourcesDiscoverResult,\n\tSendMessageHandler,\n\tSendUserMessageHandler,\n\tSessionBeforeCompactEvent,\n\tSessionBeforeCompactResult,\n\tSessionBeforeForkEvent,\n\tSessionBeforeForkResult,\n\tSessionBeforeSwitchEvent,\n\tSessionBeforeSwitchResult,\n\tSessionBeforeTreeEvent,\n\tSessionBeforeTreeResult,\n\tSessionCompactEvent,\n\tSessionEvent,\n\tSessionInfoChangedEvent,\n\tSessionShutdownEvent,\n\t// Events - Session\n\tSessionStartEvent,\n\tSessionTreeEvent,\n\tSetActiveToolsHandler,\n\tSetLabelHandler,\n\tSetModelHandler,\n\tSetThinkingLevelHandler,\n\tSystemPromptChangeEvent,\n\tTerminalInputHandler,\n\t// Events - Tool\n\tToolCallEvent,\n\tToolCallEventResult,\n\t// Tools\n\tToolDefinition,\n\t// Events - Tool Execution\n\tToolExecutionEndEvent,\n\t// Tool execution mode\n\tToolExecutionMode,\n\tToolExecutionStartEvent,\n\tToolExecutionUpdateEvent,\n\tToolInfo,\n\tToolRenderResultOptions,\n\tToolResultEvent,\n\tToolResultEventResult,\n\tTreePreparation,\n\tTurnEndEvent,\n\tTurnStartEvent,\n\t// Events - User Bash\n\tUserBashEvent,\n\tUserBashEventResult,\n\tWidgetPlacement,\n\tWorkingIndicatorOptions,\n\tWriteToolCallEvent,\n\tWriteToolResultEvent,\n} from \"./types.ts\";\n// Type guards\nexport {\n\tdefineTool,\n\tExecuteToolError,\n\tisBashToolResult,\n\tisEditToolResult,\n\tisFindToolResult,\n\tisGrepToolResult,\n\tisLsToolResult,\n\tisReadToolResult,\n\tisToolCallEventType,\n\tisWriteToolResult,\n} from \"./types.ts\";\nexport { wrapRegisteredTool, wrapRegisteredTools } from \"./wrapper.ts\";\n"]}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/extensions/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,EACN,sBAAsB,EACtB,yBAAyB,EACzB,wBAAwB,EACxB,cAAc,GACd,MAAM,aAAa,CAAC;AAarB,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AA8J9C,cAAc;AACd,OAAO,EACN,UAAU,EACV,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,GACjB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC","sourcesContent":["/*\n Extension system for lifecycle events and custom tools.\n */\n\nexport type { SlashCommandInfo, SlashCommandSource } from \"../slash-commands.ts\";\nexport type { SourceInfo } from \"../source-info.ts\";\nexport type { McpServerDeclaration } from \"./builtin/mcp/config-schema.ts\";\nexport {\n\tcreateExtensionRuntime,\n\tdiscoverAndLoadExtensions,\n\tloadExtensionFromFactory,\n\tloadExtensions,\n} from \"./loader.ts\";\nexport type {\n\tExtensionErrorListener,\n\tExtensionToolHookLifecycleEvent,\n\tExtensionToolHookLifecycleObserver,\n\tExtensionToolHookLifecycleStatus,\n\tExtensionToolHookName,\n\tForkHandler,\n\tNavigateTreeHandler,\n\tNewSessionHandler,\n\tShutdownHandler,\n\tSwitchSessionHandler,\n} from \"./runner.ts\";\nexport { ExtensionRunner } from \"./runner.ts\";\nexport type {\n\tAfterProviderResponseEvent,\n\tAgentEndEvent,\n\tAgentSettledEvent,\n\tAgentStartEvent,\n\t// Re-exports\n\tAgentToolResult,\n\tAgentToolUpdateCallback,\n\tAppendEntryHandler,\n\t// App keybindings (for custom editors)\n\tAppKeybinding,\n\tAutocompleteProviderFactory,\n\t// Events - Tool (ToolCallEvent types)\n\tBashToolCallEvent,\n\tBashToolResultEvent,\n\tBeforeAgentStartEvent,\n\tBeforeAgentStartEventResult,\n\tBeforeProviderHeadersEvent,\n\tBeforeProviderRequestEvent,\n\tBeforeProviderRequestEventResult,\n\tBuildSystemPromptOptions,\n\t// Context\n\tCompactOptions,\n\t// Events - Agent\n\tContextEvent,\n\t// Event Results\n\tContextEventResult,\n\tContextUsage,\n\tCustomToolCallEvent,\n\tCustomToolResultEvent,\n\tEditorFactory,\n\tEditToolCallEvent,\n\tEditToolResultEvent,\n\t// Message and Entry Rendering\n\tEntryRenderer,\n\tEntryRenderOptions,\n\tExecOptions,\n\tExecResult,\n\tExecuteToolErrorCode,\n\tExecuteToolHandler,\n\tExecuteToolOptions,\n\tExecuteToolResult,\n\tExecuteToolUpdateCallback,\n\tExtension,\n\tExtensionActions,\n\t// API\n\tExtensionAPI,\n\tExtensionCommandContext,\n\tExtensionCommandContextActions,\n\tExtensionContext,\n\tExtensionContextActions,\n\t// Errors\n\tExtensionError,\n\tExtensionEvent,\n\tExtensionFactory,\n\tExtensionFlag,\n\tExtensionHandler,\n\tExtensionMode,\n\t// Runtime\n\tExtensionRuntime,\n\tExtensionShortcut,\n\tExtensionUIContext,\n\tExtensionUIDialogOptions,\n\tExtensionWidgetOptions,\n\tFindToolCallEvent,\n\tFindToolResultEvent,\n\tGetActiveToolsHandler,\n\tGetAllToolsHandler,\n\tGetCommandsHandler,\n\tGetThinkingLevelHandler,\n\tGrepToolCallEvent,\n\tGrepToolResultEvent,\n\tInlineExtension,\n\t// Events - Input\n\tInputEvent,\n\tInputEventResult,\n\tInputSource,\n\tKeybindingsManager,\n\tLoadExtensionsResult,\n\tLsToolCallEvent,\n\tLsToolResultEvent,\n\t// Events - Message\n\tMessageEndEvent,\n\tMessageRenderer,\n\tMessageRenderOptions,\n\tMessageStartEvent,\n\tMessageUpdateEvent,\n\tModelSelectEvent,\n\tModelSelectEventResult,\n\tModelSelectSource,\n\tProjectTrustContext,\n\tProjectTrustEvent,\n\tProjectTrustEventDecision,\n\tProjectTrustEventResult,\n\tProjectTrustHandler,\n\t// Provider Registration\n\tProviderConfig,\n\tProviderModelConfig,\n\tReadToolCallEvent,\n\tReadToolResultEvent,\n\t// Commands\n\tRegisteredCommand,\n\tRegisteredTool,\n\tReplacedSessionContext,\n\tResolvedCommand,\n\t// Events - Resources\n\tResourcesDiscoverEvent,\n\tResourcesDiscoverResult,\n\tSendMessageHandler,\n\tSendUserMessageHandler,\n\tSessionBeforeCompactEvent,\n\tSessionBeforeCompactResult,\n\tSessionBeforeForkEvent,\n\tSessionBeforeForkResult,\n\tSessionBeforeSwitchEvent,\n\tSessionBeforeSwitchResult,\n\tSessionBeforeTreeEvent,\n\tSessionBeforeTreeResult,\n\tSessionCompactEvent,\n\tSessionEvent,\n\tSessionInfoChangedEvent,\n\tSessionShutdownEvent,\n\t// Events - Session\n\tSessionStartEvent,\n\tSessionTreeEvent,\n\tSetActiveToolsHandler,\n\tSetLabelHandler,\n\tSetModelHandler,\n\tSetThinkingLevelHandler,\n\tSystemPromptChangeEvent,\n\tTerminalInputHandler,\n\t// Events - Tool\n\tToolCallEvent,\n\tToolCallEventResult,\n\t// Tools\n\tToolDefinition,\n\t// Events - Tool Execution\n\tToolExecutionEndEvent,\n\t// Tool execution mode\n\tToolExecutionMode,\n\tToolExecutionStartEvent,\n\tToolExecutionUpdateEvent,\n\tToolInfo,\n\tToolRenderResultOptions,\n\tToolResultEvent,\n\tToolResultEventResult,\n\tTreePreparation,\n\tTurnEndEvent,\n\tTurnStartEvent,\n\t// Events - User Bash\n\tUserBashEvent,\n\tUserBashEventResult,\n\tWidgetPlacement,\n\tWorkingIndicatorOptions,\n\tWriteToolCallEvent,\n\tWriteToolResultEvent,\n} from \"./types.ts\";\n// Type guards\nexport {\n\tdefineTool,\n\tExecuteToolError,\n\tisBashToolResult,\n\tisEditToolResult,\n\tisFindToolResult,\n\tisGrepToolResult,\n\tisLsToolResult,\n\tisReadToolResult,\n\tisToolCallEventType,\n\tisWriteToolResult,\n} from \"./types.ts\";\nexport { wrapRegisteredTool, wrapRegisteredTools } from \"./wrapper.ts\";\n"]}

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

@@ -3,7 +3,7 @@
  *
  */
 import { type EventBus } from "../event-bus.ts";
-import type { Extension, ExtensionFactory, ExtensionRuntime, LoadExtensionsResult } from "./types.ts";
+import type { Extension, ExtensionFactory, ExtensionRuntime, LoadExtensionsResult, PendingProviderRegistration } from "./types.ts";
 export type ExtensionFactoryResolver = (extensionPath: string, resolvedPath: string) => ExtensionFactory | undefined;
 export declare function clearExtensionCache(): void;
 /**
@@ -11,6 +11,15 @@ export declare function clearExtensionCache(): void;
  * Runner.bindCore() replaces these with real implementations.
  */
 export declare function createExtensionRuntime(): ExtensionRuntime;
+/**
+ * Drain queued pre-bind provider registrations in original call order.
+ *
+ * Legacy (name/config) and native registrations queue in separate arrays during
+ * extension loading, each stamped with a shared sequence number. Flushers replay
+ * entries ordered by that sequence so mixed registerProvider(name, config) /
+ * registerProvider(provider) calls keep last-registration-wins. Clears both queues.
+ */
+export declare function drainPendingProviderRegistrations(runtime: ExtensionRuntime): PendingProviderRegistration[];
 /**
  * Create an Extension from an inline factory function.
  */

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;~~AAwBH~~,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;~~AAKhE~~,OAAO,KAAK,EAEX,SAAS,EAET,gBAAgB,EAChB,gBAAgB,EAChB,oBAAoB,~~EAKpB~~,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,~~CA+CzD~~;~~AA2QD~~;;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,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"}

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

@@ -28,6 +28,7 @@ import { createEventBus } from "../event-bus.js";
 import { execCommand } from "../exec.js";
 import { createSyntheticSourceInfo } from "../source-info.js";
 import { time } from "../timings.js";
+import { validateMcpServerDeclaration } from "./builtin/mcp/config-schema.js";
 /** Modules available to extensions via virtualModules (for compiled Bun binary) */
 const VIRTUAL_MODULES = {
     typebox: _bundledTypebox,
@@ -157,6 +158,9 @@ export function createExtensionRuntime() {
         throw new Error("Extension runtime not initialized. Action methods cannot be called during extension loading.");
     };
     const state = {};
+    // Shared sequence across the legacy and native pre-bind queues so flushers
+    // can replay registrations in original call order (last-registration-wins).
+    let nextProviderRegistrationOrder = 0;
     const assertActive = () => {
         if (state.staleMessage) {
             throw new Error(state.staleMessage);
@@ -181,6 +185,7 @@ export function createExtensionRuntime() {
         setThinkingLevel: notInitialized,
         flagValues: new Map(),
         pendingProviderRegistrations: [],
+        pendingNativeProviderRegistrations: [],
         assertActive,
         invalidate: (message) => {
             state.staleMessage ??=
@@ -190,14 +195,45 @@ export function createExtensionRuntime() {
         // Pre-bind: queue registrations so bindCore() can flush them once the
         // model registry is available. bindCore() replaces both with direct calls.
         registerProvider: (name, config, extensionPath = "<unknown>") => {
-            runtime.pendingProviderRegistrations.push({ name, config, extensionPath });
+            runtime.pendingProviderRegistrations.push({
+                name,
+                config,
+                extensionPath,
+                order: nextProviderRegistrationOrder++,
+            });
+        },
+        registerNativeProvider: (provider, extensionPath = "<unknown>") => {
+            runtime.pendingNativeProviderRegistrations.push({
+                provider,
+                extensionPath,
+                order: nextProviderRegistrationOrder++,
+            });
         },
         unregisterProvider: (name) => {
             runtime.pendingProviderRegistrations = runtime.pendingProviderRegistrations.filter((r) => r.name !== name);
+            runtime.pendingNativeProviderRegistrations = runtime.pendingNativeProviderRegistrations.filter((r) => r.provider.id !== name);
         },
     };
     return runtime;
 }
+/**
+ * Drain queued pre-bind provider registrations in original call order.
+ *
+ * Legacy (name/config) and native registrations queue in separate arrays during
+ * extension loading, each stamped with a shared sequence number. Flushers replay
+ * entries ordered by that sequence so mixed registerProvider(name, config) /
+ * registerProvider(provider) calls keep last-registration-wins. Clears both queues.
+ */
+export function drainPendingProviderRegistrations(runtime) {
+    const drained = [
+        ...runtime.pendingProviderRegistrations.map((entry) => ({ kind: "config", ...entry })),
+        ...runtime.pendingNativeProviderRegistrations.map((entry) => ({ kind: "native", ...entry })),
+    ];
+    drained.sort((a, b) => a.order - b.order);
+    runtime.pendingProviderRegistrations = [];
+    runtime.pendingNativeProviderRegistrations = [];
+    return drained;
+}
 /**
  * Create the ExtensionAPI for an extension.
  * Registration methods write to the extension object.
@@ -248,6 +284,19 @@ function createExtensionAPI(extension, runtime, cwd, eventBus) {
             extension.entryRenderers ??= new Map();
             extension.entryRenderers.set(customType, renderer);
         },
+        registerMcpServer(name, config) {
+            runtime.assertActive();
+            const error = validateMcpServerDeclaration(name, config);
+            if (error) {
+                throw new Error(error);
+            }
+            extension.mcpServers.set(name, {
+                name,
+                config,
+                extensionPath: extension.path,
+                registrationCwd: extension.registrationCwd,
+            });
+        },
         // Flag access - checks extension registered it, reads from runtime
         getFlag(name) {
             runtime.assertActive();
@@ -316,9 +365,15 @@ function createExtensionAPI(extension, runtime, cwd, eventBus) {
             runtime.assertActive();
             runtime.setThinkingLevel(level);
         },
-        registerProvider(name, config) {
+        registerProvider(providerOrName, config) {
             runtime.assertActive();
-            runtime.registerProvider(name, config, extension.path);
+            if (typeof providerOrName === "string") {
+                if (!config)
+                    throw new Error("Provider config is required when registering by name");
+                runtime.registerProvider(providerOrName, config, extension.path);
+                return;
+            }
+            runtime.registerNativeProvider(providerOrName, extension.path);
         },
         unregisterProvider(name) {
             runtime.assertActive();
@@ -363,7 +418,7 @@ async function loadExtensionModule(extensionPath, importer, cacheToken) {
 /**
  * Create an Extension object with empty collections.
  */
-function createExtension(extensionPath, resolvedPath) {
+function createExtension(extensionPath, resolvedPath, registrationCwd) {
     const source = extensionPath.startsWith("<") && extensionPath.endsWith(">")
         ? extensionPath.slice(1, -1).split(":")[0] || "temporary"
         : "local";
@@ -375,10 +430,12 @@ function createExtension(extensionPath, resolvedPath) {
         handlers: new Map(),
         tools: new Map(),
         messageRenderers: new Map(),
-        entryRenderers: new Map(),
+        entryRenderers: undefined,
         commands: new Map(),
         flags: new Map(),
         shortcuts: new Map(),
+        mcpServers: new Map(),
+        registrationCwd,
     };
 }
 async function loadExtension(extensionPath, cwd, eventBus, runtime, getImporter, factoryResolver, cacheToken) {
@@ -390,7 +447,7 @@ async function loadExtension(extensionPath, cwd, eventBus, runtime, getImporter,
         if (!factory) {
             return { extension: null, error: `Extension does not export a valid factory function: ${extensionPath}` };
         }
-        const extension = createExtension(extensionPath, resolvedPath);
+        const extension = createExtension(extensionPath, resolvedPath, cwd);
         const api = createExtensionAPI(extension, runtime, cwd, eventBus);
         await factory(api);
         time(`${extensionPath} factory`, "extensions");
@@ -405,8 +462,8 @@ async function loadExtension(extensionPath, cwd, eventBus, runtime, getImporter,
  * Create an Extension from an inline factory function.
  */
 export async function loadExtensionFromFactory(factory, cwd, eventBus, runtime, extensionPath = "<inline>") {
-    const extension = createExtension(extensionPath, extensionPath);
     const resolvedCwd = resolvePath(cwd);
+    const extension = createExtension(extensionPath, extensionPath, resolvedCwd);
     const api = createExtensionAPI(extension, runtime, resolvedCwd, eventBus);
     await factory(api);
     time(`${extensionPath} factory`, "extensions");