agents 0.0.0-d40512c → 0.0.0-d4257c1

package/dist/{index-CITGJflw.d.ts → index-CkQU40oY.d.ts}

@@ -1,87 +1,28 @@
+import {
+  MCPClientManager,
+  MCPConnectionState,
+  TransportType
+} from "./client-C-nwz-3N.js";
+import { Observability } from "./index-W4JUkafc.js";
+import { MessageType } from "./ai-types-BWW4umHY.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 { MCPClientManager } from "./mcp/client.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
@@ -96,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;
 } & (
   | {
@@ -134,12 +75,24 @@ 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;
+/**
+ * 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 = string> = {
+  id: string;
+  payload: T;
+  callback: keyof Agent<unknown>;
+  created_at: number;
+};
 /**
  * Represents a scheduled task within an Agent
  * @template T Type of the payload data
@@ -179,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 = {
@@ -194,7 +147,7 @@ type MCPServer = {
   name: string;
   server_url: string;
   auth_url: string | null;
-  state: "authenticating" | "connecting" | "ready" | "discovering" | "failed";
+  state: MCPConnectionState;
   instructions: string | null;
   capabilities: ServerCapabilities | null;
 };
@@ -203,17 +156,23 @@ declare function getCurrentAgent<
 >(): {
   agent: T | undefined;
   connection: Connection | undefined;
-  request: Request<unknown, CfProperties<unknown>> | undefined;
+  request: Request | undefined;
+  email: AgentEmail | undefined;
 };
 /**
  * Base class for creating Agent implementations
  * @template Env Environment type containing bindings
  * @template State State type to store within the Agent
  */
-declare class Agent<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 _ParentClass;
-  mcp: MCPClientManager;
+  readonly mcp: MCPClientManager;
   /**
    * Initial state for the Agent
    * Override to provide default state values
@@ -259,17 +218,75 @@ declare class Agent<Env, State = unknown> extends Server<Env> {
    */
   onStateUpdate(state: State | undefined, source: Connection | "server"): void;
   /**
-   * Called when the Agent receives an email
+   * Called when the Agent receives an email via routeAgentEmail()
+   * Override this method to handle incoming emails
    * @param email Email message to process
    */
-  onEmail(email: ForwardableEmailMessage): Promise<void>;
+  _onEmail(email: AgentEmail): Promise<void>;
+  /**
+   * Reply to an email
+   * @param email The email to reply to
+   * @param options Options for the reply
+   * @returns void
+   */
+  replyToEmail(
+    email: AgentEmail,
+    options: {
+      fromName: string;
+      subject?: string | undefined;
+      body: string;
+      contentType?: string;
+      headers?: Record<string, string>;
+    }
+  ): Promise<void>;
   private _tryCatch;
+  /**
+   * Automatically wrap custom methods with agent context
+   * This ensures getCurrentAgent() works in all custom methods without decorators
+   */
+  private _autoWrapCustomMethods;
   onError(connection: Connection, error: unknown): void | Promise<void>;
   onError(error: unknown): void | Promise<void>;
   /**
    * Render content (not implemented in base class)
    */
   render(): void;
+  /**
+   * Queue a task to be executed in the future
+   * @param payload Payload to pass to the callback
+   * @param callback Name of the method to call
+   * @returns The ID of the queued task
+   */
+  queue<T = unknown>(callback: keyof this, payload: T): Promise<string>;
+  private _flushingQueue;
+  private _flushQueue;
+  /**
+   * Dequeue a task by ID
+   * @param id ID of the task to dequeue
+   */
+  dequeue(id: string): Promise<void>;
+  /**
+   * Dequeue all tasks
+   */
+  dequeueAll(): Promise<void>;
+  /**
+   * Dequeue all tasks by callback
+   * @param callback Name of the callback to dequeue
+   */
+  dequeueAllByCallback(callback: string): Promise<void>;
+  /**
+   * Get a queued task by ID
+   * @param id ID of the task to get
+   * @returns The task or undefined if not found
+   */
+  getQueue(id: string): Promise<QueueItem<string> | undefined>;
+  /**
+   * Get all queues by key and value
+   * @param key Key to filter by
+   * @param value Value to filter by
+   * @returns Array of matching QueueItem objects
+   */
+  getQueues(key: string, value: string): Promise<QueueItem<string>[]>;
   /**
    * Schedule a task to be executed in the future
    * @template T Type of the payload data
@@ -332,55 +349,40 @@ declare class Agent<Env, State = unknown> extends Server<Env> {
   /**
    * 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
@@ -413,17 +415,72 @@ declare function routeAgentRequest<Env>(
   env: Env,
   options?: AgentOptions<Env>
 ): Promise<Response | null>;
+type EmailResolver<Env> = (
+  email: ForwardableEmailMessage,
+  env: Env
+) => Promise<{
+  agentName: string;
+  agentId: string;
+} | null>;
+/**
+ * Create a resolver that uses the message-id header to determine the agent to route the email to
+ * @returns A function that resolves the agent to route the email to
+ */
+declare function createHeaderBasedEmailResolver<Env>(): EmailResolver<Env>;
+/**
+ * Create a resolver that uses the email address to determine the agent to route the email to
+ * @param defaultAgentName The default agent name to use if the email address does not contain a sub-address
+ * @returns A function that resolves the agent to route the email to
+ */
+declare function createAddressBasedEmailResolver<Env>(
+  defaultAgentName: string
+): EmailResolver<Env>;
+/**
+ * Create a resolver that uses the agentName and agentId to determine the agent to route the email to
+ * @param agentName The name of the agent to route the email to
+ * @param agentId The id of the agent to route the email to
+ * @returns A function that resolves the agent to route the email to
+ */
+declare function createCatchAllEmailResolver<Env>(
+  agentName: string,
+  agentId: string
+): EmailResolver<Env>;
+type EmailRoutingOptions<Env> = AgentOptions<Env> & {
+  resolver: EmailResolver<Env>;
+};
 /**
  * Route an email to the appropriate Agent
- * @param email Email message to route
- * @param env Environment containing Agent bindings
- * @param options Routing options
+ * @param email The email to route
+ * @param env The environment containing the Agent bindings
+ * @param options The options for routing the email
+ * @returns A promise that resolves when the email has been routed
  */
 declare function routeAgentEmail<Env>(
-  _email: ForwardableEmailMessage,
-  _env: Env,
-  _options?: AgentOptions<Env>
+  email: ForwardableEmailMessage,
+  env: Env,
+  options: EmailRoutingOptions<Env>
 ): Promise<void>;
+type AgentEmail = {
+  from: string;
+  to: string;
+  getRaw: () => Promise<Uint8Array>;
+  headers: Headers;
+  rawSize: number;
+  setReject: (reason: string) => void;
+  forward: (rcptTo: string, headers?: Headers) => Promise<void>;
+  reply: (options: { from: string; to: string; raw: string }) => Promise<void>;
+};
+type EmailSendOptions = {
+  to: string;
+  subject: string;
+  body: string;
+  contentType?: string;
+  headers?: Record<string, string>;
+  includeRoutingHeaders?: boolean;
+  agentName?: string;
+  agentId?: string;
+  domain?: string;
+};
 /**
  * Get or create an Agent by name
  * @template Env Environment type containing bindings
@@ -433,12 +490,17 @@ declare function routeAgentEmail<Env>(
  * @param options Options for Agent creation
  * @returns Promise resolving to an Agent instance stub
  */
-declare function getAgentByName<Env, T extends Agent<Env>>(
+declare function getAgentByName<
+  Env,
+  T extends Agent<Env>,
+  Props extends Record<string, unknown> = Record<string, unknown>
+>(
   namespace: AgentNamespace<T>,
   name: string,
   options?: {
     jurisdiction?: DurableObjectJurisdiction;
     locationHint?: DurableObjectLocationHint;
+    props?: Props;
   }
 ): Promise<DurableObjectStub<T>>;
 /**
@@ -460,27 +522,37 @@ declare class StreamingResponse {
    */
   end(finalChunk?: unknown): void;
 }
-
+//#endregion
 export {
-  Agent as A,
-  type CallableMetadata as C,
-  type MCPServersState as M,
-  type ObservabilityEvent as O,
-  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,
-  routeAgentEmail as k,
-  getAgentByName as l,
-  StreamingResponse as m,
-  routeAgentRequest as r,
-  unstable_callable as u
+  Agent,
+  AgentContext,
+  AgentEmail,
+  AgentNamespace,
+  AgentOptions,
+  CallableMetadata,
+  type Connection$1 as Connection,
+  type ConnectionContext,
+  EmailResolver,
+  EmailRoutingOptions,
+  EmailSendOptions,
+  MCPServer,
+  MCPServerMessage,
+  MCPServersState,
+  QueueItem,
+  RPCRequest,
+  RPCResponse,
+  Schedule,
+  StateUpdateMessage,
+  StreamingResponse,
+  type WSMessage,
+  callable,
+  createAddressBasedEmailResolver,
+  createCatchAllEmailResolver,
+  createHeaderBasedEmailResolver,
+  getAgentByName,
+  getCurrentAgent,
+  routeAgentEmail,
+  routeAgentRequest,
+  unstable_callable
 };
+//# sourceMappingURL=index-CkQU40oY.d.ts.map

package/dist/index-W4JUkafc.d.ts

@@ -0,0 +1,54 @@
+import { BaseEvent, MCPObservabilityEvent } from "./mcp-BEwaCsxO.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 { Observability, ObservabilityEvent, genericObservability };
+//# sourceMappingURL=index-W4JUkafc.d.ts.map

package/dist/index.d.ts

@@ -1,31 +1,70 @@
-import "@modelcontextprotocol/sdk/client/index.js";
-import "@modelcontextprotocol/sdk/types.js";
-export { Connection, ConnectionContext, WSMessage } from "partyserver";
-import "./mcp/client.js";
+import { TransportType } from "./client-C-nwz-3N.js";
+import "./mcp-BEwaCsxO.js";
+import "./do-oauth-client-provider-CCwGwnrA.js";
+import "./index-W4JUkafc.js";
+import "./ai-types-BWW4umHY.js";
+import {
+  Agent,
+  AgentContext,
+  AgentEmail,
+  AgentNamespace,
+  AgentOptions,
+  CallableMetadata,
+  Connection,
+  ConnectionContext,
+  EmailResolver,
+  EmailRoutingOptions,
+  EmailSendOptions,
+  MCPServer,
+  MCPServerMessage,
+  MCPServersState,
+  QueueItem,
+  RPCRequest,
+  RPCResponse,
+  Schedule,
+  StateUpdateMessage,
+  StreamingResponse,
+  WSMessage,
+  callable,
+  createAddressBasedEmailResolver,
+  createCatchAllEmailResolver,
+  createHeaderBasedEmailResolver,
+  getAgentByName,
+  getCurrentAgent,
+  routeAgentEmail,
+  routeAgentRequest,
+  unstable_callable
+} from "./index-CkQU40oY.js";
 export {
-  A as Agent,
-  a as AgentContext,
-  i as AgentNamespace,
-  j as AgentOptions,
-  C as CallableMetadata,
-  f as MCPServer,
-  e as MCPServerMessage,
-  M as MCPServersState,
-  R as RPCRequest,
-  c as RPCResponse,
-  d as Schedule,
-  S as StateUpdateMessage,
-  m as StreamingResponse,
-  l as getAgentByName,
-  h as getCurrentAgent,
-  k as routeAgentEmail,
-  r as routeAgentRequest,
-  u as unstable_callable
-} from "./index-CITGJflw.js";
-import "zod";
-import "@modelcontextprotocol/sdk/client/sse.js";
-import "@modelcontextprotocol/sdk/shared/protocol.js";
-import "ai";
-import "./mcp/do-oauth-client-provider.js";
-import "@modelcontextprotocol/sdk/client/auth.js";
-import "@modelcontextprotocol/sdk/shared/auth.js";
+  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,22 +1,7 @@
-import {
-  Agent,
-  StreamingResponse,
-  getAgentByName,
-  getCurrentAgent,
-  routeAgentEmail,
-  routeAgentRequest,
-  unstable_callable
-} from "./chunk-LU2RSO54.js";
-import "./chunk-4RBEYCWK.js";
-import "./chunk-PVQZBKN7.js";
-import "./chunk-KUH345EY.js";
-export {
-  Agent,
-  StreamingResponse,
-  getAgentByName,
-  getCurrentAgent,
-  routeAgentEmail,
-  routeAgentRequest,
-  unstable_callable
-};
-//# sourceMappingURL=index.js.map
+import "./ai-types-UZlfLOYP.js";
+import "./client-DjR-lC16.js";
+import "./client-CZBVDDoO.js";
+import "./do-oauth-client-provider-B2jr6UNq.js";
+import { Agent, StreamingResponse, callable, createAddressBasedEmailResolver, createCatchAllEmailResolver, createHeaderBasedEmailResolver, getAgentByName, getCurrentAgent, routeAgentEmail, routeAgentRequest, unstable_callable } from "./src-COfG--3R.js";
+
+export { Agent, StreamingResponse, callable, createAddressBasedEmailResolver, createCatchAllEmailResolver, createHeaderBasedEmailResolver, getAgentByName, getCurrentAgent, routeAgentEmail, routeAgentRequest, unstable_callable };