agents 0.0.0-1cb6383 → 0.0.0-1dc8321

package/dist/{chunk-JXN5WZFQ.js → chunk-XGMKNUJA.js}

@@ -1,12 +1,13 @@
 import {
+  DisposableStore,
   MCPClientManager
-} from "./chunk-HY7ZLHJB.js";
+} from "./chunk-ZMMHNOMZ.js";
 import {
   DurableObjectOAuthClientProvider
-} from "./chunk-PVQZBKN7.js";
+} from "./chunk-C2OEBJZ2.js";
 import {
   camelCaseToKebabCase
-} from "./chunk-KUH345EY.js";
+} from "./chunk-QEVM4BVL.js";
 
 // src/index.ts
 import { AsyncLocalStorage } from "async_hooks";
@@ -19,13 +20,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 +34,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 +66,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);
     });
@@ -65,8 +79,12 @@ var _Agent = class _Agent extends Server {
   constructor(ctx, env) {
     super(ctx, env);
     this._state = DEFAULT_STATE;
+    this._disposables = new DisposableStore();
     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 +128,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 +158,20 @@ var _Agent = class _Agent extends Server {
       }
       await this._scheduleNextAlarm();
     };
-    this._autoWrapCustomMethods();
+    if (!wrappedClasses.has(this.constructor)) {
+      this._autoWrapCustomMethods();
+      wrappedClasses.add(this.constructor);
+    }
+    this._disposables.add(
+      this.mcp.onConnected(async () => {
+        this.broadcastMcpServers();
+      })
+    );
+    this._disposables.add(
+      this.mcp.onObservabilityEvent((event) => {
+        this.observability?.emit(event);
+      })
+    );
     this.sql`
       CREATE TABLE IF NOT EXISTS cf_agents_state (
         id TEXT PRIMARY KEY NOT NULL,
@@ -186,17 +220,16 @@ var _Agent = class _Agent extends Server {
         { agent: this, connection: void 0, request, email: void 0 },
         async () => {
           if (this.mcp.isCallbackRequest(request)) {
-            await this.mcp.handleCallbackRequest(request);
-            this.broadcast(
-              JSON.stringify({
-                mcp: this.getMcpServers(),
-                type: "cf_agent_mcp_servers"
-              })
-            );
-            return new Response("<script>window.close();</script>", {
-              headers: { "content-type": "text/html" },
-              status: 200
-            });
+            const result = await this.mcp.handleCallbackRequest(request);
+            this.broadcastMcpServers();
+            if (result.authSuccess) {
+              this.mcp.establishConnection(result.serverId).catch((error) => {
+                console.error("Background connection failed:", error);
+              }).finally(() => {
+                this.broadcastMcpServers();
+              });
+            }
+            return this.handleOAuthCallbackResponse(result, request);
           }
           return this._tryCatch(() => _onRequest(request));
         }
@@ -242,10 +275,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 +288,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 +296,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 +311,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,
@@ -327,13 +356,15 @@ var _Agent = class _Agent extends Server {
             const servers = this.sql`
             SELECT id, name, server_url, client_id, auth_url, callback_url, server_options FROM cf_agents_mcp_servers;
           `;
-            this.broadcast(
-              JSON.stringify({
-                mcp: this.getMcpServers(),
-                type: "cf_agent_mcp_servers"
-              })
-            );
+            this.broadcastMcpServers();
             if (servers && Array.isArray(servers) && servers.length > 0) {
+              servers.forEach((server) => {
+                if (server.callback_url) {
+                  this.mcp.registerCallbackUrl(
+                    `${server.callback_url}/${server.id}`
+                  );
+                }
+              });
               servers.forEach((server) => {
                 this._connectToMcpServerInternal(
                   server.name,
@@ -345,27 +376,17 @@ var _Agent = class _Agent extends Server {
                     oauthClientId: server.client_id ?? void 0
                   }
                 ).then(() => {
-                  this.broadcast(
-                    JSON.stringify({
-                      mcp: this.getMcpServers(),
-                      type: "cf_agent_mcp_servers"
-                    })
-                  );
+                  this.broadcastMcpServers();
                 }).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"
-                    })
-                  );
+                  this.broadcastMcpServers();
                 });
               });
             }
-            return _onStart();
+            return _onStart(props);
           });
         }
       );
@@ -417,7 +438,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)
@@ -430,7 +450,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] : []
     );
@@ -443,10 +463,7 @@ var _Agent = class _Agent extends Server {
             {
               displayMessage: "State updated",
               id: nanoid(),
-              payload: {
-                previousState,
-                state
-              },
+              payload: {},
               timestamp: Date.now(),
               type: "state:update"
             },
@@ -563,28 +580,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++;
@@ -731,7 +742,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"
       },
@@ -866,7 +880,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"
         },
@@ -900,6 +917,8 @@ var _Agent = class _Agent extends Server {
     this.sql`DROP TABLE IF EXISTS cf_agents_queues`;
     await this.ctx.storage.deleteAlarm();
     await this.ctx.storage.deleteAll();
+    this._disposables.dispose();
+    await this.mcp.dispose?.();
     this.ctx.abort("destroyed");
     this.observability?.emit(
       {
@@ -922,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
+   * @param options MCP client and transport 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,
@@ -949,12 +980,7 @@ var _Agent = class _Agent extends Server {
         ${options ? JSON.stringify(options) : null}
         );
     `;
-    this.broadcast(
-      JSON.stringify({
-        mcp: this.getMcpServers(),
-        type: "cf_agent_mcp_servers"
-      })
-    );
+    this.broadcastMcpServers();
     return result;
   }
   async _connectToMcpServerInternal(_serverName, url, callbackUrl, options, reconnect) {
@@ -969,6 +995,7 @@ var _Agent = class _Agent extends Server {
         authProvider.clientId = reconnect.oauthClientId;
       }
     }
