agents 0.0.0-74a8c74 → 0.0.0-75614c2

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

@@ -1,8 +1,15 @@
-import { Agent, AgentContext } from "./index.js";
 import { Message, StreamTextOnFinishCallback, ToolSet } from "ai";
+import { Agent, AgentContext } from "./index.js";
 import { Connection, WSMessage } from "partyserver";
-import "node:async_hooks";
-import "cloudflare:workers";
+import "@modelcontextprotocol/sdk/client/index.js";
+import "@modelcontextprotocol/sdk/types.js";
+import "./mcp/client.js";
+import "zod";
+import "@modelcontextprotocol/sdk/client/sse.js";
+import "@modelcontextprotocol/sdk/shared/protocol.js";
+import "./mcp/do-oauth-client-provider.js";
+import "@modelcontextprotocol/sdk/client/auth.js";
+import "@modelcontextprotocol/sdk/shared/auth.js";
 
 /**
  * Extension of Agent with built-in chat capabilities
@@ -12,25 +19,63 @@ declare class AIChatAgent<Env = unknown, State = unknown> extends Agent<
   Env,
   State
 > {
-  #private;
+  /**
+   * Map of message `id`s to `AbortController`s
+   * useful to propagate request cancellation signals for any external calls made by the agent
+   */
+  private _chatMessageAbortControllers;
   /** Array of chat messages for the current conversation */
   messages: Message[];
   constructor(ctx: AgentContext, env: Env);
+  private _broadcastChatMessage;
   onMessage(connection: Connection, message: WSMessage): Promise<void>;
   onRequest(request: Request): Promise<Response>;
+  private _tryCatchChat;
   /**
    * Handle incoming chat messages and generate a response
    * @param onFinish Callback to be called when the response is finished
+   * @param options.signal A signal to pass to any child requests which can be used to cancel them
    * @returns Response to send to the client or undefined
    */
   onChatMessage(
-    onFinish: StreamTextOnFinishCallback<ToolSet>
+    onFinish: StreamTextOnFinishCallback<ToolSet>,
+    options?: {
+      abortSignal: AbortSignal | undefined;
+    }
   ): Promise<Response | undefined>;
   /**
    * Save messages on the server side and trigger AI response
    * @param messages Chat messages to save
    */
   saveMessages(messages: Message[]): Promise<void>;
+  persistMessages(
+    messages: Message[],
+    excludeBroadcastIds?: string[]
+  ): Promise<void>;
+  private _reply;
+  /**
+   * For the given message id, look up its associated AbortController
+   * If the AbortController does not exist, create and store one in memory
+   *
+   * returns the AbortSignal associated with the AbortController
+   */
+  private _getAbortSignal;
+  /**
+   * Remove an abort controller from the cache of pending message responses
+   */
+  private _removeAbortController;
+  /**
+   * Propagate an abort signal for any requests associated with the given message id
+   */
+  private _cancelChatRequest;
+  /**
+   * Abort all pending requests and clear the cache of AbortControllers
+   */
+  private _destroyAbortControllers;
+  /**
+   * When the DO is destroyed, cancel all pending requests
+   */
+  destroy(): Promise<void>;
 }
 
 export { AIChatAgent };

package/dist/ai-chat-agent.js

