@code-yeongyu/senpi 2026.7.4 → 2026.7.9-2

package/dist/core/extensions/builtin/mcp/expose/policy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/policy.ts"],"names":[],"mappings":"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","sourcesContent":["import picomatch from \"picomatch\";\nimport type { McpToolCatalogEntry } from \"../catalog.ts\";\nimport type { McpServerConfig, McpSettings } from \"../config-schema.ts\";\n\nexport interface McpExposurePolicyResult {\n\treadonly activeEntries: McpToolCatalogEntry[];\n\treadonly filteredEntries: McpToolCatalogEntry[];\n\treadonly mode: \"direct\" | \"search\" | \"proxy\";\n\treadonly reason: \"explicit\" | \"threshold\" | \"directTools\";\n\treadonly registeredEntries: McpToolCatalogEntry[];\n\treadonly warnings: string[];\n}\n\ntype ToolMatcher = (toolName: string) => boolean;\n\nconst PICOMATCH_OPTIONS = { bash: true, dot: true };\n\nexport function computeMcpExposurePolicy(\n\tentries: readonly McpToolCatalogEntry[],\n\tconfig: McpServerConfig,\n\tsettings: McpSettings,\n): McpExposurePolicyResult {\n\tconst filteredEntries = stableSort(entries.filter((entry) => passesToolFilters(entry.tool, config)));\n\tconst directEntries = stableSort(entriesMatchingDirectTools(filteredEntries, config.directTools));\n\tif (filteredEntries.length === 0) {\n\t\treturn {\n\t\t\tactiveEntries: [],\n\t\t\tfilteredEntries,\n\t\t\tmode: \"direct\",\n\t\t\treason: \"explicit\",\n\t\t\tregisteredEntries: [],\n\t\t\twarnings: [`MCP server ${serverName(entries)} has 0 exposed tools after includeTools/excludeTools filters.`],\n\t\t};\n\t}\n\n\tif (config.directTools === true) {\n\t\treturn directResult(filteredEntries, filteredEntries, \"directTools\");\n\t}\n\tif (config.exposure === \"direct\") {\n\t\treturn directResult(filteredEntries, filteredEntries, \"explicit\");\n\t}\n\t// Tier-C proxy mode (todo 38): per-server OPT-IN only. The whole catalog\n\t// stays behind a single gateway tool; nothing registers directly and auto\n\t// never selects this mode (SPEC §5: -27.3pp GSM8K structured-output evidence).\n\tif (config.exposure === \"proxy\") {\n\t\treturn {\n\t\t\tactiveEntries: [],\n\t\t\tfilteredEntries,\n\t\t\tmode: \"proxy\",\n\t\t\treason: \"explicit\",\n\t\t\tregisteredEntries: [],\n\t\t\twarnings: [],\n\t\t};\n\t}\n\t// Tier-B search mode: register the full catalog but keep only directTools\n\t// active; mcp_search promotes the rest on demand.\n\tif (config.exposure === \"search\") {\n\t\treturn searchResult(filteredEntries, directEntries, \"explicit\");\n\t}\n\tif (filteredEntries.length <= (settings.searchThreshold ?? 10)) {\n\t\treturn directResult(filteredEntries, filteredEntries, \"threshold\");\n\t}\n\treturn searchResult(filteredEntries, directEntries, \"threshold\");\n}\n\nfunction searchResult(\n\tfilteredEntries: readonly McpToolCatalogEntry[],\n\tdirectEntries: readonly McpToolCatalogEntry[],\n\treason: McpExposurePolicyResult[\"reason\"],\n): McpExposurePolicyResult {\n\treturn {\n\t\tactiveEntries: stableSort(directEntries),\n\t\tfilteredEntries: stableSort(filteredEntries),\n\t\tmode: \"search\",\n\t\treason,\n\t\tregisteredEntries: stableSort(filteredEntries),\n\t\twarnings: [],\n\t};\n}\n\nfunction directResult(\n\tfilteredEntries: readonly McpToolCatalogEntry[],\n\tactiveEntries: readonly McpToolCatalogEntry[],\n\treason: McpExposurePolicyResult[\"reason\"],\n): McpExposurePolicyResult {\n\treturn {\n\t\tactiveEntries: stableSort(activeEntries),\n\t\tfilteredEntries: stableSort(filteredEntries),\n\t\tmode: \"direct\",\n\t\treason,\n\t\tregisteredEntries: stableSort(activeEntries),\n\t\twarnings: [],\n\t};\n}\n\nfunction passesToolFilters(toolName: string, config: McpServerConfig): boolean {\n\tconst include = compileMatchers(config.includeTools);\n\tconst exclude = compileMatchers(config.excludeTools);\n\tconst included = include.length === 0 || include.some((isMatch) => isMatch(toolName));\n\tif (!included) return false;\n\treturn !exclude.some((isMatch) => isMatch(toolName));\n}\n\nfunction entriesMatchingDirectTools(\n\tentries: readonly McpToolCatalogEntry[],\n\tdirectTools: McpServerConfig[\"directTools\"],\n): McpToolCatalogEntry[] {\n\tif (directTools === true) return stableSort(entries);\n\tif (!Array.isArray(directTools) || directTools.length === 0) return [];\n\tconst matchers = compileMatchers(directTools);\n\treturn stableSort(entries.filter((entry) => matchers.some((isMatch) => isMatch(entry.tool))));\n}\n\nfunction compileMatchers(patterns: readonly string[] | undefined): ToolMatcher[] {\n\treturn (patterns ?? []).map((pattern) => safeMatcher(pattern));\n}\n\nfunction safeMatcher(pattern: string): ToolMatcher {\n\ttry {\n\t\treturn picomatch(pattern, PICOMATCH_OPTIONS);\n\t} catch {\n\t\treturn (toolName) => toolName === pattern;\n\t}\n}\n\nfunction stableSort(entries: readonly McpToolCatalogEntry[]): McpToolCatalogEntry[] {\n\treturn [...entries].sort(\n\t\t(left, right) => left.server.localeCompare(right.server) || left.tool.localeCompare(right.tool),\n\t);\n}\n\nfunction serverName(entries: readonly McpToolCatalogEntry[]): string {\n\treturn entries[0]?.server ?? \"<unknown>\";\n}\n"]}

package/dist/core/extensions/builtin/mcp/expose/proxy.d.ts

