@assistant-ui/react 0.7.23 → 0.7.25

package/package.json

@@ -29,7 +29,7 @@
     "conversational-ui",
     "conversational-ai"
   ],
-  "version": "0.7.23",
+  "version": "0.7.25",
   "license": "MIT",
   "exports": {
     ".": {
@@ -120,9 +120,9 @@
     "tailwindcss-animate": "^1.0.7",
     "tsup": "8.3.5",
     "tsx": "^4.19.2",
+    "@assistant-ui/tsbuildutils": "^0.0.1",
     "@assistant-ui/tailwindcss-transformer": "0.1.0",
-    "@assistant-ui/tsconfig": "0.0.0",
-    "@assistant-ui/tsbuildutils": "^0.0.1"
+    "@assistant-ui/tsconfig": "0.0.0"
   },
   "publishConfig": {
     "access": "public",

package/src/api/AssistantRuntime.ts

@@ -41,11 +41,7 @@ export type AssistantRuntime = {
   registerModelConfigProvider(provider: ModelConfigProvider): Unsubscribe;
 };
 
-export class AssistantRuntimeImpl
-  implements
-    Omit<AssistantRuntimeCore, "thread" | "threadList">,
-    AssistantRuntime
-{
+export class AssistantRuntimeImpl implements AssistantRuntime {
   public readonly threadList;
   public readonly _thread: ThreadRuntime;
 
@@ -66,7 +62,7 @@ export class AssistantRuntimeImpl
         getState: () => _core.threadList.getMainThreadRuntimeCore(),
         subscribe: (callback) => _core.threadList.subscribe(callback),
       }),
-      this.threadList.mainThreadListItem, // TODO capture "main" threadListItem from context around useLocalRuntime / useExternalStoreRuntime
+      this.threadList.mainItem, // TODO capture "main" threadListItem from context around useLocalRuntime / useExternalStoreRuntime
     );
   }
 

package/src/api/ComposerRuntime.ts

