agents 0.2.21 → 0.2.22

package/dist/mcp/index.d.ts

@@ -1,23 +1,59 @@
-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-BEMdXPYJ.js";
+import { c as MaybePromise, l as ServeOptions, n as MCPClientOAuthCallbackConfig, o as BaseTransportType, r as MCPClientOAuthResult, s as CORSOptions } from "../client-GfgZTqrS.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-BXG3v10y.js";
+import { c as ConnectionContext, s as Connection, t as Agent } from "../index-BQLBXqnQ.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";
 
+//#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
+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;
+}
+interface TransportState {
+  sessionId?: string;
+  initialized: boolean;
+  protocolVersion?: ProtocolVersion;
+}
 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 {
-  private started;
+  started: boolean;
   private initialized;
   private sessionIdGenerator?;
   private enableJsonResponse;
@@ -28,11 +64,22 @@ declare class WorkerTransport implements Transport {
   private requestResponseMap;
   private corsOptions?;
   private protocolVersion?;
+  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>;
   private validateProtocolVersion;
   private getHeaders;
@@ -47,6 +94,12 @@ declare class WorkerTransport implements Transport {
   send(message: JSONRPCMessage): 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 {
   /**
@@ -56,36 +109,22 @@ interface CreateMcpHandlerOptions extends WorkerTransportOptions {
    */
   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.
+   * An optional auth context to use for handling MCP requests.
+   * If not provided, the handler will look for props in the execution context.
    */
-  corsOptions?: CORSOptions;
+  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;
 }
-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?;
@@ -150,5 +189,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, type OAuthExecutionContext, SSEEdgeClientTransport, StreamableHTTPEdgeClientTransport, WorkerTransport, type WorkerTransportOptions, createMcpHandler, experimental_createMcpHandler, getMcpAuthContext };
+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 };
 //# sourceMappingURL=index.d.ts.map

package/dist/mcp/index.js

@@ -1,9 +1,11 @@
 import { t as MessageType } from "../ai-types-B3aQaFv3.js";
 import "../client-BfiZ3HQd.js";
-import { a as SSEEdgeClientTransport, i as StreamableHTTPEdgeClientTransport } from "../client-JMskg2fw.js";
+import "../client-DZhjV_XA.js";
 import "../do-oauth-client-provider-CswoD5Lu.js";
-import { c as getCurrentAgent, s as getAgentByName, t as Agent } from "../src-nFNV3Ttx.js";
+import { c as getCurrentAgent, s as getAgentByName, t as Agent } from "../src-CwIW7tU2.js";
 import { AsyncLocalStorage } from "node:async_hooks";
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { ElicitRequestSchema, InitializeRequestSchema, JSONRPCMessageSchema, isInitializeRequest, isJSONRPCError, isJSONRPCNotification, isJSONRPCRequest, isJSONRPCResponse } from "@modelcontextprotocol/sdk/types.js";
 
 //#region src/mcp/utils.ts
@@ -637,6 +639,35 @@ var StreamableHTTPServerTransport = class {
 	}
 };
 
+//#endregion
+//#region src/mcp/client-transports.ts
+let didWarnAboutSSEEdgeClientTransport = false;
+/**
+* @deprecated Use SSEClientTransport from @modelcontextprotocol/sdk/client/sse.js instead. This alias will be removed in the next major version.
+*/
+var SSEEdgeClientTransport = class extends SSEClientTransport {
+	constructor(url, options) {
+		super(url, options);
+		if (!didWarnAboutSSEEdgeClientTransport) {
+			didWarnAboutSSEEdgeClientTransport = true;
+			console.warn("SSEEdgeClientTransport is deprecated. Use SSEClientTransport from @modelcontextprotocol/sdk/client/sse.js instead. SSEEdgeClientTransport will be removed in the next major version.");
+		}
+	}
+};
+let didWarnAboutStreamableHTTPEdgeClientTransport = false;
+/**
+* @deprecated Use StreamableHTTPClientTransport from @modelcontextprotocol/sdk/client/streamableHttp.js instead. This alias will be removed in the next major version.
+*/
+var StreamableHTTPEdgeClientTransport = class extends StreamableHTTPClientTransport {
+	constructor(url, options) {
+		super(url, options);
+		if (!didWarnAboutStreamableHTTPEdgeClientTransport) {
+			didWarnAboutStreamableHTTPEdgeClientTransport = true;
+			console.warn("StreamableHTTPEdgeClientTransport is deprecated. Use StreamableHTTPClientTransport from @modelcontextprotocol/sdk/client/streamableHttp.js instead. StreamableHTTPEdgeClientTransport will be removed in the next major version.");
+		}
+	}
+};
+
 //#endregion
 //#region src/mcp/worker-transport.ts
 const SUPPORTED_PROTOCOL_VERSIONS = ["2025-03-26", "2025-06-18"];
