@code-yeongyu/senpi 2026.7.4 → 2026.7.9-2

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

@@ -0,0 +1 @@
+{"version":3,"file":"skills.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/skills.ts"],"names":[],"mappings":"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","sourcesContent":["// skills-carry-MCP sidecar loader (todo 37).\n//\n// Skills can ship MCP servers two ways: an `mcp.json` sidecar next to SKILL.md\n// (Amp-compatible: a map of serverName -> {command/args/env | url/headers} plus\n// an optional includeTools glob list, optionally wrapped in `mcpServers`), or a\n// `mcp:` block in SKILL.md frontmatter. The sidecar wins when both exist.\n// Declared servers register LAZY with tools hidden (0 pre-load payload tokens,\n// enforced by resolveSkillMcpServer forcing search mode with no directTools);\n// loading a skill (a `/skill:<name>` command or the model reading its SKILL.md)\n// reveals the union of its includeTools matches for the session. The same\n// server declared by multiple skills union-merges includeTools; a name\n// collision with a system-configured server is resolved system-wins at\n// registration (service.attachSkillMcpServers). There is no reliable unload\n// signal, so revealed tools stay active for the session.\n\nimport { existsSync, readFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport { parseFrontmatter } from \"../../../../utils/frontmatter.ts\";\nimport type { RawConfig } from \"./config-schema.ts\";\n\ntype RawServer = NonNullable<RawConfig[\"mcpServers\"]>[string];\n\nexport interface SkillLike {\n\treadonly name: string;\n\treadonly filePath: string;\n\treadonly baseDir: string;\n}\n\ninterface SkillServerDecl {\n\traw: RawServer & { includeTools?: string[] };\n\tsourcePath: string;\n\t/** skill name -> includeTools globs declared by that skill (default all). */\n\tincludeToolsBySkill: Map<string, string[]>;\n}\n\nexport interface SkillMcpDeclarations {\n\tservers: Map<string, SkillServerDecl>;\n\twarnings: string[];\n}\n\nexport function parseSkillMcpDeclarations(skills: readonly SkillLike[]): SkillMcpDeclarations {\n\tconst servers = new Map<string, SkillServerDecl>();\n\tconst warnings: string[] = [];\n\tfor (const skill of skills) {\n\t\tconst { declared, sourcePath, warning } = readSkillServers(skill);\n\t\tif (warning !== undefined) warnings.push(warning);\n\t\tfor (const [name, raw] of Object.entries(declared)) {\n\t\t\tconst globs = normalizeGlobs(raw.includeTools);\n\t\t\tconst existing = servers.get(name);\n\t\t\tif (existing === undefined) {\n\t\t\t\tservers.set(name, { includeToolsBySkill: new Map([[skill.name, globs]]), raw, sourcePath });\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\t// Same server from multiple skills: first config wins, includeTools\n\t\t\t// union-merge per skill (revealed together once any owner loads).\n\t\t\texisting.includeToolsBySkill.set(skill.name, globs);\n\t\t}\n\t}\n\treturn { servers, warnings };\n}\n\nfunction readSkillServers(skill: SkillLike): {\n\tdeclared: Record<string, RawServer & { includeTools?: string[] }>;\n\tsourcePath: string;\n\twarning?: string;\n} {\n\tconst sidecarPath = join(skill.baseDir, \"mcp.json\");\n\tif (existsSync(sidecarPath)) {\n\t\ttry {\n\t\t\tconst parsed: unknown = JSON.parse(readFileSync(sidecarPath, \"utf8\"));\n\t\t\treturn { declared: unwrapServerMap(parsed), sourcePath: sidecarPath };\n\t\t} catch (error) {\n\t\t\treturn {\n\t\t\t\tdeclared: {},\n\t\t\t\tsourcePath: sidecarPath,\n\t\t\t\twarning: `Skill '${skill.name}': invalid mcp.json sidecar skipped (${error instanceof Error ? error.message : String(error)}); the skill itself still loads.`,\n\t\t\t};\n\t\t}\n\t}\n\ttry {\n\t\tconst { frontmatter } = parseFrontmatter<{ mcp?: unknown }>(readFileSync(skill.filePath, \"utf8\"));\n\t\tif (frontmatter.mcp === undefined) return { declared: {}, sourcePath: skill.filePath };\n\t\treturn { declared: unwrapServerMap(frontmatter.mcp), sourcePath: skill.filePath };\n\t} catch (error) {\n\t\treturn {\n\t\t\tdeclared: {},\n\t\t\tsourcePath: skill.filePath,\n\t\t\twarning: `Skill '${skill.name}': unreadable frontmatter mcp block skipped (${error instanceof Error ? error.message : String(error)}); the skill itself still loads.`,\n\t\t};\n\t}\n}\n\nfunction unwrapServerMap(value: unknown): Record<string, RawServer & { includeTools?: string[] }> {\n\tif (typeof value !== \"object\" || value === null || Array.isArray(value)) return {};\n\tconst record = value as Record<string, unknown>;\n\tconst map = typeof record.mcpServers === \"object\" && record.mcpServers !== null ? record.mcpServers : record;\n\tconst declared: Record<string, RawServer & { includeTools?: string[] }> = {};\n\tfor (const [name, server] of Object.entries(map as Record<string, unknown>)) {\n\t\tif (typeof server !== \"object\" || server === null || Array.isArray(server)) continue;\n\t\tdeclared[name] = server as RawServer & { includeTools?: string[] };\n\t}\n\treturn declared;\n}\n\nfunction normalizeGlobs(includeTools: unknown): string[] {\n\tif (!Array.isArray(includeTools)) return [\"*\"];\n\tconst globs = includeTools.filter((glob): glob is string => typeof glob === \"string\" && glob.length > 0);\n\treturn globs.length > 0 ? globs : [\"*\"];\n}\n\n/** `*`-only glob match against the ORIGINAL (server-side) tool name. */\nexport function matchIncludeTools(globs: readonly string[], toolName: string): boolean {\n\treturn globs.some((glob) => {\n\t\tconst pattern = `^${glob.split(\"*\").map(escapeRegExp).join(\".*\")}$`;\n\t\treturn new RegExp(pattern).test(toolName);\n\t});\n}\n\nfunction escapeRegExp(text: string): string {\n\treturn text.replace(/[.*+?^${}()|[\\]\\\\]/g, \"\\\\$&\");\n}\n\n/**\n * Names to reveal when `skillName` loads: for every server the skill declared,\n * every REGISTERED tool (mapped `mcp_<server>_<tool>` name) whose server-side\n * tool name matches the union of that skill's includeTools globs.\n */\nexport function skillActivationTargets(\n\tdeclarations: SkillMcpDeclarations,\n\tskillName: string,\n\tregistered: ReadonlyArray<{ name: string; toolName: string; server: string }>,\n): string[] {\n\tconst targets = new Set<string>();\n\tfor (const [serverName, decl] of declarations.servers) {\n\t\tconst globs = decl.includeToolsBySkill.get(skillName);\n\t\tif (globs === undefined) continue;\n\t\tfor (const tool of registered) {\n\t\t\tif (tool.server !== serverName) continue;\n\t\t\tif (matchIncludeTools(globs, tool.toolName)) targets.add(tool.name);\n\t\t}\n\t}\n\treturn [...targets].sort();\n}\n"]}

