agents 0.0.0-bfc9c75 → 0.0.0-bfe9e3d

package/dist/index.d.ts

@@ -8,12 +8,17 @@ import {
 } from "@modelcontextprotocol/sdk/types.js";
 import { Server, Connection, PartyServerOptions } from "partyserver";
 export { Connection, ConnectionContext, WSMessage } from "partyserver";
-import { M as MCPClientManager } from "./client-CvaJdLQA.js";
+import {
+  e as MCPClientManager,
+  T as TransportType,
+  f as MCPConnectionState
+} from "./client-DVoPb3-C.js";
 import { Observability } from "./observability/index.js";
 import { MessageType } from "./ai-types.js";
 import "zod";
 import "@modelcontextprotocol/sdk/shared/protocol.js";
 import "ai";
+import "./mcp-BH1fJeiU.js";
 import "@modelcontextprotocol/sdk/client/sse.js";
 import "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import "./mcp/do-oauth-client-provider.js";
@@ -124,6 +129,7 @@ type Schedule<T = string> = {
       cron: string;
     }
 );
+
 /**
  * MCP Server state update message from server -> Client
  */
@@ -143,7 +149,7 @@ type MCPServer = {
   name: string;
   server_url: string;
   auth_url: string | null;
-  state: "authenticating" | "connecting" | "ready" | "discovering" | "failed";
+  state: MCPConnectionState;
   instructions: string | null;
   capabilities: ServerCapabilities | null;
 };
@@ -166,8 +172,9 @@ declare class Agent<
   Props extends Record<string, unknown> = Record<string, unknown>
 > extends Server<Env, Props> {
   private _state;
+  private _disposables;
   private _ParentClass;
-  mcp: MCPClientManager;
+  readonly mcp: MCPClientManager;
   /**
    * Initial state for the Agent
    * Override to provide default state values
@@ -344,55 +351,40 @@ declare class Agent<
   /**
    * Connect to a new MCP Server
    *
+   * @param serverName Name of the MCP server
    * @param url MCP Server SSE URL
-   * @param callbackHost Base host for the agent, used for the redirect URI.
+   * @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 (header) options
+   * @param options MCP client and transport options
    * @returns authUrl
    */
   addMcpServer(
     serverName: string,
     url: string,
-    callbackHost: string,
+    callbackHost?: string,
     agentsPrefix?: string,
     options?: {
       client?: ConstructorParameters<typeof Client>[1];
-      transport?: {
-        headers: HeadersInit;
-      };
-    }
-  ): Promise<{
-    id: string;
-    authUrl: string | undefined;
-  }>;
-  _connectToMcpServerInternal(
-    _serverName: string,
-    url: string,
-    callbackUrl: string,
-    options?: {
-      client?: ConstructorParameters<typeof Client>[1];
-      /**
-       * We don't expose the normal set of transport options because:
-       * 1) we can't serialize things like the auth provider or a fetch function into the DB for reconnection purposes
-       * 2) We probably want these options to be agnostic to the transport type (SSE vs Streamable)
-       *
-       * This has the limitation that you can't override fetch, but I think headers should handle nearly all cases needed (i.e. non-standard bearer auth).
-       */
       transport?: {
         headers?: HeadersInit;
+        type?: TransportType;
       };
-    },
-    reconnect?: {
-      id: string;
-      oauthClientId?: string;
     }
   ): Promise<{
     id: string;
     authUrl: string | undefined;
-    clientId: string | undefined;
   }>;
+  private _connectToMcpServerInternal;
   removeMcpServer(id: string): Promise<void>;
   getMcpServers(): MCPServersState;
+  private broadcastMcpServers;
+  /**
+   * Handle OAuth callback response using MCPClientManager configuration
+   * @param result OAuth callback result
+   * @param request The original request (needed for base URL)
+   * @returns Response for the OAuth callback
+   */
+  private handleOAuthCallbackResponse;
 }
 /**
  * Namespace for creating Agent instances
@@ -552,6 +544,7 @@ export {
   type Schedule,
   type StateUpdateMessage,
   StreamingResponse,
+  TransportType,
   callable,
   createAddressBasedEmailResolver,
   createCatchAllEmailResolver,

package/dist/index.js

@@ -10,11 +10,12 @@ import {
   routeAgentEmail,
   routeAgentRequest,
   unstable_callable
-} from "./chunk-YDUDMOL6.js";
-import "./chunk-MH46VMM4.js";
-import "./chunk-LL2AFX7V.js";
+} from "./chunk-254F4GDT.js";
+import "./chunk-3OT2NNEW.js";
+import "./chunk-Z44WASMA.js";
 import "./chunk-QEVM4BVL.js";
-import "./chunk-AVYJQSLW.js";
+import "./chunk-BER7KXUJ.js";
+import "./chunk-PR4QN5HX.js";
 export {
   Agent,
   StreamingResponse,

package/dist/mcp/client.d.ts

@@ -3,7 +3,8 @@ import '@modelcontextprotocol/sdk/client/index.js';
 import '@modelcontextprotocol/sdk/shared/protocol.js';
 import '@modelcontextprotocol/sdk/types.js';
 import 'ai';
-export { M as MCPClientManager, g as getNamespacedData } from '../client-CvaJdLQA.js';
+export { e as MCPClientManager, d as MCPClientOAuthCallbackConfig, c as MCPClientOAuthResult, g as getNamespacedData } from '../client-DVoPb3-C.js';
+import '../mcp-BH1fJeiU.js';
 import '@modelcontextprotocol/sdk/client/sse.js';
 import '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import './do-oauth-client-provider.js';

package/dist/mcp/client.js

@@ -1,7 +1,8 @@
 import {
   MCPClientManager,
   getNamespacedData
-} from "../chunk-MH46VMM4.js";
+} from "../chunk-3OT2NNEW.js";
+import "../chunk-PR4QN5HX.js";
 export {
   MCPClientManager,
   getNamespacedData

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

@@ -1,6 +1,7 @@
 import {
   DurableObjectOAuthClientProvider
-} from "../chunk-LL2AFX7V.js";
+} from "../chunk-Z44WASMA.js";
+import "../chunk-PR4QN5HX.js";
 export {
   DurableObjectOAuthClientProvider
 };

package/dist/mcp/index.d.ts

@@ -2,12 +2,14 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { JSONRPCMessage, ElicitResult } from '@modelcontextprotocol/sdk/types.js';
 export { ElicitRequest, ElicitRequestSchema, ElicitResult } from '@modelcontextprotocol/sdk/types.js';
-import { Agent, AgentContext } from '../index.js';
-export { S as SSEEdgeClientTransport, a as StreamableHTTPEdgeClientTransport } from '../client-CvaJdLQA.js';
-import { Connection, ConnectionContext, WSMessage } from 'partyserver';
+import { Agent } from '../index.js';
+import { M as MaybePromise, B as BaseTransportType, S as ServeOptions } from '../client-DVoPb3-C.js';
+export { d as MCPClientOAuthCallbackConfig, c as MCPClientOAuthResult, a as SSEEdgeClientTransport, b as StreamableHTTPEdgeClientTransport } from '../client-DVoPb3-C.js';
+import { Connection, ConnectionContext } from 'partyserver';
 import 'cloudflare:workers';
 import '@modelcontextprotocol/sdk/client/index.js';
 import '../observability/index.js';
+import '../mcp-BH1fJeiU.js';
 import '../ai-types.js';
 import 'ai';
 import 'zod';
@@ -18,54 +20,34 @@ import './do-oauth-client-provider.js';
 import '@modelcontextprotocol/sdk/client/auth.js';
 import '@modelcontextprotocol/sdk/shared/auth.js';
 
-type MaybePromise<T> = T | Promise<T>;
-type TransportType = "sse" | "streamable-http";
-interface CORSOptions {
-    origin?: string;
-    methods?: string;
-    headers?: string;
-    maxAge?: number;
-    exposeHeaders?: string;
-}
-interface ServeOptions {
-    binding?: string;
-    corsOptions?: CORSOptions;
-    transport?: TransportType;
-}
-
 declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Record<string, unknown> = Record<string, unknown>> extends Agent<Env, State, Props> {
     private _transport?;
-    private _requestIdToConnectionId;
-    private _standaloneSseConnectionId?;
     props?: Props;
     abstract server: MaybePromise<McpServer | Server>;
     abstract init(): Promise<void>;
-    constructor(ctx: AgentContext, env: Env);
     setInitializeRequest(initializeRequest: JSONRPCMessage): Promise<void>;
     getInitializeRequest(): Promise<JSONRPCMessage | undefined>;
     /** Read the transport type for this agent.
      * This relies on the naming scheme being `sse:${sessionId}`
      * or `streamable-http:${sessionId}`.
      */
