@assistant-ui/react 0.12.9 → 0.12.11

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<{
@@ -11,7 +11,7 @@ export const ChainOfThoughtByIndicesProvider: FC<
     endIndex: number;
   }>
 > = ({ startIndex, endIndex, children }) => {
-  const parts = useAuiState(({ message }) => message.parts).slice(
+  const parts = useAuiState((s) => s.message.parts).slice(
     startIndex,
     endIndex + 1,
   ) as ChainOfThoughtPart[];

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/ensureBinding.ts

@@ -40,7 +40,7 @@ export const ensureBinding = (r: unknown) => {
   runtime.__internal_bindMethods?.();
   runtime.__isBound = true;
 
-  if (process.env["NODE_ENV"] !== "production") {
+  if (process.env.NODE_ENV !== "production") {
     debugVerifyPrototype(runtime, Object.getPrototypeOf(runtime));
   }
 };

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

@@ -0,0 +1,27 @@
+"use client";
+
+import { useAuiState } from "@assistant-ui/store";
+import type { QuoteInfo } from "@assistant-ui/core";
+
+/**
+ * Hook that returns the quote info for the current message, if any.
+ *
+ * Reads from `message.metadata.custom.quote`.
+ *
+ * @example
+ * ```tsx
+ * function QuoteBlock() {
+ *   const quote = useMessageQuote();
+ *   if (!quote) return null;
+ *   return <blockquote>{quote.text}</blockquote>;
+ * }
+ * ```
+ */
+export const useMessageQuote = (): QuoteInfo | undefined => {
+  return useAuiState(
+    (s) =>
+      (s.message.metadata?.custom as Record<string, unknown>)?.quote as
+        | QuoteInfo
+        | undefined,
+  );
+};

package/src/hooks/useMessageTiming.ts

@@ -0,0 +1,24 @@
+"use client";
+
+import { useAuiState } from "@assistant-ui/store";
+import type { MessageTiming } from "@assistant-ui/core";
+
+/**
+ * Hook that returns timing information for the current assistant message.
+ *
+ * Reads from `message.metadata.timing`.
+ *
+ * @example
+ * ```tsx
+ * function MessageStats() {
+ *   const timing = useMessageTiming();
+ *   if (!timing) return null;
+ *   return <span>{timing.tokensPerSecond?.toFixed(1)} tok/s</span>;
+ * }
+ * ```
+ */
+export const useMessageTiming = (): MessageTiming | undefined => {
+  return useAuiState((s) =>
+    s.message.role === "assistant" ? s.message.metadata?.timing : undefined,
+  );
+};

package/src/internal.ts

@@ -1,18 +1,27 @@
-export type { ThreadRuntimeCore } from "./legacy-runtime/runtime-cores/core/ThreadRuntimeCore";
-export type { ThreadListRuntimeCore } from "./legacy-runtime/runtime-cores/core/ThreadListRuntimeCore";
-export { DefaultThreadComposerRuntimeCore } from "./legacy-runtime/runtime-cores/composer/DefaultThreadComposerRuntimeCore";
-export { CompositeContextProvider } from "./utils/CompositeContextProvider";
-export { MessageRepository } from "./legacy-runtime/runtime-cores/utils/MessageRepository";
-export { BaseAssistantRuntimeCore } from "./legacy-runtime/runtime-cores/core/BaseAssistantRuntimeCore";
-export { generateId } from "./utils/idUtils";
-export { AssistantRuntimeImpl } from "./legacy-runtime/runtime/AssistantRuntime";
+// Re-export from @assistant-ui/core
+export type {
+  ThreadRuntimeCore,
+  ThreadListRuntimeCore,
+} from "@assistant-ui/core";
+
+// Re-export from @assistant-ui/core/internal
 export {
+  DefaultThreadComposerRuntimeCore,
+  CompositeContextProvider,
+  MessageRepository,
+  BaseAssistantRuntimeCore,
+  generateId,
+  AssistantRuntimeImpl,
   ThreadRuntimeImpl,
-  type ThreadRuntimeCoreBinding,
-  type ThreadListItemRuntimeBinding,
-} from "./legacy-runtime/runtime/ThreadRuntime";
-export { fromThreadMessageLike } from "./legacy-runtime/runtime-cores/external-store/ThreadMessageLike";
-export { getAutoStatus } from "./legacy-runtime/runtime-cores/external-store/auto-status";
+  fromThreadMessageLike,
+  getAutoStatus,
+} from "@assistant-ui/core/internal";
+export type {
+  ThreadRuntimeCoreBinding,
+  ThreadListItemRuntimeBinding,
+} from "@assistant-ui/core/internal";
+
+// React-specific (stay in react)
 export { splitLocalRuntimeOptions } from "./legacy-runtime/runtime-cores/local/LocalRuntimeOptions";
 export {
   useToolInvocations,

package/src/legacy-runtime/AssistantRuntimeProvider.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { FC, memo, PropsWithChildren, useEffect } from "react";
+import { ComponentType, FC, memo, PropsWithChildren, useEffect } from "react";
 import { useAui, AuiProvider, AssistantClient } from "@assistant-ui/store";
 import { AssistantRuntime } from "./runtime/AssistantRuntime";
 import { AssistantRuntimeCore } from "./runtime-cores/core/AssistantRuntimeCore";
@@ -23,7 +23,9 @@ export namespace AssistantRuntimeProvider {
 }
 
 const getRenderComponent = (runtime: AssistantRuntime) => {
-  return (runtime as { _core?: AssistantRuntimeCore })._core?.RenderComponent;
+  return (runtime as { _core?: AssistantRuntimeCore })._core?.RenderComponent as
+    | ComponentType
+    | undefined;
 };
 
 export const AssistantRuntimeProviderImpl: FC<
@@ -32,10 +34,7 @@ export const AssistantRuntimeProviderImpl: FC<
   const aui = useAui({ threads: RuntimeAdapter(runtime) }, { parent: parent });
 
   useEffect(() => {
-    if (
-      typeof process === "undefined" ||
-      process.env["NODE_ENV"] === "production"
-    )
+    if (typeof process === "undefined" || process.env.NODE_ENV === "production")
       return;
     return DevToolsProviderApi.register(aui);
   }, [aui]);

package/src/legacy-runtime/RuntimeAdapter.ts

@@ -1,12 +1,12 @@
-import { resource, tapEffect, tapInlineResource } from "@assistant-ui/tap";
+import { resource, tapEffect, tapResource } from "@assistant-ui/tap";
 import type { AssistantRuntime } from "./runtime/AssistantRuntime";
-import { ThreadListClient } from "./client/ThreadListRuntimeClient";
+import { ThreadListClient } from "@assistant-ui/core/store/internal";
 import {
   tapAssistantClientRef,
   Derived,
-  attachDefaultPeers,
+  attachTransformScopes,
 } from "@assistant-ui/store";
-import { ModelContext } from "../client/ModelContextClient";
+import { ModelContext } from "@assistant-ui/core/store";
 import { Tools, Suggestions } from "../model-context";
 
 export const RuntimeAdapter = resource((runtime: AssistantRuntime) => {
@@ -18,7 +18,7 @@ export const RuntimeAdapter = resource((runtime: AssistantRuntime) => {
     );
   }, [runtime, clientRef]);
 
-  return tapInlineResource(
+  return tapResource(
     ThreadListClient({
       runtime: runtime.threads,
       __internal_assistantRuntime: runtime,
@@ -26,23 +26,41 @@ export const RuntimeAdapter = resource((runtime: AssistantRuntime) => {
   );
 });
 
-attachDefaultPeers(RuntimeAdapter, {
-  modelContext: ModelContext(),
-  tools: Tools({}),
-  suggestions: Suggestions(),
-  threadListItem: Derived({
-    source: "threads",
-    query: { type: "main" },
-    get: (aui) => aui.threads().item("main"),
-  }),
-  thread: Derived({
-    source: "threads",
-    query: { type: "main" },
-    get: (aui) => aui.threads().thread("main"),
-  }),
-  composer: Derived({
-    source: "thread",
-    query: {},
-    get: (aui) => aui.threads().thread("main").composer,
-  }),
+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;
 });