@assistant-ui/react 0.12.10 → 0.12.11

package/src/client/ExternalThread.ts

@@ -8,20 +8,20 @@ import {
 import {
   type ClientOutput,
   tapClientLookup,
-  attachDefaultPeers,
+  attachTransformScopes,
   tapClientResource,
   Derived,
 } from "@assistant-ui/store";
 import { withKey } from "@assistant-ui/tap";
-import type { Attachment } from "../types/AttachmentTypes";
-import { ModelContext } from "./ModelContextClient";
-import { Tools } from "./Tools";
-import { Suggestions } from "./Suggestions";
-import {
+import type {
+  Attachment,
   ThreadAssistantMessagePart,
   ThreadUserMessagePart,
-} from "../types/MessagePartTypes";
-import type { ThreadMessage } from "../types";
+  ThreadMessage,
+} from "@assistant-ui/core";
+import { ModelContext, Suggestions } from "@assistant-ui/core/store";
+import { Tools } from "./Tools";
+import { DataRenderers } from "./DataRenderers";
 
 export type ExternalThreadMessage = ThreadMessage & {
   id: string;
@@ -133,38 +133,34 @@ const MessageClient = resource(
     ]);
 
     return {
-      state,
-      methods: {
-        getState: () => state,
-        composer: composerClient.methods,
-        reload: () => {
-          onReload?.();
-        },
-        speak: () => {},
-        stopSpeaking: () => {},
-        submitFeedback: () => {},
-        switchToBranch: () => {},
-        getCopyText: () =>
-          message.content.map((c) => ("text" in c ? c.text : "")).join(""),
-        part: (selector) => {
-          if ("index" in selector) {
-            return partClients.get(selector);
-          }
-          const partIndex = state.parts.findIndex(
-            (p) =>
-              p.type === "tool-call" && p.toolCallId === selector.toolCallId,
-          );
-          return partClients.get({ index: partIndex });
-        },
-        attachment: (selector) => {
-          if ("id" in selector) {
-            return attachmentClients.get({ key: selector.id });
-          }
-          return attachmentClients.get(selector);
-        },
-        setIsCopied,
-        setIsHovering,
+      getState: () => state,
+      composer: () => composerClient.methods,
+      reload: () => {
+        onReload?.();
+      },
+      speak: () => {},
+      stopSpeaking: () => {},
+      submitFeedback: () => {},
+      switchToBranch: () => {},
+      getCopyText: () =>
+        message.content.map((c) => ("text" in c ? c.text : "")).join(""),
+      part: (selector) => {
+        if ("index" in selector) {
+          return partClients.get(selector);
+        }
+        const partIndex = state.parts.findIndex(
+          (p) => p.type === "tool-call" && p.toolCallId === selector.toolCallId,
+        );
+        return partClients.get({ index: partIndex });
       },
+      attachment: (selector) => {
+        if ("id" in selector) {
+          return attachmentClients.get({ key: selector.id });
+        }
+        return attachmentClients.get(selector);
+      },
+      setIsCopied,
+      setIsHovering,
     };
   },
 );
@@ -185,12 +181,9 @@ const PartResource = resource(
     );
 
     return {
-      state,
-      methods: {
-        getState: () => state,
-        addToolResult: () => {},
-        resumeToolCall: () => {},
-      },
+      getState: () => state,
+      addToolResult: () => {},
+      resumeToolCall: () => {},
     };
   },
 );
@@ -207,12 +200,9 @@ const AttachmentResource = resource(
     onRemove,
   }: AttachmentResourceProps): ClientOutput<"attachment"> => {
     return {
-      state: attachment,
-      methods: {
-        getState: () => attachment,
-        remove: async () => {
-          onRemove?.();
-        },
+      getState: () => attachment,
+      remove: async () => {
+        onRemove?.();
       },
     };
   },
@@ -314,65 +304,62 @@ const ComposerClientResource = resource(
     );
 
     return {
-      state,
-      methods: {
-        getState: () => state,
-        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]);
-        },
-        clearAttachments: async () => {
-          setAttachments([]);
-        },
-        attachment: (selector) => {
-          if ("id" in selector) {
-            return attachmentClients.get({ key: selector.id });
-          }
-          return attachmentClients.get(selector);
-        },
-        reset: async () => {
-          setText("");
-          setRole("user");
-          setRunConfig({});
-          setAttachments([]);
-          setQuote(undefined);
-        },
-        send: () => {
-          const currentQuote = quote;
-          const message = {
-            role,
-            content: text ? [{ type: "text" as const, text }] : [],
-            attachments: attachments as any,
-            createdAt: new Date(),
-            runConfig,
-            metadata: {
-              custom: { ...(currentQuote ? { quote: currentQuote } : {}) },
-            },
-          };
-          onSend?.(message);
-          setText("");
-          setAttachments([]);
-          setQuote(undefined);
-        },
-        cancel: onCancel,
-        beginEdit: () => {
-          onBeginEdit?.();
-        },
-        startDictation: () => {},
-        stopDictation: () => {},
-        setQuote,
+      getState: () => state,
+      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]);
+      },
+      clearAttachments: async () => {
+        setAttachments([]);
+      },
+      attachment: (selector) => {
+        if ("id" in selector) {
+          return attachmentClients.get({ key: selector.id });
+        }
+        return attachmentClients.get(selector);
+      },
+      reset: async () => {
+        setText("");
+        setRole("user");
+        setRunConfig({});
+        setAttachments([]);
+        setQuote(undefined);
+      },
+      send: () => {
+        const currentQuote = quote;
+        const message = {
+          role,
+          content: text ? [{ type: "text" as const, text }] : [],
+          attachments: attachments as any,
+          createdAt: new Date(),
+          runConfig,
+          metadata: {
+            custom: { ...(currentQuote ? { quote: currentQuote } : {}) },
+          },
+        };
+        onSend?.(message);
+        setText("");
+        setAttachments([]);
+        setQuote(undefined);
       },