package/dist/core/extensions/builtin/mcp/startup-race.d.ts

@@ -0,0 +1,20 @@
+import type { ExtensionAPI } from "../../types.ts";
+import type { ResolvedMcpServer } from "./config-schema.ts";
+import type { McpConnectionEntry } from "./service-types.ts";
+export declare const MCP_STARTUP_RACE_MS = 250;
+export type McpStartupRaceResult = "settled" | "timeout";
+export type McpToolRegistrar = Pick<ExtensionAPI, "getActiveTools" | "setActiveTools" | "registerTool">;
+interface RaceMcpStartupConnectOptions {
+    readonly entry: McpConnectionEntry;
+    readonly pi: McpToolRegistrar | undefined;
+    readonly registerDirectTools: (pi: McpToolRegistrar) => Promise<void>;
+    readonly serverConfig: ResolvedMcpServer["config"];
+    readonly shouldRefreshTools: () => boolean;
+}
+export declare function raceMcpStartupConnect(options: RaceMcpStartupConnectOptions): Promise<void>;
+export declare function connectAndRefreshMcpCatalog(entry: McpConnectionEntry, serverConfig: ResolvedMcpServer["config"]): Promise<void>;
+export declare function ignoreStartupNeedsAuth(entry: McpConnectionEntry, connect: Promise<void>): Promise<void>;
+export declare function waitForMcpStartupRace(connect: Promise<void>, deadlineMs?: number): Promise<McpStartupRaceResult>;
+export declare function shouldRaceMcpStartup(lifecycle: "lazy" | "eager" | "keep-alive"): boolean;
+export {};
+//# sourceMappingURL=startup-race.d.ts.map

package/dist/core/extensions/builtin/mcp/startup-race.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"startup-race.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/startup-race.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAK5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,eAAO,MAAM,mBAAmB,MAAM,CAAC;AAEvC,MAAM,MAAM,oBAAoB,GAAG,SAAS,GAAG,SAAS,CAAC;AACzD,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,cAAc,CAAC,CAAC;AAExG,UAAU,4BAA4B;IACrC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC;IACnC,QAAQ,CAAC,EAAE,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,mBAAmB,EAAE,CAAC,EAAE,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACnD,QAAQ,CAAC,kBAAkB,EAAE,MAAM,OAAO,CAAC;CAC3C;AAED,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,4BAA4B,GAAG,OAAO,CAAC,IAAI,CAAC,CAQhG;AAED,wBAAsB,2BAA2B,CAChD,KAAK,EAAE,kBAAkB,EACzB,YAAY,EAAE,iBAAiB,CAAC,QAAQ,CAAC,GACvC,OAAO,CAAC,IAAI,CAAC,CA4Bf;AAYD,wBAAsB,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAO7G;AAaD,wBAAsB,qBAAqB,CAC1C,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,EACtB,UAAU,SAAsB,GAC9B,OAAO,CAAC,oBAAoB,CAAC,CAc/B;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,GAAG,YAAY,GAAG,OAAO,CAExF"}

package/dist/core/extensions/builtin/mcp/startup-race.js

@@ -0,0 +1,101 @@
+import { collectServerCatalogForCache, writeMcpCachedServer } from "./catalog-cache.js";
+import { markMcpConnectionNeedsAuth } from "./health.js";
+import { createMcpLogger } from "./log.js";
+import { ensureMcpResourceSubscriptions } from "./resources.js";
+import { safeTimer } from "./wrap.js";
+export const MCP_STARTUP_RACE_MS = 250;
+export async function raceMcpStartupConnect(options) {
+    const connect = ignoreStartupNeedsAuth(options.entry, connectAndRefreshMcpCatalog(options.entry, options.serverConfig));
+    const result = await waitForMcpStartupRace(connect);
+    if (result === "settled" || options.pi === undefined)
+        return;
+    void connect.then(() => refreshMcpToolsAfterStartupRace(options));
+}
+export async function connectAndRefreshMcpCatalog(entry, serverConfig) {
+    if (serverConfig === undefined)
+        return;
+    try {
+        await entry.authPlan?.refresh?.ensureFresh();
+    }
+    catch (error) {
+        const authError = markMcpConnectionNeedsAuth(entry.connection, error);
+        if (authError !== undefined) {
+            entry.logger.warn(authError.message);
+            throw authError;
+        }
+        throw error;
+    }
+    await connectMcpServer(entry.connection, entry.logger);
+    if (entry.connection.state !== "connected")
+        return;
+    if (entry.cacheRefreshedAfterConnect)
+        return;
+    entry.cacheRefreshedAfterConnect = true;
+    try {
+        const catalog = await collectServerCatalogForCache(entry.connection, serverConfig, entry.configHash);
+        entry.cachedCatalog = catalog;
+        await writeMcpCachedServer(entry.agentDir, entry.name, catalog);
+        // Per-resource subscriptions (todo 39): only when the server declares
+        // resources.subscribe; best-effort, failures are non-fatal.
+        await ensureMcpResourceSubscriptions(entry.connection.client, catalog.resources ?? []);
+    }
+    catch (error) {
+        entry.logger.warn("Failed to refresh MCP catalog cache", {
+            error: error instanceof Error ? error.message : String(error),
+        });
+    }
+}
+async function connectMcpServer(connection, logger) {
+    try {
+        await connection.connect();
+    }
+    catch (error) {
+        const failure = error instanceof Error ? error : new Error(String(error));
+        if (connection.lastError === undefined)
+            connection.markDegraded(failure);
+        logger?.warn(failure.message);
+    }
+}
+export async function ignoreStartupNeedsAuth(entry, connect) {
+    try {
+        await connect;
+    }
+    catch (error) {
+        if (entry.connection.state === "needs_auth")
+            return;
+        throw error;
+    }
+}
+async function refreshMcpToolsAfterStartupRace(options) {
+    if (options.pi === undefined || !options.shouldRefreshTools())
+        return;
+    try {
+        await options.registerDirectTools(options.pi);
+    }
+    catch (error) {
+        createMcpLogger("service").warn("Failed to refresh MCP tools after startup race", {
+            error: error instanceof Error ? error.message : String(error),
+        });
+    }
+}
+export async function waitForMcpStartupRace(connect, deadlineMs = MCP_STARTUP_RACE_MS) {
+    let timeout;
+    try {
+        return await Promise.race([
+            connect.then(() => "settled"),
+            new Promise((resolve) => {
+                timeout = safeTimer("startup.race", deadlineMs, () => resolve("timeout"), {
+                    logger: createMcpLogger("startup"),
+                });
+            }),
+        ]);
+    }
+    finally {
+        if (timeout !== undefined)
+            clearTimeout(timeout);
+    }
+}
+export function shouldRaceMcpStartup(lifecycle) {
+    return lifecycle === "eager" || lifecycle === "keep-alive";
+}
+//# sourceMappingURL=startup-race.js.map

