@code-yeongyu/senpi 2026.7.4 → 2026.7.9-2

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

@@ -0,0 +1,32 @@
+import type { McpToolDefinition } from "./expose/register.ts";
+import type { Client } from "./wrap.ts";
+import { type McpAsyncErrorSink } from "./wrap.ts";
+export interface McpCatalogDiff {
+    readonly added: string[];
+    readonly removed: string[];
+    readonly unchanged: string[];
+}
+/** Deterministic set diff between two catalogs, keyed by tool name. */
+export declare function diffMcpToolNames(prev: readonly string[], next: readonly string[]): McpCatalogDiff;
+/** `/mcp status` delta line, e.g. `3 added (inactive), 1 removed`. */
+export declare function formatMcpListChangedDelta(diff: McpCatalogDiff): string;
+export interface McpListChangeCoalescerOptions {
+    readonly onRefresh: () => void | Promise<void>;
+    readonly sink: McpAsyncErrorSink;
+    readonly delayMs?: number;
+    readonly minIntervalMs?: number;
+    readonly scope?: string;
+    readonly now?: () => number;
+}
+export interface McpListChangeCoalescer {
+    notify(): void;
+    dispose(): void;
+}
+export declare function createMcpListChangeCoalescer(options: McpListChangeCoalescerOptions): McpListChangeCoalescer;
+/** Register list_changed handlers for tools/resources/prompts. `setNotificationHandler`
+ * takes effect regardless of the server's declared capabilities. Malformed
+ * notifications fail SDK schema validation and are dropped by the SDK before
+ * reaching `onChange`, so the connection stays up. */
+export declare function subscribeMcpListChanged(client: Client, onChange: () => void): void;
+export declare function buildMcpTombstoneDefinition(name: string, server: string): McpToolDefinition;
+//# sourceMappingURL=notifications.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"notifications.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/notifications.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,iBAAiB,EAAkB,MAAM,sBAAsB,CAAC;AAC9E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,KAAK,iBAAiB,EAAa,MAAM,WAAW,CAAC;AAE9D,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,uEAAuE;AACvE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,cAAc,CAQjG;AAED,sEAAsE;AACtE,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAKtE;AAMD,MAAM,WAAW,6BAA6B;IAC7C,QAAQ,CAAC,SAAS,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC;IACjC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACtC,MAAM,IAAI,IAAI,CAAC;IACf,OAAO,IAAI,IAAI,CAAC;CAChB;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,6BAA6B,GAAG,sBAAsB,CA4B3G;AAMD;;;sDAGsD;AACtD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAUlF;AAMD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAc3F"}

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

