agents 0.0.0-1057c94 → 0.0.0-10d453d

package/dist/client.d.ts

@@ -1,12 +1,12 @@
-import "./serializable-gtr9YMhp.js";
+import "./serializable-faDkMCai.js";
 import {
-  AgentClient,
-  AgentClientFetchOptions,
-  AgentClientOptions,
-  StreamOptions,
-  agentFetch,
-  camelCaseToKebabCase
-} from "./client-CmMi85Sj.js";
+  a as agentFetch,
+  i as StreamOptions,
+  n as AgentClientFetchOptions,
+  o as camelCaseToKebabCase,
+  r as AgentClientOptions,
+  t as AgentClient
+} from "./client-BAQA84dr.js";
 export {
   AgentClient,
   AgentClientFetchOptions,

package/dist/client.js

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

package/dist/codemode/ai.js

@@ -1,8 +1,8 @@
-import "../ai-types-UZlfLOYP.js";
-import "../client-DjR-lC16.js";
-import "../client-CZBVDDoO.js";
-import "../do-oauth-client-provider-B2jr6UNq.js";
-import { getAgentByName } from "../src-tpG9NtHy.js";
+import "../ai-types-CrMqkwc_.js";
+import "../client-B3SR12TQ.js";
+import "../client-BqdCHvCQ.js";
+import "../do-oauth-client-provider-CnDheVho.js";
+import { s as getAgentByName } from "../src-DYN-ccro.js";
 import { generateObject, tool } from "ai";
 import { openai } from "@ai-sdk/openai";
 import { z } from "zod/v3";

package/dist/{do-oauth-client-provider-CCwGwnrA.d.ts → do-oauth-client-provider-CJ9YuMVT.d.ts}

@@ -11,6 +11,13 @@ interface AgentsOAuthProvider extends OAuthClientProvider {
   authUrl: string | undefined;
   clientId: string | undefined;
   serverId: string | undefined;
+  checkState(state: string): Promise<{
+    valid: boolean;
+    serverId?: string;
+    error?: string;
+  }>;
+  consumeState(state: string): Promise<void>;
+  deleteCodeVerifier(): Promise<void>;
 }
 declare class DurableObjectOAuthClientProvider implements AgentsOAuthProvider {
   storage: DurableObjectStorage;
@@ -41,15 +48,23 @@ declare class DurableObjectOAuthClientProvider implements AgentsOAuthProvider {
   tokens(): Promise<OAuthTokens | undefined>;
   saveTokens(tokens: OAuthTokens): Promise<void>;
   get authUrl(): string | undefined;
-  /**
-   * Because this operates on the server side (but we need browser auth), we send this url back to the user
-   * and require user interact to initiate the redirect flow
-   */
+  stateKey(nonce: string): string;
+  state(): Promise<string>;
+  checkState(state: string): Promise<{
+    valid: boolean;
+    serverId?: string;
+    error?: string;
+  }>;
+  consumeState(state: string): Promise<void>;
   redirectToAuthorization(authUrl: URL): Promise<void>;
+  invalidateCredentials(
+    scope: "all" | "client" | "tokens" | "verifier"
+  ): Promise<void>;
   codeVerifierKey(clientId: string): string;
   saveCodeVerifier(verifier: string): Promise<void>;
   codeVerifier(): Promise<string>;
+  deleteCodeVerifier(): Promise<void>;
 }
 //#endregion
-export { AgentsOAuthProvider, DurableObjectOAuthClientProvider };
-//# sourceMappingURL=do-oauth-client-provider-CCwGwnrA.d.ts.map
+export { DurableObjectOAuthClientProvider as n, AgentsOAuthProvider as t };
+//# sourceMappingURL=do-oauth-client-provider-CJ9YuMVT.d.ts.map

package/dist/{do-oauth-client-provider-B2jr6UNq.js → do-oauth-client-provider-CnDheVho.js}

@@ -1,11 +1,13 @@
 import { nanoid } from "nanoid";
 
 //#region src/mcp/do-oauth-client-provider.ts
+const STATE_EXPIRATION_MS = 600 * 1e3;
 var DurableObjectOAuthClientProvider = class {
 	constructor(storage, clientName, baseRedirectUrl) {
 		this.storage = storage;
 		this.clientName = clientName;
 		this.baseRedirectUrl = baseRedirectUrl;
+		if (!storage) throw new Error("DurableObjectOAuthClientProvider requires a valid DurableObjectStorage instance");
 	}
 	get clientMetadata() {
 		return {
@@ -21,7 +23,7 @@ var DurableObjectOAuthClientProvider = class {
 		return new URL(this.redirectUrl).origin;
 	}
 	get redirectUrl() {
-		return `${this.baseRedirectUrl}/${this.serverId}`;
+		return this.baseRedirectUrl;
 	}
 	get clientId() {
 		if (!this._clientId_) throw new Error("Trying to access clientId before it was set");
@@ -64,15 +66,72 @@ var DurableObjectOAuthClientProvider = class {
 	get authUrl() {
 		return this._authUrl_;
 	}
-	/**
-	* Because this operates on the server side (but we need browser auth), we send this url back to the user
-	* and require user interact to initiate the redirect flow
-	*/
+	stateKey(nonce) {
+		return `/${this.clientName}/${this.serverId}/state/${nonce}`;
+	}
+	async state() {
+		const nonce = nanoid();
+		const state = `${nonce}.${this.serverId}`;
+		const storedState = {
+			nonce,
+			serverId: this.serverId,
+			createdAt: Date.now()
+		};
+		await this.storage.put(this.stateKey(nonce), storedState);
+		return state;
+	}
+	async checkState(state) {
+		const parts = state.split(".");
+		if (parts.length !== 2) return {
+			valid: false,
+			error: "Invalid state format"
+		};
+		const [nonce, serverId] = parts;
+		const key = this.stateKey(nonce);
+		const storedState = await this.storage.get(key);
+		if (!storedState) return {
+			valid: false,
+			error: "State not found or already used"
+		};
+		if (storedState.serverId !== serverId) {
+			await this.storage.delete(key);
+			return {
+				valid: false,
+				error: "State serverId mismatch"
+			};
+		}
+		if (Date.now() - storedState.createdAt > STATE_EXPIRATION_MS) {
+			await this.storage.delete(key);
+			return {
+				valid: false,
+				error: "State expired"
+			};
+		}
+		return {
+			valid: true,
+			serverId
+		};
+	}
+	async consumeState(state) {
+		const parts = state.split(".");
+		if (parts.length !== 2) {
+			console.warn(`[OAuth] consumeState called with invalid state format: ${state.substring(0, 20)}...`);
+			return;
+		}
+		const [nonce] = parts;
+		await this.storage.delete(this.stateKey(nonce));
+	}
 	async redirectToAuthorization(authUrl) {
-		const stateToken = nanoid();
-		authUrl.searchParams.set("state", stateToken);
 		this._authUrl_ = authUrl.toString();
 	}
+	async invalidateCredentials(scope) {
+		if (!this._clientId_) return;
+		const deleteKeys = [];
+		if (scope === "all" || scope === "client") deleteKeys.push(this.clientInfoKey(this.clientId));
+		if (scope === "all" || scope === "tokens") deleteKeys.push(this.tokenKey(this.clientId));
+		if (scope === "all" || scope === "verifier") deleteKeys.push(this.codeVerifierKey(this.clientId));
+		if (deleteKeys.length > 0) await this.storage.delete(deleteKeys);
+	}
 	codeVerifierKey(clientId) {
 		return `${this.keyPrefix(clientId)}/code_verifier`;
 	}
@@ -86,8 +145,11 @@ var DurableObjectOAuthClientProvider = class {
 		if (!codeVerifier) throw new Error("No code verifier found");
 		return codeVerifier;
 	}
+	async deleteCodeVerifier() {
+		await this.storage.delete(this.codeVerifierKey(this.clientId));
+	}
 };
 
 //#endregion
-export { DurableObjectOAuthClientProvider };
-//# sourceMappingURL=do-oauth-client-provider-B2jr6UNq.js.map
+export { DurableObjectOAuthClientProvider as t };
+//# sourceMappingURL=do-oauth-client-provider-CnDheVho.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"do-oauth-client-provider-CnDheVho.js","names":["storage: DurableObjectStorage","clientName: string","baseRedirectUrl: string","storedState: StoredState","deleteKeys: string[]"],"sources":["../src/mcp/do-oauth-client-provider.ts"],"sourcesContent":["import type { OAuthClientProvider } from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport type {\n  OAuthClientInformation,\n  OAuthClientInformationFull,\n  OAuthClientMetadata,\n  OAuthTokens\n} from \"@modelcontextprotocol/sdk/shared/auth.js\";\nimport { nanoid } from \"nanoid\";\n\nconst STATE_EXPIRATION_MS = 10 * 60 * 1000; // 10 minutes\n\ninterface StoredState {\n  nonce: string;\n  serverId: string;\n  createdAt: number;\n}\n\n// A slight extension to the standard OAuthClientProvider interface because `redirectToAuthorization` doesn't give us the interface we need\n// This allows us to track authentication for a specific server and associated dynamic client registration\nexport interface AgentsOAuthProvider extends OAuthClientProvider {\n  authUrl: string | undefined;\n  clientId: string | undefined;\n  serverId: string | undefined;\n  checkState(\n    state: string\n  ): Promise<{ valid: boolean; serverId?: string; error?: string }>;\n  consumeState(state: string): Promise<void>;\n  deleteCodeVerifier(): Promise<void>;\n}\n\nexport class DurableObjectOAuthClientProvider implements AgentsOAuthProvider {\n  private _authUrl_: string | undefined;\n  private _serverId_: string | undefined;\n  private _clientId_: string | undefined;\n\n  constructor(\n    public storage: DurableObjectStorage,\n    public clientName: string,\n    public baseRedirectUrl: string\n  ) {\n    if (!storage) {\n      throw new Error(\n        \"DurableObjectOAuthClientProvider requires a valid DurableObjectStorage instance\"\n      );\n    }\n  }\n\n  get clientMetadata(): OAuthClientMetadata {\n    return {\n      client_name: this.clientName,\n      client_uri: this.clientUri,\n      grant_types: [\"authorization_code\", \"refresh_token\"],\n      redirect_uris: [this.redirectUrl],\n      response_types: [\"code\"],\n      token_endpoint_auth_method: \"none\"\n    };\n  }\n\n  get clientUri() {\n    return new URL(this.redirectUrl).origin;\n  }\n\n  get redirectUrl() {\n    return this.baseRedirectUrl;\n  }\n\n  get clientId() {\n    if (!this._clientId_) {\n      throw new Error(\"Trying to access clientId before it was set\");\n    }\n    return this._clientId_;\n  }\n\n  set clientId(clientId_: string) {\n    this._clientId_ = clientId_;\n  }\n\n  get serverId() {\n    if (!this._serverId_) {\n      throw new Error(\"Trying to access serverId before it was set\");\n    }\n    return this._serverId_;\n  }\n\n  set serverId(serverId_: string) {\n    this._serverId_ = serverId_;\n  }\n\n  keyPrefix(clientId: string) {\n    return `/${this.clientName}/${this.serverId}/${clientId}`;\n  }\n\n  clientInfoKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/client_info/`;\n  }\n\n  async clientInformation(): Promise<OAuthClientInformation | undefined> {\n    if (!this._clientId_) {\n      return undefined;\n    }\n    return (\n      (await this.storage.get<OAuthClientInformation>(\n        this.clientInfoKey(this.clientId)\n      )) ?? undefined\n    );\n  }\n\n  async saveClientInformation(\n    clientInformation: OAuthClientInformationFull\n  ): Promise<void> {\n    await this.storage.put(\n      this.clientInfoKey(clientInformation.client_id),\n      clientInformation\n    );\n    this.clientId = clientInformation.client_id;\n  }\n\n  tokenKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/token`;\n  }\n\n  async tokens(): Promise<OAuthTokens | undefined> {\n    if (!this._clientId_) {\n      return undefined;\n    }\n    return (\n      (await this.storage.get<OAuthTokens>(this.tokenKey(this.clientId))) ??\n      undefined\n    );\n  }\n\n  async saveTokens(tokens: OAuthTokens): Promise<void> {\n    await this.storage.put(this.tokenKey(this.clientId), tokens);\n  }\n\n  get authUrl() {\n    return this._authUrl_;\n  }\n\n  stateKey(nonce: string) {\n    return `/${this.clientName}/${this.serverId}/state/${nonce}`;\n  }\n\n  async state(): Promise<string> {\n    const nonce = nanoid();\n    const state = `${nonce}.${this.serverId}`;\n    const storedState: StoredState = {\n      nonce,\n      serverId: this.serverId,\n      createdAt: Date.now()\n    };\n    await this.storage.put(this.stateKey(nonce), storedState);\n    return state;\n  }\n\n  async checkState(\n    state: string\n  ): Promise<{ valid: boolean; serverId?: string; error?: string }> {\n    const parts = state.split(\".\");\n    if (parts.length !== 2) {\n      return { valid: false, error: \"Invalid state format\" };\n    }\n\n    const [nonce, serverId] = parts;\n    const key = this.stateKey(nonce);\n    const storedState = await this.storage.get<StoredState>(key);\n\n    if (!storedState) {\n      return { valid: false, error: \"State not found or already used\" };\n    }\n\n    if (storedState.serverId !== serverId) {\n      await this.storage.delete(key);\n      return { valid: false, error: \"State serverId mismatch\" };\n    }\n\n    const age = Date.now() - storedState.createdAt;\n    if (age > STATE_EXPIRATION_MS) {\n      await this.storage.delete(key);\n      return { valid: false, error: \"State expired\" };\n    }\n\n    return { valid: true, serverId };\n  }\n\n  async consumeState(state: string): Promise<void> {\n    const parts = state.split(\".\");\n    if (parts.length !== 2) {\n      // This should never happen since checkState validates format first.\n      // Log for debugging but don't throw - state consumption is best-effort.\n      console.warn(\n        `[OAuth] consumeState called with invalid state format: ${state.substring(0, 20)}...`\n      );\n      return;\n    }\n    const [nonce] = parts;\n    await this.storage.delete(this.stateKey(nonce));\n  }\n\n  async redirectToAuthorization(authUrl: URL): Promise<void> {\n    this._authUrl_ = authUrl.toString();\n  }\n\n  async invalidateCredentials(\n    scope: \"all\" | \"client\" | \"tokens\" | \"verifier\"\n  ): Promise<void> {\n    if (!this._clientId_) return;\n\n    const deleteKeys: string[] = [];\n\n    if (scope === \"all\" || scope === \"client\") {\n      deleteKeys.push(this.clientInfoKey(this.clientId));\n    }\n    if (scope === \"all\" || scope === \"tokens\") {\n      deleteKeys.push(this.tokenKey(this.clientId));\n    }\n    if (scope === \"all\" || scope === \"verifier\") {\n      deleteKeys.push(this.codeVerifierKey(this.clientId));\n    }\n\n    if (deleteKeys.length > 0) {\n      await this.storage.delete(deleteKeys);\n    }\n  }\n\n  codeVerifierKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/code_verifier`;\n  }\n\n  async saveCodeVerifier(verifier: string): Promise<void> {\n    const key = this.codeVerifierKey(this.clientId);\n\n    // Don't overwrite existing verifier to preserve first PKCE verifier\n    const existing = await this.storage.get<string>(key);\n    if (existing) {\n      return;\n    }\n\n    await this.storage.put(key, verifier);\n  }\n\n  async codeVerifier(): Promise<string> {\n    const codeVerifier = await this.storage.get<string>(\n      this.codeVerifierKey(this.clientId)\n    );\n    if (!codeVerifier) {\n      throw new Error(\"No code verifier found\");\n    }\n    return codeVerifier;\n  }\n\n  async deleteCodeVerifier(): Promise<void> {\n    await this.storage.delete(this.codeVerifierKey(this.clientId));\n  }\n}\n"],"mappings":"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"}

package/dist/{index-CEqvuT_e.d.ts → index-8Iyg9pLA.d.ts}

@@ -1,13 +1,10 @@
 import {
-  BaseTransportType,
-  MCPClientManager,
-  MCPConnectionState,
-  MaybePromise,
-  ServeOptions,
-  TransportType
-} from "./client-rqBi9hbh.js";
-import { Observability } from "./index-W4JUkafc.js";
-import { MessageType } from "./ai-types-BWW4umHY.js";
+  h as TransportType,
+  t as MCPClientManager,
+  u as MCPConnectionState
+} from "./client-fv1aMi-q.js";
+import { t as Observability } from "./index-BUle9RiP.js";
+import { n as MessageType } from "./ai-types-81H_-Uxh.js";
 import {
   Connection,
   Connection as Connection$1,
@@ -18,169 +15,15 @@ import {
 } from "partyserver";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import {
-  ElicitRequest as ElicitRequest$1,
-  ElicitRequestSchema as ElicitRequestSchema$1,
-  ElicitResult,
-  ElicitResult as ElicitResult$1,
-  JSONRPCMessage,
   Prompt,
   Resource,
   ServerCapabilities,
   Tool
 } from "@modelcontextprotocol/sdk/types.js";
 import { env } from "cloudflare:workers";
-import { Server as Server$1 } from "@modelcontextprotocol/sdk/server/index.js";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
 
-//#region src/mcp/worker-transport.d.ts
-interface WorkerTransportOptions {
-  sessionIdGenerator?: () => string;
-  enableJsonResponse?: boolean;
-  onsessioninitialized?: (sessionId: string) => void;
-}
-declare class WorkerTransport implements Transport {
-  private started;
-  private initialized;
-  private sessionIdGenerator?;
-  private enableJsonResponse;
-  private onsessioninitialized?;
-  private standaloneSseStreamId;
-  private streamMapping;
-  private requestToStreamMapping;
-  private requestResponseMap;
-  sessionId?: string;
-  onclose?: () => void;
-  onerror?: (error: Error) => void;
-  onmessage?: (message: JSONRPCMessage) => void;
-  constructor(options?: WorkerTransportOptions);
-  start(): Promise<void>;
-  handleRequest(request: Request, parsedBody?: unknown): Promise<Response>;
-  private handleGetRequest;
-  private handlePostRequest;
-  private handleDeleteRequest;
-  private handleOptionsRequest;
-  private handleUnsupportedRequest;
-  private validateSession;
-  close(): Promise<void>;
-  send(message: JSONRPCMessage): Promise<void>;
-}
-//#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"
-   */
-  route?: string;
-}
-type OAuthExecutionContext = ExecutionContext & {
-  props?: Record<string, unknown>;
-};
-declare function experimental_createMcpHandler(
-  server: McpServer | Server$1,
-  options?: CreateMcpHandlerOptions
-): (request: Request, env: unknown, ctx: ExecutionContext) => Promise<Response>;
-//#endregion
-//#region src/mcp/auth-context.d.ts
-interface McpAuthContext {
-  props: Record<string, unknown>;
-}
-declare function getMcpAuthContext(): McpAuthContext | undefined;
-//#endregion
-//#region src/mcp/index.d.ts
-declare abstract class McpAgent<
-  Env = unknown,
-  State = unknown,
-  Props extends Record<string, unknown> = Record<string, unknown>
-> extends Agent<Env, State, Props> {
-  private _transport?;
-  props?: Props;
-  abstract server: MaybePromise<McpServer | Server$1>;
-  abstract init(): Promise<void>;
-  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(): 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;
-  /** 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$1,
-    { 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 */
-  elicitInput(params: {
-    message: string;
-    requestedSchema: unknown;
-  }): Promise<ElicitResult>;
-  /** Wait for elicitation response through storage polling */
-  private _waitForElicitationResponse;
-  /** Handle elicitation responses */
-  private _handleElicitationResponse;
-  /** Return a handler for the given path for this MCP.
-   * Defaults to Streamable HTTP transport.
-   */
-  static serve(
-    path: string,
-    { binding, corsOptions, transport }?: ServeOptions
-  ): {
-    fetch<Env>(
-      this: void,
-      request: Request,
-      env: Env,
-      ctx: ExecutionContext
-    ): Promise<Response>;
-  };
-  /**
-   * Legacy api
-   **/
-  static mount(
-    path: string,
-    opts?: Omit<ServeOptions, "transport">
-  ): {
-    fetch<Env>(
-      this: void,
-      request: Request,
-      env: Env,
-      ctx: ExecutionContext
-    ): Promise<Response>;
-  };
-  static serveSSE(
-    path: string,
-    opts?: Omit<ServeOptions, "transport">
-  ): {
-    fetch<Env>(
-      this: void,
-      request: Request,
-      env: Env,
-      ctx: ExecutionContext
-    ): Promise<Response>;
-  };
-}
-//#endregion
 //#region src/index.d.ts
+
 /**
  * RPC request message from client
  */
@@ -296,9 +139,15 @@ type MCPServersState = {
   servers: {
     [id: string]: MCPServer;
   };
-  tools: Tool[];
-  prompts: Prompt[];
-  resources: Resource[];
+  tools: (Tool & {
+    serverId: string;
+  })[];
+  prompts: (Prompt & {
+    serverId: string;
+  })[];
+  resources: (Resource & {
+    serverId: string;
+  })[];
 };
 type MCPServer = {
   name: string;
@@ -328,6 +177,7 @@ declare class Agent<
 > extends Server<Env, Props> {
   private _state;
   private _disposables;
+  private _destroyed;
   private _ParentClass;
   readonly mcp: MCPClientManager;
   /**
@@ -481,7 +331,7 @@ declare class Agent<
   /**
    * Cancel a scheduled task
    * @param id ID of the task to cancel
-   * @returns true if the task was cancelled, false otherwise
+   * @returns true if the task was cancelled, false if the task was not found
    */
   cancelSchedule(id: string): Promise<boolean>;
   private _scheduleNextAlarm;
@@ -511,7 +361,8 @@ declare class Agent<
    * @param callbackHost Base host for the agent, used for the redirect URI. If not provided, will be derived from the current request.
    * @param agentsPrefix agents routing prefix if not using `agents`
    * @param options MCP client and transport options
-   * @returns authUrl
+   * @returns Server id and state - either "authenticating" with authUrl, or "ready"
+   * @throws If connection or discovery fails
    */
   addMcpServer(
     serverName: string,
@@ -525,24 +376,35 @@ declare class Agent<
         type?: TransportType;
       };
     }
-  ): Promise<{
-    id: string;
-    authUrl: string | undefined;
-  }>;
-  /**
-   * Handle potential OAuth callback requests after DO hibernation.
-   * Detects OAuth callbacks, restores state from database, and processes the callback.
-   * Returns a Response if this was an OAuth callback, otherwise returns undefined.
-   */
-  private _handlePotentialOAuthCallback;
-  /**
-   * Process an OAuth callback request (assumes state is already restored)
-   */
-  private _processOAuthCallback;
-  private _connectToMcpServerInternal;
+  ): Promise<
+    | {
+        id: string;
+        state: typeof MCPConnectionState.AUTHENTICATING;
+        authUrl: string;
+      }
+    | {
+        id: string;
+        state: typeof MCPConnectionState.READY;
+        authUrl?: undefined;
+      }
+  >;
   removeMcpServer(id: string): Promise<void>;
   getMcpServers(): MCPServersState;
   private broadcastMcpServers;
+  /**
+   * Handle MCP OAuth callback request if it's an OAuth callback.
+   *
+   * This method encapsulates the entire OAuth callback flow:
+   * 1. Checks if the request is an MCP OAuth callback
+   * 2. Processes the OAuth code exchange
+   * 3. Establishes the connection if successful
+   * 4. Broadcasts MCP server state updates
+   * 5. Returns the appropriate HTTP response
+   *
+   * @param request The incoming HTTP request
+   * @returns Response if this was an OAuth callback, null otherwise
+   */
+  private handleMcpOAuthCallback;
   /**
    * Handle OAuth callback response using MCPClientManager configuration
    * @param result OAuth callback result
@@ -691,46 +553,35 @@ declare class StreamingResponse {
 }
 //#endregion
 export {
-  Agent,
-  AgentContext,
-  AgentEmail,
-  AgentNamespace,
-  AgentOptions,
-  CallableMetadata,
-  type Connection$1 as Connection,
-  type ConnectionContext,
-  type CreateMcpHandlerOptions,
-  type ElicitRequest$1 as ElicitRequest,
-  ElicitRequestSchema$1 as ElicitRequestSchema,
-  type ElicitResult$1 as ElicitResult,
-  EmailResolver,
-  EmailRoutingOptions,
-  EmailSendOptions,
-  MCPServer,
-  MCPServerMessage,
-  MCPServersState,
-  McpAgent,
-  type McpAuthContext,
-  type OAuthExecutionContext,
-  QueueItem,
-  RPCRequest,
-  RPCResponse,
-  Schedule,
-  StateUpdateMessage,
-  StreamingResponse,
-  type WSMessage,
-  WorkerTransport,
-  type WorkerTransportOptions,
-  callable,
-  createAddressBasedEmailResolver,
-  createCatchAllEmailResolver,
-  createHeaderBasedEmailResolver,
-  experimental_createMcpHandler,
-  getAgentByName,
-  getCurrentAgent,
-  getMcpAuthContext,
-  routeAgentEmail,
-  routeAgentRequest,
-  unstable_callable
+  unstable_callable as A,
+  createAddressBasedEmailResolver as C,
+  getCurrentAgent as D,
+  getAgentByName as E,
+  routeAgentEmail as O,
+  callable as S,
+  createHeaderBasedEmailResolver as T,
+  RPCResponse as _,
+  AgentOptions as a,
+  StreamingResponse as b,
+  ConnectionContext as c,
+  EmailSendOptions as d,
+  MCPServer as f,
+  RPCRequest as g,
+  QueueItem as h,
+  AgentNamespace as i,
+  routeAgentRequest as k,
+  EmailResolver as l,
+  MCPServersState as m,
+  AgentContext as n,
+  CallableMetadata as o,
+  MCPServerMessage as p,
+  AgentEmail as r,
+  Connection$1 as s,
+  Agent as t,
+  EmailRoutingOptions as u,
+  Schedule as v,
+  createCatchAllEmailResolver as w,
+  WSMessage as x,
+  StateUpdateMessage as y
 };
-//# sourceMappingURL=index-CEqvuT_e.d.ts.map
+//# sourceMappingURL=index-8Iyg9pLA.d.ts.map

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

@@ -1,4 +1,4 @@
-import { BaseEvent, MCPObservabilityEvent } from "./mcp-BEwaCsxO.js";
+import { n as BaseEvent, t as MCPObservabilityEvent } from "./mcp-BwPscEiF.js";
 
 //#region src/observability/agent.d.ts
 
@@ -50,5 +50,9 @@ interface Observability {
  */
 declare const genericObservability: Observability;
 //#endregion
-export { Observability, ObservabilityEvent, genericObservability };
-//# sourceMappingURL=index-W4JUkafc.d.ts.map
+export {
+  ObservabilityEvent as n,
+  genericObservability as r,
+  Observability as t
+};
+//# sourceMappingURL=index-BUle9RiP.d.ts.map