agents 0.0.0-e48e5f9 → 0.0.0-e777fdd

package/dist/{chunk-5YIRLLUX.js → chunk-RS5OCNEQ.js}

@@ -1,12 +1,12 @@
 import {
   MCPClientManager
-} from "./chunk-MW5BQ2FW.js";
+} from "./chunk-QEPGNUG6.js";
 import {
   DurableObjectOAuthClientProvider
-} from "./chunk-PVQZBKN7.js";
+} from "./chunk-XFS5ERG3.js";
 import {
   camelCaseToKebabCase
-} from "./chunk-KUH345EY.js";
+} from "./chunk-QEVM4BVL.js";
 
 // src/index.ts
 import { AsyncLocalStorage } from "async_hooks";
@@ -19,13 +19,13 @@ import {
   routePartykitRequest
 } from "partyserver";
 function isRPCRequest(msg) {
-  return typeof msg === "object" && msg !== null && "type" in msg && msg.type === "rpc" && "id" in msg && typeof msg.id === "string" && "method" in msg && typeof msg.method === "string" && "args" in msg && Array.isArray(msg.args);
+  return typeof msg === "object" && msg !== null && "type" in msg && msg.type === "rpc" /* RPC */ && "id" in msg && typeof msg.id === "string" && "method" in msg && typeof msg.method === "string" && "args" in msg && Array.isArray(msg.args);
 }
 function isStateUpdateMessage(msg) {
-  return typeof msg === "object" && msg !== null && "type" in msg && msg.type === "cf_agent_state" && "state" in msg;
+  return typeof msg === "object" && msg !== null && "type" in msg && msg.type === "cf_agent_state" /* CF_AGENT_STATE */ && "state" in msg;
 }
 var callableMetadata = /* @__PURE__ */ new Map();
