@code-yeongyu/senpi 2026.7.4 → 2026.7.9-2

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

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

package/dist/core/extensions/builtin/mcp/guard/output-guard.d.ts

@@ -0,0 +1,10 @@
+import type { McpSettings } from "../config-schema.ts";
+import type { McpMappedContentBlock } from "../expose/schema-compat.ts";
+export interface McpOutputGuardOptions {
+    readonly agentDir?: string;
+    readonly server: string;
+    readonly outputGuard?: McpSettings["outputGuard"];
+}
+export declare function applyMcpOutputGuard(content: readonly McpMappedContentBlock[], options: McpOutputGuardOptions): Promise<readonly McpMappedContentBlock[]>;
+export declare function cleanupMcpOutputArtifacts(): Promise<void>;
+//# sourceMappingURL=output-guard.d.ts.map

package/dist/core/extensions/builtin/mcp/guard/output-guard.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"output-guard.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/guard/output-guard.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;CAClD;AAgBD,wBAAsB,mBAAmB,CACxC,OAAO,EAAE,SAAS,qBAAqB,EAAE,EACzC,OAAO,EAAE,qBAAqB,GAC5B,OAAO,CAAC,SAAS,qBAAqB,EAAE,CAAC,CAW3C;AA8ED,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC,CAI/D"}

package/dist/core/extensions/builtin/mcp/guard/output-guard.js