@@ -0,0 +1,98 @@
+// list_changed subscriptions + safe dynamic catalog updates (todo 35).
+//
+// Closes the gap where senpi ignored MCP list_changed notifications (codex
+// precedent). We subscribe to tools/resources/prompts list_changed — and listen
+// even when the server never declared the capability (gemini robustness) — then
+// coalesce a burst (300ms) under a per-server burst guard (max 1 refresh/s) into
+// a single re-list. On refresh, added tools enter INACTIVE (rug-pull defense),
+// and removed tools are force-dropped and tombstoned so a stale execute()
+// returns a clean isError instead of calling a dead entry.
+import { Text } from "@earendil-works/pi-tui";
+import { PromptListChangedNotificationSchema, ResourceListChangedNotificationSchema, ToolListChangedNotificationSchema, } from "@modelcontextprotocol/sdk/types.js";
+import { Type } from "typebox";
+import { ToolExecError } from "./errors.js";
+import { safeTimer } from "./wrap.js";
+/** Deterministic set diff between two catalogs, keyed by tool name. */
+export function diffMcpToolNames(prev, next) {
+    const prevSet = new Set(prev);
+    const nextSet = new Set(next);
+    return {
+        added: [...nextSet].filter((name) => !prevSet.has(name)).sort(),
+        removed: [...prevSet].filter((name) => !nextSet.has(name)).sort(),
+        unchanged: [...nextSet].filter((name) => prevSet.has(name)).sort(),
+    };
+}
+/** `/mcp status` delta line, e.g. `3 added (inactive), 1 removed`. */
+export function formatMcpListChangedDelta(diff) {
+    const parts = [];
+    if (diff.added.length > 0)
+        parts.push(`${diff.added.length} added (inactive)`);
+    if (diff.removed.length > 0)
+        parts.push(`${diff.removed.length} removed`);
+    return parts.length === 0 ? "no change" : parts.join(", ");
+}
+export function createMcpListChangeCoalescer(options) {
+    const delayMs = options.delayMs ?? 300;
+    const minIntervalMs = options.minIntervalMs ?? 1000;
+    const now = options.now ?? Date.now;
+    const scope = options.scope ?? "mcp.list_changed";
+    let timer;
+    let lastRefreshAt = Number.NEGATIVE_INFINITY;
+    const fire = async () => {
+        timer = undefined;
+        lastRefreshAt = now();
+        await options.onRefresh();
+    };
+    return {
+        notify() {
+            if (timer !== undefined)
+                return; // already scheduled -> coalesce this burst
+            const sinceLast = now() - lastRefreshAt;
+            const wait = Math.max(delayMs, minIntervalMs - sinceLast);
+            timer = safeTimer(scope, wait, fire, options.sink);
+        },
+        dispose() {
+            if (timer !== undefined) {
+                clearTimeout(timer);
+                timer = undefined;
+            }
+        },
+    };
+}
+// ---------------------------------------------------------------------------
+// SDK subscription (listen even when the capability is undeclared).
+// ---------------------------------------------------------------------------
+/** Register list_changed handlers for tools/resources/prompts. `setNotificationHandler`
+ * takes effect regardless of the server's declared capabilities. Malformed
+ * notifications fail SDK schema validation and are dropped by the SDK before
+ * reaching `onChange`, so the connection stays up. */
+export function subscribeMcpListChanged(client, onChange) {
+    for (const schema of [
+        ToolListChangedNotificationSchema,
+        ResourceListChangedNotificationSchema,
+        PromptListChangedNotificationSchema,
+    ]) {
+        client.setNotificationHandler(schema, () => {
+            onChange();
+        });
+    }
+}
+// ---------------------------------------------------------------------------
+// Tombstone: a removed tool re-registered so a stale call fails cleanly.
+// ---------------------------------------------------------------------------
+export function buildMcpTombstoneDefinition(name, server) {
+    return {
+        name,
+        label: name,
+        description: `This MCP tool was removed from ${server} and is no longer available.`,
+        parameters: Type.Object({}),
+        executionMode: "parallel",
+        async execute() {
+            throw new ToolExecError(`tool no longer available on ${server}`, { phase: "call", serverName: server });
+        },
+        renderCall(_args, theme) {
+            return new Text(theme.fg("toolOutput", `${name} (removed)`), 0, 0);
+        },
+    };
+}
+//# sourceMappingURL=notifications.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"notifications.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/notifications.ts"],"names":[],"mappings":"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","sourcesContent":["// list_changed subscriptions + safe dynamic catalog updates (todo 35).\n//\n// Closes the gap where senpi ignored MCP list_changed notifications (codex\n// precedent). We subscribe to tools/resources/prompts list_changed — and listen\n// even when the server never declared the capability (gemini robustness) — then\n// coalesce a burst (300ms) under a per-server burst guard (max 1 refresh/s) into\n// a single re-list. On refresh, added tools enter INACTIVE (rug-pull defense),\n// and removed tools are force-dropped and tombstoned so a stale execute()\n// returns a clean isError instead of calling a dead entry.\n\nimport type { AgentToolResult } from \"@earendil-works/pi-agent-core\";\nimport { Text } from \"@earendil-works/pi-tui\";\nimport {\n\tPromptListChangedNotificationSchema,\n\tResourceListChangedNotificationSchema,\n\tToolListChangedNotificationSchema,\n} from \"@modelcontextprotocol/sdk/types.js\";\nimport { Type } from \"typebox\";\nimport { ToolExecError } from \"./errors.ts\";\nimport type { McpToolDefinition, McpToolDetails } from \"./expose/register.ts\";\nimport type { Client } from \"./wrap.ts\";\nimport { type McpAsyncErrorSink, safeTimer } from \"./wrap.ts\";\n\nexport interface McpCatalogDiff {\n\treadonly added: string[];\n\treadonly removed: string[];\n\treadonly unchanged: string[];\n}\n\n/** Deterministic set diff between two catalogs, keyed by tool name. */\nexport function diffMcpToolNames(prev: readonly string[], next: readonly string[]): McpCatalogDiff {\n\tconst prevSet = new Set(prev);\n\tconst nextSet = new Set(next);\n\treturn {\n\t\tadded: [...nextSet].filter((name) => !prevSet.has(name)).sort(),\n\t\tremoved: [...prevSet].filter((name) => !nextSet.has(name)).sort(),\n\t\tunchanged: [...nextSet].filter((name) => prevSet.has(name)).sort(),\n\t};\n}\n\n/** `/mcp status` delta line, e.g. `3 added (inactive), 1 removed`. */\nexport function formatMcpListChangedDelta(diff: McpCatalogDiff): string {\n\tconst parts: string[] = [];\n\tif (diff.added.length > 0) parts.push(`${diff.added.length} added (inactive)`);\n\tif (diff.removed.length > 0) parts.push(`${diff.removed.length} removed`);\n\treturn parts.length === 0 ? \"no change\" : parts.join(\", \");\n}\n\n// ---------------------------------------------------------------------------\n// Coalescer: burst -> single refresh, under a max-1/s/server burst guard.\n// ---------------------------------------------------------------------------\n\nexport interface McpListChangeCoalescerOptions {\n\treadonly onRefresh: () => void | Promise<void>;\n\treadonly sink: McpAsyncErrorSink;\n\treadonly delayMs?: number;\n\treadonly minIntervalMs?: number;\n\treadonly scope?: string;\n\treadonly now?: () => number;\n}\n\nexport interface McpListChangeCoalescer {\n\tnotify(): void;\n\tdispose(): void;\n}\n\nexport function createMcpListChangeCoalescer(options: McpListChangeCoalescerOptions): McpListChangeCoalescer {\n\tconst delayMs = options.delayMs ?? 300;\n\tconst minIntervalMs = options.minIntervalMs ?? 1000;\n\tconst now = options.now ?? Date.now;\n\tconst scope = options.scope ?? \"mcp.list_changed\";\n\tlet timer: NodeJS.Timeout | undefined;\n\tlet lastRefreshAt = Number.NEGATIVE_INFINITY;\n\n\tconst fire = async (): Promise<void> => {\n\t\ttimer = undefined;\n\t\tlastRefreshAt = now();\n\t\tawait options.onRefresh();\n\t};\n\n\treturn {\n\t\tnotify(): void {\n\t\t\tif (timer !== undefined) return; // already scheduled -> coalesce this burst\n\t\t\tconst sinceLast = now() - lastRefreshAt;\n\t\t\tconst wait = Math.max(delayMs, minIntervalMs - sinceLast);\n\t\t\ttimer = safeTimer(scope, wait, fire, options.sink);\n\t\t},\n\t\tdispose(): void {\n\t\t\tif (timer !== undefined) {\n\t\t\t\tclearTimeout(timer);\n\t\t\t\ttimer = undefined;\n\t\t\t}\n\t\t},\n\t};\n}\n\n// ---------------------------------------------------------------------------\n// SDK subscription (listen even when the capability is undeclared).\n// ---------------------------------------------------------------------------\n\n/** Register list_changed handlers for tools/resources/prompts. `setNotificationHandler`\n * takes effect regardless of the server's declared capabilities. Malformed\n * notifications fail SDK schema validation and are dropped by the SDK before\n * reaching `onChange`, so the connection stays up. */\nexport function subscribeMcpListChanged(client: Client, onChange: () => void): void {\n\tfor (const schema of [\n\t\tToolListChangedNotificationSchema,\n\t\tResourceListChangedNotificationSchema,\n\t\tPromptListChangedNotificationSchema,\n\t]) {\n\t\tclient.setNotificationHandler(schema, () => {\n\t\t\tonChange();\n\t\t});\n\t}\n}\n\n// ---------------------------------------------------------------------------\n// Tombstone: a removed tool re-registered so a stale call fails cleanly.\n// ---------------------------------------------------------------------------\n\nexport function buildMcpTombstoneDefinition(name: string, server: string): McpToolDefinition {\n\treturn {\n\t\tname,\n\t\tlabel: name,\n\t\tdescription: `This MCP tool was removed from ${server} and is no longer available.`,\n\t\tparameters: Type.Object({}),\n\t\texecutionMode: \"parallel\",\n\t\tasync execute(): Promise<AgentToolResult<McpToolDetails | undefined>> {\n\t\t\tthrow new ToolExecError(`tool no longer available on ${server}`, { phase: \"call\", serverName: server });\n\t\t},\n\t\trenderCall(_args, theme) {\n\t\t\treturn new Text(theme.fg(\"toolOutput\", `${name} (removed)`), 0, 0);\n\t\t},\n\t};\n}\n"]}