@@ -0,0 +1,14 @@
+import { Type } from "typebox";
+import type { ToolDefinition } from "../../../types.ts";
+import type { McpToolCatalogEntry } from "../catalog.ts";
+import { type McpToolDetails } from "./register.ts";
+declare const ParamsSchema: Type.TObject<{
+    op: Type.TUnion<[Type.TLiteral<"search">, Type.TLiteral<"describe">, Type.TLiteral<"call">]>;
+    query: Type.TOptional<Type.TString>;
+    tool: Type.TOptional<Type.TString>;
+    args: Type.TOptional<Type.TString>;
+}>;
+type McpProxyTool = ToolDefinition<typeof ParamsSchema, McpToolDetails | undefined, unknown>;
+export declare function createMcpProxyTool(server: string, entries: readonly McpToolCatalogEntry[]): McpProxyTool;
+export {};
+//# sourceMappingURL=proxy.d.ts.map

package/dist/core/extensions/builtin/mcp/expose/proxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/proxy.ts"],"names":[],"mappings":"AAaA,OAAO,EAAe,IAAI,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEzD,OAAO,EAA0B,KAAK,cAAc,EAAsB,MAAM,eAAe,CAAC;AAEhG,QAAA,MAAM,YAAY;;;;;EAWhB,CAAC;AAIH,KAAK,YAAY,GAAG,cAAc,CAAC,OAAO,YAAY,EAAE,cAAc,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;AAE7F,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,mBAAmB,EAAE,GAAG,YAAY,CA2DxG"}

package/dist/core/extensions/builtin/mcp/expose/proxy.js

@@ -0,0 +1,88 @@
+// Tier-C proxy mode (todo 38): per-server OPT-IN (`exposure:"proxy"`).
+//
+// The whole server catalog hides behind ONE always-active `mcp_<server>`
+// gateway tool with three ops: search (BM25 over this server's catalog),
+// describe (schema + description for one tool), call (tool + args as a JSON
+// STRING). The JSON-string args deliberately trade provider strict-mode
+// validation for a ~200-token footprint (SPEC §5: -27.3pp GSM8K structured
+// output under proxy) — which is why auto NEVER selects this mode. Errors are
+// returned as guiding text (never thrown for user mistakes) so the model can
+// self-correct; unknown tool names get nearest-match suggestions.
+import { Text } from "@earendil-works/pi-tui";
+import { Type } from "typebox";
+import { buildBm25Index } from "./bm25.js";
+import { executeMcpCatalogEntry, mapMcpCatalogNames } from "./register.js";
+const ParamsSchema = Type.Object({
+    op: Type.Union([Type.Literal("search"), Type.Literal("describe"), Type.Literal("call")], {
+        description: "search: rank tools by capability; describe: full schema for one tool; call: invoke a tool.",
+    }),
+    query: Type.Optional(Type.String({ description: "search: capability description to rank tools by." })),
+    tool: Type.Optional(Type.String({ description: "describe/call: the server-side tool name." })),
+    args: Type.Optional(Type.String({
+        description: 'call: tool arguments as a JSON object STRING, e.g. "{\\"path\\": \\"a.txt\\"}".',
+    })),
+});
+export function createMcpProxyTool(server, entries) {
+    const named = mapMcpCatalogNames(entries);
+    const byTool = new Map(named.map(({ entry }) => [entry.tool, entry]));
+    const index = buildBm25Index(named.map(({ entry, name }) => ({ description: entry.description, name, server, toolName: entry.tool })));
+    const name = named[0]?.name.split("_").slice(0, 2).join("_") ?? `mcp_${server}`;
+    return {
+        name,
+        label: `MCP proxy for ${server}`,
+        description: `Gateway to the '${server}' MCP server (${entries.length} tools). Use op:"search" with a query to find tools, op:"describe" with a tool name for its schema, then op:"call" with tool + args (args is a JSON object STRING — no strict validation, so match the described schema exactly).`,
+        promptSnippet: `Proxy for the ${server} MCP server: search -> describe -> call (args as a JSON string).`,
+        parameters: ParamsSchema,
+        executionMode: "parallel",
+        async execute(_toolCallId, params, signal, onUpdate) {
+            if (params.op === "search") {
+                const matches = index.search(params.query ?? "", 10, {});
+                const body = matches.length === 0
+                    ? `No '${server}' tools matched. Try broader keywords or op:"describe" with an exact tool name.`
+                    : matches
+                        .map((match) => `- ${match.doc.toolName} — ${match.doc.description ?? "(no description)"}`)
+                        .join("\n");
+                return textResult(server, `Tools on '${server}':\n${body}`);
+            }
+            const entry = params.tool === undefined ? undefined : byTool.get(params.tool);
+            if (entry === undefined) {
+                return textResult(server, unknownToolText(server, params.tool, index));
+            }
+            if (params.op === "describe") {
+                return textResult(server, `${entry.tool}: ${entry.description ?? "(no description)"}\nInput schema (JSON Schema):\n${JSON.stringify(entry.schema ?? {}, null, 2)}`);
+            }
+            let args;
+            try {
+                const parsed = JSON.parse(params.args ?? "{}");
+                if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+                    throw new Error("args must encode a JSON object");
+                }
+                args = parsed;
+            }
+            catch (error) {
+                return textResult(server, `Invalid args for '${entry.tool}': ${error instanceof Error ? error.message : String(error)}. Pass args as a JSON object STRING matching the schema from op:"describe", e.g. {"op":"call","tool":"${entry.tool}","args":"{\\"key\\": \\"value\\"}"}.`);
+            }
+            return await executeMcpCatalogEntry(entry, args, signal, onUpdate);
+        },
+        renderCall(args, theme) {
+            const detail = args.op === "search" ? (args.query ?? "") : (args.tool ?? "");
+            return new Text(theme.fg("toolTitle", theme.bold(`${name} ${args.op} ${detail}`.trim())), 0, 0);
+        },
+        renderResult(result, options, theme) {
+            const title = options.isPartial ? `${name}: running` : `${name}: ${result.details?.preview ?? "done"}`;
+            return new Text(theme.fg("toolOutput", title), 0, 0);
+        },
+    };
+}
+function textResult(server, text) {
+    return { content: [{ type: "text", text }], details: { preview: firstLine(text), server, tool: "proxy" } };
+}
+function unknownToolText(server, tool, index) {
+    const nearest = tool === undefined ? [] : index.search(tool, 3, {});
+    const hint = nearest.length === 0 ? "" : ` Nearest matches: ${nearest.map((match) => match.doc.toolName).join(", ")}.`;
+    return `Unknown tool '${tool ?? "(missing)"}' on '${server}'.${hint} Use op:"search" to list tools.`;
+}
+function firstLine(text) {
+    return text.split("\n", 1)[0].slice(0, 80);
+}
+//# sourceMappingURL=proxy.js.map