+    const transportType = options?.transport?.type ?? "auto";
     let headerTransportOpts = {};
     if (options?.transport?.headers) {
       headerTransportOpts = {
@@ -988,7 +1015,8 @@ var _Agent = class _Agent extends Server {
       reconnect,
       transport: {
         ...headerTransportOpts,
-        authProvider
+        authProvider,
+        type: transportType
       }
     });
     return {
@@ -999,15 +1027,11 @@ 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"
-      })
-    );
+    this.broadcastMcpServers();
   }
   getMcpServers() {
     const mcpState = {
@@ -1035,6 +1059,36 @@ var _Agent = class _Agent extends Server {
     }
     return mcpState;
   }
+  broadcastMcpServers() {
+    this.broadcast(
+      JSON.stringify({
+        mcp: this.getMcpServers(),
+        type: "cf_agent_mcp_servers" /* CF_AGENT_MCP_SERVERS */
+      })
+    );
+  }
+  /**
+   * 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
+   */
+  handleOAuthCallbackResponse(result, request) {
+    const config = this.mcp.getOAuthCallbackConfig();
+    if (config?.customHandler) {
+      return config.customHandler(result);
+    }
+    if (config?.successRedirect && result.authSuccess) {
+      return Response.redirect(config.successRedirect);
+    }
+    if (config?.errorRedirect && !result.authSuccess) {
+      return Response.redirect(
+        `${config.errorRedirect}?error=${encodeURIComponent(result.authError || "Unknown error")}`
+      );
+    }
+    const baseUrl = new URL(request.url).origin;
+    return Response.redirect(baseUrl);
+  }
 };
 /**
  * Agent configuration options
@@ -1045,6 +1099,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",
@@ -1223,7 +1278,7 @@ var StreamingResponse = class {
       id: this._id,
       result: chunk,
       success: true,
-      type: "rpc"
+      type: "rpc" /* RPC */
     };
     this._connection.send(JSON.stringify(response));
   }
@@ -1241,7 +1296,7 @@ var StreamingResponse = class {
       id: this._id,
       result: finalChunk,
       success: true,
-      type: "rpc"
+      type: "rpc" /* RPC */
     };
     this._connection.send(JSON.stringify(response));
   }
@@ -1273,6 +1328,7 @@ function isLocalMode() {
 
 export {
   genericObservability,
+  callable,
   unstable_callable,
   getCurrentAgent,
   Agent,
@@ -1284,4 +1340,4 @@ export {
   getAgentByName,
   StreamingResponse
 };
-//# sourceMappingURL=chunk-JXN5WZFQ.js.map
+//# sourceMappingURL=chunk-XGMKNUJA.js.map