@@ -651,10 +682,38 @@ var WorkerTransport = class {
 		this.streamMapping = /* @__PURE__ */ new Map();
 		this.requestToStreamMapping = /* @__PURE__ */ new Map();
 		this.requestResponseMap = /* @__PURE__ */ new Map();
+		this.stateRestored = false;
 		this.sessionIdGenerator = options?.sessionIdGenerator;
 		this.enableJsonResponse = options?.enableJsonResponse ?? false;
 		this.onsessioninitialized = options?.onsessioninitialized;
 		this.corsOptions = options?.corsOptions;
+		this.storage = options?.storage;
+	}
+	/**
+	* Restore transport state from persistent storage.
+	* This is automatically called on start.
+	*/
+	async restoreState() {
+		if (!this.storage || this.stateRestored) return;
+		const state = await Promise.resolve(this.storage.get());
+		if (state) {
+			this.sessionId = state.sessionId;
+			this.initialized = state.initialized;
+			this.protocolVersion = state.protocolVersion;
+		}
+		this.stateRestored = true;
+	}
+	/**
+	* Persist current transport state to storage.
+	*/
+	async saveState() {
+		if (!this.storage) return;
+		const state = {
+			sessionId: this.sessionId,
+			initialized: this.initialized,
+			protocolVersion: this.protocolVersion
+		};
+		await Promise.resolve(this.storage.set(state));
 	}
 	async start() {
 		if (this.started) throw new Error("Transport already started");
@@ -729,6 +788,7 @@ var WorkerTransport = class {
 		};
 	}
 	async handleRequest(request, parsedBody) {
+		await this.restoreState();
 		switch (request.method) {
 			case "OPTIONS": return this.handleOptionsRequest(request);
 			case "GET": return this.handleGetRequest(request);
@@ -907,6 +967,7 @@ var WorkerTransport = class {
 			}
 			this.sessionId = this.sessionIdGenerator?.();
 			this.initialized = true;
+			await this.saveState();
 			if (this.sessionId && this.onsessioninitialized) this.onsessioninitialized(this.sessionId);
 		}
 		if (!isInitializationRequest) {
@@ -1103,13 +1164,22 @@ function createMcpHandler(server, options = {}) {
 	return async (request, _env, ctx) => {
 		const url = new URL(request.url);
 		if (route && url.pathname !== route) return new Response("Not Found", { status: 404 });
-		const oauthCtx = ctx;
-		const authContext = oauthCtx.props ? { props: oauthCtx.props } : void 0;
-		const transport = new WorkerTransport(options);
-		await server.connect(transport);
+		const transport = options.transport ?? new WorkerTransport({
+			sessionIdGenerator: options.sessionIdGenerator,
+			enableJsonResponse: options.enableJsonResponse,
+			onsessioninitialized: options.onsessioninitialized,
+			corsOptions: options.corsOptions,
+			storage: options.storage
+		});
+		const buildAuthContext = () => {
+			if (options.authContext) return options.authContext;
+			if (ctx.props && Object.keys(ctx.props).length > 0) return { props: ctx.props };
+		};
 		const handleRequest = async () => {
 			return await transport.handleRequest(request);
 		};
+		const authContext = buildAuthContext();
+		if (!transport.started) await server.connect(transport);
 		try {
 			if (authContext) return await runWithAuthContext(authContext, handleRequest);
 			else return await handleRequest();