agents 0.0.0-25aeaf2 → 0.0.0-2801d35

package/dist/{chunk-YFPCCSZO.js → chunk-J6T74FUS.js}

@@ -1,18 +1,12 @@
 import {
   DurableObjectOAuthClientProvider
-} from "./chunk-D6UOOELW.js";
+} from "./chunk-BZXOAZUX.js";
 import {
   camelCaseToKebabCase
-} from "./chunk-RN4SNE73.js";
+} from "./chunk-QSGN3REV.js";
 import {
   MCPClientManager
-} from "./chunk-25YDMV4H.js";
-import {
-  __privateAdd,
-  __privateGet,
-  __privateMethod,
-  __privateSet
-} from "./chunk-HMLY7DHA.js";
+} from "./chunk-Y67CHZBI.js";
 
 // src/index.ts
 import {
@@ -57,14 +51,12 @@ function getCurrentAgent() {
   }
   return store;
 }
-var _state, _ParentClass, _Agent_instances, setStateInternal_fn, tryCatch_fn, scheduleNextAlarm_fn, isCallable_fn, connectToMcpServerInternal_fn, getMcpServerStateInternal_fn;
 var Agent = class extends Server {
   constructor(ctx, env) {
     super(ctx, env);
-    __privateAdd(this, _Agent_instances);
-    __privateAdd(this, _state, DEFAULT_STATE);
-    __privateAdd(this, _ParentClass, Object.getPrototypeOf(this).constructor);
-    this.mcp = new MCPClientManager(__privateGet(this, _ParentClass).name, "0.0.1");
+    this._state = DEFAULT_STATE;
+    this._ParentClass = Object.getPrototypeOf(this).constructor;
+    this.mcp = new MCPClientManager(this._ParentClass.name, "0.0.1");
     /**
      * Initial state for the Agent
      * Override to provide default state values
@@ -111,7 +103,7 @@ var Agent = class extends Server {
         `;
         }
       }
-      await __privateMethod(this, _Agent_instances, scheduleNextAlarm_fn).call(this);
+      await this._scheduleNextAlarm();
     };
     this.sql`
       CREATE TABLE IF NOT EXISTS cf_agents_state (
@@ -120,7 +112,7 @@ var Agent = class extends Server {
       )
     `;
     void this.ctx.blockConcurrencyWhile(async () => {
-      return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, async () => {
+      return this._tryCatch(async () => {
         this.sql`
         CREATE TABLE IF NOT EXISTS cf_agents_schedules (
           id TEXT PRIMARY KEY NOT NULL DEFAULT (randomblob(9)),
@@ -157,7 +149,7 @@ var Agent = class extends Server {
             this.broadcast(
               JSON.stringify({
                 type: "cf_agent_mcp_servers",
-                mcp: __privateMethod(this, _Agent_instances, getMcpServerStateInternal_fn).call(this)
+                mcp: this.getMcpServers()
               })
             );
             return new Response("<script>window.close();</script>", {
@@ -165,7 +157,7 @@ var Agent = class extends Server {
               headers: { "content-type": "text/html" }
             });
           }
-          return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onRequest(request));
+          return this._tryCatch(() => _onRequest(request));
         }
       );
     };
@@ -175,16 +167,16 @@ var Agent = class extends Server {
         { agent: this, connection, request: void 0 },
         async () => {
           if (typeof message !== "string") {
-            return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onMessage(connection, message));
+            return this._tryCatch(() => _onMessage(connection, message));
           }
           let parsed;
           try {
             parsed = JSON.parse(message);
           } catch (e) {
-            return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onMessage(connection, message));
+            return this._tryCatch(() => _onMessage(connection, message));
           }
           if (isStateUpdateMessage(parsed)) {
-            __privateMethod(this, _Agent_instances, setStateInternal_fn).call(this, parsed.state, connection);
+            this._setStateInternal(parsed.state, connection);
             return;
           }
           if (isRPCRequest(parsed)) {
@@ -194,7 +186,7 @@ var Agent = class extends Server {
               if (typeof methodFn !== "function") {
                 throw new Error(`Method ${method} does not exist`);
               }
-              if (!__privateMethod(this, _Agent_instances, isCallable_fn).call(this, method)) {
+              if (!this._isCallable(method)) {
                 throw new Error(`Method ${method} is not callable`);
               }
               const metadata = callableMetadata.get(methodFn);
@@ -224,7 +216,7 @@ var Agent = class extends Server {
             }
             return;
           }
-          return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onMessage(connection, message));
+          return this._tryCatch(() => _onMessage(connection, message));
         }
       );
     };
@@ -245,10 +237,10 @@ var Agent = class extends Server {
             connection.send(
               JSON.stringify({
                 type: "cf_agent_mcp_servers",
-                mcp: __privateMethod(this, _Agent_instances, getMcpServerStateInternal_fn).call(this)
+                mcp: this.getMcpServers()
               })
             );
-            return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onConnect(connection, ctx2));
+            return this._tryCatch(() => _onConnect(connection, ctx2));
           }, 20);
         }
       );
@@ -263,19 +255,25 @@ var Agent = class extends Server {
           `;
           await Promise.allSettled(
             servers.map((server) => {
-              return __privateMethod(this, _Agent_instances, connectToMcpServerInternal_fn).call(this, server.name, server.server_url, server.callback_url, server.server_options ? JSON.parse(server.server_options) : void 0, {
-                id: server.id,
-                oauthClientId: server.client_id ?? void 0
-              });
+              return this._connectToMcpServerInternal(
+                server.name,
+                server.server_url,
+                server.callback_url,
+                server.server_options ? JSON.parse(server.server_options) : void 0,
+                {
+                  id: server.id,
+                  oauthClientId: server.client_id ?? void 0
+                }
+              );
             })
           );
           this.broadcast(
             JSON.stringify({
               type: "cf_agent_mcp_servers",
-              mcp: __privateMethod(this, _Agent_instances, getMcpServerStateInternal_fn).call(this)
+              mcp: this.getMcpServers()
             })
           );
-          await __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onStart());
+          await this._tryCatch(() => _onStart());
         }
       );
     };
@@ -284,8 +282,8 @@ var Agent = class extends Server {
    * Current state of the Agent
    */
   get state() {
-    if (__privateGet(this, _state) !== DEFAULT_STATE) {
-      return __privateGet(this, _state);
+    if (this._state !== DEFAULT_STATE) {
+      return this._state;
     }
     const wasChanged = this.sql`
         SELECT state FROM cf_agents_state WHERE id = ${STATE_WAS_CHANGED}
@@ -296,8 +294,8 @@ var Agent = class extends Server {
     if (wasChanged[0]?.state === "true" || // we do this check for people who updated their code before we shipped wasChanged
     result[0]?.state) {
       const state = result[0]?.state;
-      __privateSet(this, _state, JSON.parse(state));
-      return __privateGet(this, _state);
+      this._state = JSON.parse(state);
+      return this._state;
     }
     if (this.initialState === DEFAULT_STATE) {
       return void 0;
@@ -325,12 +323,39 @@ var Agent = class extends Server {
       throw this.onError(e);
     }
   }
+  _setStateInternal(state, source = "server") {
+    this._state = state;
+    this.sql`
+    INSERT OR REPLACE INTO cf_agents_state (id, state)
+    VALUES (${STATE_ROW_ID}, ${JSON.stringify(state)})
+  `;
+    this.sql`
+    INSERT OR REPLACE INTO cf_agents_state (id, state)
+    VALUES (${STATE_WAS_CHANGED}, ${JSON.stringify(true)})
+  `;
+    this.broadcast(
+      JSON.stringify({
+        type: "cf_agent_state",
+        state
+      }),
+      source !== "server" ? [source.id] : []
+    );
+    return this._tryCatch(() => {
+      const { connection, request } = agentContext.getStore() || {};
+      return agentContext.run(
+        { agent: this, connection, request },
+        async () => {
+          return this.onStateUpdate(state, source);
+        }
+      );
+    });
+  }
   /**
    * Update the Agent's state
    * @param state New state to set
    */
   setState(state) {
-    __privateMethod(this, _Agent_instances, setStateInternal_fn).call(this, state, "server");
+    this._setStateInternal(state, "server");
   }
   /**
    * Called when the Agent's state is updated
@@ -351,6 +376,13 @@ var Agent = class extends Server {
       }
     );
   }
+  async _tryCatch(fn) {
+    try {
+      return await fn();
+    } catch (e) {
+      throw this.onError(e);
+    }
+  }
   onError(connectionOrError, error) {
     let theError;
     if (connectionOrError && error) {
@@ -400,7 +432,7 @@ var Agent = class extends Server {
         payload
       )}, 'scheduled', ${timestamp})
       `;
-      await __privateMethod(this, _Agent_instances, scheduleNextAlarm_fn).call(this);
+      await this._scheduleNextAlarm();
       return {
         id,
         callback,
@@ -418,7 +450,7 @@ var Agent = class extends Server {
         payload
       )}, 'delayed', ${when}, ${timestamp})
       `;
-      await __privateMethod(this, _Agent_instances, scheduleNextAlarm_fn).call(this);
+      await this._scheduleNextAlarm();
       return {
         id,
         callback,
@@ -437,7 +469,7 @@ var Agent = class extends Server {
         payload
       )}, 'cron', ${when}, ${timestamp})
       `;
-      await __privateMethod(this, _Agent_instances, scheduleNextAlarm_fn).call(this);
+      await this._scheduleNextAlarm();
       return {
         id,
         callback,
@@ -504,9 +536,22 @@ var Agent = class extends Server {
    */
   async cancelSchedule(id) {
     this.sql`DELETE FROM cf_agents_schedules WHERE id = ${id}`;
-    await __privateMethod(this, _Agent_instances, scheduleNextAlarm_fn).call(this);
+    await this._scheduleNextAlarm();
     return true;
   }
+  async _scheduleNextAlarm() {
+    const result = this.sql`
+      SELECT time FROM cf_agents_schedules 
+      WHERE time > ${Math.floor(Date.now() / 1e3)}
+      ORDER BY time ASC 
+      LIMIT 1
+    `;
+    if (!result) return;
+    if (result.length > 0 && "time" in result[0]) {
+      const nextTime = result[0].time * 1e3;
+      await this.ctx.storage.setAlarm(nextTime);
+    }
+  }
   /**
    * Destroy the Agent, removing all state and scheduled tasks
    */
@@ -517,6 +562,13 @@ var Agent = class extends Server {
     await this.ctx.storage.deleteAlarm();
     await this.ctx.storage.deleteAll();
   }
+  /**
+   * Get all methods marked as callable on this Agent
+   * @returns A map of method names to their metadata
+   */
+  _isCallable(method) {
+    return callableMetadata.has(this[method]);
+  }
   /**
    * Connect to a new MCP Server
    *
@@ -527,121 +579,56 @@ var Agent = class extends Server {
    * @returns authUrl
    */
   async addMcpServer(serverName, url, callbackHost, agentsPrefix = "agents", options) {
-    const callbackUrl = `${callbackHost}/${agentsPrefix}/${camelCaseToKebabCase(__privateGet(this, _ParentClass).name)}/${this.name}/callback`;
-    const result = await __privateMethod(this, _Agent_instances, connectToMcpServerInternal_fn).call(this, serverName, url, callbackUrl, options);
+    const callbackUrl = `${callbackHost}/${agentsPrefix}/${camelCaseToKebabCase(this._ParentClass.name)}/${this.name}/callback`;
+    const result = await this._connectToMcpServerInternal(
+      serverName,
+      url,
+      callbackUrl,
+      options
+    );
     this.broadcast(
       JSON.stringify({
         type: "cf_agent_mcp_servers",
-        mcp: __privateMethod(this, _Agent_instances, getMcpServerStateInternal_fn).call(this)
+        mcp: this.getMcpServers()
       })
     );
     return result;
   }
-  async removeMcpServer(id) {
-    this.mcp.closeConnection(id);
-    this.sql`
-      DELETE FROM cf_agents_mcp_servers WHERE id = ${id};
-    `;
-    this.broadcast(
-      JSON.stringify({
-        type: "cf_agent_mcp_servers",
-        mcp: __privateMethod(this, _Agent_instances, getMcpServerStateInternal_fn).call(this)
-      })
+  async _connectToMcpServerInternal(serverName, url, callbackUrl, options, reconnect) {
+    const authProvider = new DurableObjectOAuthClientProvider(
+      this.ctx.storage,
+      this.name,
+      callbackUrl
     );
-  }
-};
-_state = new WeakMap();
-_ParentClass = new WeakMap();
-_Agent_instances = new WeakSet();
-setStateInternal_fn = function(state, source = "server") {
-  __privateSet(this, _state, state);
-  this.sql`
-    INSERT OR REPLACE INTO cf_agents_state (id, state)
-    VALUES (${STATE_ROW_ID}, ${JSON.stringify(state)})
-  `;
-  this.sql`
-    INSERT OR REPLACE INTO cf_agents_state (id, state)
-    VALUES (${STATE_WAS_CHANGED}, ${JSON.stringify(true)})
-  `;
-  this.broadcast(
-    JSON.stringify({
-      type: "cf_agent_state",
-      state
-    }),
-    source !== "server" ? [source.id] : []
-  );
-  return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => {
-    const { connection, request } = agentContext.getStore() || {};
-    return agentContext.run(
-      { agent: this, connection, request },
-      async () => {
-        return this.onStateUpdate(state, source);
+    if (reconnect) {
+      authProvider.serverId = reconnect.id;
+      if (reconnect.oauthClientId) {
+        authProvider.clientId = reconnect.oauthClientId;
       }
-    );
-  });
-};
-tryCatch_fn = async function(fn) {
-  try {
-    return await fn();
-  } catch (e) {
-    throw this.onError(e);
-  }
-};
-scheduleNextAlarm_fn = async function() {
-  const result = this.sql`
-      SELECT time FROM cf_agents_schedules 
-      WHERE time > ${Math.floor(Date.now() / 1e3)}
-      ORDER BY time ASC 
-      LIMIT 1
-    `;
-  if (!result) return;
-  if (result.length > 0 && "time" in result[0]) {
-    const nextTime = result[0].time * 1e3;
-    await this.ctx.storage.setAlarm(nextTime);
-  }
-};
-/**
- * Get all methods marked as callable on this Agent
- * @returns A map of method names to their metadata
- */
-isCallable_fn = function(method) {
-  return callableMetadata.has(this[method]);
-};
-connectToMcpServerInternal_fn = async function(serverName, url, callbackUrl, options, reconnect) {
-  const authProvider = new DurableObjectOAuthClientProvider(
-    this.ctx.storage,
-    this.name,
-    callbackUrl
-  );
-  if (reconnect) {
-    authProvider.serverId = reconnect.id;
-    if (reconnect.oauthClientId) {
-      authProvider.clientId = reconnect.oauthClientId;
     }
-  }
-  let headerTransportOpts = {};
-  if (options?.transport?.headers) {
-    headerTransportOpts = {
-      eventSourceInit: {
-        fetch: (url2, init) => fetch(url2, {
-          ...init,
+    let headerTransportOpts = {};
+    if (options?.transport?.headers) {
+      headerTransportOpts = {
+        eventSourceInit: {
+          fetch: (url2, init) => fetch(url2, {
+            ...init,
+            headers: options?.transport?.headers
+          })
+        },
+        requestInit: {
           headers: options?.transport?.headers
-        })
+        }
+      };
+    }
+    const { id, authUrl, clientId } = await this.mcp.connect(url, {
+      reconnect,
+      transport: {
+        ...headerTransportOpts,
+        authProvider
       },
-      requestInit: {
-        headers: options?.transport?.headers
-      }
-    };
-  }
-  const { id, authUrl, clientId } = await this.mcp.connect(url, {
-    reconnect,
-    transport: {
-      ...headerTransportOpts,
-      authProvider
-    },
-    client: options?.client
-  });
-  this.sql`
+      client: options?.client
+    });
+    this.sql`
       INSERT OR REPLACE INTO cf_agents_mcp_servers (id, name, server_url, client_id, auth_url, callback_url, server_options)
       VALUES (
         ${id},
@@ -653,30 +640,45 @@ connectToMcpServerInternal_fn = async function(serverName, url, callbackUrl, opt
         ${options ? JSON.stringify(options) : null}
       );
     `;
-  return {
-    id,
-    authUrl
-  };
-};
-getMcpServerStateInternal_fn = function() {
-  const mcpState = {
-    servers: {},
-    tools: this.mcp.listTools(),
-    prompts: this.mcp.listPrompts(),
-    resources: this.mcp.listResources()
-  };
-  const servers = this.sql`
-      SELECT id, name, server_url, client_id, auth_url, callback_url, server_options FROM cf_agents_mcp_servers;
+    return {
+      id,
+      authUrl
+    };
+  }
+  async removeMcpServer(id) {
+    this.mcp.closeConnection(id);
+    this.sql`
+      DELETE FROM cf_agents_mcp_servers WHERE id = ${id};
     `;
-  for (const server of servers) {
-    mcpState.servers[server.id] = {
-      name: server.name,
-      server_url: server.server_url,
-      auth_url: server.auth_url,
-      state: this.mcp.mcpConnections[server.id].connectionState
+    this.broadcast(
+      JSON.stringify({
+        type: "cf_agent_mcp_servers",
+        mcp: this.getMcpServers()
+      })
+    );
+  }
+  getMcpServers() {
+    const mcpState = {
+      servers: {},
+      tools: this.mcp.listTools(),
+      prompts: this.mcp.listPrompts(),
+      resources: this.mcp.listResources()
     };
+    const servers = this.sql`
+      SELECT id, name, server_url, client_id, auth_url, callback_url, server_options FROM cf_agents_mcp_servers;
+    `;
+    for (const server of servers) {
+      mcpState.servers[server.id] = {
+        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
+      };
+    }
+    return mcpState;
   }
-  return mcpState;
 };
 /**
  * Agent configuration options
@@ -726,54 +728,48 @@ async function routeAgentEmail(email, env, options) {
 async function getAgentByName(namespace, name, options) {
   return getServerByName(namespace, name, options);
 }
-var _connection, _id, _closed;
 var StreamingResponse = class {
   constructor(connection, id) {
-    __privateAdd(this, _connection);
-    __privateAdd(this, _id);
-    __privateAdd(this, _closed, false);
-    __privateSet(this, _connection, connection);
-    __privateSet(this, _id, id);
+    this._closed = false;
+    this._connection = connection;
+    this._id = id;
   }
   /**
    * Send a chunk of data to the client
    * @param chunk The data to send
    */
   send(chunk) {
-    if (__privateGet(this, _closed)) {
+    if (this._closed) {
       throw new Error("StreamingResponse is already closed");
     }
     const response = {
       type: "rpc",
-      id: __privateGet(this, _id),
+      id: this._id,
       success: true,
       result: chunk,
       done: false
     };
-    __privateGet(this, _connection).send(JSON.stringify(response));
+    this._connection.send(JSON.stringify(response));
   }
   /**
    * End the stream and send the final chunk (if any)
    * @param finalChunk Optional final chunk of data to send
    */
   end(finalChunk) {
-    if (__privateGet(this, _closed)) {
+    if (this._closed) {
       throw new Error("StreamingResponse is already closed");
     }
-    __privateSet(this, _closed, true);
+    this._closed = true;
     const response = {
       type: "rpc",
-      id: __privateGet(this, _id),
+      id: this._id,
       success: true,
       result: finalChunk,
       done: true
     };
-    __privateGet(this, _connection).send(JSON.stringify(response));
+    this._connection.send(JSON.stringify(response));
   }
 };
-_connection = new WeakMap();
-_id = new WeakMap();
-_closed = new WeakMap();
 
 export {
   unstable_callable,
@@ -784,4 +780,4 @@ export {
   getAgentByName,
   StreamingResponse
 };
-//# sourceMappingURL=chunk-YFPCCSZO.js.map
+//# sourceMappingURL=chunk-J6T74FUS.js.map