@assistant-ui/react 0.1.11 → 0.2.0

package/dist/index.mjs

@@ -1,19 +1,24 @@
-import {
-  AssistantContext,
-  ContentPartContext,
-  MessageContext,
-  ThreadContext,
-  __export,
-  useAssistantContext,
-  useComposerContext,
-  useContentPartContext,
-  useMessageContext,
-  useThreadContext
-} from "./chunk-KUACYNLE.mjs";
+var __defProp = Object.defineProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 
 // src/primitive-hooks/actionBar/useActionBarCopy.tsx
 import { useCallback } from "react";
 
+// src/context/react/MessageContext.ts
+import { createContext, useContext } from "react";
+var MessageContext = createContext(null);
+var useMessageContext = () => {
+  const context = useContext(MessageContext);
+  if (!context)
+    throw new Error(
+      "This component can only be used inside a component passed to <ThreadPrimitive.Messages components={...} />."
+    );
+  return context;
+};
+
 // src/utils/combined/useCombinedStore.ts
 import { useMemo } from "react";
 
@@ -90,8 +95,22 @@ var useActionBarEdit = () => {
 
 // src/primitive-hooks/actionBar/useActionBarReload.tsx
 import { useCallback as useCallback3 } from "react";
+
+// src/context/react/ThreadContext.ts
+import { createContext as createContext2, useContext as useContext2 } from "react";
+var ThreadContext = createContext2(null);
+var useThreadContext = () => {
+  const context = useContext2(ThreadContext);
+  if (!context)
+    throw new Error(
+      "This component must be used within an AssistantRuntimeProvider."
+    );
+  return context;
+};
+
+// 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],
@@ -101,7 +120,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;
 };