package/dist/core/extensions/builtin/mcp/startup-race.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"startup-race.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/startup-race.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ExtensionAPI } from \"../../types.ts\";\nimport { collectServerCatalogForCache, writeMcpCachedServer } from \"./catalog-cache.ts\";\nimport type { ResolvedMcpServer } from \"./config-schema.ts\";\nimport type { ServerConnection } from \"./connection.ts\";\nimport { markMcpConnectionNeedsAuth } from \"./health.ts\";\nimport { createMcpLogger } from \"./log.ts\";\nimport { ensureMcpResourceSubscriptions } from \"./resources.ts\";\nimport type { McpConnectionEntry } from \"./service-types.ts\";\nimport { safeTimer } from \"./wrap.ts\";\n\nexport const MCP_STARTUP_RACE_MS = 250;\n\nexport type McpStartupRaceResult = \"settled\" | \"timeout\";\nexport type McpToolRegistrar = Pick<ExtensionAPI, \"getActiveTools\" | \"setActiveTools\" | \"registerTool\">;\n\ninterface RaceMcpStartupConnectOptions {\n\treadonly entry: McpConnectionEntry;\n\treadonly pi: McpToolRegistrar | undefined;\n\treadonly registerDirectTools: (pi: McpToolRegistrar) => Promise<void>;\n\treadonly serverConfig: ResolvedMcpServer[\"config\"];\n\treadonly shouldRefreshTools: () => boolean;\n}\n\nexport async function raceMcpStartupConnect(options: RaceMcpStartupConnectOptions): Promise<void> {\n\tconst connect = ignoreStartupNeedsAuth(\n\t\toptions.entry,\n\t\tconnectAndRefreshMcpCatalog(options.entry, options.serverConfig),\n\t);\n\tconst result = await waitForMcpStartupRace(connect);\n\tif (result === \"settled\" || options.pi === undefined) return;\n\tvoid connect.then(() => refreshMcpToolsAfterStartupRace(options));\n}\n\nexport async function connectAndRefreshMcpCatalog(\n\tentry: McpConnectionEntry,\n\tserverConfig: ResolvedMcpServer[\"config\"],\n): Promise<void> {\n\tif (serverConfig === undefined) return;\n\ttry {\n\t\tawait entry.authPlan?.refresh?.ensureFresh();\n\t} catch (error) {\n\t\tconst authError = markMcpConnectionNeedsAuth(entry.connection, error);\n\t\tif (authError !== undefined) {\n\t\t\tentry.logger.warn(authError.message);\n\t\t\tthrow authError;\n\t\t}\n\t\tthrow error;\n\t}\n\tawait connectMcpServer(entry.connection, entry.logger);\n\tif (entry.connection.state !== \"connected\") return;\n\tif (entry.cacheRefreshedAfterConnect) return;\n\tentry.cacheRefreshedAfterConnect = true;\n\ttry {\n\t\tconst catalog = await collectServerCatalogForCache(entry.connection, serverConfig, entry.configHash);\n\t\tentry.cachedCatalog = catalog;\n\t\tawait writeMcpCachedServer(entry.agentDir, entry.name, catalog);\n\t\t// Per-resource subscriptions (todo 39): only when the server declares\n\t\t// resources.subscribe; best-effort, failures are non-fatal.\n\t\tawait ensureMcpResourceSubscriptions(entry.connection.client, catalog.resources ?? []);\n\t} catch (error) {\n\t\tentry.logger.warn(\"Failed to refresh MCP catalog cache\", {\n\t\t\terror: error instanceof Error ? error.message : String(error),\n\t\t});\n\t}\n}\n\nasync function connectMcpServer(connection: ServerConnection, logger?: McpConnectionEntry[\"logger\"]): Promise<void> {\n\ttry {\n\t\tawait connection.connect();\n\t} catch (error) {\n\t\tconst failure = error instanceof Error ? error : new Error(String(error));\n\t\tif (connection.lastError === undefined) connection.markDegraded(failure);\n\t\tlogger?.warn(failure.message);\n\t}\n}\n\nexport async function ignoreStartupNeedsAuth(entry: McpConnectionEntry, connect: Promise<void>): Promise<void> {\n\ttry {\n\t\tawait connect;\n\t} catch (error) {\n\t\tif (entry.connection.state === \"needs_auth\") return;\n\t\tthrow error;\n\t}\n}\n\nasync function refreshMcpToolsAfterStartupRace(options: RaceMcpStartupConnectOptions): Promise<void> {\n\tif (options.pi === undefined || !options.shouldRefreshTools()) return;\n\ttry {\n\t\tawait options.registerDirectTools(options.pi);\n\t} catch (error) {\n\t\tcreateMcpLogger(\"service\").warn(\"Failed to refresh MCP tools after startup race\", {\n\t\t\terror: error instanceof Error ? error.message : String(error),\n\t\t});\n\t}\n}\n\nexport async function waitForMcpStartupRace(\n\tconnect: Promise<void>,\n\tdeadlineMs = MCP_STARTUP_RACE_MS,\n): Promise<McpStartupRaceResult> {\n\tlet timeout: ReturnType<typeof setTimeout> | undefined;\n\ttry {\n\t\treturn await Promise.race([\n\t\t\tconnect.then(() => \"settled\" as const),\n\t\t\tnew Promise<\"timeout\">((resolve) => {\n\t\t\t\ttimeout = safeTimer(\"startup.race\", deadlineMs, () => resolve(\"timeout\"), {\n\t\t\t\t\tlogger: createMcpLogger(\"startup\"),\n\t\t\t\t});\n\t\t\t}),\n\t\t]);\n\t} finally {\n\t\tif (timeout !== undefined) clearTimeout(timeout);\n\t}\n}\n\nexport function shouldRaceMcpStartup(lifecycle: \"lazy\" | \"eager\" | \"keep-alive\"): boolean {\n\treturn lifecycle === \"eager\" || lifecycle === \"keep-alive\";\n}\n"]}

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

