@assistant-ui/react 0.12.11 → 0.12.12

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AACA,YAAY,EACV,UAAU,EACV,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,aAAa,EACb,eAAe,EACf,oBAAoB,EACpB,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,yBAAyB,EACzB,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,yBAAyB,EACzB,aAAa,EACb,qBAAqB,EACrB,0BAA0B,EAC1B,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,EACjB,aAAa,EACb,WAAW,EACX,SAAS,GACV,MAAM,oBAAoB,CAAC;AAG5B,YAAY,EACV,yBAAyB,EACzB,qBAAqB,EACrB,wBAAwB,EACxB,oBAAoB,EACpB,6BAA6B,EAC7B,yBAAyB,EACzB,0BAA0B,EAC1B,sBAAsB,EACtB,yBAAyB,EACzB,qBAAqB,EACrB,wBAAwB,EACxB,oBAAoB,EACpB,kCAAkC,EAClC,8BAA8B,EAC9B,wBAAwB,EACxB,oBAAoB,EACpB,4BAA4B,EAC5B,wBAAwB,EACxB,mBAAmB,EACnB,uBAAuB,GACxB,uCAAoC;AAGrC,YAAY,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AACA,YAAY,EACV,UAAU,EACV,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,aAAa,EACb,eAAe,EACf,oBAAoB,EACpB,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,yBAAyB,EACzB,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,yBAAyB,EACzB,aAAa,EACb,qBAAqB,EACrB,0BAA0B,EAC1B,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,EACjB,aAAa,EACb,WAAW,EACX,SAAS,EACT,gBAAgB,GACjB,MAAM,oBAAoB,CAAC;AAG5B,YAAY,EACV,yBAAyB,EACzB,qBAAqB,EACrB,wBAAwB,EACxB,oBAAoB,EACpB,6BAA6B,EAC7B,yBAAyB,EACzB,0BAA0B,EAC1B,sBAAsB,EACtB,yBAAyB,EACzB,qBAAqB,EACrB,wBAAwB,EACxB,oBAAoB,EACpB,kCAAkC,EAClC,8BAA8B,EAC9B,wBAAwB,EACxB,oBAAoB,EACpB,4BAA4B,EAC5B,wBAAwB,EACxB,mBAAmB,EACnB,uBAAuB,GACxB,MAAM,0BAA0B,CAAC;AAGlC,YAAY,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC"}

package/dist/types/scopes/index.d.ts

@@ -1,4 +1,3 @@
 export type { ThreadsState, ThreadsMethods, ThreadsClientSchema, ThreadListItemState, ThreadListItemMethods, ThreadListItemMeta, ThreadListItemEvents, ThreadListItemClientSchema, ThreadState, ThreadMethods, ThreadMeta, ThreadEvents, ThreadClientSchema, MessageState, MessageMethods, MessageMeta, MessageClientSchema, PartState, PartMethods, PartMeta, PartClientSchema, ComposerState, ComposerMethods, ComposerMeta, ComposerEvents, ComposerClientSchema, AttachmentState, AttachmentMethods, AttachmentMeta, AttachmentClientSchema, SuggestionsState, SuggestionsMethods, SuggestionsClientSchema, Suggestion, SuggestionState, SuggestionMethods, SuggestionMeta, SuggestionClientSchema, ModelContextState, ModelContextMethods, ModelContextClientSchema, ChainOfThoughtState, ChainOfThoughtMethods, ChainOfThoughtMeta, ChainOfThoughtClientSchema, ChainOfThoughtPart, } from "@assistant-ui/core/store";
-export type { ToolsState, ToolsMethods, ToolsClientSchema } from "./tools.js";
-export type { DataRenderersState, DataRenderersMethods, DataRenderersClientSchema, } from "./dataRenderers.js";
+export type { ToolsState, ToolsMethods, ToolsClientSchema, DataRenderersState, DataRenderersMethods, DataRenderersClientSchema, } from "@assistant-ui/core/react";
 //# sourceMappingURL=index.d.ts.map

