@assistant-ui/react 0.1.10 → 0.1.12

package/dist/index.js

@@ -31,6 +31,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   ActionBarPrimitive: () => actionBar_exports,
+  AssistantModalPrimitive: () => assistantModal_exports,
   AssistantRuntimeProvider: () => AssistantRuntimeProvider,
   BranchPickerPrimitive: () => branchPicker_exports,
   ComposerPrimitive: () => composer_exports,
@@ -167,7 +168,7 @@ var useThreadContext = () => {
 
 // src/primitive-hooks/actionBar/useActionBarReload.tsx
 var useActionBarReload = () => {
-  const { useThread, useThreadActions, useViewport } = useThreadContext();
+  const { useThread, useThreadActions, useComposer, useViewport } = useThreadContext();
   const { useMessage } = useMessageContext();
   const disabled = useCombinedStore(
     [useThread, useMessage],
@@ -177,7 +178,8 @@ var useActionBarReload = () => {
     const { parentId } = useMessage.getState();
     useThreadActions.getState().startRun(parentId);
     useViewport.getState().scrollToBottom();
-  }, [useThreadActions, useMessage, useViewport]);
+    useComposer.getState().focus();
+  }, [useThreadActions, useComposer, useViewport, useMessage]);
   if (disabled) return null;
   return callback;
 };
@@ -300,12 +302,16 @@ var useComposerIf = (props) => {
 // src/primitive-hooks/composer/useComposerSend.tsx
 var import_react14 = require("react");
 var useComposerSend = () => {
+  const { useViewport, useComposer: useNewComposer } = useThreadContext();
   const { useComposer } = useComposerContext();
   const disabled = useComposer((c) => !c.isEditing || c.value.length === 0);
   const callback = (0, import_react14.useCallback)(() => {
-    const { send } = useComposer.getState();
-    send();
-  }, [useComposer]);
+    const composerState = useComposer.getState();
+    if (!composerState.isEditing) return;
+    composerState.send();
+    useViewport.getState().scrollToBottom();
+    useNewComposer.getState().focus();
+  }, [useNewComposer, useComposer, useViewport]);
   if (disabled) return null;
   return callback;
 };
@@ -397,12 +403,12 @@ var useThreadEmpty = () => {
 // src/primitive-hooks/thread/useThreadScrollToBottom.tsx
 var import_react15 = require("react");
 var useThreadScrollToBottom = () => {
-  const { useViewport } = useThreadContext();
+  const { useComposer, useViewport } = useThreadContext();
   const isAtBottom = useViewport((s) => s.isAtBottom);
   const handleScrollToBottom = (0, import_react15.useCallback)(() => {
-    const { scrollToBottom } = useViewport.getState();
-    scrollToBottom();
-  }, [useViewport]);
+    useViewport.getState().scrollToBottom();
+    useComposer.getState().focus();
+  }, [useViewport, useComposer]);
   if (isAtBottom) return null;
   return handleScrollToBottom;
 };
