@assistant-ui/react 0.5.23 → 0.5.24

package/dist/index.d.mts

@@ -532,12 +532,16 @@ declare namespace internal {
   export { internal_BaseAssistantRuntime as BaseAssistantRuntime, internal_MessageRepository as MessageRepository, internal_ProxyConfigProvider as ProxyConfigProvider, internal_TooltipIconButton as TooltipIconButton, internal_generateId as generateId, internal_useSmooth as useSmooth, internal_useSmoothStatus as useSmoothStatus, internal_withSmoothContextProvider as withSmoothContextProvider };
 }
 
+type ConverterCallback<TIn> = (cache: ThreadMessage | undefined, message: TIn, idx: number) => ThreadMessage;
+declare class ThreadMessageConverter {
+    private readonly cache;
+    convertMessages<TIn extends WeakKey>(messages: TIn[], converter: ConverterCallback<TIn>, keyMapper?: (m: TIn) => WeakKey): ThreadMessage[];
+}
+
 declare class ExternalStoreThreadRuntime implements ReactThreadRuntime {
-    store: ExternalStoreAdapter<any>;
     private _subscriptions;
     private repository;
     private assistantOptimisticId;
-    private useStore;
     get capabilities(): {
         switchToBranch: boolean;
         edit: boolean;
@@ -548,7 +552,10 @@ declare class ExternalStoreThreadRuntime implements ReactThreadRuntime {
     messages: ThreadMessage[];
     isDisabled: boolean;
     isRunning: boolean;
+    converter: ThreadMessageConverter;
+    private _store;
     constructor(store: ExternalStoreAdapter<any>);
+    set store(store: ExternalStoreAdapter<any>);
     getBranches(messageId: string): string[];
     switchToBranch(branchId: string): void;
     append(message: AppendMessage): Promise<void>;
@@ -556,9 +563,6 @@ declare class ExternalStoreThreadRuntime implements ReactThreadRuntime {
     cancelRun(): void;
     subscribe(callback: () => void): Unsubscribe;
     private updateMessages;
-    onStoreUpdated(): void;
-    private updateData;
-    unstable_synchronizer: () => null;
     addToolResult(options: AddToolResultOptions): void;
 }
 
@@ -566,13 +570,12 @@ declare class ExternalStoreRuntime extends BaseAssistantRuntime<ExternalStoreThr
     private readonly _proxyConfigProvider;
     constructor(store: ExternalStoreAdapter<any>);
     set store(store: ExternalStoreAdapter<any>);
-    onStoreUpdated(): void;
     getModelConfig(): ModelConfig;
     registerModelConfigProvider(provider: ModelConfigProvider): () => void;
     switchToThread(threadId: string | null): void | Promise<void>;
 }
 
-declare const useExternalStoreRuntime: (store: ExternalStoreAdapter<any>) => ExternalStoreRuntime;
+declare const useExternalStoreRuntime: <T>(store: ExternalStoreAdapter<T>) => ExternalStoreRuntime;
 
 declare const getExternalStoreMessage: <T>(message: ThreadMessage) => T | undefined;
 

package/dist/index.d.ts

@@ -532,12 +532,16 @@ declare namespace internal {
   export { internal_BaseAssistantRuntime as BaseAssistantRuntime, internal_MessageRepository as MessageRepository, internal_ProxyConfigProvider as ProxyConfigProvider, internal_TooltipIconButton as TooltipIconButton, internal_generateId as generateId, internal_useSmooth as useSmooth, internal_useSmoothStatus as useSmoothStatus, internal_withSmoothContextProvider as withSmoothContextProvider };
 }
 
+type ConverterCallback<TIn> = (cache: ThreadMessage | undefined, message: TIn, idx: number) => ThreadMessage;
+declare class ThreadMessageConverter {
+    private readonly cache;
+    convertMessages<TIn extends WeakKey>(messages: TIn[], converter: ConverterCallback<TIn>, keyMapper?: (m: TIn) => WeakKey): ThreadMessage[];
+}
+
 declare class ExternalStoreThreadRuntime implements ReactThreadRuntime {
-    store: ExternalStoreAdapter<any>;
     private _subscriptions;
     private repository;
     private assistantOptimisticId;
-    private useStore;
     get capabilities(): {
         switchToBranch: boolean;
         edit: boolean;
@@ -548,7 +552,10 @@ declare class ExternalStoreThreadRuntime implements ReactThreadRuntime {
     messages: ThreadMessage[];
     isDisabled: boolean;
     isRunning: boolean;
+    converter: ThreadMessageConverter;
+    private _store;
     constructor(store: ExternalStoreAdapter<any>);
+    set store(store: ExternalStoreAdapter<any>);
     getBranches(messageId: string): string[];
     switchToBranch(branchId: string): void;
     append(message: AppendMessage): Promise<void>;
@@ -556,9 +563,6 @@ declare class ExternalStoreThreadRuntime implements ReactThreadRuntime {
     cancelRun(): void;
     subscribe(callback: () => void): Unsubscribe;
     private updateMessages;
-    onStoreUpdated(): void;
-    private updateData;
-    unstable_synchronizer: () => null;
     addToolResult(options: AddToolResultOptions): void;
 }
 
@@ -566,13 +570,12 @@ declare class ExternalStoreRuntime extends BaseAssistantRuntime<ExternalStoreThr
     private readonly _proxyConfigProvider;
     constructor(store: ExternalStoreAdapter<any>);
     set store(store: ExternalStoreAdapter<any>);
-    onStoreUpdated(): void;
     getModelConfig(): ModelConfig;
     registerModelConfigProvider(provider: ModelConfigProvider): () => void;
     switchToThread(threadId: string | null): void | Promise<void>;
 }
 
-declare const useExternalStoreRuntime: (store: ExternalStoreAdapter<any>) => ExternalStoreRuntime;
+declare const useExternalStoreRuntime: <T>(store: ExternalStoreAdapter<T>) => ExternalStoreRuntime;
 
 declare const getExternalStoreMessage: <T>(message: ThreadMessage) => T | undefined;
 

package/dist/index.js

@@ -2144,6 +2144,13 @@ var MessageRepository = (_class4 = class {constructor() { _class4.prototype.__in
       }
     }
     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
@@ -2893,18 +2900,12 @@ var useLocalRuntime = (adapter, options) => {
   return runtime;
 };
 
-// src/runtimes/external-store/ExternalStoreThreadRuntime.tsx
-
-
 // src/runtimes/external-store/getExternalStoreMessage.tsx
 var symbolInnerMessage = Symbol("innerMessage");
 var getExternalStoreMessage = (message) => {
   return message[symbolInnerMessage];
 };
 
-// src/runtimes/external-store/useExternalStoreSync.tsx
-
-
 // src/runtimes/external-store/ThreadMessageConverter.ts
 var ThreadMessageConverter = (_class6 = class {constructor() { _class6.prototype.__init16.call(this); }
   __init16() {this.cache = /* @__PURE__ */ new WeakMap()}
@@ -2925,6 +2926,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 +2997,114 @@ var fromThreadMessageLike = (like, fallbackId, fallbackStatus) => {
   }
 };
 
-// src/runtimes/external-store/useExternalStoreSync.tsx
-var useExternalStoreSync = (adapter, updateData) => {
-  const adapterRef = _react.useRef.call(void 0, adapter);
-  _react.useInsertionEffect.call(void 0, () => {
-    adapterRef.current = adapter;
-  });
-  const [converter, convertCallback] = _react.useMemo.call(void 0, () => {
-    const converter2 = _nullishCoalesce(adapter.convertMessage, () => ( ((m) => m)));
-    const convertCallback2 = (cache, m, idx) => {
-      const autoStatus = getAutoStatus(
-        adapterRef.current.messages.at(-1) === m,
-        _nullishCoalesce(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]);
-  _react.useEffect.call(void 0, () => {
-    updateData(
-      _nullishCoalesce(adapter.isDisabled, () => ( false)),
-      _nullishCoalesce(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 && _optionalChain([messages, 'access', _108 => _108[messages.length - 1], 'optionalAccess', _109 => _109.role]) !== "assistant";
 };
 var ExternalStoreThreadRuntime = (_class7 = class {
-  constructor(store) {;_class7.prototype.__init17.call(this);_class7.prototype.__init18.call(this);_class7.prototype.__init19.call(this);_class7.prototype.__init20.call(this);_class7.prototype.__init21.call(this);_class7.prototype.__init22.call(this);_class7.prototype.__init23.call(this);_class7.prototype.__init24.call(this);_class7.prototype.__init25.call(this);
-    this.store = store;
-    this.updateData(
-      _nullishCoalesce(store.isDisabled, () => ( false)),
-      _nullishCoalesce(store.isRunning, () => ( false)),
-      store.messages
-    );
-    this.useStore = _zustand.create.call(void 0, () => ({
-      store
-    }));
-  }
   __init17() {this._subscriptions = /* @__PURE__ */ new Set()}
   __init18() {this.repository = new MessageRepository()}
   __init19() {this.assistantOptimisticId = null}
-  
   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
     };
   }
   __init20() {this.messages = []}
   __init21() {this.isDisabled = false}
   __init22() {this.isRunning = false}
+  __init23() {this.converter = new ThreadMessageConverter()}
+  
+  constructor(store) {;_class7.prototype.__init17.call(this);_class7.prototype.__init18.call(this);_class7.prototype.__init19.call(this);_class7.prototype.__init20.call(this);_class7.prototype.__init21.call(this);_class7.prototype.__init22.call(this);_class7.prototype.__init23.call(this);_class7.prototype.__init24.call(this);
+    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 = _nullishCoalesce(store.isRunning, () => ( false));
+    const isDisabled = _nullishCoalesce(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(_nullishCoalesce(_optionalChain([parent, 'optionalAccess', _113 => _113.id]), () => ( null)), message);
+    }
+    if (this.assistantOptimisticId) {
+      this.repository.deleteMessage(this.assistantOptimisticId);
+      this.assistantOptimisticId = null;
+    }
+    if (hasUpcomingMessage(isRunning, messages)) {
+      this.assistantOptimisticId = this.repository.appendOptimisticMessage(
+        _nullishCoalesce(_optionalChain([messages, 'access', _114 => _114.at, 'call', _115 => _115(-1), 'optionalAccess', _116 => _116.id]), () => ( null)),
+        {
+          role: "assistant",
+          content: []
+        }
+      );
+    }
+    this.repository.resetHead(
+      _nullishCoalesce(_nullishCoalesce(this.assistantOptimisticId, () => ( _optionalChain([messages, 'access', _117 => _117.at, 'call', _118 => _118(-1), 'optionalAccess', _119 => _119.id]))), () => ( null))
+    );
+    this.messages = this.repository.getMessages();
+    this.isDisabled = isDisabled;
+    this.isRunning = isRunning;
+    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 !== (_nullishCoalesce(_optionalChain([this, 'access', _120 => _120.messages, 'access', _121 => _121.at, 'call', _122 => _122(-1), 'optionalAccess', _123 => _123.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;
@@ -3108,67 +3118,27 @@ var ExternalStoreThreadRuntime = (_class7 = class {
     this._subscriptions.add(callback);
     return () => this._subscriptions.delete(callback);
   }
-  __init23() {this.updateMessages = (messages) => {
-    _optionalChain([this, 'access', _124 => _124.store, 'access', _125 => _125.setMessages, 'optionalCall', _126 => _126(
+  __init24() {this.updateMessages = (messages) => {
+    _optionalChain([this, 'access', _124 => _124._store, 'access', _125 => _125.setMessages, 'optionalCall', _126 => _126(
       messages.flatMap(getExternalStoreMessage).filter((m) => m != null)
     )]);
   }}
-  onStoreUpdated() {
-    if (this.useStore.getState().store !== this.store) {
-      this.useStore.setState({ store: this.store });
-    }
-  }
-  __init24() {this.updateData = (isDisabled, isRunning, vm) => {
-    for (let i = 0; i < vm.length; i++) {
-      const message = vm[i];
-      const parent = vm[i - 1];
-      this.repository.addOrUpdateMessage(_nullishCoalesce(_optionalChain([parent, 'optionalAccess', _127 => _127.id]), () => ( null)), message);
-    }
-    if (this.assistantOptimisticId) {
-      this.repository.deleteMessage(this.assistantOptimisticId);
-      this.assistantOptimisticId = null;
-    }
-    if (hasUpcomingMessage(isRunning, vm)) {
-      this.assistantOptimisticId = this.repository.appendOptimisticMessage(
-        _nullishCoalesce(_optionalChain([vm, 'access', _128 => _128.at, 'call', _129 => _129(-1), 'optionalAccess', _130 => _130.id]), () => ( null)),
-        {
-          role: "assistant",
-          content: []
-        }
-      );
-    }
-    this.repository.resetHead(
-      _nullishCoalesce(_nullishCoalesce(this.assistantOptimisticId, () => ( _optionalChain([vm, 'access', _131 => _131.at, 'call', _132 => _132(-1), 'optionalAccess', _133 => _133.id]))), () => ( null))
-    );
-    this.messages = this.repository.getMessages();
-    this.isDisabled = isDisabled;
-    this.isRunning = isRunning;
-    for (const callback of this._subscriptions) callback();
-  }}
-  __init25() {this.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);
   }
 }, _class7);
 
 // src/runtimes/external-store/ExternalStoreRuntime.tsx
 var ExternalStoreRuntime = (_class8 = class extends BaseAssistantRuntime {
-  __init26() {this._proxyConfigProvider = new ProxyConfigProvider()}
+  __init25() {this._proxyConfigProvider = new ProxyConfigProvider()}
   constructor(store) {
-    super(new ExternalStoreThreadRuntime(store));_class8.prototype.__init26.call(this);;
+    super(new ExternalStoreThreadRuntime(store));_class8.prototype.__init25.call(this);;
   }
   set store(store) {
     this.thread.store = store;
   }
-  onStoreUpdated() {
-    return this.thread.onStoreUpdated();
-  }
   getModelConfig() {
     return this._proxyConfigProvider.getModelConfig();
   }
@@ -3195,9 +3165,6 @@ var useExternalStoreRuntime = (store) => {
   _react.useInsertionEffect.call(void 0, () => {
     runtime.store = store;
   });
-  _react.useEffect.call(void 0, () => {
-    runtime.onStoreUpdated();
-  });
   return runtime;
 };
 
@@ -3217,7 +3184,7 @@ var ThreadConfigProvider = ({
 }) => {
   const assistant = useAssistantContext({ optional: true });
   const configProvider = config && Object.keys(_nullishCoalesce(config, () => ( {}))).length > 0 ? /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ThreadConfigContext.Provider, { value: config, children }) : /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _jsxruntime.Fragment, { children });
-  if (!_optionalChain([config, 'optionalAccess', _134 => _134.runtime])) return configProvider;
+  if (!_optionalChain([config, 'optionalAccess', _127 => _127.runtime])) return configProvider;
   if (assistant) {
     throw new Error(
       "You provided a runtime to <Thread> while simulataneously using <AssistantRuntimeProvider>. This is not allowed."
@@ -3433,7 +3400,7 @@ var AssistantMessageContent = _react.forwardRef.call(void 0, ({ components: comp
     {
       components: {
         ...componentsProp,
-        Text: _nullishCoalesce(_nullishCoalesce(_optionalChain([componentsProp, 'optionalAccess', _135 => _135.Text]), () => ( components.Text)), () => ( content_part_default.Text))
+        Text: _nullishCoalesce(_nullishCoalesce(_optionalChain([componentsProp, 'optionalAccess', _128 => _128.Text]), () => ( components.Text)), () => ( content_part_default.Text))
       }
     }
   ) });
@@ -3608,7 +3575,7 @@ var ThreadWelcomeSuggestion = ({
 };
 var ThreadWelcomeSuggestions = () => {
   const { welcome: { suggestions } = {} } = useThreadConfig();
-  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ThreadWelcomeSuggestionContainer, { children: _optionalChain([suggestions, 'optionalAccess', _136 => _136.map, 'call', _137 => _137((suggestion, idx) => {
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ThreadWelcomeSuggestionContainer, { children: _optionalChain([suggestions, 'optionalAccess', _129 => _129.map, 'call', _130 => _130((suggestion, idx) => {
     const key = `${suggestion.prompt}-${idx}`;
     return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ThreadWelcomeSuggestion, { suggestion }, key);
   })]) });
@@ -3686,7 +3653,7 @@ var UserMessageContent = _react.forwardRef.call(void 0,
       {
         components: {
           ...components,
-          Text: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _138 => _138.Text]), () => ( content_part_default.Text))
+          Text: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _131 => _131.Text]), () => ( content_part_default.Text))
         }
       }
     ) });
@@ -3788,10 +3755,10 @@ var ThreadMessages = ({ components, ...rest }) => {
     thread_exports.Messages,
     {
       components: {
-        UserMessage: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _139 => _139.UserMessage]), () => ( user_message_default)),
-        EditComposer: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _140 => _140.EditComposer]), () => ( edit_composer_default)),
-        AssistantMessage: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _141 => _141.AssistantMessage]), () => ( assistant_message_default)),
-        SystemMessage: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _142 => _142.SystemMessage]), () => ( SystemMessage))
+        UserMessage: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _132 => _132.UserMessage]), () => ( user_message_default)),
+        EditComposer: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _133 => _133.EditComposer]), () => ( edit_composer_default)),
+        AssistantMessage: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _134 => _134.AssistantMessage]), () => ( assistant_message_default)),
+        SystemMessage: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _135 => _135.SystemMessage]), () => ( SystemMessage))
       },
       ...rest
     }