agents 0.0.0-cebd0de → 0.0.0-cec3cca

package/dist/mcp/client.js

@@ -1,471 +1,3 @@
-import "../chunk-HMLY7DHA.js";
+import { n as getNamespacedData, t as MCPClientManager } from "../client-9Ld2_lnt.js";
 
-// src/mcp/sse-edge.ts
-import {
-  SSEClientTransport
-} from "@modelcontextprotocol/sdk/client/sse.js";
-var SSEEdgeClientTransport = class extends SSEClientTransport {
-  /**
-   * Creates a new EdgeSSEClientTransport, which overrides fetch to be compatible with the CF workers environment
-   */
-  constructor(url, options) {
-    const fetchOverride = async (fetchUrl, fetchInit = {}) => {
-      const headers = await this.authHeaders();
-      const workerOptions = {
-        ...fetchInit,
-        headers: {
-          ...fetchInit?.headers,
-          ...headers
-        }
-      };
-      delete workerOptions.mode;
-      return fetch(fetchUrl, workerOptions);
-    };
-    super(url, {
-      ...options,
-      eventSourceInit: {
-        fetch: fetchOverride
-      }
-    });
-    this.authProvider = options.authProvider;
-  }
-  async authHeaders() {
-    if (this.authProvider) {
-      const tokens = await this.authProvider.tokens();
-      if (tokens) {
-        return {
-          Authorization: `Bearer ${tokens.access_token}`
-        };
-      }
-    }
-  }
-};
-
-// src/mcp/client-connection.ts
-import {
-  ToolListChangedNotificationSchema,
-  ResourceListChangedNotificationSchema,
-  PromptListChangedNotificationSchema
-} from "@modelcontextprotocol/sdk/types.js";
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-var MCPClientConnection = class {
-  constructor(url, info, options = { transport: {}, client: {}, capabilities: {} }) {
-    this.url = url;
-    this.info = info;
-    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);
-  }
-  /**
-   * 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 failed to return server capabilities");
-    }
-    const [instructions, tools, resources, prompts, resourceTemplates] = await Promise.all([
-      this.client.getInstructions(),
-      this.registerTools(),
-      this.registerResources(),
-      this.registerPrompts(),
-      this.registerResourceTemplates()
-    ]);
-    this.instructions = instructions;
-    this.tools = tools;
-    this.resources = resources;
-    this.prompts = prompts;
-    this.resourceTemplates = resourceTemplates;
-    this.connectionState = "ready";
-  }
-  /**
-   * Notification handler registration
-   */
-  async registerTools() {
-    if (!this.serverCapabilities || !this.serverCapabilities.tools) {
-      return [];
-    }
-    if (this.serverCapabilities.tools.listChanged) {
-      this.client.setNotificationHandler(
-        ToolListChangedNotificationSchema,
-        async (_notification) => {
-          this.tools = await this.fetchTools();
-        }
-      );
-    }
-    return this.fetchTools();
-  }
-  async registerResources() {
-    if (!this.serverCapabilities || !this.serverCapabilities.resources) {
-      return [];
-    }
-    if (this.serverCapabilities.resources.listChanged) {
-      this.client.setNotificationHandler(
-        ResourceListChangedNotificationSchema,
-        async (_notification) => {
-          this.resources = await this.fetchResources();
-        }
-      );
-    }
-    return this.fetchResources();
-  }
-  async registerPrompts() {
-    if (!this.serverCapabilities || !this.serverCapabilities.prompts) {
-      return [];
-    }
-    if (this.serverCapabilities.prompts.listChanged) {
-      this.client.setNotificationHandler(
-        PromptListChangedNotificationSchema,
-        async (_notification) => {
-          this.prompts = await this.fetchPrompts();
-        }
-      );
-    }
-    return this.fetchPrompts();
-  }
-  async registerResourceTemplates() {
-    if (!this.serverCapabilities || !this.serverCapabilities.resources) {
-      return [];
-    }
-    return this.fetchResourceTemplates();
-  }
-  async fetchTools() {
-    let toolsAgg = [];
-    let toolsResult = { tools: [] };
-    do {
-      toolsResult = await this.client.listTools({
-        cursor: toolsResult.nextCursor
-      });
-      toolsAgg = toolsAgg.concat(toolsResult.tools);
-    } while (toolsResult.nextCursor);
-    return toolsAgg;
-  }
-  async fetchResources() {
-    let resourcesAgg = [];
-    let resourcesResult = { resources: [] };
-    do {
-      resourcesResult = await this.client.listResources({
-        cursor: resourcesResult.nextCursor
-      });
-      resourcesAgg = resourcesAgg.concat(resourcesResult.resources);
-    } while (resourcesResult.nextCursor);
-    return resourcesAgg;
-  }
-  async fetchPrompts() {
-    let promptsAgg = [];
-    let promptsResult = { prompts: [] };
-    do {
-      promptsResult = await this.client.listPrompts({
-        cursor: promptsResult.nextCursor
-      });
-      promptsAgg = promptsAgg.concat(promptsResult.prompts);
-    } while (promptsResult.nextCursor);
-    return promptsAgg;
-  }
-  async fetchResourceTemplates() {
-    let templatesAgg = [];
-    let templatesResult = {
-      resourceTemplates: []
-    };
-    do {
-      templatesResult = await this.client.listResourceTemplates({
-        cursor: templatesResult.nextCursor
-      });
-      templatesAgg = templatesAgg.concat(templatesResult.resourceTemplates);
-    } while (templatesResult.nextCursor);
-    return templatesAgg;
-  }
-};
-
-// src/mcp/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 {
-  /**
-   * @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 = {};
-  }
-  /**
-   * Connect to and register an MCP server
-   *
-   * @param transportConfig Transport config
-   * @param clientConfig Client config
-   * @param capabilities Client capabilities (i.e. if the client supports roots/sampling)
-   */
-  async 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(
-        "Failed to authenticate: the client isn't in the `authenticating` state"
-      );
-    }
-    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
-   */
-  listTools() {
-    return getNamespacedData(this.mcpConnections, "tools");
-  }
-  /**
-   * @returns namespaced list of prompts
-   */
-  listPrompts() {
-    return getNamespacedData(this.mcpConnections, "prompts");
-  }
-  /**
-   * @returns namespaced list of tools
-   */
-  listResources() {
-    return getNamespacedData(this.mcpConnections, "resources");
-  }
-  /**
-   * @returns namespaced list of resource templates
-   */
-  listResourceTemplates() {
-    return getNamespacedData(this.mcpConnections, "resourceTemplates");
-  }
-  /**
-   * Namespaced version of callTool
-   */
-  callTool(params, resultSchema, options) {
-    const unqualifiedName = params.name.replace(`${params.serverId}.`, "");
-    return this.mcpConnections[params.serverId].client.callTool(
-      {
-        ...params,
-        name: unqualifiedName
-      },
-      resultSchema,
-      options
-    );
-  }
-  /**
-   * Namespaced version of readResource
-   */
-  readResource(params, options) {
-    return this.mcpConnections[params.serverId].client.readResource(
-      params,
-      options
-    );
-  }
-  /**
-   * Namespaced version of getPrompt
-   */
-  getPrompt(params, options) {
-    return this.mcpConnections[params.serverId].client.getPrompt(
-      params,
-      options
-    );
-  }
-};
-function getNamespacedData(mcpClients, type) {
-  const sets = Object.entries(mcpClients).map(([name, conn]) => {
-    return { name, data: conn[type] };
-  });
-  const namespacedData = sets.flatMap(({ name: serverId, data }) => {
-    return data.map((item) => {
-      return {
-        ...item,
-        // we add a serverId so we can easily pull it out and send the tool call to the right server
-        serverId
-      };
-    });
-  });
-  return namespacedData;
-}
-export {
-  MCPClientManager,
-  getNamespacedData
-};
-//# sourceMappingURL=client.js.map
+export { MCPClientManager, getNamespacedData };

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

