@esankhan3/anvil-agent-core 0.1.2 → 0.2.0

package/dist/mcp/client.js

@@ -1,36 +1,76 @@
 /**
  * `McpAgentClient` — wraps the official MCP TypeScript SDK with the lifecycle
- * Anvil's agent layer needs (lazy connect, tool listing with namespacing,
- * tool dispatch, clean close).
+ * Anvil's agent layer needs (lazy connect, namespaced tool listing, tool
+ * dispatch with cancellation, progress notifications, EOF reconnect, clean
+ * close).
  *
- * One instance per configured MCP server. The agent's tool-call loop owns
- * close() so subprocesses don't leak between invocations.
+ * One instance per configured MCP server. `McpClientPool` owns multiple
+ * instances per workspace and shares them across the agent's lifetime so
+ * resume turns don't re-pay the connect cost.
+ *
+ * Naming convention: tools are surfaced as `mcp__<server>__<tool>` (double
+ * underscore, matching Claude Code / Anthropic SDK). The bare tool name is
+ * sent to the server during dispatch.
  */
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { mkdirSync, createWriteStream } from 'node:fs';
+import { join } from 'node:path';
+import { homedir } from 'node:os';
 import { VERSION } from '../version.js';
 const CLIENT_NAME = 'anvil-agent';
