agents 0.0.0-5342ce4 → 0.0.0-54e1986

package/dist/client.d.ts

@@ -38,17 +38,24 @@ type AgentClientFetchOptions = Omit<PartyFetchOptions, "party" | "room"> & {
   /** Name of the specific Agent instance */
   name?: string;
 };
+/**
+ * Convert a camelCase string to a kebab-case string
+ * @param str The string to convert
+ * @returns The kebab-case string
+ */
+declare function camelCaseToKebabCase(str: string): string;
 /**
  * WebSocket client for connecting to an Agent
  */
 declare class AgentClient<State = unknown> extends PartySocket {
-  #private;
   /**
    * @deprecated Use agentFetch instead
    */
   static fetch(_opts: PartyFetchOptions): Promise<Response>;
   agent: string;
   name: string;
+  private options;
+  private _pendingCalls;
   constructor(options: AgentClientOptions<State>);
   setState(state: State): void;
   /**
@@ -81,4 +88,5 @@ export {
   type AgentClientOptions,
   type StreamOptions,
   agentFetch,
+  camelCaseToKebabCase,
 };

package/dist/client.js

@@ -1,131 +1,11 @@
 import {
-  __privateAdd,
-  __privateGet,
-  __privateSet
-} from "./chunk-HMLY7DHA.js";
-
-// src/client.ts
-import {
-  PartySocket
-} from "partysocket";
-function camelCaseToKebabCase(str) {
-  if (str === str.toUpperCase() && str !== str.toLowerCase()) {
-    return str.toLowerCase().replace(/_/g, "-");
-  }
-  let kebabified = str.replace(
-    /[A-Z]/g,
-    (letter) => `-${letter.toLowerCase()}`
-  );
-  kebabified = kebabified.startsWith("-") ? kebabified.slice(1) : kebabified;
-  return kebabified.replace(/_/g, "-").replace(/-$/, "");
-}
-var _options, _pendingCalls;
-var AgentClient = class extends PartySocket {
-  constructor(options) {
-    const agentNamespace = camelCaseToKebabCase(options.agent);
-    super({
-      prefix: "agents",
-      party: agentNamespace,
-      room: options.name || "default",
-      ...options
-    });
-    __privateAdd(this, _options);
-    __privateAdd(this, _pendingCalls, /* @__PURE__ */ new Map());
-    this.agent = agentNamespace;
-    this.name = options.name || "default";
-    __privateSet(this, _options, options);
-    this.addEventListener("message", (event) => {
-      if (typeof event.data === "string") {
-        let parsedMessage;
-        try {
-          parsedMessage = JSON.parse(event.data);
-        } catch (error) {
-          return;
-        }
-        if (parsedMessage.type === "cf_agent_state") {
-          __privateGet(this, _options).onStateUpdate?.(parsedMessage.state, "server");
-          return;
-        }
-        if (parsedMessage.type === "rpc") {
-          const response = parsedMessage;
-          const pending = __privateGet(this, _pendingCalls).get(response.id);
-          if (!pending) return;
-          if (!response.success) {
-            pending.reject(new Error(response.error));
-            __privateGet(this, _pendingCalls).delete(response.id);
-            pending.stream?.onError?.(response.error);
-            return;
-          }
-          if ("done" in response) {
-            if (response.done) {
-              pending.resolve(response.result);
-              __privateGet(this, _pendingCalls).delete(response.id);
-              pending.stream?.onDone?.(response.result);
-            } else {
-              pending.stream?.onChunk?.(response.result);
-            }
-          } else {
-            pending.resolve(response.result);
-            __privateGet(this, _pendingCalls).delete(response.id);
-          }
-        }
-      }
-    });
-  }
-  /**
-   * @deprecated Use agentFetch instead
-   */
-  static fetch(_opts) {
-    throw new Error(
-      "AgentClient.fetch is not implemented, use agentFetch instead"
-    );
-  }
-  setState(state) {
-    this.send(JSON.stringify({ type: "cf_agent_state", state }));
-    __privateGet(this, _options).onStateUpdate?.(state, "client");
-  }
-  /**
-   * Call a method on the Agent
-   * @param method Name of the method to call
-   * @param args Arguments to pass to the method
-   * @param streamOptions Options for handling streaming responses
-   * @returns Promise that resolves with the method's return value
-   */
-  async call(method, args = [], streamOptions) {
-    return new Promise((resolve, reject) => {
-      const id = Math.random().toString(36).slice(2);
-      __privateGet(this, _pendingCalls).set(id, {
-        resolve: (value) => resolve(value),
-        reject,
-        stream: streamOptions,
-        type: null
-      });
-      const request = {
-        type: "rpc",
-        id,
-        method,
-        args
-      };
-      this.send(JSON.stringify(request));
-    });
-  }
-};
-_options = new WeakMap();
-_pendingCalls = new WeakMap();
-function agentFetch(opts, init) {
-  const agentNamespace = camelCaseToKebabCase(opts.agent);
-  return PartySocket.fetch(
-    {
-      prefix: "agents",
-      party: agentNamespace,
-      room: opts.name || "default",
-      ...opts
-    },
-    init
-  );
-}
+  AgentClient,
+  agentFetch,
+  camelCaseToKebabCase
+} from "./chunk-QSGN3REV.js";
 export {
   AgentClient,
-  agentFetch
+  agentFetch,
+  camelCaseToKebabCase
 };
 //# sourceMappingURL=client.js.map

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/client.ts"],"sourcesContent":["import {\n  PartySocket,\n  type PartySocketOptions,\n  type PartyFetchOptions,\n} from \"partysocket\";\nimport type { RPCRequest, RPCResponse } from \"./\";\n\n/**\n * Options for creating an AgentClient\n */\nexport type AgentClientOptions<State = unknown> = Omit<\n  PartySocketOptions,\n  \"party\" | \"room\"\n> & {\n  /** Name of the agent to connect to */\n  agent: string;\n  /** Name of the specific Agent instance */\n  name?: string;\n  /** Called when the Agent's state is updated */\n  onStateUpdate?: (state: State, source: \"server\" | \"client\") => void;\n};\n\n/**\n * Options for streaming RPC calls\n */\nexport type StreamOptions = {\n  /** Called when a chunk of data is received */\n  onChunk?: (chunk: unknown) => void;\n  /** Called when the stream ends */\n  onDone?: (finalChunk: unknown) => void;\n  /** Called when an error occurs */\n  onError?: (error: string) => void;\n};\n\n/**\n * Options for the agentFetch function\n */\nexport type AgentClientFetchOptions = Omit<\n  PartyFetchOptions,\n  \"party\" | \"room\"\n> & {\n  /** Name of the agent to connect to */\n  agent: string;\n  /** Name of the specific Agent instance */\n  name?: string;\n};\n\n/**\n * Convert a camelCase string to a kebab-case string\n * @param str The string to convert\n * @returns The kebab-case string\n */\nfunction camelCaseToKebabCase(str: string): string {\n  // If string is all uppercase, convert to lowercase\n  if (str === str.toUpperCase() && str !== str.toLowerCase()) {\n    return str.toLowerCase().replace(/_/g, \"-\");\n  }\n\n  // Otherwise handle camelCase to kebab-case\n  let kebabified = str.replace(\n    /[A-Z]/g,\n    (letter) => `-${letter.toLowerCase()}`\n  );\n  kebabified = kebabified.startsWith(\"-\") ? kebabified.slice(1) : kebabified;\n  // Convert any remaining underscores to hyphens and remove trailing -'s\n  return kebabified.replace(/_/g, \"-\").replace(/-$/, \"\");\n}\n\n/**\n * WebSocket client for connecting to an Agent\n */\nexport class AgentClient<State = unknown> extends PartySocket {\n  /**\n   * @deprecated Use agentFetch instead\n   */\n  static fetch(_opts: PartyFetchOptions): Promise<Response> {\n    throw new Error(\n      \"AgentClient.fetch is not implemented, use agentFetch instead\"\n    );\n  }\n  agent: string;\n  name: string;\n  #options: AgentClientOptions<State>;\n  #pendingCalls = new Map<\n    string,\n    {\n      resolve: (value: unknown) => void;\n      reject: (error: Error) => void;\n      stream?: StreamOptions;\n      type?: unknown;\n    }\n  >();\n\n  constructor(options: AgentClientOptions<State>) {\n    const agentNamespace = camelCaseToKebabCase(options.agent);\n    super({\n      prefix: \"agents\",\n      party: agentNamespace,\n      room: options.name || \"default\",\n      ...options,\n    });\n    this.agent = agentNamespace;\n    this.name = options.name || \"default\";\n    this.#options = options;\n\n    this.addEventListener(\"message\", (event) => {\n      if (typeof event.data === \"string\") {\n        let parsedMessage: Record<string, unknown>;\n        try {\n          parsedMessage = JSON.parse(event.data);\n        } catch (error) {\n          // silently ignore invalid messages for now\n          // TODO: log errors with log levels\n          return;\n        }\n        if (parsedMessage.type === \"cf_agent_state\") {\n          this.#options.onStateUpdate?.(parsedMessage.state as State, \"server\");\n          return;\n        }\n        if (parsedMessage.type === \"rpc\") {\n          const response = parsedMessage as RPCResponse;\n          const pending = this.#pendingCalls.get(response.id);\n          if (!pending) return;\n\n          if (!response.success) {\n            pending.reject(new Error(response.error));\n            this.#pendingCalls.delete(response.id);\n            pending.stream?.onError?.(response.error);\n            return;\n          }\n\n          // Handle streaming responses\n          if (\"done\" in response) {\n            if (response.done) {\n              pending.resolve(response.result);\n              this.#pendingCalls.delete(response.id);\n              pending.stream?.onDone?.(response.result);\n            } else {\n              pending.stream?.onChunk?.(response.result);\n            }\n          } else {\n            // Non-streaming response\n            pending.resolve(response.result);\n            this.#pendingCalls.delete(response.id);\n          }\n        }\n      }\n    });\n  }\n\n  setState(state: State) {\n    this.send(JSON.stringify({ type: \"cf_agent_state\", state }));\n    this.#options.onStateUpdate?.(state, \"client\");\n  }\n\n  /**\n   * Call a method on the Agent\n   * @param method Name of the method to call\n   * @param args Arguments to pass to the method\n   * @param streamOptions Options for handling streaming responses\n   * @returns Promise that resolves with the method's return value\n   */\n  async call<T = unknown>(\n    method: string,\n    args: unknown[] = [],\n    streamOptions?: StreamOptions\n  ): Promise<T> {\n    return new Promise<T>((resolve, reject) => {\n      const id = Math.random().toString(36).slice(2);\n      this.#pendingCalls.set(id, {\n        resolve: (value: unknown) => resolve(value as T),\n        reject,\n        stream: streamOptions,\n        type: null as T,\n      });\n\n      const request: RPCRequest = {\n        type: \"rpc\",\n        id,\n        method,\n        args,\n      };\n\n      this.send(JSON.stringify(request));\n    });\n  }\n}\n\n/**\n * Make an HTTP request to an Agent\n * @param opts Connection options\n * @param init Request initialization options\n * @returns Promise resolving to a Response\n */\nexport function agentFetch(opts: AgentClientFetchOptions, init?: RequestInit) {\n  const agentNamespace = camelCaseToKebabCase(opts.agent);\n\n  return PartySocket.fetch(\n    {\n      prefix: \"agents\",\n      party: agentNamespace,\n      room: opts.name || \"default\",\n      ...opts,\n    },\n    init\n  );\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/dist/index.d.ts

