agents 0.0.0-c3e8618 → 0.0.0-c8f53b8

package/dist/mcp/client.d.ts

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

package/dist/mcp/client.js

@@ -0,0 +1,10 @@
+import {
+  MCPClientManager,
+  getNamespacedData
+} from "../chunk-Q5ZBHY4Z.js";
+import "../chunk-HMLY7DHA.js";
+export {
+  MCPClientManager,
+  getNamespacedData
+};
+//# sourceMappingURL=client.js.map

package/dist/mcp/client.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

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

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

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

@@ -0,0 +1,107 @@
+import "../chunk-HMLY7DHA.js";
+
+// src/mcp/do-oauth-client-provider.ts
+var DurableObjectOAuthClientProvider = class {
+  constructor(storage, clientName, baseRedirectUrl) {
+    this.storage = storage;
+    this.clientName = clientName;
+    this.baseRedirectUrl = baseRedirectUrl;
+  }
+  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 redirectUrl() {
+    return `${this.baseRedirectUrl}/${this.serverId}`;
+  }
+  get clientId() {
+    if (!this.clientId_) {
+      throw new Error("Trying to access clientId before it was set");
+    }
+    return this.clientId_;
+  }
+  set clientId(clientId_) {
+    this.clientId_ = clientId_;
+  }
+  get serverId() {
+    if (!this.serverId_) {
+      throw new Error("Trying to access serverId before it was set");
+    }
+    return this.serverId_;
+  }
+  set serverId(serverId_) {
+    this.serverId_ = serverId_;
+  }
+  keyPrefix(clientId) {
+    return `/${this.clientName}/${this.serverId}/${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;
+  }
+};
+export {
+  DurableObjectOAuthClientProvider
+};
+//# sourceMappingURL=do-oauth-client-provider.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/mcp/do-oauth-client-provider.ts"],"sourcesContent":["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\n// This allows us to track authentication for a specific server and associated dynamic client registration\nexport interface AgentsOAuthProvider extends OAuthClientProvider {\n  authUrl: string | undefined;\n  clientId: string | undefined;\n  serverId: string | undefined;\n}\n\nexport class DurableObjectOAuthClientProvider implements AgentsOAuthProvider {\n  private authUrl_: string | undefined;\n  private serverId_: string | undefined;\n  private clientId_: string | undefined;\n\n  constructor(\n    public storage: DurableObjectStorage,\n    public clientName: string,\n    public baseRedirectUrl: 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 redirectUrl() {\n    return `${this.baseRedirectUrl}/${this.serverId}`;\n  }\n\n  get clientId() {\n    if (!this.clientId_) {\n      throw new Error(\"Trying to access clientId before it was set\");\n    }\n    return this.clientId_;\n  }\n\n  set clientId(clientId_: string) {\n    this.clientId_ = clientId_;\n  }\n\n  get serverId() {\n    if (!this.serverId_) {\n      throw new Error(\"Trying to access serverId before it was set\");\n    }\n    return this.serverId_;\n  }\n\n  set serverId(serverId_: string) {\n    this.serverId_ = serverId_;\n  }\n\n  keyPrefix(clientId: string) {\n    return `/${this.clientName}/${this.serverId}/${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"],"mappings":";;;AAgBO,IAAM,mCAAN,MAAsE;AAAA,EAK3E,YACS,SACA,YACA,iBACP;AAHO;AACA;AACA;AAAA,EACN;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,cAAc;AAChB,WAAO,GAAG,KAAK,eAAe,IAAI,KAAK,QAAQ;AAAA,EACjD;AAAA,EAEA,IAAI,WAAW;AACb,QAAI,CAAC,KAAK,WAAW;AACnB,YAAM,IAAI,MAAM,6CAA6C;AAAA,IAC/D;AACA,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,IAAI,SAAS,WAAmB;AAC9B,SAAK,YAAY;AAAA,EACnB;AAAA,EAEA,IAAI,WAAW;AACb,QAAI,CAAC,KAAK,WAAW;AACnB,YAAM,IAAI,MAAM,6CAA6C;AAAA,IAC/D;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,QAAQ,IAAI,QAAQ;AAAA,EACzD;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;","names":[]}

package/dist/mcp/index.d.ts

@@ -1,6 +1,17 @@
+import { MCPClientManager } from './client.js';
 import { DurableObject } from 'cloudflare:workers';
+import { Connection, WSMessage } from 'partyserver';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { Connection } from 'partyserver';
+import { Server } from '@modelcontextprotocol/sdk/server/index.js';
+import 'zod';
+import '@modelcontextprotocol/sdk/types.js';
+import '@modelcontextprotocol/sdk/client/index.js';
+import '@modelcontextprotocol/sdk/client/sse.js';
+import './do-oauth-client-provider.js';
+import '@modelcontextprotocol/sdk/client/auth.js';
+import '@modelcontextprotocol/sdk/shared/auth.js';
+import '@modelcontextprotocol/sdk/shared/protocol.js';
+import 'ai';
 
 interface CORSOptions {
     origin?: string;
@@ -8,8 +19,10 @@ interface CORSOptions {
     headers?: string;
     maxAge?: number;
 }
+type MaybePromise<T> = T | Promise<T>;
 declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Record<string, unknown> = Record<string, unknown>> extends DurableObject<Env> {
     #private;
+    get mcp(): MCPClientManager;
     protected constructor(ctx: DurableObjectState, env: Env);
     /**
      * Agents API allowlist
@@ -19,22 +32,42 @@ declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Re
     sql<T = Record<string, string | number | boolean | null>>(strings: TemplateStringsArray, ...values: (string | number | boolean | null)[]): T[];
     setState(state: State): void;
     onStateUpdate(state: State | undefined, source: Connection | "server"): void;
+    onStart(): Promise<void>;
     /**
      * McpAgent API
      */
-    abstract server: McpServer;
-    private transport;
+    abstract server: MaybePromise<McpServer | Server>;
     props: Props;
     initRun: boolean;
     abstract init(): Promise<void>;
     _init(props: Props): Promise<void>;
-    onSSE(path: string): Promise<Response>;
-    onMCPMessage(request: Request): Promise<Response>;
+    setInitialized(): Promise<void>;
+    isInitialized(): Promise<boolean>;
+    fetch(request: Request): Promise<Response>;
+    getWebSocket(): WebSocket | null;
+    getWebSocketForResponseID(id: string): WebSocket | null;
+    onMessage(connection: Connection, event: WSMessage): Promise<void>;
+    onSSEMcpMessage(sessionId: string, request: Request): Promise<Error | null>;
+    webSocketMessage(ws: WebSocket, event: ArrayBuffer | string): Promise<void>;
+    webSocketError(ws: WebSocket, error: unknown): Promise<void>;
+    webSocketClose(ws: WebSocket, code: number, reason: string, wasClean: boolean): Promise<void>;
     static mount(path: string, { binding, corsOptions, }?: {
         binding?: string;
         corsOptions?: CORSOptions;
     }): {
-        fetch: (request: Request, env: Record<string, DurableObjectNamespace<McpAgent>>, ctx: ExecutionContext) => Promise<Response>;
+        fetch<Env>(this: void, request: Request, env: Env, ctx: ExecutionContext): Promise<Response>;
+    };
+    static serveSSE(path: string, { binding, corsOptions, }?: {
+        binding?: string;
+        corsOptions?: CORSOptions;
+    }): {
+        fetch<Env>(this: void, request: Request, env: Env, ctx: ExecutionContext): Promise<Response>;
+    };
+    static serve(path: string, { binding, corsOptions, }?: {
+        binding?: string;
+        corsOptions?: CORSOptions;
+    }): {
+        fetch<Env>(this: void, request: Request, env: Env, ctx: ExecutionContext): Promise<Response>;
     };
 }