agents 0.0.0-d7a460e → 0.0.0-da2bb57

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-9Ld2_lnt.js";
-import "../do-oauth-client-provider-CswoD5Lu.js";
-import { c as getCurrentAgent, s as getAgentByName, t as Agent } from "../src-Dz0H9hSU.js";
+import { t as MessageType } from "../ai-types-CrMqkwc_.js";
+import "../client-B3SR12TQ.js";
+import "../client-BZq9qau2.js";
+import "../do-oauth-client-provider-CwqK5SXm.js";
+import { c as getCurrentAgent, s as getAgentByName, t as Agent } from "../src-D_KKH_4c.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
@@ -432,7 +434,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",
@@ -476,9 +479,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");
@@ -637,6 +643,38 @@ 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.
+*/
+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 +689,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 +795,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);
@@ -801,7 +868,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,
@@ -868,6 +935,7 @@ var WorkerTransport = class {
 				}
 			});
 		}
+		const requestInfo = { headers: Object.fromEntries(request.headers.entries()) };
 		const isInitializationRequest = messages.some(isInitializeRequest);
 		if (isInitializationRequest) {
 			if (this.initialized && this.sessionId !== void 0) return new Response(JSON.stringify({
@@ -906,6 +974,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) {
@@ -915,7 +984,7 @@ var WorkerTransport = class {
 			if (versionError) return versionError;
 		}
 		if (!messages.some(isJSONRPCRequest)) {
-			for (const message of messages) this.onmessage?.(message);
+			for (const message of messages) this.onmessage?.(message, { requestInfo });
 			return new Response(null, {
 				status: 202,
 				headers: { ...this.getHeaders() }
@@ -930,7 +999,7 @@ var WorkerTransport = class {
 				}
 			});
 			for (const message of messages) if (isJSONRPCRequest(message)) this.requestToStreamMapping.set(message.id, streamId);
-			for (const message of messages) this.onmessage?.(message);
+			for (const message of messages) this.onmessage?.(message, { requestInfo });
 		});
 		const { readable, writable } = new TransformStream();
 		const writer = writable.getWriter();
@@ -951,7 +1020,7 @@ var WorkerTransport = class {
 			}
 		});
 		for (const message of messages) if (isJSONRPCRequest(message)) this.requestToStreamMapping.set(message.id, streamId);
-		for (const message of messages) this.onmessage?.(message);
+		for (const message of messages) this.onmessage?.(message, { requestInfo });
 		return new Response(readable, { headers });
 	}
 	async handleDeleteRequest(request) {
@@ -1039,8 +1108,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");
@@ -1102,13 +1171,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();
@@ -1179,7 +1257,7 @@ 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 "sse": return new McpSSETransport();
 			case "streamable-http": return new StreamableHTTPServerTransport({});
 		}
 	}
@@ -1232,7 +1310,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;
@@ -1243,7 +1321,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);