package/dist/types/scopes/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/scopes/index.ts"],"names":[],"mappings":"AACA,YAAY,EACV,YAAY,EACZ,cAAc,EACd,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,0BAA0B,EAC1B,WAAW,EACX,aAAa,EACb,UAAU,EACV,YAAY,EACZ,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,WAAW,EACX,mBAAmB,EACnB,SAAS,EACT,WAAW,EACX,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,eAAe,EACf,YAAY,EACZ,cAAc,EACd,oBAAoB,EACpB,eAAe,EACf,iBAAiB,EACjB,cAAc,EACd,sBAAsB,EACtB,gBAAgB,EAChB,kBAAkB,EAClB,uBAAuB,EACvB,UAAU,EACV,eAAe,EACf,iBAAiB,EACjB,cAAc,EACd,sBAAsB,EACtB,iBAAiB,EACjB,mBAAmB,EACnB,wBAAwB,EACxB,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,EAClB,0BAA0B,EAC1B,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAGlC,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,iBAAiB,EAAE,mBAAgB;AAC3E,YAAY,EACV,kBAAkB,EAClB,oBAAoB,EACpB,yBAAyB,GAC1B,2BAAwB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/scopes/index.ts"],"names":[],"mappings":"AACA,YAAY,EACV,YAAY,EACZ,cAAc,EACd,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,0BAA0B,EAC1B,WAAW,EACX,aAAa,EACb,UAAU,EACV,YAAY,EACZ,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,WAAW,EACX,mBAAmB,EACnB,SAAS,EACT,WAAW,EACX,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,eAAe,EACf,YAAY,EACZ,cAAc,EACd,oBAAoB,EACpB,eAAe,EACf,iBAAiB,EACjB,cAAc,EACd,sBAAsB,EACtB,gBAAgB,EAChB,kBAAkB,EAClB,uBAAuB,EACvB,UAAU,EACV,eAAe,EACf,iBAAiB,EACjB,cAAc,EACd,sBAAsB,EACtB,iBAAiB,EACjB,mBAAmB,EACnB,wBAAwB,EACxB,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,EAClB,0BAA0B,EAC1B,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAGlC,YAAY,EACV,UAAU,EACV,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,oBAAoB,EACpB,yBAAyB,GAC1B,MAAM,0BAA0B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react",
-  "version": "0.12.11",
+  "version": "0.12.12",
   "description": "TypeScript/React library for AI Chat",
   "keywords": [
     "radix-ui",
@@ -49,20 +49,18 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "assistant-cloud": "^0.1.18",
-    "@assistant-ui/core": "^0.1.0",
-    "@assistant-ui/tap": "^0.5.0",
-    "@assistant-ui/store": "^0.2.0",
+    "assistant-cloud": "^0.1.19",
+    "@assistant-ui/core": "^0.1.1",
+    "@assistant-ui/tap": "^0.5.1",
+    "@assistant-ui/store": "^0.2.1",
     "@radix-ui/primitive": "^1.1.3",
     "@radix-ui/react-compose-refs": "^1.1.2",
     "@radix-ui/react-context": "^1.1.3",
-    "@radix-ui/react-dropdown-menu": "^2.1.16",
-    "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-primitive": "^2.1.4",
-    "@radix-ui/react-slot": "^1.2.4",
     "@radix-ui/react-use-callback-ref": "^1.1.1",
     "@radix-ui/react-use-escape-keydown": "^1.1.1",
-    "assistant-stream": "^0.3.3",
+    "radix-ui": "^1.4.3",
+    "assistant-stream": "^0.3.4",
     "nanoid": "^5.1.6",
     "react-textarea-autosize": "^8.5.9",
     "zod": "^4.3.6",
@@ -85,10 +83,10 @@
   "devDependencies": {
     "@testing-library/react": "^16.3.2",
     "@types/json-schema": "^7.0.15",
-    "@types/node": "^25.2.1",
-    "@types/react": "^19.2.13",
+    "@types/node": "^25.3.0",
+    "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
-    "jsdom": "^28.0.0",
+    "jsdom": "^28.1.0",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
     "vitest": "^4.0.18",

package/src/client/ExternalThread.ts

@@ -15,13 +15,13 @@ import {
 import { withKey } from "@assistant-ui/tap";
 import type {
   Attachment,
+  CreateAttachment,
   ThreadAssistantMessagePart,
   ThreadUserMessagePart,
   ThreadMessage,
 } from "@assistant-ui/core";
 import { ModelContext, Suggestions } from "@assistant-ui/core/store";
-import { Tools } from "./Tools";
-import { DataRenderers } from "./DataRenderers";
+import { Tools, DataRenderers } from "@assistant-ui/core/react";
 
 export type ExternalThreadMessage = ThreadMessage & {
   id: string;
@@ -308,17 +308,29 @@ const ComposerClientResource = resource(
       setText,
       setRole,
       setRunConfig,
-      addAttachment: async (file: File) => {
-        const newAttachment: Attachment = {
-          id: Math.random().toString(36).substring(7),
-          type: "file",
-          name: file.name,
-          contentType: file.type,
-          file,
-          status: { type: "complete" },
-          content: [],
-        };
-        setAttachments([...attachments, newAttachment]);
+      addAttachment: async (fileOrAttachment: File | CreateAttachment) => {
+        if (fileOrAttachment instanceof File) {
+          const newAttachment: Attachment = {
+            id: Math.random().toString(36).substring(7),
+            type: "file",
+            name: fileOrAttachment.name,
+            contentType: fileOrAttachment.type,
+            file: fileOrAttachment,
+            status: { type: "complete" },
+            content: [],
+          };
+          setAttachments([...attachments, newAttachment]);
+        } else {
+          const newAttachment: Attachment = {
+            id: fileOrAttachment.id ?? Math.random().toString(36).substring(7),
+            type: fileOrAttachment.type ?? "document",
+            name: fileOrAttachment.name,
+            contentType: fileOrAttachment.contentType,
+            content: fileOrAttachment.content,
+            status: { type: "complete" },
+          };
+          setAttachments([...attachments, newAttachment]);
+        }
       },
       clearAttachments: async () => {
         setAttachments([]);

package/src/client/InMemoryThreadList.ts

@@ -10,8 +10,7 @@ import { withKey } from "@assistant-ui/tap";
 import type { ResourceElement } from "@assistant-ui/tap";
 
 import { ModelContext, Suggestions } from "@assistant-ui/core/store";
-import { Tools } from "./Tools";
-import { DataRenderers } from "./DataRenderers";
+import { Tools, DataRenderers } from "@assistant-ui/core/react";
 
 export type InMemoryThreadListProps = {
   thread: (threadId: string) => ResourceElement<ClientOutput<"thread">>;

package/src/client/index.ts

@@ -1,11 +1,12 @@
+// Re-export shared clients from core/react
+export { Tools, DataRenderers } from "@assistant-ui/core/react";
+
 // Re-export moved clients from core (matching previous public API)
 export { ModelContext as ModelContextClient } from "@assistant-ui/core/store";
 export { Suggestions, type SuggestionConfig } from "@assistant-ui/core/store";
 export { ChainOfThoughtClient } from "@assistant-ui/core/store";
 
 // Local clients (React-specific)
-export { Tools } from "./Tools";
-export { DataRenderers } from "./DataRenderers";
 export {
   ExternalThread,
   type ExternalThreadProps,

package/src/context/providers/AttachmentByIndexProvider.tsx

@@ -1,36 +1,6 @@
 "use client";
 
-import { type FC, type PropsWithChildren } from "react";
-import { useAui, AuiProvider, Derived } from "@assistant-ui/store";
-
-export const MessageAttachmentByIndexProvider: FC<
-  PropsWithChildren<{
-    index: number;
-  }>
-> = ({ index, children }) => {
-  const aui = useAui({
-    attachment: Derived({
-      source: "message",
-      query: { type: "index", index },
-      get: (aui) => aui.message().attachment({ index }),
-    }),
-  });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
-};
-
-export const ComposerAttachmentByIndexProvider: FC<
-  PropsWithChildren<{
-    index: number;
-  }>
-> = ({ index, children }) => {
-  const aui = useAui({
-    attachment: Derived({
-      source: "composer",
-      query: { type: "index", index },
-      get: (aui) => aui.composer().attachment({ index }),
-    }),
-  });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
-};
+export {
+  MessageAttachmentByIndexProvider,
+  ComposerAttachmentByIndexProvider,
+} from "@assistant-ui/core/react";

package/src/context/providers/ChainOfThoughtByIndicesProvider.tsx

@@ -1,36 +1,3 @@
 "use client";
 
-import { type FC, type PropsWithChildren } from "react";
-import { useAui, useAuiState, AuiProvider } from "@assistant-ui/store";
-import { ChainOfThoughtClient } from "@assistant-ui/core/store";
-import type { ChainOfThoughtPart } from "@assistant-ui/core/store";
-
-export const ChainOfThoughtByIndicesProvider: FC<
-  PropsWithChildren<{
-    startIndex: number;
-    endIndex: number;
-  }>
-> = ({ startIndex, endIndex, children }) => {
-  const parts = useAuiState((s) => s.message.parts).slice(
-    startIndex,
-    endIndex + 1,
-  ) as ChainOfThoughtPart[];
-
-  const parentAui = useAui();
-
-  const aui = useAui({
-    chainOfThought: ChainOfThoughtClient({
-      parts,
-      getMessagePart: ({ index }) => {
-        if (index < 0 || index >= parts.length) {
-          throw new Error(
-            `ChainOfThought part index ${index} is out of bounds (0..${parts.length - 1})`,
-          );
-        }
-        return parentAui.message().part({ index: startIndex + index });
-      },
-    }),
-  });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
-};
+export { ChainOfThoughtByIndicesProvider } from "@assistant-ui/core/react";

package/src/context/providers/ChainOfThoughtPartByIndexProvider.tsx

@@ -1,20 +1,3 @@
 "use client";
 
-import { type FC, type PropsWithChildren } from "react";
-import { useAui, AuiProvider, Derived } from "@assistant-ui/store";
-
-export const ChainOfThoughtPartByIndexProvider: FC<
-  PropsWithChildren<{
-    index: number;
-  }>
-> = ({ index, children }) => {
-  const aui = useAui({
-    part: Derived({
-      source: "chainOfThought",
-      query: { type: "index", index },
-      get: (aui) => aui.chainOfThought().part({ index }),
-    }),
-  });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
-};
+export { ChainOfThoughtPartByIndexProvider } from "@assistant-ui/core/react";

package/src/context/providers/MessageByIndexProvider.tsx

@@ -1,25 +1,3 @@
 "use client";
 
-import { type FC, type PropsWithChildren } from "react";
-import { useAui, AuiProvider, Derived } from "@assistant-ui/store";
-
-export const MessageByIndexProvider: FC<
-  PropsWithChildren<{
-    index: number;
-  }>
-> = ({ index, children }) => {
-  const aui = useAui({
-    message: Derived({
-      source: "thread",
-      query: { type: "index", index },
-      get: (aui) => aui.thread().message({ index }),
-    }),
-    composer: Derived({
-      source: "message",
-      query: {},
-      get: (aui) => aui.thread().message({ index }).composer(),
-    }),
-  });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
-};
+export { MessageByIndexProvider } from "@assistant-ui/core/react";

package/src/context/providers/PartByIndexProvider.tsx

@@ -1,20 +1,3 @@
 "use client";
 
-import { type FC, type PropsWithChildren } from "react";
-import { useAui, AuiProvider, Derived } from "@assistant-ui/store";
-
-export const PartByIndexProvider: FC<
-  PropsWithChildren<{
-    index: number;
-  }>
-> = ({ index, children }) => {
-  const aui = useAui({
-    part: Derived({
-      source: "message",
-      query: { type: "index", index },
-      get: (aui) => aui.message().part({ index }),
-    }),
-  });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
-};
+export { PartByIndexProvider } from "@assistant-ui/core/react";

package/src/context/providers/SuggestionByIndexProvider.tsx

@@ -1,23 +1,6 @@
 "use client";
 
-import { type FC, type PropsWithChildren } from "react";
-import { AuiProvider, Derived, useAui } from "@assistant-ui/store";
-
-export type SuggestionByIndexProviderProps = PropsWithChildren<{
-  index: number;
-}>;
-
-export const SuggestionByIndexProvider: FC<SuggestionByIndexProviderProps> = ({
-  index,
-  children,
-}) => {
-  const aui = useAui({
-    suggestion: Derived({
-      source: "suggestions",
-      query: { index },
-      get: (aui) => aui.suggestions().suggestion({ index }),
-    }),
-  });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
-};
+export {
+  SuggestionByIndexProvider,
+  type SuggestionByIndexProviderProps,
+} from "@assistant-ui/core/react";

package/src/context/providers/TextMessagePartProvider.tsx

@@ -1,48 +1,3 @@
 "use client";
 
-import { type FC, type PropsWithChildren } from "react";
-import { useAui, AuiProvider, type ClientOutput } from "@assistant-ui/store";
-import { PartState } from "../../types/scopes";
-import { resource, tapMemo } from "@assistant-ui/tap";
-
-const TextMessagePartClient = resource(
-  ({
-    text,
-    isRunning,
-  }: {
-    text: string;
-    isRunning: boolean;
-  }): ClientOutput<"part"> => {
-    const state = tapMemo<PartState>(
-      () => ({
-        type: "text",
-        text,
-        status: isRunning ? { type: "running" } : { type: "complete" },
-      }),
-      [text, isRunning],
-    );
-
-    return {
-      getState: () => state,
-      addToolResult: () => {
-        throw new Error("Not supported");
-      },
-      resumeToolCall: () => {
-        throw new Error("Not supported");
-      },
-    };
-  },
-);
-
-export const TextMessagePartProvider: FC<
-  PropsWithChildren<{
-    text: string;
-    isRunning?: boolean;
-  }>
-> = ({ text, isRunning = false, children }) => {
-  const aui = useAui({
-    part: TextMessagePartClient({ text, isRunning }),
-  });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
-};
+export { TextMessagePartProvider } from "@assistant-ui/core/react";

package/src/context/providers/ThreadListItemProvider.tsx

@@ -1,35 +1,6 @@
 "use client";
 
-import { type FC, type PropsWithChildren } from "react";
-import { useAui, AuiProvider, Derived } from "@assistant-ui/store";
-import type { ThreadListItemRuntime } from "../../legacy-runtime/runtime/ThreadListItemRuntime";
-import { ThreadListItemClient } from "@assistant-ui/core/store/internal";
-
-export const ThreadListItemByIndexProvider: FC<
-  PropsWithChildren<{
-    index: number;
-    archived: boolean;
-  }>
-> = ({ index, archived, children }) => {
-  const aui = useAui({
-    threadListItem: Derived({
-      source: "threads",
-      query: { type: "index", index, archived },
-      get: (aui) => aui.threads().item({ index, archived }),
-    }),
-  });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
-};
-
-export const ThreadListItemRuntimeProvider: FC<
-  PropsWithChildren<{
-    runtime: ThreadListItemRuntime;
-  }>
-> = ({ runtime, children }) => {
-  const aui = useAui({
-    threadListItem: ThreadListItemClient({ runtime }),
-  });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
-};
+export {
+  ThreadListItemByIndexProvider,
+  ThreadListItemRuntimeProvider,
+} from "@assistant-ui/core/react";

package/src/context/providers/index.ts

@@ -12,3 +12,4 @@ export {
 } from "./AttachmentByIndexProvider";
 export { TextMessagePartProvider } from "./TextMessagePartProvider";
 export { MessageProvider } from "./MessageProvider";
+export { ChainOfThoughtByIndicesProvider } from "./ChainOfThoughtByIndicesProvider";

package/src/index.ts

@@ -1,4 +1,4 @@
-import "./types/store-augmentation";
+import "@assistant-ui/core/react"; // store-augmentation side-effect (tools, dataRenderers scopes)
 
 // Re-export from @assistant-ui/store
 export {

package/src/legacy-runtime/AssistantRuntimeProvider.tsx

@@ -1,10 +1,9 @@
 "use client";
 
-import { ComponentType, FC, memo, PropsWithChildren, useEffect } from "react";
-import { useAui, AuiProvider, AssistantClient } from "@assistant-ui/store";
+import { FC, memo, PropsWithChildren, useEffect } from "react";
+import { AssistantClient, useAui } from "@assistant-ui/store";
 import { AssistantRuntime } from "./runtime/AssistantRuntime";
-import { AssistantRuntimeCore } from "./runtime-cores/core/AssistantRuntimeCore";
-import { RuntimeAdapter } from "./RuntimeAdapter";
+import { AssistantProviderBase } from "@assistant-ui/core/react";
 import { ThreadPrimitiveViewportProvider } from "../context/providers/ThreadViewportProvider";
 import { DevToolsProviderApi } from "../devtools";
 
@@ -22,35 +21,28 @@ export namespace AssistantRuntimeProvider {
   }>;
 }
 
-const getRenderComponent = (runtime: AssistantRuntime) => {
-  return (runtime as { _core?: AssistantRuntimeCore })._core?.RenderComponent as
-    | ComponentType
-    | undefined;
-};
-
-export const AssistantRuntimeProviderImpl: FC<
-  AssistantRuntimeProvider.Props
-> = ({ children, aui: parent = null, runtime }) => {
-  const aui = useAui({ threads: RuntimeAdapter(runtime) }, { parent: parent });
-
+const DevToolsRegistration: FC = () => {
+  const aui = useAui();
   useEffect(() => {
     if (typeof process === "undefined" || process.env.NODE_ENV === "production")
       return;
     return DevToolsProviderApi.register(aui);
   }, [aui]);
+  return null;
+};
 
-  const RenderComponent = getRenderComponent(runtime);
-
+export const AssistantRuntimeProviderImpl: FC<
+  AssistantRuntimeProvider.Props
+> = ({ children, aui, runtime }) => {
   return (
-    <AuiProvider value={aui}>
-      {RenderComponent && <RenderComponent />}
-
+    <AssistantProviderBase runtime={runtime} aui={aui ?? null}>
+      <DevToolsRegistration />
       {/* TODO temporarily allow accessing viewport state from outside the viewport */}
       {/* TODO figure out if this behavior should be deprecated, since it is quite hacky */}
       <ThreadPrimitiveViewportProvider>
         {children}
       </ThreadPrimitiveViewportProvider>
-    </AuiProvider>
+    </AssistantProviderBase>
   );
 };
 

package/src/legacy-runtime/RuntimeAdapter.ts

@@ -1,66 +1 @@
-import { resource, tapEffect, tapResource } from "@assistant-ui/tap";
-import type { AssistantRuntime } from "./runtime/AssistantRuntime";
-import { ThreadListClient } from "@assistant-ui/core/store/internal";
-import {
-  tapAssistantClientRef,
-  Derived,
-  attachTransformScopes,
-} from "@assistant-ui/store";
-import { ModelContext } from "@assistant-ui/core/store";
-import { Tools, Suggestions } from "../model-context";
-
-export const RuntimeAdapter = resource((runtime: AssistantRuntime) => {
-  const clientRef = tapAssistantClientRef();
-
-  tapEffect(() => {
-    return runtime.registerModelContextProvider(
-      clientRef.current!.modelContext(),
-    );
-  }, [runtime, clientRef]);
-
-  return tapResource(
-    ThreadListClient({
-      runtime: runtime.threads,
-      __internal_assistantRuntime: runtime,
-    }),
-  );
-});
-
-attachTransformScopes(RuntimeAdapter, (scopes, parent) => {
-  const result = {
-    ...scopes,
-    thread:
-      scopes.thread ??
-      Derived({
-        source: "threads",
-        query: { type: "main" },
-        get: (aui) => aui.threads().thread("main"),
-      }),
-    threadListItem:
-      scopes.threadListItem ??
-      Derived({
-        source: "threads",
-        query: { type: "main" },
-        get: (aui) => aui.threads().item("main"),
-      }),
-    composer:
-      scopes.composer ??
-      Derived({
-        source: "thread",
-        query: {},
-        get: (aui) => aui.threads().thread("main").composer(),
-      }),
-  };
-
-  if (!result.modelContext && parent.modelContext.source === null) {
-    result.modelContext = ModelContext();
-  }
-  if (!result.tools && parent.tools.source === null) {
-    result.tools = Tools({});
-  }
-  if (!result.suggestions && parent.suggestions.source === null) {
-    result.suggestions = Suggestions();
-  }
-
-  return result;
-});
+export { RuntimeAdapter } from "@assistant-ui/core/react";

package/src/legacy-runtime/runtime-cores/adapters/attachment/CloudFileAttachmentAdapter.ts

@@ -86,7 +86,7 @@ export class CloudFileAttachmentAdapter implements AttachmentAdapter {
         {
           type: "file",
           data: url,
-          mimeType: attachment.contentType,
+          mimeType: attachment.contentType ?? "",
           filename: attachment.name,
         },
       ];

package/src/legacy-runtime/runtime-cores/assistant-transport/index.ts

@@ -7,4 +7,5 @@ export type {
   AssistantTransportConnectionMetadata,
   AssistantTransportCommand,
   AssistantTransportProtocol,
+  SendCommandsRequestBody,
 } from "./types";

package/src/legacy-runtime/runtime-cores/assistant-transport/types.ts

@@ -83,6 +83,16 @@ export type HeadersValue = Record<string, string> | Headers;
 
 export type AssistantTransportProtocol = "data-stream" | "assistant-transport";
 
+export type SendCommandsRequestBody = {
+  commands: QueuedCommand[];
+  state: unknown;
+  system: string | undefined;
+  tools: Record<string, unknown> | undefined;
+  threadId: string | null;
+  parentId?: string | null;
+  [key: string]: unknown;
+};
+
 export type AssistantTransportOptions<T> = {
   initialState: T;
   api: string;
@@ -91,6 +101,21 @@ export type AssistantTransportOptions<T> = {
   converter: AssistantTransportStateConverter<T>;
   headers: HeadersValue | (() => Promise<HeadersValue>);
   body?: object | (() => Promise<object | undefined>);
+  /**
+   * Transform the request body before it is sent to the API.
+   * Receives the fully assembled body and returns the (potentially transformed) body.
+   *
+   * @example
+   * ```ts
+   * prepareSendCommandsRequest: (body) => ({
+   *   ...body,
+   *   trackingId: crypto.randomUUID(),
+   * })
+   * ```
+   */
+  prepareSendCommandsRequest?: (
+    body: SendCommandsRequestBody,
+  ) => Record<string, unknown> | Promise<Record<string, unknown>>;
   onResponse?: (response: Response) => void;
   onFinish?: () => void;
   onError?: (