@code-yeongyu/senpi 2026.7.17 → 2026.7.20

package/dist/core/extensions/builtin/mcp/expose/status.js.map

@@ -1 +1 @@
-{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/status.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAQvD,MAAM,UAAU,2BAA2B,CAC1C,OAAuC,EACvC,YAA6B,EAC7B,QAAqB;IAErB,MAAM,MAAM,GAAG,wBAAwB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;IACzE,IAAI,MAAM,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,EAAE,IAAI,EAAE,yDAAyD,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;IAC7G,CAAC;IACD,+EAA+E;IAC/E,MAAM,IAAI,GACT,MAAM,CAAC,IAAI,KAAK,QAAQ;QACvB,CAAC,CAAC,gBAAgB,MAAM,CAAC,aAAa,CAAC,MAAM,gBAAgB,MAAM,CAAC,iBAAiB,CAAC,MAAM,4BAA4B;QACxH,CAAC,CAAC,SAAS,CAAC;IACd,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;AAChF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC/C,IAAY,EACZ,UAA4B,EAC5B,YAA6B,EAC7B,QAAqB;IAErB,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;QACvE,MAAM,OAAO,GAA0B,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAClE,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,UAAU;YACV,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;YAC/C,MAAM,EAAE,IAAI,CAAC,WAAW;YACxB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,IAAI,CAAC,IAAI;SACf,CAAC,CAAC,CAAC;QACJ,OAAO,2BAA2B,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;IACrE,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IAC5B,CAAC;AACF,CAAC","sourcesContent":["import type { McpToolCatalogEntry } from \"../catalog.ts\";\nimport type { McpServerConfig, McpSettings } from \"../config-schema.ts\";\nimport type { ServerConnection } from \"../connection.ts\";\nimport { computeMcpExposurePolicy } from \"./policy.ts\";\n\nexport interface McpServerExposureStatus {\n\treadonly hint?: string;\n\treadonly toolCount: number | null;\n\treadonly mode?: \"direct\" | \"search\" | \"proxy\";\n}\n\nexport function getMcpCatalogExposureStatus(\n\tcatalog: readonly McpToolCatalogEntry[],\n\tserverConfig: McpServerConfig,\n\tsettings: McpSettings,\n): McpServerExposureStatus {\n\tconst policy = computeMcpExposurePolicy(catalog, serverConfig, settings);\n\tif (policy.filteredEntries.length === 0) {\n\t\treturn { hint: \"No MCP tools matched includeTools/excludeTools filters.\", toolCount: 0, mode: policy.mode };\n\t}\n\t// Report the total exposed tools; in search mode note how many are active now.\n\tconst hint =\n\t\tpolicy.mode === \"search\"\n\t\t\t? `search mode: ${policy.activeEntries.length} active now, ${policy.registeredEntries.length} searchable via mcp_search`\n\t\t\t: undefined;\n\treturn { hint, toolCount: policy.registeredEntries.length, mode: policy.mode };\n}\n\nexport async function getMcpServerExposureStatus(\n\tname: string,\n\tconnection: ServerConnection,\n\tserverConfig: McpServerConfig,\n\tsettings: McpSettings,\n): Promise<McpServerExposureStatus> {\n\ttry {\n\t\tconst result = await connection.client.listTools({}, { timeout: 500 });\n\t\tconst catalog: McpToolCatalogEntry[] = result.tools.map((tool) => ({\n\t\t\tannotations: tool.annotations,\n\t\t\tconnection,\n\t\t\tdescription: tool.description,\n\t\t\trequestTimeoutMs: serverConfig.requestTimeoutMs,\n\t\t\tschema: tool.inputSchema,\n\t\t\tserver: name,\n\t\t\ttool: tool.name,\n\t\t}));\n\t\treturn getMcpCatalogExposureStatus(catalog, serverConfig, settings);\n\t} catch {\n\t\treturn { toolCount: null };\n\t}\n}\n"]}
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/status.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAQvD,MAAM,UAAU,2BAA2B,CAC1C,OAAuC,EACvC,YAA6B,EAC7B,QAAqB;IAErB,MAAM,MAAM,GAAG,wBAAwB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;IACzE,IAAI,MAAM,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,EAAE,IAAI,EAAE,yDAAyD,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;IAC7G,CAAC;IACD,+EAA+E;IAC/E,MAAM,IAAI,GACT,MAAM,CAAC,IAAI,KAAK,QAAQ;QACvB,CAAC,CAAC,gBAAgB,MAAM,CAAC,aAAa,CAAC,MAAM,gBAAgB,MAAM,CAAC,iBAAiB,CAAC,MAAM,6BAA6B;QACzH,CAAC,CAAC,SAAS,CAAC;IACd,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;AAChF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC/C,IAAY,EACZ,UAA4B,EAC5B,YAA6B,EAC7B,QAAqB;IAErB,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;QACvE,MAAM,OAAO,GAA0B,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAClE,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,UAAU;YACV,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;YAC/C,MAAM,EAAE,IAAI,CAAC,WAAW;YACxB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,IAAI,CAAC,IAAI;SACf,CAAC,CAAC,CAAC;QACJ,OAAO,2BAA2B,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;IACrE,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IAC5B,CAAC;AACF,CAAC","sourcesContent":["import type { McpToolCatalogEntry } from \"../catalog.ts\";\nimport type { McpServerConfig, McpSettings } from \"../config-schema.ts\";\nimport type { ServerConnection } from \"../connection.ts\";\nimport { computeMcpExposurePolicy } from \"./policy.ts\";\n\nexport interface McpServerExposureStatus {\n\treadonly hint?: string;\n\treadonly toolCount: number | null;\n\treadonly mode?: \"direct\" | \"search\" | \"proxy\";\n}\n\nexport function getMcpCatalogExposureStatus(\n\tcatalog: readonly McpToolCatalogEntry[],\n\tserverConfig: McpServerConfig,\n\tsettings: McpSettings,\n): McpServerExposureStatus {\n\tconst policy = computeMcpExposurePolicy(catalog, serverConfig, settings);\n\tif (policy.filteredEntries.length === 0) {\n\t\treturn { hint: \"No MCP tools matched includeTools/excludeTools filters.\", toolCount: 0, mode: policy.mode };\n\t}\n\t// Report the total exposed tools; in search mode note how many are active now.\n\tconst hint =\n\t\tpolicy.mode === \"search\"\n\t\t\t? `search mode: ${policy.activeEntries.length} active now, ${policy.registeredEntries.length} searchable via tool_search`\n\t\t\t: undefined;\n\treturn { hint, toolCount: policy.registeredEntries.length, mode: policy.mode };\n}\n\nexport async function getMcpServerExposureStatus(\n\tname: string,\n\tconnection: ServerConnection,\n\tserverConfig: McpServerConfig,\n\tsettings: McpSettings,\n): Promise<McpServerExposureStatus> {\n\ttry {\n\t\tconst result = await connection.client.listTools({}, { timeout: 500 });\n\t\tconst catalog: McpToolCatalogEntry[] = result.tools.map((tool) => ({\n\t\t\tannotations: tool.annotations,\n\t\t\tconnection,\n\t\t\tdescription: tool.description,\n\t\t\trequestTimeoutMs: serverConfig.requestTimeoutMs,\n\t\t\tschema: tool.inputSchema,\n\t\t\tserver: name,\n\t\t\ttool: tool.name,\n\t\t}));\n\t\treturn getMcpCatalogExposureStatus(catalog, serverConfig, settings);\n\t} catch {\n\t\treturn { toolCount: null };\n\t}\n}\n"]}

package/dist/core/extensions/builtin/mcp/expose/tier-b.d.ts

@@ -26,19 +26,19 @@ export interface McpTierBRegistration {
     readonly searchable: SearchableMcpTool[];
     /**
      * Replay activation markers found in session history through the SAME
-     * activation path mcp_search uses (stub swap + stable ordering), so a
+     * activation path tool_search uses (stub swap + stable ordering), so a
      * resumed/compacted session restores its promoted tools without
      * re-searching. Returns the newly activated names (empty when nothing new).
      */
     rehydrateFromHistory(messages: readonly unknown[]): string[];
     /** Activate registered tools by name through the same stable path
-     * mcp_search uses (skill lazy-reveal, todo 37). Unknown names ignored. */
+     * tool_search uses (skill lazy-reveal, todo 37). Unknown names ignored. */
     activate(names: readonly string[]): void;
 }
 /** Register MCP tools honouring Tier-B search mode + prompt-cache mitigations. */
 export declare function registerMcpTierBTools(pi: McpToolRegistrar, input: McpTierBRegistrationInput, warn?: WarnFn): McpTierBRegistration;
 /** A 30-70 token placeholder for an inactive search-mode tool. Keeps the tools
- * array length-stable under stubSwap; guides the model to mcp_search. */
+ * array length-stable under stubSwap; guides the model to tool_search. */
 export declare function buildMcpStubDefinition(name: string): McpToolDefinition;
 export {};
 //# sourceMappingURL=tier-b.d.ts.map

package/dist/core/extensions/builtin/mcp/expose/tier-b.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tier-b.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/tier-b.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAEN,KAAK,iBAAiB,EAGtB,MAAM,eAAe,CAAC;AACvB,OAAO,EAIN,KAAK,iBAAiB,EAEtB,MAAM,kBAAkB,CAAC;AAE1B,KAAK,gBAAgB,GAAG,IAAI,CAAC,YAAY,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,cAAc,CAAC,CAAC;AACjG,KAAK,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;AAExC,MAAM,WAAW,yBAAyB;IACzC,wEAAwE;IACxE,QAAQ,CAAC,iBAAiB,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC3D,0EAA0E;IAC1E,QAAQ,CAAC,aAAa,EAAE,SAAS,mBAAmB,EAAE,CAAC;IACvD,6DAA6D;IAC7D,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,2EAA2E;IAC3E,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,SAAS,mBAAmB,EAAE,CAAA;KAAE,EAAE,CAAC;IAChG,mFAAmF;IACnF,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACrD,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;CAC/B;AAED,MAAM,WAAW,oBAAoB;IACpC,sEAAsE;IACtE,QAAQ,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;IACzC;;;;;OAKG;IACH,oBAAoB,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,EAAE,CAAC;IAC7D;8EAC0E;IAC1E,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;CACzC;AAID,kFAAkF;AAClF,wBAAgB,qBAAqB,CACpC,EAAE,EAAE,gBAAgB,EACpB,KAAK,EAAE,yBAAyB,EAChC,IAAI,CAAC,EAAE,MAAM,GACX,oBAAoB,CAqFtB;AA+BD;yEACyE;AACzE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,CAiBtE"}
+{"version":3,"file":"tier-b.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/tier-b.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAEN,KAAK,iBAAiB,EAGtB,MAAM,eAAe,CAAC;AACvB,OAAO,EAGN,KAAK,iBAAiB,EAGtB,MAAM,kBAAkB,CAAC;AAE1B,KAAK,gBAAgB,GAAG,IAAI,CAAC,YAAY,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,cAAc,CAAC,CAAC;AACjG,KAAK,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;AAExC,MAAM,WAAW,yBAAyB;IACzC,wEAAwE;IACxE,QAAQ,CAAC,iBAAiB,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC3D,0EAA0E;IAC1E,QAAQ,CAAC,aAAa,EAAE,SAAS,mBAAmB,EAAE,CAAC;IACvD,6DAA6D;IAC7D,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,2EAA2E;IAC3E,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,SAAS,mBAAmB,EAAE,CAAA;KAAE,EAAE,CAAC;IAChG,mFAAmF;IACnF,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACrD,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;CAC/B;AAED,MAAM,WAAW,oBAAoB;IACpC,sEAAsE;IACtE,QAAQ,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;IACzC;;;;;OAKG;IACH,oBAAoB,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,EAAE,CAAC;IAC7D;+EAC2E;IAC3E,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;CACzC;AAID,kFAAkF;AAClF,wBAAgB,qBAAqB,CACpC,EAAE,EAAE,gBAAgB,EACpB,KAAK,EAAE,yBAAyB,EAChC,IAAI,CAAC,EAAE,MAAM,GACX,oBAAoB,CAwFtB;AA+BD;0EAC0E;AAC1E,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,CAiBtE"}

package/dist/core/extensions/builtin/mcp/expose/tier-b.js

@@ -2,7 +2,7 @@
 //
 // Completes exposure:"auto": a server whose filtered tool count exceeds
 // searchThreshold enters SEARCH mode — the full catalog is registered but only
-// directTools stay active, and an always-active mcp_search promotes the rest on
+// directTools stay active, and an always-active tool_search promotes the rest on
 // demand. Prompt-cache mitigations (SPEC §5): stable name sort everywhere;
 // activation turns accept a cache miss (documented); opt-in settings.stubSwap
 // registers 30-70-token stubs so the tools array stays length-stable and only
@@ -12,7 +12,7 @@ import { Type } from "typebox";
 import { registerToolsPreservingActiveSet } from "../active-set.js";
 import { createMcpProxyTool } from "./proxy.js";
 import { buildMcpToolDefinitions, mapMcpCatalogNames, } from "./register.js";
