agents 0.0.0-88ea3a1 → 0.0.0-90db5ba

package/dist/mcp/client.d.ts

@@ -1,32 +1,49 @@
 import * as zod from 'zod';
-import { Tool, Prompt as Prompt$1, Resource, ResourceTemplate, ServerCapabilities, ClientCapabilities, CallToolRequest, CallToolResultSchema, CompatibilityCallToolResultSchema, ReadResourceRequest, GetPromptRequest } from '@modelcontextprotocol/sdk/types.js';
+import { ClientCapabilities, Tool, Prompt, Resource, ResourceTemplate, ServerCapabilities, CallToolRequest, CallToolResultSchema, CompatibilityCallToolResultSchema, ReadResourceRequest, GetPromptRequest } from '@modelcontextprotocol/sdk/types.js';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { SSEClientTransport, SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js';
+import { SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js';
+import { AgentsOAuthProvider } from './do-oauth-client-provider.js';
 import { RequestOptions } from '@modelcontextprotocol/sdk/shared/protocol.js';
+import '@modelcontextprotocol/sdk/client/auth.js';
+import '@modelcontextprotocol/sdk/shared/auth.js';
 
 declare class MCPClientConnection {
-    private info;
+    url: URL;
+    options: {
+        transport: SSEClientTransportOptions & {
+            authProvider?: AgentsOAuthProvider;
+        };
+        client: ConstructorParameters<typeof Client>[1];
+        capabilities: ClientCapabilities;
+    };
     client: Client;
-    transport: SSEClientTransport;
-    connected: boolean;
+    connectionState: "authenticating" | "connecting" | "ready" | "discovering" | "failed";
     instructions?: string;
     tools: Tool[];
-    prompts: Prompt$1[];
+    prompts: Prompt[];
     resources: Resource[];
     resourceTemplates: ResourceTemplate[];
     serverCapabilities: ServerCapabilities | undefined;
-    constructor(url: URL, info: ConstructorParameters<typeof Client>[0], opts?: {
-        transport: SSEClientTransportOptions;
+    constructor(url: URL, info: ConstructorParameters<typeof Client>[0], options?: {
+        transport: SSEClientTransportOptions & {
+            authProvider?: AgentsOAuthProvider;
+        };
         client: ConstructorParameters<typeof Client>[1];
         capabilities: ClientCapabilities;
     });
-    init(): Promise<void>;
+    /**
+     * Initialize a client connection
+     *
+     * @param code Optional OAuth code to initialize the connection with if auth hasn't been initialized
+     * @returns
+     */
+    init(code?: string, clientId?: string): Promise<void>;
     /**
      * Notification handler registration
      */
     registerTools(): Promise<Tool[]>;
     registerResources(): Promise<Resource[]>;
-    registerPrompts(): Promise<Prompt$1[]>;
+    registerPrompts(): Promise<Prompt[]>;
     registerResourceTemplates(): Promise<ResourceTemplate[]>;
     fetchTools(): Promise<{
         [x: string]: unknown;
@@ -71,7 +88,16 @@ declare class MCPClientConnection {
  * Utility class that aggregates multiple MCP clients into one
  */
 declare class MCPClientManager {
+    private name;
+    private version;
     mcpConnections: Record<string, MCPClientConnection>;
+    private callbackUrls;
+    /**
+     * @param name Name of the MCP client
+     * @param version Version of the MCP Client
+     * @param auth Auth paramters if being used to create a DurableObjectOAuthClientProvider
+     */
+    constructor(name: string, version: string);
     /**
      * Connect to and register an MCP server
      *
@@ -79,11 +105,25 @@ declare class MCPClientManager {
      * @param clientConfig Client config
      * @param capabilities Client capabilities (i.e. if the client supports roots/sampling)
      */
-    connectToServer(url: URL, info: ConstructorParameters<typeof Client>[0], opts?: {
-        transport: SSEClientTransportOptions;
-        client: ConstructorParameters<typeof Client>[1];
-        capabilities: ClientCapabilities;
-    }): Promise<void>;
+    connect(url: string, options?: {
+        reconnect?: {
+            id: string;
+            oauthClientId?: string;
+            oauthCode?: string;
+        };
+        transport?: SSEClientTransportOptions & {
+            authProvider?: AgentsOAuthProvider;
+        };
+        client?: ConstructorParameters<typeof Client>[1];
+        capabilities?: ClientCapabilities;
+    }): Promise<{
+        id: string;
+        authUrl: string | undefined;
+    }>;
+    isCallbackRequest(req: Request): boolean;
+    handleCallbackRequest(req: Request): Promise<{
+        serverId: string;
+    }>;
     /**
      * @returns namespaced list of tools
      */
@@ -104,10 +144,10 @@ declare class MCPClientManager {
      * Namespaced version of callTool
      */
     callTool(params: CallToolRequest["params"] & {
-        serverName: string;
-    }, resultSchema: typeof CallToolResultSchema | typeof CompatibilityCallToolResultSchema, options: RequestOptions): Promise<zod.objectOutputType<zod.objectUtil.extendShape<{
+        serverId: string;
+    }, resultSchema: typeof CallToolResultSchema | typeof CompatibilityCallToolResultSchema, options: RequestOptions): Promise<zod.objectOutputType<{
         _meta: zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{}, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{}, zod.ZodTypeAny, "passthrough">>>;
-    }, {
+    } & {
         content: zod.ZodArray<zod.ZodUnion<[zod.ZodObject<{
             type: zod.ZodLiteral<"text">;
             text: zod.ZodString;
@@ -129,6 +169,18 @@ declare class MCPClientManager {
             type: zod.ZodLiteral<"image">;
             data: zod.ZodString;
             mimeType: zod.ZodString;
+        }, zod.ZodTypeAny, "passthrough">>, zod.ZodObject<{
+            type: zod.ZodLiteral<"audio">;
+            data: zod.ZodString;
+            mimeType: zod.ZodString;
+        }, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{
+            type: zod.ZodLiteral<"audio">;
+            data: zod.ZodString;
+            mimeType: zod.ZodString;
+        }, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{
+            type: zod.ZodLiteral<"audio">;
+            data: zod.ZodString;
+            mimeType: zod.ZodString;
         }, zod.ZodTypeAny, "passthrough">>, zod.ZodObject<{
             type: zod.ZodLiteral<"resource">;
             resource: zod.ZodUnion<[zod.ZodObject<zod.objectUtil.extendShape<{
@@ -230,19 +282,19 @@ declare class MCPClientManager {
             }>, zod.ZodTypeAny, "passthrough">>]>;
         }, zod.ZodTypeAny, "passthrough">>]>, "many">;
         isError: zod.ZodOptional<zod.ZodDefault<zod.ZodBoolean>>;
-    }>, zod.ZodTypeAny, "passthrough"> | zod.objectOutputType<zod.objectUtil.extendShape<{
+    }, zod.ZodTypeAny, "passthrough"> | zod.objectOutputType<{
         _meta: zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{}, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{}, zod.ZodTypeAny, "passthrough">>>;
-    }, {
+    } & {
         toolResult: zod.ZodUnknown;
-    }>, zod.ZodTypeAny, "passthrough">>;
+    }, zod.ZodTypeAny, "passthrough">>;
     /**
      * Namespaced version of readResource
      */
     readResource(params: ReadResourceRequest["params"] & {
-        serverName: string;
-    }, options: RequestOptions): Promise<zod.objectOutputType<zod.objectUtil.extendShape<{
+        serverId: string;
+    }, options: RequestOptions): Promise<zod.objectOutputType<{
         _meta: zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{}, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{}, zod.ZodTypeAny, "passthrough">>>;
-    }, {
+    } & {
         contents: zod.ZodArray<zod.ZodUnion<[zod.ZodObject<zod.objectUtil.extendShape<{
             uri: zod.ZodString;
             mimeType: zod.ZodOptional<zod.ZodString>;
@@ -274,15 +326,15 @@ declare class MCPClientManager {
         }, {
             blob: zod.ZodString;
         }>, zod.ZodTypeAny, "passthrough">>]>, "many">;
-    }>, zod.ZodTypeAny, "passthrough">>;
+    }, zod.ZodTypeAny, "passthrough">>;
     /**
      * Namespaced version of getPrompt
      */
     getPrompt(params: GetPromptRequest["params"] & {
-        serverName: string;
-    }, options: RequestOptions): Promise<zod.objectOutputType<zod.objectUtil.extendShape<{
+        serverId: string;
+    }, options: RequestOptions): Promise<zod.objectOutputType<{
         _meta: zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{}, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{}, zod.ZodTypeAny, "passthrough">>>;
-    }, {
+    } & {
         description: zod.ZodOptional<zod.ZodString>;
         messages: zod.ZodArray<zod.ZodObject<{
             role: zod.ZodEnum<["user", "assistant"]>;
@@ -307,6 +359,18 @@ declare class MCPClientManager {
                 type: zod.ZodLiteral<"image">;
                 data: zod.ZodString;
                 mimeType: zod.ZodString;
+            }, zod.ZodTypeAny, "passthrough">>, zod.ZodObject<{
+                type: zod.ZodLiteral<"audio">;
+                data: zod.ZodString;
+                mimeType: zod.ZodString;
+            }, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{
+                type: zod.ZodLiteral<"audio">;
+                data: zod.ZodString;
+                mimeType: zod.ZodString;
+            }, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{
+                type: zod.ZodLiteral<"audio">;
+                data: zod.ZodString;
+                mimeType: zod.ZodString;
             }, zod.ZodTypeAny, "passthrough">>, zod.ZodObject<{
                 type: zod.ZodLiteral<"resource">;
                 resource: zod.ZodUnion<[zod.ZodObject<zod.objectUtil.extendShape<{
@@ -430,6 +494,18 @@ declare class MCPClientManager {
                 type: zod.ZodLiteral<"image">;
                 data: zod.ZodString;
                 mimeType: zod.ZodString;
+            }, zod.ZodTypeAny, "passthrough">>, zod.ZodObject<{
+                type: zod.ZodLiteral<"audio">;
+                data: zod.ZodString;
+                mimeType: zod.ZodString;
+            }, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{
+                type: zod.ZodLiteral<"audio">;
+                data: zod.ZodString;
+                mimeType: zod.ZodString;
+            }, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{
+                type: zod.ZodLiteral<"audio">;
+                data: zod.ZodString;
+                mimeType: zod.ZodString;
             }, zod.ZodTypeAny, "passthrough">>, zod.ZodObject<{
                 type: zod.ZodLiteral<"resource">;
                 resource: zod.ZodUnion<[zod.ZodObject<zod.objectUtil.extendShape<{
@@ -553,6 +629,18 @@ declare class MCPClientManager {
                 type: zod.ZodLiteral<"image">;
                 data: zod.ZodString;
                 mimeType: zod.ZodString;
+            }, zod.ZodTypeAny, "passthrough">>, zod.ZodObject<{
+                type: zod.ZodLiteral<"audio">;
+                data: zod.ZodString;
+                mimeType: zod.ZodString;
+            }, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{
+                type: zod.ZodLiteral<"audio">;
+                data: zod.ZodString;
+                mimeType: zod.ZodString;
+            }, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{
+                type: zod.ZodLiteral<"audio">;
+                data: zod.ZodString;
+                mimeType: zod.ZodString;
             }, zod.ZodTypeAny, "passthrough">>, zod.ZodObject<{
                 type: zod.ZodLiteral<"resource">;
                 resource: zod.ZodUnion<[zod.ZodObject<zod.objectUtil.extendShape<{
@@ -654,20 +742,20 @@ declare class MCPClientManager {
                 }>, zod.ZodTypeAny, "passthrough">>]>;
             }, zod.ZodTypeAny, "passthrough">>]>;
         }, zod.ZodTypeAny, "passthrough">>, "many">;
-    }>, zod.ZodTypeAny, "passthrough">>;
+    }, zod.ZodTypeAny, "passthrough">>;
 }
 type NamespacedData = {
     tools: (Tool & {
-        serverName: string;
+        serverId: string;
     })[];
     prompts: (Prompt & {
-        serverName: string;
+        serverId: string;
     })[];
     resources: (Resource & {
-        serverName: string;
+        serverId: string;
     })[];
     resourceTemplates: (ResourceTemplate & {
-        serverName: string;
+        serverId: string;
     })[];
 };
 declare function getNamespacedData<T extends keyof NamespacedData>(mcpClients: Record<string, MCPClientConnection>, type: T): NamespacedData[T];

package/dist/mcp/client.js

@@ -9,12 +9,17 @@ var SSEEdgeClientTransport = class extends SSEClientTransport {
    * Creates a new EdgeSSEClientTransport, which overrides fetch to be compatible with the CF workers environment
    */
   constructor(url, options) {
-    const fetchOverride = (url2, options2 = {}) => {
+    const fetchOverride = async (fetchUrl, fetchInit = {}) => {
+      const headers = await this.authHeaders();
       const workerOptions = {
-        ...options2
+        ...fetchInit,
+        headers: {
+          ...fetchInit?.headers,
+          ...headers
+        }
       };
       delete workerOptions.mode;
-      return global.fetch(url2, workerOptions);
+      return fetch(fetchUrl, workerOptions);
     };
     super(url, {
       ...options,
@@ -22,7 +27,17 @@ var SSEEdgeClientTransport = class extends SSEClientTransport {
         fetch: fetchOverride
       }
     });
-    this.url = url;
+    this.authProvider = options.authProvider;
+  }
+  async authHeaders() {
+    if (this.authProvider) {
+      const tokens = await this.authProvider.tokens();
+      if (tokens) {
+        return {
+          Authorization: `Bearer ${tokens.access_token}`
+        };
+      }
+    }
   }
 };
 
@@ -34,24 +49,45 @@ import {
 } from "@modelcontextprotocol/sdk/types.js";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 var MCPClientConnection = class {
-  constructor(url, info, opts = { transport: {}, client: {}, capabilities: {} }) {
-    this.info = info;
-    this.transport = new SSEEdgeClientTransport(url, opts.transport);
-    this.client = new Client(info, opts.client);
-    this.client.registerCapabilities(opts.capabilities);
-    this.connected = false;
+  constructor(url, info, options = { transport: {}, client: {}, capabilities: {} }) {
+    this.url = url;
+    this.options = options;
+    this.connectionState = "connecting";
     this.tools = [];
     this.prompts = [];
     this.resources = [];
     this.resourceTemplates = [];
+    this.client = new Client(info, options.client);
+    this.client.registerCapabilities(options.capabilities);
   }
-  async init() {
-    await this.client.connect(this.transport);
+  /**
+   * Initialize a client connection
+   *
+   * @param code Optional OAuth code to initialize the connection with if auth hasn't been initialized
+   * @returns
+   */
+  async init(code, clientId) {
+    try {
+      const transport = new SSEEdgeClientTransport(
+        this.url,
+        this.options.transport
+      );
+      if (code) {
+        await transport.finishAuth(code);
+      }
+      await this.client.connect(transport);
+    } catch (e) {
+      if (e.toString().includes("Unauthorized")) {
+        this.connectionState = "authenticating";
+        return;
+      }
+      this.connectionState = "failed";
+      throw e;
+    }
+    this.connectionState = "discovering";
     this.serverCapabilities = await this.client.getServerCapabilities();
     if (!this.serverCapabilities) {
-      throw new Error(
-        `The MCP Server ${this.info.name} failed to return server capabilities`
-      );
+      throw new Error("The MCP Server failed to return server capabilities");
     }
     const [instructions, tools, resources, prompts, resourceTemplates] = await Promise.all([
       this.client.getInstructions(),
@@ -65,6 +101,7 @@ var MCPClientConnection = class {
     this.resources = resources;
     this.prompts = prompts;
     this.resourceTemplates = resourceTemplates;
+    this.connectionState = "ready";
   }
   /**
    * Notification handler registration
@@ -123,7 +160,7 @@ var MCPClientConnection = class {
     do {
       toolsResult = await this.client.listTools({
         cursor: toolsResult.nextCursor
-      });
+      }).catch(capabilityErrorHandler({ tools: [] }, "tools/list"));
       toolsAgg = toolsAgg.concat(toolsResult.tools);
     } while (toolsResult.nextCursor);
     return toolsAgg;
@@ -134,7 +171,7 @@ var MCPClientConnection = class {
     do {
       resourcesResult = await this.client.listResources({
         cursor: resourcesResult.nextCursor
-      });
+      }).catch(capabilityErrorHandler({ resources: [] }, "resources/list"));
       resourcesAgg = resourcesAgg.concat(resourcesResult.resources);
     } while (resourcesResult.nextCursor);
     return resourcesAgg;
@@ -145,7 +182,7 @@ var MCPClientConnection = class {
     do {
       promptsResult = await this.client.listPrompts({
         cursor: promptsResult.nextCursor
-      });
+      }).catch(capabilityErrorHandler({ prompts: [] }, "prompts/list"));
       promptsAgg = promptsAgg.concat(promptsResult.prompts);
     } while (promptsResult.nextCursor);
     return promptsAgg;
@@ -158,17 +195,41 @@ var MCPClientConnection = class {
     do {
       templatesResult = await this.client.listResourceTemplates({
         cursor: templatesResult.nextCursor
-      });
+      }).catch(
+        capabilityErrorHandler(
+          { resourceTemplates: [] },
+          "resources/templates/list"
+        )
+      );
       templatesAgg = templatesAgg.concat(templatesResult.resourceTemplates);
     } while (templatesResult.nextCursor);
     return templatesAgg;
   }
 };
+function capabilityErrorHandler(empty, method) {
+  return (e) => {
+    if (e.code === -32601) {
+      console.error(
+        `The server advertised support for the capability ${method.split("/")[0]}, but returned "Method not found" for '${method}'.`
+      );
+      return empty;
+    }
+    throw e;
+  };
+}
 
 // src/mcp/client.ts
 var MCPClientManager = class {
-  constructor() {
+  /**
+   * @param name Name of the MCP client
+   * @param version Version of the MCP Client
+   * @param auth Auth paramters if being used to create a DurableObjectOAuthClientProvider
+   */
+  constructor(name, version) {
+    this.name = name;
+    this.version = version;
     this.mcpConnections = {};
+    this.callbackUrls = [];
   }
   /**
    * Connect to and register an MCP server
@@ -177,14 +238,96 @@ var MCPClientManager = class {
    * @param clientConfig Client config
    * @param capabilities Client capabilities (i.e. if the client supports roots/sampling)
    */
-  async connectToServer(url, info, opts = { transport: {}, client: {}, capabilities: {} }) {
-    if (info.name in this.mcpConnections) {
+  async connect(url, options = {}) {
+    const id = options.reconnect?.id ?? crypto.randomUUID();
+    if (!options.transport?.authProvider) {
+      console.warn(
+        "No authProvider provided in the transport options. This client will only support unauthenticated remote MCP Servers"
+      );
+    } else {
+      options.transport.authProvider.serverId = id;
+    }
+    this.mcpConnections[id] = new MCPClientConnection(
+      new URL(url),
+      {
+        name: this.name,
+        version: this.version
+      },
+      {
+        transport: options.transport ?? {},
+        client: options.client ?? {},
+        capabilities: options.client ?? {}
+      }
+    );
+    await this.mcpConnections[id].init(
+      options.reconnect?.oauthCode,
+      options.reconnect?.oauthClientId
+    );
+    const authUrl = options.transport?.authProvider?.authUrl;
+    if (authUrl && options.transport?.authProvider?.redirectUrl) {
+      this.callbackUrls.push(
+        options.transport.authProvider.redirectUrl.toString()
+      );
+    }
+    return {
+      id,
+      authUrl
+    };
+  }
+  isCallbackRequest(req) {
+    return req.method === "GET" && !!this.callbackUrls.find((url) => {
+      return req.url.startsWith(url);
+    });
+  }
+  async handleCallbackRequest(req) {
+    const url = new URL(req.url);
+    const urlMatch = this.callbackUrls.find((url2) => {
+      return req.url.startsWith(url2);
+    });
+    if (!urlMatch) {
       throw new Error(
-        `An existing MCP client has already been registered under the name "${info.name}". The MCP client name must be unique.`
+        `No callback URI match found for the request url: ${req.url}. Was the request matched with \`isCallbackRequest()\`?`
       );
     }
-    this.mcpConnections[info.name] = new MCPClientConnection(url, info, opts);
-    await this.mcpConnections[info.name].init();
+    const code = url.searchParams.get("code");
+    const clientId = url.searchParams.get("state");
+    const urlParams = urlMatch.split("/");
+    const serverId = urlParams[urlParams.length - 1];
+    if (!code) {
+      throw new Error("Unauthorized: no code provided");
+    }
+    if (!clientId) {
+      throw new Error("Unauthorized: no state provided");
+    }
+    if (this.mcpConnections[serverId] === void 0) {
+      throw new Error(`Could not find serverId: ${serverId}`);
+    }
+    if (this.mcpConnections[serverId].connectionState !== "authenticating") {
+      throw new Error(
+        "Failed to authenticate: the client isn't in the `authenticating` state"
+      );
+    }
+    const conn = this.mcpConnections[serverId];
+    if (!conn.options.transport.authProvider) {
+      throw new Error(
+        "Trying to finalize authentication for a server connection without an authProvider"
+      );
+    }
+    conn.options.transport.authProvider.clientId = clientId;
+    conn.options.transport.authProvider.serverId = serverId;
+    const serverUrl = conn.url.toString();
+    await this.connect(serverUrl, {
+      reconnect: {
+        id: serverId,
+        oauthClientId: clientId,
+        oauthCode: code
+      },
+      ...conn.options
+    });
+    if (this.mcpConnections[serverId].connectionState === "authenticating") {
+      throw new Error("Failed to authenticate: client failed to initialize");
+    }
+    return { serverId };
   }
   /**
    * @returns namespaced list of tools
@@ -214,8 +357,8 @@ var MCPClientManager = class {
    * Namespaced version of callTool
    */
   callTool(params, resultSchema, options) {
-    const unqualifiedName = params.name.replace(`${params.serverName}.`, "");
-    return this.mcpConnections[params.serverName].client.callTool(
+    const unqualifiedName = params.name.replace(`${params.serverId}.`, "");
+    return this.mcpConnections[params.serverId].client.callTool(
       {
         ...params,
         name: unqualifiedName
@@ -228,7 +371,7 @@ var MCPClientManager = class {
    * Namespaced version of readResource
    */
   readResource(params, options) {
-    return this.mcpConnections[params.serverName].client.readResource(
+    return this.mcpConnections[params.serverId].client.readResource(
       params,
       options
     );
@@ -237,7 +380,7 @@ var MCPClientManager = class {
    * Namespaced version of getPrompt
    */
   getPrompt(params, options) {
-    return this.mcpConnections[params.serverName].client.getPrompt(
+    return this.mcpConnections[params.serverId].client.getPrompt(
       params,
       options
     );
@@ -247,15 +390,12 @@ function getNamespacedData(mcpClients, type) {
   const sets = Object.entries(mcpClients).map(([name, conn]) => {
     return { name, data: conn[type] };
   });
-  const namespacedData = sets.flatMap(({ name: serverName, data }) => {
+  const namespacedData = sets.flatMap(({ name: serverId, data }) => {
     return data.map((item) => {
       return {
         ...item,
-        // we add a servername so we can easily pull it out and convert between qualified<->unqualified name
-        // just in case the server name or item name includes a "."
-        serverName: `${serverName}`,
-        // qualified name
-        name: `${serverName}.${item.name}`
+        // we add a serverId so we can easily pull it out and send the tool call to the right server
+        serverId
       };
     });
   });