package/dist/core/extensions/builtin/mcp/expose/proxy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/proxy.ts"],"names":[],"mappings":"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","sourcesContent":["// Tier-C proxy mode (todo 38): per-server OPT-IN (`exposure:\"proxy\"`).\n//\n// The whole server catalog hides behind ONE always-active `mcp_<server>`\n// gateway tool with three ops: search (BM25 over this server's catalog),\n// describe (schema + description for one tool), call (tool + args as a JSON\n// STRING). The JSON-string args deliberately trade provider strict-mode\n// validation for a ~200-token footprint (SPEC §5: -27.3pp GSM8K structured\n// output under proxy) — which is why auto NEVER selects this mode. Errors are\n// returned as guiding text (never thrown for user mistakes) so the model can\n// self-correct; unknown tool names get nearest-match suggestions.\n\nimport type { AgentToolResult } from \"@earendil-works/pi-agent-core\";\nimport { Text } from \"@earendil-works/pi-tui\";\nimport { type Static, Type } from \"typebox\";\nimport type { ToolDefinition } from \"../../../types.ts\";\nimport type { McpToolCatalogEntry } from \"../catalog.ts\";\nimport { buildBm25Index } from \"./bm25.ts\";\nimport { executeMcpCatalogEntry, type McpToolDetails, mapMcpCatalogNames } from \"./register.ts\";\n\nconst ParamsSchema = Type.Object({\n\top: Type.Union([Type.Literal(\"search\"), Type.Literal(\"describe\"), Type.Literal(\"call\")], {\n\t\tdescription: \"search: rank tools by capability; describe: full schema for one tool; call: invoke a tool.\",\n\t}),\n\tquery: Type.Optional(Type.String({ description: \"search: capability description to rank tools by.\" })),\n\ttool: Type.Optional(Type.String({ description: \"describe/call: the server-side tool name.\" })),\n\targs: Type.Optional(\n\t\tType.String({\n\t\t\tdescription: 'call: tool arguments as a JSON object STRING, e.g. \"{\\\\\"path\\\\\": \\\\\"a.txt\\\\\"}\".',\n\t\t}),\n\t),\n});\ntype Params = Static<typeof ParamsSchema>;\n\ntype ProxyResult = AgentToolResult<McpToolDetails | undefined>;\ntype McpProxyTool = ToolDefinition<typeof ParamsSchema, McpToolDetails | undefined, unknown>;\n\nexport function createMcpProxyTool(server: string, entries: readonly McpToolCatalogEntry[]): McpProxyTool {\n\tconst named = mapMcpCatalogNames(entries);\n\tconst byTool = new Map(named.map(({ entry }) => [entry.tool, entry] as const));\n\tconst index = buildBm25Index(\n\t\tnamed.map(({ entry, name }) => ({ description: entry.description, name, server, toolName: entry.tool })),\n\t);\n\tconst name = named[0]?.name.split(\"_\").slice(0, 2).join(\"_\") ?? `mcp_${server}`;\n\treturn {\n\t\tname,\n\t\tlabel: `MCP proxy for ${server}`,\n\t\tdescription: `Gateway to the '${server}' MCP server (${entries.length} tools). Use op:\"search\" with a query to find tools, op:\"describe\" with a tool name for its schema, then op:\"call\" with tool + args (args is a JSON object STRING — no strict validation, so match the described schema exactly).`,\n\t\tpromptSnippet: `Proxy for the ${server} MCP server: search -> describe -> call (args as a JSON string).`,\n\t\tparameters: ParamsSchema,\n\t\texecutionMode: \"parallel\",\n\t\tasync execute(_toolCallId, params: Params, signal, onUpdate): Promise<ProxyResult> {\n\t\t\tif (params.op === \"search\") {\n\t\t\t\tconst matches = index.search(params.query ?? \"\", 10, {});\n\t\t\t\tconst body =\n\t\t\t\t\tmatches.length === 0\n\t\t\t\t\t\t? `No '${server}' tools matched. Try broader keywords or op:\"describe\" with an exact tool name.`\n\t\t\t\t\t\t: matches\n\t\t\t\t\t\t\t\t.map((match) => `- ${match.doc.toolName} — ${match.doc.description ?? \"(no description)\"}`)\n\t\t\t\t\t\t\t\t.join(\"\\n\");\n\t\t\t\treturn textResult(server, `Tools on '${server}':\\n${body}`);\n\t\t\t}\n\t\t\tconst entry = params.tool === undefined ? undefined : byTool.get(params.tool);\n\t\t\tif (entry === undefined) {\n\t\t\t\treturn textResult(server, unknownToolText(server, params.tool, index));\n\t\t\t}\n\t\t\tif (params.op === \"describe\") {\n\t\t\t\treturn textResult(\n\t\t\t\t\tserver,\n\t\t\t\t\t`${entry.tool}: ${entry.description ?? \"(no description)\"}\\nInput schema (JSON Schema):\\n${JSON.stringify(entry.schema ?? {}, null, 2)}`,\n\t\t\t\t);\n\t\t\t}\n\t\t\tlet args: Record<string, unknown>;\n\t\t\ttry {\n\t\t\t\tconst parsed: unknown = JSON.parse(params.args ?? \"{}\");\n\t\t\t\tif (typeof parsed !== \"object\" || parsed === null || Array.isArray(parsed)) {\n\t\t\t\t\tthrow new Error(\"args must encode a JSON object\");\n\t\t\t\t}\n\t\t\t\targs = parsed as Record<string, unknown>;\n\t\t\t} catch (error) {\n\t\t\t\treturn textResult(\n\t\t\t\t\tserver,\n\t\t\t\t\t`Invalid args for '${entry.tool}': ${error instanceof Error ? error.message : String(error)}. Pass args as a JSON object STRING matching the schema from op:\"describe\", e.g. {\"op\":\"call\",\"tool\":\"${entry.tool}\",\"args\":\"{\\\\\"key\\\\\": \\\\\"value\\\\\"}\"}.`,\n\t\t\t\t);\n\t\t\t}\n\t\t\treturn await executeMcpCatalogEntry(entry, args, signal, onUpdate);\n\t\t},\n\t\trenderCall(args, theme) {\n\t\t\tconst detail = args.op === \"search\" ? (args.query ?? \"\") : (args.tool ?? \"\");\n\t\t\treturn new Text(theme.fg(\"toolTitle\", theme.bold(`${name} ${args.op} ${detail}`.trim())), 0, 0);\n\t\t},\n\t\trenderResult(result, options, theme) {\n\t\t\tconst title = options.isPartial ? `${name}: running` : `${name}: ${result.details?.preview ?? \"done\"}`;\n\t\t\treturn new Text(theme.fg(\"toolOutput\", title), 0, 0);\n\t\t},\n\t};\n}\n\nfunction textResult(server: string, text: string): ProxyResult {\n\treturn { content: [{ type: \"text\", text }], details: { preview: firstLine(text), server, tool: \"proxy\" } };\n}\n\nfunction unknownToolText(server: string, tool: string | undefined, index: ReturnType<typeof buildBm25Index>): string {\n\tconst nearest = tool === undefined ? [] : index.search(tool, 3, {});\n\tconst hint =\n\t\tnearest.length === 0 ? \"\" : ` Nearest matches: ${nearest.map((match) => match.doc.toolName).join(\", \")}.`;\n\treturn `Unknown tool '${tool ?? \"(missing)\"}' on '${server}'.${hint} Use op:\"search\" to list tools.`;\n}\n\nfunction firstLine(text: string): string {\n\treturn text.split(\"\\n\", 1)[0].slice(0, 80);\n}\n"]}