+/** Prefix every MCP-sourced tool with `mcp__<server>__` so it can never
+ *  collide with a builtin and so the model recognizes the Claude-Code-
+ *  established convention. */
+export const MCP_NAME_PREFIX = 'mcp__';
+export function mcpToolName(serverName, toolName) {
+    return `${MCP_NAME_PREFIX}${serverName}__${toolName}`;
+}
 export class McpAgentClient {
     config;
     client;
     connected = false;
-    constructor(config) {
+    connecting;
+    stderrStream;
+    opts;
+    /** Tracks request ids cancelled via `cancelInFlight`. */
+    cancelControllers = new Set();
+    constructor(config, opts = {}) {
         this.config = config;
+        this.opts = opts;
         this.client = new Client({ name: CLIENT_NAME, version: VERSION }, { capabilities: {} });
+        this.wireProgressHandler();
     }
+    // ── Connection lifecycle ───────────────────────────────────────────────
     async connect() {
         if (this.connected)
             return;
+        // Coalesce concurrent first-use; every caller awaits the same promise.
+        if (this.connecting)
+            return this.connecting;
+        this.connecting = this._connect().finally(() => {
+            this.connecting = undefined;
+        });
+        return this.connecting;
+    }
+    async _connect() {
         if (this.config.transport === 'stdio') {
             if (!this.config.command) {
                 throw new Error(`MCP server "${this.config.name}" has stdio transport but no command`);
             }
+            this.openStderrLog();
             const transport = new StdioClientTransport({
                 command: this.config.command,
                 args: this.config.args ?? [],
                 env: this.config.env,
+                // Capture stderr so the protocol JSON on stdout isn't polluted +
+                // give the user something to grep when an MCP server misbehaves.
+                stderr: this.stderrStream ? 'pipe' : 'inherit',
             });
+            if (this.stderrStream && transport.stderr) {
+                transport.stderr.pipe(this.stderrStream);
+            }
             await this.client.connect(transport);
         }
         else {
@@ -44,49 +84,173 @@ export class McpAgentClient {
         }
         this.connected = true;
     }
-    /**
-     * Returns the server's tools, namespaced as `<serverName>/<toolName>` so
-     * multiple MCP servers exposing identically-named tools don't collide in
-     * the agent's flat tool registry.
-     */
+    openStderrLog() {
+        if (this.stderrStream || this.config.transport !== 'stdio')
+            return;
+        const dir = this.opts.stderrLogDir ?? join(homedir(), '.anvil', 'mcp-logs');
+        try {
+            mkdirSync(dir, { recursive: true });
+            const suffix = this.opts.runId ? `-${this.opts.runId}` : '';
+            const path = join(dir, `${safeFileName(this.config.name)}${suffix}.log`);
+            this.stderrStream = createWriteStream(path, { flags: 'a' });
+            this.stderrStream.write(`\n--- mcp server "${this.config.name}" started ${new Date().toISOString()} ---\n`);
+        }
+        catch {
+            // Log capture is best-effort; fall back to inherit (stderr to process).
+            this.stderrStream = undefined;
+        }
+    }
+    // ── Tool discovery + dispatch ──────────────────────────────────────────
     async listTools() {
         if (!this.connected)
             await this.connect();
         const result = await this.client.listTools();
-        return result.tools.map((t) => ({
-            name: `${this.config.name}/${t.name}`,
-            description: t.description ?? '',
-            inputSchema: t.inputSchema ?? {},
-        }));
+        return result.tools.map((t) => {
+            const ann = t.annotations;
+            const annotations = {
+                readOnly: ann?.readOnlyHint ?? heuristicReadOnly(t.name),
+                destructive: ann?.destructiveHint,
+                idempotent: ann?.idempotentHint,
+                openWorld: ann?.openWorldHint,
+            };
+            const namespaced = mcpToolName(this.config.name, t.name);
+            const description = decorateDescription(t.description ?? '', this.config.name, annotations);
+            return {
+                name: namespaced,
+                bareName: t.name,
+                serverName: this.config.name,
+                schema: {
+                    name: namespaced,
+                    description,
+                    inputSchema: t.inputSchema ?? { type: 'object' },
+                },
+                annotations,
+            };
+        });
     }
     /**
      * Dispatch a tool call. Accepts either the namespaced form
-     * (`<server>/<tool>`) or the bare tool name; strips the server prefix
-     * before forwarding to the SDK.
+     * (`mcp__<server>__<tool>`) or the bare tool name. Cancellation is wired
+     * via an AbortController stored in `cancelControllers` — `cancelInFlight`
+     * aborts every pending call.
      */
-    async callTool(toolName, args) {
+    async callTool(toolName, args, signal) {
         if (!this.connected)
             await this.connect();
-        const prefix = `${this.config.name}/`;
-        const stripped = toolName.startsWith(prefix) ? toolName.slice(prefix.length) : toolName;
-        const result = await this.client.callTool({
-            name: stripped,
-            arguments: args,
-        });
-        return result;
+        const bare = stripMcpPrefix(toolName, this.config.name);
+        const inner = new AbortController();
+        this.cancelControllers.add(inner);
+        if (signal) {
+            if (signal.aborted)
+                inner.abort(signal.reason);
+            else
+                signal.addEventListener('abort', () => inner.abort(signal.reason), { once: true });
+        }
+        try {
+            // The SDK's callTool accepts an AbortSignal in the request options —
+            // it emits `notifications/cancelled` on the wire when fired.
+            const result = await this.client.callTool({ name: bare, arguments: args }, undefined, {
+                signal: inner.signal,
+            });
+            return result;
+        }
+        finally {
+            this.cancelControllers.delete(inner);
+        }
+    }
+    /** Abort every in-flight tool call. Used on agent kill. */
+    cancelInFlight(reason) {
+        for (const c of this.cancelControllers) {
+            try {
+                c.abort(reason ?? 'cancelled');
+            }
+            catch { /* ok */ }
+        }
+        this.cancelControllers.clear();
     }
     async close() {
-        if (!this.connected)
+        this.cancelInFlight('client closed');
+        if (!this.connected) {
+            this.stderrStream?.end();
+            this.stderrStream = undefined;
             return;
+        }
         try {
             await this.client.close();
         }
         finally {
             this.connected = false;
+            this.stderrStream?.end();
+            this.stderrStream = undefined;
         }
     }
     isConnected() {
         return this.connected;
     }
+    // ── Progress wiring ────────────────────────────────────────────────────
+    wireProgressHandler() {
+        if (!this.opts.onProgress)
+            return;
+        const onProgress = this.opts.onProgress;
+        // The MCP SDK exposes progress via notification handlers — register a
+        // generic one and re-emit through the caller's callback. The
+        // notification name space: `notifications/progress`.
+        const fallbackProgress = (ev) => onProgress(ev);
+        // setNotificationHandler is the public hook on the Client class —
+        // the SDK calls it for every server-initiated notification matching
+        // the schema's method.
+        try {
+            this.client.setNotificationHandler({ method: 'notifications/progress' }, (n) => {
+                const p = n.params ?? {};
+                fallbackProgress({
+                    serverName: this.config.name,
+                    toolName: String(p.progressToken ?? ''),
+                    progress: typeof p.progress === 'number' ? p.progress : 0,
+                    total: typeof p.total === 'number' ? p.total : undefined,
+                    message: typeof p.message === 'string' ? p.message : undefined,
+                });
+            });
+        }
+        catch {
+            // Older SDK versions may not expose setNotificationHandler the same way;
+            // progress is a nice-to-have, not a blocker.
+        }
+    }
+}
+// ── Helpers ────────────────────────────────────────────────────────────
+function stripMcpPrefix(toolName, serverName) {
+    const prefix = `${MCP_NAME_PREFIX}${serverName}__`;
+    if (toolName.startsWith(prefix))
+        return toolName.slice(prefix.length);
+    // Legacy `<server>/<tool>` form — accept for backward compat with old
+    // tool-merger.ts callers that may still be hanging around.
+    const legacy = `${serverName}/`;
+    if (toolName.startsWith(legacy))
+        return toolName.slice(legacy.length);
+    return toolName;
+}
+function safeFileName(s) {
+    return s.replace(/[^a-zA-Z0-9_.-]+/g, '_');
+}
+const READONLY_VERBS = /^(read|get|list|search|find|query|describe|inspect|count|fetch|view|show)/i;
+function heuristicReadOnly(toolName) {
+    // Fallback when the server hasn't declared `readOnlyHint`. Permissive on
+    // purpose — a misclassification merely surfaces the call to the dest./
+    // allowlist filter, which has the last word.
+    return READONLY_VERBS.test(toolName);
+}
+function decorateDescription(raw, serverName, annotations) {
+    // Tag the description with the server name + behavior hints so the model
+    // can pick between overlapping tools (filesystem-mcp:read vs builtin
+    // read_file). Best practice across Claude Code / Goose / Cursor.
+    const hints = [];
+    if (annotations.destructive)
+        hints.push('destructive');
+    else if (annotations.readOnly)
+        hints.push('read-only');
+    if (annotations.idempotent)
+        hints.push('idempotent');
+    const tag = hints.length > 0 ? ` [${hints.join(', ')}]` : '';
+    return `(via ${serverName} MCP${tag}) ${raw}`.trim();
 }
 //# sourceMappingURL=client.js.map

package/dist/mcp/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/mcp/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/mcp/client.ts"],"names":[],"mappings":"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"}

package/dist/mcp/index.d.ts

@@ -3,10 +3,13 @@
  *
  * Companion to `code-search-mcp` (which is the MCP *server* Anvil already
  * publishes). The client side lets Anvil's agent connect to OTHER MCP
- * servers configured per project.
+ * servers configured per project — surfacing their tools to non-Claude
+ * adapters too via `MergedToolExecutor`.
  */
 export type { McpTransport, McpServerConfig, McpServerEntry, McpServersFile, } from './types.js';
 export { loadMcpServers, findMcpConfigPath, type LoadMcpServersOptions, } from './config-loader.js';
-export { McpAgentClient } from './client.js';
+export { McpAgentClient, mcpToolName, MCP_NAME_PREFIX, type McpClientOpts, type McpToolDescriptor, type McpToolAnnotations, type McpProgressEvent, } from './client.js';
 export { buildAgentToolset, type AgentToolset, } from './tool-merger.js';
+export { McpClientPool, type McpClientPoolOpts, } from './pool.js';
+export { MergedToolExecutor, type MergedToolExecutorOpts, } from './merged-executor.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/mcp/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,EACV,YAAY,EACZ,eAAe,EACf,cAAc,EACd,cAAc,GACf,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,KAAK,qBAAqB,GAC3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EACL,iBAAiB,EACjB,KAAK,YAAY,GAClB,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,YAAY,EACV,YAAY,EACZ,eAAe,EACf,cAAc,EACd,cAAc,GACf,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,KAAK,qBAAqB,GAC3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,cAAc,EACd,WAAW,EACX,eAAe,EACf,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,GACtB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,iBAAiB,EACjB,KAAK,YAAY,GAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,aAAa,EACb,KAAK,iBAAiB,GACvB,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,kBAAkB,EAClB,KAAK,sBAAsB,GAC5B,MAAM,sBAAsB,CAAC"}

package/dist/mcp/index.js

@@ -1,11 +1,6 @@
-/**
- * @esankhan3/anvil-agent-core/mcp — Model Context Protocol *client*-side helpers.
- *
- * Companion to `code-search-mcp` (which is the MCP *server* Anvil already
- * publishes). The client side lets Anvil's agent connect to OTHER MCP
- * servers configured per project.
- */
 export { loadMcpServers, findMcpConfigPath, } from './config-loader.js';
-export { McpAgentClient } from './client.js';
+export { McpAgentClient, mcpToolName, MCP_NAME_PREFIX, } from './client.js';
 export { buildAgentToolset, } from './tool-merger.js';
+export { McpClientPool, } from './pool.js';
+export { MergedToolExecutor, } from './merged-executor.js';
 //# sourceMappingURL=index.js.map

package/dist/mcp/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAQH,OAAO,EACL,cAAc,EACd,iBAAiB,GAElB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EACL,iBAAiB,GAElB,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":"AAcA,OAAO,EACL,cAAc,EACd,iBAAiB,GAElB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,cAAc,EACd,WAAW,EACX,eAAe,GAKhB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,iBAAiB,GAElB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,aAAa,GAEd,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,kBAAkB,GAEnB,MAAM,sBAAsB,CAAC"}

package/dist/mcp/merged-executor.d.ts

@@ -0,0 +1,74 @@
+/**
+ * `MergedToolExecutor` — a `ToolExecutor` that exposes both the seven
+ * builtin tools and every tool advertised by an `McpClientPool`. The
+ * non-Claude adapters (Ollama, OpenRouter, OpenCode, OpenAI, Gemini, ADK)
+ * consume this as `config.toolExecutor` and gain MCP support transparently.
+ *
+ * Naming convention: builtins keep their bare names (`read_file`, `bash`);
+ * MCP tools are `mcp__<server>__<tool>`. The dispatch chain in `execute`
+ * routes by name.
+ *
+ * Per-stage `allowedTools` filtering supports two forms:
+ *   - exact name: `"read_file"`, `"mcp__github__create_issue"`
+ *   - per-server glob: `"mcp__github__*"` matches every tool from
+ *     `github` server.
+ *
+ * Destructive-tier guard: if a MCP tool's annotations declare
+ * `destructive: true` AND the stage's allowlist doesn't explicitly name it
+ * (only matched by glob), it's hidden from `listSchemas`. Stages that need
+ * a destructive MCP tool must list it by full name. Prevents the model
+ * from being handed `mcp__filesystem__delete_file` just because the stage
+ * had `mcp__filesystem__*`.
+ */
+import type { ToolCall, ToolSchema } from '../types.js';
+import type { ExecCtx, ToolExecutor, ToolResult } from '../tools/types.js';
+import { BuiltinToolExecutor } from '../tools/builtin.js';
+import type { McpClientPool } from './pool.js';
+export interface MergedToolExecutorOpts {
+    builtin: BuiltinToolExecutor;
+    pool?: McpClientPool;
+    /** Stage-policy allow list. Pass-through of `req.allowedTools`. */
+    allowedTools?: string[];
+    /** Surface MCP call resolution onto telemetry / activity feed. */
+    onMcpCallStart?: (info: {
+        tool: string;
+        serverName: string;
+    }) => void;
+    onMcpCallEnd?: (info: {
+        tool: string;
+        serverName: string;
+        durationMs: number;
+        isError: boolean;
+    }) => void;
+}
+export declare class MergedToolExecutor implements ToolExecutor {
+    private readonly builtin;
+    private readonly pool?;
+    private readonly allowedExact;
+    private readonly allowedGlobs;
+    private readonly allowAllBuiltins;
+    private readonly onStart?;
+    private readonly onEnd?;
+    /** Lazily populated by `listSchemas` once MCP discovery has run. */
+    private mcpDescriptors;
+    constructor(opts: MergedToolExecutorOpts);
+    /**
+     * Returns the union of builtin + MCP tool schemas, filtered by the
+     * stage's allowlist. Builtin filtering is delegated to BuiltinToolExecutor
+     * (which was already wired with `allowedTools`); MCP filtering happens
+     * here.
+     *
+     * NOTE: synchronous; reads the pool's cached tool list. Callers MUST
+     * call `prime()` once (awaitable) before the first `listSchemas` so MCP
+     * discovery has completed. After that the cache is hot.
+     */
+    listSchemas(): ToolSchema[];
+    /** Warm the MCP tool cache so a later sync `listSchemas` is complete. */
+    prime(): Promise<void>;
+    execute(call: ToolCall, ctx: ExecCtx): Promise<ToolResult>;
+    /** Show this descriptor at schema time? Apply destructive guard. */
+    private allowedForListing;
+    /** Allow this name at exec time? Defense-in-depth check vs listing. */
+    private allowedForExec;
+}
+//# sourceMappingURL=merged-executor.d.ts.map

package/dist/mcp/merged-executor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merged-executor.d.ts","sourceRoot":"","sources":["../../src/mcp/merged-executor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAG/C,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,mBAAmB,CAAC;IAC7B,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,mEAAmE;IACnE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,kEAAkE;IAClE,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACtE,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;CAC3G;AAED,qBAAa,kBAAmB,YAAW,YAAY;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgC;IAC7D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAU;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAA2C;IACpE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAyC;IAChE,oEAAoE;IACpE,OAAO,CAAC,cAAc,CAAoC;gBAE9C,IAAI,EAAE,sBAAsB;IAmBxC;;;;;;;;;OASG;IACH,WAAW,IAAI,UAAU,EAAE;IAU3B,yEAAyE;IACnE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtB,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IA+ChE,oEAAoE;IACpE,OAAO,CAAC,iBAAiB;IAgBzB,uEAAuE;IACvE,OAAO,CAAC,cAAc;CAcvB"}

package/dist/mcp/merged-executor.js

@@ -0,0 +1,198 @@
+export class MergedToolExecutor {
+    builtin;
+    pool;
+    allowedExact;
+    allowedGlobs;
+    allowAllBuiltins;
+    onStart;
+    onEnd;
+    /** Lazily populated by `listSchemas` once MCP discovery has run. */
+    mcpDescriptors = null;
+    constructor(opts) {
+        this.builtin = opts.builtin;
+        this.pool = opts.pool;
+        this.onStart = opts.onMcpCallStart;
+        this.onEnd = opts.onMcpCallEnd;
+        const allowed = opts.allowedTools ?? [];
+        this.allowedExact = new Set();
+        this.allowedGlobs = [];
+        this.allowAllBuiltins = allowed.length === 0;
+        for (const name of allowed) {
+            if (name.endsWith('__*') && name.startsWith('mcp__')) {
+                const serverName = name.slice('mcp__'.length, -3);
+                if (serverName.length > 0)
+                    this.allowedGlobs.push({ serverName });
+            }
+            else {
+                this.allowedExact.add(name);
+            }
+        }
+    }
+    /**
+     * Returns the union of builtin + MCP tool schemas, filtered by the
+     * stage's allowlist. Builtin filtering is delegated to BuiltinToolExecutor
+     * (which was already wired with `allowedTools`); MCP filtering happens
+     * here.
+     *
+     * NOTE: synchronous; reads the pool's cached tool list. Callers MUST
+     * call `prime()` once (awaitable) before the first `listSchemas` so MCP
+     * discovery has completed. After that the cache is hot.
+     */
+    listSchemas() {
+        const out = [...this.builtin.listSchemas()];
+        if (!this.mcpDescriptors)
+            return out;
+        for (const desc of this.mcpDescriptors) {
+            if (!this.allowedForListing(desc))
+                continue;
+            out.push(desc.schema);
+        }
+        return out;
+    }
+    /** Warm the MCP tool cache so a later sync `listSchemas` is complete. */
+    async prime() {
+        if (!this.pool || this.mcpDescriptors)
+            return;
+        this.mcpDescriptors = await this.pool.discoverTools();
+    }
+    async execute(call, ctx) {
+        if (!call.name.startsWith('mcp__')) {
+            // Builtin path — BuiltinToolExecutor enforces its own allowlist.
+            return this.builtin.execute(call, ctx);
+        }
+        if (!this.pool) {
+            return {
+                isError: true,
+                content: `Tool "${call.name}" requires an MCP server but no pool is configured.`,
+            };
+        }
+        if (!this.allowedForExec(call.name)) {
+            return {
+                isError: true,
+                content: `Tool "${call.name}" is not permitted in this stage.`,
+            };
+        }
+        const serverName = ownerFor(call.name);
+        if (!serverName) {
+            return { isError: true, content: `Cannot parse MCP server from "${call.name}".` };
+        }
+        const started = Date.now();
+        this.onStart?.({ tool: call.name, serverName });
+        try {
+            const result = await this.pool.callTool(call.name, call.arguments ?? {}, ctx.abortSignal);
+            const flattened = flattenMcpContent(result);
+            this.onEnd?.({
+                tool: call.name,
+                serverName,
+                durationMs: Date.now() - started,
+                isError: flattened.isError,
+            });
+            return flattened;
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            this.onEnd?.({
+                tool: call.name,
+                serverName,
+                durationMs: Date.now() - started,
+                isError: true,
+            });
+            return { isError: true, content: `MCP call failed: ${message}` };
+        }
+    }
+    // ── Filter logic ───────────────────────────────────────────────────────
+    /** Show this descriptor at schema time? Apply destructive guard. */
+    allowedForListing(desc) {
+        // Exact-match wins regardless of destructive flag.
+        if (this.allowedExact.has(desc.name))
+            return true;
+        if (this.allowAllBuiltins && !desc.annotations.destructive) {
+            // Empty allowlist means read-only fallback per BuiltinToolExecutor;
+            // mirror that for MCP tools so they aren't surfaced by default.
+            return false;
+        }
+        const matchesGlob = this.allowedGlobs.some((g) => g.serverName === desc.serverName);
+        if (!matchesGlob)
+            return false;
+        // Glob match: hide destructive tools unless the stage names them
+        // explicitly.
+        if (desc.annotations.destructive)
+            return false;
+        return true;
+    }
+    /** Allow this name at exec time? Defense-in-depth check vs listing. */
+    allowedForExec(name) {
+        if (this.allowAllBuiltins) {
+            // Match the listing default for empty allowlist.
+            return false;
+        }
+        if (this.allowedExact.has(name))
+            return true;
+        const owner = ownerFor(name);
+        if (!owner)
+            return false;
+        if (!this.allowedGlobs.some((g) => g.serverName === owner))
+            return false;
+        // Glob path: re-fetch annotations to gate destructive tools.
+        const desc = this.mcpDescriptors?.find((d) => d.name === name);
+        if (desc?.annotations.destructive)
+            return false;
+        return true;
+    }
+}
+// ── Helpers ────────────────────────────────────────────────────────────
+function ownerFor(toolName) {
+    if (!toolName.startsWith('mcp__'))
+        return undefined;
+    // mcp__<server>__<tool>; server may contain underscores. We split on the
+    // FIRST `__` after the prefix that's followed by a tool name with no
+    // `__`. Simpler: match `mcp__([^_]+(?:_[^_]+)*)__`.
+    const rest = toolName.slice('mcp__'.length);
+    // Look for the LAST `__` so the server name eats the rest.
+    const idx = rest.lastIndexOf('__');
+    if (idx < 0)
+        return undefined;
+    return rest.slice(0, idx);
+}
+/**
+ * Collapse the MCP SDK's structured `content[]` result into the
+ * `ToolResult` shape the builtin executor uses. Text parts concatenate;
+ * image / resource parts surface as `[image: <mime>]` placeholders so the
+ * model isn't fed binary garbage.
+ */
+function flattenMcpContent(raw) {
+    if (!raw || typeof raw !== 'object') {
+        return { isError: false, content: String(raw ?? '') };
+    }
+    const r = raw;
+    const parts = [];
+    if (Array.isArray(r.content)) {
+        for (const block of r.content) {
+            if (!block || typeof block !== 'object')
+                continue;
+            if (block.type === 'text' && typeof block.text === 'string') {
+                parts.push(block.text);
+            }
+            else if (block.type === 'image') {
+                parts.push(`[image: ${block.mimeType ?? 'unknown'}]`);
+            }
+            else if (block.type === 'resource') {
+                parts.push(`[resource]`);
+            }
+            else {
+                parts.push(`[${block.type ?? 'unknown'}]`);
+            }
+        }
+    }
+    if (parts.length === 0 && r.structuredContent !== undefined) {
+        try {
+            parts.push(JSON.stringify(r.structuredContent));
+        }
+        catch { /* ok */ }
+    }
+    return {
+        isError: r.isError === true,
+        content: parts.join('\n').trim() || '(empty)',
+    };
+}
+//# sourceMappingURL=merged-executor.js.map

package/dist/mcp/merged-executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merged-executor.js","sourceRoot":"","sources":["../../src/mcp/merged-executor.ts"],"names":[],"mappings":"AAsCA,MAAM,OAAO,kBAAkB;IACZ,OAAO,CAAsB;IAC7B,IAAI,CAAiB;IACrB,YAAY,CAAc;IAC1B,YAAY,CAAgC;IAC5C,gBAAgB,CAAU;IAC1B,OAAO,CAA4C;IACnD,KAAK,CAA0C;IAChE,oEAAoE;IAC5D,cAAc,GAA+B,IAAI,CAAC;IAE1D,YAAY,IAA4B;QACtC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;QACxC,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC;QAC7C,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;gBAClD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;oBAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;YACpE,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;;;;;OASG;IACH,WAAW;QACT,MAAM,GAAG,GAAiB,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,IAAI,CAAC,cAAc;YAAE,OAAO,GAAG,CAAC;QACrC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACvC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAAE,SAAS;YAC5C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,yEAAyE;IACzE,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,cAAc;YAAE,OAAO;QAC9C,IAAI,CAAC,cAAc,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAc,EAAE,GAAY;QACxC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YACnC,iEAAiE;YACjE,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACzC,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,SAAS,IAAI,CAAC,IAAI,qDAAqD;aACjF,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,SAAS,IAAI,CAAC,IAAI,mCAAmC;aAC/D,CAAC;QACJ,CAAC;QACD,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,iCAAiC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;QACpF,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,IAAI,EAAE,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;YAC1F,MAAM,SAAS,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAC5C,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,UAAU;gBACV,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO;gBAChC,OAAO,EAAE,SAAS,CAAC,OAAO;aAC3B,CAAC,CAAC;YACH,OAAO,SAAS,CAAC;QACnB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACjE,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,UAAU;gBACV,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO;gBAChC,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;YACH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,OAAO,EAAE,EAAE,CAAC;QACnE,CAAC;IACH,CAAC;IAED,0EAA0E;IAE1E,oEAAoE;IAC5D,iBAAiB,CAAC,IAAuB;QAC/C,mDAAmD;QACnD,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAClD,IAAI,IAAI,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;YAC3D,oEAAoE;YACpE,gEAAgE;YAChE,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC,UAAU,CAAC,CAAC;QACpF,IAAI,CAAC,WAAW;YAAE,OAAO,KAAK,CAAC;QAC/B,iEAAiE;QACjE,cAAc;QACd,IAAI,IAAI,CAAC,WAAW,CAAC,WAAW;YAAE,OAAO,KAAK,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,uEAAuE;IAC/D,cAAc,CAAC,IAAY;QACjC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,iDAAiD;YACjD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAC7C,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,KAAK;YAAE,OAAO,KAAK,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QACzE,6DAA6D;QAC7D,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAC/D,IAAI,IAAI,EAAE,WAAW,CAAC,WAAW;YAAE,OAAO,KAAK,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,0EAA0E;AAE1E,SAAS,QAAQ,CAAC,QAAgB;IAChC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO,SAAS,CAAC;IACpD,yEAAyE;IACzE,qEAAqE;IACrE,oDAAoD;IACpD,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,2DAA2D;IAC3D,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,GAAG,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAC9B,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AAC5B,CAAC;AAED;;;;;GAKG;AACH,SAAS,iBAAiB,CAAC,GAAY;IACrC,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC;IACxD,CAAC;IACD,MAAM,CAAC,GAAG,GAIT,CAAC;IACF,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,KAAK,MAAM,KAAK,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;YAC9B,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;gBAAE,SAAS;YAClD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC5D,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAClC,KAAK,CAAC,IAAI,CAAC,WAAW,KAAK,CAAC,QAAQ,IAAI,SAAS,GAAG,CAAC,CAAC;YACxD,CAAC;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBACrC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,IAAI,SAAS,GAAG,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;QAC5D,IAAI,CAAC;YAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC7E,CAAC;IACD,OAAO;QACL,OAAO,EAAE,CAAC,CAAC,OAAO,KAAK,IAAI;QAC3B,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,SAAS;KAC9C,CAAC;AACJ,CAAC"}