@assistant-ui/react 0.0.10 → 0.0.12

package/dist/index.mjs

@@ -16,13 +16,14 @@ __export(thread_exports, {
 });
 
 // src/primitives/thread/ThreadRoot.tsx
-import { forwardRef } from "react";
 import {
   Primitive
 } from "@radix-ui/react-primitive";
+import { forwardRef } from "react";
+import { jsx } from "react/jsx-runtime";
 var ThreadRoot = forwardRef(
   (props, ref) => {
-    return /* @__PURE__ */ React.createElement(Primitive.div, { ...props, ref });
+    return /* @__PURE__ */ jsx(Primitive.div, { ...props, ref });
   }
 );
 
@@ -59,8 +60,9 @@ var ThreadIf = ({ children, ...query }) => {
 };
 
 // src/primitives/thread/ThreadEmpty.tsx
+import { jsx as jsx2 } from "react/jsx-runtime";
 var ThreadEmpty = ({ children }) => {
-  return /* @__PURE__ */ React.createElement(ThreadIf, { empty: true }, children);
+  return /* @__PURE__ */ jsx2(ThreadIf, { empty: true, children });
 };
 
 // src/primitives/thread/ThreadViewport.tsx
@@ -124,6 +126,7 @@ var useOnScrollToBottom = (callback) => {
 };
 
 // src/primitives/thread/ThreadViewport.tsx
+import { jsx as jsx3, jsxs } from "react/jsx-runtime";
 var ThreadViewport = forwardRef2(({ autoScroll = true, onScroll, children, ...rest }, forwardedRef) => {
   const messagesEndRef = useRef3(null);
   const divRef = useRef3(null);
@@ -160,156 +163,19 @@ var ThreadViewport = forwardRef2(({ autoScroll = true, onScroll, children, ...re
     }
     lastScrollTop.current = div.scrollTop;
   };
-  return /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ jsxs(
     Primitive2.div,
     {
       ...rest,
       onScroll: composeEventHandlers(onScroll, handleScroll),
-      ref
-    },
-    children,
-    /* @__PURE__ */ React.createElement("div", { ref: messagesEndRef })
-  );
-});
-
-// src/adapters/vercel/useVercelAIBranches.tsx
-import { useCallback, useMemo, useRef as useRef4 } from "react";
-
-// src/utils/context/stores/AssistantTypes.ts
-var ROOT_PARENT_ID = "__ROOT_ID__";
-
-// src/adapters/vercel/useVercelAIBranches.tsx
-var UPCOMING_MESSAGE_ID = "__UPCOMING_MESSAGE_ID__";
-var updateBranchData = (data, messages) => {
-  for (let i = 0; i < messages.length; i++) {
-    const child = messages[i];
-    const childId = child.id;
-    const parentId = messages[i - 1]?.id ?? ROOT_PARENT_ID;
-    data.parentMap.set(childId, parentId);
-    const parentArray = data.branchMap.get(parentId);
-    if (!parentArray) {
-      data.branchMap.set(parentId, [childId]);
-    } else if (!parentArray.includes(childId)) {
-      parentArray.push(childId);
+      ref,
+      children: [
+        children,
+        /* @__PURE__ */ jsx3("div", { ref: messagesEndRef })
+      ]
     }
-    data.snapshots.set(childId, messages);
-  }
-};
-var getParentId = (data, messages, messageId) => {
-  if (messageId === UPCOMING_MESSAGE_ID) {
-    const parent = messages.at(-1);
-    if (!parent)
-      return ROOT_PARENT_ID;
-    return parent.id;
-  }
-  const parentId = data.parentMap.get(messageId);
-  if (!parentId)
-    throw new Error("Unexpected: Message parent not found");
-  return parentId;
-};
-var getBranchStateImpl = (data, messages, messageId) => {
-  const parentId = getParentId(data, messages, messageId);
-  const branches = data.branchMap.get(parentId) ?? [];
-  const branchId = messageId === UPCOMING_MESSAGE_ID ? branches.length : branches.indexOf(messageId);
-  if (branchId === -1)
-    throw new Error("Unexpected: Message not found in parent children");
-  const upcomingOffset = messageId === UPCOMING_MESSAGE_ID ? 1 : 0;
-  return {
-    branchId,
-    branchCount: branches.length + upcomingOffset
-  };
-};
-var switchToBranchImpl = (data, messages, messageId, branchId) => {
-  const parentId = getParentId(data, messages, messageId);
-  const branches = data.branchMap.get(parentId);
-  if (!branches)
-    throw new Error("Unexpected: Parent children not found");
-  const newMessageId = branches[branchId];
-  if (!newMessageId)
-    throw new Error("Unexpected: Requested branch not found");
-  if (branchId < 0 || branchId >= branches.length)
-    throw new Error("Switch to branch called with a branch index out of range");
-  if (newMessageId === messageId)
-    return messages;
-  const snapshot = data.snapshots.get(newMessageId);
-  if (!snapshot)
-    throw new Error("Unexpected: Branch snapshot not found");
-  return snapshot;
-};
-var sliceMessagesUntil = (messages, messageId) => {
-  if (messageId === ROOT_PARENT_ID)
-    return [];
-  if (messageId === UPCOMING_MESSAGE_ID)
-    return messages;
-  const messageIdx = messages.findIndex((m) => m.id === messageId);
-  if (messageIdx === -1)
-    throw new Error("Unexpected: Message not found");
-  return messages.slice(0, messageIdx + 1);
-};
-var useVercelAIBranches = (chat, context) => {
-  const data = useRef4({
-    parentMap: /* @__PURE__ */ new Map(),
-    branchMap: /* @__PURE__ */ new Map(),
-    snapshots: /* @__PURE__ */ new Map()
-  }).current;
-  updateBranchData(data, chat.messages);
-  const getBranchState = useCallback(
-    (messageId) => {
-      return getBranchStateImpl(data, chat.messages, messageId);
-    },
-    [data, chat.messages]
-  );
-  const switchToBranch = useCallback(
-    (messageId, branchId) => {
-      const newMessages = switchToBranchImpl(
-        data,
-        chat.messages,
-        messageId,
-        branchId
-      );
-      chat.setMessages(newMessages);
-    },
-    [data, chat.messages, chat.setMessages]
-  );
-  const reloadMaybe = "reload" in chat ? chat.reload : void 0;
-  const startRun = useCallback(
-    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);
-      context.useViewport.getState().scrollToBottom();
-      await reloadMaybe();
-    },
-    [context, chat.messages, chat.setMessages, reloadMaybe]
-  );
-  const append = useCallback(
-    async (message) => {
-      const newMessages = sliceMessagesUntil(chat.messages, message.parentId);
-      chat.setMessages(newMessages);
-      if (message.content.length !== 1 || message.content[0]?.type !== "text")
-        throw new Error("Only text content is currently supported");
-      context.useViewport.getState().scrollToBottom();
-      await chat.append({
-        role: "user",
-        content: message.content[0].text
-      });
-    },
-    [context, chat.messages, chat.setMessages, chat.append]
   );