@@ -1,13 +1,14 @@
 import {
   Agent
-} from "./chunk-SZEXGW6W.js";
+} from "./chunk-CGWTDCBQ.js";
+import "./chunk-E3LCYPCB.js";
+import "./chunk-767EASBA.js";
+import "./chunk-NKZZ66QY.js";
 
 // src/ai-chat-agent.ts
 import { appendResponseMessages } from "ai";
 var decoder = new TextDecoder();
 var AIChatAgent = class extends Agent {
-  /** Array of chat messages for the current conversation */
-  messages;
   constructor(ctx, env) {
     super(ctx, env);
     this.sql`create table if not exists cf_ai_chat_agent_messages (
@@ -18,8 +19,9 @@ var AIChatAgent = class extends Agent {
     this.messages = (this.sql`select * from cf_ai_chat_agent_messages` || []).map((row) => {
       return JSON.parse(row.message);
     });
+    this._chatMessageAbortControllers = /* @__PURE__ */ new Map();
   }
-  #broadcastChatMessage(message, exclude) {
+  _broadcastChatMessage(message, exclude) {
     this.broadcast(JSON.stringify(message), exclude);
   }
   async onMessage(connection, message) {
@@ -27,65 +29,83 @@ var AIChatAgent = class extends Agent {
       let data;
       try {
         data = JSON.parse(message);
-      } catch (error) {
+      } catch (_error) {
         return;
       }
       if (data.type === "cf_agent_use_chat_request" && data.init.method === "POST") {
         const {
-          method,
-          keepalive,
-          headers,
-          body,
+          // method,
+          // keepalive,
+          // headers,
+          body
           // we're reading this
-          redirect,
-          integrity,
-          credentials,
-          mode,
-          referrer,
-          referrerPolicy,
-          window
+          //
+          // // these might not exist?
           // dispatcher,
           // duplex
         } = data.init;
         const { messages } = JSON.parse(body);
-        this.#broadcastChatMessage(
+        this._broadcastChatMessage(
           {
-            type: "cf_agent_chat_messages",
-            messages
+            messages,
+            type: "cf_agent_chat_messages"
           },
           [connection.id]
         );
-        await this.#persistMessages(messages, [connection.id]);
-        return this.#tryCatch(async () => {
-          const response = await this.onChatMessage(async ({ response: response2 }) => {
-            const finalMessages = appendResponseMessages({
-              messages,
-              responseMessages: response2.messages
-            });
-            await this.#persistMessages(finalMessages, [connection.id]);
-          });
+        await this.persistMessages(messages, [connection.id]);
+        const chatMessageId = data.id;
+        const abortSignal = this._getAbortSignal(chatMessageId);
+        return this._tryCatchChat(async () => {
+          const response = await this.onChatMessage(
+            async ({ response: response2 }) => {
+              const finalMessages = appendResponseMessages({
+                messages,
+                responseMessages: response2.messages
+              });
+              await this.persistMessages(finalMessages, [connection.id]);
+              this._removeAbortController(chatMessageId);
+            },
+            abortSignal ? { abortSignal } : void 0
+          );
           if (response) {
-            await this.#reply(data.id, response);
+            await this._reply(data.id, response);
+          } else {
+            console.warn(
+              `[AIChatAgent] onChatMessage returned no response for chatMessageId: ${chatMessageId}`
+            );
+            this._broadcastChatMessage(
+              {
+                body: "No response was generated by the agent.",
+                done: true,
+                id: data.id,
+                type: "cf_agent_use_chat_response"
+              },
+              [connection.id]
+            );
           }
         });
       }
       if (data.type === "cf_agent_chat_clear") {
+        this._destroyAbortControllers();
         this.sql`delete from cf_ai_chat_agent_messages`;
         this.messages = [];
-        this.#broadcastChatMessage(
+        this._broadcastChatMessage(
           {
             type: "cf_agent_chat_clear"
           },
           [connection.id]
         );
       } else if (data.type === "cf_agent_chat_messages") {
-        await this.#persistMessages(data.messages, [connection.id]);
+        await this.persistMessages(data.messages, [connection.id]);
+      } else if (data.type === "cf_agent_chat_request_cancel") {
+        this._cancelChatRequest(data.id);
       }
     }
   }
   async onRequest(request) {
-    return this.#tryCatch(() => {
-      if (request.url.endsWith("/get-messages")) {
+    return this._tryCatchChat(() => {
+      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);
         });
@@ -94,7 +114,7 @@ var AIChatAgent = class extends Agent {
       return super.onRequest(request);
     });
   }
-  async #tryCatch(fn) {
+  async _tryCatchChat(fn) {
     try {
       return await fn();
     } catch (e) {
@@ -104,9 +124,10 @@ var AIChatAgent = class extends Agent {
   /**
    * Handle incoming chat messages and generate a response
    * @param onFinish Callback to be called when the response is finished
+   * @param options.signal A signal to pass to any child requests which can be used to cancel them
    * @returns Response to send to the client or undefined
    */
-  async onChatMessage(onFinish) {
+  async onChatMessage(onFinish, options) {
     throw new Error(
       "recieved a chat message, override onChatMessage and return a Response to send to the client"
     );
@@ -116,13 +137,13 @@ var AIChatAgent = class extends Agent {
    * @param messages Chat messages to save
    */
   async saveMessages(messages) {
-    await this.#persistMessages(messages);
+    await this.persistMessages(messages);
     const response = await this.onChatMessage(async ({ response: response2 }) => {
       const finalMessages = appendResponseMessages({
         messages,
         responseMessages: response2.messages
       });
-      await this.#persistMessages(finalMessages, []);
+      await this.persistMessages(finalMessages, []);
     });
     if (response) {
       for await (const chunk of response.body) {
@@ -131,39 +152,85 @@ var AIChatAgent = class extends Agent {
       response.body?.cancel();
     }
   }
-  async #persistMessages(messages, excludeBroadcastIds = []) {
+  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;
-    this.#broadcastChatMessage(
+    this._broadcastChatMessage(
       {
-        type: "cf_agent_chat_messages",
-        messages
+        messages,
+        type: "cf_agent_chat_messages"
       },
       excludeBroadcastIds
     );
   }
-  async #reply(id, response) {
-    return this.#tryCatch(async () => {
+  async _reply(id, response) {
+    return this._tryCatchChat(async () => {
       for await (const chunk of response.body) {
         const body = decoder.decode(chunk);
-        this.#broadcastChatMessage({
-          id,
-          type: "cf_agent_use_chat_response",
+        this._broadcastChatMessage({
           body,
-          done: false
+          done: false,
+          id,
+          type: "cf_agent_use_chat_response"
         });
       }
-      this.#broadcastChatMessage({
-        id,
-        type: "cf_agent_use_chat_response",
+      this._broadcastChatMessage({
         body: "",
-        done: true
+        done: true,
+        id,
+        type: "cf_agent_use_chat_response"
       });
     });
   }
+  /**
+   * For the given message id, look up its associated AbortController
+   * If the AbortController does not exist, create and store one in memory
+   *
+   * returns the AbortSignal associated with the AbortController
+   */
+  _getAbortSignal(id) {
+    if (typeof id !== "string") {
+      return void 0;
+    }
+    if (!this._chatMessageAbortControllers.has(id)) {
+      this._chatMessageAbortControllers.set(id, new AbortController());
+    }
+    return this._chatMessageAbortControllers.get(id)?.signal;
+  }
+  /**
+   * Remove an abort controller from the cache of pending message responses
+   */
+  _removeAbortController(id) {
+    this._chatMessageAbortControllers.delete(id);
+  }
+  /**
+   * Propagate an abort signal for any requests associated with the given message id
+   */
+  _cancelChatRequest(id) {
+    if (this._chatMessageAbortControllers.has(id)) {
+      const abortController = this._chatMessageAbortControllers.get(id);
+      abortController?.abort();
+    }
+  }
+  /**
+   * Abort all pending requests and clear the cache of AbortControllers
+   */
+  _destroyAbortControllers() {
+    for (const controller of this._chatMessageAbortControllers.values()) {
+      controller?.abort();
+    }
+    this._chatMessageAbortControllers.clear();
+  }
+  /**
+   * When the DO is destroyed, cancel all pending requests
+   */
+  async destroy() {
+    this._destroyAbortControllers();
+    await super.destroy();
+  }
 };
 export {
   AIChatAgent

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  #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":"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","names":["response"]}
+{"version":3,"sources":["../src/ai-chat-agent.ts"],"sourcesContent":["import type {\n  Message as ChatMessage,\n  StreamTextOnFinishCallback,\n  ToolSet,\n} from \"ai\";\nimport { appendResponseMessages } from \"ai\";\nimport { Agent, type AgentContext, type Connection, type WSMessage } from \"./\";\nimport type { IncomingMessage, OutgoingMessage } from \"./ai-types\";\n\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  /**\n   * Map of message `id`s to `AbortController`s\n   * useful to propagate request cancellation signals for any external calls made by the agent\n   */\n  private _chatMessageAbortControllers: Map<string, AbortController>;\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    this._chatMessageAbortControllers = new Map();\n  }\n\n  private _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          //\n          // // these might not exist?\n          // dispatcher,\n          // duplex\n        } = data.init;\n        const { messages } = JSON.parse(body as string);\n        this._broadcastChatMessage(\n          {\n            messages,\n            type: \"cf_agent_chat_messages\",\n          },\n          [connection.id]\n        );\n        await this.persistMessages(messages, [connection.id]);\n\n        const chatMessageId = data.id;\n        const abortSignal = this._getAbortSignal(chatMessageId);\n\n        return this._tryCatchChat(async () => {\n          const response = await this.onChatMessage(\n            async ({ response }) => {\n              const finalMessages = appendResponseMessages({\n                messages,\n                responseMessages: response.messages,\n              });\n\n              await this.persistMessages(finalMessages, [connection.id]);\n              this._removeAbortController(chatMessageId);\n            },\n            abortSignal ? { abortSignal } : undefined\n          );\n\n          if (response) {\n            await this._reply(data.id, response);\n          } else {\n            // Log a warning for observability\n            console.warn(\n              `[AIChatAgent] onChatMessage returned no response for chatMessageId: ${chatMessageId}`\n            );\n            // Send a fallback message to the client\n            this._broadcastChatMessage(\n              {\n                body: \"No response was generated by the agent.\",\n                done: true,\n                id: data.id,\n                type: \"cf_agent_use_chat_response\",\n              },\n              [connection.id]\n            );\n          }\n        });\n      }\n      if (data.type === \"cf_agent_chat_clear\") {\n        this._destroyAbortControllers();\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      } else if (data.type === \"cf_agent_chat_request_cancel\") {\n        // propagate an abort signal for the associated request\n        this._cancelChatRequest(data.id);\n      }\n    }\n  }\n\n  override async onRequest(request: Request): Promise<Response> {\n    return this._tryCatchChat(() => {\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  private async _tryCatchChat<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   * @param options.signal A signal to pass to any child requests which can be used to cancel them\n   * @returns Response to send to the client or undefined\n   */\n  async onChatMessage(\n    // biome-ignore lint/correctness/noUnusedFunctionParameters: overridden later\n    onFinish: StreamTextOnFinishCallback<ToolSet>,\n    // biome-ignore lint/correctness/noUnusedFunctionParameters: overridden later\n    options?: { abortSignal: AbortSignal | undefined }\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        messages: messages,\n        type: \"cf_agent_chat_messages\",\n      },\n      excludeBroadcastIds\n    );\n  }\n\n  private async _reply(id: string, response: Response) {\n    // now take chunks out from dataStreamResponse and send them to the client\n    return this._tryCatchChat(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          body,\n          done: false,\n          id,\n          type: \"cf_agent_use_chat_response\",\n        });\n      }\n\n      this._broadcastChatMessage({\n        body: \"\",\n        done: true,\n        id,\n        type: \"cf_agent_use_chat_response\",\n      });\n    });\n  }\n\n  /**\n   * For the given message id, look up its associated AbortController\n   * If the AbortController does not exist, create and store one in memory\n   *\n   * returns the AbortSignal associated with the AbortController\n   */\n  private _getAbortSignal(id: string): AbortSignal | undefined {\n    // Defensive check, since we're coercing message types at the moment\n    if (typeof id !== \"string\") {\n      return undefined;\n    }\n\n    if (!this._chatMessageAbortControllers.has(id)) {\n      this._chatMessageAbortControllers.set(id, new AbortController());\n    }\n\n    return this._chatMessageAbortControllers.get(id)?.signal;\n  }\n\n  /**\n   * Remove an abort controller from the cache of pending message responses\n   */\n  private _removeAbortController(id: string) {\n    this._chatMessageAbortControllers.delete(id);\n  }\n\n  /**\n   * Propagate an abort signal for any requests associated with the given message id\n   */\n  private _cancelChatRequest(id: string) {\n    if (this._chatMessageAbortControllers.has(id)) {\n      const abortController = this._chatMessageAbortControllers.get(id);\n      abortController?.abort();\n    }\n  }\n\n  /**\n   * Abort all pending requests and clear the cache of AbortControllers\n   */\n  private _destroyAbortControllers() {\n    for (const controller of this._chatMessageAbortControllers.values()) {\n      controller?.abort();\n    }\n    this._chatMessageAbortControllers.clear();\n  }\n\n  /**\n   * When the DO is destroyed, cancel all pending requests\n   */\n  async destroy() {\n    this._destroyAbortControllers();\n    await super.destroy();\n  }\n}\n"],"mappings":"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","names":["response"]}

package/dist/ai-react.d.ts

@@ -4,7 +4,19 @@ import { useChat } from "@ai-sdk/react";
 import { useAgent } from "./react.js";
 import "partysocket";
 import "partysocket/react";
+import "./index.js";
+import "@modelcontextprotocol/sdk/client/index.js";
+import "@modelcontextprotocol/sdk/types.js";
+import "partyserver";
+import "./mcp/client.js";
+import "zod";
+import "@modelcontextprotocol/sdk/client/sse.js";
+import "@modelcontextprotocol/sdk/shared/protocol.js";
+import "./mcp/do-oauth-client-provider.js";
+import "@modelcontextprotocol/sdk/client/auth.js";
+import "@modelcontextprotocol/sdk/shared/auth.js";
 import "./client.js";
+import "./serializable.js";
 
 type GetInitialMessagesOptions = {
   agent: string;
@@ -33,15 +45,15 @@ type UseAgentChatOptions<State> = Omit<
 declare function useAgentChat<State = unknown>(
   options: UseAgentChatOptions<State>
 ): {
+  /**
+   * Clear chat history on both client and Agent
+   */
+  clearHistory: () => void;
   /**
    * Set the chat messages and synchronize with the Agent
    * @param messages New messages to set
    */
   setMessages: (messages: Message[]) => void;
-  /**
-   * Clear chat history on both client and Agent
-   */
-  clearHistory: () => void;
   messages: ai.UIMessage[];
   error: undefined | Error;
   append: (
@@ -52,6 +64,7 @@ declare function useAgentChat<State = unknown>(
     chatRequestOptions?: ai.ChatRequestOptions
   ) => Promise<string | null | undefined>;
   stop: () => void;
+  experimental_resume: () => void;
   input: string;
   setInput: React.Dispatch<React.SetStateAction<string>>;
   handleInputChange: (

package/dist/ai-react.js

@@ -1,40 +1,53 @@
 // src/ai-react.tsx
 import { useChat } from "@ai-sdk/react";
-import { useEffect, use } from "react";
+import { nanoid } from "nanoid";
+import { use, useEffect } 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`), {
-      headers: options.headers,
-      credentials: options.credentials
+    const getMessagesUrl = new URL(url);
+    getMessagesUrl.pathname += "/get-messages";
+    const response = await fetch(getMessagesUrl.toString(), {
+      credentials: options.credentials,
+      headers: options.headers
     });
     return response.json();
   }
   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
-    })
-  ) : rest.initialMessages;
+  const initialMessagesPromise = getInitialMessages === null ? null : doGetInitialMessages({
+    agent: agent.agent,
+    name: agent.name,
+    url: agentUrlString
+  });
+  const initialMessages = initialMessagesPromise ? use(initialMessagesPromise) : rest.initialMessages ?? [];
   useEffect(() => {
+    if (!initialMessagesPromise) {
+      return;
+    }
+    requestCache.set(agentUrlString, initialMessagesPromise);
     return () => {
-      requestCache.delete(url);
+      if (requestCache.get(agentUrlString) === initialMessagesPromise) {
+        requestCache.delete(agentUrlString);
+      }
     };
-  }, [url]);
+  }, [agentUrlString, initialMessagesPromise]);
   async function aiFetch(request, options2 = {}) {
     const {
       method,
@@ -51,10 +64,17 @@ function useAgentChat(options) {
       window
       //  dispatcher, duplex
     } = options2;
-    const id = crypto.randomUUID();
+    const id = nanoid(8);
     const abortController = new AbortController();
     signal?.addEventListener("abort", () => {
+      agent.send(
+        JSON.stringify({
+          id,
+          type: "cf_agent_chat_request_cancel"
+        })
+      );
       abortController.abort();
+      controller.close();
     });
     agent.addEventListener(
       "message",
@@ -62,7 +82,7 @@ function useAgentChat(options) {
         let data;
         try {
           data = JSON.parse(event.data);
-        } catch (error) {
+        } catch (_error) {
           return;
         }
         if (data.type === "cf_agent_use_chat_response") {
@@ -85,32 +105,32 @@ function useAgentChat(options) {
     });
     agent.send(
       JSON.stringify({
-        type: "cf_agent_use_chat_request",
         id,
-        url: request.toString(),
         init: {
-          method,
-          keepalive,
-          headers,
           body,
-          redirect,
-          integrity,
           credentials,
+          headers,
+          integrity,
+          keepalive,
+          method,
           mode,
+          redirect,
           referrer,
           referrerPolicy,
           window
           // dispatcher,
           // duplex
-        }
+        },
+        type: "cf_agent_use_chat_request",
+        url: request.toString()
       })
     );
     return new Response(stream);
   }
   const useChatHelpers = useChat({
+    fetch: aiFetch,
     initialMessages,
     sendExtraMessageFields: true,
-    fetch: aiFetch,
     ...rest
   });
   useEffect(() => {
@@ -121,7 +141,7 @@ function useAgentChat(options) {
       let data;
       try {
         data = JSON.parse(event.data);
-      } catch (error) {
+      } catch (_error) {
         return;
       }
       if (data.type === "cf_agent_chat_clear") {
@@ -135,7 +155,7 @@ function useAgentChat(options) {
       let data;
       try {
         data = JSON.parse(event.data);
-      } catch (error) {
+      } catch (_error) {
         return;
       }
       if (data.type === "cf_agent_chat_messages") {
@@ -148,34 +168,30 @@ function useAgentChat(options) {
       agent.removeEventListener("message", onClearHistory);
       agent.removeEventListener("message", onMessages);
     };
-  }, [
-    agent.addEventListener,
-    agent.removeEventListener,
-    useChatHelpers.setMessages
-  ]);
+  }, [agent, useChatHelpers.setMessages]);
   return {
     ...useChatHelpers,
     /**
-     * Set the chat messages and synchronize with the Agent
-     * @param messages New messages to set
+     * Clear chat history on both client and Agent
      */
-    setMessages: (messages) => {
-      useChatHelpers.setMessages(messages);
+    clearHistory: () => {
+      useChatHelpers.setMessages([]);
       agent.send(
         JSON.stringify({
-          type: "cf_agent_chat_messages",
-          messages
+          type: "cf_agent_chat_clear"
         })
       );
     },
     /**
-     * Clear chat history on both client and Agent
+     * Set the chat messages and synchronize with the Agent
+     * @param messages New messages to set
      */
-    clearHistory: () => {
-      useChatHelpers.setMessages([]);
+    setMessages: (messages) => {
+      useChatHelpers.setMessages(messages);
       agent.send(
         JSON.stringify({
-          type: "cf_agent_chat_clear"
+          messages,
+          type: "cf_agent_chat_messages"
         })
       );
     }