agents 0.0.0-956c772 → 0.0.0-9688c15

package/dist/chunk-RN4SNE73.js

@@ -0,0 +1,133 @@
+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
+  );
+}
+
+export {
+  camelCaseToKebabCase,
+  AgentClient,
+  agentFetch
+};
+//# sourceMappingURL=chunk-RN4SNE73.js.map

package/dist/chunk-RN4SNE73.js.map

@@ -0,0 +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 */\nexport function 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":[]}

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

@@ -1,3 +1,12 @@
+import {
+  DurableObjectOAuthClientProvider
+} from "./chunk-D6UOOELW.js";
+import {
+  camelCaseToKebabCase
+} from "./chunk-RN4SNE73.js";
+import {
+  MCPClientManager
+} from "./chunk-25YDMV4H.js";
 import {
   __privateAdd,
   __privateGet,
@@ -14,7 +23,6 @@ import {
 import { parseCronExpression } from "cron-schedule";
 import { nanoid } from "nanoid";
 import { AsyncLocalStorage } from "node:async_hooks";
-import { WorkflowEntrypoint as CFWorkflowEntrypoint } from "cloudflare:workers";
 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);
 }
@@ -30,8 +38,6 @@ function unstable_callable(metadata = {}) {
     return target;
   };
 }
-var WorkflowEntrypoint = class extends CFWorkflowEntrypoint {
-};
 function getNextCronTime(cron) {
   const interval = parseCronExpression(cron);
   return interval.getNextDate();
@@ -39,18 +45,74 @@ function getNextCronTime(cron) {
 var STATE_ROW_ID = "cf_state_row_id";
 var STATE_WAS_CHANGED = "cf_state_was_changed";
 var DEFAULT_STATE = {};
-var unstable_context = new AsyncLocalStorage();
-var _state, _Agent_instances, setStateInternal_fn, tryCatch_fn, scheduleNextAlarm_fn, isCallable_fn;
+var agentContext = new AsyncLocalStorage();
+function getCurrentAgent() {
+  const store = agentContext.getStore();
+  if (!store) {
+    return {
+      agent: void 0,
+      connection: void 0,
+      request: void 0
+    };
+  }
+  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");
     /**
      * Initial state for the Agent
      * Override to provide default state values
      */
     this.initialState = DEFAULT_STATE;
+    /**
+     * 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/}
+     */
+    this.alarm = async () => {
+      const now = Math.floor(Date.now() / 1e3);
+      const result = this.sql`
+      SELECT * FROM cf_agents_schedules WHERE time <= ${now}
+    `;
+      for (const row of result || []) {
+        const callback = this[row.callback];
+        if (!callback) {
+          console.error(`callback ${row.callback} not found`);
+          continue;
+        }
+        await agentContext.run(
+          { agent: this, connection: void 0, request: void 0 },
+          async () => {
+            try {
+              await callback.bind(this)(JSON.parse(row.payload), row);
+            } catch (e) {
+              console.error(`error executing callback "${row.callback}"`, e);
+            }
+          }
+        );
+        if (row.type === "cron") {
+          const nextExecutionTime = getNextCronTime(row.cron);
+          const nextTimestamp = Math.floor(nextExecutionTime.getTime() / 1e3);
+          this.sql`
+          UPDATE cf_agents_schedules SET time = ${nextTimestamp} WHERE id = ${row.id}
+        `;
+        } else {
+          this.sql`
+          DELETE FROM cf_agents_schedules WHERE id = ${row.id}
+        `;
+        }
+      }
+      await __privateMethod(this, _Agent_instances, scheduleNextAlarm_fn).call(this);
+    };
     this.sql`
       CREATE TABLE IF NOT EXISTS cf_agents_state (
         id TEXT PRIMARY KEY NOT NULL,
@@ -74,9 +136,42 @@ var Agent = class extends Server {
         await this.alarm();
       });
     });
+    this.sql`
+      CREATE TABLE IF NOT EXISTS cf_agents_mcp_servers (
+        id TEXT PRIMARY KEY NOT NULL,
+        name TEXT NOT NULL,
+        server_url TEXT NOT NULL,
+        callback_url TEXT NOT NULL,
+        client_id TEXT,
+        auth_url TEXT,
+        server_options TEXT
+      )
+    `;
+    const _onRequest = this.onRequest.bind(this);
+    this.onRequest = (request) => {
+      return agentContext.run(
+        { agent: this, connection: void 0, request },
+        async () => {
+          if (this.mcp.isCallbackRequest(request)) {
+            await this.mcp.handleCallbackRequest(request);
+            this.broadcast(
+              JSON.stringify({
+                type: "cf_agent_mcp_servers",
+                mcp: __privateMethod(this, _Agent_instances, getMcpServerStateInternal_fn).call(this)
+              })
+            );
+            return new Response("<script>window.close();</script>", {
+              status: 200,
+              headers: { "content-type": "text/html" }
+            });
+          }
+          return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onRequest(request));
+        }
+      );
+    };
     const _onMessage = this.onMessage.bind(this);
     this.onMessage = async (connection, message) => {
-      return unstable_context.run(
+      return agentContext.run(
         { agent: this, connection, request: void 0 },
         async () => {
           if (typeof message !== "string") {
@@ -135,7 +230,7 @@ var Agent = class extends Server {
     };
     const _onConnect = this.onConnect.bind(this);
     this.onConnect = (connection, ctx2) => {
-      return unstable_context.run(
+      return agentContext.run(
         { agent: this, connection, request: ctx2.request },
         async () => {
           setTimeout(() => {
@@ -147,11 +242,43 @@ var Agent = class extends Server {
                 })
               );
             }
+            connection.send(
+              JSON.stringify({
+                type: "cf_agent_mcp_servers",
+                mcp: __privateMethod(this, _Agent_instances, getMcpServerStateInternal_fn).call(this)
+              })
+            );
             return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onConnect(connection, ctx2));
           }, 20);
         }
       );
     };
+    const _onStart = this.onStart.bind(this);
+    this.onStart = async () => {
+      return agentContext.run(
+        { agent: this, connection: void 0, request: void 0 },
+        async () => {
+          const servers = this.sql`
+            SELECT id, name, server_url, client_id, auth_url, callback_url, server_options FROM cf_agents_mcp_servers;
+          `;
+          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
+              });
+            })
+          );
+          this.broadcast(
+            JSON.stringify({
+              type: "cf_agent_mcp_servers",
+              mcp: __privateMethod(this, _Agent_instances, getMcpServerStateInternal_fn).call(this)
+            })
+          );
+          await __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onStart());
+        }
+      );
+    };
   }
   /**
    * Current state of the Agent
@@ -217,7 +344,7 @@ var Agent = class extends Server {
    * @param email Email message to process
    */
   onEmail(email) {
-    return unstable_context.run(
+    return agentContext.run(
       { agent: this, connection: void 0, request: void 0 },
       async () => {
         console.error("onEmail not implemented");
@@ -380,56 +507,51 @@ var Agent = class extends Server {
     await __privateMethod(this, _Agent_instances, scheduleNextAlarm_fn).call(this);
     return true;
   }
-  /**
-   * Method called when an alarm fires
-   * Executes any scheduled tasks that are due
-   */
-  async alarm() {
-    const now = Math.floor(Date.now() / 1e3);
-    const result = this.sql`
-      SELECT * FROM cf_agents_schedules WHERE time <= ${now}
-    `;
-    for (const row of result || []) {
-      const callback = this[row.callback];
-      if (!callback) {
-        console.error(`callback ${row.callback} not found`);
-        continue;
-      }
-      await unstable_context.run(
-        { agent: this, connection: void 0, request: void 0 },
-        async () => {
-          try {
-            await callback.bind(this)(JSON.parse(row.payload), row);
-          } catch (e) {
-            console.error(`error executing callback "${row.callback}"`, e);
-          }
-        }
-      );
-      if (row.type === "cron") {
-        const nextExecutionTime = getNextCronTime(row.cron);
-        const nextTimestamp = Math.floor(nextExecutionTime.getTime() / 1e3);
-        this.sql`
-          UPDATE cf_agents_schedules SET time = ${nextTimestamp} WHERE id = ${row.id}
-        `;
-      } else {
-        this.sql`
-          DELETE FROM cf_agents_schedules WHERE id = ${row.id}
-        `;
-      }
-    }
-    await __privateMethod(this, _Agent_instances, scheduleNextAlarm_fn).call(this);
-  }
   /**
    * Destroy the Agent, removing all state and scheduled tasks
    */
   async destroy() {
     this.sql`DROP TABLE IF EXISTS cf_agents_state`;
     this.sql`DROP TABLE IF EXISTS cf_agents_schedules`;
+    this.sql`DROP TABLE IF EXISTS cf_agents_mcp_servers`;
     await this.ctx.storage.deleteAlarm();
     await this.ctx.storage.deleteAll();
   }
+  /**
+   * 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
+   */
+  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);
+    this.broadcast(
+      JSON.stringify({
+        type: "cf_agent_mcp_servers",
+        mcp: __privateMethod(this, _Agent_instances, getMcpServerStateInternal_fn).call(this)
+      })
+    );
+    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)
+      })
+    );
+  }
 };
 _state = new WeakMap();
+_ParentClass = new WeakMap();
 _Agent_instances = new WeakSet();
 setStateInternal_fn = function(state, source = "server") {
   __privateSet(this, _state, state);
@@ -449,8 +571,8 @@ setStateInternal_fn = function(state, source = "server") {
     source !== "server" ? [source.id] : []
   );
   return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => {
-    const { connection, request } = unstable_context.getStore() || {};
-    return unstable_context.run(
+    const { connection, request } = agentContext.getStore() || {};
+    return agentContext.run(
       { agent: this, connection, request },
       async () => {
         return this.onStateUpdate(state, source);
@@ -485,6 +607,77 @@ scheduleNextAlarm_fn = async function() {
 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,
+          headers: options?.transport?.headers
+        })
+      },
+      requestInit: {
+        headers: options?.transport?.headers
+      }
+    };
+  }
+  const { id, authUrl, clientId } = await this.mcp.connect(url, {
+    reconnect,
+    transport: {
+      ...headerTransportOpts,
+      authProvider
+    },
+    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},
+        ${serverName},
+        ${url},
+        ${clientId ?? null},
+        ${authUrl ?? null},
+        ${callbackUrl},
+        ${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;
+    `;
+  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
+    };
+  }
+  return mcpState;
+};
 /**
  * Agent configuration options
  */
@@ -530,7 +723,7 @@ async function routeAgentRequest(request, env, options) {
 }
 async function routeAgentEmail(email, env, options) {
 }
-function getAgentByName(namespace, name, options) {
+async function getAgentByName(namespace, name, options) {
   return getServerByName(namespace, name, options);
 }
 var _connection, _id, _closed;
@@ -584,12 +777,11 @@ _closed = new WeakMap();
 
 export {
   unstable_callable,
-  WorkflowEntrypoint,
-  unstable_context,
+  getCurrentAgent,
   Agent,
   routeAgentRequest,
   routeAgentEmail,
   getAgentByName,
   StreamingResponse
 };
-//# sourceMappingURL=chunk-YMUU7QHV.js.map
+//# sourceMappingURL=chunk-YFPCCSZO.js.map