managed-deepagents 0.6.2-dev.11 → 0.6.2-dev.13

package/dist/connectors/mcp/index.js

@@ -18,7 +18,7 @@
  * @example
  * ```ts
  * // connectors/mcp.ts
- * import { connectors } from "managed-deepagents";
+ * import { connectors, credentials } from "managed-deepagents";
  *
  * export const connector = connectors.mcp({
  *   mcpServers: {
@@ -26,69 +26,247 @@
  *       transport: "http",
  *       url: "https://docs.example.com/mcp",
  *     },
+ *     notion: {
+ *       transport: "http",
+ *       url: "https://mcp.notion.com/mcp",
+ *       credential: credentials.get("notion", { type: "user" }),
+ *     },
  *   },
  * });
  * ```
  */
-import { z } from "zod";
-import { checkToolSelectionOverlap, toolSelectionConnectorFields, } from "../tool-selection.js";
+import { MultiServerMCPClient } from "@langchain/mcp-adapters";
 import { defineExtension } from "../../extension.js";
-/** Stdio servers are out of scope; the message points at the alternatives. */
-const STDIO_REJECTION = "uses a stdio transport, which is not supported. Managed Deep Agents " +
-    "support remote MCP servers over HTTP/SSE only; expose the server over HTTP " +
-    "or write a normal authored tool instead.";
-const remoteMcpServer = z
-    .looseObject({
-    // Present only to reject it: a `command` is how a stdio server is spelled.
-    command: z.never({ error: STDIO_REJECTION }).optional(),
-    transport: z.enum(["http", "sse"], {
-        error: (issue) => issue.input === "stdio"
-            ? STDIO_REJECTION
-            : 'must declare a remote transport ("http" or "sse")',
-    }),
-    url: z
-        .string("must be a non-empty URL")
-        .refine((url) => url.trim().length > 0, "must be a non-empty URL"),
-    headers: z.record(z.string(), z.string()).optional(),
-    ...toolSelectionConnectorFields,
-})
-    .check((ctx) => {
-    checkToolSelectionOverlap(ctx, ctx.value);
-});
+import { credentials, isCredentialReference, } from "../../credentials.js";
+import { mcpServersConfig } from "./schema.js";
+import { selectTools } from "../tool-selection.js";
 /**
- * The MCP connector's arguments.
+ * MCP tools loaded per declared connector, cached for the process lifetime.
  *
- * Shape, types, and tool-name lists are the schema's job; the rules that need
- * more than one field — a stdio server, a tool selected and deselected at once
- * — are checks with hand-written messages. Server configs stay loose because
- * `@langchain/mcp-adapters` accepts more per-transport options than MDA models.
+ * The compiled entry's graph factory runs `compileManagedAgent` on every
+ * invocation, but each connector's MCP connection and tool surface are stable
+ * for the life of the deployment — so the client is created and its tools
+ * loaded once per declaration, and every subsequent run reuses them. Storing
+ * the in-flight promise also dedupes concurrent first runs for the same
+ * connector. Multiple `connectors.mcp(...)` modules each get their own entry.
+ *
+ * An agent-owned credential is read into this cache once, so rotating that
+ * secret takes a redeploy. Servers with a user-owned credential are omitted
+ * entirely; the credential gate loads those per caller.
  */
