agents 0.0.0-7972da4 → 0.0.0-7a280ad

package/package.json

@@ -1,101 +1,101 @@
 {
-  "name": "agents",
-  "version": "0.0.0-7972da4",
-  "main": "src/index.ts",
-  "types": "dist/index.d.ts",
-  "type": "module",
-  "scripts": {
-    "check:test": "npm run check:test:workers && npm run check:test:react",
-    "check:test:workers": "vitest -r src/tests --watch false",
-    "check:test:react": "vitest -r src/react-tests --watch false",
-    "test": "vitest -r src/tests",
-    "test:react": "vitest -r src/react-tests",
-    "evals": "(cd evals; evalite)",
-    "build": "tsx ./scripts/build.ts"
+  "author": "Cloudflare Inc.",
+  "bugs": {
+    "url": "https://github.com/cloudflare/agents/issues"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.13.0",
+    "ai": "^4.3.16",
+    "cron-schedule": "^5.0.4",
+    "nanoid": "^5.1.5",
+    "partyserver": "^0.0.72",
+    "partysocket": "1.1.4",
+    "zod": "^3.25.67"
+  },
+  "description": "A home for your AI agents",
+  "devDependencies": {
+    "@cloudflare/vitest-pool-workers": "^0.8.43",
+    "react": "*",
+    "vitest-browser-react": "^0.3.0"
   },
-  "files": [
-    "dist",
-    "README.md"
-  ],
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
       "require": "./dist/index.js",
-      "import": "./dist/index.js"
+      "types": "./dist/index.d.ts"
     },
-    "./client": {
-      "types": "./dist/client.d.ts",
-      "require": "./dist/client.js",
-      "import": "./dist/client.js"
-    },
-    "./react": {
-      "types": "./dist/react.d.ts",
-      "require": "./dist/react.js",
-      "import": "./dist/react.js"
+    "./ai-chat-agent": {
+      "import": "./dist/ai-chat-agent.js",
+      "require": "./dist/ai-chat-agent.js",
+      "types": "./dist/ai-chat-agent.d.ts"
     },
     "./ai-react": {
-      "types": "./dist/ai-react.d.ts",
+      "import": "./dist/ai-react.js",
       "require": "./dist/ai-react.js",
-      "import": "./dist/ai-react.js"
-    },
-    "./ai-chat-agent": {
-      "types": "./dist/ai-chat-agent.d.ts",
-      "require": "./dist/ai-chat-agent.js",
-      "import": "./dist/ai-chat-agent.js"
+      "types": "./dist/ai-react.d.ts"
     },
     "./ai-types": {
-      "types": "./dist/ai-types.d.ts",
+      "import": "./dist/ai-types.js",
       "require": "./dist/ai-types.js",
-      "import": "./dist/ai-types.js"
+      "types": "./dist/ai-types.d.ts"
     },
-    "./schedule": {
-      "types": "./dist/schedule.d.ts",
-      "require": "./dist/schedule.js",
-      "import": "./dist/schedule.js"
+    "./client": {
+      "import": "./dist/client.js",
+      "require": "./dist/client.js",
+      "types": "./dist/client.d.ts"
     },
     "./mcp": {
-      "types": "./dist/mcp/index.d.ts",
+      "import": "./dist/mcp/index.js",
       "require": "./dist/mcp/index.js",
-      "import": "./dist/mcp/index.js"
+      "types": "./dist/mcp/index.d.ts"
     },
     "./mcp/client": {
-      "types": "./dist/mcp/client.d.ts",
+      "import": "./dist/mcp/client.js",
       "require": "./dist/mcp/client.js",
-      "import": "./dist/mcp/client.js"
+      "types": "./dist/mcp/client.d.ts"
     },
     "./mcp/do-oauth-client-provider": {
-      "types": "./dist/mcp/do-oauth-client-provider.d.ts",
+      "import": "./dist/mcp/do-oauth-client-provider.js",
       "require": "./dist/mcp/do-oauth-client-provider.js",
-      "import": "./dist/mcp/do-oauth-client-provider.js"
+      "types": "./dist/mcp/do-oauth-client-provider.d.ts"
+    },
+    "./react": {
+      "import": "./dist/react.js",
+      "require": "./dist/react.js",
+      "types": "./dist/react.d.ts"
+    },
+    "./schedule": {
+      "import": "./dist/schedule.js",
+      "require": "./dist/schedule.js",
+      "types": "./dist/schedule.d.ts"
     }
   },
+  "files": [
+    "dist",
+    "README.md"
+  ],
   "keywords": [],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/cloudflare/agents.git",
-    "directory": "packages/agents"
-  },
-  "bugs": {
-    "url": "https://github.com/cloudflare/agents/issues"
-  },
-  "author": "Cloudflare Inc.",
   "license": "MIT",
-  "description": "A home for your AI agents",
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.11.4",
-    "ai": "^4.3.16",
-    "cron-schedule": "^5.0.4",
-    "nanoid": "^5.1.5",
-    "partyserver": "^0.0.71",
-    "partysocket": "1.1.4",
-    "zod": "^3.25.17"
-  },
+  "main": "src/index.ts",
+  "name": "agents",
   "peerDependencies": {
     "react": "*"
   },
