agents 0.2.16 → 0.2.18

package/dist/mcp/index.js

@@ -1,8 +1,8 @@
 import { t as MessageType } from "../ai-types-B3aQaFv3.js";
 import "../client-BfiZ3HQd.js";
-import { i as SSEEdgeClientTransport, r as StreamableHTTPEdgeClientTransport } from "../client-CIvp_OWw.js";
+import { a as SSEEdgeClientTransport, i as StreamableHTTPEdgeClientTransport } from "../client-9Ld2_lnt.js";
 import "../do-oauth-client-provider-CswoD5Lu.js";
-import { c as getCurrentAgent, s as getAgentByName, t as Agent } from "../src-CTtjSFyX.js";
+import { c as getCurrentAgent, s as getAgentByName, t as Agent } from "../src-Dz0H9hSU.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { ElicitRequestSchema, InitializeRequestSchema, JSONRPCMessageSchema, isInitializeRequest, isJSONRPCError, isJSONRPCNotification, isJSONRPCRequest, isJSONRPCResponse } from "@modelcontextprotocol/sdk/types.js";
 
@@ -627,6 +627,9 @@ var StreamableHTTPServerTransport = class {
 
 //#endregion
 //#region src/mcp/worker-transport.ts
+const SUPPORTED_PROTOCOL_VERSIONS = ["2025-03-26", "2025-06-18"];
+const DEFAULT_PROTOCOL_VERSION = "2025-03-26";
+const MCP_PROTOCOL_VERSION_HEADER = "MCP-Protocol-Version";
 var WorkerTransport = class {
 	constructor(options) {
 		this.started = false;
@@ -639,11 +642,80 @@ var WorkerTransport = class {
 		this.sessionIdGenerator = options?.sessionIdGenerator;
 		this.enableJsonResponse = options?.enableJsonResponse ?? false;
 		this.onsessioninitialized = options?.onsessioninitialized;
+		this.corsOptions = options?.corsOptions;
 	}
 	async start() {
 		if (this.started) throw new Error("Transport already started");
 		this.started = true;
 	}
+	validateProtocolVersion(request) {
+		const versionHeader = request.headers.get(MCP_PROTOCOL_VERSION_HEADER);
+		if (!versionHeader) {
+			if (!this.protocolVersion || this.protocolVersion === DEFAULT_PROTOCOL_VERSION) return;
+			return new Response(JSON.stringify({
+				jsonrpc: "2.0",
+				error: {
+					code: -32e3,
+					message: `Bad Request: ${MCP_PROTOCOL_VERSION_HEADER} header is required`
+				},
+				id: null
+			}), {
+				status: 400,
+				headers: {
+					"Content-Type": "application/json",
+					...this.getHeaders()
+				}
+			});
+		}
+		if (!SUPPORTED_PROTOCOL_VERSIONS.includes(versionHeader)) return new Response(JSON.stringify({
+			jsonrpc: "2.0",
+			error: {
+				code: -32e3,
+				message: `Bad Request: Unsupported ${MCP_PROTOCOL_VERSION_HEADER}: ${versionHeader}. Supported versions: ${SUPPORTED_PROTOCOL_VERSIONS.join(", ")}`
+			},
+			id: null
+		}), {
+			status: 400,
+			headers: {
+				"Content-Type": "application/json",
+				...this.getHeaders()
+			}
+		});
+		if (this.protocolVersion && versionHeader !== this.protocolVersion) return new Response(JSON.stringify({
+			jsonrpc: "2.0",
+			error: {
+				code: -32e3,
+				message: `Bad Request: ${MCP_PROTOCOL_VERSION_HEADER} mismatch. Expected: ${this.protocolVersion}, Got: ${versionHeader}`
+			},
+			id: null
+		}), {
+			status: 400,
+			headers: {
+				"Content-Type": "application/json",
+				...this.getHeaders()
+			}
+		});
+	}
+	getHeaders({ forPreflight } = {}) {
+		const options = {
+			origin: "*",
+			headers: "Content-Type, Accept, Authorization, mcp-session-id, MCP-Protocol-Version",
+			methods: "GET, POST, DELETE, OPTIONS",
+			exposeHeaders: "mcp-session-id",
+			maxAge: 86400,
+			...this.corsOptions
+		};
+		if (forPreflight) return {
+			"Access-Control-Allow-Origin": options.origin,
+			"Access-Control-Allow-Headers": options.headers,
+			"Access-Control-Allow-Methods": options.methods,
+			"Access-Control-Max-Age": options.maxAge.toString()
+		};
+		return {
+			"Access-Control-Allow-Origin": options.origin,
+			"Access-Control-Expose-Headers": options.exposeHeaders
+		};
+	}
 	async handleRequest(request, parsedBody) {
 		switch (request.method) {
 			case "OPTIONS": return this.handleOptionsRequest(request);
@@ -663,10 +735,15 @@ var WorkerTransport = class {
 			id: null
 		}), {
 			status: 406,
-			headers: { "Content-Type": "application/json" }
+			headers: {
+				"Content-Type": "application/json",
+				...this.getHeaders()
+			}
 		});
-		const sessionValid = this.validateSession(request);
-		if (sessionValid !== true) return sessionValid;
+		const sessionError = this.validateSession(request);
+		if (sessionError) return sessionError;
+		const versionError = this.validateProtocolVersion(request);
+		if (versionError) return versionError;
 		const streamId = this.standaloneSseStreamId;
 		if (this.streamMapping.get(streamId) !== void 0) return new Response(JSON.stringify({
 			jsonrpc: "2.0",
@@ -677,7 +754,10 @@ var WorkerTransport = class {
 			id: null
 		}), {
 			status: 409,
-			headers: { "Content-Type": "application/json" }
+			headers: {
+				"Content-Type": "application/json",
+				...this.getHeaders()
+			}
 		});
 		const { readable, writable } = new TransformStream();
 		const writer = writable.getWriter();
@@ -686,8 +766,7 @@ var WorkerTransport = class {
 			"Content-Type": "text/event-stream",
 			"Cache-Control": "no-cache",
 			Connection: "keep-alive",
-			"Access-Control-Allow-Origin": "*",
-			"Access-Control-Expose-Headers": "mcp-session-id"
+			...this.getHeaders()
 		});
 		if (this.sessionId !== void 0) headers.set("mcp-session-id", this.sessionId);
 		const keepAlive = setInterval(() => {
@@ -719,7 +798,10 @@ var WorkerTransport = class {
 			id: null
 		}), {
 			status: 406,
-			headers: { "Content-Type": "application/json" }
+			headers: {
+				"Content-Type": "application/json",
+				...this.getHeaders()
+			}
 		});
 		if (!request.headers.get("Content-Type")?.includes("application/json")) return new Response(JSON.stringify({
 			jsonrpc: "2.0",
@@ -730,7 +812,10 @@ var WorkerTransport = class {
 			id: null
 		}), {
 			status: 415,
-			headers: { "Content-Type": "application/json" }
+			headers: {
+				"Content-Type": "application/json",
+				...this.getHeaders()
+			}
 		});
 		let rawMessage = parsedBody;
 		if (rawMessage === void 0) try {
@@ -745,7 +830,10 @@ var WorkerTransport = class {
 				id: null
 			}), {
 				status: 400,
-				headers: { "Content-Type": "application/json" }
+				headers: {
+					"Content-Type": "application/json",
+					...this.getHeaders()
+				}
 			});
 		}
 		let messages;
@@ -762,7 +850,10 @@ var WorkerTransport = class {
 				id: null
 			}), {
 				status: 400,
-				headers: { "Content-Type": "application/json" }
+				headers: {
+					"Content-Type": "application/json",
+					...this.getHeaders()
+				}
 			});
 		}
 		const isInitializationRequest = messages.some(isInitializeRequest);