package/dist/core/extensions/builtin/mcp/process-tree.d.ts

@@ -0,0 +1,8 @@
+export declare function collectProcessTree(rootPid: number): Promise<number[]>;
+export declare function reapProcessTree(rootPid: number, options: {
+    readonly termWaitMs: number;
+    readonly killWaitMs: number;
+}): Promise<void>;
+export declare function isProcessAlive(pid: number): boolean;
+export declare function delay(ms: number): Promise<void>;
+//# sourceMappingURL=process-tree.d.ts.map

package/dist/core/extensions/builtin/mcp/process-tree.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"process-tree.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/process-tree.ts"],"names":[],"mappings":"AAMA,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAY3E;AAED,wBAAsB,eAAe,CACpC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GACnE,OAAO,CAAC,IAAI,CAAC,CAYf;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAQnD;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C"}

package/dist/core/extensions/builtin/mcp/process-tree.js

@@ -0,0 +1,89 @@
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import { safeDelay } from "./wrap.js";
+const execFileAsync = promisify(execFile);
+export async function collectProcessTree(rootPid) {
+    const seen = new Set();
+    const queue = [rootPid];
+    for (let index = 0; index < queue.length; index++) {
+        const pid = queue[index];
+        if (seen.has(pid))
+            continue;
+        seen.add(pid);
+        for (const childPid of await childPids(pid)) {
+            if (!seen.has(childPid))
+                queue.push(childPid);
+        }
+    }
+    return [...seen];
+}
+export async function reapProcessTree(rootPid, options) {
+    const knownPids = new Set(await collectProcessTree(rootPid));
+    if (!someProcessAlive(knownPids))
+        return;
+    killPids(knownPids, "SIGTERM");
+    await waitForDead(knownPids, options.termWaitMs);
+    for (const pid of await collectProcessTree(rootPid))
+        knownPids.add(pid);
+    if (!someProcessAlive(knownPids))
+        return;
+    killPids(knownPids, "SIGKILL");
+    await waitForDead(knownPids, options.killWaitMs);
+}
+export function isProcessAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (error) {
+        ignoreExpectedProcessRace(error);
+        return false;
+    }
+}
+export function delay(ms) {
+    return safeDelay(ms);
+}
+async function childPids(parentPid) {
+    if (!["darwin", "linux"].includes(process.platform))
+        return [];
+    try {
+        const { stdout } = await execFileAsync("pgrep", ["-P", String(parentPid)], { timeout: 1000 });
+        return stdout
+            .split(/\s+/)
+            .map(Number)
+            .filter((pid) => Number.isInteger(pid) && pid > 0);
+    }
+    catch (error) {
+        ignoreExpectedProcessRace(error);
+        return [];
+    }
+}
+function killPids(pids, signal) {
+    for (const pid of [...pids].reverse()) {
+        try {
+            process.kill(pid, signal);
+        }
+        catch (error) {
+            ignoreExpectedProcessRace(error);
+        }
+    }
+}
+async function waitForDead(pids, timeoutMs) {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        if (!someProcessAlive(pids))
+            return;
+        await delay(25);
+    }
+}
+function someProcessAlive(pids) {
+    for (const pid of pids) {
+        if (isProcessAlive(pid))
+            return true;
+    }
+    return false;
+}
+function ignoreExpectedProcessRace(error) {
+    void error;
+}
+//# sourceMappingURL=process-tree.js.map