@@ -0,0 +1,9 @@
+import type { McpServerExposureStatus } from "./expose/status.ts";
+import type { McpServerSnapshot } from "./service-types.ts";
+export interface McpStatusRow {
+    readonly exposure: McpServerExposureStatus;
+    readonly snapshot: McpServerSnapshot;
+}
+export declare function buildMcpStatusRows(snapshots: readonly McpServerSnapshot[], getExposureStatus: (name: string) => Promise<McpServerExposureStatus>): Promise<McpStatusRow[]>;
+export declare function formatMcpStatus(title: string, rows: readonly McpStatusRow[]): string;
+//# sourceMappingURL=status.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,QAAQ,EAAE,uBAAuB,CAAC;IAC3C,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC;CACrC;AAED,wBAAsB,kBAAkB,CACvC,SAAS,EAAE,SAAS,iBAAiB,EAAE,EACvC,iBAAiB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,uBAAuB,CAAC,GACnE,OAAO,CAAC,YAAY,EAAE,CAAC,CAOzB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,YAAY,EAAE,GAAG,MAAM,CAEpF"}

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

@@ -0,0 +1,39 @@
+export async function buildMcpStatusRows(snapshots, getExposureStatus) {
+    return Promise.all(snapshots.map(async (snapshot) => ({
+        exposure: await getExposureStatus(snapshot.name),
+        snapshot,
+    })));
+}
+export function formatMcpStatus(title, rows) {
+    return [title, ...rows.map(formatRow)].join("\n");
+}
+function formatRow(row) {
+    const snapshot = row.snapshot;
+    const averageLatencyMs = snapshot.counters.callCount === 0
+        ? 0
+        : Math.round(snapshot.counters.totalLatencyMs / snapshot.counters.callCount);
+    return [
+        snapshot.name,
+        snapshot.configState,
+        `state=${snapshot.lifecycleState}`,
+        `source=${snapshot.sourcePath ?? "n/a"}`,
+        `tools=${row.exposure.toolCount ?? "?"}`,
+        `uptime=${formatUptime(snapshot.uptimeMs)}`,
+        `calls=${snapshot.counters.callCount}`,
+        `errors=${snapshot.counters.errorCount}`,
+        `latency=${averageLatencyMs}ms`,
+        `reconnects=${snapshot.counters.reconnectCount}`,
+        snapshot.lastError ? `lastError=${snapshot.lastError}` : "",
+        row.exposure.hint ? `hint=${row.exposure.hint}` : "",
+    ]
+        .filter((part) => part.length > 0)
+        .join(" ");
+}
+function formatUptime(uptimeMs) {
+    if (uptimeMs === null)
+        return "n/a";
+    if (uptimeMs < 1000)
+        return "<1s";
+    return `${Math.round(uptimeMs / 1000)}s`;
+}
+//# sourceMappingURL=status.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/status.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACvC,SAAuC,EACvC,iBAAqE;IAErE,OAAO,OAAO,CAAC,GAAG,CACjB,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QAClC,QAAQ,EAAE,MAAM,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC;QAChD,QAAQ;KACR,CAAC,CAAC,CACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAa,EAAE,IAA6B;IAC3E,OAAO,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,SAAS,CAAC,GAAiB;IACnC,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;IAC9B,MAAM,gBAAgB,GACrB,QAAQ,CAAC,QAAQ,CAAC,SAAS,KAAK,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,GAAG,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC/E,OAAO;QACN,QAAQ,CAAC,IAAI;QACb,QAAQ,CAAC,WAAW;QACpB,SAAS,QAAQ,CAAC,cAAc,EAAE;QAClC,UAAU,QAAQ,CAAC,UAAU,IAAI,KAAK,EAAE;QACxC,SAAS,GAAG,CAAC,QAAQ,CAAC,SAAS,IAAI,GAAG,EAAE;QACxC,UAAU,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAC3C,SAAS,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE;QACtC,UAAU,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE;QACxC,WAAW,gBAAgB,IAAI;QAC/B,cAAc,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE;QAChD,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE;QAC3D,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;KACpD;SACC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;SACjC,IAAI,CAAC,GAAG,CAAC,CAAC;AACb,CAAC;AAED,SAAS,YAAY,CAAC,QAAuB;IAC5C,IAAI,QAAQ,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IACpC,IAAI,QAAQ,GAAG,IAAI;QAAE,OAAO,KAAK,CAAC;IAClC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC;AAC1C,CAAC","sourcesContent":["import type { McpServerExposureStatus } from \"./expose/status.ts\";\nimport type { McpServerSnapshot } from \"./service-types.ts\";\n\nexport interface McpStatusRow {\n\treadonly exposure: McpServerExposureStatus;\n\treadonly snapshot: McpServerSnapshot;\n}\n\nexport async function buildMcpStatusRows(\n\tsnapshots: readonly McpServerSnapshot[],\n\tgetExposureStatus: (name: string) => Promise<McpServerExposureStatus>,\n): Promise<McpStatusRow[]> {\n\treturn Promise.all(\n\t\tsnapshots.map(async (snapshot) => ({\n\t\t\texposure: await getExposureStatus(snapshot.name),\n\t\t\tsnapshot,\n\t\t})),\n\t);\n}\n\nexport function formatMcpStatus(title: string, rows: readonly McpStatusRow[]): string {\n\treturn [title, ...rows.map(formatRow)].join(\"\\n\");\n}\n\nfunction formatRow(row: McpStatusRow): string {\n\tconst snapshot = row.snapshot;\n\tconst averageLatencyMs =\n\t\tsnapshot.counters.callCount === 0\n\t\t\t? 0\n\t\t\t: Math.round(snapshot.counters.totalLatencyMs / snapshot.counters.callCount);\n\treturn [\n\t\tsnapshot.name,\n\t\tsnapshot.configState,\n\t\t`state=${snapshot.lifecycleState}`,\n\t\t`source=${snapshot.sourcePath ?? \"n/a\"}`,\n\t\t`tools=${row.exposure.toolCount ?? \"?\"}`,\n\t\t`uptime=${formatUptime(snapshot.uptimeMs)}`,\n\t\t`calls=${snapshot.counters.callCount}`,\n\t\t`errors=${snapshot.counters.errorCount}`,\n\t\t`latency=${averageLatencyMs}ms`,\n\t\t`reconnects=${snapshot.counters.reconnectCount}`,\n\t\tsnapshot.lastError ? `lastError=${snapshot.lastError}` : \"\",\n\t\trow.exposure.hint ? `hint=${row.exposure.hint}` : \"\",\n\t]\n\t\t.filter((part) => part.length > 0)\n\t\t.join(\" \");\n}\n\nfunction formatUptime(uptimeMs: number | null): string {\n\tif (uptimeMs === null) return \"n/a\";\n\tif (uptimeMs < 1000) return \"<1s\";\n\treturn `${Math.round(uptimeMs / 1000)}s`;\n}\n"]}

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

