@assistant-ui/react 0.12.19 → 0.12.21

package/dist/primitives/queueItem.js

@@ -0,0 +1,4 @@
+export { QueueItemPrimitiveText as Text } from "./queueItem/QueueItemText.js";
+export { QueueItemPrimitiveSteer as Steer } from "./queueItem/QueueItemSteer.js";
+export { QueueItemPrimitiveRemove as Remove } from "./queueItem/QueueItemRemove.js";
+//# sourceMappingURL=queueItem.js.map

package/dist/primitives/queueItem.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queueItem.js","sourceRoot":"","sources":["../../src/primitives/queueItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,IAAI,IAAI,EAAE,qCAAkC;AAC3E,OAAO,EAAE,uBAAuB,IAAI,KAAK,EAAE,sCAAmC;AAC9E,OAAO,EAAE,wBAAwB,IAAI,MAAM,EAAE,uCAAoC"}

package/dist/unstable/useToolMentionAdapter.d.ts

@@ -0,0 +1,42 @@
+import type { Unstable_MentionAdapter, Unstable_MentionItem } from "@assistant-ui/core";
+export type Unstable_ToolMentionAdapterOptions = {
+    /**
+     * Explicit list of tools to show in the mention picker.
+     * If provided, model context tools are NOT included unless
+     * `includeModelContextTools` is true.
+     */
+    tools?: readonly Unstable_MentionItem[] | undefined;
+    /**
+     * Include tools from the model context (registered via useAssistantTool).
+     * Defaults to true when `tools` is not provided, false otherwise.
+     */
+    includeModelContextTools?: boolean | undefined;
+    /**
+     * Custom function to format the display label for a tool.
+     * Receives the tool name (id) and returns the display label.
+     *
+     * @example
+     * ```ts
+     * formatLabel: (name) => name.replace(/_/g, " ").replace(/\b\w/g, c => c.toUpperCase())
+     * // "get_current_weather" → "Get Current Weather"
+     * ```
+     */
+    formatLabel?: ((toolName: string) => string) | undefined;
+    /** Custom label for the tools category. @default "Tools" */
+    categoryLabel?: string | undefined;
+};
+/**
+ * @deprecated This API is still under active development and might change without notice.
+ *
+ * Creates a MentionAdapter for tools. When a user types `@`, they see
+ * available tools and can mention them to hint the LLM to use a specific tool.
+ *
+ * @example
+ * ```tsx
+ * const mentionAdapter = unstable_useToolMentionAdapter({
+ *   formatLabel: (name) => name.replaceAll("_", " "),
+ * });
+ * ```
+ */
+export declare function unstable_useToolMentionAdapter(options?: Unstable_ToolMentionAdapterOptions): Unstable_MentionAdapter;
+//# sourceMappingURL=useToolMentionAdapter.d.ts.map

package/dist/unstable/useToolMentionAdapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useToolMentionAdapter.d.ts","sourceRoot":"","sources":["../../src/unstable/useToolMentionAdapter.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,uBAAuB,EAEvB,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,MAAM,kCAAkC,GAAG;IAC/C;;;;OAIG;IACH,KAAK,CAAC,EAAE,SAAS,oBAAoB,EAAE,GAAG,SAAS,CAAC;IAEpD;;;OAGG;IACH,wBAAwB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAE/C;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAC;IAEzD,4DAA4D;IAC5D,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAgB,8BAA8B,CAC5C,OAAO,CAAC,EAAE,kCAAkC,GAC3C,uBAAuB,CA0DzB"}

package/dist/unstable/useToolMentionAdapter.js