@@ -0,0 +1,178 @@
+import { chmod, mkdir, rm, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { getAgentDir } from "../../../../../config.js";
+const DEFAULT_MAX_BYTES = 50 * 1024;
+const DEFAULT_MAX_LINES = 2000;
+const PREVIEW_BYTE_BUDGET = 8192;
+let spillCounter = 0;
+const spilledFiles = new Set();
+export async function applyMcpOutputGuard(content, options) {
+    const limits = outputGuardLimits(options.outputGuard);
+    const payload = contentToPayload(content);
+    if (payload.bytes.byteLength <= limits.maxBytes && payload.lineCount <= limits.maxLines)
+        return content;
+    const preview = buildPreview(payload, limits);
+    try {
+        const path = await writePayload(payload, options);
+        return [{ type: "text", text: spillMessage(payload, preview, path) }];
+    }
+    catch (error) {
+        return [{ type: "text", text: fallbackMessage(payload, preview, error) }];
+    }
+}
+function outputGuardLimits(outputGuard) {
+    return {
+        maxBytes: positiveInteger(outputGuard?.maxBytes) ?? DEFAULT_MAX_BYTES,
+        maxLines: positiveInteger(outputGuard?.maxLines) ?? DEFAULT_MAX_LINES,
+    };
+}
+function positiveInteger(value) {
+    return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : undefined;
+}
+function contentToPayload(content) {
+    if (content.length === 1) {
+        const binary = binaryPayload(content[0]);
+        if (binary !== undefined)
+            return binary;
+    }
+    const text = content.map(textForBlock).join("\n");
+    const bytes = Buffer.from(text, "utf8");
+    return {
+        bytes,
+        extension: "txt",
+        lineCount: countLines(text),
+        previewSource: text,
+        summary: `text output (${bytes.byteLength} bytes, ${countLines(text)} lines)`,
+    };
+}
+function binaryPayload(block) {
+    if ((block.type === "image" || block.type === "audio") && block.data.length > 0) {
+        const bytes = Buffer.from(block.data, "base64");
+        return {
+            bytes,
+            extension: extensionForMime(block.mimeType),
+            lineCount: 1,
+            previewSource: `[${block.mimeType} binary output, ${bytes.byteLength} bytes]`,
+            summary: `${block.mimeType} binary output (${bytes.byteLength} bytes)`,
+        };
+    }
+    if (block.type !== "resource" || !isRecord(block.resource))
+        return undefined;
+    const mimeType = typeof block.resource.mimeType === "string" ? block.resource.mimeType : "application/octet-stream";
+    if (typeof block.resource.blob === "string") {
+        const bytes = Buffer.from(block.resource.blob, "base64");
+        return {
+            bytes,
+            extension: extensionForMime(mimeType),
+            lineCount: 1,
+            previewSource: `[${mimeType} binary resource, ${bytes.byteLength} bytes]`,
+            summary: `${mimeType} binary resource (${bytes.byteLength} bytes)`,
+        };
+    }
+    if (typeof block.resource.text === "string") {
+        const bytes = Buffer.from(block.resource.text, "utf8");
+        return {
+            bytes,
+            extension: extensionForMime(mimeType),
+            lineCount: countLines(block.resource.text),
+            previewSource: block.resource.text,
+            summary: `${mimeType} resource (${bytes.byteLength} bytes, ${countLines(block.resource.text)} lines)`,
+        };
+    }
+    return undefined;
+}
+async function writePayload(payload, options) {
+    const dir = join(options.agentDir ?? getAgentDir(), "tmp", "mcp-out");
+    await mkdir(dir, { recursive: true });
+    const path = join(dir, `${safePathPart(options.server)}-${Date.now()}-${process.hrtime.bigint()}-${spillCounter++}.${payload.extension}`);
+    await writeFile(path, payload.bytes, { mode: 0o600 });
+    await chmod(path, 0o600);
+    spilledFiles.add(path);
+    return path;
+}
+export async function cleanupMcpOutputArtifacts() {
+    const files = [...spilledFiles];
+    spilledFiles.clear();
+    await Promise.all(files.map((file) => rm(file, { force: true })));
+}
+function buildPreview(payload, limits) {
+    const maxBytes = Math.min(PREVIEW_BYTE_BUDGET, Math.max(1024, Math.floor(limits.maxBytes / 2)));
+    const maxLines = Math.min(80, Math.max(2, Math.floor(limits.maxLines / 2)));
+    return trimBytes(headTailLines(payload.previewSource, maxLines), maxBytes);
+}
+function spillMessage(payload, preview, path) {
+    return [
+        `MCP tool output exceeded outputGuard; ${payload.summary}.`,
+        `Full output saved to: ${path}`,
+        "Read the file in chunks instead of loading the entire file at once.",
+        "Preview:",
+        preview,
+    ].join("\n");
+}
+function fallbackMessage(payload, preview, error) {
+    return [
+        `Warning: failed to write MCP output spill file: ${errorLabel(error)}`,
+        `MCP output truncated inline; ${payload.summary}.`,
+        "Preview:",
+        preview,
+    ].join("\n");
+}
+function headTailLines(text, maxLines) {
+    const lines = text.split("\n");
+    if (lines.length <= maxLines)
+        return text;
+    const headCount = Math.max(1, Math.floor(maxLines / 2));
+    const tailCount = Math.max(1, maxLines - headCount);
+    return [...lines.slice(0, headCount), "[... truncated ...]", ...lines.slice(-tailCount)].join("\n");
+}
+function trimBytes(text, maxBytes) {
+    if (Buffer.byteLength(text, "utf8") <= maxBytes)
+        return text;
+    let result = text;
+    while (result.length > 0 && Buffer.byteLength(`${result}\n[... truncated ...]`, "utf8") > maxBytes) {
+        result = result.slice(0, Math.max(0, result.length - 256));
+    }
+    return `${result}\n[... truncated ...]`;
+}
+function textForBlock(block) {
+    if (block.type === "text")
+        return block.text;
+    if (block.type === "image" || block.type === "audio") {
+        return `[${block.mimeType} binary output, ${Buffer.byteLength(block.data, "base64")} bytes]`;
+    }
+    return JSON.stringify(block);
+}
+function countLines(text) {
+    return text.length === 0 ? 0 : text.split("\n").length;
+}
+function extensionForMime(mimeType) {
+    if (mimeType === "image/png")
+        return "png";
+    if (mimeType === "image/jpeg")
+        return "jpg";
+    if (mimeType === "image/webp")
+        return "webp";
+    if (mimeType === "image/gif")
+        return "gif";
+    if (mimeType === "audio/mpeg")
+        return "mp3";
+    if (mimeType === "audio/wav")
+        return "wav";
+    if (mimeType === "application/json")
+        return "json";
+    if (mimeType === "application/pdf")
+        return "pdf";
+    if (mimeType.startsWith("text/"))
+        return "txt";
+    return "bin";
+}
+function safePathPart(value) {
+    return value.replace(/[^a-zA-Z0-9_-]/g, "_") || "server";
+}
+function errorLabel(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+//# sourceMappingURL=output-guard.js.map

package/dist/core/extensions/builtin/mcp/guard/output-guard.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"output-guard.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/guard/output-guard.ts"],"names":[],"mappings":"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","sourcesContent":["import { chmod, mkdir, rm, writeFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { getAgentDir } from \"../../../../../config.ts\";\nimport type { McpSettings } from \"../config-schema.ts\";\nimport type { McpMappedContentBlock } from \"../expose/schema-compat.ts\";\n\nexport interface McpOutputGuardOptions {\n\treadonly agentDir?: string;\n\treadonly server: string;\n\treadonly outputGuard?: McpSettings[\"outputGuard\"];\n}\n\ninterface Payload {\n\treadonly bytes: Buffer;\n\treadonly extension: string;\n\treadonly lineCount: number;\n\treadonly previewSource: string;\n\treadonly summary: string;\n}\n\nconst DEFAULT_MAX_BYTES = 50 * 1024;\nconst DEFAULT_MAX_LINES = 2000;\nconst PREVIEW_BYTE_BUDGET = 8192;\nlet spillCounter = 0;\nconst spilledFiles = new Set<string>();\n\nexport async function applyMcpOutputGuard(\n\tcontent: readonly McpMappedContentBlock[],\n\toptions: McpOutputGuardOptions,\n): Promise<readonly McpMappedContentBlock[]> {\n\tconst limits = outputGuardLimits(options.outputGuard);\n\tconst payload = contentToPayload(content);\n\tif (payload.bytes.byteLength <= limits.maxBytes && payload.lineCount <= limits.maxLines) return content;\n\tconst preview = buildPreview(payload, limits);\n\ttry {\n\t\tconst path = await writePayload(payload, options);\n\t\treturn [{ type: \"text\", text: spillMessage(payload, preview, path) }];\n\t} catch (error) {\n\t\treturn [{ type: \"text\", text: fallbackMessage(payload, preview, error) }];\n\t}\n}\n\nfunction outputGuardLimits(outputGuard: McpSettings[\"outputGuard\"]): { maxBytes: number; maxLines: number } {\n\treturn {\n\t\tmaxBytes: positiveInteger(outputGuard?.maxBytes) ?? DEFAULT_MAX_BYTES,\n\t\tmaxLines: positiveInteger(outputGuard?.maxLines) ?? DEFAULT_MAX_LINES,\n\t};\n}\n\nfunction positiveInteger(value: unknown): number | undefined {\n\treturn typeof value === \"number\" && Number.isFinite(value) && value > 0 ? Math.floor(value) : undefined;\n}\n\nfunction contentToPayload(content: readonly McpMappedContentBlock[]): Payload {\n\tif (content.length === 1) {\n\t\tconst binary = binaryPayload(content[0]);\n\t\tif (binary !== undefined) return binary;\n\t}\n\tconst text = content.map(textForBlock).join(\"\\n\");\n\tconst bytes = Buffer.from(text, \"utf8\");\n\treturn {\n\t\tbytes,\n\t\textension: \"txt\",\n\t\tlineCount: countLines(text),\n\t\tpreviewSource: text,\n\t\tsummary: `text output (${bytes.byteLength} bytes, ${countLines(text)} lines)`,\n\t};\n}\n\nfunction binaryPayload(block: McpMappedContentBlock): Payload | undefined {\n\tif ((block.type === \"image\" || block.type === \"audio\") && block.data.length > 0) {\n\t\tconst bytes = Buffer.from(block.data, \"base64\");\n\t\treturn {\n\t\t\tbytes,\n\t\t\textension: extensionForMime(block.mimeType),\n\t\t\tlineCount: 1,\n\t\t\tpreviewSource: `[${block.mimeType} binary output, ${bytes.byteLength} bytes]`,\n\t\t\tsummary: `${block.mimeType} binary output (${bytes.byteLength} bytes)`,\n\t\t};\n\t}\n\tif (block.type !== \"resource\" || !isRecord(block.resource)) return undefined;\n\tconst mimeType = typeof block.resource.mimeType === \"string\" ? block.resource.mimeType : \"application/octet-stream\";\n\tif (typeof block.resource.blob === \"string\") {\n\t\tconst bytes = Buffer.from(block.resource.blob, \"base64\");\n\t\treturn {\n\t\t\tbytes,\n\t\t\textension: extensionForMime(mimeType),\n\t\t\tlineCount: 1,\n\t\t\tpreviewSource: `[${mimeType} binary resource, ${bytes.byteLength} bytes]`,\n\t\t\tsummary: `${mimeType} binary resource (${bytes.byteLength} bytes)`,\n\t\t};\n\t}\n\tif (typeof block.resource.text === \"string\") {\n\t\tconst bytes = Buffer.from(block.resource.text, \"utf8\");\n\t\treturn {\n\t\t\tbytes,\n\t\t\textension: extensionForMime(mimeType),\n\t\t\tlineCount: countLines(block.resource.text),\n\t\t\tpreviewSource: block.resource.text,\n\t\t\tsummary: `${mimeType} resource (${bytes.byteLength} bytes, ${countLines(block.resource.text)} lines)`,\n\t\t};\n\t}\n\treturn undefined;\n}\n\nasync function writePayload(payload: Payload, options: McpOutputGuardOptions): Promise<string> {\n\tconst dir = join(options.agentDir ?? getAgentDir(), \"tmp\", \"mcp-out\");\n\tawait mkdir(dir, { recursive: true });\n\tconst path = join(\n\t\tdir,\n\t\t`${safePathPart(options.server)}-${Date.now()}-${process.hrtime.bigint()}-${spillCounter++}.${payload.extension}`,\n\t);\n\tawait writeFile(path, payload.bytes, { mode: 0o600 });\n\tawait chmod(path, 0o600);\n\tspilledFiles.add(path);\n\treturn path;\n}\n\nexport async function cleanupMcpOutputArtifacts(): Promise<void> {\n\tconst files = [...spilledFiles];\n\tspilledFiles.clear();\n\tawait Promise.all(files.map((file) => rm(file, { force: true })));\n}\n\nfunction buildPreview(payload: Payload, limits: { maxBytes: number; maxLines: number }): string {\n\tconst maxBytes = Math.min(PREVIEW_BYTE_BUDGET, Math.max(1024, Math.floor(limits.maxBytes / 2)));\n\tconst maxLines = Math.min(80, Math.max(2, Math.floor(limits.maxLines / 2)));\n\treturn trimBytes(headTailLines(payload.previewSource, maxLines), maxBytes);\n}\n\nfunction spillMessage(payload: Payload, preview: string, path: string): string {\n\treturn [\n\t\t`MCP tool output exceeded outputGuard; ${payload.summary}.`,\n\t\t`Full output saved to: ${path}`,\n\t\t\"Read the file in chunks instead of loading the entire file at once.\",\n\t\t\"Preview:\",\n\t\tpreview,\n\t].join(\"\\n\");\n}\n\nfunction fallbackMessage(payload: Payload, preview: string, error: unknown): string {\n\treturn [\n\t\t`Warning: failed to write MCP output spill file: ${errorLabel(error)}`,\n\t\t`MCP output truncated inline; ${payload.summary}.`,\n\t\t\"Preview:\",\n\t\tpreview,\n\t].join(\"\\n\");\n}\n\nfunction headTailLines(text: string, maxLines: number): string {\n\tconst lines = text.split(\"\\n\");\n\tif (lines.length <= maxLines) return text;\n\tconst headCount = Math.max(1, Math.floor(maxLines / 2));\n\tconst tailCount = Math.max(1, maxLines - headCount);\n\treturn [...lines.slice(0, headCount), \"[... truncated ...]\", ...lines.slice(-tailCount)].join(\"\\n\");\n}\n\nfunction trimBytes(text: string, maxBytes: number): string {\n\tif (Buffer.byteLength(text, \"utf8\") <= maxBytes) return text;\n\tlet result = text;\n\twhile (result.length > 0 && Buffer.byteLength(`${result}\\n[... truncated ...]`, \"utf8\") > maxBytes) {\n\t\tresult = result.slice(0, Math.max(0, result.length - 256));\n\t}\n\treturn `${result}\\n[... truncated ...]`;\n}\n\nfunction textForBlock(block: McpMappedContentBlock): string {\n\tif (block.type === \"text\") return block.text;\n\tif (block.type === \"image\" || block.type === \"audio\") {\n\t\treturn `[${block.mimeType} binary output, ${Buffer.byteLength(block.data, \"base64\")} bytes]`;\n\t}\n\treturn JSON.stringify(block);\n}\n\nfunction countLines(text: string): number {\n\treturn text.length === 0 ? 0 : text.split(\"\\n\").length;\n}\n\nfunction extensionForMime(mimeType: string): string {\n\tif (mimeType === \"image/png\") return \"png\";\n\tif (mimeType === \"image/jpeg\") return \"jpg\";\n\tif (mimeType === \"image/webp\") return \"webp\";\n\tif (mimeType === \"image/gif\") return \"gif\";\n\tif (mimeType === \"audio/mpeg\") return \"mp3\";\n\tif (mimeType === \"audio/wav\") return \"wav\";\n\tif (mimeType === \"application/json\") return \"json\";\n\tif (mimeType === \"application/pdf\") return \"pdf\";\n\tif (mimeType.startsWith(\"text/\")) return \"txt\";\n\treturn \"bin\";\n}\n\nfunction safePathPart(value: string): string {\n\treturn value.replace(/[^a-zA-Z0-9_-]/g, \"_\") || \"server\";\n}\n\nfunction errorLabel(error: unknown): string {\n\treturn error instanceof Error ? error.message : String(error);\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n"]}

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

