@code-yeongyu/senpi 2026.7.23 → 2026.7.24

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

@@ -1,143 +1,166 @@
+import { bindToProviderScope } from "@earendil-works/pi-ai/node/provider-scope";
 import { registerMcpCommands } from "./commands.js";
-import { setMcpElicitationUiProvider } from "./elicitation.js";
 import { AnthropicNativeToolSearchAdapter } from "./expose/native-search.js";
 import { TOOL_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 { getMcpService, McpService } 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);
+export function createMcpExtension(service, sessionOwned = true) {
+    return (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 tool_search.
-    const nativeAdapter = new AnthropicNativeToolSearchAdapter({
-        enabled: () => {
-            const setting = getMcpService().getNativeToolSearchSetting();
-            return setting === true || setting === "auto";
-        },
-        isDeferrable: (name) => name.startsWith("mcp_") && name !== TOOL_SEARCH_TOOL_NAME,
-        onFallback: (reason) => createMcpLogger("service").warn(reason),
-        searchToolName: TOOL_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 tool_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");
+        };
+        registerMcpCommands(pi, service);
+        // 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 tool_search.
+        const nativeAdapter = new AnthropicNativeToolSearchAdapter({
+            enabled: () => {
+                const setting = service.getNativeToolSearchSetting();
+                return setting === true || setting === "auto";
+            },
+            isDeferrable: (name) => name.startsWith("mcp_") && name !== TOOL_SEARCH_TOOL_NAME,
+            onFallback: (reason) => createMcpLogger("service").warn(reason),
+            searchToolName: TOOL_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 tool_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) => {
+            service.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 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, () => service.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 };
             }
-            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);
+        });
+        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);
             }