@@ -1,6 +1,15 @@
 import { Server, Connection, PartyServerOptions } from "partyserver";
 export { Connection, ConnectionContext, WSMessage } from "partyserver";
-import { AsyncLocalStorage } from "node:async_hooks";
+import { MCPClientManager } from "./mcp/client.js";
+import { Tool, Prompt, Resource } from "@modelcontextprotocol/sdk/types.js";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import "zod";
+import "@modelcontextprotocol/sdk/client/sse.js";
+import "./mcp/do-oauth-client-provider.js";
+import "@modelcontextprotocol/sdk/client/auth.js";
+import "@modelcontextprotocol/sdk/shared/auth.js";
+import "@modelcontextprotocol/sdk/shared/protocol.js";
+import "ai";
 
 /**
  * RPC request message from client
@@ -94,18 +103,43 @@ type Schedule<T = string> = {
       cron: string;
     }
 );
-declare const unstable_context: AsyncLocalStorage<{
-  agent: Agent<unknown>;
+/**
+ * MCP Server state update message from server -> Client
+ */
+type MCPServerMessage = {
+  type: "cf_agent_mcp_servers";
+  mcp: MCPServersState;
+};
+type MCPServersState = {
+  servers: {
+    [id: string]: MCPServer;
+  };
+  tools: Tool[];
+  prompts: Prompt[];
+  resources: Resource[];
+};
+type MCPServer = {
+  name: string;
+  server_url: string;
+  auth_url: string | null;
+  state: "authenticating" | "connecting" | "ready" | "discovering" | "failed";
+};
+declare function getCurrentAgent<
+  T extends Agent<unknown, unknown> = Agent<unknown, unknown>,
+>(): {
+  agent: T | undefined;
   connection: Connection | undefined;
-  request: Request | undefined;
-}>;
+  request: Request<unknown, CfProperties<unknown>> | 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> {
-  #private;
+  private _state;
+  private _ParentClass;
+  mcp: MCPClientManager;
   /**
    * Initial state for the Agent
    * Override to provide default state values
@@ -134,6 +168,7 @@ declare class Agent<Env, State = unknown> extends Server<Env> {
     ...values: (string | number | boolean | null)[]
   ): T[];
   constructor(ctx: AgentContext, env: Env);
+  private _setStateInternal;
   /**
    * Update the Agent's state
    * @param state New state to set
@@ -150,6 +185,7 @@ declare class Agent<Env, State = unknown> extends Server<Env> {
    * @param email Email message to process
    */
   onEmail(email: ForwardableEmailMessage): Promise<void>;
+  private _tryCatch;
   onError(connection: Connection, error: unknown): void | Promise<void>;
   onError(error: unknown): void | Promise<void>;
   /**
@@ -196,15 +232,72 @@ declare class Agent<Env, State = unknown> extends Server<Env> {
    * @returns true if the task was cancelled, false otherwise
    */
   cancelSchedule(id: string): Promise<boolean>;
+  private _scheduleNextAlarm;
   /**
-   * Method called when an alarm fires
-   * Executes any scheduled tasks that are due
+   * Method called when an alarm fires.
+   * Executes any scheduled tasks that are due.
+   *
+   * @remarks
+   * To schedule a task, please use the `this.schedule` method instead.
+   * See {@link https://developers.cloudflare.com/agents/api-reference/schedule-tasks/}
    */
-  alarm(): Promise<void>;
+  readonly alarm: () => Promise<void>;
   /**
    * Destroy the Agent, removing all state and scheduled tasks
    */
   destroy(): Promise<void>;
+  private _isCallable;
+  /**
+   * Connect to a new MCP Server
+   *
+   * @param url MCP Server SSE URL
+   * @param callbackHost Base host for the agent, used for the redirect URI.
+   * @param agentsPrefix agents routing prefix if not using `agents`
+   * @param options MCP client and transport (header) options
+   * @returns authUrl
+   */
+  addMcpServer(
+    serverName: string,
+    url: 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;
+      };
+    },
+    reconnect?: {
+      id: string;
+      oauthClientId?: string;
+    }
+  ): Promise<{
+    id: string;
+    authUrl: string | undefined;
+  }>;
+  removeMcpServer(id: string): Promise<void>;
+  private _getMcpServerStateInternal;
 }
 /**
  * Namespace for creating Agent instances
@@ -269,7 +362,9 @@ declare function getAgentByName<Env, T extends Agent<Env>>(
  * A wrapper for streaming responses in callable methods
  */
 declare class StreamingResponse {
-  #private;
+  private _connection;
+  private _id;
+  private _closed;
   constructor(connection: Connection, id: string);
   /**
    * Send a chunk of data to the client
@@ -289,14 +384,17 @@ export {
   type AgentNamespace,
   type AgentOptions,
   type CallableMetadata,
+  type MCPServer,
+  type MCPServerMessage,
+  type MCPServersState,
   type RPCRequest,
   type RPCResponse,
   type Schedule,
   type StateUpdateMessage,
   StreamingResponse,
   getAgentByName,
+  getCurrentAgent,
   routeAgentEmail,
   routeAgentRequest,
   unstable_callable,
-  unstable_context,
 };

package/dist/index.js

@@ -2,19 +2,21 @@ import {
   Agent,
   StreamingResponse,
   getAgentByName,
+  getCurrentAgent,
   routeAgentEmail,
   routeAgentRequest,
-  unstable_callable,
-  unstable_context
-} from "./chunk-XG52S6YY.js";
-import "./chunk-HMLY7DHA.js";
+  unstable_callable
+} from "./chunk-RIYR6FR6.js";
+import "./chunk-BZXOAZUX.js";
+import "./chunk-QSGN3REV.js";
+import "./chunk-Y67CHZBI.js";
 export {
   Agent,
   StreamingResponse,
   getAgentByName,
+  getCurrentAgent,
   routeAgentEmail,
   routeAgentRequest,
-  unstable_callable,
-  unstable_context
+  unstable_callable
 };
 //# sourceMappingURL=index.js.map

package/dist/mcp/client.d.ts

@@ -1,9 +1,10 @@
 import * as zod from 'zod';
-import { ClientCapabilities, Tool, Prompt, Resource, ResourceTemplate, ServerCapabilities, CallToolRequest, CallToolResultSchema, CompatibilityCallToolResultSchema, ReadResourceRequest, GetPromptRequest } from '@modelcontextprotocol/sdk/types.js';
+import { Tool, Prompt, Resource, ResourceTemplate, ServerCapabilities, CallToolRequest, CallToolResultSchema, CompatibilityCallToolResultSchema, ReadResourceRequest, GetPromptRequest } from '@modelcontextprotocol/sdk/types.js';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js';
 import { AgentsOAuthProvider } from './do-oauth-client-provider.js';
 import { RequestOptions } from '@modelcontextprotocol/sdk/shared/protocol.js';
+import { ToolSet } from 'ai';
 import '@modelcontextprotocol/sdk/client/auth.js';
 import '@modelcontextprotocol/sdk/shared/auth.js';
 
@@ -14,7 +15,6 @@ declare class MCPClientConnection {
             authProvider?: AgentsOAuthProvider;
         };
         client: ConstructorParameters<typeof Client>[1];
-        capabilities: ClientCapabilities;
     };
     client: Client;
     connectionState: "authenticating" | "connecting" | "ready" | "discovering" | "failed";
@@ -29,7 +29,6 @@ declare class MCPClientConnection {
             authProvider?: AgentsOAuthProvider;
         };
         client: ConstructorParameters<typeof Client>[1];
-        capabilities: ClientCapabilities;
     });
     /**
      * Initialize a client connection
@@ -37,7 +36,7 @@ declare class MCPClientConnection {
      * @param code Optional OAuth code to initialize the connection with if auth hasn't been initialized
      * @returns
      */
-    init(code?: string, clientId?: string): Promise<void>;
+    init(code?: string): Promise<void>;
     /**
      * Notification handler registration
      */
@@ -56,6 +55,14 @@ declare class MCPClientConnection {
             } | undefined;
         };
         description?: string | undefined;
