agents 0.0.0-33ff003 → 0.0.0-352d62c

package/dist/ai-react.js

@@ -1,9 +1,9 @@
-import "./chunk-NOUFNU2O.js";
+import "./chunk-EEKLJYON.js";
 
 // src/ai-react.tsx
 import { useChat } from "@ai-sdk/react";
-import { use, useEffect } from "react";
 import { nanoid } from "nanoid";
+import { use, useEffect } from "react";
 var requestCache = /* @__PURE__ */ new Map();
 function useAgentChat(options) {
   const { agent, getInitialMessages, ...rest } = options;
@@ -19,8 +19,8 @@ function useAgentChat(options) {
     const getMessagesUrl = new URL(url);
     getMessagesUrl.pathname += "/get-messages";
     const response = await fetch(getMessagesUrl.toString(), {
-      headers: options.headers,
-      credentials: options.credentials
+      credentials: options.credentials,
+      headers: options.headers
     });
     return response.json();
   }
@@ -71,8 +71,8 @@ function useAgentChat(options) {
     signal?.addEventListener("abort", () => {
       agent.send(
         JSON.stringify({
-          type: "cf_agent_chat_request_cancel",
-          id
+          id,
+          type: "cf_agent_chat_request_cancel" /* CF_AGENT_CHAT_REQUEST_CANCEL */
         })
       );
       abortController.abort();
@@ -84,10 +84,10 @@ function useAgentChat(options) {
         let data;
         try {
           data = JSON.parse(event.data);
-        } catch (error) {
+        } catch (_error) {
           return;
         }
-        if (data.type === "cf_agent_use_chat_response") {
+        if (data.type === "cf_agent_use_chat_response" /* CF_AGENT_USE_CHAT_RESPONSE */) {
           if (data.id === id) {
             controller.enqueue(new TextEncoder().encode(data.body));
             if (data.done) {
@@ -107,32 +107,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" /* CF_AGENT_USE_CHAT_REQUEST */,
+        url: request.toString()
       })
     );
     return new Response(stream);
   }
   const useChatHelpers = useChat({
+    fetch: aiFetch,
     initialMessages,
     sendExtraMessageFields: true,
-    fetch: aiFetch,
     ...rest
   });
   useEffect(() => {
@@ -143,10 +143,10 @@ function useAgentChat(options) {
       let data;
       try {
         data = JSON.parse(event.data);
-      } catch (error) {
+      } catch (_error) {
         return;
       }
-      if (data.type === "cf_agent_chat_clear") {
+      if (data.type === "cf_agent_chat_clear" /* CF_AGENT_CHAT_CLEAR */) {
         useChatHelpers.setMessages([]);
       }
     }
@@ -157,10 +157,10 @@ function useAgentChat(options) {
       let data;
       try {
         data = JSON.parse(event.data);
-      } catch (error) {
+      } catch (_error) {
         return;
       }
-      if (data.type === "cf_agent_chat_messages") {
+      if (data.type === "cf_agent_chat_messages" /* CF_AGENT_CHAT_MESSAGES */) {
         useChatHelpers.setMessages(data.messages);
       }
     }
@@ -174,26 +174,26 @@ function useAgentChat(options) {
   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" /* 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" /* CF_AGENT_CHAT_MESSAGES */
         })
       );
     }

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 { use, useEffect } from \"react\";\nimport type { OutgoingMessage } from \"./ai-types\";\nimport type { useAgent } from \"./react\";\nimport { nanoid } from \"nanoid\";\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\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    // immediately cache the promise so that we don't\n    // create multiple requests for the same agent during multiple\n    // concurrent renders\n    requestCache.set(agentUrlString, promise);\n    return promise;\n  }\n\n  const initialMessagesPromise =\n    getInitialMessages === null\n      ? null\n      : doGetInitialMessages({\n          agent: agent.agent,\n          name: agent.name,\n          url: agentUrlString,\n        });\n  const initialMessages = initialMessagesPromise\n    ? use(initialMessagesPromise)\n    : (rest.initialMessages ?? []);\n\n  // manages adding and removing the promise from the cache\n  useEffect(() => {\n    if (!initialMessagesPromise) {\n      return;\n    }\n    // this effect is responsible for removing the promise from the cache\n    // when the component unmounts or the promise changes,\n    // but that means it also must add the promise to the cache\n    // so that multiple arbitrary effect runs produce the expected state\n    // when resolved.\n    requestCache.set(agentUrlString, initialMessagesPromise!);\n    return () => {\n      if (requestCache.get(agentUrlString) === initialMessagesPromise) {\n        requestCache.delete(agentUrlString);\n      }\n    };\n  }, [agentUrlString, initialMessagesPromise]);\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 = nanoid(8);\n    const abortController = new AbortController();\n\n    signal?.addEventListener(\"abort\", () => {\n      // Propagate request cancellation to the Agent\n      // We need to communciate cancellation as a websocket message, instead of a request signal\n      agent.send(\n        JSON.stringify({\n          type: \"cf_agent_chat_request_cancel\",\n          id,\n        })\n      );\n\n      // NOTE - If we wanted to, we could preserve the \"interrupted\" message here, with the code below\n      //        However, I think it might be the responsibility of the library user to implement that behavior manually?\n      //        Reasoning: This code could be subject to collisions, as it \"force saves\" the messages we have locally\n      //\n      // agent.send(JSON.stringify({\n      //   type: \"cf_agent_chat_messages\",\n      //   messages: ... /* some way of getting current messages ref? */\n      // }))\n\n      abortController.abort();\n      // Make sure to also close the stream (cf. https://github.com/cloudflare/agents-starter/issues/69)\n      controller.close();\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  }, [agent, useChatHelpers.setMessages]);\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"]}
+{"version":3,"sources":["../src/ai-react.tsx"],"sourcesContent":["import { useChat } from \"@ai-sdk/react\";\nimport type { Message } from \"ai\";\nimport { nanoid } from \"nanoid\";\nimport { use, useEffect } from \"react\";\nimport { MessageType, type OutgoingMessage } from \"./ai-types\";\nimport type { useAgent } from \"./react\";\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\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      credentials: options.credentials,\n      headers: options.headers\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    // immediately cache the promise so that we don't\n    // create multiple requests for the same agent during multiple\n    // concurrent renders\n    requestCache.set(agentUrlString, promise);\n    return promise;\n  }\n\n  const initialMessagesPromise =\n    getInitialMessages === null\n      ? null\n      : doGetInitialMessages({\n          agent: agent.agent,\n          name: agent.name,\n          url: agentUrlString\n        });\n  const initialMessages = initialMessagesPromise\n    ? use(initialMessagesPromise)\n    : (rest.initialMessages ?? []);\n\n  // manages adding and removing the promise from the cache\n  useEffect(() => {\n    if (!initialMessagesPromise) {\n      return;\n    }\n    // this effect is responsible for removing the promise from the cache\n    // when the component unmounts or the promise changes,\n    // but that means it also must add the promise to the cache\n    // so that multiple arbitrary effect runs produce the expected state\n    // when resolved.\n    requestCache.set(agentUrlString, initialMessagesPromise!);\n    return () => {\n      if (requestCache.get(agentUrlString) === initialMessagesPromise) {\n        requestCache.delete(agentUrlString);\n      }\n    };\n  }, [agentUrlString, initialMessagesPromise]);\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 = nanoid(8);\n    const abortController = new AbortController();\n\n    signal?.addEventListener(\"abort\", () => {\n      // Propagate request cancellation to the Agent\n      // We need to communciate cancellation as a websocket message, instead of a request signal\n      agent.send(\n        JSON.stringify({\n          id,\n          type: MessageType.CF_AGENT_CHAT_REQUEST_CANCEL\n        })\n      );\n\n      // NOTE - If we wanted to, we could preserve the \"interrupted\" message here, with the code below\n      //        However, I think it might be the responsibility of the library user to implement that behavior manually?\n      //        Reasoning: This code could be subject to collisions, as it \"force saves\" the messages we have locally\n      //\n      // agent.send(JSON.stringify({\n      //   type: \"cf_agent_chat_messages\",\n      //   messages: ... /* some way of getting current messages ref? */\n      // }))\n\n      abortController.abort();\n      // Make sure to also close the stream (cf. https://github.com/cloudflare/agents-starter/issues/69)\n      controller.close();\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 === MessageType.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        id,\n        init: {\n          body,\n          credentials,\n          headers,\n          integrity,\n          keepalive,\n          method,\n          mode,\n          redirect,\n          referrer,\n          referrerPolicy,\n          window\n          // dispatcher,\n          // duplex\n        },\n        type: MessageType.CF_AGENT_USE_CHAT_REQUEST,\n        url: request.toString()\n      })\n    );\n\n    return new Response(stream);\n  }\n  const useChatHelpers = useChat({\n    fetch: aiFetch,\n    initialMessages,\n    sendExtraMessageFields: true,\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 === MessageType.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 === MessageType.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  }, [agent, useChatHelpers.setMessages]);\n\n  return {\n    ...useChatHelpers,\n    /**\n     * Clear chat history on both client and Agent\n     */\n    clearHistory: () => {\n      useChatHelpers.setMessages([]);\n      agent.send(\n        JSON.stringify({\n          type: MessageType.CF_AGENT_CHAT_CLEAR\n        })\n      );\n    },\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          messages,\n          type: MessageType.CF_AGENT_CHAT_MESSAGES\n        })\n      );\n    }\n  };\n}\n"],"mappings":";;;AAAA,SAAS,eAAe;AAExB,SAAS,cAAc;AACvB,SAAS,KAAK,iBAAiB;AA0B/B,IAAM,eAAe,oBAAI,IAAgC;AAOlD,SAAS,aACd,SACA;AACA,QAAM,EAAE,OAAO,oBAAoB,GAAG,KAAK,IAAI;AAE/C,QAAM,WAAW,IAAI;AAAA,IACnB;AAAA,KACE,MAAM,QAA0B,MAAM,SACpC,QAAQ,SAAS,SAAS,EAC3B,QAAQ,UAAU,UAAU,CAAC;AAAA,EAClC;AAGA,WAAS,aAAa,OAAO,KAAK;AAClC,QAAM,iBAAiB,SAAS,SAAS;AAEzC,iBAAe,+BAA+B;AAAA,IAC5C;AAAA,EACF,GAA8B;AAC5B,UAAM,iBAAiB,IAAI,IAAI,GAAG;AAClC,mBAAe,YAAY;AAC3B,UAAM,WAAW,MAAM,MAAM,eAAe,SAAS,GAAG;AAAA,MACtD,aAAa,QAAQ;AAAA,MACrB,SAAS,QAAQ;AAAA,IACnB,CAAC;AACD,WAAO,SAAS,KAAgB;AAAA,EAClC;AAEA,QAAM,0BACJ,sBAAsB;AAExB,WAAS,qBACP,2BACA;AACA,QAAI,aAAa,IAAI,cAAc,GAAG;AACpC,aAAO,aAAa,IAAI,cAAc;AAAA,IACxC;AACA,UAAM,UAAU,wBAAwB,yBAAyB;AAIjE,iBAAa,IAAI,gBAAgB,OAAO;AACxC,WAAO;AAAA,EACT;AAEA,QAAM,yBACJ,uBAAuB,OACnB,OACA,qBAAqB;AAAA,IACnB,OAAO,MAAM;AAAA,IACb,MAAM,MAAM;AAAA,IACZ,KAAK;AAAA,EACP,CAAC;AACP,QAAM,kBAAkB,yBACpB,IAAI,sBAAsB,IACzB,KAAK,mBAAmB,CAAC;AAG9B,YAAU,MAAM;AACd,QAAI,CAAC,wBAAwB;AAC3B;AAAA,IACF;AAMA,iBAAa,IAAI,gBAAgB,sBAAuB;AACxD,WAAO,MAAM;AACX,UAAI,aAAa,IAAI,cAAc,MAAM,wBAAwB;AAC/D,qBAAa,OAAO,cAAc;AAAA,MACpC;AAAA,IACF;AAAA,EACF,GAAG,CAAC,gBAAgB,sBAAsB,CAAC;AAE3C,iBAAe,QACb,SACAA,WAAuB,CAAC,GACxB;AAKA,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,IAEF,IAAIA;AACJ,UAAM,KAAK,OAAO,CAAC;AACnB,UAAM,kBAAkB,IAAI,gBAAgB;AAE5C,YAAQ,iBAAiB,SAAS,MAAM;AAGtC,YAAM;AAAA,QACJ,KAAK,UAAU;AAAA,UACb;AAAA,UACA;AAAA,QACF,CAAC;AAAA,MACH;AAWA,sBAAgB,MAAM;AAEtB,iBAAW,MAAM;AAAA,IACnB,CAAC;AAED,UAAM;AAAA,MACJ;AAAA,MACA,CAAC,UAAU;AACT,YAAI;AACJ,YAAI;AACF,iBAAO,KAAK,MAAM,MAAM,IAAI;AAAA,QAC9B,SAAS,QAAQ;AAGf;AAAA,QACF;AACA,YAAI,KAAK,wEAAiD;AACxD,cAAI,KAAK,OAAO,IAAI;AAClB,uBAAW,QAAQ,IAAI,YAAY,EAAE,OAAO,KAAK,IAAI,CAAC;AACtD,gBAAI,KAAK,MAAM;AACb,yBAAW,MAAM;AACjB,8BAAgB,MAAM;AAAA,YACxB;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,MACA,EAAE,QAAQ,gBAAgB,OAAO;AAAA,IACnC;AAEA,QAAI;AAEJ,UAAM,SAAS,IAAI,eAAe;AAAA,MAChC,MAAM,GAAG;AACP,qBAAa;AAAA,MACf;AAAA,IACF,CAAC;AAED,UAAM;AAAA,MACJ,KAAK,UAAU;AAAA,QACb;AAAA,QACA,MAAM;AAAA,UACJ;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA;AAAA;AAAA,QAGF;AAAA,QACA;AAAA,QACA,KAAK,QAAQ,SAAS;AAAA,MACxB,CAAC;AAAA,IACH;AAEA,WAAO,IAAI,SAAS,MAAM;AAAA,EAC5B;AACA,QAAM,iBAAiB,QAAQ;AAAA,IAC7B,OAAO;AAAA,IACP;AAAA,IACA,wBAAwB;AAAA,IACxB,GAAG;AAAA,EACL,CAAC;AAED,YAAU,MAAM;AACd,aAAS,eAAe,OAAqB;AAC3C,UAAI,OAAO,MAAM,SAAS,UAAU;AAClC;AAAA,MACF;AACA,UAAI;AACJ,UAAI;AACF,eAAO,KAAK,MAAM,MAAM,IAAI;AAAA,MAC9B,SAAS,QAAQ;AAGf;AAAA,MACF;AACA,UAAI,KAAK,0DAA0C;AACjD,uBAAe,YAAY,CAAC,CAAC;AAAA,MAC/B;AAAA,IACF;AAEA,aAAS,WAAW,OAAqB;AACvC,UAAI,OAAO,MAAM,SAAS,UAAU;AAClC;AAAA,MACF;AACA,UAAI;AACJ,UAAI;AACF,eAAO,KAAK,MAAM,MAAM,IAAI;AAAA,MAC9B,SAAS,QAAQ;AAGf;AAAA,MACF;AACA,UAAI,KAAK,gEAA6C;AACpD,uBAAe,YAAY,KAAK,QAAQ;AAAA,MAC1C;AAAA,IACF;AAEA,UAAM,iBAAiB,WAAW,cAAc;AAChD,UAAM,iBAAiB,WAAW,UAAU;AAE5C,WAAO,MAAM;AACX,YAAM,oBAAoB,WAAW,cAAc;AACnD,YAAM,oBAAoB,WAAW,UAAU;AAAA,IACjD;AAAA,EACF,GAAG,CAAC,OAAO,eAAe,WAAW,CAAC;AAEtC,SAAO;AAAA,IACL,GAAG;AAAA;AAAA;AAAA;AAAA,IAIH,cAAc,MAAM;AAClB,qBAAe,YAAY,CAAC,CAAC;AAC7B,YAAM;AAAA,QACJ,KAAK,UAAU;AAAA,UACb;AAAA,QACF,CAAC;AAAA,MACH;AAAA,IACF;AAAA;AAAA;AAAA;AAAA;AAAA,IAKA,aAAa,CAAC,aAAwB;AACpC,qBAAe,YAAY,QAAQ;AACnC,YAAM;AAAA,QACJ,KAAK,UAAU;AAAA,UACb;AAAA,UACA;AAAA,QACF,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AACF;","names":["options"]}

package/dist/ai-types.d.ts

@@ -1,18 +1,36 @@
 import { Message } from "ai";
 
+/**
+ * Enum for message types used in Agent communication
+ */
+declare enum MessageType {
+  /** Indicates this message contains updated chat messages */
+  CF_AGENT_CHAT_MESSAGES = "cf_agent_chat_messages",
+  /** Indicates this message is a response to a chat request */
+  CF_AGENT_USE_CHAT_RESPONSE = "cf_agent_use_chat_response",
+  /** Indicates this message is a command to clear chat history */
+  CF_AGENT_CHAT_CLEAR = "cf_agent_chat_clear",
+  /** Indicates this message is a request to the chat API */
+  CF_AGENT_USE_CHAT_REQUEST = "cf_agent_use_chat_request",
+  /** Indicates the user wants to stop generation of this message */
+  CF_AGENT_CHAT_REQUEST_CANCEL = "cf_agent_chat_request_cancel",
+  CF_AGENT_MCP_SERVERS = "cf_agent_mcp_servers",
+  CF_AGENT_STATE = "cf_agent_state",
+  RPC = "rpc"
+}
 /**
  * Types of messages sent from the Agent to clients
  */
 type OutgoingMessage =
   | {
       /** Indicates this message contains updated chat messages */
-      type: "cf_agent_chat_messages";
+      type: MessageType.CF_AGENT_CHAT_MESSAGES;
       /** Array of chat messages */
       messages: Message[];
     }
   | {
       /** Indicates this message is a response to a chat request */
-      type: "cf_agent_use_chat_response";
+      type: MessageType.CF_AGENT_USE_CHAT_RESPONSE;
       /** Unique ID of the request this response corresponds to */
       id: string;
       /** Content body of the response */
@@ -22,13 +40,13 @@ type OutgoingMessage =
     }
   | {
       /** Indicates this message contains updated chat messages */
-      type: "cf_agent_chat_messages";
+      type: MessageType.CF_AGENT_CHAT_MESSAGES;
       /** Array of chat messages */
       messages: Message[];
     }
   | {
       /** Indicates this message is a command to clear chat history */
-      type: "cf_agent_chat_clear";
+      type: MessageType.CF_AGENT_CHAT_CLEAR;
     };
 /**
  * Types of messages sent from clients to the Agent
@@ -36,7 +54,7 @@ type OutgoingMessage =
 type IncomingMessage =
   | {
       /** Indicates this message is a request to the chat API */
-      type: "cf_agent_use_chat_request";
+      type: MessageType.CF_AGENT_USE_CHAT_REQUEST;
       /** Unique ID for this request */
       id: string;
       /** Request initialization options */
@@ -57,18 +75,18 @@ type IncomingMessage =
     }
   | {
       /** Indicates this message is a command to clear chat history */
-      type: "cf_agent_chat_clear";
+      type: MessageType.CF_AGENT_CHAT_CLEAR;
     }
   | {
       /** Indicates this message contains updated chat messages */
-      type: "cf_agent_chat_messages";
+      type: MessageType.CF_AGENT_CHAT_MESSAGES;
       /** Array of chat messages */
       messages: Message[];
     }
   | {
       /** Indicates the user wants to stop generation of this message */
-      type: "cf_agent_chat_request_cancel";
+      type: MessageType.CF_AGENT_CHAT_REQUEST_CANCEL;
       id: string;
     };
 
-export type { IncomingMessage, OutgoingMessage };
+export { type IncomingMessage, MessageType, type OutgoingMessage };

package/dist/ai-types.js

@@ -1 +1,7 @@
+import {
+  MessageType
+} from "./chunk-EEKLJYON.js";
+export {
+  MessageType
+};
 //# sourceMappingURL=ai-types.js.map

package/dist/chunk-EEKLJYON.js

@@ -0,0 +1,17 @@
+// src/ai-types.ts
+var MessageType = /* @__PURE__ */ ((MessageType2) => {
+  MessageType2["CF_AGENT_CHAT_MESSAGES"] = "cf_agent_chat_messages";
+  MessageType2["CF_AGENT_USE_CHAT_RESPONSE"] = "cf_agent_use_chat_response";
+  MessageType2["CF_AGENT_CHAT_CLEAR"] = "cf_agent_chat_clear";
+  MessageType2["CF_AGENT_USE_CHAT_REQUEST"] = "cf_agent_use_chat_request";
+  MessageType2["CF_AGENT_CHAT_REQUEST_CANCEL"] = "cf_agent_chat_request_cancel";
+  MessageType2["CF_AGENT_MCP_SERVERS"] = "cf_agent_mcp_servers";
+  MessageType2["CF_AGENT_STATE"] = "cf_agent_state";
+  MessageType2["RPC"] = "rpc";
+  return MessageType2;
+})(MessageType || {});
+
+export {
+  MessageType
+};
+//# sourceMappingURL=chunk-EEKLJYON.js.map

package/dist/chunk-EEKLJYON.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/ai-types.ts"],"sourcesContent":["import type { Message as ChatMessage } from \"ai\";\n\n/**\n * Enum for message types used in Agent communication\n */\nexport enum MessageType {\n  /** Indicates this message contains updated chat messages */\n  CF_AGENT_CHAT_MESSAGES = \"cf_agent_chat_messages\",\n  /** Indicates this message is a response to a chat request */\n  CF_AGENT_USE_CHAT_RESPONSE = \"cf_agent_use_chat_response\",\n  /** Indicates this message is a command to clear chat history */\n  CF_AGENT_CHAT_CLEAR = \"cf_agent_chat_clear\",\n  /** Indicates this message is a request to the chat API */\n  CF_AGENT_USE_CHAT_REQUEST = \"cf_agent_use_chat_request\",\n  /** Indicates the user wants to stop generation of this message */\n  CF_AGENT_CHAT_REQUEST_CANCEL = \"cf_agent_chat_request_cancel\",\n\n  CF_AGENT_MCP_SERVERS = \"cf_agent_mcp_servers\",\n  CF_AGENT_STATE = \"cf_agent_state\",\n  RPC = \"rpc\"\n}\n\n/**\n * Types of messages sent from the Agent to clients\n */\nexport type OutgoingMessage =\n  | {\n      /** Indicates this message contains updated chat messages */\n      type: MessageType.CF_AGENT_CHAT_MESSAGES;\n      /** Array of chat messages */\n      messages: ChatMessage[];\n    }\n  | {\n      /** Indicates this message is a response to a chat request */\n      type: MessageType.CF_AGENT_USE_CHAT_RESPONSE;\n      /** Unique ID of the request this response corresponds to */\n      id: string;\n      /** Content body of the response */\n      body: string;\n      /** Whether this is the final chunk of the response */\n      done: boolean;\n    }\n  | {\n      /** Indicates this message contains updated chat messages */\n      type: MessageType.CF_AGENT_CHAT_MESSAGES;\n      /** Array of chat messages */\n      messages: ChatMessage[];\n    }\n  | {\n      /** Indicates this message is a command to clear chat history */\n      type: MessageType.CF_AGENT_CHAT_CLEAR;\n    };\n\n/**\n * Types of messages sent from clients to the Agent\n */\nexport type IncomingMessage =\n  | {\n      /** Indicates this message is a request to the chat API */\n      type: MessageType.CF_AGENT_USE_CHAT_REQUEST;\n      /** Unique ID for this request */\n      id: string;\n      /** Request initialization options */\n      init: Pick<\n        RequestInit,\n        | \"method\"\n        | \"keepalive\"\n        | \"headers\"\n        | \"body\"\n        | \"redirect\"\n        | \"integrity\"\n        | \"credentials\"\n        | \"mode\"\n        | \"referrer\"\n        | \"referrerPolicy\"\n        | \"window\"\n      >;\n    }\n  | {\n      /** Indicates this message is a command to clear chat history */\n      type: MessageType.CF_AGENT_CHAT_CLEAR;\n    }\n  | {\n      /** Indicates this message contains updated chat messages */\n      type: MessageType.CF_AGENT_CHAT_MESSAGES;\n      /** Array of chat messages */\n      messages: ChatMessage[];\n    }\n  | {\n      /** Indicates the user wants to stop generation of this message */\n      type: MessageType.CF_AGENT_CHAT_REQUEST_CANCEL;\n      id: string;\n    };\n"],"mappings":";AAKO,IAAK,cAAL,kBAAKA,iBAAL;AAEL,EAAAA,aAAA,4BAAyB;AAEzB,EAAAA,aAAA,gCAA6B;AAE7B,EAAAA,aAAA,yBAAsB;AAEtB,EAAAA,aAAA,+BAA4B;AAE5B,EAAAA,aAAA,kCAA+B;AAE/B,EAAAA,aAAA,0BAAuB;AACvB,EAAAA,aAAA,oBAAiB;AACjB,EAAAA,aAAA,SAAM;AAdI,SAAAA;AAAA,GAAA;","names":["MessageType"]}

package/dist/{chunk-Y67CHZBI.js → chunk-EM3J4KV7.js}

@@ -1,3 +1,16 @@
+// src/mcp/client.ts
+import { jsonSchema } from "ai";
+import { nanoid } from "nanoid";
+
+// src/mcp/client-connection.ts
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import {
+  PromptListChangedNotificationSchema,
+  ResourceListChangedNotificationSchema,
+  ToolListChangedNotificationSchema,
+  ElicitRequestSchema
+} from "@modelcontextprotocol/sdk/types.js";
+
 // src/mcp/sse-edge.ts
 import {
   SSEClientTransport
@@ -45,15 +58,59 @@ var SSEEdgeClientTransport = class extends SSEClientTransport {
   }
 };
 
-// src/mcp/client-connection.ts
+// src/mcp/streamable-http-edge.ts
 import {
-  ToolListChangedNotificationSchema,
-  ResourceListChangedNotificationSchema,
-  PromptListChangedNotificationSchema
-} from "@modelcontextprotocol/sdk/types.js";
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+  StreamableHTTPClientTransport
+} from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+var StreamableHTTPEdgeClientTransport = class extends StreamableHTTPClientTransport {
+  /**
+   * Creates a new StreamableHTTPEdgeClientTransport, which overrides fetch to be compatible with the CF workers environment
+   */
+  constructor(url, options) {
+    const fetchOverride = async (fetchUrl, fetchInit = {}) => {
+      const headers = await this.authHeaders();
+      const workerOptions = {
+        ...fetchInit,
+        headers: {
+          ...options.requestInit?.headers,
+          ...fetchInit?.headers,
+          ...headers
+        }
+      };
+      delete workerOptions.mode;
+      return (
+        // @ts-expect-error Custom fetch function for Cloudflare Workers compatibility
+        options.requestInit?.fetch?.(
+          fetchUrl,
+          workerOptions
+        ) || fetch(fetchUrl, workerOptions)
+      );
+    };
+    super(url, {
+      ...options,
+      requestInit: {
+        ...options.requestInit,
+        // @ts-expect-error Custom fetch override for Cloudflare Workers
+        fetch: fetchOverride
+      }
+    });
+    this.authProvider = options.authProvider;
+  }
+  async authHeaders() {
+    if (this.authProvider) {
+      const tokens = await this.authProvider.tokens();
+      if (tokens) {
+        return {
+          Authorization: `Bearer ${tokens.access_token}`
+        };
+      }
+    }
+  }
+};
+
+// src/mcp/client-connection.ts
 var MCPClientConnection = class {
-  constructor(url, info, options = { transport: {}, client: {} }) {
+  constructor(url, info, options = { client: {}, transport: {} }) {
     this.url = url;
     this.options = options;
     this.connectionState = "connecting";
@@ -61,7 +118,14 @@ var MCPClientConnection = class {
     this.prompts = [];
     this.resources = [];
     this.resourceTemplates = [];
-    this.client = new Client(info, options.client);
+    const clientOptions = {
+      ...options.client,
+      capabilities: {
+        ...options.client?.capabilities,
+        elicitation: {}
+      }
+    };
+    this.client = new Client(info, clientOptions);
   }
   /**
    * Initialize a client connection
@@ -71,14 +135,8 @@ var MCPClientConnection = class {
    */
   async init(code) {
     try {
-      const transport = new SSEEdgeClientTransport(
-        this.url,
-        this.options.transport
-      );
-      if (code) {
-        await transport.finishAuth(code);
-      }
-      await this.client.connect(transport);
+      const transportType = this.options.transport.type || "streamable-http";
+      await this.tryConnect(transportType, code);
     } catch (e) {
       if (e.toString().includes("Unauthorized")) {
         this.connectionState = "authenticating";
@@ -92,18 +150,36 @@ var MCPClientConnection = class {
     if (!this.serverCapabilities) {
       throw new Error("The MCP Server failed to return server capabilities");
     }
-    const [instructions, tools, resources, prompts, resourceTemplates] = await Promise.all([
+    const [
+      instructionsResult,
+      toolsResult,
+      resourcesResult,
+      promptsResult,
+      resourceTemplatesResult
+    ] = await Promise.allSettled([
       this.client.getInstructions(),
       this.registerTools(),
       this.registerResources(),
       this.registerPrompts(),
       this.registerResourceTemplates()
     ]);
-    this.instructions = instructions;
-    this.tools = tools;
-    this.resources = resources;
-    this.prompts = prompts;
-    this.resourceTemplates = resourceTemplates;
+    const operations = [
+      { name: "instructions", result: instructionsResult },
+      { name: "tools", result: toolsResult },
+      { name: "resources", result: resourcesResult },
+      { name: "prompts", result: promptsResult },
+      { name: "resource templates", result: resourceTemplatesResult }
+    ];
+    for (const { name, result } of operations) {
+      if (result.status === "rejected") {
+        console.error(`Failed to initialize ${name}:`, result.reason);
+      }
+    }
+    this.instructions = instructionsResult.status === "fulfilled" ? instructionsResult.value : void 0;
+    this.tools = toolsResult.status === "fulfilled" ? toolsResult.value : [];
+    this.resources = resourcesResult.status === "fulfilled" ? resourcesResult.value : [];
+    this.prompts = promptsResult.status === "fulfilled" ? promptsResult.value : [];
+    this.resourceTemplates = resourceTemplatesResult.status === "fulfilled" ? resourceTemplatesResult.value : [];
     this.connectionState = "ready";
   }
   /**
@@ -208,6 +284,63 @@ var MCPClientConnection = class {
     } while (templatesResult.nextCursor);
     return templatesAgg;
   }
+  /**
+   * Handle elicitation request from server
+   * Automatically uses the Agent's built-in elicitation handling if available
+   */
+  async handleElicitationRequest(_request) {
+    throw new Error(
+      "Elicitation handler must be implemented for your platform. Override handleElicitationRequest method."
+    );
+  }
+  /**
+   * Get the transport for the client
+   * @param transportType - The transport type to get
+   * @returns The transport for the client
+   */
+  getTransport(transportType) {
+    switch (transportType) {
+      case "streamable-http":
+        return new StreamableHTTPEdgeClientTransport(
+          this.url,
+          this.options.transport
+        );
+      case "sse":
+        return new SSEEdgeClientTransport(
+          this.url,
+          this.options.transport
+        );
+      default:
+        throw new Error(`Unsupported transport type: ${transportType}`);
+    }
+  }
+  async tryConnect(transportType, code) {
+    const transports = transportType === "auto" ? ["streamable-http", "sse"] : [transportType];
+    for (const currentTransportType of transports) {
+      const isLastTransport = currentTransportType === transports[transports.length - 1];
+      const hasFallback = transportType === "auto" && currentTransportType === "streamable-http" && !isLastTransport;
+      const transport = await this.getTransport(currentTransportType);
+      if (code) {
+        await transport.finishAuth(code);
+      }
+      try {
+        await this.client.connect(transport);
+        break;
+      } catch (e) {
+        const error = e instanceof Error ? e : new Error(String(e));
+        if (hasFallback && (error.message.includes("404") || error.message.includes("405"))) {
+          continue;
+        }
+        throw e;
+      }
+    }
+    this.client.setRequestHandler(
+      ElicitRequestSchema,
+      async (request) => {
+        return await this.handleElicitationRequest(request);
+      }
+    );
+  }
 };
 function capabilityErrorHandler(empty, method) {
   return (e) => {
@@ -222,8 +355,6 @@ function capabilityErrorHandler(empty, method) {
 }
 
 // src/mcp/client.ts
-import { jsonSchema } from "ai";
-import { nanoid } from "nanoid";
 var MCPClientManager = class {
   /**
    * @param _name Name of the MCP client
@@ -262,8 +393,8 @@ var MCPClientManager = class {
         version: this._version
       },
       {
-        transport: options.transport ?? {},
-        client: options.client ?? {}
+        client: options.client ?? {},
+        transport: options.transport ?? {}
       }
     );
     await this.mcpConnections[id].init(options.reconnect?.oauthCode);
@@ -273,9 +404,9 @@ var MCPClientManager = class {
         options.transport.authProvider.redirectUrl.toString()
       );
       return {
-        id,
         authUrl,
-        clientId: options.transport?.authProvider?.clientId
+        clientId: options.transport?.authProvider?.clientId,
+        id
       };
     }
     return {
@@ -350,21 +481,21 @@ var MCPClientManager = class {
     return Object.fromEntries(
       getNamespacedData(this.mcpConnections, "tools").map((tool) => {
         return [
-          `${tool.serverId}_${tool.name}`,
+          `tool_${tool.serverId}_${tool.name}`,
           {
-            parameters: jsonSchema(tool.inputSchema),
             description: tool.description,
             execute: async (args) => {
               const result = await this.callTool({
-                name: tool.name,
                 arguments: args,
+                name: tool.name,
                 serverId: tool.serverId
               });
               if (result.isError) {
                 throw new Error(result.content[0].text);
               }
               return result;
-            }
+            },
+            parameters: jsonSchema(tool.inputSchema)
           }
         ];
       })
@@ -389,6 +520,7 @@ var MCPClientManager = class {
       throw new Error(`Connection with id "${id}" does not exist.`);
     }
     await this.mcpConnections[id].client.close();
+    delete this.mcpConnections[id];
   }
   /**
    * @returns namespaced list of prompts
@@ -443,7 +575,7 @@ var MCPClientManager = class {
 };
 function getNamespacedData(mcpClients, type) {
   const sets = Object.entries(mcpClients).map(([name, conn]) => {
-    return { name, data: conn[type] };
+    return { data: conn[type], name };
   });
   const namespacedData = sets.flatMap(({ name: serverId, data }) => {
     return data.map((item) => {
@@ -458,7 +590,9 @@ function getNamespacedData(mcpClients, type) {
 }
 
 export {
+  SSEEdgeClientTransport,
+  StreamableHTTPEdgeClientTransport,
   MCPClientManager,
   getNamespacedData
 };
-//# sourceMappingURL=chunk-Y67CHZBI.js.map
+//# sourceMappingURL=chunk-EM3J4KV7.js.map