agents 0.2.23 → 0.2.24

package/dist/client.d.ts

@@ -1,4 +1,4 @@
-import "./serializable-CymX8ovI.js";
+import "./serializable-faDkMCai.js";
 import {
   a as agentFetch,
   i as StreamOptions,
@@ -6,7 +6,7 @@ import {
   o as camelCaseToKebabCase,
   r as AgentClientOptions,
   t as AgentClient
-} from "./client-CbWe9FBd.js";
+} from "./client-BAQA84dr.js";
 export {
   AgentClient,
   AgentClientFetchOptions,

package/dist/client.js

@@ -1,4 +1,4 @@
-import "./ai-types-B3aQaFv3.js";
-import { n as agentFetch, r as camelCaseToKebabCase, t as AgentClient } from "./client-BfiZ3HQd.js";
+import "./ai-types-CrMqkwc_.js";
+import { n as agentFetch, r as camelCaseToKebabCase, t as AgentClient } from "./client-B3SR12TQ.js";
 
 export { AgentClient, agentFetch, camelCaseToKebabCase };

package/dist/codemode/ai.js

@@ -1,8 +1,8 @@
-import "../ai-types-B3aQaFv3.js";
-import "../client-BfiZ3HQd.js";
-import "../client-DZhjV_XA.js";
-import "../do-oauth-client-provider-CswoD5Lu.js";
-import { s as getAgentByName } from "../src-C8K3lu37.js";
+import "../ai-types-CrMqkwc_.js";
+import "../client-B3SR12TQ.js";
+import "../client-BZq9qau2.js";
+import "../do-oauth-client-provider-CwqK5SXm.js";
+import { s as getAgentByName } from "../src-D_KKH_4c.js";
 import { generateObject, tool } from "ai";
 import { openai } from "@ai-sdk/openai";
 import { z } from "zod/v3";

package/dist/{do-oauth-client-provider-DGc5pP0l.d.ts → do-oauth-client-provider-C2CHH5x-.d.ts}

@@ -52,4 +52,4 @@ declare class DurableObjectOAuthClientProvider implements AgentsOAuthProvider {
 }
 //#endregion
 export { DurableObjectOAuthClientProvider as n, AgentsOAuthProvider as t };
-//# sourceMappingURL=do-oauth-client-provider-DGc5pP0l.d.ts.map
+//# sourceMappingURL=do-oauth-client-provider-C2CHH5x-.d.ts.map

package/dist/{do-oauth-client-provider-CswoD5Lu.js → do-oauth-client-provider-CwqK5SXm.js}

@@ -6,6 +6,7 @@ var DurableObjectOAuthClientProvider = class {
 		this.storage = storage;
 		this.clientName = clientName;
 		this.baseRedirectUrl = baseRedirectUrl;
+		if (!storage) throw new Error("DurableObjectOAuthClientProvider requires a valid DurableObjectStorage instance");
 	}
 	get clientMetadata() {
 		return {
@@ -90,4 +91,4 @@ var DurableObjectOAuthClientProvider = class {
 
 //#endregion
 export { DurableObjectOAuthClientProvider as t };
-//# sourceMappingURL=do-oauth-client-provider-CswoD5Lu.js.map
+//# sourceMappingURL=do-oauth-client-provider-CwqK5SXm.js.map

package/dist/do-oauth-client-provider-CwqK5SXm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"do-oauth-client-provider-CwqK5SXm.js","names":["storage: DurableObjectStorage","clientName: string","baseRedirectUrl: string"],"sources":["../src/mcp/do-oauth-client-provider.ts"],"sourcesContent":["import type { OAuthClientProvider } from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport type {\n  OAuthClientInformation,\n  OAuthClientInformationFull,\n  OAuthClientMetadata,\n  OAuthTokens\n} from \"@modelcontextprotocol/sdk/shared/auth.js\";\nimport { nanoid } from \"nanoid\";\n\n// A slight extension to the standard OAuthClientProvider interface because `redirectToAuthorization` doesn't give us the interface we need\n// This allows us to track authentication for a specific server and associated dynamic client registration\nexport interface AgentsOAuthProvider extends OAuthClientProvider {\n  authUrl: string | undefined;\n  clientId: string | undefined;\n  serverId: string | undefined;\n}\n\nexport class DurableObjectOAuthClientProvider implements AgentsOAuthProvider {\n  private _authUrl_: string | undefined;\n  private _serverId_: string | undefined;\n  private _clientId_: string | undefined;\n\n  constructor(\n    public storage: DurableObjectStorage,\n    public clientName: string,\n    public baseRedirectUrl: string\n  ) {\n    if (!storage) {\n      throw new Error(\n        \"DurableObjectOAuthClientProvider requires a valid DurableObjectStorage instance\"\n      );\n    }\n  }\n\n  get clientMetadata(): OAuthClientMetadata {\n    return {\n      client_name: this.clientName,\n      client_uri: this.clientUri,\n      grant_types: [\"authorization_code\", \"refresh_token\"],\n      redirect_uris: [this.redirectUrl],\n      response_types: [\"code\"],\n      token_endpoint_auth_method: \"none\"\n    };\n  }\n\n  get clientUri() {\n    return new URL(this.redirectUrl).origin;\n  }\n\n  get redirectUrl() {\n    return `${this.baseRedirectUrl}/${this.serverId}`;\n  }\n\n  get clientId() {\n    if (!this._clientId_) {\n      throw new Error(\"Trying to access clientId before it was set\");\n    }\n    return this._clientId_;\n  }\n\n  set clientId(clientId_: string) {\n    this._clientId_ = clientId_;\n  }\n\n  get serverId() {\n    if (!this._serverId_) {\n      throw new Error(\"Trying to access serverId before it was set\");\n    }\n    return this._serverId_;\n  }\n\n  set serverId(serverId_: string) {\n    this._serverId_ = serverId_;\n  }\n\n  keyPrefix(clientId: string) {\n    return `/${this.clientName}/${this.serverId}/${clientId}`;\n  }\n\n  clientInfoKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/client_info/`;\n  }\n\n  async clientInformation(): Promise<OAuthClientInformation | undefined> {\n    if (!this._clientId_) {\n      return undefined;\n    }\n    return (\n      (await this.storage.get<OAuthClientInformation>(\n        this.clientInfoKey(this.clientId)\n      )) ?? undefined\n    );\n  }\n\n  async saveClientInformation(\n    clientInformation: OAuthClientInformationFull\n  ): Promise<void> {\n    await this.storage.put(\n      this.clientInfoKey(clientInformation.client_id),\n      clientInformation\n    );\n    this.clientId = clientInformation.client_id;\n  }\n\n  tokenKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/token`;\n  }\n\n  async tokens(): Promise<OAuthTokens | undefined> {\n    if (!this._clientId_) {\n      return undefined;\n    }\n    return (\n      (await this.storage.get<OAuthTokens>(this.tokenKey(this.clientId))) ??\n      undefined\n    );\n  }\n\n  async saveTokens(tokens: OAuthTokens): Promise<void> {\n    await this.storage.put(this.tokenKey(this.clientId), tokens);\n  }\n\n  get authUrl() {\n    return this._authUrl_;\n  }\n\n  /**\n   * Because this operates on the server side (but we need browser auth), we send this url back to the user\n   * and require user interact to initiate the redirect flow\n   */\n  async redirectToAuthorization(authUrl: URL): Promise<void> {\n    // Generate secure random token for state parameter\n    const stateToken = nanoid();\n    authUrl.searchParams.set(\"state\", stateToken);\n    this._authUrl_ = authUrl.toString();\n  }\n\n  codeVerifierKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/code_verifier`;\n  }\n\n  async saveCodeVerifier(verifier: string): Promise<void> {\n    const key = this.codeVerifierKey(this.clientId);\n\n    // Don't overwrite existing verifier to preserve first PKCE verifier\n    const existing = await this.storage.get<string>(key);\n    if (existing) {\n      return;\n    }\n\n    await this.storage.put(key, verifier);\n  }\n\n  async codeVerifier(): Promise<string> {\n    const codeVerifier = await this.storage.get<string>(\n      this.codeVerifierKey(this.clientId)\n    );\n    if (!codeVerifier) {\n      throw new Error(\"No code verifier found\");\n    }\n    return codeVerifier;\n  }\n}\n"],"mappings":";;;AAiBA,IAAa,mCAAb,MAA6E;CAK3E,YACE,AAAOA,SACP,AAAOC,YACP,AAAOC,iBACP;EAHO;EACA;EACA;AAEP,MAAI,CAAC,QACH,OAAM,IAAI,MACR,kFACD;;CAIL,IAAI,iBAAsC;AACxC,SAAO;GACL,aAAa,KAAK;GAClB,YAAY,KAAK;GACjB,aAAa,CAAC,sBAAsB,gBAAgB;GACpD,eAAe,CAAC,KAAK,YAAY;GACjC,gBAAgB,CAAC,OAAO;GACxB,4BAA4B;GAC7B;;CAGH,IAAI,YAAY;AACd,SAAO,IAAI,IAAI,KAAK,YAAY,CAAC;;CAGnC,IAAI,cAAc;AAChB,SAAO,GAAG,KAAK,gBAAgB,GAAG,KAAK;;CAGzC,IAAI,WAAW;AACb,MAAI,CAAC,KAAK,WACR,OAAM,IAAI,MAAM,8CAA8C;AAEhE,SAAO,KAAK;;CAGd,IAAI,SAAS,WAAmB;AAC9B,OAAK,aAAa;;CAGpB,IAAI,WAAW;AACb,MAAI,CAAC,KAAK,WACR,OAAM,IAAI,MAAM,8CAA8C;AAEhE,SAAO,KAAK;;CAGd,IAAI,SAAS,WAAmB;AAC9B,OAAK,aAAa;;CAGpB,UAAU,UAAkB;AAC1B,SAAO,IAAI,KAAK,WAAW,GAAG,KAAK,SAAS,GAAG;;CAGjD,cAAc,UAAkB;AAC9B,SAAO,GAAG,KAAK,UAAU,SAAS,CAAC;;CAGrC,MAAM,oBAAiE;AACrE,MAAI,CAAC,KAAK,WACR;AAEF,SACG,MAAM,KAAK,QAAQ,IAClB,KAAK,cAAc,KAAK,SAAS,CAClC,IAAK;;CAIV,MAAM,sBACJ,mBACe;AACf,QAAM,KAAK,QAAQ,IACjB,KAAK,cAAc,kBAAkB,UAAU,EAC/C,kBACD;AACD,OAAK,WAAW,kBAAkB;;CAGpC,SAAS,UAAkB;AACzB,SAAO,GAAG,KAAK,UAAU,SAAS,CAAC;;CAGrC,MAAM,SAA2C;AAC/C,MAAI,CAAC,KAAK,WACR;AAEF,SACG,MAAM,KAAK,QAAQ,IAAiB,KAAK,SAAS,KAAK,SAAS,CAAC,IAClE;;CAIJ,MAAM,WAAW,QAAoC;AACnD,QAAM,KAAK,QAAQ,IAAI,KAAK,SAAS,KAAK,SAAS,EAAE,OAAO;;CAG9D,IAAI,UAAU;AACZ,SAAO,KAAK;;;;;;CAOd,MAAM,wBAAwB,SAA6B;EAEzD,MAAM,aAAa,QAAQ;AAC3B,UAAQ,aAAa,IAAI,SAAS,WAAW;AAC7C,OAAK,YAAY,QAAQ,UAAU;;CAGrC,gBAAgB,UAAkB;AAChC,SAAO,GAAG,KAAK,UAAU,SAAS,CAAC;;CAGrC,MAAM,iBAAiB,UAAiC;EACtD,MAAM,MAAM,KAAK,gBAAgB,KAAK,SAAS;AAI/C,MADiB,MAAM,KAAK,QAAQ,IAAY,IAAI,CAElD;AAGF,QAAM,KAAK,QAAQ,IAAI,KAAK,SAAS;;CAGvC,MAAM,eAAgC;EACpC,MAAM,eAAe,MAAM,KAAK,QAAQ,IACtC,KAAK,gBAAgB,KAAK,SAAS,CACpC;AACD,MAAI,CAAC,aACH,OAAM,IAAI,MAAM,yBAAyB;AAE3C,SAAO"}

package/dist/{index-DhJCaDWd.d.ts → index-BUle9RiP.d.ts}

@@ -1,4 +1,4 @@
-import { n as BaseEvent, t as MCPObservabilityEvent } from "./mcp-Dw5vDrY8.js";
+import { n as BaseEvent, t as MCPObservabilityEvent } from "./mcp-BwPscEiF.js";
 
 //#region src/observability/agent.d.ts
 
@@ -55,4 +55,4 @@ export {
   genericObservability as r,
   Observability as t
 };
-//# sourceMappingURL=index-DhJCaDWd.d.ts.map
+//# sourceMappingURL=index-BUle9RiP.d.ts.map

package/dist/{index-DEZFuVoU.d.ts → index-Bx5KK3VJ.d.ts}

@@ -1,10 +1,10 @@
 import {
-  a as MCPConnectionState,
+  h as TransportType,
   t as MCPClientManager,
-  u as TransportType
-} from "./client-GfgZTqrS.js";
-import { t as Observability } from "./index-DhJCaDWd.js";
-import { n as MessageType } from "./ai-types-D5YoPrBZ.js";
+  u as MCPConnectionState
+} from "./client-CsaP9Irq.js";
+import { t as Observability } from "./index-BUle9RiP.js";
+import { n as MessageType } from "./ai-types-81H_-Uxh.js";
 import {
   Connection,
   Connection as Connection$1,
@@ -139,9 +139,15 @@ type MCPServersState = {
   servers: {
     [id: string]: MCPServer;
   };
-  tools: Tool[];
-  prompts: Prompt[];
-  resources: Resource[];
+  tools: (Tool & {
+    serverId: string;
+  })[];
+  prompts: (Prompt & {
+    serverId: string;
+  })[];
+  resources: (Resource & {
+    serverId: string;
+  })[];
 };
 type MCPServer = {
   name: string;
@@ -171,7 +177,7 @@ declare class Agent<
 > extends Server<Env, Props> {
   private _state;
   private _disposables;
-  private _mcpStateRestored;
+  private _destroyed;
   private _ParentClass;
   readonly mcp: MCPClientManager;
   /**
@@ -347,7 +353,6 @@ declare class Agent<
    * @returns A map of method names to their metadata
    */
   private _isCallable;
-  private _ensureMcpStateRestored;
   /**
    * Connect to a new MCP Server
    *
@@ -356,7 +361,8 @@ declare class Agent<
    * @param callbackHost Base host for the agent, used for the redirect URI. If not provided, will be derived from the current request.
    * @param agentsPrefix agents routing prefix if not using `agents`
    * @param options MCP client and transport options
-   * @returns authUrl
+   * @returns Server id and state - either "authenticating" with authUrl, or "ready"
+   * @throws If connection or discovery fails
    */
   addMcpServer(
     serverName: string,
@@ -370,20 +376,35 @@ declare class Agent<
         type?: TransportType;
       };
     }
-  ): Promise<{
-    id: string;
-    authUrl: string | undefined;
-  }>;
-  private _connectToMcpServerInternal;
+  ): Promise<
+    | {
+        id: string;
+        state: typeof MCPConnectionState.AUTHENTICATING;
+        authUrl: string;
+      }
+    | {
+        id: string;
+        state: typeof MCPConnectionState.READY;
+        authUrl?: undefined;
+      }
+  >;
   removeMcpServer(id: string): Promise<void>;
-  /**
-   * Clear the auth_url for an MCP server after successful OAuth authentication
-   * This prevents the agent from continuously asking for OAuth on reconnect
-   * @param id The server ID to clear auth_url for
-   */
-  private clearMcpServerAuthUrl;
   getMcpServers(): MCPServersState;
   private broadcastMcpServers;
+  /**
+   * Handle MCP OAuth callback request if it's an OAuth callback.
+   *
+   * This method encapsulates the entire OAuth callback flow:
+   * 1. Checks if the request is an MCP OAuth callback
+   * 2. Processes the OAuth code exchange
+   * 3. Establishes the connection if successful
+   * 4. Broadcasts MCP server state updates
+   * 5. Returns the appropriate HTTP response
+   *
+   * @param request The incoming HTTP request
+   * @returns Response if this was an OAuth callback, null otherwise
+   */
+  private handleMcpOAuthCallback;
   /**
    * Handle OAuth callback response using MCPClientManager configuration
    * @param result OAuth callback result
@@ -563,4 +584,4 @@ export {
   WSMessage as x,
   StateUpdateMessage as y
 };
-//# sourceMappingURL=index-DEZFuVoU.d.ts.map
+//# sourceMappingURL=index-Bx5KK3VJ.d.ts.map

package/dist/index.d.ts

@@ -1,8 +1,8 @@
-import { u as TransportType } from "./client-GfgZTqrS.js";
-import "./mcp-Dw5vDrY8.js";
-import "./do-oauth-client-provider-DGc5pP0l.js";
-import "./index-DhJCaDWd.js";
-import "./ai-types-D5YoPrBZ.js";
+import { h as TransportType } from "./client-CsaP9Irq.js";
+import "./mcp-BwPscEiF.js";
+import "./do-oauth-client-provider-C2CHH5x-.js";
+import "./index-BUle9RiP.js";
+import "./ai-types-81H_-Uxh.js";
 import {
   A as unstable_callable,
   C as createAddressBasedEmailResolver,
@@ -34,7 +34,7 @@ import {
   w as createCatchAllEmailResolver,
   x as WSMessage,
   y as StateUpdateMessage
-} from "./index-DEZFuVoU.js";
+} from "./index-Bx5KK3VJ.js";
 export {
   Agent,
   AgentContext,

package/dist/index.js

@@ -1,7 +1,7 @@
-import "./ai-types-B3aQaFv3.js";
-import "./client-BfiZ3HQd.js";
-import "./client-DZhjV_XA.js";
-import "./do-oauth-client-provider-CswoD5Lu.js";
-import { a as createCatchAllEmailResolver, c as getCurrentAgent, d as unstable_callable, i as createAddressBasedEmailResolver, l as routeAgentEmail, n as StreamingResponse, o as createHeaderBasedEmailResolver, r as callable, s as getAgentByName, t as Agent, u as routeAgentRequest } from "./src-C8K3lu37.js";
+import "./ai-types-CrMqkwc_.js";
+import "./client-B3SR12TQ.js";
+import "./client-BZq9qau2.js";
+import "./do-oauth-client-provider-CwqK5SXm.js";
+import { a as createCatchAllEmailResolver, c as getCurrentAgent, d as unstable_callable, i as createAddressBasedEmailResolver, l as routeAgentEmail, n as StreamingResponse, o as createHeaderBasedEmailResolver, r as callable, s as getAgentByName, t as Agent, u as routeAgentRequest } from "./src-D_KKH_4c.js";
 
 export { Agent, StreamingResponse, callable, createAddressBasedEmailResolver, createCatchAllEmailResolver, createHeaderBasedEmailResolver, getAgentByName, getCurrentAgent, routeAgentEmail, routeAgentRequest, unstable_callable };

package/dist/mcp/client.d.ts

@@ -1,4 +1,4 @@
-import { i as getNamespacedData, n as MCPClientOAuthCallbackConfig, r as MCPClientOAuthResult, t as MCPClientManager } from "../client-GfgZTqrS.js";
-import "../mcp-Dw5vDrY8.js";
-import "../do-oauth-client-provider-DGc5pP0l.js";
-export { MCPClientManager, MCPClientOAuthCallbackConfig, MCPClientOAuthResult, getNamespacedData };
+import { a as MCPConnectionResult, c as RegisterServerOptions, i as MCPClientOAuthResult, l as getNamespacedData, n as MCPClientManagerOptions, o as MCPDiscoverResult, r as MCPClientOAuthCallbackConfig, s as MCPServerOptions, t as MCPClientManager } from "../client-CsaP9Irq.js";
+import "../mcp-BwPscEiF.js";
+import "../do-oauth-client-provider-C2CHH5x-.js";
+export { MCPClientManager, MCPClientManagerOptions, MCPClientOAuthCallbackConfig, MCPClientOAuthResult, MCPConnectionResult, MCPDiscoverResult, MCPServerOptions, RegisterServerOptions, getNamespacedData };

package/dist/mcp/client.js

@@ -1,3 +1,4 @@
-import { n as getNamespacedData, t as MCPClientManager } from "../client-DZhjV_XA.js";
+import { n as getNamespacedData, t as MCPClientManager } from "../client-BZq9qau2.js";
+import "../do-oauth-client-provider-CwqK5SXm.js";
 
 export { MCPClientManager, getNamespacedData };

package/dist/mcp/do-oauth-client-provider.d.ts

@@ -1,2 +1,2 @@
-import { n as DurableObjectOAuthClientProvider, t as AgentsOAuthProvider } from "../do-oauth-client-provider-DGc5pP0l.js";
+import { n as DurableObjectOAuthClientProvider, t as AgentsOAuthProvider } from "../do-oauth-client-provider-C2CHH5x-.js";
 export { AgentsOAuthProvider, DurableObjectOAuthClientProvider };

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

@@ -1,3 +1,3 @@
-import { t as DurableObjectOAuthClientProvider } from "../do-oauth-client-provider-CswoD5Lu.js";
+import { t as DurableObjectOAuthClientProvider } from "../do-oauth-client-provider-CwqK5SXm.js";
 
 export { DurableObjectOAuthClientProvider };

package/dist/mcp/index.d.ts

@@ -1,15 +1,15 @@
-import { c as MaybePromise, l as ServeOptions, n as MCPClientOAuthCallbackConfig, o as BaseTransportType, r as MCPClientOAuthResult, s as CORSOptions } from "../client-GfgZTqrS.js";
-import "../mcp-Dw5vDrY8.js";
-import "../do-oauth-client-provider-DGc5pP0l.js";
-import "../index-DhJCaDWd.js";
-import "../ai-types-D5YoPrBZ.js";
-import { c as ConnectionContext, s as Connection, t as Agent } from "../index-DEZFuVoU.js";
+import { a as MCPConnectionResult, d as BaseTransportType, f as CORSOptions, i as MCPClientOAuthResult, m as ServeOptions, o as MCPDiscoverResult, p as MaybePromise, r as MCPClientOAuthCallbackConfig, s as MCPServerOptions } from "../client-CsaP9Irq.js";
+import "../mcp-BwPscEiF.js";
+import "../do-oauth-client-provider-C2CHH5x-.js";
+import "../index-BUle9RiP.js";
+import "../ai-types-81H_-Uxh.js";
+import { c as ConnectionContext, s as Connection, t as Agent } from "../index-Bx5KK3VJ.js";
 import { SSEClientTransport, SSEClientTransportOptions } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StreamableHTTPClientTransport, StreamableHTTPClientTransportOptions } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { ElicitRequest, ElicitRequestSchema, ElicitResult, ElicitResult as ElicitResult$1, JSONRPCMessage, MessageExtraInfo } from "@modelcontextprotocol/sdk/types.js";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
+import { Transport, TransportSendOptions } from "@modelcontextprotocol/sdk/shared/transport.js";
 
 //#region src/mcp/client-transports.d.ts
 /**
@@ -91,7 +91,7 @@ declare class WorkerTransport implements Transport {
   private handleUnsupportedRequest;
   private validateSession;
   close(): Promise<void>;
-  send(message: JSONRPCMessage): Promise<void>;
+  send(message: JSONRPCMessage, options?: TransportSendOptions): Promise<void>;
 }
 //#endregion
 //#region src/mcp/auth-context.d.ts
@@ -144,7 +144,7 @@ declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Re
    */
   getSessionId(): string;
   /** Get the unique WebSocket. SSE transport only. */
-  private getWebSocket;
+  getWebSocket(): Connection<unknown> | null;
   /** Returns a new transport matching the type of the Agent. */
   private initTransport;
   /** Update and store the props */
@@ -157,7 +157,7 @@ declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Re
     request: req
   }: ConnectionContext): Promise<void>;
   /** Handles MCP Messages for the legacy SSE transport. */
