agents 0.0.0-88ea3a1 → 0.0.0-89b649a

package/dist/mcp/client.d.ts

@@ -1,32 +1,48 @@
 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 { 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 { ToolSet } from 'ai';
+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];
+    };
     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): 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;
@@ -39,6 +55,14 @@ declare class MCPClientConnection {
             } | undefined;
         };
         description?: string | undefined;
+        annotations?: {
+            [x: string]: unknown;
+            title?: string | undefined;
+            readOnlyHint?: boolean | undefined;
+            destructiveHint?: boolean | undefined;
+            idempotentHint?: boolean | undefined;
+            openWorldHint?: boolean | undefined;
+        } | undefined;
     }[]>;
     fetchResources(): Promise<{
         [x: string]: unknown;
@@ -71,7 +95,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,15 +112,42 @@ 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];
+    }): Promise<{
+        id: string;
+        authUrl?: string;
+        clientId?: string;
+    }>;
+    isCallbackRequest(req: Request): boolean;
+    handleCallbackRequest(req: Request): Promise<{
+        serverId: string;
+    }>;
     /**
      * @returns namespaced list of tools
      */
     listTools(): NamespacedData["tools"];
+    /**
+     * @returns a set of tools that you can use with the AI SDK
+     */
+    unstable_getAITools(): ToolSet;
+    /**
+     * Closes all connections to MCP servers
+     */
+    closeAllConnections(): Promise<void[]>;
+    /**
+     * Closes a connection to an MCP server
+     * @param id The id of the connection to close
+     */
+    closeConnection(id: string): Promise<void>;
     /**
      * @returns namespaced list of prompts
      */
@@ -104,10 +164,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 +189,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 +302,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 +346,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 +379,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 +514,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 +649,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 +762,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