@@ -0,0 +1,65 @@
+"use client";
+import { useMemo } from "react";
+import { useAui } from "@assistant-ui/store";
+/**
+ * @deprecated This API is still under active development and might change without notice.
+ *
+ * Creates a MentionAdapter for tools. When a user types `@`, they see
+ * available tools and can mention them to hint the LLM to use a specific tool.
+ *
+ * @example
+ * ```tsx
+ * const mentionAdapter = unstable_useToolMentionAdapter({
+ *   formatLabel: (name) => name.replaceAll("_", " "),
+ * });
+ * ```
+ */
+export function unstable_useToolMentionAdapter(options) {
+    const aui = useAui();
+    const explicitTools = options?.tools;
+    const includeModelContext = options?.includeModelContextTools ?? !explicitTools;
+    const formatLabel = options?.formatLabel;
+    const categoryLabel = options?.categoryLabel;
+    return useMemo(() => {
+        const getTools = () => {
+            const items = [];
+            if (explicitTools) {
+                items.push(...explicitTools);
+            }
+            if (includeModelContext) {
+                const context = aui.thread().getModelContext();
+                const tools = context.tools;
+                if (tools) {
+                    for (const [name, tool] of Object.entries(tools)) {
+                        if (!items.some((i) => i.id === name)) {
+                            items.push({
+                                id: name,
+                                type: "tool",
+                                label: formatLabel ? formatLabel(name) : name,
+                                description: tool.description ?? undefined,
+                            });
+                        }
+                    }
+                }
+            }
+            return items;
+        };
+        return {
+            categories() {
+                return [
+                    { id: "tools", label: categoryLabel ?? "Tools", icon: undefined },
+                ];
+            },
+            categoryItems(_categoryId) {
+                return getTools();
+            },
+            search(query) {
+                const lower = query.toLowerCase();
+                return getTools().filter((item) => item.id.toLowerCase().includes(lower) ||
+                    item.label.toLowerCase().includes(lower) ||
+                    item.description?.toLowerCase().includes(lower));
+            },
+        };
+    }, [aui, explicitTools, includeModelContext, formatLabel, categoryLabel]);
+}
+//# sourceMappingURL=useToolMentionAdapter.js.map