-  onSSEMcpMessage(_sessionId: string, messageBody: unknown): Promise<Error | null>;
+  onSSEMcpMessage(_sessionId: string, messageBody: unknown, extraInfo?: MessageExtraInfo): Promise<Error | null>;
   /** Elicit user input with a message and schema */
   elicitInput(params: {
     message: string;
@@ -189,5 +189,5 @@ declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Re
   };
 }
 //#endregion
-export { type CreateMcpHandlerOptions, type ElicitRequest, ElicitRequestSchema, type ElicitResult, type MCPClientOAuthCallbackConfig, type MCPClientOAuthResult, McpAgent, type McpAuthContext, SSEEdgeClientTransport, StreamableHTTPEdgeClientTransport, type TransportState, WorkerTransport, type WorkerTransportOptions, createMcpHandler, experimental_createMcpHandler, getMcpAuthContext };
+export { type CreateMcpHandlerOptions, type ElicitRequest, ElicitRequestSchema, type ElicitResult, type MCPClientOAuthCallbackConfig, type MCPClientOAuthResult, type MCPConnectionResult, type MCPDiscoverResult, type MCPServerOptions, McpAgent, type McpAuthContext, SSEEdgeClientTransport, StreamableHTTPEdgeClientTransport, type TransportState, WorkerTransport, type WorkerTransportOptions, createMcpHandler, experimental_createMcpHandler, getMcpAuthContext };
 //# sourceMappingURL=index.d.ts.map

package/dist/mcp/index.js

@@ -1,8 +1,8 @@
-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-C8K3lu37.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";
@@ -434,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",
@@ -478,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");
@@ -641,6 +645,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.
@@ -861,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,
@@ -1101,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");
@@ -1250,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({});
 		}
 	}
@@ -1303,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;
@@ -1314,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);