agents 0.7.5 → 0.7.6

package/dist/mcp/client.d.ts

@@ -1,2 +1,2 @@
-import { A as MCPClientManager, F as MCPDiscoverResult, I as MCPOAuthCallbackResult, L as MCPServerOptions, M as MCPClientOAuthCallbackConfig, N as MCPClientOAuthResult, P as MCPConnectionResult, R as RegisterServerOptions, j as MCPClientManagerOptions, z as getNamespacedData } from "../index-p1XLNvwQ.js";
+import { B as RegisterServerOptions, F as MCPClientOAuthResult, I as MCPConnectionResult, L as MCPDiscoverResult, M as MCPClientManager, N as MCPClientManagerOptions, P as MCPClientOAuthCallbackConfig, R as MCPOAuthCallbackResult, V as getNamespacedData, z as MCPServerOptions } from "../index-WBy5hmm3.js";
 export { MCPClientManager, MCPClientManagerOptions, MCPClientOAuthCallbackConfig, MCPClientOAuthResult, MCPConnectionResult, MCPDiscoverResult, MCPOAuthCallbackResult, MCPServerOptions, RegisterServerOptions, getNamespacedData };

package/dist/mcp/client.js

@@ -1,2 +1,2 @@
-import { n as getNamespacedData, t as MCPClientManager } from "../client-CgXIwdcc.js";
+import { n as getNamespacedData, t as MCPClientManager } from "../client-K8Z-u76l.js";
 export { MCPClientManager, getNamespacedData };

package/dist/mcp/index.d.ts

@@ -1,2 +1,2 @@
-import { $ as getMcpAuthContext, B as RPCClientTransport, F as MCPDiscoverResult, G as ElicitRequest, H as RPCServerTransport, J as McpAgent, K as ElicitRequestSchema, L as MCPServerOptions, M as MCPClientOAuthCallbackConfig, N as MCPClientOAuthResult, P as MCPConnectionResult, Q as McpAuthContext, U as RPCServerTransportOptions, V as RPCClientTransportOptions, W as RPC_DO_PREFIX, X as createMcpHandler, Y as CreateMcpHandlerOptions, Z as experimental_createMcpHandler, at as McpClientOptions, et as TransportState, it as StreamableHTTPEdgeClientTransport, nt as WorkerTransportOptions, q as ElicitResult, rt as SSEEdgeClientTransport, tt as WorkerTransport } from "../index-p1XLNvwQ.js";
+import { $ as experimental_createMcpHandler, F as MCPClientOAuthResult, G as RPCServerTransportOptions, H as RPCClientTransport, I as MCPConnectionResult, J as ElicitRequestSchema, K as RPC_DO_PREFIX, L as MCPDiscoverResult, P as MCPClientOAuthCallbackConfig, Q as createMcpHandler, U as RPCClientTransportOptions, W as RPCServerTransport, X as McpAgent, Y as ElicitResult, Z as CreateMcpHandlerOptions, at as SSEEdgeClientTransport, et as McpAuthContext, it as WorkerTransportOptions, nt as TransportState, ot as StreamableHTTPEdgeClientTransport, q as ElicitRequest, rt as WorkerTransport, st as McpClientOptions, tt as getMcpAuthContext, z as MCPServerOptions } from "../index-WBy5hmm3.js";
 export { CreateMcpHandlerOptions, ElicitRequest, ElicitRequestSchema, ElicitResult, MCPClientOAuthCallbackConfig, MCPClientOAuthResult, MCPConnectionResult, MCPDiscoverResult, MCPServerOptions, McpAgent, McpAuthContext, McpClientOptions, RPCClientTransport, RPCClientTransportOptions, RPCServerTransport, RPCServerTransportOptions, RPC_DO_PREFIX, SSEEdgeClientTransport, StreamableHTTPEdgeClientTransport, TransportState, WorkerTransport, WorkerTransportOptions, createMcpHandler, experimental_createMcpHandler, getMcpAuthContext };

package/dist/mcp/index.js

@@ -1,5 +1,5 @@
 import { MessageType } from "../types.js";
-import { a as RPCServerTransport, i as RPCClientTransport, o as RPC_DO_PREFIX } from "../client-CgXIwdcc.js";
+import { a as RPCServerTransport, i as RPCClientTransport, o as RPC_DO_PREFIX } from "../client-K8Z-u76l.js";
 import { Agent, getAgentByName, getCurrentAgent } from "../index.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
