agents 0.0.0-d7d2876 → 0.0.0-de168a2

package/README.md

@@ -316,18 +316,14 @@ Create meaningful conversations with intelligence:
 
 ```ts
 import { AIChatAgent } from "agents/ai-chat-agent";
-import { createOpenAI } from "@ai-sdk/openai";
+import { openai } from "@ai-sdk/openai";
 
 export class DialogueAgent extends AIChatAgent {
   async onChatMessage(onFinish) {
     return createDataStreamResponse({
       execute: async (dataStream) => {
-        const ai = createOpenAI({
-          apiKey: this.env.OPENAI_API_KEY,
-        });
-
         const stream = streamText({
-          model: ai("gpt-4o"),
+          model: openai("gpt-4o"),
           messages: this.messages,
           onFinish, // call onFinish so that messages get saved
         });

package/dist/ai-chat-agent.d.ts

@@ -1,7 +1,7 @@
 import { Agent, AgentContext } from "./index.js";
 import { Message, StreamTextOnFinishCallback, ToolSet } from "ai";
 import { Connection, WSMessage } from "partyserver";
-import "cloudflare:workers";
+import "node:async_hooks";
 
 /**
  * Extension of Agent with built-in chat capabilities
@@ -30,6 +30,10 @@ declare class AIChatAgent<Env = unknown, State = unknown> extends Agent<
    * @param messages Chat messages to save
    */
   saveMessages(messages: Message[]): Promise<void>;
+  persistMessages(
+    messages: Message[],
+    excludeBroadcastIds?: string[]
+  ): Promise<void>;
 }
 
 export { AIChatAgent };

package/dist/ai-chat-agent.js

@@ -1,6 +1,6 @@
 import {
   Agent
-} from "./chunk-X6BBKLSC.js";
+} from "./chunk-XG52S6YY.js";
 import {
   __privateAdd,
   __privateMethod
@@ -9,7 +9,7 @@ import {
 // src/ai-chat-agent.ts
 import { appendResponseMessages } from "ai";
 var decoder = new TextDecoder();
-var _AIChatAgent_instances, sendChatMessage_fn, broadcastChatMessage_fn, tryCatch_fn, persistMessages_fn, reply_fn;
+var _AIChatAgent_instances, broadcastChatMessage_fn, tryCatch_fn, reply_fn;
 var AIChatAgent = class extends Agent {
   constructor(ctx, env) {
     super(ctx, env);
@@ -53,14 +53,14 @@ var AIChatAgent = class extends Agent {
           type: "cf_agent_chat_messages",
           messages
         }, [connection.id]);
-        await __privateMethod(this, _AIChatAgent_instances, persistMessages_fn).call(this, messages, [connection.id]);
+        await this.persistMessages(messages, [connection.id]);
         return __privateMethod(this, _AIChatAgent_instances, tryCatch_fn).call(this, async () => {
           const response = await this.onChatMessage(async ({ response: response2 }) => {
             const finalMessages = appendResponseMessages({
               messages,
               responseMessages: response2.messages
             });
-            await __privateMethod(this, _AIChatAgent_instances, persistMessages_fn).call(this, finalMessages, [connection.id]);
+            await this.persistMessages(finalMessages, [connection.id]);
           });
           if (response) {
             await __privateMethod(this, _AIChatAgent_instances, reply_fn).call(this, data.id, response);
@@ -74,13 +74,14 @@ var AIChatAgent = class extends Agent {
           type: "cf_agent_chat_clear"
         }, [connection.id]);
       } else if (data.type === "cf_agent_chat_messages") {
-        await __privateMethod(this, _AIChatAgent_instances, persistMessages_fn).call(this, data.messages, [connection.id]);
+        await this.persistMessages(data.messages, [connection.id]);
       }
     }
   }
   async onRequest(request) {
     return __privateMethod(this, _AIChatAgent_instances, tryCatch_fn).call(this, () => {
-      if (request.url.endsWith("/get-messages")) {
+      const url = new URL(request.url);
+      if (url.pathname.endsWith("/get-messages")) {
         const messages = (this.sql`select * from cf_ai_chat_agent_messages` || []).map((row) => {
           return JSON.parse(row.message);
         });
@@ -104,13 +105,13 @@ var AIChatAgent = class extends Agent {
    * @param messages Chat messages to save
    */
   async saveMessages(messages) {
-    await __privateMethod(this, _AIChatAgent_instances, persistMessages_fn).call(this, messages);
+    await this.persistMessages(messages);
     const response = await this.onChatMessage(async ({ response: response2 }) => {
       const finalMessages = appendResponseMessages({
         messages,
         responseMessages: response2.messages
       });
-      await __privateMethod(this, _AIChatAgent_instances, persistMessages_fn).call(this, finalMessages, []);
+      await this.persistMessages(finalMessages, []);
     });
     if (response) {
       for await (const chunk of response.body) {
@@ -119,11 +120,19 @@ var AIChatAgent = class extends Agent {
       response.body?.cancel();
     }
   }
+  async persistMessages(messages, excludeBroadcastIds = []) {
+    this.sql`delete from cf_ai_chat_agent_messages`;
+    for (const message of messages) {
+      this.sql`insert into cf_ai_chat_agent_messages (id, message) values (${message.id},${JSON.stringify(message)})`;
+    }
+    this.messages = messages;
+    __privateMethod(this, _AIChatAgent_instances, broadcastChatMessage_fn).call(this, {
+      type: "cf_agent_chat_messages",
+      messages
+    }, excludeBroadcastIds);
+  }
 };
 _AIChatAgent_instances = new WeakSet();
-sendChatMessage_fn = function(connection, message) {
-  connection.send(JSON.stringify(message));
-};
 broadcastChatMessage_fn = function(message, exclude) {
   this.broadcast(JSON.stringify(message), exclude);
 };
@@ -134,17 +143,6 @@ tryCatch_fn = async function(fn) {
     throw this.onError(e);
   }
 };
-persistMessages_fn = async function(messages, excludeBroadcastIds = []) {
-  this.sql`delete from cf_ai_chat_agent_messages`;
-  for (const message of messages) {
-    this.sql`insert into cf_ai_chat_agent_messages (id, message) values (${message.id},${JSON.stringify(message)})`;
-  }
-  this.messages = messages;
-  __privateMethod(this, _AIChatAgent_instances, broadcastChatMessage_fn).call(this, {
-    type: "cf_agent_chat_messages",
-    messages
-  }, excludeBroadcastIds);
-};
 reply_fn = async function(id, response) {
   return __privateMethod(this, _AIChatAgent_instances, tryCatch_fn).call(this, async () => {
     for await (const chunk of response.body) {

package/dist/ai-chat-agent.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/ai-chat-agent.ts"],"sourcesContent":["import { Agent, type AgentContext, type Connection, type WSMessage } from \"./\";\nimport type {\n  Message as ChatMessage,\n  StreamTextOnFinishCallback,\n  ToolSet,\n} from \"ai\";\nimport { appendResponseMessages } from \"ai\";\nimport type { OutgoingMessage, IncomingMessage } from \"./ai-types\";\nconst decoder = new TextDecoder();\n\n/**\n * Extension of Agent with built-in chat capabilities\n * @template Env Environment type containing bindings\n */\nexport class AIChatAgent<Env = unknown, State = unknown> extends Agent<\n  Env,\n  State\n> {\n  /** Array of chat messages for the current conversation */\n  messages: ChatMessage[];\n  constructor(ctx: AgentContext, env: Env) {\n    super(ctx, env);\n    this.sql`create table if not exists cf_ai_chat_agent_messages (\n      id text primary key,\n      message text not null,\n      created_at datetime default current_timestamp\n    )`;\n    this.messages = (\n      this.sql`select * from cf_ai_chat_agent_messages` || []\n    ).map((row) => {\n      return JSON.parse(row.message as string);\n    });\n  }\n\n  #sendChatMessage(connection: Connection, message: OutgoingMessage) {\n    connection.send(JSON.stringify(message));\n  }\n\n  #broadcastChatMessage(message: OutgoingMessage, exclude?: string[]) {\n    this.broadcast(JSON.stringify(message), exclude);\n  }\n\n  override async onMessage(connection: Connection, message: WSMessage) {\n    if (typeof message === \"string\") {\n      let data: IncomingMessage;\n      try {\n        data = JSON.parse(message) as IncomingMessage;\n      } catch (error) {\n        // silently ignore invalid messages for now\n        // TODO: log errors with log levels\n        return;\n      }\n      if (\n        data.type === \"cf_agent_use_chat_request\" &&\n        data.init.method === \"POST\"\n      ) {\n        const {\n          method,\n          keepalive,\n          headers,\n          body, // we're reading this\n          redirect,\n          integrity,\n          credentials,\n          mode,\n          referrer,\n          referrerPolicy,\n          window,\n          // dispatcher,\n          // duplex\n        } = data.init;\n        const { messages } = JSON.parse(body as string);\n        this.#broadcastChatMessage(\n          {\n            type: \"cf_agent_chat_messages\",\n            messages,\n          },\n          [connection.id]\n        );\n        await this.#persistMessages(messages, [connection.id]);\n        return this.#tryCatch(async () => {\n          const response = await this.onChatMessage(async ({ response }) => {\n            const finalMessages = appendResponseMessages({\n              messages,\n              responseMessages: response.messages,\n            });\n\n            await this.#persistMessages(finalMessages, [connection.id]);\n          });\n          if (response) {\n            await this.#reply(data.id, response);\n          }\n        });\n      }\n      if (data.type === \"cf_agent_chat_clear\") {\n        this.sql`delete from cf_ai_chat_agent_messages`;\n        this.messages = [];\n        this.#broadcastChatMessage(\n          {\n            type: \"cf_agent_chat_clear\",\n          },\n          [connection.id]\n        );\n      } else if (data.type === \"cf_agent_chat_messages\") {\n        // replace the messages with the new ones\n        await this.#persistMessages(data.messages, [connection.id]);\n      }\n    }\n  }\n\n  override async onRequest(request: Request): Promise<Response> {\n    return this.#tryCatch(() => {\n      if (request.url.endsWith(\"/get-messages\")) {\n        const messages = (\n          this.sql`select * from cf_ai_chat_agent_messages` || []\n        ).map((row) => {\n          return JSON.parse(row.message as string);\n        });\n        return Response.json(messages);\n      }\n      return super.onRequest(request);\n    });\n  }\n\n  async #tryCatch<T>(fn: () => T | Promise<T>) {\n    try {\n      return await fn();\n    } catch (e) {\n      throw this.onError(e);\n    }\n  }\n\n  /**\n   * Handle incoming chat messages and generate a response\n   * @param onFinish Callback to be called when the response is finished\n   * @returns Response to send to the client or undefined\n   */\n  async onChatMessage(\n    onFinish: StreamTextOnFinishCallback<ToolSet>\n  ): Promise<Response | undefined> {\n    throw new Error(\n      \"recieved a chat message, override onChatMessage and return a Response to send to the client\"\n    );\n  }\n\n  /**\n   * Save messages on the server side and trigger AI response\n   * @param messages Chat messages to save\n   */\n  async saveMessages(messages: ChatMessage[]) {\n    await this.#persistMessages(messages);\n    const response = await this.onChatMessage(async ({ response }) => {\n      const finalMessages = appendResponseMessages({\n        messages,\n        responseMessages: response.messages,\n      });\n\n      await this.#persistMessages(finalMessages, []);\n    });\n    if (response) {\n      // we're just going to drain the body\n      // @ts-ignore TODO: fix this type error\n      for await (const chunk of response.body!) {\n        decoder.decode(chunk);\n      }\n      response.body?.cancel();\n    }\n  }\n\n  async #persistMessages(\n    messages: ChatMessage[],\n    excludeBroadcastIds: string[] = []\n  ) {\n    this.sql`delete from cf_ai_chat_agent_messages`;\n    for (const message of messages) {\n      this.sql`insert into cf_ai_chat_agent_messages (id, message) values (${\n        message.id\n      },${JSON.stringify(message)})`;\n    }\n    this.messages = messages;\n    this.#broadcastChatMessage(\n      {\n        type: \"cf_agent_chat_messages\",\n        messages: messages,\n      },\n      excludeBroadcastIds\n    );\n  }\n\n  async #reply(id: string, response: Response) {\n    // now take chunks out from dataStreamResponse and send them to the client\n    return this.#tryCatch(async () => {\n      // @ts-expect-error TODO: fix this type error\n      for await (const chunk of response.body!) {\n        const body = decoder.decode(chunk);\n\n        this.#broadcastChatMessage({\n          id,\n          type: \"cf_agent_use_chat_response\",\n          body,\n          done: false,\n        });\n      }\n\n      this.#broadcastChatMessage({\n        id,\n        type: \"cf_agent_use_chat_response\",\n        body: \"\",\n        done: true,\n      });\n    });\n  }\n}\n"],"mappings":";;;;;;;;;AAMA,SAAS,8BAA8B;AAEvC,IAAM,UAAU,IAAI,YAAY;AARhC;AAcO,IAAM,cAAN,cAA0D,MAG/D;AAAA,EAGA,YAAY,KAAmB,KAAU;AACvC,UAAM,KAAK,GAAG;AAPX;AAQH,SAAK;AAAA;AAAA;AAAA;AAAA;AAKL,SAAK,YACH,KAAK,gDAAgD,CAAC,GACtD,IAAI,CAAC,QAAQ;AACb,aAAO,KAAK,MAAM,IAAI,OAAiB;AAAA,IACzC,CAAC;AAAA,EACH;AAAA,EAUA,MAAe,UAAU,YAAwB,SAAoB;AACnE,QAAI,OAAO,YAAY,UAAU;AAC/B,UAAI;AACJ,UAAI;AACF,eAAO,KAAK,MAAM,OAAO;AAAA,MAC3B,SAAS,OAAO;AAGd;AAAA,MACF;AACA,UACE,KAAK,SAAS,+BACd,KAAK,KAAK,WAAW,QACrB;AACA,cAAM;AAAA,UACJ;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA;AAAA;AAAA,QAGF,IAAI,KAAK;AACT,cAAM,EAAE,SAAS,IAAI,KAAK,MAAM,IAAc;AAC9C,8BAAK,iDAAL,WACE;AAAA,UACE,MAAM;AAAA,UACN;AAAA,QACF,GACA,CAAC,WAAW,EAAE;AAEhB,cAAM,sBAAK,4CAAL,WAAsB,UAAU,CAAC,WAAW,EAAE;AACpD,eAAO,sBAAK,qCAAL,WAAe,YAAY;AAChC,gBAAM,WAAW,MAAM,KAAK,cAAc,OAAO,EAAE,UAAAA,UAAS,MAAM;AAChE,kBAAM,gBAAgB,uBAAuB;AAAA,cAC3C;AAAA,cACA,kBAAkBA,UAAS;AAAA,YAC7B,CAAC;AAED,kBAAM,sBAAK,4CAAL,WAAsB,eAAe,CAAC,WAAW,EAAE;AAAA,UAC3D,CAAC;AACD,cAAI,UAAU;AACZ,kBAAM,sBAAK,kCAAL,WAAY,KAAK,IAAI;AAAA,UAC7B;AAAA,QACF;AAAA,MACF;AACA,UAAI,KAAK,SAAS,uBAAuB;AACvC,aAAK;AACL,aAAK,WAAW,CAAC;AACjB,8BAAK,iDAAL,WACE;AAAA,UACE,MAAM;AAAA,QACR,GACA,CAAC,WAAW,EAAE;AAAA,MAElB,WAAW,KAAK,SAAS,0BAA0B;AAEjD,cAAM,sBAAK,4CAAL,WAAsB,KAAK,UAAU,CAAC,WAAW,EAAE;AAAA,MAC3D;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAe,UAAU,SAAqC;AAC5D,WAAO,sBAAK,qCAAL,WAAe,MAAM;AAC1B,UAAI,QAAQ,IAAI,SAAS,eAAe,GAAG;AACzC,cAAM,YACJ,KAAK,gDAAgD,CAAC,GACtD,IAAI,CAAC,QAAQ;AACb,iBAAO,KAAK,MAAM,IAAI,OAAiB;AAAA,QACzC,CAAC;AACD,eAAO,SAAS,KAAK,QAAQ;AAAA,MAC/B;AACA,aAAO,MAAM,UAAU,OAAO;AAAA,IAChC;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAeA,MAAM,cACJ,UAC+B;AAC/B,UAAM,IAAI;AAAA,MACR;AAAA,IACF;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,MAAM,aAAa,UAAyB;AAC1C,UAAM,sBAAK,4CAAL,WAAsB;AAC5B,UAAM,WAAW,MAAM,KAAK,cAAc,OAAO,EAAE,UAAAA,UAAS,MAAM;AAChE,YAAM,gBAAgB,uBAAuB;AAAA,QAC3C;AAAA,QACA,kBAAkBA,UAAS;AAAA,MAC7B,CAAC;AAED,YAAM,sBAAK,4CAAL,WAAsB,eAAe,CAAC;AAAA,IAC9C,CAAC;AACD,QAAI,UAAU;AAGZ,uBAAiB,SAAS,SAAS,MAAO;AACxC,gBAAQ,OAAO,KAAK;AAAA,MACtB;AACA,eAAS,MAAM,OAAO;AAAA,IACxB;AAAA,EACF;AA6CF;AAtMO;AAoBL,qBAAgB,SAAC,YAAwB,SAA0B;AACjE,aAAW,KAAK,KAAK,UAAU,OAAO,CAAC;AACzC;AAEA,0BAAqB,SAAC,SAA0B,SAAoB;AAClE,OAAK,UAAU,KAAK,UAAU,OAAO,GAAG,OAAO;AACjD;AAoFM,cAAY,eAAC,IAA0B;AAC3C,MAAI;AACF,WAAO,MAAM,GAAG;AAAA,EAClB,SAAS,GAAG;AACV,UAAM,KAAK,QAAQ,CAAC;AAAA,EACtB;AACF;AAuCM,qBAAgB,eACpB,UACA,sBAAgC,CAAC,GACjC;AACA,OAAK;AACL,aAAW,WAAW,UAAU;AAC9B,SAAK,kEACH,QAAQ,EACV,IAAI,KAAK,UAAU,OAAO,CAAC;AAAA,EAC7B;AACA,OAAK,WAAW;AAChB,wBAAK,iDAAL,WACE;AAAA,IACE,MAAM;AAAA,IACN;AAAA,EACF,GACA;AAEJ;AAEM,WAAM,eAAC,IAAY,UAAoB;AAE3C,SAAO,sBAAK,qCAAL,WAAe,YAAY;AAEhC,qBAAiB,SAAS,SAAS,MAAO;AACxC,YAAM,OAAO,QAAQ,OAAO,KAAK;AAEjC,4BAAK,iDAAL,WAA2B;AAAA,QACzB;AAAA,QACA,MAAM;AAAA,QACN;AAAA,QACA,MAAM;AAAA,MACR;AAAA,IACF;AAEA,0BAAK,iDAAL,WAA2B;AAAA,MACzB;AAAA,MACA,MAAM;AAAA,MACN,MAAM;AAAA,MACN,MAAM;AAAA,IACR;AAAA,EACF;AACF;","names":["response"]}
+{"version":3,"sources":["../src/ai-chat-agent.ts"],"sourcesContent":["import { Agent, type AgentContext, type Connection, type WSMessage } from \"./\";\nimport type {\n  Message as ChatMessage,\n  StreamTextOnFinishCallback,\n  ToolSet,\n} from \"ai\";\nimport { appendResponseMessages } from \"ai\";\nimport type { OutgoingMessage, IncomingMessage } from \"./ai-types\";\nconst decoder = new TextDecoder();\n\n/**\n * Extension of Agent with built-in chat capabilities\n * @template Env Environment type containing bindings\n */\nexport class AIChatAgent<Env = unknown, State = unknown> extends Agent<\n  Env,\n  State\n> {\n  /** Array of chat messages for the current conversation */\n  messages: ChatMessage[];\n  constructor(ctx: AgentContext, env: Env) {\n    super(ctx, env);\n    this.sql`create table if not exists cf_ai_chat_agent_messages (\n      id text primary key,\n      message text not null,\n      created_at datetime default current_timestamp\n    )`;\n    this.messages = (\n      this.sql`select * from cf_ai_chat_agent_messages` || []\n    ).map((row) => {\n      return JSON.parse(row.message as string);\n    });\n  }\n\n  #broadcastChatMessage(message: OutgoingMessage, exclude?: string[]) {\n    this.broadcast(JSON.stringify(message), exclude);\n  }\n\n  override async onMessage(connection: Connection, message: WSMessage) {\n    if (typeof message === \"string\") {\n      let data: IncomingMessage;\n      try {\n        data = JSON.parse(message) as IncomingMessage;\n      } catch (error) {\n        // silently ignore invalid messages for now\n        // TODO: log errors with log levels\n        return;\n      }\n      if (\n        data.type === \"cf_agent_use_chat_request\" &&\n        data.init.method === \"POST\"\n      ) {\n        const {\n          method,\n          keepalive,\n          headers,\n          body, // we're reading this\n          redirect,\n          integrity,\n          credentials,\n          mode,\n          referrer,\n          referrerPolicy,\n          window,\n          // dispatcher,\n          // duplex\n        } = data.init;\n        const { messages } = JSON.parse(body as string);\n        this.#broadcastChatMessage(\n          {\n            type: \"cf_agent_chat_messages\",\n            messages,\n          },\n          [connection.id]\n        );\n        await this.persistMessages(messages, [connection.id]);\n        return this.#tryCatch(async () => {\n          const response = await this.onChatMessage(async ({ response }) => {\n            const finalMessages = appendResponseMessages({\n              messages,\n              responseMessages: response.messages,\n            });\n\n            await this.persistMessages(finalMessages, [connection.id]);\n          });\n          if (response) {\n            await this.#reply(data.id, response);\n          }\n        });\n      }\n      if (data.type === \"cf_agent_chat_clear\") {\n        this.sql`delete from cf_ai_chat_agent_messages`;\n        this.messages = [];\n        this.#broadcastChatMessage(\n          {\n            type: \"cf_agent_chat_clear\",\n          },\n          [connection.id]\n        );\n      } else if (data.type === \"cf_agent_chat_messages\") {\n        // replace the messages with the new ones\n        await this.persistMessages(data.messages, [connection.id]);\n      }\n    }\n  }\n\n  override async onRequest(request: Request): Promise<Response> {\n    return this.#tryCatch(() => {\n      const url = new URL(request.url);\n      if (url.pathname.endsWith(\"/get-messages\")) {\n        const messages = (\n          this.sql`select * from cf_ai_chat_agent_messages` || []\n        ).map((row) => {\n          return JSON.parse(row.message as string);\n        });\n        return Response.json(messages);\n      }\n      return super.onRequest(request);\n    });\n  }\n\n  async #tryCatch<T>(fn: () => T | Promise<T>) {\n    try {\n      return await fn();\n    } catch (e) {\n      throw this.onError(e);\n    }\n  }\n\n  /**\n   * Handle incoming chat messages and generate a response\n   * @param onFinish Callback to be called when the response is finished\n   * @returns Response to send to the client or undefined\n   */\n  async onChatMessage(\n    onFinish: StreamTextOnFinishCallback<ToolSet>\n  ): Promise<Response | undefined> {\n    throw new Error(\n      \"recieved a chat message, override onChatMessage and return a Response to send to the client\"\n    );\n  }\n\n  /**\n   * Save messages on the server side and trigger AI response\n   * @param messages Chat messages to save\n   */\n  async saveMessages(messages: ChatMessage[]) {\n    await this.persistMessages(messages);\n    const response = await this.onChatMessage(async ({ response }) => {\n      const finalMessages = appendResponseMessages({\n        messages,\n        responseMessages: response.messages,\n      });\n\n      await this.persistMessages(finalMessages, []);\n    });\n    if (response) {\n      // we're just going to drain the body\n      // @ts-ignore TODO: fix this type error\n      for await (const chunk of response.body!) {\n        decoder.decode(chunk);\n      }\n      response.body?.cancel();\n    }\n  }\n\n  async persistMessages(\n    messages: ChatMessage[],\n    excludeBroadcastIds: string[] = []\n  ) {\n    this.sql`delete from cf_ai_chat_agent_messages`;\n    for (const message of messages) {\n      this.sql`insert into cf_ai_chat_agent_messages (id, message) values (${\n        message.id\n      },${JSON.stringify(message)})`;\n    }\n    this.messages = messages;\n    this.#broadcastChatMessage(\n      {\n        type: \"cf_agent_chat_messages\",\n        messages: messages,\n      },\n      excludeBroadcastIds\n    );\n  }\n\n  async #reply(id: string, response: Response) {\n    // now take chunks out from dataStreamResponse and send them to the client\n    return this.#tryCatch(async () => {\n      // @ts-expect-error TODO: fix this type error\n      for await (const chunk of response.body!) {\n        const body = decoder.decode(chunk);\n\n        this.#broadcastChatMessage({\n          id,\n          type: \"cf_agent_use_chat_response\",\n          body,\n          done: false,\n        });\n      }\n\n      this.#broadcastChatMessage({\n        id,\n        type: \"cf_agent_use_chat_response\",\n        body: \"\",\n        done: true,\n      });\n    });\n  }\n}\n"],"mappings":"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","names":["response"]}

package/dist/ai-react.d.ts

@@ -14,10 +14,10 @@ type GetInitialMessagesOptions = {
 /**
  * Options for the useAgentChat hook
  */
-type UseAgentChatOptions = Omit<
+type UseAgentChatOptions<State> = Omit<
   Parameters<typeof useChat>[0] & {
     /** Agent connection from useAgent */
-    agent: ReturnType<typeof useAgent>;
+    agent: ReturnType<typeof useAgent<State>>;
     getInitialMessages?:
       | undefined
       | null
@@ -30,7 +30,9 @@ type UseAgentChatOptions = Omit<
  * @param options Chat options including the agent connection
  * @returns Chat interface controls and state with added clearHistory method
  */
-declare function useAgentChat(options: UseAgentChatOptions): {
+declare function useAgentChat<State = unknown>(
+  options: UseAgentChatOptions<State>
+): {
   /**
    * Set the chat messages and synchronize with the Agent
    * @param messages New messages to set

package/dist/ai-react.js

@@ -6,11 +6,18 @@ import { useEffect, use } from "react";
 var requestCache = /* @__PURE__ */ new Map();
 function useAgentChat(options) {
   const { agent, getInitialMessages, ...rest } = options;
-  const url = `${agent._pkurl.replace("ws://", "http://").replace("wss://", "https://")}`;
+  const agentUrl = new URL(
+    `${// @ts-expect-error we're using a protected _url property that includes query params
+    (agent._url || agent._pkurl)?.replace("ws://", "http://").replace("wss://", "https://")}`
+  );
+  agentUrl.searchParams.delete("_pk");
+  const agentUrlString = agentUrl.toString();
   async function defaultGetInitialMessagesFetch({
-    url: url2
+    url
   }) {
-    const response = await fetch(new Request(`${url2}/get-messages`), {
+    const getMessagesUrl = new URL(url);
+    getMessagesUrl.pathname += "/get-messages";
+    const response = await fetch(getMessagesUrl.toString(), {
       headers: options.headers,
       credentials: options.credentials
     });
@@ -18,25 +25,25 @@ function useAgentChat(options) {
   }
   const getInitialMessagesFetch = getInitialMessages || defaultGetInitialMessagesFetch;
   function doGetInitialMessages(getInitialMessagesOptions) {
-    if (requestCache.has(url)) {
-      return requestCache.get(url);
+    if (requestCache.has(agentUrlString)) {
+      return requestCache.get(agentUrlString);
     }
     const promise = getInitialMessagesFetch(getInitialMessagesOptions);
-    requestCache.set(url, promise);
+    requestCache.set(agentUrlString, promise);
     return promise;
   }
   const initialMessages = getInitialMessages !== null ? use(
     doGetInitialMessages({
       agent: agent.agent,
       name: agent.name,
-      url
+      url: agentUrlString
     })
   ) : rest.initialMessages;
   useEffect(() => {
     return () => {
-      requestCache.delete(url);
+      requestCache.delete(agentUrlString);
     };
-  }, [url]);
+  }, [agentUrlString]);
   async function aiFetch(request, options2 = {}) {
     const {
       method,

package/dist/ai-react.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/ai-react.tsx"],"sourcesContent":["import { useChat } from \"@ai-sdk/react\";\nimport type { Message } from \"ai\";\nimport type { useAgent } from \"./react\";\nimport { useEffect, use } from \"react\";\nimport type { OutgoingMessage } from \"./ai-types\";\n\ntype GetInitialMessagesOptions = {\n  agent: string;\n  name: string;\n  url: string;\n};\n\n/**\n * Options for the useAgentChat hook\n */\ntype UseAgentChatOptions = Omit<\n  Parameters<typeof useChat>[0] & {\n    /** Agent connection from useAgent */\n    agent: ReturnType<typeof useAgent>;\n    getInitialMessages?:\n      | undefined\n      | null\n      // | (() => Message[])\n      | ((options: GetInitialMessagesOptions) => Promise<Message[]>);\n  },\n  \"fetch\"\n>;\n\n// TODO: clear cache when the agent is unmounted?\nconst requestCache = new Map<string, Promise<Message[]>>();\n\n/**\n * React hook for building AI chat interfaces using an Agent\n * @param options Chat options including the agent connection\n * @returns Chat interface controls and state with added clearHistory method\n */\nexport function useAgentChat(options: UseAgentChatOptions) {\n  const { agent, getInitialMessages, ...rest } = options;\n  const url = `${agent._pkurl\n    .replace(\"ws://\", \"http://\")\n    .replace(\"wss://\", \"https://\")}`;\n\n  async function defaultGetInitialMessagesFetch({\n    url,\n  }: GetInitialMessagesOptions) {\n    const response = await fetch(new Request(`${url}/get-messages`), {\n      headers: options.headers,\n      credentials: options.credentials,\n    });\n    return response.json<Message[]>();\n  }\n\n  const getInitialMessagesFetch =\n    getInitialMessages || defaultGetInitialMessagesFetch;\n\n  function doGetInitialMessages(\n    getInitialMessagesOptions: GetInitialMessagesOptions\n  ) {\n    if (requestCache.has(url)) {\n      return requestCache.get(url)!;\n    }\n    const promise = getInitialMessagesFetch(getInitialMessagesOptions);\n    requestCache.set(url, promise);\n    return promise;\n  }\n\n  const initialMessages =\n    getInitialMessages !== null\n      ? use(\n          doGetInitialMessages({\n            agent: agent.agent,\n            name: agent.name,\n            url,\n          })\n        )\n      : rest.initialMessages;\n\n  useEffect(() => {\n    return () => {\n      requestCache.delete(url);\n    };\n  }, [url]);\n\n  async function aiFetch(\n    request: RequestInfo | URL,\n    options: RequestInit = {}\n  ) {\n    // we're going to use a websocket to do the actual \"fetching\"\n    // but still satisfy the type signature of the fetch function\n    // so we'll return a promise that resolves to a response\n\n    const {\n      method,\n      keepalive,\n      headers,\n      body,\n      redirect,\n      integrity,\n      signal,\n      credentials,\n      mode,\n      referrer,\n      referrerPolicy,\n      window,\n      //  dispatcher, duplex\n    } = options;\n    const id = crypto.randomUUID();\n    const abortController = new AbortController();\n\n    signal?.addEventListener(\"abort\", () => {\n      abortController.abort();\n    });\n\n    agent.addEventListener(\n      \"message\",\n      (event) => {\n        let data: OutgoingMessage;\n        try {\n          data = JSON.parse(event.data) as OutgoingMessage;\n        } catch (error) {\n          // silently ignore invalid messages for now\n          // TODO: log errors with log levels\n          return;\n        }\n        if (data.type === \"cf_agent_use_chat_response\") {\n          if (data.id === id) {\n            controller.enqueue(new TextEncoder().encode(data.body));\n            if (data.done) {\n              controller.close();\n              abortController.abort();\n            }\n          }\n        }\n      },\n      { signal: abortController.signal }\n    );\n\n    let controller: ReadableStreamDefaultController;\n\n    const stream = new ReadableStream({\n      start(c) {\n        controller = c;\n      },\n    });\n\n    agent.send(\n      JSON.stringify({\n        type: \"cf_agent_use_chat_request\",\n        id,\n        url: request.toString(),\n        init: {\n          method,\n          keepalive,\n          headers,\n          body,\n          redirect,\n          integrity,\n          credentials,\n          mode,\n          referrer,\n          referrerPolicy,\n          window,\n          // dispatcher,\n          // duplex\n        },\n      })\n    );\n\n    return new Response(stream);\n  }\n  const useChatHelpers = useChat({\n    initialMessages,\n    sendExtraMessageFields: true,\n    fetch: aiFetch,\n    ...rest,\n  });\n\n  useEffect(() => {\n    function onClearHistory(event: MessageEvent) {\n      if (typeof event.data !== \"string\") {\n        return;\n      }\n      let data: OutgoingMessage;\n      try {\n        data = JSON.parse(event.data) as OutgoingMessage;\n      } catch (error) {\n        // silently ignore invalid messages for now\n        // TODO: log errors with log levels\n        return;\n      }\n      if (data.type === \"cf_agent_chat_clear\") {\n        useChatHelpers.setMessages([]);\n      }\n    }\n\n    function onMessages(event: MessageEvent) {\n      if (typeof event.data !== \"string\") {\n        return;\n      }\n      let data: OutgoingMessage;\n      try {\n        data = JSON.parse(event.data) as OutgoingMessage;\n      } catch (error) {\n        // silently ignore invalid messages for now\n        // TODO: log errors with log levels\n        return;\n      }\n      if (data.type === \"cf_agent_chat_messages\") {\n        useChatHelpers.setMessages(data.messages);\n      }\n    }\n\n    agent.addEventListener(\"message\", onClearHistory);\n    agent.addEventListener(\"message\", onMessages);\n\n    return () => {\n      agent.removeEventListener(\"message\", onClearHistory);\n      agent.removeEventListener(\"message\", onMessages);\n    };\n  }, [\n    agent.addEventListener,\n    agent.removeEventListener,\n    useChatHelpers.setMessages,\n  ]);\n\n  return {\n    ...useChatHelpers,\n    /**\n     * Set the chat messages and synchronize with the Agent\n     * @param messages New messages to set\n     */\n    setMessages: (messages: Message[]) => {\n      useChatHelpers.setMessages(messages);\n      agent.send(\n        JSON.stringify({\n          type: \"cf_agent_chat_messages\",\n          messages,\n        })\n      );\n    },\n    /**\n     * Clear chat history on both client and Agent\n     */\n    clearHistory: () => {\n      useChatHelpers.setMessages([]);\n      agent.send(\n        JSON.stringify({\n          type: \"cf_agent_chat_clear\",\n        })\n      );\n    },\n  };\n}\n"],"mappings":"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","names":["url","options"]}
+{"version":3,"sources":["../src/ai-react.tsx"],"sourcesContent":["import { useChat } from \"@ai-sdk/react\";\nimport type { Message } from \"ai\";\nimport type { useAgent } from \"./react\";\nimport { useEffect, use } from \"react\";\nimport type { OutgoingMessage } from \"./ai-types\";\n\ntype GetInitialMessagesOptions = {\n  agent: string;\n  name: string;\n  url: string;\n};\n\n/**\n * Options for the useAgentChat hook\n */\ntype UseAgentChatOptions<State> = Omit<\n  Parameters<typeof useChat>[0] & {\n    /** Agent connection from useAgent */\n    agent: ReturnType<typeof useAgent<State>>;\n    getInitialMessages?:\n      | undefined\n      | null\n      // | (() => Message[])\n      | ((options: GetInitialMessagesOptions) => Promise<Message[]>);\n  },\n  \"fetch\"\n>;\n\n// TODO: clear cache when the agent is unmounted?\nconst requestCache = new Map<string, Promise<Message[]>>();\n\n/**\n * React hook for building AI chat interfaces using an Agent\n * @param options Chat options including the agent connection\n * @returns Chat interface controls and state with added clearHistory method\n */\nexport function useAgentChat<State = unknown>(\n  options: UseAgentChatOptions<State>\n) {\n  const { agent, getInitialMessages, ...rest } = options;\n\n  const agentUrl = new URL(\n    `${// @ts-expect-error we're using a protected _url property that includes query params\n    ((agent._url as string | null) || agent._pkurl)\n      ?.replace(\"ws://\", \"http://\")\n      .replace(\"wss://\", \"https://\")}`\n  );\n\n  // delete the _pk query param\n  agentUrl.searchParams.delete(\"_pk\");\n  const agentUrlString = agentUrl.toString();\n\n  async function defaultGetInitialMessagesFetch({\n    url,\n  }: GetInitialMessagesOptions) {\n    const getMessagesUrl = new URL(url);\n    getMessagesUrl.pathname += \"/get-messages\";\n    const response = await fetch(getMessagesUrl.toString(), {\n      headers: options.headers,\n      credentials: options.credentials,\n    });\n    return response.json<Message[]>();\n  }\n\n  const getInitialMessagesFetch =\n    getInitialMessages || defaultGetInitialMessagesFetch;\n\n  function doGetInitialMessages(\n    getInitialMessagesOptions: GetInitialMessagesOptions\n  ) {\n    if (requestCache.has(agentUrlString)) {\n      return requestCache.get(agentUrlString)!;\n    }\n    const promise = getInitialMessagesFetch(getInitialMessagesOptions);\n    requestCache.set(agentUrlString, promise);\n    return promise;\n  }\n\n  const initialMessages =\n    getInitialMessages !== null\n      ? use(\n          doGetInitialMessages({\n            agent: agent.agent,\n            name: agent.name,\n            url: agentUrlString,\n          })\n        )\n      : rest.initialMessages;\n\n  useEffect(() => {\n    return () => {\n      requestCache.delete(agentUrlString);\n    };\n  }, [agentUrlString]);\n\n  async function aiFetch(\n    request: RequestInfo | URL,\n    options: RequestInit = {}\n  ) {\n    // we're going to use a websocket to do the actual \"fetching\"\n    // but still satisfy the type signature of the fetch function\n    // so we'll return a promise that resolves to a response\n\n    const {\n      method,\n      keepalive,\n      headers,\n      body,\n      redirect,\n      integrity,\n      signal,\n      credentials,\n      mode,\n      referrer,\n      referrerPolicy,\n      window,\n      //  dispatcher, duplex\n    } = options;\n    const id = crypto.randomUUID();\n    const abortController = new AbortController();\n\n    signal?.addEventListener(\"abort\", () => {\n      abortController.abort();\n    });\n\n    agent.addEventListener(\n      \"message\",\n      (event) => {\n        let data: OutgoingMessage;\n        try {\n          data = JSON.parse(event.data) as OutgoingMessage;\n        } catch (error) {\n          // silently ignore invalid messages for now\n          // TODO: log errors with log levels\n          return;\n        }\n        if (data.type === \"cf_agent_use_chat_response\") {\n          if (data.id === id) {\n            controller.enqueue(new TextEncoder().encode(data.body));\n            if (data.done) {\n              controller.close();\n              abortController.abort();\n            }\n          }\n        }\n      },\n      { signal: abortController.signal }\n    );\n\n    let controller: ReadableStreamDefaultController;\n\n    const stream = new ReadableStream({\n      start(c) {\n        controller = c;\n      },\n    });\n\n    agent.send(\n      JSON.stringify({\n        type: \"cf_agent_use_chat_request\",\n        id,\n        url: request.toString(),\n        init: {\n          method,\n          keepalive,\n          headers,\n          body,\n          redirect,\n          integrity,\n          credentials,\n          mode,\n          referrer,\n          referrerPolicy,\n          window,\n          // dispatcher,\n          // duplex\n        },\n      })\n    );\n\n    return new Response(stream);\n  }\n  const useChatHelpers = useChat({\n    initialMessages,\n    sendExtraMessageFields: true,\n    fetch: aiFetch,\n    ...rest,\n  });\n\n  useEffect(() => {\n    function onClearHistory(event: MessageEvent) {\n      if (typeof event.data !== \"string\") {\n        return;\n      }\n      let data: OutgoingMessage;\n      try {\n        data = JSON.parse(event.data) as OutgoingMessage;\n      } catch (error) {\n        // silently ignore invalid messages for now\n        // TODO: log errors with log levels\n        return;\n      }\n      if (data.type === \"cf_agent_chat_clear\") {\n        useChatHelpers.setMessages([]);\n      }\n    }\n\n    function onMessages(event: MessageEvent) {\n      if (typeof event.data !== \"string\") {\n        return;\n      }\n      let data: OutgoingMessage;\n      try {\n        data = JSON.parse(event.data) as OutgoingMessage;\n      } catch (error) {\n        // silently ignore invalid messages for now\n        // TODO: log errors with log levels\n        return;\n      }\n      if (data.type === \"cf_agent_chat_messages\") {\n        useChatHelpers.setMessages(data.messages);\n      }\n    }\n\n    agent.addEventListener(\"message\", onClearHistory);\n    agent.addEventListener(\"message\", onMessages);\n\n    return () => {\n      agent.removeEventListener(\"message\", onClearHistory);\n      agent.removeEventListener(\"message\", onMessages);\n    };\n  }, [\n    agent.addEventListener,\n    agent.removeEventListener,\n    useChatHelpers.setMessages,\n  ]);\n\n  return {\n    ...useChatHelpers,\n    /**\n     * Set the chat messages and synchronize with the Agent\n     * @param messages New messages to set\n     */\n    setMessages: (messages: Message[]) => {\n      useChatHelpers.setMessages(messages);\n      agent.send(\n        JSON.stringify({\n          type: \"cf_agent_chat_messages\",\n          messages,\n        })\n      );\n    },\n    /**\n     * Clear chat history on both client and Agent\n     */\n    clearHistory: () => {\n      useChatHelpers.setMessages([]);\n      agent.send(\n        JSON.stringify({\n          type: \"cf_agent_chat_clear\",\n        })\n      );\n    },\n  };\n}\n"],"mappings":"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","names":["options"]}