package/dist/core/extensions/builtin/mcp/process-tree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"process-tree.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/process-tree.ts"],"names":[],"mappings":"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","sourcesContent":["import { execFile } from \"node:child_process\";\nimport { promisify } from \"node:util\";\nimport { safeDelay } from \"./wrap.ts\";\n\nconst execFileAsync = promisify(execFile);\n\nexport async function collectProcessTree(rootPid: number): Promise<number[]> {\n\tconst seen = new Set<number>();\n\tconst queue = [rootPid];\n\tfor (let index = 0; index < queue.length; index++) {\n\t\tconst pid = queue[index];\n\t\tif (seen.has(pid)) continue;\n\t\tseen.add(pid);\n\t\tfor (const childPid of await childPids(pid)) {\n\t\t\tif (!seen.has(childPid)) queue.push(childPid);\n\t\t}\n\t}\n\treturn [...seen];\n}\n\nexport async function reapProcessTree(\n\trootPid: number,\n\toptions: { readonly termWaitMs: number; readonly killWaitMs: number },\n): Promise<void> {\n\tconst knownPids = new Set(await collectProcessTree(rootPid));\n\tif (!someProcessAlive(knownPids)) return;\n\n\tkillPids(knownPids, \"SIGTERM\");\n\tawait waitForDead(knownPids, options.termWaitMs);\n\n\tfor (const pid of await collectProcessTree(rootPid)) knownPids.add(pid);\n\tif (!someProcessAlive(knownPids)) return;\n\n\tkillPids(knownPids, \"SIGKILL\");\n\tawait waitForDead(knownPids, options.killWaitMs);\n}\n\nexport function isProcessAlive(pid: number): boolean {\n\ttry {\n\t\tprocess.kill(pid, 0);\n\t\treturn true;\n\t} catch (error) {\n\t\tignoreExpectedProcessRace(error);\n\t\treturn false;\n\t}\n}\n\nexport function delay(ms: number): Promise<void> {\n\treturn safeDelay(ms);\n}\n\nasync function childPids(parentPid: number): Promise<number[]> {\n\tif (![\"darwin\", \"linux\"].includes(process.platform)) return [];\n\ttry {\n\t\tconst { stdout } = await execFileAsync(\"pgrep\", [\"-P\", String(parentPid)], { timeout: 1000 });\n\t\treturn stdout\n\t\t\t.split(/\\s+/)\n\t\t\t.map(Number)\n\t\t\t.filter((pid) => Number.isInteger(pid) && pid > 0);\n\t} catch (error) {\n\t\tignoreExpectedProcessRace(error);\n\t\treturn [];\n\t}\n}\n\nfunction killPids(pids: Iterable<number>, signal: \"SIGTERM\" | \"SIGKILL\"): void {\n\tfor (const pid of [...pids].reverse()) {\n\t\ttry {\n\t\t\tprocess.kill(pid, signal);\n\t\t} catch (error) {\n\t\t\tignoreExpectedProcessRace(error);\n\t\t}\n\t}\n}\n\nasync function waitForDead(pids: Iterable<number>, timeoutMs: number): Promise<void> {\n\tconst deadline = Date.now() + timeoutMs;\n\twhile (Date.now() < deadline) {\n\t\tif (!someProcessAlive(pids)) return;\n\t\tawait delay(25);\n\t}\n}\n\nfunction someProcessAlive(pids: Iterable<number>): boolean {\n\tfor (const pid of pids) {\n\t\tif (isProcessAlive(pid)) return true;\n\t}\n\treturn false;\n}\n\nfunction ignoreExpectedProcessRace(error: unknown): void {\n\tvoid error;\n}\n"]}

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

@@ -0,0 +1,15 @@
+import type { ExtensionAPI } from "../../types.ts";
+import type { McpCachedServerCatalog } from "./catalog-cache.ts";
+import type { ServerConnection } from "./connection.ts";
+export interface McpPromptServer {
+    readonly server: string;
+    readonly connection: ServerConnection;
+    readonly requestTimeoutMs?: number;
+    readonly prompts: NonNullable<McpCachedServerCatalog["prompts"]>;
+}
+type CommandRegistrar = Pick<ExtensionAPI, "registerCommand">;
+/** Test seam: forget which commands were registered (module-level last-wins). */
+export declare function resetMcpPromptCommandsForTests(): void;
+export declare function registerMcpPromptCommands(pi: CommandRegistrar, servers: readonly McpPromptServer[]): string[];
+export {};
+//# sourceMappingURL=prompts.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/prompts.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,YAAY,EAA2B,MAAM,gBAAgB,CAAC;AAC5E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGxD,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IACtC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,CAAC;CACjE;AAED,KAAK,gBAAgB,GAAG,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;AAI9D,iFAAiF;AACjF,wBAAgB,8BAA8B,IAAI,IAAI,CAErD;AAED,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,gBAAgB,EAAE,OAAO,EAAE,SAAS,eAAe,EAAE,GAAG,MAAM,EAAE,CA6B7G"}

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

