agents 0.0.0-19a3a25 → 0.0.0-1a3d226

package/dist/mcp/index.js

@@ -1,12 +1,13 @@
-import { t as MessageType } from "../ai-types-B3aQaFv3.js";
-import "../client-BfiZ3HQd.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-CwIW7tU2.js";
+import "../context-BkKbAa1R.js";
+import { t as MessageType } from "../ai-types-DEtF_8Km.js";
+import "../client-DjTPRM8-.js";
+import "../client-QZa2Rq0l.js";
+import "../do-oauth-client-provider-B1fVIshX.js";
+import { c as getCurrentAgent, s as getAgentByName, t as Agent } from "../src-BZDh910Z.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";
+import { ElicitRequestSchema, InitializeRequestSchema, JSONRPCMessageSchema, SUPPORTED_PROTOCOL_VERSIONS, isInitializeRequest, isJSONRPCError, isJSONRPCNotification, isJSONRPCRequest, isJSONRPCResponse } from "@modelcontextprotocol/sdk/types.js";
 
 //#region src/mcp/utils.ts
 /**
@@ -434,7 +435,8 @@ const createLegacySseHandler = (basePath, namespace, options = {}) => {
 				jurisdiction: options.jurisdiction
 			});
 			const messageBody = await request.json();
-			const error = await agent.onSSEMcpMessage(sessionId, messageBody);
+			const extraInfo = { requestInfo: { headers: Object.fromEntries(request.headers.entries()) } };
+			const error = await agent.onSSEMcpMessage(sessionId, messageBody, extraInfo);
 			if (error) return new Response(error.message, {
 				headers: {
 					"Cache-Control": "no-cache",
@@ -478,9 +480,12 @@ function isDurableObjectNamespace(namespace) {
 //#endregion
 //#region src/mcp/transport.ts
 var McpSSETransport = class {
-	constructor(getWebSocket) {
+	constructor() {
 		this._started = false;
-		this._getWebSocket = getWebSocket;
+		const { agent } = getCurrentAgent();
+		if (!agent) throw new Error("McpAgent was not found in Transport constructor");
+		this.sessionId = agent.getSessionId();
+		this._getWebSocket = () => agent.getWebSocket();
 	}
 	async start() {
 		if (this._started) throw new Error("Transport already started");
@@ -588,19 +593,35 @@ var StreamableHTTPServerTransport = class {
 		if (Array.isArray(rawMessage)) messages = rawMessage.map((msg) => JSONRPCMessageSchema.parse(msg));
 		else messages = [JSONRPCMessageSchema.parse(rawMessage)];
 		const hasRequests = messages.some(isJSONRPCRequest);
-		if (!hasRequests) for (const message of messages) this.onmessage?.(message, {
-			authInfo,
-			requestInfo
-		});
+		if (!hasRequests) for (const message of messages) {
+			if (this.messageInterceptor) {
+				if (await this.messageInterceptor(message, {
+					authInfo,
+					requestInfo
+				})) continue;
+			}
+			this.onmessage?.(message, {
+				authInfo,
+				requestInfo
+			});
+		}
 		else if (hasRequests) {
 			const { connection } = getCurrentAgent();
 			if (!connection) throw new Error("Connection was not found in handlePostRequest");
 			const requestIds = messages.filter(isJSONRPCRequest).map((message) => message.id);
 			connection.setState({ requestIds });
-			for (const message of messages) this.onmessage?.(message, {
-				authInfo,
-				requestInfo
-			});
+			for (const message of messages) {
+				if (this.messageInterceptor) {
+					if (await this.messageInterceptor(message, {
+						authInfo,
+						requestInfo
+					})) continue;
+				}
+				this.onmessage?.(message, {
+					authInfo,
+					requestInfo
+				});
+			}
 		}
 	}
 	async close() {
@@ -641,6 +662,9 @@ var StreamableHTTPServerTransport = class {
 
 //#endregion
 //#region src/mcp/client-transports.ts
+/**
+* Deprecated transport wrappers
+*/
 let didWarnAboutSSEEdgeClientTransport = false;
 /**
 * @deprecated Use SSEClientTransport from @modelcontextprotocol/sdk/client/sse.js instead. This alias will be removed in the next major version.
@@ -670,8 +694,6 @@ var StreamableHTTPEdgeClientTransport = class extends StreamableHTTPClientTransp
 
 //#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) {
@@ -699,7 +721,6 @@ var WorkerTransport = class {
 		if (state) {
 			this.sessionId = state.sessionId;
 			this.initialized = state.initialized;
-			this.protocolVersion = state.protocolVersion;
 		}
 		this.stateRestored = true;
 	}
@@ -710,8 +731,7 @@ var WorkerTransport = class {
 		if (!this.storage) return;
 		const state = {
 			sessionId: this.sessionId,
-			initialized: this.initialized,
-			protocolVersion: this.protocolVersion
+			initialized: this.initialized
 		};
 		await Promise.resolve(this.storage.set(state));
 	}
@@ -719,44 +739,26 @@ var WorkerTransport = class {
 		if (this.started) throw new Error("Transport already started");
 		this.started = true;
 	}
+	/**
+	* 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)
+	*/
 	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({
+		const protocolVersion = request.headers.get(MCP_PROTOCOL_VERSION_HEADER);
+		if (protocolVersion !== null && !SUPPORTED_PROTOCOL_VERSIONS.includes(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}`
+				message: `Bad Request: Unsupported protocol version: ${protocolVersion} (supported versions: ${SUPPORTED_PROTOCOL_VERSIONS.join(", ")})`
 			},
 			id: null
 		}), {
@@ -861,7 +863,7 @@ var WorkerTransport = class {
 	}
 	async handlePostRequest(request, parsedBody) {
 		const acceptHeader = request.headers.get("Accept");
-		if (!acceptHeader?.includes("application/json") || !acceptHeader.includes("text/event-stream")) return new Response(JSON.stringify({
+		if (!acceptHeader?.includes("application/json") || !acceptHeader?.includes("text/event-stream")) return new Response(JSON.stringify({
 			jsonrpc: "2.0",
 			error: {
 				code: -32e3,
@@ -959,12 +961,6 @@ var WorkerTransport = class {
 					...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;
 			await this.saveState();
@@ -1101,8 +1097,8 @@ var WorkerTransport = class {
 		this.requestResponseMap.clear();
 		this.onclose?.();
 	}
-	async send(message) {
-		let requestId;
+	async send(message, options) {
+		let requestId = options?.relatedRequestId;
 		if (isJSONRPCResponse(message) || isJSONRPCError(message)) requestId = message.id;
 		if (requestId === void 0) {
 			if (isJSONRPCResponse(message) || isJSONRPCError(message)) throw new Error("Cannot send a response on a standalone SSE stream unless resuming a previous client request");
@@ -1250,8 +1246,14 @@ var McpAgent = class McpAgent extends Agent {
 	/** Returns a new transport matching the type of the Agent. */
 	initTransport() {
 		switch (this.getTransportType()) {
-			case "sse": return new McpSSETransport(() => this.getWebSocket());
-			case "streamable-http": return new StreamableHTTPServerTransport({});
+			case "sse": return new McpSSETransport();
+			case "streamable-http": {
+				const transport = new StreamableHTTPServerTransport({});
+				transport.messageInterceptor = async (message) => {
+					return this._handleElicitationResponse(message);
+				};
+				return transport;
+			}
 		}
 	}
 	/** Update and store the props */
@@ -1303,7 +1305,7 @@ var McpAgent = class McpAgent extends Agent {
 		}
 	}
 	/** Handles MCP Messages for the legacy SSE transport. */
-	async onSSEMcpMessage(_sessionId, messageBody) {
+	async onSSEMcpMessage(_sessionId, messageBody, extraInfo) {
 		if (this.getTransportType() !== "sse") return /* @__PURE__ */ new Error("Internal Server Error: Expected SSE transport");
 		try {
 			let parsedMessage;
@@ -1314,7 +1316,7 @@ var McpAgent = class McpAgent extends Agent {
 				throw error;
 			}
 			if (await this._handleElicitationResponse(parsedMessage)) return null;
-			this._transport?.onmessage?.(parsedMessage);
+			this._transport?.onmessage?.(parsedMessage, extraInfo);
 			return null;
 		} catch (error) {
 			console.error("Error forwarding message to SSE:", error);