@@ -156,6 +176,309 @@ var useBranchPickerPrevious = () => {
 
 // src/primitive-hooks/composer/useComposerCancel.tsx
 import { useCallback as useCallback6 } from "react";
+
+// src/context/providers/AssistantRuntimeProvider.tsx
+import { memo } from "react";
+
+// src/context/providers/AssistantProvider.tsx
+import { useEffect as useEffect2, useInsertionEffect as useInsertionEffect2, useRef as useRef2, useState as useState2 } from "react";
+
+// src/context/react/AssistantContext.ts
+import { createContext as createContext3, useContext as useContext3 } from "react";
+var AssistantContext = createContext3(
+  null
+);
+var useAssistantContext = () => {
+  const context = useContext3(AssistantContext);
+  if (!context)
+    throw new Error(
+      "This component must be used within an AssistantRuntimeProvider."
+    );
+  return context;
+};
+
+// src/context/stores/AssistantModelConfig.ts
+import { create } from "zustand";
+
+// src/types/ModelConfigTypes.ts
+var mergeModelConfigs = (configSet) => {
+  const configs = Array.from(configSet).map((c) => c()).sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
+  return configs.reduce((acc, config) => {
+    if (config.system) {
+      if (acc.system) {
+        acc.system += `
+
+${config.system}`;
+      } else {
+        acc.system = config.system;
+      }
+    }
+    if (config.tools) {
+      for (const [name, tool] of Object.entries(config.tools)) {
+        if (acc.tools?.[name]) {
+          throw new Error(
+            `You tried to define a tool with the name ${name}, but it already exists.`
+          );
+        }
+        if (!acc.tools) acc.tools = {};
+        acc.tools[name] = tool;
+      }
+    }
+    return acc;
+  }, {});
+};
+
+// src/utils/ProxyConfigProvider.ts
+var ProxyConfigProvider = class {
+  _providers = /* @__PURE__ */ new Set();
+  getModelConfig() {
+    return mergeModelConfigs(this._providers);
+  }
+  registerModelConfigProvider(provider) {
+    this._providers.add(provider);
+    return () => {
+      this._providers.delete(provider);
+    };
+  }
+};
+
+// src/context/stores/AssistantModelConfig.ts
+var makeAssistantModelConfigStore = () => create(() => {
+  const proxy = new ProxyConfigProvider();
+  return Object.freeze({
+    getModelConfig: () => {
+      return proxy.getModelConfig();
+    },
+    registerModelConfigProvider: (provider) => {
+      return proxy.registerModelConfigProvider(provider);
+    }
+  });
+});
+
+// src/context/stores/AssistantToolUIs.ts
+import { create as create2 } from "zustand";
+var makeAssistantToolUIsStore = () => create2((set) => {
+  const renderers = /* @__PURE__ */ new Map();
+  return Object.freeze({
+    getToolUI: (name) => {
+      const arr = renderers.get(name);
+      const last = arr?.at(-1);
+      if (last) return last;
+      return null;
+    },
+    setToolUI: (name, render) => {
+      let arr = renderers.get(name);
+      if (!arr) {
+        arr = [];
+        renderers.set(name, arr);
+      }
+      arr.push(render);
+      set({});
+      return () => {
+        const index = arr.indexOf(render);
+        if (index !== -1) {
+          arr.splice(index, 1);
+        }
+        if (index === arr.length) {
+          set({});
+        }
+      };
+    }
+  });
+});
+
+// src/context/providers/ThreadProvider.tsx
+import { useEffect, useInsertionEffect, useRef, useState } from "react";
+
+// src/context/stores/Composer.ts
+import { create as create3 } from "zustand";
+
+// src/context/stores/BaseComposer.ts
+var makeBaseComposer = (set) => ({
+  value: "",
+  setValue: (value) => {
+    set({ value });
+  }
+});
+
+// src/context/stores/Composer.ts
+var makeComposerStore = (useThread, useThreadActions) => {
+  const focusListeners = /* @__PURE__ */ new Set();
+  return create3()((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
+import { create as create4 } from "zustand";
+var makeThreadStore = (runtimeRef) => {
+  return create4(() => ({
+    messages: runtimeRef.current.messages,
+    isRunning: runtimeRef.current.isRunning
+  }));
+};
+
+// src/context/stores/ThreadViewport.tsx
+import { create as create5 } from "zustand";
+var makeThreadViewportStore = () => {
+  const scrollToBottomListeners = /* @__PURE__ */ new Set();
+  return create5(() => ({
+    isAtBottom: true,
+    scrollToBottom: () => {
+      for (const listener of scrollToBottomListeners) {
+        listener();
+      }
+    },
+    onScrollToBottom: (callback) => {
+      scrollToBottomListeners.add(callback);
+      return () => {
+        scrollToBottomListeners.delete(callback);
+      };
+    }
+  }));
+};
+
+// src/context/stores/ThreadActions.ts
+import { create as create6 } from "zustand";
+var makeThreadActionStore = (runtimeRef) => {
+  return create6(
+    () => Object.freeze({
+      getBranches: (messageId) => runtimeRef.current.getBranches(messageId),
+      switchToBranch: (branchId) => runtimeRef.current.switchToBranch(branchId),
+      startRun: (parentId) => runtimeRef.current.startRun(parentId),
+      append: (message) => runtimeRef.current.append(message),
+      cancelRun: () => runtimeRef.current.cancelRun(),
+      addToolResult: (toolCallId, result) => runtimeRef.current.addToolResult(toolCallId, result)
+    })
+  );
+};
+
+// src/context/providers/ThreadProvider.tsx
+import { jsx, jsxs } from "react/jsx-runtime";
+var ThreadProvider = ({
+  children,
+  runtime
+}) => {
+  const runtimeRef = useRef(runtime);
+  useInsertionEffect(() => {
+    runtimeRef.current = runtime;
+  });
+  const [context] = useState(() => {
+    const useThread = makeThreadStore(runtimeRef);
+    const useThreadActions = makeThreadActionStore(runtimeRef);
+    const useViewport = makeThreadViewportStore();
+    const useComposer = makeComposerStore(useThread, useThreadActions);
+    return {
+      useThread,
+      useThreadActions,
+      useComposer,
+      useViewport
+    };
+  });
+  useEffect(() => {
+    const onRuntimeUpdate = () => {
+      context.useThread.setState(
+        Object.freeze({
+          messages: runtimeRef.current.messages,
+          isRunning: runtimeRef.current.isRunning
+        }),
+        true
+      );
+    };
+    onRuntimeUpdate();
+    return runtime.subscribe(onRuntimeUpdate);
+  }, [context, runtime]);
+  const RuntimeSynchronizer = runtime.unstable_synchronizer;
+  return /* @__PURE__ */ jsxs(ThreadContext.Provider, { value: context, children: [
+    RuntimeSynchronizer && /* @__PURE__ */ jsx(RuntimeSynchronizer, {}),
+    children
+  ] });
+};
+
+// src/context/providers/AssistantProvider.tsx
+import { jsx as jsx2 } from "react/jsx-runtime";
+var AssistantProvider = ({ children, runtime }) => {
+  const runtimeRef = useRef2(runtime);
+  useInsertionEffect2(() => {
+    runtimeRef.current = runtime;
+  });
+  const [context] = useState2(() => {
+    const useModelConfig = makeAssistantModelConfigStore();
+    const useToolUIs = makeAssistantToolUIsStore();
+    return { useModelConfig, useToolUIs };
+  });
+  const getModelCOnfig = context.useModelConfig((c) => c.getModelConfig);
+  useEffect2(() => {
+    return runtime.registerModelConfigProvider(getModelCOnfig);
+  }, [runtime, getModelCOnfig]);
+  return /* @__PURE__ */ jsx2(AssistantContext.Provider, { value: context, children: /* @__PURE__ */ jsx2(ThreadProvider, { runtime, children }) });
+};
+
+// src/context/providers/AssistantRuntimeProvider.tsx
+import { jsx as jsx3 } from "react/jsx-runtime";
+var AssistantRuntimeProviderImpl = ({ children, runtime }) => {
+  return /* @__PURE__ */ jsx3(AssistantProvider, { runtime, children });
+};
+var AssistantRuntimeProvider = memo(AssistantRuntimeProviderImpl);
+
+// src/context/react/ComposerContext.ts
+import { useContext as useContext4, useMemo as useMemo2 } from "react";
+var useComposerContext = () => {
+  const { useComposer } = useThreadContext();
+  const { useEditComposer } = useContext4(MessageContext) ?? {};
+  return useMemo2(
+    () => ({
+      useComposer: useEditComposer ?? useComposer,
+      type: useEditComposer ? "edit" : "new"
+    }),
+    [useEditComposer, useComposer]
+  );
+};
+
+// src/context/react/ContentPartContext.ts
+import { createContext as createContext4, useContext as useContext5 } from "react";
+var ContentPartContext = createContext4(
+  null
+);
+var useContentPartContext = () => {
+  const context = useContext5(ContentPartContext);
+  if (!context)
+    throw new Error(
+      "This component can only be used inside a component passed to <MessagePrimitive.Content components={...} >."
+    );
+  return context;
+};
+
+// src/primitive-hooks/composer/useComposerCancel.tsx
 var useComposerCancel = () => {
   const { useComposer } = useComposerContext();
   const disabled = useComposer((c) => !c.isEditing);
@@ -180,7 +503,7 @@ var useComposerIf = (props) => {
 // src/primitive-hooks/composer/useComposerSend.tsx
 import { useCallback as useCallback7 } from "react";
 var useComposerSend = () => {
-  const { useViewport } = useThreadContext();
+  const { useViewport, useComposer: useNewComposer } = useThreadContext();
   const { useComposer } = useComposerContext();
   const disabled = useComposer((c) => !c.isEditing || c.value.length === 0);
   const callback = useCallback7(() => {
@@ -188,7 +511,8 @@ var useComposerSend = () => {
     if (!composerState.isEditing) return;
     composerState.send();
     useViewport.getState().scrollToBottom();
-  }, [useComposer, useViewport]);
+    useNewComposer.getState().focus();
+  }, [useNewComposer, useComposer, useViewport]);
   if (disabled) return null;
   return callback;
 };
@@ -280,12 +604,12 @@ var useThreadEmpty = () => {
 // src/primitive-hooks/thread/useThreadScrollToBottom.tsx
 import { useCallback as useCallback8 } from "react";
 var useThreadScrollToBottom = () => {
-  const { useViewport } = useThreadContext();
+  const { useComposer, useViewport } = useThreadContext();
   const isAtBottom = useViewport((s) => s.isAtBottom);
   const handleScrollToBottom = useCallback8(() => {
-    const { scrollToBottom } = useViewport.getState();
-    scrollToBottom();
-  }, [useViewport]);
+    useViewport.getState().scrollToBottom();
+    useComposer.getState().focus();
+  }, [useViewport, useComposer]);
   if (isAtBottom) return null;
   return handleScrollToBottom;
 };
@@ -310,416 +634,449 @@ 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
 import { Primitive } from "@radix-ui/react-primitive";
 import { forwardRef } from "react";
-import { jsx } from "react/jsx-runtime";
-var ThreadRoot = forwardRef(
-  (props, ref) => {
-    return /* @__PURE__ */ jsx(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;
+import { jsx as jsx4 } from "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 = forwardRef(({ hideWhenRunning, autohide, autohideFloat, ...rest }, ref) => {
+  const hideAndfloatStatus = useActionBarFloatStatus({
+    hideWhenRunning,
+    autohide,
+    autohideFloat
+  });
+  if (hideAndfloatStatus === "hidden" /* Hidden */) return null;
+  return /* @__PURE__ */ jsx4(
+    Primitive.div,
+    {
+      ...hideAndfloatStatus === "floating" /* Floating */ ? { "data-floating": "true" } : null,
+      ...rest,
+      ref
+    }
+  );
+});
+ActionBarRoot.displayName = "ActionBarRoot";
 
-// src/primitives/thread/ThreadViewport.tsx
-import { useComposedRefs as useComposedRefs2 } from "@radix-ui/react-compose-refs";
+// src/utils/createActionButton.tsx
+import { composeEventHandlers } from "@radix-ui/primitive";
 import { Primitive as Primitive2 } from "@radix-ui/react-primitive";
 import { forwardRef as forwardRef2 } from "react";
+import { jsx as jsx5 } from "react/jsx-runtime";
+var createActionButton = (displayName, useActionButton) => {
+  const ActionButton = forwardRef2((props, forwardedRef) => {
+    const callback = useActionButton(props);
+    return /* @__PURE__ */ jsx5(
+      Primitive2.button,
+      {
+        type: "button",
+        disabled: !callback,
+        ...props,
+        ref: forwardedRef,
+        onClick: composeEventHandlers(props.onClick, () => {
+          callback?.();
+        })
+      }
+    );
+  });
+  ActionButton.displayName = displayName;
+  return ActionButton;
+};
 
-// src/primitive-hooks/thread/useThreadViewportAutoScroll.tsx
-import { useComposedRefs } from "@radix-ui/react-compose-refs";
-import { useRef as useRef2 } from "react";
+// src/primitives/actionBar/ActionBarCopy.tsx
+var ActionBarCopy = createActionButton(
+  "ActionBarCopy",
+  useActionBarCopy
+);
 
-// src/utils/hooks/useOnResizeContent.tsx
-import { useCallbackRef } from "@radix-ui/react-use-callback-ref";
-import { useCallback as useCallback11 } from "react";
+// src/primitives/actionBar/ActionBarReload.tsx
+var ActionBarReload = createActionButton(
+  "ActionBarReload",
+  useActionBarReload
+);
 
-// src/utils/hooks/useManagedRef.ts
-import { useCallback as useCallback10, useRef } from "react";
-var useManagedRef = (callback) => {
-  const cleanupRef = useRef();
-  const ref = useCallback10(
-    (el) => {
-      if (cleanupRef.current) {
-        cleanupRef.current();
-      }
-      if (el) {
-        cleanupRef.current = callback(el);
-      }
-    },
-    [callback]
-  );
-  return ref;
-};
+// src/primitives/actionBar/ActionBarEdit.tsx
+var ActionBarEdit = createActionButton(
+  "ActionBarEdit",
+  useActionBarEdit
+);
 
-// src/utils/hooks/useOnResizeContent.tsx
-var useOnResizeContent = (callback) => {
-  const callbackRef = useCallbackRef(callback);
-  const refCallback = useCallback11(
-    (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/primitives/assistantModal/index.ts
+var assistantModal_exports = {};
+__export(assistantModal_exports, {
+  Content: () => AssistantModalContent,
+  Root: () => AssistantModalRoot,
+  Trigger: () => AssistantModalTrigger
+});
 
-// src/utils/hooks/useOnScrollToBottom.tsx
-import { useCallbackRef as useCallbackRef2 } from "@radix-ui/react-use-callback-ref";
-import { useEffect } from "react";
-var useOnScrollToBottom = (callback) => {
-  const callbackRef = useCallbackRef2(callback);
-  const { useViewport } = useThreadContext();
-  useEffect(() => {
-    return useViewport.getState().onScrollToBottom(() => {
+// src/primitives/assistantModal/AssistantModalRoot.tsx
+import { useState as useState3 } from "react";
+import * as PopoverPrimitive from "@radix-ui/react-popover";
+import { composeEventHandlers as composeEventHandlers2 } from "@radix-ui/primitive";
+
+// src/utils/hooks/useOnComposerFocus.tsx
+import { useCallbackRef } from "@radix-ui/react-use-callback-ref";
+import { useEffect as useEffect3 } from "react";
+var useOnComposerFocus = (callback) => {
+  const callbackRef = useCallbackRef(callback);
+  const { useComposer } = useThreadContext();
+  useEffect3(() => {
+    return useComposer.getState().onFocus(() => {
       callbackRef();
     });
-  }, [useViewport, callbackRef]);
+  }, [useComposer, callbackRef]);
 };
 
-// src/primitive-hooks/thread/useThreadViewportAutoScroll.tsx
-var useThreadViewportAutoScroll = ({
-  autoScroll = true
+// src/primitives/assistantModal/AssistantModalRoot.tsx
+import { jsx as jsx6 } from "react/jsx-runtime";
+var usePopoverScope = PopoverPrimitive.createPopoverScope();
+var useAssistantModalOpenState = (defaultOpen = false) => {
+  const state = useState3(defaultOpen);
+  const [, setOpen] = state;
+  useOnComposerFocus(() => {
+    setOpen(true);
+  });
+  return state;
+};
+var AssistantModalRoot = ({
+  __scopeAssistantModal,
+  defaultOpen,
+  open,
+  onOpenChange,
+  ...rest
 }) => {
-  const divRef = useRef2(null);
-  const { useViewport } = useThreadContext();
-  const firstRenderRef = useRef2(true);
-  const lastScrollTop = useRef2(0);
-  const isScrollingToBottomRef = useRef2(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 scope = usePopoverScope(__scopeAssistantModal);
+  const [modalOpen, setOpen] = useAssistantModalOpenState(defaultOpen);
+  return /* @__PURE__ */ jsx6(
+    PopoverPrimitive.Root,
+    {
+      ...scope,
+      open: open === void 0 ? modalOpen : open,
+      onOpenChange: composeEventHandlers2(onOpenChange, setOpen),
+      ...rest
     }
-  });
-  const scrollRef = useManagedRef((el) => {
-    el.addEventListener("scroll", handleScroll);
-    return () => {
-      el.removeEventListener("scroll", handleScroll);
-    };
-  });
-  const autoScrollRef = useComposedRefs(resizeRef, scrollRef, divRef);
-  useOnScrollToBottom(() => {
-    scrollToBottom();
-  });
-  return autoScrollRef;
+  );
 };
+AssistantModalRoot.displayName = "AssistantModalRoot";
 
-// src/primitives/thread/ThreadViewport.tsx
-import { jsx as jsx2 } from "react/jsx-runtime";
-var ThreadViewport = forwardRef2(({ autoScroll, onScroll, children, ...rest }, forwardedRef) => {
-  const autoScrollRef = useThreadViewportAutoScroll({
-    autoScroll
-  });
-  const ref = useComposedRefs2(forwardedRef, autoScrollRef);
-  return /* @__PURE__ */ jsx2(Primitive2.div, { ...rest, ref, children });
-});
-ThreadViewport.displayName = "ThreadViewport";
-
-// src/primitives/thread/ThreadMessages.tsx
-import { memo } from "react";
-
-// src/context/providers/MessageProvider.tsx
-import { useEffect as useEffect2, useState } from "react";
-import { create as create3 } from "zustand";
-
-// src/context/stores/EditComposer.ts
-import { create } from "zustand";
+// src/primitives/assistantModal/AssistantModalTrigger.tsx
+import { forwardRef as forwardRef3 } from "react";
+import * as PopoverPrimitive2 from "@radix-ui/react-popover";
+import { jsx as jsx7 } from "react/jsx-runtime";
+var AssistantModalTrigger = forwardRef3(
+  ({ __scopeAssistantModal, ...rest }, ref) => {
+    const scope = usePopoverScope(__scopeAssistantModal);
+    return /* @__PURE__ */ jsx7(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
+import { forwardRef as forwardRef4 } from "react";
+import * as PopoverPrimitive3 from "@radix-ui/react-popover";
+import { composeEventHandlers as composeEventHandlers3 } from "@radix-ui/primitive";
+import { jsx as jsx8 } from "react/jsx-runtime";
+var AssistantModalContent = forwardRef4(
+  ({
+    __scopeAssistantModal,
+    side,
+    align,
+    onInteractOutside,
+    dissmissOnInteractOutside = false,
+    ...props
+  }, forwardedRef) => {
+    const scope = usePopoverScope(__scopeAssistantModal);
+    return /* @__PURE__ */ jsx8(PopoverPrimitive3.Portal, { ...scope, children: /* @__PURE__ */ jsx8(
+      PopoverPrimitive3.Content,
+      {
+        ...scope,
+        ...props,
+        ref: forwardedRef,
+        side: side ?? "top",
+        align: align ?? "end",
+        onInteractOutside: composeEventHandlers3(
+          onInteractOutside,
+          dissmissOnInteractOutside ? void 0 : (e) => e.preventDefault()
+        )
+      }
+    ) });
   }
-});
+);
+AssistantModalContent.displayName = "AssistantModalContent";
 
-// src/context/stores/EditComposer.ts
-var makeEditComposerStore = ({
-  onEdit,
-  onSend
-}) => 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/index.ts
+var branchPicker_exports = {};
+__export(branchPicker_exports, {
+  Count: () => BranchPickerCount,
+  Next: () => BranchPickerNext,
+  Number: () => BranchPickerNumber,
+  Previous: () => BranchPickerPrevious,
+  Root: () => BranchPickerRoot
+});
 
-// src/context/stores/MessageUtils.ts
-import { create as create2 } from "zustand";
-var makeMessageUtilsStore = () => create2((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/BranchPickerNext.tsx
+var BranchPickerNext = createActionButton(
+  "BranchPickerNext",
+  useBranchPickerNext
+);
 
-// src/context/providers/MessageProvider.tsx
-import { jsx as jsx3 } from "react/jsx-runtime";
-var getIsLast = (thread, message) => {
-  return thread.messages[thread.messages.length - 1]?.id === message.id;
+// src/primitives/branchPicker/BranchPickerPrevious.tsx
+var BranchPickerPrevious = createActionButton(
+  "BranchPickerPrevious",
+  useBranchPickerPrevious
+);
+
+// src/primitives/branchPicker/BranchPickerCount.tsx
+import { Fragment, jsx as jsx9 } from "react/jsx-runtime";
+var BranchPickerCount = () => {
+  const branchCount = useBranchPickerCount();
+  return /* @__PURE__ */ jsx9(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
-  });
+
+// src/primitives/branchPicker/BranchPickerNumber.tsx
+import { Fragment as Fragment2, jsx as jsx10 } from "react/jsx-runtime";
+var BranchPickerNumber = () => {
+  const branchNumber = useBranchPickerNumber();
+  return /* @__PURE__ */ jsx10(Fragment2, { children: branchNumber });
 };
-var useMessageContext2 = (messageIndex) => {
-  const { useThread, useThreadActions } = useThreadContext();
-  const [context] = useState(() => {
-    const useMessage = create3(() => ({}));
-    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]
-        });
+
+// src/primitives/branchPicker/BranchPickerRoot.tsx
+import { Primitive as Primitive6 } from "@radix-ui/react-primitive";
+import { forwardRef as forwardRef8 } from "react";
+
+// src/primitives/message/index.ts
+var message_exports = {};
+__export(message_exports, {
+  Content: () => MessageContent,
+  If: () => MessageIf,
+  InProgress: () => MessageInProgress,
+  Root: () => MessageRoot
+});
+
+// src/primitives/message/MessageRoot.tsx
+import { composeEventHandlers as composeEventHandlers4 } from "@radix-ui/primitive";
+import { Primitive as Primitive3 } from "@radix-ui/react-primitive";
+import { forwardRef as forwardRef5 } from "react";
+import { jsx as jsx11 } from "react/jsx-runtime";
+var MessageRoot = forwardRef5(
+  ({ onMouseEnter, onMouseLeave, ...rest }, ref) => {
+    const { useMessageUtils } = useMessageContext();
+    const setIsHovering = useMessageUtils((s) => s.setIsHovering);
+    const handleMouseEnter = () => {
+      setIsHovering(true);
+    };
+    const handleMouseLeave = () => {
+      setIsHovering(false);
+    };
+    return /* @__PURE__ */ jsx11(
+      Primitive3.div,
+      {
+        ...rest,
+        ref,
+        onMouseEnter: composeEventHandlers4(onMouseEnter, handleMouseEnter),
+        onMouseLeave: composeEventHandlers4(onMouseLeave, handleMouseLeave)
       }
-    });
-    syncMessage(
-      useThread.getState(),
-      useThreadActions.getState().getBranches,
-      useMessage,
-      messageIndex
     );
-    return { useMessage, useMessageUtils, useEditComposer };
+  }
+);
+MessageRoot.displayName = "MessageRoot";
+
+// src/primitives/message/MessageIf.tsx
+var MessageIf = ({ children, ...query }) => {
+  const result = useMessageIf(query);
+  return result ? children : null;
+};
+
+// src/primitives/message/MessageContent.tsx
+import { memo as memo2 } from "react";
+
+// src/context/providers/ContentPartProvider.tsx
+import { useEffect as useEffect4, useState as useState4 } from "react";
+import { create as create7 } from "zustand";
+import { jsx as jsx12 } from "react/jsx-runtime";
+var syncContentPart = ({ message }, useContentPart, partIndex) => {
+  const part = message.content[partIndex];
+  if (!part) return;
+  const messageStatus = message.role === "assistant" ? message.status : "done";
+  const status = partIndex === message.content.length - 1 ? messageStatus : "done";
+  const currentState = useContentPart.getState();
+  if (currentState.part === part && currentState.status === status) return;
+  useContentPart.setState(
+    Object.freeze({
+      part,
+      status
+    })
+  );
+};
+var useContentPartContext2 = (partIndex) => {
+  const { useMessage } = useMessageContext();
+  const [context] = useState4(() => {
+    const useContentPart = create7(
+      () => ({})
+    );
+    syncContentPart(useMessage.getState(), useContentPart, partIndex);
+    return { useContentPart };
   });
-  useEffect2(() => {
-    return useThread.subscribe((thread) => {
-      syncMessage(
-        thread,
-        useThreadActions.getState().getBranches,
-        context.useMessage,
-        messageIndex
-      );
+  useEffect4(() => {
+    syncContentPart(useMessage.getState(), context.useContentPart, partIndex);
+    return useMessage.subscribe((message) => {
+      syncContentPart(message, context.useContentPart, partIndex);
     });
-  }, [useThread, useThreadActions, context, messageIndex]);
+  }, [context, useMessage, partIndex]);
   return context;
 };
-var MessageProvider = ({
-  messageIndex,
+var ContentPartProvider = ({
+  partIndex,
   children
 }) => {
-  const context = useMessageContext2(messageIndex);
-  return /* @__PURE__ */ jsx3(MessageContext.Provider, { value: context, children });
+  const context = useContentPartContext2(partIndex);
+  return /* @__PURE__ */ jsx12(ContentPartContext.Provider, { value: context, children });
 };
 
-// src/primitives/composer/ComposerIf.tsx
-var ComposerIf = ({ children, ...query }) => {
-  const result = useComposerIf(query);
-  return result ? children : null;
+// src/primitives/contentPart/ContentPartDisplay.tsx
+var ContentPartDisplay = () => {
+  const display = useContentPartDisplay();
+  return display ?? null;
 };
 
-// src/primitives/message/MessageIf.tsx
-var MessageIf = ({ children, ...query }) => {
-  const result = useMessageIf(query);
-  return result ? children : null;
+// src/primitives/contentPart/ContentPartInProgressIndicator.tsx
+var ContentPartInProgressIndicator = () => {
+  const indicator = useContentPartInProgressIndicator();
+  return indicator;
 };
 
-// src/primitives/thread/ThreadMessages.tsx
-import { jsx as jsx4, jsxs } from "react/jsx-runtime";
-var getComponents = (components) => {
-  return {
-    EditComposer: components.EditComposer ?? components.UserMessage ?? components.Message,
-    UserMessage: components.UserMessage ?? components.Message,
-    AssistantMessage: components.AssistantMessage ?? components.Message
-  };
+// src/primitives/contentPart/ContentPartText.tsx
+import { Primitive as Primitive4 } from "@radix-ui/react-primitive";
+import { forwardRef as forwardRef6 } from "react";
+import { jsx as jsx13 } from "react/jsx-runtime";
+var ContentPartText = forwardRef6((props, forwardedRef) => {
+  const text = useContentPartText();
+  return /* @__PURE__ */ jsx13(Primitive4.p, { ...props, ref: forwardedRef, children: text });
+});
+ContentPartText.displayName = "ContentPartText";
+
+// src/primitives/message/MessageContent.tsx
+import { Fragment as Fragment3, jsx as jsx14, jsxs as jsxs2 } from "react/jsx-runtime";
+var defaultComponents = {
+  Text: () => /* @__PURE__ */ jsxs2(Fragment3, { children: [
+    /* @__PURE__ */ jsx14(ContentPartText, { style: { whiteSpace: "pre-line" } }),
+    /* @__PURE__ */ jsx14(ContentPartInProgressIndicator, {})
+  ] }),
+  Image: () => null,
+  UI: () => /* @__PURE__ */ jsx14(ContentPartDisplay, {}),
+  tools: {
+    Fallback: (props) => {
+      const { useToolUIs } = useAssistantContext();
+      const Render = useToolUIs((s) => s.getToolUI(props.part.toolName));
+      if (!Render) return null;
+      return /* @__PURE__ */ jsx14(Render, { ...props });
+    }
+  }
 };
-var ThreadMessageImpl = ({
-  messageIndex,
-  components
+var MessageContentPartComponent = ({
+  components: {
+    Text = defaultComponents.Text,
+    Image = defaultComponents.Image,
+    UI = defaultComponents.UI,
+    tools: { by_name = {}, Fallback = defaultComponents.tools.Fallback } = {}
+  } = {}
 }) => {
-  const { UserMessage, EditComposer, AssistantMessage } = getComponents(components);
-  return /* @__PURE__ */ jsxs(MessageProvider, { messageIndex, children: [
-    /* @__PURE__ */ jsxs(MessageIf, { user: true, children: [
-      /* @__PURE__ */ jsx4(ComposerIf, { editing: false, children: /* @__PURE__ */ jsx4(UserMessage, {}) }),
-      /* @__PURE__ */ jsx4(ComposerIf, { editing: true, children: /* @__PURE__ */ jsx4(EditComposer, {}) })
-    ] }),
-    /* @__PURE__ */ jsx4(MessageIf, { assistant: true, children: /* @__PURE__ */ jsx4(AssistantMessage, {}) })
-  ] });
-};
-var ThreadMessage = 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
+  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__ */ jsx14(Text, { part, status });
+    case "image":
+      return /* @__PURE__ */ jsx14(Image, { part, status });
+    case "ui":
+      return /* @__PURE__ */ jsx14(UI, { part, status });
+    case "tool-call": {
+      const Tool = by_name[part.toolName] || Fallback;
+      const addResult = (result) => addToolResult(part.toolCallId, result);
+      return /* @__PURE__ */ jsx14(Tool, { part, status, addResult });
+    }
+    default:
+      throw new Error(`Unknown content part type: ${type}`);
+  }
+};
+var MessageContentPartImpl = ({
+  partIndex,
+  components
+}) => {
+  return /* @__PURE__ */ jsx14(ContentPartProvider, { partIndex, children: /* @__PURE__ */ jsx14(MessageContentPartComponent, { components }) });
+};
+var MessageContentPart = memo2(
+  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 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__ */ jsx4(
-      ThreadMessage,
+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__ */ jsx14(
+      MessageContentPart,
       {
-        messageIndex,
+        partIndex,
         components
       },
-      messageIndex
-    );
-  });
-};
-
-// src/utils/createActionButton.tsx
-import { composeEventHandlers } from "@radix-ui/primitive";
-import { Primitive as Primitive3 } from "@radix-ui/react-primitive";
-import { forwardRef as forwardRef3 } from "react";
-import { jsx as jsx5 } from "react/jsx-runtime";
-var createActionButton = (displayName, useActionButton) => {
-  const ActionButton = forwardRef3((props, forwardedRef) => {
-    const callback = useActionButton(props);
-    return /* @__PURE__ */ jsx5(
-      Primitive3.button,
-      {
-        type: "button",
-        disabled: !callback,
-        ...props,
-        ref: forwardedRef,
-        onClick: composeEventHandlers(props.onClick, () => {
-          callback?.();
-        })
-      }
+      partIndex
     );
   });
-  ActionButton.displayName = displayName;
-  return ActionButton;
 };
 
-// src/primitives/thread/ThreadScrollToBottom.tsx
-var ThreadScrollToBottom = createActionButton(
-  "ThreadScrollToBottom",
-  useThreadScrollToBottom
-);
+// src/primitives/message/MessageInProgress.tsx
+import { Primitive as Primitive5 } from "@radix-ui/react-primitive";
+import {
+  forwardRef as forwardRef7,
+  useMemo as useMemo3
+} from "react";
+import { jsx as jsx15 } from "react/jsx-runtime";
+var MessageInProgress = forwardRef7((props, ref) => {
+  const { useMessageUtils } = useMessageContext();
+  useMemo3(() => {
+    useMessageUtils.getState().setInProgressIndicator(/* @__PURE__ */ jsx15(Primitive5.span, { ...props, ref }));
+  }, [useMessageUtils, props, ref]);
+  return null;
+});
+MessageInProgress.displayName = "MessageInProgress";
 
-// src/primitives/thread/ThreadSuggestion.tsx
-var ThreadSuggestion = createActionButton(
-  "ThreadSuggestion",
-  useThreadSuggestion
-);
+// src/primitives/branchPicker/BranchPickerRoot.tsx
+import { jsx as jsx16 } from "react/jsx-runtime";
+var BranchPickerRoot = forwardRef8(({ hideWhenSingleBranch, ...rest }, ref) => {
+  return /* @__PURE__ */ jsx16(MessageIf, { hasBranches: hideWhenSingleBranch ? true : void 0, children: /* @__PURE__ */ jsx16(Primitive6.div, { ...rest, ref }) });
+});
+BranchPickerRoot.displayName = "BranchPickerRoot";
 
 // src/primitives/composer/index.ts
 var composer_exports = {};
@@ -732,13 +1089,13 @@ __export(composer_exports, {
 });
 
 // src/primitives/composer/ComposerRoot.tsx
-import { composeEventHandlers as composeEventHandlers2 } from "@radix-ui/primitive";
-import { Primitive as Primitive4 } from "@radix-ui/react-primitive";
+import { composeEventHandlers as composeEventHandlers5 } from "@radix-ui/primitive";
+import { Primitive as Primitive7 } from "@radix-ui/react-primitive";
 import {
-  forwardRef as forwardRef4
+  forwardRef as forwardRef9
 } from "react";
-import { jsx as jsx6 } from "react/jsx-runtime";
-var ComposerRoot = forwardRef4(
+import { jsx as jsx17 } from "react/jsx-runtime";
+var ComposerRoot = forwardRef9(
   ({ onSubmit, ...rest }, forwardedRef) => {
     const send = useComposerSend();
     const handleSubmit = (e) => {
@@ -746,12 +1103,12 @@ var ComposerRoot = forwardRef4(
       e.preventDefault();
       send();
     };
-    return /* @__PURE__ */ jsx6(
-      Primitive4.form,
+    return /* @__PURE__ */ jsx17(
+      Primitive7.form,
       {
         ...rest,
         ref: forwardedRef,
-        onSubmit: composeEventHandlers2(onSubmit, handleSubmit)
+        onSubmit: composeEventHandlers5(onSubmit, handleSubmit)
       }
     );
   }
@@ -759,19 +1116,19 @@ var ComposerRoot = forwardRef4(
 ComposerRoot.displayName = "ComposerRoot";
 
 // src/primitives/composer/ComposerInput.tsx
-import { composeEventHandlers as composeEventHandlers3 } from "@radix-ui/primitive";
-import { useComposedRefs as useComposedRefs3 } from "@radix-ui/react-compose-refs";
+import { composeEventHandlers as composeEventHandlers6 } from "@radix-ui/primitive";
+import { useComposedRefs } from "@radix-ui/react-compose-refs";
 import { Slot } from "@radix-ui/react-slot";
 import {
-  forwardRef as forwardRef5,
-  useCallback as useCallback12,
-  useEffect as useEffect3,
+  forwardRef as forwardRef10,
+  useCallback as useCallback10,
+  useEffect as useEffect5,
   useRef as useRef3
 } from "react";
 import TextareaAutosize from "react-textarea-autosize";
 import { useEscapeKeydown } from "@radix-ui/react-use-escape-keydown";
-import { jsx as jsx7 } from "react/jsx-runtime";
-var ComposerInput = forwardRef5(
+import { jsx as jsx18 } from "react/jsx-runtime";
+var ComposerInput = forwardRef10(
   ({ autoFocus = false, asChild, disabled, onChange, onKeyDown, ...rest }, forwardedRef) => {
     const { useThread } = useThreadContext();
     const { useComposer, type } = useComposerContext();
@@ -781,7 +1138,7 @@ var ComposerInput = forwardRef5(
     });
     const Component = asChild ? Slot : TextareaAutosize;
     const textareaRef = useRef3(null);
-    const ref = useComposedRefs3(forwardedRef, textareaRef);
+    const ref = useComposedRefs(forwardedRef, textareaRef);
     useEscapeKeydown((e) => {
       const composer = useComposer.getState();
       if (composer.cancel()) {
@@ -799,35 +1156,34 @@ var ComposerInput = forwardRef5(
       }
     };
     const autoFocusEnabled = autoFocus && !disabled;
-    const focus = useCallback12(() => {
+    const focus = useCallback10(() => {
       const textarea = textareaRef.current;
       if (!textarea || !autoFocusEnabled) return;
-      textarea.focus();
+      textarea.focus({ preventScroll: true });
       textarea.setSelectionRange(
         textareaRef.current.value.length,
         textareaRef.current.value.length
       );
     }, [autoFocusEnabled]);
-    useEffect3(() => focus(), [focus]);
-    useOnScrollToBottom(() => {
+    useEffect5(() => focus(), [focus]);
+    useOnComposerFocus(() => {
       if (type === "new") {
         focus();
       }
     });
-    return /* @__PURE__ */ jsx7(
+    return /* @__PURE__ */ jsx18(
       Component,
       {
         value,
         ...rest,
         ref,
-        autoFocus,
         disabled,
-        onChange: composeEventHandlers3(onChange, (e) => {
+        onChange: composeEventHandlers6(onChange, (e) => {
           const composerState = useComposer.getState();
           if (!composerState.isEditing) return;
           return composerState.setValue(e.target.value);
         }),
-        onKeyDown: composeEventHandlers3(onKeyDown, handleKeyPress)
+        onKeyDown: composeEventHandlers6(onKeyDown, handleKeyPress)
       }
     );
   }
@@ -835,15 +1191,15 @@ var ComposerInput = forwardRef5(
 ComposerInput.displayName = "ComposerInput";
 
 // src/primitives/composer/ComposerSend.tsx
-import { forwardRef as forwardRef6 } from "react";
-import { Primitive as Primitive5 } from "@radix-ui/react-primitive";
-import { jsx as jsx8 } from "react/jsx-runtime";
-var ComposerSend = forwardRef6(
+import { forwardRef as forwardRef11 } from "react";
+import { Primitive as Primitive8 } from "@radix-ui/react-primitive";
+import { jsx as jsx19 } from "react/jsx-runtime";
+var ComposerSend = forwardRef11(
   ({ disabled, ...rest }, ref) => {
     const { useComposer } = useComposerContext();
     const hasValue = useComposer((c) => c.isEditing && c.value.length > 0);
-    return /* @__PURE__ */ jsx8(
-      Primitive5.button,
+    return /* @__PURE__ */ jsx19(
+      Primitive8.button,
       {
         type: "submit",
         ...rest,
@@ -861,363 +1217,397 @@ var ComposerCancel = createActionButton(
   useComposerCancel
 );
 
-// src/primitives/message/index.ts
-var message_exports = {};
-__export(message_exports, {
-  Content: () => MessageContent,
-  If: () => MessageIf,
-  InProgress: () => MessageInProgress,
-  Root: () => MessageRoot
+// 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/message/MessageRoot.tsx
-import { composeEventHandlers as composeEventHandlers4 } from "@radix-ui/primitive";
-import { Primitive as Primitive6 } from "@radix-ui/react-primitive";
-import { forwardRef as forwardRef7 } from "react";
-import { jsx as jsx9 } from "react/jsx-runtime";
-var MessageRoot = forwardRef7(
-  ({ onMouseEnter, onMouseLeave, ...rest }, ref) => {
-    const { useMessageUtils } = useMessageContext();
-    const setIsHovering = useMessageUtils((s) => s.setIsHovering);
-    const handleMouseEnter = () => {
-      setIsHovering(true);
-    };
-    const handleMouseLeave = () => {
-      setIsHovering(false);
-    };
-    return /* @__PURE__ */ jsx9(
-      Primitive6.div,
-      {
-        ...rest,
-        ref,
-        onMouseEnter: composeEventHandlers4(onMouseEnter, handleMouseEnter),
-        onMouseLeave: composeEventHandlers4(onMouseLeave, handleMouseLeave)
-      }
-    );
+// src/primitives/contentPart/ContentPartImage.tsx
+import { Primitive as Primitive9 } from "@radix-ui/react-primitive";
+import { forwardRef as forwardRef12 } from "react";
+import { jsx as jsx20 } from "react/jsx-runtime";
+var ContentPartImage = forwardRef12((props, forwardedRef) => {
+  const image = useContentPartImage();
+  return /* @__PURE__ */ jsx20(Primitive9.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
+import { Primitive as Primitive10 } from "@radix-ui/react-primitive";
+import { forwardRef as forwardRef13 } from "react";
+import { jsx as jsx21 } from "react/jsx-runtime";
+var ThreadRoot = forwardRef13(
+  (props, ref) => {
+    return /* @__PURE__ */ jsx21(Primitive10.div, { ...props, ref });
   }
 );
-MessageRoot.displayName = "MessageRoot";
-
-// src/primitives/message/MessageContent.tsx
-import { memo as memo2 } from "react";
+ThreadRoot.displayName = "ThreadRoot";
 
-// src/context/providers/ContentPartProvider.tsx
-import { useEffect as useEffect4, useState as useState2 } from "react";
-import { create as create4 } from "zustand";
-import { jsx as jsx10 } from "react/jsx-runtime";
-var syncContentPart = ({ message }, useContentPart, partIndex) => {
-  const part = message.content[partIndex];
-  if (!part) return;
-  const messageStatus = message.role === "assistant" ? message.status : "done";
-  const status = partIndex === message.content.length - 1 ? messageStatus : "done";
-  const currentState = useContentPart.getState();
-  if (currentState.part === part && currentState.status === status) return;
-  useContentPart.setState(
-    Object.freeze({
-      part,
-      status
-    })
-  );
-};
-var useContentPartContext2 = (partIndex) => {
-  const { useMessage } = useMessageContext();
-  const [context] = useState2(() => {
-    const useContentPart = create4(
-      () => ({})
-    );
-    syncContentPart(useMessage.getState(), useContentPart, partIndex);
-    return { useContentPart };
-  });
-  useEffect4(() => {
-    syncContentPart(useMessage.getState(), context.useContentPart, partIndex);
-    return useMessage.subscribe((message) => {
-      syncContentPart(message, context.useContentPart, partIndex);
-    });
-  }, [context, useMessage, partIndex]);
-  return context;
-};
-var ContentPartProvider = ({
-  partIndex,
-  children
-}) => {
-  const context = useContentPartContext2(partIndex);
-  return /* @__PURE__ */ jsx10(ContentPartContext.Provider, { value: context, children });
+// src/primitives/thread/ThreadEmpty.tsx
+var ThreadEmpty = ({ children }) => {
+  const empty = useThreadEmpty();
+  return empty ? children : null;
 };
 
-// src/primitives/contentPart/ContentPartDisplay.tsx
-var ContentPartDisplay = () => {
-  const display = useContentPartDisplay();
-  return display ?? null;
+// src/primitives/thread/ThreadIf.tsx
+var ThreadIf = ({ children, ...query }) => {
+  const result = useThreadIf(query);
+  return result ? children : null;
 };
 
-// src/primitives/contentPart/ContentPartInProgressIndicator.tsx
-var ContentPartInProgressIndicator = () => {
-  const indicator = useContentPartInProgressIndicator();
-  return indicator;
-};
+// src/primitives/thread/ThreadViewport.tsx
+import { useComposedRefs as useComposedRefs3 } from "@radix-ui/react-compose-refs";
+import { Primitive as Primitive11 } from "@radix-ui/react-primitive";
+import { forwardRef as forwardRef14 } from "react";
 
-// src/primitives/contentPart/ContentPartText.tsx
-import { Primitive as Primitive7 } from "@radix-ui/react-primitive";
-import { forwardRef as forwardRef8 } from "react";
-import { jsx as jsx11 } from "react/jsx-runtime";
-var ContentPartText = forwardRef8((props, forwardedRef) => {
-  const text = useContentPartText();
-  return /* @__PURE__ */ jsx11(Primitive7.span, { ...props, ref: forwardedRef, children: text });
-});
-ContentPartText.displayName = "ContentPartText";
+// src/primitive-hooks/thread/useThreadViewportAutoScroll.tsx
+import { useComposedRefs as useComposedRefs2 } from "@radix-ui/react-compose-refs";
+import { useRef as useRef5 } from "react";
 
-// src/primitives/message/MessageContent.tsx
-import { Fragment, jsx as jsx12, jsxs as jsxs2 } from "react/jsx-runtime";
-var defaultComponents = {
-  Text: () => /* @__PURE__ */ jsxs2(Fragment, { children: [
-    /* @__PURE__ */ jsx12(ContentPartText, {}),
-    /* @__PURE__ */ jsx12(ContentPartInProgressIndicator, {})
-  ] }),
-  Image: () => null,
-  UI: () => /* @__PURE__ */ jsx12(ContentPartDisplay, {}),
-  tools: {
-    Fallback: (props) => {
-      const { useToolUIs } = useAssistantContext();
-      const Render = useToolUIs((s) => s.getToolUI(props.part.toolName));
-      if (!Render) return null;
-      return /* @__PURE__ */ jsx12(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__ */ jsx12(Text, { part, status });
-    case "image":
-      return /* @__PURE__ */ jsx12(Image, { part, status });
-    case "ui":
-      return /* @__PURE__ */ jsx12(UI, { part, status });
-    case "tool-call": {
-      const Tool = by_name[part.toolName] || Fallback;
-      const addResult = (result) => addToolResult(part.toolCallId, result);
-      return /* @__PURE__ */ jsx12(Tool, { part, status, addResult });
-    }
-    default:
-      throw new Error(`Unknown content part type: ${type}`);
-  }
+// src/utils/hooks/useOnResizeContent.tsx
+import { useCallbackRef as useCallbackRef2 } from "@radix-ui/react-use-callback-ref";
+import { useCallback as useCallback12 } from "react";
+
+// src/utils/hooks/useManagedRef.ts
+import { useCallback as useCallback11, useRef as useRef4 } from "react";
+var useManagedRef = (callback) => {
+  const cleanupRef = useRef4();
+  const ref = useCallback11(
+    (el) => {
+      if (cleanupRef.current) {
+        cleanupRef.current();
+      }
+      if (el) {
+        cleanupRef.current = callback(el);
+      }
+    },
+    [callback]
+  );
+  return ref;
 };
-var MessageContentPartImpl = ({
-  partIndex,
-  components
-}) => {
-  return /* @__PURE__ */ jsx12(ContentPartProvider, { partIndex, children: /* @__PURE__ */ jsx12(MessageContentPartComponent, { components }) });
+
+// src/utils/hooks/useOnResizeContent.tsx
+var useOnResizeContent = (callback) => {
+  const callbackRef = useCallbackRef2(callback);
+  const refCallback = useCallback12(
+    (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);
 };
-var MessageContentPart = memo2(
-  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__ */ jsx12(
-      MessageContentPart,
-      {
-        partIndex,
-        components
-      },
-      partIndex
-    );
+
+// src/utils/hooks/useOnScrollToBottom.tsx
+import { useCallbackRef as useCallbackRef3 } from "@radix-ui/react-use-callback-ref";
+import { useEffect as useEffect6 } from "react";
+var useOnScrollToBottom = (callback) => {
+  const callbackRef = useCallbackRef3(callback);
+  const { useViewport } = useThreadContext();
+  useEffect6(() => {
+    return useViewport.getState().onScrollToBottom(() => {
+      callbackRef();
+    });
+  }, [useViewport, callbackRef]);
+};
+
+// src/primitive-hooks/thread/useThreadViewportAutoScroll.tsx
+var useThreadViewportAutoScroll = ({
+  autoScroll = true
+}) => {
+  const divRef = useRef5(null);
+  const { useViewport } = useThreadContext();
+  const firstRenderRef = useRef5(true);
+  const lastScrollTop = useRef5(0);
+  const isScrollingToBottomRef = useRef5(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 = useComposedRefs2(resizeRef, scrollRef, divRef);
+  useOnScrollToBottom(() => {
+    scrollToBottom();
   });
+  return autoScrollRef;
 };
 
-// src/primitives/message/MessageInProgress.tsx
-import { Primitive as Primitive8 } from "@radix-ui/react-primitive";
-import {
-  forwardRef as forwardRef9,
-  useMemo as useMemo2
-} from "react";
-import { jsx as jsx13 } from "react/jsx-runtime";
-var MessageInProgress = forwardRef9((props, ref) => {
-  const { useMessageUtils } = useMessageContext();
-  useMemo2(() => {
-    useMessageUtils.getState().setInProgressIndicator(/* @__PURE__ */ jsx13(Primitive8.span, { ...props, ref }));
-  }, [useMessageUtils, props, ref]);
-  return null;
+// src/primitives/thread/ThreadViewport.tsx
+import { jsx as jsx22 } from "react/jsx-runtime";
+var ThreadViewport = forwardRef14(({ autoScroll, onScroll, children, ...rest }, forwardedRef) => {
+  const autoScrollRef = useThreadViewportAutoScroll({
+    autoScroll
+  });
+  const ref = useComposedRefs3(forwardedRef, autoScrollRef);
+  return /* @__PURE__ */ jsx22(Primitive11.div, { ...rest, ref, children });
 });
-MessageInProgress.displayName = "MessageInProgress";
+ThreadViewport.displayName = "ThreadViewport";
 
-// src/primitives/branchPicker/index.ts
-var branchPicker_exports = {};
-__export(branchPicker_exports, {
-  Count: () => BranchPickerCount,
-  Next: () => BranchPickerNext,
-  Number: () => BranchPickerNumber,
-  Previous: () => BranchPickerPrevious,
-  Root: () => BranchPickerRoot
-});
+// src/primitives/thread/ThreadMessages.tsx
+import { memo as memo3 } from "react";
 
-// src/primitives/branchPicker/BranchPickerNext.tsx
-var BranchPickerNext = createActionButton(
-  "BranchPickerNext",
-  useBranchPickerNext
-);
+// src/context/providers/MessageProvider.tsx
+import { useEffect as useEffect7, useState as useState5 } from "react";
+import { create as create10 } from "zustand";
 
-// src/primitives/branchPicker/BranchPickerPrevious.tsx
-var BranchPickerPrevious = createActionButton(
-  "BranchPickerPrevious",
-  useBranchPickerPrevious
-);
+// src/context/stores/EditComposer.ts
+import { create as create8 } from "zustand";
+var makeEditComposerStore = ({
+  onEdit,
+  onSend
+}) => create8()((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/BranchPickerCount.tsx
-import { Fragment as Fragment2, jsx as jsx14 } from "react/jsx-runtime";
-var BranchPickerCount = () => {
-  const branchCount = useBranchPickerCount();
-  return /* @__PURE__ */ jsx14(Fragment2, { children: branchCount });
-};
+// src/context/stores/MessageUtils.ts
+import { create as create9 } from "zustand";
+var makeMessageUtilsStore = () => create9((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/BranchPickerNumber.tsx
-import { Fragment as Fragment3, jsx as jsx15 } from "react/jsx-runtime";
-var BranchPickerNumber = () => {
-  const branchNumber = useBranchPickerNumber();
-  return /* @__PURE__ */ jsx15(Fragment3, { children: branchNumber });
+// src/context/providers/MessageProvider.tsx
+import { jsx as jsx23 } from "react/jsx-runtime";
+var getIsLast = (thread, message) => {
+  return thread.messages[thread.messages.length - 1]?.id === message.id;
 };
-
-// src/primitives/branchPicker/BranchPickerRoot.tsx
-import { Primitive as Primitive9 } from "@radix-ui/react-primitive";
-import { forwardRef as forwardRef10 } from "react";
-import { jsx as jsx16 } from "react/jsx-runtime";
-var BranchPickerRoot = forwardRef10(({ hideWhenSingleBranch, ...rest }, ref) => {
-  return /* @__PURE__ */ jsx16(MessageIf, { hasBranches: hideWhenSingleBranch ? true : void 0, children: /* @__PURE__ */ jsx16(Primitive9.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
-import { Primitive as Primitive10 } from "@radix-ui/react-primitive";
-import { forwardRef as forwardRef11 } from "react";
-import { jsx as jsx17 } from "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 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 ActionBarRoot = forwardRef11(({ hideWhenRunning, autohide, autohideFloat, ...rest }, ref) => {
-  const hideAndfloatStatus = useActionBarFloatStatus({
-    hideWhenRunning,
-    autohide,
-    autohideFloat
+var useMessageContext2 = (messageIndex) => {
+  const { useThread, useThreadActions } = useThreadContext();
+  const [context] = useState5(() => {
+    const useMessage = create10(() => ({}));
+    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 };
   });
-  if (hideAndfloatStatus === "hidden" /* Hidden */) return null;
-  return /* @__PURE__ */ jsx17(
-    Primitive10.div,
-    {
-      ...hideAndfloatStatus === "floating" /* Floating */ ? { "data-floating": "true" } : null,
-      ...rest,
-      ref
-    }
-  );
-});
-ActionBarRoot.displayName = "ActionBarRoot";
+  useEffect7(() => {
+    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__ */ jsx23(MessageContext.Provider, { value: context, children });
+};
 
-// src/primitives/actionBar/ActionBarCopy.tsx
-var ActionBarCopy = createActionButton(
-  "ActionBarCopy",
-  useActionBarCopy
+// src/primitives/thread/ThreadMessages.tsx
+import { jsx as jsx24, jsxs as jsxs3 } from "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__ */ jsxs3(MessageProvider, { messageIndex, children: [
+    /* @__PURE__ */ jsxs3(MessageIf, { user: true, children: [
+      /* @__PURE__ */ jsx24(ComposerIf, { editing: false, children: /* @__PURE__ */ jsx24(UserMessage, {}) }),
+      /* @__PURE__ */ jsx24(ComposerIf, { editing: true, children: /* @__PURE__ */ jsx24(EditComposer, {}) })
+    ] }),
+    /* @__PURE__ */ jsx24(MessageIf, { assistant: true, children: /* @__PURE__ */ jsx24(AssistantMessage, {}) })
+  ] });
+};
+var ThreadMessage = memo3(
+  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__ */ jsx24(
+      ThreadMessage,
+      {
+        messageIndex,
+        components
+      },
+      messageIndex
+    );
+  });
+};
 
-// 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
-import { Primitive as Primitive11 } from "@radix-ui/react-primitive";
-import { forwardRef as forwardRef12 } from "react";
-import { jsx as jsx18 } from "react/jsx-runtime";
-var ContentPartImage = forwardRef12((props, forwardedRef) => {
-  const image = useContentPartImage();
-  return /* @__PURE__ */ jsx18(Primitive11.img, { src: image, ...props, ref: forwardedRef });
-});
-ContentPartImage.displayName = "ContentPartImage";
-
 // src/runtime/local/useLocalRuntime.tsx
-import { useInsertionEffect, useState as useState3 } from "react";
-
-// src/utils/ModelConfigTypes.ts
-var mergeModelConfigs = (configSet) => {
-  const configs = Array.from(configSet).map((c) => c()).sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
-  return configs.reduce((acc, config) => {
-    if (config.system) {
-      if (acc.system) {
-        acc.system += `
-
-${config.system}`;
-      } else {
-        acc.system = config.system;
-      }
-    }
-    if (config.tools) {
-      for (const [name, tool] of Object.entries(config.tools)) {
-        if (acc.tools?.[name]) {
-          throw new Error(
-            `You tried to define a tool with the name ${name}, but it already exists.`
-          );
-        }
-        if (!acc.tools) acc.tools = {};
-        acc.tools[name] = tool;
-      }
-    }
-    return acc;
-  }, {});
-};
+import { useInsertionEffect as useInsertionEffect3, useState as useState6 } from "react";
 
 // src/runtime/utils/idUtils.tsx
 import { customAlphabet } from "nanoid/non-secure";
@@ -1475,219 +1865,81 @@ var LocalRuntime = class {
 
 // src/runtime/local/useLocalRuntime.tsx
 var useLocalRuntime = (adapter) => {
-  const [runtime] = useState3(() => new LocalRuntime(adapter));
-  useInsertionEffect(() => {
+  const [runtime] = useState6(() => new LocalRuntime(adapter));
+  useInsertionEffect3(() => {
     runtime.adapter = adapter;
   });
   return runtime;
 };
 
-// src/context/providers/AssistantRuntimeProvider.tsx
-import { memo as memo3 } from "react";
-
-// src/context/providers/AssistantProvider.tsx
-import { useEffect as useEffect6, useInsertionEffect as useInsertionEffect3, useRef as useRef5, useState as useState5 } from "react";
-
-// src/context/stores/AssistantModelConfig.ts
-import { create as create5 } from "zustand";
-
-// src/utils/ProxyConfigProvider.ts
-var ProxyConfigProvider = class {
-  _providers = /* @__PURE__ */ new Set();
-  getModelConfig() {
-    return mergeModelConfigs(this._providers);
-  }
-  registerModelConfigProvider(provider) {
-    this._providers.add(provider);
+// src/model-config/useAssistantTool.tsx
+import { useEffect as useEffect8 } from "react";
+var useAssistantTool = (tool) => {
+  const { useModelConfig, useToolUIs } = useAssistantContext();
+  const registerModelConfigProvider = useModelConfig(
+    (s) => s.registerModelConfigProvider
+  );
+  const setToolUI = useToolUIs((s) => s.setToolUI);
+  useEffect8(() => {
+    const { toolName, render, ...rest } = tool;
+    const config = {
+      tools: {
+        [tool.toolName]: rest
+      }
+    };
+    const unsub1 = registerModelConfigProvider(() => config);
+    const unsub2 = render ? setToolUI(toolName, render) : void 0;
     return () => {
-      this._providers.delete(provider);
+      unsub1();
+      unsub2?.();
     };
-  }
+  }, [registerModelConfigProvider, setToolUI, tool]);
 };
 
-// src/context/stores/AssistantModelConfig.ts
-var makeAssistantModelConfigStore = () => create5(() => {
-  const proxy = new ProxyConfigProvider();
-  return Object.freeze({
-    getModelConfig: () => {
-      return proxy.getModelConfig();
-    },
-    registerModelConfigProvider: (provider) => {
-      return proxy.registerModelConfigProvider(provider);
-    }
-  });
-});
-
-// src/context/stores/AssistantToolUIs.ts
-import { create as create6 } from "zustand";
-var makeAssistantToolUIsStore = () => create6((set) => {
-  const renderers = /* @__PURE__ */ new Map();
-  return Object.freeze({
-    getToolUI: (name) => {
-      const arr = renderers.get(name);
-      const last = arr?.at(-1);
-      if (last) return last;
-      return null;
-    },
-    setToolUI: (name, render) => {
-      let arr = renderers.get(name);
-      if (!arr) {
-        arr = [];
-        renderers.set(name, arr);
-      }
-      arr.push(render);
-      set({});
-      return () => {
-        const index = arr.indexOf(render);
-        if (index !== -1) {
-          arr.splice(index, 1);
-        }
-        if (index === arr.length) {
-          set({});
-        }
-      };
-    }
-  });
-});
-
-// src/context/providers/ThreadProvider.tsx
-import { useEffect as useEffect5, useInsertionEffect as useInsertionEffect2, useRef as useRef4, useState as useState4 } from "react";
-
-// src/context/stores/Composer.ts
-import { create as create7 } from "zustand";
-var makeComposerStore = (useThread, useThreadActions) => create7()((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;
-    }
+// src/model-config/makeAssistantTool.tsx
+var makeAssistantTool = (tool) => {
+  const Tool = () => {
+    useAssistantTool(tool);
+    return null;
   };
-});
-
-// src/context/stores/Thread.ts
-import { create as create8 } from "zustand";
-var makeThreadStore = (runtimeRef) => {
-  return create8(() => ({
-    messages: runtimeRef.current.messages,
-    isRunning: runtimeRef.current.isRunning
-  }));
+  return Tool;
 };
 
-// src/context/stores/ThreadViewport.tsx
-import { create as create9 } from "zustand";
-var makeThreadViewportStore = () => {
-  const scrollToBottomListeners = /* @__PURE__ */ new Set();
-  return create9(() => ({
-    isAtBottom: true,
-    scrollToBottom: () => {
-      for (const listener of scrollToBottomListeners) {
-        listener();
-      }
-    },
-    onScrollToBottom: (callback) => {
-      scrollToBottomListeners.add(callback);
-      return () => {
-        scrollToBottomListeners.delete(callback);
-      };
-    }
-  }));
+// src/model-config/useAssistantToolUI.tsx
+import { useEffect as useEffect9 } from "react";
+var useAssistantToolUI = (tool) => {
+  const { useToolUIs } = useAssistantContext();
+  const setToolUI = useToolUIs((s) => s.setToolUI);
+  useEffect9(() => {
+    if (!tool) return;
+    const { toolName, render } = tool;
+    return setToolUI(toolName, render);
+  }, [setToolUI, tool]);
 };
 
-// src/context/stores/ThreadActions.ts
-import { create as create10 } from "zustand";
-var makeThreadActionStore = (runtimeRef) => {
-  return create10(
-    () => Object.freeze({
-      getBranches: (messageId) => runtimeRef.current.getBranches(messageId),
-      switchToBranch: (branchId) => runtimeRef.current.switchToBranch(branchId),
-      startRun: (parentId) => runtimeRef.current.startRun(parentId),
-      append: (message) => runtimeRef.current.append(message),
-      cancelRun: () => runtimeRef.current.cancelRun(),
-      addToolResult: (toolCallId, result) => runtimeRef.current.addToolResult(toolCallId, result)
-    })
-  );
+// src/model-config/makeAssistantToolUI.tsx
+var makeAssistantToolUI = (tool) => {
+  const ToolUI = () => {
+    useAssistantToolUI(tool);
+    return null;
+  };
+  return ToolUI;
 };
 
-// src/context/providers/ThreadProvider.tsx
-import { jsx as jsx19, jsxs as jsxs3 } from "react/jsx-runtime";
-var ThreadProvider = ({
-  children,
-  runtime
-}) => {
-  const runtimeRef = useRef4(runtime);
-  useInsertionEffect2(() => {
-    runtimeRef.current = runtime;
-  });
-  const [context] = useState4(() => {
-    const useThread = makeThreadStore(runtimeRef);
-    const useThreadActions = makeThreadActionStore(runtimeRef);
-    const useViewport = makeThreadViewportStore();
-    const useComposer = makeComposerStore(useThread, useThreadActions);
-    return {
-      useThread,
-      useThreadActions,
-      useComposer,
-      useViewport
-    };
-  });
-  useEffect5(() => {
-    const onRuntimeUpdate = () => {
-      context.useThread.setState(
-        Object.freeze({
-          messages: runtimeRef.current.messages,
-          isRunning: runtimeRef.current.isRunning
-        }),
-        true
-      );
+// src/model-config/useAssistantInstructions.tsx
+import { useEffect as useEffect10 } from "react";
+var useAssistantInstructions = (instruction) => {
+  const { useModelConfig } = useAssistantContext();
+  const registerModelConfigProvider = useModelConfig(
+    (s) => s.registerModelConfigProvider
+  );
+  useEffect10(() => {
+    const config = {
+      system: instruction
     };
-    onRuntimeUpdate();
-    return runtime.subscribe(onRuntimeUpdate);
-  }, [context, runtime]);
-  const RuntimeSynchronizer = runtime.unstable_synchronizer;
-  return /* @__PURE__ */ jsxs3(ThreadContext.Provider, { value: context, children: [
-    RuntimeSynchronizer && /* @__PURE__ */ jsx19(RuntimeSynchronizer, {}),
-    children
-  ] });
-};
-
-// src/context/providers/AssistantProvider.tsx
-import { jsx as jsx20 } from "react/jsx-runtime";
-var AssistantProvider = ({ children, runtime }) => {
-  const runtimeRef = useRef5(runtime);
-  useInsertionEffect3(() => {
-    runtimeRef.current = runtime;
-  });
-  const [context] = useState5(() => {
-    const useModelConfig = makeAssistantModelConfigStore();
-    const useToolUIs = makeAssistantToolUIsStore();
-    return { useModelConfig, useToolUIs };
-  });
-  const getModelCOnfig = context.useModelConfig((c) => c.getModelConfig);
-  useEffect6(() => {
-    return runtime.registerModelConfigProvider(getModelCOnfig);
-  }, [runtime, getModelCOnfig]);
-  return /* @__PURE__ */ jsx20(AssistantContext.Provider, { value: context, children: /* @__PURE__ */ jsx20(ThreadProvider, { runtime, children }) });
-};
-
-// src/context/providers/AssistantRuntimeProvider.tsx
-import { jsx as jsx21 } from "react/jsx-runtime";
-var AssistantRuntimeProviderImpl = ({ children, runtime }) => {
-  return /* @__PURE__ */ jsx21(AssistantProvider, { runtime, children });
+    return registerModelConfigProvider(() => config);
+  }, [registerModelConfigProvider, instruction]);
 };
-var AssistantRuntimeProvider = memo3(AssistantRuntimeProviderImpl);
 
 // src/internal.ts
 var internal_exports = {};
@@ -1697,6 +1949,7 @@ __export(internal_exports, {
 });
 export {
   actionBar_exports as ActionBarPrimitive,
+  assistantModal_exports as AssistantModalPrimitive,
   AssistantRuntimeProvider,
   branchPicker_exports as BranchPickerPrimitive,
   composer_exports as ComposerPrimitive,
@@ -1704,22 +1957,32 @@ export {
   internal_exports as INTERNAL,
   message_exports as MessagePrimitive,
   thread_exports as ThreadPrimitive,
+  makeAssistantTool,
+  makeAssistantToolUI,
   useActionBarCopy,
   useActionBarEdit,
   useActionBarReload,
+  useAssistantContext,
+  useAssistantInstructions,
+  useAssistantTool,
+  useAssistantToolUI,
   useBranchPickerCount,
   useBranchPickerNext,
   useBranchPickerNumber,
   useBranchPickerPrevious,
   useComposerCancel,
+  useComposerContext,
   useComposerIf,
   useComposerSend,
+  useContentPartContext,
   useContentPartDisplay,
   useContentPartImage,
   useContentPartInProgressIndicator,
   useContentPartText,
   useLocalRuntime,
+  useMessageContext,
   useMessageIf,
+  useThreadContext,
   useThreadEmpty,
   useThreadIf,
   useThreadScrollToBottom,