-            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));
+        });
+        // 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 () => {
+                await service.attachSession(event, ctx, pi);
+                refreshMcpInstructionsForSession(service);
+                if (sessionOwned)
+                    registerMcpPromptCommands(service, pi, service.getMcpPromptServers());
+                else
+                    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 this session's UI.
+                service.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 service.attachSkillMcpServers(declared) : []),
+                    ];
+                    for (const warning of warnings)
+                        createMcpLogger("skills").warn(warning);
+                }
+                const systemPrompt = injectMcpInstructions(service, 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", async (event) => {
+            await service.handleSessionShutdown(event);
+            // A classic extension instance can be reused by the test/legacy host
+            // after reload. Its singleton is intentionally refreshed for that next
+            // session; scoped factories keep their closed instance.
+            if (!sessionOwned && event.reason === "reload" && service.isDisposed())
+                service = getMcpService();
+        }, sink));
+    };
+}
+function hasProviderScope() {
+    try {
+        bindToProviderScope(() => undefined);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export default function mcpExtension(pi) {
+    const sessionOwned = hasProviderScope();
+    return createMcpExtension(sessionOwned ? new McpService() : getMcpService(), sessionOwned)(pi);
 }
 //# sourceMappingURL=index.js.map

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

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

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

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

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

@@ -1 +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"}
+{"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;AAI/C,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CAE1E;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKnG"}

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

@@ -1,14 +1,14 @@
 const MAX_INSTRUCTIONS_CHARS = 4000;
-let sessionInstructionsBlock = "";
 export function refreshMcpInstructionsForSession(service) {
-    sessionInstructionsBlock = buildMcpInstructionsBlock(service);
+    service.setMcpInstructions(buildMcpInstructionsBlock(service));
 }
-export function injectMcpInstructions(systemPrompt) {
-    if (sessionInstructionsBlock.length === 0)
+export function injectMcpInstructions(service, systemPrompt) {
+    const instructions = service.getMcpInstructions();
+    if (instructions.length === 0)
         return undefined;
-    if (systemPrompt.includes(sessionInstructionsBlock))
+    if (systemPrompt.includes(instructions))
         return undefined;
-    return `${systemPrompt}\n\n${sessionInstructionsBlock}`;
+    return `${systemPrompt}\n\n${instructions}`;
 }
 function buildMcpInstructionsBlock(service) {
     const blocks = [];

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

@@ -1 +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"]}
+{"version":3,"file":"instructions.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/instructions.ts"],"names":[],"mappings":"AAEA,MAAM,sBAAsB,GAAG,IAAI,CAAC;AAEpC,MAAM,UAAU,gCAAgC,CAAC,OAAmB;IACnE,OAAO,CAAC,kBAAkB,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,OAAmB,EAAE,YAAoB;IAC9E,MAAM,YAAY,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAClD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAChD,IAAI,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC;QAAE,OAAO,SAAS,CAAC;IAC1D,OAAO,GAAG,YAAY,OAAO,YAAY,EAAE,CAAC;AAC7C,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\nexport function refreshMcpInstructionsForSession(service: McpService): void {\n\tservice.setMcpInstructions(buildMcpInstructionsBlock(service));\n}\n\nexport function injectMcpInstructions(service: McpService, systemPrompt: string): string | undefined {\n\tconst instructions = service.getMcpInstructions();\n\tif (instructions.length === 0) return undefined;\n\tif (systemPrompt.includes(instructions)) return undefined;\n\treturn `${systemPrompt}\\n\\n${instructions}`;\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/prompts.d.ts

@@ -1,6 +1,7 @@
 import type { ExtensionAPI } from "../../types.ts";
 import type { McpCachedServerCatalog } from "./catalog-cache.ts";
 import type { ServerConnection } from "./connection.ts";
+import type { McpService } from "./service.ts";
 export interface McpPromptServer {
     readonly server: string;
     readonly connection: ServerConnection;
@@ -11,5 +12,6 @@ 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 declare function registerMcpPromptCommands(service: McpService, pi: CommandRegistrar, servers: readonly McpPromptServer[]): string[];
 export {};
 //# sourceMappingURL=prompts.d.ts.map

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

@@ -1 +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"}
+{"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;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,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,CAAC;AAC/G,wBAAgB,yBAAyB,CACxC,OAAO,EAAE,UAAU,EACnB,EAAE,EAAE,gBAAgB,EACpB,OAAO,EAAE,SAAS,eAAe,EAAE,GACjC,MAAM,EAAE,CAAC"}

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

@@ -15,14 +15,20 @@ const registeredCommandNames = new Set();
 export function resetMcpPromptCommandsForTests() {
     registeredCommandNames.clear();
 }
-export function registerMcpPromptCommands(pi, servers) {
+export function registerMcpPromptCommands(serviceOrPi, piOrServers, serversArg) {
+    const service = serversArg === undefined ? undefined : serviceOrPi;
+    const pi = (serversArg === undefined ? serviceOrPi : piOrServers);
+    const servers = (serversArg === undefined ? piOrServers : serversArg);
     const added = [];
     for (const server of servers) {
         for (const prompt of server.prompts) {
             const commandName = `mcp:${server.server}:${prompt.name}`;
-            if (registeredCommandNames.has(commandName))
+            if (service?.isMcpPromptCommandRegistered(commandName) ?? registeredCommandNames.has(commandName))
                 continue;
-            registeredCommandNames.add(commandName);
+            if (service)
+                service.markMcpPromptCommandRegistered(commandName);
+            else
+                registeredCommandNames.add(commandName);
             added.push(commandName);
             pi.registerCommand(commandName, {
                 description: prompt.description ?? `MCP prompt ${prompt.name} from ${server.server}`,

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

@@ -1 +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"]}
+{"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\";\nimport type { McpService } from \"./service.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[];\nexport function registerMcpPromptCommands(\n\tservice: McpService,\n\tpi: CommandRegistrar,\n\tservers: readonly McpPromptServer[],\n): string[];\nexport function registerMcpPromptCommands(\n\tserviceOrPi: McpService | CommandRegistrar,\n\tpiOrServers: CommandRegistrar | readonly McpPromptServer[],\n\tserversArg?: readonly McpPromptServer[],\n): string[] {\n\tconst service = serversArg === undefined ? undefined : (serviceOrPi as McpService);\n\tconst pi = (serversArg === undefined ? serviceOrPi : piOrServers) as CommandRegistrar;\n\tconst servers = (serversArg === undefined ? piOrServers : serversArg) as readonly McpPromptServer[];\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 (service?.isMcpPromptCommandRegistered(commandName) ?? registeredCommandNames.has(commandName)) continue;\n\t\t\tif (service) service.markMcpPromptCommandRegistered(commandName);\n\t\t\telse registeredCommandNames.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/resources.d.ts

@@ -4,11 +4,13 @@ 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 type { McpOutputArtifacts } from "./guard/output-guard.ts";
 import { applyMcpOutputGuard } from "./guard/output-guard.ts";
 export interface McpResourceServer {
     readonly server: string;
     readonly connection: ServerConnection;
     readonly agentDir?: string;
+    readonly artifacts?: McpOutputArtifacts;
     readonly outputGuard?: Parameters<typeof applyMcpOutputGuard>[1]["outputGuard"];
     readonly requestTimeoutMs?: number;
     readonly resources: NonNullable<McpCachedServerCatalog["resources"]>;

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

@@ -1 +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"}
+{"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,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,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,SAAS,CAAC,EAAE,kBAAkB,CAAC;IACxC,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,CA0BnG;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"}

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

@@ -48,6 +48,7 @@ export async function readMcpResourceAsText(server, uri) {
     });
     const guarded = await applyMcpOutputGuard([{ type: "text", text: parts.join("\n") }], {
         agentDir: server.agentDir,
+        artifacts: server.artifacts,
         outputGuard: server.outputGuard,
         server: server.server,
     });