@assistant-ui/react 0.10.24 → 0.10.26

package/src/runtimes/external-store/ExternalStoreThreadListRuntimeCore.tsx

@@ -24,6 +24,10 @@ export class ExternalStoreThreadListRuntimeCore
   private _threads: readonly string[] = DEFAULT_THREADS;
   private _archivedThreads: readonly string[] = EMPTY_ARRAY;
 
+  public get isLoading() {
+    return this.adapter.isLoading ?? false;
+  }
+
   public get newThreadId() {
     return undefined;
   }

package/src/runtimes/external-store/ExternalStoreThreadRuntimeCore.tsx

@@ -53,6 +53,9 @@ export class ExternalStoreThreadRuntimeCore
 
   private _messages!: readonly ThreadMessage[];
   public isDisabled!: boolean;
+  public get isLoading() {
+    return this._store.isLoading ?? false;
+  }
 
   public override get messages() {
     return this._messages;
@@ -249,14 +252,6 @@ export class ExternalStoreThreadRuntimeCore
   public addToolResult(options: AddToolResultOptions) {
     if (!this._store.onAddToolResult && !this._store.onAddToolResult)
       throw new Error("Runtime does not support tool results.");
-    this._store.onAddToolResult?.({
-      messageId: options.messageId,
-      toolName: options.toolName,
-      toolCallId: options.toolCallId,
-      result: options.result,
-      isError: options.isError,
-      artifact: options.artifact,
-    });
     this._store.onAddToolResult?.(options);
   }
 

package/src/runtimes/external-store/ThreadMessageLike.tsx

@@ -1,22 +1,22 @@
 import { parsePartialJsonObject } from "assistant-stream/utils";
-import { generateId } from "../../internal";
+import { generateId } from "../../utils/idUtils";
 import {
   MessageStatus,
-  TextContentPart,
-  ImageContentPart,
+  TextMessagePart,
+  ImageMessagePart,
   ThreadMessage,
-  ThreadAssistantContentPart,
+  ThreadAssistantMessagePart,
   ThreadAssistantMessage,
-  ThreadUserContentPart,
+  ThreadUserMessagePart,
   ThreadUserMessage,
   ThreadSystemMessage,
   CompleteAttachment,
-  FileContentPart,
-  Unstable_AudioContentPart,
+  FileMessagePart,
+  Unstable_AudioMessagePart,
 } from "../../types";
 import {
-  ReasoningContentPart,
-  SourceContentPart,
+  ReasoningMessagePart,
+  SourceMessagePart,
   ThreadStep,
 } from "../../types/AssistantTypes";
 import { ReadonlyJSONObject, ReadonlyJSONValue } from "assistant-stream/utils";
@@ -26,12 +26,12 @@ export type ThreadMessageLike = {
   readonly content:
     | string
     | readonly (
-        | TextContentPart
-        | ReasoningContentPart
-        | SourceContentPart
-        | ImageContentPart
-        | FileContentPart
-        | Unstable_AudioContentPart
+        | TextMessagePart
+        | ReasoningMessagePart
+        | SourceMessagePart
+        | ImageMessagePart
+        | FileMessagePart
+        | Unstable_AudioMessagePart
         | {
             readonly type: "tool-call";
             readonly toolCallId?: string;
@@ -91,7 +91,7 @@ export const fromThreadMessageLike = (
         ...common,
         role,
         content: content
-          .map((part): ThreadAssistantContentPart | null => {
+          .map((part): ThreadAssistantMessagePart | null => {
             const type = part.type;
             switch (type) {
               case "text":
@@ -126,7 +126,7 @@ export const fromThreadMessageLike = (
               default: {
                 const unhandledType: "image" | "audio" = type;
                 throw new Error(
-                  `Unsupported assistant content part type: ${unhandledType}`,
+                  `Unsupported assistant message part type: ${unhandledType}`,
                 );
               }
             }
@@ -146,7 +146,7 @@ export const fromThreadMessageLike = (
       return {
         ...common,
         role,
-        content: content.map((part): ThreadUserContentPart => {
+        content: content.map((part): ThreadUserMessagePart => {
           const type = part.type;
           switch (type) {
             case "text":
@@ -158,7 +158,7 @@ export const fromThreadMessageLike = (
             default: {
               const unhandledType: "tool-call" | "reasoning" | "source" = type;
               throw new Error(
-                `Unsupported user content part type: ${unhandledType}`,
+                `Unsupported user message part type: ${unhandledType}`,
               );
             }
           }
@@ -172,13 +172,13 @@ export const fromThreadMessageLike = (
     case "system":
       if (content.length !== 1 || content[0]!.type !== "text")
         throw new Error(
-          "System messages must have exactly one text content part.",
+          "System messages must have exactly one text message part.",
         );
 
       return {
         ...common,
         role,
-        content: content as [TextContentPart],
+        content: content as [TextMessagePart],
         metadata: {
           custom: metadata?.custom ?? {},
         },

package/src/runtimes/external-store/createMessageConverter.tsx

@@ -1,6 +1,6 @@
 "use client";
 import { ThreadState } from "../../api";
-import { useContentPart, useMessage } from "../../context";
+import { useMessagePart, useMessage } from "../../context";
 import { ThreadMessage } from "../../types";
 import {
   useExternalMessageConverter,
@@ -50,13 +50,13 @@ export const createMessageConverter = <T extends object>(
       return first;
     },
     useOriginalMessages: () => {
-      const contentPartMessages = useContentPart<T[]>({
+      const MessagePartMessages = useMessagePart<T[]>({
         optional: true,
         selector: getExternalStoreMessages,
       });
 
       const messageMessages = useMessage<T[]>(getExternalStoreMessages);
-      const messages = contentPartMessages ?? messageMessages;
+      const messages = MessagePartMessages ?? messageMessages;
       if (messages.length === 0) throw new Error("No original messages found");
       return messages;
     },

package/src/runtimes/external-store/external-message-converter.tsx

@@ -8,7 +8,7 @@ import {
 } from "./getExternalStoreMessage";
 import { fromThreadMessageLike, ThreadMessageLike } from "./ThreadMessageLike";
 import { getAutoStatus, isAutoStatus } from "./auto-status";
-import { ToolCallContentPart } from "../../types";
+import { ToolCallMessagePart } from "../../types";
 
 export namespace useExternalMessageConverter {
   export type Message =
@@ -61,7 +61,7 @@ const joinExternalMessages = (
       if (toolCallIdx !== -1) {
         const toolCall = assistantMessage.content[
           toolCallIdx
-        ]! as ToolCallContentPart;
+        ]! as ToolCallMessagePart;
         if (output.toolName) {
           if (toolCall.toolName !== output.toolName)
             throw new Error(

package/src/runtimes/local/ChatModelAdapter.tsx

@@ -1,25 +1,25 @@
 import type {
-  FileContentPart,
+  FileMessagePart,
   MessageStatus,
-  ReasoningContentPart,
+  ReasoningMessagePart,
   RunConfig,
-  SourceContentPart,
-  TextContentPart,
-  ThreadAssistantContentPart,
+  SourceMessagePart,
+  TextMessagePart,
+  ThreadAssistantMessagePart,
   ThreadMessage,
   ThreadStep,
-  ToolCallContentPart,
+  ToolCallMessagePart,
 } from "../../types/AssistantTypes";
 import type { ModelContext } from "../../model-context/ModelContextTypes";
 import { ReadonlyJSONValue } from "assistant-stream/utils";
 
 export type ChatModelRunUpdate = {
-  readonly content: readonly ThreadAssistantContentPart[];
+  readonly content: readonly ThreadAssistantMessagePart[];
   readonly metadata?: Record<string, unknown>;
 };
 
 export type ChatModelRunResult = {
-  readonly content?: readonly ThreadAssistantContentPart[] | undefined;
+  readonly content?: readonly ThreadAssistantMessagePart[] | undefined;
   readonly status?: MessageStatus | undefined;
   readonly metadata?: {
     readonly unstable_state?: ReadonlyJSONValue;
@@ -32,11 +32,11 @@ export type ChatModelRunResult = {
 
 export type CoreChatModelRunResult = Omit<ChatModelRunResult, "content"> & {
   readonly content: readonly (
-    | TextContentPart
-    | ReasoningContentPart
-    | ToolCallContentPart
-    | SourceContentPart
-    | FileContentPart
+    | TextMessagePart
+    | ReasoningMessagePart
+    | ToolCallMessagePart
+    | SourceMessagePart
+    | FileMessagePart
   )[];
 };
 

package/src/runtimes/local/LocalThreadListRuntimeCore.tsx

@@ -16,6 +16,10 @@ export class LocalThreadListRuntimeCore
     this._mainThread = _threadFactory();
   }
 
+  public get isLoading() {
+    return false;
+  }
+
   public getMainThreadRuntimeCore() {
     return this._mainThread;
   }

package/src/runtimes/local/LocalThreadRuntimeCore.tsx

@@ -33,6 +33,11 @@ export class LocalThreadRuntimeCore
 
   public readonly isDisabled = false;
 
+  private _isLoading = false;
+  public get isLoading() {
+    return this._isLoading;
+  }
+
   private _suggestions: readonly ThreadSuggestion[] = [];
   private _suggestionsController: AbortController | null = null;
   public get suggestions(): readonly ThreadSuggestion[] {
@@ -93,23 +98,33 @@ export class LocalThreadRuntimeCore
 
     const promise = this.adapters.history?.load() ?? Promise.resolve(null);
 
-    this._loadPromise = promise.then((repo) => {
-      if (!repo) return;
-      this.repository.import(repo);
-      this._notifySubscribers();
+    this._isLoading = true;
+    this._notifySubscribers();
 
-      const resume = this.adapters.history?.resume?.bind(this.adapters.history);
-      if (repo.unstable_resume && resume) {
-        this.startRun(
-          {
-            parentId: this.repository.headId,
-            sourceId: this.repository.headId,
-            runConfig: this._lastRunConfig,
-          },
-          resume,
+    this._loadPromise = promise
+      .then((repo) => {
+        if (!repo) return;
+        this.repository.import(repo);
+        this._notifySubscribers();
+
+        const resume = this.adapters.history?.resume?.bind(
+          this.adapters.history,
         );
-      }
-    });
+        if (repo.unstable_resume && resume) {
+          this.startRun(
+            {
+              parentId: this.repository.headId,
+              sourceId: this.repository.headId,
+              runConfig: this._lastRunConfig,
+            },
+            resume,
+          );
+        }
+      })
+      .finally(() => {
+        this._isLoading = false;
+        this._notifySubscribers();
+      });
 
     return this._loadPromise;
   }

package/src/runtimes/remote-thread-list/EMPTY_THREAD_CORE.tsx

@@ -141,6 +141,7 @@ export const EMPTY_THREAD_CORE: ThreadRuntimeCore = {
   },
 
   isDisabled: true,
+  isLoading: false,
 
   messages: [],
 

package/src/runtimes/remote-thread-list/RemoteThreadListThreadListRuntimeCore.tsx

@@ -264,6 +264,10 @@ export class RemoteThreadListThreadListRuntimeCore
     this.getLoadThreadsPromise(); // begin loading on initial bind
   }
 
+  public get isLoading() {
+    return this._state.value.isLoading;
+  }
+
   public get threadIds() {
     return this._state.value.threadIds;
   }

package/src/runtimes/utils/MessageRepository.tsx

@@ -330,7 +330,7 @@ export class MessageRepository {
 
     if (!message)
       throw new Error(
-        "MessageRepository(deleteMessage): Optimistic message not found. This is likely an internal bug in assistant-ui.",
+        "MessageRepository(deleteMessage): Message not found. This is likely an internal bug in assistant-ui.",
       );
 
     const replacement =

package/src/tests/MessageRepository.test.ts

@@ -3,7 +3,7 @@ import {
   MessageRepository,
   ExportedMessageRepository,
 } from "../runtimes/utils/MessageRepository";
-import type { ThreadMessage, TextContentPart } from "../types/AssistantTypes";
+import type { ThreadMessage, TextMessagePart } from "../types/AssistantTypes";
 import { ThreadMessageLike } from "../runtimes";
 
 // Mock generateId and generateOptimisticId to make tests deterministic
@@ -501,13 +501,13 @@ describe("MessageRepository", () => {
           role: "user" as const,
           content: [
             { type: "text" as const, text: "Hello" },
-          ] as TextContentPart[],
+          ] as TextMessagePart[],
         },
         {
           role: "assistant" as const,
           content: [
             { type: "text" as const, text: "Hi there" },
-          ] as TextContentPart[],
+          ] as TextMessagePart[],
         },
       ];
 
@@ -680,9 +680,9 @@ describe("MessageRepository", () => {
       ]);
 
       // Verify content was updated
-      const contentPart = messages[1]!.content[0];
-      expect(contentPart.type).toBe("text");
-      expect((contentPart as TextContentPart).text).toBe("Updated content");
+      const MessagePart = messages[1]!.content[0];
+      expect(MessagePart.type).toBe("text");
+      expect((MessagePart as TextMessagePart).text).toBe("Updated content");
     });
   });
 });

package/src/types/AssistantTypes.ts

@@ -3,17 +3,17 @@ import { ReadonlyJSONObject, ReadonlyJSONValue } from "assistant-stream/utils";
 
 export type MessageRole = ThreadMessage["role"];
 
-export type TextContentPart = {
+export type TextMessagePart = {
   readonly type: "text";
   readonly text: string;
 };
 
-export type ReasoningContentPart = {
+export type ReasoningMessagePart = {
   readonly type: "reasoning";
   readonly text: string;
 };
 
-export type SourceContentPart = {
+export type SourceMessagePart = {
   readonly type: "source";
   readonly sourceType: "url";
   readonly id: string;
@@ -21,18 +21,18 @@ export type SourceContentPart = {
   readonly title?: string;
 };
 
-export type ImageContentPart = {
+export type ImageMessagePart = {
   readonly type: "image";
   readonly image: string;
 };
 
-export type FileContentPart = {
+export type FileMessagePart = {
   readonly type: "file";
   readonly data: string;
   readonly mimeType: string;
 };
 
-export type Unstable_AudioContentPart = {
+export type Unstable_AudioMessagePart = {
   readonly type: "audio";
   readonly audio: {
     readonly data: string;
@@ -40,7 +40,7 @@ export type Unstable_AudioContentPart = {
   };
 };
 
-export type ToolCallContentPart<
+export type ToolCallMessagePart<
   TArgs = ReadonlyJSONObject,
   TResult = unknown,
 > = {
@@ -54,18 +54,18 @@ export type ToolCallContentPart<
   readonly artifact?: unknown;
 };
 
-export type ThreadUserContentPart =
-  | TextContentPart
-  | ImageContentPart
-  | FileContentPart
-  | Unstable_AudioContentPart;
+export type ThreadUserMessagePart =
+  | TextMessagePart
+  | ImageMessagePart
+  | FileMessagePart
+  | Unstable_AudioMessagePart;
 
-export type ThreadAssistantContentPart =
-  | TextContentPart
-  | ReasoningContentPart
-  | ToolCallContentPart
-  | SourceContentPart
-  | FileContentPart;
+export type ThreadAssistantMessagePart =
+  | TextMessagePart
+  | ReasoningMessagePart
+  | ToolCallMessagePart
+  | SourceMessagePart
+  | FileMessagePart;
 
 type MessageCommonProps = {
   readonly id: string;
@@ -82,7 +82,7 @@ export type ThreadStep = {
     | undefined;
 };
 
-export type ContentPartStatus =
+export type MessagePartStatus =
   | {
       readonly type: "running";
     }
@@ -100,12 +100,12 @@ export type ContentPartStatus =
       readonly error?: unknown;
     };
 
-export type ToolCallContentPartStatus =
+export type ToolCallMessagePartStatus =
   | {
       readonly type: "requires-action";
       readonly reason: "tool-calls";
     }
-  | ContentPartStatus;
+  | MessagePartStatus;
 
 export type MessageStatus =
   | {
@@ -133,7 +133,7 @@ export type MessageStatus =
 
 export type ThreadSystemMessage = MessageCommonProps & {
   readonly role: "system";
-  readonly content: readonly [TextContentPart];
+  readonly content: readonly [TextMessagePart];
   readonly metadata: {
     readonly custom: Record<string, unknown>;
   };
@@ -141,7 +141,7 @@ export type ThreadSystemMessage = MessageCommonProps & {
 
 export type ThreadUserMessage = MessageCommonProps & {
   readonly role: "user";
-  readonly content: readonly ThreadUserContentPart[];
+  readonly content: readonly ThreadUserMessagePart[];
   readonly attachments: readonly CompleteAttachment[];
   readonly metadata: {
     readonly custom: Record<string, unknown>;
@@ -150,7 +150,7 @@ export type ThreadUserMessage = MessageCommonProps & {
 
 export type ThreadAssistantMessage = MessageCommonProps & {
   readonly role: "assistant";
-  readonly content: readonly ThreadAssistantContentPart[];
+  readonly content: readonly ThreadAssistantMessagePart[];
   readonly status: MessageStatus;
   readonly metadata: {
     readonly unstable_state: ReadonlyJSONValue;

package/src/types/AttachmentTypes.ts

@@ -1,4 +1,4 @@
-import { ThreadUserContentPart } from "./AssistantTypes";
+import { ThreadUserMessagePart } from "./AssistantTypes";
 
 export type PendingAttachmentStatus =
   | {
@@ -29,7 +29,7 @@ type BaseAttachment = {
   name: string;
   contentType: string;
   file?: File;
-  content?: ThreadUserContentPart[];
+  content?: ThreadUserMessagePart[];
 };
 
 export type PendingAttachment = BaseAttachment & {
@@ -39,7 +39,7 @@ export type PendingAttachment = BaseAttachment & {
 
 export type CompleteAttachment = BaseAttachment & {
   status: CompleteAttachmentStatus;
-  content: ThreadUserContentPart[];
+  content: ThreadUserMessagePart[];
 };
 
 export type Attachment = PendingAttachment | CompleteAttachment;

package/src/types/MessagePartComponentTypes.tsx

@@ -0,0 +1,52 @@
+import type { ComponentType } from "react";
+import type {
+  MessagePartStatus,
+  FileMessagePart,
+  ImageMessagePart,
+  ReasoningMessagePart,
+  SourceMessagePart,
+  TextMessagePart,
+  ToolCallMessagePart,
+  Unstable_AudioMessagePart,
+} from "./AssistantTypes";
+import { MessagePartState } from "../api/MessagePartRuntime";
+import { ToolResponse } from "assistant-stream";
+
+export type EmptyMessagePartProps = {
+  status: MessagePartStatus;
+};
+export type EmptyMessagePartComponent = ComponentType<EmptyMessagePartProps>;
+
+export type TextMessagePartProps = MessagePartState & TextMessagePart;
+export type TextMessagePartComponent = ComponentType<TextMessagePartProps>;
+
+export type ReasoningMessagePartProps = MessagePartState & ReasoningMessagePart;
+export type ReasoningMessagePartComponent =
+  ComponentType<ReasoningMessagePartProps>;
+
+export type SourceMessagePartProps = MessagePartState & SourceMessagePart;
+export type SourceMessagePartComponent = ComponentType<SourceMessagePartProps>;
+
+export type ImageMessagePartProps = MessagePartState & ImageMessagePart;
+export type ImageMessagePartComponent = ComponentType<ImageMessagePartProps>;
+
+export type FileMessagePartProps = MessagePartState & FileMessagePart;
+export type FileMessagePartComponent = ComponentType<FileMessagePartProps>;
+
+export type Unstable_AudioMessagePartProps = MessagePartState &
+  Unstable_AudioMessagePart;
+export type Unstable_AudioMessagePartComponent =
+  ComponentType<Unstable_AudioMessagePartProps>;
+
+export type ToolCallMessagePartProps<
+  TArgs = any,
+  TResult = unknown,
+> = MessagePartState &
+  ToolCallMessagePart<TArgs, TResult> & {
+    addResult: (result: TResult | ToolResponse<TResult>) => void;
+  };
+
+export type ToolCallMessagePartComponent<
+  TArgs = any,
+  TResult = any,
+> = ComponentType<ToolCallMessagePartProps<TArgs, TResult>>;