@@ -0,0 +1,73 @@
+// MCP prompts → slash commands (todo 40).
+//
+// Every prompt a connected server lists becomes a `/mcp:<server>:<prompt>`
+// senpi command. Invoking it collects the prompt's declared arguments through
+// ctx.ui.input (required arguments re-prompt once, then abort with a notice;
+// optional arguments may be left empty), calls prompts/get, and injects the
+// flattened returned messages into the input editor (senpi command semantics:
+// the user reviews and submits). prompts_list_changed rides the existing
+// tools-changed refresh, which re-runs registration; command registration is
+// last-wins, and prompts removed server-side keep a stale command until the
+// next session — invoking one surfaces the server error as a notice.
+import { createMcpLogger } from "./log.js";
+const registeredCommandNames = new Set();
+/** Test seam: forget which commands were registered (module-level last-wins). */
+export function resetMcpPromptCommandsForTests() {
+    registeredCommandNames.clear();
+}
+export function registerMcpPromptCommands(pi, servers) {
+    const added = [];
+    for (const server of servers) {
+        for (const prompt of server.prompts) {
+            const commandName = `mcp:${server.server}:${prompt.name}`;
+            if (registeredCommandNames.has(commandName))
+                continue;
+            registeredCommandNames.add(commandName);
+            added.push(commandName);
+            pi.registerCommand(commandName, {
+                description: prompt.description ?? `MCP prompt ${prompt.name} from ${server.server}`,
+                handler: async (_args, ctx) => {
+                    try {
+                        const collected = await collectPromptArguments(prompt.arguments ?? [], ctx);
+                        if (collected === undefined)
+                            return;
+                        const result = await server.connection.client.getPrompt({ arguments: collected, name: prompt.name }, { timeout: server.requestTimeoutMs });
+                        ctx.ui.setEditorText(flattenPromptMessages(result.messages));
+                    }
+                    catch (error) {
+                        const message = error instanceof Error ? error.message : String(error);
+                        createMcpLogger(server.server).warn(`prompt ${prompt.name} failed: ${message}`);
+                        ctx.ui.notify(`MCP prompt ${prompt.name} failed: ${message}`, "error");
+                    }
+                },
+            });
+        }
+    }
+    return added;
+}
+async function collectPromptArguments(declared, ctx) {
+    const collected = {};
+    for (const argument of declared) {
+        const title = `${argument.name}${argument.required ? "" : " (optional)"}`;
+        const value = await ctx.ui.input(title, argument.description);
+        if (value !== undefined && value.length > 0) {
+            collected[argument.name] = value;
+            continue;
+        }
+        if (argument.required) {
+            ctx.ui.notify(`MCP prompt cancelled: required argument '${argument.name}' not provided.`, "warning");
+            return undefined;
+        }
+    }
+    return collected;
+}
+function flattenPromptMessages(messages) {
+    return messages
+        .map((message) => {
+        const content = message.content;
+        const text = typeof content?.text === "string" ? content.text : JSON.stringify(message.content);
+        return messages.length > 1 ? `${message.role}: ${text}` : text;
+    })
+        .join("\n\n");
+}
+//# sourceMappingURL=prompts.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/prompts.ts"],"names":[],"mappings":"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","sourcesContent":["// MCP prompts → slash commands (todo 40).\n//\n// Every prompt a connected server lists becomes a `/mcp:<server>:<prompt>`\n// senpi command. Invoking it collects the prompt's declared arguments through\n// ctx.ui.input (required arguments re-prompt once, then abort with a notice;\n// optional arguments may be left empty), calls prompts/get, and injects the\n// flattened returned messages into the input editor (senpi command semantics:\n// the user reviews and submits). prompts_list_changed rides the existing\n// tools-changed refresh, which re-runs registration; command registration is\n// last-wins, and prompts removed server-side keep a stale command until the\n// next session — invoking one surfaces the server error as a notice.\n\nimport type { ExtensionAPI, ExtensionCommandContext } from \"../../types.ts\";\nimport type { McpCachedServerCatalog } from \"./catalog-cache.ts\";\nimport type { ServerConnection } from \"./connection.ts\";\nimport { createMcpLogger } from \"./log.ts\";\n\nexport interface McpPromptServer {\n\treadonly server: string;\n\treadonly connection: ServerConnection;\n\treadonly requestTimeoutMs?: number;\n\treadonly prompts: NonNullable<McpCachedServerCatalog[\"prompts\"]>;\n}\n\ntype CommandRegistrar = Pick<ExtensionAPI, \"registerCommand\">;\n\nconst registeredCommandNames = new Set<string>();\n\n/** Test seam: forget which commands were registered (module-level last-wins). */\nexport function resetMcpPromptCommandsForTests(): void {\n\tregisteredCommandNames.clear();\n}\n\nexport function registerMcpPromptCommands(pi: CommandRegistrar, servers: readonly McpPromptServer[]): string[] {\n\tconst added: string[] = [];\n\tfor (const server of servers) {\n\t\tfor (const prompt of server.prompts) {\n\t\t\tconst commandName = `mcp:${server.server}:${prompt.name}`;\n\t\t\tif (registeredCommandNames.has(commandName)) continue;\n\t\t\tregisteredCommandNames.add(commandName);\n\t\t\tadded.push(commandName);\n\t\t\tpi.registerCommand(commandName, {\n\t\t\t\tdescription: prompt.description ?? `MCP prompt ${prompt.name} from ${server.server}`,\n\t\t\t\thandler: async (_args, ctx) => {\n\t\t\t\t\ttry {\n\t\t\t\t\t\tconst collected = await collectPromptArguments(prompt.arguments ?? [], ctx);\n\t\t\t\t\t\tif (collected === undefined) return;\n\t\t\t\t\t\tconst result = await server.connection.client.getPrompt(\n\t\t\t\t\t\t\t{ arguments: collected, name: prompt.name },\n\t\t\t\t\t\t\t{ timeout: server.requestTimeoutMs },\n\t\t\t\t\t\t);\n\t\t\t\t\t\tctx.ui.setEditorText(flattenPromptMessages(result.messages));\n\t\t\t\t\t} catch (error) {\n\t\t\t\t\t\tconst message = error instanceof Error ? error.message : String(error);\n\t\t\t\t\t\tcreateMcpLogger(server.server).warn(`prompt ${prompt.name} failed: ${message}`);\n\t\t\t\t\t\tctx.ui.notify(`MCP prompt ${prompt.name} failed: ${message}`, \"error\");\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t});\n\t\t}\n\t}\n\treturn added;\n}\n\nasync function collectPromptArguments(\n\tdeclared: ReadonlyArray<{ name: string; description?: string; required?: boolean }>,\n\tctx: ExtensionCommandContext,\n): Promise<Record<string, string> | undefined> {\n\tconst collected: Record<string, string> = {};\n\tfor (const argument of declared) {\n\t\tconst title = `${argument.name}${argument.required ? \"\" : \" (optional)\"}`;\n\t\tconst value = await ctx.ui.input(title, argument.description);\n\t\tif (value !== undefined && value.length > 0) {\n\t\t\tcollected[argument.name] = value;\n\t\t\tcontinue;\n\t\t}\n\t\tif (argument.required) {\n\t\t\tctx.ui.notify(`MCP prompt cancelled: required argument '${argument.name}' not provided.`, \"warning\");\n\t\t\treturn undefined;\n\t\t}\n\t}\n\treturn collected;\n}\n\nfunction flattenPromptMessages(messages: ReadonlyArray<{ role: string; content: unknown }>): string {\n\treturn messages\n\t\t.map((message) => {\n\t\t\tconst content = message.content as { type?: string; text?: string };\n\t\t\tconst text = typeof content?.text === \"string\" ? content.text : JSON.stringify(message.content);\n\t\t\treturn messages.length > 1 ? `${message.role}: ${text}` : text;\n\t\t})\n\t\t.join(\"\\n\\n\");\n}\n"]}

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

@@ -0,0 +1,21 @@
+import type { ServerConnection } from "./connection.ts";
+import type { McpLogger } from "./log.ts";
+export declare const MCP_RECONNECT_BACKOFF_MS: readonly [500, 1000, 2000, 4000, 8000];
+export declare const MCP_RECONNECT_BREAKER_WINDOW_MS = 30000;
+export declare const MCP_RECONNECT_BREAKER_ATTEMPTS = 5;
+interface McpReconnectOptions {
+    readonly connection: ServerConnection;
+    readonly logger: McpLogger;
+    readonly reconnect: () => Promise<void>;
+    readonly shouldReconnect?: () => boolean;
+    readonly random?: () => number;
+}
+export declare function configureMcpReconnect(options: McpReconnectOptions): void;
+export declare function disposeMcpReconnect(connection: ServerConnection): void;
+export declare function reconnectMcpNow(connection: ServerConnection): Promise<void>;
+export declare function getMcpReconnectDebugSnapshot(connection: ServerConnection): {
+    attemptsInWindow: number;
+    timerHasRef: boolean | null;
+};
+export {};
+//# sourceMappingURL=reconnect.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"reconnect.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/reconnect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG1C,eAAO,MAAM,wBAAwB,YAAI,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAU,CAAC;AAC/E,eAAO,MAAM,+BAA+B,QAAS,CAAC;AACtD,eAAO,MAAM,8BAA8B,IAAI,CAAC;AAEhD,UAAU,mBAAmB;IAC5B,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,OAAO,CAAC;IACzC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC;CAC/B;AAkBD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,CAmBxE;AAED,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,gBAAgB,GAAG,IAAI,CAOtE;AAED,wBAAsB,eAAe,CAAC,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAUjF;AAED,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,gBAAgB,GAAG;IAC3E,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,OAAO,GAAG,IAAI,CAAC;CAC5B,CAOA"}

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