@@ -0,0 +1,10 @@
+import type { ServerConnection } from "./connection.ts";
+import { AuthError } from "./errors.ts";
+export declare const MCP_PING_STALE_MS = 30000;
+export declare const MCP_PING_TIMEOUT_MS = 2000;
+export type McpEnsureFreshAuth = () => Promise<unknown>;
+export declare function ensureMcpToolCallConnection(connection: ServerConnection, ensureFresh?: McpEnsureFreshAuth): Promise<void>;
+export declare function withMcpSessionExpiryRetry<T>(connection: ServerConnection, operation: () => Promise<T>): Promise<T>;
+export declare function withMcpRetriableFailedSendRetry<T>(connection: ServerConnection, operation: () => Promise<T>): Promise<T>;
+export declare function markMcpConnectionNeedsAuth(connection: ServerConnection, error: unknown): AuthError | undefined;
+//# sourceMappingURL=health.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/health.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EACN,SAAS,EAKT,MAAM,aAAa,CAAC;AAErB,eAAO,MAAM,iBAAiB,QAAS,CAAC;AACxC,eAAO,MAAM,mBAAmB,OAAQ,CAAC;AASzC,MAAM,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;AAExD,wBAAsB,2BAA2B,CAChD,UAAU,EAAE,gBAAgB,EAC5B,WAAW,CAAC,EAAE,kBAAkB,GAC9B,OAAO,CAAC,IAAI,CAAC,CA+Bf;AAED,wBAAsB,yBAAyB,CAAC,CAAC,EAChD,UAAU,EAAE,gBAAgB,EAC5B,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACzB,OAAO,CAAC,CAAC,CAAC,CAgBZ;AAED,wBAAsB,+BAA+B,CAAC,CAAC,EACtD,UAAU,EAAE,gBAAgB,EAC5B,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACzB,OAAO,CAAC,CAAC,CAAC,CAgBZ;AA6CD,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAK9G"}

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