-const mcpServersConfig = z.object({
-    mcpServers: z
-        .record(z.string(), remoteMcpServer, {
-        error: "must be an object mapping server names to remote MCP server configs",
-    })
-        .refine((servers) => Object.keys(servers).length > 0, "requires at least one entry"),
-    prefixToolNameWithServerName: z.boolean().optional(),
-    throwOnLoadError: z.boolean().optional(),
-    useStandardContentBlocks: z.boolean().optional(),
-    onConnectionError: z.literal("throw").optional(),
-});
+const cachedTools = new Map();
+/**
+ * Load (and cache) the MCP tools for one connector declaration.
+ *
+ * A failed load is never cached, so a transient connection error on the first
+ * run can be retried on the next, but a misconfigured deployment surfaces the
+ * error rather than silently starting with no tools.
+ */
+export function loadManagedMcpTools(connectors) {
+    const cached = cachedTools.get(connectors);
+    if (cached) {
+        return cached;
+    }
+    const loading = createClientAndLoadTools(connectors).catch((error) => {
+        cachedTools.delete(connectors);
+        throw error;
+    });
+    cachedTools.set(connectors, loading);
+    return loading;
+}
+/** Clear the process-level MCP tool cache. Test-only. */
+export function clearManagedMcpToolsCacheForTests(connectors) {
+    if (connectors) {
+        cachedTools.delete(connectors);
+        return;
+    }
+    cachedTools.clear();
+}
+/**
+ * The credential gate's view of the declared MCP connectors.
+ *
+ * One consumer per declaration that names a user-owned credential; a
+ * declaration that needs no grant never reaches the gate.
+ */
+export function mcpCredentialConsumers(connectors) {
+    const out = [];
+    for (const connector of connectors ?? []) {
+        if (!connector ||
+            typeof connector !== "object" ||
+            connector.kind !== "mcp_servers") {
+            continue;
+        }
+        const definition = connector;
+        const credentials = userCredentialReferences(definition);
+        if (credentials.length === 0) {
+            continue;
+        }
+        out.push({
+            declaration: definition,
+            credentials,
+            load: (accessTokens) => loadUserCredentialMcpTools(definition, accessTokens),
+        });
+    }
+    return out;
+}
+/** The declared references themselves: the gate checks their owner. */
+function userCredentialReferences(connectors) {
+    const bySlug = new Map();
+    for (const server of Object.values(connectors.mcpServers)) {
+        if (usesUserCredential(server)) {
+            const credential = server.credential;
+            bySlug.set(credential.slug, credential);
+        }
+    }
+    return [...bySlug.values()];
+}
+async function createClientAndLoadTools(connectors) {
+    const { eager, userCredential } = partitionMcpServers(connectors.mcpServers);
+    if (userCredential.length > 0) {
+        warnDeferredUserCredentialServers(userCredential);
+    }
+    if (Object.keys(eager).length === 0) {
+        return [];
+    }
+    const { tools } = await loadToolsFromServers(connectors, await withAgentCredentials(eager));
+    return tools;
+}
 /**
- * Declare the MCP servers whose tools should be loaded and added to the managed
- * Deep Agent at runtime.
+ * Load tools for user-credential servers, once the gate has confirmed the
+ * caller's grants.
  *
- * The tools hook runs at agent-graph construction time (inside the managed
- * runtime), so the MCP client loader is imported lazily — authoring-only
- * installs never pull in `@langchain/mcp-adapters`.
+ * Not process-cached here: the Authorization header is per caller, so the gate
+ * owns both the cache and closing the returned transport.
  */
