managed-deepagents 0.5.0-dev.79 → 0.5.0-dev.81

package/dist/connectors/marketplace/load.js

@@ -0,0 +1,265 @@
+/**
+ * Load marketplace MCP tools through LangSmith's `POST /api/v1/mcp/proxy`.
+ *
+ * Unlike toolserver (bare Streamable HTTP to `/v1/toolserver/servers/{slug}/mcp`),
+ * marketplace invoke uses an HTTP-over-JSON envelope. Credentials never leave
+ * the vault — the proxy mints a bearer for `agent_id` / `ls_user_id`.
+ */
+import { DynamicStructuredTool } from "@langchain/core/tools";
+import { z } from "zod";
+import { agentIdFromActor, isActorSubjectIntegrationEnabled, } from "../../identity/actor-subject.js";
+import { rewriteFleetToolError } from "../../identity/fleet-connect-hint.js";
+import { resolveFleetApiUrl, resolveFleetHeaders, } from "../../identity/fleet.js";
+import { marketplaceAsFleetHint } from "../../identity/marketplace/index.js";
+import { managedRuntimeOverrides } from "../../runtime/managed-tools.js";
+import { fetchWithTimeout, PROVIDER_HTTP_TIMEOUT_MS, } from "../../runtime/http.js";
+import { selectTools, } from "../tool-selection.js";
+import { parseMcpProxyResponseBody, resolveMarketplaceMcpServer, resolveSmithBackendV1Url, } from "./fleet-mcp.js";
+const schemaCache = new WeakMap();
+const subjectToolsCache = new WeakMap();
+const subjectToolsCacheConnectors = new Set();
+/** Load (and cache) tools for one marketplace connector declaration. */
+export function loadMarketplaceTools(integration, label, connector) {
+    if (connector.includeTools?.length === 0) {
+        return Promise.resolve([]);
+    }
+    const cached = schemaCache.get(connector);
+    if (cached) {
+        return cached;
+    }
+    const loading = connectAndLoadTools(integration, label, connector)
+        .then((tools) => {
+        // Empty pre-connect fallbacks must not stick forever — a later load may
+        // discover tools once the workspace/actor connection exists.
+        if (tools.length === 0) {
+            schemaCache.delete(connector);
+        }
+        return tools;
+    })
+        .catch((error) => {
+        schemaCache.delete(connector);
+        throw error;
+    });
+    schemaCache.set(connector, loading);
+    return loading;
+}
+export function clearMarketplaceToolsCacheForTests(connector) {
+    schemaCache.delete(connector);
+}
+export function clearMarketplaceSubjectCacheForTests() {
+    for (const connector of subjectToolsCacheConnectors) {
+        subjectToolsCache.delete(connector);
+    }
+    subjectToolsCacheConnectors.clear();
+}
+async function connectAndLoadTools(integration, label, config) {
+    const listAgentId = trimmed(process.env.MDA_TOOLSERVER_AGENT_ID);
+    const tools = await loadToolsForAgentId(integration, label, config, listAgentId);
+    if (isActorSubjectIntegrationEnabled(integration.id)) {
+        return tools.map((tool) => wrapToolWithDynamicAgentId(tool, integration, label, config));
+    }
+    return tools;
+}
+async function loadToolsForAgentId(integration, label, config, agentId) {
+    const server = await resolveMarketplaceMcpServer({
+        mcpUrl: integration.mcpUrl,
+    });
+    const providerId = server.oauth_provider_id.trim();
+    const listed = await listProxyTools({
+        integration,
+        oauthProviderId: providerId,
+        agentId,
+        label,
+    });
+    const tools = listed.map((entry) => buildProxyTool(entry, integration, providerId, config, agentId, label));
+    return selectTools(label, config, tools);
+}
+async function listProxyTools(options) {
+    const env = process.env;
+    const base = resolveFleetApiUrl(env);
+    const headers = resolveFleetHeaders(options.label, env);
+    const params = new URLSearchParams({
+        url: options.integration.mcpUrl,
+        oauth_provider_id: options.oauthProviderId,
+    });
+    if (options.agentId) {
+        params.set("agent_id", options.agentId);
+    }
+    const toolsUrl = new URL(resolveSmithBackendV1Url(base, "mcp/tools"));
+    toolsUrl.search = params.toString();
+    const response = await fetchWithTimeout(toolsUrl.toString(), { method: "GET", headers }, PROVIDER_HTTP_TIMEOUT_MS, fetch);
+    if (response.status === 428 || response.status === 401) {
+        // No subject / connection yet — expose catalog names so the agent can still
+        // be authored; invoke will fail with a connect hint once identity is present.
+        return options.integration.tools.map((name) => ({
+            name,
+            description: `${name} (connect required)`,
+            inputSchema: {
+                type: "object",
+                properties: {},
+                additionalProperties: true,
+            },
+        }));
+    }
+    if (!response.ok) {
+        const text = await response.text().catch(() => "");
+        throw new Error(`${options.label}: list marketplace tools failed (${response.status}): ${text || response.statusText}`);
+    }
+    const json = (await response.json());
+    return (json.tools ?? []).filter((tool) => typeof tool?.name === "string" && tool.name.length > 0);
+}
+function buildProxyTool(entry, integration, providerId, config, fixedAgentId, label) {
+    const schema = jsonSchemaToZod(entry.inputSchema);
+    return new DynamicStructuredTool({
+        name: entry.name,
+        description: entry.description ?? entry.name,
+        schema,
+        func: async (input, _runManager, runtime) => {
+            const runtimeConfig = runtime;
+            const agentId = resolveInvokeAgentId(runtimeConfig, integration.id) ?? fixedAgentId;
+            try {
+                return await callProxyTool({
+                    url: integration.mcpUrl,
+                    oauthProviderId: providerId,
+                    agentId,
+                    toolName: entry.name,
+                    args: input,
+                    label,
+                    timeoutMs: config.defaultToolTimeout,
+                });
+            }
+            catch (error) {
+                throw rewriteFleetToolError(error, marketplaceAsFleetHint(integration, providerId));
+            }
+        },
+    });
+}
+function wrapToolWithDynamicAgentId(tool, integration, label, config) {
+    const base = tool;
+    if (typeof base.name !== "string" || !base.name) {
+        throw new Error(`${label}: expected a LangChain tool with a string name for actor-subject wrapping`);
+    }
+    return new DynamicStructuredTool({
+        name: base.name,
+        description: base.description ?? "",
+        schema: base.schema,
+        func: async (input, runManager, runtime) => {
+            const runtimeConfig = runtime;
+            const agentId = resolveInvokeAgentId(runtimeConfig, integration.id);
+            const subjectTools = await toolsForSubject(integration, label, config, agentId);
+            const match = subjectTools.find((t) => t &&
+                typeof t === "object" &&
+                "name" in t &&
+                t.name === base.name);
+            if (!match) {
+                throw new Error(`${label}: tool "${base.name}" not found for agent subject`);
+            }
+            if (typeof match.func === "function") {
+                return await match.func(input, runManager, runtimeConfig);
+            }
+            if (typeof match.invoke === "function") {
+                return await match.invoke(input, runtimeConfig);
+            }
+            throw new Error(`${label}: tool "${base.name}" for agent subject is not invokable`);
+        },
+    });
+}
+function toolsForSubject(integration, label, config, agentId) {
+    const connectorKey = config;
+    let byAgent = subjectToolsCache.get(connectorKey);
+    if (!byAgent) {
+        byAgent = new Map();
+        subjectToolsCache.set(connectorKey, byAgent);
+        subjectToolsCacheConnectors.add(connectorKey);
+    }
+    const key = agentId ?? "";
+    const cached = byAgent.get(key);
+    if (cached) {
+        return cached;
+    }
+    const loading = loadToolsForAgentId(integration, label, config, agentId).catch((error) => {
+        byAgent.delete(key);
+        throw error;
+    });
+    byAgent.set(key, loading);
+    return loading;
+}
+function resolveInvokeAgentId(runtime, integrationId) {
+    if (isActorSubjectIntegrationEnabled(integrationId)) {
+        const identity = managedRuntimeOverrides(runtime).identity;
+        const userId = identity?.user?.id;
+        if (userId) {
+            return agentIdFromActor(userId);
+        }
+    }
+    return trimmed(process.env.MDA_TOOLSERVER_AGENT_ID);
+}
+async function callProxyTool(options) {
+    if (!options.agentId) {
+        throw new Error(`${options.label}: marketplace tool "${options.toolName}" needs an agent subject ` +
+            `(Connect-with-${options.label.replace(/^connectors\./, "")} or MDA_TOOLSERVER_AGENT_ID)`);
+    }
+    const env = process.env;
+    const base = resolveFleetApiUrl(env);
+    const headers = resolveFleetHeaders(options.label, env);
+    // Envelope timeout is seconds (smith-backend). Keep the local fetch budget
+    // at least as long, plus a small transport allowance — otherwise
+    // `defaultToolTimeout` above PROVIDER_HTTP_TIMEOUT_MS is silently truncated.
+    const timeoutMs = Math.min(Math.max(options.timeoutMs ?? 120_000, 1_000), 120_000);
+    const timeoutSeconds = timeoutMs / 1000;
+    const httpTimeoutMs = timeoutMs + 5_000;
+    // Forwarded to the vendor MCP by smith-backend's proxy. Notion (and other
+    // Streamable HTTP servers) reject requests that omit text/event-stream.
+    const mcpHeaders = {
+        "Content-Type": "application/json",
+        Accept: "application/json, text/event-stream",
+        "MCP-Protocol-Version": "2025-11-25",
+    };
+    const body = {
+        url: options.url,
+        method: "POST",
+        oauth_provider_id: options.oauthProviderId,
+        agent_id: options.agentId,
+        timeout: timeoutSeconds,
+        headers: mcpHeaders,
+        body: {
+            jsonrpc: "2.0",
+            id: 1,
+            method: "tools/call",
+            params: {
+                name: options.toolName,
+                arguments: options.args && typeof options.args === "object" ? options.args : {},
+            },
+        },
+    };
+    const response = await fetchWithTimeout(resolveSmithBackendV1Url(base, "mcp/proxy"), {
+        method: "POST",
+        headers,
+        body: JSON.stringify(body),
+    }, httpTimeoutMs, fetch);
+    const text = await response.text().catch(() => "");
+    if (!response.ok) {
+        throw new Error(`${options.label}: marketplace tool "${options.toolName}" failed (${response.status}): ${text || response.statusText}`);
+    }
+    return parseMcpProxyResponseBody(text);
+}
+/** Best-effort JSON Schema → Zod object (additionalProperties open). */
+function jsonSchemaToZod(inputSchema) {
+    if (!inputSchema || typeof inputSchema !== "object") {
+        return z.record(z.string(), z.unknown());
+    }
+    const properties = inputSchema.properties;
+    if (!properties || typeof properties !== "object") {
+        return z.record(z.string(), z.unknown());
+    }
+    const shape = {};
+    for (const key of Object.keys(properties)) {
+        shape[key] = z.unknown().optional();
+    }
+    return z.looseObject(shape);
+}
+function trimmed(value) {
+    const v = value?.trim();
+    return v ? v : undefined;
+}
+//# sourceMappingURL=load.js.map

