@assistant-ui/react 0.5.23 → 0.5.25

package/dist/index.mjs

@@ -159,11 +159,23 @@ var makeComposerStore = (useThreadMessages, useThreadActions) => {
 
 // src/context/stores/Thread.ts
 import { create as create4 } from "zustand";
+var getThreadStateFromRuntime = (runtime) => {
+  const lastMessage = runtime.messages.at(-1);
+  if (lastMessage?.role !== "assistant")
+    return Object.freeze({
+      isDisabled: runtime.isDisabled,
+      isRunning: false,
+      unstable_canAppendNew: runtime.isDisabled
+    });
+  return Object.freeze({
+    isDisabled: runtime.isDisabled,
+    isRunning: lastMessage.status.type === "running",
+    unstable_canAppendNew: !runtime.isDisabled && lastMessage.status.type !== "running" && lastMessage.status.type !== "requires-action"
+  });
+};
 var makeThreadStore = (runtimeRef) => {
-  return create4(() => ({
-    isDisabled: runtimeRef.getState().isDisabled,
-    isRunning: runtimeRef.getState().isRunning
-  }));
+  const runtime = runtimeRef.getState();
+  return create4(() => getThreadStateFromRuntime(runtime));
 };
 
 // src/context/stores/ThreadViewport.tsx
@@ -260,13 +272,11 @@ var ThreadProvider = ({
     useCallback2(
       (thread) => {
         const onThreadUpdate = () => {
-          const threadState = context.useThread.getState();
-          if (thread.isRunning !== threadState.isRunning || thread.isDisabled !== threadState.isDisabled) {
+          const oldState = context.useThread.getState();
+          const state = getThreadStateFromRuntime(thread);
+          if (oldState.isDisabled !== state.isDisabled || oldState.isRunning !== state.isRunning || oldState.unstable_canAppendNew !== state.unstable_canAppendNew) {
             context.useThread.setState(
-              Object.freeze({
-                isRunning: thread.isRunning,
-                isDisabled: thread.isDisabled
-              }),
+              getThreadStateFromRuntime(thread),
               true
             );
           }
@@ -520,8 +530,8 @@ var useCombinedStore = (stores, selector) => {
   return useCombined(selector);
 };
 
-// src/utils/getMessageText.tsx
-var getMessageText = (message) => {
+// src/utils/getThreadMessageText.tsx
+var getThreadMessageText = (message) => {
   const textParts = message.content.filter(
     (part) => part.type === "text"
   );
@@ -543,7 +553,7 @@ var useActionBarCopy = ({
     const { message } = useMessage.getState();
     const { setIsCopied } = useMessageUtils.getState();
     const { isEditing, value: composerValue } = useEditComposer.getState();
-    const valueToCopy = isEditing ? composerValue : getMessageText(message);
+    const valueToCopy = isEditing ? composerValue : getThreadMessageText(message);
     navigator.clipboard.writeText(valueToCopy).then(() => {
       setIsCopied(true);
       setTimeout(() => setIsCopied(false), copiedDuration);
@@ -670,7 +680,7 @@ var useComposerSend = () => {
   const { useComposer } = useComposerContext();
   const disabled = useCombinedStore(
     [useThread, useComposer],
-    (t, c) => t.isDisabled || t.isRunning || !c.isEditing || c.value.length === 0
+    (t, c) => !t.unstable_canAppendNew || !c.isEditing || c.value.length === 0
   );
   const callback = useCallback11(() => {
     const composerState = useComposer.getState();
@@ -1568,8 +1578,8 @@ var ComposerPrimitiveInput = forwardRef12(
     const handleKeyPress = (e) => {
       if (isDisabled) return;
       if (e.key === "Enter" && e.shiftKey === false) {
-        const isRunning = useThread.getState().isRunning;
-        if (!isRunning) {
+        const { unstable_canAppendNew } = useThread.getState();
+        if (unstable_canAppendNew) {
           e.preventDefault();
           textareaRef.current?.closest("form")?.requestSubmit();
         }
@@ -1902,7 +1912,7 @@ var useMessageContext2 = (messageIndex) => {
           throw new Error(
             "Tried to edit a non-user message. Editing is only supported for user messages. This is likely an internal bug in assistant-ui."
           );
-        const text = getMessageText(message);
+        const text = getThreadMessageText(message);
         return text;
       },
       onSend: (text) => {
@@ -2144,6 +2154,13 @@ var MessageRepository = class {
       }
     }
     if (operation !== "cut") {
+      for (let current = newParent; current; current = current.prev) {
+        if (current.current.id === child.current.id) {
+          throw new Error(
+            "MessageRepository(performOp/link): A message with the same id already exists in the parent tree. This error occurs if the same message id is found multiple times. This is likely an internal bug in assistant-ui."
+          );
+        }
+      }
       newParentOrRoot.children = [
         ...newParentOrRoot.children,
         child.current.id
@@ -2702,9 +2719,6 @@ var LocalThreadRuntime = class {
   get messages() {
     return this.repository.getMessages();
   }
-  get isRunning() {
-    return this.abortController != null;
-  }
   getBranches(messageId) {
     return this.repository.getBranches(messageId);
   }
@@ -2793,8 +2807,6 @@ var LocalThreadRuntime = class {
         updateMessage({
           status: { type: "complete", reason: "unknown" }
         });
-      } else {
-        this.notifySubscribers();
       }
     } catch (e) {
       this.abortController = null;
@@ -2893,18 +2905,12 @@ var useLocalRuntime = (adapter, options) => {
   return runtime;
 };
 
-// src/runtimes/external-store/ExternalStoreThreadRuntime.tsx
-import { create as create15 } from "zustand";
-
 // src/runtimes/external-store/getExternalStoreMessage.tsx
 var symbolInnerMessage = Symbol("innerMessage");
 var getExternalStoreMessage = (message) => {
   return message[symbolInnerMessage];
 };
 
-// src/runtimes/external-store/useExternalStoreSync.tsx
-import { useEffect as useEffect11, useInsertionEffect as useInsertionEffect4, useMemo as useMemo4, useRef as useRef6 } from "react";
-
 // src/runtimes/external-store/ThreadMessageConverter.ts
 var ThreadMessageConverter = class {
   cache = /* @__PURE__ */ new WeakMap();
@@ -2925,6 +2931,7 @@ var AUTO_STATUS_COMPLETE = Object.freeze({
   type: "complete",
   reason: "unknown"
 });
+var isAutoStatus = (status) => status === AUTO_STATUS_RUNNING || status === AUTO_STATUS_COMPLETE;
 var getAutoStatus = (isLast, isRunning) => isLast && isRunning ? AUTO_STATUS_RUNNING : AUTO_STATUS_COMPLETE;
 
 // src/runtimes/external-store/ThreadMessageLike.tsx
@@ -2995,106 +3002,112 @@ var fromThreadMessageLike = (like, fallbackId, fallbackStatus) => {
   }
 };
 
-// src/runtimes/external-store/useExternalStoreSync.tsx
-var useExternalStoreSync = (adapter, updateData) => {
-  const adapterRef = useRef6(adapter);
-  useInsertionEffect4(() => {
-    adapterRef.current = adapter;
-  });
-  const [converter, convertCallback] = useMemo4(() => {
-    const converter2 = adapter.convertMessage ?? ((m) => m);
-    const convertCallback2 = (cache, m, idx) => {
-      const autoStatus = getAutoStatus(
-        adapterRef.current.messages.at(-1) === m,
-        adapterRef.current.isRunning ?? false
-      );
-      if (cache && (cache.role !== "assistant" || cache.status === autoStatus))
-        return cache;
-      const newMessage = fromThreadMessageLike(
-        converter2(m, idx),
-        idx.toString(),
-        autoStatus
-      );
-      newMessage[symbolInnerMessage] = m;
-      return newMessage;
-    };
-    return [new ThreadMessageConverter(), convertCallback2];
-  }, [adapter.convertMessage]);
-  useEffect11(() => {
-    updateData(
-      adapter.isDisabled ?? false,
-      adapter.isRunning ?? false,
-      converter.convertMessages(adapter.messages, convertCallback)
-    );
-  }, [
-    updateData,
-    converter,
-    convertCallback,
-    adapter.isDisabled,
-    adapter.isRunning,
-    adapter.messages
-  ]);
-};
-
 // src/runtimes/external-store/ExternalStoreThreadRuntime.tsx
 var hasUpcomingMessage = (isRunning, messages) => {
   return isRunning && messages[messages.length - 1]?.role !== "assistant";
 };
 var ExternalStoreThreadRuntime = class {
-  constructor(store) {
-    this.store = store;
-    this.updateData(
-      store.isDisabled ?? false,
-      store.isRunning ?? false,
-      store.messages
-    );
-    this.useStore = create15(() => ({
-      store
-    }));
-  }
   _subscriptions = /* @__PURE__ */ new Set();
   repository = new MessageRepository();
   assistantOptimisticId = null;
-  useStore;
   get capabilities() {
     return {
-      switchToBranch: this.store.setMessages !== void 0,
-      edit: this.store.onEdit !== void 0,
-      reload: this.store.onReload !== void 0,
-      cancel: this.store.onCancel !== void 0,
-      copy: this.store.onCopy !== null
+      switchToBranch: this._store.setMessages !== void 0,
+      edit: this._store.onEdit !== void 0,
+      reload: this._store.onReload !== void 0,
+      cancel: this._store.onCancel !== void 0,
+      copy: this._store.onCopy !== null
     };
   }
   messages = [];
   isDisabled = false;
-  isRunning = false;
+  converter = new ThreadMessageConverter();
+  _store;
+  constructor(store) {
+    this.store = store;
+  }
+  set store(store) {
+    const oldStore = this._store;
+    if (oldStore) {
+      if (oldStore.convertMessage !== store.convertMessage) {
+        this.converter = new ThreadMessageConverter();
+      } else if (oldStore.isDisabled === store.isDisabled && oldStore.isRunning === store.isRunning && oldStore.messages === store.messages) {
+        return;
+      }
+    }
+    this._store = store;
+    const isRunning = store.isRunning ?? false;
+    const isDisabled = store.isDisabled ?? false;
+    const convertCallback = (cache, m, idx) => {
+      if (!store.convertMessage) return m;
+      const isLast = idx === store.messages.length - 1;
+      const autoStatus = getAutoStatus(isLast, isRunning);
+      if (cache && (cache.role !== "assistant" || !isAutoStatus(cache.status) || cache.status === autoStatus))
+        return cache;
+      const newMessage = fromThreadMessageLike(
+        store.convertMessage(m, idx),
+        idx.toString(),
+        autoStatus
+      );
+      newMessage[symbolInnerMessage] = m;
+      return newMessage;
+    };
+    const messages = this.converter.convertMessages(
+      store.messages,
+      convertCallback
+    );
+    for (let i = 0; i < messages.length; i++) {
+      const message = messages[i];
+      const parent = messages[i - 1];
+      this.repository.addOrUpdateMessage(parent?.id ?? null, message);
+    }
+    if (this.assistantOptimisticId) {
+      this.repository.deleteMessage(this.assistantOptimisticId);
+      this.assistantOptimisticId = null;
+    }
+    if (hasUpcomingMessage(isRunning, messages)) {
+      this.assistantOptimisticId = this.repository.appendOptimisticMessage(
+        messages.at(-1)?.id ?? null,
+        {
+          role: "assistant",
+          content: []
+        }
+      );
+    }
+    this.repository.resetHead(
+      this.assistantOptimisticId ?? messages.at(-1)?.id ?? null
+    );
+    this.messages = this.repository.getMessages();
+    this.isDisabled = isDisabled;
+    for (const callback of this._subscriptions) callback();
+  }
   getBranches(messageId) {
     return this.repository.getBranches(messageId);
   }
   switchToBranch(branchId) {
-    if (!this.store.setMessages)
+    if (!this._store.setMessages)
       throw new Error("Runtime does not support switching branches.");
     this.repository.switchToBranch(branchId);
     this.updateMessages(this.repository.getMessages());
   }
   async append(message) {
     if (message.parentId !== (this.messages.at(-1)?.id ?? null)) {
-      if (!this.store.onEdit)
+      if (!this._store.onEdit)
         throw new Error("Runtime does not support editing messages.");
-      await this.store.onEdit(message);
+      await this._store.onEdit(message);
     } else {
-      await this.store.onNew(message);
+      await this._store.onNew(message);
     }
   }
   async startRun(parentId) {
-    if (!this.store.onReload)
+    if (!this._store.onReload)
       throw new Error("Runtime does not support reloading messages.");
-    await this.store.onReload(parentId);
+    await this._store.onReload(parentId);
   }
   cancelRun() {
-    if (!this.store.onCancel)
+    if (!this._store.onCancel)
       throw new Error("Runtime does not support cancelling runs.");
-    this.store.onCancel();
+    this._store.onCancel();
     if (this.assistantOptimisticId) {
       this.repository.deleteMessage(this.assistantOptimisticId);
       this.assistantOptimisticId = null;
@@ -3109,51 +3122,14 @@ var ExternalStoreThreadRuntime = class {
     return () => this._subscriptions.delete(callback);
   }
   updateMessages = (messages) => {
-    this.store.setMessages?.(
+    this._store.setMessages?.(
       messages.flatMap(getExternalStoreMessage).filter((m) => m != null)
     );
   };
-  onStoreUpdated() {
-    if (this.useStore.getState().store !== this.store) {
-      this.useStore.setState({ store: this.store });
-    }
-  }
-  updateData = (isDisabled, isRunning, vm) => {
-    for (let i = 0; i < vm.length; i++) {
-      const message = vm[i];
-      const parent = vm[i - 1];
-      this.repository.addOrUpdateMessage(parent?.id ?? null, message);
-    }
-    if (this.assistantOptimisticId) {
-      this.repository.deleteMessage(this.assistantOptimisticId);
-      this.assistantOptimisticId = null;
-    }
-    if (hasUpcomingMessage(isRunning, vm)) {
-      this.assistantOptimisticId = this.repository.appendOptimisticMessage(
-        vm.at(-1)?.id ?? null,
-        {
-          role: "assistant",
-          content: []
-        }
-      );
-    }
-    this.repository.resetHead(
-      this.assistantOptimisticId ?? vm.at(-1)?.id ?? null
-    );
-    this.messages = this.repository.getMessages();
-    this.isDisabled = isDisabled;
-    this.isRunning = isRunning;
-    for (const callback of this._subscriptions) callback();
-  };
-  unstable_synchronizer = () => {
-    const { store } = this.useStore();
-    useExternalStoreSync(store, this.updateData);
-    return null;
-  };
   addToolResult(options) {
-    if (!this.store.onAddToolResult)
+    if (!this._store.onAddToolResult)
       throw new Error("Runtime does not support tool results.");
-    this.store.onAddToolResult(options);
+    this._store.onAddToolResult(options);
   }
 };
 
@@ -3166,9 +3142,6 @@ var ExternalStoreRuntime = class extends BaseAssistantRuntime {
   set store(store) {
     this.thread.store = store;
   }
-  onStoreUpdated() {
-    return this.thread.onStoreUpdated();
-  }
   getModelConfig() {
     return this._proxyConfigProvider.getModelConfig();
   }
@@ -3189,15 +3162,12 @@ var ExternalStoreRuntime = class extends BaseAssistantRuntime {
 };
 
 // src/runtimes/external-store/useExternalStoreRuntime.tsx
-import { useEffect as useEffect12, useInsertionEffect as useInsertionEffect5, useState as useState10 } from "react";
+import { useInsertionEffect as useInsertionEffect4, useState as useState10 } from "react";
 var useExternalStoreRuntime = (store) => {
   const [runtime] = useState10(() => new ExternalStoreRuntime(store));
-  useInsertionEffect5(() => {
+  useInsertionEffect4(() => {
     runtime.store = store;
   });
-  useEffect12(() => {
-    runtime.onStoreUpdated();
-  });
   return runtime;
 };