+export async function loadUserCredentialMcpTools(connectors, accessTokens) {
+    const { userCredential } = partitionMcpServers(connectors.mcpServers);
+    const connectable = {};
+    for (const name of userCredential) {
+        const server = connectors.mcpServers[name];
+        const credential = server?.credential;
+        if (!server || !isCredentialReference(credential)) {
+            continue;
+        }
+        const accessToken = accessTokens.get(credential.slug);
+        if (!accessToken) {
+            throw new Error(`MCP user credential "${credential.slug}" has no access token`);
+        }
+        connectable[name] = withBearer(server, accessToken);
+    }
+    if (Object.keys(connectable).length === 0) {
+        return { tools: [], close: async () => { } };
+    }
+    const { tools, client } = await loadToolsFromServers(connectors, connectable);
+    return { tools, close: () => client.close() };
+}
+/** Resolve each agent-owned credential into a static bearer header. */
+async function withAgentCredentials(servers) {
+    const out = {};
+    for (const [name, server] of Object.entries(servers)) {
+        const credential = server.credential;
+        out[name] = isCredentialReference(credential)
+            ? withBearer(server, await credentials.resolveDeploymentSecret(credential.slug))
+            : server;
+    }
+    return out;
+}
+function withBearer(server, token) {
+    const headers = Object.fromEntries(Object.entries(server.headers ?? {}).filter(([name]) => name.toLowerCase() !== "authorization"));
+    return {
+        ...server,
+        headers: { ...headers, Authorization: `Bearer ${token}` },
+    };
+}
+function usesUserCredential(server) {
+    return (isCredentialReference(server.credential) &&
+        server.credential.owner.type === "user");
+}
+function partitionMcpServers(servers) {
+    const eager = {};
+    const userCredential = [];
+    for (const [name, server] of Object.entries(servers)) {
+        if (usesUserCredential(server)) {
+            userCredential.push(name);
+        }
+        else {
+            eager[name] = server;
+        }
+    }
+    return { eager, userCredential };
+}
+function warnDeferredUserCredentialServers(serverNames) {
+    console.warn(`[managed-deepagents] MCP server(s) ${serverNames.join(", ")} declare ` +
+        `a user credential; tools load after the pre-run credential gate ` +
+        `confirms grants for the caller.`);
+}
+function stripManagedToolSelection(servers) {
+    return Object.fromEntries(Object.entries(servers).map(([name, server]) => {
+        const { includeTools: _includeTools, excludeTools: _excludeTools, credential: _credential, ...clientConfig } = server;
+        return [name, clientConfig];
+    }));
+}
+async function loadToolsFromServers(connectors, connectable) {
+    const prefixToolNameWithServerName = connectors.prefixToolNameWithServerName ?? true;
+    const client = new MultiServerMCPClient({
+        mcpServers: stripManagedToolSelection(connectable),
+        prefixToolNameWithServerName,
+        throwOnLoadError: connectors.throwOnLoadError ?? true,
+        useStandardContentBlocks: connectors.useStandardContentBlocks ?? true,
+        onConnectionError: connectors.onConnectionError ?? "throw",
+    });
+    try {
+        const tools = await loadToolsByServer(client, connectable, prefixToolNameWithServerName);
+        if (!prefixToolNameWithServerName) {
+            assertNoToolNameCollisions(tools);
+        }
+        return { tools, client };
+    }
+    catch (error) {
+        await client.close().catch(() => undefined);
+        throw error;
+    }
+}
+async function loadToolsByServer(client, servers, prefixToolNameWithServerName) {
+    const tools = [];
+    for (const [serverName, server] of Object.entries(servers)) {
+        const serverTools = await client.getTools(serverName);
+        tools.push(...filterToolsForServer(serverName, server, serverTools, prefixToolNameWithServerName));
+    }
+    return tools;
+}
+function filterToolsForServer(serverName, selection, tools, prefixToolNameWithServerName) {
+    return selectTools(`MCP server "${serverName}"`, selection, tools, (tool) => {
+        const name = tool.name;
+        if (typeof name !== "string") {
+            return undefined;
+        }
+        const prefix = `${serverName}__`;
+        return prefixToolNameWithServerName && name.startsWith(prefix)
+            ? name.slice(prefix.length)
+            : name;
+    });
+}
+function assertNoToolNameCollisions(tools) {
+    const seen = new Set();
+    const collisions = new Set();
+    for (const tool of tools) {
+        const name = tool.name;
+        if (typeof name !== "string")
+            continue;
+        if (seen.has(name))
+            collisions.add(name);
+        seen.add(name);
+    }
+    if (collisions.size > 0) {
+        throw new Error(`MCP tool name collision: ${[...collisions].sort().join(", ")}. ` +
+            "Set `prefixToolNameWithServerName: true` (the default) so each tool is " +
+            "namespaced by its server, or rename the conflicting tools.");
+    }
+}
 export const mcpConnector = defineExtension("connector", {
     kind: "mcp_servers",
     label: "connectors.mcp",
     args: mcpServersConfig,
-    async tools(_ctx, self) {
-        const { loadManagedMcpTools } = await import("./load.js");
-        return loadManagedMcpTools(self);
-    },
+    tools: (_ctx, self) => loadManagedMcpTools(self),
 });
 //# sourceMappingURL=index.js.map

