agents 0.3.4 → 0.3.5

package/dist/mcp/index.js

@@ -1,13 +1,13 @@
 import { t as MessageType } from "../types-4b5tlB0u.js";
 import "../client-CEO0P7vN.js";
 import "../internal_context-oN047Id3.js";
-import "../client-C7SOlYfK.js";
+import "../client-0lfEZpSQ.js";
 import "../do-oauth-client-provider-BfPFgQU0.js";
-import { c as getAgentByName, l as getCurrentAgent, t as Agent } from "../src-BRXU0m-N.js";
+import { c as getAgentByName, l as getCurrentAgent, t as Agent } from "../src-C_iKczoR.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, SUPPORTED_PROTOCOL_VERSIONS, isInitializeRequest, isJSONRPCError, isJSONRPCNotification, isJSONRPCRequest, isJSONRPCResponse } from "@modelcontextprotocol/sdk/types.js";
+import { ElicitRequestSchema, InitializeRequestSchema, JSONRPCMessageSchema, SUPPORTED_PROTOCOL_VERSIONS, isInitializeRequest, isJSONRPCErrorResponse, isJSONRPCNotification, isJSONRPCRequest, isJSONRPCResultResponse } from "@modelcontextprotocol/sdk/types.js";
 
 //#region src/mcp/utils.ts
 /**
@@ -208,7 +208,7 @@ const createStreamingHttpHandler = (basePath, namespace, options = {}) => {
 					}
 					onClose().catch(console.error);
 				});
-				if (messages.every((msg) => isJSONRPCNotification(msg) || isJSONRPCResponse(msg))) {
+				if (messages.every((msg) => isJSONRPCNotification(msg) || isJSONRPCResultResponse(msg))) {
 					ws.close();
 					return new Response(null, {
 						headers: corsHeaders(request, options.corsOptions),
@@ -634,9 +634,9 @@ var StreamableHTTPServerTransport = class {
 		const { agent } = getCurrentAgent();
 		if (!agent) throw new Error("Agent was not found in send");
 		let requestId = options?.relatedRequestId;
-		if (isJSONRPCResponse(message) || isJSONRPCError(message)) requestId = message.id;
+		if (isJSONRPCResultResponse(message) || isJSONRPCErrorResponse(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");
+			if (isJSONRPCResultResponse(message) || isJSONRPCErrorResponse(message)) throw new Error("Cannot send a response on a standalone SSE stream unless resuming a previous client request");
 			let standaloneConnection;
 			for (const conn of agent.getConnections()) if (conn.state?._standaloneSse) standaloneConnection = conn;
 			if (standaloneConnection === void 0) return;
@@ -650,7 +650,7 @@ var StreamableHTTPServerTransport = class {
 		let eventId;
 		if (this._eventStore) eventId = await this._eventStore.storeEvent(connection.id, message);
 		let shouldClose = false;
-		if (isJSONRPCResponse(message) || isJSONRPCError(message)) {
+		if (isJSONRPCResultResponse(message) || isJSONRPCErrorResponse(message)) {
 			this._requestResponseMap.set(requestId, message);
 			const relatedIds = connection.state?.requestIds ?? [];
 			shouldClose = relatedIds.every((id) => this._requestResponseMap.has(id));
@@ -708,8 +708,11 @@ var WorkerTransport = class {
 		this.sessionIdGenerator = options?.sessionIdGenerator;
 		this.enableJsonResponse = options?.enableJsonResponse ?? false;
 		this.onsessioninitialized = options?.onsessioninitialized;
+		this.onsessionclosed = options?.onsessionclosed;
 		this.corsOptions = options?.corsOptions;
 		this.storage = options?.storage;
+		this.eventStore = options?.eventStore;
+		this.retryInterval = options?.retryInterval;
 	}
 	/**
 	* Restore transport state from persistent storage.
@@ -818,7 +821,12 @@ var WorkerTransport = class {
 		if (sessionError) return sessionError;
 		const versionError = this.validateProtocolVersion(request);
 		if (versionError) return versionError;
-		const streamId = this.standaloneSseStreamId;
+		let streamId = this.standaloneSseStreamId;
+		const lastEventId = request.headers.get("Last-Event-ID");
+		if (lastEventId && this.eventStore) {
+			const eventStreamId = await this.eventStore.getStreamIdForEventId?.(lastEventId);
+			if (eventStreamId) streamId = eventStreamId;
+		}
 		if (this.streamMapping.get(streamId) !== void 0) return new Response(JSON.stringify({
 			jsonrpc: "2.0",
 			error: {
@@ -859,6 +867,26 @@ var WorkerTransport = class {
 				writer.close().catch(() => {});
 			}
 		});
+		if (this.retryInterval !== void 0) await writer.write(encoder.encode(`retry: ${this.retryInterval}\n\n`));
+		if (lastEventId && this.eventStore) {
+			const replayedStreamId = await this.eventStore.replayEventsAfter(lastEventId, { send: async (eventId, message) => {
+				const data = `id: ${eventId}\nevent: message\ndata: ${JSON.stringify(message)}\n\n`;
+				await writer.write(encoder.encode(data));
+			} });
+			if (replayedStreamId !== streamId) {
+				this.streamMapping.delete(streamId);
+				streamId = replayedStreamId;
+				this.streamMapping.set(streamId, {
+					writer,
+					encoder,
+					cleanup: () => {
+						clearInterval(keepAlive);
+						this.streamMapping.delete(streamId);
+						writer.close().catch(() => {});
+					}
+				});
+			}
+		}
 		return new Response(readable, { headers });
 	}
 	async handlePostRequest(request, parsedBody) {
@@ -1017,7 +1045,9 @@ var WorkerTransport = class {
 		if (sessionError) return sessionError;
 		const versionError = this.validateProtocolVersion(request);
 		if (versionError) return versionError;
+		const closedSessionId = this.sessionId;
 		await this.close();
+		if (closedSessionId && this.onsessionclosed) this.onsessionclosed(closedSessionId);
 		return new Response(null, {
 			status: 200,
 			headers: { ...this.getHeaders() }
@@ -1097,15 +1127,32 @@ var WorkerTransport = class {
 		this.requestResponseMap.clear();
 		this.onclose?.();
 	}
+	/**
+	* Close an SSE stream for a specific request, triggering client reconnection.
+	* Use this to implement polling behavior during long-running operations -
+	* client will reconnect after the retry interval specified in the priming event.
+	*/
+	closeSSEStream(requestId) {
+		const streamId = this.requestToStreamMapping.get(requestId);
+		if (!streamId) return;
+		const stream = this.streamMapping.get(streamId);
+		if (stream) stream.cleanup();
+		for (const [reqId, sid] of this.requestToStreamMapping.entries()) if (sid === streamId) {
+			this.requestToStreamMapping.delete(reqId);
+			this.requestResponseMap.delete(reqId);
+		}
+	}
 	async send(message, options) {
 		let requestId = options?.relatedRequestId;
-		if (isJSONRPCResponse(message) || isJSONRPCError(message)) requestId = message.id;
+		if (isJSONRPCResultResponse(message) || isJSONRPCErrorResponse(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");
+			if (isJSONRPCResultResponse(message) || isJSONRPCErrorResponse(message)) throw new Error("Cannot send a response on a standalone SSE stream unless resuming a previous client request");
 			const standaloneSse = this.streamMapping.get(this.standaloneSseStreamId);
 			if (standaloneSse === void 0) return;
 			if (standaloneSse.writer && standaloneSse.encoder) {
-				const data = `event: message\ndata: ${JSON.stringify(message)}\n\n`;
+				let eventId;
+				if (this.eventStore) eventId = await this.eventStore.storeEvent(this.standaloneSseStreamId, message);
+				const data = `${eventId ? `id: ${eventId}\n` : ""}event: message\ndata: ${JSON.stringify(message)}\n\n`;
 				await standaloneSse.writer.write(standaloneSse.encoder.encode(data));
 			}
 			return;
@@ -1116,11 +1163,13 @@ var WorkerTransport = class {
 		if (!response) throw new Error(`No connection established for request ID: ${String(requestId)}`);
 		if (!this.enableJsonResponse) {
 			if (response.writer && response.encoder) {
-				const data = `event: message\ndata: ${JSON.stringify(message)}\n\n`;
+				let eventId;
+				if (this.eventStore) eventId = await this.eventStore.storeEvent(streamId, message);
+				const data = `${eventId ? `id: ${eventId}\n` : ""}event: message\ndata: ${JSON.stringify(message)}\n\n`;
 				await response.writer.write(response.encoder.encode(data));
 			}
 		}
-		if (isJSONRPCResponse(message) || isJSONRPCError(message)) {
+		if (isJSONRPCResultResponse(message) || isJSONRPCErrorResponse(message)) {
 			this.requestResponseMap.set(requestId, message);
 			const relatedIds = Array.from(this.requestToStreamMapping.entries()).filter(([, sid]) => sid === streamId).map(([id]) => id);
 			if (relatedIds.every((id) => this.requestResponseMap.has(id))) {
@@ -1379,14 +1428,14 @@ var McpAgent = class McpAgent extends Agent {
 	}
 	/** Handle elicitation responses */
 	async _handleElicitationResponse(message) {
-		if (isJSONRPCResponse(message) && message.result) {
+		if (isJSONRPCResultResponse(message) && message.result) {
 			const requestId = message.id?.toString();
 			if (!requestId || !requestId.startsWith("elicit_")) return false;
 			if (!await this.ctx.storage.get(`elicitation:${requestId}`)) return false;
 			await this.ctx.storage.put(`elicitation:response:${requestId}`, message.result);
 			return true;
 		}
-		if (isJSONRPCError(message)) {
+		if (isJSONRPCErrorResponse(message)) {
 			const requestId = message.id?.toString();
 			if (!requestId || !requestId.startsWith("elicit_")) return false;
 			if (!await this.ctx.storage.get(`elicitation:${requestId}`)) return false;