@x-code-cli/core 0.2.10 → 0.3.1

package/dist/mcp/registry.d.ts

@@ -0,0 +1,150 @@
+import type { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
+import { McpClient } from './client.js';
+import { type McpCallResult, type McpResourceEntry, type McpServerConfig, type McpServerStatus, type McpToolEntry } from './types.js';
+/** Build an OAuth provider for one HTTP server. Stdio servers get
+ *  `undefined`. Returns `undefined` for HTTP servers too when OAuth is
+ *  not wired up at the CLI level (no token storage configured). */
+export type OAuthProviderFactory = (serverName: string, serverUrl: string) => OAuthClientProvider | undefined;
+export interface RegisteredServer {
+    name: string;
+    client: McpClient;
+    status: McpServerStatus;
+    /** When status is `failed`, the most recent stderr tail (stdio only).
+     *  Used by /mcp list to show why a server failed. */
+    stderrTail?: string;
+}
+/** Hooks the /mcp auth handler hands in so the registry can surface
+ *  human-visible progress without depending on the CLI layer. */
+export interface AuthHooks {
+    /** Called once just before the browser is opened. Receives the
+     *  authorization URL the SDK is about to redirect to. */
+    onBrowserOpen?: (url: string) => void;
+}
+/** Summary of what `restartAll` actually changed, for the /mcp refresh
+ *  output line. */
+export interface RestartSummary {
+    /** Server names present after restart that weren't present before. */
+    added: string[];
+    /** Server names removed (present before, not in new config). */
+    removed: string[];
+    /** Server names present in both but whose config differs. */
+    changed: string[];
+    /** Server names that survived restart unchanged. */
+    unchanged: string[];
+}
+export declare class McpRegistry {
+    /** callableName → entry. callableName is the model-facing
+     *  `<server>__<tool>` form; collisions resolved at insert time. */
+    private readonly entries;
+    /** uri → entry. URIs are unique per spec; if two servers genuinely
+     *  expose the same URI we keep the first and warn (handled by loader). */
+    private readonly resources;
+    private readonly servers;
+    /** Most-recently-loaded config per server. The source of truth for
+     *  `restartServer` (which reconnects with the same config) and for
+     *  diff'ing in `restartAll` when fresh configs are handed in. */
+    private readonly configs;
+    /** Factory for per-server OAuth providers. Optional — undefined means
+     *  HTTP servers requiring auth will surface as `needs_auth` and the
+     *  /mcp auth handler can't drive them. */
+    private oauthFactory;
+    constructor(input: {
+        servers: RegisteredServer[];
+        tools: McpToolEntry[];
+        resources: McpResourceEntry[];
+        /** Per-server config used at boot. Required for `restartServer` /
+         *  `authenticateServer` to know what to rebuild. */
+        configs?: Map<string, McpServerConfig>;
+        /** OAuth provider factory threaded through from the CLI. */
+        oauthFactory?: OAuthProviderFactory;
+    });
+    /** Snapshot of every model-facing tool name; stable iteration order.
+     *  Consumed by `buildTools` (agent loop) and `buildSystemPrompt`. */
+    list(): McpToolEntry[];
+    get(callableName: string): McpToolEntry | undefined;
+    listResources(): McpResourceEntry[];
+    /** Find the server that owns a given URI so the resource tool can
+     *  dispatch the read. Returns undefined for unknown URIs. */
+    resourceServer(uri: string): McpClient | undefined;
+    serverStatus(): Array<{
+        name: string;
+        status: McpServerStatus;
+        stderrTail?: string;
+    }>;
+    getServer(serverName: string): RegisteredServer | undefined;
+    getConfig(serverName: string): McpServerConfig | undefined;
+    /** Call an MCP tool by its model-facing callable name. Looks up the
+     *  entry, finds its owning server, and forwards to the SDK client. */
+    callTool(callableName: string, args: unknown, signal?: AbortSignal): Promise<McpCallResult>;
+    /** Disconnect every server cleanly. Best-effort: one bad shutdown
+     *  doesn't prevent others from running. Called from the CLI exit hook
+     *  and (internally) by `restartAll` before rebuilding. */
+    shutdown(): Promise<void>;
+    /** Reconnect one server in-place using its current config. Used by
+     *  `authenticateServer` (after fresh tokens are saved) and exposed for
+     *  callers that want a per-server reload without a full refresh.
+     *
+     *  Tool / resource entries from the old connection are dropped and
+     *  replaced with whatever the new connection enumerates — tool names
+     *  may change if the server's `tools/list` output changes between
+     *  reconnects. Callers must invalidate the agent's systemPromptCache
+     *  after this returns. */
+    restartServer(name: string, opts?: {
+        driveOAuth?: AuthHooks;
+    }): Promise<RegisteredServer>;
+    /** Disconnect everything and rebuild against `newConfigs` (or the
+     *  existing configs if omitted). Returns a diff summary so the UI
+     *  can tell the user what actually changed.
+     *
+     *  Used by `/mcp refresh`: re-read the user + project config files,
+     *  hand the merged map in here, and we'll add / remove / restart the
+     *  appropriate set. Servers whose config bytes didn't change are
+     *  still reconnected — fresher to the user, simpler than diffing
+     *  every nested field. */
+    restartAll(newConfigs?: Map<string, McpServerConfig>): Promise<RestartSummary>;
+    /** Drive a fresh OAuth round-trip for one HTTP server, then reconnect
+     *  it. Used by `/mcp auth <name>`.
+     *
+     *  Pre-condition: the caller should have just cleared any stale
+     *  tokens for this server via the token storage's `clear()` —
+     *  otherwise an existing-but-expired token could short-circuit the
+     *  re-auth path and reuse the bad state.
+     *
+     *  Returns the post-auth server state. Throws if the server is stdio
+     *  (no OAuth needed), if no OAuth factory is wired up, or if the
+     *  user closes the browser tab / the callback times out. */
+    authenticateServer(name: string, hooks?: AuthHooks): Promise<RegisteredServer>;
+    /** Replace the OAuth factory wholesale. Used by the CLI when the
+     *  token storage / onBrowserOpen wiring is built lazily after the
+     *  registry has been constructed (rare, but the test harness needs
+     *  to swap it). */
+    setOAuthFactory(factory: OAuthProviderFactory | undefined): void;
+    /** Drop every tool + resource owned by this server. Idempotent. */
+    private removeServerEntries;
+    /** Install a fresh ConnectResult into the maps. Caller is responsible
+     *  for having removed any previous entries for the same server first. */
+    private installServer;
+}
+/** Empty registry — used when MCP is disabled entirely (no mcpServers
+ *  in config, or trust dialog rejected). Cheaper than null-checking the
+ *  registry everywhere downstream. */
+export declare function emptyRegistry(): McpRegistry;
+/** One server's worth of "connect + enumerate" output. Shared between
+ *  initial boot (`loadMcpServers`) and the registry's restart paths so
+ *  the connect-shape stays consistent. */
+export interface ConnectResult {
+    server: RegisteredServer;
+    tools: ReadonlyArray<{
+        name: string;
+        description?: string;
+        inputSchema: Record<string, unknown>;
+    }>;
+    resources: ReadonlyArray<McpResourceEntry>;
+}
+/** Build a client for one server, run the connect handshake, and report
+ *  the enumerated capabilities. `driveOAuth` (when set) opts into the
+ *  full browser-based OAuth flow on UnauthorizedError; without it,
+ *  UnauthorizedError surfaces as `status: needs_auth` and the user is
+ *  expected to invoke /mcp auth explicitly. */
+export declare function connectOneServer(name: string, rawConfig: McpServerConfig, oauthFactory: OAuthProviderFactory | undefined, driveOAuth?: AuthHooks): Promise<ConnectResult>;
+//# sourceMappingURL=registry.d.ts.map

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

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

package/dist/mcp/registry.js

@@ -0,0 +1,334 @@
+import { debugLog } from '../utils.js';
+import { McpClient } from './client.js';
+import { UnsafeEnvError, assertSafeEnv } from './env-safety.js';
+import { EnvExpansionError, expandEnvDeep } from './expand-env.js';
+import { buildCallableName } from './name-mangling.js';
+import { isHttpConfig, isStdioConfig, } from './types.js';
+export class McpRegistry {
+    /** callableName → entry. callableName is the model-facing
+     *  `<server>__<tool>` form; collisions resolved at insert time. */
+    entries = new Map();
+    /** uri → entry. URIs are unique per spec; if two servers genuinely
+     *  expose the same URI we keep the first and warn (handled by loader). */
+    resources = new Map();
+    servers = new Map();
+    /** Most-recently-loaded config per server. The source of truth for
+     *  `restartServer` (which reconnects with the same config) and for
+     *  diff'ing in `restartAll` when fresh configs are handed in. */
+    configs = new Map();
+    /** Factory for per-server OAuth providers. Optional — undefined means
+     *  HTTP servers requiring auth will surface as `needs_auth` and the
+     *  /mcp auth handler can't drive them. */
+    oauthFactory;
+    constructor(input) {
+        for (const s of input.servers)
+            this.servers.set(s.name, s);
+        for (const t of input.tools)
+            this.entries.set(t.callableName, t);
+        for (const r of input.resources)
+            this.resources.set(r.uri, r);
+        if (input.configs)
+            for (const [k, v] of input.configs)
+                this.configs.set(k, v);
+        this.oauthFactory = input.oauthFactory;
+    }
+    // ── Tool surface ───────────────────────────────────────────────────────
+    /** Snapshot of every model-facing tool name; stable iteration order.
+     *  Consumed by `buildTools` (agent loop) and `buildSystemPrompt`. */
+    list() {
+        return [...this.entries.values()];
+    }
+    get(callableName) {
+        return this.entries.get(callableName);
+    }
+    // ── Resource surface ───────────────────────────────────────────────────
+    listResources() {
+        return [...this.resources.values()];
+    }
+    /** Find the server that owns a given URI so the resource tool can
+     *  dispatch the read. Returns undefined for unknown URIs. */
+    resourceServer(uri) {
+        const r = this.resources.get(uri);
+        if (!r)
+            return undefined;
+        return this.servers.get(r.serverName)?.client;
+    }
+    // ── Server surface (for /mcp list / status) ───────────────────────────
+    serverStatus() {
+        return [...this.servers.values()].map((s) => ({
+            name: s.name,
+            status: s.status,
+            stderrTail: s.stderrTail,
+        }));
+    }
+    getServer(serverName) {
+        return this.servers.get(serverName);
+    }
+    getConfig(serverName) {
+        return this.configs.get(serverName);
+    }
+    // ── Dispatch ───────────────────────────────────────────────────────────
+    /** Call an MCP tool by its model-facing callable name. Looks up the
+     *  entry, finds its owning server, and forwards to the SDK client. */
+    async callTool(callableName, args, signal) {
+        const entry = this.entries.get(callableName);
+        if (!entry)
+            throw new Error(`MCP tool not found: ${callableName}`);
+        const server = this.servers.get(entry.serverName);
+        if (!server)
+            throw new Error(`MCP server gone: ${entry.serverName}`);
+        return server.client.callTool(entry.rawName, args, signal);
+    }
+    // ── Lifecycle ──────────────────────────────────────────────────────────
+    /** Disconnect every server cleanly. Best-effort: one bad shutdown
+     *  doesn't prevent others from running. Called from the CLI exit hook
+     *  and (internally) by `restartAll` before rebuilding. */
+    async shutdown() {
+        const tasks = [];
+        for (const s of this.servers.values()) {
+            tasks.push(s.client.close().catch(() => {
+                // already logged in client.safeClose; nothing useful to do here
+            }));
+        }
+        await Promise.allSettled(tasks);
+    }
+    // ── Restart / refresh ──────────────────────────────────────────────────
+    /** Reconnect one server in-place using its current config. Used by
+     *  `authenticateServer` (after fresh tokens are saved) and exposed for
+     *  callers that want a per-server reload without a full refresh.
+     *
+     *  Tool / resource entries from the old connection are dropped and
+     *  replaced with whatever the new connection enumerates — tool names
+     *  may change if the server's `tools/list` output changes between
+     *  reconnects. Callers must invalidate the agent's systemPromptCache
+     *  after this returns. */
+    async restartServer(name, opts = {}) {
+        const config = this.configs.get(name);
+        if (!config) {
+            throw new Error(`No MCP server registered as "${name}"`);
+        }
+        // Close the existing client (if any) before spawning a replacement —
+        // for stdio servers this kills the previous child process so we
+        // don't leave a zombie behind. Errors are non-fatal: a broken
+        // connection that can't be closed cleanly should still be replaced.
+        const existing = this.servers.get(name);
+        if (existing) {
+            try {
+                await existing.client.close();
+            }
+            catch (err) {
+                debugLog('mcp.restart-close-failed', `${name}: ${String(err)}`);
+            }
+        }
+        // Strip old tools / resources owned by this server. Done *before*
+        // the new connect so a partial failure mid-reconnect leaves us in a
+        // consistent "nothing from this server" state rather than a mix of
+        // old + nothing.
+        this.removeServerEntries(name);
+        const result = await connectOneServer(name, config, this.oauthFactory, opts.driveOAuth);
+        this.installServer(result);
+        return result.server;
+    }
+    /** Disconnect everything and rebuild against `newConfigs` (or the
+     *  existing configs if omitted). Returns a diff summary so the UI
+     *  can tell the user what actually changed.
+     *
+     *  Used by `/mcp refresh`: re-read the user + project config files,
+     *  hand the merged map in here, and we'll add / remove / restart the
+     *  appropriate set. Servers whose config bytes didn't change are
+     *  still reconnected — fresher to the user, simpler than diffing
+     *  every nested field. */
+    async restartAll(newConfigs) {
+        const oldNames = new Set(this.configs.keys());
+        const newNames = new Set((newConfigs ?? this.configs).keys());
+        const summary = {
+            added: [...newNames].filter((n) => !oldNames.has(n)),
+            removed: [...oldNames].filter((n) => !newNames.has(n)),
+            changed: [],
+            unchanged: [],
+        };
+        if (newConfigs) {
+            for (const name of newNames) {
+                if (!oldNames.has(name))
+                    continue;
+                const before = JSON.stringify(this.configs.get(name));
+                const after = JSON.stringify(newConfigs.get(name));
+                if (before !== after)
+                    summary.changed.push(name);
+                else
+                    summary.unchanged.push(name);
+            }
+        }
+        else {
+            summary.unchanged = [...newNames];
+        }
+        // Tear down everything first. Doing close-all then connect-all
+        // (rather than per-server close+connect) is more predictable: we
+        // never have two clients for the same server alive at once, and
+        // stdio child processes definitely exit before their replacements
+        // spawn.
+        await this.shutdown();
+        // Reset internal state. We keep the OAuth factory because that
+        // came from the CLI process and isn't tied to any one config.
+        this.servers.clear();
+        this.entries.clear();
+        this.resources.clear();
+        this.configs.clear();
+        const effective = newConfigs ?? new Map();
+        for (const [k, v] of effective)
+            this.configs.set(k, v);
+        // Reconnect in parallel — same approach as initial boot. Each
+        // failure is recorded as `status: failed` rather than aborting the
+        // restart.
+        const tasks = [...effective.entries()].map(async ([name, config]) => {
+            try {
+                return await connectOneServer(name, config, this.oauthFactory);
+            }
+            catch (err) {
+                debugLog('mcp.restartAll-connect-failed', `${name}: ${String(err)}`);
+                return null;
+            }
+        });
+        const results = await Promise.all(tasks);
+        // Sort by name so tool insertion order is stable (matches initial-
+        // boot behaviour in loader.ts).
+        const installable = results
+            .filter((r) => r !== null)
+            .sort((a, b) => a.server.name.localeCompare(b.server.name));
+        for (const r of installable)
+            this.installServer(r);
+        return summary;
+    }
+    /** Drive a fresh OAuth round-trip for one HTTP server, then reconnect
+     *  it. Used by `/mcp auth <name>`.
+     *
+     *  Pre-condition: the caller should have just cleared any stale
+     *  tokens for this server via the token storage's `clear()` —
+     *  otherwise an existing-but-expired token could short-circuit the
+     *  re-auth path and reuse the bad state.
+     *
+     *  Returns the post-auth server state. Throws if the server is stdio
+     *  (no OAuth needed), if no OAuth factory is wired up, or if the
+     *  user closes the browser tab / the callback times out. */
+    async authenticateServer(name, hooks = {}) {
+        const config = this.configs.get(name);
+        if (!config)
+            throw new Error(`No MCP server registered as "${name}"`);
+        if (!isHttpConfig(config)) {
+            throw new Error(`MCP server "${name}" is stdio — OAuth applies to HTTP servers only`);
+        }
+        if (!this.oauthFactory) {
+            throw new Error(`OAuth not configured — set a token storage in the loader to use /mcp auth`);
+        }
+        return this.restartServer(name, { driveOAuth: hooks });
+    }
+    /** Replace the OAuth factory wholesale. Used by the CLI when the
+     *  token storage / onBrowserOpen wiring is built lazily after the
+     *  registry has been constructed (rare, but the test harness needs
+     *  to swap it). */
+    setOAuthFactory(factory) {
+        this.oauthFactory = factory;
+    }
+    // ── internals ──────────────────────────────────────────────────────────
+    /** Drop every tool + resource owned by this server. Idempotent. */
+    removeServerEntries(name) {
+        for (const [key, entry] of this.entries) {
+            if (entry.serverName === name)
+                this.entries.delete(key);
+        }
+        for (const [key, res] of this.resources) {
+            if (res.serverName === name)
+                this.resources.delete(key);
+        }
+    }
+    /** Install a fresh ConnectResult into the maps. Caller is responsible
+     *  for having removed any previous entries for the same server first. */
+    installServer(r) {
+        this.servers.set(r.server.name, r.server);
+        const taken = new Set(this.entries.keys());
+        for (const t of r.tools) {
+            const callable = buildCallableName(r.server.name, t.name, taken);
+            taken.add(callable);
+            this.entries.set(callable, {
+                callableName: callable,
+                rawName: t.name,
+                serverName: r.server.name,
+                description: t.description ?? '',
+                inputSchema: t.inputSchema,
+            });
+        }
+        for (const res of r.resources)
+            this.resources.set(res.uri, res);
+    }
+}
+/** Empty registry — used when MCP is disabled entirely (no mcpServers
+ *  in config, or trust dialog rejected). Cheaper than null-checking the
+ *  registry everywhere downstream. */
+export function emptyRegistry() {
+    return new McpRegistry({ servers: [], tools: [], resources: [] });
+}
+/** Build a client for one server, run the connect handshake, and report
+ *  the enumerated capabilities. `driveOAuth` (when set) opts into the
+ *  full browser-based OAuth flow on UnauthorizedError; without it,
+ *  UnauthorizedError surfaces as `status: needs_auth` and the user is
+ *  expected to invoke /mcp auth explicitly. */
+export async function connectOneServer(name, rawConfig, oauthFactory, driveOAuth) {
+    // Honour `enabled: false` — register but skip the connection.
+    if (rawConfig.enabled === false) {
+        const client = new McpClient(name, rawConfig);
+        return {
+            server: { name, client, status: { kind: 'disabled' } },
+            tools: [],
+            resources: [],
+        };
+    }
+    // Expand ${VAR} references before constructing the client. Then enforce
+    // the env safety check on stdio configs — this is the single chokepoint
+    // every env source (CLI flag, mcp.json, plugin manifest) flows through,
+    // so rejecting a bad key here covers them all. See env-safety.ts for the
+    // threat model.
+    let expanded;
+    try {
+        expanded = expandEnvDeep(rawConfig);
+        if (isStdioConfig(expanded))
+            assertSafeEnv(expanded.env);
+    }
+    catch (err) {
+        const msg = err instanceof EnvExpansionError || err instanceof UnsafeEnvError
+            ? err.message
+            : err instanceof Error
+                ? err.message
+                : String(err);
+        const client = new McpClient(name, rawConfig);
+        return {
+            server: { name, client, status: { kind: 'failed', error: msg } },
+            tools: [],
+            resources: [],
+        };
+    }
+    const authProvider = oauthFactory && isHttpConfig(expanded) ? oauthFactory(name, expanded.url) : undefined;
+    const client = new McpClient(name, expanded, authProvider);
+    try {
+        const info = driveOAuth ? await client.connectWithOAuth(driveOAuth) : await client.connect();
+        return {
+            server: {
+                name,
+                client,
+                status: { kind: 'connected', toolCount: info.toolCount, resourceCount: info.resourceCount },
+            },
+            tools: client.tools(),
+            resources: client.resources(),
+        };
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        const needsAuth = /unauth|401|UnauthorizedError/i.test(msg) && isHttpConfig(expanded);
+        const status = needsAuth ? { kind: 'needs_auth' } : { kind: 'failed', error: msg };
+        return {
+            server: { name, client, status, stderrTail: client.stderr() || undefined },
+            tools: [],
+            resources: [],
+        };
+    }
+}
+//# sourceMappingURL=registry.js.map

package/dist/mcp/registry.js.map

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

package/dist/mcp/resources.d.ts

@@ -0,0 +1,7 @@
+export declare const listMcpResources: import("ai").Tool<{
+    server?: string | undefined;
+}, never>;
+export declare const readMcpResource: import("ai").Tool<{
+    uri: string;
+}, never>;
+//# sourceMappingURL=resources.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../src/mcp/resources.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,gBAAgB;;SAa3B,CAAA;AAEF,eAAO,MAAM,eAAe;;SAO1B,CAAA"}

package/dist/mcp/resources.js

@@ -0,0 +1,40 @@
+// @x-code-cli/core — MCP Resources surfaced as two built-in tools
+//
+// MCP "resources" are server-exposed data the model may want to pull
+// (e.g. files exposed by filesystem-server, log entries, DB row dumps).
+// Rather than auto-injecting every resource into the conversation
+// (token-expensive, often irrelevant), we expose two tools:
+//
+//   - listMcpResources({ server? })  — enumerate URIs the model can fetch
+//   - readMcpResource({ uri })       — fetch one by URI
+//
+// Both tools are defined without an `execute` function so the agent
+// loop's processToolCalls dispatcher handles them — see
+// BYPASS_LOOP_GUARD_HANDLERS in tool-execution.ts. They surface in the
+// system prompt only when an MCP registry is configured (buildTools
+// gates the inclusion).
+import { tool } from 'ai';
+import { z } from 'zod';
+export const listMcpResources = tool({
+    description: `List resources exposed by connected MCP servers.
+
+Output one resource per line: "<uri>\t[<server>] <name> (<mimeType>)" with a description on the next indented line when present.
+
+Use this BEFORE readMcpResource so you have a URI to read. If the model already knows the URI (e.g. from a previous list call), readMcpResource directly is fine.`,
+    inputSchema: z.object({
+        server: z
+            .string()
+            .optional()
+            .describe('Optional server name to filter by. Omit to list resources from all servers.'),
+    }),
+    // No execute — handled in tool-execution.ts via BYPASS_LOOP_GUARD_HANDLERS.
+});
+export const readMcpResource = tool({
+    description: `Read the contents of an MCP resource by its URI.
+
+URIs come from listMcpResources. Text resources return their text directly; binary resources surface a one-line marker noting the omitted content.`,
+    inputSchema: z.object({
+        uri: z.string().describe('The resource URI to read, as returned by listMcpResources.'),
+    }),
+});
+//# sourceMappingURL=resources.js.map

package/dist/mcp/resources.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../src/mcp/resources.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,EAAE;AACF,qEAAqE;AACrE,wEAAwE;AACxE,kEAAkE;AAClE,4DAA4D;AAC5D,EAAE;AACF,0EAA0E;AAC1E,wDAAwD;AACxD,EAAE;AACF,oEAAoE;AACpE,wDAAwD;AACxD,uEAAuE;AACvE,oEAAoE;AACpE,wBAAwB;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAA;AAEzB,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC;IACnC,WAAW,EAAE;;;;kKAImJ;IAChK,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC;QACpB,MAAM,EAAE,CAAC;aACN,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,CAAC,6EAA6E,CAAC;KAC3F,CAAC;IACF,4EAA4E;CAC7E,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;IAClC,WAAW,EAAE;;mJAEoI;IACjJ,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC;QACpB,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,4DAA4D,CAAC;KACvF,CAAC;CACH,CAAC,CAAA"}

package/dist/mcp/tool-bridge.d.ts

@@ -0,0 +1,16 @@
+import type { McpToolEntry } from './types.js';
+export declare function truncateDescription(input: string): string;
+/** Adapt one MCP tool into an AI SDK Tool. No execute — we hand-dispatch
+ *  in tool-execution. The schema is passed through as raw JSON Schema
+ *  (the SDK has first-class support via `jsonSchema(...)` so we don't
+ *  need a zod conversion step). */
+export declare function bridgeMcpTool(entry: McpToolEntry): import("ai").Tool<unknown, never>;
+/** Build the system-prompt-friendly view of every MCP tool — short
+ *  description + the model-facing name. Used by `system-prompt.ts` to
+ *  render the `## MCP Tools` section. */
+export declare function toSystemPromptEntries(entries: readonly McpToolEntry[]): {
+    callableName: string;
+    serverName: string;
+    description: string;
+}[];
+//# sourceMappingURL=tool-bridge.d.ts.map

package/dist/mcp/tool-bridge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-bridge.d.ts","sourceRoot":"","sources":["../../src/mcp/tool-bridge.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAY9C,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIzD;AAED;;;mCAGmC;AACnC,wBAAgB,aAAa,CAAC,KAAK,EAAE,YAAY,qCAWhD;AAED;;yCAEyC;AACzC,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,SAAS,YAAY,EAAE;;;;IAMrE"}

package/dist/mcp/tool-bridge.js

@@ -0,0 +1,56 @@
+// @x-code-cli/core — MCP tool ↔ AI SDK adapter
+//
+// Two responsibilities:
+//   1. Convert each McpToolEntry into an AI-SDK `tool({...})` definition
+//      so streamText() advertises it to the model alongside built-ins.
+//   2. Trim overlong server-supplied descriptions so they don't bloat
+//      the system prompt / tool list.
+//
+// The tools are deliberately defined WITHOUT an `execute` function. The
+// AI SDK then routes the model's tool_call into `result.toolCalls` and
+// our `processToolCalls` dispatcher handles it manually — same path as
+// shell / writeFile / edit. This is what lets us gate every MCP call
+// through the permission + loop-guard machinery.
+import { jsonSchema, tool } from 'ai';
+/** Hard cap on the model-facing description length per tool.
+ *  - 200 chars is plenty for "what does this tool do?" guidance.
+ *  - Some MCP servers in the wild paste multi-paragraph docs into the
+ *    description field; left unbounded these blow up the system prompt
+ *    and chew through the prompt cache window.
+ *  - Truncation is character-based, with an ellipsis marker so the model
+ *    knows the string was clipped (the marker also doubles as a hint
+ *    to server authors when they see their own description in /mcp tools). */
+const DESCRIPTION_MAX_CHARS = 200;
+export function truncateDescription(input) {
+    if (input.length <= DESCRIPTION_MAX_CHARS)
+        return input;
+    // Keep room for the ellipsis marker so the result is still <= cap.
+    return input.slice(0, DESCRIPTION_MAX_CHARS - 1) + '…';
+}
+/** Adapt one MCP tool into an AI SDK Tool. No execute — we hand-dispatch
+ *  in tool-execution. The schema is passed through as raw JSON Schema
+ *  (the SDK has first-class support via `jsonSchema(...)` so we don't
+ *  need a zod conversion step). */
+export function bridgeMcpTool(entry) {
+    return tool({
+        description: truncateDescription(entry.description || `MCP tool from ${entry.serverName}`),
+        // The SDK's jsonSchema() helper takes a JSON Schema object and
+        // produces a Schema instance compatible with `tool()`. MCP servers
+        // hand us back well-formed JSON Schema by spec, so no preprocessing.
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        inputSchema: jsonSchema(entry.inputSchema),
+        // No execute — manual dispatch in tool-execution.ts gates the call
+        // through permissions + loop-guard.
+    });
+}
+/** Build the system-prompt-friendly view of every MCP tool — short
+ *  description + the model-facing name. Used by `system-prompt.ts` to
+ *  render the `## MCP Tools` section. */
+export function toSystemPromptEntries(entries) {
+    return entries.map((e) => ({
+        callableName: e.callableName,
+        serverName: e.serverName,
+        description: truncateDescription(e.description),
+    }));
+}
+//# sourceMappingURL=tool-bridge.js.map

package/dist/mcp/tool-bridge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-bridge.js","sourceRoot":"","sources":["../../src/mcp/tool-bridge.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,EAAE;AACF,wBAAwB;AACxB,yEAAyE;AACzE,uEAAuE;AACvE,sEAAsE;AACtE,sCAAsC;AACtC,EAAE;AACF,wEAAwE;AACxE,uEAAuE;AACvE,uEAAuE;AACvE,qEAAqE;AACrE,iDAAiD;AACjD,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,IAAI,CAAA;AAIrC;;;;;;;8EAO8E;AAC9E,MAAM,qBAAqB,GAAG,GAAG,CAAA;AAEjC,MAAM,UAAU,mBAAmB,CAAC,KAAa;IAC/C,IAAI,KAAK,CAAC,MAAM,IAAI,qBAAqB;QAAE,OAAO,KAAK,CAAA;IACvD,mEAAmE;IACnE,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,qBAAqB,GAAG,CAAC,CAAC,GAAG,GAAG,CAAA;AACxD,CAAC;AAED;;;mCAGmC;AACnC,MAAM,UAAU,aAAa,CAAC,KAAmB;IAC/C,OAAO,IAAI,CAAC;QACV,WAAW,EAAE,mBAAmB,CAAC,KAAK,CAAC,WAAW,IAAI,iBAAiB,KAAK,CAAC,UAAU,EAAE,CAAC;QAC1F,+DAA+D;QAC/D,mEAAmE;QACnE,qEAAqE;QACrE,8DAA8D;QAC9D,WAAW,EAAE,UAAU,CAAC,KAAK,CAAC,WAAkB,CAAC;QACjD,mEAAmE;QACnE,oCAAoC;KACrC,CAAC,CAAA;AACJ,CAAC;AAED;;yCAEyC;AACzC,MAAM,UAAU,qBAAqB,CAAC,OAAgC;IACpE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACzB,YAAY,EAAE,CAAC,CAAC,YAAY;QAC5B,UAAU,EAAE,CAAC,CAAC,UAAU;QACxB,WAAW,EAAE,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC;KAChD,CAAC,CAAC,CAAA;AACL,CAAC"}