package/dist/connectors/mcp/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/connectors/mcp/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EACL,yBAAyB,EACzB,4BAA4B,GAC7B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AA8FrD,8EAA8E;AAC9E,MAAM,eAAe,GACnB,sEAAsE;IACtE,6EAA6E;IAC7E,0CAA0C,CAAC;AAE7C,MAAM,eAAe,GAAG,CAAC;KACtB,WAAW,CAAC;IACX,2EAA2E;IAC3E,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC,QAAQ,EAAE;IACvD,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;QACjC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CACf,KAAK,CAAC,KAAK,KAAK,OAAO;YACrB,CAAC,CAAC,eAAe;YACjB,CAAC,CAAC,mDAAmD;KAC1D,CAAC;IACF,GAAG,EAAE,CAAC;SACH,MAAM,CAAC,yBAAyB,CAAC;SACjC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,yBAAyB,CAAC;IACpE,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IACpD,GAAG,4BAA4B;CAChC,CAAC;KACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACb,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,KAAsB,CAAC,CAAC;AAC7D,CAAC,CAAC,CAAC;AAEL;;;;;;;GAOG;AACH,MAAM,gBAAgB,GACpB,CAAC,CAAC,MAAM,CAAC;IACP,UAAU,EAAE,CAAC;SACV,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,eAAe,EAAE;QACnC,KAAK,EACH,qEAAqE;KACxE,CAAC;SACD,MAAM,CACL,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAC5C,6BAA6B,CAC9B;IACH,4BAA4B,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACpD,gBAAgB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACxC,wBAAwB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAChD,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE;CACjD,CAAC,CAAC;AAEL;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,YAAY,GACvB,eAAe,CAAC,WAAW,EAAE;IAC3B,IAAI,EAAE,aAAa;IACnB,KAAK,EAAE,gBAAgB;IACvB,IAAI,EAAE,gBAAgB;IACtB,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI;QACpB,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QAC1D,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/connectors/mcp/index.ts"],"names":[],"mappings":"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"}

package/dist/connectors/mcp/schema.d.ts

@@ -0,0 +1,12 @@
+import { z } from "zod";
+import type { McpServersConfig } from "./types.js";
+/**
+ * The MCP connector's arguments.
+ *
+ * Shape, types, and tool-name lists are the schema's job; the rules that need
+ * more than one field — a stdio server, a tool selected and deselected at once
+ * — are checks with hand-written messages. Server configs stay loose because
+ * `@langchain/mcp-adapters` accepts more per-transport options than MDA models.
+ */
+export declare const mcpServersConfig: z.ZodType<McpServersConfig, McpServersConfig>;
+//# sourceMappingURL=schema.d.ts.map

package/dist/connectors/mcp/schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/connectors/mcp/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AA6CnD;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAE,gBAAgB,CAevE,CAAC"}

package/dist/connectors/mcp/schema.js

@@ -0,0 +1,55 @@
+import { z } from "zod";
+import { appendToolSelectionOverlapIssue, optionalToolNameListSchema, } from "../tool-selection.js";
+import { isCredentialReference, } from "../../credentials.js";
+/** Stdio servers are out of scope; the message points at the alternatives. */
+const STDIO_REJECTION = "uses a stdio transport, which is not supported. Managed Deep Agents " +
+    "support remote MCP servers over HTTP/SSE only; expose the server over HTTP " +
+    "or write a normal authored tool instead.";
+/** Raw MCP tool names, before the managed `{server}__` prefix is applied. */
+const remoteMcpServer = z
+    .looseObject({
+    /**
+     * Present only to reject it: a `command` is how a stdio server is defined,
+     * which we don't support.
+     */
+    command: z.never({ error: STDIO_REJECTION }).optional(),
+    transport: z.enum(["http", "sse"], {
+        error: (issue) => issue.input === "stdio"
+            ? STDIO_REJECTION
+            : 'must declare a remote transport ("http" or "sse")',
+    }),
+    url: z
+        .string("must be a non-empty URL")
+        .refine((url) => url.trim().length > 0, "must be a non-empty URL"),
+    headers: z.record(z.string(), z.string()).optional(),
+    defaultToolTimeout: z
+        .number("defaultToolTimeout must be a positive number")
+        .positive("defaultToolTimeout must be a positive number")
+        .optional(),
+    includeTools: optionalToolNameListSchema,
+    excludeTools: optionalToolNameListSchema,
+    credential: z
+        .custom(isCredentialReference, "must be a credentials.get(slug, owner) reference")
+        .optional(),
+})
+    .check(appendToolSelectionOverlapIssue);
+/**
+ * The MCP connector's arguments.
+ *
+ * Shape, types, and tool-name lists are the schema's job; the rules that need
+ * more than one field — a stdio server, a tool selected and deselected at once
+ * — are checks with hand-written messages. Server configs stay loose because
+ * `@langchain/mcp-adapters` accepts more per-transport options than MDA models.
+ */
+export const mcpServersConfig = z.object({
+    mcpServers: z
+        .record(z.string(), remoteMcpServer, {
+        error: "must be an object mapping server names to remote MCP server configs",
+    })
+        .refine((servers) => Object.keys(servers).length > 0, "requires at least one entry"),
+    prefixToolNameWithServerName: z.boolean().optional(),
+    throwOnLoadError: z.boolean().optional(),
+    useStandardContentBlocks: z.boolean().optional(),
+    onConnectionError: z.literal("throw").optional(),
+});
+//# sourceMappingURL=schema.js.map