@@ -108,7 +108,9 @@ export type ComposerRuntime = {
   setRole(role: MessageRole): void;
   setRunConfig(runConfig: RunConfig): void;
 
-  reset(): void;
+  reset(): Promise<void>;
+  clearAttachments(): Promise<void>;
+
   send(): void;
   cancel(): void;
   subscribe(callback: () => void): Unsubscribe;
@@ -147,7 +149,13 @@ export abstract class ComposerRuntimeImpl implements ComposerRuntime {
   public reset() {
     const core = this._core.getState();
     if (!core) throw new Error("Composer is not available");
-    core.reset();
+    return core.reset();
+  }
+
+  public clearAttachments() {
+    const core = this._core.getState();
+    if (!core) throw new Error("Composer is not available");
+    return core.clearAttachments();
   }
 
   public send() {

package/src/api/ThreadListItemRuntime.ts

@@ -9,13 +9,15 @@ export type ThreadListItemState = {
   readonly isMain: boolean;
 
   readonly id: string;
+  readonly remoteId: string | undefined;
+  readonly externalId: string | undefined;
 
   /**
    * @deprecated This field was renamed to `id`. This field will be removed in 0.8.0.
    */
   readonly threadId: string;
 
-  readonly state: "archived" | "regular" | "new" | "deleted";
+  readonly status: "archived" | "regular" | "new" | "deleted";
   readonly title?: string | undefined;
 };
 

package/src/api/ThreadListRuntime.ts

@@ -21,10 +21,10 @@ export type ThreadListRuntime = {
 
   subscribe(callback: () => void): Unsubscribe;
 
-  readonly mainThreadListItem: ThreadListItemRuntime;
-  getThreadListItemById(threadId: string): ThreadListItemRuntime;
-  getThreadListItemByIndex(idx: number): ThreadListItemRuntime;
-  getThreadListArchivedItemByIndex(idx: number): ThreadListItemRuntime;
+  readonly mainItem: ThreadListItemRuntime;
+  getItemById(threadId: string): ThreadListItemRuntime;
+  getItemByIndex(idx: number): ThreadListItemRuntime;
+  getArchivedItemByIndex(idx: number): ThreadListItemRuntime;
 };
 
 const getThreadListState = (
@@ -49,8 +49,10 @@ const getThreadListItemState = (
   return {
     id: threadData.threadId,
     threadId: threadData.threadId, // TODO remove in 0.8.0
+    remoteId: threadData.remoteId,
+    externalId: threadData.externalId,
     title: threadData.title,
-    state: threadData.state,
+    status: threadData.status,
     isMain: threadData.threadId === threadList.mainThreadId,
   };
 };
@@ -93,11 +95,11 @@ export class ThreadListRuntimeImpl implements ThreadListRuntime {
 
   private _mainThreadListItemRuntime;
 
-  public get mainThreadListItem() {
+  public get mainItem() {
     return this._mainThreadListItemRuntime;
   }
 
-  public getThreadListItemByIndex(idx: number) {
+  public getItemByIndex(idx: number) {
     return new ThreadListItemRuntimeImpl(
       new ShallowMemoizeSubject({
         path: {
@@ -113,7 +115,7 @@ export class ThreadListRuntimeImpl implements ThreadListRuntime {
     );
   }
 
-  public getThreadListArchivedItemByIndex(idx: number) {
+  public getArchivedItemByIndex(idx: number) {
     return new ThreadListItemRuntimeImpl(
       new ShallowMemoizeSubject({
         path: {
@@ -132,7 +134,7 @@ export class ThreadListRuntimeImpl implements ThreadListRuntime {
     );
   }
 
-  public getThreadListItemById(threadId: string) {
+  public getItemById(threadId: string) {
     return new ThreadListItemRuntimeImpl(
       new ShallowMemoizeSubject({
         path: {

package/src/api/ThreadRuntime.ts

@@ -215,11 +215,11 @@ export class ThreadRuntimeImpl implements ThreadRuntime {
     return this._threadBinding.path;
   }
 
-  public unstable_getCore() {
-    return this._threadBinding.getState();
+  public get __internal_threadBinding() {
+    return this._threadBinding;
   }
 
-  private _threadBinding: ThreadRuntimeCoreBinding & {
+  private readonly _threadBinding: ThreadRuntimeCoreBinding & {
     getStateState(): ThreadState;
   };
 

package/src/context/providers/AssistantRuntimeProvider.tsx

@@ -8,6 +8,7 @@ import { ThreadRuntimeProvider } from "./ThreadRuntimeProvider";
 import { AssistantRuntime } from "../../api/AssistantRuntime";
 import { create } from "zustand";
 import { writableStore } from "../ReadonlyStore";
+import { AssistantRuntimeCore } from "../../runtimes/core/AssistantRuntimeCore";
 
 export namespace AssistantRuntimeProvider {
   export type Props = PropsWithChildren<{
@@ -45,6 +46,16 @@ const useThreadListStore = (runtime: AssistantRuntime) => {
   return store;
 };
 
+const DEFAULT_RENDER_COMPONENT: FC<PropsWithChildren> = ({ children }) =>
+  children;
+
+const getRenderComponent = (runtime: AssistantRuntime) => {
+  return (
+    (runtime as { _core?: AssistantRuntimeCore })._core
+      ?.__internal_RenderComponent ?? DEFAULT_RENDER_COMPONENT
+  );
+};
+
 export const AssistantRuntimeProviderImpl: FC<
   AssistantRuntimeProvider.Props
 > = ({ children, runtime }) => {
@@ -59,14 +70,18 @@ export const AssistantRuntimeProviderImpl: FC<
     };
   }, [useAssistantRuntime, useToolUIs, useThreadList]);
 
+  const RenderComponent = getRenderComponent(runtime);
+
   return (
     <AssistantContext.Provider value={context}>
-      <ThreadRuntimeProvider
-        runtime={runtime.thread}
-        listItemRuntime={runtime.threadList.mainThreadListItem}
-      >
-        {children}
-      </ThreadRuntimeProvider>
+      <RenderComponent>
+        <ThreadRuntimeProvider
+          runtime={runtime.thread}
+          listItemRuntime={runtime.threadList.mainItem}
+        >
+          {children}
+        </ThreadRuntimeProvider>
+      </RenderComponent>
     </AssistantContext.Provider>
   );
 };

package/src/primitives/threadList/ThreadListItems.tsx

@@ -28,11 +28,9 @@ const ThreadListItemImpl: FC<ThreadListItemProps> = ({
   const runtime = useMemo(
     () =>
       archived
-        ? assistantRuntime.threadList.getThreadListArchivedItemByIndex(
-            partIndex,
-          )
-        : assistantRuntime.threadList.getThreadListItemByIndex(partIndex),
-    [assistantRuntime, partIndex],
+        ? assistantRuntime.threadList.getArchivedItemByIndex(partIndex)
+        : assistantRuntime.threadList.getItemByIndex(partIndex),
+    [assistantRuntime, partIndex, archived],
   );
 
   const ThreadListItemComponent = components.ThreadListItem;

package/src/runtimes/composer/BaseComposerRuntimeCore.tsx

@@ -3,18 +3,22 @@ import {
   CompleteAttachment,
   PendingAttachment,
 } from "../../types/AttachmentTypes";
-import { AppendMessage, Unsubscribe } from "../../types";
+import { AppendMessage } from "../../types";
 import { AttachmentAdapter } from "../attachment";
 import {
   ComposerRuntimeCore,
   ComposerRuntimeEventType,
 } from "../core/ComposerRuntimeCore";
 import { MessageRole, RunConfig } from "../../types/AssistantTypes";
+import { BaseSubscribable } from "../remote-thread-list/BaseSubscribable";
 
 const isAttachmentComplete = (a: Attachment): a is CompleteAttachment =>
   a.status.type === "complete";
 
-export abstract class BaseComposerRuntimeCore implements ComposerRuntimeCore {
+export abstract class BaseComposerRuntimeCore
+  extends BaseSubscribable
+  implements ComposerRuntimeCore
+{
   public readonly isEditing = true;
 
   protected abstract getAttachmentAdapter(): AttachmentAdapter | undefined;
@@ -30,7 +34,7 @@ export abstract class BaseComposerRuntimeCore implements ComposerRuntimeCore {
 
   protected setAttachments(value: readonly Attachment[]) {
     this._attachments = value;
-    this.notifySubscribers();
+    this._notifySubscribers();
   }
 
   public abstract get canCancel(): boolean;
@@ -61,34 +65,59 @@ export abstract class BaseComposerRuntimeCore implements ComposerRuntimeCore {
     if (this._text === value) return;
 
     this._text = value;
-    this.notifySubscribers();
+    this._notifySubscribers();
   }
 
   public setRole(role: MessageRole) {
     if (this._role === role) return;
 
     this._role = role;
-    this.notifySubscribers();
+    this._notifySubscribers();
   }
 
   public setRunConfig(runConfig: RunConfig) {
     if (this._runConfig === runConfig) return;
 
     this._runConfig = runConfig;
-    this.notifySubscribers();
+    this._notifySubscribers();
   }
 
-  private _resetInternal() {
-    // TODO attachmentAdapter.remove should be called here
+  private _emptyTextAndAttachments() {
     this._attachments = [];
     this._text = "";
+    this._notifySubscribers();
+  }
+
+  private async _onClearAttachments() {
+    const adapter = this.getAttachmentAdapter();
+    if (adapter) {
+      await Promise.all(this._attachments.map((a) => adapter.remove(a)));
+    }
+  }
+
+  public async reset() {
+    if (
+      this._attachments.length === 0 &&
+      this._text === "" &&
+      this._role === "user" &&
+      Object.keys(this._runConfig).length === 0
+    ) {
+      return;
+    }
+
     this._role = "user";
     this._runConfig = {};
-    this.notifySubscribers();
+
+    const task = this._onClearAttachments();
+    this._emptyTextAndAttachments();
+    await task;
   }
 
-  public async reset() {
-    return this._resetInternal();
+  public async clearAttachments() {
+    const task = this._onClearAttachments();
+    this.setAttachments([]);
+
+    await task;
   }
 
   public async send() {
@@ -110,7 +139,7 @@ export abstract class BaseComposerRuntimeCore implements ComposerRuntimeCore {
       attachments,
       runConfig: this.runConfig,
     };
-    this._resetInternal();
+    this._emptyTextAndAttachments();
 
     this.handleSend(message);
     this._notifyEventSubscribers("send");
@@ -130,7 +159,7 @@ export abstract class BaseComposerRuntimeCore implements ComposerRuntimeCore {
     const attachment = await adapter.add({ file });
 
     this._attachments = [...this._attachments, attachment as PendingAttachment];
-    this.notifySubscribers();
+    this._notifySubscribers();
   }
 
   async removeAttachment(attachmentId: string) {
@@ -144,18 +173,7 @@ export abstract class BaseComposerRuntimeCore implements ComposerRuntimeCore {
     await adapter.remove(attachment);
 
     this._attachments = this._attachments.toSpliced(index, 1);
-    this.notifySubscribers();
-  }
-
-  private _subscriptions = new Set<() => void>();
-
-  protected notifySubscribers() {
-    for (const callback of this._subscriptions) callback();
-  }
-
-  public subscribe(callback: () => void): Unsubscribe {
-    this._subscriptions.add(callback);
-    return () => this._subscriptions.delete(callback);
+    this._notifySubscribers();
   }
 
   private _eventSubscribers = new Map<

package/src/runtimes/composer/DefaultEditComposerRuntimeCore.tsx

@@ -46,12 +46,11 @@ export class DefaultEditComposerRuntimeCore extends BaseComposerRuntimeCore {
       });
     }
 
-    this.endEditCallback();
-    this.notifySubscribers();
+    this.handleCancel();
   }
 
   public handleCancel() {
     this.endEditCallback();
-    this.notifySubscribers();
+    this._notifySubscribers();
   }
 }

package/src/runtimes/composer/DefaultThreadComposerRuntimeCore.tsx

@@ -34,7 +34,7 @@ export class DefaultThreadComposerRuntimeCore
     return this.runtime.subscribe(() => {
       if (this.canCancel !== this.runtime.capabilities.cancel) {
         this._canCancel = this.runtime.capabilities.cancel;
-        this.notifySubscribers();
+        this._notifySubscribers();
       }
     });
   }

package/src/runtimes/core/AssistantRuntimeCore.tsx

@@ -1,3 +1,4 @@
+import { PropsWithChildren } from "react";
 import type { ModelConfigProvider } from "../../types/ModelConfigTypes";
 import type { Unsubscribe } from "../../types/Unsubscribe";
 import { ThreadListRuntimeCore } from "./ThreadListRuntimeCore";
@@ -6,4 +7,6 @@ export type AssistantRuntimeCore = {
   readonly threadList: ThreadListRuntimeCore;
 
   registerModelConfigProvider: (provider: ModelConfigProvider) => Unsubscribe;
+
+  __internal_RenderComponent?: React.FC<PropsWithChildren>;
 };

package/src/runtimes/core/ComposerRuntimeCore.tsx

@@ -24,7 +24,8 @@ export type ComposerRuntimeCore = Readonly<{
   runConfig: RunConfig;
   setRunConfig: (runConfig: RunConfig) => void;
 
-  reset: () => void;
+  reset: () => Promise<void>;
+  clearAttachments: () => Promise<void>;
 
   send: () => void;
   cancel: () => void;

package/src/runtimes/core/ThreadListRuntimeCore.tsx

@@ -3,7 +3,10 @@ import { ThreadRuntimeCore } from "./ThreadRuntimeCore";
 
 type ThreadListItemCoreState = {
   readonly threadId: string;
-  readonly state: "archived" | "regular" | "new" | "deleted";
+  readonly remoteId?: string | undefined;
+  readonly externalId?: string | undefined;
+
+  readonly status: "archived" | "regular" | "new" | "deleted";
   readonly title?: string | undefined;
 
   readonly runtime?: ThreadRuntimeCore | undefined;
@@ -22,7 +25,7 @@ export type ThreadListRuntimeCore = {
   switchToThread(threadId: string): Promise<void>;
   switchToNewThread(): Promise<void>;
 
-  // getLoadThreadsPromise(): Promise<void>;
+  getLoadThreadsPromise(): Promise<void>;
   // getLoadArchivedThreadsPromise(): Promise<void>;
 
   rename(threadId: string, newTitle: string): Promise<void>;

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

@@ -10,7 +10,7 @@ import { SpeechSynthesisAdapter } from "../speech/SpeechAdapterTypes";
 import { ThreadMessageLike } from "./ThreadMessageLike";
 
 export type ExternalStoreThreadData<TState extends "regular" | "archived"> = {
-  state: TState;
+  status: TState;
   threadId: string;
   title?: string | undefined;
 };

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

@@ -13,8 +13,9 @@ const DEFAULT_THREAD_ID = "DEFAULT_THREAD_ID";
 const DEFAULT_THREADS = Object.freeze([DEFAULT_THREAD_ID]);
 const DEFAULT_THREAD: ExternalStoreThreadData<"regular"> = Object.freeze({
   threadId: DEFAULT_THREAD_ID,
-  state: "regular",
+  status: "regular",
 });
+const RESOLVED_PROMISE = Promise.resolve();
 
 export class ExternalStoreThreadListRuntimeCore
   implements ThreadListRuntimeCore
@@ -35,6 +36,10 @@ export class ExternalStoreThreadListRuntimeCore
     return this._archivedThreads;
   }
 
+  public getLoadThreadsPromise() {
+    return RESOLVED_PROMISE;
+  }
+
   private _mainThread: ExternalStoreThreadRuntimeCore;
 
   public get mainThreadId() {

package/src/runtimes/index.ts

@@ -1,8 +1,9 @@
+export * from "./attachment";
 export * from "./core";
-export * from "./local";
+export * from "./dangerous-in-browser";
 export * from "./edge";
 export * from "./external-store";
-export * from "./dangerous-in-browser";
-export * from "./speech";
-export * from "./attachment";
 export * from "./feedback";
+export * from "./local";
+export * from "./remote-thread-list";
+export * from "./speech";

package/src/runtimes/local/LocalThreadListRuntimeCore.tsx

@@ -9,13 +9,14 @@ export type ThreadListAdapter = {
 
 export type LocalThreadData = {
   readonly runtime: LocalThreadRuntimeCore;
-  readonly state: "new" | "regular" | "archived";
+  readonly status: "new" | "regular" | "archived";
   readonly threadId: string;
   readonly title?: string | undefined;
 };
 
 export type LocalThreadFactory = () => LocalThreadRuntimeCore;
 
+const RESOLVED_PROMISE = Promise.resolve();
 export class LocalThreadListRuntimeCore implements ThreadListRuntimeCore {
   private _threadData = new Map<string, LocalThreadData>();
   private _threadIds: readonly string[] = [];
@@ -51,6 +52,10 @@ export class LocalThreadListRuntimeCore implements ThreadListRuntimeCore {
     return result;
   }
 
+  public getLoadThreadsPromise(): Promise<void> {
+    return RESOLVED_PROMISE;
+  }
+
   public getItemById(threadId: string) {
     return this._threadData.get(threadId);
   }
@@ -61,7 +66,7 @@ export class LocalThreadListRuntimeCore implements ThreadListRuntimeCore {
     const data = this._threadData.get(threadId);
     if (!data) throw new Error("Thread not found");
 
-    if (data.state === "archived") await this.unarchive(threadId);
+    if (data.status === "archived") await this.unarchive(threadId);
 
     this._mainThreadId = data.threadId;
     this._notifySubscribers();
@@ -84,7 +89,7 @@ export class LocalThreadListRuntimeCore implements ThreadListRuntimeCore {
       });
       this._threadData.set(threadId, {
         runtime,
-        state: "new",
+        status: "new",
         threadId,
       });
       this._newThreadId = threadId;
@@ -101,7 +106,7 @@ export class LocalThreadListRuntimeCore implements ThreadListRuntimeCore {
     const data = this._threadData.get(threadId);
     if (!data) throw new Error("Thread not found");
 
-    const { state: lastState } = data;
+    const { status: lastState } = data;
     if (lastState === newState) return;
 
     // lastState
@@ -147,7 +152,7 @@ export class LocalThreadListRuntimeCore implements ThreadListRuntimeCore {
     if (newState !== "deleted") {
       this._threadData.set(threadId, {
         ...data,
-        state: newState,
+        status: newState,
       });
     }
 
@@ -181,7 +186,7 @@ export class LocalThreadListRuntimeCore implements ThreadListRuntimeCore {
   public archive(threadId: string): Promise<void> {
     const data = this._threadData.get(threadId);
     if (!data) throw new Error("Thread not found");
-    if (data.state !== "regular")
+    if (data.status !== "regular")
       throw new Error("Thread is not yet initialized or already archived");
 
     this._stateOp(threadId, "archived");
@@ -191,7 +196,7 @@ export class LocalThreadListRuntimeCore implements ThreadListRuntimeCore {
   public unarchive(threadId: string): Promise<void> {
     const data = this._threadData.get(threadId);
     if (!data) throw new Error("Thread not found");
-    if (data.state !== "archived") throw new Error("Thread is not archived");
+    if (data.status !== "archived") throw new Error("Thread is not archived");
 
     this._stateOp(threadId, "regular");
     return Promise.resolve();
@@ -200,8 +205,8 @@ export class LocalThreadListRuntimeCore implements ThreadListRuntimeCore {
   public delete(threadId: string): Promise<void> {
     const data = this._threadData.get(threadId);
     if (!data) throw new Error("Thread not found");
-    if (data.state !== "regular" && data.state !== "archived")
-      throw new Error("Thread is not yet initalized");
+    if (data.status !== "regular" && data.status !== "archived")
+      throw new Error("Thread is not yet initialized");
 
     this._stateOp(threadId, "deleted");
     return Promise.resolve();

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

@@ -0,0 +1,38 @@
+import { Unsubscribe } from "../../types";
+
+export class BaseSubscribable {
+  private _subscribers = new Set<() => void>();
+
+  public subscribe(callback: () => void): Unsubscribe {
+    this._subscribers.add(callback);
+    return () => this._subscribers.delete(callback);
+  }
+
+  public waitForUpdate() {
+    return new Promise<void>((resolve) => {
+      const unsubscribe = this.subscribe(() => {
+        unsubscribe();
+        resolve();
+      });
+    });
+  }
+
+  protected _notifySubscribers() {
+    const errors = [];
+    for (const callback of this._subscribers) {
+      try {
+        callback();
+      } catch (error) {
+        errors.push(error);
+      }
+    }
+
+    if (errors.length > 0) {
+      if (errors.length === 1) {
+        throw errors[0];
+      } else {
+        throw new AggregateError(errors);
+      }
+    }
+  }
+}