@assistant-ui/react 0.5.74 → 0.5.76

package/dist/index.mjs

@@ -605,20 +605,13 @@ var useActionBarReload = () => {
 // src/primitive-hooks/actionBar/useActionBarSpeak.tsx
 import { useCallback as useCallback6 } from "react";
 var useActionBarSpeak = () => {
-  const messageStore = useMessageStore();
-  const editComposerStore = useEditComposerStore();
   const messageRunime = useMessageRuntime();
-  const messageUtilsStore = useMessageUtilsStore();
-  const hasSpeakableContent = useCombinedStore(
-    [messageStore, editComposerStore],
-    (message, c) => {
-      return !c.isEditing && (message.role !== "assistant" || message.status.type !== "running") && message.content.some((c2) => c2.type === "text" && c2.text.length > 0);
-    }
-  );
   const callback = useCallback6(async () => {
-    const utt = messageRunime.speak();
-    messageUtilsStore.getState().addUtterance(utt);
-  }, [messageRunime, messageUtilsStore]);
+    messageRunime.speak();
+  }, [messageRunime]);
+  const hasSpeakableContent = useMessage((m) => {
+    return (m.role !== "assistant" || m.status.type !== "running") && m.content.some((c) => c.type === "text" && c.text.length > 0);
+  });
   if (!hasSpeakableContent) return null;
   return callback;
 };
@@ -626,11 +619,11 @@ var useActionBarSpeak = () => {
 // src/primitive-hooks/actionBar/useActionBarStopSpeaking.tsx
 import { useCallback as useCallback7 } from "react";
 var useActionBarStopSpeaking = () => {
-  const messageUtilsStore = useMessageUtilsStore();
-  const isSpeaking = useMessageUtils((u) => u.isSpeaking);
+  const messageRuntime = useMessageRuntime();
+  const isSpeaking = useMessage((u) => u.speech != null);
   const callback = useCallback7(async () => {
-    messageUtilsStore.getState().stopSpeaking();
-  }, [messageUtilsStore]);
+    messageRuntime.stopSpeaking();
+  }, [messageRuntime]);
   if (!isSpeaking) return null;
   return callback;
 };
@@ -639,13 +632,9 @@ var useActionBarStopSpeaking = () => {
 import { useCallback as useCallback8 } from "react";
 var useActionBarFeedbackPositive = () => {
   const messageRuntime = useMessageRuntime();
-  const messageUtilsStore = useMessageUtilsStore();
   const callback = useCallback8(() => {
-    messageRuntime.submitFeedback({
-      type: "positive"
-    });
-    messageUtilsStore.getState().setSubmittedFeedback("positive");
-  }, [messageUtilsStore, messageRuntime]);
+    messageRuntime.submitFeedback({ type: "positive" });
+  }, [messageRuntime]);
   return callback;
 };
 
@@ -653,13 +642,9 @@ var useActionBarFeedbackPositive = () => {
 import { useCallback as useCallback9 } from "react";
 var useActionBarFeedbackNegative = () => {
   const messageRuntime = useMessageRuntime();
-  const messageUtilsStore = useMessageUtilsStore();
   const callback = useCallback9(() => {
-    messageRuntime.submitFeedback({
-      type: "negative"
-    });
-    messageUtilsStore.getState().setSubmittedFeedback("negative");
-  }, [messageUtilsStore, messageRuntime]);
+    messageRuntime.submitFeedback({ type: "negative" });
+  }, [messageRuntime]);
   return callback;
 };
 
@@ -747,23 +732,21 @@ var useComposerSend = () => {
 import { useCallback as useCallback14 } from "react";
 var useComposerAddAttachment = () => {
   const disabled = useComposer((c) => !c.isEditing);
-  const threadComposerStore = useThreadComposerStore();
-  const threadRuntimeStore = useThreadComposerStore();
+  const composerRuntime = useComposerRuntime();
   const callback = useCallback14(() => {
-    const { addAttachment } = threadComposerStore.getState();
-    const { attachmentAccept } = threadRuntimeStore.getState();
     const input = document.createElement("input");
     input.type = "file";
+    const attachmentAccept = composerRuntime.getAttachmentAccept();
     if (attachmentAccept !== "*") {
       input.accept = attachmentAccept;
     }
     input.onchange = (e) => {
       const file = e.target.files?.[0];
       if (!file) return;
-      addAttachment(file);
+      composerRuntime.addAttachment(file);
     };
     input.click();
-  }, [threadComposerStore, threadRuntimeStore]);
+  }, [composerRuntime]);
   if (disabled) return null;
   return callback;
 };
