@assistant-ui/react 0.0.7 → 0.0.9

package/dist/index.js

@@ -53,6 +53,7 @@ __export(thread_exports, {
   If: () => ThreadIf,
   Messages: () => ThreadMessages,
   Root: () => ThreadRoot,
+  ScrollToBottom: () => ThreadScrollToBottom,
   Viewport: () => ThreadViewport
 });
 
@@ -106,7 +107,7 @@ var ThreadEmpty = ({ children }) => {
 var import_primitive = require("@radix-ui/primitive");
 var import_react_compose_refs = require("@radix-ui/react-compose-refs");
 var import_react_primitive2 = require("@radix-ui/react-primitive");
-var import_react4 = require("react");
+var import_react5 = require("react");
 
 // src/utils/hooks/useOnResizeContent.tsx
 var import_react3 = require("react");
@@ -147,22 +148,55 @@ var useOnResizeContent = (ref, callback) => {
   }, [ref.current]);
 };
 
+// src/utils/hooks/useOnScrollToBottom.tsx
+var import_react4 = require("react");
+var useOnScrollToBottom = (callback) => {
+  const callbackRef = (0, import_react4.useRef)(callback);
+  callbackRef.current = callback;
+  const { useThread } = useAssistantContext();
+  (0, import_react4.useEffect)(() => {
+    return useThread.getState().onScrollToBottom(() => {
+      callbackRef.current();
+    });
+  }, [useThread]);
+};
+
 // src/primitives/thread/ThreadViewport.tsx
