@code-yeongyu/senpi 2026.8.10 → 2026.8.11-3

package/dist/core/extensions/builtin/{mcp/expose → tool-search/engine}/bm25.js

@@ -1,19 +1,7 @@
-// Zero-dependency BM25 tool-search engine (todo 30).
-//
-// Ranks MCP tools by relevance of a free-text query against tokenised
-// name + description, with a server-name field boost. A normalised exact-name
-// match short-circuits BEFORE BM25 (hyphen/underscore/case-insensitive) so a
-// query equal to a tool's own name always wins rank-1 even when raw BM25
-// term-frequency would float noisier tools above it (codex #21503 regression
-// class). Constants k1=0.9, b=0.4 are SPEC-verified.
-//
-// Ranking is deterministic: equal scores tie-break by ascending full name.
 const BM25_K1 = 0.9;
 const BM25_B = 0.4;
-// Field weights applied to term frequency. Name tokens matter most; the server
-// name gets a modest boost; description is the baseline signal.
 const NAME_FIELD_WEIGHT = 3;
-const SERVER_FIELD_WEIGHT = 2;
+const GROUP_FIELD_WEIGHT = 2;
 const DESCRIPTION_FIELD_WEIGHT = 1;
 const DEFAULT_LIMIT = 25;
 export function buildBm25Index(docs) {
@@ -29,7 +17,8 @@ export function buildBm25Index(docs) {
     const docCount = indexed.length;
     return {
         search(query, limit = DEFAULT_LIMIT, options = {}) {
-            const pool = options.server === undefined ? indexed : indexed.filter((entry) => entry.doc.server === options.server);
+            const pool = indexed.filter((entry) => (options.source === undefined || entry.doc.source === options.source) &&
+                (options.group === undefined || entry.doc.group === options.group));
             const queryTerms = tokenizeToolText(query);
             if (queryTerms.length === 0)
                 return [];
@@ -37,7 +26,7 @@ export function buildBm25Index(docs) {
             const normQuery = normalizeToolName(query);
             const results = [];
             for (const entry of pool) {
-                const exact = useExact && normQuery.length > 0 && isExactNameMatch(entry, normQuery);
+                const exact = useExact && normQuery.length > 0 && entry.exactNames.has(normQuery);
                 const score = bm25Score(entry, queryTerms, docFreq, avgLength, docCount);
                 if (!exact && score <= 0)
                     continue;
@@ -51,17 +40,22 @@ export function buildBm25Index(docs) {
 function indexDoc(doc) {
     const termFreq = new Map();
     addField(termFreq, tokenizeToolText(doc.name), NAME_FIELD_WEIGHT);
-    addField(termFreq, tokenizeToolText(doc.toolName), NAME_FIELD_WEIGHT);
-    addField(termFreq, tokenizeToolText(doc.server), SERVER_FIELD_WEIGHT);
+    addField(termFreq, tokenizeToolText(doc.label), NAME_FIELD_WEIGHT);
+    for (const alias of doc.aliases)
+        addField(termFreq, tokenizeToolText(alias), NAME_FIELD_WEIGHT);
+    for (const keyword of doc.keywords)
+        addField(termFreq, tokenizeToolText(keyword), NAME_FIELD_WEIGHT);
+    addField(termFreq, tokenizeToolText(doc.group), GROUP_FIELD_WEIGHT);
+    addField(termFreq, tokenizeToolText(doc.ownerLabel), GROUP_FIELD_WEIGHT);
     addField(termFreq, tokenizeToolText(doc.description ?? ""), DESCRIPTION_FIELD_WEIGHT);
+    addField(termFreq, tokenizeToolText(doc.searchText ?? ""), DESCRIPTION_FIELD_WEIGHT);
     let length = 0;
     for (const count of termFreq.values())
         length += count;
     return {
         doc,
+        exactNames: new Set([doc.name, doc.label, ...doc.aliases, ...doc.keywords].map(normalizeToolName)),
         length,
-        normName: normalizeToolName(doc.name),
-        normToolName: normalizeToolName(doc.toolName),
         termFreq,
     };
 }
@@ -87,14 +81,9 @@ function bm25Score(entry, queryTerms, docFreq, avgLength, docCount) {
     return score;
 }
 function inverseDocFreq(termDocFreq, docCount) {
-    // BM25 idf with the standard +1 smoothing; clamped to be non-negative so a
-    // term present in every doc never contributes a negative score.
     const value = Math.log(1 + (docCount - termDocFreq + 0.5) / (termDocFreq + 0.5));
     return value < 0 ? 0 : value;
 }
-function isExactNameMatch(entry, normQuery) {
-    return normQuery === entry.normName || normQuery === entry.normToolName;
-}
 function compareResults(left, right) {
     if (left.exact !== right.exact)
         return left.exact ? -1 : 1;
@@ -102,15 +91,11 @@ function compareResults(left, right) {
         return right.score - left.score;
     return left.name.localeCompare(right.name);
 }
-/** Tokenise a tool identifier or description into lowercase word tokens,
- * splitting snake_case, kebab-case and camelCase / PascalCase boundaries. */
+/** Tokenise searchable text into lowercase word tokens, splitting identifiers. */
 export function tokenizeToolText(text) {
     if (text.length === 0)
         return [];
-    const withBoundaries = text
-        // camelCase / PascalCase: insert a space at lower->Upper and Upper->UpperLower boundaries.
-        .replace(/([a-z0-9])([A-Z])/g, "$1 $2")
-        .replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2");
+    const withBoundaries = text.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2");
     const tokens = [];
     for (const raw of withBoundaries.split(/[^a-zA-Z0-9]+/)) {
         if (raw.length === 0)
@@ -119,7 +104,7 @@ export function tokenizeToolText(text) {
     }
     return tokens;
 }
-/** Normalise a tool name for exact matching: lowercase, strip separators. */
+/** Normalize a searchable name for separator- and case-insensitive exact matching. */
 export function normalizeToolName(name) {
     return name.toLowerCase().replace(/[-_\s]+/g, "");
 }

package/dist/core/extensions/builtin/tool-search/engine/bm25.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bm25.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/tool-search/engine/bm25.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ToolSearchDocument, ToolSearchSource } from \"./document.ts\";\n\nconst BM25_K1 = 0.9;\nconst BM25_B = 0.4;\n\nconst NAME_FIELD_WEIGHT = 3;\nconst GROUP_FIELD_WEIGHT = 2;\nconst DESCRIPTION_FIELD_WEIGHT = 1;\n\nexport interface Bm25Result {\n\treadonly name: string;\n\treadonly score: number;\n\treadonly exact: boolean;\n\treadonly doc: ToolSearchDocument;\n}\n\nexport interface Bm25SearchOptions {\n\treadonly source?: ToolSearchSource;\n\treadonly group?: string;\n\t/** Disable the exact-name short-circuit (used to prove BM25-alone behaviour). */\n\treadonly exactMatch?: boolean;\n}\n\nexport interface Bm25Index {\n\tsearch(query: string, limit?: number, options?: Bm25SearchOptions): Bm25Result[];\n}\n\ninterface IndexedDoc {\n\treadonly doc: ToolSearchDocument;\n\treadonly termFreq: ReadonlyMap<string, number>;\n\treadonly length: number;\n\treadonly exactNames: ReadonlySet<string>;\n}\n\nconst DEFAULT_LIMIT = 25;\n\nexport function buildBm25Index(docs: readonly ToolSearchDocument[]): Bm25Index {\n\tconst indexed = docs.map(indexDoc);\n\tconst docFreq = new Map<string, number>();\n\tfor (const entry of indexed) {\n\t\tfor (const term of entry.termFreq.keys()) {\n\t\t\tdocFreq.set(term, (docFreq.get(term) ?? 0) + 1);\n\t\t}\n\t}\n\tconst totalLength = indexed.reduce((sum, entry) => sum + entry.length, 0);\n\tconst avgLength = indexed.length === 0 ? 0 : totalLength / indexed.length;\n\tconst docCount = indexed.length;\n\n\treturn {\n\t\tsearch(query, limit = DEFAULT_LIMIT, options = {}): Bm25Result[] {\n\t\t\tconst pool = indexed.filter(\n\t\t\t\t(entry) =>\n\t\t\t\t\t(options.source === undefined || entry.doc.source === options.source) &&\n\t\t\t\t\t(options.group === undefined || entry.doc.group === options.group),\n\t\t\t);\n\t\t\tconst queryTerms = tokenizeToolText(query);\n\t\t\tif (queryTerms.length === 0) return [];\n\n\t\t\tconst useExact = options.exactMatch !== false;\n\t\t\tconst normQuery = normalizeToolName(query);\n\t\t\tconst results: Bm25Result[] = [];\n\t\t\tfor (const entry of pool) {\n\t\t\t\tconst exact = useExact && normQuery.length > 0 && entry.exactNames.has(normQuery);\n\t\t\t\tconst score = bm25Score(entry, queryTerms, docFreq, avgLength, docCount);\n\t\t\t\tif (!exact && score <= 0) continue;\n\t\t\t\tresults.push({ doc: entry.doc, exact, name: entry.doc.name, score });\n\t\t\t}\n\t\t\tresults.sort(compareResults);\n\t\t\treturn results.slice(0, Math.max(0, limit));\n\t\t},\n\t};\n}\n\nfunction indexDoc(doc: ToolSearchDocument): IndexedDoc {\n\tconst termFreq = new Map<string, number>();\n\taddField(termFreq, tokenizeToolText(doc.name), NAME_FIELD_WEIGHT);\n\taddField(termFreq, tokenizeToolText(doc.label), NAME_FIELD_WEIGHT);\n\tfor (const alias of doc.aliases) addField(termFreq, tokenizeToolText(alias), NAME_FIELD_WEIGHT);\n\tfor (const keyword of doc.keywords) addField(termFreq, tokenizeToolText(keyword), NAME_FIELD_WEIGHT);\n\taddField(termFreq, tokenizeToolText(doc.group), GROUP_FIELD_WEIGHT);\n\taddField(termFreq, tokenizeToolText(doc.ownerLabel), GROUP_FIELD_WEIGHT);\n\taddField(termFreq, tokenizeToolText(doc.description ?? \"\"), DESCRIPTION_FIELD_WEIGHT);\n\taddField(termFreq, tokenizeToolText(doc.searchText ?? \"\"), DESCRIPTION_FIELD_WEIGHT);\n\n\tlet length = 0;\n\tfor (const count of termFreq.values()) length += count;\n\treturn {\n\t\tdoc,\n\t\texactNames: new Set([doc.name, doc.label, ...doc.aliases, ...doc.keywords].map(normalizeToolName)),\n\t\tlength,\n\t\ttermFreq,\n\t};\n}\n\nfunction addField(termFreq: Map<string, number>, tokens: readonly string[], weight: number): void {\n\tfor (const token of tokens) {\n\t\ttermFreq.set(token, (termFreq.get(token) ?? 0) + weight);\n\t}\n}\n\nfunction bm25Score(\n\tentry: IndexedDoc,\n\tqueryTerms: readonly string[],\n\tdocFreq: ReadonlyMap<string, number>,\n\tavgLength: number,\n\tdocCount: number,\n): number {\n\tlet score = 0;\n\tconst seen = new Set<string>();\n\tfor (const term of queryTerms) {\n\t\tif (seen.has(term)) continue;\n\t\tseen.add(term);\n\t\tconst tf = entry.termFreq.get(term);\n\t\tif (tf === undefined) continue;\n\t\tconst idf = inverseDocFreq(docFreq.get(term) ?? 0, docCount);\n\t\tconst denom = tf + BM25_K1 * (1 - BM25_B + (BM25_B * entry.length) / (avgLength || 1));\n\t\tscore += idf * ((tf * (BM25_K1 + 1)) / (denom || 1));\n\t}\n\treturn score;\n}\n\nfunction inverseDocFreq(termDocFreq: number, docCount: number): number {\n\tconst value = Math.log(1 + (docCount - termDocFreq + 0.5) / (termDocFreq + 0.5));\n\treturn value < 0 ? 0 : value;\n}\n\nfunction compareResults(left: Bm25Result, right: Bm25Result): number {\n\tif (left.exact !== right.exact) return left.exact ? -1 : 1;\n\tif (right.score !== left.score) return right.score - left.score;\n\treturn left.name.localeCompare(right.name);\n}\n\n/** Tokenise searchable text into lowercase word tokens, splitting identifiers. */\nexport function tokenizeToolText(text: string): string[] {\n\tif (text.length === 0) return [];\n\tconst withBoundaries = text.replace(/([a-z0-9])([A-Z])/g, \"$1 $2\").replace(/([A-Z]+)([A-Z][a-z])/g, \"$1 $2\");\n\tconst tokens: string[] = [];\n\tfor (const raw of withBoundaries.split(/[^a-zA-Z0-9]+/)) {\n\t\tif (raw.length === 0) continue;\n\t\ttokens.push(raw.toLowerCase());\n\t}\n\treturn tokens;\n}\n\n/** Normalize a searchable name for separator- and case-insensitive exact matching. */\nexport function normalizeToolName(name: string): string {\n\treturn name.toLowerCase().replace(/[-_\\s]+/g, \"\");\n}\n"]}

package/dist/core/extensions/builtin/tool-search/engine/document.d.ts

@@ -0,0 +1,14 @@
+export type ToolSearchSource = "mcp" | "extension";
+export interface ToolSearchDocument {
+    readonly name: string;
+    readonly label: string;
+    readonly aliases: readonly string[];
+    readonly description?: string;
+    readonly searchText?: string;
+    readonly keywords: readonly string[];
+    readonly source: ToolSearchSource;
+    readonly group: string;
+    readonly ownerLabel: string;
+    readonly registrationId: string;
+}
+//# sourceMappingURL=document.d.ts.map

package/dist/core/extensions/builtin/tool-search/engine/document.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/tool-search/engine/document.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GAAG,KAAK,GAAG,WAAW,CAAC;AAEnD,MAAM,WAAW,kBAAkB;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CAChC"}

package/dist/core/extensions/builtin/tool-search/engine/document.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=document.js.map

package/dist/core/extensions/builtin/tool-search/engine/document.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"document.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/tool-search/engine/document.ts"],"names":[],"mappings":"","sourcesContent":["export type ToolSearchSource = \"mcp\" | \"extension\";\n\nexport interface ToolSearchDocument {\n\treadonly name: string;\n\treadonly label: string;\n\treadonly aliases: readonly string[];\n\treadonly description?: string;\n\treadonly searchText?: string;\n\treadonly keywords: readonly string[];\n\treadonly source: ToolSearchSource;\n\treadonly group: string;\n\treadonly ownerLabel: string;\n\treadonly registrationId: string;\n}\n"]}

package/dist/core/extensions/builtin/tool-search/engine/marker.d.ts

@@ -0,0 +1,55 @@
+export declare const TOOL_SEARCH_ACTIVATION_MARKER_V2 = "[tool_search:activated:v2]";
+export declare const LEGACY_TOOL_SEARCH_ACTIVATION_MARKER = "[tool_search:activated]";
+export interface ToolActivationIdentity {
+    name: string;
+    registrationId: string;
+}
+export type ParsedActivationMarker = {
+    version: 2;
+    activations: ToolActivationIdentity[];
+} | {
+    version: 1;
+    names: string[];
+};
+export interface RehydratableToolSearchDocument {
+    name: string;
+    registrationId: string;
+    source: "mcp" | "extension";
+    allowLazyActivation?: boolean;
+}
+export type RegistrationIdentityInput = {
+    source: "mcp";
+    server: string;
+    name: string;
+} | {
+    source: "extension";
+    sourceInfo: {
+        path: string;
+        resolvedPath?: string;
+    };
+    name: string;
+};
+/**
+ * Derive the host-owned registration identity for a tool. Authors must never
+ * supply this value: it binds an activation marker to the canonical owner and
+ * tool name selected by the current registry generation.
+ */
+export declare function deriveRegistrationId(input: RegistrationIdentityInput): string;
+export declare function deriveMcpRegistrationId(server: string, toolName: string): string;
+export declare function deriveExtensionRegistrationId(sourceInfo: {
+    path: string;
+    resolvedPath?: string;
+}, toolName: string): string;
+/** Emit a compact ownership-aware activation marker for persisted history. */
+export declare function emitActivationMarker(activations: readonly ToolActivationIdentity[]): string;
+/** Parse ownership-aware v2 markers and legacy MCP name-only markers. */
+export declare function parseActivationMarkers(messages: readonly unknown[]): ParsedActivationMarker[];
+/**
+ * Restore valid activation history against the current winning registry docs.
+ *
+ * This pure scan is intended to run ONCE per registry generation. The owning
+ * service is responsible for generation-level memoization; callers must not
+ * continuously reapply history after each active-tool update.
+ */
+export declare function rehydrate(messages: readonly unknown[], currentDocsByName: ReadonlyMap<string, RehydratableToolSearchDocument>): string[];
+//# sourceMappingURL=marker.d.ts.map

package/dist/core/extensions/builtin/tool-search/engine/marker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"marker.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/tool-search/engine/marker.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gCAAgC,+BAA+B,CAAC;AAC7E,eAAO,MAAM,oCAAoC,4BAA4B,CAAC;AAE9E,MAAM,WAAW,sBAAsB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,sBAAsB,GAC/B;IAAE,OAAO,EAAE,CAAC,CAAC;IAAC,WAAW,EAAE,sBAAsB,EAAE,CAAA;CAAE,GACrD;IAAE,OAAO,EAAE,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEnC,MAAM,WAAW,8BAA8B;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,KAAK,GAAG,WAAW,CAAC;IAC5B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,MAAM,yBAAyB,GAClC;IAAE,MAAM,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC/C;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9F;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,GAAG,MAAM,CAG7E;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEhF;AAED,wBAAgB,6BAA6B,CAC5C,UAAU,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,EACnD,QAAQ,EAAE,MAAM,GACd,MAAM,CAER;AAED,8EAA8E;AAC9E,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,SAAS,sBAAsB,EAAE,GAAG,MAAM,CAE3F;AAED,yEAAyE;AACzE,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,GAAG,sBAAsB,EAAE,CAuB7F;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CACxB,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,iBAAiB,EAAE,WAAW,CAAC,MAAM,EAAE,8BAA8B,CAAC,GACpE,MAAM,EAAE,CAuBV"}

package/dist/core/extensions/builtin/tool-search/engine/marker.js

@@ -0,0 +1,189 @@
+export const TOOL_SEARCH_ACTIVATION_MARKER_V2 = "[tool_search:activated:v2]";
+export const LEGACY_TOOL_SEARCH_ACTIVATION_MARKER = "[tool_search:activated]";
+/**
+ * Derive the host-owned registration identity for a tool. Authors must never
+ * supply this value: it binds an activation marker to the canonical owner and
+ * tool name selected by the current registry generation.
+ */
+export function deriveRegistrationId(input) {
+    if (input.source === "mcp")
+        return `mcp\0${input.server}\0${input.name}`;
+    return `${input.sourceInfo.resolvedPath ?? input.sourceInfo.path}\0${input.name}`;
+}
+export function deriveMcpRegistrationId(server, toolName) {
+    return deriveRegistrationId({ source: "mcp", server, name: toolName });
+}
+export function deriveExtensionRegistrationId(sourceInfo, toolName) {
+    return deriveRegistrationId({ source: "extension", sourceInfo, name: toolName });
+}
+/** Emit a compact ownership-aware activation marker for persisted history. */
+export function emitActivationMarker(activations) {
+    return `${TOOL_SEARCH_ACTIVATION_MARKER_V2} ${JSON.stringify(activations)}`;
+}
+/** Parse ownership-aware v2 markers and legacy MCP name-only markers. */
+export function parseActivationMarkers(messages) {
+    const markers = [];
+    for (const message of messages) {
+        let blob;
+        try {
+            blob = JSON.stringify(message) ?? "";
+        }
+        catch {
+            continue;
+        }
+        for (const payload of extractV2Payloads(blob)) {
+            const activations = parseV2Payload(payload);
+            if (activations.length > 0)
+                markers.push({ version: 2, activations });
+        }
+        for (const segment of extractLegacyActivationSegments(blob)) {
+            const names = segment
+                .trim()
+                .split(/\s+/)
+                .filter((name) => name.length > 0);
+            if (names.length > 0)
+                markers.push({ version: 1, names });
+        }
+    }
+    return markers;
+}
+/**
+ * Restore valid activation history against the current winning registry docs.
+ *
+ * This pure scan is intended to run ONCE per registry generation. The owning
+ * service is responsible for generation-level memoization; callers must not
+ * continuously reapply history after each active-tool update.
+ */
+export function rehydrate(messages, currentDocsByName) {
+    const restored = new Set();
+    for (const marker of parseActivationMarkers(messages)) {
+        if (marker.version === 2) {
+            for (const activation of marker.activations) {
+                const current = currentDocsByName.get(activation.name);
+                if (current !== undefined &&
+                    current.allowLazyActivation !== false &&
+                    current.registrationId === activation.registrationId) {
+                    restored.add(activation.name);
+                }
+            }
+            continue;
+        }
+        for (const name of marker.names) {
+            const current = currentDocsByName.get(name);
+            if (current?.source === "mcp" && current.allowLazyActivation !== false)
+                restored.add(name);
+        }
+    }
+    return [...restored].sort();
+}
+function extractV2Payloads(blob) {
+    const payloads = [];
+    let cursor = blob.indexOf(TOOL_SEARCH_ACTIVATION_MARKER_V2);
+    while (cursor >= 0) {
+        const encodedRemainder = extractEncodedJsonStringRemainder(blob, cursor + TOOL_SEARCH_ACTIVATION_MARKER_V2.length);
+        if (encodedRemainder !== undefined) {
+            try {
+                const decodedRemainder = JSON.parse(`"${encodedRemainder}"`);
+                if (typeof decodedRemainder === "string") {
+                    const payload = extractJsonArrayPrefix(decodedRemainder.trimStart());
+                    if (payload !== undefined)
+                        payloads.push(payload);
+                }
+            }
+            catch {
+                // Malformed history is ignored during best-effort rehydration.
+            }
+        }
+        cursor = blob.indexOf(TOOL_SEARCH_ACTIVATION_MARKER_V2, cursor + TOOL_SEARCH_ACTIVATION_MARKER_V2.length);
+    }
+    return payloads;
+}
+function extractEncodedJsonStringRemainder(blob, start) {
+    let encoded = "";
+    for (let index = start; index < blob.length; index++) {
+        const character = blob[index];
+        if (character === '"')
+            return encoded;
+        if (character === "\n")
+            return undefined;
+        if (character === "\\") {
+            const escaped = blob[index + 1];
+            if (escaped === undefined)
+                return undefined;
+            encoded += character + escaped;
+            index++;
+            continue;
+        }
+        encoded += character;
+    }
+    return undefined;
+}
+function extractJsonArrayPrefix(text) {
+    if (!text.startsWith("["))
+        return undefined;
+    let depth = 0;
+    let inString = false;
+    let escaped = false;
+    for (let index = 0; index < text.length; index++) {
+        const character = text[index];
+        if (inString) {
+            if (escaped)
+                escaped = false;
+            else if (character === "\\")
+                escaped = true;
+            else if (character === '"')
+                inString = false;
+            continue;
+        }
+        if (character === '"')
+            inString = true;
+        else if (character === "[")
+            depth++;
+        else if (character === "]") {
+            depth--;
+            if (depth === 0)
+                return text.slice(0, index + 1);
+            if (depth < 0)
+                return undefined;
+        }
+    }
+    return undefined;
+}
+function parseV2Payload(payload) {
+    try {
+        const parsed = JSON.parse(payload);
+        if (!Array.isArray(parsed))
+            return [];
+        return parsed.filter(isToolActivationIdentity);
+    }
+    catch {
+        return [];
+    }
+}
+function isToolActivationIdentity(value) {
+    if (typeof value !== "object" || value === null)
+        return false;
+    const candidate = value;
+    return (typeof candidate.name === "string" &&
+        candidate.name.length > 0 &&
+        typeof candidate.registrationId === "string" &&
+        candidate.registrationId.length > 0);
+}
+/**
+ * Keep this scanner byte-for-byte equivalent to the legacy MCP extraction
+ * semantics so old JSON-stringified session history remains compatible.
+ */
+function extractLegacyActivationSegments(blob) {
+    const segments = [];
+    let cursor = blob.indexOf(LEGACY_TOOL_SEARCH_ACTIVATION_MARKER);
+    while (cursor >= 0) {
+        const rest = blob.slice(cursor + LEGACY_TOOL_SEARCH_ACTIVATION_MARKER.length);
+        // Tool names are [a-zA-Z0-9_-]; stop at the first JSON string terminator
+        // (quote / escape) or newline so we never swallow the rest of the blob.
+        const end = rest.search(/["\\\n]/);
+        segments.push(end < 0 ? rest : rest.slice(0, end));
+        cursor = blob.indexOf(LEGACY_TOOL_SEARCH_ACTIVATION_MARKER, cursor + LEGACY_TOOL_SEARCH_ACTIVATION_MARKER.length);
+    }
+    return segments;
+}
+//# sourceMappingURL=marker.js.map

package/dist/core/extensions/builtin/tool-search/engine/marker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"marker.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/tool-search/engine/marker.ts"],"names":[],"mappings":"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","sourcesContent":["export const TOOL_SEARCH_ACTIVATION_MARKER_V2 = \"[tool_search:activated:v2]\";\nexport const LEGACY_TOOL_SEARCH_ACTIVATION_MARKER = \"[tool_search:activated]\";\n\nexport interface ToolActivationIdentity {\n\tname: string;\n\tregistrationId: string;\n}\n\nexport type ParsedActivationMarker =\n\t| { version: 2; activations: ToolActivationIdentity[] }\n\t| { version: 1; names: string[] };\n\nexport interface RehydratableToolSearchDocument {\n\tname: string;\n\tregistrationId: string;\n\tsource: \"mcp\" | \"extension\";\n\tallowLazyActivation?: boolean;\n}\n\nexport type RegistrationIdentityInput =\n\t| { source: \"mcp\"; server: string; name: string }\n\t| { source: \"extension\"; sourceInfo: { path: string; resolvedPath?: string }; name: string };\n\n/**\n * Derive the host-owned registration identity for a tool. Authors must never\n * supply this value: it binds an activation marker to the canonical owner and\n * tool name selected by the current registry generation.\n */\nexport function deriveRegistrationId(input: RegistrationIdentityInput): string {\n\tif (input.source === \"mcp\") return `mcp\\0${input.server}\\0${input.name}`;\n\treturn `${input.sourceInfo.resolvedPath ?? input.sourceInfo.path}\\0${input.name}`;\n}\n\nexport function deriveMcpRegistrationId(server: string, toolName: string): string {\n\treturn deriveRegistrationId({ source: \"mcp\", server, name: toolName });\n}\n\nexport function deriveExtensionRegistrationId(\n\tsourceInfo: { path: string; resolvedPath?: string },\n\ttoolName: string,\n): string {\n\treturn deriveRegistrationId({ source: \"extension\", sourceInfo, name: toolName });\n}\n\n/** Emit a compact ownership-aware activation marker for persisted history. */\nexport function emitActivationMarker(activations: readonly ToolActivationIdentity[]): string {\n\treturn `${TOOL_SEARCH_ACTIVATION_MARKER_V2} ${JSON.stringify(activations)}`;\n}\n\n/** Parse ownership-aware v2 markers and legacy MCP name-only markers. */\nexport function parseActivationMarkers(messages: readonly unknown[]): ParsedActivationMarker[] {\n\tconst markers: ParsedActivationMarker[] = [];\n\tfor (const message of messages) {\n\t\tlet blob: string;\n\t\ttry {\n\t\t\tblob = JSON.stringify(message) ?? \"\";\n\t\t} catch {\n\t\t\tcontinue;\n\t\t}\n\n\t\tfor (const payload of extractV2Payloads(blob)) {\n\t\t\tconst activations = parseV2Payload(payload);\n\t\t\tif (activations.length > 0) markers.push({ version: 2, activations });\n\t\t}\n\t\tfor (const segment of extractLegacyActivationSegments(blob)) {\n\t\t\tconst names = segment\n\t\t\t\t.trim()\n\t\t\t\t.split(/\\s+/)\n\t\t\t\t.filter((name) => name.length > 0);\n\t\t\tif (names.length > 0) markers.push({ version: 1, names });\n\t\t}\n\t}\n\treturn markers;\n}\n\n/**\n * Restore valid activation history against the current winning registry docs.\n *\n * This pure scan is intended to run ONCE per registry generation. The owning\n * service is responsible for generation-level memoization; callers must not\n * continuously reapply history after each active-tool update.\n */\nexport function rehydrate(\n\tmessages: readonly unknown[],\n\tcurrentDocsByName: ReadonlyMap<string, RehydratableToolSearchDocument>,\n): string[] {\n\tconst restored = new Set<string>();\n\tfor (const marker of parseActivationMarkers(messages)) {\n\t\tif (marker.version === 2) {\n\t\t\tfor (const activation of marker.activations) {\n\t\t\t\tconst current = currentDocsByName.get(activation.name);\n\t\t\t\tif (\n\t\t\t\t\tcurrent !== undefined &&\n\t\t\t\t\tcurrent.allowLazyActivation !== false &&\n\t\t\t\t\tcurrent.registrationId === activation.registrationId\n\t\t\t\t) {\n\t\t\t\t\trestored.add(activation.name);\n\t\t\t\t}\n\t\t\t}\n\t\t\tcontinue;\n\t\t}\n\n\t\tfor (const name of marker.names) {\n\t\t\tconst current = currentDocsByName.get(name);\n\t\t\tif (current?.source === \"mcp\" && current.allowLazyActivation !== false) restored.add(name);\n\t\t}\n\t}\n\treturn [...restored].sort();\n}\n\nfunction extractV2Payloads(blob: string): string[] {\n\tconst payloads: string[] = [];\n\tlet cursor = blob.indexOf(TOOL_SEARCH_ACTIVATION_MARKER_V2);\n\twhile (cursor >= 0) {\n\t\tconst encodedRemainder = extractEncodedJsonStringRemainder(\n\t\t\tblob,\n\t\t\tcursor + TOOL_SEARCH_ACTIVATION_MARKER_V2.length,\n\t\t);\n\t\tif (encodedRemainder !== undefined) {\n\t\t\ttry {\n\t\t\t\tconst decodedRemainder = JSON.parse(`\"${encodedRemainder}\"`) as unknown;\n\t\t\t\tif (typeof decodedRemainder === \"string\") {\n\t\t\t\t\tconst payload = extractJsonArrayPrefix(decodedRemainder.trimStart());\n\t\t\t\t\tif (payload !== undefined) payloads.push(payload);\n\t\t\t\t}\n\t\t\t} catch {\n\t\t\t\t// Malformed history is ignored during best-effort rehydration.\n\t\t\t}\n\t\t}\n\t\tcursor = blob.indexOf(TOOL_SEARCH_ACTIVATION_MARKER_V2, cursor + TOOL_SEARCH_ACTIVATION_MARKER_V2.length);\n\t}\n\treturn payloads;\n}\n\nfunction extractEncodedJsonStringRemainder(blob: string, start: number): string | undefined {\n\tlet encoded = \"\";\n\tfor (let index = start; index < blob.length; index++) {\n\t\tconst character = blob[index];\n\t\tif (character === '\"') return encoded;\n\t\tif (character === \"\\n\") return undefined;\n\t\tif (character === \"\\\\\") {\n\t\t\tconst escaped = blob[index + 1];\n\t\t\tif (escaped === undefined) return undefined;\n\t\t\tencoded += character + escaped;\n\t\t\tindex++;\n\t\t\tcontinue;\n\t\t}\n\t\tencoded += character;\n\t}\n\treturn undefined;\n}\n\nfunction extractJsonArrayPrefix(text: string): string | undefined {\n\tif (!text.startsWith(\"[\")) return undefined;\n\tlet depth = 0;\n\tlet inString = false;\n\tlet escaped = false;\n\tfor (let index = 0; index < text.length; index++) {\n\t\tconst character = text[index];\n\t\tif (inString) {\n\t\t\tif (escaped) escaped = false;\n\t\t\telse if (character === \"\\\\\") escaped = true;\n\t\t\telse if (character === '\"') inString = false;\n\t\t\tcontinue;\n\t\t}\n\t\tif (character === '\"') inString = true;\n\t\telse if (character === \"[\") depth++;\n\t\telse if (character === \"]\") {\n\t\t\tdepth--;\n\t\t\tif (depth === 0) return text.slice(0, index + 1);\n\t\t\tif (depth < 0) return undefined;\n\t\t}\n\t}\n\treturn undefined;\n}\n\nfunction parseV2Payload(payload: string): ToolActivationIdentity[] {\n\ttry {\n\t\tconst parsed = JSON.parse(payload) as unknown;\n\t\tif (!Array.isArray(parsed)) return [];\n\t\treturn parsed.filter(isToolActivationIdentity);\n\t} catch {\n\t\treturn [];\n\t}\n}\n\nfunction isToolActivationIdentity(value: unknown): value is ToolActivationIdentity {\n\tif (typeof value !== \"object\" || value === null) return false;\n\tconst candidate = value as { name?: unknown; registrationId?: unknown };\n\treturn (\n\t\ttypeof candidate.name === \"string\" &&\n\t\tcandidate.name.length > 0 &&\n\t\ttypeof candidate.registrationId === \"string\" &&\n\t\tcandidate.registrationId.length > 0\n\t);\n}\n\n/**\n * Keep this scanner byte-for-byte equivalent to the legacy MCP extraction\n * semantics so old JSON-stringified session history remains compatible.\n */\nfunction extractLegacyActivationSegments(blob: string): string[] {\n\tconst segments: string[] = [];\n\tlet cursor = blob.indexOf(LEGACY_TOOL_SEARCH_ACTIVATION_MARKER);\n\twhile (cursor >= 0) {\n\t\tconst rest = blob.slice(cursor + LEGACY_TOOL_SEARCH_ACTIVATION_MARKER.length);\n\t\t// Tool names are [a-zA-Z0-9_-]; stop at the first JSON string terminator\n\t\t// (quote / escape) or newline so we never swallow the rest of the blob.\n\t\tconst end = rest.search(/[\"\\\\\\n]/);\n\t\tsegments.push(end < 0 ? rest : rest.slice(0, end));\n\t\tcursor = blob.indexOf(LEGACY_TOOL_SEARCH_ACTIVATION_MARKER, cursor + LEGACY_TOOL_SEARCH_ACTIVATION_MARKER.length);\n\t}\n\treturn segments;\n}\n"]}

package/dist/core/extensions/builtin/tool-search/index.d.ts

@@ -0,0 +1,7 @@
+import type { ExtensionAPI, ExtensionFactory } from "../../types.ts";
+import { ToolSearchService } from "./service.ts";
+export declare function createToolSearchExtension(service: ToolSearchService): ExtensionFactory;
+export default function toolSearchExtension(pi: ExtensionAPI): void | Promise<void>;
+export { getToolSearchService, ToolSearchService } from "./service.ts";
+export { createToolSearchTool, TOOL_SEARCH_TOOL_NAME } from "./tool.ts";
+//# sourceMappingURL=index.d.ts.map

package/dist/core/extensions/builtin/tool-search/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/tool-search/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAErE,OAAO,EAAwD,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGvG,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,iBAAiB,GAAG,gBAAgB,CA6CtF;AAWD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAUlF;AAED,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC"}

package/dist/core/extensions/builtin/tool-search/index.js

@@ -0,0 +1,71 @@
+import { bindToProviderScope } from "@earendil-works/pi-ai/node/provider-scope";
+import { AnthropicNativeToolSearchAdapter, isMcpNativeToolSearchEnabled } from "./native-search.js";
+import { getToolSearchService, installScopedToolSearchService, ToolSearchService } from "./service.js";
+import { createToolSearchTool, TOOL_SEARCH_TOOL_NAME } from "./tool.js";
+export function createToolSearchExtension(service) {
+    return (pi) => {
+        service.bindRuntime(pi);
+        pi.on("session_start", (_event, ctx) => {
+            service.beginSession();
+            service.maybeRehydrateFromHistory(ctx.sessionManager.getEntries());
+        });
+        pi.on("context", (event) => {
+            service.maybeRehydrateFromHistory(event.messages);
+        });
+        pi.registerLazyToolActivator((toolName) => service.activateTool(toolName));
+        let toolRegistered = false;
+        service.bindToolRegistrar(() => {
+            if (toolRegistered)
+                return;
+            toolRegistered = true;
+            pi.registerTool(createToolSearchTool(service));
+        });
+        const nativeAdapter = new AnthropicNativeToolSearchAdapter({
+            enabled: () => {
+                const active = new Set(pi.getActiveTools());
+                return service
+                    .getCatalog()
+                    .some((doc) => (doc.source === "extension" && !active.has(doc.name)) ||
+                    (doc.source === "mcp" && isMcpNativeToolSearchEnabled()));
+            },
+            getCatalog: () => service.getCatalog(),
+            getToolDefinition: (name) => {
+                const tool = pi.getAllTools().find((candidate) => candidate.name === name);
+                return tool === undefined ? undefined : { description: tool.description, parameters: tool.parameters };
+            },
+            isDeferrable: (name) => {
+                const doc = service.getCatalog().find((candidate) => candidate.name === name);
+                if (doc?.source === "mcp")
+                    return isMcpNativeToolSearchEnabled();
+                return doc?.source === "extension" && !pi.getActiveTools().includes(name);
+            },
+            searchToolName: TOOL_SEARCH_TOOL_NAME,
+        });
+        pi.on("before_provider_request", (event, ctx) => nativeAdapter.applyBeforeRequest(ctx.model?.api, event.payload));
+        pi.on("after_provider_response", (event) => nativeAdapter.noteResponseStatus(event.status));
+    };
+}
+function hasProviderScope() {
+    try {
+        bindToProviderScope(() => undefined);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export default function toolSearchExtension(pi) {
+    const runtime = {
+        getAllTools: () => pi.getAllTools(),
+        getActiveTools: () => pi.getActiveTools(),
+        setActiveTools: (names) => pi.setActiveTools([...names]),
+    };
+    const sessionOwned = hasProviderScope();
+    const service = sessionOwned ? new ToolSearchService(runtime) : getToolSearchService(runtime);
+    if (sessionOwned)
+        installScopedToolSearchService(service);
+    return createToolSearchExtension(service)(pi);
+}
+export { getToolSearchService, ToolSearchService } from "./service.js";
+export { createToolSearchTool, TOOL_SEARCH_TOOL_NAME } from "./tool.js";
+//# sourceMappingURL=index.js.map

package/dist/core/extensions/builtin/tool-search/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/tool-search/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { bindToProviderScope } from \"@earendil-works/pi-ai/node/provider-scope\";\nimport type { ExtensionAPI, ExtensionFactory } from \"../../types.ts\";\nimport { AnthropicNativeToolSearchAdapter, isMcpNativeToolSearchEnabled } from \"./native-search.ts\";\nimport { getToolSearchService, installScopedToolSearchService, ToolSearchService } from \"./service.ts\";\nimport { createToolSearchTool, TOOL_SEARCH_TOOL_NAME } from \"./tool.ts\";\n\nexport function createToolSearchExtension(service: ToolSearchService): ExtensionFactory {\n\treturn (pi: ExtensionAPI): void => {\n\t\tservice.bindRuntime(pi);\n\n\t\tpi.on(\"session_start\", (_event, ctx) => {\n\t\t\tservice.beginSession();\n\t\t\tservice.maybeRehydrateFromHistory(ctx.sessionManager.getEntries());\n\t\t});\n\t\tpi.on(\"context\", (event) => {\n\t\t\tservice.maybeRehydrateFromHistory(event.messages);\n\t\t});\n\t\tpi.registerLazyToolActivator((toolName) => service.activateTool(toolName));\n\t\tlet toolRegistered = false;\n\t\tservice.bindToolRegistrar(() => {\n\t\t\tif (toolRegistered) return;\n\t\t\ttoolRegistered = true;\n\t\t\tpi.registerTool(createToolSearchTool(service));\n\t\t});\n\n\t\tconst nativeAdapter = new AnthropicNativeToolSearchAdapter({\n\t\t\tenabled: () => {\n\t\t\t\tconst active = new Set(pi.getActiveTools());\n\t\t\t\treturn service\n\t\t\t\t\t.getCatalog()\n\t\t\t\t\t.some(\n\t\t\t\t\t\t(doc) =>\n\t\t\t\t\t\t\t(doc.source === \"extension\" && !active.has(doc.name)) ||\n\t\t\t\t\t\t\t(doc.source === \"mcp\" && isMcpNativeToolSearchEnabled()),\n\t\t\t\t\t);\n\t\t\t},\n\t\t\tgetCatalog: () => service.getCatalog(),\n\t\t\tgetToolDefinition: (name) => {\n\t\t\t\tconst tool = pi.getAllTools().find((candidate) => candidate.name === name);\n\t\t\t\treturn tool === undefined ? undefined : { description: tool.description, parameters: tool.parameters };\n\t\t\t},\n\t\t\tisDeferrable: (name) => {\n\t\t\t\tconst doc = service.getCatalog().find((candidate) => candidate.name === name);\n\t\t\t\tif (doc?.source === \"mcp\") return isMcpNativeToolSearchEnabled();\n\t\t\t\treturn doc?.source === \"extension\" && !pi.getActiveTools().includes(name);\n\t\t\t},\n\t\t\tsearchToolName: TOOL_SEARCH_TOOL_NAME,\n\t\t});\n\t\tpi.on(\"before_provider_request\", (event, ctx) => nativeAdapter.applyBeforeRequest(ctx.model?.api, event.payload));\n\t\tpi.on(\"after_provider_response\", (event) => nativeAdapter.noteResponseStatus(event.status));\n\t};\n}\n\nfunction hasProviderScope(): boolean {\n\ttry {\n\t\tbindToProviderScope(() => undefined);\n\t\treturn true;\n\t} catch {\n\t\treturn false;\n\t}\n}\n\nexport default function toolSearchExtension(pi: ExtensionAPI): void | Promise<void> {\n\tconst runtime = {\n\t\tgetAllTools: () => pi.getAllTools(),\n\t\tgetActiveTools: () => pi.getActiveTools(),\n\t\tsetActiveTools: (names: readonly string[]) => pi.setActiveTools([...names]),\n\t};\n\tconst sessionOwned = hasProviderScope();\n\tconst service = sessionOwned ? new ToolSearchService(runtime) : getToolSearchService(runtime);\n\tif (sessionOwned) installScopedToolSearchService(service);\n\treturn createToolSearchExtension(service)(pi);\n}\n\nexport { getToolSearchService, ToolSearchService } from \"./service.ts\";\nexport { createToolSearchTool, TOOL_SEARCH_TOOL_NAME } from \"./tool.ts\";\n"]}

package/dist/core/extensions/builtin/tool-search/native-search.d.ts

@@ -0,0 +1,52 @@
+import type { ToolSearchDocument } from "./engine/document.ts";
+export declare const ANTHROPIC_TOOL_SEARCH_TYPE = "tool_search_tool_bm25_20251119";
+export declare const ANTHROPIC_TOOL_SEARCH_NAME = "tool_search";
+/** Anthropic caps a request at 10k tools; beyond that native search is invalid. */
+export declare const ANTHROPIC_MAX_TOOLS = 10000;
+type McpNativeToolSearchGate = () => boolean;
+/** Bind the MCP-owned user setting without moving MCP configuration into the shared builtin. */
+export declare function installMcpNativeToolSearchGate(gate: McpNativeToolSearchGate): void;
+export declare function isMcpNativeToolSearchEnabled(): boolean;
+export interface NativeToolDefinition {
+    readonly description?: string;
+    readonly parameters?: unknown;
+}
+export interface AnthropicNativeInjectionConfig {
+    /** Never defer this tool (our custom tool_search), and it is non-deferrable. */
+    readonly searchToolName?: string;
+    /** True only for catalog tools eligible for native deferral in this request. */
+    readonly isDeferrable: (toolName: string) => boolean;
+    /** Current searchable catalog. Omit when only transforming resident tools. */
+    readonly getCatalog?: () => readonly ToolSearchDocument[];
+    /** Resolve the winning registered definition used to inject inactive schemas. */
+    readonly getToolDefinition?: (toolName: string) => NativeToolDefinition | undefined;
+}
+/**
+ * Pure payload transform. Injects eligible inactive catalog schemas, adds exactly
+ * one native search tool, and enforces Anthropic's HARD RULES: never defer the
+ * local search tool, never combine defer_loading with cache_control, keep at
+ * least one non-deferred tool, and skip entirely above the 10k tool cap.
+ */
+export declare function addAnthropicNativeToolSearch(api: string | undefined, payload: unknown, config: AnthropicNativeInjectionConfig): unknown;
+/** `tool_reference` blocks emitted inside a tool_result so the API expands the referenced tools. */
+export declare function buildToolReferenceBlocks(names: readonly string[]): {
+    type: "tool_reference";
+    name: string;
+}[];
+export interface AnthropicNativeAdapterDeps extends AnthropicNativeInjectionConfig {
+    /** Resolved provider/config gate. */
+    enabled(): boolean;
+    /** Invoked once when a 400 forces the local-search fallback. */
+    onFallback?(reason: string): void;
+}
+/** Session-scoped request injector with permanent 400 fallback for the session. */
+export declare class AnthropicNativeToolSearchAdapter {
+    #private;
+    constructor(deps: AnthropicNativeAdapterDeps);
+    applyBeforeRequest(api: string | undefined, payload: unknown): unknown;
+    noteResponseStatus(status: number): void;
+    get disabled(): boolean;
+    get fallbackReason(): string | null;
+}
+export {};
+//# sourceMappingURL=native-search.d.ts.map

package/dist/core/extensions/builtin/tool-search/native-search.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"native-search.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/tool-search/native-search.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAM/D,eAAO,MAAM,0BAA0B,mCAAmC,CAAC;AAC3E,eAAO,MAAM,0BAA0B,gBAAgB,CAAC;AACxD,mFAAmF;AACnF,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC,KAAK,uBAAuB,GAAG,MAAM,OAAO,CAAC;AAK7C,gGAAgG;AAChG,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,uBAAuB,GAAG,IAAI,CAGlF;AAED,wBAAgB,4BAA4B,IAAI,OAAO,CAEtD;AAED,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,8BAA8B;IAC9C,gFAAgF;IAChF,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,gFAAgF;IAChF,QAAQ,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IACrD,8EAA8E;IAC9E,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,SAAS,kBAAkB,EAAE,CAAC;IAC1D,iFAAiF;IACjF,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,oBAAoB,GAAG,SAAS,CAAC;CACpF;AAMD;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC3C,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,8BAA8B,GACpC,OAAO,CAYT;AAkCD,oGAAoG;AACpG,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,CAE7G;AAED,MAAM,WAAW,0BAA2B,SAAQ,8BAA8B;IACjF,qCAAqC;IACrC,OAAO,IAAI,OAAO,CAAC;IACnB,gEAAgE;IAChE,UAAU,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAED,mFAAmF;AACnF,qBAAa,gCAAgC;;IAM5C,YAAY,IAAI,EAAE,0BAA0B,EAE3C;IAED,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAMrE;IAED,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAMvC;IAED,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,IAAI,cAAc,IAAI,MAAM,GAAG,IAAI,CAElC;CACD"}