package/dist/core/extensions/builtin/mcp/expose/register.d.ts

@@ -0,0 +1,31 @@
+import type { AgentToolResult } from "@earendil-works/pi-agent-core";
+import type { Progress } from "@modelcontextprotocol/sdk/types.js";
+import type { TSchema } from "typebox";
+import type { ExtensionAPI, ToolDefinition } from "../../../types.ts";
+import type { McpToolCatalogEntry } from "../catalog.ts";
+export interface McpToolDetails {
+    server: string;
+    tool: string;
+    preview?: string;
+    progress?: Progress;
+}
+export type McpToolDefinition = ToolDefinition<TSchema, McpToolDetails | undefined, unknown>;
+type WarnFn = (message: string) => void;
+export interface McpCatalogRegistrationOptions {
+    readonly refreshActiveSetWhenEmpty?: boolean;
+}
+export declare function registerMcpCatalogTools(pi: Pick<ExtensionAPI, "getActiveTools" | "setActiveTools" | "registerTool">, entries: readonly McpToolCatalogEntry[], activeEntries: readonly McpToolCatalogEntry[], warn?: WarnFn, options?: McpCatalogRegistrationOptions): void;
+export interface McpNamedCatalogEntry {
+    readonly entry: McpToolCatalogEntry;
+    readonly name: string;
+}
+/** Pair each catalog entry with its stable, collision-resolved mcp tool name.
+ * Shared by the full-tool builder and the Tier-B search catalog so names never
+ * drift between the two. */
+export declare function mapMcpCatalogNames(entries: readonly McpToolCatalogEntry[], warn?: WarnFn): McpNamedCatalogEntry[];
+export declare function buildMcpToolDefinitions(entries: readonly McpToolCatalogEntry[], warn?: WarnFn): McpToolDefinition[];
+/** Full guarded call path for one catalog entry (lifecycle + retry + output
+ * guard). Shared by direct/search tool definitions and the Tier-C proxy. */
+export declare function executeMcpCatalogEntry(entry: McpToolCatalogEntry, args: Record<string, unknown>, signal: AbortSignal | undefined, onUpdate: Parameters<McpToolDefinition["execute"]>[3]): Promise<AgentToolResult<McpToolDetails | undefined>>;
+export {};
+//# sourceMappingURL=register.d.ts.map

package/dist/core/extensions/builtin/mcp/expose/register.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/register.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGrE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEtE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAczD,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACpB;AAGD,MAAM,MAAM,iBAAiB,GAAG,cAAc,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;AAC7F,KAAK,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;AAExC,MAAM,WAAW,6BAA6B;IAC7C,QAAQ,CAAC,yBAAyB,CAAC,EAAE,OAAO,CAAC;CAC7C;AAED,wBAAgB,uBAAuB,CACtC,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,cAAc,CAAC,EAC5E,OAAO,EAAE,SAAS,mBAAmB,EAAE,EACvC,aAAa,EAAE,SAAS,mBAAmB,EAAE,EAC7C,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,GAAE,6BAAkC,GACzC,IAAI,CAMN;AAED,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACtB;AAED;;4BAE4B;AAC5B,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,SAAS,mBAAmB,EAAE,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,oBAAoB,EAAE,CAOjH;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,SAAS,mBAAmB,EAAE,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAEnH;AA2BD;4EAC4E;AAC5E,wBAAsB,sBAAsB,CAC3C,KAAK,EAAE,mBAAmB,EAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,QAAQ,EAAE,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,GACnD,OAAO,CAAC,eAAe,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC,CActD"}

package/dist/core/extensions/builtin/mcp/expose/register.js

