@assistant-ui/react 0.0.6 → 0.0.7

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import * as react from 'react';
-import { FC, PropsWithChildren } from 'react';
+import { FC, PropsWithChildren, ReactNode, ComponentType } from 'react';
 import { TextareaAutosizeProps } from 'react-textarea-autosize';
-import { UseChatHelpers } from 'ai/react';
+import { UseChatHelpers, UseAssistantHelpers } from 'ai/react';
 import { UseBoundStore, StoreApi } from 'zustand';
 
 declare const ThreadRoot: react.ForwardRefExoticComponent<Pick<Omit<react.DetailedHTMLProps<react.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & {
@@ -101,16 +101,26 @@ type ComposerStore = {
     useComposer: UseBoundStore<StoreApi<ComposerState>>;
 };
 
-type TextContent = {
+type ThreadMessageTextPart = {
     type: "text";
     text: string;
 };
-type ImageContent = {
+type ThreadMessageImagePart = {
     type: "image";
     image: string;
 };
-type ThreadUserMessageContent = TextContent | ImageContent;
-type ThreadAssistantMessageContent = TextContent | ImageContent;
+type ThreadMessageUIPart = {
+    type: "ui";
+    display: ReactNode;
+};
+type ThreadMessageToolCallPart = {
+    type: "tool-call";
+    name: string;
+    args: object;
+    result?: object;
+};
+type ThreadUserMessageContent = ThreadMessageTextPart | ThreadMessageImagePart | ThreadMessageUIPart;
+type ThreadAssistantMessageContent = ThreadMessageTextPart | ThreadMessageImagePart | ThreadMessageUIPart | ThreadMessageToolCallPart;
 type ThreadUserMessage = {
     id: string;
     role: "user";
@@ -122,6 +132,7 @@ type ThreadAssistantMessage = {
     content: ThreadAssistantMessageContent[];
 };
 type ThreadMessage = ThreadUserMessage | ThreadAssistantMessage;
+type CreateThreadMessage = Omit<ThreadUserMessage, "id">;
 
 type MessageProviderProps = {
     children?: React.ReactNode;
@@ -147,7 +158,28 @@ type MessageIfProps = RequireAtLeastOne<MessageIfFilters> & {
 };
 declare const MessageIf: FC<MessageIfProps>;
 
-declare const MessageContent: FC;
+type MessageContentProps = {
+    components?: {
+        Text?: ComponentType<{
+            part: ThreadMessageTextPart;
+        }>;
+        Image?: ComponentType<{
+            part: ThreadMessageImagePart;
+        }>;
+        UI?: ComponentType<{
+            part: ThreadMessageUIPart;
+        }>;
+        tools?: {
+            by_name?: Record<string, ComponentType<{
+                part: ThreadMessageToolCallPart;
+            }>>;
+            Fallback?: ComponentType<{
+                part: ThreadMessageToolCallPart;
+            }>;
+        };
+    };
+};
+declare const MessageContent: FC<MessageContentProps>;
 
 declare namespace index$2 {
   export { MessageContent as Content, MessageIf as If, MessageProvider as Provider, MessageRoot as Root };
@@ -216,11 +248,23 @@ declare namespace index {
   export { ActionBarCopy as Copy, ActionBarEdit as Edit, ActionBarReload as Reload, ActionBarRoot as Root };
 }
 
-type VercelAIChatAssistantProviderProps = {
+type VercelAIAssistantProviderProps$1 = PropsWithChildren<{
     chat: UseChatHelpers;
-    children: React.ReactNode;
+} | {
+    assistant: UseAssistantHelpers;
+}>;
+declare const VercelAIAssistantProvider: FC<VercelAIAssistantProviderProps$1>;
+
+type RSCMessage = {
+    id: string;
+    role: "user" | "assistant";
+    display: ReactNode;
 };
-declare const VercelAIChatAssistantProvider: FC<VercelAIChatAssistantProviderProps>;
+type VercelAIAssistantProviderProps = PropsWithChildren<{
+    messages: RSCMessage[];
+    append: (message: CreateThreadMessage) => Promise<void>;
+}>;
+declare const VercelRSCAssistantProvider: FC<VercelAIAssistantProviderProps>;
 
 type MessageState = {
     message: ThreadMessage;
@@ -248,4 +292,4 @@ declare const useGoToNextBranch: () => (() => void) | null;
 
 declare const useGoToPreviousBranch: () => (() => void) | null;
 
-export { index as ActionBarPrimitive, index$1 as BranchPickerPrimitive, index$3 as ComposerPrimitive, index$2 as MessagePrimitive, index$4 as ThreadPrimitive, VercelAIChatAssistantProvider as VercelAIAssistantProvider, useMessageContext as unstable_useMessageContext, useBeginMessageEdit, useCopyMessage, useGoToNextBranch, useGoToPreviousBranch, useReloadMessage };
+export { index as ActionBarPrimitive, index$1 as BranchPickerPrimitive, index$3 as ComposerPrimitive, index$2 as MessagePrimitive, index$4 as ThreadPrimitive, VercelAIAssistantProvider, VercelRSCAssistantProvider as unstable_VercelRSCAssistantProvider, useMessageContext as unstable_useMessageContext, useBeginMessageEdit, useCopyMessage, useGoToNextBranch, useGoToPreviousBranch, useReloadMessage };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as react from 'react';
-import { FC, PropsWithChildren } from 'react';
+import { FC, PropsWithChildren, ReactNode, ComponentType } from 'react';
 import { TextareaAutosizeProps } from 'react-textarea-autosize';
-import { UseChatHelpers } from 'ai/react';
+import { UseChatHelpers, UseAssistantHelpers } from 'ai/react';
 import { UseBoundStore, StoreApi } from 'zustand';
 
 declare const ThreadRoot: react.ForwardRefExoticComponent<Pick<Omit<react.DetailedHTMLProps<react.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & {
@@ -101,16 +101,26 @@ type ComposerStore = {
     useComposer: UseBoundStore<StoreApi<ComposerState>>;
 };
 
-type TextContent = {
+type ThreadMessageTextPart = {
     type: "text";
     text: string;
 };
-type ImageContent = {
+type ThreadMessageImagePart = {
     type: "image";
     image: string;
 };
-type ThreadUserMessageContent = TextContent | ImageContent;
-type ThreadAssistantMessageContent = TextContent | ImageContent;
+type ThreadMessageUIPart = {
+    type: "ui";
+    display: ReactNode;
+};
+type ThreadMessageToolCallPart = {
+    type: "tool-call";
+    name: string;
+    args: object;
+    result?: object;
+};
+type ThreadUserMessageContent = ThreadMessageTextPart | ThreadMessageImagePart | ThreadMessageUIPart;
+type ThreadAssistantMessageContent = ThreadMessageTextPart | ThreadMessageImagePart | ThreadMessageUIPart | ThreadMessageToolCallPart;
 type ThreadUserMessage = {
     id: string;
     role: "user";
@@ -122,6 +132,7 @@ type ThreadAssistantMessage = {
     content: ThreadAssistantMessageContent[];
 };
 type ThreadMessage = ThreadUserMessage | ThreadAssistantMessage;
+type CreateThreadMessage = Omit<ThreadUserMessage, "id">;
 
 type MessageProviderProps = {
     children?: React.ReactNode;
@@ -147,7 +158,28 @@ type MessageIfProps = RequireAtLeastOne<MessageIfFilters> & {
 };
 declare const MessageIf: FC<MessageIfProps>;
 
-declare const MessageContent: FC;
+type MessageContentProps = {
+    components?: {
+        Text?: ComponentType<{
+            part: ThreadMessageTextPart;
+        }>;
+        Image?: ComponentType<{
+            part: ThreadMessageImagePart;
+        }>;
+        UI?: ComponentType<{
+            part: ThreadMessageUIPart;
+        }>;
+        tools?: {
+            by_name?: Record<string, ComponentType<{
+                part: ThreadMessageToolCallPart;
+            }>>;
+            Fallback?: ComponentType<{
+                part: ThreadMessageToolCallPart;
+            }>;
+        };
+    };
+};
+declare const MessageContent: FC<MessageContentProps>;
 
 declare namespace index$2 {
   export { MessageContent as Content, MessageIf as If, MessageProvider as Provider, MessageRoot as Root };
@@ -216,11 +248,23 @@ declare namespace index {
   export { ActionBarCopy as Copy, ActionBarEdit as Edit, ActionBarReload as Reload, ActionBarRoot as Root };
 }
 
-type VercelAIChatAssistantProviderProps = {
+type VercelAIAssistantProviderProps$1 = PropsWithChildren<{
     chat: UseChatHelpers;
-    children: React.ReactNode;
+} | {
+    assistant: UseAssistantHelpers;
+}>;
+declare const VercelAIAssistantProvider: FC<VercelAIAssistantProviderProps$1>;
+
+type RSCMessage = {
+    id: string;
+    role: "user" | "assistant";
+    display: ReactNode;
 };
-declare const VercelAIChatAssistantProvider: FC<VercelAIChatAssistantProviderProps>;
+type VercelAIAssistantProviderProps = PropsWithChildren<{
+    messages: RSCMessage[];
+    append: (message: CreateThreadMessage) => Promise<void>;
+}>;
+declare const VercelRSCAssistantProvider: FC<VercelAIAssistantProviderProps>;
 
 type MessageState = {
     message: ThreadMessage;
@@ -248,4 +292,4 @@ declare const useGoToNextBranch: () => (() => void) | null;
 
 declare const useGoToPreviousBranch: () => (() => void) | null;
 
-export { index as ActionBarPrimitive, index$1 as BranchPickerPrimitive, index$3 as ComposerPrimitive, index$2 as MessagePrimitive, index$4 as ThreadPrimitive, VercelAIChatAssistantProvider as VercelAIAssistantProvider, useMessageContext as unstable_useMessageContext, useBeginMessageEdit, useCopyMessage, useGoToNextBranch, useGoToPreviousBranch, useReloadMessage };
+export { index as ActionBarPrimitive, index$1 as BranchPickerPrimitive, index$3 as ComposerPrimitive, index$2 as MessagePrimitive, index$4 as ThreadPrimitive, VercelAIAssistantProvider, VercelRSCAssistantProvider as unstable_VercelRSCAssistantProvider, useMessageContext as unstable_useMessageContext, useBeginMessageEdit, useCopyMessage, useGoToNextBranch, useGoToPreviousBranch, useReloadMessage };

package/dist/index.js

@@ -35,7 +35,8 @@ __export(src_exports, {
   ComposerPrimitive: () => composer_exports,
   MessagePrimitive: () => message_exports,
   ThreadPrimitive: () => thread_exports,
-  VercelAIAssistantProvider: () => VercelAIChatAssistantProvider,
+  VercelAIAssistantProvider: () => VercelAIAssistantProvider,
+  unstable_VercelRSCAssistantProvider: () => VercelRSCAssistantProvider,
   unstable_useMessageContext: () => useMessageContext,
   useBeginMessageEdit: () => useBeginMessageEdit,
   useCopyMessage: () => useCopyMessage,
@@ -102,10 +103,10 @@ var ThreadEmpty = ({ children }) => {
 };
 
 // src/primitives/thread/ThreadViewport.tsx
-var import_react4 = require("react");
-var import_react_primitive2 = require("@radix-ui/react-primitive");
-var import_react_compose_refs = require("@radix-ui/react-compose-refs");
 var import_primitive = require("@radix-ui/primitive");
+var import_react_compose_refs = require("@radix-ui/react-compose-refs");
+var import_react_primitive2 = require("@radix-ui/react-primitive");
+var import_react4 = require("react");
 
 // src/utils/hooks/useOnResizeContent.tsx
 var import_react3 = require("react");
@@ -138,10 +139,8 @@ var useOnResizeContent = (ref, callback) => {
     mutationObserver.observe(el, { childList: true });
     for (const child of el.children) {
       resizeObserver.observe(child);
-      console.log("observing child", child);
     }
     return () => {
-      console.log("disconnecting");
       resizeObserver.disconnect();
       mutationObserver.disconnect();
     };
@@ -165,7 +164,6 @@ var ThreadViewport = (0, import_react4.forwardRef)(({ onScroll, children, ...res
       return;
     setIsAtBottom(div.scrollHeight - div.scrollTop <= div.clientHeight + 50);
   };
-  console.log(isAtBottom);
   return /* @__PURE__ */ React.createElement(
     import_react_primitive2.Primitive.div,
     {
@@ -270,13 +268,16 @@ var useVercelAIBranches = (chat) => {
     },
     [data, chat.messages, chat.setMessages]
   );
+  const reloadMaybe = "reload" in chat ? chat.reload : void 0;
   const reloadAt = (0, import_react5.useCallback)(
     async (message) => {
+      if (!reloadMaybe)
+        throw new Error("Reload not supported by Vercel AI SDK's useAssistant");
       const newMessages = sliceMessagesUntil(chat.messages, message);
       chat.setMessages(newMessages);
-      await chat.reload();
+      await reloadMaybe();
     },
-    [chat.messages, chat.setMessages, chat.reload]
+    [chat.messages, chat.setMessages, reloadMaybe]
   );
   const editAt = (0, import_react5.useCallback)(
     async (message, newMessage) => {
@@ -495,12 +496,41 @@ var MessageIf = ({ children, ...query }) => {
 };
 
 // src/primitives/message/MessageContent.tsx
-var MessageContent = () => {
+var defaultComponents = {
+  Text: ({ part }) => /* @__PURE__ */ React.createElement(React.Fragment, null, part.text),
+  Image: () => null,
+  UI: ({ part }) => part.display,
+  tools: {
+    Fallback: () => null
+  }
+};
+var MessageContent = ({
+  components: {
+    Text = defaultComponents.Text,
+    Image = defaultComponents.Image,
+    UI = defaultComponents.UI,
+    tools: { by_name = {}, Fallback = defaultComponents.tools.Fallback } = {}
+  } = {}
+}) => {
   const { useMessage } = useMessageContext();
   const content = useMessage((s) => s.message.content);
-  if (content[0]?.type !== "text")
-    throw new Error("Unsupported message content type");
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, content[0].text);
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, content.map((part, i) => {
+    const key = i;
+    switch (part.type) {
+      case "text":
+        return /* @__PURE__ */ React.createElement(Text, { key, part });
+      case "image":
+        return /* @__PURE__ */ React.createElement(Image, { key, part });
+      case "ui":
+        return /* @__PURE__ */ React.createElement(UI, { key, part });
+      case "tool-call": {
+        const Tool = by_name[part.name] || Fallback;
+        return /* @__PURE__ */ React.createElement(Tool, { key, part });
+      }
+      default:
+        return null;
+    }
+  }));
 };
 
 // src/primitives/thread/ThreadMessages.tsx
@@ -872,25 +902,32 @@ var useBeginMessageEdit = () => {
 var ActionBarEdit = createActionButton(useBeginMessageEdit);
 
 // src/vercel/VercelAIAssistantProvider.tsx
+var import_react18 = require("react");
+
+// src/vercel/useDummyAIAssistantContext.tsx
 var import_react17 = require("react");
 var import_zustand2 = require("zustand");
-var useAIAssistantContext = () => {
+var useDummyAIAssistantContext = () => {
   const [context] = (0, import_react17.useState)(() => {
     const useThread = (0, import_zustand2.create)()(() => ({
       messages: [],
       isLoading: false,
       reload: async () => {
+        throw new Error("Not implemented");
       },
       append: async () => {
+        throw new Error("Not implemented");
       },
       stop: () => {
+        throw new Error("Not implemented");
       }
     }));
     const useComposer = (0, import_zustand2.create)()(() => ({
       isEditing: true,
       canCancel: false,
       value: "",
-      setValue: () => {
+      setValue: (value) => {
+        useComposer.setState({ value });
       },
       edit: () => {
         throw new Error("Not implemented");
@@ -909,19 +946,24 @@ var useAIAssistantContext = () => {
     const useBranchObserver = (0, import_zustand2.create)()(() => ({
       getBranchState: () => ({
         branchId: 0,
-        branchCount: 0
+        branchCount: 1
       }),
       switchToBranch: () => {
+        throw new Error("Not implemented");
       },
       editAt: async () => {
+        throw new Error("Not implemented");
       },
       reloadAt: async () => {
+        throw new Error("Not implemented");
       }
     }));
     return { useThread, useComposer, useBranchObserver };
   });
   return context;
 };
+
+// src/vercel/VercelAIAssistantProvider.tsx
 var ThreadMessageCache = /* @__PURE__ */ new WeakMap();
 var vercelToThreadMessage = (message) => {
   if (message.role !== "user" && message.role !== "assistant")
@@ -942,58 +984,118 @@ var vercelToCachedThreadMessages = (messages) => {
     return newMessage;
   });
 };
-var VercelAIChatAssistantProvider = ({ chat, children }) => {
-  const context = useAIAssistantContext();
-  const messages = (0, import_react17.useMemo)(() => {
-    return vercelToCachedThreadMessages(chat.messages);
-  }, [chat.messages]);
-  const reload = (0, import_react17.useCallback)(async () => {
-    await chat.reload();
-  }, [chat.reload]);
-  const append = (0, import_react17.useCallback)(
+var VercelAIAssistantProvider = ({
+  children,
+  ...rest
+}) => {
+  const context = useDummyAIAssistantContext();
+  const vercel = "chat" in rest ? rest.chat : rest.assistant;
+  const messages = (0, import_react18.useMemo)(() => {
+    return vercelToCachedThreadMessages(vercel.messages);
+  }, [vercel.messages]);
+  const maybeReload = "reload" in vercel ? vercel.reload : null;
+  const reload = (0, import_react18.useCallback)(async () => {
+    if (!maybeReload)
+      throw new Error("Reload not supported");
+    await maybeReload();
+  }, [maybeReload]);
+  const append = (0, import_react18.useCallback)(
     async (message) => {
       if (message.content[0]?.type !== "text") {
         throw new Error("Only text content is currently supported");
       }
-      await chat.append({
+      await vercel.append({
         role: message.role,
         content: message.content[0].text
       });
     },
-    [chat.append]
+    [vercel.append]
   );
-  const stop = (0, import_react17.useCallback)(() => {
-    const lastMessage = chat.messages.at(-1);
-    chat.stop();
+  const stop = (0, import_react18.useCallback)(() => {
+    const lastMessage = vercel.messages.at(-1);
+    vercel.stop();
     if (lastMessage?.role === "user") {
-      chat.setInput(lastMessage.content);
+      vercel.setInput(lastMessage.content);
     }
-  }, [chat.messages, chat.stop, chat.setInput]);
-  (0, import_react17.useMemo)(() => {
+  }, [vercel.messages, vercel.stop, vercel.setInput]);
+  const isLoading = "isLoading" in vercel ? vercel.isLoading : vercel.status === "in_progress";
+  (0, import_react18.useMemo)(() => {
     context.useThread.setState(
       {
         messages,
-        isLoading: chat.isLoading,
+        isLoading,
         reload,
         append,
         stop
       },
       true
     );
-  }, [context, messages, reload, append, stop, chat.isLoading]);
-  (0, import_react17.useMemo)(() => {
+  }, [context, messages, reload, append, stop, isLoading]);
+  (0, import_react18.useMemo)(() => {
     context.useComposer.setState({
-      canCancel: chat.isLoading,
-      value: chat.input,
-      setValue: chat.setInput
+      canCancel: isLoading,
+      value: vercel.input,
+      setValue: vercel.setInput
     });
-  }, [context, chat.isLoading, chat.input, chat.setInput]);
-  const branches = useVercelAIBranches(chat);
-  (0, import_react17.useMemo)(() => {
+  }, [context, isLoading, vercel.input, vercel.setInput]);
+  const branches = useVercelAIBranches(vercel);
+  (0, import_react18.useMemo)(() => {
     context.useBranchObserver.setState(branches, true);
   }, [context, branches]);
   return /* @__PURE__ */ React.createElement(AssistantContext.Provider, { value: context }, children);
 };
+
+// src/vercel/VercelRSCAssistantProvider.tsx
+var import_react19 = require("react");
+var ThreadMessageCache2 = /* @__PURE__ */ new WeakMap();
+var vercelToThreadMessage2 = (message) => {
+  if (message.role !== "user" && message.role !== "assistant")
+    throw new Error("Unsupported role");
+  return {
+    id: message.id,
+    role: message.role,
+    content: [{ type: "ui", display: message.display }]
+  };
+};
+var vercelToCachedThreadMessages2 = (messages) => {
+  return messages.map((m) => {
+    const cached = ThreadMessageCache2.get(m);
+    if (cached)
+      return cached;
+    const newMessage = vercelToThreadMessage2(m);
+    ThreadMessageCache2.set(m, newMessage);
+    return newMessage;
+  });
+};
+var VercelRSCAssistantProvider = ({
+  children,
+  messages: vercelMessages,
+  append: vercelAppend
+}) => {
+  const context = useDummyAIAssistantContext();
+  const messages = (0, import_react19.useMemo)(() => {
+    return vercelToCachedThreadMessages2(vercelMessages);
+  }, [vercelMessages]);
+  const append = (0, import_react19.useCallback)(
+    async (message) => {
+      if (message.content[0]?.type !== "text") {
+        throw new Error("Only text content is currently supported");
+      }
+      await vercelAppend({
+        role: message.role,
+        content: [{ type: "text", text: message.content[0].text }]
+      });
+    },
+    [vercelAppend]
+  );
+  (0, import_react19.useMemo)(() => {
+    context.useThread.setState({
+      messages,
+      append
+    });
+  }, [context, messages, append]);
+  return /* @__PURE__ */ React.createElement(AssistantContext.Provider, { value: context }, children);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ActionBarPrimitive,
@@ -1002,6 +1104,7 @@ var VercelAIChatAssistantProvider = ({ chat, children }) => {
   MessagePrimitive,
   ThreadPrimitive,
   VercelAIAssistantProvider,
+  unstable_VercelRSCAssistantProvider,
   unstable_useMessageContext,
   useBeginMessageEdit,
   useCopyMessage,

package/dist/index.mjs

@@ -63,12 +63,12 @@ var ThreadEmpty = ({ children }) => {
 };
 
 // src/primitives/thread/ThreadViewport.tsx
-import { forwardRef as forwardRef2, useRef as useRef2, useState } from "react";
+import { composeEventHandlers } from "@radix-ui/primitive";
+import { useComposedRefs } from "@radix-ui/react-compose-refs";
 import {
   Primitive as Primitive2
 } from "@radix-ui/react-primitive";
-import { useComposedRefs } from "@radix-ui/react-compose-refs";
-import { composeEventHandlers } from "@radix-ui/primitive";
+import { forwardRef as forwardRef2, useRef as useRef2, useState } from "react";
 
 // src/utils/hooks/useOnResizeContent.tsx
 import { useLayoutEffect, useRef } from "react";
@@ -101,10 +101,8 @@ var useOnResizeContent = (ref, callback) => {
     mutationObserver.observe(el, { childList: true });
     for (const child of el.children) {
       resizeObserver.observe(child);
-      console.log("observing child", child);
     }
     return () => {
-      console.log("disconnecting");
       resizeObserver.disconnect();
       mutationObserver.disconnect();
     };
@@ -128,7 +126,6 @@ var ThreadViewport = forwardRef2(({ onScroll, children, ...rest }, forwardedRef)
       return;
     setIsAtBottom(div.scrollHeight - div.scrollTop <= div.clientHeight + 50);
   };
-  console.log(isAtBottom);
   return /* @__PURE__ */ React.createElement(
     Primitive2.div,
     {
@@ -233,13 +230,16 @@ var useVercelAIBranches = (chat) => {
     },
     [data, chat.messages, chat.setMessages]
   );
+  const reloadMaybe = "reload" in chat ? chat.reload : void 0;
   const reloadAt = useCallback(
     async (message) => {
+      if (!reloadMaybe)
+        throw new Error("Reload not supported by Vercel AI SDK's useAssistant");
       const newMessages = sliceMessagesUntil(chat.messages, message);
       chat.setMessages(newMessages);
-      await chat.reload();
+      await reloadMaybe();
     },
-    [chat.messages, chat.setMessages, chat.reload]
+    [chat.messages, chat.setMessages, reloadMaybe]
   );
   const editAt = useCallback(
     async (message, newMessage) => {
@@ -460,12 +460,41 @@ var MessageIf = ({ children, ...query }) => {
 };
 
 // src/primitives/message/MessageContent.tsx
-var MessageContent = () => {
+var defaultComponents = {
+  Text: ({ part }) => /* @__PURE__ */ React.createElement(React.Fragment, null, part.text),
+  Image: () => null,
+  UI: ({ part }) => part.display,
+  tools: {
+    Fallback: () => null
+  }
+};
+var MessageContent = ({
+  components: {
+    Text = defaultComponents.Text,
+    Image = defaultComponents.Image,
+    UI = defaultComponents.UI,
+    tools: { by_name = {}, Fallback = defaultComponents.tools.Fallback } = {}
+  } = {}
+}) => {
   const { useMessage } = useMessageContext();
   const content = useMessage((s) => s.message.content);
-  if (content[0]?.type !== "text")
-    throw new Error("Unsupported message content type");
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, content[0].text);
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, content.map((part, i) => {
+    const key = i;
+    switch (part.type) {
+      case "text":
+        return /* @__PURE__ */ React.createElement(Text, { key, part });
+      case "image":
+        return /* @__PURE__ */ React.createElement(Image, { key, part });
+      case "ui":
+        return /* @__PURE__ */ React.createElement(UI, { key, part });
+      case "tool-call": {
+        const Tool = by_name[part.name] || Fallback;
+        return /* @__PURE__ */ React.createElement(Tool, { key, part });
+      }
+      default:
+        return null;
+    }
+  }));
 };
 
 // src/primitives/thread/ThreadMessages.tsx
@@ -855,25 +884,32 @@ var useBeginMessageEdit = () => {
 var ActionBarEdit = createActionButton(useBeginMessageEdit);
 
 // src/vercel/VercelAIAssistantProvider.tsx
-import { useCallback as useCallback2, useMemo as useMemo4, useState as useState3 } from "react";
+import { useCallback as useCallback2, useMemo as useMemo4 } from "react";
+
+// src/vercel/useDummyAIAssistantContext.tsx
+import { useState as useState3 } from "react";
 import { create as create2 } from "zustand";
-var useAIAssistantContext = () => {
+var useDummyAIAssistantContext = () => {
   const [context] = useState3(() => {
     const useThread = create2()(() => ({
       messages: [],
       isLoading: false,
       reload: async () => {
+        throw new Error("Not implemented");
       },
       append: async () => {
+        throw new Error("Not implemented");
       },
       stop: () => {
+        throw new Error("Not implemented");
       }
     }));
     const useComposer = create2()(() => ({
       isEditing: true,
       canCancel: false,
       value: "",
-      setValue: () => {
+      setValue: (value) => {
+        useComposer.setState({ value });
       },
       edit: () => {
         throw new Error("Not implemented");
@@ -892,19 +928,24 @@ var useAIAssistantContext = () => {
     const useBranchObserver = create2()(() => ({
       getBranchState: () => ({
         branchId: 0,
-        branchCount: 0
+        branchCount: 1
       }),
       switchToBranch: () => {
+        throw new Error("Not implemented");
       },
       editAt: async () => {
+        throw new Error("Not implemented");
       },
       reloadAt: async () => {
+        throw new Error("Not implemented");
       }
     }));
     return { useThread, useComposer, useBranchObserver };
   });
   return context;
 };
+
+// src/vercel/VercelAIAssistantProvider.tsx
 var ThreadMessageCache = /* @__PURE__ */ new WeakMap();
 var vercelToThreadMessage = (message) => {
   if (message.role !== "user" && message.role !== "assistant")
@@ -925,65 +966,129 @@ var vercelToCachedThreadMessages = (messages) => {
     return newMessage;
   });
 };
-var VercelAIChatAssistantProvider = ({ chat, children }) => {
-  const context = useAIAssistantContext();
+var VercelAIAssistantProvider = ({
+  children,
+  ...rest
+}) => {
+  const context = useDummyAIAssistantContext();
+  const vercel = "chat" in rest ? rest.chat : rest.assistant;
   const messages = useMemo4(() => {
-    return vercelToCachedThreadMessages(chat.messages);
-  }, [chat.messages]);
+    return vercelToCachedThreadMessages(vercel.messages);
+  }, [vercel.messages]);
+  const maybeReload = "reload" in vercel ? vercel.reload : null;
   const reload = useCallback2(async () => {
-    await chat.reload();
-  }, [chat.reload]);
+    if (!maybeReload)
+      throw new Error("Reload not supported");
+    await maybeReload();
+  }, [maybeReload]);
   const append = useCallback2(
     async (message) => {
       if (message.content[0]?.type !== "text") {
         throw new Error("Only text content is currently supported");
       }
-      await chat.append({
+      await vercel.append({
         role: message.role,
         content: message.content[0].text
       });
     },
-    [chat.append]
+    [vercel.append]
   );
   const stop = useCallback2(() => {
-    const lastMessage = chat.messages.at(-1);
-    chat.stop();
+    const lastMessage = vercel.messages.at(-1);
+    vercel.stop();
     if (lastMessage?.role === "user") {
-      chat.setInput(lastMessage.content);
+      vercel.setInput(lastMessage.content);
     }
-  }, [chat.messages, chat.stop, chat.setInput]);
+  }, [vercel.messages, vercel.stop, vercel.setInput]);
+  const isLoading = "isLoading" in vercel ? vercel.isLoading : vercel.status === "in_progress";
   useMemo4(() => {
     context.useThread.setState(
       {
         messages,
-        isLoading: chat.isLoading,
+        isLoading,
         reload,
         append,
         stop
       },
       true
     );
-  }, [context, messages, reload, append, stop, chat.isLoading]);
+  }, [context, messages, reload, append, stop, isLoading]);
   useMemo4(() => {
     context.useComposer.setState({
-      canCancel: chat.isLoading,
-      value: chat.input,
-      setValue: chat.setInput
+      canCancel: isLoading,
+      value: vercel.input,
+      setValue: vercel.setInput
     });
-  }, [context, chat.isLoading, chat.input, chat.setInput]);
-  const branches = useVercelAIBranches(chat);
+  }, [context, isLoading, vercel.input, vercel.setInput]);
+  const branches = useVercelAIBranches(vercel);
   useMemo4(() => {
     context.useBranchObserver.setState(branches, true);
   }, [context, branches]);
   return /* @__PURE__ */ React.createElement(AssistantContext.Provider, { value: context }, children);
 };
+
+// src/vercel/VercelRSCAssistantProvider.tsx
+import {
+  useCallback as useCallback3,
+  useMemo as useMemo5
+} from "react";
+var ThreadMessageCache2 = /* @__PURE__ */ new WeakMap();
+var vercelToThreadMessage2 = (message) => {
+  if (message.role !== "user" && message.role !== "assistant")
+    throw new Error("Unsupported role");
+  return {
+    id: message.id,
+    role: message.role,
+    content: [{ type: "ui", display: message.display }]
+  };
+};
+var vercelToCachedThreadMessages2 = (messages) => {
+  return messages.map((m) => {
+    const cached = ThreadMessageCache2.get(m);
+    if (cached)
+      return cached;
+    const newMessage = vercelToThreadMessage2(m);
+    ThreadMessageCache2.set(m, newMessage);
+    return newMessage;
+  });
+};
+var VercelRSCAssistantProvider = ({
+  children,
+  messages: vercelMessages,
+  append: vercelAppend
+}) => {
+  const context = useDummyAIAssistantContext();
+  const messages = useMemo5(() => {
+    return vercelToCachedThreadMessages2(vercelMessages);
+  }, [vercelMessages]);
+  const append = useCallback3(
+    async (message) => {
+      if (message.content[0]?.type !== "text") {
+        throw new Error("Only text content is currently supported");
+      }
+      await vercelAppend({
+        role: message.role,
+        content: [{ type: "text", text: message.content[0].text }]
+      });
+    },
+    [vercelAppend]
+  );
+  useMemo5(() => {
+    context.useThread.setState({
+      messages,
+      append
+    });
+  }, [context, messages, append]);
+  return /* @__PURE__ */ React.createElement(AssistantContext.Provider, { value: context }, children);
+};
 export {
   actionBar_exports as ActionBarPrimitive,
   branchPicker_exports as BranchPickerPrimitive,
   composer_exports as ComposerPrimitive,
   message_exports as MessagePrimitive,
   thread_exports as ThreadPrimitive,
-  VercelAIChatAssistantProvider as VercelAIAssistantProvider,
+  VercelAIAssistantProvider,
+  VercelRSCAssistantProvider as unstable_VercelRSCAssistantProvider,
   useMessageContext as unstable_useMessageContext,
   useBeginMessageEdit,
   useCopyMessage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "license": "MIT",
   "exports": {
     ".": {
@@ -28,7 +28,7 @@
     "@radix-ui/react-compose-refs": "^1.0.1",
     "@radix-ui/react-primitive": "^1.0.3",
     "@radix-ui/react-slot": "^1.0.2",
-    "ai": "^3.1.10",
+    "ai": "^3.1.12",
     "react-textarea-autosize": "^8.5.3",
     "zustand": "^4.5.2"
   },