@assistant-ui/core 0.3.5 → 0.3.7

package/src/react/AssistantRuntimeProvider.test.tsx

@@ -5,7 +5,12 @@ import { useEffect } from "react";
 import { cleanup, render } from "@testing-library/react";
 import { afterEach, describe, expect, it } from "vitest";
 import { resource } from "@assistant-ui/tap";
-import { AuiProvider, useAui, type AssistantClient } from "@assistant-ui/store";
+import {
+  AuiConfig,
+  AuiProvider,
+  useAui,
+  type AssistantClient,
+} from "@assistant-ui/store";
 import type { ChatModelAdapter } from "../runtime/utils/chat-model-adapter";
 import { AssistantRuntimeProvider } from "./AssistantRuntimeProvider";
 import { useLocalRuntime } from "./runtimes/useLocalRuntime";
@@ -98,4 +103,53 @@ describe("AssistantRuntimeProvider aui composition", () => {
     expect(aui.parentScope.getState()).toEqual({ count: 0 });
     expect(log).toEqual(["parent tap effect", "consumer effect"]);
   });
+
+  it("provides config scopes alongside the runtime scope", () => {
+    let aui!: AnyClient;
+    const Consumer = () => {
+      aui = useAui();
+      return null;
+    };
+
+    const App = () => {
+      const runtime = useLocalRuntime(chatModel);
+      const config = AuiConfig({
+        extraScope: makeCounterClient()(),
+      } as unknown as AuiConfig.Input);
+      return (
+        <AssistantRuntimeProvider runtime={runtime} config={config}>
+          <Consumer />
+        </AssistantRuntimeProvider>
+      );
+    };
+
+    render(<App />);
+
+    expect(aui.threads).toBeDefined();
+    expect(aui.extraScope.getState()).toEqual({ count: 0 });
+  });
+
+  it("keeps the runtime's threads scope when config carries a threads key", () => {
+    let aui!: AnyClient;
+    const Consumer = () => {
+      aui = useAui();
+      return null;
+    };
+
+    const App = () => {
+      const runtime = useLocalRuntime(chatModel);
+      const config = AuiConfig({
+        threads: makeCounterClient()(),
+      } as unknown as AuiConfig.Input);
+      return (
+        <AssistantRuntimeProvider runtime={runtime} config={config}>
+          <Consumer />
+        </AssistantRuntimeProvider>
+      );
+    };
+
+    render(<App />);
+
+    expect(aui.threads.getState().main).toBeDefined();
+  });
 });

package/src/react/AssistantRuntimeProvider.tsx

@@ -1,5 +1,5 @@
 import { type ReactNode, memo } from "react";
-import type { AssistantClient } from "@assistant-ui/store";
+import type { AssistantClient, AuiConfig } from "@assistant-ui/store";
 import type { AssistantRuntime } from "../runtime/api/assistant-runtime";
 import { AssistantProviderBase } from "./AssistantProvider";
 