@@ -0,0 +1,172 @@
+import { UnauthorizedError } from "@modelcontextprotocol/sdk/client/auth.js";
+import { OAuthFlowError } from "./auth/oauth-errors.js";
+import { AuthError, ConnectError, isMcpSessionExpiredError, isRetriableMcpError, SessionExpiredError, } from "./errors.js";
+export const MCP_PING_STALE_MS = 30_000;
+export const MCP_PING_TIMEOUT_MS = 2_000;
+const healthByConnection = new WeakMap();
+export async function ensureMcpToolCallConnection(connection, ensureFresh) {
+    await ensureFreshAuth(connection, ensureFresh);
+    const health = healthStateFor(connection);
+    if (connection.state !== "connected") {
+        if (connection.state === "idle" || connection.state === "connecting") {
+            try {
+                await connection.connect();
+            }
+            catch (error) {
+                if (isNeedsAuthError(error))
+                    throw headlessAuthError(connection, error);
+                throw error;
+            }
+        }
+        else if (connection.state === "needs_auth") {
+            throw headlessAuthError(connection);
+        }
+        else {
+            await renewConnection(connection, health);
+            return;
+        }
+    }
+    const lastSuccessfulPingAtMs = health.lastSuccessfulPingAtMs;
+    if (lastSuccessfulPingAtMs !== undefined && Date.now() - lastSuccessfulPingAtMs <= MCP_PING_STALE_MS) {
+        return;
+    }
+    if (health.pendingValidation !== undefined) {
+        await health.pendingValidation;
+        return;
+    }
+    const pendingValidation = pingOrRenew(connection, health).finally(() => {
+        if (health.pendingValidation === pendingValidation)
+            health.pendingValidation = undefined;
+    });
+    health.pendingValidation = pendingValidation;
+    await pendingValidation;
+}
+export async function withMcpSessionExpiryRetry(connection, operation) {
+    try {
+        return await operation();
+    }
+    catch (error) {
+        if (!isMcpSessionExpiredError(error))
+            throw error;
+        connection.markDegraded(sessionExpiredError(connection, error, true));
+        await connection.renew();
+        try {
+            return await operation();
+        }
+        catch (retryError) {
+            if (!isMcpSessionExpiredError(retryError))
+                throw retryError;
+            const expired = sessionExpiredError(connection, retryError, false);
+            connection.markSuspended(expired);
+            throw expired;
+        }
+    }
+}
+export async function withMcpRetriableFailedSendRetry(connection, operation) {
+    try {
+        return await operation();
+    }
+    catch (error) {
+        if (!isRetriableFailedSendError(error))
+            throw error;
+        connection.markDegraded(failedSendError(connection, error, true));
+        await connection.renew();
+        try {
+            return await operation();
+        }
+        catch (retryError) {
+            if (isRetriableFailedSendError(retryError)) {
+                connection.markDegraded(failedSendError(connection, retryError, false));
+            }
+            throw retryError;
+        }
+    }
+}
+function healthStateFor(connection) {
+    let health = healthByConnection.get(connection);
+    if (health === undefined) {
+        health = { lastSuccessfulPingAtMs: undefined, pendingValidation: undefined };
+        healthByConnection.set(connection, health);
+    }
+    return health;
+}
+async function pingOrRenew(connection, health) {
+    try {
+        await connection.client.ping({ timeout: MCP_PING_TIMEOUT_MS });
+        health.lastSuccessfulPingAtMs = Date.now();
+    }
+    catch (error) {
+        connection.markDegraded(error instanceof Error ? error : new Error(String(error)));
+        await renewConnection(connection, health);
+    }
+}
+async function renewConnection(connection, health) {
+    try {
+        await connection.renew();
+    }
+    catch (error) {
+        if (isNeedsAuthError(error))
+            throw headlessAuthError(connection, error);
+        throw error;
+    }
+    health.lastSuccessfulPingAtMs = Date.now();
+}
+async function ensureFreshAuth(connection, ensureFresh) {
+    if (ensureFresh === undefined)
+        return;
+    try {
+        await ensureFresh();
+    }
+    catch (error) {
+        const authError = markMcpConnectionNeedsAuth(connection, error);
+        if (authError !== undefined)
+            throw authError;
+        throw error;
+    }
+}
+export function markMcpConnectionNeedsAuth(connection, error) {
+    if (!isNeedsAuthError(error))
+        return undefined;
+    const authError = headlessAuthError(connection, error);
+    connection.markNeedsAuth(authError);
+    return authError;
+}
+function isRetriableFailedSendError(error) {
+    return isRetriableMcpError(error) && !isMcpSessionExpiredError(error);
+}
+function failedSendError(connection, cause, retriable) {
+    const suffix = retriable
+        ? "reconnecting once before retry"
+        : `post-reconnect retry also failed; run /mcp reconnect ${connection.serverName}`;
+    return new ConnectError(`MCP server ${connection.serverName} failed to send tool call; ${suffix}`, {
+        cause,
+        phase: "call",
+        retriable,
+        serverName: connection.serverName,
+    });
+}
+function sessionExpiredError(connection, cause, retriable) {
+    const suffix = retriable
+        ? "reinitializing once"
+        : `reinitialize retry also expired; run /mcp reconnect ${connection.serverName}`;
+    return new SessionExpiredError(`MCP server ${connection.serverName} session expired; ${suffix}`, {
+        cause,
+        phase: "session",
+        retriable,
+        serverName: connection.serverName,
+    });
+}
+function headlessAuthError(connection, cause) {
+    return new AuthError(`MCP server ${connection.serverName} needs OAuth. Run senpi interactive, then /mcp auth-start ${connection.serverName} and /mcp auth-complete ${connection.serverName} <redirect-url>.`, { cause, phase: "auth", serverName: connection.serverName });
+}
+function isNeedsAuthError(error, depth = 0) {
+    if (error instanceof UnauthorizedError)
+        return true;
+    if (error instanceof OAuthFlowError)
+        return error.terminal;
+    if (depth < 5 && error !== null && typeof error === "object" && "cause" in error) {
+        return isNeedsAuthError(error.cause, depth + 1);
+    }
+    return false;
+}
+//# sourceMappingURL=health.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"health.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/health.ts"],"names":[],"mappings":"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","sourcesContent":["import { UnauthorizedError } from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport { OAuthFlowError } from \"./auth/oauth-errors.ts\";\nimport type { ServerConnection } from \"./connection.ts\";\nimport {\n\tAuthError,\n\tConnectError,\n\tisMcpSessionExpiredError,\n\tisRetriableMcpError,\n\tSessionExpiredError,\n} from \"./errors.ts\";\n\nexport const MCP_PING_STALE_MS = 30_000;\nexport const MCP_PING_TIMEOUT_MS = 2_000;\n\ninterface McpHealthState {\n\tlastSuccessfulPingAtMs: number | undefined;\n\tpendingValidation: Promise<void> | undefined;\n}\n\nconst healthByConnection = new WeakMap<ServerConnection, McpHealthState>();\n\nexport type McpEnsureFreshAuth = () => Promise<unknown>;\n\nexport async function ensureMcpToolCallConnection(\n\tconnection: ServerConnection,\n\tensureFresh?: McpEnsureFreshAuth,\n): Promise<void> {\n\tawait ensureFreshAuth(connection, ensureFresh);\n\tconst health = healthStateFor(connection);\n\tif (connection.state !== \"connected\") {\n\t\tif (connection.state === \"idle\" || connection.state === \"connecting\") {\n\t\t\ttry {\n\t\t\t\tawait connection.connect();\n\t\t\t} catch (error) {\n\t\t\t\tif (isNeedsAuthError(error)) throw headlessAuthError(connection, error);\n\t\t\t\tthrow error;\n\t\t\t}\n\t\t} else if (connection.state === \"needs_auth\") {\n\t\t\tthrow headlessAuthError(connection);\n\t\t} else {\n\t\t\tawait renewConnection(connection, health);\n\t\t\treturn;\n\t\t}\n\t}\n\tconst lastSuccessfulPingAtMs = health.lastSuccessfulPingAtMs;\n\tif (lastSuccessfulPingAtMs !== undefined && Date.now() - lastSuccessfulPingAtMs <= MCP_PING_STALE_MS) {\n\t\treturn;\n\t}\n\tif (health.pendingValidation !== undefined) {\n\t\tawait health.pendingValidation;\n\t\treturn;\n\t}\n\tconst pendingValidation = pingOrRenew(connection, health).finally(() => {\n\t\tif (health.pendingValidation === pendingValidation) health.pendingValidation = undefined;\n\t});\n\thealth.pendingValidation = pendingValidation;\n\tawait pendingValidation;\n}\n\nexport async function withMcpSessionExpiryRetry<T>(\n\tconnection: ServerConnection,\n\toperation: () => Promise<T>,\n): Promise<T> {\n\ttry {\n\t\treturn await operation();\n\t} catch (error) {\n\t\tif (!isMcpSessionExpiredError(error)) throw error;\n\t\tconnection.markDegraded(sessionExpiredError(connection, error, true));\n\t\tawait connection.renew();\n\t\ttry {\n\t\t\treturn await operation();\n\t\t} catch (retryError) {\n\t\t\tif (!isMcpSessionExpiredError(retryError)) throw retryError;\n\t\t\tconst expired = sessionExpiredError(connection, retryError, false);\n\t\t\tconnection.markSuspended(expired);\n\t\t\tthrow expired;\n\t\t}\n\t}\n}\n\nexport async function withMcpRetriableFailedSendRetry<T>(\n\tconnection: ServerConnection,\n\toperation: () => Promise<T>,\n): Promise<T> {\n\ttry {\n\t\treturn await operation();\n\t} catch (error) {\n\t\tif (!isRetriableFailedSendError(error)) throw error;\n\t\tconnection.markDegraded(failedSendError(connection, error, true));\n\t\tawait connection.renew();\n\t\ttry {\n\t\t\treturn await operation();\n\t\t} catch (retryError) {\n\t\t\tif (isRetriableFailedSendError(retryError)) {\n\t\t\t\tconnection.markDegraded(failedSendError(connection, retryError, false));\n\t\t\t}\n\t\t\tthrow retryError;\n\t\t}\n\t}\n}\n\nfunction healthStateFor(connection: ServerConnection): McpHealthState {\n\tlet health = healthByConnection.get(connection);\n\tif (health === undefined) {\n\t\thealth = { lastSuccessfulPingAtMs: undefined, pendingValidation: undefined };\n\t\thealthByConnection.set(connection, health);\n\t}\n\treturn health;\n}\n\nasync function pingOrRenew(connection: ServerConnection, health: McpHealthState): Promise<void> {\n\ttry {\n\t\tawait connection.client.ping({ timeout: MCP_PING_TIMEOUT_MS });\n\t\thealth.lastSuccessfulPingAtMs = Date.now();\n\t} catch (error) {\n\t\tconnection.markDegraded(error instanceof Error ? error : new Error(String(error)));\n\t\tawait renewConnection(connection, health);\n\t}\n}\n\nasync function renewConnection(connection: ServerConnection, health: McpHealthState): Promise<void> {\n\ttry {\n\t\tawait connection.renew();\n\t} catch (error) {\n\t\tif (isNeedsAuthError(error)) throw headlessAuthError(connection, error);\n\t\tthrow error;\n\t}\n\thealth.lastSuccessfulPingAtMs = Date.now();\n}\n\nasync function ensureFreshAuth(\n\tconnection: ServerConnection,\n\tensureFresh: McpEnsureFreshAuth | undefined,\n): Promise<void> {\n\tif (ensureFresh === undefined) return;\n\ttry {\n\t\tawait ensureFresh();\n\t} catch (error) {\n\t\tconst authError = markMcpConnectionNeedsAuth(connection, error);\n\t\tif (authError !== undefined) throw authError;\n\t\tthrow error;\n\t}\n}\n\nexport function markMcpConnectionNeedsAuth(connection: ServerConnection, error: unknown): AuthError | undefined {\n\tif (!isNeedsAuthError(error)) return undefined;\n\tconst authError = headlessAuthError(connection, error);\n\tconnection.markNeedsAuth(authError);\n\treturn authError;\n}\n\nfunction isRetriableFailedSendError(error: unknown): boolean {\n\treturn isRetriableMcpError(error) && !isMcpSessionExpiredError(error);\n}\n\nfunction failedSendError(connection: ServerConnection, cause: unknown, retriable: boolean): ConnectError {\n\tconst suffix = retriable\n\t\t? \"reconnecting once before retry\"\n\t\t: `post-reconnect retry also failed; run /mcp reconnect ${connection.serverName}`;\n\treturn new ConnectError(`MCP server ${connection.serverName} failed to send tool call; ${suffix}`, {\n\t\tcause,\n\t\tphase: \"call\",\n\t\tretriable,\n\t\tserverName: connection.serverName,\n\t});\n}\n\nfunction sessionExpiredError(connection: ServerConnection, cause: unknown, retriable: boolean): SessionExpiredError {\n\tconst suffix = retriable\n\t\t? \"reinitializing once\"\n\t\t: `reinitialize retry also expired; run /mcp reconnect ${connection.serverName}`;\n\treturn new SessionExpiredError(`MCP server ${connection.serverName} session expired; ${suffix}`, {\n\t\tcause,\n\t\tphase: \"session\",\n\t\tretriable,\n\t\tserverName: connection.serverName,\n\t});\n}\n\nfunction headlessAuthError(connection: ServerConnection, cause?: unknown): AuthError {\n\treturn new AuthError(\n\t\t`MCP server ${connection.serverName} needs OAuth. Run senpi interactive, then /mcp auth-start ${connection.serverName} and /mcp auth-complete ${connection.serverName} <redirect-url>.`,\n\t\t{ cause, phase: \"auth\", serverName: connection.serverName },\n\t);\n}\n\nfunction isNeedsAuthError(error: unknown, depth = 0): boolean {\n\tif (error instanceof UnauthorizedError) return true;\n\tif (error instanceof OAuthFlowError) return error.terminal;\n\tif (depth < 5 && error !== null && typeof error === \"object\" && \"cause\" in error) {\n\t\treturn isNeedsAuthError(error.cause, depth + 1);\n\t}\n\treturn false;\n}\n"]}

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

