@assistant-ui/react 0.14.29 → 0.15.1

package/src/mcp-apps/McpAppRenderer.tsx

@@ -162,7 +162,7 @@ function InlineRenderer({
       sendMessage: (params) => {
         const text = extractSendMessageText(params);
         if (!text) return { ok: false, reason: "unrecognised params shape" };
-        aui.thread().append({ content: [{ type: "text", text }] });
+        aui.thread.append({ content: [{ type: "text", text }] });
         return { ok: true };
       },
       callTool: (params) =>

package/src/model-context/makeAssistantVisible.test.tsx

@@ -14,7 +14,7 @@ const { registerMock, auiMock } = vi.hoisted(() => {
   return {
     registerMock: register,
     auiMock: {
-      modelContext: () => ({ register }),
+      modelContext: { register },
     },
   };
 });

package/src/model-context/makeAssistantVisible.tsx

@@ -104,7 +104,7 @@ export const makeAssistantVisible = <T extends ComponentType<any>>(
 
       const { clickable, editable } = config ?? {};
       useEffect(() => {
-        return aui.modelContext().register({
+        return aui.modelContext.register({
           getModelContext: () => {
             return {
               tools: {

package/src/primitives/actionBar/ActionBarExportMarkdown.tsx

@@ -23,7 +23,7 @@ const useActionBarExportMarkdown = ({
   });
 
   const callback = useCallback(async () => {
-    const content = aui.message().getCopyText();
+    const content = aui.message.getCopyText();
     if (!content) return;
 
     if (onExport) {

package/src/primitives/attachment/AttachmentRemove.ts

@@ -12,7 +12,7 @@ const useAttachmentRemove = () => {
   const aui = useAui();
 
   const handleRemoveAttachment = useCallback(() => {
-    aui.attachment().remove();
+    aui.attachment.remove();
   }, [aui]);
 
   return handleRemoveAttachment;

package/src/primitives/chainOfThought/ChainOfThoughtAccordionTrigger.ts

@@ -13,7 +13,7 @@ const useChainOfThoughtAccordionTrigger = () => {
   const collapsed = useAuiState((s) => s.chainOfThought.collapsed);
 
   const callback = useCallback(() => {
-    aui.chainOfThought().setCollapsed(!collapsed);
+    aui.chainOfThought.setCollapsed(!collapsed);
   }, [aui, collapsed]);
 
   return callback;

package/src/primitives/composer/ComposerAddAttachment.test.tsx

@@ -30,9 +30,9 @@ vi.mock("@assistant-ui/store", async (importOriginal) => {
   return {
     ...actual,
     useAui: () => ({
-      composer: () => ({
+      composer: {
         getState: () => ({ attachmentAccept: "*" }),
-      }),
+      },
     }),
   };
 });

package/src/primitives/composer/ComposerAddAttachment.ts

@@ -24,7 +24,7 @@ const useComposerAddAttachment = ({
     input.multiple = multiple;
     input.hidden = true;
 
-    const attachmentAccept = aui.composer().getState().attachmentAccept;
+    const attachmentAccept = aui.composer.getState().attachmentAccept;
     if (attachmentAccept !== "*") {
       input.accept = attachmentAccept;
     }

package/src/primitives/composer/ComposerAttachmentDropzone.test.tsx

@@ -15,9 +15,9 @@ vi.mock("@assistant-ui/store", async (importOriginal) => {
   return {
     ...actual,
     useAui: () => ({
-      composer: () => ({
+      composer: {
         addAttachment,
-      }),
+      },
     }),
   };
 });

package/src/primitives/composer/ComposerAttachmentDropzone.tsx

@@ -70,7 +70,7 @@ export const ComposerPrimitiveAttachmentDropzone = forwardRef<
       await Promise.all(
         files.map(async (file) => {
           try {
-            await aui.composer().addAttachment(file);
+            await aui.composer.addAttachment(file);
           } catch {
             // The composer runtime emits composer.attachmentAddError before rejecting;
             // the readonly and empty-thread stubs only throw.

package/src/primitives/composer/ComposerInput.test.tsx

@@ -38,16 +38,16 @@ let pluginRegistry: { getPlugins: () => (typeof plugin)[] } | null = null;
 
 vi.mock("@assistant-ui/store", () => {
   const aui = {
-    composer: () => ({
-      setText,
+    composer: {
+      setText: (text: string) => setText(text),
       getState: () => composerState,
       cancel: () => {},
-      send: sendSpy,
-      addAttachment,
-    }),
-    thread: () => ({
+      send: (options?: { steer?: boolean }) => sendSpy(options),
+      addAttachment: (file: File) => addAttachment(file),
+    },
+    thread: {
       getState: () => threadState,
-    }),
+    },
     on: () => () => {},
   };
   type Selector<T> = (s: {

package/src/primitives/composer/ComposerInput.tsx

@@ -208,7 +208,7 @@ export const ComposerPrimitiveInput = forwardRef<
 
       if (!cancelOnEscape) return;
 
-      const composer = aui.composer();
+      const composer = aui.composer;
       if (composer.getState().canCancel) {
         composer.cancel();
         e.preventDefault();
@@ -229,7 +229,7 @@ export const ComposerPrimitiveInput = forwardRef<
       }
 
       if (e.key === "Enter") {
-        const threadState = aui.thread().getState();
+        const threadState = aui.thread.getState();
         const hasQueue = threadState.capabilities.queue;
 
         // Steer hotkey: Cmd/Ctrl+Shift+Enter (respects submitMode="none" and canSend)
@@ -238,10 +238,10 @@ export const ComposerPrimitiveInput = forwardRef<
           (e.ctrlKey || e.metaKey) &&
           hasQueue &&
           declaredSubmitMode !== "none" &&
-          aui.composer().getState().canSend
+          aui.composer.getState().canSend
         ) {
           e.preventDefault();
-          aui.composer().send({ steer: true });
+          aui.composer.send({ steer: true });
           return;
         }
 
@@ -267,7 +267,7 @@ export const ComposerPrimitiveInput = forwardRef<
 
     const handlePaste = async (e: ClipboardEvent<HTMLTextAreaElement>) => {
       if (!addAttachmentOnPaste) return;
-      const threadCapabilities = aui.thread().getState().capabilities;
+      const threadCapabilities = aui.thread.getState().capabilities;
       const files = Array.from(e.clipboardData?.files || []);
 
       if (threadCapabilities.attachments && files.length > 0) {
@@ -275,7 +275,7 @@ export const ComposerPrimitiveInput = forwardRef<
         await Promise.all(
           files.map(async (file) => {
             try {
-              await aui.composer().addAttachment(file);
+              await aui.composer.addAttachment(file);
             } catch {
               // The composer runtime emits composer.attachmentAddError before rejecting.
             }
@@ -319,7 +319,7 @@ export const ComposerPrimitiveInput = forwardRef<
 
     useOnScrollToBottom(() => {
       if (
-        aui.composer().getState().type === "thread" &&
+        aui.composer.getState().type === "thread" &&
         unstable_focusOnScrollToBottom
       ) {
         focus();
@@ -328,7 +328,7 @@ export const ComposerPrimitiveInput = forwardRef<
 
     useEffect(() => {
       if (
-        aui.composer().getState().type !== "thread" ||
+        aui.composer.getState().type !== "thread" ||
         !unstable_focusOnRunStart
       )
         return undefined;
@@ -338,7 +338,7 @@ export const ComposerPrimitiveInput = forwardRef<
 
     useEffect(() => {
       if (
-        aui.composer().getState().type !== "thread" ||
+        aui.composer.getState().type !== "thread" ||
         !unstable_focusOnThreadSwitched
       )
         return undefined;
@@ -362,7 +362,7 @@ export const ComposerPrimitiveInput = forwardRef<
       onChange: composeEventHandlers(
         onChange,
         (e: React.ChangeEvent<HTMLTextAreaElement>) => {
-          if (!aui.composer().getState().isEditing) return;
+          if (!aui.composer.getState().isEditing) return;
           const nativeIsComposing =
             (e.nativeEvent as { isComposing?: boolean }).isComposing === true;
           // recover stuck compositionRef when the browser drops compositionend
@@ -372,7 +372,7 @@ export const ComposerPrimitiveInput = forwardRef<
           const isComposing = nativeIsComposing || compositionRef.current;
           // keep controlled value in sync mid-IME so react does not reset the textarea to a stale value
           flushTapSync(() => {
-            aui.composer().setText(e.target.value);
+            aui.composer.setText(e.target.value);
           });
           if (isComposing) return;
           const pos = e.target.selectionStart ?? e.target.value.length;
@@ -396,10 +396,10 @@ export const ComposerPrimitiveInput = forwardRef<
           .onCompositionEnd,
         (e: React.CompositionEvent<HTMLTextAreaElement>) => {
           compositionRef.current = false;
-          if (!aui.composer().getState().isEditing) return;
+          if (!aui.composer.getState().isEditing) return;
           const target = e.target as HTMLTextAreaElement;
           flushTapSync(() => {
-            aui.composer().setText(target.value);
+            aui.composer.setText(target.value);
           });
           const pos = target.selectionStart ?? target.value.length;
           if (pluginRegistry) {

package/src/primitives/composer/ComposerQuote.tsx

@@ -93,7 +93,7 @@ export const ComposerPrimitiveQuoteDismiss = forwardRef<
 >(({ onClick, ...props }, forwardedRef) => {
   const aui = useAui();
   const handleDismiss = useCallback(() => {
-    aui.composer().setQuote(undefined);
+    aui.composer.setQuote(undefined);
   }, [aui]);
 
   return (

package/src/primitives/composer/ComposerStopDictation.ts

@@ -14,7 +14,7 @@ const useComposerStopDictation = () => {
   const isDictating = useAuiState((s) => s.composer.dictation != null);
 
   const callback = useCallback(() => {
-    aui.composer().stopDictation();
+    aui.composer.stopDictation();
   }, [aui]);
 
   if (!isDictating) return null;

package/src/primitives/composer/trigger/triggerSelectionResource.ts

@@ -72,7 +72,7 @@ const useTriggerSelectionResource = ({
       return;
     }
 
-    const currentText = aui.composer().getState().text;
+    const currentText = aui.composer.getState().text;
     const before = currentText.slice(0, trigger.offset);
     const after = currentText.slice(
       trigger.offset + triggerChar.length + trigger.query.length,
@@ -80,11 +80,9 @@ const useTriggerSelectionResource = ({
 
     const insertDirective = () => {
       const directive = behavior.formatter.serialize(item);
-      aui
-        .composer()
-        .setText(
-          before + directive + (after.startsWith(" ") ? after : ` ${after}`),
-        );
+      aui.composer.setText(
+        before + directive + (after.startsWith(" ") ? after : ` ${after}`),
+      );
     };
 
     if (behavior.kind === "directive") {
@@ -92,9 +90,9 @@ const useTriggerSelectionResource = ({
       behavior.onInserted?.(item);
     } else {
       if (behavior.removeOnExecute) {
-        aui
-          .composer()
-          .setText(before + (after.startsWith(" ") ? after.slice(1) : after));
+        aui.composer.setText(
+          before + (after.startsWith(" ") ? after.slice(1) : after),
+        );
       } else {
         // Leave directive chip in the composer as an audit trail
         insertDirective();

package/src/primitives/message/MessagePartsGrouped.tsx

@@ -230,11 +230,9 @@ const ToolUIDisplay = ({
 }: {
   Fallback: ToolCallMessagePartComponent | undefined;
 } & ToolCallMessagePartProps) => {
-  const Render = useAuiState((s) => {
-    const Render = s.tools.tools[props.toolName] ?? Fallback;
-    if (Array.isArray(Render)) return Render[0] ?? Fallback;
-    return Render;
-  });
+  const Render = useAuiState(
+    (s) => s.tools.toolUIs[props.toolName]?.[0]?.render ?? Fallback,
+  );
   if (!Render) return null;
   return <Render {...props} />;
 };
@@ -292,9 +290,9 @@ const MessagePartComponent: FC<MessagePartComponentProps> = ({
 
   const type = part.type;
   if (type === "tool-call") {
-    const addResult = aui.part().addToolResult;
-    const resume = aui.part().resumeToolCall;
-    const respondToApproval = aui.part().respondToToolApproval;
+    const addResult = aui.part.addToolResult;
+    const resume = aui.part.resumeToolCall;
+    const respondToApproval = aui.part.respondToToolApproval;
     if ("Override" in tools)
       return (
         <tools.Override

package/src/primitives/message/MessageRoot.tsx

@@ -23,7 +23,7 @@ type ThreadViewportStore = NonNullable<
 
 const useIsHoveringRef = () => {
   const aui = useAui();
-  const message = useAuiState(() => aui.message());
+  const message = useAuiState(() => aui.message);
 
   const callbackRef = useCallback(
     (el: HTMLElement) => {

package/src/primitives/queueItem/QueueItemRemove.ts

@@ -12,7 +12,7 @@ const useQueueItemRemove = () => {
   const aui = useAui();
 
   const callback = useCallback(() => {
-    aui.queueItem().remove();
+    aui.queueItem.remove();
   }, [aui]);
 
   return callback;

package/src/primitives/queueItem/QueueItemSteer.ts

@@ -12,7 +12,7 @@ const useQueueItemSteer = () => {
   const aui = useAui();
 
   const callback = useCallback(() => {
-    aui.queueItem().steer();
+    aui.queueItem.steer();
   }, [aui]);
 
   return callback;

package/src/primitives/selectionToolbar/SelectionToolbarQuote.tsx

@@ -40,7 +40,7 @@ export const SelectionToolbarPrimitiveQuote = forwardRef<
   const handleClick = useCallback(() => {
     if (!info) return;
 
-    aui.thread().composer().setQuote({
+    aui.thread.composer().setQuote({
       text: info.text,
       messageId: info.messageId,
     });

package/src/primitives/suggestion/SuggestionTrigger.ts

@@ -34,24 +34,24 @@ const useSuggestionTrigger = ({
   const resolvedSend = send ?? false;
 
   const callback = useCallback(() => {
-    const isRunning = aui.thread().getState().isRunning;
+    const isRunning = aui.thread.getState().isRunning;
 
     if (resolvedSend && !isRunning) {
-      aui.thread().append({
+      aui.thread.append({
         content: [{ type: "text", text: prompt }],
-        runConfig: aui.composer().getState().runConfig,
+        runConfig: aui.composer.getState().runConfig,
       });
       if (clearComposer) {
-        aui.composer().setText("");
+        aui.composer.setText("");
       }
     } else {
       if (clearComposer) {
-        aui.composer().setText(prompt);
+        aui.composer.setText(prompt);
       } else {
-        const currentText = aui.composer().getState().text;
-        aui
-          .composer()
-          .setText(currentText.trim() ? `${currentText} ${prompt}` : prompt);
+        const currentText = aui.composer.getState().text;
+        aui.composer.setText(
+          currentText.trim() ? `${currentText} ${prompt}` : prompt,
+        );
       }
     }
   }, [aui, resolvedSend, clearComposer, prompt]);

package/src/tests/DataRenderers.test.tsx

@@ -66,7 +66,7 @@ const GlobalFallbackDataUI: FC<{ render: DataMessagePartComponent }> = ({
   render,
 }) => {
   const aui = useAui();
-  useEffect(() => aui.dataRenderers().setFallbackDataUI(render), [aui, render]);
+  useEffect(() => aui.dataRenderers.setFallbackDataUI(render), [aui, render]);
   return null;
 };
 

package/src/tests/RemoteThreadListRuntime.deferredProvider.test.tsx

@@ -6,9 +6,9 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import { useRemoteThreadListRuntime } from "@assistant-ui/core/react";
 import { makeAdapter } from "./remote-thread-list-test-helpers";
 import type { AssistantRuntime } from "@assistant-ui/core";
+import { useAui } from "@assistant-ui/store";
 import { AssistantRuntimeProvider } from "../context";
 import { useLocalRuntime } from "../legacy-runtime/runtime-cores/local/useLocalRuntime";
-import { useAssistantRuntime } from "../legacy-runtime/hooks/AssistantContext";
 import type { ChatModelAdapter, RemoteThreadListAdapter } from "../index";
 
 const noOpAdapter: ChatModelAdapter = {
@@ -34,8 +34,8 @@ const RuntimeProvider: FC<
 const RuntimeCapture: FC<{
   runtimeRef: { current: AssistantRuntime | null };
 }> = ({ runtimeRef }) => {
-  const runtime = useAssistantRuntime();
-  runtimeRef.current = runtime;
+  const aui = useAui();
+  runtimeRef.current = aui.threads.__internal_getAssistantRuntime?.() ?? null;
   return null;
 };
 

package/src/tests/external-thread-attachments.test.tsx

@@ -74,14 +74,12 @@ describe("ExternalThread attachments", () => {
     }
 
     await waitFor(() => {
-      expect(aui().thread().composer().getState().attachments[0]).toMatchObject(
-        {
-          type: "document",
-          name: "notes.txt",
-          contentType: "text/plain",
-          content: [{ type: "text", text: "hello" }],
-        },
-      );
+      expect(aui().thread.composer().getState().attachments[0]).toMatchObject({
+        type: "document",
+        name: "notes.txt",
+        contentType: "text/plain",
+        content: [{ type: "text", text: "hello" }],
+      });
     });
   });
 
@@ -94,9 +92,9 @@ describe("ExternalThread attachments", () => {
       content: [{ type: "text", text: "implementation detail" }],
     } as File;
 
-    await act(() => aui().thread().composer().addAttachment(foreignFile));
+    await act(() => aui().thread.composer().addAttachment(foreignFile));
 
-    expect(aui().thread().composer().getState().attachments[0]).toMatchObject({
+    expect(aui().thread.composer().getState().attachments[0]).toMatchObject({
       type: "file",
       name: "photo.png",
       contentType: "image/png",
@@ -126,7 +124,7 @@ describe("ExternalThread attachments", () => {
       "File type application/zip is not accepted. Accepted types: image/*",
     );
     expect(add).not.toHaveBeenCalled();
-    expect(aui().thread().composer().getState().attachments).toHaveLength(0);
+    expect(aui().thread.composer().getState().attachments).toHaveLength(0);
   });
 
   it("rejects prepared attachments that do not match the adapter accept string", async () => {
@@ -151,7 +149,7 @@ describe("ExternalThread attachments", () => {
     ).rejects.toThrow(
       "File type text/plain is not accepted. Accepted types: .pdf",
     );
-    expect(aui().thread().composer().getState().attachments).toHaveLength(0);
+    expect(aui().thread.composer().getState().attachments).toHaveLength(0);
   });
 
   it("restores the draft when an attachment upload fails on send", async () => {
@@ -192,21 +190,21 @@ describe("ExternalThread attachments", () => {
         .addAttachment(new File(["data"], "notes.txt", { type: "text/plain" })),
     );
     await act(async () => {
-      aui().thread().composer().setText("hello");
+      aui().thread.composer().setText("hello");
     });
     await act(async () => {
-      aui().thread().composer().send();
+      aui().thread.composer().send();
     });
 
     // The draft is cleared optimistically while the upload runs.
-    expect(aui().thread().composer().getState().text).toBe("");
+    expect(aui().thread.composer().getState().text).toBe("");
 
     await act(async () => {
       rejectSend(new Error("upload failed"));
     });
 
     await waitFor(() => {
-      const state = aui().thread().composer().getState();
+      const state = aui().thread.composer().getState();
       expect(state.text).toBe("hello");
       expect(state.attachments).toHaveLength(1);
     });
@@ -255,13 +253,13 @@ describe("ExternalThread attachments", () => {
           ),
       );
 
-      await act(() => invoke(aui().thread().composer()));
+      await act(() => invoke(aui().thread.composer()));
 
       expect(remove).toHaveBeenCalledTimes(1);
       expect(remove).toHaveBeenCalledWith(
         expect.objectContaining({ id: "att-1" }),
       );
-      expect(aui().thread().composer().getState().attachments).toHaveLength(0);
+      expect(aui().thread.composer().getState().attachments).toHaveLength(0);
     },
   );
 
@@ -297,7 +295,7 @@ describe("ExternalThread attachments", () => {
       },
     });
 
-    const composer = () => aui().thread().message({ id: "u1" }).composer();
+    const composer = () => aui().thread.message({ id: "u1" }).composer();
     await act(async () => {
       composer().beginEdit();
     });
@@ -349,18 +347,18 @@ describe("ExternalThread attachments", () => {
         .addAttachment(new File(["data"], "notes.txt", { type: "text/plain" })),
     );
     await act(async () => {
-      aui().thread().composer().setText("hello");
-      aui().thread().composer().send();
+      aui().thread.composer().setText("hello");
+      aui().thread.composer().send();
     });
     await act(async () => {
-      aui().thread().composer().setText("meanwhile");
+      aui().thread.composer().setText("meanwhile");
     });
 
     await act(async () => {
       rejectSend(new Error("upload failed"));
     });
 
-    const state = aui().thread().composer().getState();
+    const state = aui().thread.composer().getState();
     expect(state.text).toBe("hello\nmeanwhile");
     expect(state.attachments).toHaveLength(1);
     expect(state.attachments[0]).toMatchObject({ id: "att-1" });

package/src/tests/external-thread-branches.test.tsx

@@ -66,18 +66,18 @@ const adapterFor = (
 describe("ExternalThread branches", () => {
   it("defaults to single-branch state without an adapter", () => {
     const { aui } = renderThread(baseProps());
-    const state = aui().thread().getState();
+    const state = aui().thread.getState();
     expect(state.messages[1]!.branchNumber).toBe(1);
     expect(state.messages[1]!.branchCount).toBe(1);
     expect(state.capabilities.switchToBranch).toBe(false);
     expect(() =>
-      aui().thread().message({ index: 1 }).switchToBranch({ position: "next" }),
+      aui().thread.message({ index: 1 }).switchToBranch({ position: "next" }),
     ).not.toThrow();
   });
 
   it("derives branchNumber and branchCount from the adapter", () => {
     const { aui } = renderThread(baseProps(adapterFor(["a1", "a2", "a3"])));
-    const state = aui().thread().getState();
+    const state = aui().thread.getState();
     expect(state.messages[1]!.branchNumber).toBe(2);
     expect(state.messages[1]!.branchCount).toBe(3);
     expect(state.capabilities.switchToBranch).toBe(true);
@@ -88,7 +88,7 @@ describe("ExternalThread branches", () => {
     const { aui } = renderThread(
       baseProps(adapterFor(["a1", "a2", "a3"], switchToBranch)),
     );
-    const msg = () => aui().thread().message({ index: 1 });
+    const msg = () => aui().thread.message({ index: 1 });
 
     msg().switchToBranch({ position: "previous" });
     expect(switchToBranch).toHaveBeenLastCalledWith("a1");
@@ -101,7 +101,7 @@ describe("ExternalThread branches", () => {
       isRunning: false,
       branches: adapterFor(["a1", "a2"], switchToBranch),
     });
-    edge.aui().thread().message({ index: 1 }).switchToBranch({
+    edge.aui().thread.message({ index: 1 }).switchToBranch({
       position: "previous",
     });
     expect(switchToBranch).not.toHaveBeenCalled();
@@ -112,7 +112,7 @@ describe("ExternalThread branches", () => {
     const { aui } = renderThread(
       baseProps(adapterFor(["a1", "a2"], switchToBranch)),
     );
-    const msg = () => aui().thread().message({ index: 1 });
+    const msg = () => aui().thread.message({ index: 1 });
 
     msg().switchToBranch({ branchId: "not-in-the-list" });
     expect(switchToBranch).toHaveBeenLastCalledWith("not-in-the-list");
@@ -130,11 +130,11 @@ describe("ExternalThread branches", () => {
         switchToBranch,
       }),
     );
-    const state = aui().thread().getState();
+    const state = aui().thread.getState();
     expect(state.messages[1]!.branchNumber).toBe(1);
     expect(state.messages[1]!.branchCount).toBe(1);
 
-    aui().thread().message({ index: 1 }).switchToBranch({ position: "next" });
+    aui().thread.message({ index: 1 }).switchToBranch({ position: "next" });
     expect(switchToBranch).not.toHaveBeenCalled();
   });
 
@@ -145,14 +145,14 @@ describe("ExternalThread branches", () => {
       isRunning: false,
       branches: adapterFor(["a1", "a2", "a3"]),
     });
-    const before = aui().thread().getState().messages[1];
+    const before = aui().thread.getState().messages[1];
 
     rerender({
       messages,
       isRunning: false,
       branches: adapterFor(["a1", "a2", "a3"]),
     });
-    const after = aui().thread().getState().messages[1];
+    const after = aui().thread.getState().messages[1];
 
     expect(after!.branchNumber).toBe(2);
     expect(before!.parts[0]).toBe(after!.parts[0]);