@@ -810,7 +793,15 @@ var useMessageIf = (props) => {
   const messageUtilsStore = useMessageUtilsStore();
   return useCombinedStore(
     [messageStore, messageUtilsStore],
-    ({ role, attachments, branchCount, isLast }, { isCopied, isHovering, isSpeaking, submittedFeedback }) => {
+    ({
+      role,
+      attachments,
+      content,
+      branchCount,
+      isLast,
+      speech,
+      submittedFeedback
+    }, { isCopied, isHovering }) => {
       if (props.hasBranches === true && branchCount < 2) return false;
       if (props.user && role !== "user") return false;
       if (props.assistant && role !== "assistant") return false;
@@ -818,13 +809,15 @@ var useMessageIf = (props) => {
       if (props.lastOrHover === true && !isHovering && !isLast) return false;
       if (props.copied === true && !isCopied) return false;
       if (props.copied === false && isCopied) return false;
-      if (props.speaking === true && !isSpeaking) return false;
-      if (props.speaking === false && isSpeaking) return false;
+      if (props.speaking === true && speech == null) return false;
+      if (props.speaking === false && speech != null) return false;
       if (props.hasAttachments === true && (role !== "user" || !attachments.length))
         return false;
       if (props.hasAttachments === false && role === "user" && !!attachments.length)
         return false;
-      if (props.submittedFeedback !== void 0 && submittedFeedback !== props.submittedFeedback)
+      if (props.hasContent === true && content.length === 0) return false;
+      if (props.hasContent === false && content.length > 0) return false;
+      if (props.submittedFeedback !== void 0 && (submittedFeedback?.type ?? null) !== props.submittedFeedback)
         return false;
       return true;
     }
@@ -920,7 +913,7 @@ var useActionBarFloatStatus = ({
       const autohideEnabled = autohide === "always" || autohide === "not-last" && !m.isLast;
       if (!autohideEnabled) return "normal" /* Normal */;
       if (!mu.isHovering) return "hidden" /* Hidden */;
-      if (autohideFloat === "always" || autohideFloat === "single-branch" && m.branches.length <= 1)
+      if (autohideFloat === "always" || autohideFloat === "single-branch" && m.branchCount <= 1)
         return "floating" /* Floating */;
       return "normal" /* Normal */;
     }
@@ -1058,8 +1051,8 @@ import { composeEventHandlers as composeEventHandlers4 } from "@radix-ui/primiti
 import { Primitive as Primitive5 } from "@radix-ui/react-primitive";
 import { jsx as jsx8 } from "react/jsx-runtime";
 var ActionBarPrimitiveFeedbackPositive = forwardRef5(({ onClick, disabled, ...props }, forwardedRef) => {
-  const isSubmitted = useMessageUtils(
-    (u) => u.submittedFeedback === "positive"
+  const isSubmitted = useMessage(
+    (u) => u.submittedFeedback?.type === "positive"
   );
   const callback = useActionBarFeedbackPositive();
   return /* @__PURE__ */ jsx8(
@@ -1084,8 +1077,8 @@ import { composeEventHandlers as composeEventHandlers5 } from "@radix-ui/primiti
 import { Primitive as Primitive6 } from "@radix-ui/react-primitive";
 import { jsx as jsx9 } from "react/jsx-runtime";
 var ActionBarPrimitiveFeedbackNegative = forwardRef6(({ onClick, disabled, ...props }, forwardedRef) => {
-  const isSubmitted = useMessageUtils(
-    (u) => u.submittedFeedback === "negative"
+  const isSubmitted = useMessage(
+    (u) => u.submittedFeedback?.type === "negative"
   );
   const callback = useActionBarFeedbackNegative();
   return /* @__PURE__ */ jsx9(
@@ -1309,9 +1302,9 @@ var { useAttachment: useMessageAttachment } = createContextStoreHook(
 // src/primitives/attachment/AttachmentThumb.tsx
 import { Primitive as Primitive8 } from "@radix-ui/react-primitive";
 import { jsxs } from "react/jsx-runtime";
-var AttachmentPrimitiveThumb = forwardRef11(() => {
+var AttachmentPrimitiveThumb = forwardRef11((props, ref) => {
   const ext = useAttachment((a) => a.name.split(".").pop());
-  return /* @__PURE__ */ jsxs(Primitive8.div, { children: [
+  return /* @__PURE__ */ jsxs(Primitive8.div, { ...props, ref, children: [
     ".",
     ext
   ] });
@@ -1348,7 +1341,7 @@ __export(branchPicker_exports, {
   Count: () => BranchPickerPrimitiveCount,
   Next: () => BranchPickerPrimitiveNext,
   Number: () => BranchPickerPrimitiveNumber,
-  Previous: () => BranchPickerPrevious,
+  Previous: () => BranchPickerPrimitivePrevious,
   Root: () => BranchPickerPrimitiveRoot
 });
 
@@ -1359,7 +1352,7 @@ var BranchPickerPrimitiveNext = createActionButton(
 );
 
 // src/primitives/branchPicker/BranchPickerPrevious.tsx
-var BranchPickerPrevious = createActionButton(
+var BranchPickerPrimitivePrevious = createActionButton(
   "BranchPickerPrimitive.Previous",
   useBranchPickerPrevious
 );
@@ -1852,7 +1845,6 @@ var getThreadComposerState = (runtime, focus, onFocus) => {
     isEmpty: runtime?.isEmpty ?? true,
     text: runtime?.text ?? "",
     attachments: runtime?.attachments ?? EMPTY_ARRAY,
-    attachmentAccept: runtime?.attachmentAccept ?? "*",
     value: runtime?.text ?? "",
     setValue: runtime?.setText.bind(runtime) ?? METHOD_NOT_SUPPORTED,
     setText: runtime?.setText.bind(runtime) ?? METHOD_NOT_SUPPORTED,
@@ -1874,7 +1866,6 @@ var getEditComposerState = (runtime, beginEdit) => {
     isEmpty: runtime?.isEmpty ?? true,
     text: runtime?.text ?? "",
     attachments: runtime?.attachments ?? EMPTY_ARRAY,
-    attachmentAccept: runtime?.attachmentAccept ?? "*",
     value: runtime?.text ?? "",
     setValue: runtime?.setText.bind(runtime) ?? METHOD_NOT_SUPPORTED,
     setText: runtime?.setText.bind(runtime) ?? METHOD_NOT_SUPPORTED,
@@ -1911,12 +1902,6 @@ var ComposerRuntimeImpl = class {
   get text() {
     return this.getState().text;
   }
-  /**
-   * @deprecated Use `getState().attachmentAccept` instead. This will be removed in 0.6.0.
-   */
-  get attachmentAccept() {
-    return this.getState().attachmentAccept;
-  }
   /**
    * @deprecated Use `getState().attachments` instead. This will be removed in 0.6.0.
    */
@@ -1971,6 +1956,11 @@ var ComposerRuntimeImpl = class {
   subscribe(callback) {
     return this._core.subscribe(callback);
   }
+  getAttachmentAccept() {
+    const core = this._core.getState();
+    if (!core) throw new Error("Composer is not available");
+    return core.getAttachmentAccept();
+  }
 };
 var ThreadComposerRuntimeImpl = class extends ComposerRuntimeImpl {
   get type() {
@@ -2173,6 +2163,16 @@ var MessageRuntimeImpl = class {
     if (!state) throw new Error("Message is not available");
     return this._threadBinding.getState().speak(state.id);
   }
+  stopSpeaking() {
+    const state = this._core.getState();
+    if (!state) throw new Error("Message is not available");
+    const thread = this._threadBinding.getState();
+    if (thread.speech?.messageId === state.id) {
+      this._threadBinding.getState().stopSpeaking();
+    } else {
+      throw new Error("Message is not being spoken");
+    }
+  }
   submitFeedback({ type }) {
     const state = this._core.getState();
     if (!state) throw new Error("Message is not available");
@@ -2817,7 +2817,6 @@ import { create as create10 } from "zustand";
 // src/context/stores/MessageUtils.ts
 import { create as create9 } from "zustand";
 var makeMessageUtilsStore = () => create9((set) => {
-  let utterance = null;
   return {
     isCopied: false,
     setIsCopied: (value) => {
@@ -2826,21 +2825,6 @@ var makeMessageUtilsStore = () => create9((set) => {
     isHovering: false,
     setIsHovering: (value) => {
       set({ isHovering: value });
-    },
-    isSpeaking: false,
-    stopSpeaking: () => {
-      utterance?.cancel();
-    },
-    addUtterance: (utt) => {
-      utterance = utt;
-      set({ isSpeaking: true });
-      utt.onEnd(() => {
-        set({ isSpeaking: false });
-      });
-    },
-    submittedFeedback: null,
-    setSubmittedFeedback: (feedback) => {
-      set({ submittedFeedback: feedback });
     }
   };
 });
@@ -3037,7 +3021,9 @@ __export(internal_exports, {
 var isAttachmentComplete = (a) => a.status.type === "complete";
 var BaseComposerRuntimeCore = class {
   isEditing = true;
-  attachmentAccept = "*";
+  getAttachmentAccept() {
+    return this.getAttachmentAdapter()?.accept ?? "*";
+  }
   _attachments = [];
   set attachments(value) {
     this._attachments = value;
@@ -3063,10 +3049,11 @@ var BaseComposerRuntimeCore = class {
     this.notifySubscribers();
   }
   async send() {
-    const attachments = this._attachmentAdapter ? await Promise.all(
+    const adapter = this.getAttachmentAdapter();
+    const attachments = adapter && this.attachments.length > 0 ? await Promise.all(
       this.attachments.map(async (a) => {
         if (isAttachmentComplete(a)) return a;
-        const result = await this._attachmentAdapter.send(a);
+        const result = await adapter.send(a);
         if (result.status?.type !== "complete") {
           result.status = { type: "complete" };
         }
@@ -3081,19 +3068,10 @@ var BaseComposerRuntimeCore = class {
     this.reset();
     this.handleSend(message);
   }
-  _attachmentAdapter;
-  setAttachmentAdapter(adapter) {
-    this._attachmentAdapter = adapter;
-    const accept = adapter?.accept ?? "*";
-    if (this.attachmentAccept !== accept) {
-      this.attachmentAccept = accept;
-      this.notifySubscribers();
-    }
-  }
   async addAttachment(file) {
-    if (!this._attachmentAdapter)
-      throw new Error("Attachments are not supported");
-    const attachment = await this._attachmentAdapter.add({ file });
+    const adapter = this.getAttachmentAdapter();
+    if (!adapter) throw new Error("Attachments are not supported");
+    const attachment = await adapter.add({ file });
     if (attachment.status === void 0) {
       attachment.status = { type: "requires-action", reason: "composer-send" };
     }
@@ -3101,12 +3079,12 @@ var BaseComposerRuntimeCore = class {
     this.notifySubscribers();
   }
   async removeAttachment(attachmentId) {
-    if (!this._attachmentAdapter)
-      throw new Error("Attachments are not supported");
+    const adapter = this.getAttachmentAdapter();
+    if (!adapter) throw new Error("Attachments are not supported");
     const index = this._attachments.findIndex((a) => a.id === attachmentId);
     if (index === -1) throw new Error("Attachment not found");
     const attachment = this._attachments[index];
-    await this._attachmentAdapter.remove(attachment);
+    await adapter.remove(attachment);
     this._attachments = this._attachments.toSpliced(index, 1);
     this.notifySubscribers();
   }
@@ -3134,6 +3112,9 @@ var DefaultThreadComposerRuntimeCore = class extends BaseComposerRuntimeCore {
   get attachments() {
     return super.attachments;
   }
+  getAttachmentAdapter() {
+    return this.runtime.adapters?.attachments;
+  }
   connect() {
     return this.runtime.subscribe(() => {
       if (this.canCancel !== this.runtime.capabilities.cancel) {
@@ -3512,36 +3493,6 @@ var TooltipIconButton = forwardRef23(({ children, tooltip, side = "bottom", ...r
 });
 TooltipIconButton.displayName = "TooltipIconButton";
 
-// src/api/AssistantRuntime.ts
-var AssistantRuntimeImpl = class {
-  constructor(_core, CustomThreadRuntime) {
-    this._core = _core;
-    this.thread = new CustomThreadRuntime(
-      new NestedSubscriptionSubject({
-        getState: () => this._core.thread,
-        subscribe: (callback) => this._core.subscribe(callback)
-      })
-    );
-  }
-  thread;
-  switchToNewThread() {
-    return this._core.switchToNewThread();
-  }
-  switchToThread(threadId) {
-    return this._core.switchToThread(threadId);
-  }
-  registerModelConfigProvider(provider) {
-    return this._core.registerModelConfigProvider(provider);
-  }
-  // TODO events for thread switching
-  /**
-   * @deprecated Thread is now static and never gets updated. This will be removed in 0.6.0.
-   */
-  subscribe(callback) {
-    return this._core.subscribe(callback);
-  }
-};
-
 // src/api/ThreadRuntime.ts
 var toAppendMessage = (messages2, message) => {
   if (typeof message === "string") {
@@ -3571,7 +3522,8 @@ var getThreadState = (runtime) => {
     isRunning: lastMessage?.role !== "assistant" ? false : lastMessage.status.type === "running",
     messages: runtime.messages,
     suggestions: runtime.suggestions,
-    extras: runtime.extras
+    extras: runtime.extras,
+    speech: runtime.speech
   });
 };
 var ThreadRuntimeImpl = class {
@@ -3618,6 +3570,12 @@ var ThreadRuntimeImpl = class {
   get messages() {
     return this._threadBinding.getState().messages;
   }
+  /**
+   * @deprecated Use `getState().speechState` instead. This will be removed in 0.6.0.
+   */
+  get speech() {
+    return this._threadBinding.getState().speech;
+  }
   unstable_getCore() {
     return this._threadBinding.getState();
   }
@@ -3678,15 +3636,21 @@ var ThreadRuntimeImpl = class {
   switchToBranch(branchId) {
     return this._threadBinding.getState().switchToBranch(branchId);
   }
-  // /**
-  //  * @deprecated Use `getMesssageById(id).speak()` instead. This will be removed in 0.6.0.
-  //  */
+  /**
+   * @deprecated Use `getMesssageById(id).speak()` instead. This will be removed in 0.6.0.
+   */
   speak(messageId) {
     return this._threadBinding.getState().speak(messageId);
   }
-  // /**
-  //  * @deprecated Use `getMesssageById(id).submitFeedback({ type })` instead. This will be removed in 0.6.0.
-  //  */
+  stopSpeaking() {
+    return this._threadBinding.getState().stopSpeaking();
+  }
+  getSubmittedFeedback(messageId) {
+    return this._threadBinding.getState().getSubmittedFeedback(messageId);
+  }
+  /**
+   * @deprecated Use `getMesssageById(id).submitFeedback({ type })` instead. This will be removed in 0.6.0.
+   */
   submitFeedback(options) {
     return this._threadBinding.getState().submitFeedback(options);
   }
@@ -3713,10 +3677,12 @@ var ThreadRuntimeImpl = class {
     return new MessageRuntimeImpl(
       new ShallowMemoizeSubject({
         getState: () => {
-          const messages2 = this.getState().messages;
+          const { messages: messages2, speech: speechState } = this.getState();
           const message = messages2[idx];
           if (!message) return SKIP_UPDATE;
-          const branches = this._threadBinding.getState().getBranches(message.id);
+          const thread = this._threadBinding.getState();
+          const branches = thread.getBranches(message.id);
+          const submittedFeedback = thread.getSubmittedFeedback(message.id);
           return {
             ...message,
             message,
@@ -3724,7 +3690,9 @@ var ThreadRuntimeImpl = class {
             parentId: messages2[idx - 1]?.id ?? null,
             branches,
             branchNumber: branches.indexOf(message.id) + 1,
-            branchCount: branches.length
+            branchCount: branches.length,
+            speech: speechState?.messageId === message.id ? speechState : void 0,
+            submittedFeedback
           };
         },
         subscribe: (callback) => this._threadBinding.subscribe(callback)
@@ -3734,6 +3702,47 @@ var ThreadRuntimeImpl = class {
   }
 };
 
+// src/api/AssistantRuntime.ts
+var AssistantRuntimeImpl = class _AssistantRuntimeImpl {
+  constructor(_core, _thread) {
+    this._core = _core;
+    this._thread = _thread;
+  }
+  get thread() {
+    return this._thread;
+  }
+  switchToNewThread() {
+    return this._core.switchToNewThread();
+  }
+  switchToThread(threadId) {
+    return this._core.switchToThread(threadId);
+  }
+  registerModelConfigProvider(provider) {
+    return this._core.registerModelConfigProvider(provider);
+  }
+  // TODO events for thread switching
+  /**
+   * @deprecated Thread is now static and never gets updated. This will be removed in 0.6.0.
+   */
+  subscribe(callback) {
+    return this._core.subscribe(callback);
+  }
+  static createThreadRuntime(_core, CustomThreadRuntime = ThreadRuntimeImpl) {
+    return new CustomThreadRuntime(
+      new NestedSubscriptionSubject({
+        getState: () => _core.thread,
+        subscribe: (callback) => _core.subscribe(callback)
+      })
+    );
+  }
+  static create(_core, CustomThreadRuntime = ThreadRuntimeImpl) {
+    return new _AssistantRuntimeImpl(
+      _core,
+      _AssistantRuntimeImpl.createThreadRuntime(_core, CustomThreadRuntime)
+    );
+  }
+};
+
 // src/runtimes/edge/converters/fromLanguageModelMessages.ts
 var fromLanguageModelMessages = (lm, { mergeSteps }) => {
   const messages2 = [];
@@ -4096,10 +4105,14 @@ var DefaultEditComposerRuntimeCore = class extends BaseComposerRuntimeCore {
     this._nonTextParts = message.content.filter(
       (part) => part.type !== "text" && part.type !== "ui"
     );
+    this.attachments = message.attachments ?? [];
   }
   get canCancel() {
     return true;
   }
+  getAttachmentAdapter() {
+    return this.runtime.adapters?.attachments;
+  }
   _nonTextParts;
   _previousText;
   _parentId;
@@ -4121,10 +4134,107 @@ var DefaultEditComposerRuntimeCore = class extends BaseComposerRuntimeCore {
   }
 };
 
+// src/runtimes/core/BaseThreadRuntimeCore.tsx
+var BaseThreadRuntimeCore = class {
+  constructor(configProvider) {
+    this.configProvider = configProvider;
+  }
+  _subscriptions = /* @__PURE__ */ new Set();
+  repository = new MessageRepository();
+  get messages() {
+    return this.repository.getMessages();
+  }
+  composer = new DefaultThreadComposerRuntimeCore(this);
+  getModelConfig() {
+    return this.configProvider.getModelConfig();
+  }
+  _editComposers = /* @__PURE__ */ new Map();
+  getEditComposer(messageId) {
+    return this._editComposers.get(messageId);
+  }
+  beginEdit(messageId) {
+    if (this._editComposers.has(messageId))
+      throw new Error("Edit already in progress");
+    this._editComposers.set(
+      messageId,
+      new DefaultEditComposerRuntimeCore(
+        this,
+        () => this._editComposers.delete(messageId),
+        this.repository.getMessage(messageId)
+      )
+    );
+    this.notifySubscribers();
+  }
+  getBranches(messageId) {
+    return this.repository.getBranches(messageId);
+  }
+  switchToBranch(branchId) {
+    this.repository.switchToBranch(branchId);
+    this.notifySubscribers();
+  }
+  notifySubscribers() {
+    for (const callback of this._subscriptions) callback();
+  }
+  subscribe(callback) {
+    this._subscriptions.add(callback);
+    return () => this._subscriptions.delete(callback);
+  }
+  _submittedFeedback = {};
+  getSubmittedFeedback(messageId) {
+    return this._submittedFeedback[messageId];
+  }
+  submitFeedback({ messageId, type }) {
+    const adapter = this.adapters?.feedback;
+    if (!adapter) throw new Error("Feedback adapter not configured");
+    const { message } = this.repository.getMessage(messageId);
+    adapter.submit({ message, type });
+    this._submittedFeedback[messageId] = { type };
+    this.notifySubscribers();
+  }
+  _stopSpeaking;
+  speech;
+  speak(messageId) {
+    const adapter = this.adapters?.speech;
+    if (!adapter) throw new Error("Speech adapter not configured");
+    const { message } = this.repository.getMessage(messageId);
+    this._stopSpeaking?.();
+    const utterance = adapter.speak(message);
+    const unsub = utterance.subscribe(() => {
+      if (utterance.status.type === "ended") {
+        this._stopSpeaking = void 0;
+        this.speech = void 0;
+      } else {
+        this.speech = { messageId, status: utterance.status };
+      }
+      this.notifySubscribers();
+    });
+    this.speech = { messageId, status: utterance.status };
+    this.notifySubscribers();
+    this._stopSpeaking = () => {
+      utterance.cancel();
+      unsub();
+      this.speech = void 0;
+      this._stopSpeaking = void 0;
+    };
+  }
+  stopSpeaking() {
+    if (!this._stopSpeaking) throw new Error("No message is being spoken");
+    this._stopSpeaking();
+    this.notifySubscribers();
+  }
+  export() {
+    return this.repository.export();
+  }
+  import(data) {
+    this.repository.import(data);
+    this.notifySubscribers();
+  }
+};
+
 // src/runtimes/local/LocalThreadRuntimeCore.tsx
-var LocalThreadRuntimeCore = class {
+var LocalThreadRuntimeCore = class extends BaseThreadRuntimeCore {
   constructor(configProvider, adapter, { initialMessages, ...options }) {
-    this.configProvider = configProvider;
+    super(configProvider);
     this.adapter = adapter;
     this.threadId = generateId();
     this.options = options;
@@ -4137,28 +4247,22 @@ var LocalThreadRuntimeCore = class {
       }
     }
   }
-  _subscriptions = /* @__PURE__ */ new Set();
-  abortController = null;
-  repository = new MessageRepository();
   capabilities = {
     switchToBranch: true,
     edit: true,
     reload: true,
     cancel: true,
     unstable_copy: true,
-    speak: false,
+    speech: false,
     attachments: false,
     feedback: false
   };
+  abortController = null;
   threadId;
   isDisabled = false;
   suggestions = [];
-  get messages() {
-    return this.repository.getMessages();
-  }
-  composer = new DefaultThreadComposerRuntimeCore(this);
-  getModelConfig() {
-    return this.configProvider.getModelConfig();
+  get adapters() {
+    return this.options.adapters;
   }
   _options;
   get options() {
@@ -4171,11 +4275,10 @@ var LocalThreadRuntimeCore = class {
     this._options = options;
     let hasUpdates = false;
     const canSpeak = options.adapters?.speech !== void 0;
-    if (this.capabilities.speak !== canSpeak) {
-      this.capabilities.speak = canSpeak;
+    if (this.capabilities.speech !== canSpeak) {
+      this.capabilities.speech = canSpeak;
       hasUpdates = true;
     }
-    this.composer.setAttachmentAdapter(options.adapters?.attachments);
     const canAttach = options.adapters?.attachments !== void 0;
     if (this.capabilities.attachments !== canAttach) {
       this.capabilities.attachments = canAttach;
@@ -4188,30 +4291,6 @@ var LocalThreadRuntimeCore = class {
     }
     if (hasUpdates) this.notifySubscribers();
   }
-  _editComposers = /* @__PURE__ */ new Map();
-  getEditComposer(messageId) {
-    return this._editComposers.get(messageId);
-  }
-  beginEdit(messageId) {
-    if (this._editComposers.has(messageId))
-      throw new Error("Edit already in progress");
-    this._editComposers.set(
-      messageId,
-      new DefaultEditComposerRuntimeCore(
-        this,
-        () => this._editComposers.delete(messageId),
-        this.repository.getMessage(messageId)
-      )
-    );
-    this.notifySubscribers();
-  }
-  getBranches(messageId) {
-    return this.repository.getBranches(messageId);
-  }
-  switchToBranch(branchId) {
-    this.repository.switchToBranch(branchId);
-    this.notifySubscribers();
-  }
   async append(message) {
     const newMessage = fromCoreMessage(message, {
       attachments: message.attachments
@@ -4288,7 +4367,7 @@ var LocalThreadRuntimeCore = class {
       const promiseOrGenerator = this.adapter.run({
         messages: messages2,
         abortSignal: this.abortController.signal,
-        config: this.configProvider.getModelConfig(),
+        config: this.getModelConfig(),
         onUpdate: updateMessage
       });
       if (Symbol.asyncIterator in promiseOrGenerator) {
@@ -4320,17 +4399,9 @@ var LocalThreadRuntimeCore = class {
     return message;
   }
   cancelRun() {
-    if (!this.abortController) return;
-    this.abortController.abort();
+    this.abortController?.abort();
     this.abortController = null;
   }
-  notifySubscribers() {
-    for (const callback of this._subscriptions) callback();
-  }
-  subscribe(callback) {
-    this._subscriptions.add(callback);
-    return () => this._subscriptions.delete(callback);
-  }
   addToolResult({
     messageId,
     toolCallId,
@@ -4364,38 +4435,6 @@ var LocalThreadRuntimeCore = class {
       this.performRoundtrip(parentId, message);
     }
   }
-  // TODO lift utterance state to thread runtime
-  _utterance;
-  speak(messageId) {
-    const adapter = this.options.adapters?.speech;
-    if (!adapter) throw new Error("Speech adapter not configured");
-    const { message } = this.repository.getMessage(messageId);
-    if (this._utterance) {
-      this._utterance.cancel();
-      this._utterance = void 0;
-    }
-    const utterance = adapter.speak(message);
-    utterance.onEnd(() => {
-      if (this._utterance === utterance) {
-        this._utterance = void 0;
-      }
-    });
-    this._utterance = utterance;
-    return this._utterance;
-  }
-  submitFeedback({ messageId, type }) {
-    const adapter = this.options.adapters?.feedback;
-    if (!adapter) throw new Error("Feedback adapter not configured");
-    const { message } = this.repository.getMessage(messageId);
-    adapter.submit({ message, type });
-  }
-  export() {
-    return this.repository.export();
-  }
-  import(data) {
-    this.repository.import(data);
-    this.notifySubscribers();
-  }
 };
 
 // src/runtimes/local/LocalRuntimeCore.tsx
@@ -4439,14 +4478,20 @@ var LocalRuntimeCore = class extends BaseAssistantRuntimeCore {
 };
 
 // src/runtimes/local/useLocalRuntime.tsx
-var LocalRuntime = class extends AssistantRuntimeImpl {
-  constructor(core) {
-    super(core, ThreadRuntimeImpl);
+var LocalRuntimeImpl = class _LocalRuntimeImpl extends AssistantRuntimeImpl {
+  constructor(core, thread) {
+    super(core, thread);
     this.core = core;
   }
   reset(options) {
     this.core.reset(options);
   }
+  static create(_core) {
+    return new _LocalRuntimeImpl(
+      _core,
+      AssistantRuntimeImpl.createThreadRuntime(_core, ThreadRuntimeImpl)
+    );
+  }
 };
 var useLocalRuntime = (adapter, options = {}) => {
   const [runtime] = useState11(() => new LocalRuntimeCore(adapter, options));
@@ -4454,7 +4499,7 @@ var useLocalRuntime = (adapter, options = {}) => {
     runtime.thread.adapter = adapter;
     runtime.thread.options = options;
   });
-  return useMemo11(() => new LocalRuntime(runtime), [runtime]);
+  return useMemo11(() => LocalRuntimeImpl.create(runtime), [runtime]);
 };
 
 // src/runtimes/external-store/useExternalStoreRuntime.tsx
@@ -4567,13 +4612,7 @@ var EMPTY_ARRAY2 = Object.freeze([]);
 var hasUpcomingMessage = (isRunning, messages2) => {
   return isRunning && messages2[messages2.length - 1]?.role !== "assistant";
 };
-var ExternalStoreThreadRuntimeCore = class {
-  constructor(configProvider, store) {
-    this.configProvider = configProvider;
-    this.store = store;
-  }
-  _subscriptions = /* @__PURE__ */ new Set();
-  repository = new MessageRepository();
+var ExternalStoreThreadRuntimeCore = class extends BaseThreadRuntimeCore {
   assistantOptimisticId = null;
   _capabilities = {
     switchToBranch: false,
@@ -4581,7 +4620,7 @@ var ExternalStoreThreadRuntimeCore = class {
     reload: false,
     cancel: false,
     unstable_copy: false,
-    speak: false,
+    speech: false,
     attachments: false,
     feedback: false
   };
@@ -4589,29 +4628,26 @@ var ExternalStoreThreadRuntimeCore = class {
     return this._capabilities;
   }
   threadId;
-  messages;
+  _messages;
   isDisabled;
+  get messages() {
+    return this._messages;
+  }
+  get adapters() {
+    return this._store.adapters;
+  }
   suggestions = [];
   extras = void 0;
   _converter = new ThreadMessageConverter();
   _store;
-  composer = new DefaultThreadComposerRuntimeCore(this);
-  _editComposers = /* @__PURE__ */ new Map();
-  getEditComposer(messageId) {
-    return this._editComposers.get(messageId);
-  }
   beginEdit(messageId) {
-    if (this._editComposers.has(messageId))
-      throw new Error("Edit already in progress");
-    this._editComposers.set(
-      messageId,
-      new DefaultEditComposerRuntimeCore(
-        this,
-        () => this._editComposers.delete(messageId),
-        this.repository.getMessage(messageId)
-      )
-    );
-    this.notifySubscribers();
+    if (!this.store.onEdit)
+      throw new Error("Runtime does not support editing.");
+    super.beginEdit(messageId);
+  }
+  constructor(configProvider, store) {
+    super(configProvider);
+    this.store = store;
   }
   get store() {
     return this._store;
@@ -4630,13 +4666,12 @@ var ExternalStoreThreadRuntimeCore = class {
       edit: this._store.onEdit !== void 0,
       reload: this._store.onReload !== void 0,
       cancel: this._store.onCancel !== void 0,
-      speak: this._store.onSpeak !== void 0,
+      speech: this._store.adapters?.speech !== void 0,
       unstable_copy: this._store.unstable_capabilities?.copy !== false,
       // default true
       attachments: !!this.store.adapters?.attachments,
       feedback: !!this.store.adapters?.feedback
     };
-    this.composer.setAttachmentAdapter(this._store.adapters?.attachments);
     if (oldStore) {
       if (oldStore.convertMessage !== store.convertMessage) {
         this._converter = new ThreadMessageConverter();
@@ -4680,18 +4715,9 @@ var ExternalStoreThreadRuntimeCore = class {
     this.repository.resetHead(
       this.assistantOptimisticId ?? messages2.at(-1)?.id ?? null
     );
-    this.messages = this.repository.getMessages();
+    this._messages = this.repository.getMessages();
     this.notifySubscribers();
   }
-  getModelConfig() {
-    return this.configProvider.getModelConfig();
-  }
-  notifySubscribers() {
-    for (const callback of this._subscriptions) callback();
-  }
-  getBranches(messageId) {
-    return this.repository.getBranches(messageId);
-  }
   switchToBranch(branchId) {
     if (!this._store.setMessages)
       throw new Error("Runtime does not support switching branches.");
@@ -4740,33 +4766,11 @@ var ExternalStoreThreadRuntimeCore = class {
       throw new Error("Runtime does not support tool results.");
     this._store.onAddToolResult(options);
   }
-  speak(messageId) {
-    if (!this._store.onSpeak)
-      throw new Error("Runtime does not support speaking.");
-    const { message } = this.repository.getMessage(messageId);
-    return this._store.onSpeak(message);
-  }
-  submitFeedback({ messageId, type }) {
-    const adapter = this._store.adapters?.feedback;
-    if (!adapter) throw new Error("Feedback adapter not configured");
-    const { message } = this.repository.getMessage(messageId);
-    adapter.submit({ message, type });
-  }
-  subscribe(callback) {
-    this._subscriptions.add(callback);
-    return () => this._subscriptions.delete(callback);
-  }
   updateMessages = (messages2) => {
     this._store.setMessages?.(
       messages2.flatMap(getExternalStoreMessage).filter((m) => m != null)
     );
   };
-  import(repository) {
-    this.repository.import(repository);
-  }
-  export() {
-    return this.repository.export();
-  }
 };
 
 // src/runtimes/external-store/ExternalStoreRuntimeCore.tsx
@@ -4821,7 +4825,7 @@ var useExternalStoreRuntime = (store) => {
     runtime.thread.store = store;
   });
   return useMemo12(
-    () => new AssistantRuntimeImpl(runtime, ThreadRuntimeImpl),
+    () => AssistantRuntimeImpl.create(runtime, ThreadRuntimeImpl),
     [runtime]
   );
 };
@@ -5011,11 +5015,11 @@ var WebSpeechSynthesisAdapter = class {
   speak(message) {
     const text = getThreadMessageText(message);
     const utterance = new SpeechSynthesisUtterance(text);
-    const endHandlers = /* @__PURE__ */ new Set();
+    const subscribers = /* @__PURE__ */ new Set();
     const handleEnd = (reason, error) => {
       if (res.status.type === "ended") return;
       res.status = { type: "ended", reason, error };
-      endHandlers.forEach((handler) => handler());
+      subscribers.forEach((handler) => handler());
     };
     utterance.addEventListener("end", () => handleEnd("finished"));
     utterance.addEventListener("error", (e) => handleEnd("error", e.error));
@@ -5026,7 +5030,7 @@ var WebSpeechSynthesisAdapter = class {
         window.speechSynthesis.cancel();
         handleEnd("cancelled");
       },
-      onEnd: (callback) => {
+      subscribe: (callback) => {
         if (res.status.type === "ended") {
           let cancelled = false;
           queueMicrotask(() => {
@@ -5036,9 +5040,9 @@ var WebSpeechSynthesisAdapter = class {
             cancelled = true;
           };
         } else {
-          endHandlers.add(callback);
+          subscribers.add(callback);
           return () => {
-            endHandlers.delete(callback);
+            subscribers.delete(callback);
           };
         }
       }
@@ -5241,8 +5245,8 @@ var useAllowCopy = (ensureCapability = false) => {
 };
 var useAllowSpeak = (ensureCapability = false) => {
   const { assistantMessage: { allowSpeak = true } = {} } = useThreadConfig();
-  const speakSupported = useThread((t) => t.capabilities.speak);
-  return allowSpeak && (!ensureCapability || speakSupported);
+  const speechSupported = useThread((t) => t.capabilities.speech);
+  return allowSpeak && (!ensureCapability || speechSupported);
 };
 var useAllowReload = (ensureCapability = false) => {
   const { assistantMessage: { allowReload = true } = {} } = useThreadConfig();
@@ -5288,13 +5292,13 @@ var AssistantActionBarRoot = withDefaults(actionBar_exports.Root, {
   className: "aui-assistant-action-bar-root"
 });
 AssistantActionBarRoot.displayName = "AssistantActionBarRoot";
-var AssistantActionBarCopy = forwardRef24((props, ref) => {
+var AssistantActionBarCopy = forwardRef24(({ copiedDuration, ...props }, ref) => {
   const {
     strings: {
       assistantMessage: { copy: { tooltip = "Copy" } = {} } = {}
     } = {}
   } = useThreadConfig();
-  return /* @__PURE__ */ jsx39(actionBar_exports.Copy, { asChild: true, children: /* @__PURE__ */ jsx39(TooltipIconButton, { tooltip, ...props, ref, children: props.children ?? /* @__PURE__ */ jsxs4(Fragment5, { children: [
+  return /* @__PURE__ */ jsx39(actionBar_exports.Copy, { copiedDuration, asChild: true, children: /* @__PURE__ */ jsx39(TooltipIconButton, { tooltip, ...props, ref, children: props.children ?? /* @__PURE__ */ jsxs4(Fragment5, { children: [
     /* @__PURE__ */ jsx39(message_exports.If, { copied: true, children: /* @__PURE__ */ jsx39(CheckIcon, {}) }),
     /* @__PURE__ */ jsx39(message_exports.If, { copied: false, children: /* @__PURE__ */ jsx39(CopyIcon, {}) })
   ] }) }) });
@@ -5409,7 +5413,7 @@ var BranchPicker = () => {
   const allowBranchPicker = useAllowBranchPicker(true);
   if (!allowBranchPicker) return null;
   return /* @__PURE__ */ jsxs5(BranchPickerRoot, { hideWhenSingleBranch: true, children: [
-    /* @__PURE__ */ jsx40(BranchPickerPrevious2, {}),
+    /* @__PURE__ */ jsx40(BranchPickerPrevious, {}),
     /* @__PURE__ */ jsx40(BranchPickerState, {}),
     /* @__PURE__ */ jsx40(BranchPickerNext, {})
   ] });
@@ -5419,7 +5423,7 @@ var BranchPickerRoot = withDefaults(branchPicker_exports.Root, {
   className: "aui-branch-picker-root"
 });
 BranchPickerRoot.displayName = "BranchPickerRoot";
-var BranchPickerPrevious2 = forwardRef25((props, ref) => {
+var BranchPickerPrevious = forwardRef25((props, ref) => {
   const {
     strings: {
       branchPicker: { previous: { tooltip = "Previous" } = {} } = {}
@@ -5428,7 +5432,7 @@ var BranchPickerPrevious2 = forwardRef25((props, ref) => {
   const allowBranchPicker = useAllowBranchPicker();
   return /* @__PURE__ */ jsx40(branchPicker_exports.Previous, { disabled: !allowBranchPicker, asChild: true, children: /* @__PURE__ */ jsx40(TooltipIconButton, { tooltip, ...props, ref, children: props.children ?? /* @__PURE__ */ jsx40(ChevronLeftIcon, {}) }) });
 });
-BranchPickerPrevious2.displayName = "BranchPickerPrevious";
+BranchPickerPrevious.displayName = "BranchPickerPrevious";
 var BranchPickerStateWrapper = withDefaults("span", {
   className: "aui-branch-picker-state"
 });
@@ -5450,7 +5454,7 @@ var BranchPickerNext = forwardRef25((props, ref) => {
 BranchPickerNext.displayName = "BranchPickerNext";
 var exports2 = {
   Root: BranchPickerRoot,
-  Previous: BranchPickerPrevious2,
+  Previous: BranchPickerPrevious,
   Next: BranchPickerNext
 };
 var branch_picker_default = Object.assign(BranchPicker, exports2);
@@ -5591,12 +5595,30 @@ import { forwardRef as forwardRef27 } from "react";
 import { CircleXIcon } from "lucide-react";
 import { jsx as jsx45, jsxs as jsxs8 } from "react/jsx-runtime";
 var ComposerAttachmentRoot = withDefaults(attachment_exports.Root, {
-  className: "aui-composer-attachment-root"
+  className: "aui-attachment-root"
 });
 ComposerAttachmentRoot.displayName = "ComposerAttachmentRoot";
 var ComposerAttachment2 = () => {
+  const typeLabel = useAttachment((a) => {
+    const type = a.type;
+    switch (type) {
+      case "image":
+        return "Image";
+      case "document":
+        return "Document";
+      case "file":
+        return "File";
+      default:
+        const _exhaustiveCheck = type;
+        throw new Error(`Unknown attachment type: ${_exhaustiveCheck}`);
+    }
+  });
   return /* @__PURE__ */ jsxs8(ComposerAttachmentRoot, { children: [
-    /* @__PURE__ */ jsx45(attachment_exports.unstable_Thumb, {}),
+    /* @__PURE__ */ jsx45(attachment_exports.unstable_Thumb, { className: "aui-attachment-thumb" }),
+    /* @__PURE__ */ jsxs8("div", { className: "aui-attachment-text", children: [
+      /* @__PURE__ */ jsx45("p", { className: "aui-attachment-name", children: /* @__PURE__ */ jsx45(attachment_exports.Name, {}) }),
+      /* @__PURE__ */ jsx45("p", { className: "aui-attachment-type", children: typeLabel })
+    ] }),
     /* @__PURE__ */ jsx45(ComposerAttachmentRemove, {})
   ] });
 };
@@ -5720,23 +5742,27 @@ var ComposerSendButton = withDefaults(TooltipIconButton, {
   variant: "default",
   className: "aui-composer-send"
 });
-var ComposerSend = forwardRef28((props, ref) => {
-  const {
-    strings: { composer: { send: { tooltip = "Send" } = {} } = {} } = {}
-  } = useThreadConfig();
-  return /* @__PURE__ */ jsx46(composer_exports.Send, { asChild: true, children: /* @__PURE__ */ jsx46(ComposerSendButton, { tooltip, ...props, ref, children: props.children ?? /* @__PURE__ */ jsx46(SendHorizontalIcon, {}) }) });
-});
+var ComposerSend = forwardRef28(
+  (props, ref) => {
+    const {
+      strings: { composer: { send: { tooltip = "Send" } = {} } = {} } = {}
+    } = useThreadConfig();
+    return /* @__PURE__ */ jsx46(composer_exports.Send, { asChild: true, children: /* @__PURE__ */ jsx46(ComposerSendButton, { tooltip, ...props, ref, children: props.children ?? /* @__PURE__ */ jsx46(SendHorizontalIcon, {}) }) });
+  }
+);
 ComposerSend.displayName = "ComposerSend";
 var ComposerCancelButton = withDefaults(TooltipIconButton, {
   variant: "default",
   className: "aui-composer-cancel"
 });
-var ComposerCancel = forwardRef28((props, ref) => {
-  const {
-    strings: { composer: { cancel: { tooltip = "Cancel" } = {} } = {} } = {}
-  } = useThreadConfig();
-  return /* @__PURE__ */ jsx46(composer_exports.Cancel, { asChild: true, children: /* @__PURE__ */ jsx46(ComposerCancelButton, { tooltip, ...props, ref, children: props.children ?? /* @__PURE__ */ jsx46(CircleStopIcon, {}) }) });
-});
+var ComposerCancel = forwardRef28(
+  (props, ref) => {
+    const {
+      strings: { composer: { cancel: { tooltip = "Cancel" } = {} } = {} } = {}
+    } = useThreadConfig();
+    return /* @__PURE__ */ jsx46(composer_exports.Cancel, { asChild: true, children: /* @__PURE__ */ jsx46(ComposerCancelButton, { tooltip, ...props, ref, children: props.children ?? /* @__PURE__ */ jsx46(CircleStopIcon, {}) }) });
+  }
+);
 ComposerCancel.displayName = "ComposerCancel";
 var exports6 = {
   Root: ComposerRoot,
@@ -5768,11 +5794,9 @@ var ThreadWelcomeRootStyled = withDefaults("div", {
 var ThreadWelcomeCenter = withDefaults("div", {
   className: "aui-thread-welcome-center"
 });
-var ThreadWelcomeRoot = forwardRef29(
-  (props, ref) => {
-    return /* @__PURE__ */ jsx47(thread_exports.Empty, { children: /* @__PURE__ */ jsx47(ThreadWelcomeRootStyled, { ...props, ref }) });
-  }
-);
+var ThreadWelcomeRoot = forwardRef29((props, ref) => {
+  return /* @__PURE__ */ jsx47(thread_exports.Empty, { children: /* @__PURE__ */ jsx47(ThreadWelcomeRootStyled, { ...props, ref }) });
+});
 ThreadWelcomeRoot.displayName = "ThreadWelcomeRoot";
 var ThreadWelcomeAvatar = () => {
   const { assistantAvatar: avatar = { fallback: "A" } } = useThreadConfig();
@@ -5854,13 +5878,33 @@ var exports8 = {
 var user_action_bar_default = Object.assign(UserActionBar, exports8);
 
 // src/ui/user-message-attachment.tsx
-import { jsx as jsx49 } from "react/jsx-runtime";
+import { jsx as jsx49, jsxs as jsxs11 } from "react/jsx-runtime";
 var UserMessageAttachmentRoot = withDefaults(attachment_exports.Root, {
-  className: "aui-user-message-attachment-root"
+  className: "aui-attachment-root"
 });
 UserMessageAttachmentRoot.displayName = "UserMessageAttachmentRoot";
 var UserMessageAttachment = () => {
-  return /* @__PURE__ */ jsx49(UserMessageAttachmentRoot, { children: /* @__PURE__ */ jsx49(attachment_exports.unstable_Thumb, {}) });
+  const typeLabel = useAttachment((a) => {
+    const type = a.type;
+    switch (type) {
+      case "image":
+        return "Image";
+      case "document":
+        return "Document";
+      case "file":
+        return "File";
+      default:
+        const _exhaustiveCheck = type;
+        throw new Error(`Unknown attachment type: ${_exhaustiveCheck}`);
+    }
+  });
+  return /* @__PURE__ */ jsxs11(UserMessageAttachmentRoot, { children: [
+    /* @__PURE__ */ jsx49(attachment_exports.unstable_Thumb, { className: "aui-attachment-thumb" }),
+    /* @__PURE__ */ jsxs11("div", { className: "aui-attachment-text", children: [
+      /* @__PURE__ */ jsx49("p", { className: "aui-attachment-name", children: /* @__PURE__ */ jsx49(attachment_exports.Name, {}) }),
+      /* @__PURE__ */ jsx49("p", { className: "aui-attachment-type", children: typeLabel })
+    ] })
+  ] });
 };
 UserMessageAttachment.displayName = "UserMessageAttachment";
 var exports9 = {
@@ -5872,12 +5916,14 @@ var user_message_attachment_default = Object.assign(
 );
 
 // src/ui/user-message.tsx
-import { jsx as jsx50, jsxs as jsxs11 } from "react/jsx-runtime";
+import { jsx as jsx50, jsxs as jsxs12 } from "react/jsx-runtime";
 var UserMessage = () => {
-  return /* @__PURE__ */ jsxs11(UserMessageRoot, { children: [
+  return /* @__PURE__ */ jsxs12(UserMessageRoot, { children: [
     /* @__PURE__ */ jsx50(UserMessageAttachments, {}),
-    /* @__PURE__ */ jsx50(user_action_bar_default, {}),
-    /* @__PURE__ */ jsx50(UserMessageContent, {}),
+    /* @__PURE__ */ jsxs12(message_exports.If, { hasContent: true, children: [
+      /* @__PURE__ */ jsx50(user_action_bar_default, {}),
+      /* @__PURE__ */ jsx50(UserMessageContent, {})
+    ] }),
     /* @__PURE__ */ jsx50(branch_picker_default, {})
   ] });
 };
@@ -5889,19 +5935,17 @@ UserMessageRoot.displayName = "UserMessageRoot";
 var UserMessageContentWrapper = withDefaults("div", {
   className: "aui-user-message-content"
 });
-var UserMessageContent = forwardRef31(
-  ({ components, ...props }, ref) => {
-    return /* @__PURE__ */ jsx50(UserMessageContentWrapper, { ...props, ref, children: /* @__PURE__ */ jsx50(
-      message_exports.Content,
-      {
-        components: {
-          ...components,
-          Text: components?.Text ?? content_part_default.Text
-        }
+var UserMessageContent = forwardRef31(({ components, ...props }, ref) => {
+  return /* @__PURE__ */ jsx50(UserMessageContentWrapper, { ...props, ref, children: /* @__PURE__ */ jsx50(
+    message_exports.Content,
+    {
+      components: {
+        ...components,
+        Text: components?.Text ?? content_part_default.Text
       }
-    ) });
-  }
-);
+    }
+  ) });
+});
 UserMessageContent.displayName = "UserMessageContent";
 var UserMessageAttachmentsContainer = withDefaults("div", {
   className: "aui-user-message-attachments"
@@ -5928,11 +5972,11 @@ var user_message_default = Object.assign(UserMessage, exports10);
 
 // src/ui/edit-composer.tsx
 import { forwardRef as forwardRef32 } from "react";
-import { jsx as jsx51, jsxs as jsxs12 } from "react/jsx-runtime";
+import { jsx as jsx51, jsxs as jsxs13 } from "react/jsx-runtime";
 var EditComposer = () => {
-  return /* @__PURE__ */ jsxs12(EditComposerRoot, { children: [
+  return /* @__PURE__ */ jsxs13(EditComposerRoot, { children: [
     /* @__PURE__ */ jsx51(EditComposerInput, {}),
-    /* @__PURE__ */ jsxs12(EditComposerFooter, { children: [
+    /* @__PURE__ */ jsxs13(EditComposerFooter, { children: [
       /* @__PURE__ */ jsx51(EditComposerCancel, {}),
       /* @__PURE__ */ jsx51(EditComposerSend, {})
     ] })
@@ -5951,25 +5995,19 @@ var EditComposerFooter = withDefaults("div", {
   className: "aui-edit-composer-footer"
 });
 EditComposerFooter.displayName = "EditComposerFooter";
-var EditComposerCancel = forwardRef32(
-  (props, ref) => {
-    const {
-      strings: {
-        editComposer: { cancel: { label = "Cancel" } = {} } = {}
-      } = {}
-    } = useThreadConfig();
-    return /* @__PURE__ */ jsx51(composer_exports.Cancel, { asChild: true, children: /* @__PURE__ */ jsx51(Button, { variant: "ghost", ...props, ref, children: props.children ?? label }) });
-  }
-);
+var EditComposerCancel = forwardRef32((props, ref) => {
+  const {
+    strings: { editComposer: { cancel: { label = "Cancel" } = {} } = {} } = {}
+  } = useThreadConfig();
+  return /* @__PURE__ */ jsx51(composer_exports.Cancel, { asChild: true, children: /* @__PURE__ */ jsx51(Button, { variant: "ghost", ...props, ref, children: props.children ?? label }) });
+});
 EditComposerCancel.displayName = "EditComposerCancel";
-var EditComposerSend = forwardRef32(
-  (props, ref) => {
-    const {
-      strings: { editComposer: { send: { label = "Send" } = {} } = {} } = {}
-    } = useThreadConfig();
-    return /* @__PURE__ */ jsx51(composer_exports.Send, { asChild: true, children: /* @__PURE__ */ jsx51(Button, { ...props, ref, children: props.children ?? label }) });
-  }
-);
+var EditComposerSend = forwardRef32((props, ref) => {
+  const {
+    strings: { editComposer: { send: { label = "Send" } = {} } = {} } = {}
+  } = useThreadConfig();
+  return /* @__PURE__ */ jsx51(composer_exports.Send, { asChild: true, children: /* @__PURE__ */ jsx51(Button, { ...props, ref, children: props.children ?? label }) });
+});
 EditComposerSend.displayName = "EditComposerSend";
 var exports11 = {
   Root: EditComposerRoot,
@@ -5981,7 +6019,7 @@ var exports11 = {
 var edit_composer_default = Object.assign(EditComposer, exports11);
 
 // src/ui/thread.tsx
-import { Fragment as Fragment7, jsx as jsx52, jsxs as jsxs13 } from "react/jsx-runtime";
+import { Fragment as Fragment7, jsx as jsx52, jsxs as jsxs14 } from "react/jsx-runtime";
 var Thread = (config) => {
   const {
     components: {
@@ -5989,11 +6027,11 @@ var Thread = (config) => {
       ThreadWelcome: ThreadWelcomeComponent = thread_welcome_default
     } = {}
   } = config;
-  return /* @__PURE__ */ jsx52(ThreadRoot, { config, children: /* @__PURE__ */ jsxs13(ThreadViewport, { children: [
+  return /* @__PURE__ */ jsx52(ThreadRoot, { config, children: /* @__PURE__ */ jsxs14(ThreadViewport, { children: [
     /* @__PURE__ */ jsx52(ThreadWelcomeComponent, {}),
     /* @__PURE__ */ jsx52(ThreadMessages, {}),
     /* @__PURE__ */ jsx52(ThreadFollowupSuggestions, {}),
-    /* @__PURE__ */ jsxs13(ThreadViewportFooter, { children: [
+    /* @__PURE__ */ jsxs14(ThreadViewportFooter, { children: [
       /* @__PURE__ */ jsx52(ThreadScrollToBottom, {}),
       /* @__PURE__ */ jsx52(ComposerComponent, {})
     ] })
@@ -6018,7 +6056,7 @@ var ThreadViewportFooter = withDefaults("div", {
 ThreadViewportFooter.displayName = "ThreadViewportFooter";
 var SystemMessage = () => null;
 var ThreadMessages = ({ components, unstable_flexGrowDiv: flexGrowDiv = true, ...rest }) => {
-  return /* @__PURE__ */ jsxs13(Fragment7, { children: [
+  return /* @__PURE__ */ jsxs14(Fragment7, { children: [
     /* @__PURE__ */ jsx52(
       thread_exports.Messages,
       {
@@ -6073,15 +6111,18 @@ var exports12 = {
 var thread_default = Object.assign(Thread, exports12);
 
 // src/ui/assistant-modal.tsx
-import { Fragment as Fragment8, jsx as jsx53, jsxs as jsxs14 } from "react/jsx-runtime";
+import { Fragment as Fragment8, jsx as jsx53, jsxs as jsxs15 } from "react/jsx-runtime";
 var AssistantModal = (config) => {
-  return /* @__PURE__ */ jsxs14(AssistantModalRoot, { config, children: [
+  return /* @__PURE__ */ jsxs15(AssistantModalRoot, { config, children: [
     /* @__PURE__ */ jsx53(AssistantModalTrigger, {}),
     /* @__PURE__ */ jsx53(AssistantModalContent, { children: /* @__PURE__ */ jsx53(thread_default, {}) })
   ] });
 };
 AssistantModal.displayName = "AssistantModal";
-var AssistantModalRoot = ({ config, ...props }) => {
+var AssistantModalRoot = ({
+  config,
+  ...props
+}) => {
   return /* @__PURE__ */ jsx53(ThreadConfigProvider, { config, children: /* @__PURE__ */ jsx53(assistantModal_exports.Root, { ...props }) });
 };
 AssistantModalRoot.displayName = "AssistantModalRoot";
@@ -6119,7 +6160,7 @@ var AssistantModalButton = forwardRef34(({ "data-state": state, ...rest }, ref)
       "data-state": state,
       ...rest,
       ref,
-      children: rest.children ?? /* @__PURE__ */ jsxs14(Fragment8, { children: [
+      children: rest.children ?? /* @__PURE__ */ jsxs15(Fragment8, { children: [
         /* @__PURE__ */ jsx53(
           BotIcon,
           {