@@ -0,0 +1,15 @@
+import type { McpServerConfig } from "./config-schema.ts";
+import type { ServerConnection } from "./connection.ts";
+import type { McpLogger } from "./log.ts";
+export declare const MCP_KEEP_ALIVE_INTERVAL_MS = 30000;
+interface McpLifecycleDebugSnapshot {
+    inFlight: number;
+    idleTimerHasRef: boolean | null;
+    keepAliveTimerHasRef: boolean | null;
+}
+export declare function configureMcpConnectionLifecycle(connection: ServerConnection, config: McpServerConfig, logger: McpLogger): void;
+export declare function disposeMcpConnectionLifecycle(connection: ServerConnection): void;
+export declare function runMcpConnectionLifecycleCall<T>(connection: ServerConnection, fn: () => Promise<T>): Promise<T>;
+export declare function getMcpLifecycleDebugSnapshot(connection: ServerConnection): McpLifecycleDebugSnapshot | undefined;
+export {};
+//# sourceMappingURL=idle.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"idle.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/idle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG1C,eAAO,MAAM,0BAA0B,QAAS,CAAC;AAYjD,UAAU,yBAAyB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,OAAO,GAAG,IAAI,CAAC;IAChC,oBAAoB,EAAE,OAAO,GAAG,IAAI,CAAC;CACrC;AAID,wBAAgB,+BAA+B,CAC9C,UAAU,EAAE,gBAAgB,EAC5B,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,SAAS,GACf,IAAI,CAeN;AAED,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,gBAAgB,GAAG,IAAI,CAOhF;AAED,wBAAsB,6BAA6B,CAAC,CAAC,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAWrH;AAED,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,gBAAgB,GAAG,yBAAyB,GAAG,SAAS,CAQhH"}

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