@@ -0,0 +1,142 @@
+import { ConnectError } from "./errors.js";
+import { safeTimer } from "./wrap.js";
+export const MCP_RECONNECT_BACKOFF_MS = [500, 1000, 2000, 4000, 8000];
+export const MCP_RECONNECT_BREAKER_WINDOW_MS = 30_000;
+export const MCP_RECONNECT_BREAKER_ATTEMPTS = 5;
+const reconnectStates = new WeakMap();
+export function configureMcpReconnect(options) {
+    disposeMcpReconnect(options.connection);
+    const state = {
+        attemptTimes: [],
+        backoffIndex: 0,
+        connection: options.connection,
+        disposed: false,
+        logger: options.logger,
+        random: options.random ?? Math.random,
+        reconnect: options.reconnect,
+        shouldReconnect: options.shouldReconnect ?? (() => true),
+        timer: undefined,
+        timerGeneration: undefined,
+        unsubscribe: options.connection.onStateChange((event) => {
+            if (event.state === "degraded")
+                scheduleReconnect(state, event.generation, event.error);
+            if (event.state === "connected")
+                state.backoffIndex = 0;
+        }),
+    };
+    reconnectStates.set(options.connection, state);
+}
+export function disposeMcpReconnect(connection) {
+    const state = reconnectStates.get(connection);
+    if (state === undefined)
+        return;
+    reconnectStates.delete(connection);
+    state.disposed = true;
+    clearReconnectTimer(state);
+    state.unsubscribe();
+}
+export async function reconnectMcpNow(connection) {
+    const state = reconnectStates.get(connection);
+    if (state === undefined) {
+        await connection.renew();
+        return;
+    }
+    clearReconnectTimer(state);
+    state.attemptTimes = [];
+    state.backoffIndex = 0;
+    await runReconnectAttempt(state, connection.generation, true);
+}
+export function getMcpReconnectDebugSnapshot(connection) {
+    const state = reconnectStates.get(connection);
+    if (state === undefined)
+        return { attemptsInWindow: 0, timerHasRef: null };
+    return {
+        attemptsInWindow: pruneAttemptTimes(state, Date.now()).length,
+        timerHasRef: state.timer?.hasRef() ?? null,
+    };
+}
+function scheduleReconnect(state, generation, cause) {
+    if (state.disposed || state.timer !== undefined || !state.shouldReconnect())
+        return;
+    if (state.connection.state === "disabled" || state.connection.state === "suspended")
+        return;
+    if (breakerShouldOpen(state, Date.now())) {
+        openCircuit(state, cause);
+        return;
+    }
+    const baseDelayMs = MCP_RECONNECT_BACKOFF_MS[Math.min(state.backoffIndex, MCP_RECONNECT_BACKOFF_MS.length - 1)];
+    const delayMs = Math.max(0, Math.floor(baseDelayMs * clampRandom(state.random())));
+    state.timerGeneration = generation;
+    state.timer = safeTimer(`mcp.${state.connection.serverName}.reconnect`, delayMs, async () => {
+        state.timer = undefined;
+        const timerGeneration = state.timerGeneration;
+        state.timerGeneration = undefined;
+        if (timerGeneration === undefined)
+            return;
+        await runReconnectAttempt(state, timerGeneration, false);
+    }, { logger: state.logger });
+}
+async function runReconnectAttempt(state, generation, manual) {
+    if (state.disposed || !state.shouldReconnect())
+        return;
+    if (!manual && generation !== state.connection.generation)
+        return;
+    if (state.connection.state === "disabled")
+        return;
+    if (!manual && breakerShouldOpen(state, Date.now())) {
+        openCircuit(state);
+        return;
+    }
+    state.attemptTimes = [...pruneAttemptTimes(state, Date.now()), Date.now()];
+    state.backoffIndex += 1;
+    try {
+        await state.reconnect();
+        state.backoffIndex = 0;
+    }
+    catch (error) {
+        const failure = error instanceof Error ? error : new Error(String(error));
+        if (state.connection.state !== "suspended" && state.connection.state !== "needs_auth") {
+            const visibleFailure = isGenericReconnectFailure(failure) && state.connection.lastError !== undefined
+                ? state.connection.lastError
+                : failure;
+            state.connection.markDegraded(visibleFailure);
+            scheduleReconnect(state, state.connection.generation, visibleFailure);
+        }
+        throwIfManual(manual, failure);
+    }
+}
+function isGenericReconnectFailure(error) {
+    return error.message.includes("connect was superseded") || error.message.includes("transport closed");
+}
+function breakerShouldOpen(state, now) {
+    state.attemptTimes = pruneAttemptTimes(state, now);
+    return state.attemptTimes.length >= MCP_RECONNECT_BREAKER_ATTEMPTS;
+}
+function openCircuit(state, cause) {
+    clearReconnectTimer(state);
+    state.connection.markSuspended(new ConnectError(`MCP server ${state.connection.serverName} reconnect circuit breaker opened after ${MCP_RECONNECT_BREAKER_ATTEMPTS} attempts in ${MCP_RECONNECT_BREAKER_WINDOW_MS / 1000}s; run /mcp reconnect ${state.connection.serverName}`, { cause, phase: "reconnect", retriable: false, serverName: state.connection.serverName }));
+}
+function pruneAttemptTimes(state, now) {
+    return state.attemptTimes.filter((attemptAt) => now - attemptAt <= MCP_RECONNECT_BREAKER_WINDOW_MS);
+}
+function clearReconnectTimer(state) {
+    if (state.timer === undefined)
+        return;
+    clearTimeout(state.timer);
+    state.timer = undefined;
+    state.timerGeneration = undefined;
+}
+function clampRandom(random) {
+    if (!Number.isFinite(random))
+        return 1;
+    if (random < 0)
+        return 0;
+    if (random > 1)
+        return 1;
+    return random;
+}
+function throwIfManual(manual, error) {
+    if (manual)
+        throw error;
+}
+//# sourceMappingURL=reconnect.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"reconnect.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/reconnect.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ServerConnection } from \"./connection.ts\";\nimport { ConnectError } from \"./errors.ts\";\nimport type { McpLogger } from \"./log.ts\";\nimport { safeTimer } from \"./wrap.ts\";\n\nexport const MCP_RECONNECT_BACKOFF_MS = [500, 1000, 2000, 4000, 8000] as const;\nexport const MCP_RECONNECT_BREAKER_WINDOW_MS = 30_000;\nexport const MCP_RECONNECT_BREAKER_ATTEMPTS = 5;\n\ninterface McpReconnectOptions {\n\treadonly connection: ServerConnection;\n\treadonly logger: McpLogger;\n\treadonly reconnect: () => Promise<void>;\n\treadonly shouldReconnect?: () => boolean;\n\treadonly random?: () => number;\n}\n\ninterface McpReconnectState {\n\treadonly connection: ServerConnection;\n\treadonly logger: McpLogger;\n\treadonly reconnect: () => Promise<void>;\n\treadonly shouldReconnect: () => boolean;\n\treadonly random: () => number;\n\treadonly unsubscribe: () => void;\n\tattemptTimes: number[];\n\tbackoffIndex: number;\n\tdisposed: boolean;\n\ttimer: NodeJS.Timeout | undefined;\n\ttimerGeneration: number | undefined;\n}\n\nconst reconnectStates = new WeakMap<ServerConnection, McpReconnectState>();\n\nexport function configureMcpReconnect(options: McpReconnectOptions): void {\n\tdisposeMcpReconnect(options.connection);\n\tconst state: McpReconnectState = {\n\t\tattemptTimes: [],\n\t\tbackoffIndex: 0,\n\t\tconnection: options.connection,\n\t\tdisposed: false,\n\t\tlogger: options.logger,\n\t\trandom: options.random ?? Math.random,\n\t\treconnect: options.reconnect,\n\t\tshouldReconnect: options.shouldReconnect ?? (() => true),\n\t\ttimer: undefined,\n\t\ttimerGeneration: undefined,\n\t\tunsubscribe: options.connection.onStateChange((event) => {\n\t\t\tif (event.state === \"degraded\") scheduleReconnect(state, event.generation, event.error);\n\t\t\tif (event.state === \"connected\") state.backoffIndex = 0;\n\t\t}),\n\t};\n\treconnectStates.set(options.connection, state);\n}\n\nexport function disposeMcpReconnect(connection: ServerConnection): void {\n\tconst state = reconnectStates.get(connection);\n\tif (state === undefined) return;\n\treconnectStates.delete(connection);\n\tstate.disposed = true;\n\tclearReconnectTimer(state);\n\tstate.unsubscribe();\n}\n\nexport async function reconnectMcpNow(connection: ServerConnection): Promise<void> {\n\tconst state = reconnectStates.get(connection);\n\tif (state === undefined) {\n\t\tawait connection.renew();\n\t\treturn;\n\t}\n\tclearReconnectTimer(state);\n\tstate.attemptTimes = [];\n\tstate.backoffIndex = 0;\n\tawait runReconnectAttempt(state, connection.generation, true);\n}\n\nexport function getMcpReconnectDebugSnapshot(connection: ServerConnection): {\n\tattemptsInWindow: number;\n\ttimerHasRef: boolean | null;\n} {\n\tconst state = reconnectStates.get(connection);\n\tif (state === undefined) return { attemptsInWindow: 0, timerHasRef: null };\n\treturn {\n\t\tattemptsInWindow: pruneAttemptTimes(state, Date.now()).length,\n\t\ttimerHasRef: state.timer?.hasRef() ?? null,\n\t};\n}\n\nfunction scheduleReconnect(state: McpReconnectState, generation: number, cause: Error | undefined): void {\n\tif (state.disposed || state.timer !== undefined || !state.shouldReconnect()) return;\n\tif (state.connection.state === \"disabled\" || state.connection.state === \"suspended\") return;\n\tif (breakerShouldOpen(state, Date.now())) {\n\t\topenCircuit(state, cause);\n\t\treturn;\n\t}\n\tconst baseDelayMs = MCP_RECONNECT_BACKOFF_MS[Math.min(state.backoffIndex, MCP_RECONNECT_BACKOFF_MS.length - 1)];\n\tconst delayMs = Math.max(0, Math.floor(baseDelayMs * clampRandom(state.random())));\n\tstate.timerGeneration = generation;\n\tstate.timer = safeTimer(\n\t\t`mcp.${state.connection.serverName}.reconnect`,\n\t\tdelayMs,\n\t\tasync () => {\n\t\t\tstate.timer = undefined;\n\t\t\tconst timerGeneration = state.timerGeneration;\n\t\t\tstate.timerGeneration = undefined;\n\t\t\tif (timerGeneration === undefined) return;\n\t\t\tawait runReconnectAttempt(state, timerGeneration, false);\n\t\t},\n\t\t{ logger: state.logger },\n\t);\n}\n\nasync function runReconnectAttempt(state: McpReconnectState, generation: number, manual: boolean): Promise<void> {\n\tif (state.disposed || !state.shouldReconnect()) return;\n\tif (!manual && generation !== state.connection.generation) return;\n\tif (state.connection.state === \"disabled\") return;\n\tif (!manual && breakerShouldOpen(state, Date.now())) {\n\t\topenCircuit(state);\n\t\treturn;\n\t}\n\tstate.attemptTimes = [...pruneAttemptTimes(state, Date.now()), Date.now()];\n\tstate.backoffIndex += 1;\n\ttry {\n\t\tawait state.reconnect();\n\t\tstate.backoffIndex = 0;\n\t} catch (error) {\n\t\tconst failure = error instanceof Error ? error : new Error(String(error));\n\t\tif (state.connection.state !== \"suspended\" && state.connection.state !== \"needs_auth\") {\n\t\t\tconst visibleFailure =\n\t\t\t\tisGenericReconnectFailure(failure) && state.connection.lastError !== undefined\n\t\t\t\t\t? state.connection.lastError\n\t\t\t\t\t: failure;\n\t\t\tstate.connection.markDegraded(visibleFailure);\n\t\t\tscheduleReconnect(state, state.connection.generation, visibleFailure);\n\t\t}\n\t\tthrowIfManual(manual, failure);\n\t}\n}\n\nfunction isGenericReconnectFailure(error: Error): boolean {\n\treturn error.message.includes(\"connect was superseded\") || error.message.includes(\"transport closed\");\n}\n\nfunction breakerShouldOpen(state: McpReconnectState, now: number): boolean {\n\tstate.attemptTimes = pruneAttemptTimes(state, now);\n\treturn state.attemptTimes.length >= MCP_RECONNECT_BREAKER_ATTEMPTS;\n}\n\nfunction openCircuit(state: McpReconnectState, cause?: Error): void {\n\tclearReconnectTimer(state);\n\tstate.connection.markSuspended(\n\t\tnew ConnectError(\n\t\t\t`MCP server ${state.connection.serverName} reconnect circuit breaker opened after ${MCP_RECONNECT_BREAKER_ATTEMPTS} attempts in ${MCP_RECONNECT_BREAKER_WINDOW_MS / 1000}s; run /mcp reconnect ${state.connection.serverName}`,\n\t\t\t{ cause, phase: \"reconnect\", retriable: false, serverName: state.connection.serverName },\n\t\t),\n\t);\n}\n\nfunction pruneAttemptTimes(state: McpReconnectState, now: number): number[] {\n\treturn state.attemptTimes.filter((attemptAt) => now - attemptAt <= MCP_RECONNECT_BREAKER_WINDOW_MS);\n}\n\nfunction clearReconnectTimer(state: McpReconnectState): void {\n\tif (state.timer === undefined) return;\n\tclearTimeout(state.timer);\n\tstate.timer = undefined;\n\tstate.timerGeneration = undefined;\n}\n\nfunction clampRandom(random: number): number {\n\tif (!Number.isFinite(random)) return 1;\n\tif (random < 0) return 0;\n\tif (random > 1) return 1;\n\treturn random;\n}\n\nfunction throwIfManual(manual: boolean, error: Error): void {\n\tif (manual) throw error;\n}\n"]}

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