@@ -1275,6 +1275,10 @@ function experimental_createMcpHandler(server, options = {}) {
 //#endregion
 //#region src/mcp/index.ts
 var McpAgent = class McpAgent extends Agent {
+	constructor(..._args) {
+		super(..._args);
+		this._pendingElicitations = /* @__PURE__ */ new Map();
+	}
 	shouldSendProtocolMessages(_connection, ctx) {
 		return !ctx.request.headers.get(MCP_HTTP_METHOD_HEADER);
 	}
@@ -1334,8 +1338,8 @@ var McpAgent = class McpAgent extends Agent {
 			case "sse": return new McpSSETransport();
 			case "streamable-http": {
 				const transport = new StreamableHTTPServerTransport({});
-				transport.messageInterceptor = async (message) => {
-					return this._handleElicitationResponse(message);
+				transport.messageInterceptor = (message) => {
+					return Promise.resolve(this._handleElicitationResponse(message));
 				};
 				return transport;
 			}
@@ -1354,7 +1358,7 @@ var McpAgent = class McpAgent extends Agent {
 	/** Sets up the MCP transport and server every time the Agent is started.*/
 	async onStart(props) {
 		if (props) await this.updateProps(props);
-		this.props = await this.ctx.storage.get("props");
+		else this.props = await this.ctx.storage.get("props");
 		await this.init();
 		const server = await this.server;
 		this._transport = this.initTransport();
@@ -1402,7 +1406,7 @@ var McpAgent = class McpAgent extends Agent {
 				this._transport?.onerror?.(error);
 				throw error;
 			}
-			if (await this._handleElicitationResponse(parsedMessage)) return null;
+			if (this._handleElicitationResponse(parsedMessage)) return null;
 			this._transport?.onmessage?.(parsedMessage, extraInfo);
 			return null;
 		} catch (error) {
@@ -1414,11 +1418,6 @@ var McpAgent = class McpAgent extends Agent {
 	/** Elicit user input with a message and schema */
 	async elicitInput(params) {
 		const requestId = `elicit_${Math.random().toString(36).substring(2, 11)}`;
-		await this.ctx.storage.put(`elicitation:${requestId}`, {
-			message: params.message,
-			requestedSchema: params.requestedSchema,
-			timestamp: Date.now()
-		});
 		const elicitRequest = {
 			jsonrpc: "2.0",
 			id: requestId,
@@ -1428,60 +1427,71 @@ var McpAgent = class McpAgent extends Agent {
 				requestedSchema: params.requestedSchema
 			}
 		};
-		if (this._transport) await this._transport.send(elicitRequest);
-		else {
-			const connections = this.getConnections();
-			if (!connections || Array.from(connections).length === 0) {
-				await this.ctx.storage.delete(`elicitation:${requestId}`);
-				throw new Error("No active connections available for elicitation");
-			}
-			const connectionList = Array.from(connections);
-			for (const connection of connectionList) try {
-				connection.send(JSON.stringify(elicitRequest));
+		let timeoutId;
+		const responsePromise = new Promise((resolve, reject) => {
+			timeoutId = setTimeout(() => {
+				this._pendingElicitations.delete(requestId);
+				reject(/* @__PURE__ */ new Error("Elicitation request timed out"));
+			}, 6e4);
+			this._pendingElicitations.set(requestId, {
+				resolve: (result) => {
+					clearTimeout(timeoutId);
+					this._pendingElicitations.delete(requestId);
+					resolve(result);
+				},
+				reject: (err) => {
+					clearTimeout(timeoutId);
+					this._pendingElicitations.delete(requestId);
+					reject(err);
+				}
+			});
+		});
+		const cleanup = () => {
+			clearTimeout(timeoutId);
+			this._pendingElicitations.delete(requestId);
+		};
+		return this.keepAliveWhile(async () => {
+			if (this._transport) try {
+				await this._transport.send(elicitRequest);
 			} catch (error) {
-				console.error("Failed to send elicitation request:", error);
+				cleanup();
+				throw error;
 			}
-		}
-		return this._waitForElicitationResponse(requestId);
-	}
-	/** Wait for elicitation response through storage polling */
-	async _waitForElicitationResponse(requestId) {
-		const startTime = Date.now();
-		const timeout = 6e4;
-		try {
-			while (Date.now() - startTime < timeout) {
-				const response = await this.ctx.storage.get(`elicitation:response:${requestId}`);
-				if (response) {
-					await this.ctx.storage.delete(`elicitation:${requestId}`);
-					await this.ctx.storage.delete(`elicitation:response:${requestId}`);
-					return response;
+			else {
+				const connections = this.getConnections();
+				if (!connections || Array.from(connections).length === 0) {
+					cleanup();
+					throw new Error("No active connections available for elicitation");
+				}
+				const connectionList = Array.from(connections);
+				for (const connection of connectionList) try {
+					connection.send(JSON.stringify(elicitRequest));
+				} catch (error) {
+					console.error("Failed to send elicitation request:", error);
 				}
-				await new Promise((resolve) => setTimeout(resolve, 100));
 			}
-			throw new Error("Elicitation request timed out");
-		} finally {
-			await this.ctx.storage.delete(`elicitation:${requestId}`);
-			await this.ctx.storage.delete(`elicitation:response:${requestId}`);
-		}
+			return responsePromise;
+		});
 	}
-	/** Handle elicitation responses */
-	async _handleElicitationResponse(message) {
+	/** Handle elicitation responses via in-memory resolver */
+	_handleElicitationResponse(message) {
 		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);
+			const pending = this._pendingElicitations.get(requestId);
+			if (!pending) return false;
+			pending.resolve(message.result);
 			return true;
 		}
 		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;
-			const errorResult = {
+			const pending = this._pendingElicitations.get(requestId);
+			if (!pending) return false;
+			pending.resolve({
 				action: "cancel",
 				content: { error: message.error.message || "Elicitation request failed" }
-			};
-			await this.ctx.storage.put(`elicitation:response:${requestId}`, errorResult);
+			});
 			return true;
 		}
 		return false;