package/dist/connectors/mcp/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/connectors/mcp/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EACL,+BAA+B,EAC/B,0BAA0B,GAC3B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,qBAAqB,GAEtB,MAAM,sBAAsB,CAAC;AAE9B,8EAA8E;AAC9E,MAAM,eAAe,GACnB,sEAAsE;IACtE,6EAA6E;IAC7E,0CAA0C,CAAC;AAE7C,6EAA6E;AAC7E,MAAM,eAAe,GAAG,CAAC;KACtB,WAAW,CAAC;IACX;;;OAGG;IACH,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC,QAAQ,EAAE;IACvD,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;QACjC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CACf,KAAK,CAAC,KAAK,KAAK,OAAO;YACrB,CAAC,CAAC,eAAe;YACjB,CAAC,CAAC,mDAAmD;KAC1D,CAAC;IACF,GAAG,EAAE,CAAC;SACH,MAAM,CAAC,yBAAyB,CAAC;SACjC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,yBAAyB,CAAC;IACpE,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IACpD,kBAAkB,EAAE,CAAC;SAClB,MAAM,CAAC,8CAA8C,CAAC;SACtD,QAAQ,CAAC,8CAA8C,CAAC;SACxD,QAAQ,EAAE;IACb,YAAY,EAAE,0BAA0B;IACxC,YAAY,EAAE,0BAA0B;IACxC,UAAU,EAAE,CAAC;SACV,MAAM,CACL,qBAAqB,EACrB,kDAAkD,CACnD;SACA,QAAQ,EAAE;CACd,CAAC;KACD,KAAK,CAAC,+BAA+B,CAAC,CAAC;AAE1C;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAC3B,CAAC,CAAC,MAAM,CAAC;IACP,UAAU,EAAE,CAAC;SACV,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,eAAe,EAAE;QACnC,KAAK,EACH,qEAAqE;KACxE,CAAC;SACD,MAAM,CACL,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAC5C,6BAA6B,CAC9B;IACH,4BAA4B,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACpD,gBAAgB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACxC,wBAAwB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAChD,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE;CACjD,CAAC,CAAC"}

package/dist/connectors/mcp/types.d.ts

