@assistant-ui/react 0.12.16 → 0.12.19

package/src/primitives/actionBar/ActionBarCopy.tsx

@@ -4,8 +4,8 @@ import { forwardRef } from "react";
 import { ActionButtonProps } from "../../utils/createActionButton";
 import { composeEventHandlers } from "@radix-ui/primitive";
 import { Primitive } from "@radix-ui/react-primitive";
-import { useCallback } from "react";
-import { useAuiState, useAui } from "@assistant-ui/store";
+import { useActionBarCopy } from "@assistant-ui/core/react";
+import { useAuiState } from "@assistant-ui/store";
 
 /**
  * Hook that provides copy functionality for action bar buttons.
@@ -36,31 +36,12 @@ const useActionBarPrimitiveCopy = ({
 }: {
   copiedDuration?: number | undefined;
 } = {}) => {
-  const aui = useAui();
-  const hasCopyableContent = useAuiState((s) => {
-    return (
-      (s.message.role !== "assistant" ||
-        s.message.status?.type !== "running") &&
-      s.message.parts.some((c) => c.type === "text" && c.text.length > 0)
-    );
+  const { copy, disabled } = useActionBarCopy({
+    copiedDuration,
+    copyToClipboard: (text) => navigator.clipboard.writeText(text),
   });
-
-  const isEditing = useAuiState((s) => s.composer.isEditing);
-  const composerValue = useAuiState((s) => s.composer.text);
-
-  const callback = useCallback(() => {
-    const valueToCopy = isEditing ? composerValue : aui.message().getCopyText();
-
-    if (!valueToCopy) return;
-
-    navigator.clipboard.writeText(valueToCopy).then(() => {
-      aui.message().setIsCopied(true);
-      setTimeout(() => aui.message().setIsCopied(false), copiedDuration);
-    });
-  }, [aui, isEditing, composerValue, copiedDuration]);
-
-  if (!hasCopyableContent) return null;
-  return callback;
+  if (disabled) return null;
+  return copy;
 };
 
 export namespace ActionBarPrimitiveCopy {

package/src/primitives/actionBar/ActionBarEdit.ts

@@ -5,8 +5,7 @@ import {
   ActionButtonProps,
   createActionButton,
 } from "../../utils/createActionButton";
-import { useCallback } from "react";
-import { useAuiState, useAui } from "@assistant-ui/store";
+import { useActionBarEdit as useActionBarEditBehavior } from "@assistant-ui/core/react";
 
 /**
  * Hook that provides edit functionality for action bar buttons.
@@ -30,15 +29,9 @@ import { useAuiState, useAui } from "@assistant-ui/store";
  * ```
  */
 const useActionBarEdit = () => {
-  const aui = useAui();
-  const disabled = useAuiState((s) => s.composer.isEditing);
-
-  const callback = useCallback(() => {
-    aui.composer().beginEdit();
-  }, [aui]);
-
+  const { disabled, edit } = useActionBarEditBehavior();
   if (disabled) return null;
-  return callback;
+  return edit;
 };
 
 export namespace ActionBarPrimitiveEdit {

package/src/primitives/actionBar/ActionBarFeedbackNegative.tsx

@@ -4,17 +4,12 @@ import { forwardRef } from "react";
 import { ActionButtonProps } from "../../utils/createActionButton";
 import { composeEventHandlers } from "@radix-ui/primitive";
 import { Primitive } from "@radix-ui/react-primitive";
-import { useCallback } from "react";
-import { useAuiState, useAui } from "@assistant-ui/store";
+import { useAuiState } from "@assistant-ui/store";
+import { useActionBarFeedbackNegative as useActionBarFeedbackNegativeBehavior } from "@assistant-ui/core/react";
 
 const useActionBarFeedbackNegative = () => {
-  const aui = useAui();
-
-  const callback = useCallback(() => {
-    aui.message().submitFeedback({ type: "negative" });
-  }, [aui]);
-
-  return callback;
+  const { submit } = useActionBarFeedbackNegativeBehavior();
+  return submit;
 };
 
 export namespace ActionBarPrimitiveFeedbackNegative {

package/src/primitives/actionBar/ActionBarFeedbackPositive.tsx

@@ -1,19 +1,15 @@
 "use client";
 
-import { forwardRef, useCallback } from "react";
+import { forwardRef } from "react";
 import { ActionButtonProps } from "../../utils/createActionButton";
 import { composeEventHandlers } from "@radix-ui/primitive";
-import { useAuiState, useAui } from "@assistant-ui/store";
+import { useAuiState } from "@assistant-ui/store";
 import { Primitive } from "@radix-ui/react-primitive";
+import { useActionBarFeedbackPositive as useActionBarFeedbackPositiveBehavior } from "@assistant-ui/core/react";
 
 const useActionBarFeedbackPositive = () => {
-  const aui = useAui();
-
-  const callback = useCallback(() => {
-    aui.message().submitFeedback({ type: "positive" });
-  }, [aui]);
-
-  return callback;
+  const { submit } = useActionBarFeedbackPositiveBehavior();
+  return submit;
 };
 
 export namespace ActionBarPrimitiveFeedbackPositive {

package/src/primitives/actionBar/ActionBarReload.ts

@@ -5,8 +5,7 @@ import {
   ActionButtonProps,
   createActionButton,
 } from "../../utils/createActionButton";
-import { useCallback } from "react";
-import { useAuiState, useAui } from "@assistant-ui/store";
+import { useActionBarReload as useActionBarReloadBehavior } from "@assistant-ui/core/react";
 
 /**
  * Hook that provides reload functionality for action bar buttons.
@@ -30,21 +29,9 @@ import { useAuiState, useAui } from "@assistant-ui/store";
  * ```
  */
 const useActionBarReload = () => {
-  const aui = useAui();
-
-  const disabled = useAuiState(
-    (s) =>
-      s.thread.isRunning ||
-      s.thread.isDisabled ||
-      s.message.role !== "assistant",
-  );
-
-  const callback = useCallback(() => {
-    aui.message().reload();
-  }, [aui]);
-
+  const { disabled, reload } = useActionBarReloadBehavior();
   if (disabled) return null;
-  return callback;
+  return reload;
 };
 
 export namespace ActionBarPrimitiveReload {

package/src/primitives/actionBar/ActionBarSpeak.ts

@@ -1,29 +1,16 @@
 "use client";
 
-import { useCallback } from "react";
-import { useAuiState, useAui } from "@assistant-ui/store";
 import {
   ActionButtonElement,
   ActionButtonProps,
   createActionButton,
 } from "../../utils/createActionButton";
+import { useActionBarSpeak as useActionBarSpeakBehavior } from "@assistant-ui/core/react";
 
 const useActionBarSpeak = () => {
-  const aui = useAui();
-  const callback = useCallback(async () => {
-    aui.message().speak();
-  }, [aui]);
-
-  const hasSpeakableContent = useAuiState((s) => {
-    return (
-      (s.message.role !== "assistant" ||
-        s.message.status?.type !== "running") &&
-      s.message.parts.some((c) => c.type === "text" && c.text.length > 0)
-    );
-  });
-
-  if (!hasSpeakableContent) return null;
-  return callback;
+  const { disabled, speak } = useActionBarSpeakBehavior();
+  if (disabled) return null;
+  return speak;
 };
 
 export namespace ActionBarPrimitiveSpeak {

package/src/primitives/actionBar/ActionBarStopSpeaking.tsx

@@ -5,20 +5,12 @@ import { ActionButtonProps } from "../../utils/createActionButton";
 import { useEscapeKeydown } from "@radix-ui/react-use-escape-keydown";
 import { Primitive } from "@radix-ui/react-primitive";
 import { composeEventHandlers } from "@radix-ui/primitive";
-import { useCallback } from "react";
-import { useAuiState, useAui } from "@assistant-ui/store";
+import { useActionBarStopSpeaking as useActionBarStopSpeakingBehavior } from "@assistant-ui/core/react";
 
 const useActionBarStopSpeaking = () => {
-  const aui = useAui();
-  const isSpeaking = useAuiState((s) => s.message.speech != null);
-
-  const callback = useCallback(() => {
-    aui.message().stopSpeaking();
-  }, [aui]);
-
-  if (!isSpeaking) return null;
-
-  return callback;
+  const { disabled, stopSpeaking } = useActionBarStopSpeakingBehavior();
+  if (disabled) return null;
+  return stopSpeaking;
 };
 
 export namespace ActionBarPrimitiveStopSpeaking {

package/src/primitives/actionBar.ts

@@ -0,0 +1,9 @@
+export { ActionBarPrimitiveRoot as Root } from "./actionBar/ActionBarRoot";
+export { ActionBarPrimitiveCopy as Copy } from "./actionBar/ActionBarCopy";
+export { ActionBarPrimitiveReload as Reload } from "./actionBar/ActionBarReload";
+export { ActionBarPrimitiveEdit as Edit } from "./actionBar/ActionBarEdit";
+export { ActionBarPrimitiveSpeak as Speak } from "./actionBar/ActionBarSpeak";
+export { ActionBarPrimitiveStopSpeaking as StopSpeaking } from "./actionBar/ActionBarStopSpeaking";
+export { ActionBarPrimitiveFeedbackPositive as FeedbackPositive } from "./actionBar/ActionBarFeedbackPositive";
+export { ActionBarPrimitiveFeedbackNegative as FeedbackNegative } from "./actionBar/ActionBarFeedbackNegative";
+export { ActionBarPrimitiveExportMarkdown as ExportMarkdown } from "./actionBar/ActionBarExportMarkdown";

package/src/primitives/actionBarMore.ts

@@ -0,0 +1,5 @@
+export { ActionBarMorePrimitiveRoot as Root } from "./actionBarMore/ActionBarMoreRoot";
+export { ActionBarMorePrimitiveTrigger as Trigger } from "./actionBarMore/ActionBarMoreTrigger";
+export { ActionBarMorePrimitiveContent as Content } from "./actionBarMore/ActionBarMoreContent";
+export { ActionBarMorePrimitiveItem as Item } from "./actionBarMore/ActionBarMoreItem";
+export { ActionBarMorePrimitiveSeparator as Separator } from "./actionBarMore/ActionBarMoreSeparator";

package/src/primitives/assistantModal.ts

@@ -0,0 +1,4 @@
+export { AssistantModalPrimitiveRoot as Root } from "./assistantModal/AssistantModalRoot";
+export { AssistantModalPrimitiveTrigger as Trigger } from "./assistantModal/AssistantModalTrigger";
+export { AssistantModalPrimitiveContent as Content } from "./assistantModal/AssistantModalContent";
+export { AssistantModalPrimitiveAnchor as Anchor } from "./assistantModal/AssistantModalAnchor";

package/src/primitives/attachment/AttachmentThumb.tsx

@@ -26,4 +26,4 @@ export const AttachmentPrimitiveThumb = forwardRef<
   );
 });
 
-AttachmentPrimitiveThumb.displayName = "AttachmentPrimitive.Thumb";
+AttachmentPrimitiveThumb.displayName = "AttachmentPrimitive.unstable_Thumb";

package/src/primitives/attachment.ts

@@ -0,0 +1,4 @@
+export { AttachmentPrimitiveRoot as Root } from "./attachment/AttachmentRoot";
+export { AttachmentPrimitiveThumb as unstable_Thumb } from "./attachment/AttachmentThumb";
+export { AttachmentPrimitiveName as Name } from "./attachment/AttachmentName";
+export { AttachmentPrimitiveRemove as Remove } from "./attachment/AttachmentRemove";

package/src/primitives/branchPicker/BranchPickerNext.ts

@@ -5,29 +5,12 @@ import {
   ActionButtonProps,
   createActionButton,
 } from "../../utils/createActionButton";
-import { useCallback } from "react";
-import { useAuiState, useAui } from "@assistant-ui/store";
+import { useBranchPickerNext as useBranchPickerNextBehavior } from "@assistant-ui/core/react";
 
 const useBranchPickerNext = () => {
-  const aui = useAui();
-  const disabled = useAuiState((s) => {
-    // Disabled if no next branch
-    if (s.message.branchNumber >= s.message.branchCount) return true;
-
-    // Disabled if running and capability not supported
-    if (s.thread.isRunning && !s.thread.capabilities.switchBranchDuringRun) {
-      return true;
-    }
-
-    return false;
-  });
-
-  const callback = useCallback(() => {
-    aui.message().switchToBranch({ position: "next" });
-  }, [aui]);
-
+  const { disabled, next } = useBranchPickerNextBehavior();
   if (disabled) return null;
-  return callback;
+  return next;
 };
 
 export namespace BranchPickerPrimitiveNext {

package/src/primitives/branchPicker/BranchPickerPrevious.ts

@@ -5,50 +5,12 @@ import {
   ActionButtonProps,
   createActionButton,
 } from "../../utils/createActionButton";
-import { useCallback } from "react";
-import { useAuiState, useAui } from "@assistant-ui/store";
+import { useBranchPickerPrevious as useBranchPickerPreviousBehavior } from "@assistant-ui/core/react";
 
-/**
- * Hook that provides navigation to the previous branch functionality.
- *
- * This hook returns a callback function that switches to the previous branch
- * in the message branch tree, or null if there is no previous branch available.
- *
- * @returns A previous branch callback function, or null if navigation is disabled
- *
- * @example
- * ```tsx
- * function CustomPreviousButton() {
- *   const previous = useBranchPickerPrevious();
- *
- *   return (
- *     <button onClick={previous} disabled={!previous}>
- *       {previous ? "Previous Branch" : "No Previous Branch"}
- *     </button>
- *   );
- * }
- * ```
- */
 const useBranchPickerPrevious = () => {
-  const aui = useAui();
-  const disabled = useAuiState((s) => {
-    // Disabled if no previous branch
-    if (s.message.branchNumber <= 1) return true;
-
-    // Disabled if running and capability not supported
-    if (s.thread.isRunning && !s.thread.capabilities.switchBranchDuringRun) {
-      return true;
-    }
-
-    return false;
-  });
-
-  const callback = useCallback(() => {
-    aui.message().switchToBranch({ position: "previous" });
-  }, [aui]);
-
+  const { disabled, previous } = useBranchPickerPreviousBehavior();
   if (disabled) return null;
-  return callback;
+  return previous;
 };
 
 export namespace BranchPickerPrimitivePrevious {

package/src/primitives/branchPicker/BranchPickerRoot.tsx

@@ -2,7 +2,7 @@
 
 import { Primitive } from "@radix-ui/react-primitive";
 import { type ComponentRef, forwardRef, ComponentPropsWithoutRef } from "react";
-import { If } from "../message";
+import { MessagePrimitiveIf as If } from "../message/MessageIf";
 
 export namespace BranchPickerPrimitiveRoot {
   export type Element = ComponentRef<typeof Primitive.div>;

package/src/primitives/branchPicker.ts

@@ -0,0 +1,5 @@
+export { BranchPickerPrimitiveNext as Next } from "./branchPicker/BranchPickerNext";
+export { BranchPickerPrimitivePrevious as Previous } from "./branchPicker/BranchPickerPrevious";
+export { BranchPickerPrimitiveCount as Count } from "./branchPicker/BranchPickerCount";
+export { BranchPickerPrimitiveNumber as Number } from "./branchPicker/BranchPickerNumber";
+export { BranchPickerPrimitiveRoot as Root } from "./branchPicker/BranchPickerRoot";

package/src/primitives/{chainOfThought/index.ts → chainOfThought.ts}

@@ -1,14 +1,14 @@
 export {
   ChainOfThoughtPrimitiveRoot as Root,
   type ChainOfThoughtPrimitiveRoot as RootPrimitive,
-} from "./ChainOfThoughtRoot";
+} from "./chainOfThought/ChainOfThoughtRoot";
 
 export {
   ChainOfThoughtPrimitiveAccordionTrigger as AccordionTrigger,
   type ChainOfThoughtPrimitiveAccordionTrigger as AccordionTriggerPrimitive,
-} from "./ChainOfThoughtAccordionTrigger";
+} from "./chainOfThought/ChainOfThoughtAccordionTrigger";
 
 export {
   ChainOfThoughtPrimitiveParts as Parts,
   type ChainOfThoughtPrimitiveParts as PartsPrimitive,
-} from "./ChainOfThoughtParts";
+} from "./chainOfThought/ChainOfThoughtParts";

package/src/primitives/composer/ComposerAddAttachment.ts

@@ -6,7 +6,8 @@ import {
   createActionButton,
 } from "../../utils/createActionButton";
 import { useCallback } from "react";
-import { useAuiState, useAui } from "@assistant-ui/store";
+import { useAui } from "@assistant-ui/store";
+import { useComposerAddAttachment as useComposerAddAttachmentBehavior } from "@assistant-ui/core/react";
 
 const useComposerAddAttachment = ({
   multiple = true,
@@ -14,7 +15,7 @@ const useComposerAddAttachment = ({
   /** allow selecting multiple files */
   multiple?: boolean | undefined;
 } = {}) => {
-  const disabled = useAuiState((s) => !s.composer.isEditing);
+  const { disabled, addAttachment } = useComposerAddAttachmentBehavior();
   const aui = useAui();
 
   const callback = useCallback(() => {
@@ -34,7 +35,7 @@ const useComposerAddAttachment = ({
       const fileList = (e.target as HTMLInputElement).files;
       if (!fileList) return;
       for (const file of fileList) {
-        aui.composer().addAttachment(file);
+        addAttachment(file);
       }
 
       document.body.removeChild(input);
@@ -47,7 +48,7 @@ const useComposerAddAttachment = ({
     };
 
     input.click();
-  }, [aui, multiple]);
+  }, [aui, multiple, addAttachment]);
 
   if (disabled) return null;
   return callback;

package/src/primitives/composer/ComposerCancel.ts

@@ -5,19 +5,12 @@ import {
   ActionButtonProps,
   createActionButton,
 } from "../../utils/createActionButton";
-import { useCallback } from "react";
-import { useAuiState, useAui } from "@assistant-ui/store";
+import { useComposerCancel as useComposerCancelBehavior } from "@assistant-ui/core/react";
 
 const useComposerCancel = () => {
-  const aui = useAui();
-  const disabled = useAuiState((s) => !s.composer.canCancel);
-
-  const callback = useCallback(() => {
-    aui.composer().cancel();
-  }, [aui]);
-
+  const { disabled, cancel } = useComposerCancelBehavior();
   if (disabled) return null;
-  return callback;
+  return cancel;
 };
 
 export namespace ComposerPrimitiveCancel {

package/src/primitives/composer/ComposerDictate.ts

@@ -1,28 +1,16 @@
 "use client";
 
-import { useCallback } from "react";
-import { useAui, useAuiState } from "@assistant-ui/store";
 import type {
   ActionButtonElement,
   ActionButtonProps,
 } from "../../utils/createActionButton";
 import { createActionButton } from "../../utils/createActionButton";
+import { useComposerDictate as useComposerDictateBehavior } from "@assistant-ui/core/react";
 
 const useComposerDictate = () => {
-  const aui = useAui();
-  const disabled = useAuiState(
-    (s) =>
-      s.composer.dictation != null ||
-      !s.thread.capabilities.dictation ||
-      !s.composer.isEditing,
-  );
-
-  const callback = useCallback(() => {
-    aui.composer().startDictation();
-  }, [aui]);
-
+  const { disabled, startDictation } = useComposerDictateBehavior();
   if (disabled) return null;
-  return callback;
+  return startDictation;
 };
 
 export namespace ComposerPrimitiveDictate {

package/src/primitives/composer/ComposerSend.ts

@@ -5,22 +5,12 @@ import {
   ActionButtonProps,
   createActionButton,
 } from "../../utils/createActionButton";
-import { useCallback } from "react";
-import { useAuiState, useAui } from "@assistant-ui/store";
+import { useComposerSend as useComposerSendBehavior } from "@assistant-ui/core/react";
 
 export const useComposerSend = () => {
-  const aui = useAui();
-
-  const disabled = useAuiState(
-    (s) => s.thread.isRunning || !s.composer.isEditing || s.composer.isEmpty,
-  );
-
-  const callback = useCallback(() => {
-    aui.composer().send();
-  }, [aui]);
-
+  const { disabled, send } = useComposerSendBehavior();
   if (disabled) return null;
-  return callback;
+  return send;
 };
 
 export namespace ComposerPrimitiveSend {

package/src/primitives/composer.ts

@@ -0,0 +1,15 @@
+export { ComposerPrimitiveRoot as Root } from "./composer/ComposerRoot";
+export { ComposerPrimitiveInput as Input } from "./composer/ComposerInput";
+export { ComposerPrimitiveSend as Send } from "./composer/ComposerSend";
+export { ComposerPrimitiveCancel as Cancel } from "./composer/ComposerCancel";
+export { ComposerPrimitiveAddAttachment as AddAttachment } from "./composer/ComposerAddAttachment";
+export { ComposerPrimitiveAttachments as Attachments } from "./composer/ComposerAttachments";
+export { ComposerPrimitiveAttachmentByIndex as AttachmentByIndex } from "./composer/ComposerAttachments";
+export { ComposerPrimitiveAttachmentDropzone as AttachmentDropzone } from "./composer/ComposerAttachmentDropzone";
+export { ComposerPrimitiveDictate as Dictate } from "./composer/ComposerDictate";
+export { ComposerPrimitiveStopDictation as StopDictation } from "./composer/ComposerStopDictation";
+export { ComposerPrimitiveDictationTranscript as DictationTranscript } from "./composer/ComposerDictationTranscript";
+export { ComposerPrimitiveIf as If } from "./composer/ComposerIf";
+export { ComposerPrimitiveQuote as Quote } from "./composer/ComposerQuote";
+export { ComposerPrimitiveQuoteText as QuoteText } from "./composer/ComposerQuote";
+export { ComposerPrimitiveQuoteDismiss as QuoteDismiss } from "./composer/ComposerQuote";

package/src/primitives/error/ErrorMessage.tsx

@@ -2,7 +2,7 @@
 
 import { Primitive } from "@radix-ui/react-primitive";
 import { type ComponentRef, forwardRef, ComponentPropsWithoutRef } from "react";
-import { useAuiState } from "@assistant-ui/store";
+import { useMessageError } from "@assistant-ui/core/react";
 
 export namespace ErrorPrimitiveMessage {
   export type Element = ComponentRef<typeof Primitive.span>;
@@ -13,12 +13,7 @@ export const ErrorPrimitiveMessage = forwardRef<
   ErrorPrimitiveMessage.Element,
   ErrorPrimitiveMessage.Props
 >(({ children, ...props }, forwardRef) => {
-  const error = useAuiState((s) => {
-    return s.message.status?.type === "incomplete" &&
-      s.message.status.reason === "error"
-      ? s.message.status.error
-      : undefined;
-  });
+  const error = useMessageError();
 
   if (error === undefined) return null;
 

package/src/primitives/error.ts

@@ -0,0 +1,2 @@
+export { ErrorPrimitiveRoot as Root } from "./error/ErrorRoot";
+export { ErrorPrimitiveMessage as Message } from "./error/ErrorMessage";

package/src/primitives/message/MessageError.ts

@@ -1,15 +1,11 @@
 "use client";
 
 import { FC, PropsWithChildren } from "react";
-import { useAuiState } from "@assistant-ui/store";
+import { useMessageError } from "@assistant-ui/core/react";
 
 export const MessagePrimitiveError: FC<PropsWithChildren> = ({ children }) => {
-  const hasError = useAuiState(
-    (s) =>
-      s.message.status?.type === "incomplete" &&
-      s.message.status.reason === "error",
-  );
-  return hasError ? children : null;
+  const error = useMessageError();
+  return error !== undefined ? children : null;
 };
 
 MessagePrimitiveError.displayName = "MessagePrimitive.Error";

package/src/primitives/message/MessageParts.tsx

@@ -31,10 +31,16 @@ export namespace MessagePrimitiveParts {
 /**
  * Renders the parts of a message with web-specific default components.
  */
-export const MessagePrimitiveParts: FC<MessagePrimitiveParts.Props> = ({
-  components,
-  ...rest
-}) => {
+export const MessagePrimitiveParts: FC<MessagePrimitiveParts.Props> = (
+  props,
+) => {
+  if ("children" in props) {
+    return (
+      <MessagePrimitivePartsBase>{props.children}</MessagePrimitivePartsBase>
+    );
+  }
+
+  const { components, ...rest } = props;
   const merged = components
     ? {
         Text: components.Text ?? webDefaultComponents.Text,
@@ -58,6 +64,7 @@ export const MessagePrimitiveParts: FC<MessagePrimitiveParts.Props> = ({
                 messagePartsDefaultComponents.ReasoningGroup,
             }),
         Empty: components.Empty,
+        Quote: components.Quote,
       }
     : webDefaultComponents;
 

package/src/primitives/message/MessagePartsGrouped.tsx

@@ -8,10 +8,8 @@ import {
   useMemo,
 } from "react";
 import { useAuiState, useAui } from "@assistant-ui/store";
-import {
-  PartByIndexProvider,
-  TextMessagePartProvider,
-} from "../../context/providers";
+import { PartByIndexProvider } from "../../context/providers/PartByIndexProvider";
+import { TextMessagePartProvider } from "../../context/providers/TextMessagePartProvider";
 import { MessagePartPrimitiveText } from "../messagePart/MessagePartText";
 import { MessagePartPrimitiveImage } from "../messagePart/MessagePartImage";
 import type {
@@ -26,7 +24,7 @@ import type {
   ToolCallMessagePartProps,
   FileMessagePartComponent,
   ReasoningMessagePartComponent,
-} from "../../types";
+} from "@assistant-ui/core/react";
 import { MessagePartPrimitiveInProgress } from "../messagePart/MessagePartInProgress";
 import type { MessagePartStatus } from "@assistant-ui/core";
 

package/src/primitives/message.ts

@@ -0,0 +1,13 @@
+export { MessagePrimitiveRoot as Root } from "./message/MessageRoot";
+export { MessagePrimitiveParts as Parts } from "./message/MessageParts";
+export { MessagePrimitivePartByIndex as PartByIndex } from "./message/MessageParts";
+export { MessagePrimitiveParts as Content } from "./message/MessageParts";
+export { MessagePrimitiveIf as If } from "./message/MessageIf";
+export { MessagePrimitiveAttachments as Attachments } from "./message/MessageAttachments";
+export { MessagePrimitiveAttachmentByIndex as AttachmentByIndex } from "./message/MessageAttachments";
+export { MessagePrimitiveQuote as Quote } from "@assistant-ui/core/react";
+export { MessagePrimitiveError as Error } from "./message/MessageError";
+export {
+  MessagePrimitiveUnstable_PartsGrouped as Unstable_PartsGrouped,
+  MessagePrimitiveUnstable_PartsGroupedByParentId as Unstable_PartsGroupedByParentId,
+} from "./message/MessagePartsGrouped";

package/src/primitives/messagePart.ts

@@ -0,0 +1,4 @@
+export { MessagePartPrimitiveText as Text } from "./messagePart/MessagePartText";
+export { MessagePartPrimitiveImage as Image } from "./messagePart/MessagePartImage";
+export { MessagePartPrimitiveInProgress as InProgress } from "./messagePart/MessagePartInProgress";
+export { PartPrimitiveMessages as Messages } from "@assistant-ui/core/react";

package/src/primitives/{selectionToolbar/index.ts → selectionToolbar.ts}

@@ -1,8 +1,8 @@
 export {
   SelectionToolbarPrimitiveRoot as Root,
   type SelectionToolbarPrimitiveRoot,
-} from "./SelectionToolbarRoot";
+} from "./selectionToolbar/SelectionToolbarRoot";
 export {
   SelectionToolbarPrimitiveQuote as Quote,
   type SelectionToolbarPrimitiveQuote,
-} from "./SelectionToolbarQuote";
+} from "./selectionToolbar/SelectionToolbarQuote";