-var ThreadViewport = (0, import_react4.forwardRef)(({ onScroll, children, ...rest }, forwardedRef) => {
-  const divRef = (0, import_react4.useRef)(null);
+var ThreadViewport = (0, import_react5.forwardRef)(({ autoScroll = true, onScroll, children, ...rest }, forwardedRef) => {
+  const messagesEndRef = (0, import_react5.useRef)(null);
+  const divRef = (0, import_react5.useRef)(null);
   const ref = (0, import_react_compose_refs.useComposedRefs)(forwardedRef, divRef);
-  const [isAtBottom, setIsAtBottom] = (0, import_react4.useState)(true);
+  const { useThread } = useAssistantContext();
+  const firstRenderRef = (0, import_react5.useRef)(true);
+  const lastScrollTop = (0, import_react5.useRef)(0);
+  const scrollToBottom = () => {
+    const div = messagesEndRef.current;
+    if (!div || !autoScroll)
+      return;
+    const behavior = firstRenderRef.current ? "instant" : "auto";
+    firstRenderRef.current = false;
+    useThread.setState({ isAtBottom: true });
+    div.scrollIntoView({ behavior });
+  };
   useOnResizeContent(divRef, () => {
-    const div = divRef.current;
-    if (!div || !isAtBottom)
+    if (!useThread.getState().isAtBottom)
       return;
-    div.scrollTop = div.scrollHeight;
+    scrollToBottom();
+  });
+  useOnScrollToBottom(() => {
+    scrollToBottom();
   });
   const handleScroll = () => {
     const div = divRef.current;
     if (!div)
       return;
-    setIsAtBottom(div.scrollHeight - div.scrollTop <= div.clientHeight + 50);
+    const isAtBottom = useThread.getState().isAtBottom;
+    const newIsAtBottom = div.scrollHeight - div.scrollTop <= div.clientHeight;
+    if (!newIsAtBottom && lastScrollTop.current < div.scrollTop) {
+    } else if (newIsAtBottom !== isAtBottom) {
+      useThread.setState({ isAtBottom: newIsAtBottom });
+    }
+    lastScrollTop.current = div.scrollTop;
   };
   return /* @__PURE__ */ React.createElement(
     import_react_primitive2.Primitive.div,
@@ -171,19 +205,24 @@ var ThreadViewport = (0, import_react4.forwardRef)(({ onScroll, children, ...res
       onScroll: (0, import_primitive.composeEventHandlers)(onScroll, handleScroll),
       ref
     },
-    children
+    children,
+    /* @__PURE__ */ React.createElement("div", { ref: messagesEndRef })
   );
 });
 
-// src/vercel/useVercelAIBranches.tsx
-var import_react5 = require("react");
-var ROOT_ID = "__ROOT_ID__";
+// src/adapters/vercel/useVercelAIBranches.tsx
+var import_react6 = require("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_ID;
+    const parentId = messages[i - 1]?.id ?? ROOT_PARENT_ID;
     data.parentMap.set(childId, parentId);
     const parentArray = data.branchMap.get(parentId);
     if (!parentArray) {
@@ -194,32 +233,32 @@ var updateBranchData = (data, messages) => {
     data.snapshots.set(childId, messages);
   }
 };
-var getParentId = (data, messages, message) => {
-  if (message.id === UPCOMING_MESSAGE_ID) {
+var getParentId = (data, messages, messageId) => {
+  if (messageId === UPCOMING_MESSAGE_ID) {
     const parent = messages.at(-1);
     if (!parent)
-      return ROOT_ID;
+      return ROOT_PARENT_ID;
     return parent.id;
   }
-  const parentId = data.parentMap.get(message.id);
+  const parentId = data.parentMap.get(messageId);
   if (!parentId)
     throw new Error("Unexpected: Message parent not found");
   return parentId;
 };
-var getBranchStateImpl = (data, messages, message) => {
-  const parentId = getParentId(data, messages, message);
+var getBranchStateImpl = (data, messages, messageId) => {
+  const parentId = getParentId(data, messages, messageId);
   const branches = data.branchMap.get(parentId) ?? [];
-  const branchId = message.id === UPCOMING_MESSAGE_ID ? branches.length : branches.indexOf(message.id);
+  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 = message.id === UPCOMING_MESSAGE_ID ? 1 : 0;
+  const upcomingOffset = messageId === UPCOMING_MESSAGE_ID ? 1 : 0;
   return {
     branchId,
     branchCount: branches.length + upcomingOffset
   };
 };
-var switchToBranchImpl = (data, messages, message, branchId) => {
-  const parentId = getParentId(data, messages, message);
+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");
@@ -228,40 +267,42 @@ var switchToBranchImpl = (data, messages, message, branchId) => {
     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 === message.id)
+  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, message) => {
-  if (message.id === UPCOMING_MESSAGE_ID)
+var sliceMessagesUntil = (messages, messageId) => {
+  if (messageId === ROOT_PARENT_ID)
+    return [];
+  if (messageId === UPCOMING_MESSAGE_ID)
     return messages;
-  const messageIdx = messages.findIndex((m) => m.id === message.id);
+  const messageIdx = messages.findIndex((m) => m.id === messageId);
   if (messageIdx === -1)
     throw new Error("Unexpected: Message not found");
-  return messages.slice(0, messageIdx);
+  return messages.slice(0, messageIdx + 1);
 };
-var useVercelAIBranches = (chat) => {
-  const data = (0, import_react5.useRef)({
+var useVercelAIBranches = (chat, context) => {
+  const data = (0, import_react6.useRef)({
     parentMap: /* @__PURE__ */ new Map(),
     branchMap: /* @__PURE__ */ new Map(),
     snapshots: /* @__PURE__ */ new Map()
   }).current;
   updateBranchData(data, chat.messages);
-  const getBranchState = (0, import_react5.useCallback)(
-    (message) => {
-      return getBranchStateImpl(data, chat.messages, message);
+  const getBranchState = (0, import_react6.useCallback)(
+    (messageId) => {
+      return getBranchStateImpl(data, chat.messages, messageId);
     },
     [data, chat.messages]
   );
-  const switchToBranch = (0, import_react5.useCallback)(
-    (message, branchId) => {
+  const switchToBranch = (0, import_react6.useCallback)(
+    (messageId, branchId) => {
       const newMessages = switchToBranchImpl(
         data,
         chat.messages,
-        message,
+        messageId,
         branchId
       );
       chat.setMessages(newMessages);
@@ -269,61 +310,66 @@ var useVercelAIBranches = (chat) => {
     [data, chat.messages, chat.setMessages]
   );
   const reloadMaybe = "reload" in chat ? chat.reload : void 0;
-  const reloadAt = (0, import_react5.useCallback)(
-    async (message) => {
+  const reload = (0, import_react6.useCallback)(
+    async (messageId) => {
       if (!reloadMaybe)
         throw new Error("Reload not supported by Vercel AI SDK's useAssistant");
-      const newMessages = sliceMessagesUntil(chat.messages, message);
+      const newMessages = sliceMessagesUntil(chat.messages, messageId);
       chat.setMessages(newMessages);
+      context.useThread.getState().scrollToBottom();
       await reloadMaybe();
     },
-    [chat.messages, chat.setMessages, reloadMaybe]
+    [context, chat.messages, chat.setMessages, reloadMaybe]
   );
-  const editAt = (0, import_react5.useCallback)(
-    async (message, newMessage) => {
-      const newMessages = sliceMessagesUntil(chat.messages, message);
+  const append = (0, import_react6.useCallback)(
+    async (message) => {
+      const newMessages = sliceMessagesUntil(chat.messages, message.parentId);
       chat.setMessages(newMessages);
-      if (newMessage.content[0]?.type !== "text")
+      if (message.content.length !== 1 || message.content[0]?.type !== "text")
         throw new Error("Only text content is currently supported");
+      context.useThread.getState().scrollToBottom();
       await chat.append({
         role: "user",
-        content: newMessage.content[0].text
+        content: message.content[0].text
       });
     },
-    [chat.messages, chat.setMessages, chat.append]
+    [context, chat.messages, chat.setMessages, chat.append]
   );
-  return (0, import_react5.useMemo)(
+  return (0, import_react6.useMemo)(
     () => ({
       getBranchState,
       switchToBranch,
-      editAt,
-      reloadAt
+      append,
+      reload
     }),
-    [getBranchState, switchToBranch, editAt, reloadAt]
+    [getBranchState, switchToBranch, append, reload]
   );
 };
 var hasUpcomingMessage = (thread) => {
   return thread.isLoading && thread.messages[thread.messages.length - 1]?.role !== "assistant";
 };
 
-// src/utils/context/ComposerState.ts
-var import_react7 = require("react");
+// src/utils/context/useComposerContext.ts
+var import_react8 = require("react");
 
-// src/utils/context/MessageContext.ts
-var import_react6 = require("react");
-var MessageContext = (0, import_react6.createContext)(null);
+// src/utils/context/useMessageContext.ts
+var import_react7 = require("react");
+var MessageContext = (0, import_react7.createContext)(null);
 var useMessageContext = () => {
-  const context = (0, import_react6.useContext)(MessageContext);
+  const context = (0, import_react7.useContext)(MessageContext);
   if (!context)
     throw new Error("useMessageContext must be used within a MessageProvider");
   return context;
 };
 
-// src/utils/context/ComposerState.ts
+// src/utils/context/useComposerContext.ts
 var useComposerContext = () => {
   const { useComposer: useAssisstantComposer } = useAssistantContext();
-  const { useComposer: useMessageComposer } = (0, import_react7.useContext)(MessageContext) ?? {};
-  return { useComposer: useMessageComposer ?? useAssisstantComposer };
+  const { useComposer: useMessageComposer } = (0, import_react8.useContext)(MessageContext) ?? {};
+  return {
+    useComposer: useMessageComposer ?? useAssisstantComposer,
+    type: useMessageComposer ? "message" : "assistant"
+  };
 };
 
 // src/primitives/composer/ComposerIf.tsx
@@ -352,16 +398,15 @@ __export(message_exports, {
 });
 
 // src/primitives/message/MessageProvider.tsx
-var import_react8 = require("react");
+var import_react9 = require("react");
 var import_zustand = require("zustand");
-var import_shallow = require("zustand/react/shallow");
 var getIsLast = (thread, message) => {
   const hasUpcoming = hasUpcomingMessage(thread);
   return hasUpcoming ? message.id === UPCOMING_MESSAGE_ID : thread.messages[thread.messages.length - 1]?.id === message.id;
 };
 var useMessageContext2 = () => {
-  const { useBranchObserver } = useAssistantContext();
-  const [context] = (0, import_react8.useState)(() => {
+  const [context] = (0, import_react9.useState)(() => {
+    const { useThread } = useAssistantContext();
     const useMessage = (0, import_zustand.create)(() => ({
       message: null,
       isLast: false,
@@ -370,10 +415,6 @@ var useMessageContext2 = () => {
       setIsCopied: () => {
       },
       setIsHovering: () => {
-      },
-      branchState: {
-        branchId: 0,
-        branchCount: 0
       }
     }));
     const useComposer = (0, import_zustand.create)((set, get) => ({
@@ -395,8 +436,8 @@ var useMessageContext2 = () => {
         const message = useMessage.getState().message;
         if (message.role !== "user")
           throw new Error("Editing is only supported for user messages");
-        useBranchObserver.getState().editAt(message, {
-          role: "user",
+        useThread.getState().append({
+          parentId: message.parentId,
           content: [{ type: "text", text: get().value }]
         });
         set({ isEditing: false });
@@ -412,15 +453,12 @@ var MessageProvider = ({
   message,
   children
 }) => {
-  const { useThread, useBranchObserver } = useAssistantContext();
+  const { useThread } = useAssistantContext();
   const context = useMessageContext2();
-  const branchState = useBranchObserver(
-    (0, import_shallow.useShallow)((b) => b.getBranchState(message))
-  );
   const isLast = useThread((thread) => getIsLast(thread, message));
-  const [isCopied, setIsCopied] = (0, import_react8.useState)(false);
-  const [isHovering, setIsHovering] = (0, import_react8.useState)(false);
-  (0, import_react8.useMemo)(() => {
+  const [isCopied, setIsCopied] = (0, import_react9.useState)(false);
+  const [isHovering, setIsHovering] = (0, import_react9.useState)(false);
+  (0, import_react9.useMemo)(() => {
     context.useMessage.setState(
       {
         message,
@@ -428,20 +466,19 @@ var MessageProvider = ({
         isCopied,
         isHovering,
         setIsCopied,
-        setIsHovering,
-        branchState
+        setIsHovering
       },
       true
     );
-  }, [context, message, isLast, isCopied, isHovering, branchState]);
+  }, [context, message, isLast, isCopied, isHovering]);
   return /* @__PURE__ */ React.createElement(MessageContext.Provider, { value: context }, children);
 };
 
 // src/primitives/message/MessageRoot.tsx
 var import_primitive2 = require("@radix-ui/primitive");
 var import_react_primitive3 = require("@radix-ui/react-primitive");
-var import_react9 = require("react");
-var MessageRoot = (0, import_react9.forwardRef)(
+var import_react10 = require("react");
+var MessageRoot = (0, import_react10.forwardRef)(
   ({ onMouseEnter, onMouseLeave, ...rest }, ref) => {
     const { useMessage } = useMessageContext();
     const setIsHovering = useMessage((s) => s.setIsHovering);
@@ -466,29 +503,21 @@ var MessageRoot = (0, import_react9.forwardRef)(
 // src/primitives/message/MessageIf.tsx
 var useMessageIf = (props) => {
   const { useMessage } = useMessageContext();
-  return useMessage(
-    ({
-      message,
-      isLast,
-      isCopied,
-      isHovering,
-      branchState: { branchCount }
-    }) => {
-      if (props.hasBranches === true && branchCount < 2)
-        return false;
-      if (props.user && message.role !== "user")
-        return false;
-      if (props.assistant && message.role !== "assistant")
-        return false;
-      if (props.lastOrHover === true && !isHovering && !isLast)
-        return false;
-      if (props.copied === true && !isCopied)
-        return false;
-      if (props.copied === false && isCopied)
-        return false;
-      return true;
-    }
-  );
+  return useMessage(({ message, isLast, isCopied, isHovering }) => {
+    if (props.hasBranches === true && message.branchCount < 2)
+      return false;
+    if (props.user && message.role !== "user")
+      return false;
+    if (props.assistant && message.role !== "assistant")
+      return false;
+    if (props.lastOrHover === true && !isHovering && !isLast)
+      return false;
+    if (props.copied === true && !isCopied)
+      return false;
+    if (props.copied === false && isCopied)
+      return false;
+    return true;
+  });
 };
 var MessageIf = ({ children, ...query }) => {
   const result = useMessageIf(query);
@@ -559,13 +588,40 @@ var ThreadMessages = ({ components }) => {
       message: {
         id: UPCOMING_MESSAGE_ID,
         role: "assistant",
-        content: [{ type: "text", text: "..." }]
+        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
+var import_primitive3 = require("@radix-ui/primitive");
+var import_react_primitive4 = require("@radix-ui/react-primitive");
+var import_react11 = require("react");
+var ThreadScrollToBottom = (0, import_react11.forwardRef)(({ onClick, ...rest }, ref) => {
+  const { useThread } = useAssistantContext();
+  const isAtBottom = useThread((s) => s.isAtBottom);
+  const handleScrollToBottom = () => {
+    const thread = useThread.getState();
+    thread.scrollToBottom();
+  };
+  return /* @__PURE__ */ React.createElement(
+    import_react_primitive4.Primitive.button,
+    {
+      ...rest,
+      disabled: isAtBottom,
+      ref,
+      onClick: (0, import_primitive3.composeEventHandlers)(onClick, handleScrollToBottom)
+    }
+  );
+});
+
 // src/primitives/composer/index.ts
 var composer_exports = {};
 __export(composer_exports, {
@@ -577,33 +633,15 @@ __export(composer_exports, {
 });
 
 // src/primitives/composer/ComposerRoot.tsx
-var import_primitive3 = require("@radix-ui/primitive");
+var import_primitive4 = require("@radix-ui/primitive");
 var import_react_compose_refs2 = require("@radix-ui/react-compose-refs");
-var import_react_primitive4 = require("@radix-ui/react-primitive");
-var import_react10 = require("react");
-var ComposerFormContext = (0, import_react10.createContext)(null);
-var useComposerFormContext = () => {
-  const context = (0, import_react10.useContext)(ComposerFormContext);
-  if (!context) {
-    throw new Error(
-      "Composer compound components cannot be rendered outside the Composer component"
-    );
-  }
-  return context;
-};
-var ComposerRoot = (0, import_react10.forwardRef)(
+var import_react_primitive5 = require("@radix-ui/react-primitive");
+var import_react12 = require("react");
+var ComposerRoot = (0, import_react12.forwardRef)(
   ({ onSubmit, ...rest }, forwardedRef) => {
     const { useComposer } = useComposerContext();
-    const formRef = (0, import_react10.useRef)(null);
+    const formRef = (0, import_react12.useRef)(null);
     const ref = (0, import_react_compose_refs2.useComposedRefs)(forwardedRef, formRef);
-    const composerContextValue = (0, import_react10.useMemo)(
-      () => ({
-        submit: () => formRef.current?.dispatchEvent(
-          new Event("submit", { cancelable: true, bubbles: true })
-        )
-      }),
-      []
-    );
     const handleSubmit = (e) => {
       const composerState = useComposer.getState();
       if (!composerState.isEditing)
@@ -611,73 +649,96 @@ var ComposerRoot = (0, import_react10.forwardRef)(
       e.preventDefault();
       composerState.send();
     };
-    return /* @__PURE__ */ React.createElement(ComposerFormContext.Provider, { value: composerContextValue }, /* @__PURE__ */ React.createElement(
-      import_react_primitive4.Primitive.form,
+    return /* @__PURE__ */ React.createElement(
+      import_react_primitive5.Primitive.form,
       {
         ...rest,
         ref,
-        onSubmit: (0, import_primitive3.composeEventHandlers)(onSubmit, handleSubmit)
+        onSubmit: (0, import_primitive4.composeEventHandlers)(onSubmit, handleSubmit)
       }
-    ));
+    );
   }
 );
 
 // src/primitives/composer/ComposerInput.tsx
-var import_primitive4 = require("@radix-ui/primitive");
+var import_primitive5 = require("@radix-ui/primitive");
+var import_react_compose_refs3 = require("@radix-ui/react-compose-refs");
 var import_react_slot = require("@radix-ui/react-slot");
-var import_react11 = require("react");
+var import_react13 = require("react");
 var import_react_textarea_autosize = __toESM(require("react-textarea-autosize"));
-var ComposerInput = (0, import_react11.forwardRef)(({ asChild, disabled, onChange, onKeyDown, ...rest }, forwardedRef) => {
-  const { useThread } = useAssistantContext();
-  const isLoading = useThread((t) => t.isLoading);
-  const { useComposer } = useComposerContext();
-  const value = useComposer((c) => {
-    if (!c.isEditing)
-      return "";
-    return c.value;
-  });
-  const Component = asChild ? import_react_slot.Slot : import_react_textarea_autosize.default;
-  const composerForm = useComposerFormContext();
-  const handleKeyPress = (e) => {
-    if (disabled)
-      return;
-    if (e.key === "Escape") {
-      useComposer.getState().cancel();
-    }
-    if (isLoading)
-      return;
-    if (e.key === "Enter" && e.shiftKey === false) {
-      e.preventDefault();
-      composerForm.submit();
-    }
-  };
-  return /* @__PURE__ */ React.createElement(
-    Component,
-    {
-      value,
-      ...rest,
-      ref: forwardedRef,
-      disabled,
-      onChange: (0, import_primitive4.composeEventHandlers)(onChange, (e) => {
-        const composerState = useComposer.getState();
-        if (!composerState.isEditing)
-          return;
-        return composerState.setValue(e.target.value);
-      }),
-      onKeyDown: (0, import_primitive4.composeEventHandlers)(onKeyDown, handleKeyPress)
-    }
-  );
-});
+var ComposerInput = (0, import_react13.forwardRef)(
+  ({ autoFocus, asChild, disabled, onChange, onKeyDown, ...rest }, forwardedRef) => {
+    const { useThread } = useAssistantContext();
+    const { useComposer, type } = useComposerContext();
+    const value = useComposer((c) => {
+      if (!c.isEditing)
+        return "";
+      return c.value;
+    });
+    const Component = asChild ? import_react_slot.Slot : import_react_textarea_autosize.default;
+    const handleKeyPress = (e) => {
+      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) {
+        const isLoading = useThread.getState().isLoading;
+        if (!isLoading) {
+          e.preventDefault();
+          composer.send();
+        }
+      }
+    };
+    const textareaRef = (0, import_react13.useRef)(null);
+    const ref = (0, import_react_compose_refs3.useComposedRefs)(forwardedRef, textareaRef);
+    const autoFocusEnabled = autoFocus !== false && !disabled;
+    const focus = (0, import_react13.useCallback)(() => {
+      const textarea = textareaRef.current;
+      if (!textarea || !autoFocusEnabled)
+        return;
+      textarea.focus();
+      textarea.setSelectionRange(
+        textareaRef.current.value.length,
+        textareaRef.current.value.length
+      );
+    }, [autoFocusEnabled]);
+    (0, import_react13.useEffect)(() => focus(), [focus]);
+    useOnScrollToBottom(() => {
+      if (type === "assistant") {
+        focus();
+      }
+    });
+    return /* @__PURE__ */ React.createElement(
+      Component,
+      {
+        value,
+        ...rest,
+        ref,
+        disabled,
+        onChange: (0, import_primitive5.composeEventHandlers)(onChange, (e) => {
+          const composerState = useComposer.getState();
+          if (!composerState.isEditing)
+            return;
+          return composerState.setValue(e.target.value);
+        }),
+        onKeyDown: (0, import_primitive5.composeEventHandlers)(onKeyDown, handleKeyPress)
+      }
+    );
+  }
+);
 
 // src/primitives/composer/ComposerSend.tsx
-var import_react_primitive5 = require("@radix-ui/react-primitive");
-var import_react12 = require("react");
-var ComposerSend = (0, import_react12.forwardRef)(
+var import_react_primitive6 = require("@radix-ui/react-primitive");
+var import_react14 = require("react");
+var ComposerSend = (0, import_react14.forwardRef)(
   ({ disabled, ...rest }, ref) => {
     const { useComposer } = useComposerContext();
     const hasValue = useComposer((c) => c.isEditing && c.value.length > 0);
     return /* @__PURE__ */ React.createElement(
-      import_react_primitive5.Primitive.button,
+      import_react_primitive6.Primitive.button,
       {
         type: "submit",
         ...rest,
@@ -689,22 +750,22 @@ var ComposerSend = (0, import_react12.forwardRef)(
 );
 
 // src/primitives/composer/ComposerCancel.tsx
-var import_primitive5 = require("@radix-ui/primitive");
-var import_react_primitive6 = require("@radix-ui/react-primitive");
-var import_react13 = require("react");
-var ComposerCancel = (0, import_react13.forwardRef)(({ disabled, onClick, ...rest }, ref) => {
+var import_primitive6 = require("@radix-ui/primitive");
+var import_react_primitive7 = require("@radix-ui/react-primitive");
+var import_react15 = require("react");
+var ComposerCancel = (0, import_react15.forwardRef)(({ disabled, onClick, ...rest }, ref) => {
   const { useComposer } = useComposerContext();
   const hasValue = useComposer((c) => c.canCancel);
   const handleClose = () => {
     useComposer.getState().cancel();
   };
   return /* @__PURE__ */ React.createElement(
-    import_react_primitive6.Primitive.button,
+    import_react_primitive7.Primitive.button,
     {
       type: "button",
       ...rest,
       ref,
-      onClick: (0, import_primitive5.composeEventHandlers)(onClick, handleClose),
+      onClick: (0, import_primitive6.composeEventHandlers)(onClick, handleClose),
       disabled: disabled || !hasValue
     }
   );
@@ -720,42 +781,64 @@ __export(branchPicker_exports, {
   Root: () => BranchPickerRoot
 });
 
+// src/utils/context/combined/useCombinedStore.ts
+var import_react17 = require("react");
+
+// src/utils/context/combined/createCombinedStore.ts
+var import_react16 = require("react");
+var createCombinedStore = (stores) => {
+  const subscribe = (callback) => {
+    const unsubscribes = stores.map((store) => store.subscribe(callback));
+    return () => {
+      for (const unsub of unsubscribes) {
+        unsub();
+      }
+    };
+  };
+  return (selector) => {
+    const getSnapshot = () => selector(...stores.map((store) => store.getState()));
+    return (0, import_react16.useSyncExternalStore)(subscribe, getSnapshot, getSnapshot);
+  };
+};
+
+// src/utils/context/combined/useCombinedStore.ts
+var useCombinedStore = (stores, selector) => {
+  const useCombined = (0, import_react17.useMemo)(() => createCombinedStore(stores), stores);
+  return useCombined(selector);
+};
+
 // src/actions/useGoToNextBranch.tsx
 var useGoToNextBranch = () => {
-  const { useThread, useBranchObserver } = useAssistantContext();
+  const { useThread } = useAssistantContext();
   const { useComposer, useMessage } = useMessageContext();
-  const isLoading = useThread((s) => s.isLoading);
-  const isEditing = useComposer((s) => s.isEditing);
-  const hasNext = useMessage(
-    ({ branchState: { branchId, branchCount } }) => branchId + 1 < branchCount
+  const disabled = useCombinedStore(
+    [useThread, useComposer, useMessage],
+    (t, c, m) => t.isLoading || c.isEditing || m.message.branchId + 1 >= m.message.branchCount
   );
-  if (isLoading || isEditing || !hasNext)
+  if (disabled)
     return null;
   return () => {
-    const {
-      message,
-      branchState: { branchId }
-    } = useMessage.getState();
-    useBranchObserver.getState().switchToBranch(message, branchId + 1);
+    const { message } = useMessage.getState();
+    useThread.getState().switchToBranch(message.id, message.branchId + 1);
   };
 };
 
 // src/utils/createActionButton.tsx
-var import_react14 = require("react");
-var import_react_primitive7 = require("@radix-ui/react-primitive");
-var import_primitive6 = require("@radix-ui/primitive");
+var import_react18 = require("react");
+var import_react_primitive8 = require("@radix-ui/react-primitive");
+var import_primitive7 = require("@radix-ui/primitive");
 var createActionButton = (useActionButton) => {
-  return (0, import_react14.forwardRef)(
+  return (0, import_react18.forwardRef)(
     (props, forwardedRef) => {
       const onClick = useActionButton(props);
       return /* @__PURE__ */ React.createElement(
-        import_react_primitive7.Primitive.button,
+        import_react_primitive8.Primitive.button,
         {
           type: "button",
           disabled: !onClick,
           ...props,
           ref: forwardedRef,
-          onClick: (0, import_primitive6.composeEventHandlers)(props.onClick, onClick ?? void 0)
+          onClick: (0, import_primitive7.composeEventHandlers)(props.onClick, onClick ?? void 0)
         }
       );
     }
@@ -767,19 +850,17 @@ var BranchPickerNext = createActionButton(useGoToNextBranch);
 
 // src/actions/useGoToPreviousBranch.tsx
 var useGoToPreviousBranch = () => {
-  const { useThread, useBranchObserver } = useAssistantContext();
+  const { useThread } = useAssistantContext();
   const { useComposer, useMessage } = useMessageContext();
-  const isLoading = useThread((s) => s.isLoading);
-  const isEditing = useComposer((s) => s.isEditing);
-  const hasNext = useMessage(({ branchState: { branchId } }) => branchId > 0);
-  if (isLoading || isEditing || !hasNext)
+  const disabled = useCombinedStore(
+    [useThread, useComposer, useMessage],
+    (t, c, m) => t.isLoading || c.isEditing || m.message.branchId <= 0
+  );
+  if (disabled)
     return null;
   return () => {
-    const {
-      message,
-      branchState: { branchId }
-    } = useMessage.getState();
-    useBranchObserver.getState().switchToBranch(message, branchId - 1);
+    const { message } = useMessage.getState();
+    useThread.getState().switchToBranch(message.id, message.branchId - 1);
   };
 };
 
@@ -789,22 +870,22 @@ var BranchPickerPrevious = createActionButton(useGoToPreviousBranch);
 // src/primitives/branchPicker/BranchPickerCount.tsx
 var BranchPickerCount = () => {
   const { useMessage } = useMessageContext();
-  const branchCount = useMessage((s) => s.branchState.branchCount);
+  const branchCount = useMessage((s) => s.message.branchCount);
   return /* @__PURE__ */ React.createElement(React.Fragment, null, branchCount);
 };
 
 // src/primitives/branchPicker/BranchPickerNumber.tsx
 var BranchPickerNumber = () => {
   const { useMessage } = useMessageContext();
-  const branchId = useMessage((s) => s.branchState.branchId);
+  const branchId = useMessage((s) => s.message.branchId);
   return /* @__PURE__ */ React.createElement(React.Fragment, null, branchId + 1);
 };
 
 // src/primitives/branchPicker/BranchPickerRoot.tsx
-var import_react_primitive8 = require("@radix-ui/react-primitive");
-var import_react15 = require("react");
-var BranchPickerRoot = (0, import_react15.forwardRef)(({ hideWhenSingleBranch, ...rest }, ref) => {
-  return /* @__PURE__ */ React.createElement(MessageIf, { hasBranches: hideWhenSingleBranch ? true : void 0 }, /* @__PURE__ */ React.createElement(import_react_primitive8.Primitive.div, { ...rest, ref }));
+var import_react_primitive9 = require("@radix-ui/react-primitive");
+var import_react19 = require("react");
+var BranchPickerRoot = (0, import_react19.forwardRef)(({ hideWhenSingleBranch, ...rest }, ref) => {
+  return /* @__PURE__ */ React.createElement(MessageIf, { hasBranches: hideWhenSingleBranch ? true : void 0 }, /* @__PURE__ */ React.createElement(import_react_primitive9.Primitive.div, { ...rest, ref }));
 });
 
 // src/primitives/actionBar/index.ts
@@ -817,28 +898,30 @@ __export(actionBar_exports, {
 });
 
 // src/primitives/actionBar/ActionBarRoot.tsx
-var import_react_primitive9 = require("@radix-ui/react-primitive");
-var import_react16 = require("react");
-var ActionBarRoot = (0, import_react16.forwardRef)(({ hideWhenBusy, autohide, autohideFloat, ...rest }, ref) => {
+var import_react_primitive10 = require("@radix-ui/react-primitive");
+var import_react20 = require("react");
+var ActionBarRoot = (0, import_react20.forwardRef)(({ hideWhenBusy, autohide, autohideFloat, ...rest }, ref) => {
   const { useThread } = useAssistantContext();
   const { useMessage } = useMessageContext();
-  const hideAndfloatStatus = useMessage((m) => {
-    const autohideEnabled = autohide === "always" || autohide === "not-last" && !m.isLast;
-    if (!autohideEnabled)
+  const hideAndfloatStatus = useCombinedStore(
+    [useThread, useMessage],
+    (t, m) => {
+      if (hideWhenBusy && t.isLoading)
+        return "hidden" /* Hidden */;
+      const autohideEnabled = autohide === "always" || autohide === "not-last" && !m.isLast;
+      if (!autohideEnabled)
+        return "normal" /* Normal */;
+      if (!m.isHovering)
+        return "hidden" /* Hidden */;
+      if (autohideFloat === "always" || autohideFloat === "single-branch" && m.message.branchCount <= 1)
+        return "floating" /* Floating */;
       return "normal" /* Normal */;
-    if (!m.isHovering)
-      return "hidden" /* Hidden */;
-    if (autohideFloat === "always" || autohideFloat === "single-branch" && m.branchState.branchCount <= 1)
-      return "floating" /* Floating */;
-    return "normal" /* Normal */;
-  });
-  const busy = useThread((t) => t.isLoading);
-  if (hideWhenBusy && busy)
-    return null;
+    }
+  );
   if (hideAndfloatStatus === "hidden" /* Hidden */)
     return null;
   return /* @__PURE__ */ React.createElement(
-    import_react_primitive9.Primitive.div,
+    import_react_primitive10.Primitive.div,
     {
       "data-floating": hideAndfloatStatus === "floating" /* Floating */,
       ...rest,
@@ -868,17 +951,19 @@ var ActionBarCopy = createActionButton(useCopyMessage);
 
 // src/actions/useReloadMessage.tsx
 var useReloadMessage = () => {
-  const { useThread, useBranchObserver } = useAssistantContext();
+  const { useThread } = useAssistantContext();
   const { useMessage } = useMessageContext();
-  const isLoading = useThread((s) => s.isLoading);
-  const isAssistant = useMessage((s) => s.message.role === "assistant");
-  if (isLoading || !isAssistant)
+  const disabled = useCombinedStore(
+    [useThread, useMessage],
+    (t, m) => t.isLoading || m.message.role !== "assistant"
+  );
+  if (disabled)
     return null;
   return () => {
     const message = useMessage.getState().message;
     if (message.role !== "assistant")
       throw new Error("Reloading is only supported on assistant messages");
-    useBranchObserver.getState().reloadAt(message);
+    useThread.getState().reload(message.id);
   };
 };
 
@@ -888,9 +973,11 @@ var ActionBarReload = createActionButton(useReloadMessage);
 // src/actions/useBeginMessageEdit.tsx
 var useBeginMessageEdit = () => {
   const { useMessage, useComposer } = useMessageContext();
-  const isUser = useMessage((s) => s.message.role === "user");
-  const isEditing = useComposer((s) => s.isEditing);
-  if (!isUser || isEditing)
+  const disabled = useCombinedStore(
+    [useMessage, useComposer],
+    (m, c) => m.message.role !== "user" || c.isEditing
+  );
+  if (disabled)
     return null;
   return () => {
     const { edit } = useComposer.getState();
@@ -901,25 +988,41 @@ var useBeginMessageEdit = () => {
 // src/primitives/actionBar/ActionBarEdit.tsx
 var ActionBarEdit = createActionButton(useBeginMessageEdit);
 
-// src/vercel/VercelAIAssistantProvider.tsx
-var import_react18 = require("react");
+// src/adapters/vercel/VercelAIAssistantProvider.tsx
+var import_react22 = require("react");
 
-// src/vercel/useDummyAIAssistantContext.tsx
-var import_react17 = require("react");
+// src/adapters/vercel/useDummyAIAssistantContext.tsx
+var import_react21 = require("react");
 var import_zustand2 = require("zustand");
 var useDummyAIAssistantContext = () => {
-  const [context] = (0, import_react17.useState)(() => {
+  const [context] = (0, import_react21.useState)(() => {
+    const scrollToBottomListeners = /* @__PURE__ */ new Set();
     const useThread = (0, import_zustand2.create)()(() => ({
       messages: [],
       isLoading: false,
-      reload: async () => {
-        throw new Error("Not implemented");
-      },
       append: async () => {
         throw new Error("Not implemented");
       },
       stop: () => {
         throw new Error("Not implemented");
+      },
+      switchToBranch: () => {
+        throw new Error("Not implemented");
+      },
+      reload: async () => {
+        throw new Error("Not implemented");
+      },
+      isAtBottom: true,
+      scrollToBottom: () => {
+        for (const listener of scrollToBottomListeners) {
+          listener();
+        }
+      },
+      onScrollToBottom: (callback) => {
+        scrollToBottomListeners.add(callback);
+        return () => {
+          scrollToBottomListeners.delete(callback);
+        };
       }
     }));
     const useComposer = (0, import_zustand2.create)()(() => ({
@@ -934,7 +1037,7 @@ var useDummyAIAssistantContext = () => {
       },
       send: () => {
         useThread.getState().append({
-          role: "user",
+          parentId: useThread.getState().messages.at(-1)?.id ?? ROOT_PARENT_ID,
           content: [{ type: "text", text: useComposer.getState().value }]
         });
         useComposer.getState().setValue("");
@@ -943,43 +1046,39 @@ var useDummyAIAssistantContext = () => {
         useThread.getState().stop();
       }
     }));
-    const useBranchObserver = (0, import_zustand2.create)()(() => ({
-      getBranchState: () => ({
-        branchId: 0,
-        branchCount: 1
-      }),
-      switchToBranch: () => {
-        throw new Error("Not implemented");
-      },
-      editAt: async () => {
-        throw new Error("Not implemented");
-      },
-      reloadAt: async () => {
-        throw new Error("Not implemented");
-      }
-    }));
-    return { useThread, useComposer, useBranchObserver };
+    return { useThread, useComposer };
   });
   return context;
 };
 
-// src/vercel/VercelAIAssistantProvider.tsx
+// src/adapters/vercel/VercelAIAssistantProvider.tsx
 var ThreadMessageCache = /* @__PURE__ */ new WeakMap();
-var vercelToThreadMessage = (message) => {
+var vercelToThreadMessage = (message, parentId, branchId, branchCount) => {
   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 }]
+    content: [{ type: "text", text: message.content }],
+    branchId,
+    branchCount,
+    createdAt: message.createdAt ?? /* @__PURE__ */ new Date()
   };
 };
-var vercelToCachedThreadMessages = (messages) => {
-  return messages.map((m) => {
+var vercelToCachedThreadMessages = (messages, getBranchState) => {
+  return messages.map((m, idx) => {
     const cached = ThreadMessageCache.get(m);
-    if (cached)
+    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)
       return cached;
-    const newMessage = vercelToThreadMessage(m);
+    const newMessage = vercelToThreadMessage(
+      m,
+      parentId,
+      branchId,
+      branchCount
+    );
     ThreadMessageCache.set(m, newMessage);
     return newMessage;
   });
@@ -990,28 +1089,14 @@ var VercelAIAssistantProvider = ({
 }) => {
   const context = useDummyAIAssistantContext();
   const vercel = "chat" in rest ? rest.chat : rest.assistant;
-  const messages = (0, import_react18.useMemo)(() => {
-    return vercelToCachedThreadMessages(vercel.messages);
-  }, [vercel.messages]);
-  const maybeReload = "reload" in vercel ? vercel.reload : null;
-  const reload = (0, import_react18.useCallback)(async () => {
-    if (!maybeReload)
-      throw new Error("Reload not supported");
-    await maybeReload();
-  }, [maybeReload]);
-  const append = (0, import_react18.useCallback)(
-    async (message) => {
-      if (message.content[0]?.type !== "text") {
-        throw new Error("Only text content is currently supported");
-      }
-      await vercel.append({
-        role: message.role,
-        content: message.content[0].text
-      });
-    },
-    [vercel.append]
-  );
-  const stop = (0, import_react18.useCallback)(() => {
+  const branches = useVercelAIBranches(vercel, context);
+  const messages = (0, import_react22.useMemo)(() => {
+    return vercelToCachedThreadMessages(
+      vercel.messages,
+      branches.getBranchState
+    );
+  }, [vercel.messages, branches.getBranchState]);
+  const stop = (0, import_react22.useCallback)(() => {
     const lastMessage = vercel.messages.at(-1);
     vercel.stop();
     if (lastMessage?.role === "user") {
@@ -1019,50 +1104,49 @@ var VercelAIAssistantProvider = ({
     }
   }, [vercel.messages, vercel.stop, vercel.setInput]);
   const isLoading = "isLoading" in vercel ? vercel.isLoading : vercel.status === "in_progress";
-  (0, import_react18.useMemo)(() => {
-    context.useThread.setState(
-      {
-        messages,
-        isLoading,
-        reload,
-        append,
-        stop
-      },
-      true
-    );
-  }, [context, messages, reload, append, stop, isLoading]);
-  (0, import_react18.useMemo)(() => {
+  (0, import_react22.useMemo)(() => {
+    context.useThread.setState({
+      messages,
+      isLoading,
+      stop,
+      switchToBranch: branches.switchToBranch,
+      append: branches.append,
+      reload: branches.reload
+    });
+  }, [context, messages, isLoading, stop, branches]);
+  (0, import_react22.useMemo)(() => {
     context.useComposer.setState({
       canCancel: isLoading,
       value: vercel.input,
       setValue: vercel.setInput
     });
   }, [context, isLoading, vercel.input, vercel.setInput]);
-  const branches = useVercelAIBranches(vercel);
-  (0, import_react18.useMemo)(() => {
-    context.useBranchObserver.setState(branches, true);
-  }, [context, branches]);
   return /* @__PURE__ */ React.createElement(AssistantContext.Provider, { value: context }, children);
 };
 
-// src/vercel/VercelRSCAssistantProvider.tsx
-var import_react19 = require("react");
+// src/adapters/vercel/VercelRSCAssistantProvider.tsx
+var import_react23 = require("react");
 var ThreadMessageCache2 = /* @__PURE__ */ new WeakMap();
-var vercelToThreadMessage2 = (message) => {
+var vercelToThreadMessage2 = (parentId, 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 }]
+    content: [{ type: "ui", display: message.display }],
+    createdAt: message.createdAt ?? /* @__PURE__ */ new Date(),
+    branchId: 0,
+    branchCount: 1
   };
 };
 var vercelToCachedThreadMessages2 = (messages) => {
-  return messages.map((m) => {
+  return messages.map((m, idx) => {
     const cached = ThreadMessageCache2.get(m);
-    if (cached)
+    const parentId = messages[idx - 1]?.id ?? ROOT_PARENT_ID;
+    if (cached && cached.parentId === parentId)
       return cached;
-    const newMessage = vercelToThreadMessage2(m);
+    const newMessage = vercelToThreadMessage2(parentId, m);
     ThreadMessageCache2.set(m, newMessage);
     return newMessage;
   });
@@ -1073,22 +1157,22 @@ var VercelRSCAssistantProvider = ({
   append: vercelAppend
 }) => {
   const context = useDummyAIAssistantContext();
-  const messages = (0, import_react19.useMemo)(() => {
+  const messages = (0, import_react23.useMemo)(() => {
     return vercelToCachedThreadMessages2(vercelMessages);
   }, [vercelMessages]);
-  const append = (0, import_react19.useCallback)(
+  const append = (0, import_react23.useCallback)(
     async (message) => {
+      if (message.parentId !== (context.useThread.getState().messages.at(-1)?.id ?? ROOT_PARENT_ID))
+        throw new Error("Unexpected: Message editing is not supported");
       if (message.content[0]?.type !== "text") {
         throw new Error("Only text content is currently supported");
       }
-      await vercelAppend({
-        role: message.role,
-        content: [{ type: "text", text: message.content[0].text }]
-      });
+      context.useThread.getState().scrollToBottom();
+      await vercelAppend(message);
     },
-    [vercelAppend]
+    [context, vercelAppend]
   );
-  (0, import_react19.useMemo)(() => {
+  (0, import_react23.useMemo)(() => {
     context.useThread.setState({
       messages,
       append