@@ -427,502 +433,242 @@ var useThreadSuggestion = ({
   return callback;
 };
 
-// src/primitives/thread/index.ts
-var thread_exports = {};
-__export(thread_exports, {
-  Empty: () => ThreadEmpty,
-  If: () => ThreadIf,
-  Messages: () => ThreadMessages,
-  Root: () => ThreadRoot,
-  ScrollToBottom: () => ThreadScrollToBottom,
-  Suggestion: () => ThreadSuggestion,
-  Viewport: () => ThreadViewport
+// src/primitives/actionBar/index.ts
+var actionBar_exports = {};
+__export(actionBar_exports, {
+  Copy: () => ActionBarCopy,
+  Edit: () => ActionBarEdit,
+  Reload: () => ActionBarReload,
+  Root: () => ActionBarRoot
 });
 
-// src/primitives/thread/ThreadRoot.tsx
+// src/primitives/actionBar/ActionBarRoot.tsx
 var import_react_primitive = require("@radix-ui/react-primitive");
 var import_react17 = require("react");
 var import_jsx_runtime = require("react/jsx-runtime");
-var ThreadRoot = (0, import_react17.forwardRef)(
-  (props, ref) => {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_primitive.Primitive.div, { ...props, ref });
-  }
-);
-ThreadRoot.displayName = "ThreadRoot";
-
-// src/primitives/thread/ThreadIf.tsx
-var ThreadIf = ({ children, ...query }) => {
-  const result = useThreadIf(query);
-  return result ? children : null;
-};
-
-// src/primitives/thread/ThreadEmpty.tsx
-var import_jsx_runtime2 = require("react/jsx-runtime");
-var ThreadEmpty = ({ children }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(ThreadIf, { empty: true, children });
+var useActionBarFloatStatus = ({
+  hideWhenRunning,
+  autohide,
+  autohideFloat
+}) => {
+  const { useThread } = useThreadContext();
+  const { useMessage, useMessageUtils } = useMessageContext();
+  return useCombinedStore(
+    [useThread, useMessage, useMessageUtils],
+    (t, m, mu) => {
+      if (hideWhenRunning && t.isRunning) return "hidden" /* Hidden */;
+      const autohideEnabled = autohide === "always" || autohide === "not-last" && !m.isLast;
+      if (!autohideEnabled) return "normal" /* Normal */;
+      if (!mu.isHovering) return "hidden" /* Hidden */;
+      if (autohideFloat === "always" || autohideFloat === "single-branch" && m.branches.length <= 1)
+        return "floating" /* Floating */;
+      return "normal" /* Normal */;
+    }
+  );
 };
+var ActionBarRoot = (0, import_react17.forwardRef)(({ hideWhenRunning, autohide, autohideFloat, ...rest }, ref) => {
+  const hideAndfloatStatus = useActionBarFloatStatus({
+    hideWhenRunning,
+    autohide,
+    autohideFloat
+  });
+  if (hideAndfloatStatus === "hidden" /* Hidden */) return null;
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+    import_react_primitive.Primitive.div,
+    {
+      ...hideAndfloatStatus === "floating" /* Floating */ ? { "data-floating": "true" } : null,
+      ...rest,
+      ref
+    }
+  );
+});
+ActionBarRoot.displayName = "ActionBarRoot";
 
-// src/primitives/thread/ThreadViewport.tsx
+// src/utils/createActionButton.tsx
 var import_primitive = require("@radix-ui/primitive");
-var import_react_compose_refs = require("@radix-ui/react-compose-refs");
 var import_react_primitive2 = require("@radix-ui/react-primitive");
-var import_react20 = require("react");
-
-// src/utils/hooks/useOnResizeContent.tsx
-var import_react_use_callback_ref = require("@radix-ui/react-use-callback-ref");
 var import_react18 = require("react");
-var useOnResizeContent = (ref, callback) => {
-  const callbackRef = (0, import_react_use_callback_ref.useCallbackRef)(callback);
-  (0, import_react18.useEffect)(() => {
-    const el = ref.current;
-    if (!el) return;
-    const resizeObserver = new ResizeObserver(() => {
-      callbackRef();
-    });
-    const mutationObserver = new MutationObserver((mutations) => {
-      for (const mutation of mutations) {
-        for (const node of mutation.addedNodes) {
-          if (node instanceof Element) {
-            resizeObserver.observe(node);
-          }
-        }
-        for (const node of mutation.removedNodes) {
-          if (node instanceof Element) {
-            resizeObserver.unobserve(node);
-          }
-        }
+var import_jsx_runtime2 = require("react/jsx-runtime");
+var createActionButton = (displayName, useActionButton) => {
+  const ActionButton = (0, import_react18.forwardRef)((props, forwardedRef) => {
+    const callback = useActionButton(props);
+    return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+      import_react_primitive2.Primitive.button,
+      {
+        type: "button",
+        disabled: !callback,
+        ...props,
+        ref: forwardedRef,
+        onClick: (0, import_primitive.composeEventHandlers)(props.onClick, () => {
+          callback?.();
+        })
       }
-      callbackRef();
-    });
-    resizeObserver.observe(el);
-    mutationObserver.observe(el, { childList: true });
-    for (const child of el.children) {
-      resizeObserver.observe(child);
-    }
-    return () => {
-      resizeObserver.disconnect();
-      mutationObserver.disconnect();
-    };
-  }, [ref, callbackRef]);
+    );
+  });
+  ActionButton.displayName = displayName;
+  return ActionButton;
 };
 
-// src/utils/hooks/useOnScrollToBottom.tsx
-var import_react_use_callback_ref2 = require("@radix-ui/react-use-callback-ref");
+// src/primitives/actionBar/ActionBarCopy.tsx
+var ActionBarCopy = createActionButton(
+  "ActionBarCopy",
+  useActionBarCopy
+);
+
+// src/primitives/actionBar/ActionBarReload.tsx
+var ActionBarReload = createActionButton(
+  "ActionBarReload",
+  useActionBarReload
+);
+
+// src/primitives/actionBar/ActionBarEdit.tsx
+var ActionBarEdit = createActionButton(
+  "ActionBarEdit",
+  useActionBarEdit
+);
+
+// src/primitives/assistantModal/index.ts
+var assistantModal_exports = {};
+__export(assistantModal_exports, {
+  Content: () => AssistantModalContent,
+  Root: () => AssistantModalRoot,
+  Trigger: () => AssistantModalTrigger
+});
+
+// src/primitives/assistantModal/AssistantModalRoot.tsx
+var import_react20 = require("react");
+var PopoverPrimitive = __toESM(require("@radix-ui/react-popover"));
+var import_primitive2 = require("@radix-ui/primitive");
+
+// src/utils/hooks/useOnComposerFocus.tsx
+var import_react_use_callback_ref = require("@radix-ui/react-use-callback-ref");
 var import_react19 = require("react");
-var useOnScrollToBottom = (callback) => {
-  const callbackRef = (0, import_react_use_callback_ref2.useCallbackRef)(callback);
-  const { useViewport } = useThreadContext();
+var useOnComposerFocus = (callback) => {
+  const callbackRef = (0, import_react_use_callback_ref.useCallbackRef)(callback);
+  const { useComposer } = useThreadContext();
   (0, import_react19.useEffect)(() => {
-    return useViewport.getState().onScrollToBottom(() => {
+    return useComposer.getState().onFocus(() => {
       callbackRef();
     });
-  }, [useViewport, callbackRef]);
+  }, [useComposer, callbackRef]);
 };
 
-// src/primitives/thread/ThreadViewport.tsx
+// src/primitives/assistantModal/AssistantModalRoot.tsx
 var import_jsx_runtime3 = require("react/jsx-runtime");
-var ThreadViewport = (0, import_react20.forwardRef)(({ autoScroll = true, onScroll, children, ...rest }, forwardedRef) => {
-  const messagesEndRef = (0, import_react20.useRef)(null);
-  const divRef = (0, import_react20.useRef)(null);
-  const ref = (0, import_react_compose_refs.useComposedRefs)(forwardedRef, divRef);
-  const { useViewport } = useThreadContext();
-  const firstRenderRef = (0, import_react20.useRef)(true);
-  const isScrollingToBottomRef = (0, import_react20.useRef)(false);
-  const lastScrollTop = (0, import_react20.useRef)(0);
-  const scrollToBottom = () => {
-    const div = messagesEndRef.current;
-    if (!div || !autoScroll) return;
-    const behavior = firstRenderRef.current ? "instant" : "auto";
-    firstRenderRef.current = false;
-    isScrollingToBottomRef.current = true;
-    div.scrollIntoView({ behavior });
-  };
-  useOnResizeContent(divRef, () => {
-    if (!isScrollingToBottomRef.current && !useViewport.getState().isAtBottom) {
-      handleScroll();
-    } else {
-      scrollToBottom();
-    }
-  });
-  useOnScrollToBottom(() => {
-    scrollToBottom();
+var usePopoverScope = PopoverPrimitive.createPopoverScope();
+var useAssistantModalOpenState = (defaultOpen = false) => {
+  const state = (0, import_react20.useState)(defaultOpen);
+  const [, setOpen] = state;
+  useOnComposerFocus(() => {
+    setOpen(true);
   });
-  const handleScroll = () => {
-    const div = divRef.current;
-    if (!div) return;
-    const isAtBottom = useViewport.getState().isAtBottom;
-    const newIsAtBottom = div.scrollHeight - div.scrollTop <= div.clientHeight;
-    if (!newIsAtBottom && lastScrollTop.current < div.scrollTop) {
-    } else if (newIsAtBottom !== isAtBottom) {
-      isScrollingToBottomRef.current = false;
-      useViewport.setState({
-        isAtBottom: newIsAtBottom
-      });
-    }
-    lastScrollTop.current = div.scrollTop;
-  };
-  return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
-    import_react_primitive2.Primitive.div,
+  return state;
+};
+var AssistantModalRoot = ({
+  __scopeAssistantModal,
+  defaultOpen,
+  open,
+  onOpenChange,
+  ...rest
+}) => {
+  const scope = usePopoverScope(__scopeAssistantModal);
+  const [modalOpen, setOpen] = useAssistantModalOpenState(defaultOpen);
+  return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
+    PopoverPrimitive.Root,
     {
-      ...rest,
-      onScroll: (0, import_primitive.composeEventHandlers)(onScroll, handleScroll),
-      ref,
-      children: [
-        children,
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("div", { ref: messagesEndRef })
-      ]
+      ...scope,
+      open: open === void 0 ? modalOpen : open,
+      onOpenChange: (0, import_primitive2.composeEventHandlers)(onOpenChange, setOpen),
+      ...rest
     }
   );
-});
-ThreadViewport.displayName = "ThreadViewport";
-
-// src/primitives/thread/ThreadMessages.tsx
-var import_react22 = require("react");
+};
+AssistantModalRoot.displayName = "AssistantModalRoot";
 
-// src/context/providers/MessageProvider.tsx
+// src/primitives/assistantModal/AssistantModalTrigger.tsx
 var import_react21 = require("react");
-var import_zustand3 = require("zustand");
-
-// src/context/stores/EditComposer.ts
-var import_zustand = require("zustand");
+var PopoverPrimitive2 = __toESM(require("@radix-ui/react-popover"));
+var import_jsx_runtime4 = require("react/jsx-runtime");
+var AssistantModalTrigger = (0, import_react21.forwardRef)(
+  ({ __scopeAssistantModal, ...rest }, ref) => {
+    const scope = usePopoverScope(__scopeAssistantModal);
+    return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(PopoverPrimitive2.Trigger, { ...scope, ...rest, ref });
+  }
+);
+AssistantModalTrigger.displayName = "AssistantModalTrigger";
 
-// src/context/stores/BaseComposer.ts
-var makeBaseComposer = (set) => ({
-  value: "",
-  setValue: (value) => {
-    set({ value });
+// src/primitives/assistantModal/AssistantModalContent.tsx
+var import_react22 = require("react");
+var PopoverPrimitive3 = __toESM(require("@radix-ui/react-popover"));
+var import_primitive3 = require("@radix-ui/primitive");
+var import_jsx_runtime5 = require("react/jsx-runtime");
+var AssistantModalContent = (0, import_react22.forwardRef)(
+  ({
+    __scopeAssistantModal,
+    side,
+    align,
+    onInteractOutside,
+    dissmissOnInteractOutside = false,
+    ...props
+  }, forwardedRef) => {
+    const scope = usePopoverScope(__scopeAssistantModal);
+    return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(PopoverPrimitive3.Portal, { ...scope, children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
+      PopoverPrimitive3.Content,
+      {
+        ...scope,
+        ...props,
+        ref: forwardedRef,
+        side: side ?? "top",
+        align: align ?? "end",
+        onInteractOutside: (0, import_primitive3.composeEventHandlers)(
+          onInteractOutside,
+          dissmissOnInteractOutside ? void 0 : (e) => e.preventDefault()
+        )
+      }
+    ) });
   }
+);
+AssistantModalContent.displayName = "AssistantModalContent";
+
+// src/primitives/branchPicker/index.ts
+var branchPicker_exports = {};
+__export(branchPicker_exports, {
+  Count: () => BranchPickerCount,
+  Next: () => BranchPickerNext,
+  Number: () => BranchPickerNumber,
+  Previous: () => BranchPickerPrevious,
+  Root: () => BranchPickerRoot
 });
 
-// src/context/stores/EditComposer.ts
-var makeEditComposerStore = ({
-  onEdit,
-  onSend
-}) => (0, import_zustand.create)()((set, get, store) => ({
-  ...makeBaseComposer(set, get, store),
-  isEditing: false,
-  edit: () => {
-    const value = onEdit();
-    set({ isEditing: true, value });
-  },
-  send: () => {
-    const value = get().value;
-    set({ isEditing: false });
-    onSend(value);
-  },
-  cancel: () => {
-    if (!get().isEditing) return false;
-    set({ isEditing: false });
-    return true;
-  }
-}));
+// src/primitives/branchPicker/BranchPickerNext.tsx
+var BranchPickerNext = createActionButton(
+  "BranchPickerNext",
+  useBranchPickerNext
+);
 
-// src/context/stores/MessageUtils.ts
-var import_zustand2 = require("zustand");
-var makeMessageUtilsStore = () => (0, import_zustand2.create)((set) => ({
-  inProgressIndicator: null,
-  setInProgressIndicator: (value) => {
-    set({ inProgressIndicator: value });
-  },
-  isCopied: false,
-  setIsCopied: (value) => {
-    set({ isCopied: value });
-  },
-  isHovering: false,
-  setIsHovering: (value) => {
-    set({ isHovering: value });
-  }
-}));
+// src/primitives/branchPicker/BranchPickerPrevious.tsx
+var BranchPickerPrevious = createActionButton(
+  "BranchPickerPrevious",
+  useBranchPickerPrevious
+);
 
-// src/context/providers/MessageProvider.tsx
-var import_jsx_runtime4 = require("react/jsx-runtime");
-var getIsLast = (thread, message) => {
-  return thread.messages[thread.messages.length - 1]?.id === message.id;
+// src/primitives/branchPicker/BranchPickerCount.tsx
+var import_jsx_runtime6 = require("react/jsx-runtime");
+var BranchPickerCount = () => {
+  const branchCount = useBranchPickerCount();
+  return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_jsx_runtime6.Fragment, { children: branchCount });
 };
-var syncMessage = (thread, getBranches, useMessage, messageIndex) => {
-  const parentId = thread.messages[messageIndex - 1]?.id ?? null;
-  const message = thread.messages[messageIndex];
-  if (!message) return;
-  const isLast = getIsLast(thread, message);
-  const branches = getBranches(message.id);
-  const currentState = useMessage.getState();
-  if (currentState.message === message && currentState.parentId === parentId && currentState.branches === branches && currentState.isLast === isLast)
-    return;
-  useMessage.setState({
-    message,
-    parentId,
-    branches,
-    isLast
-  });
-};
-var useMessageContext2 = (messageIndex) => {
-  const { useThread, useThreadActions } = useThreadContext();
-  const [context] = (0, import_react21.useState)(() => {
-    const useMessage = (0, import_zustand3.create)(() => ({}));
-    const useMessageUtils = makeMessageUtilsStore();
-    const useEditComposer = makeEditComposerStore({
-      onEdit: () => {
-        const message = useMessage.getState().message;
-        if (message.role !== "user")
-          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(
-            "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"
-        );
-        useThreadActions.getState().append({
-          parentId,
-          content: [{ type: "text", text }, ...nonTextParts]
-        });
-      }
-    });
-    syncMessage(
-      useThread.getState(),
-      useThreadActions.getState().getBranches,
-      useMessage,
-      messageIndex
-    );
-    return { useMessage, useMessageUtils, useEditComposer };
-  });
-  (0, import_react21.useEffect)(() => {
-    return useThread.subscribe((thread) => {
-      syncMessage(
-        thread,
-        useThreadActions.getState().getBranches,
-        context.useMessage,
-        messageIndex
-      );
-    });
-  }, [useThread, useThreadActions, context, messageIndex]);
-  return context;
-};
-var MessageProvider = ({
-  messageIndex,
-  children
-}) => {
-  const context = useMessageContext2(messageIndex);
-  return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(MessageContext.Provider, { value: context, children });
-};
-
-// src/primitives/composer/ComposerIf.tsx
-var ComposerIf = ({ children, ...query }) => {
-  const result = useComposerIf(query);
-  return result ? children : null;
-};
-
-// src/primitives/message/MessageIf.tsx
-var MessageIf = ({ children, ...query }) => {
-  const result = useMessageIf(query);
-  return result ? children : null;
-};
-
-// src/primitives/thread/ThreadMessages.tsx
-var import_jsx_runtime5 = require("react/jsx-runtime");
-var getComponents = (components) => {
-  return {
-    EditComposer: components.EditComposer ?? components.UserMessage ?? components.Message,
-    UserMessage: components.UserMessage ?? components.Message,
-    AssistantMessage: components.AssistantMessage ?? components.Message
-  };
-};
-var ThreadMessageImpl = ({
-  messageIndex,
-  components
-}) => {
-  const { UserMessage, EditComposer, AssistantMessage } = getComponents(components);
-  return /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(MessageProvider, { messageIndex, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(MessageIf, { user: true, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(ComposerIf, { editing: false, children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(UserMessage, {}) }),
-      /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(ComposerIf, { editing: true, children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(EditComposer, {}) })
-    ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(MessageIf, { assistant: true, children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(AssistantMessage, {}) })
-  ] });
-};
-var ThreadMessage = (0, import_react22.memo)(
-  ThreadMessageImpl,
-  (prev, next) => prev.messageIndex === next.messageIndex && prev.components.UserMessage === next.components.UserMessage && prev.components.EditComposer === next.components.EditComposer && prev.components.AssistantMessage === next.components.AssistantMessage
-);
-var ThreadMessages = ({ components }) => {
-  const { useThread } = useThreadContext();
-  const messagesLength = useThread((t) => t.messages.length);
-  if (messagesLength === 0) return null;
-  return new Array(messagesLength).fill(null).map((_, idx) => {
-    const messageIndex = idx;
-    return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
-      ThreadMessage,
-      {
-        messageIndex,
-        components
-      },
-      messageIndex
-    );
-  });
-};
-
-// src/utils/createActionButton.tsx
-var import_primitive2 = require("@radix-ui/primitive");
-var import_react_primitive3 = require("@radix-ui/react-primitive");
-var import_react23 = require("react");
-var import_jsx_runtime6 = require("react/jsx-runtime");
-var createActionButton = (displayName, useActionButton) => {
-  const ActionButton = (0, import_react23.forwardRef)((props, forwardedRef) => {
-    const callback = useActionButton(props);
-    return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
-      import_react_primitive3.Primitive.button,
-      {
-        type: "button",
-        disabled: !callback,
-        ...props,
-        ref: forwardedRef,
-        onClick: (0, import_primitive2.composeEventHandlers)(props.onClick, () => {
-          callback?.();
-        })
-      }
-    );
-  });
-  ActionButton.displayName = displayName;
-  return ActionButton;
-};
-
-// src/primitives/thread/ThreadScrollToBottom.tsx
-var ThreadScrollToBottom = createActionButton(
-  "ThreadScrollToBottom",
-  useThreadScrollToBottom
-);
-
-// src/primitives/thread/ThreadSuggestion.tsx
-var ThreadSuggestion = createActionButton(
-  "ThreadSuggestion",
-  useThreadSuggestion
-);
-
-// src/primitives/composer/index.ts
-var composer_exports = {};
-__export(composer_exports, {
-  Cancel: () => ComposerCancel,
-  If: () => ComposerIf,
-  Input: () => ComposerInput,
-  Root: () => ComposerRoot,
-  Send: () => ComposerSend
-});
 
-// src/primitives/composer/ComposerRoot.tsx
-var import_primitive3 = require("@radix-ui/primitive");
-var import_react_compose_refs2 = require("@radix-ui/react-compose-refs");
-var import_react_primitive4 = require("@radix-ui/react-primitive");
-var import_react24 = require("react");
+// src/primitives/branchPicker/BranchPickerNumber.tsx
 var import_jsx_runtime7 = require("react/jsx-runtime");
-var ComposerRoot = (0, import_react24.forwardRef)(
-  ({ onSubmit, ...rest }, forwardedRef) => {
-    const { useViewport } = useThreadContext();
-    const { useComposer } = useComposerContext();
-    const formRef = (0, import_react24.useRef)(null);
-    const ref = (0, import_react_compose_refs2.useComposedRefs)(forwardedRef, formRef);
-    const handleSubmit = (e) => {
-      const composerState = useComposer.getState();
-      if (!composerState.isEditing) return;
-      e.preventDefault();
-      composerState.send();
-      useViewport.getState().scrollToBottom();
-    };
-    return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
-      import_react_primitive4.Primitive.form,
-      {
-        ...rest,
-        ref,
-        onSubmit: (0, import_primitive3.composeEventHandlers)(onSubmit, handleSubmit)
-      }
-    );
-  }
-);
-ComposerRoot.displayName = "ComposerRoot";
-
-// src/primitives/composer/ComposerInput.tsx
-var import_primitive4 = 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_react25 = require("react");
-var import_react_textarea_autosize = __toESM(require("react-textarea-autosize"));
-var import_jsx_runtime8 = require("react/jsx-runtime");
-var ComposerInput = (0, import_react25.forwardRef)(
-  ({ autoFocus = false, asChild, disabled, onChange, onKeyDown, ...rest }, forwardedRef) => {
-    const { useThread } = useThreadContext();
-    const { useComposer, type } = useComposerContext();
-    const value = useComposer((c) => {
-      if (!c.isEditing) return "";
-      return c.value;
-    });
-    const Component = asChild ? import_react_slot.Slot : import_react_textarea_autosize.default;
-    const textareaRef = (0, import_react25.useRef)(null);
-    const ref = (0, import_react_compose_refs3.useComposedRefs)(forwardedRef, textareaRef);
-    const handleKeyPress = (e) => {
-      if (disabled) return;
-      if (e.key === "Escape") {
-        const composer = useComposer.getState();
-        if (composer.cancel()) {
-          e.preventDefault();
-        }
-      } else if (e.key === "Enter" && e.shiftKey === false) {
-        const isRunning = useThread.getState().isRunning;
-        if (!isRunning) {
-          e.preventDefault();
-          textareaRef.current?.closest("form")?.requestSubmit();
-        }
-      }
-    };
-    const autoFocusEnabled = autoFocus && !disabled;
-    const focus = (0, import_react25.useCallback)(() => {
-      const textarea = textareaRef.current;
-      if (!textarea || !autoFocusEnabled) return;
-      textarea.focus();
-      textarea.setSelectionRange(
-        textareaRef.current.value.length,
-        textareaRef.current.value.length
-      );
-    }, [autoFocusEnabled]);
-    (0, import_react25.useEffect)(() => focus(), [focus]);
-    useOnScrollToBottom(() => {
-      if (type === "new") {
-        focus();
-      }
-    });
-    return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
-      Component,
-      {
-        value,
-        ...rest,
-        ref,
-        autoFocus,
-        disabled,
-        onChange: (0, import_primitive4.composeEventHandlers)(onChange, (e) => {
-          const composerState = useComposer.getState();
-          if (!composerState.isEditing) return;
-          return composerState.setValue(e.target.value);
-        }),
-        onKeyDown: (0, import_primitive4.composeEventHandlers)(onKeyDown, handleKeyPress)
-      }
-    );
-  }
-);
-ComposerInput.displayName = "ComposerInput";
-
-// src/primitives/composer/ComposerSend.tsx
-var ComposerSend = createActionButton("ComposerSend", useComposerSend);
+var BranchPickerNumber = () => {
+  const branchNumber = useBranchPickerNumber();
+  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_jsx_runtime7.Fragment, { children: branchNumber });
+};
 
-// src/primitives/composer/ComposerCancel.tsx
-var ComposerCancel = createActionButton(
-  "ComposerCancel",
-  useComposerCancel
-);
+// src/primitives/branchPicker/BranchPickerRoot.tsx
+var import_react_primitive6 = require("@radix-ui/react-primitive");
+var import_react28 = require("react");
 
 // src/primitives/message/index.ts
 var message_exports = {};
@@ -934,11 +680,11 @@ __export(message_exports, {
 });
 
 // src/primitives/message/MessageRoot.tsx
-var import_primitive5 = require("@radix-ui/primitive");
-var import_react_primitive5 = require("@radix-ui/react-primitive");
-var import_react26 = require("react");
-var import_jsx_runtime9 = require("react/jsx-runtime");
-var MessageRoot = (0, import_react26.forwardRef)(
+var import_primitive4 = require("@radix-ui/primitive");
+var import_react_primitive3 = require("@radix-ui/react-primitive");
+var import_react23 = require("react");
+var import_jsx_runtime8 = require("react/jsx-runtime");
+var MessageRoot = (0, import_react23.forwardRef)(
   ({ onMouseEnter, onMouseLeave, ...rest }, ref) => {
     const { useMessageUtils } = useMessageContext();
     const setIsHovering = useMessageUtils((s) => s.setIsHovering);
@@ -948,26 +694,32 @@ var MessageRoot = (0, import_react26.forwardRef)(
     const handleMouseLeave = () => {
       setIsHovering(false);
     };
-    return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
-      import_react_primitive5.Primitive.div,
+    return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
+      import_react_primitive3.Primitive.div,
       {
         ...rest,
         ref,
-        onMouseEnter: (0, import_primitive5.composeEventHandlers)(onMouseEnter, handleMouseEnter),
-        onMouseLeave: (0, import_primitive5.composeEventHandlers)(onMouseLeave, handleMouseLeave)
+        onMouseEnter: (0, import_primitive4.composeEventHandlers)(onMouseEnter, handleMouseEnter),
+        onMouseLeave: (0, import_primitive4.composeEventHandlers)(onMouseLeave, handleMouseLeave)
       }
     );
   }
 );
 MessageRoot.displayName = "MessageRoot";
 
-// src/primitives/message/MessageContent.tsx
-var import_react29 = require("react");
+// src/primitives/message/MessageIf.tsx
+var MessageIf = ({ children, ...query }) => {
+  const result = useMessageIf(query);
+  return result ? children : null;
+};
+
+// src/primitives/message/MessageContent.tsx
+var import_react26 = require("react");
 
 // src/context/providers/ContentPartProvider.tsx
-var import_react27 = require("react");
-var import_zustand4 = require("zustand");
-var import_jsx_runtime10 = require("react/jsx-runtime");
+var import_react24 = require("react");
+var import_zustand = require("zustand");
+var import_jsx_runtime9 = require("react/jsx-runtime");
 var syncContentPart = ({ message }, useContentPart, partIndex) => {
   const part = message.content[partIndex];
   if (!part) return;
@@ -984,14 +736,14 @@ var syncContentPart = ({ message }, useContentPart, partIndex) => {
 };
 var useContentPartContext2 = (partIndex) => {
   const { useMessage } = useMessageContext();
-  const [context] = (0, import_react27.useState)(() => {
-    const useContentPart = (0, import_zustand4.create)(
+  const [context] = (0, import_react24.useState)(() => {
+    const useContentPart = (0, import_zustand.create)(
       () => ({})
     );
     syncContentPart(useMessage.getState(), useContentPart, partIndex);
     return { useContentPart };
   });
-  (0, import_react27.useEffect)(() => {
+  (0, import_react24.useEffect)(() => {
     syncContentPart(useMessage.getState(), context.useContentPart, partIndex);
     return useMessage.subscribe((message) => {
       syncContentPart(message, context.useContentPart, partIndex);
@@ -1004,7 +756,7 @@ var ContentPartProvider = ({
   children
 }) => {
   const context = useContentPartContext2(partIndex);
-  return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(ContentPartContext.Provider, { value: context, children });
+  return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(ContentPartContext.Provider, { value: context, children });
 };
 
 // src/primitives/contentPart/ContentPartDisplay.tsx
@@ -1012,244 +764,649 @@ var ContentPartDisplay = () => {
   const display = useContentPartDisplay();
   return display ?? null;
 };
-
-// src/primitives/contentPart/ContentPartInProgressIndicator.tsx
-var ContentPartInProgressIndicator = () => {
-  const indicator = useContentPartInProgressIndicator();
-  return indicator;
+
+// src/primitives/contentPart/ContentPartInProgressIndicator.tsx
+var ContentPartInProgressIndicator = () => {
+  const indicator = useContentPartInProgressIndicator();
+  return indicator;
+};
+
+// src/primitives/contentPart/ContentPartText.tsx
+var import_react_primitive4 = require("@radix-ui/react-primitive");
+var import_react25 = require("react");
+var import_jsx_runtime10 = require("react/jsx-runtime");
+var ContentPartText = (0, import_react25.forwardRef)((props, forwardedRef) => {
+  const text = useContentPartText();
+  return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_react_primitive4.Primitive.span, { ...props, ref: forwardedRef, children: text });
+});
+ContentPartText.displayName = "ContentPartText";
+
+// src/primitives/message/MessageContent.tsx
+var import_jsx_runtime11 = require("react/jsx-runtime");
+var defaultComponents = {
+  Text: () => /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(import_jsx_runtime11.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(ContentPartText, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(ContentPartInProgressIndicator, {})
+  ] }),
+  Image: () => null,
+  UI: () => /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(ContentPartDisplay, {}),
+  tools: {
+    Fallback: (props) => {
+      const { useToolUIs } = useAssistantContext();
+      const Render = useToolUIs((s) => s.getToolUI(props.part.toolName));
+      if (!Render) return null;
+      return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Render, { ...props });
+    }
+  }
+};
+var MessageContentPartComponent = ({
+  components: {
+    Text = defaultComponents.Text,
+    Image = defaultComponents.Image,
+    UI = defaultComponents.UI,
+    tools: { by_name = {}, Fallback = defaultComponents.tools.Fallback } = {}
+  } = {}
+}) => {
+  const { useThreadActions } = useThreadContext();
+  const addToolResult = useThreadActions((t) => t.addToolResult);
+  const { useContentPart } = useContentPartContext();
+  const { part, status } = useContentPart();
+  const type = part.type;
+  switch (type) {
+    case "text":
+      return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Text, { part, status });
+    case "image":
+      return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Image, { part, status });
+    case "ui":
+      return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(UI, { part, status });
+    case "tool-call": {
+      const Tool = by_name[part.toolName] || Fallback;
+      const addResult = (result) => addToolResult(part.toolCallId, result);
+      return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Tool, { part, status, addResult });
+    }
+    default:
+      throw new Error(`Unknown content part type: ${type}`);
+  }
+};
+var MessageContentPartImpl = ({
+  partIndex,
+  components
+}) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(ContentPartProvider, { partIndex, children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(MessageContentPartComponent, { components }) });
+};
+var MessageContentPart = (0, import_react26.memo)(
+  MessageContentPartImpl,
+  (prev, next) => prev.partIndex === next.partIndex && prev.components?.Text === next.components?.Text && prev.components?.Image === next.components?.Image && prev.components?.UI === next.components?.UI && prev.components?.tools === next.components?.tools
+);
+var MessageContent = ({ components }) => {
+  const { useMessage } = useMessageContext();
+  const contentLength = useMessage((s) => s.message.content.length);
+  return new Array(contentLength).fill(null).map((_, idx) => {
+    const partIndex = idx;
+    return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+      MessageContentPart,
+      {
+        partIndex,
+        components
+      },
+      partIndex
+    );
+  });
+};
+
+// src/primitives/message/MessageInProgress.tsx
+var import_react_primitive5 = require("@radix-ui/react-primitive");
+var import_react27 = require("react");
+var import_jsx_runtime12 = require("react/jsx-runtime");
+var MessageInProgress = (0, import_react27.forwardRef)((props, ref) => {
+  const { useMessageUtils } = useMessageContext();
+  (0, import_react27.useMemo)(() => {
+    useMessageUtils.getState().setInProgressIndicator(/* @__PURE__ */ (0, import_jsx_runtime12.jsx)(import_react_primitive5.Primitive.span, { ...props, ref }));
+  }, [useMessageUtils, props, ref]);
+  return null;
+});
+MessageInProgress.displayName = "MessageInProgress";
+
+// src/primitives/branchPicker/BranchPickerRoot.tsx
+var import_jsx_runtime13 = require("react/jsx-runtime");
+var BranchPickerRoot = (0, import_react28.forwardRef)(({ hideWhenSingleBranch, ...rest }, ref) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(MessageIf, { hasBranches: hideWhenSingleBranch ? true : void 0, children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(import_react_primitive6.Primitive.div, { ...rest, ref }) });
+});
+BranchPickerRoot.displayName = "BranchPickerRoot";
+
+// src/primitives/composer/index.ts
+var composer_exports = {};
+__export(composer_exports, {
+  Cancel: () => ComposerCancel,
+  If: () => ComposerIf,
+  Input: () => ComposerInput,
+  Root: () => ComposerRoot,
+  Send: () => ComposerSend
+});
+
+// src/primitives/composer/ComposerRoot.tsx
+var import_primitive5 = require("@radix-ui/primitive");
+var import_react_primitive7 = require("@radix-ui/react-primitive");
+var import_react29 = require("react");
+var import_jsx_runtime14 = require("react/jsx-runtime");
+var ComposerRoot = (0, import_react29.forwardRef)(
+  ({ onSubmit, ...rest }, forwardedRef) => {
+    const send = useComposerSend();
+    const handleSubmit = (e) => {
+      if (!send) return;
+      e.preventDefault();
+      send();
+    };
+    return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+      import_react_primitive7.Primitive.form,
+      {
+        ...rest,
+        ref: forwardedRef,
+        onSubmit: (0, import_primitive5.composeEventHandlers)(onSubmit, handleSubmit)
+      }
+    );
+  }
+);
+ComposerRoot.displayName = "ComposerRoot";
+
+// src/primitives/composer/ComposerInput.tsx
+var import_primitive6 = require("@radix-ui/primitive");
+var import_react_compose_refs = require("@radix-ui/react-compose-refs");
+var import_react_slot = require("@radix-ui/react-slot");
+var import_react30 = require("react");
+var import_react_textarea_autosize = __toESM(require("react-textarea-autosize"));
+var import_react_use_escape_keydown = require("@radix-ui/react-use-escape-keydown");
+var import_jsx_runtime15 = require("react/jsx-runtime");
+var ComposerInput = (0, import_react30.forwardRef)(
+  ({ autoFocus = false, asChild, disabled, onChange, onKeyDown, ...rest }, forwardedRef) => {
+    const { useThread } = useThreadContext();
+    const { useComposer, type } = useComposerContext();
+    const value = useComposer((c) => {
+      if (!c.isEditing) return "";
+      return c.value;
+    });
+    const Component = asChild ? import_react_slot.Slot : import_react_textarea_autosize.default;
+    const textareaRef = (0, import_react30.useRef)(null);
+    const ref = (0, import_react_compose_refs.useComposedRefs)(forwardedRef, textareaRef);
+    (0, import_react_use_escape_keydown.useEscapeKeydown)((e) => {
+      const composer = useComposer.getState();
+      if (composer.cancel()) {
+        e.preventDefault();
+      }
+    });
+    const handleKeyPress = (e) => {
+      if (disabled) return;
+      if (e.key === "Enter" && e.shiftKey === false) {
+        const isRunning = useThread.getState().isRunning;
+        if (!isRunning) {
+          e.preventDefault();
+          textareaRef.current?.closest("form")?.requestSubmit();
+        }
+      }
+    };
+    const autoFocusEnabled = autoFocus && !disabled;
+    const focus = (0, import_react30.useCallback)(() => {
+      const textarea = textareaRef.current;
+      if (!textarea || !autoFocusEnabled) return;
+      textarea.focus({ preventScroll: true });
+      textarea.setSelectionRange(
+        textareaRef.current.value.length,
+        textareaRef.current.value.length
+      );
+    }, [autoFocusEnabled]);
+    (0, import_react30.useEffect)(() => focus(), [focus]);
+    useOnComposerFocus(() => {
+      if (type === "new") {
+        focus();
+      }
+    });
+    return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+      Component,
+      {
+        value,
+        ...rest,
+        ref,
+        disabled,
+        onChange: (0, import_primitive6.composeEventHandlers)(onChange, (e) => {
+          const composerState = useComposer.getState();
+          if (!composerState.isEditing) return;
+          return composerState.setValue(e.target.value);
+        }),
+        onKeyDown: (0, import_primitive6.composeEventHandlers)(onKeyDown, handleKeyPress)
+      }
+    );
+  }
+);
+ComposerInput.displayName = "ComposerInput";
+
+// src/primitives/composer/ComposerSend.tsx
+var import_react31 = require("react");
+var import_react_primitive8 = require("@radix-ui/react-primitive");
+var import_jsx_runtime16 = require("react/jsx-runtime");
+var ComposerSend = (0, import_react31.forwardRef)(
+  ({ disabled, ...rest }, ref) => {
+    const { useComposer } = useComposerContext();
+    const hasValue = useComposer((c) => c.isEditing && c.value.length > 0);
+    return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+      import_react_primitive8.Primitive.button,
+      {
+        type: "submit",
+        ...rest,
+        ref,
+        disabled: disabled || !hasValue
+      }
+    );
+  }
+);
+ComposerSend.displayName = "ComposerSend";
+
+// src/primitives/composer/ComposerCancel.tsx
+var ComposerCancel = createActionButton(
+  "ComposerCancel",
+  useComposerCancel
+);
+
+// src/primitives/composer/ComposerIf.tsx
+var ComposerIf = ({ children, ...query }) => {
+  const result = useComposerIf(query);
+  return result ? children : null;
+};
+
+// src/primitives/contentPart/index.ts
+var contentPart_exports = {};
+__export(contentPart_exports, {
+  Display: () => ContentPartDisplay,
+  Image: () => ContentPartImage,
+  InProgressIndicator: () => ContentPartInProgressIndicator,
+  Text: () => ContentPartText
+});
+
+// src/primitives/contentPart/ContentPartImage.tsx
+var import_react_primitive9 = require("@radix-ui/react-primitive");
+var import_react32 = require("react");
+var import_jsx_runtime17 = require("react/jsx-runtime");
+var ContentPartImage = (0, import_react32.forwardRef)((props, forwardedRef) => {
+  const image = useContentPartImage();
+  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(import_react_primitive9.Primitive.img, { src: image, ...props, ref: forwardedRef });
+});
+ContentPartImage.displayName = "ContentPartImage";
+
+// src/primitives/thread/index.ts
+var thread_exports = {};
+__export(thread_exports, {
+  Empty: () => ThreadEmpty,
+  If: () => ThreadIf,
+  Messages: () => ThreadMessages,
+  Root: () => ThreadRoot,
+  ScrollToBottom: () => ThreadScrollToBottom,
+  Suggestion: () => ThreadSuggestion,
+  Viewport: () => ThreadViewport
+});
+
+// src/primitives/thread/ThreadRoot.tsx
+var import_react_primitive10 = require("@radix-ui/react-primitive");
+var import_react33 = require("react");
+var import_jsx_runtime18 = require("react/jsx-runtime");
+var ThreadRoot = (0, import_react33.forwardRef)(
+  (props, ref) => {
+    return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_react_primitive10.Primitive.div, { ...props, ref });
+  }
+);
+ThreadRoot.displayName = "ThreadRoot";
+
+// src/primitives/thread/ThreadEmpty.tsx
+var ThreadEmpty = ({ children }) => {
+  const empty = useThreadEmpty();
+  return empty ? children : null;
+};
+
+// src/primitives/thread/ThreadIf.tsx
+var ThreadIf = ({ children, ...query }) => {
+  const result = useThreadIf(query);
+  return result ? children : null;
+};
+
+// src/primitives/thread/ThreadViewport.tsx
+var import_react_compose_refs3 = require("@radix-ui/react-compose-refs");
+var import_react_primitive11 = require("@radix-ui/react-primitive");
+var import_react38 = require("react");
+
+// src/primitive-hooks/thread/useThreadViewportAutoScroll.tsx
+var import_react_compose_refs2 = require("@radix-ui/react-compose-refs");
+var import_react37 = require("react");
+
+// src/utils/hooks/useOnResizeContent.tsx
+var import_react_use_callback_ref2 = require("@radix-ui/react-use-callback-ref");
+var import_react35 = require("react");
+
+// src/utils/hooks/useManagedRef.ts
+var import_react34 = require("react");
+var useManagedRef = (callback) => {
+  const cleanupRef = (0, import_react34.useRef)();
+  const ref = (0, import_react34.useCallback)(
+    (el) => {
+      if (cleanupRef.current) {
+        cleanupRef.current();
+      }
+      if (el) {
+        cleanupRef.current = callback(el);
+      }
+    },
+    [callback]
+  );
+  return ref;
+};
+
+// src/utils/hooks/useOnResizeContent.tsx
+var useOnResizeContent = (callback) => {
+  const callbackRef = (0, import_react_use_callback_ref2.useCallbackRef)(callback);
+  const refCallback = (0, import_react35.useCallback)(
+    (el) => {
+      const resizeObserver = new ResizeObserver(() => {
+        callbackRef();
+      });
+      const mutationObserver = new MutationObserver((mutations) => {
+        for (const mutation of mutations) {
+          for (const node of mutation.addedNodes) {
+            if (node instanceof Element) {
+              resizeObserver.observe(node);
+            }
+          }
+          for (const node of mutation.removedNodes) {
+            if (node instanceof Element) {
+              resizeObserver.unobserve(node);
+            }
+          }
+        }
+        callbackRef();
+      });
+      resizeObserver.observe(el);
+      mutationObserver.observe(el, { childList: true });
+      for (const child of el.children) {
+        resizeObserver.observe(child);
+      }
+      return () => {
+        resizeObserver.disconnect();
+        mutationObserver.disconnect();
+      };
+    },
+    [callbackRef]
+  );
+  return useManagedRef(refCallback);
+};
+
+// src/utils/hooks/useOnScrollToBottom.tsx
+var import_react_use_callback_ref3 = require("@radix-ui/react-use-callback-ref");
+var import_react36 = require("react");
+var useOnScrollToBottom = (callback) => {
+  const callbackRef = (0, import_react_use_callback_ref3.useCallbackRef)(callback);
+  const { useViewport } = useThreadContext();
+  (0, import_react36.useEffect)(() => {
+    return useViewport.getState().onScrollToBottom(() => {
+      callbackRef();
+    });
+  }, [useViewport, callbackRef]);
+};
+
+// src/primitive-hooks/thread/useThreadViewportAutoScroll.tsx
+var useThreadViewportAutoScroll = ({
+  autoScroll = true
+}) => {
+  const divRef = (0, import_react37.useRef)(null);
+  const { useViewport } = useThreadContext();
+  const firstRenderRef = (0, import_react37.useRef)(true);
+  const lastScrollTop = (0, import_react37.useRef)(0);
+  const isScrollingToBottomRef = (0, import_react37.useRef)(false);
+  const scrollToBottom = () => {
+    const div = divRef.current;
+    if (!div || !autoScroll) return;
+    const behavior = firstRenderRef.current ? "instant" : "auto";
+    firstRenderRef.current = false;
+    isScrollingToBottomRef.current = true;
+    div.scrollTo({ top: div.scrollHeight, behavior });
+  };
+  const handleScroll = () => {
+    const div = divRef.current;
+    if (!div) return;
+    const isAtBottom = useViewport.getState().isAtBottom;
+    const newIsAtBottom = div.scrollHeight - div.scrollTop <= div.clientHeight;
+    if (!newIsAtBottom && lastScrollTop.current < div.scrollTop) {
+    } else {
+      isScrollingToBottomRef.current = newIsAtBottom;
+      if (newIsAtBottom !== isAtBottom) {
+        useViewport.setState({
+          isAtBottom: newIsAtBottom
+        });
+      }
+    }
+    lastScrollTop.current = div.scrollTop;
+  };
+  const resizeRef = useOnResizeContent(() => {
+    if (!isScrollingToBottomRef.current && !useViewport.getState().isAtBottom && !firstRenderRef.current) {
+      handleScroll();
+    } else {
+      scrollToBottom();
+    }
+  });
+  const scrollRef = useManagedRef((el) => {
+    el.addEventListener("scroll", handleScroll);
+    return () => {
+      el.removeEventListener("scroll", handleScroll);
+    };
+  });
+  const autoScrollRef = (0, import_react_compose_refs2.useComposedRefs)(resizeRef, scrollRef, divRef);
+  useOnScrollToBottom(() => {
+    scrollToBottom();
+  });
+  return autoScrollRef;
+};
+
+// src/primitives/thread/ThreadViewport.tsx
+var import_jsx_runtime19 = require("react/jsx-runtime");
+var ThreadViewport = (0, import_react38.forwardRef)(({ autoScroll, onScroll, children, ...rest }, forwardedRef) => {
+  const autoScrollRef = useThreadViewportAutoScroll({
+    autoScroll
+  });
+  const ref = (0, import_react_compose_refs3.useComposedRefs)(forwardedRef, autoScrollRef);
+  return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(import_react_primitive11.Primitive.div, { ...rest, ref, children });
+});
+ThreadViewport.displayName = "ThreadViewport";
+
+// src/primitives/thread/ThreadMessages.tsx
+var import_react40 = require("react");
+
+// src/context/providers/MessageProvider.tsx
+var import_react39 = require("react");
+var import_zustand4 = require("zustand");
+
+// src/context/stores/EditComposer.ts
+var import_zustand2 = require("zustand");
+
+// src/context/stores/BaseComposer.ts
+var makeBaseComposer = (set) => ({
+  value: "",
+  setValue: (value) => {
+    set({ value });
+  }
+});
+
+// src/context/stores/EditComposer.ts
+var makeEditComposerStore = ({
+  onEdit,
+  onSend
+}) => (0, import_zustand2.create)()((set, get, store) => ({
+  ...makeBaseComposer(set, get, store),
+  isEditing: false,
+  edit: () => {
+    const value = onEdit();
+    set({ isEditing: true, value });
+  },
+  send: () => {
+    const value = get().value;
+    set({ isEditing: false });
+    onSend(value);
+  },
+  cancel: () => {
+    if (!get().isEditing) return false;
+    set({ isEditing: false });
+    return true;
+  }
+}));
+
+// src/context/stores/MessageUtils.ts
+var import_zustand3 = require("zustand");
+var makeMessageUtilsStore = () => (0, import_zustand3.create)((set) => ({
+  inProgressIndicator: null,
+  setInProgressIndicator: (value) => {
+    set({ inProgressIndicator: value });
+  },
+  isCopied: false,
+  setIsCopied: (value) => {
+    set({ isCopied: value });
+  },
+  isHovering: false,
+  setIsHovering: (value) => {
+    set({ isHovering: value });
+  }
+}));
+
+// src/context/providers/MessageProvider.tsx
+var import_jsx_runtime20 = require("react/jsx-runtime");
+var getIsLast = (thread, message) => {
+  return thread.messages[thread.messages.length - 1]?.id === message.id;
+};
+var syncMessage = (thread, getBranches, useMessage, messageIndex) => {
+  const parentId = thread.messages[messageIndex - 1]?.id ?? null;
+  const message = thread.messages[messageIndex];
+  if (!message) return;
+  const isLast = getIsLast(thread, message);
+  const branches = getBranches(message.id);
+  const currentState = useMessage.getState();
+  if (currentState.message === message && currentState.parentId === parentId && currentState.branches === branches && currentState.isLast === isLast)
+    return;
+  useMessage.setState({
+    message,
+    parentId,
+    branches,
+    isLast
+  });
+};
+var useMessageContext2 = (messageIndex) => {
+  const { useThread, useThreadActions } = useThreadContext();
+  const [context] = (0, import_react39.useState)(() => {
+    const useMessage = (0, import_zustand4.create)(() => ({}));
+    const useMessageUtils = makeMessageUtilsStore();
+    const useEditComposer = makeEditComposerStore({
+      onEdit: () => {
+        const message = useMessage.getState().message;
+        if (message.role !== "user")
+          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(
+            "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"
+        );
+        useThreadActions.getState().append({
+          parentId,
+          role: "user",
+          content: [{ type: "text", text }, ...nonTextParts]
+        });
+      }
+    });
+    syncMessage(
+      useThread.getState(),
+      useThreadActions.getState().getBranches,
+      useMessage,
+      messageIndex
+    );
+    return { useMessage, useMessageUtils, useEditComposer };
+  });
+  (0, import_react39.useEffect)(() => {
+    return useThread.subscribe((thread) => {
+      syncMessage(
+        thread,
+        useThreadActions.getState().getBranches,
+        context.useMessage,
+        messageIndex
+      );
+    });
+  }, [useThread, useThreadActions, context, messageIndex]);
+  return context;
+};
+var MessageProvider = ({
+  messageIndex,
+  children
+}) => {
+  const context = useMessageContext2(messageIndex);
+  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(MessageContext.Provider, { value: context, children });
 };
 
-// src/primitives/contentPart/ContentPartText.tsx
-var import_react_primitive6 = require("@radix-ui/react-primitive");
-var import_react28 = require("react");
-var import_jsx_runtime11 = require("react/jsx-runtime");
-var ContentPartText = (0, import_react28.forwardRef)((props, forwardedRef) => {
-  const text = useContentPartText();
-  return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(import_react_primitive6.Primitive.span, { ...props, ref: forwardedRef, children: text });
-});
-ContentPartText.displayName = "ContentPartText";
-
-// src/primitives/message/MessageContent.tsx
-var import_jsx_runtime12 = require("react/jsx-runtime");
-var defaultComponents = {
-  Text: () => /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(import_jsx_runtime12.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(ContentPartText, {}),
-    /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(ContentPartInProgressIndicator, {})
-  ] }),
-  Image: () => null,
-  UI: () => /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(ContentPartDisplay, {}),
-  tools: {
-    Fallback: (props) => {
-      const { useToolUIs } = useAssistantContext();
-      const Render = useToolUIs((s) => s.getToolUI(props.part.toolName));
-      if (!Render) return null;
-      return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Render, { ...props });
-    }
-  }
-};
-var MessageContentPartComponent = ({
-  components: {
-    Text = defaultComponents.Text,
-    Image = defaultComponents.Image,
-    UI = defaultComponents.UI,
-    tools: { by_name = {}, Fallback = defaultComponents.tools.Fallback } = {}
-  } = {}
-}) => {
-  const { useThreadActions } = useThreadContext();
-  const addToolResult = useThreadActions((t) => t.addToolResult);
-  const { useContentPart } = useContentPartContext();
-  const { part, status } = useContentPart();
-  const type = part.type;
-  switch (type) {
-    case "text":
-      return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Text, { part, status });
-    case "image":
-      return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Image, { part, status });
-    case "ui":
-      return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(UI, { part, status });
-    case "tool-call": {
-      const Tool = by_name[part.toolName] || Fallback;
-      const addResult = (result) => addToolResult(part.toolCallId, result);
-      return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Tool, { part, status, addResult });
-    }
-    default:
-      throw new Error(`Unknown content part type: ${type}`);
-  }
+// src/primitives/thread/ThreadMessages.tsx
+var import_jsx_runtime21 = require("react/jsx-runtime");
+var getComponents = (components) => {
+  return {
+    EditComposer: components.EditComposer ?? components.UserMessage ?? components.Message,
+    UserMessage: components.UserMessage ?? components.Message,
+    AssistantMessage: components.AssistantMessage ?? components.Message
+  };
 };
