@assistant-ui/react 0.5.15 → 0.5.17

package/dist/index.d.mts

@@ -186,10 +186,13 @@ type ChatModelRunOptions = {
     messages: ThreadMessage[];
     abortSignal: AbortSignal;
     config: ModelConfig;
+    /**
+     * @deprecated Declare the run function as an AsyncGenerator instead. This method will be removed in v0.6
+     */
     onUpdate: (result: ChatModelRunUpdate) => void;
 };
 type ChatModelAdapter = {
-    run: (options: ChatModelRunOptions) => Promise<ChatModelRunResult>;
+    run: (options: ChatModelRunOptions) => Promise<ChatModelRunResult> | AsyncGenerator<ChatModelRunResult, void>;
 };
 
 declare abstract class BaseAssistantRuntime<TThreadRuntime extends ReactThreadRuntime> implements AssistantRuntime {
@@ -245,6 +248,7 @@ declare class LocalThreadRuntime implements ThreadRuntime {
         cancel: true;
         copy: true;
     }>;
+    readonly isDisabled = false;
     get messages(): ThreadMessage[];
     get isRunning(): boolean;
     constructor(configProvider: ModelConfigProvider, adapter: ChatModelAdapter, options?: LocalRuntimeOptions | undefined);
@@ -295,7 +299,7 @@ type EdgeChatAdapterOptions = {
 declare class EdgeChatAdapter implements ChatModelAdapter {
     private options;
     constructor(options: EdgeChatAdapterOptions);
-    run({ messages, abortSignal, config, onUpdate }: ChatModelRunOptions): Promise<ChatModelRunResult>;
+    run({ messages, abortSignal, config }: ChatModelRunOptions): AsyncGenerator<ChatModelRunResult, void, unknown>;
 }
 
 type EdgeRuntimeOptions = EdgeChatAdapterOptions & LocalRuntimeOptions;
@@ -565,6 +569,7 @@ type ExternalStoreMessageConverterAdapter<T> = {
 };
 type ExternalStoreAdapterBase<T> = {
     threadId?: string | undefined;
+    isDisabled?: boolean | undefined;
     isRunning?: boolean | undefined;
     messages: T[];
     setMessages?: ((messages: T[]) => void) | undefined;
@@ -656,7 +661,8 @@ declare class ExternalStoreThreadRuntime implements ReactThreadRuntime {
         cancel: boolean;
         copy: boolean;
     };
-    messages: ThreadMessage[];
+    messages: any[];
+    isDisabled: boolean;
     isRunning: boolean;
     constructor(store: ExternalStoreAdapter<any>);
     getBranches(messageId: string): string[];
@@ -760,6 +766,7 @@ declare function useAssistantContext(options: {
 
 type ThreadState = Readonly<{
     isRunning: boolean;
+    isDisabled: boolean;
 }>;
 
 type ThreadViewportState = Readonly<{
@@ -932,6 +939,7 @@ declare const useThreadEmpty: () => boolean;
 type ThreadIfFilters = {
     empty: boolean | undefined;
     running: boolean | undefined;
+    disabled: boolean | undefined;
 };
 type UseThreadIfProps = RequireAtLeastOne<ThreadIfFilters>;
 declare const useThreadIf: (props: UseThreadIfProps) => boolean;

package/dist/index.d.ts

@@ -186,10 +186,13 @@ type ChatModelRunOptions = {
     messages: ThreadMessage[];
     abortSignal: AbortSignal;
     config: ModelConfig;
+    /**
+     * @deprecated Declare the run function as an AsyncGenerator instead. This method will be removed in v0.6
+     */
     onUpdate: (result: ChatModelRunUpdate) => void;
 };
 type ChatModelAdapter = {
-    run: (options: ChatModelRunOptions) => Promise<ChatModelRunResult>;
+    run: (options: ChatModelRunOptions) => Promise<ChatModelRunResult> | AsyncGenerator<ChatModelRunResult, void>;
 };
 
 declare abstract class BaseAssistantRuntime<TThreadRuntime extends ReactThreadRuntime> implements AssistantRuntime {
@@ -245,6 +248,7 @@ declare class LocalThreadRuntime implements ThreadRuntime {
         cancel: true;
         copy: true;
     }>;
+    readonly isDisabled = false;
     get messages(): ThreadMessage[];
     get isRunning(): boolean;
     constructor(configProvider: ModelConfigProvider, adapter: ChatModelAdapter, options?: LocalRuntimeOptions | undefined);
@@ -295,7 +299,7 @@ type EdgeChatAdapterOptions = {
 declare class EdgeChatAdapter implements ChatModelAdapter {
     private options;
     constructor(options: EdgeChatAdapterOptions);
-    run({ messages, abortSignal, config, onUpdate }: ChatModelRunOptions): Promise<ChatModelRunResult>;
+    run({ messages, abortSignal, config }: ChatModelRunOptions): AsyncGenerator<ChatModelRunResult, void, unknown>;
 }
 
 type EdgeRuntimeOptions = EdgeChatAdapterOptions & LocalRuntimeOptions;
@@ -565,6 +569,7 @@ type ExternalStoreMessageConverterAdapter<T> = {
 };
 type ExternalStoreAdapterBase<T> = {
     threadId?: string | undefined;
+    isDisabled?: boolean | undefined;
     isRunning?: boolean | undefined;
     messages: T[];
     setMessages?: ((messages: T[]) => void) | undefined;
@@ -656,7 +661,8 @@ declare class ExternalStoreThreadRuntime implements ReactThreadRuntime {
         cancel: boolean;
         copy: boolean;
     };
-    messages: ThreadMessage[];
+    messages: any[];
+    isDisabled: boolean;
     isRunning: boolean;
     constructor(store: ExternalStoreAdapter<any>);
     getBranches(messageId: string): string[];
@@ -760,6 +766,7 @@ declare function useAssistantContext(options: {
 
 type ThreadState = Readonly<{
     isRunning: boolean;
+    isDisabled: boolean;
 }>;
 
 type ThreadViewportState = Readonly<{
@@ -932,6 +939,7 @@ declare const useThreadEmpty: () => boolean;
 type ThreadIfFilters = {
     empty: boolean | undefined;
     running: boolean | undefined;
+    disabled: boolean | undefined;
 };
 type UseThreadIfProps = RequireAtLeastOne<ThreadIfFilters>;
 declare const useThreadIf: (props: UseThreadIfProps) => boolean;

package/dist/index.js

@@ -304,6 +304,7 @@ var makeComposerStore = (useThreadMessages, useThreadActions) => {
 var import_zustand4 = require("zustand");
 var makeThreadStore = (runtimeRef) => {
   return (0, import_zustand4.create)(() => ({
+    isDisabled: runtimeRef.getState().isDisabled,
     isRunning: runtimeRef.getState().isRunning
   }));
 };
@@ -402,10 +403,12 @@ var ThreadProvider = ({
     (0, import_react4.useCallback)(
       (thread) => {
         const onThreadUpdate = () => {
-          if (thread.isRunning !== context.useThread.getState().isRunning) {
+          const threadState = context.useThread.getState();
+          if (thread.isRunning !== threadState.isRunning || thread.isDisabled !== threadState.isDisabled) {
             context.useThread.setState(
               Object.freeze({
-                isRunning: thread.isRunning
+                isRunning: thread.isRunning,
+                isDisabled: thread.isDisabled
               }),
               true
             );
@@ -716,7 +719,7 @@ var useActionBarReload = () => {
   const { useMessage } = useMessageContext();
   const disabled = useCombinedStore(
     [useThread, useMessage],
-    (t, m) => t.isRunning || m.message.role !== "assistant"
+    (t, m) => t.isRunning || t.isDisabled || m.message.role !== "assistant"
   );
   const callback = (0, import_react19.useCallback)(() => {
     const { parentId } = useMessage.getState();
@@ -802,9 +805,16 @@ var useComposerIf = (props) => {
 // src/primitive-hooks/composer/useComposerSend.tsx
 var import_react23 = require("react");
 var useComposerSend = () => {
-  const { useViewport, useComposer: useNewComposer } = useThreadContext();
+  const {
+    useThread,
+    useViewport,
+    useComposer: useNewComposer
+  } = useThreadContext();
   const { useComposer } = useComposerContext();
-  const disabled = useComposer((c) => !c.isEditing || c.value.length === 0);
+  const disabled = useCombinedStore(
+    [useThread, useComposer],
+    (t, c) => t.isDisabled || t.isRunning || !c.isEditing || c.value.length === 0
+  );
   const callback = (0, import_react23.useCallback)(() => {
     const composerState = useComposer.getState();
     if (!composerState.isEditing) return;
@@ -883,6 +893,8 @@ var useThreadIf = (props) => {
       if (props.empty === false && messages.length === 0) return false;
       if (props.running === true && !thread.isRunning) return false;
       if (props.running === false && thread.isRunning) return false;
+      if (props.disabled === true && thread.isDisabled) return false;
+      if (props.disabled === false && thread.isDisabled) return false;
       return true;
     }
   );
@@ -914,7 +926,7 @@ var useThreadSuggestion = ({
 }) => {
   const { useThread, useComposer } = useThreadContext();
   const append = useAppendMessage();
-  const disabled = useThread((t) => t.isRunning);
+  const disabled = useThread((t) => t.isDisabled);
   const callback = (0, import_react25.useCallback)(() => {
     const thread = useThread.getState();
     const composer = useComposer.getState();
@@ -1597,7 +1609,14 @@ var import_react_textarea_autosize = __toESM(require("react-textarea-autosize"))
 var import_react_use_escape_keydown = require("@radix-ui/react-use-escape-keydown");
 var import_jsx_runtime19 = require("react/jsx-runtime");
 var ComposerPrimitiveInput = (0, import_react41.forwardRef)(
-  ({ autoFocus = false, asChild, disabled, onChange, onKeyDown, ...rest }, forwardedRef) => {
+  ({
+    autoFocus = false,
+    asChild,
+    disabled: disabledProp,
+    onChange,
+    onKeyDown,
+    ...rest
+  }, forwardedRef) => {
     const { useThread } = useThreadContext();
     const { useComposer, type } = useComposerContext();
     const value = useComposer((c) => {
@@ -1605,6 +1624,7 @@ var ComposerPrimitiveInput = (0, import_react41.forwardRef)(
       return c.value;
     });
     const Component = asChild ? import_react_slot.Slot : import_react_textarea_autosize.default;
+    const isDisabled = useThread((t) => t.isDisabled) ?? disabledProp ?? false;
     const textareaRef = (0, import_react41.useRef)(null);
     const ref = (0, import_react_compose_refs2.useComposedRefs)(forwardedRef, textareaRef);
     (0, import_react_use_escape_keydown.useEscapeKeydown)((e) => {
@@ -1615,7 +1635,7 @@ var ComposerPrimitiveInput = (0, import_react41.forwardRef)(
       }
     });
     const handleKeyPress = (e) => {
-      if (disabled) return;
+      if (isDisabled) return;
       if (e.key === "Enter" && e.shiftKey === false) {
         const isRunning = useThread.getState().isRunning;
         if (!isRunning) {
@@ -1624,7 +1644,7 @@ var ComposerPrimitiveInput = (0, import_react41.forwardRef)(
         }
       }
     };
-    const autoFocusEnabled = autoFocus && !disabled;
+    const autoFocusEnabled = autoFocus && !isDisabled;
     const focus = (0, import_react41.useCallback)(() => {
       const textarea = textareaRef.current;
       if (!textarea || !autoFocusEnabled) return;
@@ -1647,7 +1667,7 @@ var ComposerPrimitiveInput = (0, import_react41.forwardRef)(
         value,
         ...rest,
         ref,
-        disabled,
+        disabled: isDisabled,
         onChange: (0, import_primitive5.composeEventHandlers)(onChange, (e) => {
           const composerState = useComposer.getState();
           if (!composerState.isEditing) return;
@@ -3408,7 +3428,7 @@ var EdgeChatAdapter = class {
   constructor(options) {
     this.options = options;
   }
-  async run({ messages, abortSignal, config, onUpdate }) {
+  async *run({ messages, abortSignal, config }) {
     const result = await fetch(this.options.api, {
       method: "POST",
       headers: {
@@ -3429,11 +3449,10 @@ var EdgeChatAdapter = class {
     const stream = result.body.pipeThrough(new TextDecoderStream()).pipeThrough(chunkByLineStream()).pipeThrough(assistantDecoderStream()).pipeThrough(toolResultStream(config.tools)).pipeThrough(runResultStream());
     let update;
     for await (update of asAsyncIterable(stream)) {
-      onUpdate(update);
+      yield update;
     }
     if (update === void 0)
       throw new Error("No data received from Edge Runtime");
-    return update;
   }
 };
 
@@ -3475,6 +3494,7 @@ var LocalThreadRuntime = class {
   abortController = null;
   repository = new MessageRepository();
   capabilities = CAPABILITIES;
+  isDisabled = false;
   get messages() {
     return this.repository.getMessages();
   }
@@ -3551,21 +3571,27 @@ var LocalThreadRuntime = class {
       });
     }
     try {
-      const result = await this.adapter.run({
+      const promiseOrGenerator = this.adapter.run({
         messages,
         abortSignal: this.abortController.signal,
         config: this.configProvider.getModelConfig(),
         onUpdate: updateMessage
       });
-      if (result.status?.type === "running")
-        throw new Error(
-          "Unexpected running status returned from ChatModelAdapter"
-        );
+      if (Symbol.asyncIterator in promiseOrGenerator) {
+        for await (const r of promiseOrGenerator) {
+          updateMessage(r);
+        }
+      } else {
+        updateMessage(await promiseOrGenerator);
+      }
       this.abortController = null;
-      updateMessage({
-        status: { type: "complete", reason: "unknown" },
-        ...result
-      });
+      if (message.status.type === "running") {
+        updateMessage({
+          status: { type: "complete", reason: "unknown" }
+        });
+      } else {
+        this.notifySubscribers();
+      }
     } catch (e) {
       this.abortController = null;
       if (e instanceof Error && e.name === "AbortError") {
@@ -3785,6 +3811,7 @@ var useExternalStoreSync = (adapter, updateData) => {
   }, [adapter.convertMessage]);
   (0, import_react55.useEffect)(() => {
     updateData(
+      adapter.isDisabled ?? false,
       adapter.isRunning ?? false,
       converter.convertMessages(adapter.messages, convertCallback)
     );
@@ -3792,8 +3819,9 @@ var useExternalStoreSync = (adapter, updateData) => {
     updateData,
     converter,
     convertCallback,
-    adapter.messages,
-    adapter.isRunning
+    adapter.isDisabled,
+    adapter.isRunning,
+    adapter.messages
   ]);
 };
 
@@ -3804,6 +3832,9 @@ var hasUpcomingMessage = (isRunning, messages) => {
 var ExternalStoreThreadRuntime = class {
   constructor(store) {
     this.store = store;
+    this.isDisabled = store.isDisabled ?? false;
+    this.isRunning = store.isRunning ?? false;
+    this.messages = store.messages;
     this.useStore = (0, import_zustand14.create)(() => ({
       store
     }));
@@ -3821,8 +3852,9 @@ var ExternalStoreThreadRuntime = class {
       copy: this.store.onCopy !== null
     };
   }
-  messages = [];
-  isRunning = false;
+  messages;
+  isDisabled;
+  isRunning;
   getBranches(messageId) {
     return this.repository.getBranches(messageId);
   }
@@ -3873,7 +3905,7 @@ var ExternalStoreThreadRuntime = class {
       this.useStore.setState({ store: this.store });
     }
   }
-  updateData = (isRunning, vm) => {
+  updateData = (isDisabled, isRunning, vm) => {
     for (let i = 0; i < vm.length; i++) {
       const message = vm[i];
       const parent = vm[i - 1];
@@ -3896,6 +3928,7 @@ var ExternalStoreThreadRuntime = class {
       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();
   };