@@ -0,0 +1,112 @@
+import { safeInterval, safeTimer } from "./wrap.js";
+export const MCP_KEEP_ALIVE_INTERVAL_MS = 30_000;
+const lifecycleByConnection = new WeakMap();
+export function configureMcpConnectionLifecycle(connection, config, logger) {
+    disposeMcpConnectionLifecycle(connection);
+    const state = {
+        config,
+        connection,
+        idleTimer: undefined,
+        inFlight: 0,
+        keepAliveTimer: undefined,
+        logger,
+        unsubscribeState: connection.onStateChange(() => {
+            refreshLifecycleTimers(state);
+        }),
+    };
+    lifecycleByConnection.set(connection, state);
+    refreshLifecycleTimers(state);
+}
+export function disposeMcpConnectionLifecycle(connection) {
+    const state = lifecycleByConnection.get(connection);
+    if (state === undefined)
+        return;
+    lifecycleByConnection.delete(connection);
+    clearLifecycleTimer(state, "idleTimer");
+    clearLifecycleTimer(state, "keepAliveTimer");
+    state.unsubscribeState();
+}
+export async function runMcpConnectionLifecycleCall(connection, fn) {
+    const state = lifecycleByConnection.get(connection);
+    if (state === undefined)
+        return fn();
+    state.inFlight += 1;
+    clearLifecycleTimer(state, "idleTimer");
+    try {
+        return await fn();
+    }
+    finally {
+        state.inFlight -= 1;
+        refreshLifecycleTimers(state);
+    }
+}
+export function getMcpLifecycleDebugSnapshot(connection) {
+    const state = lifecycleByConnection.get(connection);
+    if (state === undefined)
+        return undefined;
+    return {
+        inFlight: state.inFlight,
+        idleTimerHasRef: hasRef(state.idleTimer),
+        keepAliveTimerHasRef: hasRef(state.keepAliveTimer),
+    };
+}
+function refreshLifecycleTimers(state) {
+    if (state.config.lifecycle === "keep-alive") {
+        clearLifecycleTimer(state, "idleTimer");
+        if (state.keepAliveTimer === undefined)
+            startKeepAliveTimer(state);
+        return;
+    }
+    clearLifecycleTimer(state, "keepAliveTimer");
+    if (state.connection.state !== "connected" || state.inFlight > 0) {
+        clearLifecycleTimer(state, "idleTimer");
+        return;
+    }
+    if (state.idleTimer === undefined)
+        startIdleTimer(state);
+}
+function startIdleTimer(state) {
+    state.idleTimer = safeTimer(`mcp.${state.connection.serverName}.idle`, state.config.idleTimeoutMin * 60_000, async () => {
+        state.idleTimer = undefined;
+        if (state.connection.state !== "connected")
+            return;
+        if (state.inFlight > 0) {
+            refreshLifecycleTimers(state);
+            return;
+        }
+        await state.connection.bumpGeneration();
+    }, { logger: state.logger });
+}
+function startKeepAliveTimer(state) {
+    state.keepAliveTimer = safeInterval(`mcp.${state.connection.serverName}.keepAlive`, MCP_KEEP_ALIVE_INTERVAL_MS, async () => {
+        await runMcpConnectionLifecycleCall(state.connection, () => keepAlivePingOrRecover(state));
+    }, { logger: state.logger });
+}
+async function keepAlivePingOrRecover(state) {
+    try {
+        if (state.connection.state === "connected") {
+            await state.connection.client.ping({ timeout: 2_000 });
+            return;
+        }
+        if (state.connection.state === "idle" || state.connection.state === "connecting") {
+            await state.connection.connect();
+            return;
+        }
+        await state.connection.renew();
+    }
+    catch (error) {
+        const normalized = error instanceof Error ? error : new Error(String(error));
+        state.connection.markDegraded(normalized);
+    }
+}
+function clearLifecycleTimer(state, key) {
+    const timer = state[key];
+    if (timer === undefined)
+        return;
+    clearTimeout(timer);
+    state[key] = undefined;
+}
+function hasRef(timer) {
+    return timer === undefined ? null : timer.hasRef();
+}
+//# sourceMappingURL=idle.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"idle.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/idle.ts"],"names":[],"mappings":"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","sourcesContent":["import type { McpServerConfig } from \"./config-schema.ts\";\nimport type { ServerConnection } from \"./connection.ts\";\nimport type { McpLogger } from \"./log.ts\";\nimport { safeInterval, safeTimer } from \"./wrap.ts\";\n\nexport const MCP_KEEP_ALIVE_INTERVAL_MS = 30_000;\n\ninterface McpLifecycleState {\n\treadonly connection: ServerConnection;\n\treadonly config: McpServerConfig;\n\treadonly logger: McpLogger;\n\treadonly unsubscribeState: () => void;\n\tinFlight: number;\n\tidleTimer: NodeJS.Timeout | undefined;\n\tkeepAliveTimer: NodeJS.Timeout | undefined;\n}\n\ninterface McpLifecycleDebugSnapshot {\n\tinFlight: number;\n\tidleTimerHasRef: boolean | null;\n\tkeepAliveTimerHasRef: boolean | null;\n}\n\nconst lifecycleByConnection = new WeakMap<ServerConnection, McpLifecycleState>();\n\nexport function configureMcpConnectionLifecycle(\n\tconnection: ServerConnection,\n\tconfig: McpServerConfig,\n\tlogger: McpLogger,\n): void {\n\tdisposeMcpConnectionLifecycle(connection);\n\tconst state: McpLifecycleState = {\n\t\tconfig,\n\t\tconnection,\n\t\tidleTimer: undefined,\n\t\tinFlight: 0,\n\t\tkeepAliveTimer: undefined,\n\t\tlogger,\n\t\tunsubscribeState: connection.onStateChange(() => {\n\t\t\trefreshLifecycleTimers(state);\n\t\t}),\n\t};\n\tlifecycleByConnection.set(connection, state);\n\trefreshLifecycleTimers(state);\n}\n\nexport function disposeMcpConnectionLifecycle(connection: ServerConnection): void {\n\tconst state = lifecycleByConnection.get(connection);\n\tif (state === undefined) return;\n\tlifecycleByConnection.delete(connection);\n\tclearLifecycleTimer(state, \"idleTimer\");\n\tclearLifecycleTimer(state, \"keepAliveTimer\");\n\tstate.unsubscribeState();\n}\n\nexport async function runMcpConnectionLifecycleCall<T>(connection: ServerConnection, fn: () => Promise<T>): Promise<T> {\n\tconst state = lifecycleByConnection.get(connection);\n\tif (state === undefined) return fn();\n\tstate.inFlight += 1;\n\tclearLifecycleTimer(state, \"idleTimer\");\n\ttry {\n\t\treturn await fn();\n\t} finally {\n\t\tstate.inFlight -= 1;\n\t\trefreshLifecycleTimers(state);\n\t}\n}\n\nexport function getMcpLifecycleDebugSnapshot(connection: ServerConnection): McpLifecycleDebugSnapshot | undefined {\n\tconst state = lifecycleByConnection.get(connection);\n\tif (state === undefined) return undefined;\n\treturn {\n\t\tinFlight: state.inFlight,\n\t\tidleTimerHasRef: hasRef(state.idleTimer),\n\t\tkeepAliveTimerHasRef: hasRef(state.keepAliveTimer),\n\t};\n}\n\nfunction refreshLifecycleTimers(state: McpLifecycleState): void {\n\tif (state.config.lifecycle === \"keep-alive\") {\n\t\tclearLifecycleTimer(state, \"idleTimer\");\n\t\tif (state.keepAliveTimer === undefined) startKeepAliveTimer(state);\n\t\treturn;\n\t}\n\tclearLifecycleTimer(state, \"keepAliveTimer\");\n\tif (state.connection.state !== \"connected\" || state.inFlight > 0) {\n\t\tclearLifecycleTimer(state, \"idleTimer\");\n\t\treturn;\n\t}\n\tif (state.idleTimer === undefined) startIdleTimer(state);\n}\n\nfunction startIdleTimer(state: McpLifecycleState): void {\n\tstate.idleTimer = safeTimer(\n\t\t`mcp.${state.connection.serverName}.idle`,\n\t\tstate.config.idleTimeoutMin * 60_000,\n\t\tasync () => {\n\t\t\tstate.idleTimer = undefined;\n\t\t\tif (state.connection.state !== \"connected\") return;\n\t\t\tif (state.inFlight > 0) {\n\t\t\t\trefreshLifecycleTimers(state);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tawait state.connection.bumpGeneration();\n\t\t},\n\t\t{ logger: state.logger },\n\t);\n}\n\nfunction startKeepAliveTimer(state: McpLifecycleState): void {\n\tstate.keepAliveTimer = safeInterval(\n\t\t`mcp.${state.connection.serverName}.keepAlive`,\n\t\tMCP_KEEP_ALIVE_INTERVAL_MS,\n\t\tasync () => {\n\t\t\tawait runMcpConnectionLifecycleCall(state.connection, () => keepAlivePingOrRecover(state));\n\t\t},\n\t\t{ logger: state.logger },\n\t);\n}\n\nasync function keepAlivePingOrRecover(state: McpLifecycleState): Promise<void> {\n\ttry {\n\t\tif (state.connection.state === \"connected\") {\n\t\t\tawait state.connection.client.ping({ timeout: 2_000 });\n\t\t\treturn;\n\t\t}\n\t\tif (state.connection.state === \"idle\" || state.connection.state === \"connecting\") {\n\t\t\tawait state.connection.connect();\n\t\t\treturn;\n\t\t}\n\t\tawait state.connection.renew();\n\t} catch (error) {\n\t\tconst normalized = error instanceof Error ? error : new Error(String(error));\n\t\tstate.connection.markDegraded(normalized);\n\t}\n}\n\nfunction clearLifecycleTimer(state: McpLifecycleState, key: \"idleTimer\" | \"keepAliveTimer\"): void {\n\tconst timer = state[key];\n\tif (timer === undefined) return;\n\tclearTimeout(timer);\n\tstate[key] = undefined;\n}\n\nfunction hasRef(timer: NodeJS.Timeout | undefined): boolean | null {\n\treturn timer === undefined ? null : timer.hasRef();\n}\n"]}

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

@@ -0,0 +1,3 @@
+import type { ExtensionAPI } from "../../types.ts";
+export default function mcpExtension(pi: ExtensionAPI): void;
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAuC,MAAM,gBAAgB,CAAC;AAkBxF,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CAoI3D"}