@assistant-ui/react 0.0.14 → 0.0.16

package/dist/index.js

@@ -33,6 +33,7 @@ __export(src_exports, {
   ActionBarPrimitive: () => actionBar_exports,
   BranchPickerPrimitive: () => branchPicker_exports,
   ComposerPrimitive: () => composer_exports,
+  ContentPartPrimitive: () => contentPart_exports,
   MessagePrimitive: () => message_exports,
   ThreadPrimitive: () => thread_exports,
   VercelAIAssistantProvider: () => VercelAIAssistantProvider,
@@ -75,7 +76,7 @@ var useAssistantContext = () => {
   const context = (0, import_react2.useContext)(AssistantContext);
   if (!context)
     throw new Error(
-      "This component must be used within a AssistantProvider"
+      "This component must be used within a AssistantProvider."
     );
   return context;
 };
@@ -84,14 +85,10 @@ var useAssistantContext = () => {
 var useThreadIf = (props) => {
   const { useThread } = useAssistantContext();
   return useThread((thread) => {
-    if (props.empty === true && thread.messages.length !== 0)
-      return false;
-    if (props.empty === false && thread.messages.length === 0)
-      return false;
-    if (props.running === true && !thread.isRunning)
-      return false;
-    if (props.running === false && thread.isRunning)
-      return false;
+    if (props.empty === true && thread.messages.length !== 0) return false;
+    if (props.empty === false && thread.messages.length === 0) return false;
+    if (props.running === true && !thread.isRunning) return false;
+    if (props.running === false && thread.isRunning) return false;
     return true;
   });
 };
@@ -117,10 +114,9 @@ var import_react3 = require("react");
 var useOnResizeContent = (ref, callback) => {
   const callbackRef = (0, import_react3.useRef)(callback);
   callbackRef.current = callback;
-  (0, import_react3.useLayoutEffect)(() => {
+  (0, import_react3.useEffect)(() => {
     const el = ref.current;
-    if (!el)
-      return;
+    if (!el) return;
     const resizeObserver = new ResizeObserver(() => {
       callbackRef.current();
     });
@@ -175,16 +171,14 @@ var ThreadViewport = (0, import_react5.forwardRef)(({ autoScroll = true, onScrol
   const lastScrollTop = (0, import_react5.useRef)(0);
   const scrollToBottom = () => {
     const div = messagesEndRef.current;
-    if (!div || !autoScroll)
-      return;
+    if (!div || !autoScroll) return;
     const behavior = firstRenderRef.current ? "instant" : "auto";
     firstRenderRef.current = false;
     useViewport.setState({ isAtBottom: true });
     div.scrollIntoView({ behavior });
   };
   useOnResizeContent(divRef, () => {
-    if (!useViewport.getState().isAtBottom)
-      return;
+    if (!useViewport.getState().isAtBottom) return;
     scrollToBottom();
   });
   useOnScrollToBottom(() => {
@@ -192,8 +186,7 @@ var ThreadViewport = (0, import_react5.forwardRef)(({ autoScroll = true, onScrol
   });
   const handleScroll = () => {
     const div = divRef.current;
-    if (!div)
-      return;
+    if (!div) return;
     const isAtBottom = useViewport.getState().isAtBottom;
     const newIsAtBottom = div.scrollHeight - div.scrollTop <= div.clientHeight;
     if (!newIsAtBottom && lastScrollTop.current < div.scrollTop) {
@@ -225,7 +218,9 @@ var MessageContext = (0, import_react6.createContext)(null);
 var useMessageContext = () => {
   const context = (0, import_react6.useContext)(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;
 };
 
@@ -243,10 +238,8 @@ var useComposerContext = () => {
 var useComposerIf = (props) => {
   const { useComposer } = useComposerContext();
   return useComposer((composer) => {
-    if (props.editing === true && !composer.isEditing)
-      return false;
-    if (props.editing === false && composer.isEditing)
-      return false;
+    if (props.editing === true && !composer.isEditing) return false;
+    if (props.editing === false && composer.isEditing) return false;
     return true;
   });
 };
@@ -260,6 +253,7 @@ var message_exports = {};
 __export(message_exports, {
   Content: () => MessageContent,
   If: () => MessageIf,
+  Loading: () => MessageLoading,
   Provider: () => MessageProvider,
   Root: () => MessageRoot
 });
@@ -268,6 +262,14 @@ __export(message_exports, {
 var import_react8 = require("react");
 var import_zustand2 = require("zustand");
 
+// src/utils/context/getMessageText.tsx
+var getMessageText = (message) => {
+  const textParts = message.content.filter(
+    (part) => part.type === "text"
+  );
+  return textParts.map((part) => part.text).join("\n\n");
+};
+
 // src/utils/context/stores/ComposerStore.ts
 var import_zustand = require("zustand");
 var makeBaseComposer = (set) => ({
@@ -292,8 +294,7 @@ var makeMessageComposerStore = ({
     onSend(value);
   },
   cancel: () => {
-    if (!get().isEditing)
-      return false;
+    if (!get().isEditing) return false;
     set({ isEditing: false });
     return true;
   }
@@ -312,8 +313,7 @@ var makeThreadComposerStore = (useThread) => (0, import_zustand.create)()((set,
     },
     cancel: () => {
       const thread = useThread.getState();
-      if (!thread.isRunning)
-        return false;
+      if (!thread.isRunning) return false;
       useThread.getState().cancelRun();
       return true;
     }
@@ -328,30 +328,40 @@ var getIsLast = (thread, message) => {
 var useMessageContext2 = () => {
   const { useThread } = useAssistantContext();
   const [context] = (0, import_react8.useState)(() => {
-    const useMessage = (0, import_zustand2.create)(() => ({
+    const useMessage = (0, import_zustand2.create)((set) => ({
       message: null,
       parentId: null,
       branches: [],
       isLast: false,
+      loadingIndicator: null,
       isCopied: false,
       isHovering: false,
-      setIsCopied: () => {
+      setLoadingIndicator: (value) => {
+        set({ loadingIndicator: value });
       },
-      setIsHovering: () => {
+      setIsCopied: (value) => {
+        set({ isCopied: value });
+      },
+      setIsHovering: (value) => {
+        set({ isHovering: value });
       }
     }));
     const useComposer = makeMessageComposerStore({
       onEdit: () => {
         const message = useMessage.getState().message;
         if (message.role !== "user")
-          throw new Error("Editing is only supported for user messages");
-        const text = message.content.filter((part) => part.type === "text").map((part) => part.text).join("\n");
+          throw new Error(
+            "Tried to edit a non-user message. Editing is only supported for user messages. This is likely an internal bug in assistant-ui."
+          );
+        const text = getMessageText(message);
         return text;
       },
       onSend: (text) => {
         const { message, parentId } = useMessage.getState();
         if (message.role !== "user")
-          throw new Error("Editing is only supported for user messages");
+          throw new Error(
+            "Tried to edit a non-user message. Editing is only supported for user messages. This is likely an internal bug in assistant-ui."
+          );
         const nonTextParts = message.content.filter(
           (part) => part.type !== "text" && part.type !== "ui"
         );
@@ -374,23 +384,14 @@ var MessageProvider = ({
   const context = useMessageContext2();
   const isLast = useThread((thread) => getIsLast(thread, message));
   const branches = useThread((thread) => thread.getBranches(message.id));
-  const [isCopied, setIsCopied] = (0, import_react8.useState)(false);
-  const [isHovering, setIsHovering] = (0, import_react8.useState)(false);
   (0, import_react8.useMemo)(() => {
-    context.useMessage.setState(
-      {
-        message,
-        parentId,
-        branches,
-        isLast,
-        isCopied,
-        isHovering,
-        setIsCopied,
-        setIsHovering
-      },
-      true
-    );
-  }, [context, message, parentId, branches, isLast, isCopied, isHovering]);
+    context.useMessage.setState({
+      message,
+      parentId,
+      branches,
+      isLast
+    });
+  }, [context, message, parentId, branches, isLast]);
   return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(MessageContext.Provider, { value: context, children });
 };
 
@@ -425,18 +426,12 @@ var MessageRoot = (0, import_react9.forwardRef)(
 var useMessageIf = (props) => {
   const { useMessage } = useMessageContext();
   return useMessage(({ message, branches, isLast, isCopied, isHovering }) => {
-    if (props.hasBranches === true && branches.length < 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;
+    if (props.hasBranches === true && branches.length < 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;
   });
 };
@@ -445,10 +440,94 @@ var MessageIf = ({ children, ...query }) => {
   return result ? children : null;
 };
 
-// src/primitives/message/MessageContent.tsx
+// src/utils/context/combined/useCombinedStore.ts
+var import_react11 = require("react");
+
+// src/utils/context/combined/createCombinedStore.ts
+var import_react10 = 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_react10.useSyncExternalStore)(subscribe, getSnapshot, getSnapshot);
+  };
+};
+
+// src/utils/context/combined/useCombinedStore.ts
+var useCombinedStore = (stores, selector) => {
+  const useCombined = (0, import_react11.useMemo)(() => createCombinedStore(stores), stores);
+  return useCombined(selector);
+};
+
+// src/utils/context/useContentPartContext.ts
+var import_react12 = require("react");
+var ContentPartContext = (0, import_react12.createContext)(null);
+var useContentPartContext = () => {
+  const context = (0, import_react12.useContext)(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
+var import_react13 = require("react");
+var import_zustand3 = require("zustand");
 var import_jsx_runtime6 = require("react/jsx-runtime");
+var useContentPartContext2 = () => {
+  const [context] = (0, import_react13.useState)(() => {
+    const useContentPart = (0, import_zustand3.create)(() => ({
+      part: null,
+      isLoading: false
+    }));
+    return { useContentPart };
+  });
+  return context;
+};
+var ContentPartProvider = ({
+  part,
+  isLoading,
+  children
+}) => {
+  const context = useContentPartContext2();
+  (0, import_react13.useMemo)(() => {
+    context.useContentPart.setState(
+      {
+        part,
+        isLoading
+      },
+      true
+    );
+  }, [context, part, isLoading]);
+  return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(ContentPartContext.Provider, { value: context, children });
+};
+
+// src/primitives/message/MessageContent.tsx
+var import_jsx_runtime7 = require("react/jsx-runtime");
 var defaultComponents = {
-  Text: ({ part }) => /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_jsx_runtime6.Fragment, { children: part.text }),
+  Text: ({ part }) => /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(import_jsx_runtime7.Fragment, { children: [
+    part.text,
+    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(ContentPartLoadingIndicator, {})
+  ] }),
   Image: () => null,
   UI: ({ part }) => part.display,
   tools: {
@@ -463,29 +542,61 @@ var MessageContent = ({
     tools: { by_name = {}, Fallback = defaultComponents.tools.Fallback } = {}
   } = {}
 }) => {
+  const { useThread } = useAssistantContext();
   const { useMessage } = useMessageContext();
   const content = useMessage((s) => s.message.content);
-  return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_jsx_runtime6.Fragment, { children: content.map((part, i) => {
+  const isLoading = useCombinedStore(
+    [useThread, useMessage],
+    (t, s) => s.isLast && t.isRunning
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_jsx_runtime7.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__ */ (0, import_jsx_runtime6.jsx)(Text, { part }, key);
+        component = /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Text, { part });
+        break;
       case "image":
-        return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Image, { part }, key);
+        component = /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Image, { part });
+        break;
       case "ui":
-        return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(UI, { part }, key);
+        component = /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(UI, { part });
+        break;
       case "tool-call": {
         const Tool = by_name[part.name] || Fallback;
-        return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Tool, { part }, key);
+        component = /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Tool, { part });
+        break;
       }
       default:
-        return null;
+        throw new Error(`Unknown content part type: ${type}`);
     }
+    return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+      ContentPartProvider,
+      {
+        part,
+        isLoading: i === content.length - 1 && isLoading,
+        children: component
+      },
+      key
+    );
   }) });
 };
 
+// src/primitives/message/MessageLoading.tsx
+var import_react_primitive4 = require("@radix-ui/react-primitive");
+var import_react14 = require("react");
+var import_jsx_runtime8 = require("react/jsx-runtime");
+var MessageLoading = (0, import_react14.forwardRef)((props, ref) => {
+  const { useMessage } = useMessageContext();
+  (0, import_react14.useMemo)(() => {
+    useMessage.getState().setLoadingIndicator(/* @__PURE__ */ (0, import_jsx_runtime8.jsx)(import_react_primitive4.Primitive.div, { ...props, ref }));
+  }, [useMessage, props, ref]);
+  return null;
+});
+
 // src/primitives/thread/ThreadMessages.tsx
-var import_jsx_runtime7 = require("react/jsx-runtime");
+var import_jsx_runtime9 = require("react/jsx-runtime");
 var getComponents = (components) => {
   return {
     EditComposer: components.EditComposer ?? components.UserMessage ?? components.Message,
@@ -498,21 +609,20 @@ var ThreadMessages = ({ components }) => {
   const thread = useThread();
   const messages = thread.messages;
   const { UserMessage, EditComposer, AssistantMessage } = getComponents(components);
-  if (messages.length === 0)
-    return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_jsx_runtime7.Fragment, { children: messages.map((message, idx) => {
+  if (messages.length === 0) return null;
+  return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_jsx_runtime9.Fragment, { children: messages.map((message, idx) => {
     const parentId = messages[idx - 1]?.id ?? null;
-    return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
+    return /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
       MessageProvider,
       {
         message,
         parentId,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(MessageIf, { user: true, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(ComposerIf, { editing: false, children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(UserMessage, {}) }),
-            /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(ComposerIf, { editing: true, children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(EditComposer, {}) })
+          /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(MessageIf, { user: true, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(ComposerIf, { editing: false, children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(UserMessage, {}) }),
+            /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(ComposerIf, { editing: true, children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(EditComposer, {}) })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(MessageIf, { assistant: true, children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(AssistantMessage, {}) })
+          /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(MessageIf, { assistant: true, children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(AssistantMessage, {}) })
         ]
       },
       parentId ?? "__ROOT__"
@@ -522,17 +632,17 @@ var ThreadMessages = ({ components }) => {
 
 // src/primitives/thread/ThreadScrollToBottom.tsx
 var import_primitive3 = require("@radix-ui/primitive");
-var import_react_primitive4 = require("@radix-ui/react-primitive");
-var import_react10 = require("react");
-var import_jsx_runtime8 = require("react/jsx-runtime");
-var ThreadScrollToBottom = (0, import_react10.forwardRef)(({ onClick, ...rest }, ref) => {
+var import_react_primitive5 = require("@radix-ui/react-primitive");
+var import_react15 = require("react");
+var import_jsx_runtime10 = require("react/jsx-runtime");
+var ThreadScrollToBottom = (0, import_react15.forwardRef)(({ onClick, ...rest }, ref) => {
   const { useViewport } = useAssistantContext();
   const isAtBottom = useViewport((s) => s.isAtBottom);
   const handleScrollToBottom = () => {
     useViewport.getState().scrollToBottom();
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
-    import_react_primitive4.Primitive.button,
+  return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
+    import_react_primitive5.Primitive.button,
     {
       ...rest,
       disabled: isAtBottom,
@@ -544,10 +654,10 @@ var ThreadScrollToBottom = (0, import_react10.forwardRef)(({ onClick, ...rest },
 
 // src/primitives/thread/ThreadSuggestion.tsx
 var import_primitive4 = require("@radix-ui/primitive");
-var import_react_primitive5 = require("@radix-ui/react-primitive");
-var import_react11 = require("react");
-var import_jsx_runtime9 = require("react/jsx-runtime");
-var ThreadSuggestion = (0, import_react11.forwardRef)(({ onClick, prompt, method, autoSend: send, ...rest }, ref) => {
+var import_react_primitive6 = require("@radix-ui/react-primitive");
+var import_react16 = require("react");
+var import_jsx_runtime11 = require("react/jsx-runtime");
+var ThreadSuggestion = (0, import_react16.forwardRef)(({ onClick, prompt, method, autoSend: send, ...rest }, ref) => {
   const { useThread, useComposer } = useAssistantContext();
   const isDisabled = useThread((t) => t.isRunning);
   const handleApplySuggestion = () => {
@@ -558,8 +668,8 @@ var ThreadSuggestion = (0, import_react11.forwardRef)(({ onClick, prompt, method
       composer.send();
     }
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
-    import_react_primitive5.Primitive.button,
+  return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+    import_react_primitive6.Primitive.button,
     {
       ...rest,
       disabled: isDisabled,
@@ -582,25 +692,24 @@ __export(composer_exports, {
 // src/primitives/composer/ComposerRoot.tsx
 var import_primitive5 = require("@radix-ui/primitive");
 var import_react_compose_refs2 = require("@radix-ui/react-compose-refs");
-var import_react_primitive6 = require("@radix-ui/react-primitive");
-var import_react12 = require("react");
-var import_jsx_runtime10 = require("react/jsx-runtime");
-var ComposerRoot = (0, import_react12.forwardRef)(
+var import_react_primitive7 = require("@radix-ui/react-primitive");
+var import_react17 = require("react");
+var import_jsx_runtime12 = require("react/jsx-runtime");
+var ComposerRoot = (0, import_react17.forwardRef)(
   ({ onSubmit, ...rest }, forwardedRef) => {
     const { useViewport } = useAssistantContext();
     const { useComposer } = useComposerContext();
-    const formRef = (0, import_react12.useRef)(null);
+    const formRef = (0, import_react17.useRef)(null);
     const ref = (0, import_react_compose_refs2.useComposedRefs)(forwardedRef, formRef);
     const handleSubmit = (e) => {
       const composerState = useComposer.getState();
-      if (!composerState.isEditing)
-        return;
+      if (!composerState.isEditing) return;
       e.preventDefault();
       composerState.send();
       useViewport.getState().scrollToBottom();
     };
-    return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
-      import_react_primitive6.Primitive.form,
+    return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+      import_react_primitive7.Primitive.form,
       {
         ...rest,
         ref,
@@ -614,22 +723,20 @@ var ComposerRoot = (0, import_react12.forwardRef)(
 var import_primitive6 = 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_react13 = require("react");
+var import_react18 = require("react");
 var import_react_textarea_autosize = __toESM(require("react-textarea-autosize"));
-var import_jsx_runtime11 = require("react/jsx-runtime");
-var ComposerInput = (0, import_react13.forwardRef)(
+var import_jsx_runtime13 = require("react/jsx-runtime");
+var ComposerInput = (0, import_react18.forwardRef)(
   ({ autoFocus = false, asChild, disabled, onChange, onKeyDown, ...rest }, forwardedRef) => {
     const { useThread, useViewport } = useAssistantContext();
     const { useComposer, type } = useComposerContext();
     const value = useComposer((c) => {
-      if (!c.isEditing)
-        return "";
+      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;
+      if (disabled) return;
       const composer = useComposer.getState();
       if (e.key === "Escape") {
         if (useComposer.getState().cancel()) {
@@ -644,26 +751,25 @@ var ComposerInput = (0, import_react13.forwardRef)(
         }
       }
     };
-    const textareaRef = (0, import_react13.useRef)(null);
+    const textareaRef = (0, import_react18.useRef)(null);
     const ref = (0, import_react_compose_refs3.useComposedRefs)(forwardedRef, textareaRef);
     const autoFocusEnabled = autoFocus && !disabled;
-    const focus = (0, import_react13.useCallback)(() => {
+    const focus = (0, import_react18.useCallback)(() => {
       const textarea = textareaRef.current;
-      if (!textarea || !autoFocusEnabled)
-        return;
+      if (!textarea || !autoFocusEnabled) return;
       textarea.focus();
       textarea.setSelectionRange(
         textareaRef.current.value.length,
         textareaRef.current.value.length
       );
     }, [autoFocusEnabled]);
-    (0, import_react13.useEffect)(() => focus(), [focus]);
+    (0, import_react18.useEffect)(() => focus(), [focus]);
     useOnScrollToBottom(() => {
       if (type === "assistant") {
         focus();
       }
     });
-    return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
       Component,
       {
         value,
@@ -672,8 +778,7 @@ var ComposerInput = (0, import_react13.forwardRef)(
         disabled,
         onChange: (0, import_primitive6.composeEventHandlers)(onChange, (e) => {
           const composerState = useComposer.getState();
-          if (!composerState.isEditing)
-            return;
+          if (!composerState.isEditing) return;
           return composerState.setValue(e.target.value);
         }),
         onKeyDown: (0, import_primitive6.composeEventHandlers)(onKeyDown, handleKeyPress)
@@ -683,15 +788,15 @@ var ComposerInput = (0, import_react13.forwardRef)(
 );
 
 // src/primitives/composer/ComposerSend.tsx
-var import_react_primitive7 = require("@radix-ui/react-primitive");
-var import_react14 = require("react");
-var import_jsx_runtime12 = require("react/jsx-runtime");
-var ComposerSend = (0, import_react14.forwardRef)(
+var import_react_primitive8 = require("@radix-ui/react-primitive");
+var import_react19 = require("react");
+var import_jsx_runtime14 = require("react/jsx-runtime");
+var ComposerSend = (0, import_react19.forwardRef)(
   ({ disabled, ...rest }, ref) => {
     const { useComposer } = useComposerContext();
     const hasValue = useComposer((c) => c.isEditing && c.value.length > 0);
-    return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
-      import_react_primitive7.Primitive.button,
+    return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+      import_react_primitive8.Primitive.button,
       {
         type: "submit",
         ...rest,
@@ -704,16 +809,16 @@ var ComposerSend = (0, import_react14.forwardRef)(
 
 // src/primitives/composer/ComposerCancel.tsx
 var import_primitive7 = require("@radix-ui/primitive");
-var import_react_primitive8 = require("@radix-ui/react-primitive");
-var import_react15 = require("react");
-var import_jsx_runtime13 = require("react/jsx-runtime");
-var ComposerCancel = (0, import_react15.forwardRef)(({ onClick, ...rest }, ref) => {
+var import_react_primitive9 = require("@radix-ui/react-primitive");
+var import_react20 = require("react");
+var import_jsx_runtime15 = require("react/jsx-runtime");
+var ComposerCancel = (0, import_react20.forwardRef)(({ onClick, ...rest }, ref) => {
   const { useComposer } = useComposerContext();
   const handleCancel = () => {
     useComposer.getState().cancel();
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
-    import_react_primitive8.Primitive.button,
+  return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+    import_react_primitive9.Primitive.button,
     {
       type: "button",
       ...rest,
@@ -733,32 +838,6 @@ __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 } = useAssistantContext();
@@ -767,8 +846,7 @@ var useGoToNextBranch = () => {
     [useMessage, useComposer],
     (m, c) => c.isEditing || m.branches.indexOf(m.message.id) + 1 >= m.branches.length
   );
-  if (disabled)
-    return null;
+  if (disabled) return null;
   return () => {
     const { message, branches } = useMessage.getState();
     useThread.getState().switchToBranch(branches[branches.indexOf(message.id) + 1]);
@@ -777,15 +855,15 @@ var useGoToNextBranch = () => {
 
 // src/utils/createActionButton.tsx
 var import_primitive8 = require("@radix-ui/primitive");
-var import_react_primitive9 = require("@radix-ui/react-primitive");
-var import_react18 = require("react");
-var import_jsx_runtime14 = require("react/jsx-runtime");
+var import_react_primitive10 = require("@radix-ui/react-primitive");
+var import_react21 = require("react");
+var import_jsx_runtime16 = require("react/jsx-runtime");
 var createActionButton = (useActionButton) => {
-  return (0, import_react18.forwardRef)(
+  return (0, import_react21.forwardRef)(
     (props, forwardedRef) => {
       const onClick = useActionButton(props);
-      return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
-        import_react_primitive9.Primitive.button,
+      return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+        import_react_primitive10.Primitive.button,
         {
           type: "button",
           disabled: !onClick,
@@ -809,8 +887,7 @@ var useGoToPreviousBranch = () => {
     [useMessage, useComposer],
     (m, c) => c.isEditing || m.branches.indexOf(m.message.id) <= 0
   );
-  if (disabled)
-    return null;
+  if (disabled) return null;
   return () => {
     const { message, branches } = useMessage.getState();
     useThread.getState().switchToBranch(
@@ -824,27 +901,27 @@ var useGoToPreviousBranch = () => {
 var BranchPickerPrevious = createActionButton(useGoToPreviousBranch);
 
 // src/primitives/branchPicker/BranchPickerCount.tsx
-var import_jsx_runtime15 = require("react/jsx-runtime");
+var import_jsx_runtime17 = require("react/jsx-runtime");
 var BranchPickerCount = () => {
   const { useMessage } = useMessageContext();
   const branchCount = useMessage((s) => s.branches.length);
-  return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(import_jsx_runtime15.Fragment, { children: branchCount });
+  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(import_jsx_runtime17.Fragment, { children: branchCount });
 };
 
 // src/primitives/branchPicker/BranchPickerNumber.tsx
-var import_jsx_runtime16 = require("react/jsx-runtime");
+var import_jsx_runtime18 = require("react/jsx-runtime");
 var BranchPickerNumber = () => {
   const { useMessage } = useMessageContext();
   const branchIdx = useMessage((s) => s.branches.indexOf(s.message.id));
-  return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_jsx_runtime16.Fragment, { children: branchIdx + 1 });
+  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_jsx_runtime18.Fragment, { children: branchIdx + 1 });
 };
 
 // src/primitives/branchPicker/BranchPickerRoot.tsx
-var import_react_primitive10 = require("@radix-ui/react-primitive");
-var import_react19 = require("react");
-var import_jsx_runtime17 = require("react/jsx-runtime");
-var BranchPickerRoot = (0, import_react19.forwardRef)(({ hideWhenSingleBranch, ...rest }, ref) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(MessageIf, { hasBranches: hideWhenSingleBranch ? true : void 0, children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(import_react_primitive10.Primitive.div, { ...rest, ref }) });
+var import_react_primitive11 = require("@radix-ui/react-primitive");
+var import_react22 = require("react");
+var import_jsx_runtime19 = require("react/jsx-runtime");
+var BranchPickerRoot = (0, import_react22.forwardRef)(({ hideWhenSingleBranch, ...rest }, ref) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(MessageIf, { hasBranches: hideWhenSingleBranch ? true : void 0, children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(import_react_primitive11.Primitive.div, { ...rest, ref }) });
 });
 
 // src/primitives/actionBar/index.ts
@@ -857,31 +934,27 @@ __export(actionBar_exports, {
 });
 
 // src/primitives/actionBar/ActionBarRoot.tsx
-var import_react_primitive11 = require("@radix-ui/react-primitive");
-var import_react20 = require("react");
-var import_jsx_runtime18 = require("react/jsx-runtime");
-var ActionBarRoot = (0, import_react20.forwardRef)(({ hideWhenRunning, autohide, autohideFloat, ...rest }, ref) => {
+var import_react_primitive12 = require("@radix-ui/react-primitive");
+var import_react23 = require("react");
+var import_jsx_runtime20 = require("react/jsx-runtime");
+var ActionBarRoot = (0, import_react23.forwardRef)(({ hideWhenRunning, autohide, autohideFloat, ...rest }, ref) => {
   const { useThread } = useAssistantContext();
   const { useMessage } = useMessageContext();
   const hideAndfloatStatus = useCombinedStore(
     [useThread, useMessage],
     (t, m) => {
-      if (hideWhenRunning && t.isRunning)
-        return "hidden" /* Hidden */;
+      if (hideWhenRunning && t.isRunning) return "hidden" /* Hidden */;
       const autohideEnabled = autohide === "always" || autohide === "not-last" && !m.isLast;
-      if (!autohideEnabled)
-        return "normal" /* Normal */;
-      if (!m.isHovering)
-        return "hidden" /* Hidden */;
+      if (!autohideEnabled) return "normal" /* Normal */;
+      if (!m.isHovering) return "hidden" /* Hidden */;
       if (autohideFloat === "always" || autohideFloat === "single-branch" && m.branches.length <= 1)
         return "floating" /* Floating */;
       return "normal" /* Normal */;
     }
   );
-  if (hideAndfloatStatus === "hidden" /* Hidden */)
-    return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
-    import_react_primitive11.Primitive.div,
+  if (hideAndfloatStatus === "hidden" /* Hidden */) return null;
+  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+    import_react_primitive12.Primitive.div,
     {
       "data-floating": hideAndfloatStatus === "floating" /* Floating */,
       ...rest,
@@ -893,14 +966,18 @@ var ActionBarRoot = (0, import_react20.forwardRef)(({ hideWhenRunning, autohide,
 // src/actions/useCopyMessage.tsx
 var useCopyMessage = ({ copiedDuration = 3e3 }) => {
   const { useMessage, useComposer } = useMessageContext();
-  const isEditing = useComposer((s) => s.isEditing);
-  if (isEditing)
-    return null;
+  const hasCopyableContent = useCombinedStore(
+    [useMessage, useComposer],
+    (m, c) => {
+      return c.isEditing || m.message.content.some((c2) => c2.type === "text");
+    }
+  );
+  if (!hasCopyableContent) return null;
   return () => {
+    const { isEditing, value: composerValue } = useComposer.getState();
     const { message, setIsCopied } = useMessage.getState();
-    if (message.content[0]?.type !== "text")
-      throw new Error("Copying is only supported for text-only messages");
-    navigator.clipboard.writeText(message.content[0].text);
+    const valueToCopy = isEditing ? composerValue : getMessageText(message);
+    navigator.clipboard.writeText(valueToCopy);
     setIsCopied(true);
     setTimeout(() => setIsCopied(false), copiedDuration);
   };
@@ -917,12 +994,9 @@ var useReloadMessage = () => {
     [useThread, useMessage],
     (t, m) => t.isRunning || m.message.role !== "assistant"
   );
-  if (disabled)
-    return null;
+  if (disabled) return null;
   return () => {
-    const { message, parentId } = useMessage.getState();
-    if (message.role !== "assistant")
-      throw new Error("Reloading is only supported on assistant messages");
+    const { parentId } = useMessage.getState();
     useThread.getState().startRun(parentId);
     useViewport.getState().scrollToBottom();
   };
@@ -938,8 +1012,7 @@ var useBeginMessageEdit = () => {
     [useMessage, useComposer],
     (m, c) => m.message.role !== "user" || c.isEditing
   );
-  if (disabled)
-    return null;
+  if (disabled) return null;
   return () => {
     const { edit } = useComposer.getState();
     edit();
@@ -949,18 +1022,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
-var import_react23 = require("react");
+var import_react26 = require("react");
 
 // src/adapters/vercel/useDummyAIAssistantContext.tsx
-var import_react21 = require("react");
-var import_zustand4 = require("zustand");
+var import_react24 = require("react");
+var import_zustand5 = require("zustand");
 
 // src/utils/context/stores/ViewportStore.tsx
-var import_zustand3 = require("zustand");
+var import_zustand4 = require("zustand");
 var makeViewportStore = () => {
   const scrollToBottomListeners = /* @__PURE__ */ new Set();
-  return (0, import_zustand3.create)(() => ({
+  return (0, import_zustand4.create)(() => ({
     isAtBottom: true,
     scrollToBottom: () => {
       for (const listener of scrollToBottomListeners) {
@@ -978,7 +1058,7 @@ var makeViewportStore = () => {
 
 // src/adapters/vercel/useDummyAIAssistantContext.tsx
 var makeDummyThreadStore = () => {
-  return (0, import_zustand4.create)(() => ({
+  return (0, import_zustand5.create)(() => ({
     messages: [],
     isRunning: false,
     getBranches: () => {
@@ -987,19 +1067,19 @@ var makeDummyThreadStore = () => {
     switchToBranch: () => {
       throw new Error("Not implemented");
     },
-    append: async () => {
+    append: () => {
       throw new Error("Not implemented");
     },
-    cancelRun: () => {
+    startRun: () => {
       throw new Error("Not implemented");
     },
-    startRun: async () => {
+    cancelRun: () => {
       throw new Error("Not implemented");
     }
   }));
 };
 var useDummyAIAssistantContext = () => {
-  const [context] = (0, import_react21.useState)(() => {
+  const [context] = (0, import_react24.useState)(() => {
     const useThread = makeDummyThreadStore();
     const useViewport = makeViewportStore();
     const useComposer = makeThreadComposerStore(useThread);
@@ -1009,7 +1089,7 @@ var useDummyAIAssistantContext = () => {
 };
 
 // src/adapters/vercel/useVercelAIThreadState.tsx
-var import_react22 = require("react");
+var import_react25 = require("react");
 
 // src/adapters/MessageRepository.tsx
 var import_non_secure = require("nanoid/non-secure");
@@ -1021,15 +1101,48 @@ var optimisticPrefix = "__optimistic__";
 var generateOptimisticId = () => `${optimisticPrefix}${generateId()}`;
 var isOptimisticId = (id) => id.startsWith(optimisticPrefix);
 var findHead = (message) => {
-  if (message.next)
-    return findHead(message.next);
+  if (message.next) return findHead(message.next);
   return message;
 };
 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) {
@@ -1037,28 +1150,18 @@ var MessageRepository = class {
     }
     return messages;
   }
-  // TODO previousId is confusing
-  // TODO previousId does not fix children
-  // TODO cut / link operations
-  addOrUpdateMessage(parentId, message, previousId = message.id) {
-    const item = this.messages.get(message.id);
-    if (item) {
-      if (item.prev?.current.id !== parentId) {
-        if ((item.prev?.current.id ?? null) !== parentId) {
-          this.deleteMessage(message.id);
-        } else {
-          item.current = message;
-          if (previousId !== message.id) {
-            this.messages.delete(previousId);
-            this.messages.set(message.id, item);
-          }
-          return;
-        }
-      }
-    }
+  addOrUpdateMessage(parentId, message) {
+    const existingItem = this.messages.get(message.id);
     const prev = parentId ? this.messages.get(parentId) : null;
     if (prev === void 0)
-      throw new Error("Unexpected: Parent message not found");
+      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,
@@ -1067,108 +1170,83 @@ 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("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() {
+  appendOptimisticMessage(parentId, message) {
     let optimisticId;
     do {
       optimisticId = generateOptimisticId();
     } while (this.messages.has(optimisticId));
-    return optimisticId;
-  }
-  commitOptimisticAppend(message) {
-    const optimisticIdUser = this.getOptimisticId();
-    this.addOrUpdateMessage(message.parentId, {
-      id: optimisticIdUser,
-      role: "user",
-      content: message.content,
-      createdAt: /* @__PURE__ */ new Date()
-    });
-    const optimisticIdAssistant = this.commitOptimisticRun(optimisticIdUser);
-    return [optimisticIdUser, optimisticIdAssistant];
-  }
-  commitOptimisticRun(parentId) {
-    const optimisticId = this.getOptimisticId();
     this.addOrUpdateMessage(parentId, {
+      ...message,
       id: optimisticId,
-      role: "assistant",
-      content: [
-        {
-          type: "text",
-          text: ""
-        }
-      ],
       createdAt: /* @__PURE__ */ new Date()
     });
     return optimisticId;
   }
-  getBranches(messageId) {
+  deleteMessage(messageId, newParentId) {
     const message = this.messages.get(messageId);
+    const newParent = newParentId ? this.messages.get(newParentId) : null;
     if (!message)
-      throw new Error("Unexpected: Message not found");
-    if (message.prev) {
-      return message.prev.children;
+      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");
     }
-    return this.rootChildren;
+    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."
+      );
+    const { children } = message.prev ?? this.root;
+    return children;
   }
   switchToBranch(messageId) {
     const message = this.messages.get(messageId);
     if (!message)
-      throw new Error("Unexpected: Branch not found");
+      throw new Error(
+        "MessageRepository(switchToBranch): Branch not found. This is likely an internal bug in assistant-ui."
+      );
     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 {
+    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;
+      }
     }
   }
 };
@@ -1182,8 +1260,7 @@ var ThreadMessageConverter = class {
   convertMessages(messages) {
     return messages.map((m) => {
       const cached = this.cache.get(m);
-      if (cached)
-        return cached;
+      if (cached) return cached;
       const newMessage = this.converter(m);
       this.cache.set(m, newMessage);
       return newMessage;
@@ -1194,41 +1271,51 @@ var ThreadMessageConverter = class {
 // src/adapters/vercel/useVercelAIThreadState.tsx
 var vercelToThreadMessage = (message) => {
   if (message.role !== "user" && message.role !== "assistant")
-    throw new Error("Unsupported role");
+    throw new Error(
+      `You have a message with an unsupported role. The role ${message.role} is not supported.`
+    );
   return {
     id: message.id,
     role: message.role,
-    content: [{ type: "text", text: message.content }],
+    content: [
+      ...message.content ? [{ type: "text", text: message.content }] : [],
+      ...message.toolInvocations?.map((t) => ({
+        type: "tool-call",
+        name: t.toolName,
+        args: t.args,
+        result: "result" in t ? t.result : void 0
+      })) ?? []
+    ],
+    // ignore type mismatch for now
     createdAt: message.createdAt ?? /* @__PURE__ */ new Date(),
     innerMessage: message
   };
 };
 var converter = new ThreadMessageConverter(vercelToThreadMessage);
 var sliceMessagesUntil = (messages, messageId) => {
-  if (messageId == null)
-    return [];
-  if (isOptimisticId(messageId))
-    return messages;
+  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");
+    throw new Error(
+      "useVercelAIThreadState: Message not found. This is liekly an internal bug in assistant-ui."
+    );
   return messages.slice(0, messageIdx + 1);
 };
 var hasUpcomingMessage = (isRunning, messages) => {
   return isRunning && messages[messages.length - 1]?.role !== "assistant";
 };
 var getIsRunning = (vercel) => {
-  if ("isLoading" in vercel)
-    return vercel.isLoading;
+  if ("isLoading" in vercel) return vercel.isLoading;
   return vercel.status === "in_progress";
 };
 var useVercelAIThreadState = (vercel) => {
-  const [data] = (0, import_react22.useState)(() => new MessageRepository());
-  const vercelRef = (0, import_react22.useRef)(vercel);
+  const [data] = (0, import_react25.useState)(() => new MessageRepository());
+  const vercelRef = (0, import_react25.useRef)(vercel);
   vercelRef.current = vercel;
   const isRunning = getIsRunning(vercelRef.current);
-  const assistantOptimisticIdRef = (0, import_react22.useRef)(null);
-  const messages = (0, import_react22.useMemo)(() => {
+  const assistantOptimisticIdRef = (0, import_react25.useRef)(null);
+  const messages = (0, import_react25.useMemo)(() => {
     const vm = converter.convertMessages(vercel.messages);
     for (let i = 0; i < vm.length; i++) {
       const message = vm[i];
@@ -1236,24 +1323,28 @@ 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);
     return data.getMessages();
   }, [data, isRunning, vercel.messages]);
-  const getBranches = (0, import_react22.useCallback)(
+  const getBranches2 = (0, import_react25.useCallback)(
     (messageId) => {
       return data.getBranches(messageId);
     },
     [data]
   );
-  const switchToBranch = (0, import_react22.useCallback)(
+  const switchToBranch2 = (0, import_react25.useCallback)(
     (messageId) => {
       data.switchToBranch(messageId);
       vercelRef.current.setMessages(
@@ -1262,10 +1353,12 @@ var useVercelAIThreadState = (vercel) => {
     },
     [data]
   );
-  const startRun = (0, import_react22.useCallback)(async (parentId) => {
+  const startRun = (0, import_react25.useCallback)(async (parentId) => {
     const reloadMaybe = "reload" in vercelRef.current ? vercelRef.current.reload : void 0;
     if (!reloadMaybe)
-      throw new Error("Reload not supported by Vercel AI SDK's useAssistant");
+      throw new Error(
+        "Reload is not supported by Vercel AI SDK's useAssistant."
+      );
     const newMessages = sliceMessagesUntil(
       vercelRef.current.messages,
       parentId
@@ -1273,9 +1366,9 @@ var useVercelAIThreadState = (vercel) => {
     vercelRef.current.setMessages(newMessages);
     await reloadMaybe();
   }, []);
-  const append = (0, import_react22.useCallback)(async (message) => {
+  const append = (0, import_react25.useCallback)(async (message) => {
     if (message.content.length !== 1 || message.content[0]?.type !== "text")
-      throw new Error("Only text content is supported by Vercel AI SDK");
+      throw new Error("Only text content is supported by Vercel AI SDK.");
     const newMessages = sliceMessagesUntil(
       vercelRef.current.messages,
       message.parentId
@@ -1286,37 +1379,37 @@ var useVercelAIThreadState = (vercel) => {
       content: message.content[0].text
     });
   }, []);
-  const cancelRun = (0, import_react22.useCallback)(() => {
+  const cancelRun2 = (0, import_react25.useCallback)(() => {
     const lastMessage = vercelRef.current.messages.at(-1);
     vercelRef.current.stop();
     if (lastMessage?.role === "user") {
       vercelRef.current.setInput(lastMessage.content);
     }
   }, []);
-  return (0, import_react22.useMemo)(
+  return (0, import_react25.useMemo)(
     () => ({
       isRunning,
       messages,
-      getBranches,
-      switchToBranch,
+      getBranches: getBranches2,
+      switchToBranch: switchToBranch2,
       append,
       startRun,
-      cancelRun
+      cancelRun: cancelRun2
     }),
     [
       isRunning,
       messages,
-      getBranches,
-      switchToBranch,
+      getBranches2,
+      switchToBranch2,
       append,
       startRun,
-      cancelRun
+      cancelRun2
     ]
   );
 };
 
 // src/adapters/vercel/VercelAIAssistantProvider.tsx
-var import_jsx_runtime19 = require("react/jsx-runtime");
+var import_jsx_runtime21 = require("react/jsx-runtime");
 var VercelAIAssistantProvider = ({
   children,
   ...rest
@@ -1324,24 +1417,22 @@ var VercelAIAssistantProvider = ({
   const context = useDummyAIAssistantContext();
   const vercel = "chat" in rest ? rest.chat : rest.assistant;
   const threadState = useVercelAIThreadState(vercel);
-  (0, import_react23.useMemo)(() => {
+  (0, import_react26.useMemo)(() => {
     context.useThread.setState(threadState, true);
   }, [context, threadState]);
-  (0, import_react23.useMemo)(() => {
+  (0, import_react26.useMemo)(() => {
     context.useComposer.setState({
       value: vercel.input,
       setValue: vercel.setInput
     });
   }, [context, vercel.input, vercel.setInput]);
-  return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(AssistantContext.Provider, { value: context, children });
+  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(AssistantContext.Provider, { value: context, children });
 };
 
 // src/adapters/vercel/VercelRSCAssistantProvider.tsx
-var import_react24 = require("react");
-var import_jsx_runtime20 = require("react/jsx-runtime");
+var import_react27 = require("react");
+var import_jsx_runtime22 = require("react/jsx-runtime");
 var vercelToThreadMessage2 = (message) => {
-  if (message.role !== "user" && message.role !== "assistant")
-    throw new Error("Unsupported role");
   return {
     id: message.id,
     role: message.role,
@@ -1349,6 +1440,22 @@ var vercelToThreadMessage2 = (message) => {
     createdAt: message.createdAt ?? /* @__PURE__ */ new Date()
   };
 };
+var EMPTY_BRANCHES = [];
+var getBranches = () => {
+  return EMPTY_BRANCHES;
+};
+var switchToBranch = () => {
+  throw new Error(
+    "Branch switching is not supported by VercelRSCAssistantProvider."
+  );
+};
+var cancelRun = () => {
+  if (process.env["NODE_ENV"] === "development") {
+    console.warn(
+      "Run cancellation is not supported by VercelRSCAssistantProvider."
+    );
+  }
+};
 var VercelRSCAssistantProvider = ({
   children,
   convertMessage,
@@ -1358,53 +1465,66 @@ var VercelRSCAssistantProvider = ({
   reload
 }) => {
   const context = useDummyAIAssistantContext();
-  const converter2 = (0, import_react24.useMemo)(() => {
+  const [isRunning, setIsRunning] = (0, import_react27.useState)(false);
+  const withRunning = (0, import_react27.useCallback)((callback) => {
+    setIsRunning(true);
+    return callback.finally(() => setIsRunning(false));
+  }, []);
+  const converter2 = (0, import_react27.useMemo)(() => {
     const rscConverter = convertMessage ?? ((m) => m);
     return new ThreadMessageConverter((m) => {
       return vercelToThreadMessage2(rscConverter(m));
     });
   }, [convertMessage]);
-  const messages = (0, import_react24.useMemo)(() => {
+  const messages = (0, import_react27.useMemo)(() => {
     return converter2.convertMessages(vercelMessages);
   }, [converter2, vercelMessages]);
-  const append = (0, import_react24.useCallback)(
+  const append = (0, import_react27.useCallback)(
     async (message) => {
       if (message.parentId !== (context.useThread.getState().messages.at(-1)?.id ?? null)) {
         if (!edit)
           throw new Error(
-            "Unexpected: Message editing is not supported, no edit callback was provided to VercelRSCAssistantProvider."
+            "Message editing is not enabled, please provide an edit callback to VercelRSCAssistantProvider."
           );
-        await edit(message);
+        await withRunning(edit(message));
       } else {
-        await appendCallback(message);
+        await withRunning(appendCallback(message));
       }
     },
-    [context, appendCallback, edit]
+    [context, withRunning, appendCallback, edit]
   );
-  const startRun = (0, import_react24.useCallback)(
+  const startRun = (0, import_react27.useCallback)(
     async (parentId) => {
       if (!reload)
         throw new Error(
-          "Unexpected: Message reloading is not supported, no reload callback was provided to VercelRSCAssistantProvider."
+          "Message reloading is not enabled, please provide a reload callback to VercelRSCAssistantProvider."
         );
-      await reload(parentId);
+      await withRunning(reload(parentId));
     },
-    [reload]
+    [withRunning, reload]
   );
-  (0, import_react24.useMemo)(() => {
-    context.useThread.setState({
-      messages,
-      append,
-      startRun
-    });
-  }, [context, messages, append, startRun]);
-  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(AssistantContext.Provider, { value: context, children });
+  (0, import_react27.useMemo)(() => {
+    context.useThread.setState(
+      {
+        messages,
+        isRunning,
+        getBranches,
+        switchToBranch,
+        append,
+        startRun,
+        cancelRun
+      },
+      true
+    );
+  }, [context, messages, isRunning, append, startRun]);
+  return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(AssistantContext.Provider, { value: context, children });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ActionBarPrimitive,
   BranchPickerPrimitive,
   ComposerPrimitive,
+  ContentPartPrimitive,
   MessagePrimitive,
   ThreadPrimitive,
   VercelAIAssistantProvider,