@@ -0,0 +1,158 @@
+import { Text } from "@earendil-works/pi-tui";
+import { registerToolsPreservingActiveSet } from "../active-set.js";
+import { ToolExecError } from "../errors.js";
+import { applyMcpOutputGuard } from "../guard/output-guard.js";
+import { ensureMcpToolCallConnection, withMcpRetriableFailedSendRetry, withMcpSessionExpiryRetry } from "../health.js";
+import { runMcpConnectionLifecycleCall } from "../idle.js";
+import { buildMcpToolNames, convertJsonSchemaToTypeBox, mapMcpToolResult, } from "./schema-compat.js";
+export function registerMcpCatalogTools(pi, entries, activeEntries, warn, options = {}) {
+    if (entries.length === 0 && activeEntries.length === 0 && options.refreshActiveSetWhenEmpty !== true)
+        return;
+    const tools = buildMcpToolDefinitions(entries, warn);
+    const currentActive = pi.getActiveTools().filter((name) => !name.startsWith("mcp_"));
+    const mcpNames = buildActiveToolNames(entries, activeEntries, warn);
+    registerToolsPreservingActiveSet(pi, tools, [...currentActive, ...mcpNames]);
+}
+/** Pair each catalog entry with its stable, collision-resolved mcp tool name.
+ * Shared by the full-tool builder and the Tier-B search catalog so names never
+ * drift between the two. */
+export function mapMcpCatalogNames(entries, warn) {
+    const sorted = [...entries].sort(compareCatalogEntries);
+    const names = buildMcpToolNames(sorted.map((entry) => ({ serverName: entry.server, toolName: entry.tool })), warn);
+    return sorted.map((entry, index) => ({ entry, name: names[index] ?? "" }));
+}
+export function buildMcpToolDefinitions(entries, warn) {
+    return mapMcpCatalogNames(entries, warn).map(({ entry, name }) => createMcpToolDefinition(entry, name));
+}
+function createMcpToolDefinition(entry, name) {
+    const converted = convertJsonSchemaToTypeBox(entry.schema);
+    const label = `${entry.server}/${entry.tool}`;
+    return {
+        name,
+        label,
+        description: entry.description ?? `MCP tool ${label}`,
+        parameters: converted.schema,
+        executionMode: "parallel",
+        async execute(_toolCallId, params, signal, onUpdate) {
+            const args = isRecord(params) ? params : {};
+            return await executeMcpCatalogEntry(entry, args, signal, onUpdate);
+        },
+        renderCall(args, theme) {
+            return new Text(theme.fg("toolTitle", theme.bold(`${name} ${previewArgs(args)}`.trim())), 0, 0);
+        },
+        renderResult(result, options, theme) {
+            const title = options.isPartial
+                ? `${name}: running`
+                : `${name}: ${result.details?.preview ?? "(empty result)"}`;
+            return new Text(theme.fg("toolOutput", title), 0, 0);
+        },
+    };
+}
+/** Full guarded call path for one catalog entry (lifecycle + retry + output
+ * guard). Shared by direct/search tool definitions and the Tier-C proxy. */
+export async function executeMcpCatalogEntry(entry, args, signal, onUpdate) {
+    const label = `${entry.server}/${entry.tool}`;
+    const result = await callMcpTool(entry, args, signal, onUpdate, label);
+    const mapped = mapMcpToolResult(normalizeCallToolResult(result));
+    if (!mapped.ok) {
+        throw new ToolExecError(mapped.error.message, { phase: "call", serverName: entry.server });
+    }
+    const guarded = await applyMcpOutputGuard(mapped.content, {
+        agentDir: entry.agentDir,
+        outputGuard: entry.outputGuard,
+        server: entry.server,
+    });
+    const content = toAgentContent(guarded);
+    return { content, details: { preview: previewContent(content), server: entry.server, tool: entry.tool } };
+}
+async function callMcpTool(entry, args, signal, onUpdate, label) {
+    try {
+        return await runMcpConnectionLifecycleCall(entry.connection, () => withMcpSessionExpiryRetry(entry.connection, async () => {
+            await ensureMcpToolCallConnection(entry.connection, entry.ensureFresh);
+            await entry.ensureConnected?.();
+            return await withMcpRetriableFailedSendRetry(entry.connection, async () => {
+                return await entry.connection.client.callTool({ name: entry.tool, arguments: args }, undefined, {
+                    onprogress: (progress) => {
+                        onUpdate?.({
+                            content: [{ type: "text", text: formatProgress(label, progress) }],
+                            details: { progress, server: entry.server, tool: entry.tool },
+                        });
+                    },
+                    signal,
+                    timeout: entry.requestTimeoutMs,
+                });
+            });
+        }));
+    }
+    catch (error) {
+        throw new ToolExecError(`ToolExecError: ${errorLabel(error)}`, {
+            cause: error,
+            phase: "call",
+            serverName: entry.server,
+        });
+    }
+}
+function normalizeCallToolResult(result) {
+    if ("content" in result || "structuredContent" in result || "isError" in result) {
+        const candidate = result;
+        const normalized = {};
+        if (isMcpContentBlockArray(candidate.content))
+            normalized.content = candidate.content;
+        if (typeof candidate.isError === "boolean")
+            normalized.isError = candidate.isError;
+        if ("structuredContent" in candidate)
+            normalized.structuredContent = candidate.structuredContent;
+        return normalized;
+    }
+    return { structuredContent: result.toolResult };
+}
+function isMcpContentBlockArray(value) {
+    return Array.isArray(value);
+}
+function toAgentContent(blocks) {
+    return blocks.map((block) => {
+        if (block.type === "text" || block.type === "image")
+            return block;
+        return { type: "text", text: JSON.stringify(block) };
+    });
+}
+function previewContent(content) {
+    return truncatePreview(content
+        .map((block) => (block.type === "text" ? block.text : `[${block.mimeType} image]`))
+        .join(" ")
+        .trim() || "(empty result)");
+}
+function previewArgs(args) {
+    const text = JSON.stringify(args);
+    return text === undefined ? "" : truncatePreview(text);
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function errorLabel(error) {
+    return error instanceof Error ? `${error.name}: ${error.message}` : String(error);
+}
+function formatProgress(label, progress) {
+    const total = progress.total === undefined ? "" : `/${progress.total}`;
+    const message = progress.message === undefined ? "" : ` ${progress.message}`;
+    return `${label} progress ${progress.progress}${total}${message}`.trim();
+}
+function truncatePreview(value) {
+    return value.length <= 120 ? value : `${value.slice(0, 117)}...`;
+}
+function compareCatalogEntries(left, right) {
+    return left.server.localeCompare(right.server) || left.tool.localeCompare(right.tool);
+}
+function buildActiveToolNames(entries, activeEntries, warn) {
+    const activeKeys = new Set(activeEntries.map(catalogEntryKey));
+    const sorted = [...entries].sort(compareCatalogEntries);
+    const names = buildMcpToolNames(sorted.map((entry) => ({ serverName: entry.server, toolName: entry.tool })), warn);
+    return sorted
+        .map((entry, index) => (activeKeys.has(catalogEntryKey(entry)) ? (names[index] ?? "") : ""))
+        .filter((name) => name.length > 0)
+        .sort();
+}
+function catalogEntryKey(entry) {
+    return `${entry.server}\0${entry.tool}`;
+}
+//# sourceMappingURL=register.js.map

package/dist/core/extensions/builtin/mcp/expose/register.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/register.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AgentToolResult } from \"@earendil-works/pi-agent-core\";\nimport type { ImageContent, TextContent } from \"@earendil-works/pi-ai\";\nimport { Text } from \"@earendil-works/pi-tui\";\nimport type { Progress } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { TSchema } from \"typebox\";\nimport type { ExtensionAPI, ToolDefinition } from \"../../../types.ts\";\nimport { registerToolsPreservingActiveSet } from \"../active-set.ts\";\nimport type { McpToolCatalogEntry } from \"../catalog.ts\";\nimport { ToolExecError } from \"../errors.ts\";\nimport { applyMcpOutputGuard } from \"../guard/output-guard.ts\";\nimport { ensureMcpToolCallConnection, withMcpRetriableFailedSendRetry, withMcpSessionExpiryRetry } from \"../health.ts\";\nimport { runMcpConnectionLifecycleCall } from \"../idle.ts\";\nimport {\n\tbuildMcpToolNames,\n\tconvertJsonSchemaToTypeBox,\n\ttype McpContentBlock,\n\ttype McpMappedContentBlock,\n\ttype McpToolResultLike,\n\tmapMcpToolResult,\n} from \"./schema-compat.ts\";\n\nexport interface McpToolDetails {\n\tserver: string;\n\ttool: string;\n\tpreview?: string;\n\tprogress?: Progress;\n}\n\ntype McpAgentContent = TextContent | ImageContent;\nexport type McpToolDefinition = ToolDefinition<TSchema, McpToolDetails | undefined, unknown>;\ntype WarnFn = (message: string) => void;\n\nexport interface McpCatalogRegistrationOptions {\n\treadonly refreshActiveSetWhenEmpty?: boolean;\n}\n\nexport function registerMcpCatalogTools(\n\tpi: Pick<ExtensionAPI, \"getActiveTools\" | \"setActiveTools\" | \"registerTool\">,\n\tentries: readonly McpToolCatalogEntry[],\n\tactiveEntries: readonly McpToolCatalogEntry[],\n\twarn?: WarnFn,\n\toptions: McpCatalogRegistrationOptions = {},\n): void {\n\tif (entries.length === 0 && activeEntries.length === 0 && options.refreshActiveSetWhenEmpty !== true) return;\n\tconst tools = buildMcpToolDefinitions(entries, warn);\n\tconst currentActive = pi.getActiveTools().filter((name) => !name.startsWith(\"mcp_\"));\n\tconst mcpNames = buildActiveToolNames(entries, activeEntries, warn);\n\tregisterToolsPreservingActiveSet(pi, tools, [...currentActive, ...mcpNames]);\n}\n\nexport interface McpNamedCatalogEntry {\n\treadonly entry: McpToolCatalogEntry;\n\treadonly name: string;\n}\n\n/** Pair each catalog entry with its stable, collision-resolved mcp tool name.\n * Shared by the full-tool builder and the Tier-B search catalog so names never\n * drift between the two. */\nexport function mapMcpCatalogNames(entries: readonly McpToolCatalogEntry[], warn?: WarnFn): McpNamedCatalogEntry[] {\n\tconst sorted = [...entries].sort(compareCatalogEntries);\n\tconst names = buildMcpToolNames(\n\t\tsorted.map((entry) => ({ serverName: entry.server, toolName: entry.tool })),\n\t\twarn,\n\t);\n\treturn sorted.map((entry, index) => ({ entry, name: names[index] ?? \"\" }));\n}\n\nexport function buildMcpToolDefinitions(entries: readonly McpToolCatalogEntry[], warn?: WarnFn): McpToolDefinition[] {\n\treturn mapMcpCatalogNames(entries, warn).map(({ entry, name }) => createMcpToolDefinition(entry, name));\n}\n\nfunction createMcpToolDefinition(entry: McpToolCatalogEntry, name: string): McpToolDefinition {\n\tconst converted = convertJsonSchemaToTypeBox(entry.schema);\n\tconst label = `${entry.server}/${entry.tool}`;\n\treturn {\n\t\tname,\n\t\tlabel,\n\t\tdescription: entry.description ?? `MCP tool ${label}`,\n\t\tparameters: converted.schema,\n\t\texecutionMode: \"parallel\",\n\t\tasync execute(_toolCallId, params, signal, onUpdate): Promise<AgentToolResult<McpToolDetails | undefined>> {\n\t\t\tconst args: Record<string, unknown> = isRecord(params) ? params : {};\n\t\t\treturn await executeMcpCatalogEntry(entry, args, signal, onUpdate);\n\t\t},\n\t\trenderCall(args, theme) {\n\t\t\treturn new Text(theme.fg(\"toolTitle\", theme.bold(`${name} ${previewArgs(args)}`.trim())), 0, 0);\n\t\t},\n\t\trenderResult(result, options, theme) {\n\t\t\tconst title = options.isPartial\n\t\t\t\t? `${name}: running`\n\t\t\t\t: `${name}: ${result.details?.preview ?? \"(empty result)\"}`;\n\t\t\treturn new Text(theme.fg(\"toolOutput\", title), 0, 0);\n\t\t},\n\t};\n}\n\n/** Full guarded call path for one catalog entry (lifecycle + retry + output\n * guard). Shared by direct/search tool definitions and the Tier-C proxy. */\nexport async function executeMcpCatalogEntry(\n\tentry: McpToolCatalogEntry,\n\targs: Record<string, unknown>,\n\tsignal: AbortSignal | undefined,\n\tonUpdate: Parameters<McpToolDefinition[\"execute\"]>[3],\n): Promise<AgentToolResult<McpToolDetails | undefined>> {\n\tconst label = `${entry.server}/${entry.tool}`;\n\tconst result = await callMcpTool(entry, args, signal, onUpdate, label);\n\tconst mapped = mapMcpToolResult(normalizeCallToolResult(result));\n\tif (!mapped.ok) {\n\t\tthrow new ToolExecError(mapped.error.message, { phase: \"call\", serverName: entry.server });\n\t}\n\tconst guarded = await applyMcpOutputGuard(mapped.content, {\n\t\tagentDir: entry.agentDir,\n\t\toutputGuard: entry.outputGuard,\n\t\tserver: entry.server,\n\t});\n\tconst content = toAgentContent(guarded);\n\treturn { content, details: { preview: previewContent(content), server: entry.server, tool: entry.tool } };\n}\n\nasync function callMcpTool(\n\tentry: McpToolCatalogEntry,\n\targs: Record<string, unknown>,\n\tsignal: AbortSignal | undefined,\n\tonUpdate: Parameters<McpToolDefinition[\"execute\"]>[3],\n\tlabel: string,\n): Promise<Awaited<ReturnType<McpToolCatalogEntry[\"connection\"][\"client\"][\"callTool\"]>>> {\n\ttry {\n\t\treturn await runMcpConnectionLifecycleCall(entry.connection, () =>\n\t\t\twithMcpSessionExpiryRetry(entry.connection, async () => {\n\t\t\t\tawait ensureMcpToolCallConnection(entry.connection, entry.ensureFresh);\n\t\t\t\tawait entry.ensureConnected?.();\n\t\t\t\treturn await withMcpRetriableFailedSendRetry(entry.connection, async () => {\n\t\t\t\t\treturn await entry.connection.client.callTool({ name: entry.tool, arguments: args }, undefined, {\n\t\t\t\t\t\tonprogress: (progress) => {\n\t\t\t\t\t\t\tonUpdate?.({\n\t\t\t\t\t\t\t\tcontent: [{ type: \"text\", text: formatProgress(label, progress) }],\n\t\t\t\t\t\t\t\tdetails: { progress, server: entry.server, tool: entry.tool },\n\t\t\t\t\t\t\t});\n\t\t\t\t\t\t},\n\t\t\t\t\t\tsignal,\n\t\t\t\t\t\ttimeout: entry.requestTimeoutMs,\n\t\t\t\t\t});\n\t\t\t\t});\n\t\t\t}),\n\t\t);\n\t} catch (error) {\n\t\tthrow new ToolExecError(`ToolExecError: ${errorLabel(error)}`, {\n\t\t\tcause: error,\n\t\t\tphase: \"call\",\n\t\t\tserverName: entry.server,\n\t\t});\n\t}\n}\n\nfunction normalizeCallToolResult(\n\tresult: Awaited<ReturnType<McpToolCatalogEntry[\"connection\"][\"client\"][\"callTool\"]>>,\n): McpToolResultLike {\n\tif (\"content\" in result || \"structuredContent\" in result || \"isError\" in result) {\n\t\tconst candidate = result as Record<string, unknown>;\n\t\tconst normalized: McpToolResultLike = {};\n\t\tif (isMcpContentBlockArray(candidate.content)) normalized.content = candidate.content;\n\t\tif (typeof candidate.isError === \"boolean\") normalized.isError = candidate.isError;\n\t\tif (\"structuredContent\" in candidate) normalized.structuredContent = candidate.structuredContent;\n\t\treturn normalized;\n\t}\n\treturn { structuredContent: result.toolResult };\n}\n\nfunction isMcpContentBlockArray(value: unknown): value is McpContentBlock[] {\n\treturn Array.isArray(value);\n}\n\nfunction toAgentContent(blocks: readonly McpMappedContentBlock[]): McpAgentContent[] {\n\treturn blocks.map((block) => {\n\t\tif (block.type === \"text\" || block.type === \"image\") return block;\n\t\treturn { type: \"text\", text: JSON.stringify(block) };\n\t});\n}\n\nfunction previewContent(content: readonly McpAgentContent[]): string {\n\treturn truncatePreview(\n\t\tcontent\n\t\t\t.map((block) => (block.type === \"text\" ? block.text : `[${block.mimeType} image]`))\n\t\t\t.join(\" \")\n\t\t\t.trim() || \"(empty result)\",\n\t);\n}\n\nfunction previewArgs(args: unknown): string {\n\tconst text = JSON.stringify(args);\n\treturn text === undefined ? \"\" : truncatePreview(text);\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n\nfunction errorLabel(error: unknown): string {\n\treturn error instanceof Error ? `${error.name}: ${error.message}` : String(error);\n}\n\nfunction formatProgress(label: string, progress: Progress): string {\n\tconst total = progress.total === undefined ? \"\" : `/${progress.total}`;\n\tconst message = progress.message === undefined ? \"\" : ` ${progress.message}`;\n\treturn `${label} progress ${progress.progress}${total}${message}`.trim();\n}\n\nfunction truncatePreview(value: string): string {\n\treturn value.length <= 120 ? value : `${value.slice(0, 117)}...`;\n}\n\nfunction compareCatalogEntries(left: McpToolCatalogEntry, right: McpToolCatalogEntry): number {\n\treturn left.server.localeCompare(right.server) || left.tool.localeCompare(right.tool);\n}\n\nfunction buildActiveToolNames(\n\tentries: readonly McpToolCatalogEntry[],\n\tactiveEntries: readonly McpToolCatalogEntry[],\n\twarn?: WarnFn,\n): string[] {\n\tconst activeKeys = new Set(activeEntries.map(catalogEntryKey));\n\tconst sorted = [...entries].sort(compareCatalogEntries);\n\tconst names = buildMcpToolNames(\n\t\tsorted.map((entry) => ({ serverName: entry.server, toolName: entry.tool })),\n\t\twarn,\n\t);\n\treturn sorted\n\t\t.map((entry, index) => (activeKeys.has(catalogEntryKey(entry)) ? (names[index] ?? \"\") : \"\"))\n\t\t.filter((name) => name.length > 0)\n\t\t.sort();\n}\n\nfunction catalogEntryKey(entry: McpToolCatalogEntry): string {\n\treturn `${entry.server}\\0${entry.tool}`;\n}\n"]}