-var MessageContentPartImpl = ({
-  partIndex,
+var ThreadMessageImpl = ({
+  messageIndex,
   components
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(ContentPartProvider, { partIndex, children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(MessageContentPartComponent, { components }) });
+  const { UserMessage, EditComposer, AssistantMessage } = getComponents(components);
+  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(MessageProvider, { messageIndex, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(MessageIf, { user: true, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(ComposerIf, { editing: false, children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(UserMessage, {}) }),
+      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(ComposerIf, { editing: true, children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(EditComposer, {}) })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(MessageIf, { assistant: true, children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(AssistantMessage, {}) })
+  ] });
 };
-var MessageContentPart = (0, import_react29.memo)(
-  MessageContentPartImpl,
-  (prev, next) => prev.partIndex === next.partIndex && prev.components?.Text === next.components?.Text && prev.components?.Image === next.components?.Image && prev.components?.UI === next.components?.UI && prev.components?.tools === next.components?.tools
+var ThreadMessage = (0, import_react40.memo)(
+  ThreadMessageImpl,
+  (prev, next) => prev.messageIndex === next.messageIndex && prev.components.UserMessage === next.components.UserMessage && prev.components.EditComposer === next.components.EditComposer && prev.components.AssistantMessage === next.components.AssistantMessage
 );
-var MessageContent = ({ components }) => {
-  const { useMessage } = useMessageContext();
-  const contentLength = useMessage((s) => s.message.content.length);
-  return new Array(contentLength).fill(null).map((_, idx) => {
-    const partIndex = idx;
-    return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
-      MessageContentPart,
+var ThreadMessages = ({ components }) => {
+  const { useThread } = useThreadContext();
+  const messagesLength = useThread((t) => t.messages.length);
+  if (messagesLength === 0) return null;
+  return new Array(messagesLength).fill(null).map((_, idx) => {
+    const messageIndex = idx;
+    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+      ThreadMessage,
       {
-        partIndex,
+        messageIndex,
         components
       },
-      partIndex
+      messageIndex
     );
   });
 };
 
-// src/primitives/message/MessageInProgress.tsx
-var import_react_primitive7 = require("@radix-ui/react-primitive");
-var import_react30 = require("react");
-var import_jsx_runtime13 = require("react/jsx-runtime");
-var MessageInProgress = (0, import_react30.forwardRef)((props, ref) => {
-  const { useMessageUtils } = useMessageContext();
-  (0, import_react30.useMemo)(() => {
-    useMessageUtils.getState().setInProgressIndicator(/* @__PURE__ */ (0, import_jsx_runtime13.jsx)(import_react_primitive7.Primitive.span, { ...props, ref }));
-  }, [useMessageUtils, props, ref]);
-  return null;
-});
-MessageInProgress.displayName = "MessageInProgress";
-
-// src/primitives/branchPicker/index.ts
-var branchPicker_exports = {};
-__export(branchPicker_exports, {
-  Count: () => BranchPickerCount,
-  Next: () => BranchPickerNext,
-  Number: () => BranchPickerNumber,
-  Previous: () => BranchPickerPrevious,
-  Root: () => BranchPickerRoot
-});
-
-// src/primitives/branchPicker/BranchPickerNext.tsx
-var BranchPickerNext = createActionButton(
-  "BranchPickerNext",
-  useBranchPickerNext
-);
-
-// src/primitives/branchPicker/BranchPickerPrevious.tsx
-var BranchPickerPrevious = createActionButton(
-  "BranchPickerPrevious",
-  useBranchPickerPrevious
-);
-
-// src/primitives/branchPicker/BranchPickerCount.tsx
-var import_jsx_runtime14 = require("react/jsx-runtime");
-var BranchPickerCount = () => {
-  const branchCount = useBranchPickerCount();
-  return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_jsx_runtime14.Fragment, { children: branchCount });
-};
-
-// src/primitives/branchPicker/BranchPickerNumber.tsx
-var import_jsx_runtime15 = require("react/jsx-runtime");
-var BranchPickerNumber = () => {
-  const branchNumber = useBranchPickerNumber();
-  return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(import_jsx_runtime15.Fragment, { children: branchNumber });
-};
-
-// src/primitives/branchPicker/BranchPickerRoot.tsx
-var import_react_primitive8 = require("@radix-ui/react-primitive");
-var import_react31 = require("react");
-var import_jsx_runtime16 = require("react/jsx-runtime");
-var BranchPickerRoot = (0, import_react31.forwardRef)(({ hideWhenSingleBranch, ...rest }, ref) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(MessageIf, { hasBranches: hideWhenSingleBranch ? true : void 0, children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_react_primitive8.Primitive.div, { ...rest, ref }) });
-});
-BranchPickerRoot.displayName = "BranchPickerRoot";
-
-// src/primitives/actionBar/index.ts
-var actionBar_exports = {};
-__export(actionBar_exports, {
-  Copy: () => ActionBarCopy,
-  Edit: () => ActionBarEdit,
-  Reload: () => ActionBarReload,
-  Root: () => ActionBarRoot
-});
-
-// src/primitives/actionBar/ActionBarRoot.tsx
-var import_react_primitive9 = require("@radix-ui/react-primitive");
-var import_react32 = require("react");
-var import_jsx_runtime17 = require("react/jsx-runtime");
-var useActionBarFloatStatus = ({
-  hideWhenRunning,
-  autohide,
-  autohideFloat
-}) => {
-  const { useThread } = useThreadContext();
-  const { useMessage, useMessageUtils } = useMessageContext();
-  return useCombinedStore(
-    [useThread, useMessage, useMessageUtils],
-    (t, m, mu) => {
-      if (hideWhenRunning && t.isRunning) return "hidden" /* Hidden */;
-      const autohideEnabled = autohide === "always" || autohide === "not-last" && !m.isLast;
-      if (!autohideEnabled) return "normal" /* Normal */;
-      if (!mu.isHovering) return "hidden" /* Hidden */;
-      if (autohideFloat === "always" || autohideFloat === "single-branch" && m.branches.length <= 1)
-        return "floating" /* Floating */;
-      return "normal" /* Normal */;
-    }
-  );
-};
-var ActionBarRoot = (0, import_react32.forwardRef)(({ hideWhenRunning, autohide, autohideFloat, ...rest }, ref) => {
-  const hideAndfloatStatus = useActionBarFloatStatus({
-    hideWhenRunning,
-    autohide,
-    autohideFloat
-  });
-  if (hideAndfloatStatus === "hidden" /* Hidden */) return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
-    import_react_primitive9.Primitive.div,
-    {
-      ...hideAndfloatStatus === "floating" /* Floating */ ? { "data-floating": "true" } : null,
-      ...rest,
-      ref
-    }
-  );
-});
-ActionBarRoot.displayName = "ActionBarRoot";
-
-// src/primitives/actionBar/ActionBarCopy.tsx
-var ActionBarCopy = createActionButton(
-  "ActionBarCopy",
-  useActionBarCopy
-);
-
-// src/primitives/actionBar/ActionBarReload.tsx
-var ActionBarReload = createActionButton(
-  "ActionBarReload",
-  useActionBarReload
+// src/primitives/thread/ThreadScrollToBottom.tsx
+var ThreadScrollToBottom = createActionButton(
+  "ThreadScrollToBottom",
+  useThreadScrollToBottom
 );
 
-// src/primitives/actionBar/ActionBarEdit.tsx
-var ActionBarEdit = createActionButton(
-  "ActionBarEdit",
-  useActionBarEdit
+// src/primitives/thread/ThreadSuggestion.tsx
+var ThreadSuggestion = createActionButton(
+  "ThreadSuggestion",
+  useThreadSuggestion
 );
 
-// src/primitives/contentPart/index.ts
-var contentPart_exports = {};
-__export(contentPart_exports, {
-  Display: () => ContentPartDisplay,
-  Image: () => ContentPartImage,
-  InProgressIndicator: () => ContentPartInProgressIndicator,
-  Text: () => ContentPartText
-});
-
-// src/primitives/contentPart/ContentPartImage.tsx
-var import_react_primitive10 = require("@radix-ui/react-primitive");
-var import_react33 = require("react");
-var import_jsx_runtime18 = require("react/jsx-runtime");
-var ContentPartImage = (0, import_react33.forwardRef)((props, forwardedRef) => {
-  const image = useContentPartImage();
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_react_primitive10.Primitive.img, { src: image, ...props, ref: forwardedRef });
-});
-ContentPartImage.displayName = "ContentPartImage";
-
 // src/runtime/local/useLocalRuntime.tsx
-var import_react34 = require("react");
+var import_react41 = require("react");
 
 // src/utils/ModelConfigTypes.ts
 var mergeModelConfigs = (configSet) => {
@@ -1535,18 +1692,18 @@ var LocalRuntime = class {
 
 // src/runtime/local/useLocalRuntime.tsx
 var useLocalRuntime = (adapter) => {
-  const [runtime] = (0, import_react34.useState)(() => new LocalRuntime(adapter));
-  (0, import_react34.useInsertionEffect)(() => {
+  const [runtime] = (0, import_react41.useState)(() => new LocalRuntime(adapter));
+  (0, import_react41.useInsertionEffect)(() => {
     runtime.adapter = adapter;
   });
   return runtime;
 };
 
 // src/context/providers/AssistantRuntimeProvider.tsx
-var import_react37 = require("react");
+var import_react44 = require("react");
 
 // src/context/providers/AssistantProvider.tsx
-var import_react36 = require("react");
+var import_react43 = require("react");
 
 // src/context/stores/AssistantModelConfig.ts
 var import_zustand5 = require("zustand");
@@ -1611,30 +1768,45 @@ var makeAssistantToolUIsStore = () => (0, import_zustand6.create)((set) => {
 });
 
 // src/context/providers/ThreadProvider.tsx
-var import_react35 = require("react");
+var import_react42 = require("react");
 
 // src/context/stores/Composer.ts
 var import_zustand7 = require("zustand");
-var makeComposerStore = (useThread, useThreadActions) => (0, import_zustand7.create)()((set, get, store) => {
-  return {
-    ...makeBaseComposer(set, get, store),
-    isEditing: true,
-    send: () => {
-      const { setValue, value } = get();
-      setValue("");
-      useThreadActions.getState().append({
-        parentId: useThread.getState().messages.at(-1)?.id ?? null,
-        content: [{ type: "text", text: value }]
-      });
-    },
-    cancel: () => {
-      const thread = useThread.getState();
-      if (!thread.isRunning) return false;
-      useThreadActions.getState().cancelRun();
-      return true;
-    }
-  };
-});
+var makeComposerStore = (useThread, useThreadActions) => {
+  const focusListeners = /* @__PURE__ */ new Set();
+  return (0, import_zustand7.create)()((set, get, store) => {
+    return {
+      ...makeBaseComposer(set, get, store),
+      isEditing: true,
+      send: () => {
+        const { setValue, value } = get();
+        setValue("");
+        useThreadActions.getState().append({
+          parentId: useThread.getState().messages.at(-1)?.id ?? null,
+          role: "user",
+          content: [{ type: "text", text: value }]
+        });
+      },
+      cancel: () => {
+        const thread = useThread.getState();
+        if (!thread.isRunning) return false;
+        useThreadActions.getState().cancelRun();
+        return true;
+      },
+      focus: () => {
+        for (const listener of focusListeners) {
+          listener();
+        }
+      },
+      onFocus: (listener) => {
+        focusListeners.add(listener);
+        return () => {
+          focusListeners.delete(listener);
+        };
+      }
+    };
+  });
+};
 
 // src/context/stores/Thread.ts
 var import_zustand8 = require("zustand");
@@ -1681,16 +1853,16 @@ var makeThreadActionStore = (runtimeRef) => {
 };
 
 // src/context/providers/ThreadProvider.tsx
-var import_jsx_runtime19 = require("react/jsx-runtime");
+var import_jsx_runtime22 = require("react/jsx-runtime");
 var ThreadProvider = ({
   children,
   runtime
 }) => {
-  const runtimeRef = (0, import_react35.useRef)(runtime);
-  (0, import_react35.useInsertionEffect)(() => {
+  const runtimeRef = (0, import_react42.useRef)(runtime);
+  (0, import_react42.useInsertionEffect)(() => {
     runtimeRef.current = runtime;
   });
-  const [context] = (0, import_react35.useState)(() => {
+  const [context] = (0, import_react42.useState)(() => {
     const useThread = makeThreadStore(runtimeRef);
     const useThreadActions = makeThreadActionStore(runtimeRef);
     const useViewport = makeThreadViewportStore();
@@ -1702,7 +1874,7 @@ var ThreadProvider = ({
       useViewport
     };
   });
-  (0, import_react35.useEffect)(() => {
+  (0, import_react42.useEffect)(() => {
     const onRuntimeUpdate = () => {
       context.useThread.setState(
         Object.freeze({
@@ -1716,37 +1888,37 @@ var ThreadProvider = ({
     return runtime.subscribe(onRuntimeUpdate);
   }, [context, runtime]);
   const RuntimeSynchronizer = runtime.unstable_synchronizer;
-  return /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(ThreadContext.Provider, { value: context, children: [
-    RuntimeSynchronizer && /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(RuntimeSynchronizer, {}),
+  return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(ThreadContext.Provider, { value: context, children: [
+    RuntimeSynchronizer && /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(RuntimeSynchronizer, {}),
     children
   ] });
 };
 
 // src/context/providers/AssistantProvider.tsx
-var import_jsx_runtime20 = require("react/jsx-runtime");
+var import_jsx_runtime23 = require("react/jsx-runtime");
 var AssistantProvider = ({ children, runtime }) => {
-  const runtimeRef = (0, import_react36.useRef)(runtime);
-  (0, import_react36.useInsertionEffect)(() => {
+  const runtimeRef = (0, import_react43.useRef)(runtime);
+  (0, import_react43.useInsertionEffect)(() => {
     runtimeRef.current = runtime;
   });
-  const [context] = (0, import_react36.useState)(() => {
+  const [context] = (0, import_react43.useState)(() => {
     const useModelConfig = makeAssistantModelConfigStore();
     const useToolUIs = makeAssistantToolUIsStore();
     return { useModelConfig, useToolUIs };
   });
   const getModelCOnfig = context.useModelConfig((c) => c.getModelConfig);
-  (0, import_react36.useEffect)(() => {
+  (0, import_react43.useEffect)(() => {
     return runtime.registerModelConfigProvider(getModelCOnfig);
   }, [runtime, getModelCOnfig]);
-  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(AssistantContext.Provider, { value: context, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(ThreadProvider, { runtime, children }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(AssistantContext.Provider, { value: context, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(ThreadProvider, { runtime, children }) });
 };
 
 // src/context/providers/AssistantRuntimeProvider.tsx
-var import_jsx_runtime21 = require("react/jsx-runtime");
+var import_jsx_runtime24 = require("react/jsx-runtime");
 var AssistantRuntimeProviderImpl = ({ children, runtime }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(AssistantProvider, { runtime, children });
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(AssistantProvider, { runtime, children });
 };
-var AssistantRuntimeProvider = (0, import_react37.memo)(AssistantRuntimeProviderImpl);
+var AssistantRuntimeProvider = (0, import_react44.memo)(AssistantRuntimeProviderImpl);
 
 // src/internal.ts
 var internal_exports = {};
@@ -1757,6 +1929,7 @@ __export(internal_exports, {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ActionBarPrimitive,
+  AssistantModalPrimitive,
   AssistantRuntimeProvider,
   BranchPickerPrimitive,
   ComposerPrimitive,