-  return useMemo(
-    () => ({
-      getBranchState,
-      switchToBranch,
-      append,
-      startRun
-    }),
-    [getBranchState, switchToBranch, append, startRun]
-  );
-};
-var hasUpcomingMessage = (thread) => {
-  return thread.isRunning && thread.messages[thread.messages.length - 1]?.role !== "assistant";
-};
+});
 
 // src/utils/context/useComposerContext.ts
 import { useContext as useContext3 } from "react";
@@ -360,7 +226,7 @@ __export(message_exports, {
 });
 
 // src/primitives/message/MessageProvider.tsx
-import { useMemo as useMemo2, useState } from "react";
+import { useMemo, useState } from "react";
 import { create as create2 } from "zustand";
 
 // src/utils/context/stores/ComposerStore.ts
@@ -378,7 +244,6 @@ var makeMessageComposerStore = ({
   onSend
 }) => create()((set, get, store) => ({
   ...makeBaseComposer(set, get, store),
-  canCancel: true,
   isEditing: false,
   edit: () => {
     const value = onEdit();
@@ -387,39 +252,48 @@ var makeMessageComposerStore = ({
   send: () => {
     const value = get().value;
     set({ isEditing: false });
-    return onSend(value);
+    onSend(value);
   },
   cancel: () => {
+    if (!get().isEditing)
+      return false;
     set({ isEditing: false });
+    return true;
   }
 }));
-var makeThreadComposerStore = ({
-  onSend,
-  onCancel
-}) => create()((set, get, store) => ({
-  ...makeBaseComposer(set, get, store),
-  isEditing: true,
-  canCancel: false,
-  send: () => {
-    const value = get().value;
-    set({ value: "", canCancel: true });
-    onSend(value).then(() => {
-      set({ canCancel: false });
-    });
-  },
-  cancel: onCancel
-}));
+var makeThreadComposerStore = (useThread) => create()((set, get, store) => {
+  return {
+    ...makeBaseComposer(set, get, store),
+    isEditing: true,
+    send: () => {
+      const { value } = get();
+      set({ value: "" });
+      useThread.getState().append({
+        parentId: useThread.getState().messages.at(-1)?.id ?? null,
+        content: [{ type: "text", text: value }]
+      });
+    },
+    cancel: () => {
+      const thread = useThread.getState();
+      if (!thread.isRunning)
+        return false;
+      useThread.getState().cancelRun();
+      return true;
+    }
+  };
+});
 
 // src/primitives/message/MessageProvider.tsx
+import { jsx as jsx4 } from "react/jsx-runtime";
 var getIsLast = (thread, message) => {
-  const hasUpcoming = hasUpcomingMessage(thread);
-  return hasUpcoming ? message.id === UPCOMING_MESSAGE_ID : thread.messages[thread.messages.length - 1]?.id === message.id;
+  return thread.messages[thread.messages.length - 1]?.id === message.id;
 };
 var useMessageContext2 = () => {
+  const { useThread } = useAssistantContext();
   const [context] = useState(() => {
-    const { useThread } = useAssistantContext();
     const useMessage = create2(() => ({
       message: null,
+      branches: [],
       isLast: false,
       isCopied: false,
       isHovering: false,
@@ -439,7 +313,7 @@ var useMessageContext2 = () => {
       },
       onSend: (text) => {
         const message = useMessage.getState().message;
-        return useThread.getState().append({
+        useThread.getState().append({
           parentId: message.parentId,
           content: [{ type: "text", text }]
         });
@@ -456,12 +330,14 @@ var MessageProvider = ({
   const { useThread } = useAssistantContext();
   const context = useMessageContext2();
   const isLast = useThread((thread) => getIsLast(thread, message));
+  const branches = useThread((thread) => thread.getBranches(message.id));
   const [isCopied, setIsCopied] = useState(false);
   const [isHovering, setIsHovering] = useState(false);
-  useMemo2(() => {
+  useMemo(() => {
     context.useMessage.setState(
       {
         message,
+        branches,
         isLast,
         isCopied,
         isHovering,
@@ -470,8 +346,8 @@ var MessageProvider = ({
       },
       true
     );
-  }, [context, message, isLast, isCopied, isHovering]);
-  return /* @__PURE__ */ React.createElement(MessageContext.Provider, { value: context }, children);
+  }, [context, message, branches, isLast, isCopied, isHovering]);
+  return /* @__PURE__ */ jsx4(MessageContext.Provider, { value: context, children });
 };
 
 // src/primitives/message/MessageRoot.tsx
@@ -480,6 +356,7 @@ import {
   Primitive as Primitive3
 } from "@radix-ui/react-primitive";
 import { forwardRef as forwardRef3 } from "react";
+import { jsx as jsx5 } from "react/jsx-runtime";
 var MessageRoot = forwardRef3(
   ({ onMouseEnter, onMouseLeave, ...rest }, ref) => {
     const { useMessage } = useMessageContext();
@@ -490,7 +367,7 @@ var MessageRoot = forwardRef3(
     const handleMouseLeave = () => {
       setIsHovering(false);
     };
-    return /* @__PURE__ */ React.createElement(
+    return /* @__PURE__ */ jsx5(
       Primitive3.div,
       {
         ...rest,
@@ -505,8 +382,8 @@ var MessageRoot = forwardRef3(
 // src/primitives/message/MessageIf.tsx
 var useMessageIf = (props) => {
   const { useMessage } = useMessageContext();
-  return useMessage(({ message, isLast, isCopied, isHovering }) => {
-    if (props.hasBranches === true && message.branchCount < 2)
+  return useMessage(({ message, branches, isLast, isCopied, isHovering }) => {
+    if (props.hasBranches === true && branches.length < 2)
       return false;
     if (props.user && message.role !== "user")
       return false;
@@ -527,8 +404,9 @@ var MessageIf = ({ children, ...query }) => {
 };
 
 // src/primitives/message/MessageContent.tsx
+import { Fragment, jsx as jsx6 } from "react/jsx-runtime";
 var defaultComponents = {
-  Text: ({ part }) => /* @__PURE__ */ React.createElement(React.Fragment, null, part.text),
+  Text: ({ part }) => /* @__PURE__ */ jsx6(Fragment, { children: part.text }),
   Image: () => null,
   UI: ({ part }) => part.display,
   tools: {
@@ -545,26 +423,27 @@ var MessageContent = ({
 }) => {
   const { useMessage } = useMessageContext();
   const content = useMessage((s) => s.message.content);
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, content.map((part, i) => {
+  return /* @__PURE__ */ jsx6(Fragment, { children: content.map((part, i) => {
     const key = i;
     switch (part.type) {
       case "text":
-        return /* @__PURE__ */ React.createElement(Text, { key, part });
+        return /* @__PURE__ */ jsx6(Text, { part }, key);
       case "image":
-        return /* @__PURE__ */ React.createElement(Image, { key, part });
+        return /* @__PURE__ */ jsx6(Image, { part }, key);
       case "ui":
-        return /* @__PURE__ */ React.createElement(UI, { key, part });
+        return /* @__PURE__ */ jsx6(UI, { part }, key);
       case "tool-call": {
         const Tool = by_name[part.name] || Fallback;
-        return /* @__PURE__ */ React.createElement(Tool, { key, part });
+        return /* @__PURE__ */ jsx6(Tool, { part }, key);
       }
       default:
         return null;
     }
-  }));
+  }) });
 };
 
 // src/primitives/thread/ThreadMessages.tsx
+import { Fragment as Fragment2, jsx as jsx7, jsxs as jsxs2 } from "react/jsx-runtime";
 var getComponents = (components) => {
   return {
     EditComposer: components.EditComposer ?? components.UserMessage ?? components.Message,
@@ -579,27 +458,18 @@ var ThreadMessages = ({ components }) => {
   const { UserMessage, EditComposer, AssistantMessage } = getComponents(components);
   if (messages.length === 0)
     return null;
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, messages.map((message, idx) => {
+  return /* @__PURE__ */ jsx7(Fragment2, { children: messages.map((message, idx) => {
     return (
       // biome-ignore lint/suspicious/noArrayIndexKey: fixes a11y issues with branch navigation
-      /* @__PURE__ */ React.createElement(MessageProvider, { key: idx, message }, /* @__PURE__ */ React.createElement(MessageIf, { user: true }, /* @__PURE__ */ React.createElement(ComposerIf, { editing: false }, /* @__PURE__ */ React.createElement(UserMessage, null)), /* @__PURE__ */ React.createElement(ComposerIf, { editing: true }, /* @__PURE__ */ React.createElement(EditComposer, null))), /* @__PURE__ */ React.createElement(MessageIf, { assistant: true }, /* @__PURE__ */ React.createElement(AssistantMessage, null)))
+      /* @__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)
     );
-  }), hasUpcomingMessage(thread) && /* @__PURE__ */ React.createElement(
-    MessageProvider,
-    {
-      message: {
-        id: UPCOMING_MESSAGE_ID,
-        role: "assistant",
-        content: [{ type: "text", text: "..." }],
-        parentId: messages.at(-1)?.id ?? ROOT_PARENT_ID,
-        // TODO fix these (move upcoming message to AssistantContext)
-        branchId: 0,
-        branchCount: 1,
-        createdAt: /* @__PURE__ */ new Date()
-      }
-    },
-    /* @__PURE__ */ React.createElement(AssistantMessage, null)
-  ));
+  }) });
 };
 
 // src/primitives/thread/ThreadScrollToBottom.tsx
@@ -608,13 +478,14 @@ import {
   Primitive as Primitive4
 } from "@radix-ui/react-primitive";
 import { forwardRef as forwardRef4 } from "react";
+import { jsx as jsx8 } from "react/jsx-runtime";
 var ThreadScrollToBottom = forwardRef4(({ onClick, ...rest }, ref) => {
   const { useViewport } = useAssistantContext();
   const isAtBottom = useViewport((s) => s.isAtBottom);
   const handleScrollToBottom = () => {
     useViewport.getState().scrollToBottom();
   };
-  return /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ jsx8(
     Primitive4.button,
     {
       ...rest,
@@ -641,11 +512,13 @@ import { useComposedRefs as useComposedRefs2 } from "@radix-ui/react-compose-ref
 import {
   Primitive as Primitive5
 } from "@radix-ui/react-primitive";
-import { forwardRef as forwardRef5, useRef as useRef5 } from "react";
+import { forwardRef as forwardRef5, useRef as useRef4 } from "react";
+import { jsx as jsx9 } from "react/jsx-runtime";
 var ComposerRoot = forwardRef5(
   ({ onSubmit, ...rest }, forwardedRef) => {
+    const { useViewport } = useAssistantContext();
     const { useComposer } = useComposerContext();
-    const formRef = useRef5(null);
+    const formRef = useRef4(null);
     const ref = useComposedRefs2(forwardedRef, formRef);
     const handleSubmit = (e) => {
       const composerState = useComposer.getState();
@@ -653,8 +526,9 @@ var ComposerRoot = forwardRef5(
         return;
       e.preventDefault();
       composerState.send();
+      useViewport.getState().scrollToBottom();
     };
-    return /* @__PURE__ */ React.createElement(
+    return /* @__PURE__ */ jsx9(
       Primitive5.form,
       {
         ...rest,
@@ -671,14 +545,15 @@ import { useComposedRefs as useComposedRefs3 } from "@radix-ui/react-compose-ref
 import { Slot } from "@radix-ui/react-slot";
 import {
   forwardRef as forwardRef6,
-  useCallback as useCallback2,
+  useCallback,
   useEffect as useEffect2,
-  useRef as useRef6
+  useRef as useRef5
 } from "react";
 import TextareaAutosize from "react-textarea-autosize";
+import { jsx as jsx10 } from "react/jsx-runtime";
 var ComposerInput = forwardRef6(
   ({ autoFocus, asChild, disabled, onChange, onKeyDown, ...rest }, forwardedRef) => {
-    const { useThread } = useAssistantContext();
+    const { useThread, useViewport } = useAssistantContext();
     const { useComposer, type } = useComposerContext();
     const value = useComposer((c) => {
       if (!c.isEditing)
@@ -690,22 +565,23 @@ var ComposerInput = forwardRef6(
       if (disabled)
         return;
       const composer = useComposer.getState();
-      if (e.key === "Escape" && composer.canCancel) {
-        e.preventDefault();
-        useComposer.getState().cancel();
-      }
-      if (e.key === "Enter" && e.shiftKey === false) {
+      if (e.key === "Escape") {
+        if (useComposer.getState().cancel()) {
+          e.preventDefault();
+        }
+      } else if (e.key === "Enter" && e.shiftKey === false) {
         const isRunning = useThread.getState().isRunning;
         if (!isRunning) {
           e.preventDefault();
           composer.send();
+          useViewport.getState().scrollToBottom();
         }
       }
     };
-    const textareaRef = useRef6(null);
+    const textareaRef = useRef5(null);
     const ref = useComposedRefs3(forwardedRef, textareaRef);
     const autoFocusEnabled = autoFocus !== false && !disabled;
-    const focus = useCallback2(() => {
+    const focus = useCallback(() => {
       const textarea = textareaRef.current;
       if (!textarea || !autoFocusEnabled)
         return;
@@ -721,7 +597,7 @@ var ComposerInput = forwardRef6(
         focus();
       }
     });
-    return /* @__PURE__ */ React.createElement(
+    return /* @__PURE__ */ jsx10(
       Component,
       {
         value,
@@ -745,11 +621,12 @@ import {
   Primitive as Primitive6
 } from "@radix-ui/react-primitive";
 import { forwardRef as forwardRef7 } from "react";
+import { jsx as jsx11 } from "react/jsx-runtime";
 var ComposerSend = forwardRef7(
   ({ disabled, ...rest }, ref) => {
     const { useComposer } = useComposerContext();
     const hasValue = useComposer((c) => c.isEditing && c.value.length > 0);
-    return /* @__PURE__ */ React.createElement(
+    return /* @__PURE__ */ jsx11(
       Primitive6.button,
       {
         type: "submit",
@@ -767,20 +644,19 @@ import {
   Primitive as Primitive7
 } from "@radix-ui/react-primitive";
 import { forwardRef as forwardRef8 } from "react";
-var ComposerCancel = forwardRef8(({ disabled, onClick, ...rest }, ref) => {
+import { jsx as jsx12 } from "react/jsx-runtime";
+var ComposerCancel = forwardRef8(({ onClick, ...rest }, ref) => {
   const { useComposer } = useComposerContext();
-  const hasValue = useComposer((c) => c.canCancel);
-  const handleClose = () => {
+  const handleCancel = () => {
     useComposer.getState().cancel();
   };
-  return /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ jsx12(
     Primitive7.button,
     {
       type: "button",
       ...rest,
       ref,
-      onClick: composeEventHandlers6(onClick, handleClose),
-      disabled: disabled || !hasValue
+      onClick: composeEventHandlers6(onClick, handleCancel)
     }
   );
 });
@@ -796,7 +672,7 @@ __export(branchPicker_exports, {
 });
 
 // src/utils/context/combined/useCombinedStore.ts
-import { useMemo as useMemo3 } from "react";
+import { useMemo as useMemo2 } from "react";
 
 // src/utils/context/combined/createCombinedStore.ts
 import { useSyncExternalStore } from "react";
@@ -817,37 +693,38 @@ var createCombinedStore = (stores) => {
 
 // src/utils/context/combined/useCombinedStore.ts
 var useCombinedStore = (stores, selector) => {
-  const useCombined = useMemo3(() => createCombinedStore(stores), stores);
+  const useCombined = useMemo2(() => createCombinedStore(stores), stores);
   return useCombined(selector);
 };
 
 // src/actions/useGoToNextBranch.tsx
 var useGoToNextBranch = () => {
   const { useThread } = useAssistantContext();
-  const { useComposer, useMessage } = useMessageContext();
+  const { useMessage, useComposer } = useMessageContext();
   const disabled = useCombinedStore(
-    [useThread, useComposer, useMessage],
-    (t, c, m) => t.isRunning || c.isEditing || m.message.branchId + 1 >= m.message.branchCount
+    [useMessage, useComposer],
+    (m, c) => c.isEditing || m.branches.indexOf(m.message.id) + 1 >= m.branches.length
   );
   if (disabled)
     return null;
   return () => {
-    const { message } = useMessage.getState();
-    useThread.getState().switchToBranch(message.id, message.branchId + 1);
+    const { message, branches } = useMessage.getState();
+    useThread.getState().switchToBranch(branches[branches.indexOf(message.id) + 1]);
   };
 };
 
 // src/utils/createActionButton.tsx
-import { forwardRef as forwardRef9 } from "react";
+import { composeEventHandlers as composeEventHandlers7 } from "@radix-ui/primitive";
 import {
   Primitive as Primitive8
 } from "@radix-ui/react-primitive";
-import { composeEventHandlers as composeEventHandlers7 } from "@radix-ui/primitive";
+import { forwardRef as forwardRef9 } from "react";
+import { jsx as jsx13 } from "react/jsx-runtime";
 var createActionButton = (useActionButton) => {
   return forwardRef9(
     (props, forwardedRef) => {
       const onClick = useActionButton(props);
-      return /* @__PURE__ */ React.createElement(
+      return /* @__PURE__ */ jsx13(
         Primitive8.button,
         {
           type: "button",
@@ -867,16 +744,19 @@ var BranchPickerNext = createActionButton(useGoToNextBranch);
 // src/actions/useGoToPreviousBranch.tsx
 var useGoToPreviousBranch = () => {
   const { useThread } = useAssistantContext();
-  const { useComposer, useMessage } = useMessageContext();
+  const { useMessage, useComposer } = useMessageContext();
   const disabled = useCombinedStore(
-    [useThread, useComposer, useMessage],
-    (t, c, m) => t.isRunning || c.isEditing || m.message.branchId <= 0
+    [useMessage, useComposer],
+    (m, c) => c.isEditing || m.branches.indexOf(m.message.id) <= 0
   );
   if (disabled)
     return null;
   return () => {
-    const { message } = useMessage.getState();
-    useThread.getState().switchToBranch(message.id, message.branchId - 1);
+    const { message, branches } = useMessage.getState();
+    useThread.getState().switchToBranch(
+      branches[branches.indexOf(message.id) - 1]
+      // TODO probably there's a more elegant way to do this
+    );
   };
 };
 
@@ -884,17 +764,19 @@ var useGoToPreviousBranch = () => {
 var BranchPickerPrevious = createActionButton(useGoToPreviousBranch);
 
 // src/primitives/branchPicker/BranchPickerCount.tsx
+import { Fragment as Fragment3, jsx as jsx14 } from "react/jsx-runtime";
 var BranchPickerCount = () => {
   const { useMessage } = useMessageContext();
-  const branchCount = useMessage((s) => s.message.branchCount);
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, branchCount);
+  const branchCount = useMessage((s) => s.branches.length);
+  return /* @__PURE__ */ jsx14(Fragment3, { children: branchCount });
 };
 
 // src/primitives/branchPicker/BranchPickerNumber.tsx
+import { Fragment as Fragment4, jsx as jsx15 } from "react/jsx-runtime";
 var BranchPickerNumber = () => {
   const { useMessage } = useMessageContext();
-  const branchId = useMessage((s) => s.message.branchId);
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, branchId + 1);
+  const branchIdx = useMessage((s) => s.branches.indexOf(s.message.id));
+  return /* @__PURE__ */ jsx15(Fragment4, { children: branchIdx + 1 });
 };
 
 // src/primitives/branchPicker/BranchPickerRoot.tsx
@@ -902,8 +784,9 @@ import {
   Primitive as Primitive9
 } from "@radix-ui/react-primitive";
 import { forwardRef as forwardRef10 } from "react";
+import { jsx as jsx16 } from "react/jsx-runtime";
 var BranchPickerRoot = forwardRef10(({ hideWhenSingleBranch, ...rest }, ref) => {
-  return /* @__PURE__ */ React.createElement(MessageIf, { hasBranches: hideWhenSingleBranch ? true : void 0 }, /* @__PURE__ */ React.createElement(Primitive9.div, { ...rest, ref }));
+  return /* @__PURE__ */ jsx16(MessageIf, { hasBranches: hideWhenSingleBranch ? true : void 0, children: /* @__PURE__ */ jsx16(Primitive9.div, { ...rest, ref }) });
 });
 
 // src/primitives/actionBar/index.ts
@@ -920,6 +803,7 @@ import {
   Primitive as Primitive10
 } from "@radix-ui/react-primitive";
 import { forwardRef as forwardRef11 } from "react";
+import { jsx as jsx17 } from "react/jsx-runtime";
 var ActionBarRoot = forwardRef11(({ hideWhenRunning, autohide, autohideFloat, ...rest }, ref) => {
   const { useThread } = useAssistantContext();
   const { useMessage } = useMessageContext();
@@ -933,14 +817,14 @@ var ActionBarRoot = forwardRef11(({ hideWhenRunning, autohide, autohideFloat, ..
         return "normal" /* Normal */;
       if (!m.isHovering)
         return "hidden" /* Hidden */;
-      if (autohideFloat === "always" || autohideFloat === "single-branch" && m.message.branchCount <= 1)
+      if (autohideFloat === "always" || autohideFloat === "single-branch" && m.branches.length <= 1)
         return "floating" /* Floating */;
       return "normal" /* Normal */;
     }
   );
   if (hideAndfloatStatus === "hidden" /* Hidden */)
     return null;
-  return /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ jsx17(
     Primitive10.div,
     {
       "data-floating": hideAndfloatStatus === "floating" /* Floating */,
@@ -971,7 +855,7 @@ var ActionBarCopy = createActionButton(useCopyMessage);
 
 // src/actions/useReloadMessage.tsx
 var useReloadMessage = () => {
-  const { useThread } = useAssistantContext();
+  const { useThread, useViewport } = useAssistantContext();
   const { useMessage } = useMessageContext();
   const disabled = useCombinedStore(
     [useThread, useMessage],
@@ -984,6 +868,7 @@ var useReloadMessage = () => {
     if (message.role !== "assistant")
       throw new Error("Reloading is only supported on assistant messages");
     useThread.getState().startRun(message.parentId);
+    useViewport.getState().scrollToBottom();
   };
 };
 
@@ -1036,45 +921,274 @@ var makeViewportStore = () => {
 };
 
 // src/adapters/vercel/useDummyAIAssistantContext.tsx
+var makeDummyThreadStore = () => {
+  return create4(() => ({
+    messages: [],
+    isRunning: false,
+    getBranches: () => {
+      return [];
+    },
+    switchToBranch: () => {
+      throw new Error("Not implemented");
+    },
+    append: async () => {
+      throw new Error("Not implemented");
+    },
+    cancelRun: () => {
+      throw new Error("Not implemented");
+    },
+    startRun: async () => {
+      throw new Error("Not implemented");
+    }
+  }));
+};
 var useDummyAIAssistantContext = () => {
   const [context] = useState2(() => {
-    const useThread = create4()(() => ({
-      id: "",
-      messages: [],
-      isRunning: false,
-      append: async () => {
-        throw new Error("Not implemented");
-      },
-      cancelRun: () => {
-        throw new Error("Not implemented");
-      },
-      switchToBranch: () => {
-        throw new Error("Not implemented");
-      },
-      startRun: async () => {
-        throw new Error("Not implemented");
-      }
-    }));
+    const useThread = makeDummyThreadStore();
     const useViewport = makeViewportStore();
-    const useComposer = makeThreadComposerStore({
-      onSend: async (text) => {
-        await useThread.getState().append({
-          parentId: useThread.getState().messages.at(-1)?.id ?? ROOT_PARENT_ID,
-          content: [{ type: "text", text }]
-        });
-      },
-      onCancel: () => {
-        useThread.getState().cancelRun();
-      }
-    });
+    const useComposer = makeThreadComposerStore(useThread);
     return { useThread, useViewport, useComposer };
   });
   return context;
 };
 
+// src/adapters/vercel/useVercelAIBranches.tsx
+import { useCallback as useCallback2, useMemo as useMemo3, useRef as useRef6, useState as useState3 } from "react";
+
+// src/adapters/MessageRepository.tsx
+import { customAlphabet } from "nanoid/non-secure";
+var generateId = customAlphabet(
+  "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
+  7
+);
+var optimisticPrefix = "__optimistic__";
+var generateOptimisticId = () => `${optimisticPrefix}${generateId()}`;
+var isOptimisticId = (id) => id.startsWith(optimisticPrefix);
+var findHead = (message) => {
+  if (message.next)
+    return findHead(message.next);
+  return message;
+};
+var MessageRepository = class {
+  messages = /* @__PURE__ */ new Map();
+  // message_id -> item
+  head = null;
+  rootChildren = [];
+  getMessages() {
+    const messages = new Array(this.head?.level ?? 0);
+    for (let current = this.head; current; current = current.prev) {
+      messages[current.level] = current.current;
+    }
+    return messages;
+  }
+  addOrUpdateMessage(message) {
+    const item = this.messages.get(message.id);
+    if (item) {
+      if (item.current.parentId !== message.parentId) {
+        this.deleteMessage(message.id);
+      } else {
+        item.current = message;
+        return;
+      }
+    }
+    const prev = message.parentId ? this.messages.get(message.parentId) : null;
+    if (prev === void 0)
+      throw new Error("Unexpected: Parent message not found");
+    const newItem = {
+      prev,
+      current: message,
+      next: null,
+      children: [],
+      level: prev ? prev.level + 1 : 0
+    };
+    this.messages.set(message.id, newItem);
+    if (prev) {
+      prev.children = [...prev.children, message.id];
+      prev.next = newItem;
+    } else {
+      this.rootChildren = [...this.rootChildren, message.id];
+    }
+    if (this.head === prev) {
+      this.head = newItem;
+    }
+  }
+  deleteMessage(messageId) {
+    const message = this.messages.get(messageId);
+    if (!message)
+      throw new Error("Unexpected: Message not found");
+    if (message.children.length > 0) {
+      for (const child of message.children) {
+        this.deleteMessage(child);
+      }
+    }
+    this.messages.delete(messageId);
+    if (message.prev) {
+      message.prev.children = message.prev.children.filter(
+        (m) => m !== messageId
+      );
+      if (message.prev.next === message) {
+        const childId = message.prev.children.at(-1);
+        const child = childId ? this.messages.get(childId) : null;
+        if (child === void 0)
+          throw new Error("Unexpected: Child message not found");
+        message.prev.next = child;
+      }
+    } else {
+      this.rootChildren = this.rootChildren.filter((m) => m !== messageId);
+    }
+    if (this.head === message) {
+      this.head = message.prev ? findHead(message.prev) : null;
+    }
+  }
+  getOptimisticId = () => {
+    let optimisticId;
+    do {
+      optimisticId = generateOptimisticId();
+    } while (this.messages.has(optimisticId));
+    return optimisticId;
+  };
+  commitOptimisticRun(parentId) {
+    const optimisticId = this.getOptimisticId();
+    this.addOrUpdateMessage({
+      id: optimisticId,
+      role: "assistant",
+      content: [
+        {
+          type: "text",
+          text: ""
+        }
+      ],
+      parentId,
+      createdAt: /* @__PURE__ */ new Date()
+    });
+    return optimisticId;
+  }
+  getBranches(messageId) {
+    const message = this.messages.get(messageId);
+    if (!message)
+      throw new Error("Unexpected: Message not found");
+    if (message.prev) {
+      return message.prev.children;
+    }
+    return this.rootChildren;
+  }
+  switchToBranch(messageId) {
+    const message = this.messages.get(messageId);
+    if (!message)
+      throw new Error("Unexpected: Branch not found");
+    if (message.prev) {
+      message.prev.next = message;
+    }
+    this.head = findHead(message);
+  }
+  resetHead(messageId) {
+    if (messageId) {
+      const message = this.messages.get(messageId);
+      if (!message)
+        throw new Error("Unexpected: Branch not found");
+      this.head = message;
+      for (let current = message; current; current = current.prev) {
+        if (current.prev) {
+          current.prev.next = current;
+        }
+      }
+    } else {
+      this.head = null;
+    }
+  }
+};
+
+// src/adapters/vercel/useVercelAIBranches.tsx
+var sliceMessagesUntil = (messages, messageId) => {
+  if (messageId == null)
+    return [];
+  if (isOptimisticId(messageId))
+    return messages;
+  const messageIdx = messages.findIndex((m) => m.id === messageId);
+  if (messageIdx === -1)
+    throw new Error("Unexpected: Message not found");
+  return messages.slice(0, messageIdx + 1);
+};
+var hasUpcomingMessage = (isRunning, messages) => {
+  return isRunning && messages[messages.length - 1]?.role !== "assistant";
+};
+var useVercelAIBranches = (chat, messages) => {
+  const [data] = useState3(() => new MessageRepository());
+  const isRunning = "isLoading" in chat ? chat.isLoading : chat.status === "in_progress";
+  const assistantOptimisticIdRef = useRef6(null);
+  const messagesEx = useMemo3(() => {
+    for (const message of messages) {
+      data.addOrUpdateMessage(message);
+    }
+    if (assistantOptimisticIdRef.current) {
+      data.deleteMessage(assistantOptimisticIdRef.current);
+      assistantOptimisticIdRef.current = null;
+    }
+    if (hasUpcomingMessage(isRunning, messages)) {
+      assistantOptimisticIdRef.current = data.commitOptimisticRun(
+        messages.at(-1)?.id ?? null
+      );
+    }
+    data.resetHead(
+      assistantOptimisticIdRef.current ?? messages.at(-1)?.id ?? null
+    );
+    return data.getMessages();
+  }, [data, isRunning, messages]);
+  const getBranches = useCallback2(
+    (messageId) => {
+      return data.getBranches(messageId);
+    },
+    [data]
+  );
+  const switchToBranch = useCallback2(
+    (messageId) => {
+      data.switchToBranch(messageId);
+      chat.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]
+  );
+  return useMemo3(
+    () => ({
+      messages: messagesEx,
+      getBranches,
+      switchToBranch,
+      append,
+      startRun
+    }),
+    [messagesEx, getBranches, switchToBranch, append, startRun]
+  );
+};
+
 // src/adapters/vercel/VercelAIAssistantProvider.tsx
+import { jsx as jsx18 } from "react/jsx-runtime";
 var ThreadMessageCache = /* @__PURE__ */ new WeakMap();
-var vercelToThreadMessage = (message, parentId, branchId, branchCount) => {
+var vercelToThreadMessage = (message, parentId) => {
   if (message.role !== "user" && message.role !== "assistant")
     throw new Error("Unsupported role");
   return {
@@ -1082,24 +1196,17 @@ var vercelToThreadMessage = (message, parentId, branchId, branchCount) => {
     id: message.id,
     role: message.role,
     content: [{ type: "text", text: message.content }],
-    branchId,
-    branchCount,
-    createdAt: message.createdAt ?? /* @__PURE__ */ new Date()
+    createdAt: message.createdAt ?? /* @__PURE__ */ new Date(),
+    innerMessage: message
   };
 };
-var vercelToCachedThreadMessages = (messages, getBranchState) => {
+var vercelToCachedThreadMessages = (messages) => {
   return messages.map((m, idx) => {
     const cached = ThreadMessageCache.get(m);
-    const parentId = messages[idx - 1]?.id ?? ROOT_PARENT_ID;
-    const { branchId, branchCount } = getBranchState(m.id);
-    if (cached && cached.parentId === parentId && cached.branchId === branchId && cached.branchCount === branchCount)
+    const parentId = messages[idx - 1]?.id ?? null;
+    if (cached && cached.parentId === parentId)
       return cached;
-    const newMessage = vercelToThreadMessage(
-      m,
-      parentId,
-      branchId,
-      branchCount
-    );
+    const newMessage = vercelToThreadMessage(m, parentId);
     ThreadMessageCache.set(m, newMessage);
     return newMessage;
   });
@@ -1110,13 +1217,10 @@ var VercelAIAssistantProvider = ({
 }) => {
   const context = useDummyAIAssistantContext();
   const vercel = "chat" in rest ? rest.chat : rest.assistant;
-  const branches = useVercelAIBranches(vercel, context);
   const messages = useMemo4(() => {
-    return vercelToCachedThreadMessages(
-      vercel.messages,
-      branches.getBranchState
-    );
-  }, [vercel.messages, branches.getBranchState]);
+    return vercelToCachedThreadMessages(vercel.messages);
+  }, [vercel.messages]);
+  const branches = useVercelAIBranches(vercel, messages);
   const cancelRun = useCallback3(() => {
     const lastMessage = vercel.messages.at(-1);
     vercel.stop();
@@ -1126,23 +1230,26 @@ var VercelAIAssistantProvider = ({
   }, [vercel.messages, vercel.stop, vercel.setInput]);
   const isRunning = "isLoading" in vercel ? vercel.isLoading : vercel.status === "in_progress";
   useMemo4(() => {
-    context.useThread.setState({
-      messages,
-      isRunning,
-      cancelRun,
-      switchToBranch: branches.switchToBranch,
-      append: branches.append,
-      startRun: branches.startRun
-    });
-  }, [context, messages, isRunning, cancelRun, branches]);
+    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]);
   useMemo4(() => {
     context.useComposer.setState({
-      canCancel: isRunning,
       value: vercel.input,
       setValue: vercel.setInput
     });
-  }, [context, isRunning, vercel.input, vercel.setInput]);
-  return /* @__PURE__ */ React.createElement(AssistantContext.Provider, { value: context }, children);
+  }, [context, vercel.input, vercel.setInput]);
+  return /* @__PURE__ */ jsx18(AssistantContext.Provider, { value: context, children });
 };
 
 // src/adapters/vercel/VercelRSCAssistantProvider.tsx
@@ -1150,6 +1257,7 @@ import {
   useCallback as useCallback4,
   useMemo as useMemo5
 } from "react";
+import { jsx as jsx19 } from "react/jsx-runtime";
 var ThreadMessageCache2 = /* @__PURE__ */ new WeakMap();
 var vercelToThreadMessage2 = (parentId, message) => {
   if (message.role !== "user" && message.role !== "assistant")
@@ -1159,15 +1267,13 @@ var vercelToThreadMessage2 = (parentId, message) => {
     id: message.id,
     role: message.role,
     content: [{ type: "ui", display: message.display }],
-    createdAt: message.createdAt ?? /* @__PURE__ */ new Date(),
-    branchId: 0,
-    branchCount: 1
+    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 ?? ROOT_PARENT_ID;
+    const parentId = messages[idx - 1]?.id ?? null;
     if (cached && cached.parentId === parentId)
       return cached;
     const newMessage = vercelToThreadMessage2(parentId, m);
@@ -1175,23 +1281,18 @@ var vercelToCachedThreadMessages2 = (messages) => {
     return newMessage;
   });
 };
-var VercelRSCAssistantProvider = ({
-  children,
-  messages: vercelMessages,
-  append: vercelAppend
-}) => {
+var VercelRSCAssistantProvider = ({ children, messages: vercelMessages, append: vercelAppend }) => {
   const context = useDummyAIAssistantContext();
   const messages = useMemo5(() => {
     return vercelToCachedThreadMessages2(vercelMessages);
   }, [vercelMessages]);
   const append = useCallback4(
     async (message) => {
-      if (message.parentId !== (context.useThread.getState().messages.at(-1)?.id ?? ROOT_PARENT_ID))
+      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");
       }
-      context.useViewport.getState().scrollToBottom();
       await vercelAppend(message);
     },
     [context, vercelAppend]
@@ -1202,7 +1303,7 @@ var VercelRSCAssistantProvider = ({
       append
     });
   }, [context, messages, append]);
-  return /* @__PURE__ */ React.createElement(AssistantContext.Provider, { value: context }, children);
+  return /* @__PURE__ */ jsx19(AssistantContext.Provider, { value: context, children });
 };
 export {
   actionBar_exports as ActionBarPrimitive,
@@ -1211,7 +1312,7 @@ export {
   message_exports as MessagePrimitive,
   thread_exports as ThreadPrimitive,
   VercelAIAssistantProvider,
-  VercelRSCAssistantProvider as unstable_VercelRSCAssistantProvider,
+  VercelRSCAssistantProvider,
   useMessageContext as unstable_useMessageContext,
   useBeginMessageEdit,
   useCopyMessage,