@@ -0,0 +1,27 @@
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
+import type { McpOAuthProvider } from "./auth/oauth-provider.ts";
+import type { McpServerConfig } from "./config-schema.ts";
+import type { McpLogger } from "./log.ts";
+import { type McpAsyncErrorSink } from "./wrap.ts";
+export type McpTransportConnection = {
+    readonly serverName: string;
+    readonly client: Client;
+    readonly transport: Transport;
+    readonly transportKind: "stdio" | "http";
+    readonly connectTimeoutMs: number;
+    readonly asyncErrorSink: McpAsyncErrorSink;
+    captureRootPid?(): void;
+    getRootPid(): number | null;
+};
+export type CreateMcpTransportOptions = {
+    readonly serverName: string;
+    readonly config: McpServerConfig;
+    readonly logger: McpLogger;
+    readonly env?: Record<string, string | undefined>;
+    readonly authProvider?: McpOAuthProvider;
+};
+export declare function createMcpTransport(options: CreateMcpTransportOptions): McpTransportConnection;
+export declare function connectMcpTransport(connection: McpTransportConnection): Promise<void>;
+export declare function shutdownMcpTransport(connection: McpTransportConnection): Promise<void>;
+//# sourceMappingURL=transport.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAGnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,OAAO,EAAE,KAAK,iBAAiB,EAAmC,MAAM,WAAW,CAAC;AAEpF,MAAM,MAAM,sBAAsB,GAAG;IACpC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,aAAa,EAAE,OAAO,GAAG,MAAM,CAAC;IACzC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,cAAc,EAAE,iBAAiB,CAAC;IAC3C,cAAc,CAAC,IAAI,IAAI,CAAC;IACxB,UAAU,IAAI,MAAM,GAAG,IAAI,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACvC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAElD,QAAQ,CAAC,YAAY,CAAC,EAAE,gBAAgB,CAAC;CACzC,CAAC;AAOF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,sBAAsB,CAG7F;AAED,wBAAsB,mBAAmB,CAAC,UAAU,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0C3F;AAED,wBAAsB,oBAAoB,CAAC,UAAU,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAY5F"}

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