-import { createMcpSearchTool, MCP_SEARCH_TOOL_NAME, rehydrateActiveToolsFromHistory, unionStable, } from "./tool-search.js";
+import { createMcpSearchTool, rehydrateActiveToolsFromHistory, TOOL_SEARCH_TOOL_NAME, unionStable, } from "./tool-search.js";
 const NOOP_REHYDRATE = () => [];
 /** Register MCP tools honouring Tier-B search mode + prompt-cache mitigations. */
 export function registerMcpTierBTools(pi, input, warn) {
@@ -76,14 +76,14 @@ export function registerMcpTierBTools(pi, input, warn) {
         activateMcpTools(unionStable(current, fresh));
         return fresh;
     };
-    // mcp_search carries a distinct param schema, so register it on its own
+    // tool_search carries a distinct param schema, so register it on its own
     // rather than mixing it into the broadly-typed catalog def array.
     pi.registerTool(searchTool);
     if (!stubSwap) {
-        // Default search mode: full defs registered, only directTools + mcp_search
+        // Default search mode: full defs registered, only directTools + tool_search
         // active. Newly promoted tools enter the array on their activation turn
         // (an accepted cache miss).
-        const active = orderActiveSet([...currentBase, MCP_SEARCH_TOOL_NAME, ...activeMcpNames], reference);
+        const active = orderActiveSet([...currentBase, TOOL_SEARCH_TOOL_NAME, ...activeMcpNames], reference);
         registerToolsPreservingActiveSet(pi, fullDefs, active);
         return { activate, searchable, rehydrateFromHistory };
     }
@@ -96,7 +96,7 @@ export function registerMcpTierBTools(pi, input, warn) {
         stubbed.add(def.name);
         return buildMcpStubDefinition(def.name);
     });
-    const active = orderActiveSet([...currentBase, MCP_SEARCH_TOOL_NAME, ...fullDefs.map((def) => def.name)], reference);
+    const active = orderActiveSet([...currentBase, TOOL_SEARCH_TOOL_NAME, ...fullDefs.map((def) => def.name)], reference);
     registerToolsPreservingActiveSet(pi, toRegister, active);
     return { activate, searchable, rehydrateFromHistory };
 }
