agents 0.0.0-d1f6c02 → 0.0.0-d2872f3

package/dist/mcp/client.js

@@ -1,7 +1,7 @@
 import {
   MCPClientManager,
   getNamespacedData
-} from "../chunk-Y67CHZBI.js";
+} from "../chunk-HY7ZLHJB.js";
 export {
   MCPClientManager,
   getNamespacedData

package/dist/mcp/do-oauth-client-provider.js

@@ -1,6 +1,6 @@
 import {
   DurableObjectOAuthClientProvider
-} from "../chunk-BZXOAZUX.js";
+} from "../chunk-PVQZBKN7.js";
 export {
   DurableObjectOAuthClientProvider
 };

package/dist/mcp/index.d.ts

@@ -1,17 +1,20 @@
-import { MCPClientManager } from './client.js';
+import { M as MCPClientManager } from '../client-DgyzBU_8.js';
+export { S as SSEEdgeClientTransport, a as StreamableHTTPEdgeClientTransport } from '../client-DgyzBU_8.js';
 import { DurableObject } from 'cloudflare:workers';
-import { Connection, WSMessage } from 'partyserver';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { ElicitResult } from '@modelcontextprotocol/sdk/types.js';
+export { ElicitRequest, ElicitRequestSchema, ElicitResult } from '@modelcontextprotocol/sdk/types.js';
+import { Connection, WSMessage } from 'partyserver';
 import 'zod';
-import '@modelcontextprotocol/sdk/types.js';
 import '@modelcontextprotocol/sdk/client/index.js';
+import '@modelcontextprotocol/sdk/shared/protocol.js';
+import 'ai';
 import '@modelcontextprotocol/sdk/client/sse.js';
+import '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import './do-oauth-client-provider.js';
 import '@modelcontextprotocol/sdk/client/auth.js';
 import '@modelcontextprotocol/sdk/shared/auth.js';
