agents 0.19.0 → 0.20.1

package/dist/{agent-tool-types-BNUGGBzQ.d.ts → agent-tool-types-BC-WFlsz.d.ts}

@@ -5,7 +5,19 @@ import {
   r as ObservabilityEvent,
   s as MCPObservabilityEvent
 } from "./index-BRnybD6X.js";
-import { t as AgentMcpOAuthProvider } from "./do-oauth-client-provider-D4ZwyBDu.js";
+import { t as AgentMcpOAuthProvider } from "./do-oauth-client-provider-VTZj2VtM.js";
+import {
+  a as McpAuthContext,
+  c as CORSOptions,
+  d as ServeOptions,
+  f as TransportType,
+  l as MaybePromise,
+  n as StatelessMcpHandler,
+  s as BaseTransportType,
+  t as CreateStatelessMcpHandlerOptions,
+  u as McpClientOptions
+} from "./handler-stateless-C_bo-Ytq.js";
+import { n as LegacyCallToolResultSchema } from "./client-invoker-BNSZxAkv.js";
 import {
   _ as WorkflowEventPayload,
   d as WorkflowCallback,
@@ -29,51 +41,58 @@ import {
   WSMessage as WSMessage$1
 } from "partyserver";
 import { z } from "zod";
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import {
-  SSEClientTransport,
-  SSEClientTransportOptions
-} from "@modelcontextprotocol/sdk/client/sse.js";
-import {
-  StreamableHTTPClientTransport,
-  StreamableHTTPClientTransportOptions
-} from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import {
+  CacheableRequestOptions,
   CallToolRequest,
-  CallToolResultSchema,
+  CallToolRequestOptions,
+  Client,
   ClientCapabilities,
-  CompatibilityCallToolResultSchema,
+  DiscoverResult,
   ElicitRequest,
   ElicitRequest as ElicitRequest$1,
-  ElicitRequestSchema as ElicitRequestSchema$1,
+  ElicitRequest as ElicitRequest$2,
   ElicitResult,
-  ElicitResult as ElicitResult$1,
+  ElicitResult as ElicitResult$2,
+  ElicitResult as ElicitResult$3,
   GetPromptRequest,
-  InitializeRequestParams,
   JSONRPCMessage,
   MessageExtraInfo,
   Prompt,
   ReadResourceRequest,
-  RequestId,
+  RequestOptions,
   Resource,
-  ResourceTemplate,
+  ResourceTemplateType,
+  SSEClientTransport,
+  SSEClientTransportOptions,
   ServerCapabilities,
-  Tool
+  StreamableHTTPClientTransport,
+  StreamableHTTPClientTransportOptions,
+  StreamableHTTPReconnectionOptions,
+  Tool,
+  Transport,
+  TransportSendOptions
+} from "@modelcontextprotocol/client";
+import {
+  ElicitRequestSchema,
+  ElicitResult as ElicitResult$1,
+  InitializeRequestParams,
+  JSONRPCMessage as JSONRPCMessage$1,
+  MessageExtraInfo as MessageExtraInfo$1,
+  RequestId
 } from "@modelcontextprotocol/sdk/types.js";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { McpServerFactory } from "@modelcontextprotocol/server";
+import { McpServer as McpServer$1 } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { Server as Server$2 } from "@modelcontextprotocol/sdk/server/index.js";
 import {
   EventStore as EventStore$1,
   StreamId as StreamId$1,
-  WebStandardStreamableHTTPServerTransport,
+  WebStandardStreamableHTTPServerTransport as WebStandardStreamableHTTPServerTransport$1,
   WebStandardStreamableHTTPServerTransportOptions
 } from "@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js";
-import { RequestOptions } from "@modelcontextprotocol/sdk/shared/protocol.js";
 import {
-  Transport,
-  TransportSendOptions
+  Transport as Transport$1,
+  TransportSendOptions as TransportSendOptions$1
 } from "@modelcontextprotocol/sdk/shared/transport.js";
-import { Server as Server$1 } from "@modelcontextprotocol/sdk/server/index.js";
-import { Client as Client$1 } from "@modelcontextprotocol/sdk/client";
 import {
   EventId,
   EventStore,
@@ -81,6 +100,33 @@ import {
 } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import { AuthInfo } from "@modelcontextprotocol/sdk/server/auth/types.js";
 
+//#region src/observability/tracing/tracer.d.ts
+type InvocationScopeOptions = {
+  /**
+   * Open a scope even inside a live one, for work deliberately detached from
+   * the handler that started it — `ctx.waitUntil` bodies, queue drains — which
+   * runs on past that handler and must not be cut off with it.
+   */
+  readonly detached?: boolean;
+};
+/**
+ * Runs `body` as one traced invocation.
+ *
+ * Work that escapes its native invocation cannot be traced from the context it
+ * started in: the still-open span is force-closed against the invocation that
+ * owned that context, which reports a negative duration or `span_not_ended`.
+ * Spans opened with {@link SpanLifetime.boundToInvocation} inside this scope
+ * are therefore closed before `body` settles — but not one moment earlier, so
+ * everything that completes during the invocation (the normal case: a chat
+ * turn is awaited by the handler that received it) still records its finish
+ * attributes. A span truncated this way is marked
+ * `cloudflare.agents.span.truncated` rather than passing as complete.
+ */
+declare function withInvocationScope<T>(
+  body: () => T,
+  options?: InvocationScopeOptions
+): T;
+//#endregion
 //#region src/sub-routing.d.ts
 /**
  * URL segment marking a parent↔child boundary.
@@ -209,35 +255,15 @@ declare class Emitter<T> implements Disposable {
   dispose(): void;
 }
 //#endregion
-//#region src/mcp/types.d.ts
-type MaybePromise<T> = T | Promise<T>;
-type HttpTransportType = "sse" | "streamable-http";
-type BaseTransportType = HttpTransportType | "rpc";
-type TransportType = BaseTransportType | "auto";
-interface CORSOptions {
-  origin?: string;
-  methods?: string;
-  headers?: string;
-  maxAge?: number;
-  exposeHeaders?: string;
-}
-interface ServeOptions {
-  binding?: string;
-  corsOptions?: CORSOptions;
-  transport?: TransportType;
-  jurisdiction?: DurableObjectJurisdiction;
-}
-type McpClientOptions = ConstructorParameters<typeof Client$1>[1];
-//#endregion
 //#region src/mcp/client-transports.d.ts
 /**
- * @deprecated Use SSEClientTransport from @modelcontextprotocol/sdk/client/sse.js instead. This alias will be removed in the next major version.
+ * @deprecated Use SSEClientTransport from @modelcontextprotocol/client instead. This alias will be removed in the next major version.
  */
 declare class SSEEdgeClientTransport extends SSEClientTransport {
   constructor(url: URL, options: SSEClientTransportOptions);
 }
 /**
- * @deprecated Use StreamableHTTPClientTransport from @modelcontextprotocol/sdk/client/streamableHttp.js instead. This alias will be removed in the next major version.
+ * @deprecated Use StreamableHTTPClientTransport from @modelcontextprotocol/client instead. This alias will be removed in the next major version.
  */
 declare class StreamableHTTPEdgeClientTransport extends StreamableHTTPClientTransport {
   constructor(url: URL, options: StreamableHTTPClientTransportOptions);
@@ -275,26 +301,13 @@ interface WorkerTransportOptions extends WebStandardStreamableHTTPServerTranspor
    */
   storage?: MCPStorageApi;
 }
-declare class WorkerTransport extends WebStandardStreamableHTTPServerTransport {
+declare class WorkerTransport extends WebStandardStreamableHTTPServerTransport$1 {
   private readonly _corsOptions?;
   private readonly _storage?;
   private _stateRestored;
   private _capturedInitializeParams?;
   private _userOnSessionInitialized?;
   private _bridgeInstalled;
-  /**
-   * Tracks keepalive interval cleanups so we can fire them eagerly when the
-   * SDK closes the underlying SSE stream via `closeSSEStream(requestId)` or
-   * `closeStandaloneSSEStream()`. Keyed by the JSON-RPC request id that
-   * triggered the stream, or the sentinel for the standalone GET stream.
-   */
-  private readonly _keepaliveCleanups;
-  /**
-   * Most recent JSON-RPC request id seen on an incoming POST. Used to key
-   * keepalive cleanups when the response is an SSE stream tied to that
-   * request (so `closeSSEStream(id)` can find and clear the interval).
-   */
-  private _pendingRequestId?;
   /**
    * Request ids whose SSE stream was deliberately torn down via
    * `closeSSEStream`. The SDK's `send()` throws "No connection established"
@@ -315,8 +328,7 @@ declare class WorkerTransport extends WebStandardStreamableHTTPServerTransport {
   /**
    * Top-level request entry point. Handles CORS preflight, restores any
    * persisted state on first invocation, then delegates to the SDK transport
-   * and finally appends CORS headers + keepalive to whatever response comes
-   * back.
+   * and finally appends CORS headers to whatever response comes back.
    */
   handleRequest(
     request: Request,
@@ -332,7 +344,6 @@ declare class WorkerTransport extends WebStandardStreamableHTTPServerTransport {
    */
   private normalizeAllowHeader;
   closeSSEStream(requestId: RequestId): void;
-  closeStandaloneSSEStream(): void;
   close(): Promise<void>;
   /**
    * Swallow two classes of message that would otherwise surface as
@@ -353,35 +364,10 @@ declare class WorkerTransport extends WebStandardStreamableHTTPServerTransport {
    * unhandled-rejection tracker can fire before the caller's own `await`
    * observes it.
    */
-  send(message: JSONRPCMessage, options?: TransportSendOptions): Promise<void>;
-  /**
-   * If the response is an SSE stream, tee the body through a TransformStream
-   * that injects a `: keepalive\n\n` comment frame every 25s. The interval
-   * is cleared when the wrapped stream closes — which happens both when the
-   * SDK ends the underlying stream naturally and when `closeSSEStream` is
-   * called.
-   *
-   * Keepalive policy:
-   *   - POST response streams (`key` is a request id): always keepalive.
-   *     In-progress tool calls have no recovery path — if the stream drops
-   *     mid-execution the result is lost — so we keep it under the
-   *     Cloudflare edge ~5min idle watchdog.
-   *   - Standalone GET stream (`key === "_standalone"`): keepalive only
-   *     when no `eventStore` is configured. When resumability is enabled,
-   *     clients reconnect with `Last-Event-ID` after an idle drop, so we
-   *     skip the keepalive and let the DO hibernate.
-   *
-   * Uses the shared `sse-keepalive` constants so both this wrapper and
-   * `McpAgent.serve()` write identical frames at the same cadence.
-   * See cloudflare/agents#1583.
-   */
-  private withKeepalive;
-  /**
-   * Does the SDK transport have an `eventStore`? Reaches into the SDK's
-   * private field because the option isn't surfaced on the public API —
-   * we only need a yes/no for keepalive policy.
-   */
-  private eventStoreConfigured;
+  send(
+    message: JSONRPCMessage$1,
+    options?: TransportSendOptions$1
+  ): Promise<void>;
   private getCorsHeaders;
   private withCorsHeaders;
   private installOnSessionInitializedBridge;
@@ -390,42 +376,58 @@ declare class WorkerTransport extends WebStandardStreamableHTTPServerTransport {
   private saveState;
 }
 //#endregion
-//#region src/mcp/auth-context.d.ts
-interface McpAuthContext {
-  props: Record<string, unknown>;
-}
-declare function getMcpAuthContext(): McpAuthContext | undefined;
-//#endregion
-//#region src/mcp/handler.d.ts
-interface CreateMcpHandlerOptions extends WorkerTransportOptions {
-  /**
-   * The route path that this MCP handler should respond to.
-   * If specified, the handler will only process requests that match this route.
-   * @default "/mcp"
-   */
+//#region src/mcp/handler-legacy.d.ts
+/** Options for the retained SDK v1, sessionful handler. */
+interface CreateLegacyMcpHandlerOptions extends WorkerTransportOptions {
+  /** Exact route handled by this handler. @default "/mcp" */
   route?: string;
-  /**
-   * An optional auth context to use for handling MCP requests.
-   * If not provided, the handler will look for props in the execution context.
-   */
+  /** Application props exposed through {@link getMcpAuthContext}. */
   authContext?: McpAuthContext;
-  /**
-   * An optional transport to use for handling MCP requests.
-   * If not provided, a WorkerTransport will be created with the provided WorkerTransportOptions.
-   */
+  /** Pre-created sessionful transport. */
   transport?: WorkerTransport;
 }
-declare function createMcpHandler(
-  server: McpServer | Server$1,
-  options?: CreateMcpHandlerOptions
-): (request: Request, env: unknown, ctx: ExecutionContext) => Promise<Response>;
+type CreateMcpHandlerOptions$1 = CreateLegacyMcpHandlerOptions;
+type LegacyMcpHandler = (
+  request: Request,
+  env: unknown,
+  ctx: ExecutionContext
+) => Promise<Response>;
+/**
+ * Create a sessionful Legacy MCP handler backed by SDK v1.
+ *
+ * New Stateless servers should use `createMcpHandler` from
+ * `agents/mcp/server` instead.
+ */
+declare function createLegacyMcpHandler(
+  server: McpServer$1 | Server$2,
+  options?: CreateLegacyMcpHandlerOptions
+): LegacyMcpHandler;
+//#endregion
+//#region src/mcp/handler-compat.d.ts
 /**
- * @deprecated This has been renamed to createMcpHandler, and experimental_createMcpHandler will be removed in the next major version
+ * @deprecated Passing an SDK v1 server to createMcpHandler is deprecated and
+ * will be removed in the next major version. Pass an SDK v2 factory to
+ * createMcpHandler. Use createLegacyMcpHandler only to temporarily retain
+ * sessionful SDK v1 behavior while migrating.
+ */
+declare function createMcpHandler$1(
+  server: McpServer$1 | Server$2,
+  options?: CreateMcpHandlerOptions$1
+): LegacyMcpHandler;
+declare function createMcpHandler$1(
+  factory: McpServerFactory,
+  options?: CreateStatelessMcpHandlerOptions
+): StatelessMcpHandler;
+/**
+ * @deprecated Pass an SDK v2 factory to createMcpHandler.
+ * experimental_createMcpHandler will be removed in the next major version.
+ * Use createLegacyMcpHandler only to temporarily retain sessionful SDK v1
+ * behavior while migrating.
  */
 declare function experimental_createMcpHandler(
-  server: McpServer | Server$1,
-  options?: CreateMcpHandlerOptions
-): (request: Request, env: unknown, ctx: ExecutionContext) => Promise<Response>;
+  server: McpServer$1 | Server$2,
+  options?: CreateMcpHandlerOptions$1
+): LegacyMcpHandler;
 //#endregion
 //#region src/mcp/event-store.d.ts
 /**
@@ -481,14 +483,14 @@ declare class DurableObjectEventStore implements EventStore {
   private readonly seqByStream;
   private readonly seqInit;
   constructor(storage: DurableObjectStorage);
-  storeEvent(streamId: StreamId, message: JSONRPCMessage): Promise<EventId>;
+  storeEvent(streamId: StreamId, message: JSONRPCMessage$1): Promise<EventId>;
   getStreamIdForEventId(eventId: EventId): Promise<StreamId | undefined>;
   replayEventsAfter(
     lastEventId: EventId,
     {
       send
     }: {
-      send: (eventId: EventId, message: JSONRPCMessage) => Promise<void>;
+      send: (eventId: EventId, message: JSONRPCMessage$1) => Promise<void>;
     }
   ): Promise<StreamId>;
   /**
@@ -515,7 +517,13 @@ interface ClearableEventStore extends EventStore$1 {
   clearStream(streamId: StreamId$1): Promise<void>;
 }
 //#endregion
-//#region src/mcp/index.d.ts
+//#region src/mcp/legacy-agent.d.ts
+/**
+ * @deprecated McpAgent is feature-frozen. Migrate to an SDK v2 factory with
+ * createMcpHandler from agents/mcp/server. When sessionful features prevent an
+ * immediate migration, run the stateless route beside the existing McpAgent
+ * route until clients transition and sessions drain.
+ */
 declare abstract class McpAgent<
   Env extends Cloudflare.Env = Cloudflare.Env,
   State = unknown,
@@ -528,10 +536,10 @@ declare abstract class McpAgent<
     _connection: Connection$1,
     ctx: ConnectionContext$1
   ): boolean;
-  abstract server: MaybePromise<McpServer | Server$1>;
+  abstract server: MaybePromise<McpServer$1 | Server$2>;
   abstract init(): Promise<void>;
-  setInitializeRequest(initializeRequest: JSONRPCMessage): Promise<void>;
-  getInitializeRequest(): Promise<JSONRPCMessage | undefined>;
+  setInitializeRequest(initializeRequest: JSONRPCMessage$1): Promise<void>;
+  getInitializeRequest(): Promise<JSONRPCMessage$1 | undefined>;
   /**
    * Storage key prefix for the `streamId -> requestIds` mapping used
    * to support POST stream resumption across WebSocket reconnects.
@@ -628,7 +636,7 @@ declare abstract class McpAgent<
   onSSEMcpMessage(
     _sessionId: string,
     messageBody: unknown,
-    extraInfo?: MessageExtraInfo
+    extraInfo?: MessageExtraInfo$1
   ): Promise<Error | null>;
   /** Elicit user input with a message and schema */
   elicitInput(
@@ -639,7 +647,7 @@ declare abstract class McpAgent<
     options?: {
       relatedRequestId?: RequestId;
     }
-  ): Promise<ElicitResult>;
+  ): Promise<ElicitResult$1>;
   /** Handle elicitation responses via in-memory resolver */
   private _handleElicitationResponse;
   /**
@@ -649,8 +657,8 @@ declare abstract class McpAgent<
    * @returns The response message(s) or undefined
    */
   handleMcpMessage(
-    message: JSONRPCMessage | JSONRPCMessage[]
-  ): Promise<JSONRPCMessage | JSONRPCMessage[] | undefined>;
+    message: JSONRPCMessage$1 | JSONRPCMessage$1[]
+  ): Promise<JSONRPCMessage$1 | JSONRPCMessage$1[] | undefined>;
   /** Return a handler for the given path for this MCP.
    * Defaults to Streamable HTTP transport.
    */
@@ -693,6 +701,8 @@ declare abstract class McpAgent<
 }
 //#endregion
 //#region src/mcp/rpc.d.ts
+type JSONRPCMessage$2 = JSONRPCMessage$1;
+type MessageExtraInfo$2 = MessageExtraInfo$1;
 declare const RPC_DO_PREFIX = "rpc:";
 interface RPCClientTransportOptions<T extends McpAgent = McpAgent> {
   namespace: DurableObjectNamespace<T>;
@@ -723,7 +733,7 @@ declare class RPCClientTransport implements Transport {
 interface RPCServerTransportOptions {
   timeout?: number;
 }
-declare class RPCServerTransport implements Transport {
+declare class RPCServerTransport implements Transport$1 {
   private _started;
   private _protocolVersion?;
   private _timeout;
@@ -732,7 +742,7 @@ declare class RPCServerTransport implements Transport {
   sessionId?: string;
   onclose?: () => void;
   onerror?: (error: Error) => void;
-  onmessage?: (message: JSONRPCMessage, extra?: MessageExtraInfo) => void;
+  onmessage?: (message: JSONRPCMessage$2, extra?: MessageExtraInfo$2) => void;
   constructor(options?: RPCServerTransportOptions);
   setProtocolVersion(version: string): void;
   getProtocolVersion(): string | undefined;
@@ -745,7 +755,10 @@ declare class RPCServerTransport implements Transport {
   private _appendRequest;
   private _completeContinuation;
   private _appendContinuation;
-  send(message: JSONRPCMessage, options?: TransportSendOptions): Promise<void>;
+  send(
+    message: JSONRPCMessage$2,
+    options?: TransportSendOptions$1
+  ): Promise<void>;
   /**
    * @internal Called by McpAgent.handleMcpMessage() — not for external use.
    *
@@ -759,11 +772,11 @@ declare class RPCServerTransport implements Transport {
    * for id-based routing; this continuation waiter receives it instead.
    */
   _awaitPendingResponse(): Promise<
-    JSONRPCMessage | JSONRPCMessage[] | undefined
+    JSONRPCMessage$2 | JSONRPCMessage$2[] | undefined
   >;
   handle(
-    message: JSONRPCMessage | JSONRPCMessage[]
-  ): Promise<JSONRPCMessage | JSONRPCMessage[] | undefined>;
+    message: JSONRPCMessage$2 | JSONRPCMessage$2[]
+  ): Promise<JSONRPCMessage$2 | JSONRPCMessage$2[] | undefined>;
 }
 //#endregion
 //#region src/mcp/client-connection.d.ts
@@ -815,7 +828,11 @@ type MCPDiscoveryResult =
  * Held in memory only — never persisted — so it must be re-supplied when a
  * connection is recreated (e.g. after Durable Object hibernation).
  */
-type MCPElicitationHandler = (request: ElicitRequest) => Promise<ElicitResult>;
+type MCPElicitationHandler = (
+  request: ElicitRequest /** Aborts when the originating MCP call is cancelled or exhausts its total-time budget. */,
+
+  signal?: AbortSignal
+) => Promise<ElicitResult>;
 type MCPElicitationHandlers = {
   form?: MCPElicitationHandler;
   url?: MCPElicitationHandler;
@@ -825,7 +842,7 @@ declare class MCPClientConnection {
   private readonly _info;
   options: {
     transport: MCPTransportOptions;
-    client: McpClientOptions;
+    client: NonNullable<McpClientOptions>;
     elicitationHandlers?: MCPElicitationHandlers;
     /**
      * Client capabilities persisted from a previous session, advertised
@@ -833,7 +850,8 @@ declare class MCPClientConnection {
      * by {@link configureElicitationHandlers} — reconfigured handlers are
      * the source of truth. Explicit `client.capabilities` win per key.
      */
-    capabilitySeed?: ClientCapabilities;
+    capabilitySeed?: ClientCapabilities /** SDK discovery result paired with a resumed Stateless HTTP session. */;
+    discoverResult?: DiscoverResult;
   };
   client: Client;
   connectionState: MCPConnectionState;
@@ -850,9 +868,10 @@ declare class MCPClientConnection {
    * endpoint when the authorization server is not at the default location.
    */
   private _pendingAuthTransport?;
+  private _restoredListSubscription?;
   prompts: Prompt[];
   resources: Resource[];
-  resourceTemplates: ResourceTemplate[];
+  resourceTemplates: ResourceTemplateType[];
   serverCapabilities: ServerCapabilities | undefined;
   /** True when resuming a streamable-http session without cached capabilities */
   private _probingCapabilities;
@@ -860,6 +879,8 @@ declare class MCPClientConnection {
   private _discoveryAbortController;
   private readonly _onObservabilityEvent;
   readonly onObservabilityEvent: Event<MCPObservabilityEvent>;
+  private readonly _onListChanged;
+  readonly onListChanged: Event<void>;
   /**
    * Whether the connection advertised the elicitation capability. The SDK
    * client refuses to register an `elicitation/create` request handler when
@@ -872,7 +893,7 @@ declare class MCPClientConnection {
     _info: ConstructorParameters<typeof Client>[0],
     options?: {
       transport: MCPTransportOptions;
-      client: McpClientOptions;
+      client: NonNullable<McpClientOptions>;
       elicitationHandlers?: MCPElicitationHandlers;
       /**
        * Client capabilities persisted from a previous session, advertised
@@ -880,7 +901,8 @@ declare class MCPClientConnection {
        * by {@link configureElicitationHandlers} — reconfigured handlers are
        * the source of truth. Explicit `client.capabilities` win per key.
        */
-      capabilitySeed?: ClientCapabilities;
+      capabilitySeed?: ClientCapabilities /** SDK discovery result paired with a resumed Stateless HTTP session. */;
+      discoverResult?: DiscoverResult;
     }
   );
   private createClient;
@@ -912,7 +934,7 @@ declare class MCPClientConnection {
    * Complete OAuth authorization
    */
   completeAuthorization(
-    code: string,
+    callback: string | URLSearchParams,
     options?: {
       alreadyAccepted?: boolean;
     }
@@ -951,7 +973,8 @@ declare class MCPClientConnection {
    * Should only be called if serverCapabilities.prompts exists
    */
   registerPrompts(): Promise<Prompt[]>;
-  registerResourceTemplates(): Promise<ResourceTemplate[]>;
+  registerResourceTemplates(): Promise<ResourceTemplateType[]>;
+  private catalogFetchOptions;
   fetchTools(): Promise<
     {
       inputSchema: {
@@ -959,7 +982,648 @@ declare class MCPClientConnection {
         type: "object";
         properties?:
           | {
-              [x: string]: object;
+              [x: string]:
+                | string
+                | number
+                | boolean
+                | {
+                    [x: string]:
+                      | string
+                      | number
+                      | boolean
+                      | /*elided*/ any
+                      | (
+                          | string
+                          | number
+                          | boolean
+                          | /*elided*/ any
+                          | (
+                              | string
+                              | number
+                              | boolean
+                              | /*elided*/ any
+                              | (
+                                  | string
+                                  | number
+                                  | boolean
+                                  | /*elided*/ any
+                                  | (
+                                      | string
+                                      | number
+                                      | boolean
+                                      | /*elided*/ any
+                                      | (
+                                          | string
+                                          | number
+                                          | boolean
+                                          | /*elided*/ any
+                                          | (
+                                              | string
+                                              | number
+                                              | boolean
+                                              | /*elided*/ any
+                                              | (
+                                                  | string
+                                                  | number
+                                                  | boolean
+                                                  | /*elided*/ any
+                                                  | (
+                                                      | string
+                                                      | number
+                                                      | boolean
+                                                      | /*elided*/ any
+                                                      | (
+                                                          | string
+                                                          | number
+                                                          | boolean
+                                                          | /*elided*/ any
+                                                          | (
+                                                              | string
+                                                              | number
+                                                              | boolean
+                                                              | /*elided*/ any
+                                                              | (
+                                                                  | string
+                                                                  | number
+                                                                  | boolean
+                                                                  | /*elided*/ any
+                                                                  | /*elided*/ any
+                                                                  | null
+                                                                )[]
+                                                              | null
+                                                            )[]
+                                                          | null
+                                                        )[]
+                                                      | null
+                                                    )[]
+                                                  | null
+                                                )[]
+                                              | null
+                                            )[]
+                                          | null
+                                        )[]
+                                      | null
+                                    )[]
+                                  | null
+                                )[]
+                              | null
+                            )[]
+                          | null
+                        )[]
+                      | null;
+                  }
+                | (
+                    | string
+                    | number
+                    | boolean
+                    | {
+                        [x: string]:
+                          | string
+                          | number
+                          | boolean
+                          | /*elided*/ any
+                          | (
+                              | string
+                              | number
+                              | boolean
+                              | /*elided*/ any
+                              | (
+                                  | string
+                                  | number
+                                  | boolean
+                                  | /*elided*/ any
+                                  | (
+                                      | string
+                                      | number
+                                      | boolean
+                                      | /*elided*/ any
+                                      | (
+                                          | string
+                                          | number
+                                          | boolean
+                                          | /*elided*/ any
+                                          | (
+                                              | string
+                                              | number
+                                              | boolean
+                                              | /*elided*/ any
+                                              | (
+                                                  | string
+                                                  | number
+                                                  | boolean
+                                                  | /*elided*/ any
+                                                  | (
+                                                      | string
+                                                      | number
+                                                      | boolean
+                                                      | /*elided*/ any
+                                                      | (
+                                                          | string
+                                                          | number
+                                                          | boolean
+                                                          | /*elided*/ any
+                                                          | (
+                                                              | string
+                                                              | number
+                                                              | boolean
+                                                              | /*elided*/ any
+                                                              | (
+                                                                  | string
+                                                                  | number
+                                                                  | boolean
+                                                                  | /*elided*/ any
+                                                                  | /*elided*/ any
+                                                                  | null
+                                                                )[]
+                                                              | null
+                                                            )[]
+                                                          | null
+                                                        )[]
+                                                      | null
+                                                    )[]
+                                                  | null
+                                                )[]
+                                              | null
+                                            )[]
+                                          | null
+                                        )[]
+                                      | null
+                                    )[]
+                                  | null
+                                )[]
+                              | null
+                            )[]
+                          | null;
+                      }
+                    | (
+                        | string
+                        | number
+                        | boolean
+                        | {
+                            [x: string]:
+                              | string
+                              | number
+                              | boolean
+                              | /*elided*/ any
+                              | (
+                                  | string
+                                  | number
+                                  | boolean
+                                  | /*elided*/ any
+                                  | (
+                                      | string
+                                      | number
+                                      | boolean
+                                      | /*elided*/ any
+                                      | (
+                                          | string
+                                          | number
+                                          | boolean
+                                          | /*elided*/ any
+                                          | (
+                                              | string
+                                              | number
+                                              | boolean
+                                              | /*elided*/ any
+                                              | (
+                                                  | string
+                                                  | number
+                                                  | boolean
+                                                  | /*elided*/ any
+                                                  | (
+                                                      | string
+                                                      | number
+                                                      | boolean
+                                                      | /*elided*/ any
+                                                      | (
+                                                          | string
+                                                          | number
+                                                          | boolean
+                                                          | /*elided*/ any
+                                                          | (
+                                                              | string
+                                                              | number
+                                                              | boolean
+                                                              | /*elided*/ any
+                                                              | (
+                                                                  | string
+                                                                  | number
+                                                                  | boolean
+                                                                  | /*elided*/ any
+                                                                  | /*elided*/ any
+                                                                  | null
+                                                                )[]
+                                                              | null
+                                                            )[]
+                                                          | null
+                                                        )[]
+                                                      | null
+                                                    )[]
+                                                  | null
+                                                )[]
+                                              | null
+                                            )[]
+                                          | null
+                                        )[]
+                                      | null
+                                    )[]
+                                  | null
+                                )[]
+                              | null;
+                          }
+                        | (
+                            | string
+                            | number
+                            | boolean
+                            | {
+                                [x: string]:
+                                  | string
+                                  | number
+                                  | boolean
+                                  | /*elided*/ any
+                                  | (
+                                      | string
+                                      | number
+                                      | boolean
+                                      | /*elided*/ any
+                                      | (
+                                          | string
+                                          | number
+                                          | boolean
+                                          | /*elided*/ any
+                                          | (
+                                              | string
+                                              | number
+                                              | boolean
+                                              | /*elided*/ any
+                                              | (
+                                                  | string
+                                                  | number
+                                                  | boolean
+                                                  | /*elided*/ any
+                                                  | (
+                                                      | string
+                                                      | number
+                                                      | boolean
+                                                      | /*elided*/ any
+                                                      | (
+                                                          | string
+                                                          | number
+                                                          | boolean
+                                                          | /*elided*/ any
+                                                          | (
+                                                              | string
+                                                              | number
+                                                              | boolean
+                                                              | /*elided*/ any
+                                                              | (
+                                                                  | string
+                                                                  | number
+                                                                  | boolean
+                                                                  | /*elided*/ any
+                                                                  | /*elided*/ any
+                                                                  | null
+                                                                )[]
+                                                              | null
+                                                            )[]
+                                                          | null
+                                                        )[]
+                                                      | null
+                                                    )[]
+                                                  | null
+                                                )[]
+                                              | null
+                                            )[]
+                                          | null
+                                        )[]
+                                      | null
+                                    )[]
+                                  | null;
+                              }
+                            | (
+                                | string
+                                | number
+                                | boolean
+                                | {
+                                    [x: string]:
+                                      | string
+                                      | number
+                                      | boolean
+                                      | /*elided*/ any
+                                      | (
+                                          | string
+                                          | number
+                                          | boolean
+                                          | /*elided*/ any
+                                          | (
+                                              | string
+                                              | number
+                                              | boolean
+                                              | /*elided*/ any
+                                              | (
+                                                  | string
+                                                  | number
+                                                  | boolean
+                                                  | /*elided*/ any
+                                                  | (
+                                                      | string
+                                                      | number
+                                                      | boolean
+                                                      | /*elided*/ any
+                                                      | (
+                                                          | string
+                                                          | number
+                                                          | boolean
+                                                          | /*elided*/ any
+                                                          | (
+                                                              | string
+                                                              | number
+                                                              | boolean
+                                                              | /*elided*/ any
+                                                              | (
+                                                                  | string
+                                                                  | number
+                                                                  | boolean
+                                                                  | /*elided*/ any
+                                                                  | /*elided*/ any
+                                                                  | null
+                                                                )[]
+                                                              | null
+                                                            )[]
+                                                          | null
+                                                        )[]
+                                                      | null
+                                                    )[]
+                                                  | null
+                                                )[]
+                                              | null
+                                            )[]
+                                          | null
+                                        )[]
+                                      | null;
+                                  }
+                                | (
+                                    | string
+                                    | number
+                                    | boolean
+                                    | {
+                                        [x: string]:
+                                          | string
+                                          | number
+                                          | boolean
+                                          | /*elided*/ any
+                                          | (
+                                              | string
+                                              | number
+                                              | boolean
+                                              | /*elided*/ any
+                                              | (
+                                                  | string
+                                                  | number
+                                                  | boolean
+                                                  | /*elided*/ any
+                                                  | (
+                                                      | string
+                                                      | number
+                                                      | boolean
+                                                      | /*elided*/ any
+                                                      | (
+                                                          | string
+                                                          | number
+                                                          | boolean
+                                                          | /*elided*/ any
+                                                          | (
+                                                              | string
+                                                              | number
+                                                              | boolean
+                                                              | /*elided*/ any
+                                                              | (
+                                                                  | string
+                                                                  | number
+                                                                  | boolean
+                                                                  | /*elided*/ any
+                                                                  | /*elided*/ any
+                                                                  | null
+                                                                )[]
+                                                              | null
+                                                            )[]
+                                                          | null
+                                                        )[]
+                                                      | null
+                                                    )[]
+                                                  | null
+                                                )[]
+                                              | null
+                                            )[]
+                                          | null;
+                                      }
+                                    | (
+                                        | string
+                                        | number
+                                        | boolean
+                                        | {
+                                            [x: string]:
+                                              | string
+                                              | number
+                                              | boolean
+                                              | /*elided*/ any
+                                              | (
+                                                  | string
+                                                  | number
+                                                  | boolean
+                                                  | /*elided*/ any
+                                                  | (
+                                                      | string
+                                                      | number
+                                                      | boolean
+                                                      | /*elided*/ any
+                                                      | (
+                                                          | string
+                                                          | number
+                                                          | boolean
+                                                          | /*elided*/ any
+                                                          | (
+                                                              | string
+                                                              | number
+                                                              | boolean
+                                                              | /*elided*/ any
+                                                              | (
+                                                                  | string
+                                                                  | number
+                                                                  | boolean
+                                                                  | /*elided*/ any
+                                                                  | /*elided*/ any
+                                                                  | null
+                                                                )[]
+                                                              | null
+                                                            )[]
+                                                          | null
+                                                        )[]
+                                                      | null
+                                                    )[]
+                                                  | null
+                                                )[]
+                                              | null;
+                                          }
+                                        | (
+                                            | string
+                                            | number
+                                            | boolean
+                                            | {
+                                                [x: string]:
+                                                  | string
+                                                  | number
+                                                  | boolean
+                                                  | /*elided*/ any
+                                                  | (
+                                                      | string
+                                                      | number
+                                                      | boolean
+                                                      | /*elided*/ any
+                                                      | (
+                                                          | string
+                                                          | number
+                                                          | boolean
+                                                          | /*elided*/ any
+                                                          | (
+                                                              | string
+                                                              | number
+                                                              | boolean
+                                                              | /*elided*/ any
+                                                              | (
+                                                                  | string
+                                                                  | number
+                                                                  | boolean
+                                                                  | /*elided*/ any
+                                                                  | /*elided*/ any
+                                                                  | null
+                                                                )[]
+                                                              | null
+                                                            )[]
+                                                          | null
+                                                        )[]
+                                                      | null
+                                                    )[]
+                                                  | null;
+                                              }
+                                            | (
+                                                | string
+                                                | number
+                                                | boolean
+                                                | {
+                                                    [x: string]:
+                                                      | string
+                                                      | number
+                                                      | boolean
+                                                      | /*elided*/ any
+                                                      | (
+                                                          | string
+                                                          | number
+                                                          | boolean
+                                                          | /*elided*/ any
+                                                          | (
+                                                              | string
+                                                              | number
+                                                              | boolean
+                                                              | /*elided*/ any
+                                                              | (
+                                                                  | string
+                                                                  | number
+                                                                  | boolean
+                                                                  | /*elided*/ any
+                                                                  | /*elided*/ any
+                                                                  | null
+                                                                )[]
+                                                              | null
+                                                            )[]
+                                                          | null
+                                                        )[]
+                                                      | null;
+                                                  }
+                                                | (
+                                                    | string
+                                                    | number
+                                                    | boolean
+                                                    | {
+                                                        [x: string]:
+                                                          | string
+                                                          | number
+                                                          | boolean
+                                                          | /*elided*/ any
+                                                          | (
+                                                              | string
+                                                              | number
+                                                              | boolean
+                                                              | /*elided*/ any
+                                                              | (
+                                                                  | string
+                                                                  | number
+                                                                  | boolean
+                                                                  | /*elided*/ any
+                                                                  | /*elided*/ any
+                                                                  | null
+                                                                )[]
+                                                              | null
+                                                            )[]
+                                                          | null;
+                                                      }
+                                                    | (
+                                                        | string
+                                                        | number
+                                                        | boolean
+                                                        | {
+                                                            [x: string]:
+                                                              | string
+                                                              | number
+                                                              | boolean
+                                                              | /*elided*/ any
+                                                              | (
+                                                                  | string
+                                                                  | number
+                                                                  | boolean
+                                                                  | /*elided*/ any
+                                                                  | /*elided*/ any
+                                                                  | null
+                                                                )[]
+                                                              | null;
+                                                          }
+                                                        | (
+                                                            | string
+                                                            | number
+                                                            | boolean
+                                                            | {
+                                                                [x: string]:
+                                                                  | string
+                                                                  | number
+                                                                  | boolean
+                                                                  | /*elided*/ any
+                                                                  | /*elided*/ any
+                                                                  | null;
+                                                              }
+                                                            | /*elided*/ any
+                                                            | null
+                                                          )[]
+                                                        | null
+                                                      )[]
+                                                    | null
+                                                  )[]
+                                                | null
+                                              )[]
+                                            | null
+                                          )[]
+                                        | null
+                                      )[]
+                                    | null
+                                  )[]
+                                | null
+                              )[]
+                            | null
+                          )[]
+                        | null
+                      )[]
+                    | null
+                  )[]
+                | null;
             }
           | undefined;
         required?: string[] | undefined;
@@ -969,13 +1633,7 @@ declare class MCPClientConnection {
       outputSchema?:
         | {
             [x: string]: unknown;
-            type: "object";
-            properties?:
-              | {
-                  [x: string]: object;
-                }
-              | undefined;
-            required?: string[] | undefined;
+            $schema?: string | undefined;
           }
         | undefined;
       annotations?:
@@ -1102,11 +1760,17 @@ declare class MCPClientConnection {
    * @deprecated Overriding or instance-patching this method directly is
    * deprecated — pass the `elicitationHandlers` connection option instead.
    */
-  handleElicitationRequest(request: ElicitRequest): Promise<ElicitResult>;
+  handleElicitationRequest(
+    request: ElicitRequest,
+    signal?: AbortSignal
+  ): Promise<ElicitResult>;
   private isResumedStreamableHttpSession;
   get sessionId(): string | undefined;
   /** @internal Clear a restored session before reconnecting. */
   clearResumedSession(): void;
+  get protocolVersion(): string | undefined;
+  get discoverResult(): DiscoverResult | undefined;
+  private openRestoredListSubscription;
   private getTransportName;
   close(): Promise<void>;
   /**
@@ -1123,7 +1787,7 @@ declare class MCPClientConnection {
 //#endregion
 //#region src/mcp/client-storage.d.ts
 /**
- * Represents a row in the cf_agents_mcp_servers table
+ * Represents a row in the cf_agents_mcp_servers table.
  */
 type MCPServerRow = {
   id: string;
@@ -1134,6 +1798,42 @@ type MCPServerRow = {
   callback_url: string;
   server_options: string | null;
 };
+/** Explicitly supported durable subset of MCP SDK client options. */
+type PersistedMcpClientOptions = Pick<
+  McpClientOptions,
+  | "capabilities"
+  | "supportedProtocolVersions"
+  | "enforceStrictCapabilities"
+  | "debouncedNotificationMethods"
+  | "versionNegotiation"
+  | "inputRequired"
+  | "listMaxPages"
+  | "cachePartition"
+  | "defaultCacheTtlMs"
+>;
+type PersistedMcpTransportOptions = {
+  type?: TransportType;
+  headers?: HeadersInit;
+  requestInit?: RequestInit;
+  reconnectionOptions?: StreamableHTTPReconnectionOptions;
+  skipIssuerMetadataValidation?: boolean;
+  onInsufficientScope?: "reauthorize" | "throw";
+  maxStepUpRetries?: number;
+  sessionId?: string;
+  protocolVersion?: string;
+};
+type PersistedMcpServerOptions = {
+  client?: PersistedMcpClientOptions;
+  transport?: PersistedMcpTransportOptions;
+  discoverResult?: DiscoverResult;
+  retry?: RetryOptions /** Durable Object binding used to restore an RPC MCP connection. */;
+  bindingName?: string /** Application props passed back to a restored RPC MCP connection. */;
+  props?: Record<
+    string,
+    unknown
+  > /** One-wake capability seed; handler functions remain memory-only. */;
+  capabilities?: ClientCapabilities;
+};
 //#endregion
 //#region src/mcp/client.d.ts
 type MCPAITool = {
@@ -1177,25 +1877,7 @@ declare const MCP_SERVER_ID_MAX_LENGTH = 64;
  * normalizeServerId("42-things");       // "id-42-things"
  */
 declare function normalizeServerId(input: string): string;
-/**
- * Options that can be stored in the server_options column
- * This is what gets JSON.stringify'd and stored in the database
- */
-type MCPServerOptions = {
-  client?: ConstructorParameters<typeof Client>[1];
-  transport?: {
-    headers?: HeadersInit;
-    type?: TransportType;
-    sessionId?: string;
-  } /** Retry options for connection and reconnection attempts */;
-  retry?: RetryOptions;
-  /**
-   * Client capabilities advertised from configured handlers (currently the
-   * elicitation modes). Handlers are functions and cannot be persisted, so
-   * this records what they advertised for restores after hibernation.
-   */
-  capabilities?: ClientCapabilities;
-};
+type MCPServerOptions = PersistedMcpServerOptions;
 /**
  * Result of an OAuth callback request
  */
@@ -1217,7 +1899,7 @@ type RegisterServerOptions = {
   url: string;
   name: string;
   callbackUrl?: string;
-  client?: ConstructorParameters<typeof Client>[1];
+  client?: McpClientOptions;
   transport?: MCPTransportOptions;
   authUrl?: string;
   clientId?: string /** Retry options for connection and reconnection attempts */;
@@ -1269,7 +1951,9 @@ type MCPClientOAuthResult =
     };
 type MCPClientElicitationHandler = (
   request: ElicitRequest,
-  serverId: string
+  serverId: string /** Aborts when the originating MCP operation is cancelled. */,
+
+  signal?: AbortSignal
 ) => Promise<ElicitResult>;
 type MCPClientElicitationHandlers = {
   form?: MCPClientElicitationHandler;
@@ -1382,7 +2066,7 @@ declare class MCPClientManager {
    */
   private getServerRetryOptions;
   private clearServerAuthUrl;
-  private updateStoredSessionId;
+  private updateStoredSession;
   private failConnection;
   private isAuthAcceptedConnection;
   private oauthCallbackSuccess;
@@ -1464,7 +2148,7 @@ declare class MCPClientManager {
         oauthCode?: string;
       };
       transport?: MCPTransportOptions;
-      client?: ConstructorParameters<typeof Client>[1];
+      client?: McpClientOptions;
     }
   ): Promise<{
     id: string;
@@ -1486,6 +2170,8 @@ declare class MCPClientManager {
    * @returns Server ID
    */
   registerServer(id: string, options: RegisterServerOptions): Promise<string>;
+  /** Persist and emit an OAuth continuation produced by connect or discovery. */
+  private persistAuthContinuation;
   /**
    * Connect to an already registered MCP server and initialize the connection.
    *
@@ -1645,136 +2331,19 @@ declare class MCPClientManager {
     params: CallToolRequest["params"] & {
       serverId: string;
     },
-    resultSchema?:
-      | typeof CallToolResultSchema
-      | typeof CompatibilityCallToolResultSchema,
-    options?: RequestOptions
-  ): Promise<
-    | {
-        [x: string]: unknown;
-        content: (
-          | {
-              type: "text";
-              text: string;
-              annotations?:
-                | {
-                    audience?: ("user" | "assistant")[] | undefined;
-                    priority?: number | undefined;
-                    lastModified?: string | undefined;
-                  }
-                | undefined;
-              _meta?: Record<string, unknown> | undefined;
-            }
-          | {
-              type: "image";
-              data: string;
-              mimeType: string;
-              annotations?:
-                | {
-                    audience?: ("user" | "assistant")[] | undefined;
-                    priority?: number | undefined;
-                    lastModified?: string | undefined;
-                  }
-                | undefined;
-              _meta?: Record<string, unknown> | undefined;
-            }
-          | {
-              type: "audio";
-              data: string;
-              mimeType: string;
-              annotations?:
-                | {
-                    audience?: ("user" | "assistant")[] | undefined;
-                    priority?: number | undefined;
-                    lastModified?: string | undefined;
-                  }
-                | undefined;
-              _meta?: Record<string, unknown> | undefined;
-            }
-          | {
-              type: "resource";
-              resource:
-                | {
-                    uri: string;
-                    text: string;
-                    mimeType?: string | undefined;
-                    _meta?: Record<string, unknown> | undefined;
-                  }
-                | {
-                    uri: string;
-                    blob: string;
-                    mimeType?: string | undefined;
-                    _meta?: Record<string, unknown> | undefined;
-                  };
-              annotations?:
-                | {
-                    audience?: ("user" | "assistant")[] | undefined;
-                    priority?: number | undefined;
-                    lastModified?: string | undefined;
-                  }
-                | undefined;
-              _meta?: Record<string, unknown> | undefined;
-            }
-          | {
-              uri: string;
-              name: string;
-              type: "resource_link";
-              description?: string | undefined;
-              mimeType?: string | undefined;
-              size?: number | undefined;
-              annotations?:
-                | {
-                    audience?: ("user" | "assistant")[] | undefined;
-                    priority?: number | undefined;
-                    lastModified?: string | undefined;
-                  }
-                | undefined;
-              _meta?:
-                | {
-                    [x: string]: unknown;
-                  }
-                | undefined;
-              icons?:
-                | {
-                    src: string;
-                    mimeType?: string | undefined;
-                    sizes?: string[] | undefined;
-                    theme?: "light" | "dark" | undefined;
-                  }[]
-                | undefined;
-              title?: string | undefined;
-            }
-        )[];
-        _meta?:
-          | {
-              [x: string]: unknown;
-              progressToken?: string | number | undefined;
-              "io.modelcontextprotocol/related-task"?:
-                | {
-                    taskId: string;
-                  }
-                | undefined;
-            }
-          | undefined;
-        structuredContent?: Record<string, unknown> | undefined;
-        isError?: boolean | undefined;
-      }
-    | {
-        [x: string]: unknown;
-        toolResult: unknown;
-        _meta?:
-          | {
-              [x: string]: unknown;
-              progressToken?: string | number | undefined;
-              "io.modelcontextprotocol/related-task"?:
-                | {
-                    taskId: string;
-                  }
-                | undefined;
-            }
-          | undefined;
-      }
-  >;
+    options?: CallToolRequestOptions
+  ): ReturnType<Client["callTool"]>;
+  /**
+   * @deprecated Prefer the v2 request-options overload. Explicit legacy result
+   * schemas remain honored through the v2 SDK request funnel.
+   */
+  callTool(
+    params: CallToolRequest["params"] & {
+      serverId: string;
+    },
+    resultSchema: LegacyCallToolResultSchema,
+    options?: CallToolRequestOptions
+  ): ReturnType<Client["callTool"]>;
   /**
    * Namespaced version of readResource
    */
@@ -1782,7 +2351,7 @@ declare class MCPClientManager {
     params: ReadResourceRequest["params"] & {
       serverId: string;
     },
-    options: RequestOptions
+    options?: CacheableRequestOptions
   ): Promise<{
     [x: string]: unknown;
     contents: (
@@ -1790,22 +2359,41 @@ declare class MCPClientManager {
           uri: string;
           text: string;
           mimeType?: string | undefined;
-          _meta?: Record<string, unknown> | undefined;
+          _meta?:
+            | {
+                [x: string]: unknown;
+              }
+            | undefined;
         }
       | {
           uri: string;
           blob: string;
           mimeType?: string | undefined;
-          _meta?: Record<string, unknown> | undefined;
+          _meta?:
+            | {
+                [x: string]: unknown;
+              }
+            | undefined;
         }
     )[];
     _meta?:
       | {
           [x: string]: unknown;
-          progressToken?: string | number | undefined;
-          "io.modelcontextprotocol/related-task"?:
+          "io.modelcontextprotocol/serverInfo"?:
             | {
-                taskId: string;
+                version: string;
+                name: string;
+                websiteUrl?: string | undefined;
+                description?: string | undefined;
+                icons?:
+                  | {
+                      src: string;
+                      mimeType?: string | undefined;
+                      sizes?: string[] | undefined;
+                      theme?: "light" | "dark" | undefined;
+                    }[]
+                  | undefined;
+                title?: string | undefined;
               }
             | undefined;
         }
@@ -1818,7 +2406,7 @@ declare class MCPClientManager {
     params: GetPromptRequest["params"] & {
       serverId: string;
     },
-    options: RequestOptions
+    options?: RequestOptions
   ): Promise<{
     [x: string]: unknown;
     messages: {
@@ -1834,7 +2422,11 @@ declare class MCPClientManager {
                   lastModified?: string | undefined;
                 }
               | undefined;
-            _meta?: Record<string, unknown> | undefined;
+            _meta?:
+              | {
+                  [x: string]: unknown;
+                }
+              | undefined;
           }
         | {
             type: "image";
@@ -1847,7 +2439,11 @@ declare class MCPClientManager {
                   lastModified?: string | undefined;
                 }
               | undefined;
-            _meta?: Record<string, unknown> | undefined;
+            _meta?:
+              | {
+                  [x: string]: unknown;
+                }
+              | undefined;
           }
         | {
             type: "audio";
@@ -1860,31 +2456,11 @@ declare class MCPClientManager {
                   lastModified?: string | undefined;
                 }
               | undefined;
-            _meta?: Record<string, unknown> | undefined;
-          }
-        | {
-            type: "resource";
-            resource:
-              | {
-                  uri: string;
-                  text: string;
-                  mimeType?: string | undefined;
-                  _meta?: Record<string, unknown> | undefined;
-                }
-              | {
-                  uri: string;
-                  blob: string;
-                  mimeType?: string | undefined;
-                  _meta?: Record<string, unknown> | undefined;
-                };
-            annotations?:
+            _meta?:
               | {
-                  audience?: ("user" | "assistant")[] | undefined;
-                  priority?: number | undefined;
-                  lastModified?: string | undefined;
+                  [x: string]: unknown;
                 }
               | undefined;
-            _meta?: Record<string, unknown> | undefined;
           }
         | {
             uri: string;
@@ -1914,15 +2490,62 @@ declare class MCPClientManager {
                 }[]
               | undefined;
             title?: string | undefined;
+          }
+        | {
+            type: "resource";
+            resource:
+              | {
+                  uri: string;
+                  text: string;
+                  mimeType?: string | undefined;
+                  _meta?:
+                    | {
+                        [x: string]: unknown;
+                      }
+                    | undefined;
+                }
+              | {
+                  uri: string;
+                  blob: string;
+                  mimeType?: string | undefined;
+                  _meta?:
+                    | {
+                        [x: string]: unknown;
+                      }
+                    | undefined;
+                };
+            annotations?:
+              | {
+                  audience?: ("user" | "assistant")[] | undefined;
+                  priority?: number | undefined;
+                  lastModified?: string | undefined;
+                }
+              | undefined;
+            _meta?:
+              | {
+                  [x: string]: unknown;
+                }
+              | undefined;
           };
     }[];
     _meta?:
       | {
           [x: string]: unknown;
-          progressToken?: string | number | undefined;
-          "io.modelcontextprotocol/related-task"?:
+          "io.modelcontextprotocol/serverInfo"?:
             | {
-                taskId: string;
+                version: string;
+                name: string;
+                websiteUrl?: string | undefined;
+                description?: string | undefined;
+                icons?:
+                  | {
+                      src: string;
+                      mimeType?: string | undefined;
+                      sizes?: string[] | undefined;
+                      theme?: "light" | "dark" | undefined;
+                    }[]
+                  | undefined;
+                title?: string | undefined;
               }
             | undefined;
         }
@@ -1940,7 +2563,7 @@ type NamespacedData = {
   resources: (Resource & {
     serverId: string;
   })[];
-  resourceTemplates: (ResourceTemplate & {
+  resourceTemplates: (ResourceTemplateType & {
     serverId: string;
   })[];
 };
@@ -2394,10 +3017,16 @@ type AddMcpServerOptions = {
    */
   callbackPath?: string /** Agents routing prefix (default: "agents") */;
   agentsPrefix?: string /** MCP client options */;
-  client?: ConstructorParameters<typeof Client>[1] /** Transport options */;
+  client?: McpClientOptions /** Transport options */;
   transport?: {
     /** Custom headers for authentication (e.g., bearer tokens, CF Access) */ headers?: HeadersInit /** Transport type: "sse", "streamable-http", or "auto" (default) */;
     type?: TransportType;
+    /**
+     * Compatibility escape hatch for a trusted legacy authorization server
+     * whose RFC 8414 issuer does not match its metadata discovery URL.
+     * Security-weakening; leave false unless the server is explicitly known.
+     */
+    skipIssuerMetadataValidation?: boolean;
   } /** Retry options for connection and reconnection attempts */;
   retry?: RetryOptions;
 };
@@ -4769,13 +5398,7 @@ declare class Agent<
     url: string,
     callbackHostOrOptions?: string | AddMcpServerOptions,
     agentsPrefix?: string,
-    options?: {
-      client?: ConstructorParameters<typeof Client>[1];
-      transport?: {
-        headers?: HeadersInit;
-        type?: TransportType;
-      };
-    }
+    options?: Pick<AddMcpServerOptions, "client" | "transport">
   ): Promise<
     | {
         id: string;
@@ -5401,121 +6024,124 @@ type AgentToolEventState<Part extends AgentToolRunPart = AgentToolRunPart> = {
 //#endregion
 export {
   RoutingRetryOptions as $,
-  WorkerTransport as $t,
+  LegacyMcpHandler as $t,
   AgentGetOptions as A,
-  MCP_SERVER_ID_MAX_LENGTH as At,
+  MCPServerFilter as At,
   EmailSendBinding as B,
-  RPC_DO_PREFIX as Bt,
+  RPCServerTransport as Bt,
   DetachedRunAgentToolResult as C,
-  MCPClientOAuthCallbackConfig as Ct,
+  MCPClientManager as Ct,
   AddRpcMcpServerOptions as D,
-  MCPOAuthCallbackResult as Dt,
+  MCPConnectionResult as Dt,
   AddMcpServerOptions as E,
-  MCPDiscoverResult as Et,
+  MCPClientOAuthResult as Et,
   Connection$1 as F,
-  MCPElicitationHandlers as Ft,
+  normalizeServerId as Ft,
   FiberStatus as G,
-  ClearableEventStore as Gt,
+  ElicitResult$3 as Gt,
   FiberInspection as H,
-  ElicitRequestSchema$1 as Ht,
+  RPC_DO_PREFIX as Ht,
   ConnectionContext$1 as I,
-  RPCClientTransport as It,
+  MCPElicitationHandler as It,
   MCPServerMessage as J,
-  createMcpHandler as Jt,
+  DurableObjectEventStore as Jt,
   ListFibersOptions as K,
-  DurableObjectEventStore as Kt,
+  McpAgent as Kt,
   DEFAULT_AGENT_STATIC_OPTIONS as L,
-  RPCClientTransportOptions as Lt,
+  MCPElicitationHandlers as Lt,
   AgentOptions as M,
-  getNamespacedData as Mt,
+  MCP_SERVER_ID_MAX_LENGTH as Mt,
   AgentStaticOptions as N,
-  normalizeServerId as Nt,
+  RegisterServerOptions as Nt,
   Agent as O,
-  MCPServerFilter as Ot,
+  MCPDiscoverResult as Ot,
   CallableMetadata as P,
-  MCPElicitationHandler as Pt,
+  getNamespacedData as Pt,
   RPCResponse as Q,
-  TransportState as Qt,
+  CreateMcpHandlerOptions$1 as Qt,
   DeleteFibersOptions as R,
-  RPCServerTransport as Rt,
+  RPCClientTransport as Rt,
   DetachedAgentToolConfig as S,
-  MCPClientManagerOptions as St,
+  MCPClientElicitationHandlers as St,
   RunAgentToolResult as T,
-  MCPConnectionResult as Tt,
+  MCPClientOAuthCallbackConfig as Tt,
   FiberRecoveryContext as U,
-  ElicitResult$1 as Ut,
+  ElicitRequest$2 as Ut,
   FiberContext as V,
-  ElicitRequest$1 as Vt,
+  RPCServerTransportOptions as Vt,
   FiberRecoveryResult as W,
-  McpAgent as Wt,
+  ElicitRequestSchema as Wt,
   QueueItem as X,
-  McpAuthContext as Xt,
+  experimental_createMcpHandler as Xt,
   MCPServersState as Y,
-  experimental_createMcpHandler as Yt,
+  createMcpHandler$1 as Yt,
   RPCRequest as Z,
-  getMcpAuthContext as Zt,
+  CreateLegacyMcpHandlerOptions as Zt,
   AgentToolRunState as _,
-  MCPAITool as _t,
+  ElicitRequest$1 as _t,
   AgentToolEvent as a,
-  SUB_PREFIX as an,
+  SSEEdgeClientTransport as an,
   StartFiberResult as at,
   AgentToolTerminalStatus as b,
-  MCPClientElicitationHandlers as bt,
+  MCPAIToolSet as bt,
   AgentToolFailure as c,
-  parseSubAgentPath as cn,
+  SubAgentPathMatch as cn,
   SubAgentClass as ct,
   AgentToolMilestone as d,
+  routeSubAgentRequest as dn,
   callable as dt,
-  WorkerTransportOptions as en,
+  createLegacyMcpHandler as en,
   Schedule as et,
   AgentToolProgress as f,
+  withInvocationScope as fn,
   getAgentByName as ft,
   AgentToolRunPart as g,
   unstable_callable as gt,
   AgentToolRunInspection as h,
   routeAgentRequest as ht,
   AgentToolDisplayMetadata as i,
-  TransportType as in,
+  WorkerTransportOptions as in,
   StartFiberOptions as it,
   AgentNamespace as j,
-  RegisterServerOptions as jt,
+  MCPServerOptions as jt,
   AgentContext as k,
-  MCPServerOptions as kt,
+  MCPOAuthCallbackResult as kt,
   AgentToolInterruptedReason as l,
-  routeSubAgentRequest as ln,
+  getSubAgentByName as ln,
   SubAgentStub as lt,
   AgentToolRunInfo as m,
   routeAgentEmail as mt,
   AGENT_TOOL_PROGRESS_PART as n,
-  StreamableHTTPEdgeClientTransport as nn,
+  TransportState as nn,
   SendEmailOptions as nt,
   AgentToolEventMessage as o,
-  SubAgentPathMatch as on,
+  StreamableHTTPEdgeClientTransport as on,
   StateUpdateMessage as ot,
   AgentToolProgressSnapshot as p,
   getCurrentAgent as pt,
   MCPServer as q,
-  CreateMcpHandlerOptions as qt,
+  ClearableEventStore as qt,
   AgentToolChildAdapter as r,
-  McpClientOptions as rn,
+  WorkerTransport as rn,
   SqlError as rt,
   AgentToolEventState as s,
-  getSubAgentByName as sn,
+  SUB_PREFIX as sn,
   StreamingResponse as st,
   AGENT_TOOL_MILESTONE_PART as t,
-  SSEEdgeClientTransport as tn,
+  MCPStorageApi as tn,
   ScheduleCriteria as tt,
   AgentToolLifecycleResult as u,
+  parseSubAgentPath as un,
   WSMessage$1 as ut,
   AgentToolRunStatus as v,
-  MCPAIToolSet as vt,
+  ElicitResult$2 as vt,
   RunAgentToolOptions as w,
-  MCPClientOAuthResult as wt,
+  MCPClientManagerOptions as wt,
   ChatCapableAgentClass as x,
-  MCPClientManager as xt,
+  MCPClientElicitationHandler as xt,
   AgentToolStoredChunk as y,
-  MCPClientElicitationHandler as yt,
+  MCPAITool as yt,
   EmailRoutingOptions as z,
-  RPCServerTransportOptions as zt
+  RPCClientTransportOptions as zt
 };
-//# sourceMappingURL=agent-tool-types-BNUGGBzQ.d.ts.map
+//# sourceMappingURL=agent-tool-types-BC-WFlsz.d.ts.map