agents 0.0.0-cf3b3d7 → 0.0.0-d08612f

package/dist/{index-DCRAdW9R.d.ts → index-DPJ32qQn.d.ts}

@@ -1,10 +1,11 @@
+import { n as AgentEmail } from "./context-_sPQqJWv.js";
 import {
-  l as MCPConnectionState,
-  m as TransportType,
-  t as MCPClientManager
-} from "./client-BaCHMay9.js";
-import { t as Observability } from "./index-DhJCaDWd.js";
-import { n as MessageType } from "./ai-types-D5YoPrBZ.js";
+  h as TransportType,
+  t as MCPClientManager,
+  u as MCPConnectionState
+} from "./client-DfIOsabL.js";
+import { t as Observability } from "./index-CyDpAVHZ.js";
+import { n as MessageType } from "./ai-types-D_hTbf25.js";
 import {
   Connection,
   Connection as Connection$1,
@@ -139,9 +140,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;
@@ -325,7 +332,7 @@ declare class Agent<
   /**
    * Cancel a scheduled task
    * @param id ID of the task to cancel
-   * @returns true if the task was cancelled, false otherwise
+   * @returns true if the task was cancelled, false if the task was not found
    */
   cancelSchedule(id: string): Promise<boolean>;
   private _scheduleNextAlarm;
@@ -355,7 +362,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,
@@ -369,12 +377,20 @@ declare class Agent<
         type?: TransportType;
       };
     }
-  ): Promise<{
-    id: string;
-    authUrl: string | undefined;
-  }>;
+  ): Promise<
+    | {
+        id: string;
+        state: typeof MCPConnectionState.AUTHENTICATING;
+        authUrl: string;
+      }
+    | {
+        id: string;
+        state: typeof MCPConnectionState.READY;
+        authUrl?: undefined;
+      }
+  >;
   removeMcpServer(id: string): Promise<void>;