-function unstable_callable(metadata = {}) {
+function callable(metadata = {}) {
   return function callableDecorator(target, context) {
     if (!callableMetadata.has(target)) {
       callableMetadata.set(target, metadata);
@@ -33,6 +33,16 @@ function unstable_callable(metadata = {}) {
     return target;
   };
 }
+var didWarnAboutUnstableCallable = false;
+var unstable_callable = (metadata = {}) => {
+  if (!didWarnAboutUnstableCallable) {
+    didWarnAboutUnstableCallable = true;
+    console.warn(
+      "unstable_callable is deprecated, use callable instead. unstable_callable will be removed in the next major version."
+    );
+  }
+  callable(metadata);
+};
 function getNextCronTime(cron) {
   const interval = parseCronExpression(cron);
   return interval.getNextDate();
@@ -55,7 +65,10 @@ function getCurrentAgent() {
 }
 function withAgentContext(method) {
   return function(...args) {
-    const { connection, request, email } = getCurrentAgent();
+    const { connection, request, email, agent } = getCurrentAgent();
+    if (agent === this) {
+      return method.apply(this, args);
+    }
     return agentContext.run({ agent: this, connection, request, email }, () => {
       return method.apply(this, args);
     });
@@ -66,7 +79,10 @@ var _Agent = class _Agent extends Server {
     super(ctx, env);
     this._state = DEFAULT_STATE;
     this._ParentClass = Object.getPrototypeOf(this).constructor;
-    this.mcp = new MCPClientManager(this._ParentClass.name, "0.0.1");
+    this.mcp = new MCPClientManager(
+      this._ParentClass.name,
+      "0.0.1"
+    );
     /**
      * Initial state for the Agent
      * Override to provide default state values
@@ -110,7 +126,10 @@ var _Agent = class _Agent extends Server {
                   {
                     displayMessage: `Schedule ${row.id} executed`,
                     id: nanoid(),
-                    payload: row,
+                    payload: {
+                      callback: row.callback,
+                      id: row.id
+                    },
                     timestamp: Date.now(),
                     type: "schedule:execute"
                   },
@@ -137,7 +156,10 @@ var _Agent = class _Agent extends Server {
       }
       await this._scheduleNextAlarm();
     };
-    this._autoWrapCustomMethods();
+    if (!wrappedClasses.has(this.constructor)) {
+      this._autoWrapCustomMethods();
+      wrappedClasses.add(this.constructor);
+    }
     this.sql`
       CREATE TABLE IF NOT EXISTS cf_agents_state (
         id TEXT PRIMARY KEY NOT NULL,
@@ -190,7 +212,7 @@ var _Agent = class _Agent extends Server {
             this.broadcast(
               JSON.stringify({
                 mcp: this.getMcpServers(),
-                type: "cf_agent_mcp_servers"
+                type: "cf_agent_mcp_servers" /* CF_AGENT_MCP_SERVERS */
               })
             );
             return new Response("<script>window.close();</script>", {
@@ -242,10 +264,8 @@ var _Agent = class _Agent extends Server {
                   displayMessage: `RPC call to ${method}`,
                   id: nanoid(),
                   payload: {
-                    args,
                     method,
-                    streaming: metadata?.streaming,
-                    success: true
+                    streaming: metadata?.streaming
                   },
                   timestamp: Date.now(),
                   type: "rpc"
@@ -257,7 +277,7 @@ var _Agent = class _Agent extends Server {
                 id,
                 result,
                 success: true,
-                type: "rpc"
+                type: "rpc" /* RPC */
               };
               connection.send(JSON.stringify(response));
             } catch (e) {
@@ -265,7 +285,7 @@ var _Agent = class _Agent extends Server {
                 error: e instanceof Error ? e.message : "Unknown error occurred",
                 id: parsed.id,
                 success: false,
-                type: "rpc"
+                type: "rpc" /* RPC */
               };
               connection.send(JSON.stringify(response));
               console.error("RPC error:", e);
@@ -280,41 +300,39 @@ var _Agent = class _Agent extends Server {
     this.onConnect = (connection, ctx2) => {
       return agentContext.run(
         { agent: this, connection, request: ctx2.request, email: void 0 },
-        async () => {
-          setTimeout(() => {
-            if (this.state) {
-              connection.send(
-                JSON.stringify({
-                  state: this.state,
-                  type: "cf_agent_state"
-                })
-              );
-            }
+        () => {
+          if (this.state) {
             connection.send(
               JSON.stringify({
-                mcp: this.getMcpServers(),
-                type: "cf_agent_mcp_servers"
+                state: this.state,
+                type: "cf_agent_state" /* CF_AGENT_STATE */
               })
             );
-            this.observability?.emit(
-              {
-                displayMessage: "Connection established",
-                id: nanoid(),
-                payload: {
-                  connectionId: connection.id
-                },
-                timestamp: Date.now(),
-                type: "connect"
+          }
+          connection.send(
+            JSON.stringify({
+              mcp: this.getMcpServers(),
+              type: "cf_agent_mcp_servers" /* CF_AGENT_MCP_SERVERS */
+            })
+          );
+          this.observability?.emit(
+            {
+              displayMessage: "Connection established",
+              id: nanoid(),
+              payload: {
+                connectionId: connection.id
               },
-              this.ctx
-            );
-            return this._tryCatch(() => _onConnect(connection, ctx2));
-          }, 20);
+              timestamp: Date.now(),
+              type: "connect"
+            },
+            this.ctx
+          );
+          return this._tryCatch(() => _onConnect(connection, ctx2));
         }
       );
     };
     const _onStart = this.onStart.bind(this);
-    this.onStart = async () => {
+    this.onStart = async (props) => {
       return agentContext.run(
         {
           agent: this,
@@ -323,13 +341,24 @@ var _Agent = class _Agent extends Server {
           email: void 0
         },
         async () => {
-          const servers = this.sql`
+          await this._tryCatch(() => {
+            const servers = this.sql`
             SELECT id, name, server_url, client_id, auth_url, callback_url, server_options FROM cf_agents_mcp_servers;
           `;
-          if (servers && Array.isArray(servers) && servers.length > 0) {
-            Promise.allSettled(
-              servers.map((server) => {
-                return this._connectToMcpServerInternal(
+            this.broadcast(
+              JSON.stringify({
+                mcp: this.getMcpServers(),
+                type: "cf_agent_mcp_servers" /* CF_AGENT_MCP_SERVERS */
+              })
+            );
+            if (servers && Array.isArray(servers) && servers.length > 0) {
+              servers.forEach((server) => {
+                if (server.callback_url) {
+                  this.mcp.registerCallbackUrl(server.callback_url);
+                }
+              });
+              servers.forEach((server) => {
+                this._connectToMcpServerInternal(
                   server.name,
                   server.server_url,
                   server.callback_url,
@@ -338,18 +367,29 @@ var _Agent = class _Agent extends Server {
                     id: server.id,
                     oauthClientId: server.client_id ?? void 0
                   }
-                );
-              })
-            ).then((_results) => {
-              this.broadcast(
-                JSON.stringify({
-                  mcp: this.getMcpServers(),
-                  type: "cf_agent_mcp_servers"
-                })
-              );
-            });
-          }
-          await this._tryCatch(() => _onStart());
+                ).then(() => {
+                  this.broadcast(
+                    JSON.stringify({
+                      mcp: this.getMcpServers(),
+                      type: "cf_agent_mcp_servers" /* CF_AGENT_MCP_SERVERS */
+                    })
+                  );
+                }).catch((error) => {
+                  console.error(
+                    `Error connecting to MCP server: ${server.name} (${server.server_url})`,
+                    error
+                  );
+                  this.broadcast(
+                    JSON.stringify({
+                      mcp: this.getMcpServers(),
+                      type: "cf_agent_mcp_servers" /* CF_AGENT_MCP_SERVERS */
+                    })
+                  );
+                });
+              });
+            }
+            return _onStart(props);
+          });
         }
       );
     };
@@ -400,7 +440,6 @@ var _Agent = class _Agent extends Server {
     }
   }
   _setStateInternal(state, source = "server") {
-    const previousState = this._state;
     this._state = state;
     this.sql`
     INSERT OR REPLACE INTO cf_agents_state (id, state)
@@ -413,7 +452,7 @@ var _Agent = class _Agent extends Server {
     this.broadcast(
       JSON.stringify({
         state,
-        type: "cf_agent_state"
+        type: "cf_agent_state" /* CF_AGENT_STATE */
       }),
       source !== "server" ? [source.id] : []
     );
@@ -426,10 +465,7 @@ var _Agent = class _Agent extends Server {
             {
               displayMessage: "State updated",
               id: nanoid(),
-              payload: {
-                previousState,
-                state
-              },
+              payload: {},
               timestamp: Date.now(),
               type: "state:update"
             },
@@ -546,28 +582,22 @@ var _Agent = class _Agent extends Server {
     while (proto && proto !== Object.prototype && depth < 10) {
       const methodNames = Object.getOwnPropertyNames(proto);
       for (const methodName of methodNames) {
-        if (baseMethods.has(methodName) || methodName.startsWith("_") || typeof this[methodName] !== "function") {
+        const descriptor = Object.getOwnPropertyDescriptor(proto, methodName);
+        if (baseMethods.has(methodName) || methodName.startsWith("_") || !descriptor || !!descriptor.get || typeof descriptor.value !== "function") {
           continue;
         }
-        if (!baseMethods.has(methodName)) {
-          const descriptor = Object.getOwnPropertyDescriptor(proto, methodName);
-          if (descriptor && typeof descriptor.value === "function") {
-            const wrappedFunction = withAgentContext(
-              // biome-ignore lint/suspicious/noExplicitAny: I can't typescript
-              this[methodName]
-              // biome-ignore lint/suspicious/noExplicitAny: I can't typescript
-            );
-            if (this._isCallable(methodName)) {
-              callableMetadata.set(
-                wrappedFunction,
-                callableMetadata.get(
-                  this[methodName]
-                )
-              );
-            }
-            this.constructor.prototype[methodName] = wrappedFunction;
-          }
+        const wrappedFunction = withAgentContext(
+          // biome-ignore lint/suspicious/noExplicitAny: I can't typescript
+          this[methodName]
+          // biome-ignore lint/suspicious/noExplicitAny: I can't typescript
+        );
+        if (this._isCallable(methodName)) {
+          callableMetadata.set(
+            wrappedFunction,
+            callableMetadata.get(this[methodName])
+          );
         }
+        this.constructor.prototype[methodName] = wrappedFunction;
       }
       proto = Object.getPrototypeOf(proto);
       depth++;
@@ -627,7 +657,6 @@ var _Agent = class _Agent extends Server {
     }
     this._flushingQueue = true;
     while (true) {
-      const executed = [];
       const result = this.sql`
       SELECT * FROM cf_agents_queues
       ORDER BY created_at ASC
@@ -651,13 +680,10 @@ var _Agent = class _Agent extends Server {
           },
           async () => {
             await callback.bind(this)(JSON.parse(row.payload), row);
-            executed.push(row.id);
+            await this.dequeue(row.id);
           }
         );
       }
-      for (const id of executed) {
-        await this.dequeue(id);
-      }
     }
     this._flushingQueue = false;
   }
@@ -718,7 +744,10 @@ var _Agent = class _Agent extends Server {
       {
         displayMessage: `Schedule ${schedule.id} created`,
         id: nanoid(),
-        payload: schedule,
+        payload: {
+          callback,
+          id
+        },
         timestamp: Date.now(),
         type: "schedule:create"
       },
@@ -853,7 +882,10 @@ var _Agent = class _Agent extends Server {
         {
           displayMessage: `Schedule ${id} cancelled`,
           id: nanoid(),
-          payload: schedule,
+          payload: {
+            callback: schedule.callback,
+            id: schedule.id
+          },
           timestamp: Date.now(),
           type: "schedule:cancel"
         },
@@ -866,9 +898,9 @@ var _Agent = class _Agent extends Server {
   }
   async _scheduleNextAlarm() {
     const result = this.sql`
-      SELECT time FROM cf_agents_schedules 
+      SELECT time FROM cf_agents_schedules
       WHERE time > ${Math.floor(Date.now() / 1e3)}
-      ORDER BY time ASC 
+      ORDER BY time ASC
       LIMIT 1
     `;
     if (!result) return;
@@ -909,14 +941,26 @@ var _Agent = class _Agent extends Server {
   /**
    * 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
    * @returns authUrl
    */
   async addMcpServer(serverName, url, callbackHost, agentsPrefix = "agents", options) {
-    const callbackUrl = `${callbackHost}/${agentsPrefix}/${camelCaseToKebabCase(this._ParentClass.name)}/${this.name}/callback`;
+    let resolvedCallbackHost = callbackHost;
+    if (!resolvedCallbackHost) {
+      const { request } = getCurrentAgent();
+      if (!request) {
+        throw new Error(
+          "callbackHost is required when not called within a request context"
+        );
+      }
+      const requestUrl = new URL(request.url);
+      resolvedCallbackHost = `${requestUrl.protocol}//${requestUrl.host}`;
+    }
+    const callbackUrl = `${resolvedCallbackHost}/${agentsPrefix}/${camelCaseToKebabCase(this._ParentClass.name)}/${this.name}/callback`;
     const result = await this._connectToMcpServerInternal(
       serverName,
       url,
@@ -939,7 +983,7 @@ var _Agent = class _Agent extends Server {
     this.broadcast(
       JSON.stringify({
         mcp: this.getMcpServers(),
-        type: "cf_agent_mcp_servers"
+        type: "cf_agent_mcp_servers" /* CF_AGENT_MCP_SERVERS */
       })
     );
     return result;
@@ -970,12 +1014,14 @@ var _Agent = class _Agent extends Server {
         }
       };
     }
+    const transportType = options?.transport?.type || "auto";
     const { id, authUrl, clientId } = await this.mcp.connect(url, {
       client: options?.client,
       reconnect,
       transport: {
         ...headerTransportOpts,
-        authProvider
+        authProvider,
+        type: transportType
       }
     });
     return {
@@ -986,13 +1032,14 @@ var _Agent = class _Agent extends Server {
   }
   async removeMcpServer(id) {
     this.mcp.closeConnection(id);
+    this.mcp.unregisterCallbackUrl(id);
     this.sql`
       DELETE FROM cf_agents_mcp_servers WHERE id = ${id};
     `;
     this.broadcast(
       JSON.stringify({
         mcp: this.getMcpServers(),
-        type: "cf_agent_mcp_servers"
+        type: "cf_agent_mcp_servers" /* CF_AGENT_MCP_SERVERS */
       })
     );
   }
@@ -1032,6 +1079,7 @@ _Agent.options = {
   // default to hibernate
 };
 var Agent = _Agent;
+var wrappedClasses = /* @__PURE__ */ new Set();
 async function routeAgentRequest(request, env, options) {
   const corsHeaders = options?.cors === true ? {
     "Access-Control-Allow-Credentials": "true",
@@ -1120,25 +1168,35 @@ function createAddressBasedEmailResolver(defaultAgentName) {
 function createCatchAllEmailResolver(agentName, agentId) {
   return async () => ({ agentName, agentId });
 }
+var agentMapCache = /* @__PURE__ */ new WeakMap();
 async function routeAgentEmail(email, env, options) {
   const routingInfo = await options.resolver(email, env);
   if (!routingInfo) {
     console.warn("No routing information found for email, dropping message");
     return;
   }
-  const namespaceBinding = env[routingInfo.agentName];
-  if (!namespaceBinding) {
-    throw new Error(
-      `Agent namespace '${routingInfo.agentName}' not found in environment`
-    );
+  if (!agentMapCache.has(env)) {
+    const map = {};
+    for (const [key, value] of Object.entries(env)) {
+      if (value && typeof value === "object" && "idFromName" in value && typeof value.idFromName === "function") {
+        map[key] = value;
+        map[camelCaseToKebabCase(key)] = value;
+      }
+    }
+    agentMapCache.set(env, map);
   }
-  if (typeof namespaceBinding !== "object" || !("idFromName" in namespaceBinding) || typeof namespaceBinding.idFromName !== "function") {
+  const agentMap = agentMapCache.get(env);
+  const namespace = agentMap[routingInfo.agentName];
+  if (!namespace) {
+    const availableAgents = Object.keys(agentMap).filter((key) => !key.includes("-")).join(", ");
     throw new Error(
-      `Environment binding '${routingInfo.agentName}' is not an AgentNamespace (found: ${typeof namespaceBinding})`
+      `Agent namespace '${routingInfo.agentName}' not found in environment. Available agents: ${availableAgents}`
     );
   }
-  const namespace = namespaceBinding;
-  const agent = await getAgentByName(namespace, routingInfo.agentId);
+  const agent = await getAgentByName(
+    namespace,
+    routingInfo.agentId
+  );
   const serialisableEmail = {
     getRaw: async () => {
       const reader = email.raw.getReader();
@@ -1200,7 +1258,7 @@ var StreamingResponse = class {
       id: this._id,
       result: chunk,
       success: true,
-      type: "rpc"
+      type: "rpc" /* RPC */
     };
     this._connection.send(JSON.stringify(response));
   }
@@ -1218,7 +1276,7 @@ var StreamingResponse = class {
       id: this._id,
       result: finalChunk,
       success: true,
-      type: "rpc"
+      type: "rpc" /* RPC */
     };
     this._connection.send(JSON.stringify(response));
   }
@@ -1250,6 +1308,7 @@ function isLocalMode() {
 
 export {
   genericObservability,
+  callable,
   unstable_callable,
   getCurrentAgent,
   Agent,
@@ -1261,4 +1320,4 @@ export {
   getAgentByName,
   StreamingResponse
 };
-//# sourceMappingURL=chunk-5YIRLLUX.js.map
+//# sourceMappingURL=chunk-RS5OCNEQ.js.map