@@ -0,0 +1,42 @@
+import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { Type } from "typebox";
+import type { ToolDefinition } from "../../types.ts";
+import type { McpCachedServerCatalog } from "./catalog-cache.ts";
+import type { ServerConnection } from "./connection.ts";
+import type { McpToolDetails } from "./expose/register.ts";
+import { applyMcpOutputGuard } from "./guard/output-guard.ts";
+export interface McpResourceServer {
+    readonly server: string;
+    readonly connection: ServerConnection;
+    readonly agentDir?: string;
+    readonly outputGuard?: Parameters<typeof applyMcpOutputGuard>[1]["outputGuard"];
+    readonly requestTimeoutMs?: number;
+    readonly resources: NonNullable<McpCachedServerCatalog["resources"]>;
+}
+/** Route resource updated notifications into the shared refresh path. */
+export declare function subscribeMcpResourceUpdated(client: Client, onChange: () => void): void;
+/** Best-effort per-resource subscriptions when the server declares support. */
+export declare function ensureMcpResourceSubscriptions(client: Client, resources: ReadonlyArray<{
+    uri: string;
+}>): Promise<void>;
+/** Read one resource and flatten its contents to guarded text. */
+export declare function readMcpResourceAsText(server: McpResourceServer, uri: string): Promise<string>;
+declare const ListParams: Type.TObject<{
+    server: Type.TOptional<Type.TString>;
+}>;
+declare const ReadParams: Type.TObject<{
+    server: Type.TString;
+    uri: Type.TString;
+}>;
+type McpUtilityTool = ToolDefinition<typeof ListParams | typeof ReadParams, McpToolDetails | undefined, unknown>;
+/** The two model-facing utility tools. Register only when servers() is non-empty. */
+export declare function createMcpResourceTools(servers: () => readonly McpResourceServer[]): McpUtilityTool[];
+export interface McpMentionExpansion {
+    readonly text: string;
+    readonly changed: boolean;
+    readonly notices: string[];
+}
+/** Expand `@mcp:<server>/<uri>` mentions; failures leave the mention intact. */
+export declare function expandMcpResourceMentions(text: string, servers: () => readonly McpResourceServer[]): Promise<McpMentionExpansion>;
+export {};
+//# sourceMappingURL=resources.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/resources.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAExE,OAAO,EAAe,IAAI,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IACtC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;IAChF,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC,CAAC;CACrE;AAED,yEAAyE;AACzE,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAItF;AAED,+EAA+E;AAC/E,wBAAsB,8BAA8B,CACnD,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,aAAa,CAAC;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,GACvC,OAAO,CAAC,IAAI,CAAC,CAKf;AAED,kEAAkE;AAClE,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAyBnG;AAED,QAAA,MAAM,UAAU;;EAEd,CAAC;AACH,QAAA,MAAM,UAAU;;;EAGd,CAAC;AAEH,KAAK,cAAc,GAAG,cAAc,CAAC,OAAO,UAAU,GAAG,OAAO,UAAU,EAAE,cAAc,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;AAEjH,qFAAqF;AACrF,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,SAAS,iBAAiB,EAAE,GAAG,cAAc,EAAE,CAsDpG;AAID,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,gFAAgF;AAChF,wBAAsB,yBAAyB,CAC9C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,SAAS,iBAAiB,EAAE,GACzC,OAAO,CAAC,mBAAmB,CAAC,CAuB9B"}