@assistant-ui/react 0.7.86 → 0.7.88

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

@@ -4,7 +4,6 @@ import { useEffect, useMemo, useState } from "react";
 import { ExternalStoreRuntimeCore } from "./ExternalStoreRuntimeCore";
 import { ExternalStoreAdapter } from "./ExternalStoreAdapter";
 import { AssistantRuntimeImpl } from "../../api/AssistantRuntime";
-import { ThreadRuntimeImpl } from "../../api/ThreadRuntime";
 import { useRuntimeAdapters } from "../adapters/RuntimeAdapterProvider";
 
 export const useExternalStoreRuntime = <T,>(store: ExternalStoreAdapter<T>) => {
@@ -21,8 +20,5 @@ export const useExternalStoreRuntime = <T,>(store: ExternalStoreAdapter<T>) => {
     return runtime.registerModelContextProvider(modelContext);
   }, [modelContext, runtime]);
 
-  return useMemo(
-    () => AssistantRuntimeImpl.create(runtime, ThreadRuntimeImpl),
-    [runtime],
-  );
+  return useMemo(() => new AssistantRuntimeImpl(runtime), [runtime]);
 };

package/src/runtimes/index.ts

@@ -5,3 +5,5 @@ export * from "./edge";
 export * from "./external-store";
 export * from "./local";
 export * from "./remote-thread-list";
+
+export { ExportedMessageRepository } from "./utils/MessageRepository";

package/src/runtimes/local/LocalRuntimeCore.tsx

@@ -1,28 +1,9 @@
-import type { CoreMessage } from "../../types/AssistantTypes";
 import { BaseAssistantRuntimeCore } from "../core/BaseAssistantRuntimeCore";
 import { LocalThreadRuntimeCore } from "./LocalThreadRuntimeCore";
 import { LocalRuntimeOptionsBase } from "./LocalRuntimeOptions";
 import { LocalThreadListRuntimeCore } from "./LocalThreadListRuntimeCore";
 import { ExportedMessageRepository } from "../utils/MessageRepository";
 import { ThreadMessageLike } from "../external-store";
-import { fromThreadMessageLike } from "../external-store/ThreadMessageLike";
-import { generateId } from "../../internal";
-import { getAutoStatus } from "../external-store/auto-status";
-
-const getExportFromInitialMessages = (
-  initialMessages: readonly ThreadMessageLike[],
-): ExportedMessageRepository => {
-  const messages = initialMessages.map((i, idx) => {
-    const isLast = idx === initialMessages.length - 1;
-    return fromThreadMessageLike(i, generateId(), getAutoStatus(isLast, false));
-  });
-  return {
-    messages: messages.map((m, idx) => ({
-      parentId: messages[idx - 1]?.id ?? null,
-      message: m,
-    })),
-  };
-};
 
 export class LocalRuntimeCore extends BaseAssistantRuntimeCore {
   public readonly threads;
@@ -45,20 +26,7 @@ export class LocalRuntimeCore extends BaseAssistantRuntimeCore {
     if (initialMessages) {
       this.threads
         .getMainThreadRuntimeCore()
-        .import(getExportFromInitialMessages(initialMessages));
+        .import(ExportedMessageRepository.fromArray(initialMessages));
     }
   }
-
-  public reset({
-    initialMessages,
-  }: {
-    initialMessages?: readonly CoreMessage[] | undefined;
-  } = {}) {
-    this.threads.switchToNewThread();
-    if (!initialMessages) return;
-
-    this.threads
-      .getMainThreadRuntimeCore()
-      .import(getExportFromInitialMessages(initialMessages));
-  }
 }

package/src/runtimes/local/useLocalRuntime.tsx

@@ -4,37 +4,10 @@ import { useEffect, useMemo, useState } from "react";
 import type { ChatModelAdapter } from "./ChatModelAdapter";
 import { LocalRuntimeCore } from "./LocalRuntimeCore";
 import { LocalRuntimeOptions } from "./LocalRuntimeOptions";
