agents 0.0.0-19a3a25 → 0.0.0-1a3d226

package/dist/{index-CuqiHyhT.d.ts → index-CfZ2mfMI.d.ts}

@@ -1,10 +1,11 @@
+import { n as AgentEmail } from "./context-DcbQ8o7k.js";
 import {
-  a as MCPConnectionState,
+  h as TransportType,
   t as MCPClientManager,
-  u as TransportType
-} from "./client-BnO9jNtu.js";
-import { t as Observability } from "./index-DhJCaDWd.js";
-import { n as MessageType } from "./ai-types-D5YoPrBZ.js";
+  u as MCPConnectionState
+} from "./client-BINtT7y-.js";
+import { t as Observability } from "./index-DLuxm_9W.js";
+import { n as MessageType } from "./ai-types-0OnT3FHg.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,13 +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 _mcpStateRestored;
+  private _destroyed;
   private _ParentClass;
   readonly mcp: MCPClientManager;
   /**
@@ -325,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;
@@ -347,7 +353,6 @@ declare class Agent<
    * @returns A map of method names to their metadata
    */
   private _isCallable;
-  private _ensureMcpStateRestored;
   /**
    * Connect to a new MCP Server
    *
@@ -356,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,
@@ -370,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
@@ -390,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
@@ -457,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;
@@ -493,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>,
@@ -526,35 +543,34 @@ declare class StreamingResponse {
 }
 //#endregion
 export {
-  unstable_callable as A,
-  createAddressBasedEmailResolver as C,
-  getCurrentAgent as D,
-  getAgentByName as E,
-  routeAgentEmail as O,
-  callable as S,
-  createHeaderBasedEmailResolver as T,
-  RPCResponse as _,
-  AgentOptions as a,
-  StreamingResponse as b,
-  ConnectionContext as c,
-  EmailSendOptions as d,
-  MCPServer as f,
-  RPCRequest as g,
-  QueueItem as h,
-  AgentNamespace as i,
-  routeAgentRequest as k,
-  EmailResolver as l,
-  MCPServersState as m,
+  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,
-  CallableMetadata as o,
-  MCPServerMessage as p,
-  AgentEmail as r,
-  Connection$1 as s,
+  Connection$1 as o,
+  MCPServersState as p,
+  AgentNamespace as r,
+  ConnectionContext as s,
   Agent as t,
-  EmailRoutingOptions as u,
-  Schedule as v,
-  createCatchAllEmailResolver as w,
-  WSMessage as x,
-  StateUpdateMessage as y
+  EmailSendOptions as u,
+  StateUpdateMessage as v,
+  createHeaderBasedEmailResolver as w,
+  callable as x,
+  StreamingResponse as y
 };
-//# sourceMappingURL=index-CuqiHyhT.d.ts.map
+//# sourceMappingURL=index-CfZ2mfMI.d.ts.map

package/dist/{index-DhJCaDWd.d.ts → index-DLuxm_9W.d.ts}

@@ -1,4 +1,4 @@
-import { n as BaseEvent, t as MCPObservabilityEvent } from "./mcp-Dw5vDrY8.js";
+import { n as BaseEvent, t as MCPObservabilityEvent } from "./mcp-CPSfGUgd.js";
 
 //#region src/observability/agent.d.ts
 
@@ -55,4 +55,4 @@ export {
   genericObservability as r,
   Observability as t
 };
-//# sourceMappingURL=index-DhJCaDWd.d.ts.map
+//# sourceMappingURL=index-DLuxm_9W.d.ts.map

package/dist/index.d.ts

@@ -1,40 +1,37 @@
-import { u as TransportType } from "./client-BnO9jNtu.js";
-import "./mcp-Dw5vDrY8.js";
-import "./do-oauth-client-provider-DGc5pP0l.js";
-import "./index-DhJCaDWd.js";
-import "./ai-types-D5YoPrBZ.js";
+import { n as AgentEmail } from "./context-DcbQ8o7k.js";
+import { h as TransportType } from "./client-BINtT7y-.js";
+import "./ai-types-0OnT3FHg.js";
 import {
-  A as unstable_callable,
-  C as createAddressBasedEmailResolver,
-  D as getCurrentAgent,
-  E as getAgentByName,
-  O as routeAgentEmail,
-  S as callable,
-  T as createHeaderBasedEmailResolver,
-  _ as RPCResponse,
-  a as AgentOptions,
-  b as StreamingResponse,
-  c as ConnectionContext,
-  d as EmailSendOptions,
-  f as MCPServer,
-  g as RPCRequest,
-  h as QueueItem,
-  i as AgentNamespace,
-  k as routeAgentRequest,
-  l as EmailResolver,
-  m as MCPServersState,
+  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 CallableMetadata,
-  p as MCPServerMessage,
-  r as AgentEmail,
-  s as Connection,
+  o as Connection,
+  p as MCPServersState,
+  r as AgentNamespace,
+  s as ConnectionContext,
   t as Agent,
-  u as EmailRoutingOptions,
-  v as Schedule,
-  w as createCatchAllEmailResolver,
-  x as WSMessage,
-  y as StateUpdateMessage
-} from "./index-CuqiHyhT.js";
+  u as EmailSendOptions,
+  v as StateUpdateMessage,
+  w as createHeaderBasedEmailResolver,
+  x as callable,
+  y as StreamingResponse
+} from "./index-CfZ2mfMI.js";
 export {
   Agent,
   AgentContext,

package/dist/index.js

@@ -1,7 +1,7 @@
-import "./ai-types-B3aQaFv3.js";
-import "./client-BfiZ3HQd.js";
-import "./client-DZhjV_XA.js";
-import "./do-oauth-client-provider-CswoD5Lu.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-CwIW7tU2.js";
+import "./context-BkKbAa1R.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,2 @@
-import { i as getNamespacedData, n as MCPClientOAuthCallbackConfig, r as MCPClientOAuthResult, t as MCPClientManager } from "../client-BnO9jNtu.js";
-import "../mcp-Dw5vDrY8.js";
-import "../do-oauth-client-provider-DGc5pP0l.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-BINtT7y-.js";
+export { MCPClientManager, MCPClientManagerOptions, MCPClientOAuthCallbackConfig, MCPClientOAuthResult, MCPConnectionResult, MCPDiscoverResult, MCPServerOptions, RegisterServerOptions, getNamespacedData };

package/dist/mcp/client.js

@@ -1,3 +1,4 @@
-import { n as getNamespacedData, t as MCPClientManager } from "../client-DZhjV_XA.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 { n as DurableObjectOAuthClientProvider, t as AgentsOAuthProvider } from "../do-oauth-client-provider-DGc5pP0l.js";
+import { n as DurableObjectOAuthClientProvider, t as AgentsOAuthProvider } from "../do-oauth-client-provider--To1Tsjj.js";
 export { AgentsOAuthProvider, DurableObjectOAuthClientProvider };

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

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

package/dist/mcp/index.d.ts

@@ -1,15 +1,13 @@
-import { c as MaybePromise, l as ServeOptions, n as MCPClientOAuthCallbackConfig, o as BaseTransportType, r as MCPClientOAuthResult, s as CORSOptions } from "../client-BnO9jNtu.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-CuqiHyhT.js";
+import "../context-DcbQ8o7k.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-BINtT7y-.js";
+import "../ai-types-0OnT3FHg.js";
+import { o as Connection, s as ConnectionContext, t as Agent } from "../index-CfZ2mfMI.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 } from "@modelcontextprotocol/sdk/shared/transport.js";
+import { Transport, TransportSendOptions } from "@modelcontextprotocol/sdk/shared/transport.js";
 
 //#region src/mcp/client-transports.d.ts
 /**
@@ -26,8 +24,6 @@ declare class StreamableHTTPEdgeClientTransport extends StreamableHTTPClientTran
 }
 //#endregion
 //#region src/mcp/worker-transport.d.ts
-declare const SUPPORTED_PROTOCOL_VERSIONS: readonly ["2025-03-26", "2025-06-18"];
-type ProtocolVersion = (typeof SUPPORTED_PROTOCOL_VERSIONS)[number];
 interface MCPStorageApi {
   get(): Promise<TransportState | undefined> | TransportState | undefined;
   set(state: TransportState): Promise<void> | void;
@@ -35,7 +31,6 @@ interface MCPStorageApi {
 interface TransportState {
   sessionId?: string;
   initialized: boolean;
-  protocolVersion?: ProtocolVersion;
 }
 interface WorkerTransportOptions {
   sessionIdGenerator?: () => string;
@@ -63,7 +58,6 @@ declare class WorkerTransport implements Transport {
   private requestToStreamMapping;
   private requestResponseMap;
   private corsOptions?;
-  private protocolVersion?;
   private storage?;
   private stateRestored;
   sessionId?: string;
@@ -81,6 +75,19 @@ declare class WorkerTransport implements Transport {
    */
   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>;
@@ -91,7 +98,7 @@ declare class WorkerTransport implements Transport {
   private handleUnsupportedRequest;
   private validateSession;
   close(): Promise<void>;
-  send(message: JSONRPCMessage): Promise<void>;
+  send(message: JSONRPCMessage, options?: TransportSendOptions): Promise<void>;
 }
 //#endregion
 //#region src/mcp/auth-context.d.ts
@@ -126,7 +133,7 @@ declare function createMcpHandler(server: McpServer | Server, options?: CreateMc
 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>;
@@ -144,7 +151,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 */
@@ -157,7 +164,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;
@@ -189,5 +196,5 @@ declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Re
   };
 }
 //#endregion
-export { type CreateMcpHandlerOptions, type ElicitRequest, ElicitRequestSchema, type ElicitResult, type MCPClientOAuthCallbackConfig, type MCPClientOAuthResult, McpAgent, type McpAuthContext, SSEEdgeClientTransport, StreamableHTTPEdgeClientTransport, type TransportState, WorkerTransport, type WorkerTransportOptions, createMcpHandler, experimental_createMcpHandler, getMcpAuthContext };
+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