-import '@modelcontextprotocol/sdk/shared/protocol.js';
-import 'ai';
 
 interface CORSOptions {
     origin?: string;
@@ -40,6 +43,13 @@ declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Re
     get state(): State;
     sql<T = Record<string, string | number | boolean | null>>(strings: TemplateStringsArray, ...values: (string | number | boolean | null)[]): T[];
     setState(state: State): void;
+    /**
+     * Elicit user input with a message and schema
+     */
+    elicitInput(params: {
+        message: string;
+        requestedSchema: unknown;
+    }): Promise<ElicitResult>;
     onStateUpdate(state: State | undefined, source: Connection | "server"): void;
     onStart(): Promise<void>;
     /**
@@ -52,28 +62,36 @@ declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Re
     _init(props: Props): Promise<void>;
     setInitialized(): Promise<void>;
     isInitialized(): Promise<boolean>;
+    updateProps(props: Props): Promise<void>;
     private _initialize;
     fetch(request: Request): Promise<Response>;
     getWebSocket(): WebSocket | null;
     getWebSocketForResponseID(id: string): WebSocket | null;
     onMessage(connection: Connection, event: WSMessage): Promise<void>;
-    onSSEMcpMessage(sessionId: string, request: Request): Promise<Error | null>;
+    /**
+     * Wait for elicitation response through storage polling
+     */
+    private _waitForElicitationResponse;
+    /**
+     * Handle elicitation responses   */
+    private _handleElicitationResponse;
+    onSSEMcpMessage(_sessionId: string, messageBody: unknown): Promise<Error | null>;
     webSocketMessage(ws: WebSocket, event: ArrayBuffer | string): Promise<void>;
     webSocketError(ws: WebSocket, error: unknown): Promise<void>;
     webSocketClose(ws: WebSocket, code: number, reason: string, wasClean: boolean): Promise<void>;
-    static mount(path: string, { binding, corsOptions, }?: {
+    static mount(path: string, { binding, corsOptions }?: {
         binding?: string;
         corsOptions?: CORSOptions;
     }): {
         fetch<Env>(this: void, request: Request, env: Env, ctx: ExecutionContext): Promise<Response>;
     };
-    static serveSSE(path: string, { binding, corsOptions, }?: {
+    static serveSSE(path: string, { binding, corsOptions }?: {
         binding?: string;
         corsOptions?: CORSOptions;
     }): {
         fetch<Env>(this: void, request: Request, env: Env, ctx: ExecutionContext): Promise<Response>;
     };
-    static serve(path: string, { binding, corsOptions, }?: {
+    static serve(path: string, { binding, corsOptions }?: {
         binding?: string;
         corsOptions?: CORSOptions;
     }): {

package/dist/mcp/index.js

@@ -1,31 +1,40 @@
 import {
   Agent
-} from "../chunk-AXSPGBHI.js";
-import "../chunk-BZXOAZUX.js";
-import "../chunk-QSGN3REV.js";
-import "../chunk-Y67CHZBI.js";
+} from "../chunk-JXN5WZFQ.js";
+import {
+  SSEEdgeClientTransport,
+  StreamableHTTPEdgeClientTransport
+} from "../chunk-HY7ZLHJB.js";
+import "../chunk-PVQZBKN7.js";
+import "../chunk-KUH345EY.js";
 
 // src/mcp/index.ts
 import { DurableObject } from "cloudflare:workers";
 import {
   InitializeRequestSchema,
+  JSONRPCMessageSchema,
   isJSONRPCError,
   isJSONRPCNotification,
   isJSONRPCRequest,
-  isJSONRPCResponse,
-  JSONRPCMessageSchema
+  isJSONRPCResponse
+} from "@modelcontextprotocol/sdk/types.js";
+import {
+  ElicitRequestSchema
 } from "@modelcontextprotocol/sdk/types.js";
 var MAXIMUM_MESSAGE_SIZE_BYTES = 4 * 1024 * 1024;
-function corsHeaders(request, corsOptions = {}) {
+function corsHeaders(_request, corsOptions = {}) {
   const origin = "*";
   return {
-    "Access-Control-Allow-Origin": corsOptions.origin || origin,
+    "Access-Control-Allow-Headers": corsOptions.headers || "Content-Type, mcp-session-id, mcp-protocol-version",
     "Access-Control-Allow-Methods": corsOptions.methods || "GET, POST, OPTIONS",
-    "Access-Control-Allow-Headers": corsOptions.headers || "Content-Type, mcp-session-id",
-    "Access-Control-Max-Age": (corsOptions.maxAge || 86400).toString(),
-    "Access-Control-Expose-Headers": corsOptions.exposeHeaders || "mcp-session-id"
+    "Access-Control-Allow-Origin": corsOptions.origin || origin,
+    "Access-Control-Expose-Headers": corsOptions.exposeHeaders || "mcp-session-id",
+    "Access-Control-Max-Age": (corsOptions.maxAge || 86400).toString()
   };
 }
+function isDurableObjectNamespace(namespace) {
+  return typeof namespace === "object" && namespace !== null && "newUniqueId" in namespace && typeof namespace.newUniqueId === "function" && "idFromName" in namespace && typeof namespace.idFromName === "function";
+}
 function handleCORS(request, corsOptions) {
   if (request.method === "OPTIONS") {
     return new Response(null, { headers: corsHeaders(request, corsOptions) });
@@ -138,6 +147,46 @@ var McpAgent = class _McpAgent extends DurableObject {
   setState(state) {
     return this._agent.setState(state);
   }
+  /**
+   * 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,
+      method: "elicitation/create",
+      params: {
+        message: params.message,
+        requestedSchema: params.requestedSchema
+      }
+    };
+    if (this._transport) {
+      await this._transport.send(elicitRequest);
+    } else {
+      const connections = this._agent?.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));
+        } catch (error) {
+          console.error("Failed to send elicitation request:", error);
+        }
+      }
+    }
+    return this._waitForElicitationResponse(requestId);
+  }
+  // we leave the variables as unused for autocomplete purposes
+  // biome-ignore lint/correctness/noUnusedFunctionParameters: overriden later
   onStateUpdate(state, source) {
   }
   async onStart() {
@@ -175,11 +224,10 @@ var McpAgent = class _McpAgent extends DurableObject {
     }
   }
   async _init(props) {
-    await this.ctx.storage.put("props", props ?? {});
+    await this.updateProps(props);
     if (!this.ctx.storage.get("transportType")) {
       await this.ctx.storage.put("transportType", "unset");
     }
-    this.props = props;
     if (!this.initRun) {
       this.initRun = true;
       await this.init();
@@ -191,6 +239,10 @@ var McpAgent = class _McpAgent extends DurableObject {
   async isInitialized() {
     return await this.ctx.storage.get("initialized") === true;
   }
+  async updateProps(props) {
+    await this.ctx.storage.put("props", props ?? {});
+    this.props = props;
+  }
   async _initialize() {
     await this.ctx.blockConcurrencyWhile(async () => {
       this._status = "starting";
@@ -277,14 +329,78 @@ var McpAgent = class _McpAgent extends DurableObject {
       this._transport?.onerror?.(error);
       return;
     }
+    if (await this._handleElicitationResponse(message)) {
+      return;
+    }
     if (isJSONRPCRequest(message)) {
       this._requestIdToConnectionId.set(message.id.toString(), connection.id);
     }
     this._transport?.onmessage?.(message);
   }
+  /**
+   * 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;
+        }
+        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}`);
+    }
+  }
+  /**
+   * Handle elicitation responses   */
+  async _handleElicitationResponse(message) {
+    if (isJSONRPCResponse(message) && message.result) {
+      const requestId = message.id?.toString();
+      if (!requestId || !requestId.startsWith("elicit_")) return false;
+      const pendingRequest = await this.ctx.storage.get(
+        `elicitation:${requestId}`
+      );
+      if (!pendingRequest) return false;
+      await this.ctx.storage.put(
+        `elicitation:response:${requestId}`,
+        message.result
+      );
+      return true;
+    }
+    if (isJSONRPCError(message)) {
+      const requestId = message.id?.toString();
+      if (!requestId || !requestId.startsWith("elicit_")) return false;
+      const pendingRequest = await this.ctx.storage.get(
+        `elicitation:${requestId}`
+      );
+      if (!pendingRequest) return false;
+      const errorResult = {
+        action: "cancel",
+        content: {
+          error: message.error.message || "Elicitation request failed"
+        }
+      };
+      await this.ctx.storage.put(
+        `elicitation:response:${requestId}`,
+        errorResult
+      );
+      return true;
+    }
+    return false;
+  }
   // All messages received over SSE after the initial connection has been established
   // will be passed here
-  async onSSEMcpMessage(sessionId, request) {
+  async onSSEMcpMessage(_sessionId, messageBody) {
     if (this._status !== "started") {
       await this._initialize();
     }
@@ -292,14 +408,16 @@ var McpAgent = class _McpAgent extends DurableObject {
       return new Error("Internal Server Error: Expected SSE protocol");
     }
     try {
-      const message = await request.json();
       let parsedMessage;
       try {
-        parsedMessage = JSONRPCMessageSchema.parse(message);
+        parsedMessage = JSONRPCMessageSchema.parse(messageBody);
       } catch (error) {
         this._transport?.onerror?.(error);
         throw error;
       }
+      if (await this._handleElicitationResponse(parsedMessage)) {
+        return null;
+      }
       this._transport?.onmessage?.(parsedMessage);
       return null;
     } catch (error) {
@@ -356,7 +474,7 @@ var McpAgent = class _McpAgent extends DurableObject {
           );
           return new Response("Invalid binding", { status: 500 });
         }
-        if (bindingValue.toString() !== "[object DurableObjectNamespace]") {
+        if (!isDurableObjectNamespace(bindingValue)) {
           return new Response("Invalid binding", { status: 500 });
         }
         const namespace = bindingValue;
@@ -379,9 +497,14 @@ data: ${relativeUrlWithSession}
           await doStub._init(ctx.props);
           const upgradeUrl = new URL(request.url);
           upgradeUrl.pathname = "/sse";
+          const existingHeaders = {};
+          request.headers.forEach((value, key) => {
+            existingHeaders[key] = value;
+          });
           const response = await doStub.fetch(
             new Request(upgradeUrl, {
               headers: {
+                ...existingHeaders,
                 Upgrade: "websocket",
                 // Required by PartyServer
                 "x-partykit-room": sessionId
@@ -417,10 +540,10 @@ data: ${JSON.stringify(result.data)}
             onMessage(event).catch(console.error);
           });
           ws.addEventListener("error", (error) => {
-            async function onError(error2) {
+            async function onError(_error) {
               try {
                 await writer.close();
-              } catch (e) {
+              } catch (_e) {
               }
             }
             onError(error).catch(console.error);
@@ -437,9 +560,9 @@ data: ${JSON.stringify(result.data)}
           });
           return new Response(readable, {
             headers: {
-              "Content-Type": "text/event-stream",
               "Cache-Control": "no-cache",
               Connection: "keep-alive",
+              "Content-Type": "text/event-stream",
               ...corsHeaders(request, corsOptions)
             }
           });
@@ -472,26 +595,28 @@ data: ${JSON.stringify(result.data)}
           }
           const id = namespace.idFromName(`sse:${sessionId}`);
           const doStub = namespace.get(id);
-          const error = await doStub.onSSEMcpMessage(sessionId, request);
+          const messageBody = await request.json();
+          await doStub.updateProps(ctx.props);
+          const error = await doStub.onSSEMcpMessage(sessionId, messageBody);
           if (error) {
             return new Response(error.message, {
-              status: 400,
               headers: {
-                "Content-Type": "text/event-stream",
                 "Cache-Control": "no-cache",
                 Connection: "keep-alive",
+                "Content-Type": "text/event-stream",
                 ...corsHeaders(request, corsOptions)
-              }
+              },
+              status: 400
             });
           }
           return new Response("Accepted", {
-            status: 202,
             headers: {
-              "Content-Type": "text/event-stream",
               "Cache-Control": "no-cache",
               Connection: "keep-alive",
+              "Content-Type": "text/event-stream",
               ...corsHeaders(request, corsOptions)
-            }
+            },
+            status: 202
           });
         }
         return new Response("Not Found", { status: 404 });
@@ -521,7 +646,7 @@ data: ${JSON.stringify(result.data)}
           );
           return new Response("Invalid binding", { status: 500 });
         }
-        if (bindingValue.toString() !== "[object DurableObjectNamespace]") {
+        if (!isDurableObjectNamespace(bindingValue)) {
           return new Response("Invalid binding", { status: 500 });
         }
         const namespace = bindingValue;
@@ -529,24 +654,24 @@ data: ${JSON.stringify(result.data)}
           const acceptHeader = request.headers.get("accept");
           if (!acceptHeader?.includes("application/json") || !acceptHeader.includes("text/event-stream")) {
             const body2 = JSON.stringify({
-              jsonrpc: "2.0",
               error: {
                 code: -32e3,
                 message: "Not Acceptable: Client must accept both application/json and text/event-stream"
               },
-              id: null
+              id: null,
+              jsonrpc: "2.0"
             });
             return new Response(body2, { status: 406 });
           }
           const ct = request.headers.get("content-type");
           if (!ct || !ct.includes("application/json")) {
             const body2 = JSON.stringify({
-              jsonrpc: "2.0",
               error: {
                 code: -32e3,
                 message: "Unsupported Media Type: Content-Type must be application/json"
               },
-              id: null
+              id: null,
+              jsonrpc: "2.0"
             });
             return new Response(body2, { status: 415 });
           }
@@ -556,12 +681,12 @@ data: ${JSON.stringify(result.data)}
           );
           if (contentLength > MAXIMUM_MESSAGE_SIZE_BYTES) {
             const body2 = JSON.stringify({
-              jsonrpc: "2.0",
               error: {
                 code: -32e3,
                 message: `Request body too large. Maximum size is ${MAXIMUM_MESSAGE_SIZE_BYTES} bytes`
               },
-              id: null
+              id: null,
+              jsonrpc: "2.0"
             });
             return new Response(body2, { status: 413 });
           }
@@ -569,14 +694,14 @@ data: ${JSON.stringify(result.data)}
           let rawMessage;
           try {
             rawMessage = await request.json();
-          } catch (error) {
+          } catch (_error) {
             const body2 = JSON.stringify({
-              jsonrpc: "2.0",
               error: {
                 code: -32700,
                 message: "Parse error: Invalid JSON"
               },
-              id: null
+              id: null,
+              jsonrpc: "2.0"
             });
             return new Response(body2, { status: 400 });
           }
@@ -590,12 +715,12 @@ data: ${JSON.stringify(result.data)}
           for (const msg of arrayMessage) {
             if (!JSONRPCMessageSchema.safeParse(msg).success) {
               const body2 = JSON.stringify({
-                jsonrpc: "2.0",
                 error: {
                   code: -32700,
                   message: "Parse error: Invalid JSON-RPC message"
                 },
-                id: null
+                id: null,
+                jsonrpc: "2.0"
               });
               return new Response(body2, { status: 400 });
             }
@@ -606,34 +731,34 @@ data: ${JSON.stringify(result.data)}
           );
           if (isInitializationRequest && sessionId) {
             const body2 = JSON.stringify({
-              jsonrpc: "2.0",
               error: {
                 code: -32600,
                 message: "Invalid Request: Initialization requests must not include a sessionId"
               },
-              id: null
+              id: null,
+              jsonrpc: "2.0"
             });
             return new Response(body2, { status: 400 });
           }
           if (isInitializationRequest && messages.length > 1) {
             const body2 = JSON.stringify({
-              jsonrpc: "2.0",
               error: {
                 code: -32600,
                 message: "Invalid Request: Only one initialization request is allowed"
               },
-              id: null
+              id: null,
+              jsonrpc: "2.0"
             });
             return new Response(body2, { status: 400 });
           }
           if (!isInitializationRequest && !sessionId) {
             const body2 = JSON.stringify({
-              jsonrpc: "2.0",
               error: {
                 code: -32e3,
                 message: "Bad Request: Mcp-Session-Id header is required"
               },
-              id: null
+              id: null,
+              jsonrpc: "2.0"
             });
             return new Response(body2, { status: 400 });
           }
@@ -646,23 +771,30 @@ data: ${JSON.stringify(result.data)}
             await doStub.setInitialized();
           } else if (!isInitialized) {
             const body2 = JSON.stringify({
-              jsonrpc: "2.0",
               error: {
                 code: -32001,
                 message: "Session not found"
               },
-              id: null
+              id: null,
+              jsonrpc: "2.0"
             });
             return new Response(body2, { status: 404 });
+          } else {
+            await doStub.updateProps(ctx.props);
           }
           const { readable, writable } = new TransformStream();
           const writer = writable.getWriter();
           const encoder = new TextEncoder();
           const upgradeUrl = new URL(request.url);
           upgradeUrl.pathname = "/streamable-http";
+          const existingHeaders = {};
+          request.headers.forEach((value, key) => {
+            existingHeaders[key] = value;
+          });
           const response = await doStub.fetch(
             new Request(upgradeUrl, {
               headers: {
+                ...existingHeaders,
                 Upgrade: "websocket",
                 // Required by PartyServer
                 "x-partykit-room": sessionId
@@ -674,12 +806,12 @@ data: ${JSON.stringify(result.data)}
             console.error("Failed to establish WebSocket connection");
             await writer.close();
             const body2 = JSON.stringify({
-              jsonrpc: "2.0",
               error: {
                 code: -32001,
                 message: "Failed to establish WebSocket connection"
               },
-              id: null
+              id: null,
+              jsonrpc: "2.0"
             });
             return new Response(body2, { status: 500 });
           }
@@ -712,10 +844,10 @@ data: ${JSON.stringify(result.data)}
             onMessage(event).catch(console.error);
           });
           ws.addEventListener("error", (error) => {
-            async function onError(error2) {
+            async function onError(_error) {
               try {
                 await writer.close();
-              } catch (e) {
+              } catch (_e) {
               }
             }
             onError(error).catch(console.error);
@@ -739,8 +871,8 @@ data: ${JSON.stringify(result.data)}
             }
             ws.close();
             return new Response(null, {
-              status: 202,
-              headers: corsHeaders(request, corsOptions)
+              headers: corsHeaders(request, corsOptions),
+              status: 202
             });
           }
           for (const message of messages) {
@@ -751,9 +883,9 @@ data: ${JSON.stringify(result.data)}
           }
           return new Response(readable, {
             headers: {
-              "Content-Type": "text/event-stream",
               "Cache-Control": "no-cache",
               Connection: "keep-alive",
+              "Content-Type": "text/event-stream",
               "mcp-session-id": sessionId,
               ...corsHeaders(request, corsOptions)
             },
@@ -761,12 +893,12 @@ data: ${JSON.stringify(result.data)}
           });
         }
         const body = JSON.stringify({
-          jsonrpc: "2.0",
           error: {
             code: -32e3,
             message: "Method not allowed"
           },
-          id: null
+          id: null,
+          jsonrpc: "2.0"
         });
         return new Response(body, { status: 405 });
       }
@@ -774,6 +906,9 @@ data: ${JSON.stringify(result.data)}
   }
 };
 export {
-  McpAgent
+  ElicitRequestSchema,
+  McpAgent,
+  SSEEdgeClientTransport,
+  StreamableHTTPEdgeClientTransport
 };
 //# sourceMappingURL=index.js.map