package/dist/unstable/useToolMentionAdapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useToolMentionAdapter.js","sourceRoot":"","sources":["../../src/unstable/useToolMentionAdapter.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAqC7C;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,8BAA8B,CAC5C,OAA4C;IAE5C,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;IACrB,MAAM,aAAa,GAAG,OAAO,EAAE,KAAK,CAAC;IACrC,MAAM,mBAAmB,GACvB,OAAO,EAAE,wBAAwB,IAAI,CAAC,aAAa,CAAC;IACtD,MAAM,WAAW,GAAG,OAAO,EAAE,WAAW,CAAC;IACzC,MAAM,aAAa,GAAG,OAAO,EAAE,aAAa,CAAC;IAE7C,OAAO,OAAO,CAA0B,GAAG,EAAE;QAC3C,MAAM,QAAQ,GAAG,GAA2B,EAAE;YAC5C,MAAM,KAAK,GAA2B,EAAE,CAAC;YAEzC,IAAI,aAAa,EAAE,CAAC;gBAClB,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;YAC/B,CAAC;YAED,IAAI,mBAAmB,EAAE,CAAC;gBACxB,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,eAAe,EAAE,CAAC;gBAC/C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;gBAC5B,IAAI,KAAK,EAAE,CAAC;oBACV,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;wBACjD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;4BACtC,KAAK,CAAC,IAAI,CAAC;gCACT,EAAE,EAAE,IAAI;gCACR,IAAI,EAAE,MAAM;gCACZ,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;gCAC7C,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,SAAS;6BAC3C,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YAED,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QAEF,OAAO;YACL,UAAU;gBACR,OAAO;oBACL,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,aAAa,IAAI,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;iBAClE,CAAC;YACJ,CAAC;YAED,aAAa,CAAC,WAAmB;gBAC/B,OAAO,QAAQ,EAAE,CAAC;YACpB,CAAC;YAED,MAAM,CAAC,KAAa;gBAClB,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;gBAClC,OAAO,QAAQ,EAAE,CAAC,MAAM,CACtB,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC;oBACrC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC;oBACxC,IAAI,CAAC,WAAW,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAClD,CAAC;YACJ,CAAC;SACF,CAAC;IACJ,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;AAC5E,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react",
-  "version": "0.12.19",
+  "version": "0.12.21",
   "description": "TypeScript/React library for AI Chat",
   "keywords": [
     "radix-ui",
@@ -49,22 +49,22 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/core": "^0.1.7",
-    "@assistant-ui/store": "^0.2.3",
-    "@assistant-ui/tap": "^0.5.3",
+    "@assistant-ui/core": "^0.1.9",
+    "@assistant-ui/store": "^0.2.5",
+    "@assistant-ui/tap": "^0.5.5",
     "@radix-ui/primitive": "^1.1.3",
     "@radix-ui/react-compose-refs": "^1.1.2",
     "@radix-ui/react-context": "^1.1.3",
     "@radix-ui/react-primitive": "^2.1.4",
     "@radix-ui/react-use-callback-ref": "^1.1.1",
     "@radix-ui/react-use-escape-keydown": "^1.1.1",
-    "assistant-cloud": "^0.1.22",
-    "assistant-stream": "^0.3.6",
-    "nanoid": "^5.1.6",
+    "assistant-cloud": "^0.1.23",
+    "assistant-stream": "^0.3.8",
+    "nanoid": "^5.1.7",
     "radix-ui": "^1.4.3",
     "react-textarea-autosize": "^8.5.9",
     "zod": "^4.3.6",
-    "zustand": "^5.0.11"
+    "zustand": "^5.0.12"
   },
   "peerDependencies": {
     "@types/react": "*",
@@ -86,10 +86,10 @@
     "@types/node": "^25.5.0",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
-    "jsdom": "^28.1.0",
+    "jsdom": "^29.0.1",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
-    "vitest": "^4.1.0",
+    "vitest": "^4.1.1",
     "@assistant-ui/x-buildutils": "0.0.3"
   },
   "publishConfig": {

package/src/client/ExternalThread.ts

@@ -6,6 +6,7 @@ import {
   tapEffectEvent,
 } from "@assistant-ui/tap";
 import {
+  type ClientElement,
   type ClientOutput,
   tapClientLookup,
   attachTransformScopes,
@@ -14,34 +15,60 @@ import {
 } from "@assistant-ui/store";
 import { withKey } from "@assistant-ui/tap";
 import type {
+  AppendMessage,
   Attachment,
   CreateAttachment,
   ThreadAssistantMessagePart,
   ThreadUserMessagePart,
   ThreadMessage,
 } from "@assistant-ui/core";
+import type { QueueItemState } from "@assistant-ui/core/store";
+import type { ComposerSendOptions } from "@assistant-ui/core/store";
 import { ModelContext, Suggestions } from "@assistant-ui/core/store";
 import { Tools, DataRenderers } from "@assistant-ui/core/react";
+import { SingleThreadList } from "./SingleThreadList";
+
+const EMPTY_QUEUE_ITEMS: readonly QueueItemState[] = [];
 
 export type ExternalThreadMessage = ThreadMessage & {
   id: string;
 };
 
+export type ExternalThreadQueueAdapter = {
+  /** The current queue items. */
+  items: readonly QueueItemState[];
+  /** Called when a message is submitted via the composer. Receives the steer preference. */
+  enqueue: (message: AppendMessage, opts: { steer: boolean }) => void;
+  /** Called to promote an existing queue item (cancel current run, run this immediately). */
+  steer: (queueItemId: string) => void;
+  /** Called to remove an item from the queue. */
+  remove: (queueItemId: string) => void;
+  /** Called to clear all pending queue items, with the reason for clearing. */
+  clear: (reason: "edit" | "reload" | "cancel-run") => void;
+};
+
 export type ExternalThreadProps = {
   messages: readonly ExternalThreadMessage[];
   isRunning?: boolean;
-  onNew?: (message: any) => void;
-  onEdit?: (message: any) => void;
+  /**
+   * Callback for new messages (non-queue runtimes).
+   * @note Unused when `queue` is provided — new messages are routed through `queue.enqueue` instead.
+   */
+  onNew?: (message: AppendMessage) => void;
+  onEdit?: (message: AppendMessage) => void;
   onReload?: (parentId: string | null) => void;
   onStartRun?: () => void;
   onCancel?: () => void;
+  /** Queue adapter for runtimes that support message queuing and steering. */
+  queue?: ExternalThreadQueueAdapter;
 };
 
 type MessageClientProps = {
   message: ExternalThreadMessage;
   index: number;
-  onEdit?: (message: any) => void;
+  onEdit?: (message: AppendMessage) => void;
   onReload?: () => void;
+  queue?: ExternalThreadQueueAdapter | undefined;
 };
 
 // Message Client - minimal implementation
@@ -51,6 +78,7 @@ const MessageClient = resource(
     index,
     onEdit,
     onReload,
+    queue,
   }: MessageClientProps): ClientOutput<"message"> => {
     const [isCopied, setIsCopied] = tapState(false);
     const [isHovering, setIsHovering] = tapState(false);
@@ -86,7 +114,8 @@ const MessageClient = resource(
       setIsEditing(false);
     };
 
-    const handleSendEdit = (msg: any) => {
+    const handleSendEdit = (msg: AppendMessage) => {
+      queue?.clear("edit");
       onEdit?.({
         ...msg,
         parentId: message.id,
@@ -104,6 +133,7 @@ const MessageClient = resource(
         onBeginEdit: handleBeginEdit,
         onSend: handleSendEdit,
         message,
+        queue,
       }),
     );
 
@@ -214,10 +244,29 @@ type ComposerClientResourceProps = {
   canCancel: boolean;
   onCancel: () => void;
   onBeginEdit?: () => void;
-  onSend?: (message: any) => void;
+  onSend?: (message: AppendMessage) => void;
   message?: ExternalThreadMessage;
+  queue?: ExternalThreadQueueAdapter | undefined;
 };
 
+const QueueItemClient = resource(
+  ({
+    item,
+    onSteer,
+    onRemove,
+  }: {
+    item: QueueItemState;
+    onSteer: () => void;
+    onRemove: () => void;
+  }): ClientOutput<"queueItem"> => {
+    return {
+      getState: () => item,
+      steer: onSteer,
+      remove: onRemove,
+    };
+  },
+);
+
 // Composer Client - minimal implementation
 const ComposerClientResource = resource(
   ({
@@ -228,6 +277,7 @@ const ComposerClientResource = resource(
     onBeginEdit,
     onSend,
     message,
+    queue,
   }: ComposerClientResourceProps): ClientOutput<"composer"> => {
     const [text, setText] = tapState("");
     const [role, setRole] = tapState<"user" | "assistant" | "system">("user");
@@ -276,6 +326,22 @@ const ComposerClientResource = resource(
       [attachments],
     );
 
+    const queueItems = queue?.items ?? EMPTY_QUEUE_ITEMS;
+    const queueItemClients = tapClientLookup(
+      () =>
+        queueItems.map((item) =>
+          withKey(
+            item.id,
+            QueueItemClient({
+              item,
+              onSteer: () => queue?.steer(item.id),
+              onRemove: () => queue?.remove(item.id),
+            }),
+          ),
+        ),
+      [queueItems],
+    );
+
     const state = tapMemo(
       () => ({
         text,
@@ -289,6 +355,7 @@ const ComposerClientResource = resource(
         type,
         dictation: undefined,
         quote,
+        queue: queueItems,
       }),
       [
         text,
@@ -300,6 +367,7 @@ const ComposerClientResource = resource(
         type,
         attachments.length,
         quote,
+        queueItems,
       ],
     );
 
@@ -348,19 +416,25 @@ const ComposerClientResource = resource(
         setAttachments([]);
         setQuote(undefined);
       },
-      send: () => {
+      send: (opts?: ComposerSendOptions) => {
         const currentQuote = quote;
-        const message = {
+        const composedMessage: AppendMessage = {
           role,
           content: text ? [{ type: "text" as const, text }] : [],
           attachments: attachments as any,
           createdAt: new Date(),
+          parentId: null,
+          sourceId: null,
           runConfig,
           metadata: {
             custom: { ...(currentQuote ? { quote: currentQuote } : {}) },
           },
         };
-        onSend?.(message);
+        if (queue) {
+          queue.enqueue(composedMessage, { steer: opts?.steer ?? false });
+        } else {
+          onSend?.(composedMessage);
+        }
         setText("");
         setAttachments([]);
         setQuote(undefined);
@@ -372,6 +446,9 @@ const ComposerClientResource = resource(
       startDictation: () => {},
       stopDictation: () => {},
       setQuote,
+      queueItem: (selector: { index: number }) => {
+        return queueItemClients.get(selector);
+      },
     };
   },
 );
@@ -386,12 +463,14 @@ export const ExternalThread = resource(
     onReload,
     onStartRun,
     onCancel,
+    queue,
   }: ExternalThreadProps): ClientOutput<"thread"> => {
     const handleReload = (messageId: string) => {
       const messageIndex = messages.findIndex((m) => m.id === messageId);
       if (messageIndex === -1) return;
 
       const parentId = messageIndex > 0 ? messages[messageIndex - 1]!.id : null;
+      queue?.clear("reload");
       onReload?.(parentId);
     };
 
@@ -402,18 +481,20 @@ export const ExternalThread = resource(
             message: msg,
             index,
             onReload: () => handleReload(msg.id),
+            queue,
           };
           if (onEdit) props.onEdit = onEdit;
           return withKey(msg.id, MessageClient(props));
         }),
-      [messages, onEdit],
+      [messages, onEdit, queue],
     );
 
     const handleCancelRun = () => {
+      queue?.clear("cancel-run");
       onCancel?.();
     };
 
-    const handleSendNew = (message: any) => {
+    const handleSendNew = (message: AppendMessage) => {
       onNew?.(message);
     };
 
@@ -424,9 +505,11 @@ export const ExternalThread = resource(
         canCancel: isRunning,
         onCancel: handleCancelRun,
         onSend: handleSendNew,
+        queue,
       }),
     );
 
+    const hasQueue = !!queue;
     const state = tapMemo(() => {
       const messageStates = messageClients.state.map((s, idx, arr) => ({
         ...s,
@@ -449,6 +532,7 @@ export const ExternalThread = resource(
           switchBranchDuringRun: false,
           unstable_copy: false,
           dictation: false,
+          queue: hasQueue,
         },
         messages: messageStates,
         state: {},
@@ -457,13 +541,46 @@ export const ExternalThread = resource(
         speech: undefined,
         composer: composerClient.state,
       };
-    }, [messages, isRunning, messageClients.state, composerClient.state]);
+    }, [
+      messages,
+      isRunning,
+      hasQueue,
+      messageClients.state,
+      composerClient.state,
+    ]);
 
     return {
       getState: () => state,
       composer: () => composerClient.methods,
       append: (message) => {
-        onNew?.(message);
+        const appendMessage: AppendMessage =
+          typeof message === "string"
+            ? {
+                createdAt: new Date(),
+                parentId: messages.at(-1)?.id ?? null,
+                sourceId: null,
+                runConfig: {},
+                role: "user",
+                content: [{ type: "text", text: message }],
+                attachments: [],
+                metadata: { custom: {} },
+              }
+            : {
+                createdAt: message.createdAt ?? new Date(),
+                parentId: message.parentId ?? messages.at(-1)?.id ?? null,
+                sourceId: message.sourceId ?? null,
+                role: message.role ?? "user",
+                content: message.content,
+                attachments: message.attachments ?? [],
+                metadata: message.metadata ?? { custom: {} },
+                runConfig: message.runConfig ?? {},
+                startRun: message.startRun,
+              };
+        if (queue) {
+          queue.enqueue(appendMessage, { steer: false });
+        } else {
+          onNew?.(appendMessage);
+        }
       },
       startRun: () => {
         onStartRun?.();
@@ -489,29 +606,40 @@ export const ExternalThread = resource(
 );
 
 attachTransformScopes(ExternalThread, (scopes, parent) => {
-  const result = {
-    ...scopes,
-    composer:
-      scopes.composer ??
-      Derived({
-        source: "thread",
-        query: {},
-        get: (aui) => aui.thread().composer(),
-      }),
-  };
+  if (!scopes.threads && parent.threads.source === null) {
+    const threadElement = scopes.thread as ClientElement<"thread">;
+    scopes.threads = SingleThreadList({ thread: threadElement });
+    scopes.thread = Derived({
+      source: "threads",
+      query: { type: "main" },
+      get: (aui) => aui.threads().thread("main"),
+    });
+  }
+
+  if (!scopes.threadListItem && parent.threadListItem.source === null) {
+    scopes.threadListItem = Derived({
+      source: "threads",
+      query: { type: "main" },
+      get: (aui) => aui.threads().item("main"),
+    });
+  }
 
-  if (!result.modelContext && parent.modelContext.source === null) {
-    result.modelContext = ModelContext();
+  scopes.composer ??= Derived({
+    source: "thread",
+    query: {},
+    get: (aui) => aui.thread().composer(),
+  });
+
+  if (!scopes.modelContext && parent.modelContext.source === null) {
+    scopes.modelContext = ModelContext();
   }
-  if (!result.tools && parent.tools.source === null) {
-    result.tools = Tools({});
+  if (!scopes.tools && parent.tools.source === null) {
+    scopes.tools = Tools({});
   }
-  if (!result.dataRenderers && parent.dataRenderers.source === null) {
-    result.dataRenderers = DataRenderers();
+  if (!scopes.dataRenderers && parent.dataRenderers.source === null) {
+    scopes.dataRenderers = DataRenderers();
   }
-  if (!result.suggestions && parent.suggestions.source === null) {
-    result.suggestions = Suggestions();
+  if (!scopes.suggestions && parent.suggestions.source === null) {
+    scopes.suggestions = Suggestions();
   }
-
-  return result;
 });

package/src/client/InMemoryThreadList.ts

@@ -168,43 +168,32 @@ export const InMemoryThreadList = resource(
 );
 
 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();
+  scopes.thread ??= Derived({
+    source: "threads",
+    query: { type: "main" },
+    get: (aui) => aui.threads().thread("main"),
+  });
+  scopes.threadListItem ??= Derived({
+    source: "threads",
+    query: { type: "main" },
+    get: (aui) => aui.threads().item("main"),
+  });
+  scopes.composer ??= Derived({
+    source: "thread",
+    query: {},
+    get: (aui) => aui.threads().thread("main").composer(),
+  });
+
+  if (!scopes.modelContext && parent.modelContext.source === null) {
+    scopes.modelContext = ModelContext();
   }
-  if (!result.tools && parent.tools.source === null) {
-    result.tools = Tools({});
+  if (!scopes.tools && parent.tools.source === null) {
+    scopes.tools = Tools({});
   }
-  if (!result.dataRenderers && parent.dataRenderers.source === null) {
-    result.dataRenderers = DataRenderers();
+  if (!scopes.dataRenderers && parent.dataRenderers.source === null) {
+    scopes.dataRenderers = DataRenderers();
   }
-  if (!result.suggestions && parent.suggestions.source === null) {
-    result.suggestions = Suggestions();
+  if (!scopes.suggestions && parent.suggestions.source === null) {
+    scopes.suggestions = Suggestions();
   }
-
-  return result;
 });