+      cancel: onCancel,
+      beginEdit: () => {
+        onBeginEdit?.();
+      },
+      startDictation: () => {},
+      stopDictation: () => {},
+      setQuote,
     };
   },
 );
@@ -461,43 +448,57 @@ export const ExternalThread = resource(
     }, [messages, isRunning, messageClients.state, composerClient.state]);
 
     return {
-      state,
-      methods: {
-        getState: () => state,
-        composer: composerClient.methods,
-        append: (message) => {
-          onNew?.(message);
-        },
-        startRun: () => {
-          onStartRun?.();
-        },
-        unstable_resumeRun: () => {},
-        cancelRun: handleCancelRun,
-        getModelContext: () => ({ tools: {}, config: {} }),
-        export: () => ({ messages: [] }),
-        import: () => {},
-        reset: () => {},
-        message: (selector) => {
-          if ("id" in selector) {
-            return messageClients.get({ key: selector.id });
-          }
-          return messageClients.get(selector);
-        },
-        stopSpeaking: () => {},
-        startVoice: async () => {},
-        stopVoice: async () => {},
+      getState: () => state,
+      composer: () => composerClient.methods,
+      append: (message) => {
+        onNew?.(message);
       },
+      startRun: () => {
+        onStartRun?.();
+      },
+      unstable_resumeRun: () => {},
+      cancelRun: handleCancelRun,
+      getModelContext: () => ({ tools: {}, config: {} }),
+      export: () => ({ messages: [] }),
+      import: () => {},
+      reset: () => {},
+      message: (selector) => {
+        if ("id" in selector) {
+          return messageClients.get({ key: selector.id });
+        }
+        return messageClients.get(selector);
+      },
+      stopSpeaking: () => {},
+      startVoice: async () => {},
+      stopVoice: async () => {},
     };
   },
 );
 