package/dist/connectors/marketplace/load.js.map

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

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

@@ -1,13 +1,11 @@
 /**
  * The managed `connectors/` declaration primitive.
  *
- * For the first connector iteration, a connector means exactly one thing: MCP
- * servers. A Managed Deep Agent declares the remote MCP servers whose tools it
- * wants in `connectors/mcp.ts` by exporting a named `mcp` from
- * {@link defineMcpServers}. MDA discovers that declaration, creates the
- * `@langchain/mcp-adapters` client, loads the tools, and adds them to the Deep
- * Agent at runtime — the author never imports the MCP client or calls
- * `getTools()`.
+ * A Managed Deep Agent declares the remote MCP servers whose tools it wants in
+ * `connectors/mcp.ts` with `connectors.mcp(...)`. MDA discovers that
+ * declaration, creates the `@langchain/mcp-adapters` client, loads the tools,
+ * and adds them to the Deep Agent at runtime — the author never imports the MCP
+ * client or calls `getTools()`.
  *
  * Only remote MCP servers over HTTP/SSE are supported. Stdio MCP servers are
  * intentionally out of scope: they introduce process management, packaging, and
@@ -20,12 +18,9 @@
  * @example
  * ```ts
  * // connectors/mcp.ts
- * import { defineMcpServers } from "managed-deepagents";
+ * import { connectors } from "managed-deepagents";
  *
- * export const mcp = defineMcpServers({
- *   useStandardContentBlocks: true,
- *   prefixToolNameWithServerName: true,
- *   throwOnLoadError: true,
+ * export const connector = connectors.mcp({
  *   mcpServers: {
  *     docs: {
  *       transport: "http",
@@ -35,7 +30,7 @@
  * });
  * ```
  */