@@ -0,0 +1,214 @@
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { getDefaultEnvironment, StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { configureMcpElicitation, MCP_CLIENT_ELICITATION_CAPABILITY } from "./elicitation.js";
+import { AuthError, ConnectError, TimeoutError } from "./errors.js";
+import { delay, reapProcessTree } from "./process-tree.js";
+import { safeInterval, safeOn, safeTimer } from "./wrap.js";
+const SHUTDOWN_GRACE_MS = 100, SHUTDOWN_TERM_WAIT_MS = 400, SHUTDOWN_FINAL_WAIT_MS = 500, SHUTDOWN_CLOSE_WAIT_MS = 400;
+export function createMcpTransport(options) {
+    if (options.config.type === "stdio")
+        return createStdioConnection(options, options.config.connectTimeoutMs);
+    return createHttpConnection(options, options.config.connectTimeoutMs);
+}
+export async function connectMcpTransport(connection) {
+    let timedOut = false;
+    const controller = new AbortController();
+    const captureInterval = safeInterval("transport.captureRootPid", 25, () => connection.captureRootPid?.(), connection.asyncErrorSink);
+    const timeout = safeTimer("transport.connectTimeout", connection.connectTimeoutMs, () => {
+        timedOut = true;
+        connection.captureRootPid?.();
+        controller.abort();
+    }, connection.asyncErrorSink);
+    try {
+        await connection.client.connect(connection.transport, {
+            signal: controller.signal,
+            timeout: connection.connectTimeoutMs,
+        });
+    }
+    catch (error) {
+        await shutdownMcpTransport(connection).catch(() => undefined);
+        if (timedOut) {
+            throw new TimeoutError(`MCP server ${connection.serverName} timed out during connect after ${connection.connectTimeoutMs}ms`, { cause: error, phase: "connect", retriable: true, serverName: connection.serverName });
+        }
+        throw new ConnectError(`MCP server ${connection.serverName} failed during connect: ${errorMessage(error)}`, {
+            cause: error,
+            phase: "connect",
+            retriable: true,
+            serverName: connection.serverName,
+        });
+    }
+    finally {
+        clearInterval(captureInterval);
+        clearTimeout(timeout);
+    }
+}
+export async function shutdownMcpTransport(connection) {
+    const rootPid = connection.getRootPid();
+    const closePromise = closeClientAndTransport(connection);
+    await delay(SHUTDOWN_GRACE_MS);
+    if (rootPid !== null) {
+        await reapProcessTree(rootPid, {
+            killWaitMs: SHUTDOWN_FINAL_WAIT_MS,
+            termWaitMs: SHUTDOWN_TERM_WAIT_MS,
+        });
+    }
+    await Promise.race([closePromise, delay(SHUTDOWN_CLOSE_WAIT_MS)]);
+}
+function createStdioConnection(options, connectTimeoutMs) {
+    if (options.config.command === undefined || options.config.command.trim().length === 0) {
+        throw new ConnectError(`MCP server ${options.serverName} stdio command is required`, {
+            phase: "create",
+            serverName: options.serverName,
+        });
+    }
+    const transport = new StdioClientTransport({
+        args: options.config.args,
+        command: options.config.command,
+        cwd: options.config.cwd,
+        env: buildStdioEnv(options),
+        stderr: "pipe",
+    });
+    pipeStderr(transport, options.logger);
+    return createConnection(options.serverName, "stdio", transport, connectTimeoutMs, { logger: options.logger });
+}
+function createHttpConnection(options, connectTimeoutMs) {
+    if (options.config.url === undefined || options.config.url.trim().length === 0) {
+        throw new ConnectError(`MCP server ${options.serverName} HTTP URL is required`, {
+            phase: "create",
+            serverName: options.serverName,
+        });
+    }
+    let url;
+    try {
+        url = new URL(options.config.url);
+    }
+    catch (error) {
+        throw new ConnectError(`MCP server ${options.serverName} HTTP URL is invalid: ${errorMessage(error)}`, {
+            cause: error,
+            phase: "create",
+            serverName: options.serverName,
+        });
+    }
+    const headers = buildHeaders(options);
+    const transport = new StreamableHTTPClientTransport(url, {
+        authProvider: options.authProvider,
+        requestInit: Object.keys(headers).length === 0 ? undefined : { headers },
+    });
+    return createConnection(options.serverName, "http", transport, connectTimeoutMs, { logger: options.logger });
+}
+function createConnection(serverName, transportKind, transport, connectTimeoutMs, asyncErrorSink) {
+    let lastRootPid = null;
+    const readRootPid = () => (transport instanceof StdioClientTransport ? transport.pid : null);
+    const captureRootPid = () => {
+        lastRootPid = readRootPid() ?? lastRootPid;
+    };
+    if (transport instanceof StdioClientTransport)
+        trackStdioStart(transport, captureRootPid);
+    return {
+        captureRootPid,
+        client: buildMcpClient(),
+        connectTimeoutMs,
+        asyncErrorSink,
+        getRootPid: () => {
+            captureRootPid();
+            return readRootPid() ?? lastRootPid;
+        },
+        serverName,
+        transport,
+        transportKind,
+    };
+}
+function trackStdioStart(transport, captureRootPid) {
+    const start = transport.start.bind(transport);
+    transport.start = async () => {
+        await start();
+        captureRootPid();
+    };
+}
+function buildStdioEnv(options) {
+    const env = {
+        ...getDefaultEnvironment(),
+        ...definedEnv(options.env),
+        ...(options.config.env ?? {}),
+    };
+    // OMP pattern: hand stdio OAuth servers the current access token via env.
+    const accessToken = options.authProvider?.tokens()?.access_token;
+    if (accessToken !== undefined && accessToken.length > 0)
+        env.OAUTH_ACCESS_TOKEN = accessToken;
+    return env;
+}
+function definedEnv(env) {
+    const result = {};
+    for (const [key, value] of Object.entries(env ?? {})) {
+        if (value !== undefined)
+            result[key] = value;
+    }
+    return result;
+}
+function buildHeaders(options) {
+    const headers = { ...(options.config.headers ?? {}) };
+    const shouldAttachBearer = options.config.auth === "bearer" ||
+        (options.config.auth === undefined && options.config.bearerTokenEnv !== undefined);
+    if (!shouldAttachBearer)
+        return headers;
+    const envName = options.config.bearerTokenEnv;
+    if (envName === undefined || envName.trim().length === 0) {
+        throw new AuthError(`MCP server ${options.serverName} bearer auth requires bearerTokenEnv`, {
+            phase: "create",
+            serverName: options.serverName,
+        });
+    }
+    const token = options.env?.[envName] ?? process.env[envName];
+    if (token === undefined || token.length === 0) {
+        throw new AuthError(`MCP server ${options.serverName} bearer token env ${envName} is not set`, {
+            phase: "create",
+            serverName: options.serverName,
+        });
+    }
+    headers.authorization = `Bearer ${token}`;
+    return headers;
+}
+function pipeStderr(transport, logger) {
+    let pending = "";
+    const stderr = transport.stderr;
+    if (stderr === undefined || stderr === null)
+        return;
+    const sink = { logger };
+    safeOn(stderr, "data", "transport.stderr.data", (chunk) => {
+        if (!Buffer.isBuffer(chunk) && typeof chunk !== "string")
+            return;
+        pending += Buffer.isBuffer(chunk) ? chunk.toString("utf8") : chunk;
+        const lines = pending.split(/\r?\n/);
+        pending = lines.pop() ?? "";
+        for (const line of lines) {
+            if (line.length > 0)
+                logger.stderr(line);
+        }
+    }, sink);
+    safeOn(stderr, "end", "transport.stderr.end", () => {
+        if (pending.length > 0)
+            logger.stderr(pending);
+        pending = "";
+    }, sink);
+}
+async function closeClientAndTransport(connection) {
+    if (isTerminableHttpTransport(connection.transport)) {
+        await connection.transport.terminateSession().catch(() => undefined);
+    }
+    await connection.transport.close().catch(() => undefined);
+    await connection.client.close().catch(() => undefined);
+}
+function isTerminableHttpTransport(transport) {
+    return typeof transport.terminateSession === "function";
+}
+const errorMessage = (error) => (error instanceof Error ? error.message : String(error));
+function buildMcpClient() {
+    // Elicitation capability is declared EMPTY on purpose (form mode only;
+    // Spring-AI servers reject richer shapes) and the create-handler is wired
+    // before any connect so mid-call requests never race registration.
+    const client = new Client({ name: "senpi-mcp-client", version: "0.0.0" }, { capabilities: MCP_CLIENT_ELICITATION_CAPABILITY });
+    configureMcpElicitation(client);
+    return client;
+}
+//# sourceMappingURL=transport.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/transport.ts"],"names":[],"mappings":"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","sourcesContent":["import { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport { getDefaultEnvironment, StdioClientTransport } from \"@modelcontextprotocol/sdk/client/stdio.js\";\nimport { StreamableHTTPClientTransport } from \"@modelcontextprotocol/sdk/client/streamableHttp.js\";\nimport type { Transport } from \"@modelcontextprotocol/sdk/shared/transport.js\";\nimport type { McpOAuthProvider } from \"./auth/oauth-provider.ts\";\nimport type { McpServerConfig } from \"./config-schema.ts\";\nimport { configureMcpElicitation, MCP_CLIENT_ELICITATION_CAPABILITY } from \"./elicitation.ts\";\nimport { AuthError, ConnectError, TimeoutError } from \"./errors.ts\";\nimport type { McpLogger } from \"./log.ts\";\nimport { delay, reapProcessTree } from \"./process-tree.ts\";\nimport { type McpAsyncErrorSink, safeInterval, safeOn, safeTimer } from \"./wrap.ts\";\n\nexport type McpTransportConnection = {\n\treadonly serverName: string;\n\treadonly client: Client;\n\treadonly transport: Transport;\n\treadonly transportKind: \"stdio\" | \"http\";\n\treadonly connectTimeoutMs: number;\n\treadonly asyncErrorSink: McpAsyncErrorSink;\n\tcaptureRootPid?(): void;\n\tgetRootPid(): number | null;\n};\n\nexport type CreateMcpTransportOptions = {\n\treadonly serverName: string;\n\treadonly config: McpServerConfig;\n\treadonly logger: McpLogger;\n\treadonly env?: Record<string, string | undefined>;\n\t// Present only when OAuth is the resolved auth mode for this server.\n\treadonly authProvider?: McpOAuthProvider;\n};\n\nconst SHUTDOWN_GRACE_MS = 100,\n\tSHUTDOWN_TERM_WAIT_MS = 400,\n\tSHUTDOWN_FINAL_WAIT_MS = 500,\n\tSHUTDOWN_CLOSE_WAIT_MS = 400;\n\nexport function createMcpTransport(options: CreateMcpTransportOptions): McpTransportConnection {\n\tif (options.config.type === \"stdio\") return createStdioConnection(options, options.config.connectTimeoutMs);\n\treturn createHttpConnection(options, options.config.connectTimeoutMs);\n}\n\nexport async function connectMcpTransport(connection: McpTransportConnection): Promise<void> {\n\tlet timedOut = false;\n\tconst controller = new AbortController();\n\tconst captureInterval = safeInterval(\n\t\t\"transport.captureRootPid\",\n\t\t25,\n\t\t() => connection.captureRootPid?.(),\n\t\tconnection.asyncErrorSink,\n\t);\n\tconst timeout = safeTimer(\n\t\t\"transport.connectTimeout\",\n\t\tconnection.connectTimeoutMs,\n\t\t() => {\n\t\t\ttimedOut = true;\n\t\t\tconnection.captureRootPid?.();\n\t\t\tcontroller.abort();\n\t\t},\n\t\tconnection.asyncErrorSink,\n\t);\n\ttry {\n\t\tawait connection.client.connect(connection.transport, {\n\t\t\tsignal: controller.signal,\n\t\t\ttimeout: connection.connectTimeoutMs,\n\t\t});\n\t} catch (error) {\n\t\tawait shutdownMcpTransport(connection).catch(() => undefined);\n\t\tif (timedOut) {\n\t\t\tthrow new TimeoutError(\n\t\t\t\t`MCP server ${connection.serverName} timed out during connect after ${connection.connectTimeoutMs}ms`,\n\t\t\t\t{ cause: error, phase: \"connect\", retriable: true, serverName: connection.serverName },\n\t\t\t);\n\t\t}\n\t\tthrow new ConnectError(`MCP server ${connection.serverName} failed during connect: ${errorMessage(error)}`, {\n\t\t\tcause: error,\n\t\t\tphase: \"connect\",\n\t\t\tretriable: true,\n\t\t\tserverName: connection.serverName,\n\t\t});\n\t} finally {\n\t\tclearInterval(captureInterval);\n\t\tclearTimeout(timeout);\n\t}\n}\n\nexport async function shutdownMcpTransport(connection: McpTransportConnection): Promise<void> {\n\tconst rootPid = connection.getRootPid();\n\tconst closePromise = closeClientAndTransport(connection);\n\tawait delay(SHUTDOWN_GRACE_MS);\n\n\tif (rootPid !== null) {\n\t\tawait reapProcessTree(rootPid, {\n\t\t\tkillWaitMs: SHUTDOWN_FINAL_WAIT_MS,\n\t\t\ttermWaitMs: SHUTDOWN_TERM_WAIT_MS,\n\t\t});\n\t}\n\tawait Promise.race([closePromise, delay(SHUTDOWN_CLOSE_WAIT_MS)]);\n}\n\nfunction createStdioConnection(options: CreateMcpTransportOptions, connectTimeoutMs: number): McpTransportConnection {\n\tif (options.config.command === undefined || options.config.command.trim().length === 0) {\n\t\tthrow new ConnectError(`MCP server ${options.serverName} stdio command is required`, {\n\t\t\tphase: \"create\",\n\t\t\tserverName: options.serverName,\n\t\t});\n\t}\n\tconst transport = new StdioClientTransport({\n\t\targs: options.config.args,\n\t\tcommand: options.config.command,\n\t\tcwd: options.config.cwd,\n\t\tenv: buildStdioEnv(options),\n\t\tstderr: \"pipe\",\n\t});\n\tpipeStderr(transport, options.logger);\n\treturn createConnection(options.serverName, \"stdio\", transport, connectTimeoutMs, { logger: options.logger });\n}\n\nfunction createHttpConnection(options: CreateMcpTransportOptions, connectTimeoutMs: number): McpTransportConnection {\n\tif (options.config.url === undefined || options.config.url.trim().length === 0) {\n\t\tthrow new ConnectError(`MCP server ${options.serverName} HTTP URL is required`, {\n\t\t\tphase: \"create\",\n\t\t\tserverName: options.serverName,\n\t\t});\n\t}\n\tlet url: URL;\n\ttry {\n\t\turl = new URL(options.config.url);\n\t} catch (error) {\n\t\tthrow new ConnectError(`MCP server ${options.serverName} HTTP URL is invalid: ${errorMessage(error)}`, {\n\t\t\tcause: error,\n\t\t\tphase: \"create\",\n\t\t\tserverName: options.serverName,\n\t\t});\n\t}\n\tconst headers = buildHeaders(options);\n\tconst transport = new StreamableHTTPClientTransport(url, {\n\t\tauthProvider: options.authProvider,\n\t\trequestInit: Object.keys(headers).length === 0 ? undefined : { headers },\n\t});\n\treturn createConnection(options.serverName, \"http\", transport, connectTimeoutMs, { logger: options.logger });\n}\n\nfunction createConnection(\n\tserverName: string,\n\ttransportKind: \"stdio\" | \"http\",\n\ttransport: Transport,\n\tconnectTimeoutMs: number,\n\tasyncErrorSink: McpAsyncErrorSink,\n): McpTransportConnection {\n\tlet lastRootPid: number | null = null;\n\tconst readRootPid = (): number | null => (transport instanceof StdioClientTransport ? transport.pid : null);\n\tconst captureRootPid = (): void => {\n\t\tlastRootPid = readRootPid() ?? lastRootPid;\n\t};\n\tif (transport instanceof StdioClientTransport) trackStdioStart(transport, captureRootPid);\n\treturn {\n\t\tcaptureRootPid,\n\t\tclient: buildMcpClient(),\n\t\tconnectTimeoutMs,\n\t\tasyncErrorSink,\n\t\tgetRootPid: () => {\n\t\t\tcaptureRootPid();\n\t\t\treturn readRootPid() ?? lastRootPid;\n\t\t},\n\t\tserverName,\n\t\ttransport,\n\t\ttransportKind,\n\t};\n}\n\nfunction trackStdioStart(transport: StdioClientTransport, captureRootPid: () => void): void {\n\tconst start = transport.start.bind(transport);\n\ttransport.start = async () => {\n\t\tawait start();\n\t\tcaptureRootPid();\n\t};\n}\n\nfunction buildStdioEnv(options: CreateMcpTransportOptions): Record<string, string> {\n\tconst env: Record<string, string> = {\n\t\t...getDefaultEnvironment(),\n\t\t...definedEnv(options.env),\n\t\t...(options.config.env ?? {}),\n\t};\n\t// OMP pattern: hand stdio OAuth servers the current access token via env.\n\tconst accessToken = options.authProvider?.tokens()?.access_token;\n\tif (accessToken !== undefined && accessToken.length > 0) env.OAUTH_ACCESS_TOKEN = accessToken;\n\treturn env;\n}\n\nfunction definedEnv(env: Record<string, string | undefined> | undefined): Record<string, string> {\n\tconst result: Record<string, string> = {};\n\tfor (const [key, value] of Object.entries(env ?? {})) {\n\t\tif (value !== undefined) result[key] = value;\n\t}\n\treturn result;\n}\n\nfunction buildHeaders(options: CreateMcpTransportOptions): Record<string, string> {\n\tconst headers = { ...(options.config.headers ?? {}) };\n\tconst shouldAttachBearer =\n\t\toptions.config.auth === \"bearer\" ||\n\t\t(options.config.auth === undefined && options.config.bearerTokenEnv !== undefined);\n\tif (!shouldAttachBearer) return headers;\n\tconst envName = options.config.bearerTokenEnv;\n\tif (envName === undefined || envName.trim().length === 0) {\n\t\tthrow new AuthError(`MCP server ${options.serverName} bearer auth requires bearerTokenEnv`, {\n\t\t\tphase: \"create\",\n\t\t\tserverName: options.serverName,\n\t\t});\n\t}\n\tconst token = options.env?.[envName] ?? process.env[envName];\n\tif (token === undefined || token.length === 0) {\n\t\tthrow new AuthError(`MCP server ${options.serverName} bearer token env ${envName} is not set`, {\n\t\t\tphase: \"create\",\n\t\t\tserverName: options.serverName,\n\t\t});\n\t}\n\theaders.authorization = `Bearer ${token}`;\n\treturn headers;\n}\n\nfunction pipeStderr(transport: StdioClientTransport, logger: McpLogger): void {\n\tlet pending = \"\";\n\tconst stderr = transport.stderr;\n\tif (stderr === undefined || stderr === null) return;\n\tconst sink: McpAsyncErrorSink = { logger };\n\tsafeOn(\n\t\tstderr,\n\t\t\"data\",\n\t\t\"transport.stderr.data\",\n\t\t(chunk) => {\n\t\t\tif (!Buffer.isBuffer(chunk) && typeof chunk !== \"string\") return;\n\t\t\tpending += Buffer.isBuffer(chunk) ? chunk.toString(\"utf8\") : chunk;\n\t\t\tconst lines = pending.split(/\\r?\\n/);\n\t\t\tpending = lines.pop() ?? \"\";\n\t\t\tfor (const line of lines) {\n\t\t\t\tif (line.length > 0) logger.stderr(line);\n\t\t\t}\n\t\t},\n\t\tsink,\n\t);\n\tsafeOn(\n\t\tstderr,\n\t\t\"end\",\n\t\t\"transport.stderr.end\",\n\t\t() => {\n\t\t\tif (pending.length > 0) logger.stderr(pending);\n\t\t\tpending = \"\";\n\t\t},\n\t\tsink,\n\t);\n}\n\nasync function closeClientAndTransport(connection: McpTransportConnection): Promise<void> {\n\tif (isTerminableHttpTransport(connection.transport)) {\n\t\tawait connection.transport.terminateSession().catch(() => undefined);\n\t}\n\tawait connection.transport.close().catch(() => undefined);\n\tawait connection.client.close().catch(() => undefined);\n}\n\nfunction isTerminableHttpTransport(\n\ttransport: Transport,\n): transport is Transport & { terminateSession(): Promise<void> } {\n\treturn typeof (transport as Partial<{ terminateSession(): Promise<void> }>).terminateSession === \"function\";\n}\n\nconst errorMessage = (error: unknown): string => (error instanceof Error ? error.message : String(error));\n\nfunction buildMcpClient(): Client {\n\t// Elicitation capability is declared EMPTY on purpose (form mode only;\n\t// Spring-AI servers reject richer shapes) and the create-handler is wired\n\t// before any connect so mid-call requests never race registration.\n\tconst client = new Client(\n\t\t{ name: \"senpi-mcp-client\", version: \"0.0.0\" },\n\t\t{ capabilities: MCP_CLIENT_ELICITATION_CAPABILITY },\n\t);\n\tconfigureMcpElicitation(client);\n\treturn client;\n}\n"]}

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

@@ -0,0 +1,20 @@
+export { Client } from "@modelcontextprotocol/sdk/client/index.js";
+export { Server } from "@modelcontextprotocol/sdk/server/index.js";
+export type { CallToolResult, ListToolsResult } from "@modelcontextprotocol/sdk/types.js";
+import type { EventEmitter } from "node:events";
+type MaybePromise<T> = T | Promise<T>;
+export interface McpErrorLogger {
+    error(message: string, data?: unknown): void;
+}
+export interface McpAsyncErrorSink {
+    readonly logger: McpErrorLogger;
+    readonly notify?: (message: string, error: Error) => MaybePromise<void>;
+}
+export type WrappedAsyncCallback<TArgs extends readonly unknown[]> = (...args: TArgs) => Promise<void>;
+export declare function wrapAsync<TArgs extends readonly unknown[]>(scope: string, fn: (...args: TArgs) => MaybePromise<void>, sink: McpAsyncErrorSink): WrappedAsyncCallback<TArgs>;
+export declare function safeTimer(scope: string, delayMs: number, fn: () => MaybePromise<void>, sink: McpAsyncErrorSink): NodeJS.Timeout;
+export declare function safeInterval(scope: string, delayMs: number, fn: () => MaybePromise<void>, sink: McpAsyncErrorSink): NodeJS.Timeout;
+export declare function safeDelay(delayMs: number): Promise<void>;
+export declare function safeOn(emitter: EventEmitter, eventName: string | symbol, scope: string, listener: (...args: unknown[]) => MaybePromise<void>, sink: McpAsyncErrorSink): () => void;
+export declare function reportMcpAsyncError(scope: string, error: unknown, sink: McpAsyncErrorSink): Promise<void>;
+//# sourceMappingURL=wrap.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"wrap.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/wrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAE1F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,KAAK,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAEtC,MAAM,WAAW,cAAc;IAC9B,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAC7C;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CACxE;AAED,MAAM,MAAM,oBAAoB,CAAC,KAAK,SAAS,SAAS,OAAO,EAAE,IAAI,CAAC,GAAG,IAAI,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEvG,wBAAgB,SAAS,CAAC,KAAK,SAAS,SAAS,OAAO,EAAE,EACzD,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,KAAK,KAAK,YAAY,CAAC,IAAI,CAAC,EAC1C,IAAI,EAAE,iBAAiB,GACrB,oBAAoB,CAAC,KAAK,CAAC,CAS7B;AAED,wBAAgB,SAAS,CACxB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC,EAC5B,IAAI,EAAE,iBAAiB,GACrB,MAAM,CAAC,OAAO,CAOhB;AAED,wBAAgB,YAAY,CAC3B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC,EAC5B,IAAI,EAAE,iBAAiB,GACrB,MAAM,CAAC,OAAO,CAOhB;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAIxD;AAED,wBAAgB,MAAM,CACrB,OAAO,EAAE,YAAY,EACrB,SAAS,EAAE,MAAM,GAAG,MAAM,EAC1B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,YAAY,CAAC,IAAI,CAAC,EACpD,IAAI,EAAE,iBAAiB,GACrB,MAAM,IAAI,CAMZ;AAED,wBAAsB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAW/G"}