-attachDefaultPeers(ExternalThread, {
-  modelContext: ModelContext(),
-  tools: Tools({}),
-  suggestions: Suggestions(),
-  composer: Derived({
-    source: "thread",
-    query: {},
-    get: (aui) => aui.thread().composer,
-  }),
+attachTransformScopes(ExternalThread, (scopes, parent) => {
+  const result = {
+    ...scopes,
+    composer:
+      scopes.composer ??
+      Derived({
+        source: "thread",
+        query: {},
+        get: (aui) => aui.thread().composer(),
+      }),
+  };
+
+  if (!result.modelContext && parent.modelContext.source === null) {
+    result.modelContext = ModelContext();
+  }
+  if (!result.tools && parent.tools.source === null) {
+    result.tools = Tools({});
+  }
+  if (!result.dataRenderers && parent.dataRenderers.source === null) {
+    result.dataRenderers = DataRenderers();
+  }
+  if (!result.suggestions && parent.suggestions.source === null) {
+    result.suggestions = Suggestions();
+  }
+
+  return result;
 });

package/src/client/InMemoryThreadList.ts

@@ -3,15 +3,15 @@ import {
   type ClientOutput,
   tapClientLookup,
   Derived,
-  attachDefaultPeers,
+  attachTransformScopes,
   tapClientResource,
 } from "@assistant-ui/store";
 import { withKey } from "@assistant-ui/tap";
 import type { ResourceElement } from "@assistant-ui/tap";
-import type { ThreadState } from "../types/scopes/thread";
-import { Suggestions } from "./Suggestions";
-import { ModelContext } from "./ModelContextClient";
+
+import { ModelContext, Suggestions } from "@assistant-ui/core/store";
 import { Tools } from "./Tools";
+import { DataRenderers } from "./DataRenderers";
 
 export type InMemoryThreadListProps = {
   thread: (threadId: string) => ResourceElement<ClientOutput<"thread">>;
@@ -47,18 +47,15 @@ const ThreadListItemClient = resource(
     );
 
     return {
-      state,
-      methods: {
-        getState: () => state,
-        switchTo: onSwitchTo,
-        rename: () => {},
-        archive: onArchive,
-        unarchive: onUnarchive,
-        delete: onDelete,
-        generateTitle: () => {},
-        initialize: async () => ({ remoteId: data.id, externalId: undefined }),
-        detach: () => {},
-      },
+      getState: () => state,
+      switchTo: onSwitchTo,
+      rename: () => {},
+      archive: onArchive,
+      unarchive: onUnarchive,
+      delete: onDelete,
+      generateTitle: () => {},
+      initialize: async () => ({ remoteId: data.id, externalId: undefined }),
+      detach: () => {},
     };
   },
 );
@@ -139,7 +136,6 @@ export const InMemoryThreadList = resource(
     const state = tapMemo(() => {
       const regularThreads = threads.filter((t) => t.status === "regular");
       const archivedThreads = threads.filter((t) => t.status === "archived");
-      const mainThreadState = mainThreadClient.state as ThreadState;
 
       return {
         mainThreadId,
@@ -148,50 +144,68 @@ export const InMemoryThreadList = resource(
         threadIds: regularThreads.map((t) => t.id),
         archivedThreadIds: archivedThreads.map((t) => t.id),
         threadItems: threadListItems.state,
-        main: mainThreadState,
+        main: mainThreadClient.state,
       };
     }, [mainThreadId, threads, threadListItems.state, mainThreadClient.state]);
 
     return {
-      state,
-      methods: {
-        getState: () => state,
-        switchToThread: handleSwitchToThread,
-        switchToNewThread: handleSwitchToNewThread,
-        item: (selector) => {
-          if (selector === "main") {
-            const index = threads.findIndex((t) => t.id === mainThreadId);
-            return threadListItems.get({ index: index === -1 ? 0 : index });
-          }
-          if ("id" in selector) {
-            const index = threads.findIndex((t) => t.id === selector.id);
-            return threadListItems.get({ index });
-          }
-          return threadListItems.get(selector);
-        },
-        thread: () => mainThreadClient.methods,
+      getState: () => state,
+      switchToThread: handleSwitchToThread,
+      switchToNewThread: handleSwitchToNewThread,
+      item: (selector) => {
+        if (selector === "main") {
+          const index = threads.findIndex((t) => t.id === mainThreadId);
+          return threadListItems.get({ index: index === -1 ? 0 : index });
+        }
+        if ("id" in selector) {
+          const index = threads.findIndex((t) => t.id === selector.id);
+          return threadListItems.get({ index });
+        }
+        return threadListItems.get(selector);
       },
+      thread: () => mainThreadClient.methods,
     };
   },
 );
 
-attachDefaultPeers(InMemoryThreadList, {
-  thread: Derived({
-    source: "threads",
-    query: { type: "main" },
-    get: (aui) => aui.threads().thread("main"),
-  }),
-  threadListItem: Derived({
-    source: "threads",
-    query: { type: "main" },
-    get: (aui) => aui.threads().item("main"),
-  }),
-  composer: Derived({
-    source: "thread",
-    query: {},
-    get: (aui) => aui.threads().thread("main").composer,
-  }),
-  modelContext: ModelContext(),
-  tools: Tools({}),
-  suggestions: Suggestions(),
+attachTransformScopes(InMemoryThreadList, (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.dataRenderers && parent.dataRenderers.source === null) {
+    result.dataRenderers = DataRenderers();
+  }
+  if (!result.suggestions && parent.suggestions.source === null) {
+    result.suggestions = Suggestions();
+  }
+
+  return result;
 });

package/src/client/Tools.ts

@@ -2,13 +2,13 @@ import { resource, tapState, tapEffect, tapCallback } from "@assistant-ui/tap";
 import {
   tapAssistantClientRef,
   type ClientOutput,
-  attachDefaultPeers,
+  attachTransformScopes,
 } from "@assistant-ui/store";
 import { ToolsState } from "../types/scopes";
 import type { Tool } from "assistant-stream";
 import { type Toolkit } from "../model-context/toolbox";
 import { ToolCallMessagePartComponent } from "../types";
-import { ModelContext } from "./ModelContextClient";
+import { ModelContext } from "@assistant-ui/core/store";
 
 export const Tools = resource(
   ({ toolkit }: { toolkit?: Toolkit }): ClientOutput<"tools"> => {
@@ -83,15 +83,15 @@ export const Tools = resource(
     }, [toolkit, setToolUI, clientRef]);
 
     return {
-      state,
-      methods: {
-        getState: () => state,
-        setToolUI,
-      },
+      getState: () => state,
+      setToolUI,
     };
   },
 );
 
-attachDefaultPeers(Tools, {
-  modelContext: ModelContext(),
-});
+attachTransformScopes(Tools, (scopes, parent) => ({
+  ...scopes,
+  ...(scopes.modelContext || parent.modelContext.source !== null
+    ? {}
+    : { modelContext: ModelContext() }),
+}));

package/src/client/index.ts

@@ -1,6 +1,11 @@
-export { ModelContext as ModelContextClient } from "./ModelContextClient";
+// 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 { Suggestions, type SuggestionConfig } from "./Suggestions";
+export { DataRenderers } from "./DataRenderers";
 export {
   ExternalThread,
   type ExternalThreadProps,
@@ -10,4 +15,3 @@ export {
   InMemoryThreadList,
   type InMemoryThreadListProps,
 } from "./InMemoryThreadList";
-export { ChainOfThoughtClient } from "./ChainOfThoughtClient";

package/src/context/providers/ChainOfThoughtByIndicesProvider.tsx

@@ -2,8 +2,8 @@
 
 import { type FC, type PropsWithChildren } from "react";
 import { useAui, useAuiState, AuiProvider } from "@assistant-ui/store";
-import { ChainOfThoughtClient } from "../../client/ChainOfThoughtClient";
-import type { ChainOfThoughtPart } from "../../types/scopes/chainOfThought";
+import { ChainOfThoughtClient } from "@assistant-ui/core/store";
+import type { ChainOfThoughtPart } from "@assistant-ui/core/store";
 
 export const ChainOfThoughtByIndicesProvider: FC<
   PropsWithChildren<{

package/src/context/providers/MessageByIndexProvider.tsx

@@ -17,7 +17,7 @@ export const MessageByIndexProvider: FC<
     composer: Derived({
       source: "message",
       query: {},
-      get: (aui) => aui.thread().message({ index }).composer,
+      get: (aui) => aui.thread().message({ index }).composer(),
     }),
   });
 

package/src/context/providers/MessageProvider.tsx

@@ -3,9 +3,9 @@
 import { type FC, type PropsWithChildren } from "react";
 import { useAui, AuiProvider } from "@assistant-ui/store";
 import {
-  ThreadMessageClientProps,
+  type ThreadMessageClientProps,
   ThreadMessageClient,
-} from "../../client/ThreadMessageClient";
+} from "@assistant-ui/core/store";
 
 export const MessageProvider: FC<
   PropsWithChildren<ThreadMessageClientProps>

package/src/context/providers/TextMessagePartProvider.tsx

@@ -23,15 +23,12 @@ const TextMessagePartClient = resource(
     );
 
     return {
-      state,
-      methods: {
-        getState: () => state,
-        addToolResult: () => {
-          throw new Error("Not supported");
-        },
-        resumeToolCall: () => {
-          throw new Error("Not supported");
-        },
+      getState: () => state,
+      addToolResult: () => {
+        throw new Error("Not supported");
+      },
+      resumeToolCall: () => {
+        throw new Error("Not supported");
       },
     };
   },

package/src/context/providers/ThreadListItemProvider.tsx

@@ -3,7 +3,7 @@
 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 "../../legacy-runtime/client/ThreadListItemRuntimeClient";
+import { ThreadListItemClient } from "@assistant-ui/core/store/internal";
 
 export const ThreadListItemByIndexProvider: FC<
   PropsWithChildren<{

package/src/context/react/utils/useRuntimeState.ts

@@ -1,5 +1,5 @@
+import type { Unsubscribe } from "@assistant-ui/core";
 import { useDebugValue, useSyncExternalStore } from "react";
-import { Unsubscribe } from "../../../types";
 import { ensureBinding } from "./ensureBinding";
 
 export type SubscribableRuntime<TState> = {

package/src/context/stores/{ThreadViewport.tsx → ThreadViewport.ts}

@@ -1,7 +1,7 @@
 "use client";
 
 import { create } from "zustand";
-import type { Unsubscribe } from "../../types/Unsubscribe";
+import type { Unsubscribe } from "@assistant-ui/core";
 
 export type SizeHandle = {
   /** Update the height */

package/src/devtools/DevToolsHooks.ts

@@ -1,5 +1,5 @@
+import type { Unsubscribe } from "@assistant-ui/core";
 import { AssistantClient } from "@assistant-ui/store";
-import { Unsubscribe } from "../types";
 
 export interface EventLog {
   time: Date;

package/src/hooks/useMessageQuote.ts

@@ -1,7 +1,7 @@
 "use client";
 
 import { useAuiState } from "@assistant-ui/store";
-import type { QuoteInfo } from "../types/QuoteTypes";
+import type { QuoteInfo } from "@assistant-ui/core";
 
 /**
  * Hook that returns the quote info for the current message, if any.