@assistant-ui/react 0.0.13 → 0.0.14

package/dist/index.mjs

@@ -35,7 +35,7 @@ var useAssistantContext = () => {
   const context = useContext(AssistantContext);
   if (!context)
     throw new Error(
-      "useAssistantContext must be used within a AssistantProvider"
+      "This component must be used within a AssistantProvider"
     );
   return context;
 };
@@ -187,7 +187,7 @@ var MessageContext = createContext2(null);
 var useMessageContext = () => {
   const context = useContext2(MessageContext);
   if (!context)
-    throw new Error("useMessageContext must be used within a MessageProvider");
+    throw new Error("This component must be used within a MessageProvider");
   return context;
 };
 
@@ -294,6 +294,7 @@ var useMessageContext2 = () => {
   const [context] = useState(() => {
     const useMessage = create2(() => ({
       message: null,
+      parentId: null,
       branches: [],
       isLast: false,
       isCopied: false,
@@ -308,15 +309,19 @@ var useMessageContext2 = () => {
         const message = useMessage.getState().message;
         if (message.role !== "user")
           throw new Error("Editing is only supported for user messages");
-        if (message.content[0]?.type !== "text")
-          throw new Error("Editing is only supported for text-only messages");
-        return message.content[0].text;
+        const text = message.content.filter((part) => part.type === "text").map((part) => part.text).join("\n");
+        return text;
       },
       onSend: (text) => {
-        const message = useMessage.getState().message;
+        const { message, parentId } = useMessage.getState();
+        if (message.role !== "user")
+          throw new Error("Editing is only supported for user messages");
+        const nonTextParts = message.content.filter(
+          (part) => part.type !== "text" && part.type !== "ui"
+        );
         useThread.getState().append({
-          parentId: message.parentId,
-          content: [{ type: "text", text }]
+          parentId,
+          content: [{ type: "text", text }, ...nonTextParts]
         });
       }
     });
@@ -326,6 +331,7 @@ var useMessageContext2 = () => {
 };
 var MessageProvider = ({
   message,
+  parentId,
   children
 }) => {
   const { useThread } = useAssistantContext();
@@ -338,6 +344,7 @@ var MessageProvider = ({
     context.useMessage.setState(
       {
         message,
+        parentId,
         branches,
         isLast,
         isCopied,
@@ -347,7 +354,7 @@ var MessageProvider = ({
       },
       true
     );
-  }, [context, message, branches, isLast, isCopied, isHovering]);
+  }, [context, message, parentId, branches, isLast, isCopied, isHovering]);
   return /* @__PURE__ */ jsx4(MessageContext.Provider, { value: context, children });
 };
 
@@ -460,15 +467,21 @@ var ThreadMessages = ({ components }) => {
   if (messages.length === 0)
     return null;
   return /* @__PURE__ */ jsx7(Fragment2, { children: messages.map((message, idx) => {
-    return (
-      // biome-ignore lint/suspicious/noArrayIndexKey: fixes a11y issues with branch navigation
-      /* @__PURE__ */ jsxs2(MessageProvider, { message, children: [
-        /* @__PURE__ */ jsxs2(MessageIf, { user: true, children: [
-          /* @__PURE__ */ jsx7(ComposerIf, { editing: false, children: /* @__PURE__ */ jsx7(UserMessage, {}) }),
-          /* @__PURE__ */ jsx7(ComposerIf, { editing: true, children: /* @__PURE__ */ jsx7(EditComposer, {}) })
-        ] }),
-        /* @__PURE__ */ jsx7(MessageIf, { assistant: true, children: /* @__PURE__ */ jsx7(AssistantMessage, {}) })
-      ] }, idx)
+    const parentId = messages[idx - 1]?.id ?? null;
+    return /* @__PURE__ */ jsxs2(
+      MessageProvider,
+      {
+        message,
+        parentId,
+        children: [
+          /* @__PURE__ */ jsxs2(MessageIf, { user: true, children: [
+            /* @__PURE__ */ jsx7(ComposerIf, { editing: false, children: /* @__PURE__ */ jsx7(UserMessage, {}) }),
+            /* @__PURE__ */ jsx7(ComposerIf, { editing: true, children: /* @__PURE__ */ jsx7(EditComposer, {}) })
+          ] }),
+          /* @__PURE__ */ jsx7(MessageIf, { assistant: true, children: /* @__PURE__ */ jsx7(AssistantMessage, {}) })
+        ]
+      },
+      parentId ?? "__ROOT__"
     );
   }) });
 };
@@ -582,7 +595,7 @@ import {
 import TextareaAutosize from "react-textarea-autosize";
 import { jsx as jsx11 } from "react/jsx-runtime";
 var ComposerInput = forwardRef7(
-  ({ autoFocus, asChild, disabled, onChange, onKeyDown, ...rest }, forwardedRef) => {
+  ({ autoFocus = false, asChild, disabled, onChange, onKeyDown, ...rest }, forwardedRef) => {
     const { useThread, useViewport } = useAssistantContext();
     const { useComposer, type } = useComposerContext();
     const value = useComposer((c) => {
@@ -610,7 +623,7 @@ var ComposerInput = forwardRef7(
     };
     const textareaRef = useRef5(null);
     const ref = useComposedRefs3(forwardedRef, textareaRef);
-    const autoFocusEnabled = autoFocus !== false && !disabled;
+    const autoFocusEnabled = autoFocus && !disabled;
     const focus = useCallback(() => {
       const textarea = textareaRef.current;
       if (!textarea || !autoFocusEnabled)
@@ -894,10 +907,10 @@ var useReloadMessage = () => {
   if (disabled)
     return null;
   return () => {
-    const message = useMessage.getState().message;
+    const { message, parentId } = useMessage.getState();
     if (message.role !== "assistant")
       throw new Error("Reloading is only supported on assistant messages");
-    useThread.getState().startRun(message.parentId);
+    useThread.getState().startRun(parentId);
     useViewport.getState().scrollToBottom();
   };
 };
@@ -924,7 +937,7 @@ var useBeginMessageEdit = () => {
 var ActionBarEdit = createActionButton(useBeginMessageEdit);
 
 // src/adapters/vercel/VercelAIAssistantProvider.tsx
-import { useCallback as useCallback3, useMemo as useMemo4 } from "react";
+import { useMemo as useMemo4 } from "react";
 
 // src/adapters/vercel/useDummyAIAssistantContext.tsx
 import { useState as useState2 } from "react";
@@ -982,7 +995,7 @@ var useDummyAIAssistantContext = () => {
   return context;
 };
 
-// src/adapters/vercel/useVercelAIBranches.tsx
+// src/adapters/vercel/useVercelAIThreadState.tsx
 import { useCallback as useCallback2, useMemo as useMemo3, useRef as useRef6, useState as useState3 } from "react";
 
 // src/adapters/MessageRepository.tsx
@@ -1011,17 +1024,26 @@ var MessageRepository = class {
     }
     return messages;
   }
-  addOrUpdateMessage(message) {
+  // TODO previousId is confusing
+  // TODO previousId does not fix children
+  // TODO cut / link operations
+  addOrUpdateMessage(parentId, message, previousId = message.id) {
     const item = this.messages.get(message.id);
     if (item) {
-      if (item.current.parentId !== message.parentId) {
-        this.deleteMessage(message.id);
-      } else {
-        item.current = message;
-        return;
+      if (item.prev?.current.id !== parentId) {
+        if ((item.prev?.current.id ?? null) !== parentId) {
+          this.deleteMessage(message.id);
+        } else {
+          item.current = message;
+          if (previousId !== message.id) {
+            this.messages.delete(previousId);
+            this.messages.set(message.id, item);
+          }
+          return;
+        }
       }
     }
-    const prev = message.parentId ? this.messages.get(message.parentId) : null;
+    const prev = parentId ? this.messages.get(parentId) : null;
     if (prev === void 0)
       throw new Error("Unexpected: Parent message not found");
     const newItem = {
@@ -1070,16 +1092,27 @@ var MessageRepository = class {
       this.head = message.prev ? findHead(message.prev) : null;
     }
   }
-  getOptimisticId = () => {
+  getOptimisticId() {
     let optimisticId;
     do {
       optimisticId = generateOptimisticId();
     } while (this.messages.has(optimisticId));
     return optimisticId;
-  };
+  }
+  commitOptimisticAppend(message) {
+    const optimisticIdUser = this.getOptimisticId();
+    this.addOrUpdateMessage(message.parentId, {
+      id: optimisticIdUser,
+      role: "user",
+      content: message.content,
+      createdAt: /* @__PURE__ */ new Date()
+    });
+    const optimisticIdAssistant = this.commitOptimisticRun(optimisticIdUser);
+    return [optimisticIdUser, optimisticIdAssistant];
+  }
   commitOptimisticRun(parentId) {
     const optimisticId = this.getOptimisticId();
-    this.addOrUpdateMessage({
+    this.addOrUpdateMessage(parentId, {
       id: optimisticId,
       role: "assistant",
       content: [
@@ -1088,7 +1121,6 @@ var MessageRepository = class {
           text: ""
         }
       ],
-      parentId,
       createdAt: /* @__PURE__ */ new Date()
     });
     return optimisticId;
@@ -1128,7 +1160,37 @@ var MessageRepository = class {
   }
 };
 
-// src/adapters/vercel/useVercelAIBranches.tsx
+// src/adapters/ThreadMessageConverter.tsx
+var ThreadMessageConverter = class {
+  constructor(converter2) {
+    this.converter = converter2;
+  }
+  cache = /* @__PURE__ */ new WeakMap();
+  convertMessages(messages) {
+    return messages.map((m) => {
+      const cached = this.cache.get(m);
+      if (cached)
+        return cached;
+      const newMessage = this.converter(m);
+      this.cache.set(m, newMessage);
+      return newMessage;
+    });
+  }
+};
+
+// src/adapters/vercel/useVercelAIThreadState.tsx
+var vercelToThreadMessage = (message) => {
+  if (message.role !== "user" && message.role !== "assistant")
+    throw new Error("Unsupported role");
+  return {
+    id: message.id,
+    role: message.role,
+    content: [{ type: "text", text: message.content }],
+    createdAt: message.createdAt ?? /* @__PURE__ */ new Date(),
+    innerMessage: message
+  };
+};
+var converter = new ThreadMessageConverter(vercelToThreadMessage);
 var sliceMessagesUntil = (messages, messageId) => {
   if (messageId == null)
     return [];
@@ -1142,28 +1204,36 @@ var sliceMessagesUntil = (messages, messageId) => {
 var hasUpcomingMessage = (isRunning, messages) => {
   return isRunning && messages[messages.length - 1]?.role !== "assistant";
 };
-var useVercelAIBranches = (chat, messages) => {
+var getIsRunning = (vercel) => {
+  if ("isLoading" in vercel)
+    return vercel.isLoading;
+  return vercel.status === "in_progress";
+};
+var useVercelAIThreadState = (vercel) => {
   const [data] = useState3(() => new MessageRepository());
-  const isRunning = "isLoading" in chat ? chat.isLoading : chat.status === "in_progress";
+  const vercelRef = useRef6(vercel);
+  vercelRef.current = vercel;
+  const isRunning = getIsRunning(vercelRef.current);
   const assistantOptimisticIdRef = useRef6(null);
-  const messagesEx = useMemo3(() => {
-    for (const message of messages) {
-      data.addOrUpdateMessage(message);
+  const messages = useMemo3(() => {
+    const vm = converter.convertMessages(vercel.messages);
+    for (let i = 0; i < vm.length; i++) {
+      const message = vm[i];
+      const parent = vm[i - 1];
+      data.addOrUpdateMessage(parent?.id ?? null, message);
     }
     if (assistantOptimisticIdRef.current) {
       data.deleteMessage(assistantOptimisticIdRef.current);
       assistantOptimisticIdRef.current = null;
     }
-    if (hasUpcomingMessage(isRunning, messages)) {
+    if (hasUpcomingMessage(isRunning, vm)) {
       assistantOptimisticIdRef.current = data.commitOptimisticRun(
-        messages.at(-1)?.id ?? null
+        vm.at(-1)?.id ?? null
       );
     }
-    data.resetHead(
-      assistantOptimisticIdRef.current ?? messages.at(-1)?.id ?? null
-    );
+    data.resetHead(assistantOptimisticIdRef.current ?? vm.at(-1)?.id ?? null);
     return data.getMessages();
-  }, [data, isRunning, messages]);
+  }, [data, isRunning, vercel.messages]);
   const getBranches = useCallback2(
     (messageId) => {
       return data.getBranches(messageId);
@@ -1173,106 +1243,77 @@ var useVercelAIBranches = (chat, messages) => {
   const switchToBranch = useCallback2(
     (messageId) => {
       data.switchToBranch(messageId);
-      chat.setMessages(
+      vercelRef.current.setMessages(
         data.getMessages().filter((m) => !isOptimisticId(m.id)).map((m) => m.innerMessage)
       );
     },
-    [data, chat.setMessages]
-  );
-  const reloadMaybe = "reload" in chat ? chat.reload : void 0;
-  const startRun = useCallback2(
-    async (parentId) => {
-      if (!reloadMaybe)
-        throw new Error("Reload not supported by Vercel AI SDK's useAssistant");
-      const newMessages = sliceMessagesUntil(chat.messages, parentId);
-      chat.setMessages(newMessages);
-      await reloadMaybe();
-    },
-    [chat.messages, chat.setMessages, reloadMaybe]
-  );
-  const append = useCallback2(
-    async (message) => {
-      if (message.content.length !== 1 || message.content[0]?.type !== "text")
-        throw new Error("Only text content is supported by Vercel AI SDK");
-      const newMessages = sliceMessagesUntil(chat.messages, message.parentId);
-      chat.setMessages(newMessages);
-      await chat.append({
-        role: "user",
-        content: message.content[0].text
-      });
-    },
-    [chat.messages, chat.setMessages, chat.append]
+    [data]
   );
+  const startRun = useCallback2(async (parentId) => {
+    const reloadMaybe = "reload" in vercelRef.current ? vercelRef.current.reload : void 0;
+    if (!reloadMaybe)
+      throw new Error("Reload not supported by Vercel AI SDK's useAssistant");
+    const newMessages = sliceMessagesUntil(
+      vercelRef.current.messages,
+      parentId
+    );
+    vercelRef.current.setMessages(newMessages);
+    await reloadMaybe();
+  }, []);
+  const append = useCallback2(async (message) => {
+    if (message.content.length !== 1 || message.content[0]?.type !== "text")
+      throw new Error("Only text content is supported by Vercel AI SDK");
+    const newMessages = sliceMessagesUntil(
+      vercelRef.current.messages,
+      message.parentId
+    );
+    vercelRef.current.setMessages(newMessages);
+    await vercelRef.current.append({
+      role: "user",
+      content: message.content[0].text
+    });
+  }, []);
+  const cancelRun = useCallback2(() => {
+    const lastMessage = vercelRef.current.messages.at(-1);
+    vercelRef.current.stop();
+    if (lastMessage?.role === "user") {
+      vercelRef.current.setInput(lastMessage.content);
+    }
+  }, []);
   return useMemo3(
     () => ({
-      messages: messagesEx,
+      isRunning,
+      messages,
       getBranches,
       switchToBranch,
       append,
-      startRun
+      startRun,
+      cancelRun
     }),
-    [messagesEx, getBranches, switchToBranch, append, startRun]
+    [
+      isRunning,
+      messages,
+      getBranches,
+      switchToBranch,
+      append,
+      startRun,
+      cancelRun
+    ]
   );
 };
 
 // src/adapters/vercel/VercelAIAssistantProvider.tsx
 import { jsx as jsx19 } from "react/jsx-runtime";
-var ThreadMessageCache = /* @__PURE__ */ new WeakMap();
-var vercelToThreadMessage = (message, parentId) => {
-  if (message.role !== "user" && message.role !== "assistant")
-    throw new Error("Unsupported role");
-  return {
-    parentId,
-    id: message.id,
-    role: message.role,
-    content: [{ type: "text", text: message.content }],
-    createdAt: message.createdAt ?? /* @__PURE__ */ new Date(),
-    innerMessage: message
-  };
-};
-var vercelToCachedThreadMessages = (messages) => {
-  return messages.map((m, idx) => {
-    const cached = ThreadMessageCache.get(m);
-    const parentId = messages[idx - 1]?.id ?? null;
-    if (cached && cached.parentId === parentId)
-      return cached;
-    const newMessage = vercelToThreadMessage(m, parentId);
-    ThreadMessageCache.set(m, newMessage);
-    return newMessage;
-  });
-};
 var VercelAIAssistantProvider = ({
   children,
   ...rest
 }) => {
   const context = useDummyAIAssistantContext();
   const vercel = "chat" in rest ? rest.chat : rest.assistant;
-  const messages = useMemo4(() => {
-    return vercelToCachedThreadMessages(vercel.messages);
-  }, [vercel.messages]);
-  const branches = useVercelAIBranches(vercel, messages);
-  const cancelRun = useCallback3(() => {
-    const lastMessage = vercel.messages.at(-1);
-    vercel.stop();
-    if (lastMessage?.role === "user") {
-      vercel.setInput(lastMessage.content);
-    }
-  }, [vercel.messages, vercel.stop, vercel.setInput]);
-  const isRunning = "isLoading" in vercel ? vercel.isLoading : vercel.status === "in_progress";
+  const threadState = useVercelAIThreadState(vercel);
   useMemo4(() => {
-    context.useThread.setState(
-      {
-        messages: branches.messages,
-        isRunning,
-        getBranches: branches.getBranches,
-        switchToBranch: branches.switchToBranch,
-        append: branches.append,
-        startRun: branches.startRun,
-        cancelRun
-      },
-      true
-    );
-  }, [context, isRunning, cancelRun, branches]);
+    context.useThread.setState(threadState, true);
+  }, [context, threadState]);
   useMemo4(() => {
     context.useComposer.setState({
       value: vercel.input,
@@ -1284,55 +1325,69 @@ var VercelAIAssistantProvider = ({
 
 // src/adapters/vercel/VercelRSCAssistantProvider.tsx
 import {
-  useCallback as useCallback4,
+  useCallback as useCallback3,
   useMemo as useMemo5
 } from "react";
 import { jsx as jsx20 } from "react/jsx-runtime";
-var ThreadMessageCache2 = /* @__PURE__ */ new WeakMap();
-var vercelToThreadMessage2 = (parentId, message) => {
+var vercelToThreadMessage2 = (message) => {
   if (message.role !== "user" && message.role !== "assistant")
     throw new Error("Unsupported role");
   return {
-    parentId,
     id: message.id,
     role: message.role,
     content: [{ type: "ui", display: message.display }],
     createdAt: message.createdAt ?? /* @__PURE__ */ new Date()
   };
 };
-var vercelToCachedThreadMessages2 = (messages) => {
-  return messages.map((m, idx) => {
-    const cached = ThreadMessageCache2.get(m);
-    const parentId = messages[idx - 1]?.id ?? null;
-    if (cached && cached.parentId === parentId)
-      return cached;
-    const newMessage = vercelToThreadMessage2(parentId, m);
-    ThreadMessageCache2.set(m, newMessage);
-    return newMessage;
-  });
-};
-var VercelRSCAssistantProvider = ({ children, messages: vercelMessages, append: vercelAppend }) => {
+var VercelRSCAssistantProvider = ({
+  children,
+  convertMessage,
+  messages: vercelMessages,
+  append: appendCallback,
+  edit,
+  reload
+}) => {
   const context = useDummyAIAssistantContext();
+  const converter2 = useMemo5(() => {
+    const rscConverter = convertMessage ?? ((m) => m);
+    return new ThreadMessageConverter((m) => {
+      return vercelToThreadMessage2(rscConverter(m));
+    });
+  }, [convertMessage]);
   const messages = useMemo5(() => {
-    return vercelToCachedThreadMessages2(vercelMessages);
-  }, [vercelMessages]);
-  const append = useCallback4(
+    return converter2.convertMessages(vercelMessages);
+  }, [converter2, vercelMessages]);
+  const append = useCallback3(
     async (message) => {
-      if (message.parentId !== (context.useThread.getState().messages.at(-1)?.id ?? null))
-        throw new Error("Unexpected: Message editing is not supported");
-      if (message.content[0]?.type !== "text") {
-        throw new Error("Only text content is currently supported");
+      if (message.parentId !== (context.useThread.getState().messages.at(-1)?.id ?? null)) {
+        if (!edit)
+          throw new Error(
+            "Unexpected: Message editing is not supported, no edit callback was provided to VercelRSCAssistantProvider."
+          );
+        await edit(message);
+      } else {
+        await appendCallback(message);
       }
-      await vercelAppend(message);
     },
-    [context, vercelAppend]
+    [context, appendCallback, edit]
+  );
+  const startRun = useCallback3(
+    async (parentId) => {
+      if (!reload)
+        throw new Error(
+          "Unexpected: Message reloading is not supported, no reload callback was provided to VercelRSCAssistantProvider."
+        );
+      await reload(parentId);
+    },
+    [reload]
   );
   useMemo5(() => {
     context.useThread.setState({
       messages,
-      append
+      append,
+      startRun
     });
-  }, [context, messages, append]);
+  }, [context, messages, append, startRun]);
   return /* @__PURE__ */ jsx20(AssistantContext.Provider, { value: context, children });
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "license": "MIT",
   "exports": {
     ".": {