package/dist/core/extensions/builtin/mcp/expose/schema-compat.d.ts

@@ -0,0 +1,68 @@
+import type { ImageContent, TextContent } from "@earendil-works/pi-ai";
+import { type TSchema } from "typebox";
+import { buildMcpToolName, buildMcpToolNames, type McpToolNameEntry } from "./naming.ts";
+import { collectAllPages, type McpListPage, type McpPaginationResult } from "./pagination.ts";
+export type { McpListPage, McpPaginationResult, McpToolNameEntry };
+export { buildMcpToolName, buildMcpToolNames, collectAllPages };
+interface SchemaConversionResult {
+    schema: TSchema;
+    warnings: string[];
+}
+interface OutputSchemaRetryResult {
+    schema: Record<string, unknown>;
+    warnings: string[];
+}
+export type McpContentBlock = {
+    type: "text";
+    text?: unknown;
+} | {
+    type: "image";
+    data?: unknown;
+    mimeType?: unknown;
+} | {
+    type: "audio";
+    data?: unknown;
+    mimeType?: unknown;
+} | {
+    type: "resource";
+    resource?: unknown;
+} | {
+    type: "resource_link";
+    uri?: unknown;
+    name?: unknown;
+    description?: unknown;
+    mimeType?: unknown;
+} | Record<string, unknown>;
+export type McpMappedContentBlock = TextContent | ImageContent | {
+    type: "audio";
+    data: string;
+    mimeType: string;
+} | {
+    type: "resource";
+    resource: unknown;
+} | {
+    type: "resource_link";
+    uri: string;
+    name?: string;
+    description?: string;
+    mimeType?: string;
+};
+export interface McpToolResultLike {
+    content?: McpContentBlock[];
+    structuredContent?: unknown;
+    isError?: boolean;
+}
+export type McpMappedToolResult = {
+    ok: true;
+    content: McpMappedContentBlock[];
+} | {
+    ok: false;
+    error: {
+        message: string;
+        content: McpMappedContentBlock[];
+    };
+};
+export declare function convertJsonSchemaToTypeBox(schema: unknown): SchemaConversionResult;
+export declare function prepareOutputSchemaRetry(schema: unknown): OutputSchemaRetryResult;
+export declare function mapMcpToolResult(result: McpToolResultLike): McpMappedToolResult;
+//# sourceMappingURL=schema-compat.d.ts.map

