@assistant-ui/react 0.0.15 → 0.0.16

package/dist/index.mjs

@@ -71,11 +71,11 @@ import {
 import { forwardRef as forwardRef2, useRef as useRef3 } from "react";
 
 // src/utils/hooks/useOnResizeContent.tsx
-import { useLayoutEffect, useRef } from "react";
+import { useEffect, useRef } from "react";
 var useOnResizeContent = (ref, callback) => {
   const callbackRef = useRef(callback);
   callbackRef.current = callback;
-  useLayoutEffect(() => {
+  useEffect(() => {
     const el = ref.current;
     if (!el) return;
     const resizeObserver = new ResizeObserver(() => {
@@ -109,12 +109,12 @@ var useOnResizeContent = (ref, callback) => {
 };
 
 // src/utils/hooks/useOnScrollToBottom.tsx
-import { useEffect, useRef as useRef2 } from "react";
+import { useEffect as useEffect2, useRef as useRef2 } from "react";
 var useOnScrollToBottom = (callback) => {
   const callbackRef = useRef2(callback);
   callbackRef.current = callback;
   const { useViewport } = useAssistantContext();
-  useEffect(() => {
+  useEffect2(() => {
     return useViewport.getState().onScrollToBottom(() => {
       callbackRef.current();
     });
@@ -179,7 +179,9 @@ var MessageContext = createContext2(null);
 var useMessageContext = () => {
   const context = useContext2(MessageContext);
   if (!context)
-    throw new Error("This component must be used within a MessageProvider.");
+    throw new Error(
+      "This component must be used within a MessagePrimitive.Provider."
+    );
   return context;
 };
 
@@ -212,6 +214,7 @@ var message_exports = {};
 __export(message_exports, {
   Content: () => MessageContent,
   If: () => MessageIf,
+  Loading: () => MessageLoading,
   Provider: () => MessageProvider,
   Root: () => MessageRoot
 });
@@ -293,8 +296,12 @@ var useMessageContext2 = () => {
       parentId: null,
       branches: [],
       isLast: false,
+      loadingIndicator: null,
       isCopied: false,
       isHovering: false,
+      setLoadingIndicator: (value) => {
+        set({ loadingIndicator: value });
+      },
       setIsCopied: (value) => {
         set({ isCopied: value });
       },
@@ -398,10 +405,94 @@ var MessageIf = ({ children, ...query }) => {
   return result ? children : null;
 };
 
+// src/utils/context/combined/useCombinedStore.ts
+import { useMemo as useMemo2 } from "react";
+
+// src/utils/context/combined/createCombinedStore.ts
+import { useSyncExternalStore } from "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 useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+  };
+};
+
+// src/utils/context/combined/useCombinedStore.ts
+var useCombinedStore = (stores, selector) => {
+  const useCombined = useMemo2(() => createCombinedStore(stores), stores);
+  return useCombined(selector);
+};
+
+// src/utils/context/useContentPartContext.ts
+import { createContext as createContext3, useContext as useContext4 } from "react";
+var ContentPartContext = createContext3(null);
+var useContentPartContext = () => {
+  const context = useContext4(ContentPartContext);
+  if (!context)
+    throw new Error(
+      "This component must be used within a ContentPartPrimitive.Provider."
+    );
+  return context;
+};
+
+// src/primitives/contentPart/ContentPartLoadingIndicator.tsx
+var ContentPartLoadingIndicator = () => {
+  const { useMessage } = useMessageContext();
+  const { useContentPart } = useContentPartContext();
+  const loadingIndicator = useCombinedStore(
+    [useMessage, useContentPart],
+    (m, c) => c.isLoading ? m.loadingIndicator : null
+  );
+  return loadingIndicator;
+};
+
+// src/primitives/contentPart/ContentPartProvider.tsx
+import { useMemo as useMemo3, useState as useState2 } from "react";
+import { create as create3 } from "zustand";
+import { jsx as jsx6 } from "react/jsx-runtime";
+var useContentPartContext2 = () => {
+  const [context] = useState2(() => {
+    const useContentPart = create3(() => ({
+      part: null,
+      isLoading: false
+    }));
+    return { useContentPart };
+  });
+  return context;
+};
+var ContentPartProvider = ({
+  part,
+  isLoading,
+  children
+}) => {
+  const context = useContentPartContext2();
+  useMemo3(() => {
+    context.useContentPart.setState(
+      {
+        part,
+        isLoading
+      },
+      true
+    );
+  }, [context, part, isLoading]);
+  return /* @__PURE__ */ jsx6(ContentPartContext.Provider, { value: context, children });
+};
+
 // src/primitives/message/MessageContent.tsx
-import { Fragment, jsx as jsx6 } from "react/jsx-runtime";
+import { Fragment, jsx as jsx7, jsxs as jsxs2 } from "react/jsx-runtime";
 var defaultComponents = {
-  Text: ({ part }) => /* @__PURE__ */ jsx6(Fragment, { children: part.text }),
+  Text: ({ part }) => /* @__PURE__ */ jsxs2(Fragment, { children: [
+    part.text,
+    /* @__PURE__ */ jsx7(ContentPartLoadingIndicator, {})
+  ] }),
   Image: () => null,
   UI: ({ part }) => part.display,
   tools: {
@@ -416,29 +507,63 @@ var MessageContent = ({
     tools: { by_name = {}, Fallback = defaultComponents.tools.Fallback } = {}
   } = {}
 }) => {
+  const { useThread } = useAssistantContext();
   const { useMessage } = useMessageContext();
   const content = useMessage((s) => s.message.content);
-  return /* @__PURE__ */ jsx6(Fragment, { children: content.map((part, i) => {
+  const isLoading = useCombinedStore(
+    [useThread, useMessage],
+    (t, s) => s.isLast && t.isRunning
+  );
+  return /* @__PURE__ */ jsx7(Fragment, { children: content.map((part, i) => {
     const key = i;
-    switch (part.type) {
+    const type = part.type;
+    let component = null;
+    switch (type) {
       case "text":
-        return /* @__PURE__ */ jsx6(Text, { part }, key);
+        component = /* @__PURE__ */ jsx7(Text, { part });
+        break;
       case "image":
-        return /* @__PURE__ */ jsx6(Image, { part }, key);
+        component = /* @__PURE__ */ jsx7(Image, { part });
+        break;
       case "ui":
-        return /* @__PURE__ */ jsx6(UI, { part }, key);
+        component = /* @__PURE__ */ jsx7(UI, { part });
+        break;
       case "tool-call": {
         const Tool = by_name[part.name] || Fallback;
-        return /* @__PURE__ */ jsx6(Tool, { part }, key);
+        component = /* @__PURE__ */ jsx7(Tool, { part });
+        break;
       }
       default:
-        return null;
+        throw new Error(`Unknown content part type: ${type}`);
     }
+    return /* @__PURE__ */ jsx7(
+      ContentPartProvider,
+      {
+        part,
+        isLoading: i === content.length - 1 && isLoading,
+        children: component
+      },
+      key
+    );
   }) });
 };
 
+// src/primitives/message/MessageLoading.tsx
+import {
+  Primitive as Primitive4
+} from "@radix-ui/react-primitive";
+import { forwardRef as forwardRef4, useMemo as useMemo4 } from "react";
+import { jsx as jsx8 } from "react/jsx-runtime";
+var MessageLoading = forwardRef4((props, ref) => {
+  const { useMessage } = useMessageContext();
+  useMemo4(() => {
+    useMessage.getState().setLoadingIndicator(/* @__PURE__ */ jsx8(Primitive4.div, { ...props, ref }));
+  }, [useMessage, props, ref]);
+  return null;
+});
+
 // src/primitives/thread/ThreadMessages.tsx
-import { Fragment as Fragment2, jsx as jsx7, jsxs as jsxs2 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx9, jsxs as jsxs3 } from "react/jsx-runtime";
 var getComponents = (components) => {
   return {
     EditComposer: components.EditComposer ?? components.UserMessage ?? components.Message,
@@ -452,19 +577,19 @@ var ThreadMessages = ({ components }) => {
   const messages = thread.messages;
   const { UserMessage, EditComposer, AssistantMessage } = getComponents(components);
   if (messages.length === 0) return null;
-  return /* @__PURE__ */ jsx7(Fragment2, { children: messages.map((message, idx) => {
+  return /* @__PURE__ */ jsx9(Fragment2, { children: messages.map((message, idx) => {
     const parentId = messages[idx - 1]?.id ?? null;
-    return /* @__PURE__ */ jsxs2(
+    return /* @__PURE__ */ jsxs3(
       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__ */ jsxs3(MessageIf, { user: true, children: [
+            /* @__PURE__ */ jsx9(ComposerIf, { editing: false, children: /* @__PURE__ */ jsx9(UserMessage, {}) }),
+            /* @__PURE__ */ jsx9(ComposerIf, { editing: true, children: /* @__PURE__ */ jsx9(EditComposer, {}) })
           ] }),
-          /* @__PURE__ */ jsx7(MessageIf, { assistant: true, children: /* @__PURE__ */ jsx7(AssistantMessage, {}) })
+          /* @__PURE__ */ jsx9(MessageIf, { assistant: true, children: /* @__PURE__ */ jsx9(AssistantMessage, {}) })
         ]
       },
       parentId ?? "__ROOT__"
@@ -475,18 +600,18 @@ var ThreadMessages = ({ components }) => {
 // src/primitives/thread/ThreadScrollToBottom.tsx
 import { composeEventHandlers as composeEventHandlers3 } from "@radix-ui/primitive";
 import {
-  Primitive as Primitive4
+  Primitive as Primitive5
 } 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) => {
+import { forwardRef as forwardRef5 } from "react";
+import { jsx as jsx10 } from "react/jsx-runtime";
+var ThreadScrollToBottom = forwardRef5(({ onClick, ...rest }, ref) => {
   const { useViewport } = useAssistantContext();
   const isAtBottom = useViewport((s) => s.isAtBottom);
   const handleScrollToBottom = () => {
     useViewport.getState().scrollToBottom();
   };
-  return /* @__PURE__ */ jsx8(
-    Primitive4.button,
+  return /* @__PURE__ */ jsx10(
+    Primitive5.button,
     {
       ...rest,
       disabled: isAtBottom,
@@ -499,11 +624,11 @@ var ThreadScrollToBottom = forwardRef4(({ onClick, ...rest }, ref) => {
 // src/primitives/thread/ThreadSuggestion.tsx
 import { composeEventHandlers as composeEventHandlers4 } from "@radix-ui/primitive";
 import {
-  Primitive as Primitive5
+  Primitive as Primitive6
 } from "@radix-ui/react-primitive";
-import { forwardRef as forwardRef5 } from "react";
-import { jsx as jsx9 } from "react/jsx-runtime";
-var ThreadSuggestion = forwardRef5(({ onClick, prompt, method, autoSend: send, ...rest }, ref) => {
+import { forwardRef as forwardRef6 } from "react";
+import { jsx as jsx11 } from "react/jsx-runtime";
+var ThreadSuggestion = forwardRef6(({ onClick, prompt, method, autoSend: send, ...rest }, ref) => {
   const { useThread, useComposer } = useAssistantContext();
   const isDisabled = useThread((t) => t.isRunning);
   const handleApplySuggestion = () => {
@@ -514,8 +639,8 @@ var ThreadSuggestion = forwardRef5(({ onClick, prompt, method, autoSend: send, .
       composer.send();
     }
   };
-  return /* @__PURE__ */ jsx9(
-    Primitive5.button,
+  return /* @__PURE__ */ jsx11(
+    Primitive6.button,
     {
       ...rest,
       disabled: isDisabled,
@@ -539,11 +664,11 @@ __export(composer_exports, {
 import { composeEventHandlers as composeEventHandlers5 } from "@radix-ui/primitive";
 import { useComposedRefs as useComposedRefs2 } from "@radix-ui/react-compose-refs";
 import {
-  Primitive as Primitive6
+  Primitive as Primitive7
 } from "@radix-ui/react-primitive";
-import { forwardRef as forwardRef6, useRef as useRef4 } from "react";
-import { jsx as jsx10 } from "react/jsx-runtime";
-var ComposerRoot = forwardRef6(
+import { forwardRef as forwardRef7, useRef as useRef4 } from "react";
+import { jsx as jsx12 } from "react/jsx-runtime";
+var ComposerRoot = forwardRef7(
   ({ onSubmit, ...rest }, forwardedRef) => {
     const { useViewport } = useAssistantContext();
     const { useComposer } = useComposerContext();
@@ -556,8 +681,8 @@ var ComposerRoot = forwardRef6(
       composerState.send();
       useViewport.getState().scrollToBottom();
     };
-    return /* @__PURE__ */ jsx10(
-      Primitive6.form,
+    return /* @__PURE__ */ jsx12(
+      Primitive7.form,
       {
         ...rest,
         ref,
@@ -572,14 +697,14 @@ import { composeEventHandlers as composeEventHandlers6 } from "@radix-ui/primiti
 import { useComposedRefs as useComposedRefs3 } from "@radix-ui/react-compose-refs";
 import { Slot } from "@radix-ui/react-slot";
 import {
-  forwardRef as forwardRef7,
+  forwardRef as forwardRef8,
   useCallback,
-  useEffect as useEffect2,
+  useEffect as useEffect3,
   useRef as useRef5
 } from "react";
 import TextareaAutosize from "react-textarea-autosize";
-import { jsx as jsx11 } from "react/jsx-runtime";
-var ComposerInput = forwardRef7(
+import { jsx as jsx13 } from "react/jsx-runtime";
+var ComposerInput = forwardRef8(
   ({ autoFocus = false, asChild, disabled, onChange, onKeyDown, ...rest }, forwardedRef) => {
     const { useThread, useViewport } = useAssistantContext();
     const { useComposer, type } = useComposerContext();
@@ -616,13 +741,13 @@ var ComposerInput = forwardRef7(
         textareaRef.current.value.length
       );
     }, [autoFocusEnabled]);
-    useEffect2(() => focus(), [focus]);
+    useEffect3(() => focus(), [focus]);
     useOnScrollToBottom(() => {
       if (type === "assistant") {
         focus();
       }
     });
-    return /* @__PURE__ */ jsx11(
+    return /* @__PURE__ */ jsx13(
       Component,
       {
         value,
@@ -642,16 +767,16 @@ var ComposerInput = forwardRef7(
 
 // src/primitives/composer/ComposerSend.tsx
 import {
-  Primitive as Primitive7
+  Primitive as Primitive8
 } from "@radix-ui/react-primitive";
-import { forwardRef as forwardRef8 } from "react";
-import { jsx as jsx12 } from "react/jsx-runtime";
-var ComposerSend = forwardRef8(
+import { forwardRef as forwardRef9 } from "react";
+import { jsx as jsx14 } from "react/jsx-runtime";
+var ComposerSend = forwardRef9(
   ({ disabled, ...rest }, ref) => {
     const { useComposer } = useComposerContext();
     const hasValue = useComposer((c) => c.isEditing && c.value.length > 0);
-    return /* @__PURE__ */ jsx12(
-      Primitive7.button,
+    return /* @__PURE__ */ jsx14(
+      Primitive8.button,
       {
         type: "submit",
         ...rest,
@@ -665,17 +790,17 @@ var ComposerSend = forwardRef8(
 // src/primitives/composer/ComposerCancel.tsx
 import { composeEventHandlers as composeEventHandlers7 } from "@radix-ui/primitive";
 import {
-  Primitive as Primitive8
+  Primitive as Primitive9
 } from "@radix-ui/react-primitive";
-import { forwardRef as forwardRef9 } from "react";
-import { jsx as jsx13 } from "react/jsx-runtime";
-var ComposerCancel = forwardRef9(({ onClick, ...rest }, ref) => {
+import { forwardRef as forwardRef10 } from "react";
+import { jsx as jsx15 } from "react/jsx-runtime";
+var ComposerCancel = forwardRef10(({ onClick, ...rest }, ref) => {
   const { useComposer } = useComposerContext();
   const handleCancel = () => {
     useComposer.getState().cancel();
   };
-  return /* @__PURE__ */ jsx13(
-    Primitive8.button,
+  return /* @__PURE__ */ jsx15(
+    Primitive9.button,
     {
       type: "button",
       ...rest,
@@ -695,32 +820,6 @@ __export(branchPicker_exports, {
   Root: () => BranchPickerRoot
 });
 
-// src/utils/context/combined/useCombinedStore.ts
-import { useMemo as useMemo2 } from "react";
-
-// src/utils/context/combined/createCombinedStore.ts
-import { useSyncExternalStore } from "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 useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
-  };
-};
-
-// src/utils/context/combined/useCombinedStore.ts
-var useCombinedStore = (stores, selector) => {
-  const useCombined = useMemo2(() => createCombinedStore(stores), stores);
-  return useCombined(selector);
-};
-
 // src/actions/useGoToNextBranch.tsx
 var useGoToNextBranch = () => {
   const { useThread } = useAssistantContext();
@@ -739,16 +838,16 @@ var useGoToNextBranch = () => {
 // src/utils/createActionButton.tsx
 import { composeEventHandlers as composeEventHandlers8 } from "@radix-ui/primitive";
 import {
-  Primitive as Primitive9
+  Primitive as Primitive10
 } from "@radix-ui/react-primitive";
-import { forwardRef as forwardRef10 } from "react";
-import { jsx as jsx14 } from "react/jsx-runtime";
+import { forwardRef as forwardRef11 } from "react";
+import { jsx as jsx16 } from "react/jsx-runtime";
 var createActionButton = (useActionButton) => {
-  return forwardRef10(
+  return forwardRef11(
     (props, forwardedRef) => {
       const onClick = useActionButton(props);
-      return /* @__PURE__ */ jsx14(
-        Primitive9.button,
+      return /* @__PURE__ */ jsx16(
+        Primitive10.button,
         {
           type: "button",
           disabled: !onClick,
@@ -786,29 +885,29 @@ var useGoToPreviousBranch = () => {
 var BranchPickerPrevious = createActionButton(useGoToPreviousBranch);
 
 // src/primitives/branchPicker/BranchPickerCount.tsx
-import { Fragment as Fragment3, jsx as jsx15 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx17 } from "react/jsx-runtime";
 var BranchPickerCount = () => {
   const { useMessage } = useMessageContext();
   const branchCount = useMessage((s) => s.branches.length);
-  return /* @__PURE__ */ jsx15(Fragment3, { children: branchCount });
+  return /* @__PURE__ */ jsx17(Fragment3, { children: branchCount });
 };
 
 // src/primitives/branchPicker/BranchPickerNumber.tsx
-import { Fragment as Fragment4, jsx as jsx16 } from "react/jsx-runtime";
+import { Fragment as Fragment4, jsx as jsx18 } from "react/jsx-runtime";
 var BranchPickerNumber = () => {
   const { useMessage } = useMessageContext();
   const branchIdx = useMessage((s) => s.branches.indexOf(s.message.id));
-  return /* @__PURE__ */ jsx16(Fragment4, { children: branchIdx + 1 });
+  return /* @__PURE__ */ jsx18(Fragment4, { children: branchIdx + 1 });
 };
 
 // src/primitives/branchPicker/BranchPickerRoot.tsx
 import {
-  Primitive as Primitive10
+  Primitive as Primitive11
 } from "@radix-ui/react-primitive";
-import { forwardRef as forwardRef11 } from "react";
-import { jsx as jsx17 } from "react/jsx-runtime";
-var BranchPickerRoot = forwardRef11(({ hideWhenSingleBranch, ...rest }, ref) => {
-  return /* @__PURE__ */ jsx17(MessageIf, { hasBranches: hideWhenSingleBranch ? true : void 0, children: /* @__PURE__ */ jsx17(Primitive10.div, { ...rest, ref }) });
+import { forwardRef as forwardRef12 } from "react";
+import { jsx as jsx19 } from "react/jsx-runtime";
+var BranchPickerRoot = forwardRef12(({ hideWhenSingleBranch, ...rest }, ref) => {
+  return /* @__PURE__ */ jsx19(MessageIf, { hasBranches: hideWhenSingleBranch ? true : void 0, children: /* @__PURE__ */ jsx19(Primitive11.div, { ...rest, ref }) });
 });
 
 // src/primitives/actionBar/index.ts
@@ -822,11 +921,11 @@ __export(actionBar_exports, {
 
 // src/primitives/actionBar/ActionBarRoot.tsx
 import {
-  Primitive as Primitive11
+  Primitive as Primitive12
 } from "@radix-ui/react-primitive";
-import { forwardRef as forwardRef12 } from "react";
-import { jsx as jsx18 } from "react/jsx-runtime";
-var ActionBarRoot = forwardRef12(({ hideWhenRunning, autohide, autohideFloat, ...rest }, ref) => {
+import { forwardRef as forwardRef13 } from "react";
+import { jsx as jsx20 } from "react/jsx-runtime";
+var ActionBarRoot = forwardRef13(({ hideWhenRunning, autohide, autohideFloat, ...rest }, ref) => {
   const { useThread } = useAssistantContext();
   const { useMessage } = useMessageContext();
   const hideAndfloatStatus = useCombinedStore(
@@ -842,8 +941,8 @@ var ActionBarRoot = forwardRef12(({ hideWhenRunning, autohide, autohideFloat, ..
     }
   );
   if (hideAndfloatStatus === "hidden" /* Hidden */) return null;
-  return /* @__PURE__ */ jsx18(
-    Primitive11.div,
+  return /* @__PURE__ */ jsx20(
+    Primitive12.div,
     {
       "data-floating": hideAndfloatStatus === "floating" /* Floating */,
       ...rest,
@@ -911,18 +1010,25 @@ var useBeginMessageEdit = () => {
 // src/primitives/actionBar/ActionBarEdit.tsx
 var ActionBarEdit = createActionButton(useBeginMessageEdit);
 
+// src/primitives/contentPart/index.ts
+var contentPart_exports = {};
+__export(contentPart_exports, {
+  LoadingIndicator: () => ContentPartLoadingIndicator,
+  Provider: () => ContentPartProvider
+});
+
 // src/adapters/vercel/VercelAIAssistantProvider.tsx
-import { useMemo as useMemo4 } from "react";
+import { useMemo as useMemo6 } from "react";
 
 // src/adapters/vercel/useDummyAIAssistantContext.tsx
-import { useState as useState2 } from "react";
-import { create as create4 } from "zustand";
+import { useState as useState3 } from "react";
+import { create as create5 } from "zustand";
 
 // src/utils/context/stores/ViewportStore.tsx
-import { create as create3 } from "zustand";
+import { create as create4 } from "zustand";
 var makeViewportStore = () => {
   const scrollToBottomListeners = /* @__PURE__ */ new Set();
-  return create3(() => ({
+  return create4(() => ({
     isAtBottom: true,
     scrollToBottom: () => {
       for (const listener of scrollToBottomListeners) {
@@ -940,7 +1046,7 @@ var makeViewportStore = () => {
 
 // src/adapters/vercel/useDummyAIAssistantContext.tsx
 var makeDummyThreadStore = () => {
-  return create4(() => ({
+  return create5(() => ({
     messages: [],
     isRunning: false,
     getBranches: () => {
@@ -961,7 +1067,7 @@ var makeDummyThreadStore = () => {
   }));
 };
 var useDummyAIAssistantContext = () => {
-  const [context] = useState2(() => {
+  const [context] = useState3(() => {
     const useThread = makeDummyThreadStore();
     const useViewport = makeViewportStore();
     const useComposer = makeThreadComposerStore(useThread);
@@ -971,7 +1077,7 @@ var useDummyAIAssistantContext = () => {
 };
 
 // src/adapters/vercel/useVercelAIThreadState.tsx
-import { useCallback as useCallback2, useMemo as useMemo3, useRef as useRef6, useState as useState3 } from "react";
+import { useCallback as useCallback2, useMemo as useMemo5, useRef as useRef6, useState as useState4 } from "react";
 
 // src/adapters/MessageRepository.tsx
 import { customAlphabet } from "nanoid/non-secure";
@@ -990,7 +1096,41 @@ var MessageRepository = class {
   messages = /* @__PURE__ */ new Map();
   // message_id -> item
   head = null;
-  rootChildren = [];
+  root = {
+    children: []
+  };
+  getFallbackChild(p) {
+    const childId = p.children.at(-1);
+    const child = childId ? this.messages.get(childId) : null;
+    if (child === void 0)
+      throw new Error(
+        "MessageRepository(getFallbackChild): Child message not found. This is likely an internal bug in assistant-ui."
+      );
+    return child;
+  }
+  performOp(newParent, child, operation) {
+    const parentOrRoot = child.prev ?? this.root;
+    const newParentOrRoot = newParent ?? this.root;
+    if (operation === "relink" && parentOrRoot === newParentOrRoot) return;
+    if (operation !== "link") {
+      parentOrRoot.children = parentOrRoot.children.filter(
+        (m) => m !== child.current.id
+      );
+      if (child.prev?.next === child) {
+        child.prev.next = this.getFallbackChild(child.prev);
+      }
+    }
+    if (operation !== "cut") {
+      newParentOrRoot.children = [
+        ...newParentOrRoot.children,
+        child.current.id
+      ];
+      if (newParent && (findHead(child) === this.head || newParent.next === null)) {
+        newParent.next = child;
+      }
+      child.prev = newParent;
+    }
+  }
   getMessages() {
     const messages = new Array(this.head?.level ?? 0);
     for (let current = this.head; current; current = current.prev) {
@@ -999,20 +1139,17 @@ var MessageRepository = class {
     return messages;
   }
   addOrUpdateMessage(parentId, message) {
-    const item = this.messages.get(message.id);
-    if (item) {
-      if ((item.prev?.current.id ?? null) !== parentId) {
-        this.deleteMessage(message.id);
-      } else {
-        item.current = message;
-        return;
-      }
-    }
+    const existingItem = this.messages.get(message.id);
     const prev = parentId ? this.messages.get(parentId) : null;
     if (prev === void 0)
       throw new Error(
         "MessageRepository(addOrUpdateMessage): Parent message not found. This is likely an internal bug in assistant-ui."
       );
+    if (existingItem) {
+      existingItem.current = message;
+      this.performOp(prev, existingItem, "relink");
+      return;
+    }
     const newItem = {
       prev,
       current: message,
@@ -1021,80 +1158,56 @@ var MessageRepository = class {
       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;
     }
+    this.performOp(prev, newItem, "link");
   }
-  deleteMessage(messageId) {
-    const message = this.messages.get(messageId);
-    if (!message)
-      throw new Error(
-        "MessageRepository(deleteMessage): Message not found. This is likely an internal bug in assistant-ui."
-      );
-    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(
-            "MessageRepository(deleteMessage): Child message not found. This is likely an internal bug in assistant-ui."
-          );
-        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() {
+  appendOptimisticMessage(parentId, message) {
     let optimisticId;
     do {
       optimisticId = generateOptimisticId();
     } while (this.messages.has(optimisticId));
-    return optimisticId;
-  }
-  commitOptimisticRun(parentId) {
-    const optimisticId = this.getOptimisticId();
     this.addOrUpdateMessage(parentId, {
+      ...message,
       id: optimisticId,
-      role: "assistant",
-      content: [
-        {
-          type: "text",
-          text: ""
-        }
-      ],
       createdAt: /* @__PURE__ */ new Date()
     });
     return optimisticId;
   }
+  deleteMessage(messageId, newParentId) {
+    const message = this.messages.get(messageId);
+    const newParent = newParentId ? this.messages.get(newParentId) : null;
+    if (!message)
+      throw new Error(
+        "MessageRepository(deleteMessage): Optimistic message not found. This is likely an internal bug in assistant-ui."
+      );
+    if (newParent === void 0)
+      throw new Error(
+        "MessageRepository(deleteMessage): New message not found. This is likely an internal bug in assistant-ui."
+      );
+    for (const child of message.children) {
+      const childMessage = this.messages.get(child);
+      if (!childMessage)
+        throw new Error(
+          "MessageRepository(deleteMessage): Child message not found. This is likely an internal bug in assistant-ui."
+        );
+      this.performOp(newParent, childMessage, "relink");
+    }
+    this.messages.delete(messageId);
+    if (this.head === message) {
+      this.head = this.getFallbackChild(message.prev ?? this.root);
+    }
+    this.performOp(null, message, "cut");
+  }
   getBranches(messageId) {
     const message = this.messages.get(messageId);
     if (!message)
       throw new Error(
         "MessageRepository(getBranches): Message not found. This is likely an internal bug in assistant-ui."
       );
-    if (message.prev) {
-      return message.prev.children;
-    }
-    return this.rootChildren;
+    const { children } = message.prev ?? this.root;
+    return children;
   }
   switchToBranch(messageId) {
     const message = this.messages.get(messageId);
@@ -1108,20 +1221,20 @@ var MessageRepository = class {
     this.head = findHead(message);
   }
   resetHead(messageId) {
-    if (messageId) {
-      const message = this.messages.get(messageId);
-      if (!message)
-        throw new Error(
-          "MessageRepository(resetHead): Branch not found. This is likely an internal bug in assistant-ui."
-        );
-      this.head = message;
-      for (let current = message; current; current = current.prev) {
-        if (current.prev) {
-          current.prev.next = current;
-        }
-      }
-    } else {
+    if (messageId === null) {
       this.head = null;
+      return;
+    }
+    const message = this.messages.get(messageId);
+    if (!message)
+      throw new Error(
+        "MessageRepository(resetHead): Branch not found. This is likely an internal bug in assistant-ui."
+      );
+    this.head = message;
+    for (let current = message; current; current = current.prev) {
+      if (current.prev) {
+        current.prev.next = current;
+      }
     }
   }
 };
@@ -1185,12 +1298,12 @@ var getIsRunning = (vercel) => {
   return vercel.status === "in_progress";
 };
 var useVercelAIThreadState = (vercel) => {
-  const [data] = useState3(() => new MessageRepository());
+  const [data] = useState4(() => new MessageRepository());
   const vercelRef = useRef6(vercel);
   vercelRef.current = vercel;
   const isRunning = getIsRunning(vercelRef.current);
   const assistantOptimisticIdRef = useRef6(null);
-  const messages = useMemo3(() => {
+  const messages = useMemo5(() => {
     const vm = converter.convertMessages(vercel.messages);
     for (let i = 0; i < vm.length; i++) {
       const message = vm[i];
@@ -1198,12 +1311,16 @@ var useVercelAIThreadState = (vercel) => {
       data.addOrUpdateMessage(parent?.id ?? null, message);
     }
     if (assistantOptimisticIdRef.current) {
-      data.deleteMessage(assistantOptimisticIdRef.current);
+      data.deleteMessage(assistantOptimisticIdRef.current, null);
       assistantOptimisticIdRef.current = null;
     }
     if (hasUpcomingMessage(isRunning, vm)) {
-      assistantOptimisticIdRef.current = data.commitOptimisticRun(
-        vm.at(-1)?.id ?? null
+      assistantOptimisticIdRef.current = data.appendOptimisticMessage(
+        vm.at(-1)?.id ?? null,
+        {
+          role: "assistant",
+          content: [{ type: "text", text: "" }]
+        }
       );
     }
     data.resetHead(assistantOptimisticIdRef.current ?? vm.at(-1)?.id ?? null);
@@ -1257,7 +1374,7 @@ var useVercelAIThreadState = (vercel) => {
       vercelRef.current.setInput(lastMessage.content);
     }
   }, []);
-  return useMemo3(
+  return useMemo5(
     () => ({
       isRunning,
       messages,
@@ -1280,7 +1397,7 @@ var useVercelAIThreadState = (vercel) => {
 };
 
 // src/adapters/vercel/VercelAIAssistantProvider.tsx
-import { jsx as jsx19 } from "react/jsx-runtime";
+import { jsx as jsx21 } from "react/jsx-runtime";
 var VercelAIAssistantProvider = ({
   children,
   ...rest
@@ -1288,25 +1405,25 @@ var VercelAIAssistantProvider = ({
   const context = useDummyAIAssistantContext();
   const vercel = "chat" in rest ? rest.chat : rest.assistant;
   const threadState = useVercelAIThreadState(vercel);
-  useMemo4(() => {
+  useMemo6(() => {
     context.useThread.setState(threadState, true);
   }, [context, threadState]);
-  useMemo4(() => {
+  useMemo6(() => {
     context.useComposer.setState({
       value: vercel.input,
       setValue: vercel.setInput
     });
   }, [context, vercel.input, vercel.setInput]);
-  return /* @__PURE__ */ jsx19(AssistantContext.Provider, { value: context, children });
+  return /* @__PURE__ */ jsx21(AssistantContext.Provider, { value: context, children });
 };
 
 // src/adapters/vercel/VercelRSCAssistantProvider.tsx
 import {
   useCallback as useCallback3,
-  useMemo as useMemo5,
-  useState as useState4
+  useMemo as useMemo7,
+  useState as useState5
 } from "react";
-import { jsx as jsx20 } from "react/jsx-runtime";
+import { jsx as jsx22 } from "react/jsx-runtime";
 var vercelToThreadMessage2 = (message) => {
   return {
     id: message.id,
@@ -1340,18 +1457,18 @@ var VercelRSCAssistantProvider = ({
   reload
 }) => {
   const context = useDummyAIAssistantContext();
-  const [isRunning, setIsRunning] = useState4(false);
+  const [isRunning, setIsRunning] = useState5(false);
   const withRunning = useCallback3((callback) => {
     setIsRunning(true);
     return callback.finally(() => setIsRunning(false));
   }, []);
-  const converter2 = useMemo5(() => {
+  const converter2 = useMemo7(() => {
     const rscConverter = convertMessage ?? ((m) => m);
     return new ThreadMessageConverter((m) => {
       return vercelToThreadMessage2(rscConverter(m));
     });
   }, [convertMessage]);
-  const messages = useMemo5(() => {
+  const messages = useMemo7(() => {
     return converter2.convertMessages(vercelMessages);
   }, [converter2, vercelMessages]);
   const append = useCallback3(
@@ -1378,7 +1495,7 @@ var VercelRSCAssistantProvider = ({
     },
     [withRunning, reload]
   );
-  useMemo5(() => {
+  useMemo7(() => {
     context.useThread.setState(
       {
         messages,
@@ -1392,12 +1509,13 @@ var VercelRSCAssistantProvider = ({
       true
     );
   }, [context, messages, isRunning, append, startRun]);
-  return /* @__PURE__ */ jsx20(AssistantContext.Provider, { value: context, children });
+  return /* @__PURE__ */ jsx22(AssistantContext.Provider, { value: context, children });
 };
 export {
   actionBar_exports as ActionBarPrimitive,
   branchPicker_exports as BranchPickerPrimitive,
   composer_exports as ComposerPrimitive,
+  contentPart_exports as ContentPartPrimitive,
   message_exports as MessagePrimitive,
   thread_exports as ThreadPrimitive,
   VercelAIAssistantProvider,