@code-yeongyu/senpi 2026.7.4 → 2026.7.9-2

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

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

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

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

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

@@ -0,0 +1,4 @@
+import type { McpService } from "./service.ts";
+export declare function refreshMcpInstructionsForSession(service: McpService): void;
+export declare function injectMcpInstructions(systemPrompt: string): string | undefined;
+//# sourceMappingURL=instructions.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/instructions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAM/C,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CAE1E;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAI9E"}

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

@@ -0,0 +1,40 @@
+const MAX_INSTRUCTIONS_CHARS = 4000;
+let sessionInstructionsBlock = "";
+export function refreshMcpInstructionsForSession(service) {
+    sessionInstructionsBlock = buildMcpInstructionsBlock(service);
+}
+export function injectMcpInstructions(systemPrompt) {
+    if (sessionInstructionsBlock.length === 0)
+        return undefined;
+    if (systemPrompt.includes(sessionInstructionsBlock))
+        return undefined;
+    return `${systemPrompt}\n\n${sessionInstructionsBlock}`;
+}
+function buildMcpInstructionsBlock(service) {
+    const blocks = [];
+    for (const snapshot of service.getServerSnapshots()) {
+        const connection = service.getConnection(snapshot.name);
+        const instructions = connection?.state === "connected"
+            ? connection.client.getInstructions()
+            : service.getCachedInstructions(snapshot.name);
+        if (instructions === undefined || instructions.length === 0)
+            continue;
+        blocks.push(formatInstructionsBlock(snapshot.name, instructions));
+    }
+    return blocks.join("\n\n");
+}
+function formatInstructionsBlock(serverName, instructions) {
+    const escapedServerName = escapeXml(serverName);
+    const cappedInstructions = instructions.slice(0, MAX_INSTRUCTIONS_CHARS);
+    const escapedInstructions = escapeXml(cappedInstructions);
+    return `<mcp_instructions server="${escapedServerName}">\n${escapedInstructions}\n</mcp_instructions>`;
+}
+function escapeXml(value) {
+    return value
+        .replace(/&/g, "&amp;")
+        .replace(/</g, "&lt;")
+        .replace(/>/g, "&gt;")
+        .replace(/"/g, "&quot;")
+        .replace(/'/g, "&apos;");
+}
+//# sourceMappingURL=instructions.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"instructions.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/instructions.ts"],"names":[],"mappings":"AAEA,MAAM,sBAAsB,GAAG,IAAI,CAAC;AAEpC,IAAI,wBAAwB,GAAG,EAAE,CAAC;AAElC,MAAM,UAAU,gCAAgC,CAAC,OAAmB;IACnE,wBAAwB,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,YAAoB;IACzD,IAAI,wBAAwB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5D,IAAI,YAAY,CAAC,QAAQ,CAAC,wBAAwB,CAAC;QAAE,OAAO,SAAS,CAAC;IACtE,OAAO,GAAG,YAAY,OAAO,wBAAwB,EAAE,CAAC;AACzD,CAAC;AAED,SAAS,yBAAyB,CAAC,OAAmB;IACrD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;QACrD,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,YAAY,GACjB,UAAU,EAAE,KAAK,KAAK,WAAW;YAChC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,EAAE;YACrC,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QACtE,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,uBAAuB,CAAC,UAAkB,EAAE,YAAoB;IACxE,MAAM,iBAAiB,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,kBAAkB,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,sBAAsB,CAAC,CAAC;IACzE,MAAM,mBAAmB,GAAG,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAC1D,OAAO,6BAA6B,iBAAiB,OAAO,mBAAmB,uBAAuB,CAAC;AACxG,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC/B,OAAO,KAAK;SACV,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;SACtB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC;SACvB,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAC3B,CAAC","sourcesContent":["import type { McpService } from \"./service.ts\";\n\nconst MAX_INSTRUCTIONS_CHARS = 4000;\n\nlet sessionInstructionsBlock = \"\";\n\nexport function refreshMcpInstructionsForSession(service: McpService): void {\n\tsessionInstructionsBlock = buildMcpInstructionsBlock(service);\n}\n\nexport function injectMcpInstructions(systemPrompt: string): string | undefined {\n\tif (sessionInstructionsBlock.length === 0) return undefined;\n\tif (systemPrompt.includes(sessionInstructionsBlock)) return undefined;\n\treturn `${systemPrompt}\\n\\n${sessionInstructionsBlock}`;\n}\n\nfunction buildMcpInstructionsBlock(service: McpService): string {\n\tconst blocks: string[] = [];\n\tfor (const snapshot of service.getServerSnapshots()) {\n\t\tconst connection = service.getConnection(snapshot.name);\n\t\tconst instructions =\n\t\t\tconnection?.state === \"connected\"\n\t\t\t\t? connection.client.getInstructions()\n\t\t\t\t: service.getCachedInstructions(snapshot.name);\n\t\tif (instructions === undefined || instructions.length === 0) continue;\n\t\tblocks.push(formatInstructionsBlock(snapshot.name, instructions));\n\t}\n\treturn blocks.join(\"\\n\\n\");\n}\n\nfunction formatInstructionsBlock(serverName: string, instructions: string): string {\n\tconst escapedServerName = escapeXml(serverName);\n\tconst cappedInstructions = instructions.slice(0, MAX_INSTRUCTIONS_CHARS);\n\tconst escapedInstructions = escapeXml(cappedInstructions);\n\treturn `<mcp_instructions server=\"${escapedServerName}\">\\n${escapedInstructions}\\n</mcp_instructions>`;\n}\n\nfunction escapeXml(value: string): string {\n\treturn value\n\t\t.replace(/&/g, \"&amp;\")\n\t\t.replace(/</g, \"&lt;\")\n\t\t.replace(/>/g, \"&gt;\")\n\t\t.replace(/\"/g, \"&quot;\")\n\t\t.replace(/'/g, \"&apos;\");\n}\n"]}

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

@@ -0,0 +1,26 @@
+export type McpLogLevel = "debug" | "info" | "notice" | "warning" | "error" | "critical" | "alert" | "emergency";
+export type McpLogChannel = "client" | "server" | "stderr" | "file";
+export interface McpLogLevelMapping {
+    level: McpLogLevel;
+    severity: number;
+}
+export interface McpLogger {
+    readonly filePath: string;
+    debug(message: string, data?: unknown): void;
+    info(message: string, data?: unknown): void;
+    warn(message: string, data?: unknown): void;
+    error(message: string, data?: unknown): void;
+    stderr(message: string, data?: unknown): void;
+    log(level: string, message: string, data?: unknown, channel?: McpLogChannel): void;
+    getRingBuffer(): string[];
+}
+export interface McpLoggerOptions {
+    logDir?: string;
+    maxFileBytes?: number;
+}
+export declare function createMcpLogger(server: string, options?: McpLoggerOptions): McpLogger;
+export declare function getMcpLogDir(): string;
+export declare function fingerprintSecret(secret: string): string;
+export declare function redactMcpLogText(text: string): string;
+export declare function mapMcpLogLevel(level: string): McpLogLevelMapping;
+//# sourceMappingURL=log.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/log.ts"],"names":[],"mappings":"AAeA,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,WAAW,CAAC;AACjH,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEpE,MAAM,WAAW,kBAAkB;IAClC,KAAK,EAAE,WAAW,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC7C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC5C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC5C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC7C,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC9C,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACnF,aAAa,IAAI,MAAM,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACtB;AAiCD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,SAAS,CAEzF;AAED,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAErD;AAuBD,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,kBAAkB,CAEhE"}

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

@@ -0,0 +1,213 @@
+import { createHash } from "node:crypto";
+import { chmodSync, closeSync, existsSync, mkdirSync, openSync, renameSync, rmSync, statSync, writeSync, } from "node:fs";
+import { dirname, join } from "node:path";
+import { getAgentDir } from "../../../../config.js";
+const DEFAULT_MAX_FILE_BYTES = 1024 * 1024;
+const MAX_RING_LINES = 200;
+const SENSITIVE_KEY_PATTERN = /(?:^|[_-])(?:api[_-]?key|key|token|secret|password|client_secret|auth|authorization)(?:$|[_-])/i;
+const QUERY_SECRET_PATTERN = /([?&][^=\s&"'<>]*(?:key|token|secret|password|client_secret|auth)[^=\s&"'<>]*=)([^&\s"'<>]+)/gi;
+const AUTHORIZATION_VALUE_PATTERN = /((?:"|')?\bAuthorization(?:"|')?\s*[:=]\s*(?:"|')?(?:[A-Za-z][A-Za-z0-9+.-]*\s+)?)(?!<redacted:)([^"',\s}\]&]+)/gi;
+const BEARER_VALUE_PATTERN = /(\bBearer\s+)(?!<redacted:)([A-Za-z0-9._~+/=-]+)/gi;
+const KEY_VALUE_PATTERN = /((?:"|')?[^"'\s:=,{}]*(?:api[_-]?key|key|token|secret|password|client_secret|auth)[^"'\s:=,{}]*(?:"|')?\s*[:=]\s*(?:"|')?)([^"',\s}\]&]+)/gi;
+const MCP_LOG_LEVELS = {
+    emergency: { level: "emergency", severity: 0 },
+    alert: { level: "alert", severity: 1 },
+    critical: { level: "critical", severity: 2 },
+    crit: { level: "critical", severity: 2 },
+    error: { level: "error", severity: 3 },
+    err: { level: "error", severity: 3 },
+    warning: { level: "warning", severity: 4 },
+    warn: { level: "warning", severity: 4 },
+    notice: { level: "notice", severity: 5 },
+    informational: { level: "info", severity: 6 },
+    info: { level: "info", severity: 6 },
+    debug: { level: "debug", severity: 7 },
+};
+export function createMcpLogger(server, options = {}) {
+    return new FileMcpLogger(server, options);
+}
+export function getMcpLogDir() {
+    return join(getAgentDir(), "logs", "mcp");
+}
+export function fingerprintSecret(secret) {
+    return createHash("sha256").update(secret).digest("hex").slice(0, 8);
+}
+export function redactMcpLogText(text) {
+    return redactMcpLogTextWithContext(text, { seen: new WeakSet(), secrets: new Set() });
+}
+function redactMcpLogTextWithContext(text, context) {
+    return text
+        .replace(AUTHORIZATION_VALUE_PATTERN, (_match, prefix, secret) => `${prefix}${redactionForSecret(secret, context)}`)
+        .replace(BEARER_VALUE_PATTERN, (_match, prefix, secret) => `${prefix}${redactionForSecret(secret, context)}`)
+        .replace(QUERY_SECRET_PATTERN, (_match, prefix, secret) => `${prefix}${redactionForSecret(secret, context)}`)
+        .replace(KEY_VALUE_PATTERN, (match, prefix, secret) => secret.startsWith("<redacted:") || /\bAuthorization\b/i.test(prefix)
+        ? match
+        : `${prefix}${redactionForSecret(secret, context)}`);
+}
+export function mapMcpLogLevel(level) {
+    return { ...(MCP_LOG_LEVELS[level] ?? MCP_LOG_LEVELS.info) };
+}
+class FileMcpLogger {
+    #server;
+    #maxFileBytes;
+    #ring = [];
+    #fileSinkDisabled = false;
+    constructor(server, options) {
+        this.#server = server;
+        this.#maxFileBytes = options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES;
+        this.filePath = join(options.logDir ?? getMcpLogDir(), `${sanitizeServerName(server)}.log`);
+    }
+    debug(message, data) {
+        this.log("debug", message, data);
+    }
+    info(message, data) {
+        this.log("info", message, data);
+    }
+    warn(message, data) {
+        this.log("warning", message, data);
+    }
+    error(message, data) {
+        this.log("error", message, data);
+    }
+    stderr(message, data) {
+        this.log("info", message, data, "stderr");
+    }
+    log(level, message, data, channel = "server") {
+        const line = this.#formatLine(level, message, data, channel);
+        this.#pushRing(line);
+        this.#writeFile(line);
+    }
+    getRingBuffer() {
+        return [...this.#ring];
+    }
+    #formatLine(level, message, data, channel) {
+        const context = { seen: new WeakSet(), secrets: new Set() };
+        const mapped = mapMcpLogLevel(level);
+        const redactedData = data === undefined ? undefined : redactMcpLogData(data, context);
+        const entry = {
+            timestamp: new Date().toISOString(),
+            server: this.#server,
+            level: mapped.level,
+            severity: mapped.severity,
+            channel,
+            message: redactMcpLogTextWithContext(message, context),
+            data: redactedData,
+        };
+        return redactKnownSecrets(JSON.stringify(entry), context);
+    }
+    #pushRing(line) {
+        this.#ring.push(line);
+        if (this.#ring.length > MAX_RING_LINES) {
+            this.#ring.splice(0, this.#ring.length - MAX_RING_LINES);
+        }
+    }
+    #writeFile(line) {
+        if (this.#fileSinkDisabled)
+            return;
+        try {
+            mkdirSync(dirname(this.filePath), { recursive: true, mode: 0o700 });
+            const bytes = Buffer.byteLength(`${line}\n`);
+            this.#rotateIfNeeded(bytes);
+            const fd = openSync(this.filePath, "a", 0o600);
+            try {
+                writeSync(fd, `${line}\n`);
+            }
+            finally {
+                closeSync(fd);
+            }
+            chmodSync(this.filePath, 0o600);
+        }
+        catch {
+            this.#fileSinkDisabled = true;
+            this.#pushRing(this.#formatLine("warning", "file sink disabled after write failure", undefined, "file"));
+        }
+    }
+    #rotateIfNeeded(incomingBytes) {
+        if (this.#maxFileBytes <= 0 || !existsSync(this.filePath))
+            return;
+        if (statSync(this.filePath).size + incomingBytes <= this.#maxFileBytes)
+            return;
+        try {
+            rmSync(`${this.filePath}.1`, { force: true });
+            renameSync(this.filePath, `${this.filePath}.1`);
+            chmodSync(`${this.filePath}.1`, 0o600);
+        }
+        catch {
+            throw new Error("log rotation failed");
+        }
+    }
+}
+function redactMcpLogData(value, context) {
+    if (typeof value === "string")
+        return redactMcpLogTextWithContext(value, context);
+    if (typeof value === "bigint")
+        return value.toString();
+    if (typeof value !== "object" || value === null)
+        return value;
+    if (context.seen.has(value))
+        return "[Circular]";
+    context.seen.add(value);
+    if (value instanceof Error)
+        return redactMcpLogError(value, context);
+    if (Array.isArray(value))
+        return value.map((item) => redactMcpLogData(item, context));
+    return redactMcpLogEntries(value, context);
+}
+function redactMcpLogError(error, context) {
+    const redacted = redactMcpLogEntries(error, context);
+    redacted.name = redactMcpLogTextWithContext(error.name, context);
+    redacted.message = redactKnownSecrets(redactMcpLogTextWithContext(error.message, context), context);
+    if (error.stack !== undefined) {
+        redacted.stack = redactKnownSecrets(redactMcpLogTextWithContext(error.stack, context), context);
+    }
+    return redacted;
+}
+function redactMcpLogEntries(value, context) {
+    const redacted = {};
+    for (const [key, item] of Object.entries(value)) {
+        if (SENSITIVE_KEY_PATTERN.test(key)) {
+            redacted[key] = redactionForSecret(stringifySecretValue(item), context);
+        }
+        else {
+            redacted[key] = redactMcpLogData(item, context);
+        }
+    }
+    return redacted;
+}
+function stringifySecretValue(value) {
+    if (typeof value === "string")
+        return value;
+    if (typeof value === "number" || typeof value === "boolean" || typeof value === "bigint")
+        return String(value);
+    const seen = new WeakSet();
+    const json = JSON.stringify(value, (_key, item) => {
+        if (typeof item === "bigint")
+            return item.toString();
+        if (typeof item !== "object" || item === null)
+            return item;
+        if (seen.has(item))
+            return "[Circular]";
+        seen.add(item);
+        return item;
+    });
+    return json ?? String(value);
+}
+function redactionForSecret(secret, context) {
+    if (secret.length > 0 && !secret.startsWith("<redacted:")) {
+        context.secrets.add(secret);
+    }
+    return redactionFor(secret);
+}
+function redactKnownSecrets(text, context) {
+    for (const secret of [...context.secrets].sort((left, right) => right.length - left.length)) {
+        text = text.split(secret).join(redactionFor(secret));
+    }
+    return text;
+}
+function redactionFor(secret) {
+    return `<redacted:${fingerprintSecret(secret)}>`;
+}
+function sanitizeServerName(server) {
+    return server.replace(/[^A-Za-z0-9._-]+/g, "_") || "server";
+}
+//# sourceMappingURL=log.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/log.ts"],"names":[],"mappings":"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","sourcesContent":["import { createHash } from \"node:crypto\";\nimport {\n\tchmodSync,\n\tcloseSync,\n\texistsSync,\n\tmkdirSync,\n\topenSync,\n\trenameSync,\n\trmSync,\n\tstatSync,\n\twriteSync,\n} from \"node:fs\";\nimport { dirname, join } from \"node:path\";\nimport { getAgentDir } from \"../../../../config.ts\";\n\nexport type McpLogLevel = \"debug\" | \"info\" | \"notice\" | \"warning\" | \"error\" | \"critical\" | \"alert\" | \"emergency\";\nexport type McpLogChannel = \"client\" | \"server\" | \"stderr\" | \"file\";\n\nexport interface McpLogLevelMapping {\n\tlevel: McpLogLevel;\n\tseverity: number;\n}\n\nexport interface McpLogger {\n\treadonly filePath: string;\n\tdebug(message: string, data?: unknown): void;\n\tinfo(message: string, data?: unknown): void;\n\twarn(message: string, data?: unknown): void;\n\terror(message: string, data?: unknown): void;\n\tstderr(message: string, data?: unknown): void;\n\tlog(level: string, message: string, data?: unknown, channel?: McpLogChannel): void;\n\tgetRingBuffer(): string[];\n}\n\nexport interface McpLoggerOptions {\n\tlogDir?: string;\n\tmaxFileBytes?: number;\n}\n\ninterface RedactionContext {\n\treadonly seen: WeakSet<object>;\n\treadonly secrets: Set<string>;\n}\n\nconst DEFAULT_MAX_FILE_BYTES = 1024 * 1024;\nconst MAX_RING_LINES = 200;\nconst SENSITIVE_KEY_PATTERN =\n\t/(?:^|[_-])(?:api[_-]?key|key|token|secret|password|client_secret|auth|authorization)(?:$|[_-])/i;\nconst QUERY_SECRET_PATTERN =\n\t/([?&][^=\\s&\"'<>]*(?:key|token|secret|password|client_secret|auth)[^=\\s&\"'<>]*=)([^&\\s\"'<>]+)/gi;\nconst AUTHORIZATION_VALUE_PATTERN =\n\t/((?:\"|')?\\bAuthorization(?:\"|')?\\s*[:=]\\s*(?:\"|')?(?:[A-Za-z][A-Za-z0-9+.-]*\\s+)?)(?!<redacted:)([^\"',\\s}\\]&]+)/gi;\nconst BEARER_VALUE_PATTERN = /(\\bBearer\\s+)(?!<redacted:)([A-Za-z0-9._~+/=-]+)/gi;\nconst KEY_VALUE_PATTERN =\n\t/((?:\"|')?[^\"'\\s:=,{}]*(?:api[_-]?key|key|token|secret|password|client_secret|auth)[^\"'\\s:=,{}]*(?:\"|')?\\s*[:=]\\s*(?:\"|')?)([^\"',\\s}\\]&]+)/gi;\nconst MCP_LOG_LEVELS: Record<string, McpLogLevelMapping> = {\n\temergency: { level: \"emergency\", severity: 0 },\n\talert: { level: \"alert\", severity: 1 },\n\tcritical: { level: \"critical\", severity: 2 },\n\tcrit: { level: \"critical\", severity: 2 },\n\terror: { level: \"error\", severity: 3 },\n\terr: { level: \"error\", severity: 3 },\n\twarning: { level: \"warning\", severity: 4 },\n\twarn: { level: \"warning\", severity: 4 },\n\tnotice: { level: \"notice\", severity: 5 },\n\tinformational: { level: \"info\", severity: 6 },\n\tinfo: { level: \"info\", severity: 6 },\n\tdebug: { level: \"debug\", severity: 7 },\n};\n\nexport function createMcpLogger(server: string, options: McpLoggerOptions = {}): McpLogger {\n\treturn new FileMcpLogger(server, options);\n}\n\nexport function getMcpLogDir(): string {\n\treturn join(getAgentDir(), \"logs\", \"mcp\");\n}\n\nexport function fingerprintSecret(secret: string): string {\n\treturn createHash(\"sha256\").update(secret).digest(\"hex\").slice(0, 8);\n}\n\nexport function redactMcpLogText(text: string): string {\n\treturn redactMcpLogTextWithContext(text, { seen: new WeakSet<object>(), secrets: new Set<string>() });\n}\n\nfunction redactMcpLogTextWithContext(text: string, context: RedactionContext): string {\n\treturn text\n\t\t.replace(\n\t\t\tAUTHORIZATION_VALUE_PATTERN,\n\t\t\t(_match, prefix: string, secret: string) => `${prefix}${redactionForSecret(secret, context)}`,\n\t\t)\n\t\t.replace(\n\t\t\tBEARER_VALUE_PATTERN,\n\t\t\t(_match, prefix: string, secret: string) => `${prefix}${redactionForSecret(secret, context)}`,\n\t\t)\n\t\t.replace(\n\t\t\tQUERY_SECRET_PATTERN,\n\t\t\t(_match, prefix: string, secret: string) => `${prefix}${redactionForSecret(secret, context)}`,\n\t\t)\n\t\t.replace(KEY_VALUE_PATTERN, (match: string, prefix: string, secret: string) =>\n\t\t\tsecret.startsWith(\"<redacted:\") || /\\bAuthorization\\b/i.test(prefix)\n\t\t\t\t? match\n\t\t\t\t: `${prefix}${redactionForSecret(secret, context)}`,\n\t\t);\n}\n\nexport function mapMcpLogLevel(level: string): McpLogLevelMapping {\n\treturn { ...(MCP_LOG_LEVELS[level] ?? MCP_LOG_LEVELS.info) };\n}\n\nclass FileMcpLogger implements McpLogger {\n\treadonly filePath: string;\n\treadonly #server: string;\n\treadonly #maxFileBytes: number;\n\treadonly #ring: string[] = [];\n\t#fileSinkDisabled = false;\n\n\tconstructor(server: string, options: McpLoggerOptions) {\n\t\tthis.#server = server;\n\t\tthis.#maxFileBytes = options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES;\n\t\tthis.filePath = join(options.logDir ?? getMcpLogDir(), `${sanitizeServerName(server)}.log`);\n\t}\n\n\tdebug(message: string, data?: unknown): void {\n\t\tthis.log(\"debug\", message, data);\n\t}\n\n\tinfo(message: string, data?: unknown): void {\n\t\tthis.log(\"info\", message, data);\n\t}\n\n\twarn(message: string, data?: unknown): void {\n\t\tthis.log(\"warning\", message, data);\n\t}\n\n\terror(message: string, data?: unknown): void {\n\t\tthis.log(\"error\", message, data);\n\t}\n\n\tstderr(message: string, data?: unknown): void {\n\t\tthis.log(\"info\", message, data, \"stderr\");\n\t}\n\n\tlog(level: string, message: string, data?: unknown, channel: McpLogChannel = \"server\"): void {\n\t\tconst line = this.#formatLine(level, message, data, channel);\n\t\tthis.#pushRing(line);\n\t\tthis.#writeFile(line);\n\t}\n\n\tgetRingBuffer(): string[] {\n\t\treturn [...this.#ring];\n\t}\n\n\t#formatLine(level: string, message: string, data: unknown, channel: McpLogChannel): string {\n\t\tconst context: RedactionContext = { seen: new WeakSet<object>(), secrets: new Set<string>() };\n\t\tconst mapped = mapMcpLogLevel(level);\n\t\tconst redactedData = data === undefined ? undefined : redactMcpLogData(data, context);\n\t\tconst entry = {\n\t\t\ttimestamp: new Date().toISOString(),\n\t\t\tserver: this.#server,\n\t\t\tlevel: mapped.level,\n\t\t\tseverity: mapped.severity,\n\t\t\tchannel,\n\t\t\tmessage: redactMcpLogTextWithContext(message, context),\n\t\t\tdata: redactedData,\n\t\t};\n\t\treturn redactKnownSecrets(JSON.stringify(entry), context);\n\t}\n\n\t#pushRing(line: string): void {\n\t\tthis.#ring.push(line);\n\t\tif (this.#ring.length > MAX_RING_LINES) {\n\t\t\tthis.#ring.splice(0, this.#ring.length - MAX_RING_LINES);\n\t\t}\n\t}\n\n\t#writeFile(line: string): void {\n\t\tif (this.#fileSinkDisabled) return;\n\t\ttry {\n\t\t\tmkdirSync(dirname(this.filePath), { recursive: true, mode: 0o700 });\n\t\t\tconst bytes = Buffer.byteLength(`${line}\\n`);\n\t\t\tthis.#rotateIfNeeded(bytes);\n\t\t\tconst fd = openSync(this.filePath, \"a\", 0o600);\n\t\t\ttry {\n\t\t\t\twriteSync(fd, `${line}\\n`);\n\t\t\t} finally {\n\t\t\t\tcloseSync(fd);\n\t\t\t}\n\t\t\tchmodSync(this.filePath, 0o600);\n\t\t} catch {\n\t\t\tthis.#fileSinkDisabled = true;\n\t\t\tthis.#pushRing(this.#formatLine(\"warning\", \"file sink disabled after write failure\", undefined, \"file\"));\n\t\t}\n\t}\n\n\t#rotateIfNeeded(incomingBytes: number): void {\n\t\tif (this.#maxFileBytes <= 0 || !existsSync(this.filePath)) return;\n\t\tif (statSync(this.filePath).size + incomingBytes <= this.#maxFileBytes) return;\n\t\ttry {\n\t\t\trmSync(`${this.filePath}.1`, { force: true });\n\t\t\trenameSync(this.filePath, `${this.filePath}.1`);\n\t\t\tchmodSync(`${this.filePath}.1`, 0o600);\n\t\t} catch {\n\t\t\tthrow new Error(\"log rotation failed\");\n\t\t}\n\t}\n}\n\nfunction redactMcpLogData(value: unknown, context: RedactionContext): unknown {\n\tif (typeof value === \"string\") return redactMcpLogTextWithContext(value, context);\n\tif (typeof value === \"bigint\") return value.toString();\n\tif (typeof value !== \"object\" || value === null) return value;\n\tif (context.seen.has(value)) return \"[Circular]\";\n\tcontext.seen.add(value);\n\tif (value instanceof Error) return redactMcpLogError(value, context);\n\tif (Array.isArray(value)) return value.map((item) => redactMcpLogData(item, context));\n\treturn redactMcpLogEntries(value, context);\n}\n\nfunction redactMcpLogError(error: Error, context: RedactionContext): Record<string, unknown> {\n\tconst redacted = redactMcpLogEntries(error, context);\n\tredacted.name = redactMcpLogTextWithContext(error.name, context);\n\tredacted.message = redactKnownSecrets(redactMcpLogTextWithContext(error.message, context), context);\n\tif (error.stack !== undefined) {\n\t\tredacted.stack = redactKnownSecrets(redactMcpLogTextWithContext(error.stack, context), context);\n\t}\n\treturn redacted;\n}\n\nfunction redactMcpLogEntries(value: object, context: RedactionContext): Record<string, unknown> {\n\tconst redacted: Record<string, unknown> = {};\n\tfor (const [key, item] of Object.entries(value)) {\n\t\tif (SENSITIVE_KEY_PATTERN.test(key)) {\n\t\t\tredacted[key] = redactionForSecret(stringifySecretValue(item), context);\n\t\t} else {\n\t\t\tredacted[key] = redactMcpLogData(item, context);\n\t\t}\n\t}\n\treturn redacted;\n}\n\nfunction stringifySecretValue(value: unknown): string {\n\tif (typeof value === \"string\") return value;\n\tif (typeof value === \"number\" || typeof value === \"boolean\" || typeof value === \"bigint\") return String(value);\n\tconst seen = new WeakSet<object>();\n\tconst json = JSON.stringify(value, (_key: string, item: unknown) => {\n\t\tif (typeof item === \"bigint\") return item.toString();\n\t\tif (typeof item !== \"object\" || item === null) return item;\n\t\tif (seen.has(item)) return \"[Circular]\";\n\t\tseen.add(item);\n\t\treturn item;\n\t});\n\treturn json ?? String(value);\n}\n\nfunction redactionForSecret(secret: string, context: RedactionContext): string {\n\tif (secret.length > 0 && !secret.startsWith(\"<redacted:\")) {\n\t\tcontext.secrets.add(secret);\n\t}\n\treturn redactionFor(secret);\n}\n\nfunction redactKnownSecrets(text: string, context: RedactionContext): string {\n\tfor (const secret of [...context.secrets].sort((left, right) => right.length - left.length)) {\n\t\ttext = text.split(secret).join(redactionFor(secret));\n\t}\n\treturn text;\n}\n\nfunction redactionFor(secret: string): string {\n\treturn `<redacted:${fingerprintSecret(secret)}>`;\n}\n\nfunction sanitizeServerName(server: string): string {\n\treturn server.replace(/[^A-Za-z0-9._-]+/g, \"_\") || \"server\";\n}\n"]}

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

@@ -0,0 +1,13 @@
+import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import type { McpLogger } from "./log.ts";
+export declare const MCP_LOG_RATE_LIMIT_PER_SECOND = 10;
+export interface McpLoggingOptions {
+    readonly logger: McpLogger;
+    /** Minimum level to record (server config `logLevel`); default records all. */
+    readonly logLevel?: string;
+    readonly ratePerSecond?: number;
+    /** Test seam for deterministic bucket refill. */
+    readonly now?: () => number;
+}
+export declare function subscribeMcpServerLogging(client: Client, options: McpLoggingOptions): void;
+//# sourceMappingURL=logging.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/logging.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAExE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,eAAO,MAAM,6BAA6B,KAAK,CAAC;AAyBhD,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,+EAA+E;IAC/E,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,iDAAiD;IACjD,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CAC5B;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,IAAI,CAiB1F"}

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

@@ -0,0 +1,52 @@
+// Server logging notifications (todo 42, logging half — tool-call progress
+// already flows through callMcpTool's onprogress → the executing tool's
+// onUpdate callback since W4).
+//
+// notifications/message routes into the per-server MCP logger with RFC-5424
+// levels folded onto the logger's four methods; the server config's
+// `logLevel` field (inert since W1) now filters below-threshold messages, and
+// a token bucket caps bursts at 10 messages/second so a chatty server cannot
+// flood the ring buffer — the final message of a burst always lands because
+// the bucket refills continuously.
+import { LoggingMessageNotificationSchema } from "@modelcontextprotocol/sdk/types.js";
+export const MCP_LOG_RATE_LIMIT_PER_SECOND = 10;
+/** RFC-5424 severity order, most→least severe. */
+const LEVEL_ORDER = ["emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"];
+function severity(level) {
+    const index = LEVEL_ORDER.indexOf(level);
+    return index === -1 ? LEVEL_ORDER.indexOf("info") : index;
+}
+function loggerMethod(level) {
+    switch (level) {
+        case "debug":
+            return "debug";
+        case "info":
+        case "notice":
+            return "info";
+        case "warning":
+            return "warn";
+        default:
+            return "error";
+    }
+}
+export function subscribeMcpServerLogging(client, options) {
+    const threshold = options.logLevel === undefined ? undefined : severity(options.logLevel);
+    const rate = options.ratePerSecond ?? MCP_LOG_RATE_LIMIT_PER_SECOND;
+    const now = options.now ?? Date.now;
+    let tokens = rate;
+    let lastRefill = now();
+    client.setNotificationHandler(LoggingMessageNotificationSchema, (notification) => {
+        const { level, data, logger: serverLogger } = notification.params;
+        if (threshold !== undefined && severity(level) > threshold)
+            return;
+        const at = now();
+        tokens = Math.min(rate, tokens + ((at - lastRefill) / 1000) * rate);
+        lastRefill = at;
+        if (tokens < 1)
+            return;
+        tokens -= 1;
+        const text = typeof data === "string" ? data : JSON.stringify(data);
+        options.logger[loggerMethod(level)](`[server${serverLogger ? `:${serverLogger}` : ""}] ${text}`);
+    });
+}
+//# sourceMappingURL=logging.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/logging.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,wEAAwE;AACxE,+BAA+B;AAC/B,EAAE;AACF,4EAA4E;AAC5E,oEAAoE;AACpE,8EAA8E;AAC9E,6EAA6E;AAC7E,4EAA4E;AAC5E,mCAAmC;AAGnC,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AAGtF,MAAM,CAAC,MAAM,6BAA6B,GAAG,EAAE,CAAC;AAEhD,kDAAkD;AAClD,MAAM,WAAW,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAU,CAAC;AAG/G,SAAS,QAAQ,CAAC,KAAa;IAC9B,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,KAAqB,CAAC,CAAC;IACzD,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC3D,CAAC;AAED,SAAS,YAAY,CAAC,KAAa;IAClC,QAAQ,KAAK,EAAE,CAAC;QACf,KAAK,OAAO;YACX,OAAO,OAAO,CAAC;QAChB,KAAK,MAAM,CAAC;QACZ,KAAK,QAAQ;YACZ,OAAO,MAAM,CAAC;QACf,KAAK,SAAS;YACb,OAAO,MAAM,CAAC;QACf;YACC,OAAO,OAAO,CAAC;IACjB,CAAC;AACF,CAAC;AAWD,MAAM,UAAU,yBAAyB,CAAC,MAAc,EAAE,OAA0B;IACnF,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1F,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,IAAI,6BAA6B,CAAC;IACpE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;IACpC,IAAI,MAAM,GAAG,IAAI,CAAC;IAClB,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;IACvB,MAAM,CAAC,sBAAsB,CAAC,gCAAgC,EAAE,CAAC,YAAY,EAAE,EAAE;QAChF,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC;QAClE,IAAI,SAAS,KAAK,SAAS,IAAI,QAAQ,CAAC,KAAK,CAAC,GAAG,SAAS;YAAE,OAAO;QACnE,MAAM,EAAE,GAAG,GAAG,EAAE,CAAC;QACjB,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,CAAC,EAAE,GAAG,UAAU,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;QACpE,UAAU,GAAG,EAAE,CAAC;QAChB,IAAI,MAAM,GAAG,CAAC;YAAE,OAAO;QACvB,MAAM,IAAI,CAAC,CAAC;QACZ,MAAM,IAAI,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACpE,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,YAAY,CAAC,CAAC,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IAClG,CAAC,CAAC,CAAC;AACJ,CAAC","sourcesContent":["// Server logging notifications (todo 42, logging half — tool-call progress\n// already flows through callMcpTool's onprogress → the executing tool's\n// onUpdate callback since W4).\n//\n// notifications/message routes into the per-server MCP logger with RFC-5424\n// levels folded onto the logger's four methods; the server config's\n// `logLevel` field (inert since W1) now filters below-threshold messages, and\n// a token bucket caps bursts at 10 messages/second so a chatty server cannot\n// flood the ring buffer — the final message of a burst always lands because\n// the bucket refills continuously.\n\nimport type { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport { LoggingMessageNotificationSchema } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { McpLogger } from \"./log.ts\";\n\nexport const MCP_LOG_RATE_LIMIT_PER_SECOND = 10;\n\n/** RFC-5424 severity order, most→least severe. */\nconst LEVEL_ORDER = [\"emergency\", \"alert\", \"critical\", \"error\", \"warning\", \"notice\", \"info\", \"debug\"] as const;\ntype Rfc5424Level = (typeof LEVEL_ORDER)[number];\n\nfunction severity(level: string): number {\n\tconst index = LEVEL_ORDER.indexOf(level as Rfc5424Level);\n\treturn index === -1 ? LEVEL_ORDER.indexOf(\"info\") : index;\n}\n\nfunction loggerMethod(level: string): \"debug\" | \"info\" | \"warn\" | \"error\" {\n\tswitch (level) {\n\t\tcase \"debug\":\n\t\t\treturn \"debug\";\n\t\tcase \"info\":\n\t\tcase \"notice\":\n\t\t\treturn \"info\";\n\t\tcase \"warning\":\n\t\t\treturn \"warn\";\n\t\tdefault:\n\t\t\treturn \"error\";\n\t}\n}\n\nexport interface McpLoggingOptions {\n\treadonly logger: McpLogger;\n\t/** Minimum level to record (server config `logLevel`); default records all. */\n\treadonly logLevel?: string;\n\treadonly ratePerSecond?: number;\n\t/** Test seam for deterministic bucket refill. */\n\treadonly now?: () => number;\n}\n\nexport function subscribeMcpServerLogging(client: Client, options: McpLoggingOptions): void {\n\tconst threshold = options.logLevel === undefined ? undefined : severity(options.logLevel);\n\tconst rate = options.ratePerSecond ?? MCP_LOG_RATE_LIMIT_PER_SECOND;\n\tconst now = options.now ?? Date.now;\n\tlet tokens = rate;\n\tlet lastRefill = now();\n\tclient.setNotificationHandler(LoggingMessageNotificationSchema, (notification) => {\n\t\tconst { level, data, logger: serverLogger } = notification.params;\n\t\tif (threshold !== undefined && severity(level) > threshold) return;\n\t\tconst at = now();\n\t\ttokens = Math.min(rate, tokens + ((at - lastRefill) / 1000) * rate);\n\t\tlastRefill = at;\n\t\tif (tokens < 1) return;\n\t\ttokens -= 1;\n\t\tconst text = typeof data === \"string\" ? data : JSON.stringify(data);\n\t\toptions.logger[loggerMethod(level)](`[server${serverLogger ? `:${serverLogger}` : \"\"}] ${text}`);\n\t});\n}\n"]}