-  "devDependencies": {
-    "@cloudflare/vitest-pool-workers": "^0.8.31",
-    "react": "*",
-    "vitest-browser-react": "^0.2.0"
-  }
+  "repository": {
+    "directory": "packages/agents",
+    "type": "git",
+    "url": "git+https://github.com/cloudflare/agents.git"
+  },
+  "scripts": {
+    "build": "tsx ./scripts/build.ts",
+    "check:test": "npm run check:test:workers && npm run check:test:react",
+    "check:test:react": "vitest -r src/react-tests --watch false",
+    "check:test:workers": "vitest -r src/tests --watch false",
+    "evals": "(cd evals; evalite)",
+    "test": "vitest -r src/tests",
+    "test:react": "vitest -r src/react-tests"
+  },
+  "type": "module",
+  "types": "dist/index.d.ts",
+  "version": "0.0.0-7a280ad"
 }

package/src/index.ts

@@ -1,35 +1,30 @@
-import {
-  Server,
-  routePartykitRequest,
-  type PartyServerOptions,
-  getServerByName,
-  type Connection,
-  type ConnectionContext,
-  type WSMessage,
-} from "partyserver";
-
-import { parseCronExpression } from "cron-schedule";
-import { nanoid } from "nanoid";
-
 import { AsyncLocalStorage } from "node:async_hooks";
-import { MCPClientManager } from "./mcp/client";
-import {
-  DurableObjectOAuthClientProvider,
-  type AgentsOAuthProvider,
-} from "./mcp/do-oauth-client-provider";
+import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import type { SSEClientTransportOptions } from "@modelcontextprotocol/sdk/client/sse.js";
+
 import type {
-  Tool,
-  Resource,
   Prompt,
+  Resource,
   ServerCapabilities,
+  Tool,
 } from "@modelcontextprotocol/sdk/types.js";
-
-import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import type { SSEClientTransportOptions } from "@modelcontextprotocol/sdk/client/sse.js";
-
+import { parseCronExpression } from "cron-schedule";
+import { nanoid } from "nanoid";
+import {
+  type Connection,
+  type ConnectionContext,
+  getServerByName,
+  type PartyServerOptions,
+  routePartykitRequest,
+  Server,
+  type WSMessage,
+} from "partyserver";
 import { camelCaseToKebabCase } from "./client";
+import { MCPClientManager } from "./mcp/client";
+// import type { MCPClientConnection } from "./mcp/client-connection";
+import { DurableObjectOAuthClientProvider } from "./mcp/do-oauth-client-provider";
 