@@ -0,0 +1,62 @@
+import type { ClientConfig, StreamableHTTPConnection } from "@langchain/mcp-adapters";
+import type { Connector } from "../../runtime/connector.js";
+import type { CredentialReference } from "../../credentials.js";
+/** Per-server MCP tool selection. Names are raw, unprefixed MCP tool names. */
+export interface McpToolSelectionConfig {
+    /**
+     * Raw MCP tool names to expose from this server. Names are matched before any
+     * managed `{server}__` prefix is applied.
+     */
+    includeTools?: string[];
+    /**
+     * Raw MCP tool names to hide from this server. Names are matched before any
+     * managed `{server}__` prefix is applied.
+     */
+    excludeTools?: string[];
+}
+/** A user-owned credential reference resolved through Agent Auth at run time. */
+export type McpServerCredential = CredentialReference;
+/** Adapter connection fields MDA forwards, excluding stdio/auth the runtime owns. */
+type AdapterRemoteConnection = Omit<StreamableHTTPConnection, "transport" | "type" | "authProvider">;
+/** Shared remote server options plus MDA-only tool selection and credential mode. */
+export type RemoteMcpServerBaseConfig = AdapterRemoteConnection & McpToolSelectionConfig & {
+    /**
+     * Bearer credential for this server, declared with `credentials.get(...)`.
+     * An agent owner is a deployment-wide secret read once at load; a user
+     * owner is the caller's OAuth grant, loaded per caller after the gate.
+     */
+    credential?: McpServerCredential;
+};
+/** Streamable HTTP MCP server connection. */
+export type HttpMcpServerConfig = RemoteMcpServerBaseConfig & {
+    /** Remote transport. `"http"` selects Streamable HTTP. */
+    transport: "http";
+};
+/** Legacy SSE MCP server connection. */
+export type SseMcpServerConfig = RemoteMcpServerBaseConfig & {
+    /** Remote transport. `"sse"` selects legacy SSE. */
+    transport: "sse";
+};
+/** A remote MCP server connection. Stdio servers are intentionally excluded. */
+export type RemoteMcpServerConfig = HttpMcpServerConfig | SseMcpServerConfig;
+/** {@link MultiServerMCPClient} options MDA exposes on `connectors.mcp`. */
+type McpClientOptions = Pick<ClientConfig, "prefixToolNameWithServerName" | "throwOnLoadError" | "useStandardContentBlocks" | "onConnectionError">;
+/** Configuration accepted by `connectors.mcp`. */
+export interface McpServersConfig extends McpClientOptions {
+    /**
+     * MCP servers to connect to. Each key is the logical server name MDA uses
+     * for validation, tracing metadata, and tool-name prefixing.
+     */
+    mcpServers: Record<string, RemoteMcpServerConfig>;
+}
+/**
+ * The connector exported from a `connectors/` module for MCP. It is a branded
+ * managed {@link Connector} whose `tools` hook loads the declared MCP tools at
+ * runtime, plus the raw config the loader reads.
+ */
+export interface McpServersDefinition extends McpServersConfig, Connector {
+    /** Internal discriminator used by the MDA loader. */
+    readonly kind: "mcp_servers";
+}
+export {};
+//# sourceMappingURL=types.d.ts.map

package/dist/connectors/mcp/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/connectors/mcp/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,wBAAwB,EACzB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,+EAA+E;AAC/E,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,iFAAiF;AACjF,MAAM,MAAM,mBAAmB,GAAG,mBAAmB,CAAC;AAEtD,qFAAqF;AACrF,KAAK,uBAAuB,GAAG,IAAI,CACjC,wBAAwB,EACxB,WAAW,GAAG,MAAM,GAAG,cAAc,CACtC,CAAC;AAEF,qFAAqF;AACrF,MAAM,MAAM,yBAAyB,GAAG,uBAAuB,GAC7D,sBAAsB,GAAG;IACvB;;;;OAIG;IACH,UAAU,CAAC,EAAE,mBAAmB,CAAC;CAClC,CAAC;AAEJ,6CAA6C;AAC7C,MAAM,MAAM,mBAAmB,GAAG,yBAAyB,GAAG;IAC5D,0DAA0D;IAC1D,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,wCAAwC;AACxC,MAAM,MAAM,kBAAkB,GAAG,yBAAyB,GAAG;IAC3D,oDAAoD;IACpD,SAAS,EAAE,KAAK,CAAC;CAClB,CAAC;AAEF,gFAAgF;AAChF,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,GAAG,kBAAkB,CAAC;AAE7E,4EAA4E;AAC5E,KAAK,gBAAgB,GAAG,IAAI,CAC1B,YAAY,EACV,8BAA8B,GAC9B,kBAAkB,GAClB,0BAA0B,GAC1B,mBAAmB,CACtB,CAAC;AAEF,kDAAkD;AAClD,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;CACnD;AAED;;;;GAIG;AACH,MAAM,WAAW,oBAAqB,SAAQ,gBAAgB,EAAE,SAAS;IACvE,qDAAqD;IACrD,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;CAC9B"}