+        annotations?: {
+            [x: string]: unknown;
+            title?: string | undefined;
+            readOnlyHint?: boolean | undefined;
+            destructiveHint?: boolean | undefined;
+            idempotentHint?: boolean | undefined;
+            openWorldHint?: boolean | undefined;
+        } | undefined;
     }[]>;
     fetchResources(): Promise<{
         [x: string]: unknown;
@@ -88,16 +95,16 @@ declare class MCPClientConnection {
  * Utility class that aggregates multiple MCP clients into one
  */
 declare class MCPClientManager {
-    private name;
-    private version;
+    private _name;
+    private _version;
     mcpConnections: Record<string, MCPClientConnection>;
-    private callbackUrls;
+    private _callbackUrls;
     /**
-     * @param name Name of the MCP client
-     * @param version Version of the MCP Client
+     * @param _name Name of the MCP client
+     * @param _version Version of the MCP Client
      * @param auth Auth paramters if being used to create a DurableObjectOAuthClientProvider
      */
-    constructor(name: string, version: string);
+    constructor(_name: string, _version: string);
     /**
      * Connect to and register an MCP server
      *
@@ -115,10 +122,10 @@ declare class MCPClientManager {
             authProvider?: AgentsOAuthProvider;
         };
         client?: ConstructorParameters<typeof Client>[1];
-        capabilities?: ClientCapabilities;
     }): Promise<{
         id: string;
-        authUrl: string | undefined;
+        authUrl?: string;
+        clientId?: string;
     }>;
     isCallbackRequest(req: Request): boolean;
     handleCallbackRequest(req: Request): Promise<{
@@ -128,6 +135,19 @@ declare class MCPClientManager {
      * @returns namespaced list of tools
      */
     listTools(): NamespacedData["tools"];
+    /**
+     * @returns a set of tools that you can use with the AI SDK
+     */
+    unstable_getAITools(): ToolSet;
+    /**
+     * Closes all connections to MCP servers
+     */
+    closeAllConnections(): Promise<void[]>;
+    /**
+     * Closes a connection to an MCP server
+     * @param id The id of the connection to close
+     */
+    closeConnection(id: string): Promise<void>;
     /**
      * @returns namespaced list of prompts
      */