agents 0.0.0-e4a2352 → 0.0.0-e8f693b

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

@@ -0,0 +1,55 @@
+import { OAuthClientProvider } from "@modelcontextprotocol/sdk/client/auth.js";
+import {
+  OAuthClientInformation,
+  OAuthClientInformationFull,
+  OAuthClientMetadata,
+  OAuthTokens
+} from "@modelcontextprotocol/sdk/shared/auth.js";
+
+//#region src/mcp/do-oauth-client-provider.d.ts
+interface AgentsOAuthProvider extends OAuthClientProvider {
+  authUrl: string | undefined;
+  clientId: string | undefined;
+  serverId: string | undefined;
+}
+declare class DurableObjectOAuthClientProvider implements AgentsOAuthProvider {
+  storage: DurableObjectStorage;
+  clientName: string;
+  baseRedirectUrl: string;
+  private _authUrl_;
+  private _serverId_;
+  private _clientId_;
+  constructor(
+    storage: DurableObjectStorage,
+    clientName: string,
+    baseRedirectUrl: string
+  );
+  get clientMetadata(): OAuthClientMetadata;
+  get clientUri(): string;
+  get redirectUrl(): string;
+  get clientId(): string;
+  set clientId(clientId_: string);
+  get serverId(): string;
+  set serverId(serverId_: string);
+  keyPrefix(clientId: string): string;
+  clientInfoKey(clientId: string): string;
+  clientInformation(): Promise<OAuthClientInformation | undefined>;
+  saveClientInformation(
+    clientInformation: OAuthClientInformationFull
+  ): Promise<void>;
+  tokenKey(clientId: string): string;
+  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
+   */
+  redirectToAuthorization(authUrl: URL): Promise<void>;
+  codeVerifierKey(clientId: string): string;
+  saveCodeVerifier(verifier: string): Promise<void>;
+  codeVerifier(): Promise<string>;
+}
+//#endregion
+export { DurableObjectOAuthClientProvider as n, AgentsOAuthProvider as t };
+//# sourceMappingURL=do-oauth-client-provider-DGc5pP0l.d.ts.map

package/dist/{index-BCJclX6q.d.ts → index-B6MjW6n-.d.ts}

@@ -1,88 +1,28 @@
-import { env } from "cloudflare:workers";
+import {
+  a as MCPConnectionState,
+  l as TransportType,
+  t as MCPClientManager
+} from "./client-B17XUTV7.js";
+import { t as Observability } from "./index-DhJCaDWd.js";
+import { n as MessageType } from "./ai-types-D5YoPrBZ.js";
+import {
+  Connection,
+  Connection as Connection$1,
+  ConnectionContext,
+  PartyServerOptions,
+  Server,
+  WSMessage
+} from "partyserver";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import {
-  ServerCapabilities,
-  Tool,
   Prompt,
-  Resource
+  Resource,
+  ServerCapabilities,
+  Tool
 } from "@modelcontextprotocol/sdk/types.js";
-import { Server, Connection, PartyServerOptions } from "partyserver";
-import { M as MCPClientManager } from "./client-DgyzBU_8.js";
-import { Message } from "ai";
+import { env } from "cloudflare:workers";
 