package/dist/connectors/mcp/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/connectors/mcp/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/connectors/mcp/types.ts"],"names":[],"mappings":""}

package/dist/connectors/tool-selection.d.ts

@@ -20,27 +20,18 @@ export interface ToolSelection<TTool extends string = string> {
     /** Tool names to hide. Applied after {@link ToolSelection.includeTools}. */
     excludeTools?: TTool[];
 }
-/**
- * Shared authoring options for connectors that load remote tools.
- */
-export interface ToolSelectionConnectorConfig<TTool extends string = string> extends ToolSelection<TTool> {
-    /** Timeout for each tool call (milliseconds on the TypeScript runtime). */
-    defaultToolTimeout?: number;
-}
 /** Tool names: non-empty, no duplicates within one list. */
-export declare const toolSelectionConnectorFields: {
-    includeTools: z.ZodOptional<z.ZodArray<z.ZodString>>;
-    excludeTools: z.ZodOptional<z.ZodArray<z.ZodString>>;
-    defaultToolTimeout: z.ZodOptional<z.ZodNumber>;
-};
-/** Shared include/exclude overlap check for connector arg schemas. */
-export declare function checkToolSelectionOverlap(ctx: {
+export declare const optionalToolNameListSchema: z.ZodOptional<z.ZodArray<z.ZodString>>;
+export declare function appendToolSelectionOverlapIssue(ctx: {
+    value: unknown;
     issues: {
-        push(issue: unknown): void;
+        push: (issue: {
+            code: "custom";
+            input: unknown;
+            message: string;
+        }) => void;
     };
-    value: unknown;
-}, value: ToolSelection): void;
-export declare function toolSelectionConnectorSchema<TArgs, TInput>(extra?: z.ZodRawShape): z.ZodType<TArgs, TInput>;
+}): void;
 /** Read the name a selection matches a loaded tool by. */
 export type ToolNameReader = (tool: unknown) => string | undefined;
 /** Read a loaded tool's own `name`. The default for connectors that don't rename. */

