agents 0.0.0-f973b54 → 0.0.0-fac1fe8

package/dist/mcp/client.js

@@ -1,8 +1,7 @@
 import {
   MCPClientManager,
   getNamespacedData
-} from "../chunk-Q5ZBHY4Z.js";
-import "../chunk-HMLY7DHA.js";
+} from "../chunk-MH46VMM4.js";
 export {
   MCPClientManager,
   getNamespacedData

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

@@ -10,11 +10,12 @@ declare class DurableObjectOAuthClientProvider implements AgentsOAuthProvider {
     storage: DurableObjectStorage;
     clientName: string;
     baseRedirectUrl: string;
-    private authUrl_;
-    private serverId_;
-    private clientId_;
+    private _authUrl_;
+    private _serverId_;
+    private _clientId_;
     constructor(storage: DurableObjectStorage, clientName: string, baseRedirectUrl: string);
     get clientMetadata(): OAuthClientMetadata;
+    get clientUri(): string;
     get redirectUrl(): string;
     get clientId(): string;
     set clientId(clientId_: string);

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

@@ -1,106 +1,6 @@
-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;
-  }
-};
+import {
+  DurableObjectOAuthClientProvider
+} from "../chunk-LL2AFX7V.js";
 export {
   DurableObjectOAuthClientProvider
 };

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

@@ -1 +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":[]}
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/dist/mcp/index.d.ts

@@ -1,73 +1,96 @@
-import { MCPClientManager } from './client.js';
-import { DurableObject } from 'cloudflare:workers';
-import { Connection, WSMessage } from 'partyserver';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
-import 'zod';
-import '@modelcontextprotocol/sdk/types.js';
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { ElicitResult } from '@modelcontextprotocol/sdk/types.js';
+export { ElicitRequest, ElicitRequestSchema, ElicitResult } from '@modelcontextprotocol/sdk/types.js';
+import { Agent, AgentContext } from '../index.js';
+export { S as SSEEdgeClientTransport, a as StreamableHTTPEdgeClientTransport } from '../client-CvaJdLQA.js';
+import { Connection, ConnectionContext, WSMessage } from 'partyserver';
+import 'cloudflare:workers';
 import '@modelcontextprotocol/sdk/client/index.js';
+import '../observability/index.js';
+import '../ai-types.js';
+import 'ai';
+import 'zod';
+import '@modelcontextprotocol/sdk/shared/protocol.js';
 import '@modelcontextprotocol/sdk/client/sse.js';
+import '@modelcontextprotocol/sdk/client/streamableHttp.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';
 
+type MaybePromise<T> = T | Promise<T>;
+type TransportType = "sse" | "streamable-http";
 interface CORSOptions {
     origin?: string;
     methods?: string;
     headers?: string;
     maxAge?: number;
+    exposeHeaders?: string;
 }
-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
-     */
-    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
-     */
+interface ServeOptions {
+    binding?: string;
+    corsOptions?: CORSOptions;
+    transport?: TransportType;
+}
+
+declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Record<string, unknown> = Record<string, unknown>> extends Agent<Env, State, Props> {
+    private _transport?;
+    private _requestIdToConnectionId;
+    private _standaloneSseConnectionId?;
+    props?: Props;
     abstract server: MaybePromise<McpServer | Server>;
-    props: Props;
-    initRun: boolean;
     abstract init(): Promise<void>;
-    _init(props: Props): Promise<void>;
+    constructor(ctx: AgentContext, env: Env);
     setInitialized(): Promise<void>;
     isInitialized(): Promise<boolean>;
-    fetch(request: Request): Promise<Response>;
-    getWebSocket(): WebSocket | null;
-    getWebSocketForResponseID(id: string): WebSocket | null;
+    /** Read the transport type for this agent.
+     * This relies on the naming scheme being `sse:${sessionId}`
+     * or `streamable-http:${sessionId}`.
+     */
+    getTransportType(): TransportType;
+    /** Get the WebSocket for the standalone SSE if any. Streamable HTTP only. */
+    private getWebSocketForStandaloneSse;
+    /** Get the unique WebSocket. SSE transport only. */
+    private getWebSocket;
+    /** Get the corresponding WebSocket for a responseId. Streamable HTTP only. */
+    private getWebSocketForResponseID;
+    /** Returns a new transport matching the type of the Agent. */
+    private initTransport;
+    /** Update and store the props */
+    updateProps(props?: Props): 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, _: ConnectionContext): Promise<void>;
+    /** Handles MCP Messages for Streamable HTTP. */
     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<Env>(request: Request, env: Env, ctx: ExecutionContext): Promise<Response>;
+    /** Remove clients from our cache when they disconnect */
+    onClose(conn: Connection, _code: number, _reason: string, _wasClean: boolean): 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>;
+    /** 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 }?: ServeOptions): {
+        fetch<Env>(this: void, request: Request, env: Env, ctx: ExecutionContext): Promise<Response>;
     };
-    static serveSSE(path: string, { binding, corsOptions, }?: {
-        binding?: string;
-        corsOptions?: CORSOptions;
-    }): {
-        fetch<Env>(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 serve(path: string, { binding, corsOptions, }?: {
-        binding?: string;
-        corsOptions?: CORSOptions;
-    }): {
-        fetch<Env>(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>;
     };
 }