-type BaseEvent<
-  T extends string,
-  Payload extends Record<string, unknown> = {}
-> = {
-  type: T;
-  /**
-   * The unique identifier for the event
-   */
-  id: string;
-  /**
-   * The message to display in the logs for this event, should the implementation choose to display
-   * a human-readable message.
-   */
-  displayMessage: string;
-  /**
-   * The payload of the event
-   */
-  payload: Payload;
-  /**
-   * The timestamp of the event in milliseconds since epoch
-   */
-  timestamp: number;
-};
-/**
- * The type of events that can be emitted by an Agent
- */
-type ObservabilityEvent =
-  | BaseEvent<
-      "state:update",
-      {
-        state: unknown;
-        previousState: unknown;
-      }
-    >
-  | BaseEvent<
-      "rpc",
-      {
-        method: string;
-        args: unknown[];
-        streaming?: boolean;
-        success: boolean;
-      }
-    >
-  | BaseEvent<
-      "message:request" | "message:response",
-      {
-        message: Message[];
-      }
-    >
-  | BaseEvent<"message:clear">
-  | BaseEvent<
-      "schedule:create" | "schedule:execute" | "schedule:cancel",
-      Schedule<unknown>
-    >
-  | BaseEvent<"destroy">
-  | BaseEvent<
-      "connect",
-      {
-        connectionId: string;
-      }
-    >;
-interface Observability {
-  /**
-   * Emit an event for the Agent's observability implementation to handle.
-   * @param event - The event to emit
-   * @param ctx - The execution context of the invocation
-   */
-  emit(event: ObservabilityEvent, ctx: DurableObjectState): void;
-}
-/**
- * A generic observability implementation that logs events to the console.
- */
-declare const genericObservability: Observability;
+//#region src/index.d.ts
 
 /**
  * RPC request message from client
@@ -97,14 +37,14 @@ type RPCRequest = {
  * State update message from client
  */
 type StateUpdateMessage = {
-  type: "cf_agent_state";
+  type: MessageType.CF_AGENT_STATE;
   state: unknown;
 };
 /**
  * RPC response message to client
  */
 type RPCResponse = {
-  type: "rpc";
+  type: MessageType.RPC;
   id: string;
 } & (
   | {
@@ -135,15 +75,21 @@ type CallableMetadata = {
  * Decorator that marks a method as callable by clients
  * @param metadata Optional metadata about the callable method
  */
-declare function unstable_callable(
+declare function callable(
   metadata?: CallableMetadata
 ): <This, Args extends unknown[], Return>(
   target: (this: This, ...args: Args) => Return,
   context: ClassMethodDecoratorContext
 ) => (this: This, ...args: Args) => Return;
-type QueueItem<T = string> = {
+/**
+ * Decorator that marks a method as callable by clients
+ * @deprecated this has been renamed to callable, and unstable_callable will be removed in the next major version
+ * @param metadata Optional metadata about the callable method
+ */
+declare const unstable_callable: (metadata?: CallableMetadata) => void;
+type QueueItem<T$1 = string> = {
   id: string;
-  payload: T;
+  payload: T$1;
   callback: keyof Agent<unknown>;
   created_at: number;
 };
@@ -151,13 +97,13 @@ type QueueItem<T = string> = {
  * Represents a scheduled task within an Agent
  * @template T Type of the payload data
  */
-type Schedule<T = string> = {
+type Schedule<T$1 = string> = {
   /** Unique identifier for the schedule */
   id: string;
   /** Name of the method to be called */
   callback: string;
   /** Data to be passed to the callback */
-  payload: T;
+  payload: T$1;
 } & (
   | {
       /** Type of schedule for one-time execution at a specific time */
@@ -186,7 +132,7 @@ type Schedule<T = string> = {
  * MCP Server state update message from server -> Client
  */
 type MCPServerMessage = {
-  type: "cf_agent_mcp_servers";
+  type: MessageType.CF_AGENT_MCP_SERVERS;
   mcp: MCPServersState;
 };
 type MCPServersState = {
@@ -201,14 +147,14 @@ type MCPServer = {
   name: string;
   server_url: string;
   auth_url: string | null;
-  state: "authenticating" | "connecting" | "ready" | "discovering" | "failed";
+  state: MCPConnectionState;
   instructions: string | null;
   capabilities: ServerCapabilities | null;
 };
 declare function getCurrentAgent<
-  T extends Agent<unknown, unknown> = Agent<unknown, unknown>
+  T$1 extends Agent<unknown, unknown> = Agent<unknown, unknown>
 >(): {
-  agent: T | undefined;
+  agent: T$1 | undefined;
   connection: Connection | undefined;
   request: Request | undefined;
   email: AgentEmail | undefined;
@@ -218,10 +164,16 @@ declare function getCurrentAgent<
  * @template Env Environment type containing bindings
  * @template State State type to store within the Agent
  */
-declare class Agent<Env = typeof env, State = unknown> extends Server<Env> {
+declare class Agent<
+  Env = typeof env,
+  State = unknown,
+  Props extends Record<string, unknown> = Record<string, unknown>
+> extends Server<Env, Props> {
   private _state;
+  private _disposables;
+  private _mcpStateRestored;
   private _ParentClass;
-  mcp: MCPClientManager;
+  readonly mcp: MCPClientManager;
   /**
    * Initial state for the Agent
    * Override to provide default state values
@@ -395,58 +347,44 @@ declare class Agent<Env = typeof env, State = unknown> extends Server<Env> {
    * @returns A map of method names to their metadata
    */
   private _isCallable;
+  private _ensureMcpStateRestored;
   /**
    * Connect to a new MCP Server
    *
+   * @param serverName Name of the MCP server
    * @param url MCP Server SSE URL
-   * @param callbackHost Base host for the agent, used for the redirect URI.
+   * @param callbackHost Base host for the agent, used for the redirect URI. If not provided, will be derived from the current request.
    * @param agentsPrefix agents routing prefix if not using `agents`
-   * @param options MCP client and transport (header) options
+   * @param options MCP client and transport options
    * @returns authUrl
    */
   addMcpServer(
     serverName: string,
     url: string,
-    callbackHost: string,
+    callbackHost?: string,
     agentsPrefix?: string,
     options?: {
       client?: ConstructorParameters<typeof Client>[1];
-      transport?: {
-        headers: HeadersInit;
-      };
-    }
-  ): Promise<{
-    id: string;
-    authUrl: string | undefined;
-  }>;
-  _connectToMcpServerInternal(
-    _serverName: string,
-    url: string,
-    callbackUrl: string,
-    options?: {
-      client?: ConstructorParameters<typeof Client>[1];
-      /**
-       * We don't expose the normal set of transport options because:
-       * 1) we can't serialize things like the auth provider or a fetch function into the DB for reconnection purposes
-       * 2) We probably want these options to be agnostic to the transport type (SSE vs Streamable)
-       *
-       * This has the limitation that you can't override fetch, but I think headers should handle nearly all cases needed (i.e. non-standard bearer auth).
-       */
       transport?: {
         headers?: HeadersInit;
+        type?: TransportType;
       };
-    },
-    reconnect?: {
-      id: string;
-      oauthClientId?: string;
     }
   ): Promise<{
     id: string;
     authUrl: string | undefined;
-    clientId: string | undefined;
   }>;
+  private _connectToMcpServerInternal;
   removeMcpServer(id: string): Promise<void>;
   getMcpServers(): MCPServersState;
+  private broadcastMcpServers;
+  /**
+   * Handle OAuth callback response using MCPClientManager configuration
+   * @param result OAuth callback result
+   * @param request The original request (needed for base URL)
+   * @returns Response for the OAuth callback
+   */
+  private handleOAuthCallbackResponse;
 }
 /**
  * Namespace for creating Agent instances
@@ -554,14 +492,19 @@ type EmailSendOptions = {
  * @param options Options for Agent creation
  * @returns Promise resolving to an Agent instance stub
  */
-declare function getAgentByName<Env, T extends Agent<Env>>(
-  namespace: AgentNamespace<T>,
+declare function getAgentByName<
+  Env,
+  T$1 extends Agent<Env>,
+  Props extends Record<string, unknown> = Record<string, unknown>
+>(
+  namespace: AgentNamespace<T$1>,
   name: string,
   options?: {
     jurisdiction?: DurableObjectJurisdiction;
     locationHint?: DurableObjectLocationHint;
+    props?: Props;
   }
-): Promise<DurableObjectStub<T>>;
+): Promise<DurableObjectStub<T$1>>;
 /**
  * A wrapper for streaming responses in callable methods
  */
@@ -581,35 +524,37 @@ declare class StreamingResponse {
    */
   end(finalChunk?: unknown): void;
 }
-
+//#endregion
 export {
-  Agent as A,
-  type CallableMetadata as C,
-  type EmailResolver as E,
-  type MCPServersState as M,
-  type ObservabilityEvent as O,
-  type QueueItem as Q,
-  type RPCRequest as R,
-  type StateUpdateMessage as S,
-  type AgentContext as a,
-  type Observability as b,
-  type RPCResponse as c,
-  type Schedule as d,
-  type MCPServerMessage as e,
-  type MCPServer as f,
-  genericObservability as g,
-  getCurrentAgent as h,
-  type AgentNamespace as i,
-  type AgentOptions as j,
-  createHeaderBasedEmailResolver as k,
-  createAddressBasedEmailResolver as l,
-  createCatchAllEmailResolver as m,
-  type EmailRoutingOptions as n,
-  routeAgentEmail as o,
-  type AgentEmail as p,
-  type EmailSendOptions as q,
-  routeAgentRequest as r,
-  getAgentByName as s,
-  StreamingResponse as t,
-  unstable_callable as u
+  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-B6MjW6n-.d.ts.map

package/dist/index-DhJCaDWd.d.ts

@@ -0,0 +1,58 @@
+import { n as BaseEvent, t as MCPObservabilityEvent } from "./mcp-Dw5vDrY8.js";
+
+//#region src/observability/agent.d.ts
+
+/**
+ * Agent-specific observability events
+ * These track the lifecycle and operations of an Agent
+ */
+type AgentObservabilityEvent =
+  | BaseEvent<"state:update", {}>
+  | BaseEvent<
+      "rpc",
+      {
+        method: string;
+        streaming?: boolean;
+      }
+    >
+  | BaseEvent<"message:request" | "message:response", {}>
+  | BaseEvent<"message:clear">
+  | BaseEvent<
+      "schedule:create" | "schedule:execute" | "schedule:cancel",
+      {
+        callback: string;
+        id: string;
+      }
+    >
+  | BaseEvent<"destroy">
+  | BaseEvent<
+      "connect",
+      {
+        connectionId: string;
+      }
+    >;
+//#endregion
+//#region src/observability/index.d.ts
+/**
+ * Union of all observability event types from different domains
+ */
+type ObservabilityEvent = AgentObservabilityEvent | MCPObservabilityEvent;
+interface Observability {
+  /**
+   * Emit an event for the Agent's observability implementation to handle.
+   * @param event - The event to emit
+   * @param ctx - The execution context of the invocation (optional)
+   */
+  emit(event: ObservabilityEvent, ctx?: DurableObjectState): void;
+}
+/**
+ * A generic observability implementation that logs events to the console.
+ */
+declare const genericObservability: Observability;
+//#endregion
+export {
+  ObservabilityEvent as n,
+  genericObservability as r,
+  Observability as t
+};
+//# sourceMappingURL=index-DhJCaDWd.d.ts.map

package/dist/index.d.ts

@@ -1,41 +1,70 @@
-import "cloudflare:workers";
-import "@modelcontextprotocol/sdk/client/index.js";
-import "@modelcontextprotocol/sdk/types.js";
-export { Connection, ConnectionContext, WSMessage } from "partyserver";
-import "./client-DgyzBU_8.js";
-export {
-  A as Agent,
-  a as AgentContext,
-  p as AgentEmail,
-  i as AgentNamespace,
-  j as AgentOptions,
-  C as CallableMetadata,
-  E as EmailResolver,
-  n as EmailRoutingOptions,
-  q as EmailSendOptions,
+import { l as TransportType } from "./client-B17XUTV7.js";
+import "./mcp-Dw5vDrY8.js";
+import "./do-oauth-client-provider-DGc5pP0l.js";
+import "./index-DhJCaDWd.js";
+import "./ai-types-D5YoPrBZ.js";
+import {
+  A as unstable_callable,
+  C as createAddressBasedEmailResolver,
+  D as getCurrentAgent,
+  E as getAgentByName,
+  O as routeAgentEmail,
+  S as callable,
+  T as createHeaderBasedEmailResolver,
+  _ as RPCResponse,
+  a as AgentOptions,
+  b as StreamingResponse,
+  c as ConnectionContext,
+  d as EmailSendOptions,
   f as MCPServer,
-  e as MCPServerMessage,
-  M as MCPServersState,
-  Q as QueueItem,
-  R as RPCRequest,
-  c as RPCResponse,
-  d as Schedule,
-  S as StateUpdateMessage,
-  t as StreamingResponse,
-  l as createAddressBasedEmailResolver,
-  m as createCatchAllEmailResolver,
-  k as createHeaderBasedEmailResolver,
-  s as getAgentByName,
-  h as getCurrentAgent,
-  o as routeAgentEmail,
-  r as routeAgentRequest,
-  u as unstable_callable
-} from "./index-BCJclX6q.js";
-import "zod";
-import "@modelcontextprotocol/sdk/shared/protocol.js";
-import "ai";
-import "@modelcontextprotocol/sdk/client/sse.js";
-import "@modelcontextprotocol/sdk/client/streamableHttp.js";
-import "./mcp/do-oauth-client-provider.js";
-import "@modelcontextprotocol/sdk/client/auth.js";
-import "@modelcontextprotocol/sdk/shared/auth.js";
+  g as RPCRequest,
+  h as QueueItem,
+  i as AgentNamespace,
+  k as routeAgentRequest,
+  l as EmailResolver,
+  m as MCPServersState,
+  n as AgentContext,
+  o as CallableMetadata,
+  p as MCPServerMessage,
+  r as AgentEmail,
+  s as Connection,
+  t as Agent,
+  u as EmailRoutingOptions,
+  v as Schedule,
+  w as createCatchAllEmailResolver,
+  x as WSMessage,
+  y as StateUpdateMessage
+} from "./index-B6MjW6n-.js";
+export {
+  Agent,
+  AgentContext,
+  AgentEmail,
+  AgentNamespace,
+  AgentOptions,
+  CallableMetadata,
+  Connection,
+  ConnectionContext,
+  EmailResolver,
+  EmailRoutingOptions,
+  EmailSendOptions,
+  MCPServer,
+  MCPServerMessage,
+  MCPServersState,
+  QueueItem,
+  RPCRequest,
+  RPCResponse,
+  Schedule,
+  StateUpdateMessage,
+  StreamingResponse,
+  TransportType,
+  WSMessage,
+  callable,
+  createAddressBasedEmailResolver,
+  createCatchAllEmailResolver,
+  createHeaderBasedEmailResolver,
+  getAgentByName,
+  getCurrentAgent,
+  routeAgentEmail,
+  routeAgentRequest,
+  unstable_callable
+};

package/dist/index.js

@@ -1,28 +1,7 @@
-import {
-  Agent,
-  StreamingResponse,
-  createAddressBasedEmailResolver,
-  createCatchAllEmailResolver,
-  createHeaderBasedEmailResolver,
-  getAgentByName,
-  getCurrentAgent,
-  routeAgentEmail,
-  routeAgentRequest,
-  unstable_callable
-} from "./chunk-JXN5WZFQ.js";
-import "./chunk-HY7ZLHJB.js";
-import "./chunk-PVQZBKN7.js";
-import "./chunk-KUH345EY.js";
-export {
-  Agent,
-  StreamingResponse,
-  createAddressBasedEmailResolver,
-  createCatchAllEmailResolver,
-  createHeaderBasedEmailResolver,
-  getAgentByName,
-  getCurrentAgent,
-  routeAgentEmail,
-  routeAgentRequest,
-  unstable_callable
-};
-//# sourceMappingURL=index.js.map
+import "./ai-types-B3aQaFv3.js";
+import "./client-BfiZ3HQd.js";
+import "./client-9Ld2_lnt.js";
+import "./do-oauth-client-provider-CswoD5Lu.js";
+import { a as createCatchAllEmailResolver, c as getCurrentAgent, d as unstable_callable, i as createAddressBasedEmailResolver, l as routeAgentEmail, n as StreamingResponse, o as createHeaderBasedEmailResolver, r as callable, s as getAgentByName, t as Agent, u as routeAgentRequest } from "./src-Dz0H9hSU.js";
+
+export { Agent, StreamingResponse, callable, createAddressBasedEmailResolver, createCatchAllEmailResolver, createHeaderBasedEmailResolver, getAgentByName, getCurrentAgent, routeAgentEmail, routeAgentRequest, unstable_callable };

package/dist/mcp/client.d.ts

@@ -1,11 +1,4 @@
-import 'zod';
-import '@modelcontextprotocol/sdk/client/index.js';
-import '@modelcontextprotocol/sdk/shared/protocol.js';
-import '@modelcontextprotocol/sdk/types.js';
-import 'ai';
-export { M as MCPClientManager, g as getNamespacedData } from '../client-DgyzBU_8.js';
-import '@modelcontextprotocol/sdk/client/sse.js';
-import '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import './do-oauth-client-provider.js';
-import '@modelcontextprotocol/sdk/client/auth.js';
-import '@modelcontextprotocol/sdk/shared/auth.js';
+import { i as getNamespacedData, n as MCPClientOAuthCallbackConfig, r as MCPClientOAuthResult, t as MCPClientManager } from "../client-B17XUTV7.js";
+import "../mcp-Dw5vDrY8.js";
+import "../do-oauth-client-provider-DGc5pP0l.js";
+export { MCPClientManager, MCPClientOAuthCallbackConfig, MCPClientOAuthResult, getNamespacedData };

package/dist/mcp/client.js

@@ -1,9 +1,3 @@
-import {
-  MCPClientManager,
-  getNamespacedData
-} from "../chunk-HY7ZLHJB.js";
-export {
-  MCPClientManager,
-  getNamespacedData
-};
-//# sourceMappingURL=client.js.map
+import { n as getNamespacedData, t as MCPClientManager } from "../client-9Ld2_lnt.js";
+
+export { MCPClientManager, getNamespacedData };