@@ -113,7 +113,7 @@ function swapStubsToFull(pi, names, stubbed, fullByName) {
 }
 /** Order the active set deterministically WITHOUT disturbing non-MCP (base)
  * tools: base tools keep their existing relative order (by `reference` index,
- * new ones appended), MCP tools (incl. mcp_search) are sorted for cache
+ * new ones appended), MCP tools (incl. tool_search) are sorted for cache
  * stability. Sorting base tools would churn the system-prompt tool listing. */
 function orderActiveSet(names, reference) {
     const unique = [...new Set(names)];
@@ -125,17 +125,17 @@ function orderActiveSet(names, reference) {
     return [...base, ...mcp];
 }
 /** A 30-70 token placeholder for an inactive search-mode tool. Keeps the tools
- * array length-stable under stubSwap; guides the model to mcp_search. */
+ * array length-stable under stubSwap; guides the model to tool_search. */
 export function buildMcpStubDefinition(name) {
     return {
         name,
         label: name,
-        description: `Inactive MCP tool. Run mcp_search to activate ${name}, then call it on your next turn.`,
+        description: `Inactive MCP tool. Run tool_search to activate ${name}, then call it on your next turn.`,
         parameters: Type.Object({}),
         executionMode: "parallel",
         async execute() {
             return {
-                content: [{ type: "text", text: `${name} is not active. Use mcp_search to activate it, then call it.` }],
+                content: [{ type: "text", text: `${name} is not active. Use tool_search to activate it, then call it.` }],
                 details: undefined,
             };
         },

package/dist/core/extensions/builtin/mcp/expose/tier-b.js.map

@@ -1 +1 @@
-{"version":3,"file":"tier-b.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/tier-b.ts"],"names":[],"mappings":"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","sourcesContent":["// Tier-B adaptive exposure wiring (todo 32).\n//\n// Completes exposure:\"auto\": a server whose filtered tool count exceeds\n// searchThreshold enters SEARCH mode — the full catalog is registered but only\n// directTools stay active, and an always-active mcp_search promotes the rest on\n// demand. Prompt-cache mitigations (SPEC §5): stable name sort everywhere;\n// activation turns accept a cache miss (documented); opt-in settings.stubSwap\n// registers 30-70-token stubs so the tools array stays length-stable and only\n// the activated entry's bytes change (stub -> full) on promotion.\n\nimport type { AgentToolResult } from \"@earendil-works/pi-agent-core\";\nimport { Text } from \"@earendil-works/pi-tui\";\nimport { Type } from \"typebox\";\nimport type { ExtensionAPI } from \"../../../types.ts\";\nimport { registerToolsPreservingActiveSet } from \"../active-set.ts\";\nimport type { McpToolCatalogEntry } from \"../catalog.ts\";\nimport type { McpSettings } from \"../config-schema.ts\";\nimport { createMcpProxyTool } from \"./proxy.ts\";\nimport {\n\tbuildMcpToolDefinitions,\n\ttype McpToolDefinition,\n\ttype McpToolDetails,\n\tmapMcpCatalogNames,\n} from \"./register.ts\";\nimport {\n\tcreateMcpSearchTool,\n\tMCP_SEARCH_TOOL_NAME,\n\trehydrateActiveToolsFromHistory,\n\ttype SearchableMcpTool,\n\tunionStable,\n} from \"./tool-search.ts\";\n\ntype McpToolRegistrar = Pick<ExtensionAPI, \"getActiveTools\" | \"setActiveTools\" | \"registerTool\">;\ntype WarnFn = (message: string) => void;\n\nexport interface McpTierBRegistrationInput {\n\t/** Full catalog to register (all filtered tools across all servers). */\n\treadonly registeredEntries: readonly McpToolCatalogEntry[];\n\t/** Subset kept active immediately (direct-mode servers + directTools). */\n\treadonly activeEntries: readonly McpToolCatalogEntry[];\n\t/** True when at least one server resolved to search mode. */\n\treadonly searchMode: boolean;\n\t/** Tier-C proxy servers (todo 38): one always-active gateway tool each. */\n\treadonly proxyGateways?: readonly { server: string; entries: readonly McpToolCatalogEntry[] }[];\n\t/** Always-active utility tools (todo 39: mcp_list_resources/mcp_read_resource). */\n\treadonly utilityTools?: readonly McpToolDefinition[];\n\treadonly settings: McpSettings;\n}\n\nexport interface McpTierBRegistration {\n\t/** Searchable catalog (for reuse by /mcp status and list_changed). */\n\treadonly searchable: SearchableMcpTool[];\n\t/**\n\t * Replay activation markers found in session history through the SAME\n\t * activation path mcp_search uses (stub swap + stable ordering), so a\n\t * resumed/compacted session restores its promoted tools without\n\t * re-searching. Returns the newly activated names (empty when nothing new).\n\t */\n\trehydrateFromHistory(messages: readonly unknown[]): string[];\n\t/** Activate registered tools by name through the same stable path\n\t * mcp_search uses (skill lazy-reveal, todo 37). Unknown names ignored. */\n\tactivate(names: readonly string[]): void;\n}\n\nconst NOOP_REHYDRATE = (): string[] => [];\n\n/** Register MCP tools honouring Tier-B search mode + prompt-cache mitigations. */\nexport function registerMcpTierBTools(\n\tpi: McpToolRegistrar,\n\tinput: McpTierBRegistrationInput,\n\twarn?: WarnFn,\n): McpTierBRegistration {\n\tconst named = mapMcpCatalogNames(input.registeredEntries, warn);\n\tconst searchable: SearchableMcpTool[] = named.map(({ entry, name }) => ({\n\t\tname,\n\t\ttoolName: entry.tool,\n\t\tdescription: entry.description,\n\t\tserver: entry.server,\n\t}));\n\tconst fullDefs = buildMcpToolDefinitions(input.registeredEntries, warn);\n\tconst fullByName = new Map(fullDefs.map((def) => [def.name, def] as const));\n\tconst gatewayNames: string[] = [];\n\tfor (const gateway of input.proxyGateways ?? []) {\n\t\tconst tool = createMcpProxyTool(gateway.server, gateway.entries);\n\t\tpi.registerTool(tool);\n\t\tgatewayNames.push(tool.name);\n\t}\n\tfor (const tool of input.utilityTools ?? []) {\n\t\tpi.registerTool(tool);\n\t\tgatewayNames.push(tool.name);\n\t}\n\tconst activeMcpNames = [...mapMcpCatalogNames(input.activeEntries).map(({ name }) => name), ...gatewayNames];\n\tconst reference = pi.getActiveTools();\n\t// Base tools carry over; any stale mcp_* names from a prior generation are\n\t// dropped (membership = base + the intended mcp set; reference orders only).\n\tconst currentBase = reference.filter((name) => !name.startsWith(\"mcp_\"));\n\n\tif (!input.searchMode) {\n\t\tregisterToolsPreservingActiveSet(pi, fullDefs, orderActiveSet([...currentBase, ...activeMcpNames], reference));\n\t\t// Direct mode: everything registerable is already active, nothing to replay.\n\t\tconst activateDirect = (names: readonly string[]): void => {\n\t\t\tpi.setActiveTools(orderActiveSet(unionStable(pi.getActiveTools(), names), pi.getActiveTools()));\n\t\t};\n\t\treturn { activate: activateDirect, searchable, rehydrateFromHistory: NOOP_REHYDRATE };\n\t}\n\n\tconst stubSwap = input.settings.stubSwap === true;\n\tconst stubbed = new Set<string>();\n\tconst activateMcpTools = (names: readonly string[]): void => {\n\t\tif (stubSwap) swapStubsToFull(pi, names, stubbed, fullByName);\n\t\tpi.setActiveTools(orderActiveSet(names, pi.getActiveTools()));\n\t};\n\tconst searchTool = createMcpSearchTool({\n\t\tgetSearchableTools: () => searchable,\n\t\tgetActiveTools: () => pi.getActiveTools(),\n\t\tsetActiveTools: activateMcpTools,\n\t});\n\tconst registeredNames = new Set(fullDefs.map((def) => def.name));\n\tconst activate = (names: readonly string[]): void => {\n\t\tconst known = names.filter((name) => registeredNames.has(name));\n\t\tif (known.length === 0) return;\n\t\tactivateMcpTools(unionStable(pi.getActiveTools(), known));\n\t};\n\tconst rehydrateFromHistory = (messages: readonly unknown[]): string[] => {\n\t\tconst restored = rehydrateActiveToolsFromHistory(messages, registeredNames);\n\t\tconst current = pi.getActiveTools();\n\t\tconst fresh = restored.filter((name) => !current.includes(name));\n\t\tif (fresh.length === 0) return [];\n\t\tactivateMcpTools(unionStable(current, fresh));\n\t\treturn fresh;\n\t};\n\n\t// mcp_search carries a distinct param schema, so register it on its own\n\t// rather than mixing it into the broadly-typed catalog def array.\n\tpi.registerTool(searchTool);\n\n\tif (!stubSwap) {\n\t\t// Default search mode: full defs registered, only directTools + mcp_search\n\t\t// active. Newly promoted tools enter the array on their activation turn\n\t\t// (an accepted cache miss).\n\t\tconst active = orderActiveSet([...currentBase, MCP_SEARCH_TOOL_NAME, ...activeMcpNames], reference);\n\t\tregisterToolsPreservingActiveSet(pi, fullDefs, active);\n\t\treturn { activate, searchable, rehydrateFromHistory };\n\t}\n\n\t// stubSwap: every search-mode tool is registered as a tiny stub and kept\n\t// active so the tools array is length-stable; direct tools stay full.\n\tconst directActive = new Set(activeMcpNames);\n\tconst toRegister: McpToolDefinition[] = fullDefs.map((def) => {\n\t\tif (directActive.has(def.name)) return def;\n\t\tstubbed.add(def.name);\n\t\treturn buildMcpStubDefinition(def.name);\n\t});\n\tconst active = orderActiveSet([...currentBase, MCP_SEARCH_TOOL_NAME, ...fullDefs.map((def) => def.name)], reference);\n\tregisterToolsPreservingActiveSet(pi, toRegister, active);\n\treturn { activate, searchable, rehydrateFromHistory };\n}\n\nfunction swapStubsToFull(\n\tpi: McpToolRegistrar,\n\tnames: readonly string[],\n\tstubbed: Set<string>,\n\tfullByName: ReadonlyMap<string, McpToolDefinition>,\n): void {\n\tfor (const name of names) {\n\t\tif (!stubbed.has(name)) continue;\n\t\tconst full = fullByName.get(name);\n\t\tif (full === undefined) continue;\n\t\tpi.registerTool(full);\n\t\tstubbed.delete(name);\n\t}\n}\n\n/** Order the active set deterministically WITHOUT disturbing non-MCP (base)\n * tools: base tools keep their existing relative order (by `reference` index,\n * new ones appended), MCP tools (incl. mcp_search) are sorted for cache\n * stability. Sorting base tools would churn the system-prompt tool listing. */\nfunction orderActiveSet(names: readonly string[], reference: readonly string[]): string[] {\n\tconst unique = [...new Set(names)];\n\tconst rank = new Map(reference.map((name, index) => [name, index] as const));\n\tconst base = unique\n\t\t.filter((name) => !name.startsWith(\"mcp_\"))\n\t\t.sort((a, b) => (rank.get(a) ?? Number.MAX_SAFE_INTEGER) - (rank.get(b) ?? Number.MAX_SAFE_INTEGER));\n\tconst mcp = unique.filter((name) => name.startsWith(\"mcp_\")).sort();\n\treturn [...base, ...mcp];\n}\n\n/** A 30-70 token placeholder for an inactive search-mode tool. Keeps the tools\n * array length-stable under stubSwap; guides the model to mcp_search. */\nexport function buildMcpStubDefinition(name: string): McpToolDefinition {\n\treturn {\n\t\tname,\n\t\tlabel: name,\n\t\tdescription: `Inactive MCP tool. Run mcp_search to activate ${name}, then call it on your next turn.`,\n\t\tparameters: Type.Object({}),\n\t\texecutionMode: \"parallel\",\n\t\tasync execute(): Promise<AgentToolResult<McpToolDetails | undefined>> {\n\t\t\treturn {\n\t\t\t\tcontent: [{ type: \"text\", text: `${name} is not active. Use mcp_search to activate it, then call it.` }],\n\t\t\t\tdetails: undefined,\n\t\t\t};\n\t\t},\n\t\trenderCall(_args, theme) {\n\t\t\treturn new Text(theme.fg(\"toolOutput\", `${name} (inactive stub)`), 0, 0);\n\t\t},\n\t};\n}\n"]}
+{"version":3,"file":"tier-b.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/tier-b.ts"],"names":[],"mappings":"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","sourcesContent":["// Tier-B adaptive exposure wiring (todo 32).\n//\n// Completes exposure:\"auto\": a server whose filtered tool count exceeds\n// searchThreshold enters SEARCH mode — the full catalog is registered but only\n// directTools stay active, and an always-active tool_search promotes the rest on\n// demand. Prompt-cache mitigations (SPEC §5): stable name sort everywhere;\n// activation turns accept a cache miss (documented); opt-in settings.stubSwap\n// registers 30-70-token stubs so the tools array stays length-stable and only\n// the activated entry's bytes change (stub -> full) on promotion.\n\nimport type { AgentToolResult } from \"@earendil-works/pi-agent-core\";\nimport { Text } from \"@earendil-works/pi-tui\";\nimport { Type } from \"typebox\";\nimport type { ExtensionAPI } from \"../../../types.ts\";\nimport { registerToolsPreservingActiveSet } from \"../active-set.ts\";\nimport type { McpToolCatalogEntry } from \"../catalog.ts\";\nimport type { McpSettings } from \"../config-schema.ts\";\nimport { createMcpProxyTool } from \"./proxy.ts\";\nimport {\n\tbuildMcpToolDefinitions,\n\ttype McpToolDefinition,\n\ttype McpToolDetails,\n\tmapMcpCatalogNames,\n} from \"./register.ts\";\nimport {\n\tcreateMcpSearchTool,\n\trehydrateActiveToolsFromHistory,\n\ttype SearchableMcpTool,\n\tTOOL_SEARCH_TOOL_NAME,\n\tunionStable,\n} from \"./tool-search.ts\";\n\ntype McpToolRegistrar = Pick<ExtensionAPI, \"getActiveTools\" | \"setActiveTools\" | \"registerTool\">;\ntype WarnFn = (message: string) => void;\n\nexport interface McpTierBRegistrationInput {\n\t/** Full catalog to register (all filtered tools across all servers). */\n\treadonly registeredEntries: readonly McpToolCatalogEntry[];\n\t/** Subset kept active immediately (direct-mode servers + directTools). */\n\treadonly activeEntries: readonly McpToolCatalogEntry[];\n\t/** True when at least one server resolved to search mode. */\n\treadonly searchMode: boolean;\n\t/** Tier-C proxy servers (todo 38): one always-active gateway tool each. */\n\treadonly proxyGateways?: readonly { server: string; entries: readonly McpToolCatalogEntry[] }[];\n\t/** Always-active utility tools (todo 39: mcp_list_resources/mcp_read_resource). */\n\treadonly utilityTools?: readonly McpToolDefinition[];\n\treadonly settings: McpSettings;\n}\n\nexport interface McpTierBRegistration {\n\t/** Searchable catalog (for reuse by /mcp status and list_changed). */\n\treadonly searchable: SearchableMcpTool[];\n\t/**\n\t * Replay activation markers found in session history through the SAME\n\t * activation path tool_search uses (stub swap + stable ordering), so a\n\t * resumed/compacted session restores its promoted tools without\n\t * re-searching. Returns the newly activated names (empty when nothing new).\n\t */\n\trehydrateFromHistory(messages: readonly unknown[]): string[];\n\t/** Activate registered tools by name through the same stable path\n\t * tool_search uses (skill lazy-reveal, todo 37). Unknown names ignored. */\n\tactivate(names: readonly string[]): void;\n}\n\nconst NOOP_REHYDRATE = (): string[] => [];\n\n/** Register MCP tools honouring Tier-B search mode + prompt-cache mitigations. */\nexport function registerMcpTierBTools(\n\tpi: McpToolRegistrar,\n\tinput: McpTierBRegistrationInput,\n\twarn?: WarnFn,\n): McpTierBRegistration {\n\tconst named = mapMcpCatalogNames(input.registeredEntries, warn);\n\tconst searchable: SearchableMcpTool[] = named.map(({ entry, name }) => ({\n\t\tname,\n\t\ttoolName: entry.tool,\n\t\tdescription: entry.description,\n\t\tserver: entry.server,\n\t}));\n\tconst fullDefs = buildMcpToolDefinitions(input.registeredEntries, warn);\n\tconst fullByName = new Map(fullDefs.map((def) => [def.name, def] as const));\n\tconst gatewayNames: string[] = [];\n\tfor (const gateway of input.proxyGateways ?? []) {\n\t\tconst tool = createMcpProxyTool(gateway.server, gateway.entries);\n\t\tpi.registerTool(tool);\n\t\tgatewayNames.push(tool.name);\n\t}\n\tfor (const tool of input.utilityTools ?? []) {\n\t\tpi.registerTool(tool);\n\t\tgatewayNames.push(tool.name);\n\t}\n\tconst activeMcpNames = [...mapMcpCatalogNames(input.activeEntries).map(({ name }) => name), ...gatewayNames];\n\tconst reference = pi.getActiveTools();\n\t// Base tools carry over; any stale mcp_* names from a prior generation are\n\t// dropped (membership = base + the intended mcp set; reference orders only).\n\tconst currentBase = reference.filter((name) => !name.startsWith(\"mcp_\"));\n\n\tif (!input.searchMode) {\n\t\tregisterToolsPreservingActiveSet(pi, fullDefs, orderActiveSet([...currentBase, ...activeMcpNames], reference));\n\t\t// Direct mode: everything registerable is already active, nothing to replay.\n\t\tconst activateDirect = (names: readonly string[]): void => {\n\t\t\tpi.setActiveTools(orderActiveSet(unionStable(pi.getActiveTools(), names), pi.getActiveTools()));\n\t\t};\n\t\treturn { activate: activateDirect, searchable, rehydrateFromHistory: NOOP_REHYDRATE };\n\t}\n\n\tconst stubSwap = input.settings.stubSwap === true;\n\tconst stubbed = new Set<string>();\n\tconst activateMcpTools = (names: readonly string[]): void => {\n\t\tif (stubSwap) swapStubsToFull(pi, names, stubbed, fullByName);\n\t\tpi.setActiveTools(orderActiveSet(names, pi.getActiveTools()));\n\t};\n\tconst searchTool = createMcpSearchTool({\n\t\tgetSearchableTools: () => searchable,\n\t\tgetActiveTools: () => pi.getActiveTools(),\n\t\tsetActiveTools: activateMcpTools,\n\t});\n\tconst registeredNames = new Set(fullDefs.map((def) => def.name));\n\tconst activate = (names: readonly string[]): void => {\n\t\tconst known = names.filter((name) => registeredNames.has(name));\n\t\tif (known.length === 0) return;\n\t\tactivateMcpTools(unionStable(pi.getActiveTools(), known));\n\t};\n\tconst rehydrateFromHistory = (messages: readonly unknown[]): string[] => {\n\t\tconst restored = rehydrateActiveToolsFromHistory(messages, registeredNames);\n\t\tconst current = pi.getActiveTools();\n\t\tconst fresh = restored.filter((name) => !current.includes(name));\n\t\tif (fresh.length === 0) return [];\n\t\tactivateMcpTools(unionStable(current, fresh));\n\t\treturn fresh;\n\t};\n\n\t// tool_search carries a distinct param schema, so register it on its own\n\t// rather than mixing it into the broadly-typed catalog def array.\n\tpi.registerTool(searchTool);\n\n\tif (!stubSwap) {\n\t\t// Default search mode: full defs registered, only directTools + tool_search\n\t\t// active. Newly promoted tools enter the array on their activation turn\n\t\t// (an accepted cache miss).\n\t\tconst active = orderActiveSet([...currentBase, TOOL_SEARCH_TOOL_NAME, ...activeMcpNames], reference);\n\t\tregisterToolsPreservingActiveSet(pi, fullDefs, active);\n\t\treturn { activate, searchable, rehydrateFromHistory };\n\t}\n\n\t// stubSwap: every search-mode tool is registered as a tiny stub and kept\n\t// active so the tools array is length-stable; direct tools stay full.\n\tconst directActive = new Set(activeMcpNames);\n\tconst toRegister: McpToolDefinition[] = fullDefs.map((def) => {\n\t\tif (directActive.has(def.name)) return def;\n\t\tstubbed.add(def.name);\n\t\treturn buildMcpStubDefinition(def.name);\n\t});\n\tconst active = orderActiveSet(\n\t\t[...currentBase, TOOL_SEARCH_TOOL_NAME, ...fullDefs.map((def) => def.name)],\n\t\treference,\n\t);\n\tregisterToolsPreservingActiveSet(pi, toRegister, active);\n\treturn { activate, searchable, rehydrateFromHistory };\n}\n\nfunction swapStubsToFull(\n\tpi: McpToolRegistrar,\n\tnames: readonly string[],\n\tstubbed: Set<string>,\n\tfullByName: ReadonlyMap<string, McpToolDefinition>,\n): void {\n\tfor (const name of names) {\n\t\tif (!stubbed.has(name)) continue;\n\t\tconst full = fullByName.get(name);\n\t\tif (full === undefined) continue;\n\t\tpi.registerTool(full);\n\t\tstubbed.delete(name);\n\t}\n}\n\n/** Order the active set deterministically WITHOUT disturbing non-MCP (base)\n * tools: base tools keep their existing relative order (by `reference` index,\n * new ones appended), MCP tools (incl. tool_search) are sorted for cache\n * stability. Sorting base tools would churn the system-prompt tool listing. */\nfunction orderActiveSet(names: readonly string[], reference: readonly string[]): string[] {\n\tconst unique = [...new Set(names)];\n\tconst rank = new Map(reference.map((name, index) => [name, index] as const));\n\tconst base = unique\n\t\t.filter((name) => !name.startsWith(\"mcp_\"))\n\t\t.sort((a, b) => (rank.get(a) ?? Number.MAX_SAFE_INTEGER) - (rank.get(b) ?? Number.MAX_SAFE_INTEGER));\n\tconst mcp = unique.filter((name) => name.startsWith(\"mcp_\")).sort();\n\treturn [...base, ...mcp];\n}\n\n/** A 30-70 token placeholder for an inactive search-mode tool. Keeps the tools\n * array length-stable under stubSwap; guides the model to tool_search. */\nexport function buildMcpStubDefinition(name: string): McpToolDefinition {\n\treturn {\n\t\tname,\n\t\tlabel: name,\n\t\tdescription: `Inactive MCP tool. Run tool_search to activate ${name}, then call it on your next turn.`,\n\t\tparameters: Type.Object({}),\n\t\texecutionMode: \"parallel\",\n\t\tasync execute(): Promise<AgentToolResult<McpToolDetails | undefined>> {\n\t\t\treturn {\n\t\t\t\tcontent: [{ type: \"text\", text: `${name} is not active. Use tool_search to activate it, then call it.` }],\n\t\t\t\tdetails: undefined,\n\t\t\t};\n\t\t},\n\t\trenderCall(_args, theme) {\n\t\t\treturn new Text(theme.fg(\"toolOutput\", `${name} (inactive stub)`), 0, 0);\n\t\t},\n\t};\n}\n"]}

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

@@ -1,10 +1,10 @@
 import { Type } from "typebox";
 import type { ToolDefinition } from "../../../types.ts";
 import { type Bm25Doc } from "./bm25.ts";
-export declare const MCP_SEARCH_TOOL_NAME = "mcp_search";
+export declare const TOOL_SEARCH_TOOL_NAME = "tool_search";
 /** Stable, machine-parseable marker embedded in every activating result so
  * activations survive compaction/restart. Kept human-readable on purpose. */
-export declare const MCP_SEARCH_ACTIVATION_MARKER = "[mcp_search:activated]";
+export declare const TOOL_SEARCH_ACTIVATION_MARKER = "[tool_search:activated]";
 export type SearchableMcpTool = Bm25Doc;
 export interface McpSearchDeps {
     /** Full current catalog (all MCP tools, active or not) to rank over. */
@@ -30,7 +30,7 @@ interface RankedMatch {
 }
 export declare function buildMcpSearchResultText(query: string, matches: readonly RankedMatch[], server: string | undefined): string;
 /**
- * Replay mcp_search activations recorded in prior history so a
+ * Replay tool_search activations recorded in prior history so a
  * compacted/restarted session restores its active tool set without re-searching.
  * Only names still present in `validNames` are restored (removed tools stay
  * dropped). Deterministic: returns a de-duplicated, sorted list.

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

@@ -1 +1 @@
-{"version":3,"file":"tool-search.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/tool-search.ts"],"names":[],"mappings":"AAYA,OAAO,EAAe,IAAI,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,KAAK,OAAO,EAAkB,MAAM,WAAW,CAAC;AAEzD,eAAO,MAAM,oBAAoB,eAAe,CAAC;AACjD;6EAC6E;AAC7E,eAAO,MAAM,4BAA4B,2BAA2B,CAAC;AAGrE,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC;AAExC,MAAM,WAAW,aAAa;IAC7B,wEAAwE;IACxE,kBAAkB,IAAI,SAAS,iBAAiB,EAAE,CAAC;IACnD,0DAA0D;IAC1D,cAAc,IAAI,MAAM,EAAE,CAAC;IAC3B,4EAA4E;IAC5E,cAAc,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;CAC/C;AAED,MAAM,WAAW,gBAAgB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,QAAA,MAAM,YAAY;;;EAGhB,CAAC;AAGH,KAAK,aAAa,GAAG,cAAc,CAAC,OAAO,YAAY,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;AAEpF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,aAAa,GAAG,aAAa,CAmCtE;AAED,UAAU,WAAW;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,iBAAiB,CAAC;CAChC;AAED,wBAAgB,wBAAwB,CACvC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,SAAS,WAAW,EAAE,EAC/B,MAAM,EAAE,MAAM,GAAG,SAAS,GACxB,MAAM,CAgBR;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC9C,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,GAC7B,MAAM,EAAE,CAUV;AAsBD;2CAC2C;AAC3C,wBAAgB,WAAW,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAE1F"}
+{"version":3,"file":"tool-search.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/tool-search.ts"],"names":[],"mappings":"AAYA,OAAO,EAAe,IAAI,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,KAAK,OAAO,EAAkB,MAAM,WAAW,CAAC;AAEzD,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AACnD;6EAC6E;AAC7E,eAAO,MAAM,6BAA6B,4BAA4B,CAAC;AAGvE,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC;AAExC,MAAM,WAAW,aAAa;IAC7B,wEAAwE;IACxE,kBAAkB,IAAI,SAAS,iBAAiB,EAAE,CAAC;IACnD,0DAA0D;IAC1D,cAAc,IAAI,MAAM,EAAE,CAAC;IAC3B,4EAA4E;IAC5E,cAAc,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;CAC/C;AAED,MAAM,WAAW,gBAAgB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,QAAA,MAAM,YAAY;;;EAGhB,CAAC;AAGH,KAAK,aAAa,GAAG,cAAc,CAAC,OAAO,YAAY,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;AAEpF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,aAAa,GAAG,aAAa,CAmCtE;AAED,UAAU,WAAW;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,iBAAiB,CAAC;CAChC;AAED,wBAAgB,wBAAwB,CACvC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,SAAS,WAAW,EAAE,EAC/B,MAAM,EAAE,MAAM,GAAG,SAAS,GACxB,MAAM,CAgBR;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC9C,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,GAC7B,MAAM,EAAE,CAUV;AAsBD;2CAC2C;AAC3C,wBAAgB,WAAW,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAE1F"}

package/dist/core/extensions/builtin/mcp/expose/tool-search.js

@@ -1,6 +1,6 @@
-// mcp_search tool + promotion engine (todo 31).
+// tool_search tool + promotion engine (todo 31).
 //
-// `mcp_search` is an always-active tool that ranks the full MCP catalog with
+// `tool_search` is an always-active tool that ranks the full MCP catalog with
 // the local BM25 engine and PROMOTES matched tools into the active set via
 // setActiveTools (effective the NEXT turn — senpi semantics). Promotion state
 // is derivable from history: each result embeds a stable activation marker so a
@@ -10,10 +10,10 @@
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import { buildBm25Index } from "./bm25.js";
-export const MCP_SEARCH_TOOL_NAME = "mcp_search";
+export const TOOL_SEARCH_TOOL_NAME = "tool_search";
 /** Stable, machine-parseable marker embedded in every activating result so
  * activations survive compaction/restart. Kept human-readable on purpose. */
-export const MCP_SEARCH_ACTIVATION_MARKER = "[mcp_search:activated]";
+export const TOOL_SEARCH_ACTIVATION_MARKER = "[tool_search:activated]";
 const MAX_RESULTS = 10;
 const ParamsSchema = Type.Object({
     query: Type.String({ description: "Natural-language description of the capability you need." }),
@@ -21,7 +21,7 @@ const ParamsSchema = Type.Object({
 });
 export function createMcpSearchTool(deps) {
     return {
-        name: MCP_SEARCH_TOOL_NAME,
+        name: TOOL_SEARCH_TOOL_NAME,
         label: "MCP tool search",
         description: "Search the catalog of available MCP tools by capability. Matched tools are activated and become callable on your NEXT turn. Use this before calling an MCP tool that is not already active.",
         promptSnippet: "Search MCP servers for a tool by capability; matched tools activate next turn.",
@@ -43,13 +43,13 @@ export function createMcpSearchTool(deps) {
         },
         renderCall(args, theme) {
             const filter = args.server ? ` @${args.server}` : "";
-            return new Text(theme.fg("toolTitle", theme.bold(`${MCP_SEARCH_TOOL_NAME} "${args.query}"${filter}`)), 0, 0);
+            return new Text(theme.fg("toolTitle", theme.bold(`${TOOL_SEARCH_TOOL_NAME} "${args.query}"${filter}`)), 0, 0);
         },
         renderResult(result, options, theme) {
             const count = result.details?.activated.length ?? 0;
             const title = options.isPartial
-                ? `${MCP_SEARCH_TOOL_NAME}: searching`
-                : `${MCP_SEARCH_TOOL_NAME}: ${count} tool(s) activated`;
+                ? `${TOOL_SEARCH_TOOL_NAME}: searching`
+                : `${TOOL_SEARCH_TOOL_NAME}: ${count} tool(s) activated`;
             return new Text(theme.fg("toolOutput", title), 0, 0);
         },
     };
@@ -57,7 +57,7 @@ export function createMcpSearchTool(deps) {
 export function buildMcpSearchResultText(query, matches, server) {
     const scope = server ? ` on server "${server}"` : "";
     if (matches.length === 0) {
-        return `No MCP tools matched "${query}"${scope}. No tools were activated; try different keywords or run mcp_search with a broader query. Your active tool set is unchanged.`;
+        return `No MCP tools matched "${query}"${scope}. No tools were activated; try different keywords or run tool_search with a broader query. Your active tool set is unchanged.`;
     }
     const bullets = matches
         .map((match) => `- ${match.name} — ${oneLine(match.doc.description) ?? "(no description)"}`)
@@ -68,11 +68,11 @@ export function buildMcpSearchResultText(query, matches, server) {
         "",
         bullets,
         "",
-        `${MCP_SEARCH_ACTIVATION_MARKER} ${names}`,
+        `${TOOL_SEARCH_ACTIVATION_MARKER} ${names}`,
     ].join("\n");
 }
 /**
- * Replay mcp_search activations recorded in prior history so a
+ * Replay tool_search activations recorded in prior history so a
  * compacted/restarted session restores its active tool set without re-searching.
  * Only names still present in `validNames` are restored (removed tools stay
  * dropped). Deterministic: returns a de-duplicated, sorted list.
@@ -98,14 +98,14 @@ function extractActivationSegments(message) {
         return [];
     }
     const segments = [];
-    let cursor = blob.indexOf(MCP_SEARCH_ACTIVATION_MARKER);
+    let cursor = blob.indexOf(TOOL_SEARCH_ACTIVATION_MARKER);
     while (cursor >= 0) {
-        const rest = blob.slice(cursor + MCP_SEARCH_ACTIVATION_MARKER.length);
+        const rest = blob.slice(cursor + 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(MCP_SEARCH_ACTIVATION_MARKER, cursor + MCP_SEARCH_ACTIVATION_MARKER.length);
+        cursor = blob.indexOf(TOOL_SEARCH_ACTIVATION_MARKER, cursor + TOOL_SEARCH_ACTIVATION_MARKER.length);
     }
     return segments;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"tool-search.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/tool-search.ts"],"names":[],"mappings":"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","sourcesContent":["// mcp_search tool + promotion engine (todo 31).\n//\n// `mcp_search` is an always-active tool that ranks the full MCP catalog with\n// the local BM25 engine and PROMOTES matched tools into the active set via\n// setActiveTools (effective the NEXT turn — senpi semantics). Promotion state\n// is derivable from history: each result embeds a stable activation marker so a\n// compaction/restart can replay activations at session_start\n// (rehydrateActiveToolsFromHistory). Activated tools persist for the session;\n// there is no auto-eviction in v1. Every setActiveTools call is stable-sorted.\n\nimport type { AgentToolResult } from \"@earendil-works/pi-agent-core\";\nimport { Text } from \"@earendil-works/pi-tui\";\nimport { type Static, Type } from \"typebox\";\nimport type { ToolDefinition } from \"../../../types.ts\";\nimport { type Bm25Doc, buildBm25Index } from \"./bm25.ts\";\n\nexport const MCP_SEARCH_TOOL_NAME = \"mcp_search\";\n/** Stable, machine-parseable marker embedded in every activating result so\n * activations survive compaction/restart. Kept human-readable on purpose. */\nexport const MCP_SEARCH_ACTIVATION_MARKER = \"[mcp_search:activated]\";\nconst MAX_RESULTS = 10;\n\nexport type SearchableMcpTool = Bm25Doc;\n\nexport interface McpSearchDeps {\n\t/** Full current catalog (all MCP tools, active or not) to rank over. */\n\tgetSearchableTools(): readonly SearchableMcpTool[];\n\t/** Current active tool names (includes non-MCP tools). */\n\tgetActiveTools(): string[];\n\t/** Replace the active set. Implementations should preserve registration. */\n\tsetActiveTools(names: readonly string[]): void;\n}\n\nexport interface McpSearchDetails {\n\tquery: string;\n\tactivated: string[];\n}\n\nconst ParamsSchema = Type.Object({\n\tquery: Type.String({ description: \"Natural-language description of the capability you need.\" }),\n\tserver: Type.Optional(Type.String({ description: \"Optional: restrict the search to a single MCP server name.\" })),\n});\ntype Params = Static<typeof ParamsSchema>;\n\ntype McpSearchTool = ToolDefinition<typeof ParamsSchema, McpSearchDetails, unknown>;\n\nexport function createMcpSearchTool(deps: McpSearchDeps): McpSearchTool {\n\treturn {\n\t\tname: MCP_SEARCH_TOOL_NAME,\n\t\tlabel: \"MCP tool search\",\n\t\tdescription:\n\t\t\t\"Search the catalog of available MCP tools by capability. Matched tools are activated and become callable on your NEXT turn. Use this before calling an MCP tool that is not already active.\",\n\t\tpromptSnippet: \"Search MCP servers for a tool by capability; matched tools activate next turn.\",\n\t\tparameters: ParamsSchema,\n\t\texecutionMode: \"parallel\",\n\t\tasync execute(_toolCallId, params: Params): Promise<AgentToolResult<McpSearchDetails>> {\n\t\t\tconst searchable = deps.getSearchableTools();\n\t\t\tconst index = buildBm25Index(searchable);\n\t\t\tconst matches = index.search(params.query, MAX_RESULTS, params.server ? { server: params.server } : {});\n\t\t\tconst activated = matches.map((match) => match.name);\n\t\t\tif (activated.length > 0) {\n\t\t\t\tdeps.setActiveTools(unionStable(deps.getActiveTools(), activated));\n\t\t\t}\n\t\t\tconst text = buildMcpSearchResultText(params.query, matches, params.server);\n\t\t\treturn {\n\t\t\t\tcontent: [{ type: \"text\", text }],\n\t\t\t\tdetails: { activated, query: params.query },\n\t\t\t};\n\t\t},\n\t\trenderCall(args, theme) {\n\t\t\tconst filter = args.server ? ` @${args.server}` : \"\";\n\t\t\treturn new Text(theme.fg(\"toolTitle\", theme.bold(`${MCP_SEARCH_TOOL_NAME} \"${args.query}\"${filter}`)), 0, 0);\n\t\t},\n\t\trenderResult(result, options, theme) {\n\t\t\tconst count = result.details?.activated.length ?? 0;\n\t\t\tconst title = options.isPartial\n\t\t\t\t? `${MCP_SEARCH_TOOL_NAME}: searching`\n\t\t\t\t: `${MCP_SEARCH_TOOL_NAME}: ${count} tool(s) activated`;\n\t\t\treturn new Text(theme.fg(\"toolOutput\", title), 0, 0);\n\t\t},\n\t};\n}\n\ninterface RankedMatch {\n\treadonly name: string;\n\treadonly doc: SearchableMcpTool;\n}\n\nexport function buildMcpSearchResultText(\n\tquery: string,\n\tmatches: readonly RankedMatch[],\n\tserver: string | undefined,\n): string {\n\tconst scope = server ? ` on server \"${server}\"` : \"\";\n\tif (matches.length === 0) {\n\t\treturn `No MCP tools matched \"${query}\"${scope}. No tools were activated; try different keywords or run mcp_search with a broader query. Your active tool set is unchanged.`;\n\t}\n\tconst bullets = matches\n\t\t.map((match) => `- ${match.name} — ${oneLine(match.doc.description) ?? \"(no description)\"}`)\n\t\t.join(\"\\n\");\n\tconst names = matches.map((match) => match.name).join(\" \");\n\treturn [\n\t\t`Found ${matches.length} MCP tool(s) matching \"${query}\"${scope}. They are now active and callable from your NEXT turn:`,\n\t\t\"\",\n\t\tbullets,\n\t\t\"\",\n\t\t`${MCP_SEARCH_ACTIVATION_MARKER} ${names}`,\n\t].join(\"\\n\");\n}\n\n/**\n * Replay mcp_search activations recorded in prior history so a\n * compacted/restarted session restores its active tool set without re-searching.\n * Only names still present in `validNames` are restored (removed tools stay\n * dropped). Deterministic: returns a de-duplicated, sorted list.\n */\nexport function rehydrateActiveToolsFromHistory(\n\tmessages: readonly unknown[],\n\tvalidNames: ReadonlySet<string>,\n): string[] {\n\tconst restored = new Set<string>();\n\tfor (const message of messages) {\n\t\tfor (const segment of extractActivationSegments(message)) {\n\t\t\tfor (const name of segment.trim().split(/\\s+/)) {\n\t\t\t\tif (name.length > 0 && validNames.has(name)) restored.add(name);\n\t\t\t}\n\t\t}\n\t}\n\treturn [...restored].sort();\n}\n\nfunction extractActivationSegments(message: unknown): string[] {\n\tlet blob: string;\n\ttry {\n\t\tblob = JSON.stringify(message) ?? \"\";\n\t} catch {\n\t\treturn [];\n\t}\n\tconst segments: string[] = [];\n\tlet cursor = blob.indexOf(MCP_SEARCH_ACTIVATION_MARKER);\n\twhile (cursor >= 0) {\n\t\tconst rest = blob.slice(cursor + MCP_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(MCP_SEARCH_ACTIVATION_MARKER, cursor + MCP_SEARCH_ACTIVATION_MARKER.length);\n\t}\n\treturn segments;\n}\n\n/** Stable union: dedupe and sort so the active-tools array is byte-stable\n * across turns (prompt-cache friendly). */\nexport function unionStable(current: readonly string[], added: readonly string[]): string[] {\n\treturn [...new Set([...current, ...added])].sort();\n}\n\nfunction oneLine(text: string | undefined): string | undefined {\n\tif (text === undefined) return undefined;\n\tconst collapsed = text.replace(/\\s+/g, \" \").trim();\n\tif (collapsed.length === 0) return undefined;\n\treturn collapsed.length <= 100 ? collapsed : `${collapsed.slice(0, 97)}...`;\n}\n"]}
+{"version":3,"file":"tool-search.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/tool-search.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,EAAE;AACF,8EAA8E;AAC9E,2EAA2E;AAC3E,8EAA8E;AAC9E,gFAAgF;AAChF,6DAA6D;AAC7D,8EAA8E;AAC9E,+EAA+E;AAG/E,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAe,IAAI,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,EAAgB,cAAc,EAAE,MAAM,WAAW,CAAC;AAEzD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC;AACnD;6EAC6E;AAC7E,MAAM,CAAC,MAAM,6BAA6B,GAAG,yBAAyB,CAAC;AACvE,MAAM,WAAW,GAAG,EAAE,CAAC;AAkBvB,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC;IAChC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,0DAA0D,EAAE,CAAC;IAC/F,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,4DAA4D,EAAE,CAAC,CAAC;CACjH,CAAC,CAAC;AAKH,MAAM,UAAU,mBAAmB,CAAC,IAAmB;IACtD,OAAO;QACN,IAAI,EAAE,qBAAqB;QAC3B,KAAK,EAAE,iBAAiB;QACxB,WAAW,EACV,6LAA6L;QAC9L,aAAa,EAAE,gFAAgF;QAC/F,UAAU,EAAE,YAAY;QACxB,aAAa,EAAE,UAAU;QACzB,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,MAAc;YACxC,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7C,MAAM,KAAK,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;YACzC,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACxG,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC;YACpE,CAAC;YACD,MAAM,IAAI,GAAG,wBAAwB,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YAC5E,OAAO;gBACN,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;gBACjC,OAAO,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE;aAC3C,CAAC;QACH,CAAC;QACD,UAAU,CAAC,IAAI,EAAE,KAAK;YACrB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrD,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,qBAAqB,KAAK,IAAI,CAAC,KAAK,IAAI,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC/G,CAAC;QACD,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK;YAClC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,IAAI,CAAC,CAAC;YACpD,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS;gBAC9B,CAAC,CAAC,GAAG,qBAAqB,aAAa;gBACvC,CAAC,CAAC,GAAG,qBAAqB,KAAK,KAAK,oBAAoB,CAAC;YAC1D,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACtD,CAAC;KACD,CAAC;AACH,CAAC;AAOD,MAAM,UAAU,wBAAwB,CACvC,KAAa,EACb,OAA+B,EAC/B,MAA0B;IAE1B,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,eAAe,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACrD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,yBAAyB,KAAK,IAAI,KAAK,+HAA+H,CAAC;IAC/K,CAAC;IACD,MAAM,OAAO,GAAG,OAAO;SACrB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,CAAC,IAAI,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,kBAAkB,EAAE,CAAC;SAC3F,IAAI,CAAC,IAAI,CAAC,CAAC;IACb,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3D,OAAO;QACN,SAAS,OAAO,CAAC,MAAM,0BAA0B,KAAK,IAAI,KAAK,yDAAyD;QACxH,EAAE;QACF,OAAO;QACP,EAAE;QACF,GAAG,6BAA6B,IAAI,KAAK,EAAE;KAC3C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,+BAA+B,CAC9C,QAA4B,EAC5B,UAA+B;IAE/B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IACnC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAChC,KAAK,MAAM,OAAO,IAAI,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1D,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC;oBAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACjE,CAAC;QACF,CAAC;IACF,CAAC;IACD,OAAO,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;AAC7B,CAAC;AAED,SAAS,yBAAyB,CAAC,OAAgB;IAClD,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACJ,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,EAAE,CAAC;IACX,CAAC;IACD,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;IACzD,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAC;QACvE,yEAAyE;QACzE,wEAAwE;QACxE,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACnC,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QACnD,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,6BAA6B,EAAE,MAAM,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAC;IACrG,CAAC;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED;2CAC2C;AAC3C,MAAM,UAAU,WAAW,CAAC,OAA0B,EAAE,KAAwB;IAC/E,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AACpD,CAAC;AAED,SAAS,OAAO,CAAC,IAAwB;IACxC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACzC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACnD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC7C,OAAO,SAAS,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC;AAC7E,CAAC","sourcesContent":["// tool_search tool + promotion engine (todo 31).\n//\n// `tool_search` is an always-active tool that ranks the full MCP catalog with\n// the local BM25 engine and PROMOTES matched tools into the active set via\n// setActiveTools (effective the NEXT turn — senpi semantics). Promotion state\n// is derivable from history: each result embeds a stable activation marker so a\n// compaction/restart can replay activations at session_start\n// (rehydrateActiveToolsFromHistory). Activated tools persist for the session;\n// there is no auto-eviction in v1. Every setActiveTools call is stable-sorted.\n\nimport type { AgentToolResult } from \"@earendil-works/pi-agent-core\";\nimport { Text } from \"@earendil-works/pi-tui\";\nimport { type Static, Type } from \"typebox\";\nimport type { ToolDefinition } from \"../../../types.ts\";\nimport { type Bm25Doc, buildBm25Index } from \"./bm25.ts\";\n\nexport const TOOL_SEARCH_TOOL_NAME = \"tool_search\";\n/** Stable, machine-parseable marker embedded in every activating result so\n * activations survive compaction/restart. Kept human-readable on purpose. */\nexport const TOOL_SEARCH_ACTIVATION_MARKER = \"[tool_search:activated]\";\nconst MAX_RESULTS = 10;\n\nexport type SearchableMcpTool = Bm25Doc;\n\nexport interface McpSearchDeps {\n\t/** Full current catalog (all MCP tools, active or not) to rank over. */\n\tgetSearchableTools(): readonly SearchableMcpTool[];\n\t/** Current active tool names (includes non-MCP tools). */\n\tgetActiveTools(): string[];\n\t/** Replace the active set. Implementations should preserve registration. */\n\tsetActiveTools(names: readonly string[]): void;\n}\n\nexport interface McpSearchDetails {\n\tquery: string;\n\tactivated: string[];\n}\n\nconst ParamsSchema = Type.Object({\n\tquery: Type.String({ description: \"Natural-language description of the capability you need.\" }),\n\tserver: Type.Optional(Type.String({ description: \"Optional: restrict the search to a single MCP server name.\" })),\n});\ntype Params = Static<typeof ParamsSchema>;\n\ntype McpSearchTool = ToolDefinition<typeof ParamsSchema, McpSearchDetails, unknown>;\n\nexport function createMcpSearchTool(deps: McpSearchDeps): McpSearchTool {\n\treturn {\n\t\tname: TOOL_SEARCH_TOOL_NAME,\n\t\tlabel: \"MCP tool search\",\n\t\tdescription:\n\t\t\t\"Search the catalog of available MCP tools by capability. Matched tools are activated and become callable on your NEXT turn. Use this before calling an MCP tool that is not already active.\",\n\t\tpromptSnippet: \"Search MCP servers for a tool by capability; matched tools activate next turn.\",\n\t\tparameters: ParamsSchema,\n\t\texecutionMode: \"parallel\",\n\t\tasync execute(_toolCallId, params: Params): Promise<AgentToolResult<McpSearchDetails>> {\n\t\t\tconst searchable = deps.getSearchableTools();\n\t\t\tconst index = buildBm25Index(searchable);\n\t\t\tconst matches = index.search(params.query, MAX_RESULTS, params.server ? { server: params.server } : {});\n\t\t\tconst activated = matches.map((match) => match.name);\n\t\t\tif (activated.length > 0) {\n\t\t\t\tdeps.setActiveTools(unionStable(deps.getActiveTools(), activated));\n\t\t\t}\n\t\t\tconst text = buildMcpSearchResultText(params.query, matches, params.server);\n\t\t\treturn {\n\t\t\t\tcontent: [{ type: \"text\", text }],\n\t\t\t\tdetails: { activated, query: params.query },\n\t\t\t};\n\t\t},\n\t\trenderCall(args, theme) {\n\t\t\tconst filter = args.server ? ` @${args.server}` : \"\";\n\t\t\treturn new Text(theme.fg(\"toolTitle\", theme.bold(`${TOOL_SEARCH_TOOL_NAME} \"${args.query}\"${filter}`)), 0, 0);\n\t\t},\n\t\trenderResult(result, options, theme) {\n\t\t\tconst count = result.details?.activated.length ?? 0;\n\t\t\tconst title = options.isPartial\n\t\t\t\t? `${TOOL_SEARCH_TOOL_NAME}: searching`\n\t\t\t\t: `${TOOL_SEARCH_TOOL_NAME}: ${count} tool(s) activated`;\n\t\t\treturn new Text(theme.fg(\"toolOutput\", title), 0, 0);\n\t\t},\n\t};\n}\n\ninterface RankedMatch {\n\treadonly name: string;\n\treadonly doc: SearchableMcpTool;\n}\n\nexport function buildMcpSearchResultText(\n\tquery: string,\n\tmatches: readonly RankedMatch[],\n\tserver: string | undefined,\n): string {\n\tconst scope = server ? ` on server \"${server}\"` : \"\";\n\tif (matches.length === 0) {\n\t\treturn `No MCP tools matched \"${query}\"${scope}. No tools were activated; try different keywords or run tool_search with a broader query. Your active tool set is unchanged.`;\n\t}\n\tconst bullets = matches\n\t\t.map((match) => `- ${match.name} — ${oneLine(match.doc.description) ?? \"(no description)\"}`)\n\t\t.join(\"\\n\");\n\tconst names = matches.map((match) => match.name).join(\" \");\n\treturn [\n\t\t`Found ${matches.length} MCP tool(s) matching \"${query}\"${scope}. They are now active and callable from your NEXT turn:`,\n\t\t\"\",\n\t\tbullets,\n\t\t\"\",\n\t\t`${TOOL_SEARCH_ACTIVATION_MARKER} ${names}`,\n\t].join(\"\\n\");\n}\n\n/**\n * Replay tool_search activations recorded in prior history so a\n * compacted/restarted session restores its active tool set without re-searching.\n * Only names still present in `validNames` are restored (removed tools stay\n * dropped). Deterministic: returns a de-duplicated, sorted list.\n */\nexport function rehydrateActiveToolsFromHistory(\n\tmessages: readonly unknown[],\n\tvalidNames: ReadonlySet<string>,\n): string[] {\n\tconst restored = new Set<string>();\n\tfor (const message of messages) {\n\t\tfor (const segment of extractActivationSegments(message)) {\n\t\t\tfor (const name of segment.trim().split(/\\s+/)) {\n\t\t\t\tif (name.length > 0 && validNames.has(name)) restored.add(name);\n\t\t\t}\n\t\t}\n\t}\n\treturn [...restored].sort();\n}\n\nfunction extractActivationSegments(message: unknown): string[] {\n\tlet blob: string;\n\ttry {\n\t\tblob = JSON.stringify(message) ?? \"\";\n\t} catch {\n\t\treturn [];\n\t}\n\tconst segments: string[] = [];\n\tlet cursor = blob.indexOf(TOOL_SEARCH_ACTIVATION_MARKER);\n\twhile (cursor >= 0) {\n\t\tconst rest = blob.slice(cursor + 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(TOOL_SEARCH_ACTIVATION_MARKER, cursor + TOOL_SEARCH_ACTIVATION_MARKER.length);\n\t}\n\treturn segments;\n}\n\n/** Stable union: dedupe and sort so the active-tools array is byte-stable\n * across turns (prompt-cache friendly). */\nexport function unionStable(current: readonly string[], added: readonly string[]): string[] {\n\treturn [...new Set([...current, ...added])].sort();\n}\n\nfunction oneLine(text: string | undefined): string | undefined {\n\tif (text === undefined) return undefined;\n\tconst collapsed = text.replace(/\\s+/g, \" \").trim();\n\tif (collapsed.length === 0) return undefined;\n\treturn collapsed.length <= 100 ? collapsed : `${collapsed.slice(0, 97)}...`;\n}\n"]}

package/dist/core/extensions/builtin/mcp/index.js

@@ -1,7 +1,7 @@
 import { registerMcpCommands } from "./commands.js";
 import { setMcpElicitationUiProvider } from "./elicitation.js";
 import { AnthropicNativeToolSearchAdapter } from "./expose/native-search.js";
-import { MCP_SEARCH_TOOL_NAME } from "./expose/tool-search.js";
+import { TOOL_SEARCH_TOOL_NAME } from "./expose/tool-search.js";
 import { injectMcpInstructions, refreshMcpInstructionsForSession } from "./instructions.js";
 import { createMcpLogger } from "./log.js";
 import { registerMcpPromptCommands } from "./prompts.js";
@@ -22,19 +22,19 @@ export default function mcpExtension(pi) {
     // Native provider tool-search adapter (todo 33 — Anthropic, spike = GO).
     // Runs on every request but is a no-op unless settings.nativeToolSearch is
     // auto|true and the model is anthropic-messages; a 400 disables it for the
-    // session and falls back to the always-registered local mcp_search.
+    // session and falls back to the always-registered local tool_search.
     const nativeAdapter = new AnthropicNativeToolSearchAdapter({
         enabled: () => {
             const setting = getMcpService().getNativeToolSearchSetting();
             return setting === true || setting === "auto";
         },
-        isDeferrable: (name) => name.startsWith("mcp_") && name !== MCP_SEARCH_TOOL_NAME,
+        isDeferrable: (name) => name.startsWith("mcp_") && name !== TOOL_SEARCH_TOOL_NAME,
         onFallback: (reason) => createMcpLogger("service").warn(reason),
-        searchToolName: MCP_SEARCH_TOOL_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));
-    // Resumed/compacted sessions carry mcp_search activation markers in their
+    // Resumed/compacted sessions carry tool_search activation markers in their
     // history but re-enter search mode with only directTools active. The context
     // event (fired before each LLM call, with the full message history) replays
     // the markers as a safety net; the primary replay happens at attach time so

package/dist/core/extensions/builtin/mcp/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/index.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ExtensionAPI, ExtensionContext, SessionStartEvent } from \"../../types.ts\";\nimport { registerMcpCommands } from \"./commands.ts\";\nimport { setMcpElicitationUiProvider } from \"./elicitation.ts\";\nimport { AnthropicNativeToolSearchAdapter } from \"./expose/native-search.ts\";\nimport { MCP_SEARCH_TOOL_NAME } from \"./expose/tool-search.ts\";\nimport { injectMcpInstructions, refreshMcpInstructionsForSession } from \"./instructions.ts\";\nimport { createMcpLogger } from \"./log.ts\";\nimport { registerMcpPromptCommands } from \"./prompts.ts\";\nimport { expandMcpResourceMentions } from \"./resources.ts\";\nimport { getMcpService } from \"./service.ts\";\nimport {\n\tparseSkillMcpDeclarations,\n\ttype SkillLike,\n\ttype SkillMcpDeclarations,\n\tskillActivationTargets,\n} from \"./skills.ts\";\nimport { reportMcpAsyncError, wrapAsync } from \"./wrap.ts\";\n\nexport default function mcpExtension(pi: ExtensionAPI): void {\n\tlet attachPromise: Promise<void> | undefined;\n\tconst sink = {\n\t\tlogger: {\n\t\t\terror(message: string, data?: unknown): void {\n\t\t\t\tcreateMcpLogger(\"service\").error(message, data);\n\t\t\t},\n\t\t},\n\t};\n\n\tregisterMcpCommands(pi);\n\n\t// Native provider tool-search adapter (todo 33 — Anthropic, spike = GO).\n\t// Runs on every request but is a no-op unless settings.nativeToolSearch is\n\t// auto|true and the model is anthropic-messages; a 400 disables it for the\n\t// session and falls back to the always-registered local mcp_search.\n\tconst nativeAdapter = new AnthropicNativeToolSearchAdapter({\n\t\tenabled: () => {\n\t\t\tconst setting = getMcpService().getNativeToolSearchSetting();\n\t\t\treturn setting === true || setting === \"auto\";\n\t\t},\n\t\tisDeferrable: (name) => name.startsWith(\"mcp_\") && name !== MCP_SEARCH_TOOL_NAME,\n\t\tonFallback: (reason) => createMcpLogger(\"service\").warn(reason),\n\t\tsearchToolName: MCP_SEARCH_TOOL_NAME,\n\t});\n\tpi.on(\"before_provider_request\", (event, ctx) => nativeAdapter.applyBeforeRequest(ctx.model?.api, event.payload));\n\tpi.on(\"after_provider_response\", (event) => nativeAdapter.noteResponseStatus(event.status));\n\t// Resumed/compacted sessions carry mcp_search activation markers in their\n\t// history but re-enter search mode with only directTools active. The context\n\t// event (fired before each LLM call, with the full message history) replays\n\t// the markers as a safety net; the primary replay happens at attach time so\n\t// the FIRST turn's payload already carries previously promoted tools. Scans\n\t// once per registration (see McpService.maybeRehydrateFromHistory).\n\tpi.on(\"context\", (event) => {\n\t\tgetMcpService().maybeRehydrateFromHistory(event.messages);\n\t});\n\n\t// skills-carry-MCP (todo 37): skills declaring MCP servers (mcp.json\n\t// sidecar or SKILL.md frontmatter) register lazily with tools hidden;\n\t// loading a skill — /skill:<name> input or the model reading its SKILL.md —\n\t// reveals that skill's includeTools matches for the rest of the session.\n\tlet skillDecls: SkillMcpDeclarations = { servers: new Map(), warnings: [] };\n\tlet skillsByName = new Map<string, SkillLike>();\n\tconst loadedSkills = new Set<string>();\n\tconst revealSkill = (skillName: string): void => {\n\t\tif (loadedSkills.has(skillName) || !skillsByName.has(skillName)) return;\n\t\tloadedSkills.add(skillName);\n\t\tconst service = getMcpService();\n\t\tconst registered = service.getTierBSearchable();\n\t\tconst targets = skillActivationTargets(skillDecls, skillName, registered);\n\t\tif (targets.length > 0) service.activateSkillMcpTools(targets);\n\t};\n\tpi.on(\"input\", async (event, ctx) => {\n\t\tconst match = /^\\s*\\/skill:([A-Za-z0-9._-]+)/.exec(event.text);\n\t\tif (match) revealSkill(match[1]);\n\t\t// @mcp:<server>/<uri> mention expansion (todo 39): recognized mentions are\n\t\t// inlined via the sanctioned input transform; failures pass through\n\t\t// untouched with a one-line notice so submission is never blocked.\n\t\tif (event.text.includes(\"@mcp:\")) {\n\t\t\tconst expansion = await expandMcpResourceMentions(event.text, () => getMcpService().getMcpResourceServers());\n\t\t\tfor (const notice of expansion.notices) {\n\t\t\t\tcreateMcpLogger(\"resources\").warn(notice);\n\t\t\t\tvoid ctx.ui?.notify?.(notice, \"warning\");\n\t\t\t}\n\t\t\tif (expansion.changed) return { action: \"transform\", text: expansion.text };\n\t\t}\n\t\treturn undefined;\n\t});\n\tpi.on(\"tool_call\", (event) => {\n\t\tif (event.toolName !== \"read\") return undefined;\n\t\tconst path = (event.input as { path?: string }).path;\n\t\tif (path === undefined) return undefined;\n\t\tfor (const [name, skill] of skillsByName) {\n\t\t\tif (path === skill.filePath || path.endsWith(skill.filePath)) revealSkill(name);\n\t\t}\n\t\treturn undefined;\n\t});\n\n\t// Attach is SINGLE-FLIGHT. session_start handlers are dispatched\n\t// fire-and-forget, so a slow attach (a cold MCP server's boot + catalog\n\t// collection is awaited inside attachSession) can still be in flight when\n\t// before_agent_start fires. The old `attached` boolean was only set on\n\t// completion, so before_agent_start would start a SECOND concurrent attach —\n\t// which found the connection entries already created (still \"connecting\"),\n\t// collected an empty catalog, and registered no MCP tools for turn 1; the\n\t// first attach then landed the real registration turns later. Memoizing the\n\t// in-flight promise makes before_agent_start await the ORIGINAL attach, so\n\t// the first turn's payload deterministically carries the MCP tool set.\n\t// session_start always starts a fresh attach (reloads must re-sync config).\n\tconst attach = (event: SessionStartEvent, ctx: ExtensionContext): Promise<void> => {\n\t\tattachPromise = (async () => {\n\t\t\tconst service = getMcpService();\n\t\t\tawait service.attachSession(event, ctx, pi);\n\t\t\trefreshMcpInstructionsForSession(service);\n\t\t\tregisterMcpPromptCommands(pi, service.getMcpPromptServers());\n\t\t})();\n\t\treturn attachPromise;\n\t};\n\tpi.on(\n\t\t\"session_start\",\n\t\twrapAsync(\"mcp.session_start\", (event, ctx) => attach(event, ctx), sink),\n\t);\n\tpi.on(\"before_agent_start\", async (event, ctx) => {\n\t\ttry {\n\t\t\t// Elicitation (todo 41): point mid-call forms at the live session UI.\n\t\t\tsetMcpElicitationUiProvider(() => ctx.ui);\n\t\t\tawait (attachPromise ?? attach({ type: \"session_start\", reason: \"startup\" }, ctx));\n\t\t\tconst skills = (event.systemPromptOptions.skills ?? []) as readonly SkillLike[];\n\t\t\tif (skills.length > 0) {\n\t\t\t\tskillsByName = new Map(skills.map((skill) => [skill.name, skill]));\n\t\t\t\tskillDecls = parseSkillMcpDeclarations(skills);\n\t\t\t\tconst declared = new Map(\n\t\t\t\t\t[...skillDecls.servers].map(([name, decl]) => [name, { raw: decl.raw, sourcePath: decl.sourcePath }]),\n\t\t\t\t);\n\t\t\t\tconst warnings = [\n\t\t\t\t\t...skillDecls.warnings,\n\t\t\t\t\t...(declared.size > 0 ? await getMcpService().attachSkillMcpServers(declared) : []),\n\t\t\t\t];\n\t\t\t\tfor (const warning of warnings) createMcpLogger(\"skills\").warn(warning);\n\t\t\t}\n\t\t\tconst systemPrompt = injectMcpInstructions(event.systemPrompt);\n\t\t\treturn systemPrompt === undefined ? undefined : { systemPrompt };\n\t\t} catch (error) {\n\t\t\tif (!(error instanceof Error)) throw error;\n\t\t\tawait reportMcpAsyncError(\"mcp.before_agent_start\", error, sink);\n\t\t\treturn undefined;\n\t\t}\n\t});\n\tpi.on(\n\t\t\"session_shutdown\",\n\t\twrapAsync(\"mcp.session_shutdown\", (event) => getMcpService().handleSessionShutdown(event), sink),\n\t);\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/index.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ExtensionAPI, ExtensionContext, SessionStartEvent } from \"../../types.ts\";\nimport { registerMcpCommands } from \"./commands.ts\";\nimport { setMcpElicitationUiProvider } from \"./elicitation.ts\";\nimport { AnthropicNativeToolSearchAdapter } from \"./expose/native-search.ts\";\nimport { TOOL_SEARCH_TOOL_NAME } from \"./expose/tool-search.ts\";\nimport { injectMcpInstructions, refreshMcpInstructionsForSession } from \"./instructions.ts\";\nimport { createMcpLogger } from \"./log.ts\";\nimport { registerMcpPromptCommands } from \"./prompts.ts\";\nimport { expandMcpResourceMentions } from \"./resources.ts\";\nimport { getMcpService } from \"./service.ts\";\nimport {\n\tparseSkillMcpDeclarations,\n\ttype SkillLike,\n\ttype SkillMcpDeclarations,\n\tskillActivationTargets,\n} from \"./skills.ts\";\nimport { reportMcpAsyncError, wrapAsync } from \"./wrap.ts\";\n\nexport default function mcpExtension(pi: ExtensionAPI): void {\n\tlet attachPromise: Promise<void> | undefined;\n\tconst sink = {\n\t\tlogger: {\n\t\t\terror(message: string, data?: unknown): void {\n\t\t\t\tcreateMcpLogger(\"service\").error(message, data);\n\t\t\t},\n\t\t},\n\t};\n\n\tregisterMcpCommands(pi);\n\n\t// Native provider tool-search adapter (todo 33 — Anthropic, spike = GO).\n\t// Runs on every request but is a no-op unless settings.nativeToolSearch is\n\t// auto|true and the model is anthropic-messages; a 400 disables it for the\n\t// session and falls back to the always-registered local tool_search.\n\tconst nativeAdapter = new AnthropicNativeToolSearchAdapter({\n\t\tenabled: () => {\n\t\t\tconst setting = getMcpService().getNativeToolSearchSetting();\n\t\t\treturn setting === true || setting === \"auto\";\n\t\t},\n\t\tisDeferrable: (name) => name.startsWith(\"mcp_\") && name !== TOOL_SEARCH_TOOL_NAME,\n\t\tonFallback: (reason) => createMcpLogger(\"service\").warn(reason),\n\t\tsearchToolName: TOOL_SEARCH_TOOL_NAME,\n\t});\n\tpi.on(\"before_provider_request\", (event, ctx) => nativeAdapter.applyBeforeRequest(ctx.model?.api, event.payload));\n\tpi.on(\"after_provider_response\", (event) => nativeAdapter.noteResponseStatus(event.status));\n\t// Resumed/compacted sessions carry tool_search activation markers in their\n\t// history but re-enter search mode with only directTools active. The context\n\t// event (fired before each LLM call, with the full message history) replays\n\t// the markers as a safety net; the primary replay happens at attach time so\n\t// the FIRST turn's payload already carries previously promoted tools. Scans\n\t// once per registration (see McpService.maybeRehydrateFromHistory).\n\tpi.on(\"context\", (event) => {\n\t\tgetMcpService().maybeRehydrateFromHistory(event.messages);\n\t});\n\n\t// skills-carry-MCP (todo 37): skills declaring MCP servers (mcp.json\n\t// sidecar or SKILL.md frontmatter) register lazily with tools hidden;\n\t// loading a skill — /skill:<name> input or the model reading its SKILL.md —\n\t// reveals that skill's includeTools matches for the rest of the session.\n\tlet skillDecls: SkillMcpDeclarations = { servers: new Map(), warnings: [] };\n\tlet skillsByName = new Map<string, SkillLike>();\n\tconst loadedSkills = new Set<string>();\n\tconst revealSkill = (skillName: string): void => {\n\t\tif (loadedSkills.has(skillName) || !skillsByName.has(skillName)) return;\n\t\tloadedSkills.add(skillName);\n\t\tconst service = getMcpService();\n\t\tconst registered = service.getTierBSearchable();\n\t\tconst targets = skillActivationTargets(skillDecls, skillName, registered);\n\t\tif (targets.length > 0) service.activateSkillMcpTools(targets);\n\t};\n\tpi.on(\"input\", async (event, ctx) => {\n\t\tconst match = /^\\s*\\/skill:([A-Za-z0-9._-]+)/.exec(event.text);\n\t\tif (match) revealSkill(match[1]);\n\t\t// @mcp:<server>/<uri> mention expansion (todo 39): recognized mentions are\n\t\t// inlined via the sanctioned input transform; failures pass through\n\t\t// untouched with a one-line notice so submission is never blocked.\n\t\tif (event.text.includes(\"@mcp:\")) {\n\t\t\tconst expansion = await expandMcpResourceMentions(event.text, () => getMcpService().getMcpResourceServers());\n\t\t\tfor (const notice of expansion.notices) {\n\t\t\t\tcreateMcpLogger(\"resources\").warn(notice);\n\t\t\t\tvoid ctx.ui?.notify?.(notice, \"warning\");\n\t\t\t}\n\t\t\tif (expansion.changed) return { action: \"transform\", text: expansion.text };\n\t\t}\n\t\treturn undefined;\n\t});\n\tpi.on(\"tool_call\", (event) => {\n\t\tif (event.toolName !== \"read\") return undefined;\n\t\tconst path = (event.input as { path?: string }).path;\n\t\tif (path === undefined) return undefined;\n\t\tfor (const [name, skill] of skillsByName) {\n\t\t\tif (path === skill.filePath || path.endsWith(skill.filePath)) revealSkill(name);\n\t\t}\n\t\treturn undefined;\n\t});\n\n\t// Attach is SINGLE-FLIGHT. session_start handlers are dispatched\n\t// fire-and-forget, so a slow attach (a cold MCP server's boot + catalog\n\t// collection is awaited inside attachSession) can still be in flight when\n\t// before_agent_start fires. The old `attached` boolean was only set on\n\t// completion, so before_agent_start would start a SECOND concurrent attach —\n\t// which found the connection entries already created (still \"connecting\"),\n\t// collected an empty catalog, and registered no MCP tools for turn 1; the\n\t// first attach then landed the real registration turns later. Memoizing the\n\t// in-flight promise makes before_agent_start await the ORIGINAL attach, so\n\t// the first turn's payload deterministically carries the MCP tool set.\n\t// session_start always starts a fresh attach (reloads must re-sync config).\n\tconst attach = (event: SessionStartEvent, ctx: ExtensionContext): Promise<void> => {\n\t\tattachPromise = (async () => {\n\t\t\tconst service = getMcpService();\n\t\t\tawait service.attachSession(event, ctx, pi);\n\t\t\trefreshMcpInstructionsForSession(service);\n\t\t\tregisterMcpPromptCommands(pi, service.getMcpPromptServers());\n\t\t})();\n\t\treturn attachPromise;\n\t};\n\tpi.on(\n\t\t\"session_start\",\n\t\twrapAsync(\"mcp.session_start\", (event, ctx) => attach(event, ctx), sink),\n\t);\n\tpi.on(\"before_agent_start\", async (event, ctx) => {\n\t\ttry {\n\t\t\t// Elicitation (todo 41): point mid-call forms at the live session UI.\n\t\t\tsetMcpElicitationUiProvider(() => ctx.ui);\n\t\t\tawait (attachPromise ?? attach({ type: \"session_start\", reason: \"startup\" }, ctx));\n\t\t\tconst skills = (event.systemPromptOptions.skills ?? []) as readonly SkillLike[];\n\t\t\tif (skills.length > 0) {\n\t\t\t\tskillsByName = new Map(skills.map((skill) => [skill.name, skill]));\n\t\t\t\tskillDecls = parseSkillMcpDeclarations(skills);\n\t\t\t\tconst declared = new Map(\n\t\t\t\t\t[...skillDecls.servers].map(([name, decl]) => [name, { raw: decl.raw, sourcePath: decl.sourcePath }]),\n\t\t\t\t);\n\t\t\t\tconst warnings = [\n\t\t\t\t\t...skillDecls.warnings,\n\t\t\t\t\t...(declared.size > 0 ? await getMcpService().attachSkillMcpServers(declared) : []),\n\t\t\t\t];\n\t\t\t\tfor (const warning of warnings) createMcpLogger(\"skills\").warn(warning);\n\t\t\t}\n\t\t\tconst systemPrompt = injectMcpInstructions(event.systemPrompt);\n\t\t\treturn systemPrompt === undefined ? undefined : { systemPrompt };\n\t\t} catch (error) {\n\t\t\tif (!(error instanceof Error)) throw error;\n\t\t\tawait reportMcpAsyncError(\"mcp.before_agent_start\", error, sink);\n\t\t\treturn undefined;\n\t\t}\n\t});\n\tpi.on(\n\t\t\"session_shutdown\",\n\t\twrapAsync(\"mcp.session_shutdown\", (event) => getMcpService().handleSessionShutdown(event), sink),\n\t);\n}\n"]}

package/dist/core/extensions/builtin/mcp/service-snapshot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-snapshot.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/service-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEhF,wBAAgB,sBAAsB,CACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,iBAAiB,GAAG,SAAS,EACrC,UAAU,EAAE,gBAAgB,GAAG,SAAS,EACxC,KAAK,EAAE,kBAAkB,GAAG,SAAS,EACrC,GAAG,SAAa,GACd,iBAAiB,CAgBnB"}
+{"version":3,"file":"service-snapshot.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/service-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEhF,wBAAgB,sBAAsB,CACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,iBAAiB,GAAG,SAAS,EACrC,UAAU,EAAE,gBAAgB,GAAG,SAAS,EACxC,KAAK,EAAE,kBAAkB,GAAG,SAAS,EACrC,GAAG,SAAa,GACd,iBAAiB,CAiBnB"}

package/dist/core/extensions/builtin/mcp/service-snapshot.js

@@ -3,6 +3,7 @@ export function buildMcpServerSnapshot(name, server, connection, entry, now = Da
         name,
         configState: server?.state ?? "removed",
         configHash: server?.configHash ?? null,
+        source: server?.source ?? null,
         sourcePath: server?.sourcePath ?? null,
         lifecycleState: connection?.state === "idle" && connection.generation === 0 && entry?.cachedCatalog !== undefined
             ? "cached"

package/dist/core/extensions/builtin/mcp/service-snapshot.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-snapshot.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/service-snapshot.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,sBAAsB,CACrC,IAAY,EACZ,MAAqC,EACrC,UAAwC,EACxC,KAAqC,EACrC,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IAEhB,OAAO;QACN,IAAI;QACJ,WAAW,EAAE,MAAM,EAAE,KAAK,IAAI,SAAS;QACvC,UAAU,EAAE,MAAM,EAAE,UAAU,IAAI,IAAI;QACtC,UAAU,EAAE,MAAM,EAAE,UAAU,IAAI,IAAI;QACtC,cAAc,EACb,UAAU,EAAE,KAAK,KAAK,MAAM,IAAI,UAAU,CAAC,UAAU,KAAK,CAAC,IAAI,KAAK,EAAE,aAAa,KAAK,SAAS;YAChG,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,IAAI,aAAa,CAAC;QACxC,UAAU,EAAE,UAAU,EAAE,UAAU,IAAI,IAAI;QAC1C,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,IAAI;QACrC,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,IAAI,IAAI;QACjD,QAAQ,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,WAAW;QAC9D,QAAQ,EAAE,KAAK,EAAE,QAAQ,IAAI,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE;KAClG,CAAC;AACH,CAAC","sourcesContent":["import type { ResolvedMcpServer } from \"./config-schema.ts\";\nimport type { ServerConnection } from \"./connection.ts\";\nimport type { McpConnectionEntry, McpServerSnapshot } from \"./service-types.ts\";\n\nexport function buildMcpServerSnapshot(\n\tname: string,\n\tserver: ResolvedMcpServer | undefined,\n\tconnection: ServerConnection | undefined,\n\tentry: McpConnectionEntry | undefined,\n\tnow = Date.now(),\n): McpServerSnapshot {\n\treturn {\n\t\tname,\n\t\tconfigState: server?.state ?? \"removed\",\n\t\tconfigHash: server?.configHash ?? null,\n\t\tsourcePath: server?.sourcePath ?? null,\n\t\tlifecycleState:\n\t\t\tconnection?.state === \"idle\" && connection.generation === 0 && entry?.cachedCatalog !== undefined\n\t\t\t\t? \"cached\"\n\t\t\t\t: (connection?.state ?? \"not_spawned\"),\n\t\tgeneration: connection?.generation ?? null,\n\t\tpid: connection?.getRootPid() ?? null,\n\t\tlastError: connection?.lastError?.message ?? null,\n\t\tuptimeMs: entry === undefined ? null : now - entry.createdAtMs,\n\t\tcounters: entry?.counters ?? { callCount: 0, errorCount: 0, totalLatencyMs: 0, reconnectCount: 0 },\n\t};\n}\n"]}
+{"version":3,"file":"service-snapshot.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/service-snapshot.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,sBAAsB,CACrC,IAAY,EACZ,MAAqC,EACrC,UAAwC,EACxC,KAAqC,EACrC,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IAEhB,OAAO;QACN,IAAI;QACJ,WAAW,EAAE,MAAM,EAAE,KAAK,IAAI,SAAS;QACvC,UAAU,EAAE,MAAM,EAAE,UAAU,IAAI,IAAI;QACtC,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI;QAC9B,UAAU,EAAE,MAAM,EAAE,UAAU,IAAI,IAAI;QACtC,cAAc,EACb,UAAU,EAAE,KAAK,KAAK,MAAM,IAAI,UAAU,CAAC,UAAU,KAAK,CAAC,IAAI,KAAK,EAAE,aAAa,KAAK,SAAS;YAChG,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,IAAI,aAAa,CAAC;QACxC,UAAU,EAAE,UAAU,EAAE,UAAU,IAAI,IAAI;QAC1C,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,IAAI;QACrC,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,IAAI,IAAI;QACjD,QAAQ,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,WAAW;QAC9D,QAAQ,EAAE,KAAK,EAAE,QAAQ,IAAI,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE;KAClG,CAAC;AACH,CAAC","sourcesContent":["import type { ResolvedMcpServer } from \"./config-schema.ts\";\nimport type { ServerConnection } from \"./connection.ts\";\nimport type { McpConnectionEntry, McpServerSnapshot } from \"./service-types.ts\";\n\nexport function buildMcpServerSnapshot(\n\tname: string,\n\tserver: ResolvedMcpServer | undefined,\n\tconnection: ServerConnection | undefined,\n\tentry: McpConnectionEntry | undefined,\n\tnow = Date.now(),\n): McpServerSnapshot {\n\treturn {\n\t\tname,\n\t\tconfigState: server?.state ?? \"removed\",\n\t\tconfigHash: server?.configHash ?? null,\n\t\tsource: server?.source ?? null,\n\t\tsourcePath: server?.sourcePath ?? null,\n\t\tlifecycleState:\n\t\t\tconnection?.state === \"idle\" && connection.generation === 0 && entry?.cachedCatalog !== undefined\n\t\t\t\t? \"cached\"\n\t\t\t\t: (connection?.state ?? \"not_spawned\"),\n\t\tgeneration: connection?.generation ?? null,\n\t\tpid: connection?.getRootPid() ?? null,\n\t\tlastError: connection?.lastError?.message ?? null,\n\t\tuptimeMs: entry === undefined ? null : now - entry.createdAtMs,\n\t\tcounters: entry?.counters ?? { callCount: 0, errorCount: 0, totalLatencyMs: 0, reconnectCount: 0 },\n\t};\n}\n"]}

package/dist/core/extensions/builtin/mcp/service-types.d.ts

@@ -12,6 +12,17 @@ export type McpSessionContext = Pick<ExtensionContext, "cwd" | "isProjectTrusted
      * requirement narrow lets tests pass a two-line fake.
      */
     sessionManager?: Pick<ExtensionContext["sessionManager"], "getEntries">;
+    /**
+     * Extension-declared MCP servers. Read on every attach so reattach/reload
+     * paths pick up the current declarations without caching them in the MCP
+     * builtin.
+     */
+    getRegisteredMcpServers?: () => readonly {
+        name: string;
+        config: Record<string, unknown>;
+        extensionPath: string;
+        registrationCwd: string;
+    }[];
 };
 export interface McpSessionOptions {
     readonly agentDir?: string;
@@ -32,6 +43,7 @@ export interface McpServerSnapshot {
     name: string;
     configState: ResolvedMcpServer["state"] | "removed";
     configHash: string | null;
+    source: ResolvedMcpServer["source"] | null;
     sourcePath: string | null;
     lifecycleState: ServerConnectionState | "cached" | "not_spawned";
     generation: number | null;

package/dist/core/extensions/builtin/mcp/service-types.d.ts.map

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

package/dist/core/extensions/builtin/mcp/service-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-types.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/service-types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ExtensionContext, SessionShutdownEvent, SessionStartEvent } from \"../../types.ts\";\nimport type { ServerAuthPlan } from \"./auth/context.ts\";\nimport type { McpCachedServerCatalog } from \"./catalog-cache.ts\";\nimport type { ResolvedMcpServer } from \"./config-schema.ts\";\nimport type { ServerConnection, ServerConnectionState } from \"./connection.ts\";\nimport type { McpLogger } from \"./log.ts\";\n\nexport type McpDisposeReason = Extract<SessionShutdownEvent[\"reason\"], \"quit\" | \"reload\">;\nexport type McpSessionContext = Pick<ExtensionContext, \"cwd\" | \"isProjectTrusted\"> & {\n\t/**\n\t * Session history access, present on the real ExtensionContext. Only\n\t * getEntries is needed (attach-time promotion rehydration); keeping the\n\t * requirement narrow lets tests pass a two-line fake.\n\t */\n\tsessionManager?: Pick<ExtensionContext[\"sessionManager\"], \"getEntries\">;\n};\n\nexport interface McpSessionOptions {\n\treadonly agentDir?: string;\n\treadonly env?: Record<string, string | undefined>;\n\treadonly logDir?: string;\n\treadonly projectTrusted?: boolean;\n}\n\nexport interface McpServiceSnapshot {\n\tdisposed: boolean;\n\tdisposeCount: number;\n\tlastDisposeReason: McpDisposeReason | null;\n\tsessionStartCount: number;\n\tlastSessionStartReason: SessionStartEvent[\"reason\"] | null;\n\thasSessionContext: boolean;\n\tconnectionCount: number;\n}\n\nexport interface McpServerSnapshot {\n\tname: string;\n\tconfigState: ResolvedMcpServer[\"state\"] | \"removed\";\n\tconfigHash: string | null;\n\tsourcePath: string | null;\n\tlifecycleState: ServerConnectionState | \"cached\" | \"not_spawned\";\n\tgeneration: number | null;\n\tpid: number | null;\n\tlastError: string | null;\n\tuptimeMs: number | null;\n\tcounters: McpServerCounters;\n}\n\nexport interface McpServerCounters {\n\tcallCount: number;\n\terrorCount: number;\n\ttotalLatencyMs: number;\n\treconnectCount: number;\n}\n\nexport interface McpConnectionEntry {\n\treadonly key: string;\n\treadonly name: string;\n\treadonly configHash: string;\n\treadonly connection: ServerConnection;\n\treadonly logger: McpLogger;\n\treadonly createdAtMs: number;\n\treadonly counters: McpServerCounters;\n\treadonly agentDir?: string;\n\treadonly authPlan?: ServerAuthPlan;\n\tcachedCatalog?: McpCachedServerCatalog;\n\tcacheRefreshedAfterConnect: boolean;\n\t/** Full mcp tool names last registered for this server (list_changed diffing). */\n\tknownToolNames?: string[];\n\t/** Latest `/mcp status` list_changed delta line, e.g. \"2 added (inactive), 1 removed\". */\n\tlastListChangedDelta?: string;\n\t/** Teardown for the list_changed coalescer + subscription. */\n\tdisposeListChanged?: () => void;\n}\n"]}
+{"version":3,"file":"service-types.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/service-types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ExtensionContext, SessionShutdownEvent, SessionStartEvent } from \"../../types.ts\";\nimport type { ServerAuthPlan } from \"./auth/context.ts\";\nimport type { McpCachedServerCatalog } from \"./catalog-cache.ts\";\nimport type { ResolvedMcpServer } from \"./config-schema.ts\";\nimport type { ServerConnection, ServerConnectionState } from \"./connection.ts\";\nimport type { McpLogger } from \"./log.ts\";\n\nexport type McpDisposeReason = Extract<SessionShutdownEvent[\"reason\"], \"quit\" | \"reload\">;\nexport type McpSessionContext = Pick<ExtensionContext, \"cwd\" | \"isProjectTrusted\"> & {\n\t/**\n\t * Session history access, present on the real ExtensionContext. Only\n\t * getEntries is needed (attach-time promotion rehydration); keeping the\n\t * requirement narrow lets tests pass a two-line fake.\n\t */\n\tsessionManager?: Pick<ExtensionContext[\"sessionManager\"], \"getEntries\">;\n\t/**\n\t * Extension-declared MCP servers. Read on every attach so reattach/reload\n\t * paths pick up the current declarations without caching them in the MCP\n\t * builtin.\n\t */\n\tgetRegisteredMcpServers?: () => readonly {\n\t\tname: string;\n\t\tconfig: Record<string, unknown>;\n\t\textensionPath: string;\n\t\tregistrationCwd: string;\n\t}[];\n};\n\nexport interface McpSessionOptions {\n\treadonly agentDir?: string;\n\treadonly env?: Record<string, string | undefined>;\n\treadonly logDir?: string;\n\treadonly projectTrusted?: boolean;\n}\n\nexport interface McpServiceSnapshot {\n\tdisposed: boolean;\n\tdisposeCount: number;\n\tlastDisposeReason: McpDisposeReason | null;\n\tsessionStartCount: number;\n\tlastSessionStartReason: SessionStartEvent[\"reason\"] | null;\n\thasSessionContext: boolean;\n\tconnectionCount: number;\n}\n\nexport interface McpServerSnapshot {\n\tname: string;\n\tconfigState: ResolvedMcpServer[\"state\"] | \"removed\";\n\tconfigHash: string | null;\n\tsource: ResolvedMcpServer[\"source\"] | null;\n\tsourcePath: string | null;\n\tlifecycleState: ServerConnectionState | \"cached\" | \"not_spawned\";\n\tgeneration: number | null;\n\tpid: number | null;\n\tlastError: string | null;\n\tuptimeMs: number | null;\n\tcounters: McpServerCounters;\n}\n\nexport interface McpServerCounters {\n\tcallCount: number;\n\terrorCount: number;\n\ttotalLatencyMs: number;\n\treconnectCount: number;\n}\n\nexport interface McpConnectionEntry {\n\treadonly key: string;\n\treadonly name: string;\n\treadonly configHash: string;\n\treadonly connection: ServerConnection;\n\treadonly logger: McpLogger;\n\treadonly createdAtMs: number;\n\treadonly counters: McpServerCounters;\n\treadonly agentDir?: string;\n\treadonly authPlan?: ServerAuthPlan;\n\tcachedCatalog?: McpCachedServerCatalog;\n\tcacheRefreshedAfterConnect: boolean;\n\t/** Full mcp tool names last registered for this server (list_changed diffing). */\n\tknownToolNames?: string[];\n\t/** Latest `/mcp status` list_changed delta line, e.g. \"2 added (inactive), 1 removed\". */\n\tlastListChangedDelta?: string;\n\t/** Teardown for the list_changed coalescer + subscription. */\n\tdisposeListChanged?: () => void;\n}\n"]}

package/dist/core/extensions/builtin/mcp/service.d.ts

@@ -32,7 +32,7 @@ export declare class McpService {
     /** Connected servers that list resources (todo 39), for mention expansion. */
     getMcpResourceServers(): readonly McpResourceServer[];
     /** Reveal skill-owned tools (todo 37): activation is effective the next
-     * turn, exactly like an mcp_search promotion. Unknown names are ignored. */
+     * turn, exactly like an tool_search promotion. Unknown names are ignored. */
     activateSkillMcpTools(names: readonly string[]): void;
     handleSessionShutdown(event: SessionShutdownEvent): Promise<void>;
     dispose(reason: McpDisposeReason): Promise<void>;
@@ -45,7 +45,7 @@ export declare class McpService {
     recordCall(name: string, elapsedMs: number, failed: boolean): void;
     getSnapshot(): McpServiceSnapshot;
     /**
-     * Replay mcp_search activation markers from session history through the
+     * Replay tool_search activation markers from session history through the
      * live tier-B activation path (see tool-search.ts). Returns newly activated
      * names; safe to call repeatedly (already-active names are skipped).
      */