package/dist/{chunk-X6BBKLSC.js → chunk-XG52S6YY.js}

@@ -13,7 +13,7 @@ import {
 } from "partyserver";
 import { parseCronExpression } from "cron-schedule";
 import { nanoid } from "nanoid";
-import { WorkflowEntrypoint as CFWorkflowEntrypoint } from "cloudflare:workers";
+import { AsyncLocalStorage } from "node:async_hooks";
 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);
 }
@@ -29,8 +29,6 @@ function unstable_callable(metadata = {}) {
     return target;
   };
 }
-var WorkflowEntrypoint = class extends CFWorkflowEntrypoint {
-};
 function getNextCronTime(cron) {
   const interval = parseCronExpression(cron);
   return interval.getNextDate();
@@ -38,6 +36,7 @@ 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 Agent = class extends Server {
   constructor(ctx, env) {
@@ -74,71 +73,81 @@ var Agent = class extends Server {
     });
     const _onMessage = this.onMessage.bind(this);
     this.onMessage = async (connection, message) => {
-      if (typeof message !== "string") {
-        return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onMessage(connection, message));
-      }
-      let parsed;
-      try {
-        parsed = JSON.parse(message);
-      } catch (e) {
-        return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onMessage(connection, message));
-      }
-      if (isStateUpdateMessage(parsed)) {
-        __privateMethod(this, _Agent_instances, setStateInternal_fn).call(this, parsed.state, connection);
-        return;
-      }
-      if (isRPCRequest(parsed)) {
-        try {
-          const { id, method, args } = parsed;
-          const methodFn = this[method];
-          if (typeof methodFn !== "function") {
-            throw new Error(`Method ${method} does not exist`);
+      return unstable_context.run(
+        { agent: this, connection, request: void 0 },
+        async () => {
+          if (typeof message !== "string") {
+            return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onMessage(connection, message));
+          }
+          let parsed;
+          try {
+            parsed = JSON.parse(message);
+          } catch (e) {
+            return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onMessage(connection, message));
           }
-          if (!__privateMethod(this, _Agent_instances, isCallable_fn).call(this, method)) {
-            throw new Error(`Method ${method} is not callable`);
+          if (isStateUpdateMessage(parsed)) {
+            __privateMethod(this, _Agent_instances, setStateInternal_fn).call(this, parsed.state, connection);
+            return;
           }
-          const metadata = callableMetadata.get(methodFn);
-          if (metadata?.streaming) {
-            const stream = new StreamingResponse(connection, id);
-            await methodFn.apply(this, [stream, ...args]);
+          if (isRPCRequest(parsed)) {
+            try {
+              const { id, method, args } = parsed;
+              const methodFn = this[method];
+              if (typeof methodFn !== "function") {
+                throw new Error(`Method ${method} does not exist`);
+              }
+              if (!__privateMethod(this, _Agent_instances, isCallable_fn).call(this, method)) {
+                throw new Error(`Method ${method} is not callable`);
+              }
+              const metadata = callableMetadata.get(methodFn);
+              if (metadata?.streaming) {
+                const stream = new StreamingResponse(connection, id);
+                await methodFn.apply(this, [stream, ...args]);
+                return;
+              }
+              const result = await methodFn.apply(this, args);
+              const response = {
+                type: "rpc",
+                id,
+                success: true,
+                result,
+                done: true
+              };
+              connection.send(JSON.stringify(response));
+            } catch (e) {
+              const response = {
+                type: "rpc",
+                id: parsed.id,
+                success: false,
+                error: e instanceof Error ? e.message : "Unknown error occurred"
+              };
+              connection.send(JSON.stringify(response));
+              console.error("RPC error:", e);
+            }
             return;
           }
-          const result = await methodFn.apply(this, args);
-          const response = {
-            type: "rpc",
-            id,
-            success: true,
-            result,
-            done: true
-          };
-          connection.send(JSON.stringify(response));
-        } catch (e) {
-          const response = {
-            type: "rpc",
-            id: parsed.id,
-            success: false,
-            error: e instanceof Error ? e.message : "Unknown error occurred"
-          };
-          connection.send(JSON.stringify(response));
-          console.error("RPC error:", e);
+          return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onMessage(connection, message));
         }
-        return;
-      }
-      return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onMessage(connection, message));
+      );
     };
     const _onConnect = this.onConnect.bind(this);
     this.onConnect = (connection, ctx2) => {
-      setTimeout(() => {
-        if (this.state) {
-          connection.send(
-            JSON.stringify({
-              type: "cf_agent_state",
-              state: this.state
-            })
-          );
+      return unstable_context.run(
+        { agent: this, connection, request: ctx2.request },
+        async () => {
+          setTimeout(() => {
+            if (this.state) {
+              connection.send(
+                JSON.stringify({
+                  type: "cf_agent_state",
+                  state: this.state
+                })
+              );
+            }
+            return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onConnect(connection, ctx2));
+          }, 20);
         }
-        return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => _onConnect(connection, ctx2));
-      }, 20);
+      );
     };
   }
   /**
@@ -205,7 +214,12 @@ var Agent = class extends Server {
    * @param email Email message to process
    */
   onEmail(email) {
-    throw new Error("Not implemented");
+    return unstable_context.run(
+      { agent: this, connection: void 0, request: void 0 },
+      async () => {
+        console.error("onEmail not implemented");
+      }
+    );
   }
   onError(connectionOrError, error) {
     let theError;
@@ -334,10 +348,6 @@ var Agent = class extends Server {
       query += " AND id = ?";
       params.push(criteria.id);
     }
-    if (criteria.description) {
-      query += " AND description = ?";
-      params.push(criteria.description);
-    }
     if (criteria.type) {
       query += " AND type = ?";
       params.push(criteria.type);
@@ -382,11 +392,16 @@ var Agent = class extends Server {
         console.error(`callback ${row.callback} not found`);
         continue;
       }
-      try {
-        await callback.bind(this)(JSON.parse(row.payload), row);
-      } catch (e) {
-        console.error(`error executing callback "${row.callback}"`, e);
-      }
+      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);
@@ -430,7 +445,15 @@ setStateInternal_fn = function(state, source = "server") {
     }),
     source !== "server" ? [source.id] : []
   );
-  return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => this.onStateUpdate(state, source));
+  return __privateMethod(this, _Agent_instances, tryCatch_fn).call(this, () => {
+    const { connection, request } = unstable_context.getStore() || {};
+    return unstable_context.run(
+      { agent: this, connection, request },
+      async () => {
+        return this.onStateUpdate(state, source);
+      }
+    );
+  });
 };
 tryCatch_fn = async function(fn) {
   try {
@@ -558,11 +581,11 @@ _closed = new WeakMap();
 
 export {
   unstable_callable,
-  WorkflowEntrypoint,
+  unstable_context,
   Agent,
   routeAgentRequest,
   routeAgentEmail,
   getAgentByName,
   StreamingResponse
 };
-//# sourceMappingURL=chunk-X6BBKLSC.js.map
+//# sourceMappingURL=chunk-XG52S6YY.js.map