-  getMcpServers(): Promise<MCPServersState>;
+  getMcpServers(): MCPServersState;
   private broadcastMcpServers;
   /**
    * Handle MCP OAuth callback request if it's an OAuth callback.
@@ -474,16 +490,6 @@ declare function routeAgentEmail<Env>(
   env: Env,
   options: EmailRoutingOptions<Env>
 ): Promise<void>;
-type AgentEmail = {
-  from: string;
-  to: string;
-  getRaw: () => Promise<Uint8Array>;
-  headers: Headers;
-  rawSize: number;
-  setReject: (reason: string) => void;
-  forward: (rcptTo: string, headers?: Headers) => Promise<void>;
-  reply: (options: { from: string; to: string; raw: string }) => Promise<void>;
-};
 type EmailSendOptions = {
   to: string;
   subject: string;
@@ -538,35 +544,34 @@ declare class StreamingResponse {
 }
 //#endregion
 export {
-  unstable_callable as A,
-  createAddressBasedEmailResolver as C,
-  getCurrentAgent as D,
-  getAgentByName as E,
-  routeAgentEmail as O,
-  callable as S,
-  createHeaderBasedEmailResolver as T,
-  RPCResponse as _,
-  AgentOptions as a,
-  StreamingResponse as b,
-  ConnectionContext as c,
-  EmailSendOptions as d,
-  MCPServer as f,
-  RPCRequest as g,
-  QueueItem as h,
-  AgentNamespace as i,
-  routeAgentRequest as k,
-  EmailResolver as l,
-  MCPServersState as m,
+  createCatchAllEmailResolver as C,
+  routeAgentEmail as D,
+  getCurrentAgent as E,
+  routeAgentRequest as O,
+  createAddressBasedEmailResolver as S,
+  getAgentByName as T,
+  Schedule as _,
+  CallableMetadata as a,
+  WSMessage as b,
+  EmailResolver as c,
+  MCPServer as d,
+  MCPServerMessage as f,
+  RPCResponse as g,
+  RPCRequest as h,
+  AgentOptions as i,
+  unstable_callable as k,
+  EmailRoutingOptions as l,
+  QueueItem as m,
   AgentContext as n,
-  CallableMetadata as o,
-  MCPServerMessage as p,
-  AgentEmail as r,
-  Connection$1 as s,
+  Connection$1 as o,
+  MCPServersState as p,
+  AgentNamespace as r,
+  ConnectionContext as s,
   Agent as t,
-  EmailRoutingOptions as u,
-  Schedule as v,
-  createCatchAllEmailResolver as w,
-  WSMessage as x,
-  StateUpdateMessage as y
+  EmailSendOptions as u,
+  StateUpdateMessage as v,
+  createHeaderBasedEmailResolver as w,
+  callable as x,
+  StreamingResponse as y
 };
-//# sourceMappingURL=index-DCRAdW9R.d.ts.map
+//# sourceMappingURL=index-DPJ32qQn.d.ts.map

package/dist/index.d.ts

@@ -1,40 +1,40 @@
-import { m as TransportType } from "./client-BaCHMay9.js";
-import "./mcp-Dw5vDrY8.js";
-import "./do-oauth-client-provider-CnbnngL2.js";
-import "./index-DhJCaDWd.js";
-import "./ai-types-D5YoPrBZ.js";
+import { n as AgentEmail } from "./context-_sPQqJWv.js";
+import { h as TransportType } from "./client-DfIOsabL.js";
+import "./mcp-CzbSsLfc.js";
+import "./do-oauth-client-provider-B-ryFIPr.js";
+import "./index-CyDpAVHZ.js";
+import "./ai-types-D_hTbf25.js";
 import {
-  A as unstable_callable,
-  C as createAddressBasedEmailResolver,
-  D as getCurrentAgent,
-  E as getAgentByName,
-  O as routeAgentEmail,
-  S as callable,
-  T as createHeaderBasedEmailResolver,
-  _ as RPCResponse,
-  a as AgentOptions,
-  b as StreamingResponse,
-  c as ConnectionContext,
-  d as EmailSendOptions,
-  f as MCPServer,
-  g as RPCRequest,
-  h as QueueItem,
-  i as AgentNamespace,
-  k as routeAgentRequest,
-  l as EmailResolver,
-  m as MCPServersState,
+  C as createCatchAllEmailResolver,
+  D as routeAgentEmail,
+  E as getCurrentAgent,
+  O as routeAgentRequest,
+  S as createAddressBasedEmailResolver,
+  T as getAgentByName,
+  _ as Schedule,
+  a as CallableMetadata,
+  b as WSMessage,
+  c as EmailResolver,
+  d as MCPServer,
+  f as MCPServerMessage,
+  g as RPCResponse,
+  h as RPCRequest,
+  i as AgentOptions,
+  k as unstable_callable,
+  l as EmailRoutingOptions,
+  m as QueueItem,
   n as AgentContext,
-  o as CallableMetadata,
-  p as MCPServerMessage,
-  r as AgentEmail,
-  s as Connection,
+  o as Connection,
+  p as MCPServersState,
+  r as AgentNamespace,
+  s as ConnectionContext,
   t as Agent,
-  u as EmailRoutingOptions,
-  v as Schedule,
-  w as createCatchAllEmailResolver,
-  x as WSMessage,
-  y as StateUpdateMessage
-} from "./index-DCRAdW9R.js";
+  u as EmailSendOptions,
+  v as StateUpdateMessage,
+  w as createHeaderBasedEmailResolver,
+  x as callable,
+  y as StreamingResponse
+} from "./index-DPJ32qQn.js";
 export {
   Agent,
   AgentContext,

package/dist/index.js

@@ -1,7 +1,8 @@
-import "./ai-types-B3aQaFv3.js";
-import "./client-BfiZ3HQd.js";
-import "./client-DpkZyXgJ.js";
-import "./do-oauth-client-provider-D2P1lSft.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-Dk8lwxHf.js";
+import "./context-BkKbAa1R.js";
+import "./ai-types-CwgHzwUb.js";
+import "./client-CcyhkGfN.js";
+import "./client-QZa2Rq0l.js";
+import "./do-oauth-client-provider-B1fVIshX.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-BmbDclOA.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 { a as MCPConnectionResult, c as getNamespacedData, i as MCPClientOAuthResult, n as MCPClientManagerOptions, o as MCPServerOptions, r as MCPClientOAuthCallbackConfig, s as RegisterServerOptions, t as MCPClientManager } from "../client-BaCHMay9.js";
-import "../mcp-Dw5vDrY8.js";
-import "../do-oauth-client-provider-CnbnngL2.js";
-export { MCPClientManager, MCPClientManagerOptions, MCPClientOAuthCallbackConfig, MCPClientOAuthResult, MCPConnectionResult, MCPServerOptions, RegisterServerOptions, 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-DfIOsabL.js";
+import "../mcp-CzbSsLfc.js";
+import "../do-oauth-client-provider-B-ryFIPr.js";
+export { MCPClientManager, MCPClientManagerOptions, MCPClientOAuthCallbackConfig, MCPClientOAuthResult, MCPConnectionResult, MCPDiscoverResult, MCPServerOptions, RegisterServerOptions, getNamespacedData };

package/dist/mcp/client.js

@@ -1,4 +1,4 @@
-import { n as getNamespacedData, t as MCPClientManager } from "../client-DpkZyXgJ.js";
-import "../do-oauth-client-provider-D2P1lSft.js";
+import { n as getNamespacedData, t as MCPClientManager } from "../client-QZa2Rq0l.js";
+import "../do-oauth-client-provider-B1fVIshX.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-CnbnngL2.js";
+import { n as DurableObjectOAuthClientProvider, t as AgentsOAuthProvider } from "../do-oauth-client-provider-B-ryFIPr.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-D2P1lSft.js";
+import { t as DurableObjectOAuthClientProvider } from "../do-oauth-client-provider-B1fVIshX.js";
 
 export { DurableObjectOAuthClientProvider };

package/dist/mcp/index.d.ts

@@ -1,9 +1,10 @@
-import { a as MCPConnectionResult, d as CORSOptions, f as MaybePromise, i as MCPClientOAuthResult, o as MCPServerOptions, p as ServeOptions, r as MCPClientOAuthCallbackConfig, u as BaseTransportType } from "../client-BaCHMay9.js";
-import "../mcp-Dw5vDrY8.js";
-import "../do-oauth-client-provider-CnbnngL2.js";
-import "../index-DhJCaDWd.js";
-import "../ai-types-D5YoPrBZ.js";
-import { c as ConnectionContext, s as Connection, t as Agent } from "../index-DCRAdW9R.js";
+import "../context-_sPQqJWv.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-DfIOsabL.js";
+import "../mcp-CzbSsLfc.js";
+import "../do-oauth-client-provider-B-ryFIPr.js";
+import "../index-CyDpAVHZ.js";
+import "../ai-types-D_hTbf25.js";
+import { o as Connection, s as ConnectionContext, t as Agent } from "../index-DPJ32qQn.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";
@@ -144,7 +145,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 +158,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 +190,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, type MCPConnectionResult, type MCPServerOptions, 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,9 @@
-import { t as MessageType } from "../ai-types-B3aQaFv3.js";
-import "../client-BfiZ3HQd.js";
-import "../client-DpkZyXgJ.js";
-import "../do-oauth-client-provider-D2P1lSft.js";
-import { c as getCurrentAgent, s as getAgentByName, t as Agent } from "../src-Dk8lwxHf.js";
+import "../context-BkKbAa1R.js";
+import { t as MessageType } from "../ai-types-CwgHzwUb.js";
+import "../client-CcyhkGfN.js";
+import "../client-QZa2Rq0l.js";
+import "../do-oauth-client-provider-B1fVIshX.js";
+import { c as getCurrentAgent, s as getAgentByName, t as Agent } from "../src-BmbDclOA.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 +435,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 +480,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 +646,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.
@@ -1250,7 +1258,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 +1311,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 +1322,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);