-    getTransportType(): TransportType;
-    /** Get the WebSocket for the standalone SSE if any. Streamable HTTP only. */
-    private getWebSocketForStandaloneSse;
+    getTransportType(): BaseTransportType;
+    /** Read the sessionId for this agent.
+     * This relies on the naming scheme being `sse:${sessionId}`
+     * or `streamable-http:${sessionId}`.
+     */
+    getSessionId(): string;
     /** Get the unique WebSocket. SSE transport only. */
     private getWebSocket;
-    /** Get the corresponding WebSocket for a responseId. Streamable HTTP only. */
-    private getWebSocketForResponseID;
     /** Returns a new transport matching the type of the Agent. */
     private initTransport;
     /** Update and store the props */
     updateProps(props?: Props): Promise<void>;
+    reinitializeServer(): Promise<void>;
     /** Sets up the MCP transport and server every time the Agent is started.*/
     onStart(props?: Props): Promise<void>;
     /** Validates new WebSocket connections. */
-    onConnect(conn: Connection, _: ConnectionContext): Promise<void>;
-    /** Handles MCP Messages for Streamable HTTP. */
-    onMessage(connection: Connection, event: WSMessage): Promise<void>;
-    /** Remove clients from our cache when they disconnect */
-    onClose(conn: Connection, _code: number, _reason: string, _wasClean: boolean): Promise<void>;
+    onConnect(conn: Connection, { request: req }: ConnectionContext): Promise<void>;
     /** Handles MCP Messages for the legacy SSE transport. */
     onSSEMcpMessage(_sessionId: string, messageBody: unknown): Promise<Error | null>;
     /** Elicit user input with a message and schema */