package/dist/connectors/tool-selection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-selection.d.ts","sourceRoot":"","sources":["../../src/connectors/tool-selection.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;GAKG;AACH,MAAM,WAAW,aAAa,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM;IAC1D,6DAA6D;IAC7D,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC;IACvB,4EAA4E;IAC5E,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,4BAA4B,CAC3C,KAAK,SAAS,MAAM,GAAG,MAAM,CAC7B,SAAQ,aAAa,CAAC,KAAK,CAAC;IAC5B,2EAA2E;IAC3E,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAOD,4DAA4D;AAC5D,eAAO,MAAM,4BAA4B;IACvC,YAAY;IAgBZ,YAAY;IAgBZ,kBAAkB;CAInB,CAAC;AAEF,sEAAsE;AACtE,wBAAgB,yBAAyB,CACvC,GAAG,EAAE;IAAE,MAAM,EAAE;QAAE,IAAI,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAAA;KAAE,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAC/D,KAAK,EAAE,aAAa,GACnB,IAAI,CAgBN;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,MAAM,EACxD,KAAK,GAAE,CAAC,CAAC,WAAgB,GACxB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAO1B;AAED,0DAA0D;AAC1D,MAAM,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,GAAG,SAAS,CAAC;AAEnE,qFAAqF;AACrF,eAAO,MAAM,QAAQ,EAAE,cAGtB,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,aAAa,EACxB,KAAK,EAAE,SAAS,OAAO,EAAE,EACzB,QAAQ,GAAE,cAAyB,GAClC,OAAO,EAAE,CAwBX"}
+{"version":3,"file":"tool-selection.d.ts","sourceRoot":"","sources":["../../src/connectors/tool-selection.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;GAKG;AACH,MAAM,WAAW,aAAa,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM;IAC1D,6DAA6D;IAC7D,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC;IACvB,4EAA4E;IAC5E,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC;CACxB;AAED,4DAA4D;AAC5D,eAAO,MAAM,0BAA0B,wCAsB1B,CAAC;AAmBd,wBAAgB,+BAA+B,CAAC,GAAG,EAAE;IACnD,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE;QACN,IAAI,EAAE,CAAC,KAAK,EAAE;YAAE,IAAI,EAAE,QAAQ,CAAC;YAAC,KAAK,EAAE,OAAO,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE,KAAK,IAAI,CAAC;KAC5E,CAAC;CACH,GAAG,IAAI,CAWP;AAED,0DAA0D;AAC1D,MAAM,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,GAAG,SAAS,CAAC;AAEnE,qFAAqF;AACrF,eAAO,MAAM,QAAQ,EAAE,cAGtB,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,aAAa,EACxB,KAAK,EAAE,SAAS,OAAO,EAAE,EACzB,QAAQ,GAAE,cAAyB,GAClC,OAAO,EAAE,CAwBX"}

package/dist/connectors/tool-selection.js

@@ -8,73 +8,47 @@
  * silently dropping a tool the agent was meant to have.
  */
 import { z } from "zod";
-function nonEmpty(field) {
-    const message = `${field} must be a non-empty string`;
-    return z.string(message).refine((value) => value.trim().length > 0, message);
-}
 /** Tool names: non-empty, no duplicates within one list. */
-export const toolSelectionConnectorFields = {
-    includeTools: z
-        .array(nonEmpty("tool name"))
-        .check((ctx) => {
-        const seen = new Set();
-        for (const name of ctx.value) {
-            if (seen.has(name)) {
-                ctx.issues.push({
-                    code: "custom",
-                    input: ctx.value,
-                    message: `contains duplicate tool name "${name}"`,
-                });
-            }
-            seen.add(name);
-        }
-    })
-        .optional(),
-    excludeTools: z
-        .array(nonEmpty("tool name"))
-        .check((ctx) => {
-        const seen = new Set();
-        for (const name of ctx.value) {
-            if (seen.has(name)) {
-                ctx.issues.push({
-                    code: "custom",
-                    input: ctx.value,
-                    message: `contains duplicate tool name "${name}"`,
-                });
-            }
-            seen.add(name);
+export const optionalToolNameListSchema = z
+    .array(z
+    .string("tool name must be a non-empty string")
+    .refine((name) => name.trim().length > 0, "tool name must be a non-empty string"))
+    .check((ctx) => {
+    const seen = new Set();
+    for (const name of ctx.value) {
+        if (seen.has(name)) {
+            ctx.issues.push({
+                code: "custom",
+                input: ctx.value,
+                message: `contains duplicate tool name "${name}"`,
+            });
         }
-    })
-        .optional(),
-    defaultToolTimeout: z
-        .number("defaultToolTimeout must be a positive number")
-        .positive("defaultToolTimeout must be a positive number")
-        .optional(),
-};
-/** Shared include/exclude overlap check for connector arg schemas. */
-export function checkToolSelectionOverlap(ctx, value) {
-    const { includeTools, excludeTools } = value;
+        seen.add(name);
+    }
+})
+    .optional();
+function toolSelectionOverlapMessage(selection) {
+    const { includeTools, excludeTools } = selection;
     const overlap = (includeTools ?? []).filter((name) => (excludeTools ?? []).includes(name));
-    if (overlap.length > 0) {
+    if (overlap.length === 0) {
+        return undefined;
+    }
+    return `selects tool(s) in both \`includeTools\` and \`excludeTools\`: ${[
+        ...new Set(overlap),
+    ]
+        .sort()
+        .join(", ")}`;
+}
+export function appendToolSelectionOverlapIssue(ctx) {
+    const message = toolSelectionOverlapMessage(ctx.value);
+    if (message) {
         ctx.issues.push({
             code: "custom",
             input: ctx.value,
-            message: `selects tool(s) in both \`includeTools\` and \`excludeTools\`: ${[
-                ...new Set(overlap),
-            ]
-                .sort()
-                .join(", ")}`,
+            message,
         });
     }
 }
-export function toolSelectionConnectorSchema(extra = {}) {
-    return z
-        .strictObject({ ...toolSelectionConnectorFields, ...extra })
-        .check((ctx) => {
-        checkToolSelectionOverlap(ctx, ctx.value);
-    })
-        .prefault({});
-}
 /** Read a loaded tool's own `name`. The default for connectors that don't rename. */
 export const toolName = (tool) => {
     const name = tool.name;