@@ -0,0 +1,2 @@
+import { n as DurableObjectOAuthClientProvider, t as AgentsOAuthProvider } from "../do-oauth-client-provider-DGc5pP0l.js";
+export { AgentsOAuthProvider, DurableObjectOAuthClientProvider };

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

@@ -0,0 +1,3 @@
+import { t as DurableObjectOAuthClientProvider } from "../do-oauth-client-provider-CswoD5Lu.js";
+
+export { DurableObjectOAuthClientProvider };

package/dist/mcp/index.d.ts

@@ -1,44 +1,154 @@
-import { DurableObject } from 'cloudflare:workers';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { Connection } from 'partyserver';
+import { c as MaybePromise, d as StreamableHTTPEdgeClientTransport, f as SSEEdgeClientTransport, l as ServeOptions, n as MCPClientOAuthCallbackConfig, o as BaseTransportType, r as MCPClientOAuthResult, s as CORSOptions } from "../client-Csp_m13H.js";
+import "../mcp-Dw5vDrY8.js";
+import "../do-oauth-client-provider-DGc5pP0l.js";
+import "../index-DhJCaDWd.js";
+import "../ai-types-D5YoPrBZ.js";
+import { c as ConnectionContext, s as Connection, t as Agent } from "../index-DFqsR7mb.js";
+import { ElicitRequest, ElicitRequestSchema, ElicitResult, ElicitResult as ElicitResult$1, JSONRPCMessage, MessageExtraInfo } from "@modelcontextprotocol/sdk/types.js";
+import { Server } from "@modelcontextprotocol/sdk/server/index.js";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
 