@@ -29,6 +29,7 @@ export const AssistantRuntimeProvider = memo(
   ({
     runtime,
     aui,
+    config,
     children,
   }: {
     /**
@@ -44,10 +45,19 @@ export const AssistantRuntimeProvider = memo(
      * @defaultValue null
      */
     aui?: AssistantClient | null;
+    /**
+     * Optional extra scopes provided alongside the runtime's `threads`
+     * scope; build with `AuiConfig`.
+     */
+    config?: AuiConfig;
     children: ReactNode;
   }) => {
     return (
-      <AssistantProviderBase runtime={runtime} aui={aui ?? null}>
+      <AssistantProviderBase
+        runtime={runtime}
+        aui={aui ?? null}
+        config={config}
+      >
         {children}
       </AssistantProviderBase>
     );

package/src/react/RuntimeAdapter.test.ts

@@ -0,0 +1,85 @@
+import { describe, expect, it, vi } from "vitest";
+import { flushTapSync } from "@assistant-ui/tap";
+import { AuiConfig, createAssistantClient } from "@assistant-ui/store/client";
+import { RuntimeAdapter } from "../store";
+import { ExternalStoreRuntimeCore } from "../runtimes/internal";
+import { AssistantRuntimeImpl } from "../runtime/internal";
+import type { ExternalStoreAdapter } from "../runtimes/external-store/external-store-adapter";
+
+type DemoMessage = { role: "user" | "assistant"; text: string };
+
+const createRuntime = (
+  overrides?: Partial<ExternalStoreAdapter<DemoMessage>>,
+) => {
+  const onNew = vi.fn(async () => {});
+  const adapter: ExternalStoreAdapter<DemoMessage> = {
+    messages: [{ role: "user", text: "hi" }],
+    convertMessage: (message) => ({
+      role: message.role,
+      content: [{ type: "text", text: message.text }],
+    }),
+    onNew,
+    ...overrides,
+  };
+  const runtime = new AssistantRuntimeImpl(
+    new ExternalStoreRuntimeCore(adapter),
+  );
+  return { runtime, onNew };
+};
+
+describe("RuntimeAdapter via the neutral store entry", () => {
+  it("mounts a runtime into a standalone client without React", () => {
+    const { runtime } = createRuntime();
+    const handle = createAssistantClient(
+      AuiConfig({ threads: RuntimeAdapter(runtime) }),
+    );
+    const aui = handle.getClient();
+
+    const messages = aui.thread.getState().messages;
+    expect(messages).toHaveLength(1);
+    expect(messages[0]!.content[0]).toMatchObject({
+      type: "text",
+      text: "hi",
+    });
+
+    expect(aui.threads.getState().mainThreadId).toBeDefined();
+    expect(aui.tools.getState()).toBeDefined();
+    expect(aui.dataRenderers.getState()).toBeDefined();
+
+    handle.destroy();
+  });
+
+  it("routes composer sends to the external store adapter", async () => {
+    const { runtime, onNew } = createRuntime();
+    const handle = createAssistantClient(
+      AuiConfig({ threads: RuntimeAdapter(runtime) }),
+    );
+    const aui = handle.getClient();
+
+    flushTapSync(() => aui.composer.setText("hello"));
+    flushTapSync(() => aui.composer.send());
+    await new Promise((resolve) => setTimeout(resolve));
+
+    expect(onNew).toHaveBeenCalledTimes(1);
+    expect(onNew.mock.calls[0]![0]).toMatchObject({
+      content: [{ type: "text", text: "hello" }],
+    });
+
+    handle.destroy();
+  });
+
+  it("registers the client's model context on the runtime", () => {
+    const { runtime } = createRuntime();
+    const register = vi.spyOn(runtime, "registerModelContextProvider");
+
+    const handle = createAssistantClient(
+      AuiConfig({ threads: RuntimeAdapter(runtime) }),
+    );
+
+    // Dev mode double-mounts the root (StrictMode emulation), so assert
+    // presence rather than an exact count
+    expect(register).toHaveBeenCalled();
+
+    handle.destroy();
+  });
+});

package/src/react/RuntimeAdapter.ts

@@ -8,7 +8,7 @@ import {
 import {
   attachTransformScopes,
   useAssistantClientRef,
-} from "@assistant-ui/store";
+} from "@assistant-ui/store/client";
 import { DataRenderers } from "./client/DataRenderers";
 import { Tools } from "./client/Tools";
 

package/src/react/client/Interactables.test.ts

@@ -9,8 +9,9 @@ import type { ThreadMessage } from "../../types/message";
 
 const clientHolder: { client: unknown } = { client: null };
 
-vi.mock("@assistant-ui/store", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("@assistant-ui/store")>();
+vi.mock("@assistant-ui/store/client", async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import("@assistant-ui/store/client")>();
   return {
     ...actual,
     useAssistantClientRef: () => ({

package/src/react/client/Interactables.ts

@@ -1,10 +1,10 @@
 import { useState, useEffect, useCallback, useRef, useMemo } from "react";
 import { resource } from "@assistant-ui/tap";
+import type { ClientOutput } from "@assistant-ui/store";
 import {
-  useAssistantClientRef,
-  type ClientOutput,
   attachTransformScopes,
-} from "@assistant-ui/store";
+  useAssistantClientRef,
+} from "@assistant-ui/store/client";
 import type {
   Unstable_InteractablesState,
   Unstable_InteractableRegistration,
@@ -13,7 +13,7 @@ import type {
   Unstable_InteractablesConfig,
 } from "../types/scopes/interactables";
 import { toJSONSchema, toPartialJSONSchema } from "assistant-stream";
-import { ModelContext } from "../../store";
+import { ModelContext } from "../../store/clients/model-context-client";
 import {
   buildInteractableModelContext,
   type PartialJSONSchema,

package/src/react/client/Tools.ts

@@ -5,11 +5,11 @@ import {
   withKey,
   type ResourceElement,
 } from "@assistant-ui/tap";
+import type { ClientOutput } from "@assistant-ui/store";
 import {
-  useAssistantClientRef,
-  type ClientOutput,
   attachTransformScopes,
-} from "@assistant-ui/store";
+  useAssistantClientRef,
+} from "@assistant-ui/store/client";
 import type { McpAppResourceOutput, ToolsState } from "../types/scopes/tools";
 import type { Tool } from "assistant-stream";
 import {
@@ -18,7 +18,7 @@ import {
   type Toolkit,
 } from "../model-context/toolbox";
 import type { ToolCallMessagePartComponent } from "../types/MessagePartComponentTypes";
-import { ModelContext } from "../../store";
+import { ModelContext } from "../../store/clients/model-context-client";
 
 export type { McpAppResourceOutput };
 

package/src/react/index.ts

@@ -228,6 +228,7 @@ export {
 } from "./runtimes/useStreamingTiming";
 export {
   createRuntimeExtras,
+  unstable_createRuntimeExtrasFromBrand,
   type RuntimeExtras,
 } from "./runtimes/createRuntimeExtras";
 export { RemoteThreadListHookInstanceManager } from "./runtimes/RemoteThreadListHookInstanceManager";

package/src/react/providers/AttachmentByIndexProvider.tsx

@@ -1,20 +1,24 @@
 import type { FC, PropsWithChildren } from "react";
-import { useAui, AuiProvider, Derived } from "@assistant-ui/store";
+import { useAui, AuiConfig, AuiProvider, Derived } from "@assistant-ui/store";
 
 export const MessageAttachmentByIndexProvider: FC<
   PropsWithChildren<{
     index: number;
   }>
 > = ({ index, children }) => {
-  const aui = useAui({
+  const aui = useAui();
+  const config = AuiConfig({
     attachment: Derived({
       source: "message",
       query: { type: "index", index },
       get: (aui) => aui.message.attachment({ index }),
     }),
   });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
+  return (
+    <AuiProvider extends={aui} config={config}>
+      {children}
+    </AuiProvider>
+  );
 };
 
 export const ComposerAttachmentByIndexProvider: FC<
@@ -22,13 +26,17 @@ export const ComposerAttachmentByIndexProvider: FC<
     index: number;
   }>
 > = ({ index, children }) => {
-  const aui = useAui({
+  const aui = useAui();
+  const config = AuiConfig({
     attachment: Derived({
       source: "composer",
       query: { type: "index", index },
       get: (aui) => aui.composer.attachment({ index }),
     }),
   });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
+  return (
+    <AuiProvider extends={aui} config={config}>
+      {children}
+    </AuiProvider>
+  );
 };

package/src/react/providers/ChainOfThoughtByIndicesProvider.tsx

@@ -1,5 +1,10 @@
 import type { FC, PropsWithChildren } from "react";
-import { useAui, useAuiState, AuiProvider } from "@assistant-ui/store";
+import {
+  useAui,
+  useAuiState,
+  AuiConfig,
+  AuiProvider,
+} from "@assistant-ui/store";
 import { ChainOfThoughtClient } from "../../store/clients/chain-of-thought-client";
 import type { ChainOfThoughtPart } from "../../store/scopes/chain-of-thought";
 
@@ -16,7 +21,7 @@ export const ChainOfThoughtByIndicesProvider: FC<
 
   const parentAui = useAui();
 
-  const aui = useAui({
+  const config = AuiConfig({
     chainOfThought: ChainOfThoughtClient({
       parts,
       getMessagePart: ({ index }) => {
@@ -29,6 +34,9 @@ export const ChainOfThoughtByIndicesProvider: FC<
       },
     }),
   });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
+  return (
+    <AuiProvider extends={parentAui} config={config}>
+      {children}
+    </AuiProvider>
+  );
 };

package/src/react/providers/ChainOfThoughtPartByIndexProvider.tsx

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

package/src/react/providers/MessageByIdProvider.tsx

@@ -1,12 +1,13 @@
 import type { FC, PropsWithChildren } from "react";
-import { useAui, AuiProvider, Derived } from "@assistant-ui/store";
+import { useAui, AuiConfig, AuiProvider, Derived } from "@assistant-ui/store";
 
 export const MessageByIdProvider: FC<
   PropsWithChildren<{
     id: string;
   }>
 > = ({ id, children }) => {
-  const aui = useAui({
+  const aui = useAui();
+  const config = AuiConfig({
     message: Derived({
       source: "thread",
       query: { type: "id", id },
@@ -18,6 +19,9 @@ export const MessageByIdProvider: FC<
       get: (aui) => aui.thread.message({ id }).composer(),
     }),
   });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
+  return (
+    <AuiProvider extends={aui} config={config}>
+      {children}
+    </AuiProvider>
+  );
 };

package/src/react/providers/MessageByIndexProvider.tsx

@@ -1,12 +1,13 @@
 import type { FC, PropsWithChildren } from "react";
-import { useAui, AuiProvider, Derived } from "@assistant-ui/store";
+import { useAui, AuiConfig, AuiProvider, Derived } from "@assistant-ui/store";
 
 export const MessageByIndexProvider: FC<
   PropsWithChildren<{
     index: number;
   }>
 > = ({ index, children }) => {
-  const aui = useAui({
+  const aui = useAui();
+  const config = AuiConfig({
     message: Derived({
       source: "thread",
       query: { type: "index", index },
@@ -18,6 +19,9 @@ export const MessageByIndexProvider: FC<
       get: (aui) => aui.thread.message({ index }).composer(),
     }),
   });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
+  return (
+    <AuiProvider extends={aui} config={config}>
+      {children}
+    </AuiProvider>
+  );
 };

package/src/react/providers/PartByIndexProvider.tsx

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

package/src/react/providers/QueueItemByIndexProvider.tsx

@@ -1,5 +1,5 @@
 import type { FC, PropsWithChildren } from "react";
-import { AuiProvider, Derived, useAui } from "@assistant-ui/store";
+import { useAui, AuiConfig, AuiProvider, Derived } from "@assistant-ui/store";
 
 export type QueueItemByIndexProviderProps = PropsWithChildren<{
   index: number;
@@ -9,13 +9,17 @@ export const QueueItemByIndexProvider: FC<QueueItemByIndexProviderProps> = ({
   index,
   children,
 }) => {
-  const aui = useAui({
+  const aui = useAui();
+  const config = AuiConfig({
     queueItem: Derived({
       source: "composer",
-      query: { index },
+      query: { type: "index", index },
       get: (aui) => aui.composer.queueItem({ index }),
     }),
   });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
+  return (
+    <AuiProvider extends={aui} config={config}>
+      {children}
+    </AuiProvider>
+  );
 };

package/src/react/providers/ReadonlyThreadProvider.tsx

@@ -5,7 +5,7 @@ import {
   useMemo,
   useState,
 } from "react";
-import { useAui, AuiProvider, Derived } from "@assistant-ui/store";
+import { useAui, AuiConfig, AuiProvider, Derived } from "@assistant-ui/store";
 import type { ThreadMessage } from "../../types/message";
 import { ReadonlyThreadRuntimeCore } from "../../runtimes/readonly/ReadonlyThreadRuntimeCore";
 import {
@@ -72,7 +72,9 @@ export const ReadonlyThreadProvider: FC<ReadonlyThreadProvider.Props> = ({
     );
   }, [core]);
 
-  const aui = useAui({
+  const aui = useAui();
+
+  const config = AuiConfig({
     thread: ThreadClient({ runtime: threadRuntime }),
     composer: Derived({
       source: "thread",
@@ -80,6 +82,9 @@ export const ReadonlyThreadProvider: FC<ReadonlyThreadProvider.Props> = ({
       get: (aui) => aui.thread.composer(),
     }),
   });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
+  return (
+    <AuiProvider extends={aui} config={config}>
+      {children}
+    </AuiProvider>
+  );
 };

package/src/react/providers/SuggestionByIndexProvider.tsx

@@ -1,5 +1,5 @@
 import type { FC, PropsWithChildren } from "react";
-import { AuiProvider, Derived, useAui } from "@assistant-ui/store";
+import { useAui, AuiConfig, AuiProvider, Derived } from "@assistant-ui/store";
 
 export type SuggestionByIndexProviderProps = PropsWithChildren<{
   index: number;
@@ -9,13 +9,17 @@ export const SuggestionByIndexProvider: FC<SuggestionByIndexProviderProps> = ({
   index,
   children,
 }) => {
-  const aui = useAui({
+  const aui = useAui();
+  const config = AuiConfig({
     suggestion: Derived({
       source: "suggestions",
       query: { index },
       get: (aui) => aui.suggestions.suggestion({ index }),
     }),
   });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
+  return (
+    <AuiProvider extends={aui} config={config}>
+      {children}
+    </AuiProvider>
+  );
 };

package/src/react/providers/TextMessagePartProvider.tsx

@@ -1,5 +1,10 @@
 import { type FC, type PropsWithChildren, useMemo } from "react";
-import { useAui, AuiProvider, type ClientOutput } from "@assistant-ui/store";
+import {
+  useAui,
+  AuiConfig,
+  AuiProvider,
+  type ClientOutput,
+} from "@assistant-ui/store";
 import type { PartState } from "../../store/scopes/part";
 
 import { resource } from "@assistant-ui/tap";
@@ -42,9 +47,13 @@ export const TextMessagePartProvider: FC<
     isRunning?: boolean;
   }>
 > = ({ text, isRunning = false, children }) => {
-  const aui = useAui({
+  const aui = useAui();
+  const config = AuiConfig({
     part: TextMessagePartClient({ text, isRunning }),
   });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
+  return (
+    <AuiProvider extends={aui} config={config}>
+      {children}
+    </AuiProvider>
+  );
 };

package/src/react/providers/ThreadListItemByIndexProvider.tsx

@@ -1,5 +1,5 @@
 import type { FC, PropsWithChildren } from "react";
-import { useAui, AuiProvider, Derived } from "@assistant-ui/store";
+import { useAui, AuiConfig, AuiProvider, Derived } from "@assistant-ui/store";
 
 export const ThreadListItemByIndexProvider: FC<
   PropsWithChildren<{
@@ -7,13 +7,17 @@ export const ThreadListItemByIndexProvider: FC<
     archived: boolean;
   }>
 > = ({ index, archived, children }) => {
-  const aui = useAui({
+  const aui = useAui();
+  const config = AuiConfig({
     threadListItem: Derived({
       source: "threads",
       query: { type: "index", index, archived },
       get: (aui) => aui.threads.item({ index, archived }),
     }),
   });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
+  return (
+    <AuiProvider extends={aui} config={config}>
+      {children}
+    </AuiProvider>
+  );
 };

package/src/react/providers/ThreadListItemRuntimeProvider.tsx

@@ -1,5 +1,5 @@
 import type { FC, PropsWithChildren } from "react";
-import { useAui, AuiProvider } from "@assistant-ui/store";
+import { useAui, AuiConfig, AuiProvider } from "@assistant-ui/store";
 import type { ThreadListItemRuntime } from "../..";
 import { ThreadListItemClient } from "../../store/internal";
 
@@ -8,9 +8,13 @@ export const ThreadListItemRuntimeProvider: FC<
     runtime: ThreadListItemRuntime;
   }>
 > = ({ runtime, children }) => {
-  const aui = useAui({
+  const aui = useAui();
+  const config = AuiConfig({
     threadListItem: ThreadListItemClient({ runtime }),
   });
-
-  return <AuiProvider value={aui}>{children}</AuiProvider>;
+  return (
+    <AuiProvider extends={aui} config={config}>
+      {children}
+    </AuiProvider>
+  );
 };