-import {
-  AssistantRuntime,
-  AssistantRuntimeImpl,
-} from "../../api/AssistantRuntime";
-import { ThreadRuntimeImpl } from "../../internal";
 import { useRuntimeAdapters } from "../adapters/RuntimeAdapterProvider";
 import { useRemoteThreadListRuntime } from "../remote-thread-list/useRemoteThreadListRuntime";
 import { useCloudThreadListAdapter } from "../remote-thread-list/adapter/cloud";
-
-export type LocalRuntime = AssistantRuntime & {
-  reset: (options?: Parameters<LocalRuntimeCore["reset"]>[0]) => void;
-};
-
-class LocalRuntimeImpl extends AssistantRuntimeImpl implements LocalRuntime {
-  private constructor(private core: LocalRuntimeCore) {
-    super(core, ThreadRuntimeImpl);
-  }
-
-  public override __internal_bindMethods() {
-    super.__internal_bindMethods();
-    this.reset = this.reset.bind(this);
-  }
-
-  public reset(options?: Parameters<LocalRuntimeCore["reset"]>[0]) {
-    this.core.reset(options);
-  }
-
-  public static override create(_core: LocalRuntimeCore): LocalRuntime {
-    return new LocalRuntimeImpl(_core);
-  }
-}
+import { AssistantRuntimeImpl } from "../../internal";
 
 const useLocalThreadRuntime = (
   adapter: ChatModelAdapter,
@@ -65,7 +38,7 @@ const useLocalThreadRuntime = (
     return runtime.registerModelContextProvider(modelContext);
   }, [modelContext, runtime]);
 
-  return useMemo(() => LocalRuntimeImpl.create(runtime), [runtime]);
+  return useMemo(() => new AssistantRuntimeImpl(runtime), [runtime]);
 };
 
 export const useLocalRuntime = (

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

@@ -34,5 +34,5 @@ export const useRemoteThreadListRuntime = (
     runtime.threads.__internal_setOptions(options);
     runtime.threads.__internal_load();
   }, [runtime, options]);
-  return useMemo(() => AssistantRuntimeImpl.create(runtime), [runtime]);
+  return useMemo(() => new AssistantRuntimeImpl(runtime), [runtime]);
 };

package/src/runtimes/utils/MessageRepository.tsx

@@ -1,6 +1,9 @@
 import type { CoreMessage, ThreadMessage } from "../../types/AssistantTypes";
-import { generateOptimisticId } from "../../utils/idUtils";
+import { generateId, generateOptimisticId } from "../../utils/idUtils";
 import { fromCoreMessage } from "../edge/converters/fromCoreMessage";
+import { ThreadMessageLike } from "../external-store";
+import { getAutoStatus } from "../external-store/auto-status";
+import { fromThreadMessageLike } from "../external-store/ThreadMessageLike";
 
 type RepositoryParent = {
   children: string[];
@@ -18,13 +21,30 @@ export type ExportedMessageRepositoryItem = {
   parentId: string | null;
 };
 
-export interface ExportedMessageRepository {
+export type ExportedMessageRepository = {
   headId?: string | null;
   messages: Array<{
     message: ThreadMessage;
     parentId: string | null;
   }>;
-}
+};
+
+export const ExportedMessageRepository = {
+  fromArray: (
+    messages: readonly ThreadMessageLike[],
+  ): ExportedMessageRepository => {
+    const conv = messages.map((m) =>
+      fromThreadMessageLike(m, generateId(), getAutoStatus(false, false)),
+    );
+
+    return {
+      messages: conv.map((m, idx) => ({
+        parentId: idx > 0 ? conv[idx - 1]!.id : null,
+        message: m,
+      })),
+    };
+  },
+};
 
 const findHead = (
   message: RepositoryMessage | RepositoryParent,
@@ -287,6 +307,16 @@ export class MessageRepository {
     this._messages.dirty();
   }
 
+  clear(): void {
+    this.messages.clear();
+    this.head = null;
+    this.root = {
+      children: [],
+      next: null,
+    };
+    this._messages.dirty();
+  }
+
   export(): ExportedMessageRepository {
     const exportItems: ExportedMessageRepository["messages"] = [];