-export type { Connection, WSMessage, ConnectionContext } from "partyserver";
+export type { Connection, ConnectionContext, WSMessage } from "partyserver";
 
 /**
  * RPC request message from client
@@ -122,6 +117,7 @@ const callableMetadata = new Map<Function, CallableMetadata>();
 export function unstable_callable(metadata: CallableMetadata = {}) {
   return function callableDecorator<This, Args extends unknown[], Return>(
     target: (this: This, ...args: Args) => Return,
+    // biome-ignore lint/correctness/noUnusedFunctionParameters: later
     context: ClassMethodDecoratorContext
   ) {
     if (!callableMetadata.has(target)) {
@@ -194,6 +190,9 @@ export type MCPServer = {
   name: string;
   server_url: string;
   auth_url: string | null;
+  // This state is specifically about the temporary process of getting a token (if needed).
+  // Scope outside of that can't be relied upon because when the DO sleeps, there's no way
+  // to communicate a change to a non-ready state.
   state: "authenticating" | "connecting" | "ready" | "discovering" | "failed";
   instructions: string | null;
   capabilities: ServerCapabilities | null;
@@ -397,15 +396,15 @@ export class Agent<Env, State = unknown> extends Server<Env> {
             // after the MCP connection handshake, we can send updated mcp state
             this.broadcast(
               JSON.stringify({
-                type: "cf_agent_mcp_servers",
                 mcp: this.getMcpServers(),
+                type: "cf_agent_mcp_servers",
               })
             );
 
             // We probably should let the user configure this response/redirect, but this is fine for now.
             return new Response("<script>window.close();</script>", {
-              status: 200,
               headers: { "content-type": "text/html" },
+              status: 200,
             });
           }
 
@@ -426,7 +425,7 @@ export class Agent<Env, State = unknown> extends Server<Env> {
           let parsed: unknown;
           try {
             parsed = JSON.parse(message);
-          } catch (e) {
+          } catch (_e) {
             // silently fail and let the onMessage handler handle it
             return this._tryCatch(() => _onMessage(connection, message));
           }
@@ -462,21 +461,21 @@ export class Agent<Env, State = unknown> extends Server<Env> {
               // For regular methods, execute and send response
               const result = await methodFn.apply(this, args);
               const response: RPCResponse = {
-                type: "rpc",
+                done: true,
                 id,
-                success: true,
                 result,
-                done: true,
+                success: true,
+                type: "rpc",
               };
               connection.send(JSON.stringify(response));
             } catch (e) {
               // Send error response
               const response: RPCResponse = {
-                type: "rpc",
-                id: parsed.id,
-                success: false,
                 error:
                   e instanceof Error ? e.message : "Unknown error occurred",
+                id: parsed.id,
+                success: false,
+                type: "rpc",
               };
               connection.send(JSON.stringify(response));
               console.error("RPC error:", e);
@@ -500,16 +499,16 @@ export class Agent<Env, State = unknown> extends Server<Env> {
             if (this.state) {
               connection.send(
                 JSON.stringify({
-                  type: "cf_agent_state",
                   state: this.state,
+                  type: "cf_agent_state",
                 })
               );
             }
 
             connection.send(
               JSON.stringify({
-                type: "cf_agent_mcp_servers",
                 mcp: this.getMcpServers(),
+                type: "cf_agent_mcp_servers",
               })
             );
 
@@ -528,28 +527,30 @@ export class Agent<Env, State = unknown> extends Server<Env> {
             SELECT id, name, server_url, client_id, auth_url, callback_url, server_options FROM cf_agents_mcp_servers;
           `;
 
-          // from DO storage, reconnect to all servers using our saved auth information
+          // from DO storage, reconnect to all servers not currently in the oauth flow using our saved auth information
           await Promise.allSettled(
-            servers.map((server) => {
-              return this._connectToMcpServerInternal(
-                server.name,
-                server.server_url,
-                server.callback_url,
-                server.server_options
-                  ? JSON.parse(server.server_options)
-                  : undefined,
-                {
-                  id: server.id,
-                  oauthClientId: server.client_id ?? undefined,
-                }
-              );
-            })
+            servers
+              .filter((server) => server.auth_url === null)
+              .map((server) => {
+                return this._connectToMcpServerInternal(
+                  server.name,
+                  server.server_url,
+                  server.callback_url,
+                  server.server_options
+                    ? JSON.parse(server.server_options)
+                    : undefined,
+                  {
+                    id: server.id,
+                    oauthClientId: server.client_id ?? undefined,
+                  }
+                );
+              })
           );
 
           this.broadcast(
             JSON.stringify({
-              type: "cf_agent_mcp_servers",
               mcp: this.getMcpServers(),
+              type: "cf_agent_mcp_servers",
             })
           );
 
@@ -574,8 +575,8 @@ export class Agent<Env, State = unknown> extends Server<Env> {
   `;
     this.broadcast(
       JSON.stringify({
-        type: "cf_agent_state",
         state: state,
+        type: "cf_agent_state",
       }),
       source !== "server" ? [source.id] : []
     );
@@ -603,6 +604,7 @@ export class Agent<Env, State = unknown> extends Server<Env> {
    * @param state Updated state
    * @param source Source of the state update ("server" or a client connection)
    */
+  // biome-ignore lint/correctness/noUnusedFunctionParameters: overridden later
   onStateUpdate(state: State | undefined, source: Connection | "server") {
     // override this to handle state updates
   }