-import { type Connector } from "../../runtime/connector.js";
+import type { Connector } from "../../runtime/connector.js";
 /** Per-server MCP tool selection. Names are raw, unprefixed MCP tool names. */
 export interface McpToolSelectionConfig {
     /**
@@ -81,7 +76,7 @@ export interface SseMcpServerConfig extends RemoteMcpServerBaseConfig {
 }
 /** A remote MCP server connection. Stdio servers are intentionally excluded. */
 export type RemoteMcpServerConfig = HttpMcpServerConfig | SseMcpServerConfig;
-/** Configuration accepted by {@link defineMcpServers}. */
+/** Configuration accepted by `connectors.mcp`. */
 export interface McpServersConfig {
     /**
      * MCP servers to connect to. Each key is the logical server name MDA uses
@@ -124,11 +119,9 @@ export interface McpServersDefinition extends McpServersConfig, Connector {
  * Declare the MCP servers whose tools should be loaded and added to the managed
  * Deep Agent at runtime.
  *
- * Validates the config eagerly so misconfiguration surfaces at module load
- * (build/dev startup) rather than mid-run: at least one server must be
- * declared, and every server must use a remote transport (`"http"` or
- * `"sse"`). Stdio servers and invalid tool selectors are rejected with a clear
- * error.
+ * 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`.
  */
-export declare function defineMcpServers(config: McpServersConfig): McpServersDefinition;
+export declare const mcpConnector: (config: McpServersConfig) => McpServersDefinition;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connectors/mcp/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAEH,OAAO,EAAmB,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAE7E,+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,4DAA4D;AAC5D,MAAM,WAAW,yBAA0B,SAAQ,sBAAsB;IACvE,6CAA6C;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,sEAAsE;IACtE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,2EAA2E;IAC3E,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,6CAA6C;AAC7C,MAAM,WAAW,mBAAoB,SAAQ,yBAAyB;IACpE,0DAA0D;IAC1D,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,wCAAwC;AACxC,MAAM,WAAW,kBAAmB,SAAQ,yBAAyB;IACnE,oDAAoD;IACpD,SAAS,EAAE,KAAK,CAAC;IACjB,iDAAiD;IACjD,SAAS,CAAC,EAAE;QACV,OAAO,EAAE,OAAO,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAED,gFAAgF;AAChF,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,GAAG,kBAAkB,CAAC;AAE7E,0DAA0D;AAC1D,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAClD;;;;OAIG;IACH,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;;;GAIG;AACH,MAAM,WAAW,oBAAqB,SAAQ,gBAAgB,EAAE,SAAS;IACvE,qDAAqD;IACrD,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;CAC9B;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,gBAAgB,GACvB,oBAAoB,CA2CtB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connectors/mcp/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAKH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAE5D,+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,4DAA4D;AAC5D,MAAM,WAAW,yBAA0B,SAAQ,sBAAsB;IACvE,6CAA6C;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,sEAAsE;IACtE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,2EAA2E;IAC3E,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,6CAA6C;AAC7C,MAAM,WAAW,mBAAoB,SAAQ,yBAAyB;IACpE,0DAA0D;IAC1D,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,wCAAwC;AACxC,MAAM,WAAW,kBAAmB,SAAQ,yBAAyB;IACnE,oDAAoD;IACpD,SAAS,EAAE,KAAK,CAAC;IACjB,iDAAiD;IACjD,SAAS,CAAC,EAAE;QACV,OAAO,EAAE,OAAO,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAED,gFAAgF;AAChF,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,GAAG,kBAAkB,CAAC;AAE7E,kDAAkD;AAClD,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAClD;;;;OAIG;IACH,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;;;GAIG;AACH,MAAM,WAAW,oBAAqB,SAAQ,gBAAgB,EAAE,SAAS;IACvE,qDAAqD;IACrD,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;CAC9B;AAyFD;;;;;;;GAOG;AACH,eAAO,MAAM,YAAY,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,oBASrD,CAAC"}

package/dist/connectors/mcp/index.js

@@ -1,13 +1,11 @@
 /**
  * The managed `connectors/` declaration primitive.
  *
- * For the first connector iteration, a connector means exactly one thing: MCP
- * servers. A Managed Deep Agent declares the remote MCP servers whose tools it
- * wants in `connectors/mcp.ts` by exporting a named `mcp` from
- * {@link defineMcpServers}. MDA discovers that declaration, creates the
- * `@langchain/mcp-adapters` client, loads the tools, and adds them to the Deep
- * Agent at runtime — the author never imports the MCP client or calls
- * `getTools()`.
+ * A Managed Deep Agent declares the remote MCP servers whose tools it wants in
+ * `connectors/mcp.ts` with `connectors.mcp(...)`. MDA discovers that
+ * declaration, creates the `@langchain/mcp-adapters` client, loads the tools,
+ * and adds them to the Deep Agent at runtime — the author never imports the MCP
+ * client or calls `getTools()`.
  *
  * Only remote MCP servers over HTTP/SSE are supported. Stdio MCP servers are
  * intentionally out of scope: they introduce process management, packaging, and
@@ -20,12 +18,9 @@
  * @example
  * ```ts
  * // connectors/mcp.ts
- * import { defineMcpServers } from "managed-deepagents";
+ * import { connectors } from "managed-deepagents";
  *
- * export const mcp = defineMcpServers({
- *   useStandardContentBlocks: true,
- *   prefixToolNameWithServerName: true,
- *   throwOnLoadError: true,
+ * export const connector = connectors.mcp({
  *   mcpServers: {
  *     docs: {
  *       transport: "http",
@@ -35,109 +30,94 @@
  * });
  * ```
  */
-import { CONNECTOR_BRAND } from "../../runtime/connector.js";
+import { z } from "zod";
+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.";
+/** Raw MCP tool names, before the managed `{server}__` prefix is applied. */
+const toolNames = z
+    .array(z
+    .string("must be a non-empty tool name")
+    .refine((name) => name.trim().length > 0, "must be a non-empty 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();
+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(),
+    defaultToolTimeout: z.number().optional(),
+    includeTools: toolNames,
+    excludeTools: toolNames,
+})
+    .check((ctx) => {
+    const { includeTools, excludeTools } = ctx.value;
+    const overlap = (includeTools ?? []).filter((name) => (excludeTools ?? []).includes(name));
+    if (overlap.length > 0) {
+        ctx.issues.push({
+            code: "custom",
+            input: ctx.value,
+            message: "selects tool(s) in both `includeTools` and `excludeTools`: " +
+                `${[...overlap].sort().join(", ")}`,
+        });
+    }
+});
 /**
- * Declare the MCP servers whose tools should be loaded and added to the managed
- * Deep Agent at runtime.
+ * The MCP connector's arguments.
  *
- * Validates the config eagerly so misconfiguration surfaces at module load
- * (build/dev startup) rather than mid-run: at least one server must be
- * declared, and every server must use a remote transport (`"http"` or
- * `"sse"`). Stdio servers and invalid tool selectors are rejected with a clear
- * error.
+ * 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 function defineMcpServers(config) {
-    const provided = config;
-    const servers = provided.mcpServers;
-    if (servers === null ||
-        typeof servers !== "object" ||
-        Array.isArray(servers)) {
-        throw new Error("defineMcpServers(...) requires an `mcpServers` object mapping server " +
-            "names to remote MCP server configs.");
-    }
-    const entries = Object.entries(servers);
-    if (entries.length === 0) {
-        throw new Error("defineMcpServers(...) requires at least one entry in `mcpServers`.");
-    }
-    for (const [name, server] of entries) {
-        validateRemoteServer(name, server);
-    }
-    const definition = { kind: "mcp_servers", ...config };
-    // Brand it as a connector without exposing the symbol as an enumerable field.
-    Object.defineProperty(definition, CONNECTOR_BRAND, {
-        value: true,
-        enumerable: false,
-    });
-    // 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`.
-    Object.defineProperty(definition, "tools", {
-        value: async () => {
-            const { loadManagedMcpTools } = await import("./load.js");
-            return loadManagedMcpTools(definition);
-        },
-        enumerable: false,
-    });
-    return definition;
-}
-/** Allowed remote transports. Stdio is intentionally unsupported in v0. */
-const REMOTE_TRANSPORTS = new Set(["http", "sse"]);
+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(),
+});
 /**
- * Validate a single MCP server config, rejecting stdio servers and anything
- * that is not a remote HTTP/SSE connection with a `url`.
+ * Declare the MCP servers whose tools should be loaded and added to the managed
+ * Deep Agent at runtime.
+ *
+ * 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`.
  */
