agents 0.0.0-2cc0f02 → 0.0.0-2e73791

package/dist/{index-DWcUTPtX.d.ts → index-xIS9I1YX.d.ts}

@@ -1,10 +1,11 @@
+import { n as AgentEmail } from "./context-_sPQqJWv.js";
 import {
-  MCPClientManager,
-  MCPConnectionState,
-  TransportType
-} from "./client-C-u-lCFT.js";
-import { Observability } from "./index-W4JUkafc.js";
-import { MessageType } from "./ai-types-BWW4umHY.js";
+  h as TransportType,
+  t as MCPClientManager,
+  u as MCPConnectionState
+} from "./client-Cfw92Wb_.js";
+import { t as Observability } from "./index-CyDpAVHZ.js";
+import { n as MessageType } from "./ai-types-U8lYA0o8.js";
 import {
   Connection,
   Connection as Connection$1,
@@ -20,7 +21,6 @@ import {
   ServerCapabilities,
   Tool
 } from "@modelcontextprotocol/sdk/types.js";
-import { env } from "cloudflare:workers";
 
 //#region src/index.d.ts
 
@@ -90,7 +90,7 @@ declare const unstable_callable: (metadata?: CallableMetadata) => void;
 type QueueItem<T = string> = {
   id: string;
   payload: T;
-  callback: keyof Agent<unknown>;
+  callback: keyof Agent<Cloudflare.Env>;
   created_at: number;
 };
 /**
@@ -139,9 +139,15 @@ type MCPServersState = {
   servers: {
     [id: string]: MCPServer;
   };
-  tools: Tool[];
-  prompts: Prompt[];
-  resources: Resource[];
+  tools: (Tool & {
+    serverId: string;
+  })[];
+  prompts: (Prompt & {
+    serverId: string;
+  })[];
+  resources: (Resource & {
+    serverId: string;
+  })[];
 };
 type MCPServer = {
   name: string;
@@ -152,7 +158,7 @@ type MCPServer = {
   capabilities: ServerCapabilities | null;
 };
 declare function getCurrentAgent<
-  T extends Agent<unknown, unknown> = Agent<unknown, unknown>
+  T extends Agent<Cloudflare.Env> = Agent<Cloudflare.Env>
 >(): {
   agent: T | undefined;
   connection: Connection | undefined;
@@ -165,12 +171,13 @@ declare function getCurrentAgent<
  * @template State State type to store within the Agent
  */
 declare class Agent<
-  Env = typeof env,
+  Env extends Cloudflare.Env = Cloudflare.Env,
   State = unknown,
   Props extends Record<string, unknown> = Record<string, unknown>
 > extends Server<Env, Props> {
   private _state;
   private _disposables;
+  private _destroyed;
   private _ParentClass;
   readonly mcp: MCPClientManager;
   /**
@@ -324,7 +331,7 @@ declare class Agent<
   /**
    * Cancel a scheduled task
    * @param id ID of the task to cancel
-   * @returns true if the task was cancelled, false otherwise
+   * @returns true if the task was cancelled, false if the task was not found
    */
   cancelSchedule(id: string): Promise<boolean>;
   private _scheduleNextAlarm;
@@ -354,7 +361,8 @@ declare class Agent<
    * @param callbackHost Base host for the agent, used for the redirect URI. If not provided, will be derived from the current request.
    * @param agentsPrefix agents routing prefix if not using `agents`
    * @param options MCP client and transport options
-   * @returns authUrl
+   * @returns Server id and state - either "authenticating" with authUrl, or "ready"
+   * @throws If connection or discovery fails
    */
   addMcpServer(
     serverName: string,
@@ -368,14 +376,35 @@ declare class Agent<
         type?: TransportType;
       };
     }
-  ): Promise<{
-    id: string;
-    authUrl: string | undefined;
-  }>;
-  private _connectToMcpServerInternal;
+  ): Promise<
+    | {
+        id: string;
+        state: typeof MCPConnectionState.AUTHENTICATING;
+        authUrl: string;
+      }
+    | {
+        id: string;
+        state: typeof MCPConnectionState.READY;
+        authUrl?: undefined;
+      }
+  >;
   removeMcpServer(id: string): Promise<void>;
   getMcpServers(): MCPServersState;
   private broadcastMcpServers;