@@ -1,266 +1,7 @@
-import "../chunk-HMLY7DHA.js";
-
-// src/mcp/sse-edge.ts
 import {
-  SSEClientTransport
-} from "@modelcontextprotocol/sdk/client/sse.js";
-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 workerOptions = {
-        ...options2
-      };
-      delete workerOptions.mode;
-      return global.fetch(url2, workerOptions);
-    };
-    super(url, {
-      ...options,
-      eventSourceInit: {
-        fetch: fetchOverride
-      }
-    });
-    this.url = url;
-  }
-};
-
-// src/mcp/client-connection.ts
-import {
-  ToolListChangedNotificationSchema,
-  ResourceListChangedNotificationSchema,
-  PromptListChangedNotificationSchema
-} 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;
-    this.tools = [];
-    this.prompts = [];
-    this.resources = [];
-    this.resourceTemplates = [];
-  }
-  async init() {
-    await this.client.connect(this.transport);
-    this.serverCapabilities = await this.client.getServerCapabilities();
-    if (!this.serverCapabilities) {
-      throw new Error(
-        `The MCP Server ${this.info.name} failed to return server capabilities`
-      );
-    }
-    const [instructions, tools, resources, prompts, resourceTemplates] = await Promise.all([
-      this.client.getInstructions(),
-      this.registerTools(),
-      this.registerResources(),
-      this.registerPrompts(),
-      this.registerResourceTemplates()
-    ]);
-    this.instructions = instructions;
-    this.tools = tools;
-    this.resources = resources;
-    this.prompts = prompts;
-    this.resourceTemplates = resourceTemplates;
-  }
-  /**
-   * Notification handler registration
-   */
-  async registerTools() {
-    if (!this.serverCapabilities || !this.serverCapabilities.tools) {
-      return [];
-    }
-    if (this.serverCapabilities.tools.listChanged) {
-      this.client.setNotificationHandler(
-        ToolListChangedNotificationSchema,
-        async (_notification) => {
-          this.tools = await this.fetchTools();
-        }
-      );
-    }
-    return this.fetchTools();
-  }
-  async registerResources() {
-    if (!this.serverCapabilities || !this.serverCapabilities.resources) {
-      return [];
-    }
-    if (this.serverCapabilities.resources.listChanged) {
-      this.client.setNotificationHandler(
-        ResourceListChangedNotificationSchema,
-        async (_notification) => {
-          this.resources = await this.fetchResources();
-        }
-      );
-    }
-    return this.fetchResources();
-  }
-  async registerPrompts() {
-    if (!this.serverCapabilities || !this.serverCapabilities.prompts) {
-      return [];
-    }
-    if (this.serverCapabilities.prompts.listChanged) {
-      this.client.setNotificationHandler(
-        PromptListChangedNotificationSchema,
-        async (_notification) => {
-          this.prompts = await this.fetchPrompts();
-        }
-      );
-    }
-    return this.fetchPrompts();
-  }
-  async registerResourceTemplates() {
-    if (!this.serverCapabilities || !this.serverCapabilities.resources) {
-      return [];
-    }
-    return this.fetchResourceTemplates();
-  }
-  async fetchTools() {
-    let toolsAgg = [];
-    let toolsResult = { tools: [] };
-    do {
-      toolsResult = await this.client.listTools({
-        cursor: toolsResult.nextCursor
-      });
-      toolsAgg = toolsAgg.concat(toolsResult.tools);
-    } while (toolsResult.nextCursor);
-    return toolsAgg;
-  }
-  async fetchResources() {
-    let resourcesAgg = [];
-    let resourcesResult = { resources: [] };
-    do {
-      resourcesResult = await this.client.listResources({
-        cursor: resourcesResult.nextCursor
-      });
-      resourcesAgg = resourcesAgg.concat(resourcesResult.resources);
-    } while (resourcesResult.nextCursor);
-    return resourcesAgg;
-  }
-  async fetchPrompts() {
-    let promptsAgg = [];
-    let promptsResult = { prompts: [] };
-    do {
-      promptsResult = await this.client.listPrompts({
-        cursor: promptsResult.nextCursor
-      });
-      promptsAgg = promptsAgg.concat(promptsResult.prompts);
-    } while (promptsResult.nextCursor);
-    return promptsAgg;
-  }
-  async fetchResourceTemplates() {
-    let templatesAgg = [];
-    let templatesResult = {
-      resourceTemplates: []
-    };
-    do {
-      templatesResult = await this.client.listResourceTemplates({
-        cursor: templatesResult.nextCursor
-      });
-      templatesAgg = templatesAgg.concat(templatesResult.resourceTemplates);
-    } while (templatesResult.nextCursor);
-    return templatesAgg;
-  }
-};
-
-// src/mcp/client.ts
-var MCPClientManager = class {
-  constructor() {
-    this.mcpConnections = {};
-  }
-  /**
-   * Connect to and register an MCP server
-   *
-   * @param transportConfig Transport config
-   * @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) {
-      throw new Error(
-        `An existing MCP client has already been registered under the name "${info.name}". The MCP client name must be unique.`
-      );
-    }
-    this.mcpConnections[info.name] = new MCPClientConnection(url, info, opts);
-    await this.mcpConnections[info.name].init();
-  }
-  /**
-   * @returns namespaced list of tools
-   */
-  listTools() {
-    return getNamespacedData(this.mcpConnections, "tools");
-  }
-  /**
-   * @returns namespaced list of prompts
-   */
-  listPrompts() {
-    return getNamespacedData(this.mcpConnections, "prompts");
-  }
-  /**
-   * @returns namespaced list of tools
-   */
-  listResources() {
-    return getNamespacedData(this.mcpConnections, "resources");
-  }
-  /**
-   * @returns namespaced list of resource templates
-   */
-  listResourceTemplates() {
-    return getNamespacedData(this.mcpConnections, "resourceTemplates");
-  }
-  /**
-   * Namespaced version of callTool
-   */
-  callTool(params, resultSchema, options) {
-    const unqualifiedName = params.name.replace(`${params.serverName}.`, "");
-    return this.mcpConnections[params.serverName].client.callTool(
-      {
-        ...params,
-        name: unqualifiedName
-      },
-      resultSchema,
-      options
-    );
-  }
-  /**
-   * Namespaced version of readResource
-   */
-  readResource(params, options) {
-    return this.mcpConnections[params.serverName].client.readResource(
-      params,
-      options
-    );
-  }
-  /**
-   * Namespaced version of getPrompt
-   */
-  getPrompt(params, options) {
-    return this.mcpConnections[params.serverName].client.getPrompt(
-      params,
-      options
-    );
-  }
-};
-function getNamespacedData(mcpClients, type) {
-  const sets = Object.entries(mcpClients).map(([name, conn]) => {
-    return { name, data: conn[type] };
-  });
-  const namespacedData = sets.flatMap(({ name: serverName, 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}`
-      };
-    });
-  });
-  return namespacedData;
-}
+  MCPClientManager,
+  getNamespacedData
+} from "../chunk-OYJXQRRH.js";
 export {
   MCPClientManager,
   getNamespacedData

package/dist/mcp/client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mcp/sse-edge.ts","../../src/mcp/client-connection.ts","../../src/mcp/client.ts"],"sourcesContent":["import {\n  SSEClientTransport,\n  type SSEClientTransportOptions,\n} from \"@modelcontextprotocol/sdk/client/sse.js\";\n\nexport class SSEEdgeClientTransport extends SSEClientTransport {\n  /**\n   * Creates a new EdgeSSEClientTransport, which overrides fetch to be compatible with the CF workers environment\n   */\n  constructor(\n    private url: URL,\n    options: SSEClientTransportOptions\n  ) {\n    // biome-ignore lint/suspicious/noExplicitAny: Overriding fetch, type doesn't matter here\n    const fetchOverride = (url: any, options = {}) => {\n      const workerOptions = {\n        ...options,\n      };\n      // Remove unsupported properties\n      // @ts-ignore\n      // biome-ignore lint/performance/noDelete: workaround for workers environment\n      delete workerOptions.mode;\n\n      // Call the original fetch with fixed options\n      return global.fetch(url, workerOptions);\n    };\n\n    super(url, {\n      ...options,\n      eventSourceInit: {\n        fetch: fetchOverride,\n      },\n    });\n  }\n}\n","import { SSEEdgeClientTransport } from \"./sse-edge\";\n\nimport {\n  ToolListChangedNotificationSchema,\n  type ClientCapabilities,\n  type Resource,\n  type Tool,\n  type Prompt,\n  ResourceListChangedNotificationSchema,\n  PromptListChangedNotificationSchema,\n  type ListToolsResult,\n  type ListResourcesResult,\n  type ListPromptsResult,\n  type ServerCapabilities,\n  type ResourceTemplate,\n  type ListResourceTemplatesResult,\n} from \"@modelcontextprotocol/sdk/types.js\";\nimport { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport type {\n  SSEClientTransport,\n  SSEClientTransportOptions,\n} from \"@modelcontextprotocol/sdk/client/sse.js\";\n\nexport class MCPClientConnection {\n  client: Client;\n  transport: SSEClientTransport;\n  connected: boolean;\n  instructions?: string;\n  tools: Tool[];\n  prompts: Prompt[];\n  resources: Resource[];\n  resourceTemplates: ResourceTemplate[];\n  serverCapabilities: ServerCapabilities | undefined;\n\n  constructor(\n    url: URL,\n    private info: ConstructorParameters<typeof Client>[0],\n    opts: {\n      transport: SSEClientTransportOptions;\n      client: ConstructorParameters<typeof Client>[1];\n      capabilities: ClientCapabilities;\n    } = { transport: {}, client: {}, capabilities: {} }\n  ) {\n    this.transport = new SSEEdgeClientTransport(url, opts.transport);\n    this.client = new Client(info, opts.client);\n    this.client.registerCapabilities(opts.capabilities);\n    this.connected = false;\n    this.tools = [];\n    this.prompts = [];\n    this.resources = [];\n    this.resourceTemplates = [];\n  }\n\n  async init() {\n    await this.client.connect(this.transport);\n\n    this.serverCapabilities = await this.client.getServerCapabilities();\n    if (!this.serverCapabilities) {\n      throw new Error(\n        `The MCP Server ${this.info.name} failed to return server capabilities`\n      );\n    }\n\n    const [instructions, tools, resources, prompts, resourceTemplates] =\n      await Promise.all([\n        this.client.getInstructions(),\n        this.registerTools(),\n        this.registerResources(),\n        this.registerPrompts(),\n        this.registerResourceTemplates(),\n      ]);\n\n    this.instructions = instructions;\n    this.tools = tools;\n    this.resources = resources;\n    this.prompts = prompts;\n    this.resourceTemplates = resourceTemplates;\n  }\n\n  /**\n   * Notification handler registration\n   */\n  async registerTools(): Promise<Tool[]> {\n    if (!this.serverCapabilities || !this.serverCapabilities.tools) {\n      return [];\n    }\n\n    if (this.serverCapabilities.tools.listChanged) {\n      this.client.setNotificationHandler(\n        ToolListChangedNotificationSchema,\n        async (_notification) => {\n          this.tools = await this.fetchTools();\n        }\n      );\n    }\n\n    return this.fetchTools();\n  }\n\n  async registerResources(): Promise<Resource[]> {\n    if (!this.serverCapabilities || !this.serverCapabilities.resources) {\n      return [];\n    }\n\n    if (this.serverCapabilities.resources.listChanged) {\n      this.client.setNotificationHandler(\n        ResourceListChangedNotificationSchema,\n        async (_notification) => {\n          this.resources = await this.fetchResources();\n        }\n      );\n    }\n\n    return this.fetchResources();\n  }\n\n  async registerPrompts(): Promise<Prompt[]> {\n    if (!this.serverCapabilities || !this.serverCapabilities.prompts) {\n      return [];\n    }\n\n    if (this.serverCapabilities.prompts.listChanged) {\n      this.client.setNotificationHandler(\n        PromptListChangedNotificationSchema,\n        async (_notification) => {\n          this.prompts = await this.fetchPrompts();\n        }\n      );\n    }\n\n    return this.fetchPrompts();\n  }\n\n  async registerResourceTemplates(): Promise<ResourceTemplate[]> {\n    if (!this.serverCapabilities || !this.serverCapabilities.resources) {\n      return [];\n    }\n\n    return this.fetchResourceTemplates();\n  }\n\n  async fetchTools() {\n    let toolsAgg: Tool[] = [];\n    let toolsResult: ListToolsResult = { tools: [] };\n    do {\n      toolsResult = await this.client.listTools({\n        cursor: toolsResult.nextCursor,\n      });\n      toolsAgg = toolsAgg.concat(toolsResult.tools);\n    } while (toolsResult.nextCursor);\n    return toolsAgg;\n  }\n\n  async fetchResources() {\n    let resourcesAgg: Resource[] = [];\n    let resourcesResult: ListResourcesResult = { resources: [] };\n    do {\n      resourcesResult = await this.client.listResources({\n        cursor: resourcesResult.nextCursor,\n      });\n      resourcesAgg = resourcesAgg.concat(resourcesResult.resources);\n    } while (resourcesResult.nextCursor);\n    return resourcesAgg;\n  }\n\n  async fetchPrompts() {\n    let promptsAgg: Prompt[] = [];\n    let promptsResult: ListPromptsResult = { prompts: [] };\n    do {\n      promptsResult = await this.client.listPrompts({\n        cursor: promptsResult.nextCursor,\n      });\n      promptsAgg = promptsAgg.concat(promptsResult.prompts);\n    } while (promptsResult.nextCursor);\n    return promptsAgg;\n  }\n\n  async fetchResourceTemplates() {\n    let templatesAgg: ResourceTemplate[] = [];\n    let templatesResult: ListResourceTemplatesResult = {\n      resourceTemplates: [],\n    };\n    do {\n      templatesResult = await this.client.listResourceTemplates({\n        cursor: templatesResult.nextCursor,\n      });\n      templatesAgg = templatesAgg.concat(templatesResult.resourceTemplates);\n    } while (templatesResult.nextCursor);\n    return templatesAgg;\n  }\n}\n","import { MCPClientConnection } from \"./client-connection\";\n\nimport type {\n  ClientCapabilities,\n  CallToolRequest,\n  CallToolResultSchema,\n  CompatibilityCallToolResultSchema,\n  ReadResourceRequest,\n  GetPromptRequest,\n  Tool,\n  Resource,\n  ResourceTemplate,\n} from \"@modelcontextprotocol/sdk/types.js\";\nimport type { SSEClientTransportOptions } from \"@modelcontextprotocol/sdk/client/sse.js\";\nimport type { Client } from \"@modelcontextprotocol/sdk/client/index.js\";\nimport type { RequestOptions } from \"@modelcontextprotocol/sdk/shared/protocol.js\";\n\n/**\n * Utility class that aggregates multiple MCP clients into one\n */\nexport class MCPClientManager {\n  public mcpConnections: Record<string, MCPClientConnection> = {};\n\n  /**\n   * Connect to and register an MCP server\n   *\n   * @param transportConfig Transport config\n   * @param clientConfig Client config\n   * @param capabilities Client capabilities (i.e. if the client supports roots/sampling)\n   */\n  async connectToServer(\n    url: URL,\n    info: ConstructorParameters<typeof Client>[0],\n    opts: {\n      transport: SSEClientTransportOptions;\n      client: ConstructorParameters<typeof Client>[1];\n      capabilities: ClientCapabilities;\n    } = { transport: {}, client: {}, capabilities: {} }\n  ) {\n    if (info.name in this.mcpConnections) {\n      throw new Error(\n        `An existing MCP client has already been registered under the name \"${info.name}\". The MCP client name must be unique.`\n      );\n    }\n\n    this.mcpConnections[info.name] = new MCPClientConnection(url, info, opts);\n    await this.mcpConnections[info.name].init();\n  }\n\n  /**\n   * @returns namespaced list of tools\n   */\n  listTools(): NamespacedData[\"tools\"] {\n    return getNamespacedData(this.mcpConnections, \"tools\");\n  }\n\n  /**\n   * @returns namespaced list of prompts\n   */\n  listPrompts(): NamespacedData[\"prompts\"] {\n    return getNamespacedData(this.mcpConnections, \"prompts\");\n  }\n\n  /**\n   * @returns namespaced list of tools\n   */\n  listResources(): NamespacedData[\"resources\"] {\n    return getNamespacedData(this.mcpConnections, \"resources\");\n  }\n\n  /**\n   * @returns namespaced list of resource templates\n   */\n  listResourceTemplates(): NamespacedData[\"resourceTemplates\"] {\n    return getNamespacedData(this.mcpConnections, \"resourceTemplates\");\n  }\n\n  /**\n   * Namespaced version of callTool\n   */\n  callTool(\n    params: CallToolRequest[\"params\"] & { serverName: string },\n    resultSchema:\n      | typeof CallToolResultSchema\n      | typeof CompatibilityCallToolResultSchema,\n    options: RequestOptions\n  ) {\n    const unqualifiedName = params.name.replace(`${params.serverName}.`, \"\");\n    return this.mcpConnections[params.serverName].client.callTool(\n      {\n        ...params,\n        name: unqualifiedName,\n      },\n      resultSchema,\n      options\n    );\n  }\n\n  /**\n   * Namespaced version of readResource\n   */\n  readResource(\n    params: ReadResourceRequest[\"params\"] & { serverName: string },\n    options: RequestOptions\n  ) {\n    return this.mcpConnections[params.serverName].client.readResource(\n      params,\n      options\n    );\n  }\n\n  /**\n   * Namespaced version of getPrompt\n   */\n  getPrompt(\n    params: GetPromptRequest[\"params\"] & { serverName: string },\n    options: RequestOptions\n  ) {\n    return this.mcpConnections[params.serverName].client.getPrompt(\n      params,\n      options\n    );\n  }\n}\n\ntype NamespacedData = {\n  tools: (Tool & { serverName: string })[];\n  prompts: (Prompt & { serverName: string })[];\n  resources: (Resource & { serverName: string })[];\n  resourceTemplates: (ResourceTemplate & { serverName: string })[];\n};\n\nexport function getNamespacedData<T extends keyof NamespacedData>(\n  mcpClients: Record<string, MCPClientConnection>,\n  type: T\n): NamespacedData[T] {\n  const sets = Object.entries(mcpClients).map(([name, conn]) => {\n    return { name, data: conn[type] };\n  });\n\n  const namespacedData = sets.flatMap(({ name: serverName, data }) => {\n    return data.map((item) => {\n      return {\n        ...item,\n        // we add a servername so we can easily pull it out and convert between qualified<->unqualified name\n        // just in case the server name or item name includes a \".\"\n        serverName: `${serverName}`,\n        // qualified name\n        name: `${serverName}.${item.name}`,\n      };\n    });\n  });\n\n  return namespacedData as NamespacedData[T]; // Type assertion needed due to TS limitations with conditional return types\n}\n"],"mappings":"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","names":["url","options"]}
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/dist/mcp/do-oauth-client-provider.d.ts

@@ -0,0 +1,41 @@
+import { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
+import { OAuthClientMetadata, OAuthClientInformation, OAuthClientInformationFull, OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
+
+interface AgentsOAuthProvider extends OAuthClientProvider {
+    authUrl: string | undefined;
+    clientId: string | undefined;
+    serverId: string | undefined;
+}
+declare class DurableObjectOAuthClientProvider implements AgentsOAuthProvider {
+    storage: DurableObjectStorage;
+    clientName: string;
+    baseRedirectUrl: string;
+    private _authUrl_;
+    private _serverId_;
+    private _clientId_;
+    constructor(storage: DurableObjectStorage, clientName: string, baseRedirectUrl: string);
+    get clientMetadata(): OAuthClientMetadata;
+    get redirectUrl(): string;
+    get clientId(): string;
+    set clientId(clientId_: string);
+    get serverId(): string;
+    set serverId(serverId_: string);
+    keyPrefix(clientId: string): string;
+    clientInfoKey(clientId: string): string;
+    clientInformation(): Promise<OAuthClientInformation | undefined>;
+    saveClientInformation(clientInformation: OAuthClientInformationFull): Promise<void>;
+    tokenKey(clientId: string): string;
+    tokens(): Promise<OAuthTokens | undefined>;
+    saveTokens(tokens: OAuthTokens): Promise<void>;
+    get authUrl(): string | undefined;
+    /**
+     * Because this operates on the server side (but we need browser auth), we send this url back to the user
+     * and require user interact to initiate the redirect flow
+     */
+    redirectToAuthorization(authUrl: URL): Promise<void>;
+    codeVerifierKey(clientId: string): string;
+    saveCodeVerifier(verifier: string): Promise<void>;
+    codeVerifier(): Promise<string>;
+}
+
+export { type AgentsOAuthProvider, DurableObjectOAuthClientProvider };

package/dist/mcp/do-oauth-client-provider.js

@@ -0,0 +1,7 @@
+import {
+  DurableObjectOAuthClientProvider
+} from "../chunk-BZXOAZUX.js";
+export {
+  DurableObjectOAuthClientProvider
+};
+//# sourceMappingURL=do-oauth-client-provider.js.map