@@ -776,7 +867,10 @@ var WorkerTransport = class {
 				id: null
 			}), {
 				status: 400,
-				headers: { "Content-Type": "application/json" }
+				headers: {
+					"Content-Type": "application/json",
+					...this.getHeaders()
+				}
 			});
 			if (messages.length > 1) return new Response(JSON.stringify({
 				jsonrpc: "2.0",
@@ -787,21 +881,32 @@ var WorkerTransport = class {
 				id: null
 			}), {
 				status: 400,
-				headers: { "Content-Type": "application/json" }
+				headers: {
+					"Content-Type": "application/json",
+					...this.getHeaders()
+				}
 			});
+			const initRequest = messages.find(isInitializeRequest);
+			if (initRequest?.params) {
+				const version = initRequest.params.protocolVersion;
+				if (version && SUPPORTED_PROTOCOL_VERSIONS.includes(version)) this.protocolVersion = version;
+				else this.protocolVersion = DEFAULT_PROTOCOL_VERSION;
+			}
 			this.sessionId = this.sessionIdGenerator?.();
 			this.initialized = true;
 			if (this.sessionId && this.onsessioninitialized) this.onsessioninitialized(this.sessionId);
 		}
 		if (!isInitializationRequest) {
-			const sessionValid = this.validateSession(request);
-			if (sessionValid !== true) return sessionValid;
+			const sessionError = this.validateSession(request);
+			if (sessionError) return sessionError;
+			const versionError = this.validateProtocolVersion(request);
+			if (versionError) return versionError;
 		}
 		if (!messages.some(isJSONRPCRequest)) {
 			for (const message of messages) this.onmessage?.(message);
 			return new Response(null, {
 				status: 202,
-				headers: { "Access-Control-Allow-Origin": "*" }
+				headers: { ...this.getHeaders() }
 			});
 		}
 		const streamId = crypto.randomUUID();