+  /**
+   * Handle MCP OAuth callback request if it's an OAuth callback.
+   *
+   * This method encapsulates the entire OAuth callback flow:
+   * 1. Checks if the request is an MCP OAuth callback
+   * 2. Processes the OAuth code exchange
+   * 3. Establishes the connection if successful
+   * 4. Broadcasts MCP server state updates
+   * 5. Returns the appropriate HTTP response
+   *
+   * @param request The incoming HTTP request
+   * @returns Response if this was an OAuth callback, null otherwise
+   */
+  private handleMcpOAuthCallback;
   /**
    * Handle OAuth callback response using MCPClientManager configuration
    * @param result OAuth callback result
@@ -388,7 +417,7 @@ declare class Agent<
  * Namespace for creating Agent instances
  * @template Agentic Type of the Agent class
  */
-type AgentNamespace<Agentic extends Agent<unknown>> =
+type AgentNamespace<Agentic extends Agent<Cloudflare.Env>> =
   DurableObjectNamespace<Agentic>;
 /**
  * Agent's durable context
@@ -455,21 +484,11 @@ type EmailRoutingOptions<Env> = AgentOptions<Env> & {
  * @param options The options for routing the email
  * @returns A promise that resolves when the email has been routed
  */
-declare function routeAgentEmail<Env>(
+declare function routeAgentEmail<Env extends Cloudflare.Env = Cloudflare.Env>(
   email: ForwardableEmailMessage,
   env: Env,
   options: EmailRoutingOptions<Env>
 ): Promise<void>;
-type AgentEmail = {
-  from: string;
-  to: string;
-  getRaw: () => Promise<Uint8Array>;
-  headers: Headers;
-  rawSize: number;
-  setReject: (reason: string) => void;
-  forward: (rcptTo: string, headers?: Headers) => Promise<void>;
-  reply: (options: { from: string; to: string; raw: string }) => Promise<void>;
-};
 type EmailSendOptions = {
   to: string;
   subject: string;
@@ -491,8 +510,8 @@ type EmailSendOptions = {
  * @returns Promise resolving to an Agent instance stub
  */
 declare function getAgentByName<
-  Env,
-  T extends Agent<Env>,
+  Env extends Cloudflare.Env = Cloudflare.Env,
+  T extends Agent<Env> = Agent<Env>,
   Props extends Record<string, unknown> = Record<string, unknown>
 >(
   namespace: AgentNamespace<T>,
@@ -524,35 +543,34 @@ declare class StreamingResponse {
 }
 //#endregion
 export {
-  Agent,
-  AgentContext,
-  AgentEmail,
-  AgentNamespace,
-  AgentOptions,
-  CallableMetadata,
-  type Connection$1 as Connection,
-  type ConnectionContext,
-  EmailResolver,
-  EmailRoutingOptions,
-  EmailSendOptions,
-  MCPServer,
-  MCPServerMessage,
-  MCPServersState,
-  QueueItem,
-  RPCRequest,
-  RPCResponse,
-  Schedule,
-  StateUpdateMessage,
-  StreamingResponse,
-  type WSMessage,
-  callable,
-  createAddressBasedEmailResolver,
-  createCatchAllEmailResolver,
-  createHeaderBasedEmailResolver,
-  getAgentByName,
-  getCurrentAgent,
-  routeAgentEmail,
-  routeAgentRequest,
-  unstable_callable
+  createCatchAllEmailResolver as C,
+  routeAgentEmail as D,
+  getCurrentAgent as E,
+  routeAgentRequest as O,
+  createAddressBasedEmailResolver as S,
+  getAgentByName as T,
+  Schedule as _,
+  CallableMetadata as a,
+  WSMessage as b,
+  EmailResolver as c,
+  MCPServer as d,
+  MCPServerMessage as f,
+  RPCResponse as g,
+  RPCRequest as h,
+  AgentOptions as i,
+  unstable_callable as k,
+  EmailRoutingOptions as l,
+  QueueItem as m,
+  AgentContext as n,
+  Connection$1 as o,
+  MCPServersState as p,
+  AgentNamespace as r,
+  ConnectionContext as s,
+  Agent as t,
+  EmailSendOptions as u,
+  StateUpdateMessage as v,
+  createHeaderBasedEmailResolver as w,
+  callable as x,
+  StreamingResponse as y
 };
-//# sourceMappingURL=index-DWcUTPtX.d.ts.map
+//# sourceMappingURL=index-xIS9I1YX.d.ts.map

package/dist/index.d.ts

@@ -1,40 +1,40 @@
-import { TransportType } from "./client-C-u-lCFT.js";
-import "./mcp-BEwaCsxO.js";
-import "./do-oauth-client-provider-CCwGwnrA.js";
-import "./index-W4JUkafc.js";
-import "./ai-types-BWW4umHY.js";
+import { n as AgentEmail } from "./context-_sPQqJWv.js";
+import { h as TransportType } from "./client-Cfw92Wb_.js";
+import "./mcp-CzbSsLfc.js";
+import "./do-oauth-client-provider-B-ryFIPr.js";
+import "./index-CyDpAVHZ.js";
+import "./ai-types-U8lYA0o8.js";
 import {
-  Agent,
-  AgentContext,
-  AgentEmail,
-  AgentNamespace,
-  AgentOptions,
-  CallableMetadata,
-  Connection,
-  ConnectionContext,
-  EmailResolver,
-  EmailRoutingOptions,
-  EmailSendOptions,
-  MCPServer,
-  MCPServerMessage,
-  MCPServersState,
-  QueueItem,
-  RPCRequest,
-  RPCResponse,
-  Schedule,
-  StateUpdateMessage,
-  StreamingResponse,
-  WSMessage,
-  callable,
-  createAddressBasedEmailResolver,
-  createCatchAllEmailResolver,
-  createHeaderBasedEmailResolver,
-  getAgentByName,
-  getCurrentAgent,
-  routeAgentEmail,
-  routeAgentRequest,
-  unstable_callable
-} from "./index-DWcUTPtX.js";
+  C as createCatchAllEmailResolver,
+  D as routeAgentEmail,
+  E as getCurrentAgent,
+  O as routeAgentRequest,
+  S as createAddressBasedEmailResolver,
+  T as getAgentByName,
+  _ as Schedule,
+  a as CallableMetadata,
+  b as WSMessage,
+  c as EmailResolver,
+  d as MCPServer,
+  f as MCPServerMessage,
+  g as RPCResponse,
+  h as RPCRequest,
+  i as AgentOptions,
+  k as unstable_callable,
+  l as EmailRoutingOptions,
+  m as QueueItem,
+  n as AgentContext,
+  o as Connection,
+  p as MCPServersState,
+  r as AgentNamespace,
+  s as ConnectionContext,
+  t as Agent,
+  u as EmailSendOptions,
+  v as StateUpdateMessage,
+  w as createHeaderBasedEmailResolver,
+  x as callable,
+  y as StreamingResponse
+} from "./index-xIS9I1YX.js";
 export {
   Agent,
   AgentContext,

package/dist/index.js

@@ -1,7 +1,8 @@
-import "./client-WbaRgKYN.js";
-import "./ai-types-B0GBFDwi.js";
-import "./client-zS-OCVJA.js";
-import "./do-oauth-client-provider-B2jr6UNq.js";
-import { Agent, StreamingResponse, callable, createAddressBasedEmailResolver, createCatchAllEmailResolver, createHeaderBasedEmailResolver, getAgentByName, getCurrentAgent, routeAgentEmail, routeAgentRequest, unstable_callable } from "./src-C9xZ0CrH.js";
+import "./context-BkKbAa1R.js";
+import "./ai-types-DEtF_8Km.js";
+import "./client-DjTPRM8-.js";
+import "./client-QZa2Rq0l.js";
+import "./do-oauth-client-provider-B1fVIshX.js";
+import { a as createCatchAllEmailResolver, c as getCurrentAgent, d as unstable_callable, i as createAddressBasedEmailResolver, l as routeAgentEmail, n as StreamingResponse, o as createHeaderBasedEmailResolver, r as callable, s as getAgentByName, t as Agent, u as routeAgentRequest } from "./src-BZDh910Z.js";
 
 export { Agent, StreamingResponse, callable, createAddressBasedEmailResolver, createCatchAllEmailResolver, createHeaderBasedEmailResolver, getAgentByName, getCurrentAgent, routeAgentEmail, routeAgentRequest, unstable_callable };

package/dist/mcp/client.d.ts

@@ -1,4 +1,4 @@
-import { MCPClientManager, MCPClientOAuthCallbackConfig, MCPClientOAuthResult, getNamespacedData } from "../client-C-u-lCFT.js";
-import "../mcp-BEwaCsxO.js";
-import "../do-oauth-client-provider-CCwGwnrA.js";
-export { MCPClientManager, MCPClientOAuthCallbackConfig, MCPClientOAuthResult, getNamespacedData };
+import { a as MCPConnectionResult, c as RegisterServerOptions, i as MCPClientOAuthResult, l as getNamespacedData, n as MCPClientManagerOptions, o as MCPDiscoverResult, r as MCPClientOAuthCallbackConfig, s as MCPServerOptions, t as MCPClientManager } from "../client-Cfw92Wb_.js";
+import "../mcp-CzbSsLfc.js";
+import "../do-oauth-client-provider-B-ryFIPr.js";
+export { MCPClientManager, MCPClientManagerOptions, MCPClientOAuthCallbackConfig, MCPClientOAuthResult, MCPConnectionResult, MCPDiscoverResult, MCPServerOptions, RegisterServerOptions, getNamespacedData };

package/dist/mcp/client.js

@@ -1,3 +1,4 @@
-import { MCPClientManager, getNamespacedData } from "../client-WbaRgKYN.js";
+import { n as getNamespacedData, t as MCPClientManager } from "../client-QZa2Rq0l.js";
+import "../do-oauth-client-provider-B1fVIshX.js";
 
 export { MCPClientManager, getNamespacedData };

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

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

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

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

package/dist/mcp/index.d.ts

@@ -1,15 +1,142 @@
-import { BaseTransportType, MCPClientOAuthCallbackConfig, MCPClientOAuthResult, MaybePromise, SSEEdgeClientTransport, ServeOptions, StreamableHTTPEdgeClientTransport } from "../client-C-u-lCFT.js";
-import "../mcp-BEwaCsxO.js";
-import "../do-oauth-client-provider-CCwGwnrA.js";
-import "../index-W4JUkafc.js";
-import "../ai-types-BWW4umHY.js";
-import { Agent, Connection, ConnectionContext } from "../index-DWcUTPtX.js";
-import { ElicitRequest, ElicitRequestSchema, ElicitResult, ElicitResult as ElicitResult$1, JSONRPCMessage } from "@modelcontextprotocol/sdk/types.js";
+import "../context-_sPQqJWv.js";
+import { a as MCPConnectionResult, d as BaseTransportType, f as CORSOptions, i as MCPClientOAuthResult, m as ServeOptions, o as MCPDiscoverResult, p as MaybePromise, r as MCPClientOAuthCallbackConfig, s as MCPServerOptions } from "../client-Cfw92Wb_.js";
+import "../mcp-CzbSsLfc.js";
+import "../do-oauth-client-provider-B-ryFIPr.js";
+import "../index-CyDpAVHZ.js";
+import "../ai-types-U8lYA0o8.js";
+import { o as Connection, s as ConnectionContext, t as Agent } from "../index-xIS9I1YX.js";
+import { SSEClientTransport, SSEClientTransportOptions } from "@modelcontextprotocol/sdk/client/sse.js";
+import { StreamableHTTPClientTransport, StreamableHTTPClientTransportOptions } from "@modelcontextprotocol/sdk/client/streamableHttp.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, TransportSendOptions } from "@modelcontextprotocol/sdk/shared/transport.js";
 
+//#region src/mcp/client-transports.d.ts
+/**
+ * @deprecated Use SSEClientTransport from @modelcontextprotocol/sdk/client/sse.js instead. This alias will be removed in the next major version.
+ */
+declare class SSEEdgeClientTransport extends SSEClientTransport {
+  constructor(url: URL, options: SSEClientTransportOptions);
+}
+/**
+ * @deprecated Use StreamableHTTPClientTransport from @modelcontextprotocol/sdk/client/streamableHttp.js instead. This alias will be removed in the next major version.
+ */
+declare class StreamableHTTPEdgeClientTransport extends StreamableHTTPClientTransport {
+  constructor(url: URL, options: StreamableHTTPClientTransportOptions);
+}
+//#endregion
+//#region src/mcp/worker-transport.d.ts
+interface MCPStorageApi {
+  get(): Promise<TransportState | undefined> | TransportState | undefined;
+  set(state: TransportState): Promise<void> | void;
+}
+interface TransportState {
+  sessionId?: string;
+  initialized: boolean;
+}
+interface WorkerTransportOptions {
+  sessionIdGenerator?: () => string;
+  /**
+   * Enable traditional Request/Response mode, this will disable streaming.
+   */
+  enableJsonResponse?: boolean;
+  onsessioninitialized?: (sessionId: string) => void;
+  corsOptions?: CORSOptions;
+  /**
+   * Optional storage api for persisting transport state.
+   * Use this to store session state in Durable Object/Agent storage
+   * so it survives hibernation/restart.
+   */
+  storage?: MCPStorageApi;
+}
+declare class WorkerTransport implements Transport {
+  started: boolean;
+  private initialized;
+  private sessionIdGenerator?;
+  private enableJsonResponse;
+  private onsessioninitialized?;
+  private standaloneSseStreamId;
+  private streamMapping;
+  private requestToStreamMapping;
+  private requestResponseMap;
+  private corsOptions?;
+  private storage?;
+  private stateRestored;
+  sessionId?: string;
+  onclose?: () => void;
+  onerror?: (error: Error) => void;
+  onmessage?: (message: JSONRPCMessage, extra?: MessageExtraInfo) => void;
+  constructor(options?: WorkerTransportOptions);
+  /**
+   * Restore transport state from persistent storage.
+   * This is automatically called on start.
+   */
+  private restoreState;
+  /**
+   * Persist current transport state to storage.
+   */
+  private saveState;
+  start(): Promise<void>;
+  /**
+   * Validates the MCP-Protocol-Version header on incoming requests.
+   *
+   * This performs a simple check: if a version header is present, it must be
+   * in the SUPPORTED_PROTOCOL_VERSIONS list. We do not track the negotiated
+   * version or enforce version consistency across requests - the SDK handles
+   * version negotiation during initialization, and we simply reject any
+   * explicitly unsupported versions.
+   *
+   * - Header present and supported: Accept
+   * - Header present and unsupported: 400 Bad Request
+   * - Header missing: Accept (version validation is optional)
+   */
+  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, options?: TransportSendOptions): Promise<void>;
+}
+//#endregion
+//#region src/mcp/auth-context.d.ts
+interface McpAuthContext {
+  props: Record<string, unknown>;
+}
+declare function getMcpAuthContext(): McpAuthContext | undefined;
+//#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;
+  /**
+   * An optional auth context to use for handling MCP requests.
+   * If not provided, the handler will look for props in the execution context.
+   */
+  authContext?: McpAuthContext;
+  /**
+   * An optional transport to use for handling MCP requests.
+   * If not provided, a WorkerTransport will be created with the provided WorkerTransportOptions.
+   */
+  transport?: WorkerTransport;
+}
+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/index.d.ts
-declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Record<string, unknown> = Record<string, unknown>> extends Agent<Env, State, Props> {
+declare abstract class McpAgent<Env extends Cloudflare.Env = Cloudflare.Env, State = unknown, Props extends Record<string, unknown> = Record<string, unknown>> extends Agent<Env, State, Props> {
   private _transport?;
   props?: Props;
   abstract server: MaybePromise<McpServer | Server>;
@@ -27,7 +154,7 @@ declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Re
    */
   getSessionId(): string;
   /** Get the unique WebSocket. SSE transport only. */
-  private getWebSocket;
+  getWebSocket(): Connection<unknown> | null;
   /** Returns a new transport matching the type of the Agent. */
   private initTransport;
   /** Update and store the props */
@@ -40,7 +167,7 @@ declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Re
     request: req
   }: ConnectionContext): Promise<void>;
   /** Handles MCP Messages for the legacy SSE transport. */
-  onSSEMcpMessage(_sessionId: string, messageBody: unknown): Promise<Error | null>;
+  onSSEMcpMessage(_sessionId: string, messageBody: unknown, extraInfo?: MessageExtraInfo): Promise<Error | null>;
   /** Elicit user input with a message and schema */
   elicitInput(params: {
     message: string;
@@ -56,7 +183,8 @@ declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Re
   static serve(path: string, {
     binding,
     corsOptions,
-    transport
+    transport,
+    jurisdiction
   }?: ServeOptions): {
     fetch<Env>(this: void, request: Request, env: Env, ctx: ExecutionContext): Promise<Response>;
   };
@@ -71,5 +199,5 @@ declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Re
   };
 }
 //#endregion
-export { type ElicitRequest, ElicitRequestSchema, type ElicitResult, type MCPClientOAuthCallbackConfig, type MCPClientOAuthResult, McpAgent, SSEEdgeClientTransport, StreamableHTTPEdgeClientTransport };
+export { type CreateMcpHandlerOptions, type ElicitRequest, ElicitRequestSchema, type ElicitResult, type MCPClientOAuthCallbackConfig, type MCPClientOAuthResult, type MCPConnectionResult, type MCPDiscoverResult, type MCPServerOptions, McpAgent, type McpAuthContext, SSEEdgeClientTransport, StreamableHTTPEdgeClientTransport, type TransportState, WorkerTransport, type WorkerTransportOptions, createMcpHandler, experimental_createMcpHandler, getMcpAuthContext };
 //# sourceMappingURL=index.d.ts.map