agents 0.0.52 → 0.0.54

package/dist/mcp/client.d.ts

@@ -1,32 +1,40 @@
 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, ClientCapabilities, 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 { RequestOptions } from '@modelcontextprotocol/sdk/shared/protocol.js';
+import { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
 
 declare class MCPClientConnection {
+    url: URL;
     private info;
+    private options;
     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?: {
+    constructor(url: URL, info: ConstructorParameters<typeof Client>[0], options?: {
         transport: SSEClientTransportOptions;
         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;
@@ -44,8 +52,8 @@ declare class MCPClientConnection {
         [x: string]: unknown;
         name: string;
         uri: string;
-        mimeType?: string | undefined;
         description?: string | undefined;
+        mimeType?: string | undefined;
     }[]>;
     fetchPrompts(): Promise<{
         [x: string]: unknown;
@@ -62,16 +70,33 @@ declare class MCPClientConnection {
         [x: string]: unknown;
         name: string;
         uriTemplate: string;
-        mimeType?: string | undefined;
         description?: string | undefined;
+        mimeType?: string | undefined;
     }[]>;
 }
 
+interface AgentsOAuthProvider extends OAuthClientProvider {
+    authUrl: string | undefined;
+    clientId: string | undefined;
+}
+
 /**
  * Utility class that aggregates multiple MCP clients into one
  */
 declare class MCPClientManager {
+    private name;
+    private version;
+    private auth?;
     mcpConnections: Record<string, MCPClientConnection>;
+    /**
+     * @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, auth?: {
+        baseCallbackUri: string;
+        storage: DurableObjectStorage;
+    } | undefined);
     /**
      * Connect to and register an MCP server
      *
@@ -79,11 +104,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, opts?: {
+        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,7 +143,7 @@ declare class MCPClientManager {
      * Namespaced version of callTool
      */
     callTool(params: CallToolRequest["params"] & {
-        serverName: string;
+        serverId: string;
     }, resultSchema: typeof CallToolResultSchema | typeof CompatibilityCallToolResultSchema, options: RequestOptions): Promise<zod.objectOutputType<zod.objectUtil.extendShape<{
         _meta: zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{}, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{}, zod.ZodTypeAny, "passthrough">>>;
     }, {
@@ -239,7 +278,7 @@ declare class MCPClientManager {
      * Namespaced version of readResource
      */
     readResource(params: ReadResourceRequest["params"] & {
-        serverName: string;
+        serverId: string;
     }, options: RequestOptions): Promise<zod.objectOutputType<zod.objectUtil.extendShape<{
         _meta: zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{}, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{}, zod.ZodTypeAny, "passthrough">>>;
     }, {
@@ -279,7 +318,7 @@ declare class MCPClientManager {
      * Namespaced version of getPrompt
      */
     getPrompt(params: GetPromptRequest["params"] & {
-        serverName: string;
+        serverId: string;
     }, options: RequestOptions): Promise<zod.objectOutputType<zod.objectUtil.extendShape<{
         _meta: zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{}, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{}, zod.ZodTypeAny, "passthrough">>>;
     }, {
@@ -658,16 +697,16 @@ declare class MCPClientManager {
 }
 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,46 @@ import {
 } from "@modelcontextprotocol/sdk/types.js";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 var MCPClientConnection = class {
-  constructor(url, info, opts = { transport: {}, client: {}, capabilities: {} }) {
+  constructor(url, info, options = { transport: {}, client: {}, capabilities: {} }) {
+    this.url = url;
     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.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 +102,7 @@ var MCPClientConnection = class {
     this.resources = resources;
     this.prompts = prompts;
     this.resourceTemplates = resourceTemplates;
+    this.connectionState = "ready";
   }
   /**
    * Notification handler registration
@@ -165,9 +203,109 @@ var MCPClientConnection = class {
   }
 };
 
+// src/mcp/do-oauth-client-provider.ts
+var DurableObjectOAuthClientProvider = class {
+  constructor(storage, clientName, sessionId, redirectUrl, clientId_) {
+    this.storage = storage;
+    this.clientName = clientName;
+    this.sessionId = sessionId;
+    this.redirectUrl = redirectUrl;
+    this.clientId_ = clientId_;
+  }
+  get clientMetadata() {
+    return {
+      redirect_uris: [this.redirectUrl],
+      token_endpoint_auth_method: "none",
+      grant_types: ["authorization_code", "refresh_token"],
+      response_types: ["code"],
+      client_name: this.clientName,
+      client_uri: "example.com"
+    };
+  }
+  get clientId() {
+    if (!this.clientId_) {
+      throw new Error("no clientId");
+    }
+    return this.clientId_;
+  }
+  set clientId(clientId_) {
+    this.clientId_ = clientId_;
+  }
+  keyPrefix(clientId) {
+    return `/${this.clientName}/${this.sessionId}/${clientId}`;
+  }
+  clientInfoKey(clientId) {
+    return `${this.keyPrefix(clientId)}/client_info/`;
+  }
+  async clientInformation() {
+    if (!this.clientId_) {
+      return void 0;
+    }
+    return await this.storage.get(
+      this.clientInfoKey(this.clientId)
+    ) ?? void 0;
+  }
+  async saveClientInformation(clientInformation) {
+    await this.storage.put(
+      this.clientInfoKey(clientInformation.client_id),
+      clientInformation
+    );
+    this.clientId = clientInformation.client_id;
+  }
+  tokenKey(clientId) {
+    return `${this.keyPrefix(clientId)}/token`;
+  }
+  async tokens() {
+    if (!this.clientId_) {
+      return void 0;
+    }
+    return await this.storage.get(this.tokenKey(this.clientId)) ?? void 0;
+  }
+  async saveTokens(tokens) {
+    await this.storage.put(this.tokenKey(this.clientId), tokens);
+  }
+  get authUrl() {
+    return this.authUrl_;
+  }
+  /**
+   * 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
+   */
+  async redirectToAuthorization(authUrl) {
+    const client_id = authUrl.searchParams.get("client_id");
+    if (client_id) {
+      authUrl.searchParams.append("state", client_id);
+    }
+    this.authUrl_ = authUrl.toString();
+  }
+  codeVerifierKey(clientId) {
+    return `${this.keyPrefix(clientId)}/code_verifier`;
+  }
+  async saveCodeVerifier(verifier) {
+    await this.storage.put(this.codeVerifierKey(this.clientId), verifier);
+  }
+  async codeVerifier() {
+    const codeVerifier = await this.storage.get(
+      this.codeVerifierKey(this.clientId)
+    );
+    if (!codeVerifier) {
+      throw new Error("No code verifier found");
+    }
+    return codeVerifier;
+  }
+};
+
 // 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, auth) {
+    this.name = name;
+    this.version = version;
+    this.auth = auth;
     this.mcpConnections = {};
   }
   /**
@@ -177,14 +315,82 @@ 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, opts = {}) {
+    const id = opts.reconnect?.id ?? crypto.randomUUID();
+    if (this.auth) {
+      console.warn(
+        "Using .auth configuration to generate an oauth provider, this is temporary and will be removed in the next version. Instead use transport.authProvider to provide an auth provider"
+      );
+    }
+    const authProvider = this.auth ? new DurableObjectOAuthClientProvider(
+      this.auth.storage,
+      this.name,
+      id,
+      `${this.auth.baseCallbackUri}/${id}`,
+      opts.reconnect?.oauthClientId
+    ) : opts.transport?.authProvider;
+    this.mcpConnections[id] = new MCPClientConnection(
+      new URL(url),
+      {
+        name: this.name,
+        version: this.version
+      },
+      {
+        transport: {
+          ...opts.transport,
+          authProvider
+        },
+        client: opts.client ?? {},
+        capabilities: opts.client ?? {}
+      }
+    );
+    await this.mcpConnections[id].init(
+      opts.reconnect?.oauthCode,
+      opts.reconnect?.oauthClientId
+    );
+    return {
+      id,
+      authUrl: authProvider?.authUrl
+    };
+  }
+  isCallbackRequest(req) {
+    if (this.auth?.baseCallbackUri) {
+      return req.url.startsWith(this.auth.baseCallbackUri) && req.method === "GET";
+    }
+    return false;
+  }
+  async handleCallbackRequest(req) {
+    const url = new URL(req.url);
+    const code = url.searchParams.get("code");
+    const clientId = url.searchParams.get("state");
+    let serverId = req.url.replace(this.auth.baseCallbackUri, "").split("?")[0];
+    serverId = serverId.replaceAll("/", "");
+    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(
-        `An existing MCP client has already been registered under the name "${info.name}". The MCP client name must be unique.`
+        "Failed to authenticate: the client isn't in the `authenticating` state"
       );
     }
-    this.mcpConnections[info.name] = new MCPClientConnection(url, info, opts);
-    await this.mcpConnections[info.name].init();
+    const serverUrl = this.mcpConnections[serverId].url.toString();
+    await this.connect(serverUrl, {
+      reconnect: {
+        id: serverId,
+        oauthClientId: clientId,
+        oauthCode: code
+      }
+    });
+    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 +420,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 +434,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 +443,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 +453,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
       };
     });
   });

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":["../../src/mcp/sse-edge.ts","../../src/mcp/client-connection.ts","../../src/mcp/do-oauth-client-provider.ts","../../src/mcp/client.ts"],"sourcesContent":["import {\n  SSEClientTransport,\n  type SSEClientTransportOptions,\n} from \"@modelcontextprotocol/sdk/client/sse.js\";\nimport type { OAuthClientProvider } from \"@modelcontextprotocol/sdk/client/auth.js\";\n\nexport class SSEEdgeClientTransport extends SSEClientTransport {\n  private authProvider: OAuthClientProvider | undefined;\n  /**\n   * Creates a new EdgeSSEClientTransport, which overrides fetch to be compatible with the CF workers environment\n   */\n  constructor(url: URL, options: SSEClientTransportOptions) {\n    const fetchOverride: typeof fetch = async (\n      fetchUrl: RequestInfo | URL,\n      fetchInit: RequestInit = {}\n    ) => {\n      // add auth headers\n      const headers = await this.authHeaders();\n      const workerOptions = {\n        ...fetchInit,\n        headers: {\n          ...fetchInit?.headers,\n          ...headers,\n        },\n      };\n\n      // Remove unsupported properties\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 fetch(fetchUrl, workerOptions);\n    };\n\n    super(url, {\n      ...options,\n      eventSourceInit: {\n        fetch: fetchOverride,\n      },\n    });\n    this.authProvider = options.authProvider;\n  }\n\n  async authHeaders() {\n    if (this.authProvider) {\n      const tokens = await this.authProvider.tokens();\n      if (tokens) {\n        return {\n          Authorization: `Bearer ${tokens.access_token}`,\n        };\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 { SSEClientTransportOptions } from \"@modelcontextprotocol/sdk/client/sse.js\";\n\nexport class MCPClientConnection {\n  client: Client;\n  connectionState:\n    | \"authenticating\"\n    | \"connecting\"\n    | \"ready\"\n    | \"discovering\"\n    | \"failed\" = \"connecting\";\n  instructions?: string;\n  tools: Tool[] = [];\n  prompts: Prompt[] = [];\n  resources: Resource[] = [];\n  resourceTemplates: ResourceTemplate[] = [];\n  serverCapabilities: ServerCapabilities | undefined;\n\n  constructor(\n    public url: URL,\n    private info: ConstructorParameters<typeof Client>[0],\n    private options: {\n      transport: SSEClientTransportOptions;\n      client: ConstructorParameters<typeof Client>[1];\n      capabilities: ClientCapabilities;\n    } = { transport: {}, client: {}, capabilities: {} }\n  ) {\n    this.client = new Client(info, options.client);\n    this.client.registerCapabilities(options.capabilities);\n  }\n\n  /**\n   * Initialize a client connection\n   *\n   * @param code Optional OAuth code to initialize the connection with if auth hasn't been initialized\n   * @returns\n   */\n  async init(code?: string, clientId?: string) {\n    try {\n      const transport = new SSEEdgeClientTransport(\n        this.url,\n        this.options.transport\n      );\n      if (code) {\n        await transport.finishAuth(code);\n      }\n      await this.client.connect(transport);\n      // biome-ignore lint/suspicious/noExplicitAny: allow for the error check here\n    } catch (e: any) {\n      if (e.toString().includes(\"Unauthorized\")) {\n        // unauthorized, we should wait for the user to authenticate\n        this.connectionState = \"authenticating\";\n        return;\n      }\n      this.connectionState = \"failed\";\n      throw e;\n    }\n\n    this.connectionState = \"discovering\";\n\n    this.serverCapabilities = await this.client.getServerCapabilities();\n    if (!this.serverCapabilities) {\n      throw new Error(\"The MCP Server failed to return server capabilities\");\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    this.connectionState = \"ready\";\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 type { OAuthClientProvider } from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport type {\n  OAuthTokens,\n  OAuthClientMetadata,\n  OAuthClientInformation,\n  OAuthClientInformationFull,\n} from \"@modelcontextprotocol/sdk/shared/auth.js\";\n\n// A slight extension to the standard OAuthClientProvider interface because `redirectToAuthorization` doesn't give us the interface we need\nexport interface AgentsOAuthProvider extends OAuthClientProvider {\n  authUrl: string | undefined;\n  clientId: string | undefined;\n}\n\nexport class DurableObjectOAuthClientProvider implements AgentsOAuthProvider {\n  private authUrl_: string | undefined;\n\n  constructor(\n    public storage: DurableObjectStorage,\n    public clientName: string,\n    public sessionId: string,\n    public redirectUrl: string,\n    private clientId_?: string\n  ) {}\n\n  get clientMetadata(): OAuthClientMetadata {\n    return {\n      redirect_uris: [this.redirectUrl],\n      token_endpoint_auth_method: \"none\",\n      grant_types: [\"authorization_code\", \"refresh_token\"],\n      response_types: [\"code\"],\n      client_name: this.clientName,\n      client_uri: \"example.com\",\n    };\n  }\n\n  get clientId() {\n    if (!this.clientId_) {\n      throw new Error(\"no clientId\");\n    }\n    return this.clientId_;\n  }\n\n  set clientId(clientId_: string) {\n    this.clientId_ = clientId_;\n  }\n\n  keyPrefix(clientId: string) {\n    return `/${this.clientName}/${this.sessionId}/${clientId}`;\n  }\n\n  clientInfoKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/client_info/`;\n  }\n\n  async clientInformation(): Promise<OAuthClientInformation | undefined> {\n    if (!this.clientId_) {\n      return undefined;\n    }\n    return (\n      (await this.storage.get<OAuthClientInformation>(\n        this.clientInfoKey(this.clientId)\n      )) ?? undefined\n    );\n  }\n\n  async saveClientInformation(\n    clientInformation: OAuthClientInformationFull\n  ): Promise<void> {\n    await this.storage.put(\n      this.clientInfoKey(clientInformation.client_id),\n      clientInformation\n    );\n    this.clientId = clientInformation.client_id;\n  }\n\n  tokenKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/token`;\n  }\n\n  async tokens(): Promise<OAuthTokens | undefined> {\n    if (!this.clientId_) {\n      return undefined;\n    }\n    return (\n      (await this.storage.get<OAuthTokens>(this.tokenKey(this.clientId))) ??\n      undefined\n    );\n  }\n\n  async saveTokens(tokens: OAuthTokens): Promise<void> {\n    await this.storage.put(this.tokenKey(this.clientId), tokens);\n  }\n\n  get authUrl() {\n    return this.authUrl_;\n  }\n\n  /**\n   * Because this operates on the server side (but we need browser auth), we send this url back to the user\n   * and require user interact to initiate the redirect flow\n   */\n  async redirectToAuthorization(authUrl: URL): Promise<void> {\n    // We want to track the client ID in state here because the typescript SSE client sometimes does\n    // a dynamic client registration AFTER generating this redirect URL.\n    const client_id = authUrl.searchParams.get(\"client_id\");\n    if (client_id) {\n      authUrl.searchParams.append(\"state\", client_id);\n    }\n    this.authUrl_ = authUrl.toString();\n  }\n\n  codeVerifierKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/code_verifier`;\n  }\n\n  async saveCodeVerifier(verifier: string): Promise<void> {\n    await this.storage.put(this.codeVerifierKey(this.clientId), verifier);\n  }\n\n  async codeVerifier(): Promise<string> {\n    const codeVerifier = await this.storage.get<string>(\n      this.codeVerifierKey(this.clientId)\n    );\n    if (!codeVerifier) {\n      throw new Error(\"No code verifier found\");\n    }\n    return codeVerifier;\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  Prompt,\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\";\nimport {\n  DurableObjectOAuthClientProvider,\n  type AgentsOAuthProvider,\n} from \"./do-oauth-client-provider\";\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   * @param name Name of the MCP client\n   * @param version Version of the MCP Client\n   * @param auth Auth paramters if being used to create a DurableObjectOAuthClientProvider\n   */\n  constructor(\n    private name: string,\n    private version: string,\n    private auth?: { baseCallbackUri: string; storage: DurableObjectStorage }\n  ) {}\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 connect(\n    url: string,\n    opts: {\n      // Allows you to reconnect to a server (in the case of a auth reconnect)\n      // Doesn't handle session reconnection\n      reconnect?: {\n        id: string;\n        oauthClientId?: string;\n        oauthCode?: string;\n      };\n      // we're overriding authProvider here because we want to be able to access the auth URL\n      transport?: SSEClientTransportOptions & {\n        authProvider: AgentsOAuthProvider;\n      };\n      client?: ConstructorParameters<typeof Client>[1];\n      capabilities?: ClientCapabilities;\n    } = {}\n  ): Promise<{ id: string; authUrl: string | undefined }> {\n    const id = opts.reconnect?.id ?? crypto.randomUUID();\n\n    // if we have global auth for the manager AND there's no authProvider override\n    // then let's setup an auth provider\n\n    if (this.auth) {\n      console.warn(\n        \"Using .auth configuration to generate an oauth provider, this is temporary and will be removed in the next version. Instead use transport.authProvider to provide an auth provider\"\n      );\n    }\n\n    const authProvider: AgentsOAuthProvider | undefined = this.auth\n      ? new DurableObjectOAuthClientProvider(\n          this.auth.storage,\n          this.name,\n          id,\n          `${this.auth.baseCallbackUri}/${id}`,\n          opts.reconnect?.oauthClientId\n        )\n      : opts.transport?.authProvider;\n\n    this.mcpConnections[id] = new MCPClientConnection(\n      new URL(url),\n      {\n        name: this.name,\n        version: this.version,\n      },\n      {\n        transport: {\n          ...opts.transport,\n          authProvider,\n        },\n        client: opts.client ?? {},\n        capabilities: opts.client ?? {},\n      }\n    );\n\n    await this.mcpConnections[id].init(\n      opts.reconnect?.oauthCode,\n      opts.reconnect?.oauthClientId\n    );\n\n    return {\n      id,\n      authUrl: authProvider?.authUrl,\n    };\n  }\n\n  isCallbackRequest(req: Request): boolean {\n    if (this.auth?.baseCallbackUri) {\n      return (\n        req.url.startsWith(this.auth.baseCallbackUri) && req.method === \"GET\"\n      );\n    }\n    return false;\n  }\n\n  async handleCallbackRequest(req: Request) {\n    const url = new URL(req.url);\n    const code = url.searchParams.get(\"code\");\n    const clientId = url.searchParams.get(\"state\");\n    let serverId = req.url\n      .replace(this.auth!.baseCallbackUri, \"\")\n      .split(\"?\")[0];\n    serverId = serverId.replaceAll(\"/\", \"\");\n    if (!code) {\n      throw new Error(\"Unauthorized: no code provided\");\n    }\n    if (!clientId) {\n      throw new Error(\"Unauthorized: no state provided\");\n    }\n\n    if (this.mcpConnections[serverId] === undefined) {\n      throw new Error(`Could not find serverId: ${serverId}`);\n    }\n\n    if (this.mcpConnections[serverId].connectionState !== \"authenticating\") {\n      throw new Error(\n        \"Failed to authenticate: the client isn't in the `authenticating` state\"\n      );\n    }\n\n    // reconnect to server with authorization\n    const serverUrl = this.mcpConnections[serverId].url.toString();\n    await this.connect(serverUrl, {\n      reconnect: {\n        id: serverId,\n        oauthClientId: clientId,\n        oauthCode: code,\n      },\n    });\n\n    if (this.mcpConnections[serverId].connectionState === \"authenticating\") {\n      throw new Error(\"Failed to authenticate: client failed to initialize\");\n    }\n\n    return { serverId };\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\"] & { serverId: string },\n    resultSchema:\n      | typeof CallToolResultSchema\n      | typeof CompatibilityCallToolResultSchema,\n    options: RequestOptions\n  ) {\n    const unqualifiedName = params.name.replace(`${params.serverId}.`, \"\");\n    return this.mcpConnections[params.serverId].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\"] & { serverId: string },\n    options: RequestOptions\n  ) {\n    return this.mcpConnections[params.serverId].client.readResource(\n      params,\n      options\n    );\n  }\n\n  /**\n   * Namespaced version of getPrompt\n   */\n  getPrompt(\n    params: GetPromptRequest[\"params\"] & { serverId: string },\n    options: RequestOptions\n  ) {\n    return this.mcpConnections[params.serverId].client.getPrompt(\n      params,\n      options\n    );\n  }\n}\n\ntype NamespacedData = {\n  tools: (Tool & { serverId: string })[];\n  prompts: (Prompt & { serverId: string })[];\n  resources: (Resource & { serverId: string })[];\n  resourceTemplates: (ResourceTemplate & { serverId: 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: serverId, data }) => {\n    return data.map((item) => {\n      return {\n        ...item,\n        // we add a serverId so we can easily pull it out and send the tool call to the right server\n        serverId,\n      };\n    });\n  });\n\n  return namespacedData as NamespacedData[T]; // Type assertion needed due to TS limitations with conditional return types\n}\n"],"mappings":";;;AAAA;AAAA,EACE;AAAA,OAEK;AAGA,IAAM,yBAAN,cAAqC,mBAAmB;AAAA;AAAA;AAAA;AAAA,EAK7D,YAAY,KAAU,SAAoC;AACxD,UAAM,gBAA8B,OAClC,UACA,YAAyB,CAAC,MACvB;AAEH,YAAM,UAAU,MAAM,KAAK,YAAY;AACvC,YAAM,gBAAgB;AAAA,QACpB,GAAG;AAAA,QACH,SAAS;AAAA,UACP,GAAG,WAAW;AAAA,UACd,GAAG;AAAA,QACL;AAAA,MACF;AAIA,aAAO,cAAc;AAGrB,aAAO,MAAM,UAAU,aAAa;AAAA,IACtC;AAEA,UAAM,KAAK;AAAA,MACT,GAAG;AAAA,MACH,iBAAiB;AAAA,QACf,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AACD,SAAK,eAAe,QAAQ;AAAA,EAC9B;AAAA,EAEA,MAAM,cAAc;AAClB,QAAI,KAAK,cAAc;AACrB,YAAM,SAAS,MAAM,KAAK,aAAa,OAAO;AAC9C,UAAI,QAAQ;AACV,eAAO;AAAA,UACL,eAAe,UAAU,OAAO,YAAY;AAAA,QAC9C;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;;;ACnDA;AAAA,EACE;AAAA,EAKA;AAAA,EACA;AAAA,OAOK;AACP,SAAS,cAAc;AAGhB,IAAM,sBAAN,MAA0B;AAAA,EAe/B,YACS,KACC,MACA,UAIJ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,GAAG,cAAc,CAAC,EAAE,GAClD;AAPO;AACC;AACA;AAhBV,2BAKe;AAEf,iBAAgB,CAAC;AACjB,mBAAoB,CAAC;AACrB,qBAAwB,CAAC;AACzB,6BAAwC,CAAC;AAYvC,SAAK,SAAS,IAAI,OAAO,MAAM,QAAQ,MAAM;AAC7C,SAAK,OAAO,qBAAqB,QAAQ,YAAY;AAAA,EACvD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQA,MAAM,KAAK,MAAe,UAAmB;AAC3C,QAAI;AACF,YAAM,YAAY,IAAI;AAAA,QACpB,KAAK;AAAA,QACL,KAAK,QAAQ;AAAA,MACf;AACA,UAAI,MAAM;AACR,cAAM,UAAU,WAAW,IAAI;AAAA,MACjC;AACA,YAAM,KAAK,OAAO,QAAQ,SAAS;AAAA,IAErC,SAAS,GAAQ;AACf,UAAI,EAAE,SAAS,EAAE,SAAS,cAAc,GAAG;AAEzC,aAAK,kBAAkB;AACvB;AAAA,MACF;AACA,WAAK,kBAAkB;AACvB,YAAM;AAAA,IACR;AAEA,SAAK,kBAAkB;AAEvB,SAAK,qBAAqB,MAAM,KAAK,OAAO,sBAAsB;AAClE,QAAI,CAAC,KAAK,oBAAoB;AAC5B,YAAM,IAAI,MAAM,qDAAqD;AAAA,IACvE;AAEA,UAAM,CAAC,cAAc,OAAO,WAAW,SAAS,iBAAiB,IAC/D,MAAM,QAAQ,IAAI;AAAA,MAChB,KAAK,OAAO,gBAAgB;AAAA,MAC5B,KAAK,cAAc;AAAA,MACnB,KAAK,kBAAkB;AAAA,MACvB,KAAK,gBAAgB;AAAA,MACrB,KAAK,0BAA0B;AAAA,IACjC,CAAC;AAEH,SAAK,eAAe;AACpB,SAAK,QAAQ;AACb,SAAK,YAAY;AACjB,SAAK,UAAU;AACf,SAAK,oBAAoB;AAEzB,SAAK,kBAAkB;AAAA,EACzB;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM,gBAAiC;AACrC,QAAI,CAAC,KAAK,sBAAsB,CAAC,KAAK,mBAAmB,OAAO;AAC9D,aAAO,CAAC;AAAA,IACV;AAEA,QAAI,KAAK,mBAAmB,MAAM,aAAa;AAC7C,WAAK,OAAO;AAAA,QACV;AAAA,QACA,OAAO,kBAAkB;AACvB,eAAK,QAAQ,MAAM,KAAK,WAAW;AAAA,QACrC;AAAA,MACF;AAAA,IACF;AAEA,WAAO,KAAK,WAAW;AAAA,EACzB;AAAA,EAEA,MAAM,oBAAyC;AAC7C,QAAI,CAAC,KAAK,sBAAsB,CAAC,KAAK,mBAAmB,WAAW;AAClE,aAAO,CAAC;AAAA,IACV;AAEA,QAAI,KAAK,mBAAmB,UAAU,aAAa;AACjD,WAAK,OAAO;AAAA,QACV;AAAA,QACA,OAAO,kBAAkB;AACvB,eAAK,YAAY,MAAM,KAAK,eAAe;AAAA,QAC7C;AAAA,MACF;AAAA,IACF;AAEA,WAAO,KAAK,eAAe;AAAA,EAC7B;AAAA,EAEA,MAAM,kBAAqC;AACzC,QAAI,CAAC,KAAK,sBAAsB,CAAC,KAAK,mBAAmB,SAAS;AAChE,aAAO,CAAC;AAAA,IACV;AAEA,QAAI,KAAK,mBAAmB,QAAQ,aAAa;AAC/C,WAAK,OAAO;AAAA,QACV;AAAA,QACA,OAAO,kBAAkB;AACvB,eAAK,UAAU,MAAM,KAAK,aAAa;AAAA,QACzC;AAAA,MACF;AAAA,IACF;AAEA,WAAO,KAAK,aAAa;AAAA,EAC3B;AAAA,EAEA,MAAM,4BAAyD;AAC7D,QAAI,CAAC,KAAK,sBAAsB,CAAC,KAAK,mBAAmB,WAAW;AAClE,aAAO,CAAC;AAAA,IACV;AAEA,WAAO,KAAK,uBAAuB;AAAA,EACrC;AAAA,EAEA,MAAM,aAAa;AACjB,QAAI,WAAmB,CAAC;AACxB,QAAI,cAA+B,EAAE,OAAO,CAAC,EAAE;AAC/C,OAAG;AACD,oBAAc,MAAM,KAAK,OAAO,UAAU;AAAA,QACxC,QAAQ,YAAY;AAAA,MACtB,CAAC;AACD,iBAAW,SAAS,OAAO,YAAY,KAAK;AAAA,IAC9C,SAAS,YAAY;AACrB,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,iBAAiB;AACrB,QAAI,eAA2B,CAAC;AAChC,QAAI,kBAAuC,EAAE,WAAW,CAAC,EAAE;AAC3D,OAAG;AACD,wBAAkB,MAAM,KAAK,OAAO,cAAc;AAAA,QAChD,QAAQ,gBAAgB;AAAA,MAC1B,CAAC;AACD,qBAAe,aAAa,OAAO,gBAAgB,SAAS;AAAA,IAC9D,SAAS,gBAAgB;AACzB,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,eAAe;AACnB,QAAI,aAAuB,CAAC;AAC5B,QAAI,gBAAmC,EAAE,SAAS,CAAC,EAAE;AACrD,OAAG;AACD,sBAAgB,MAAM,KAAK,OAAO,YAAY;AAAA,QAC5C,QAAQ,cAAc;AAAA,MACxB,CAAC;AACD,mBAAa,WAAW,OAAO,cAAc,OAAO;AAAA,IACtD,SAAS,cAAc;AACvB,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,yBAAyB;AAC7B,QAAI,eAAmC,CAAC;AACxC,QAAI,kBAA+C;AAAA,MACjD,mBAAmB,CAAC;AAAA,IACtB;AACA,OAAG;AACD,wBAAkB,MAAM,KAAK,OAAO,sBAAsB;AAAA,QACxD,QAAQ,gBAAgB;AAAA,MAC1B,CAAC;AACD,qBAAe,aAAa,OAAO,gBAAgB,iBAAiB;AAAA,IACtE,SAAS,gBAAgB;AACzB,WAAO;AAAA,EACT;AACF;;;ACrMO,IAAM,mCAAN,MAAsE;AAAA,EAG3E,YACS,SACA,YACA,WACA,aACC,WACR;AALO;AACA;AACA;AACA;AACC;AAAA,EACP;AAAA,EAEH,IAAI,iBAAsC;AACxC,WAAO;AAAA,MACL,eAAe,CAAC,KAAK,WAAW;AAAA,MAChC,4BAA4B;AAAA,MAC5B,aAAa,CAAC,sBAAsB,eAAe;AAAA,MACnD,gBAAgB,CAAC,MAAM;AAAA,MACvB,aAAa,KAAK;AAAA,MAClB,YAAY;AAAA,IACd;AAAA,EACF;AAAA,EAEA,IAAI,WAAW;AACb,QAAI,CAAC,KAAK,WAAW;AACnB,YAAM,IAAI,MAAM,aAAa;AAAA,IAC/B;AACA,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,IAAI,SAAS,WAAmB;AAC9B,SAAK,YAAY;AAAA,EACnB;AAAA,EAEA,UAAU,UAAkB;AAC1B,WAAO,IAAI,KAAK,UAAU,IAAI,KAAK,SAAS,IAAI,QAAQ;AAAA,EAC1D;AAAA,EAEA,cAAc,UAAkB;AAC9B,WAAO,GAAG,KAAK,UAAU,QAAQ,CAAC;AAAA,EACpC;AAAA,EAEA,MAAM,oBAAiE;AACrE,QAAI,CAAC,KAAK,WAAW;AACnB,aAAO;AAAA,IACT;AACA,WACG,MAAM,KAAK,QAAQ;AAAA,MAClB,KAAK,cAAc,KAAK,QAAQ;AAAA,IAClC,KAAM;AAAA,EAEV;AAAA,EAEA,MAAM,sBACJ,mBACe;AACf,UAAM,KAAK,QAAQ;AAAA,MACjB,KAAK,cAAc,kBAAkB,SAAS;AAAA,MAC9C;AAAA,IACF;AACA,SAAK,WAAW,kBAAkB;AAAA,EACpC;AAAA,EAEA,SAAS,UAAkB;AACzB,WAAO,GAAG,KAAK,UAAU,QAAQ,CAAC;AAAA,EACpC;AAAA,EAEA,MAAM,SAA2C;AAC/C,QAAI,CAAC,KAAK,WAAW;AACnB,aAAO;AAAA,IACT;AACA,WACG,MAAM,KAAK,QAAQ,IAAiB,KAAK,SAAS,KAAK,QAAQ,CAAC,KACjE;AAAA,EAEJ;AAAA,EAEA,MAAM,WAAW,QAAoC;AACnD,UAAM,KAAK,QAAQ,IAAI,KAAK,SAAS,KAAK,QAAQ,GAAG,MAAM;AAAA,EAC7D;AAAA,EAEA,IAAI,UAAU;AACZ,WAAO,KAAK;AAAA,EACd;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,MAAM,wBAAwB,SAA6B;AAGzD,UAAM,YAAY,QAAQ,aAAa,IAAI,WAAW;AACtD,QAAI,WAAW;AACb,cAAQ,aAAa,OAAO,SAAS,SAAS;AAAA,IAChD;AACA,SAAK,WAAW,QAAQ,SAAS;AAAA,EACnC;AAAA,EAEA,gBAAgB,UAAkB;AAChC,WAAO,GAAG,KAAK,UAAU,QAAQ,CAAC;AAAA,EACpC;AAAA,EAEA,MAAM,iBAAiB,UAAiC;AACtD,UAAM,KAAK,QAAQ,IAAI,KAAK,gBAAgB,KAAK,QAAQ,GAAG,QAAQ;AAAA,EACtE;AAAA,EAEA,MAAM,eAAgC;AACpC,UAAM,eAAe,MAAM,KAAK,QAAQ;AAAA,MACtC,KAAK,gBAAgB,KAAK,QAAQ;AAAA,IACpC;AACA,QAAI,CAAC,cAAc;AACjB,YAAM,IAAI,MAAM,wBAAwB;AAAA,IAC1C;AACA,WAAO;AAAA,EACT;AACF;;;ACxGO,IAAM,mBAAN,MAAuB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQ5B,YACU,MACA,SACA,MACR;AAHQ;AACA;AACA;AAVV,SAAO,iBAAsD,CAAC;AAAA,EAW3D;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASH,MAAM,QACJ,KACA,OAcI,CAAC,GACiD;AACtD,UAAM,KAAK,KAAK,WAAW,MAAM,OAAO,WAAW;AAKnD,QAAI,KAAK,MAAM;AACb,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAEA,UAAM,eAAgD,KAAK,OACvD,IAAI;AAAA,MACF,KAAK,KAAK;AAAA,MACV,KAAK;AAAA,MACL;AAAA,MACA,GAAG,KAAK,KAAK,eAAe,IAAI,EAAE;AAAA,MAClC,KAAK,WAAW;AAAA,IAClB,IACA,KAAK,WAAW;AAEpB,SAAK,eAAe,EAAE,IAAI,IAAI;AAAA,MAC5B,IAAI,IAAI,GAAG;AAAA,MACX;AAAA,QACE,MAAM,KAAK;AAAA,QACX,SAAS,KAAK;AAAA,MAChB;AAAA,MACA;AAAA,QACE,WAAW;AAAA,UACT,GAAG,KAAK;AAAA,UACR;AAAA,QACF;AAAA,QACA,QAAQ,KAAK,UAAU,CAAC;AAAA,QACxB,cAAc,KAAK,UAAU,CAAC;AAAA,MAChC;AAAA,IACF;AAEA,UAAM,KAAK,eAAe,EAAE,EAAE;AAAA,MAC5B,KAAK,WAAW;AAAA,MAChB,KAAK,WAAW;AAAA,IAClB;AAEA,WAAO;AAAA,MACL;AAAA,MACA,SAAS,cAAc;AAAA,IACzB;AAAA,EACF;AAAA,EAEA,kBAAkB,KAAuB;AACvC,QAAI,KAAK,MAAM,iBAAiB;AAC9B,aACE,IAAI,IAAI,WAAW,KAAK,KAAK,eAAe,KAAK,IAAI,WAAW;AAAA,IAEpE;AACA,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,sBAAsB,KAAc;AACxC,UAAM,MAAM,IAAI,IAAI,IAAI,GAAG;AAC3B,UAAM,OAAO,IAAI,aAAa,IAAI,MAAM;AACxC,UAAM,WAAW,IAAI,aAAa,IAAI,OAAO;AAC7C,QAAI,WAAW,IAAI,IAChB,QAAQ,KAAK,KAAM,iBAAiB,EAAE,EACtC,MAAM,GAAG,EAAE,CAAC;AACf,eAAW,SAAS,WAAW,KAAK,EAAE;AACtC,QAAI,CAAC,MAAM;AACT,YAAM,IAAI,MAAM,gCAAgC;AAAA,IAClD;AACA,QAAI,CAAC,UAAU;AACb,YAAM,IAAI,MAAM,iCAAiC;AAAA,IACnD;AAEA,QAAI,KAAK,eAAe,QAAQ,MAAM,QAAW;AAC/C,YAAM,IAAI,MAAM,4BAA4B,QAAQ,EAAE;AAAA,IACxD;AAEA,QAAI,KAAK,eAAe,QAAQ,EAAE,oBAAoB,kBAAkB;AACtE,YAAM,IAAI;AAAA,QACR;AAAA,MACF;AAAA,IACF;AAGA,UAAM,YAAY,KAAK,eAAe,QAAQ,EAAE,IAAI,SAAS;AAC7D,UAAM,KAAK,QAAQ,WAAW;AAAA,MAC5B,WAAW;AAAA,QACT,IAAI;AAAA,QACJ,eAAe;AAAA,QACf,WAAW;AAAA,MACb;AAAA,IACF,CAAC;AAED,QAAI,KAAK,eAAe,QAAQ,EAAE,oBAAoB,kBAAkB;AACtE,YAAM,IAAI,MAAM,qDAAqD;AAAA,IACvE;AAEA,WAAO,EAAE,SAAS;AAAA,EACpB;AAAA;AAAA;AAAA;AAAA,EAKA,YAAqC;AACnC,WAAO,kBAAkB,KAAK,gBAAgB,OAAO;AAAA,EACvD;AAAA;AAAA;AAAA;AAAA,EAKA,cAAyC;AACvC,WAAO,kBAAkB,KAAK,gBAAgB,SAAS;AAAA,EACzD;AAAA;AAAA;AAAA;AAAA,EAKA,gBAA6C;AAC3C,WAAO,kBAAkB,KAAK,gBAAgB,WAAW;AAAA,EAC3D;AAAA;AAAA;AAAA;AAAA,EAKA,wBAA6D;AAC3D,WAAO,kBAAkB,KAAK,gBAAgB,mBAAmB;AAAA,EACnE;AAAA;AAAA;AAAA;AAAA,EAKA,SACE,QACA,cAGA,SACA;AACA,UAAM,kBAAkB,OAAO,KAAK,QAAQ,GAAG,OAAO,QAAQ,KAAK,EAAE;AACrE,WAAO,KAAK,eAAe,OAAO,QAAQ,EAAE,OAAO;AAAA,MACjD;AAAA,QACE,GAAG;AAAA,QACH,MAAM;AAAA,MACR;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAAA;AAAA;AAAA;AAAA,EAKA,aACE,QACA,SACA;AACA,WAAO,KAAK,eAAe,OAAO,QAAQ,EAAE,OAAO;AAAA,MACjD;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAAA;AAAA;AAAA;AAAA,EAKA,UACE,QACA,SACA;AACA,WAAO,KAAK,eAAe,OAAO,QAAQ,EAAE,OAAO;AAAA,MACjD;AAAA,MACA;AAAA,IACF;AAAA,EACF;AACF;AASO,SAAS,kBACd,YACA,MACmB;AACnB,QAAM,OAAO,OAAO,QAAQ,UAAU,EAAE,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM;AAC5D,WAAO,EAAE,MAAM,MAAM,KAAK,IAAI,EAAE;AAAA,EAClC,CAAC;AAED,QAAM,iBAAiB,KAAK,QAAQ,CAAC,EAAE,MAAM,UAAU,KAAK,MAAM;AAChE,WAAO,KAAK,IAAI,CAAC,SAAS;AACxB,aAAO;AAAA,QACL,GAAG;AAAA;AAAA,QAEH;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACH,CAAC;AAED,SAAO;AACT;","names":[]}

package/dist/mcp/index.js

@@ -214,8 +214,12 @@ var McpAgent = class extends DurableObject {
     binding = "MCP_OBJECT",
     corsOptions
   } = {}) {
-    const basePattern = new URLPattern({ pathname: path });
-    const messagePattern = new URLPattern({ pathname: `${path}/message` });
+    let pathname = path;
+    if (path === "/") {
+      pathname = "/*";
+    }
+    const basePattern = new URLPattern({ pathname });
+    const messagePattern = new URLPattern({ pathname: `${pathname}/message` });
     return {
       fetch: async (request, env, ctx) => {
         const corsResponse = handleCORS(request, corsOptions);
@@ -228,7 +232,7 @@ var McpAgent = class extends DurableObject {
           const writer = writable.getWriter();
           const encoder = new TextEncoder();
           const endpointMessage = `event: endpoint
-data: ${encodeURI(`${path}/message`)}?sessionId=${sessionId}
+data: ${encodeURI(`${pathname}/message`)}?sessionId=${sessionId}
 
 `;
           writer.write(encoder.encode(endpointMessage));
@@ -300,7 +304,7 @@ data: ${event.data}
           const sessionId = url.searchParams.get("sessionId");
           if (!sessionId) {
             return new Response(
-              `Missing sessionId. Expected POST to ${path} to initiate new one`,
+              `Missing sessionId. Expected POST to ${pathname} to initiate new one`,
               { status: 400 }
             );
           }

package/dist/mcp/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mcp/index.ts"],"sourcesContent":["import { DurableObject } from \"cloudflare:workers\";\nimport { Agent } from \"../\";\nimport type { McpServer } from \"@modelcontextprotocol/sdk/server/mcp.js\";\nimport type { Connection } from \"../\";\nimport type { JSONRPCMessage } from \"@modelcontextprotocol/sdk/types.js\";\nimport { JSONRPCMessageSchema } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { Transport } from \"@modelcontextprotocol/sdk/shared/transport.js\";\n\nconst MAXIMUM_MESSAGE_SIZE = 4 * 1024 * 1024; // 4MB\n\n// CORS helper function\nfunction handleCORS(\n  request: Request,\n  corsOptions?: CORSOptions\n): Response | null {\n  const origin = request.headers.get(\"Origin\") || \"*\";\n  const corsHeaders = {\n    \"Access-Control-Allow-Origin\": corsOptions?.origin || origin,\n    \"Access-Control-Allow-Methods\":\n      corsOptions?.methods || \"GET, POST, OPTIONS\",\n    \"Access-Control-Allow-Headers\": corsOptions?.headers || \"Content-Type\",\n    \"Access-Control-Max-Age\": (corsOptions?.maxAge || 86400).toString(),\n  };\n\n  if (request.method === \"OPTIONS\") {\n    return new Response(null, { headers: corsHeaders });\n  }\n\n  return null;\n}\n\ninterface CORSOptions {\n  origin?: string;\n  methods?: string;\n  headers?: string;\n  maxAge?: number;\n}\n\nclass McpTransport implements Transport {\n  onclose?: () => void;\n  onerror?: (error: Error) => void;\n  onmessage?: (message: JSONRPCMessage) => void;\n  sessionId?: string;\n\n  #getWebSocket: () => WebSocket | null;\n  #started = false;\n  constructor(getWebSocket: () => WebSocket | null) {\n    this.#getWebSocket = getWebSocket;\n  }\n\n  async start() {\n    // The transport does not manage the WebSocket connection since it's terminated\n    // by the Durable Object in order to allow hibernation. There's nothing to initialize.\n    if (this.#started) {\n      throw new Error(\"Transport already started\");\n    }\n    this.#started = true;\n  }\n\n  async send(message: JSONRPCMessage) {\n    if (!this.#started) {\n      throw new Error(\"Transport not started\");\n    }\n    const websocket = this.#getWebSocket();\n    if (!websocket) {\n      throw new Error(\"WebSocket not connected\");\n    }\n    try {\n      websocket.send(JSON.stringify(message));\n    } catch (error) {\n      this.onerror?.(error as Error);\n      throw error;\n    }\n  }\n\n  async close() {\n    // Similar to start, the only thing to do is to pass the event on to the server\n    this.onclose?.();\n  }\n}\n\nexport abstract class McpAgent<\n  Env = unknown,\n  State = unknown,\n  Props extends Record<string, unknown> = Record<string, unknown>,\n> extends DurableObject<Env> {\n  #status: \"zero\" | \"starting\" | \"started\" = \"zero\";\n  #transport?: McpTransport;\n  #connected = false;\n\n  /**\n   * Since McpAgent's _aren't_ yet real \"Agents\" (they route differently, don't support\n   * websockets, don't support hibernation), let's only expose a couple of the methods\n   * to the outer class: initialState/state/setState/onStateUpdate/sql\n   */\n  readonly #agent: Agent<Env, State>;\n\n  protected constructor(ctx: DurableObjectState, env: Env) {\n    super(ctx, env);\n    const self = this;\n\n    // Since McpAgent's _aren't_ yet real \"Agents\" (they route differently, they don't support\n    // scheduling etc, let's only expose a couple of the methods\n    // to the outer class for now.\n    this.#agent = new (class extends Agent<Env, State> {\n      static options = {\n        hibernate: true,\n      };\n\n      onStateUpdate(state: State | undefined, source: Connection | \"server\") {\n        return self.onStateUpdate(state, source);\n      }\n    })(ctx, env);\n  }\n\n  /**\n   * Agents API allowlist\n   */\n  initialState!: State;\n  get state() {\n    if (this.initialState) this.#agent.initialState = this.initialState;\n    return this.#agent.state;\n  }\n  sql<T = Record<string, string | number | boolean | null>>(\n    strings: TemplateStringsArray,\n    ...values: (string | number | boolean | null)[]\n  ) {\n    return this.#agent.sql<T>(strings, ...values);\n  }\n\n  setState(state: State) {\n    return this.#agent.setState(state);\n  }\n  onStateUpdate(state: State | undefined, source: Connection | \"server\") {\n    // override this to handle state updates\n  }\n  async onStart() {\n    this.props = (await this.ctx.storage.get(\"props\")) as Props;\n    this.init?.();\n\n    // Connect to the MCP server\n    this.#transport = new McpTransport(() => this.getWebSocket());\n    await this.server.connect(this.#transport);\n  }\n\n  /**\n   * McpAgent API\n   */\n  abstract server: McpServer;\n  props!: Props;\n  initRun = false;\n\n  abstract init(): Promise<void>;\n\n  async _init(props: Props) {\n    await this.ctx.storage.put(\"props\", props);\n    this.props = props;\n    if (!this.initRun) {\n      this.initRun = true;\n      await this.init();\n    }\n  }\n\n  async #initialize(): Promise<void> {\n    await this.ctx.blockConcurrencyWhile(async () => {\n      this.#status = \"starting\";\n      await this.onStart();\n      this.#status = \"started\";\n    });\n  }\n\n  // Allow the worker to fetch a websocket connection to the agent\n  async fetch(request: Request): Promise<Response> {\n    if (this.#status !== \"started\") {\n      // This means the server \"woke up\" after hibernation\n      // so we need to hydrate it again\n      await this.#initialize();\n    }\n\n    // Only handle WebSocket upgrade requests\n    if (request.headers.get(\"Upgrade\") !== \"websocket\") {\n      return new Response(\"Expected WebSocket Upgrade request\", {\n        status: 400,\n      });\n    }\n\n    const url = new URL(request.url);\n    const sessionId = url.searchParams.get(\"sessionId\");\n    if (!sessionId) {\n      return new Response(\"Missing sessionId\", { status: 400 });\n    }\n\n    // Create a WebSocket pair\n    const webSocketPair = new WebSocketPair();\n    const [client, server] = Object.values(webSocketPair);\n\n    // For now, each agent can only have one connection\n    // If we get an upgrade while already connected, we should error\n    if (this.#connected) {\n      return new Response(\"WebSocket already connected\", { status: 400 });\n    }\n    this.ctx.acceptWebSocket(server);\n    this.#connected = true;\n\n    // Connect to the MCP server\n    this.#transport = new McpTransport(() => this.getWebSocket());\n    await this.server.connect(this.#transport);\n\n    return new Response(null, {\n      status: 101,\n      webSocket: client,\n    });\n  }\n\n  getWebSocket() {\n    const websockets = this.ctx.getWebSockets();\n    if (websockets.length === 0) {\n      return null;\n    }\n    return websockets[0];\n  }\n\n  async onMCPMessage(sessionId: string, request: Request): Promise<Response> {\n    if (this.#status !== \"started\") {\n      // This means the server \"woke up\" after hibernation\n      // so we need to hydrate it again\n      await this.#initialize();\n    }\n    try {\n      const contentType = request.headers.get(\"content-type\") || \"\";\n      if (!contentType.includes(\"application/json\")) {\n        return new Response(`Unsupported content-type: ${contentType}`, {\n          status: 400,\n        });\n      }\n\n      // check if the request body is too large\n      const contentLength = Number.parseInt(\n        request.headers.get(\"content-length\") || \"0\",\n        10\n      );\n      if (contentLength > MAXIMUM_MESSAGE_SIZE) {\n        return new Response(`Request body too large: ${contentLength} bytes`, {\n          status: 400,\n        });\n      }\n\n      // Clone the request before reading the body to avoid stream issues\n      const message = await request.json();\n      let parsedMessage: JSONRPCMessage;\n      try {\n        parsedMessage = JSONRPCMessageSchema.parse(message);\n      } catch (error) {\n        this.#transport?.onerror?.(error as Error);\n        throw error;\n      }\n\n      this.#transport?.onmessage?.(parsedMessage);\n      return new Response(\"Accepted\", { status: 202 });\n    } catch (error) {\n      this.#transport?.onerror?.(error as Error);\n      return new Response(String(error), { status: 400 });\n    }\n  }\n\n  // This is unused since there are no incoming websocket messages\n  async webSocketMessage(ws: WebSocket, event: ArrayBuffer | string) {\n    let message: JSONRPCMessage;\n    try {\n      // Ensure event is a string\n      const data =\n        typeof event === \"string\" ? event : new TextDecoder().decode(event);\n      message = JSONRPCMessageSchema.parse(JSON.parse(data));\n    } catch (error) {\n      this.#transport?.onerror?.(error as Error);\n      return;\n    }\n\n    if (this.#status !== \"started\") {\n      // This means the server \"woke up\" after hibernation\n      // so we need to hydrate it again\n      await this.#initialize();\n    }\n\n    this.#transport?.onmessage?.(message);\n  }\n\n  // WebSocket event handlers for hibernation support\n  async webSocketError(ws: WebSocket, error: unknown): Promise<void> {\n    if (this.#status !== \"started\") {\n      // This means the server \"woke up\" after hibernation\n      // so we need to hydrate it again\n      await this.#initialize();\n    }\n    this.#transport?.onerror?.(error as Error);\n  }\n\n  async webSocketClose(\n    ws: WebSocket,\n    code: number,\n    reason: string,\n    wasClean: boolean\n  ): Promise<void> {\n    if (this.#status !== \"started\") {\n      // This means the server \"woke up\" after hibernation\n      // so we need to hydrate it again\n      await this.#initialize();\n    }\n    this.#transport?.onclose?.();\n    this.#connected = false;\n  }\n\n  static mount(\n    path: string,\n    {\n      binding = \"MCP_OBJECT\",\n      corsOptions,\n    }: {\n      binding?: string;\n      corsOptions?: CORSOptions;\n    } = {}\n  ) {\n    const basePattern = new URLPattern({ pathname: path });\n    const messagePattern = new URLPattern({ pathname: `${path}/message` });\n\n    return {\n      fetch: async (\n        request: Request,\n        env: Record<string, DurableObjectNamespace<McpAgent>>,\n        ctx: ExecutionContext\n      ) => {\n        // Handle CORS preflight\n        const corsResponse = handleCORS(request, corsOptions);\n        if (corsResponse) return corsResponse;\n\n        const url = new URL(request.url);\n        const namespace = env[binding];\n\n        // Handle SSE connections\n        if (request.method === \"GET\" && basePattern.test(url)) {\n          // Use a session ID if one is passed in, or create a unique\n          // session ID for this connection\n          const sessionId =\n            url.searchParams.get(\"sessionId\") ||\n            namespace.newUniqueId().toString();\n\n          // Create a Transform Stream for SSE\n          const { readable, writable } = new TransformStream();\n          const writer = writable.getWriter();\n          const encoder = new TextEncoder();\n\n          // Send the endpoint event\n          const endpointMessage = `event: endpoint\\ndata: ${encodeURI(`${path}/message`)}?sessionId=${sessionId}\\n\\n`;\n          writer.write(encoder.encode(endpointMessage));\n\n          // Get the Durable Object\n          const id = namespace.idFromString(sessionId);\n          const doStub = namespace.get(id);\n\n          // Initialize the object\n          // @ts-ignore\n          await doStub._init(ctx.props);\n\n          // Connect to the Durable Object via WebSocket\n          const upgradeUrl = new URL(request.url);\n          upgradeUrl.searchParams.set(\"sessionId\", sessionId);\n          const response = await doStub.fetch(\n            new Request(upgradeUrl, {\n              headers: {\n                Upgrade: \"websocket\",\n              },\n            })\n          );\n\n          // Get the WebSocket\n          const ws = response.webSocket;\n          if (!ws) {\n            console.error(\"Failed to establish WebSocket connection\");\n            await writer.close();\n            return;\n          }\n\n          // Accept the WebSocket\n          ws.accept();\n\n          // Handle messages from the Durable Object\n          ws.addEventListener(\"message\", async (event) => {\n            try {\n              const message = JSON.parse(event.data);\n\n              // validate that the message is a valid JSONRPC message\n              // https://www.jsonrpc.org/specification#response_object\n              if (!(typeof message.id === \"number\" || message.id === null)) {\n                throw new Error(\"Invalid jsonrpc message id\");\n              }\n\n              if (message.jsonrpc !== \"2.0\") {\n                throw new Error(\"Invalid jsonrpc version\");\n              }\n\n              // must have either result or error field\n              if (\n                !Object.hasOwn(message, \"result\") &&\n                !Object.hasOwn(message, \"error\")\n              ) {\n                throw new Error(\n                  \"Invalid jsonrpc message. Must have either result or error field\"\n                );\n              }\n\n              // Send the message as an SSE event\n              const messageText = `event: message\\ndata: ${event.data}\\n\\n`;\n              await writer.write(encoder.encode(messageText));\n            } catch (error) {\n              console.error(\"Error forwarding message to SSE:\", error);\n            }\n          });\n\n          // Handle WebSocket errors\n          ws.addEventListener(\"error\", async (error) => {\n            try {\n              await writer.close();\n            } catch (e) {\n              // Ignore errors when closing\n            }\n          });\n\n          // Handle WebSocket closure\n          ws.addEventListener(\"close\", async () => {\n            try {\n              await writer.close();\n            } catch (error) {\n              console.error(\"Error closing SSE connection:\", error);\n            }\n          });\n\n          // Return the SSE response\n          return new Response(readable, {\n            headers: {\n              \"Content-Type\": \"text/event-stream\",\n              \"Cache-Control\": \"no-cache\",\n              Connection: \"keep-alive\",\n              \"Access-Control-Allow-Origin\": corsOptions?.origin || \"*\",\n            },\n          });\n        }\n\n        // Handle MCP messages\n        if (request.method === \"POST\" && messagePattern.test(url)) {\n          const sessionId = url.searchParams.get(\"sessionId\");\n          if (!sessionId) {\n            return new Response(\n              `Missing sessionId. Expected POST to ${path} to initiate new one`,\n              { status: 400 }\n            );\n          }\n\n          // Get the Durable Object\n          const object = namespace.get(namespace.idFromString(sessionId));\n\n          // Forward the request to the Durable Object\n          const response = await object.onMCPMessage(sessionId, request);\n\n          // Add CORS headers\n          const headers = new Headers();\n          response.headers.forEach?.((value, key) => {\n            headers.set(key, value);\n          });\n          headers.set(\n            \"Access-Control-Allow-Origin\",\n            corsOptions?.origin || \"*\"\n          );\n\n          return new Response(response.body as unknown as BodyInit, {\n            status: response.status,\n            statusText: response.statusText,\n            headers,\n          });\n        }\n\n        return new Response(\"Not Found\", { status: 404 });\n      },\n    };\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/mcp/index.ts"],"sourcesContent":["import { DurableObject } from \"cloudflare:workers\";\nimport { Agent } from \"../\";\nimport type { McpServer } from \"@modelcontextprotocol/sdk/server/mcp.js\";\nimport type { Connection } from \"../\";\nimport type { JSONRPCMessage } from \"@modelcontextprotocol/sdk/types.js\";\nimport { JSONRPCMessageSchema } from \"@modelcontextprotocol/sdk/types.js\";\nimport type { Transport } from \"@modelcontextprotocol/sdk/shared/transport.js\";\n\nconst MAXIMUM_MESSAGE_SIZE = 4 * 1024 * 1024; // 4MB\n\n// CORS helper function\nfunction handleCORS(\n  request: Request,\n  corsOptions?: CORSOptions\n): Response | null {\n  const origin = request.headers.get(\"Origin\") || \"*\";\n  const corsHeaders = {\n    \"Access-Control-Allow-Origin\": corsOptions?.origin || origin,\n    \"Access-Control-Allow-Methods\":\n      corsOptions?.methods || \"GET, POST, OPTIONS\",\n    \"Access-Control-Allow-Headers\": corsOptions?.headers || \"Content-Type\",\n    \"Access-Control-Max-Age\": (corsOptions?.maxAge || 86400).toString(),\n  };\n\n  if (request.method === \"OPTIONS\") {\n    return new Response(null, { headers: corsHeaders });\n  }\n\n  return null;\n}\n\ninterface CORSOptions {\n  origin?: string;\n  methods?: string;\n  headers?: string;\n  maxAge?: number;\n}\n\nclass McpTransport implements Transport {\n  onclose?: () => void;\n  onerror?: (error: Error) => void;\n  onmessage?: (message: JSONRPCMessage) => void;\n  sessionId?: string;\n\n  #getWebSocket: () => WebSocket | null;\n  #started = false;\n  constructor(getWebSocket: () => WebSocket | null) {\n    this.#getWebSocket = getWebSocket;\n  }\n\n  async start() {\n    // The transport does not manage the WebSocket connection since it's terminated\n    // by the Durable Object in order to allow hibernation. There's nothing to initialize.\n    if (this.#started) {\n      throw new Error(\"Transport already started\");\n    }\n    this.#started = true;\n  }\n\n  async send(message: JSONRPCMessage) {\n    if (!this.#started) {\n      throw new Error(\"Transport not started\");\n    }\n    const websocket = this.#getWebSocket();\n    if (!websocket) {\n      throw new Error(\"WebSocket not connected\");\n    }\n    try {\n      websocket.send(JSON.stringify(message));\n    } catch (error) {\n      this.onerror?.(error as Error);\n      throw error;\n    }\n  }\n\n  async close() {\n    // Similar to start, the only thing to do is to pass the event on to the server\n    this.onclose?.();\n  }\n}\n\nexport abstract class McpAgent<\n  Env = unknown,\n  State = unknown,\n  Props extends Record<string, unknown> = Record<string, unknown>,\n> extends DurableObject<Env> {\n  #status: \"zero\" | \"starting\" | \"started\" = \"zero\";\n  #transport?: McpTransport;\n  #connected = false;\n\n  /**\n   * Since McpAgent's _aren't_ yet real \"Agents\" (they route differently, don't support\n   * websockets, don't support hibernation), let's only expose a couple of the methods\n   * to the outer class: initialState/state/setState/onStateUpdate/sql\n   */\n  readonly #agent: Agent<Env, State>;\n\n  protected constructor(ctx: DurableObjectState, env: Env) {\n    super(ctx, env);\n    const self = this;\n\n    // Since McpAgent's _aren't_ yet real \"Agents\" (they route differently, they don't support\n    // scheduling etc, let's only expose a couple of the methods\n    // to the outer class for now.\n    this.#agent = new (class extends Agent<Env, State> {\n      static options = {\n        hibernate: true,\n      };\n\n      onStateUpdate(state: State | undefined, source: Connection | \"server\") {\n        return self.onStateUpdate(state, source);\n      }\n    })(ctx, env);\n  }\n\n  /**\n   * Agents API allowlist\n   */\n  initialState!: State;\n  get state() {\n    if (this.initialState) this.#agent.initialState = this.initialState;\n    return this.#agent.state;\n  }\n  sql<T = Record<string, string | number | boolean | null>>(\n    strings: TemplateStringsArray,\n    ...values: (string | number | boolean | null)[]\n  ) {\n    return this.#agent.sql<T>(strings, ...values);\n  }\n\n  setState(state: State) {\n    return this.#agent.setState(state);\n  }\n  onStateUpdate(state: State | undefined, source: Connection | \"server\") {\n    // override this to handle state updates\n  }\n  async onStart() {\n    this.props = (await this.ctx.storage.get(\"props\")) as Props;\n    this.init?.();\n\n    // Connect to the MCP server\n    this.#transport = new McpTransport(() => this.getWebSocket());\n    await this.server.connect(this.#transport);\n  }\n\n  /**\n   * McpAgent API\n   */\n  abstract server: McpServer;\n  props!: Props;\n  initRun = false;\n\n  abstract init(): Promise<void>;\n\n  async _init(props: Props) {\n    await this.ctx.storage.put(\"props\", props);\n    this.props = props;\n    if (!this.initRun) {\n      this.initRun = true;\n      await this.init();\n    }\n  }\n\n  async #initialize(): Promise<void> {\n    await this.ctx.blockConcurrencyWhile(async () => {\n      this.#status = \"starting\";\n      await this.onStart();\n      this.#status = \"started\";\n    });\n  }\n\n  // Allow the worker to fetch a websocket connection to the agent\n  async fetch(request: Request): Promise<Response> {\n    if (this.#status !== \"started\") {\n      // This means the server \"woke up\" after hibernation\n      // so we need to hydrate it again\n      await this.#initialize();\n    }\n\n    // Only handle WebSocket upgrade requests\n    if (request.headers.get(\"Upgrade\") !== \"websocket\") {\n      return new Response(\"Expected WebSocket Upgrade request\", {\n        status: 400,\n      });\n    }\n\n    const url = new URL(request.url);\n    const sessionId = url.searchParams.get(\"sessionId\");\n    if (!sessionId) {\n      return new Response(\"Missing sessionId\", { status: 400 });\n    }\n\n    // Create a WebSocket pair\n    const webSocketPair = new WebSocketPair();\n    const [client, server] = Object.values(webSocketPair);\n\n    // For now, each agent can only have one connection\n    // If we get an upgrade while already connected, we should error\n    if (this.#connected) {\n      return new Response(\"WebSocket already connected\", { status: 400 });\n    }\n    this.ctx.acceptWebSocket(server);\n    this.#connected = true;\n\n    // Connect to the MCP server\n    this.#transport = new McpTransport(() => this.getWebSocket());\n    await this.server.connect(this.#transport);\n\n    return new Response(null, {\n      status: 101,\n      webSocket: client,\n    });\n  }\n\n  getWebSocket() {\n    const websockets = this.ctx.getWebSockets();\n    if (websockets.length === 0) {\n      return null;\n    }\n    return websockets[0];\n  }\n\n  async onMCPMessage(sessionId: string, request: Request): Promise<Response> {\n    if (this.#status !== \"started\") {\n      // This means the server \"woke up\" after hibernation\n      // so we need to hydrate it again\n      await this.#initialize();\n    }\n    try {\n      const contentType = request.headers.get(\"content-type\") || \"\";\n      if (!contentType.includes(\"application/json\")) {\n        return new Response(`Unsupported content-type: ${contentType}`, {\n          status: 400,\n        });\n      }\n\n      // check if the request body is too large\n      const contentLength = Number.parseInt(\n        request.headers.get(\"content-length\") || \"0\",\n        10\n      );\n      if (contentLength > MAXIMUM_MESSAGE_SIZE) {\n        return new Response(`Request body too large: ${contentLength} bytes`, {\n          status: 400,\n        });\n      }\n\n      // Clone the request before reading the body to avoid stream issues\n      const message = await request.json();\n      let parsedMessage: JSONRPCMessage;\n      try {\n        parsedMessage = JSONRPCMessageSchema.parse(message);\n      } catch (error) {\n        this.#transport?.onerror?.(error as Error);\n        throw error;\n      }\n\n      this.#transport?.onmessage?.(parsedMessage);\n      return new Response(\"Accepted\", { status: 202 });\n    } catch (error) {\n      this.#transport?.onerror?.(error as Error);\n      return new Response(String(error), { status: 400 });\n    }\n  }\n\n  // This is unused since there are no incoming websocket messages\n  async webSocketMessage(ws: WebSocket, event: ArrayBuffer | string) {\n    let message: JSONRPCMessage;\n    try {\n      // Ensure event is a string\n      const data =\n        typeof event === \"string\" ? event : new TextDecoder().decode(event);\n      message = JSONRPCMessageSchema.parse(JSON.parse(data));\n    } catch (error) {\n      this.#transport?.onerror?.(error as Error);\n      return;\n    }\n\n    if (this.#status !== \"started\") {\n      // This means the server \"woke up\" after hibernation\n      // so we need to hydrate it again\n      await this.#initialize();\n    }\n\n    this.#transport?.onmessage?.(message);\n  }\n\n  // WebSocket event handlers for hibernation support\n  async webSocketError(ws: WebSocket, error: unknown): Promise<void> {\n    if (this.#status !== \"started\") {\n      // This means the server \"woke up\" after hibernation\n      // so we need to hydrate it again\n      await this.#initialize();\n    }\n    this.#transport?.onerror?.(error as Error);\n  }\n\n  async webSocketClose(\n    ws: WebSocket,\n    code: number,\n    reason: string,\n    wasClean: boolean\n  ): Promise<void> {\n    if (this.#status !== \"started\") {\n      // This means the server \"woke up\" after hibernation\n      // so we need to hydrate it again\n      await this.#initialize();\n    }\n    this.#transport?.onclose?.();\n    this.#connected = false;\n  }\n\n  static mount(\n    path: string,\n    {\n      binding = \"MCP_OBJECT\",\n      corsOptions,\n    }: {\n      binding?: string;\n      corsOptions?: CORSOptions;\n    } = {}\n  ) {\n    let pathname = path;\n    if (path === \"/\") {\n      pathname = \"/*\";\n    }\n    const basePattern = new URLPattern({ pathname });\n    const messagePattern = new URLPattern({ pathname: `${pathname}/message` });\n\n    return {\n      fetch: async (\n        request: Request,\n        env: Record<string, DurableObjectNamespace<McpAgent>>,\n        ctx: ExecutionContext\n      ) => {\n        // Handle CORS preflight\n        const corsResponse = handleCORS(request, corsOptions);\n        if (corsResponse) return corsResponse;\n\n        const url = new URL(request.url);\n        const namespace = env[binding];\n\n        // Handle SSE connections\n        if (request.method === \"GET\" && basePattern.test(url)) {\n          // Use a session ID if one is passed in, or create a unique\n          // session ID for this connection\n          const sessionId =\n            url.searchParams.get(\"sessionId\") ||\n            namespace.newUniqueId().toString();\n\n          // Create a Transform Stream for SSE\n          const { readable, writable } = new TransformStream();\n          const writer = writable.getWriter();\n          const encoder = new TextEncoder();\n\n          // Send the endpoint event\n          const endpointMessage = `event: endpoint\\ndata: ${encodeURI(`${pathname}/message`)}?sessionId=${sessionId}\\n\\n`;\n          writer.write(encoder.encode(endpointMessage));\n\n          // Get the Durable Object\n          const id = namespace.idFromString(sessionId);\n          const doStub = namespace.get(id);\n\n          // Initialize the object\n          // @ts-ignore\n          await doStub._init(ctx.props);\n\n          // Connect to the Durable Object via WebSocket\n          const upgradeUrl = new URL(request.url);\n          upgradeUrl.searchParams.set(\"sessionId\", sessionId);\n          const response = await doStub.fetch(\n            new Request(upgradeUrl, {\n              headers: {\n                Upgrade: \"websocket\",\n              },\n            })\n          );\n\n          // Get the WebSocket\n          const ws = response.webSocket;\n          if (!ws) {\n            console.error(\"Failed to establish WebSocket connection\");\n            await writer.close();\n            return;\n          }\n\n          // Accept the WebSocket\n          ws.accept();\n\n          // Handle messages from the Durable Object\n          ws.addEventListener(\"message\", async (event) => {\n            try {\n              const message = JSON.parse(event.data);\n\n              // validate that the message is a valid JSONRPC message\n              // https://www.jsonrpc.org/specification#response_object\n              if (!(typeof message.id === \"number\" || message.id === null)) {\n                throw new Error(\"Invalid jsonrpc message id\");\n              }\n\n              if (message.jsonrpc !== \"2.0\") {\n                throw new Error(\"Invalid jsonrpc version\");\n              }\n\n              // must have either result or error field\n              if (\n                !Object.hasOwn(message, \"result\") &&\n                !Object.hasOwn(message, \"error\")\n              ) {\n                throw new Error(\n                  \"Invalid jsonrpc message. Must have either result or error field\"\n                );\n              }\n\n              // Send the message as an SSE event\n              const messageText = `event: message\\ndata: ${event.data}\\n\\n`;\n              await writer.write(encoder.encode(messageText));\n            } catch (error) {\n              console.error(\"Error forwarding message to SSE:\", error);\n            }\n          });\n\n          // Handle WebSocket errors\n          ws.addEventListener(\"error\", async (error) => {\n            try {\n              await writer.close();\n            } catch (e) {\n              // Ignore errors when closing\n            }\n          });\n\n          // Handle WebSocket closure\n          ws.addEventListener(\"close\", async () => {\n            try {\n              await writer.close();\n            } catch (error) {\n              console.error(\"Error closing SSE connection:\", error);\n            }\n          });\n\n          // Return the SSE response\n          return new Response(readable, {\n            headers: {\n              \"Content-Type\": \"text/event-stream\",\n              \"Cache-Control\": \"no-cache\",\n              Connection: \"keep-alive\",\n              \"Access-Control-Allow-Origin\": corsOptions?.origin || \"*\",\n            },\n          });\n        }\n\n        // Handle MCP messages\n        if (request.method === \"POST\" && messagePattern.test(url)) {\n          const sessionId = url.searchParams.get(\"sessionId\");\n          if (!sessionId) {\n            return new Response(\n              `Missing sessionId. Expected POST to ${pathname} to initiate new one`,\n              { status: 400 }\n            );\n          }\n\n          // Get the Durable Object\n          const object = namespace.get(namespace.idFromString(sessionId));\n\n          // Forward the request to the Durable Object\n          const response = await object.onMCPMessage(sessionId, request);\n\n          // Add CORS headers\n          const headers = new Headers();\n          response.headers.forEach?.((value, key) => {\n            headers.set(key, value);\n          });\n          headers.set(\n            \"Access-Control-Allow-Origin\",\n            corsOptions?.origin || \"*\"\n          );\n\n          return new Response(response.body as unknown as BodyInit, {\n            status: response.status,\n            statusText: response.statusText,\n            headers,\n          });\n        }\n\n        return new Response(\"Not Found\", { status: 404 });\n      },\n    };\n  }\n}\n"],"mappings":"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","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agents",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "main": "src/index.ts",
   "type": "module",
   "scripts": {
@@ -52,6 +52,11 @@
       "types": "./dist/mcp/client.d.ts",
       "require": "./dist/mcp/client.js",
       "import": "./dist/mcp/client.js"
+    },
+    "./mcp/do-oauth-client-provider": {
+      "types": "./dist/mcp/do-oauth-client-provider.d.ts",
+      "require": "./dist/mcp/do-oauth-client-provider.js",
+      "import": "./dist/mcp/do-oauth-client-provider.js"
     }
   },
   "keywords": [],