@@ -611,6 +613,7 @@ export class Agent<Env, State = unknown> extends Server<Env> {
    * Called when the Agent receives an email
    * @param email Email message to process
    */
+  // biome-ignore lint/correctness/noUnusedFunctionParameters: overridden later
   onEmail(email: ForwardableEmailMessage) {
     return agentContext.run(
       { agent: this, connection: undefined, request: undefined },
@@ -697,8 +700,8 @@ export class Agent<Env, State = unknown> extends Server<Env> {
       await this._scheduleNextAlarm();
 
       return {
-        id,
         callback: callback,
+        id,
         payload: payload as T,
         time: timestamp,
         type: "scheduled",
@@ -718,10 +721,10 @@ export class Agent<Env, State = unknown> extends Server<Env> {
       await this._scheduleNextAlarm();
 
       return {
-        id,
         callback: callback,
-        payload: payload as T,
         delayInSeconds: when,
+        id,
+        payload: payload as T,
         time: timestamp,
         type: "delayed",
       };
@@ -740,10 +743,10 @@ export class Agent<Env, State = unknown> extends Server<Env> {
       await this._scheduleNextAlarm();
 
       return {
-        id,
         callback: callback,
-        payload: payload as T,
         cron: when,
+        id,
+        payload: payload as T,
         time: timestamp,
         type: "cron",
       };
@@ -913,6 +916,7 @@ export class Agent<Env, State = unknown> extends Server<Env> {
     // delete all alarms
     await this.ctx.storage.deleteAlarm();
     await this.ctx.storage.deleteAll();
+    this.ctx.abort("destroyed"); // enforce that the agent is evicted
   }
 
   /**
@@ -955,8 +959,8 @@ export class Agent<Env, State = unknown> extends Server<Env> {
 
     this.broadcast(
       JSON.stringify({
-        type: "cf_agent_mcp_servers",
         mcp: this.getMcpServers(),
+        type: "cf_agent_mcp_servers",
       })
     );
 
@@ -1018,12 +1022,12 @@ export class Agent<Env, State = unknown> extends Server<Env> {
     }
 
     const { id, authUrl, clientId } = await this.mcp.connect(url, {
+      client: options?.client,
       reconnect,
       transport: {
         ...headerTransportOpts,
         authProvider,
       },
-      client: options?.client,
     });
 
     this.sql`
@@ -1040,8 +1044,8 @@ export class Agent<Env, State = unknown> extends Server<Env> {
     `;
 
     return {
-      id,
       authUrl,
+      id,
     };
   }
 
@@ -1052,18 +1056,18 @@ export class Agent<Env, State = unknown> extends Server<Env> {
     `;
     this.broadcast(
       JSON.stringify({
-        type: "cf_agent_mcp_servers",
         mcp: this.getMcpServers(),
+        type: "cf_agent_mcp_servers",
       })
     );
   }
 
   getMcpServers(): MCPServersState {
     const mcpState: MCPServersState = {
-      servers: {},
-      tools: this.mcp.listTools(),
       prompts: this.mcp.listPrompts(),
       resources: this.mcp.listResources(),
+      servers: {},
+      tools: this.mcp.listTools(),
     };
 
     const servers = this.sql<MCPServerRow>`
@@ -1071,14 +1075,15 @@ export class Agent<Env, State = unknown> extends Server<Env> {
     `;
 
     for (const server of servers) {
+      const serverConn = this.mcp.mcpConnections[server.id];
       mcpState.servers[server.id] = {
+        auth_url: server.auth_url,
+        capabilities: serverConn?.serverCapabilities ?? null,
+        instructions: serverConn?.instructions ?? null,
         name: server.name,
         server_url: server.server_url,
-        auth_url: server.auth_url,
-        state: this.mcp.mcpConnections[server.id].connectionState,
-        instructions: this.mcp.mcpConnections[server.id].instructions ?? null,
-        capabilities:
-          this.mcp.mcpConnections[server.id].serverCapabilities ?? null,
+        // mark as "authenticating" because the server isn't automatically connected, so it's pending authenticating
+        state: serverConn?.connectionState ?? "authenticating",
       };
     }
 
@@ -1123,9 +1128,9 @@ export async function routeAgentRequest<Env>(
   const corsHeaders =
     options?.cors === true
       ? {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Methods": "GET, POST, HEAD, OPTIONS",
           "Access-Control-Allow-Credentials": "true",
+          "Access-Control-Allow-Methods": "GET, POST, HEAD, OPTIONS",
+          "Access-Control-Allow-Origin": "*",
           "Access-Control-Max-Age": "86400",
         }
       : options?.cors;
@@ -1173,9 +1178,9 @@ export async function routeAgentRequest<Env>(
  * @param options Routing options
  */
 export async function routeAgentEmail<Env>(
-  email: ForwardableEmailMessage,
-  env: Env,
-  options?: AgentOptions<Env>
+  _email: ForwardableEmailMessage,
+  _env: Env,
+  _options?: AgentOptions<Env>
 ): Promise<void> {}
 
 /**
@@ -1220,11 +1225,11 @@ export class StreamingResponse {
       throw new Error("StreamingResponse is already closed");
     }
     const response: RPCResponse = {
-      type: "rpc",
+      done: false,
       id: this._id,
-      success: true,
       result: chunk,
-      done: false,
+      success: true,
+      type: "rpc",
     };
     this._connection.send(JSON.stringify(response));
   }
@@ -1239,11 +1244,11 @@ export class StreamingResponse {
     }
     this._closed = true;
     const response: RPCResponse = {
-      type: "rpc",
+      done: true,
       id: this._id,
-      success: true,
       result: finalChunk,
-      done: true,
+      success: true,
+      type: "rpc",
     };
     this._connection.send(JSON.stringify(response));
   }