package/dist/core/extensions/builtin/mcp/expose/schema-compat.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema-compat.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/schema-compat.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,KAAK,OAAO,EAAQ,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,eAAe,EAAE,KAAK,WAAW,EAAE,KAAK,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAE9F,YAAY,EAAE,WAAW,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,eAAe,EAAE,CAAC;AAEhE,UAAU,sBAAsB;IAC/B,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,UAAU,uBAAuB;IAChC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,QAAQ,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,MAAM,eAAe,GACxB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,GAChC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GACrD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GACrD;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GACxC;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GACnG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE3B,MAAM,MAAM,qBAAqB,GAC9B,WAAW,GACX,YAAY,GACZ;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,GACvC;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAElG,MAAM,WAAW,iBAAiB;IACjC,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAC5B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,mBAAmB,GAC5B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,qBAAqB,EAAE,CAAA;CAAE,GAC9C;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,qBAAqB,EAAE,CAAA;KAAE,CAAA;CAAE,CAAC;AAI/E,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,OAAO,GAAG,sBAAsB,CAalF;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,OAAO,GAAG,uBAAuB,CAYjF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,iBAAiB,GAAG,mBAAmB,CAM/E"}

package/dist/core/extensions/builtin/mcp/expose/schema-compat.js

@@ -0,0 +1,136 @@
+import { Type } from "typebox";
+import { buildMcpToolName, buildMcpToolNames } from "./naming.js";
+import { collectAllPages } from "./pagination.js";
+export { buildMcpToolName, buildMcpToolNames, collectAllPages };
+const PERMISSIVE_OBJECT_SCHEMA = { type: "object", properties: {} };
+export function convertJsonSchemaToTypeBox(schema) {
+    const warnings = [];
+    const resolved = resolveRefs(stripTopLevelSchemaKeys(schema), schema, new Set(), warnings);
+    if (warnings.length > 0) {
+        return { schema: Type.Unsafe({ ...PERMISSIVE_OBJECT_SCHEMA }), warnings };
+    }
+    if (!isRecord(resolved)) {
+        return {
+            schema: Type.Unsafe({ ...PERMISSIVE_OBJECT_SCHEMA }),
+            warnings: ["MCP schema is not an object; using permissive object schema."],
+        };
+    }
+    return { schema: Type.Unsafe(resolved), warnings };
+}
+export function prepareOutputSchemaRetry(schema) {
+    const warnings = [];
+    const record = isRecord(schema) ? { ...schema } : { ...PERMISSIVE_OBJECT_SCHEMA };
+    if (hasOwn(record, "$schema")) {
+        delete record.$schema;
+        warnings.push("Stripped top-level $schema from MCP outputSchema retry.");
+    }
+    if (hasOwn(record, "additionalProperties")) {
+        delete record.additionalProperties;
+        warnings.push("Stripped top-level additionalProperties from MCP outputSchema retry.");
+    }
+    return { schema: record, warnings };
+}
+export function mapMcpToolResult(result) {
+    const content = mapMcpContent(result);
+    if (result.isError === true) {
+        return { ok: false, error: { message: contentToErrorMessage(content), content } };
+    }
+    return { ok: true, content };
+}
+function mapMcpContent(result) {
+    const content = [];
+    for (const block of result.content ?? []) {
+        content.push(mapContentBlock(block));
+    }
+    if (result.structuredContent !== undefined) {
+        content.push({ type: "text", text: stringifyJson(result.structuredContent) });
+    }
+    if (content.length === 0) {
+        content.push({ type: "text", text: "(empty result)" });
+    }
+    return content;
+}
+function mapContentBlock(block) {
+    if (block.type === "text") {
+        return { type: "text", text: typeof block.text === "string" ? block.text : stringifyJson(block.text) };
+    }
+    if (block.type === "image" && typeof block.data === "string" && typeof block.mimeType === "string") {
+        return { type: "image", data: block.data, mimeType: block.mimeType };
+    }
+    if (block.type === "audio" && typeof block.data === "string" && typeof block.mimeType === "string") {
+        return { type: "audio", data: block.data, mimeType: block.mimeType };
+    }
+    if (block.type === "resource" && hasOwn(block, "resource")) {
+        return { type: "resource", resource: block.resource };
+    }
+    if (block.type === "resource_link" && typeof block.uri === "string") {
+        return {
+            type: "resource_link",
+            uri: block.uri,
+            ...(typeof block.name === "string" ? { name: block.name } : {}),
+            ...(typeof block.description === "string" ? { description: block.description } : {}),
+            ...(typeof block.mimeType === "string" ? { mimeType: block.mimeType } : {}),
+        };
+    }
+    return { type: "text", text: stringifyJson(block) };
+}
+function contentToErrorMessage(content) {
+    const firstText = content.find((block) => block.type === "text");
+    return firstText?.text.trim() || "MCP tool returned an error result.";
+}
+function stripTopLevelSchemaKeys(schema) {
+    if (!isRecord(schema))
+        return schema;
+    const result = { ...schema };
+    delete result.$schema;
+    delete result.additionalProperties;
+    return result;
+}
+function resolveRefs(value, root, seenRefs, warnings) {
+    if (Array.isArray(value)) {
+        return value.map((entry) => resolveRefs(entry, root, seenRefs, warnings));
+    }
+    if (!isRecord(value))
+        return value;
+    if (typeof value.$ref === "string") {
+        const ref = value.$ref;
+        const resolved = resolveLocalRef(root, ref);
+        if (resolved === undefined || seenRefs.has(ref)) {
+            warnings.push(`MCP schema contains unresolvable $ref '${ref}'; using permissive object schema.`);
+            return { ...PERMISSIVE_OBJECT_SCHEMA };
+        }
+        const nextSeenRefs = new Set(seenRefs);
+        nextSeenRefs.add(ref);
+        return resolveRefs(resolved, root, nextSeenRefs, warnings);
+    }
+    const result = {};
+    for (const [key, child] of Object.entries(value)) {
+        result[key] = resolveRefs(child, root, seenRefs, warnings);
+    }
+    return result;
+}
+function resolveLocalRef(root, ref) {
+    if (!ref.startsWith("#/"))
+        return undefined;
+    let current = root;
+    for (const part of ref
+        .slice(2)
+        .split("/")
+        .map((segment) => segment.replace(/~1/g, "/").replace(/~0/g, "~"))) {
+        if (!isRecord(current) || !(part in current))
+            return undefined;
+        current = current[part];
+    }
+    return current;
+}
+function stringifyJson(value) {
+    const text = JSON.stringify(value);
+    return text ?? String(value);
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function hasOwn(value, key) {
+    return Object.getOwnPropertyDescriptor(value, key) !== undefined;
+}
+//# sourceMappingURL=schema-compat.js.map