-function validateRemoteServer(name, server) {
-    if (server === null || typeof server !== "object") {
-        throw new Error(`MCP server "${name}" must be a configuration object.`);
-    }
-    const config = server;
-    // A stdio server is identified by transport or by a `command` field. Reject
-    // it with guidance toward the supported remote transports.
-    if (config.transport === "stdio" || "command" in config) {
-        throw new Error(`MCP server "${name}" 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 transport = config.transport;
-    if (typeof transport !== "string" || !REMOTE_TRANSPORTS.has(transport)) {
-        throw new Error(`MCP server "${name}" must declare a remote transport ` +
-            `("http" or "sse"); got ${JSON.stringify(transport)}.`);
-    }
-    if (typeof config.url !== "string" || config.url.trim().length === 0) {
-        throw new Error(`MCP server "${name}" must declare a non-empty \`url\`.`);
-    }
-    validateToolSelection(name, config);
-}
-function validateToolSelection(name, config) {
-    const includeTools = validateToolNameList(name, "includeTools", config.includeTools);
-    const excludeTools = validateToolNameList(name, "excludeTools", config.excludeTools);
-    if (!includeTools || !excludeTools) {
-        return;
-    }
-    const included = new Set(includeTools);
-    const conflicts = excludeTools.filter((toolName) => included.has(toolName));
-    if (conflicts.length > 0) {
-        throw new Error(`MCP server "${name}" selects tool(s) in both \`includeTools\` and ` +
-            `\`excludeTools\`: ${conflicts.sort().join(", ")}.`);
-    }
-}
-function validateToolNameList(serverName, field, value) {
-    if (value === undefined) {
-        return undefined;
-    }
-    if (!Array.isArray(value)) {
-        throw new Error(`MCP server "${serverName}" \`${field}\` must be an array of strings.`);
-    }
-    const seen = new Set();
-    for (const [index, item] of value.entries()) {
-        if (typeof item !== "string" || item.trim().length === 0) {
-            throw new Error(`MCP server "${serverName}" \`${field}\` entry ${index} must be a non-empty string.`);
-        }
-        if (seen.has(item)) {
-            throw new Error(`MCP server "${serverName}" \`${field}\` contains duplicate tool name "${item}".`);
-        }
-        seen.add(item);
-    }
-    return value;
-}
+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);
+    },
+});
 //# 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":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/connectors/mcp/index.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../src/connectors/mcp/load.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAA0B,MAAM,YAAY,CAAC;AAa/E;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,OAAO,EAAE,CAAC,CAQpB;AAED,yDAAyD;AACzD,wBAAgB,iCAAiC,IAAI,IAAI,CAExD"}
+{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../src/connectors/mcp/load.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAA0B,MAAM,YAAY,CAAC;AAa/E;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,OAAO,EAAE,CAAC,CAQpB;AAED,yDAAyD;AACzD,wBAAgB,iCAAiC,IAAI,IAAI,CAExD"}