@@ -822,8 +927,7 @@ var WorkerTransport = class {
 			"Content-Type": "text/event-stream",
 			"Cache-Control": "no-cache",
 			Connection: "keep-alive",
-			"Access-Control-Allow-Origin": "*",
-			"Access-Control-Expose-Headers": "mcp-session-id"
+			...this.getHeaders()
 		});
 		if (this.sessionId !== void 0) headers.set("mcp-session-id", this.sessionId);
 		this.streamMapping.set(streamId, {
@@ -839,24 +943,20 @@ var WorkerTransport = class {
 		return new Response(readable, { headers });
 	}
 	async handleDeleteRequest(request) {
-		const sessionValid = this.validateSession(request);
-		if (sessionValid !== true) return sessionValid;
+		const sessionError = this.validateSession(request);
+		if (sessionError) return sessionError;
+		const versionError = this.validateProtocolVersion(request);
+		if (versionError) return versionError;
 		await this.close();
 		return new Response(null, {
 			status: 200,
-			headers: { "Access-Control-Allow-Origin": "*" }
+			headers: { ...this.getHeaders() }
 		});
 	}
 	handleOptionsRequest(_request) {
-		const headers = new Headers({
-			"Access-Control-Allow-Origin": "*",
-			"Access-Control-Allow-Methods": "GET, POST, DELETE, OPTIONS",
-			"Access-Control-Allow-Headers": "Content-Type, Accept, Authorization, mcp-session-id",
-			"Access-Control-Max-Age": "86400"
-		});
 		return new Response(null, {
-			status: 204,
-			headers
+			status: 200,
+			headers: { ...this.getHeaders({ forPreflight: true }) }
 		});
 	}
 	handleUnsupportedRequest() {
@@ -876,7 +976,7 @@ var WorkerTransport = class {
 		});
 	}
 	validateSession(request) {
-		if (this.sessionIdGenerator === void 0) return true;
+		if (this.sessionIdGenerator === void 0) return;
 		if (!this.initialized) return new Response(JSON.stringify({
 			jsonrpc: "2.0",
 			error: {
@@ -886,7 +986,10 @@ var WorkerTransport = class {
 			id: null
 		}), {
 			status: 400,
-			headers: { "Content-Type": "application/json" }
+			headers: {
+				"Content-Type": "application/json",
+				...this.getHeaders()
+			}
 		});
 		const sessionId = request.headers.get("mcp-session-id");
 		if (!sessionId) return new Response(JSON.stringify({
@@ -898,7 +1001,10 @@ var WorkerTransport = class {
 			id: null
 		}), {
 			status: 400,
-			headers: { "Content-Type": "application/json" }
+			headers: {
+				"Content-Type": "application/json",
+				...this.getHeaders()
+			}
 		});
 		if (sessionId !== this.sessionId) return new Response(JSON.stringify({
 			jsonrpc: "2.0",
@@ -909,9 +1015,11 @@ var WorkerTransport = class {
 			id: null
 		}), {
 			status: 404,
-			headers: { "Content-Type": "application/json" }
+			headers: {
+				"Content-Type": "application/json",
+				...this.getHeaders()
+			}
 		});
-		return true;
 	}
 	async close() {
 		for (const { cleanup } of this.streamMapping.values()) cleanup();
@@ -950,8 +1058,7 @@ var WorkerTransport = class {
 					const responses = relatedIds.map((id) => this.requestResponseMap.get(id));
 					const headers = new Headers({
 						"Content-Type": "application/json",
-						"Access-Control-Allow-Origin": "*",
-						"Access-Control-Expose-Headers": "mcp-session-id"
+						...this.getHeaders()
 					});
 					if (this.sessionId !== void 0) headers.set("mcp-session-id", this.sessionId);
 					const body = responses.length === 1 ? responses[0] : responses;
@@ -978,7 +1085,7 @@ function runWithAuthContext(context, fn) {
 
 //#endregion
 //#region src/mcp/handler.ts
-function experimental_createMcpHandler(server, options = {}) {
+function createMcpHandler(server, options = {}) {
 	const route = options.route ?? "/mcp";
 	return async (request, _env, ctx) => {
 		const url = new URL(request.url);
@@ -991,10 +1098,8 @@ function experimental_createMcpHandler(server, options = {}) {
 			return await transport.handleRequest(request);
 		};
 		try {
-			let response;
-			if (authContext) response = await runWithAuthContext(authContext, handleRequest);
-			else response = await handleRequest();
-			return response;
+			if (authContext) return await runWithAuthContext(authContext, handleRequest);
+			else return await handleRequest();
 		} catch (error) {
 			console.error("MCP handler error:", error);
 			return new Response(JSON.stringify({
@@ -1011,6 +1116,17 @@ function experimental_createMcpHandler(server, options = {}) {
 		}
 	};
 }
+let didWarnAboutExperimentalCreateMcpHandler = false;
+/**
+* @deprecated This has been renamed to createMcpHandler, and experimental_createMcpHandler will be removed in the next major version
+*/
+function experimental_createMcpHandler(server, options = {}) {
+	if (!didWarnAboutExperimentalCreateMcpHandler) {
+		didWarnAboutExperimentalCreateMcpHandler = true;
+		console.warn("experimental_createMcpHandler is deprecated, use createMcpHandler instead. experimental_createMcpHandler will be removed in the next major version.");
+	}
+	return createMcpHandler(server, options);
+}
 
 //#endregion
 //#region src/mcp/index.ts
@@ -1231,5 +1347,5 @@ var McpAgent = class McpAgent extends Agent {
 };
 
 //#endregion
-export { ElicitRequestSchema, McpAgent, SSEEdgeClientTransport, StreamableHTTPEdgeClientTransport, WorkerTransport, experimental_createMcpHandler, getMcpAuthContext };
+export { ElicitRequestSchema, McpAgent, SSEEdgeClientTransport, StreamableHTTPEdgeClientTransport, WorkerTransport, createMcpHandler, experimental_createMcpHandler, getMcpAuthContext };
 //# sourceMappingURL=index.js.map