-interface CORSOptions {
-    origin?: string;
-    methods?: string;
-    headers?: string;
-    maxAge?: number;
+//#region src/mcp/worker-transport.d.ts
+interface WorkerTransportOptions {
+  sessionIdGenerator?: () => string;
+  enableJsonResponse?: boolean;
+  onsessioninitialized?: (sessionId: string) => void;
+  corsOptions?: CORSOptions;
 }
-declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Record<string, unknown> = Record<string, unknown>> extends DurableObject<Env> {
-    #private;
-    /**
-     * Agents API allowlist
-     */
-    initialState: State;
-    get state(): State;
-    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;
-    props: Props;
-    initRun: boolean;
-    abstract init(): Promise<void>;
-    _init(props: Props): Promise<void>;
-    fetch(request: Request): Promise<Response>;
-    getWebSocket(): WebSocket | null;
-    onMCPMessage(sessionId: string, request: Request): Promise<Response>;
-    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 | undefined>;
-    };
+declare class WorkerTransport implements Transport {
+  private started;
+  private initialized;
+  private sessionIdGenerator?;
+  private enableJsonResponse;
+  private onsessioninitialized?;
+  private standaloneSseStreamId;
+  private streamMapping;
+  private requestToStreamMapping;
+  private requestResponseMap;
+  private corsOptions?;
+  private protocolVersion?;
+  sessionId?: string;
+  onclose?: () => void;
+  onerror?: (error: Error) => void;
+  onmessage?: (message: JSONRPCMessage, extra?: MessageExtraInfo) => void;
+  constructor(options?: WorkerTransportOptions);
+  start(): Promise<void>;
+  private validateProtocolVersion;
+  private getHeaders;
+  handleRequest(request: Request, parsedBody?: unknown): Promise<Response>;
+  private handleGetRequest;
+  private handlePostRequest;
+  private handleDeleteRequest;
+  private handleOptionsRequest;
+  private handleUnsupportedRequest;
+  private validateSession;
+  close(): Promise<void>;
+  send(message: JSONRPCMessage): Promise<void>;
 }
-
-export { McpAgent };
+//#endregion
+//#region src/mcp/handler.d.ts
+interface CreateMcpHandlerOptions extends WorkerTransportOptions {
+  /**
+   * The route path that this MCP handler should respond to.
+   * If specified, the handler will only process requests that match this route.
+   * @default "/mcp"
+   */
+  route?: string;
+  /**
+   * CORS configuration options for handling cross-origin requests.
+   * These options are passed to the WorkerTransport which handles adding
+   * CORS headers to all responses.
+   *
+   * Default values are:
+   * - origin: "*"
+   * - headers: "Content-Type, Accept, Authorization, mcp-session-id, MCP-Protocol-Version"
+   * - methods: "GET, POST, DELETE, OPTIONS"
+   * - exposeHeaders: "mcp-session-id"
+   * - maxAge: 86400
+   *
+   * Provided options will overwrite the defaults.
+   */
+  corsOptions?: CORSOptions;
+}
+type OAuthExecutionContext = ExecutionContext & {
+  props?: Record<string, unknown>;
+};
+declare function createMcpHandler(server: McpServer | Server, options?: CreateMcpHandlerOptions): (request: Request, env: unknown, ctx: ExecutionContext) => Promise<Response>;
+/**
+ * @deprecated This has been renamed to createMcpHandler, and experimental_createMcpHandler will be removed in the next major version
+ */
+declare function experimental_createMcpHandler(server: McpServer | Server, options?: CreateMcpHandlerOptions): (request: Request, env: unknown, ctx: ExecutionContext) => Promise<Response>;
+//#endregion
+//#region src/mcp/auth-context.d.ts
+interface McpAuthContext {
+  props: Record<string, unknown>;
+}
+declare function getMcpAuthContext(): McpAuthContext | undefined;
+//#endregion
+//#region src/mcp/index.d.ts
+declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Record<string, unknown> = Record<string, unknown>> extends Agent<Env, State, Props> {
+  private _transport?;
+  props?: Props;
+  abstract server: MaybePromise<McpServer | Server>;
+  abstract init(): Promise<void>;
+  setInitializeRequest(initializeRequest: JSONRPCMessage): Promise<void>;
+  getInitializeRequest(): Promise<JSONRPCMessage | undefined>;
+  /** Read the transport type for this agent.
+   * This relies on the naming scheme being `sse:${sessionId}`
+   * or `streamable-http:${sessionId}`.
+   */
+  getTransportType(): BaseTransportType;
+  /** Read the sessionId for this agent.
+   * This relies on the naming scheme being `sse:${sessionId}`
+   * or `streamable-http:${sessionId}`.
+   */
+  getSessionId(): string;
+  /** Get the unique WebSocket. SSE transport only. */
+  private getWebSocket;
+  /** Returns a new transport matching the type of the Agent. */
+  private initTransport;
+  /** Update and store the props */
+  updateProps(props?: Props): Promise<void>;
+  reinitializeServer(): Promise<void>;
+  /** Sets up the MCP transport and server every time the Agent is started.*/
+  onStart(props?: Props): Promise<void>;
+  /** Validates new WebSocket connections. */
+  onConnect(conn: Connection, {
+    request: req
+  }: ConnectionContext): Promise<void>;
+  /** Handles MCP Messages for the legacy SSE transport. */
+  onSSEMcpMessage(_sessionId: string, messageBody: unknown): Promise<Error | null>;
+  /** Elicit user input with a message and schema */
+  elicitInput(params: {
+    message: string;
+    requestedSchema: unknown;
+  }): Promise<ElicitResult$1>;
+  /** Wait for elicitation response through storage polling */
+  private _waitForElicitationResponse;
+  /** Handle elicitation responses */
+  private _handleElicitationResponse;
+  /** Return a handler for the given path for this MCP.
+   * Defaults to Streamable HTTP transport.
+   */
+  static serve(path: string, {
+    binding,
+    corsOptions,
+    transport,
+    jurisdiction
+  }?: ServeOptions): {
+    fetch<Env>(this: void, request: Request, env: Env, ctx: ExecutionContext): Promise<Response>;
+  };
+  /**
+   * Legacy api
+   **/
+  static mount(path: string, opts?: Omit<ServeOptions, "transport">): {
+    fetch<Env>(this: void, request: Request, env: Env, ctx: ExecutionContext): Promise<Response>;
+  };
+  static serveSSE(path: string, opts?: Omit<ServeOptions, "transport">): {
+    fetch<Env>(this: void, request: Request, env: Env, ctx: ExecutionContext): Promise<Response>;
+  };
+}
+//#endregion
+export { type CreateMcpHandlerOptions, type ElicitRequest, ElicitRequestSchema, type ElicitResult, type MCPClientOAuthCallbackConfig, type MCPClientOAuthResult, McpAgent, type McpAuthContext, type OAuthExecutionContext, SSEEdgeClientTransport, StreamableHTTPEdgeClientTransport, WorkerTransport, type WorkerTransportOptions, createMcpHandler, experimental_createMcpHandler, getMcpAuthContext };
+//# sourceMappingURL=index.d.ts.map