@code-yeongyu/senpi 2026.7.5-2 → 2026.7.9

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

@@ -0,0 +1,139 @@
+// MCP resources (todo 39): list/read/subscribe + @mcp: input-mention expansion.
+//
+// Model-facing access is two utility tools — mcp_list_resources and
+// mcp_read_resource — registered ONLY when at least one connected server
+// actually lists resources (no dead tools). User-facing convenience is the
+// `@mcp:<server>/<uri>` mention, expanded through the sanctioned `input` event
+// transform: recognized mentions are replaced inline with the fetched resource
+// body (output-guarded); unrecognized or failing mentions pass through
+// UNCHANGED with a one-line notice, never blocking the submission. Servers
+// declaring the resources.subscribe capability get per-resource subscriptions;
+// updated/list_changed notifications flow into the existing tools-changed
+// refresh path, so the catalog cache stays current.
+import { Text } from "@earendil-works/pi-tui";
+import { ResourceUpdatedNotificationSchema } from "@modelcontextprotocol/sdk/types.js";
+import { Type } from "typebox";
+import { ToolExecError } from "./errors.js";
+import { applyMcpOutputGuard } from "./guard/output-guard.js";
+/** Route resource updated notifications into the shared refresh path. */
+export function subscribeMcpResourceUpdated(client, onChange) {
+    client.setNotificationHandler(ResourceUpdatedNotificationSchema, () => {
+        onChange();
+    });
+}
+/** Best-effort per-resource subscriptions when the server declares support. */
+export async function ensureMcpResourceSubscriptions(client, resources) {
+    if (client.getServerCapabilities()?.resources?.subscribe !== true)
+        return;
+    await Promise.all(resources.map((resource) => client.subscribeResource({ uri: resource.uri }).catch(() => undefined)));
+}
+/** Read one resource and flatten its contents to guarded text. */
+export async function readMcpResourceAsText(server, uri) {
+    let contents;
+    try {
+        const result = await server.connection.client.readResource({ uri }, { timeout: server.requestTimeoutMs });
+        contents = result.contents;
+    }
+    catch (error) {
+        throw new ToolExecError(`Failed to read MCP resource ${uri}: ${error instanceof Error ? error.message : String(error)}`, {
+            phase: "call",
+            serverName: server.server,
+        });
+    }
+    const parts = contents.map((content) => {
+        if ("text" in content && typeof content.text === "string")
+            return content.text;
+        const blob = "blob" in content && typeof content.blob === "string" ? content.blob : "";
+        return `[binary resource ${content.uri} (${content.mimeType ?? "unknown"}), ~${Math.round((blob.length * 3) / 4)} bytes]`;
+    });
+    const guarded = await applyMcpOutputGuard([{ type: "text", text: parts.join("\n") }], {
+        agentDir: server.agentDir,
+        outputGuard: server.outputGuard,
+        server: server.server,
+    });
+    return guarded.map((block) => ("text" in block && typeof block.text === "string" ? block.text : "")).join("\n");
+}
+const ListParams = Type.Object({
+    server: Type.Optional(Type.String({ description: "Restrict to one MCP server name." })),
+});
+const ReadParams = Type.Object({
+    server: Type.String({ description: "MCP server name (from mcp_list_resources)." }),
+    uri: Type.String({ description: "Resource URI to read." }),
+});
+/** The two model-facing utility tools. Register only when servers() is non-empty. */
+export function createMcpResourceTools(servers) {
+    const list = {
+        name: "mcp_list_resources",
+        label: "List MCP resources",
+        description: "List resources exposed by connected MCP servers (URI, name, mime type).",
+        parameters: ListParams,
+        executionMode: "parallel",
+        async execute(_id, params) {
+            const scoped = servers().filter((entry) => params.server === undefined || entry.server === params.server);
+            const lines = scoped.flatMap((entry) => entry.resources.map((resource) => `- @mcp:${entry.server}/${resource.uri} — ${resource.name ?? resource.uri}${resource.mimeType ? ` (${resource.mimeType})` : ""}`));
+            const text = lines.length === 0 ? "No MCP resources available." : lines.join("\n");
+            return {
+                content: [{ type: "text", text }],
+                details: {
+                    preview: `${lines.length} resource(s)`,
+                    server: params.server ?? "*",
+                    tool: "mcp_list_resources",
+                },
+            };
+        },
+        renderCall(args, theme) {
+            return new Text(theme.fg("toolTitle", theme.bold(`mcp_list_resources ${args.server ?? ""}`.trim())), 0, 0);
+        },
+    };
+    const read = {
+        name: "mcp_read_resource",
+        label: "Read MCP resource",
+        description: "Read one MCP resource by server name and URI; returns its (guarded) content.",
+        parameters: ReadParams,
+        executionMode: "parallel",
+        async execute(_id, params) {
+            const entry = servers().find((candidate) => candidate.server === params.server);
+            if (entry === undefined) {
+                throw new ToolExecError(`Unknown MCP server '${params.server}' for resource ${params.uri}.`, {
+                    phase: "call",
+                    serverName: params.server,
+                });
+            }
+            const text = await readMcpResourceAsText(entry, params.uri);
+            return {
+                content: [{ type: "text", text }],
+                details: { preview: params.uri, server: params.server, tool: "mcp_read_resource" },
+            };
+        },
+        renderCall(args, theme) {
+            return new Text(theme.fg("toolTitle", theme.bold(`mcp_read_resource ${args.server}/${args.uri}`)), 0, 0);
+        },
+    };
+    return [list, read];
+}
+const MENTION_PATTERN = /@mcp:([A-Za-z0-9._-]+)\/(\S+)/g;
+/** Expand `@mcp:<server>/<uri>` mentions; failures leave the mention intact. */
+export async function expandMcpResourceMentions(text, servers) {
+    const matches = [...text.matchAll(MENTION_PATTERN)];
+    if (matches.length === 0)
+        return { changed: false, notices: [], text };
+    const notices = [];
+    let expanded = text;
+    for (const match of matches) {
+        const [mention, serverName, uri] = match;
+        const entry = servers().find((candidate) => candidate.server === serverName);
+        if (entry === undefined) {
+            notices.push(`@mcp mention left as-is: unknown server '${serverName}'.`);
+            continue;
+        }
+        try {
+            const body = await readMcpResourceAsText(entry, uri);
+            expanded = expanded.replace(mention, `<mcp-resource server="${serverName}" uri="${uri}">\n${body}\n</mcp-resource>`);
+        }
+        catch (error) {
+            notices.push(`@mcp mention left as-is: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    return { changed: expanded !== text, notices, text: expanded };
+}
+//# sourceMappingURL=resources.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/resources.ts"],"names":[],"mappings":"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","sourcesContent":["// MCP resources (todo 39): list/read/subscribe + @mcp: input-mention expansion.\n//\n// Model-facing access is two utility tools — mcp_list_resources and\n// mcp_read_resource — registered ONLY when at least one connected server\n// actually lists resources (no dead tools). User-facing convenience is the\n// `@mcp:<server>/<uri>` mention, expanded through the sanctioned `input` event\n// transform: recognized mentions are replaced inline with the fetched resource\n// body (output-guarded); unrecognized or failing mentions pass through\n// UNCHANGED with a one-line notice, never blocking the submission. Servers\n// declaring the resources.subscribe capability get per-resource subscriptions;\n// updated/list_changed notifications flow into the existing tools-changed\n// refresh path, so the catalog cache stays current.\n\nimport { Text } from \"@earendil-works/pi-tui\";\nimport type { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport { ResourceUpdatedNotificationSchema } from \"@modelcontextprotocol/sdk/types.js\";\nimport { type Static, Type } from \"typebox\";\nimport type { ToolDefinition } from \"../../types.ts\";\nimport type { McpCachedServerCatalog } from \"./catalog-cache.ts\";\nimport type { ServerConnection } from \"./connection.ts\";\nimport { ToolExecError } from \"./errors.ts\";\nimport type { McpToolDetails } from \"./expose/register.ts\";\nimport { applyMcpOutputGuard } from \"./guard/output-guard.ts\";\n\nexport interface McpResourceServer {\n\treadonly server: string;\n\treadonly connection: ServerConnection;\n\treadonly agentDir?: string;\n\treadonly outputGuard?: Parameters<typeof applyMcpOutputGuard>[1][\"outputGuard\"];\n\treadonly requestTimeoutMs?: number;\n\treadonly resources: NonNullable<McpCachedServerCatalog[\"resources\"]>;\n}\n\n/** Route resource updated notifications into the shared refresh path. */\nexport function subscribeMcpResourceUpdated(client: Client, onChange: () => void): void {\n\tclient.setNotificationHandler(ResourceUpdatedNotificationSchema, () => {\n\t\tonChange();\n\t});\n}\n\n/** Best-effort per-resource subscriptions when the server declares support. */\nexport async function ensureMcpResourceSubscriptions(\n\tclient: Client,\n\tresources: ReadonlyArray<{ uri: string }>,\n): Promise<void> {\n\tif (client.getServerCapabilities()?.resources?.subscribe !== true) return;\n\tawait Promise.all(\n\t\tresources.map((resource) => client.subscribeResource({ uri: resource.uri }).catch(() => undefined)),\n\t);\n}\n\n/** Read one resource and flatten its contents to guarded text. */\nexport async function readMcpResourceAsText(server: McpResourceServer, uri: string): Promise<string> {\n\tlet contents: Awaited<ReturnType<Client[\"readResource\"]>>[\"contents\"];\n\ttry {\n\t\tconst result = await server.connection.client.readResource({ uri }, { timeout: server.requestTimeoutMs });\n\t\tcontents = result.contents;\n\t} catch (error) {\n\t\tthrow new ToolExecError(\n\t\t\t`Failed to read MCP resource ${uri}: ${error instanceof Error ? error.message : String(error)}`,\n\t\t\t{\n\t\t\t\tphase: \"call\",\n\t\t\t\tserverName: server.server,\n\t\t\t},\n\t\t);\n\t}\n\tconst parts = contents.map((content) => {\n\t\tif (\"text\" in content && typeof content.text === \"string\") return content.text;\n\t\tconst blob = \"blob\" in content && typeof content.blob === \"string\" ? content.blob : \"\";\n\t\treturn `[binary resource ${content.uri} (${content.mimeType ?? \"unknown\"}), ~${Math.round((blob.length * 3) / 4)} bytes]`;\n\t});\n\tconst guarded = await applyMcpOutputGuard([{ type: \"text\", text: parts.join(\"\\n\") }], {\n\t\tagentDir: server.agentDir,\n\t\toutputGuard: server.outputGuard,\n\t\tserver: server.server,\n\t});\n\treturn guarded.map((block) => (\"text\" in block && typeof block.text === \"string\" ? block.text : \"\")).join(\"\\n\");\n}\n\nconst ListParams = Type.Object({\n\tserver: Type.Optional(Type.String({ description: \"Restrict to one MCP server name.\" })),\n});\nconst ReadParams = Type.Object({\n\tserver: Type.String({ description: \"MCP server name (from mcp_list_resources).\" }),\n\turi: Type.String({ description: \"Resource URI to read.\" }),\n});\n\ntype McpUtilityTool = ToolDefinition<typeof ListParams | typeof ReadParams, McpToolDetails | undefined, unknown>;\n\n/** The two model-facing utility tools. Register only when servers() is non-empty. */\nexport function createMcpResourceTools(servers: () => readonly McpResourceServer[]): McpUtilityTool[] {\n\tconst list: ToolDefinition<typeof ListParams, McpToolDetails | undefined, unknown> = {\n\t\tname: \"mcp_list_resources\",\n\t\tlabel: \"List MCP resources\",\n\t\tdescription: \"List resources exposed by connected MCP servers (URI, name, mime type).\",\n\t\tparameters: ListParams,\n\t\texecutionMode: \"parallel\",\n\t\tasync execute(_id, params: Static<typeof ListParams>) {\n\t\t\tconst scoped = servers().filter((entry) => params.server === undefined || entry.server === params.server);\n\t\t\tconst lines = scoped.flatMap((entry) =>\n\t\t\t\tentry.resources.map(\n\t\t\t\t\t(resource) =>\n\t\t\t\t\t\t`- @mcp:${entry.server}/${resource.uri} — ${resource.name ?? resource.uri}${resource.mimeType ? ` (${resource.mimeType})` : \"\"}`,\n\t\t\t\t),\n\t\t\t);\n\t\t\tconst text = lines.length === 0 ? \"No MCP resources available.\" : lines.join(\"\\n\");\n\t\t\treturn {\n\t\t\t\tcontent: [{ type: \"text\", text }],\n\t\t\t\tdetails: {\n\t\t\t\t\tpreview: `${lines.length} resource(s)`,\n\t\t\t\t\tserver: params.server ?? \"*\",\n\t\t\t\t\ttool: \"mcp_list_resources\",\n\t\t\t\t},\n\t\t\t};\n\t\t},\n\t\trenderCall(args, theme) {\n\t\t\treturn new Text(theme.fg(\"toolTitle\", theme.bold(`mcp_list_resources ${args.server ?? \"\"}`.trim())), 0, 0);\n\t\t},\n\t};\n\tconst read: ToolDefinition<typeof ReadParams, McpToolDetails | undefined, unknown> = {\n\t\tname: \"mcp_read_resource\",\n\t\tlabel: \"Read MCP resource\",\n\t\tdescription: \"Read one MCP resource by server name and URI; returns its (guarded) content.\",\n\t\tparameters: ReadParams,\n\t\texecutionMode: \"parallel\",\n\t\tasync execute(_id, params: Static<typeof ReadParams>) {\n\t\t\tconst entry = servers().find((candidate) => candidate.server === params.server);\n\t\t\tif (entry === undefined) {\n\t\t\t\tthrow new ToolExecError(`Unknown MCP server '${params.server}' for resource ${params.uri}.`, {\n\t\t\t\t\tphase: \"call\",\n\t\t\t\t\tserverName: params.server,\n\t\t\t\t});\n\t\t\t}\n\t\t\tconst text = await readMcpResourceAsText(entry, params.uri);\n\t\t\treturn {\n\t\t\t\tcontent: [{ type: \"text\", text }],\n\t\t\t\tdetails: { preview: params.uri, server: params.server, tool: \"mcp_read_resource\" },\n\t\t\t};\n\t\t},\n\t\trenderCall(args, theme) {\n\t\t\treturn new Text(theme.fg(\"toolTitle\", theme.bold(`mcp_read_resource ${args.server}/${args.uri}`)), 0, 0);\n\t\t},\n\t};\n\treturn [list as McpUtilityTool, read as McpUtilityTool];\n}\n\nconst MENTION_PATTERN = /@mcp:([A-Za-z0-9._-]+)\\/(\\S+)/g;\n\nexport interface McpMentionExpansion {\n\treadonly text: string;\n\treadonly changed: boolean;\n\treadonly notices: string[];\n}\n\n/** Expand `@mcp:<server>/<uri>` mentions; failures leave the mention intact. */\nexport async function expandMcpResourceMentions(\n\ttext: string,\n\tservers: () => readonly McpResourceServer[],\n): Promise<McpMentionExpansion> {\n\tconst matches = [...text.matchAll(MENTION_PATTERN)];\n\tif (matches.length === 0) return { changed: false, notices: [], text };\n\tconst notices: string[] = [];\n\tlet expanded = text;\n\tfor (const match of matches) {\n\t\tconst [mention, serverName, uri] = match;\n\t\tconst entry = servers().find((candidate) => candidate.server === serverName);\n\t\tif (entry === undefined) {\n\t\t\tnotices.push(`@mcp mention left as-is: unknown server '${serverName}'.`);\n\t\t\tcontinue;\n\t\t}\n\t\ttry {\n\t\t\tconst body = await readMcpResourceAsText(entry, uri);\n\t\t\texpanded = expanded.replace(\n\t\t\t\tmention,\n\t\t\t\t`<mcp-resource server=\"${serverName}\" uri=\"${uri}\">\\n${body}\\n</mcp-resource>`,\n\t\t\t);\n\t\t} catch (error) {\n\t\t\tnotices.push(`@mcp mention left as-is: ${error instanceof Error ? error.message : String(error)}`);\n\t\t}\n\t}\n\treturn { changed: expanded !== text, notices, text: expanded };\n}\n"]}

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

@@ -0,0 +1,5 @@
+import type { ResolvedMcpConfig } from "./config-schema.ts";
+import { type McpServerExposureStatus } from "./expose/status.ts";
+import type { McpConnectionEntry } from "./service-types.ts";
+export declare function getMcpServiceExposureStatus(name: string, config: ResolvedMcpConfig | null, entry: McpConnectionEntry | undefined): Promise<McpServerExposureStatus>;
+//# sourceMappingURL=service-exposure.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"service-exposure.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/service-exposure.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAGN,KAAK,uBAAuB,EAC5B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,wBAAsB,2BAA2B,CAChD,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,iBAAiB,GAAG,IAAI,EAChC,KAAK,EAAE,kBAAkB,GAAG,SAAS,GACnC,OAAO,CAAC,uBAAuB,CAAC,CAkBlC"}

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

@@ -0,0 +1,19 @@
+import { cachedToolsToCatalogEntries } from "./catalog.js";
+import { getMcpCatalogExposureStatus, getMcpServerExposureStatus, } from "./expose/status.js";
+import { connectAndRefreshMcpCatalog } from "./startup-race.js";
+export async function getMcpServiceExposureStatus(name, config, entry) {
+    if (config === null)
+        return { toolCount: null };
+    const server = config.servers[name];
+    if (server?.config === undefined || entry === undefined)
+        return { toolCount: null };
+    const serverConfig = server.config;
+    if (entry.cachedCatalog !== undefined && entry.connection.state !== "connected") {
+        const catalog = cachedToolsToCatalogEntries(name, entry.cachedCatalog, entry.connection, serverConfig.requestTimeoutMs, () => connectAndRefreshMcpCatalog(entry, serverConfig), { ensureFresh: () => entry.authPlan?.refresh?.ensureFresh().then(() => undefined) ?? Promise.resolve() });
+        return getMcpCatalogExposureStatus(catalog, serverConfig, config.settings);
+    }
+    if (entry.connection.state !== "connected")
+        return { toolCount: null };
+    return await getMcpServerExposureStatus(name, entry.connection, serverConfig, config.settings);
+}
+//# sourceMappingURL=service-exposure.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"service-exposure.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/service-exposure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,EACN,2BAA2B,EAC3B,0BAA0B,GAE1B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAEhE,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAChD,IAAY,EACZ,MAAgC,EAChC,KAAqC;IAErC,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IAChD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,MAAM,EAAE,MAAM,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IACpF,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC;IACnC,IAAI,KAAK,CAAC,aAAa,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,KAAK,WAAW,EAAE,CAAC;QACjF,MAAM,OAAO,GAAG,2BAA2B,CAC1C,IAAI,EACJ,KAAK,CAAC,aAAa,EACnB,KAAK,CAAC,UAAU,EAChB,YAAY,CAAC,gBAAgB,EAC7B,GAAG,EAAE,CAAC,2BAA2B,CAAC,KAAK,EAAE,YAAY,CAAC,EACtD,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CACxG,CAAC;QACF,OAAO,2BAA2B,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC5E,CAAC;IACD,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,KAAK,WAAW;QAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IACvE,OAAO,MAAM,0BAA0B,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;AAChG,CAAC","sourcesContent":["import { cachedToolsToCatalogEntries } from \"./catalog.ts\";\nimport type { ResolvedMcpConfig } from \"./config-schema.ts\";\nimport {\n\tgetMcpCatalogExposureStatus,\n\tgetMcpServerExposureStatus,\n\ttype McpServerExposureStatus,\n} from \"./expose/status.ts\";\nimport type { McpConnectionEntry } from \"./service-types.ts\";\nimport { connectAndRefreshMcpCatalog } from \"./startup-race.ts\";\n\nexport async function getMcpServiceExposureStatus(\n\tname: string,\n\tconfig: ResolvedMcpConfig | null,\n\tentry: McpConnectionEntry | undefined,\n): Promise<McpServerExposureStatus> {\n\tif (config === null) return { toolCount: null };\n\tconst server = config.servers[name];\n\tif (server?.config === undefined || entry === undefined) return { toolCount: null };\n\tconst serverConfig = server.config;\n\tif (entry.cachedCatalog !== undefined && entry.connection.state !== \"connected\") {\n\t\tconst catalog = cachedToolsToCatalogEntries(\n\t\t\tname,\n\t\t\tentry.cachedCatalog,\n\t\t\tentry.connection,\n\t\t\tserverConfig.requestTimeoutMs,\n\t\t\t() => connectAndRefreshMcpCatalog(entry, serverConfig),\n\t\t\t{ ensureFresh: () => entry.authPlan?.refresh?.ensureFresh().then(() => undefined) ?? Promise.resolve() },\n\t\t);\n\t\treturn getMcpCatalogExposureStatus(catalog, serverConfig, config.settings);\n\t}\n\tif (entry.connection.state !== \"connected\") return { toolCount: null };\n\treturn await getMcpServerExposureStatus(name, entry.connection, serverConfig, config.settings);\n}\n"]}

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

@@ -0,0 +1,11 @@
+import type { ExtensionAPI } from "../../types.ts";
+import type { ResolvedMcpConfig } from "./config-schema.ts";
+import type { McpSessionRegistration } from "./expose/session.ts";
+import type { McpConnectionEntry } from "./service-types.ts";
+type McpToolRegistrar = Pick<ExtensionAPI, "getActiveTools" | "setActiveTools" | "registerTool">;
+export interface McpServiceDirectToolRegistrationOptions {
+    readonly refreshActiveSetWhenEmpty?: boolean;
+}
+export declare function registerMcpServiceDirectTools(pi: McpToolRegistrar, config: ResolvedMcpConfig, entries: Iterable<McpConnectionEntry>, options?: McpServiceDirectToolRegistrationOptions): Promise<McpSessionRegistration | undefined>;
+export {};
+//# sourceMappingURL=service-register.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"service-register.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/service-register.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAElE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,KAAK,gBAAgB,GAAG,IAAI,CAAC,YAAY,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,cAAc,CAAC,CAAC;AAEjG,MAAM,WAAW,uCAAuC;IACvD,QAAQ,CAAC,yBAAyB,CAAC,EAAE,OAAO,CAAC;CAC7C;AAED,wBAAsB,6BAA6B,CAClD,EAAE,EAAE,gBAAgB,EACpB,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,QAAQ,CAAC,kBAAkB,CAAC,EACrC,OAAO,GAAE,uCAA4C,GACnD,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CAkB7C"}

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

@@ -0,0 +1,17 @@
+import { registerDirectMcpTools } from "./expose/session.js";
+import { connectAndRefreshMcpCatalog } from "./startup-race.js";
+export async function registerMcpServiceDirectTools(pi, config, entries, options = {}) {
+    return await registerDirectMcpTools(pi, config, [...entries].map((entry) => {
+        const serverConfig = config.servers[entry.name]?.config;
+        return {
+            agentDir: entry.agentDir,
+            cachedCatalog: entry.cachedCatalog,
+            connection: entry.connection,
+            ensureFresh: () => entry.authPlan?.refresh?.ensureFresh().then(() => undefined) ?? Promise.resolve(),
+            ensureCachedToolConnected: () => connectAndRefreshMcpCatalog(entry, serverConfig),
+            logger: entry.logger,
+            name: entry.name,
+        };
+    }), options);
+}
+//# sourceMappingURL=service-register.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"service-register.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/service-register.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAQhE,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAClD,EAAoB,EACpB,MAAyB,EACzB,OAAqC,EACrC,OAAO,GAA4C,EAAE;IAErD,OAAO,MAAM,sBAAsB,CAClC,EAAE,EACF,MAAM,EACN,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC1B,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QACxD,OAAO;YACN,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE;YACpG,yBAAyB,EAAE,GAAG,EAAE,CAAC,2BAA2B,CAAC,KAAK,EAAE,YAAY,CAAC;YACjF,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,IAAI,EAAE,KAAK,CAAC,IAAI;SAChB,CAAC;IACH,CAAC,CAAC,EACF,OAAO,CACP,CAAC;AACH,CAAC","sourcesContent":["import type { ExtensionAPI } from \"../../types.ts\";\nimport type { ResolvedMcpConfig } from \"./config-schema.ts\";\nimport type { McpSessionRegistration } from \"./expose/session.ts\";\nimport { registerDirectMcpTools } from \"./expose/session.ts\";\nimport type { McpConnectionEntry } from \"./service-types.ts\";\nimport { connectAndRefreshMcpCatalog } from \"./startup-race.ts\";\n\ntype McpToolRegistrar = Pick<ExtensionAPI, \"getActiveTools\" | \"setActiveTools\" | \"registerTool\">;\n\nexport interface McpServiceDirectToolRegistrationOptions {\n\treadonly refreshActiveSetWhenEmpty?: boolean;\n}\n\nexport async function registerMcpServiceDirectTools(\n\tpi: McpToolRegistrar,\n\tconfig: ResolvedMcpConfig,\n\tentries: Iterable<McpConnectionEntry>,\n\toptions: McpServiceDirectToolRegistrationOptions = {},\n): Promise<McpSessionRegistration | undefined> {\n\treturn await registerDirectMcpTools(\n\t\tpi,\n\t\tconfig,\n\t\t[...entries].map((entry) => {\n\t\t\tconst serverConfig = config.servers[entry.name]?.config;\n\t\t\treturn {\n\t\t\t\tagentDir: entry.agentDir,\n\t\t\t\tcachedCatalog: entry.cachedCatalog,\n\t\t\t\tconnection: entry.connection,\n\t\t\t\tensureFresh: () => entry.authPlan?.refresh?.ensureFresh().then(() => undefined) ?? Promise.resolve(),\n\t\t\t\tensureCachedToolConnected: () => connectAndRefreshMcpCatalog(entry, serverConfig),\n\t\t\t\tlogger: entry.logger,\n\t\t\t\tname: entry.name,\n\t\t\t};\n\t\t}),\n\t\toptions,\n\t);\n}\n"]}

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

@@ -0,0 +1,5 @@
+import type { ResolvedMcpServer } from "./config-schema.ts";
+import type { ServerConnection } from "./connection.ts";
+import type { McpConnectionEntry, McpServerSnapshot } from "./service-types.ts";
+export declare function buildMcpServerSnapshot(name: string, server: ResolvedMcpServer | undefined, connection: ServerConnection | undefined, entry: McpConnectionEntry | undefined, now?: number): McpServerSnapshot;
+//# sourceMappingURL=service-snapshot.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,17 @@
+export function buildMcpServerSnapshot(name, server, connection, entry, now = Date.now()) {
+    return {
+        name,
+        configState: server?.state ?? "removed",
+        configHash: server?.configHash ?? null,
+        sourcePath: server?.sourcePath ?? null,
+        lifecycleState: connection?.state === "idle" && connection.generation === 0 && entry?.cachedCatalog !== undefined
+            ? "cached"
+            : (connection?.state ?? "not_spawned"),
+        generation: connection?.generation ?? null,
+        pid: connection?.getRootPid() ?? null,
+        lastError: connection?.lastError?.message ?? null,
+        uptimeMs: entry === undefined ? null : now - entry.createdAtMs,
+        counters: entry?.counters ?? { callCount: 0, errorCount: 0, totalLatencyMs: 0, reconnectCount: 0 },
+    };
+}
+//# sourceMappingURL=service-snapshot.js.map

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

@@ -0,0 +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"]}

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

@@ -0,0 +1,68 @@
+import type { ExtensionContext, SessionShutdownEvent, SessionStartEvent } from "../../types.ts";
+import type { ServerAuthPlan } from "./auth/context.ts";
+import type { McpCachedServerCatalog } from "./catalog-cache.ts";
+import type { ResolvedMcpServer } from "./config-schema.ts";
+import type { ServerConnection, ServerConnectionState } from "./connection.ts";
+import type { McpLogger } from "./log.ts";
+export type McpDisposeReason = Extract<SessionShutdownEvent["reason"], "quit" | "reload">;
+export type McpSessionContext = Pick<ExtensionContext, "cwd" | "isProjectTrusted"> & {
+    /**
+     * Session history access, present on the real ExtensionContext. Only
+     * getEntries is needed (attach-time promotion rehydration); keeping the
+     * requirement narrow lets tests pass a two-line fake.
+     */
+    sessionManager?: Pick<ExtensionContext["sessionManager"], "getEntries">;
+};
+export interface McpSessionOptions {
+    readonly agentDir?: string;
+    readonly env?: Record<string, string | undefined>;
+    readonly logDir?: string;
+    readonly projectTrusted?: boolean;
+}
+export interface McpServiceSnapshot {
+    disposed: boolean;
+    disposeCount: number;
+    lastDisposeReason: McpDisposeReason | null;
+    sessionStartCount: number;
+    lastSessionStartReason: SessionStartEvent["reason"] | null;
+    hasSessionContext: boolean;
+    connectionCount: number;
+}
+export interface McpServerSnapshot {
+    name: string;
+    configState: ResolvedMcpServer["state"] | "removed";
+    configHash: string | null;
+    sourcePath: string | null;
+    lifecycleState: ServerConnectionState | "cached" | "not_spawned";
+    generation: number | null;
+    pid: number | null;
+    lastError: string | null;
+    uptimeMs: number | null;
+    counters: McpServerCounters;
+}
+export interface McpServerCounters {
+    callCount: number;
+    errorCount: number;
+    totalLatencyMs: number;
+    reconnectCount: number;
+}
+export interface McpConnectionEntry {
+    readonly key: string;
+    readonly name: string;
+    readonly configHash: string;
+    readonly connection: ServerConnection;
+    readonly logger: McpLogger;
+    readonly createdAtMs: number;
+    readonly counters: McpServerCounters;
+    readonly agentDir?: string;
+    readonly authPlan?: ServerAuthPlan;
+    cachedCatalog?: McpCachedServerCatalog;
+    cacheRefreshedAfterConnect: boolean;
+    /** Full mcp tool names last registered for this server (list_changed diffing). */
+    knownToolNames?: string[];
+    /** Latest `/mcp status` list_changed delta line, e.g. "2 added (inactive), 1 removed". */
+    lastListChangedDelta?: string;
+    /** Teardown for the list_changed coalescer + subscription. */
+    disposeListChanged?: () => void;
+}
+//# sourceMappingURL=service-types.d.ts.map

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

@@ -0,0 +1 @@
+{"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

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

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

@@ -0,0 +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"]}

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

@@ -0,0 +1,75 @@
+import type { ExtensionAPI, SessionShutdownEvent, SessionStartEvent } from "../../types.ts";
+import { resolveSkillMcpServer } from "./config.ts";
+import type { McpServerConfig } from "./config-schema.ts";
+import { ServerConnection } from "./connection.ts";
+import type { McpServerExposureStatus } from "./expose/status.ts";
+import type { McpResourceServer } from "./resources.ts";
+import type { McpDisposeReason, McpServerSnapshot, McpServiceSnapshot, McpSessionContext, McpSessionOptions } from "./service-types.ts";
+export { registerToolsPreservingActiveSet } from "./active-set.ts";
+export declare class McpService {
+    #private;
+    attachSession(event: SessionStartEvent, ctx: McpSessionContext, _pi?: Pick<ExtensionAPI, "getActiveTools" | "setActiveTools" | "registerTool">, options?: McpSessionOptions): Promise<void>;
+    /**
+     * Register skill-declared MCP servers (todo 37). Skill servers are forced
+     * into search mode with no directTools, so their catalogs register with
+     * ZERO active tools until activateSkillMcpTools reveals them. A name
+     * collision with a system-configured server keeps the system config and
+     * returns a warning (system wins).
+     */
+    attachSkillMcpServers(declared: ReadonlyMap<string, {
+        raw: Parameters<typeof resolveSkillMcpServer>[1];
+        sourcePath: string;
+    }>): Promise<string[]>;
+    /** Registered searchable catalog (mapped name + server-side tool name),
+     * used by the skills loader to compute activation targets. */
+    getTierBSearchable(): ReadonlyArray<{
+        name: string;
+        toolName: string;
+        server: string;
+    }>;
+    /** Connected servers that list prompts (todo 40), for slash registration. */
+    getMcpPromptServers(): readonly import("./prompts.ts").McpPromptServer[];
+    /** 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. */
+    activateSkillMcpTools(names: readonly string[]): void;
+    handleSessionShutdown(event: SessionShutdownEvent): Promise<void>;
+    dispose(reason: McpDisposeReason): Promise<void>;
+    isDisposed(): boolean;
+    getConnection(name: string): ServerConnection | undefined;
+    reconnectServer(name: string): Promise<void>;
+    getServerSnapshots(): McpServerSnapshot[];
+    getLogLines(name: string, maxLines: number): string[];
+    getServerExposureStatus(name: string): Promise<McpServerExposureStatus>;
+    recordCall(name: string, elapsedMs: number, failed: boolean): void;
+    getSnapshot(): McpServiceSnapshot;
+    /**
+     * Replay mcp_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).
+     */
+    rehydrateActiveToolsFromHistory(messages: readonly unknown[]): string[];
+    /**
+     * Once-per-registration variant for per-turn context events: scanning the
+     * full history each turn would cost O(history) JSON serialization, and a
+     * live session's active set only drifts from history when a (re-)registration
+     * rebuilt it — so scan once after each registration and skip otherwise.
+     */
+    maybeRehydrateFromHistory(messages: readonly unknown[]): string[];
+    getPendingAuth(): Map<string, import("./auth/oauth-provider.ts").McpOAuthProvider>;
+    getAuthTarget(name: string): {
+        config: McpServerConfig;
+        agentDir?: string;
+        env?: Record<string, string | undefined>;
+        callbackUrl?: string;
+    } | undefined;
+    getCachedInstructions(name: string): string | undefined;
+    /** Resolved `settings.nativeToolSearch` (auto | true | false | undefined).
+     * Drives the native provider tool-search adapter gate. */
+    getNativeToolSearchSetting(): "auto" | boolean | undefined;
+}
+export declare function getMcpService(): McpService;
+export declare function shouldDisposeMcpService(reason: SessionShutdownEvent["reason"]): reason is McpDisposeReason;
+export declare function resetMcpServiceForTests(): void;
+//# sourceMappingURL=service.d.ts.map

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

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