@assistant-ui/react 0.12.0 → 0.12.3

package/dist/utils/idUtils.js

@@ -3,4 +3,7 @@ export const generateId = customAlphabet("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZab
 const optimisticPrefix = "__optimistic__";
 export const generateOptimisticId = () => `${optimisticPrefix}${generateId()}`;
 export const isOptimisticId = (id) => id.startsWith(optimisticPrefix);
+const errorPrefix = "__error__";
+export const generateErrorMessageId = () => `${errorPrefix}${generateId()}`;
+export const isErrorMessageId = (id) => id.startsWith(errorPrefix);
 //# sourceMappingURL=idUtils.js.map

package/dist/utils/idUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"idUtils.js","sourceRoot":"","sources":["../../src/utils/idUtils.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,CAAC,MAAM,UAAU,GAAG,cAAc,CACtC,gEAAgE,EAChE,CAAC,CACF,CAAC;AAEF,MAAM,gBAAgB,GAAG,gBAAgB,CAAC;AAC1C,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,GAAG,gBAAgB,GAAG,UAAU,EAAE,EAAE,CAAC;AAC/E,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC"}
+{"version":3,"file":"idUtils.js","sourceRoot":"","sources":["../../src/utils/idUtils.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,CAAC,MAAM,UAAU,GAAG,cAAc,CACtC,gEAAgE,EAChE,CAAC,CACF,CAAC;AAEF,MAAM,gBAAgB,GAAG,gBAAgB,CAAC;AAC1C,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,GAAG,gBAAgB,GAAG,UAAU,EAAE,EAAE,CAAC;AAC/E,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AAE9E,MAAM,WAAW,GAAG,WAAW,CAAC;AAChC,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,EAAE,CAAC,GAAG,WAAW,GAAG,UAAU,EAAE,EAAE,CAAC;AAC5E,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react",
-  "version": "0.12.0",
+  "version": "0.12.3",
   "description": "TypeScript/React library for AI Chat",
   "keywords": [
     "radix-ui",
@@ -49,9 +49,9 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "assistant-cloud": "^0.1.13",
-    "@assistant-ui/tap": "^0.4.0",
-    "@assistant-ui/store": "^0.1.0",
+    "assistant-cloud": "^0.1.15",
+    "@assistant-ui/tap": "^0.4.2",
+    "@assistant-ui/store": "^0.1.2",
     "@radix-ui/primitive": "^1.1.3",
     "@radix-ui/react-compose-refs": "^1.1.2",
     "@radix-ui/react-context": "^1.1.3",
@@ -61,10 +61,10 @@
     "@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.2.47",
+    "assistant-stream": "^0.3.0",
     "nanoid": "^5.1.6",
     "react-textarea-autosize": "^8.5.9",
-    "zod": "^4.3.5",
+    "zod": "^4.3.6",
     "zustand": "^5.0.10"
   },
   "peerDependencies": {
@@ -83,12 +83,12 @@
   },
   "devDependencies": {
     "@types/json-schema": "^7.0.15",
-    "@types/node": "^25.0.9",
+    "@types/node": "^25.0.10",
     "@types/react": "^19.2.9",
     "@types/react-dom": "^19.2.3",
-    "react": "^19.2.3",
-    "react-dom": "^19.2.3",
-    "vitest": "^4.0.17",
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4",
+    "vitest": "^4.0.18",
     "@assistant-ui/x-buildutils": "0.0.1"
   },
   "publishConfig": {

package/src/client/Suggestions.ts

@@ -0,0 +1,74 @@
+import { resource, tapState, withKey } from "@assistant-ui/tap";
+import { type ClientOutput, tapClientLookup } from "@assistant-ui/store";
+import type { SuggestionsState, SuggestionState } from "../types/scopes";
+
+export type SuggestionConfig =
+  | string
+  | { title: string; label: string; prompt: string };
+
+const SuggestionClient = resource(
+  (state: SuggestionState): ClientOutput<"suggestion"> => {
+    return {
+      state,
+      methods: {
+        getState: () => state,
+      },
+    };
+  },
+);
+
+const SuggestionsResource = resource(
+  (suggestions?: SuggestionConfig[]): ClientOutput<"suggestions"> => {
+    const [state] = tapState<SuggestionsState>(() => {
+      const normalizedSuggestions = (suggestions ?? []).map((s) => {
+        if (typeof s === "string") {
+          return {
+            title: s,
+            label: "",
+            prompt: s,
+          };
+        }
+        return {
+          title: s.title,
+          label: s.label,
+          prompt: s.prompt,
+        };
+      });
+
+      return {
+        suggestions: normalizedSuggestions,
+      };
+    });
+
+    const suggestionClients = tapClientLookup(
+      () =>
+        state.suggestions.map((suggestion, index) =>
+          withKey(index, SuggestionClient(suggestion)),
+        ),
+      [state.suggestions],
+    );
+
+    return {
+      state,
+      methods: {
+        getState: () => state,
+        suggestion: ({ index }: { index: number }) => {
+          return suggestionClients.get({ index });
+        },
+      },
+    };
+  },
+);
+
+export const Suggestions: {
+  (): import("@assistant-ui/tap").ResourceElement<
+    ClientOutput<"suggestions">,
+    undefined
+  >;
+  (
+    suggestions: SuggestionConfig[],
+  ): import("@assistant-ui/tap").ResourceElement<
+    ClientOutput<"suggestions">,
+    SuggestionConfig[]
+  >;
+} = SuggestionsResource as any;

package/src/client/Tools.ts

@@ -1,9 +1,14 @@
 import { resource, tapState, tapEffect, tapCallback } from "@assistant-ui/tap";
-import { tapAssistantClientRef, type ClientOutput } from "@assistant-ui/store";
+import {
+  tapAssistantClientRef,
+  type ClientOutput,
+  attachDefaultPeers,
+} 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";
 
 export const Tools = resource(
   ({ toolkit }: { toolkit?: Toolkit }): ClientOutput<"tools"> => {
@@ -86,3 +91,7 @@ export const Tools = resource(
     };
   },
 );
+
+attachDefaultPeers(Tools, {
+  modelContext: ModelContext(),
+});

package/src/context/providers/SuggestionByIndexProvider.tsx

@@ -0,0 +1,23 @@
+"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>;
+};

package/src/context/providers/ThreadListItemProvider.tsx

@@ -2,6 +2,8 @@
 
 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";
 
 export const ThreadListItemByIndexProvider: FC<
   PropsWithChildren<{
@@ -20,17 +22,13 @@ export const ThreadListItemByIndexProvider: FC<
   return <AuiProvider value={aui}>{children}</AuiProvider>;
 };
 
-export const ThreadListItemByIdProvider: FC<
+export const ThreadListItemRuntimeProvider: FC<
   PropsWithChildren<{
-    id: string;
+    runtime: ThreadListItemRuntime;
   }>
-> = ({ id, children }) => {
+> = ({ runtime, children }) => {
   const aui = useAui({
-    threadListItem: Derived({
-      source: "threads",
-      query: { type: "id", id },
-      get: (aui) => aui.threads().item({ id }),
-    }),
+    threadListItem: ThreadListItemClient({ runtime }),
   });
 
   return <AuiProvider value={aui}>{children}</AuiProvider>;

package/src/context/providers/index.ts

@@ -1,9 +1,10 @@
 export { AssistantRuntimeProvider } from "../../legacy-runtime/AssistantRuntimeProvider";
 export {
   ThreadListItemByIndexProvider,
-  ThreadListItemByIdProvider,
+  ThreadListItemRuntimeProvider,
 } from "./ThreadListItemProvider";
 export { MessageByIndexProvider } from "./MessageByIndexProvider";
+export { SuggestionByIndexProvider } from "./SuggestionByIndexProvider";
 export { PartByIndexProvider } from "./PartByIndexProvider";
 export {
   MessageAttachmentByIndexProvider,

package/src/legacy-runtime/AssistantRuntimeProvider.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { FC, memo, PropsWithChildren } from "react";
-import { useAui, AuiProvider } from "@assistant-ui/store";
+import { useAui, AuiProvider, AssistantClient } from "@assistant-ui/store";
 import { AssistantRuntime } from "./runtime/AssistantRuntime";
 import { AssistantRuntimeCore } from "./runtime-cores/core/AssistantRuntimeCore";
 import { RuntimeAdapter } from "./RuntimeAdapter";
@@ -13,6 +13,11 @@ export namespace AssistantRuntimeProvider {
      * The runtime to provide to the rest of your app.
      */
     runtime: AssistantRuntime;
+
+    /**
+     * The aui instance to extend. If not provided, a new aui instance will be created.
+     */
+    aui?: AssistantClient;
   }>;
 }
 
@@ -22,10 +27,8 @@ const getRenderComponent = (runtime: AssistantRuntime) => {
 
 export const AssistantRuntimeProviderImpl: FC<
   AssistantRuntimeProvider.Props
-> = ({ children, runtime }) => {
-  const aui = useAui({
-    threads: RuntimeAdapter(runtime),
-  });
+> = ({ children, aui: parent = null, runtime }) => {
+  const aui = useAui({ threads: RuntimeAdapter(runtime) }, { parent: parent });
 
   const RenderComponent = getRenderComponent(runtime);
 

package/src/legacy-runtime/RuntimeAdapter.ts

@@ -7,7 +7,7 @@ import {
   attachDefaultPeers,
 } from "@assistant-ui/store";
 import { ModelContext } from "../client/ModelContextClient";
-import { Tools } from "../model-context";
+import { Tools, Suggestions } from "../model-context";
 
 export const RuntimeAdapter = resource((runtime: AssistantRuntime) => {
   const clientRef = tapAssistantClientRef();
@@ -29,6 +29,7 @@ export const RuntimeAdapter = resource((runtime: AssistantRuntime) => {
 attachDefaultPeers(RuntimeAdapter, {
   modelContext: ModelContext(),
   tools: Tools({}),
+  suggestions: Suggestions(),
   threadListItem: Derived({
     source: "threads",
     query: { type: "main" },

package/src/legacy-runtime/client/ThreadListRuntimeClient.ts

@@ -57,10 +57,10 @@ export const ThreadListClient = resource(
     const state = tapMemo<ThreadsState>(() => {
       return {
         mainThreadId: runtimeState.mainThreadId,
-        newThreadId: runtimeState.newThread ?? null,
+        newThreadId: runtimeState.newThreadId ?? null,
         isLoading: runtimeState.isLoading,
-        threadIds: runtimeState.threads,
-        archivedThreadIds: runtimeState.archivedThreads,
+        threadIds: runtimeState.threadIds,
+        archivedThreadIds: runtimeState.archivedThreadIds,
         threadItems: threadItems.state,
 
         main: main.state,

package/src/legacy-runtime/runtime/RuntimeBindings.ts

@@ -64,10 +64,6 @@ export type ThreadListItemState = {
   readonly id: string;
   readonly remoteId: string | undefined;
   readonly externalId: string | undefined;
-  /**
-   * @deprecated Use `id` instead. This field will be removed in version 0.12.0.
-   */
-  readonly threadId: string;
   readonly status: ThreadListItemStatus;
   readonly title?: string | undefined;
 };

package/src/legacy-runtime/runtime/ThreadListRuntime.ts

@@ -18,9 +18,9 @@ import { NestedSubscriptionSubject } from "./subscribable/NestedSubscriptionSubj
 
 export type ThreadListState = {
   readonly mainThreadId: string;
-  readonly newThread: string | undefined;
-  readonly threads: readonly string[];
-  readonly archivedThreads: readonly string[];
+  readonly newThreadId: string | undefined;
+  readonly threadIds: readonly string[];
+  readonly archivedThreadIds: readonly string[];
   readonly isLoading: boolean;
   readonly threadItems: Readonly<
     Record<string, Omit<ThreadListItemState, "isMain" | "threadId">>
@@ -49,11 +49,11 @@ const getThreadListState = (
 ): ThreadListState => {
   return {
     mainThreadId: threadList.mainThreadId,
-    newThread: threadList.newThreadId,
-    threads: threadList.threadIds,
-    archivedThreads: threadList.archivedThreadIds,
+    newThreadId: threadList.newThreadId,
+    threadIds: threadList.threadIds,
+    archivedThreadIds: threadList.archivedThreadIds,
     isLoading: threadList.isLoading,
-    threadItems: threadList.threadData,
+    threadItems: threadList.threadItems,
   };
 };
 
@@ -67,7 +67,6 @@ const getThreadListItemState = (
   if (!threadData) return SKIP_UPDATE;
   return {
     id: threadData.id,
-    threadId: threadData.id, // TODO remove in 0.12.0
     remoteId: threadData.remoteId,
     externalId: threadData.externalId,
     title: threadData.title,

package/src/legacy-runtime/runtime-cores/assistant-transport/useAssistantTransportRuntime.tsx

@@ -15,6 +15,7 @@ import {
   DataStreamDecoder,
   AssistantTransportDecoder,
   unstable_createInitialMessage as createInitialMessage,
+  toToolsJSONSchema,
 } from "assistant-stream";
 import {
   AssistantTransportOptions,
@@ -28,7 +29,7 @@ import { useCommandQueue } from "./commandQueue";
 import { useRunManager } from "./runManager";
 import { useConvertedState } from "./useConvertedState";
 import { ToolExecutionStatus, useToolInvocations } from "./useToolInvocations";
-import { toAISDKTools, getEnabledTools, createRequestHeaders } from "./utils";
+import { createRequestHeaders } from "./utils";
 import { useRemoteThreadListRuntime } from "../remote-thread-list/useRemoteThreadListRuntime";
 import { InMemoryThreadListAdapter } from "../remote-thread-list/adapter/in-memory";
 import { useAui, useAuiState } from "@assistant-ui/store";
@@ -115,9 +116,7 @@ const useAssistantTransportThreadRuntime = <T,>(
             commands,
             state: agentStateRef.current,
             system: context.system,
-            tools: context.tools
-              ? toAISDKTools(getEnabledTools(context.tools))
-              : undefined,
+            tools: context.tools ? toToolsJSONSchema(context.tools) : undefined,
             threadId,
             ...(parentIdRef.current !== undefined && {
               parentId: parentIdRef.current,

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

@@ -1,42 +1,37 @@
-import { Tool } from "assistant-stream";
-import type { JSONSchema7 } from "json-schema";
-import { z } from "zod";
+import { Tool, toToolsJSONSchema, type ToolJSONSchema } from "assistant-stream";
 
-// Convert tools to AI SDK format
-export const toAISDKTools = (tools: Record<string, Tool>) => {
-  return Object.fromEntries(
-    Object.entries(tools).map(([name, tool]) => [
-      name,
-      {
-        ...(tool.description ? { description: tool.description } : undefined),
-        parameters: (tool.parameters instanceof z.ZodType
-          ? z.toJSONSchema(tool.parameters)
-          : tool.parameters) as JSONSchema7,
-      },
-    ]),
-  );
-};
+/**
+ * @deprecated Use `toToolsJSONSchema` from `assistant-stream` instead.
+ */
+export function toAISDKTools(
+  tools: Record<string, Tool>,
+): Record<string, ToolJSONSchema> {
+  return toToolsJSONSchema(tools, { filter: () => true });
+}
 
-// Filter enabled tools
-export const getEnabledTools = (tools: Record<string, Tool>) => {
+/**
+ * @deprecated Use `toToolsJSONSchema` from `assistant-stream` instead, which includes filtering by default.
+ */
+export function getEnabledTools(
+  tools: Record<string, Tool>,
+): Record<string, Tool> {
   return Object.fromEntries(
     Object.entries(tools).filter(
       ([, tool]) => !tool.disabled && tool.type !== "backend",
     ),
   );
-};
+}
 
-// Create headers for fetch request
-export const createRequestHeaders = async (
+export async function createRequestHeaders(
   headersValue:
     | Record<string, string>
     | Headers
     | (() => Promise<Record<string, string> | Headers>),
-): Promise<Headers> => {
+): Promise<Headers> {
   const resolvedHeaders =
     typeof headersValue === "function" ? await headersValue() : headersValue;
 
   const headers = new Headers(resolvedHeaders);
   headers.set("Content-Type", "application/json");
   return headers;
-};
+}

package/src/legacy-runtime/runtime-cores/core/ThreadListRuntimeCore.tsx

@@ -21,7 +21,7 @@ export type ThreadListRuntimeCore = {
   threadIds: readonly string[];
   archivedThreadIds: readonly string[];
 
-  readonly threadData: Readonly<Record<string, ThreadListItemCoreState>>;
+  readonly threadItems: Readonly<Record<string, ThreadListItemCoreState>>;
 
   getMainThreadRuntimeCore(): ThreadRuntimeCore;
   getThreadRuntimeCore(threadId: string): ThreadRuntimeCore;

package/src/legacy-runtime/runtime-cores/external-store/ExternalStoreThreadListRuntimeCore.tsx

@@ -47,7 +47,7 @@ export class ExternalStoreThreadListRuntimeCore
     return this._archivedThreads;
   }
 
-  public get threadData() {
+  public get threadItems() {
     return this._threadData;
   }
 

package/src/legacy-runtime/runtime-cores/external-store/external-message-converter.tsx

@@ -11,6 +11,8 @@ import { getAutoStatus, isAutoStatus } from "./auto-status";
 import { ThreadMessage, ToolCallMessagePart } from "../../../types";
 import { ToolExecutionStatus } from "../assistant-transport/useToolInvocations";
 import { ReadonlyJSONValue } from "assistant-stream/utils";
+import { generateErrorMessageId } from "../../../utils/idUtils";
+import { ThreadAssistantMessage } from "../../../types/AssistantTypes";
 
 export namespace useExternalMessageConverter {
   export type Message =
@@ -262,6 +264,28 @@ const chunkExternalMessages = <T,>(
   return results;
 };
 
+function createErrorAssistantMessage(
+  error: ReadonlyJSONValue,
+): ThreadAssistantMessage {
+  return Object.assign<ThreadAssistantMessage, { [symbolInnerMessage]: [] }>(
+    {
+      id: generateErrorMessageId(),
+      role: "assistant",
+      content: [],
+      status: { type: "incomplete", reason: "error", error },
+      createdAt: new Date(),
+      metadata: {
+        unstable_state: null,
+        unstable_annotations: [],
+        unstable_data: [],
+        custom: {},
+        steps: [],
+      },
+    },
+    { [symbolInnerMessage]: [] },
+  );
+}
+
 export const convertExternalMessages = <T extends WeakKey>(
   messages: T[],
   callback: useExternalMessageConverter.Callback<T>,
@@ -278,14 +302,9 @@ export const convertExternalMessages = <T extends WeakKey>(
 
   const chunks = chunkExternalMessages(callbackResults);
 
-  return chunks.map((message, idx) => {
+  const result = chunks.map((message, idx) => {
     const isLast = idx === chunks.length - 1;
     const joined = joinExternalMessages(message.outputs);
-    const hasSuspendedToolCalls =
-      typeof joined.content === "object" &&
-      joined.content.some(
-        (c) => c.type === "tool-call" && c.result === undefined,
-      );
     const hasPendingToolCalls =
       typeof joined.content === "object" &&
       joined.content.some(
@@ -294,7 +313,7 @@ export const convertExternalMessages = <T extends WeakKey>(
     const autoStatus = getAutoStatus(
       isLast,
       isRunning,
-      hasSuspendedToolCalls,
+      hasPendingToolCalls,
       hasPendingToolCalls,
       isLast ? metadata.error : undefined,
     );
@@ -306,6 +325,15 @@ export const convertExternalMessages = <T extends WeakKey>(
     (newMessage as any)[symbolInnerMessage] = message.inputs;
     return newMessage;
   });
+
+  if (metadata.error) {
+    const lastMessage = result.at(-1);
+    if (!lastMessage || lastMessage.role !== "assistant") {
+      result.push(createErrorAssistantMessage(metadata.error));
+    }
+  }
+
+  return result;
 };
 
 export const useExternalMessageConverter = <T extends WeakKey>({
@@ -411,6 +439,13 @@ export const useExternalMessageConverter = <T extends WeakKey>({
       symbolInnerMessage
     ] = messages;
 
+    if (state.metadata.error) {
+      const lastMessage = threadMessages.at(-1);
+      if (!lastMessage || lastMessage.role !== "assistant") {
+        threadMessages.push(createErrorAssistantMessage(state.metadata.error));
+      }
+    }
+
     return threadMessages;
   }, [state, messages, isRunning, joinStrategy]);
 };

package/src/legacy-runtime/runtime-cores/local/LocalThreadListRuntimeCore.tsx

@@ -50,7 +50,7 @@ export class LocalThreadListRuntimeCore
     return DEFAULT_THREAD_ID;
   }
 
-  public get threadData() {
+  public get threadItems() {
     return DEFAULT_THREAD_DATA;
   }
 

package/src/legacy-runtime/runtime-cores/remote-thread-list/BaseSubscribable.tsx

@@ -31,6 +31,9 @@ export class BaseSubscribable {
       if (errors.length === 1) {
         throw errors[0];
       } else {
+        for (const error of errors) {
+          console.error(error);
+        }
         throw new AggregateError(errors);
       }
     }

package/src/legacy-runtime/runtime-cores/remote-thread-list/RemoteThreadListHookInstanceManager.tsx

@@ -8,13 +8,19 @@ import {
   memo,
   PropsWithChildren,
   ComponentType,
+  useMemo,
 } from "react";
 import { UseBoundStore, StoreApi, create } from "zustand";
 import { useAui } from "@assistant-ui/store";
-import { ThreadListItemByIdProvider } from "../../../context/providers";
-import { ThreadRuntimeCore, ThreadRuntimeImpl } from "../../../internal";
+import { ThreadListItemRuntimeProvider } from "../../../context/providers";
+import {
+  ThreadListRuntimeCore,
+  ThreadRuntimeCore,
+  ThreadRuntimeImpl,
+} from "../../../internal";
 import { BaseSubscribable } from "./BaseSubscribable";
 import { AssistantRuntime } from "../../runtime";
+import { ThreadListRuntimeImpl } from "../../runtime/ThreadListRuntime";
 
 type RemoteThreadListHook = () => AssistantRuntime;
 
@@ -27,9 +33,14 @@ export class RemoteThreadListHookInstanceManager extends BaseSubscribable {
   >;
   private instances = new Map<string, RemoteThreadListHookInstance>();
   private useAliveThreadsKeysChanged = create(() => ({}));
+  private parent: ThreadListRuntimeCore;
 
-  constructor(runtimeHook: RemoteThreadListHook) {
+  constructor(
+    runtimeHook: RemoteThreadListHook,
+    parent: ThreadListRuntimeCore,
+  ) {
     super();
+    this.parent = parent;
     this.useRuntimeHook = create(() => ({ useRuntime: runtimeHook }));
   }
 
@@ -139,14 +150,17 @@ export class RemoteThreadListHookInstanceManager extends BaseSubscribable {
     threadId: string;
     provider: ComponentType<PropsWithChildren>;
   }> = memo(({ threadId, provider: Provider }) => {
-    // Runtime is provided by ThreadListItemByIdProvider
+    const runtime = useMemo(
+      () => new ThreadListRuntimeImpl(this.parent).getItemById(threadId),
+      [threadId],
+    );
 
     return (
-      <ThreadListItemByIdProvider id={threadId}>
+      <ThreadListItemRuntimeProvider runtime={runtime}>
         <Provider>
           <this._InnerActiveThreadProvider threadId={threadId} />
         </Provider>
-      </ThreadListItemByIdProvider>
+      </ThreadListItemRuntimeProvider>
     );
   });
 

package/src/legacy-runtime/runtime-cores/remote-thread-list/RemoteThreadListThreadListRuntimeCore.tsx

@@ -156,7 +156,7 @@ export class RemoteThreadListThreadListRuntimeCore
     threadData: {},
   });
 
-  public get threadData() {
+  public get threadItems() {
     return this._state.value.threadData;
   }
 
@@ -240,12 +240,12 @@ export class RemoteThreadListThreadListRuntimeCore
     this._state.subscribe(() => this._notifySubscribers());
     this._hookManager = new RemoteThreadListHookInstanceManager(
       options.runtimeHook,
+      this,
     );
     this.useProvider = create(() => ({
       Provider: options.adapter.unstable_Provider ?? Fragment,
     }));
     this.__internal_setOptions(options);
-
     this.switchToNewThread();
   }
 

package/src/model-context/index.ts

@@ -23,5 +23,7 @@ export type { Toolkit, ToolDefinition } from "./toolbox";
 
 export { Tools } from "../client/Tools";
 
+export { Suggestions, type SuggestionConfig } from "../client/Suggestions";
+
 export * from "./registry";
 export * from "./frame";