@assistant-ui/react 0.5.67 → 0.5.68

package/dist/index.js

@@ -234,13 +234,7 @@ var ThreadRuntimeProvider = ({ children, runtime }) => {
       useViewport
     };
   }, [useThread2, useThreadRuntime2, useThreadMessages2, useThreadComposer2]);
-  const Synchronizer = context.useThread(
-    (t) => t.unstable_synchronizer
-  );
-  return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, ThreadContext.Provider, { value: context, children: [
-    Synchronizer && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Synchronizer, {}),
-    children
-  ] });
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ThreadContext.Provider, { value: context, children });
 };
 
 // src/context/providers/AssistantRuntimeProvider.tsx
@@ -576,11 +570,11 @@ var useActionBarCopy = ({
 // src/primitive-hooks/actionBar/useActionBarEdit.tsx
 
 var useActionBarEdit = () => {
-  const composerRuntime = useComposerRuntime();
-  const disabled = useComposer((c) => c.isEditing);
+  const messageRuntime = useMessageRuntime();
+  const disabled = useEditComposer((c) => c.isEditing);
   const callback = _react.useCallback.call(void 0, () => {
-    composerRuntime.beginEdit();
-  }, [composerRuntime]);
+    messageRuntime.composer.beginEdit();
+  }, [messageRuntime]);
   if (disabled) return null;
   return callback;
 };
@@ -1589,40 +1583,204 @@ var ContentPartPrimitiveInProgress = ({ children }) => {
 };
 ContentPartPrimitiveInProgress.displayName = "ContentPartPrimitive.InProgress";
 
+// src/api/AttachmentRuntime.ts
+var AttachmentRuntime = class {
+  constructor(_core) {
+    this._core = _core;
+  }
+  getState() {
+    return this._core.getState();
+  }
+  subscribe(callback) {
+    return this._core.subscribe(callback);
+  }
+};
+var ComposerAttachmentRuntime = class extends AttachmentRuntime {
+  constructor(core, _composerApi) {
+    super(core);
+    this._composerApi = _composerApi;
+  }
+  remove() {
+    const core = this._composerApi.getState();
+    if (!core) throw new Error("Composer is not available");
+    return core.removeAttachment(this.getState().id);
+  }
+};
+var ThreadComposerAttachmentRuntime = class extends ComposerAttachmentRuntime {
+  get source() {
+    return "thread-composer";
+  }
+};
+var EditComposerAttachmentRuntime = class extends ComposerAttachmentRuntime {
+  get source() {
+    return "edit-composer";
+  }
+};
+var MessageAttachmentRuntime = class extends AttachmentRuntime {
+  get source() {
+    return "message";
+  }
+  constructor(core) {
+    super(core);
+  }
+  remove() {
+    throw new Error("Message attachments cannot be removed");
+  }
+};
+
+// src/api/subscribable/BaseSubject.ts
+var BaseSubject = (_class2 = class {constructor() { _class2.prototype.__init5.call(this); }
+  __init5() {this._subscriptions = /* @__PURE__ */ new Set()}
+  
+  get isConnected() {
+    return !!this._connection;
+  }
+  notifySubscribers() {
+    for (const callback of this._subscriptions) callback();
+  }
+  _updateConnection() {
+    if (this._subscriptions.size > 0) {
+      if (this._connection) return;
+      this._connection = this._connect();
+    } else {
+      _optionalChain([this, 'access', _16 => _16._connection, 'optionalCall', _17 => _17()]);
+      this._connection = void 0;
+    }
+  }
+  subscribe(callback) {
+    this._subscriptions.add(callback);
+    this._updateConnection();
+    return () => {
+      this._subscriptions.delete(callback);
+      this._updateConnection();
+    };
+  }
+}, _class2);
+
+// src/api/subscribable/SKIP_UPDATE.ts
+var SKIP_UPDATE = Symbol("skip-update");
+
+// src/api/subscribable/LazyMemoizeSubject.ts
+var LazyMemoizeSubject = (_class3 = class extends BaseSubject {
+  constructor(binding) {
+    super();_class3.prototype.__init6.call(this);_class3.prototype.__init7.call(this);;
+    this.binding = binding;
+  }
+  __init6() {this._previousStateDirty = true}
+  
+  __init7() {this.getState = () => {
+    if (!this.isConnected || this._previousStateDirty) {
+      const newState = this.binding.getState();
+      if (newState !== SKIP_UPDATE) {
+        this._previousState = newState;
+      }
+      this._previousStateDirty = false;
+    }
+    if (this._previousState === void 0)
+      throw new Error("Entry not available in the store");
+    return this._previousState;
+  }}
+  _connect() {
+    const callback = () => {
+      this._previousStateDirty = true;
+      this.notifySubscribers();
+    };
+    return this.binding.subscribe(callback);
+  }
+}, _class3);
+
+// src/api/subscribable/shallowEqual.ts
+function shallowEqual(objA, objB) {
+  if (objA === void 0 && objB === void 0) return true;
+  if (objA === void 0) return false;
+  if (objB === void 0) return false;
+  for (const key of Object.keys(objA)) {
+    const valueA = objA[key];
+    const valueB = objB[key];
+    if (!Object.is(valueA, valueB)) return false;
+  }
+  return true;
+}
+
+// src/api/subscribable/ShallowMemoizeSubject.ts
+var ShallowMemoizeSubject = (_class4 = class extends BaseSubject {
+  constructor(binding) {
+    super();_class4.prototype.__init8.call(this);;
+    this.binding = binding;
+    const state = binding.getState();
+    if (state === SKIP_UPDATE)
+      throw new Error("Entry not available in the store");
+    this._previousState = state;
+  }
+  
+  __init8() {this.getState = () => {
+    if (!this.isConnected) this._syncState();
+    return this._previousState;
+  }}
+  _syncState() {
+    const state = this.binding.getState();
+    if (state === SKIP_UPDATE) return false;
+    if (shallowEqual(state, this._previousState)) return false;
+    this._previousState = state;
+    return true;
+  }
+  _connect() {
+    const callback = () => {
+      if (this._syncState()) {
+        this.notifySubscribers();
+      }
+    };
+    return this.binding.subscribe(callback);
+  }
+}, _class4);
+
 // src/api/ComposerRuntime.ts
 var METHOD_NOT_SUPPORTED = () => {
   throw new Error("Composer is not available");
 };
 var EMPTY_ARRAY = Object.freeze([]);
-var getThreadComposerState = (type, runtime, beginEdit, focus, onFocus) => {
+var getThreadComposerState = (runtime, focus, onFocus) => {
+  return Object.freeze({
+    type: "thread",
+    isEditing: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _18 => _18.isEditing]), () => ( false)),
+    canCancel: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _19 => _19.canCancel]), () => ( false)),
+    isEmpty: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _20 => _20.isEmpty]), () => ( true)),
+    text: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _21 => _21.text]), () => ( "")),
+    attachments: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _22 => _22.attachments]), () => ( EMPTY_ARRAY)),
+    attachmentAccept: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _23 => _23.attachmentAccept]), () => ( "*")),
+    value: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _24 => _24.text]), () => ( "")),
+    setValue: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _25 => _25.setText, 'access', _26 => _26.bind, 'call', _27 => _27(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
+    setText: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _28 => _28.setText, 'access', _29 => _29.bind, 'call', _30 => _30(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
+    // edit: beginEdit,
+    send: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _31 => _31.send, 'access', _32 => _32.bind, 'call', _33 => _33(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
+    cancel: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _34 => _34.cancel, 'access', _35 => _35.bind, 'call', _36 => _36(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
+    focus,
+    onFocus,
+    reset: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _37 => _37.reset, 'access', _38 => _38.bind, 'call', _39 => _39(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
+    addAttachment: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _40 => _40.addAttachment, 'access', _41 => _41.bind, 'call', _42 => _42(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
+    removeAttachment: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _43 => _43.removeAttachment, 'access', _44 => _44.bind, 'call', _45 => _45(runtime)]), () => ( METHOD_NOT_SUPPORTED))
+  });
+};
+var getEditComposerState = (runtime, beginEdit) => {
   return Object.freeze({
-    type,
-    isEditing: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _16 => _16.isEditing]), () => ( false)),
-    canCancel: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _17 => _17.canCancel]), () => ( false)),
-    isEmpty: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _18 => _18.isEmpty]), () => ( true)),
-    text: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _19 => _19.text]), () => ( "")),
-    attachments: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _20 => _20.attachments]), () => ( EMPTY_ARRAY)),
-    attachmentAccept: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _21 => _21.attachmentAccept]), () => ( "*")),
-    value: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _22 => _22.text]), () => ( "")),
-    setValue: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _23 => _23.setText, 'access', _24 => _24.bind, 'call', _25 => _25(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
-    setText: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _26 => _26.setText, 'access', _27 => _27.bind, 'call', _28 => _28(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
+    type: "edit",
+    isEditing: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _46 => _46.isEditing]), () => ( false)),
+    canCancel: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _47 => _47.canCancel]), () => ( false)),
+    isEmpty: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _48 => _48.isEmpty]), () => ( true)),
+    text: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _49 => _49.text]), () => ( "")),
+    attachments: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _50 => _50.attachments]), () => ( EMPTY_ARRAY)),
+    attachmentAccept: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _51 => _51.attachmentAccept]), () => ( "*")),
+    value: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _52 => _52.text]), () => ( "")),
+    setValue: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _53 => _53.setText, 'access', _54 => _54.bind, 'call', _55 => _55(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
+    setText: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _56 => _56.setText, 'access', _57 => _57.bind, 'call', _58 => _58(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
     edit: beginEdit,
-    send: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _29 => _29.send, 'access', _30 => _30.bind, 'call', _31 => _31(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
-    cancel: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _32 => _32.cancel, 'access', _33 => _33.bind, 'call', _34 => _34(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
-    focus: _nullishCoalesce(focus, () => ( METHOD_NOT_SUPPORTED)),
-    onFocus: _nullishCoalesce(onFocus, () => ( METHOD_NOT_SUPPORTED)),
-    reset: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _35 => _35.reset, 'access', _36 => _36.bind, 'call', _37 => _37(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
-    addAttachment: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _38 => _38.addAttachment, 'access', _39 => _39.bind, 'call', _40 => _40(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
-    removeAttachment: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _41 => _41.removeAttachment, 'access', _42 => _42.bind, 'call', _43 => _43(runtime)]), () => ( METHOD_NOT_SUPPORTED))
+    send: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _59 => _59.send, 'access', _60 => _60.bind, 'call', _61 => _61(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
+    cancel: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _62 => _62.cancel, 'access', _63 => _63.bind, 'call', _64 => _64(runtime)]), () => ( METHOD_NOT_SUPPORTED))
   });
 };
-var ComposerRuntime = (_class2 = class {
-  constructor(_core, _beginEdit) {;_class2.prototype.__init5.call(this);
+var ComposerRuntime = class {
+  constructor(_core) {
     this._core = _core;
-    this._beginEdit = _beginEdit;
-  }
-  get type() {
-    return this._beginEdit ? "edit" : "thread";
   }
   /**
    * @deprecated Use `getState().isEditing` instead. This will be removed in 0.6.0.
@@ -1654,7 +1812,6 @@ var ComposerRuntime = (_class2 = class {
   get attachmentAccept() {
     return this.getState().attachmentAccept;
   }
-  // TODO should this instead return getAttachmentByIndex([idx]) instead?
   /**
    * @deprecated Use `getState().attachments` instead. This will be removed in 0.6.0.
    */
@@ -1667,15 +1824,6 @@ var ComposerRuntime = (_class2 = class {
   get value() {
     return this.text;
   }
-  getState() {
-    return getThreadComposerState(
-      this.type,
-      this._core.getState(),
-      _nullishCoalesce(_optionalChain([this, 'access', _44 => _44._beginEdit, 'optionalAccess', _45 => _45.bind, 'call', _46 => _46(this)]), () => ( METHOD_NOT_SUPPORTED)),
-      this.focus.bind(this),
-      this.onFocus.bind(this)
-    );
-  }
   setText(text) {
     const core = this._core.getState();
     if (!core) throw new Error("Composer is not available");
@@ -1715,19 +1863,38 @@ var ComposerRuntime = (_class2 = class {
     if (!core) throw new Error("Composer is not available");
     core.cancel();
   }
-  beginEdit() {
-    _optionalChain([this, 'access', _47 => _47._beginEdit, 'optionalCall', _48 => _48()]);
-  }
-  /**
-   * @deprecated Use `beginEdit()` instead. This will be removed in 0.6.0.
-   */
-  edit() {
-    this.beginEdit();
-  }
   subscribe(callback) {
     return this._core.subscribe(callback);
   }
-  __init5() {this._focusListeners = /* @__PURE__ */ new Set()}
+};
+var ThreadComposerRuntime = (_class5 = class extends ComposerRuntime {
+  get type() {
+    return "thread";
+  }
+  
+  constructor(core) {
+    const stateBinding = new LazyMemoizeSubject({
+      getState: () => getThreadComposerState(
+        core.getState(),
+        this.focus.bind(this),
+        this.onFocus.bind(this)
+      ),
+      subscribe: (callback) => core.subscribe(callback)
+    });
+    super({
+      getState: () => core.getState(),
+      subscribe: (callback) => stateBinding.subscribe(callback)
+    });_class5.prototype.__init9.call(this);;
+    this._getState = stateBinding.getState.bind(stateBinding);
+  }
+  get attachments() {
+    return _nullishCoalesce(_optionalChain([this, 'access', _65 => _65.getState, 'call', _66 => _66(), 'optionalAccess', _67 => _67.attachments]), () => ( EMPTY_ARRAY));
+  }
+  getState() {
+    return this._getState();
+  }
+  // TODO replace with events
+  __init9() {this._focusListeners = /* @__PURE__ */ new Set()}
   focus() {
     this._focusListeners.forEach((callback) => callback());
   }
@@ -1735,36 +1902,73 @@ var ComposerRuntime = (_class2 = class {
     this._focusListeners.add(callback);
     return () => this._focusListeners.delete(callback);
   }
-}, _class2);
-
-// src/api/subscribable/BaseSubject.ts
-var BaseSubject = (_class3 = class {constructor() { _class3.prototype.__init6.call(this); }
-  __init6() {this._subscriptions = /* @__PURE__ */ new Set()}
+  unstable_getAttachmentByIndex(idx) {
+    return new ThreadComposerAttachmentRuntime(
+      new ShallowMemoizeSubject({
+        getState: () => {
+          const attachments = this.getState().attachments;
+          const attachment = attachments[idx];
+          if (!attachment) return SKIP_UPDATE;
+          return {
+            ...attachment,
+            attachment,
+            source: "thread-composer"
+          };
+        },
+        subscribe: (callback) => this._core.subscribe(callback)
+      }),
+      this._core
+    );
+  }
+}, _class5);
+var EditComposerRuntime = class extends ComposerRuntime {
+  constructor(core, _beginEdit) {
+    const stateBinding = new LazyMemoizeSubject({
+      getState: () => getEditComposerState(core.getState(), this._beginEdit),
+      subscribe: (callback) => core.subscribe(callback)
+    });
+    super({
+      getState: () => core.getState(),
+      subscribe: (callback) => stateBinding.subscribe(callback)
+    });
+    this._beginEdit = _beginEdit;
+    this._getState = stateBinding.getState.bind(stateBinding);
+  }
+  get type() {
+    return "edit";
+  }
   
-  get isConnected() {
-    return !!this._connection;
+  getState() {
+    return this._getState();
   }
-  notifySubscribers() {
-    for (const callback of this._subscriptions) callback();
+  beginEdit() {
+    this._beginEdit();
   }
-  _updateConnection() {
-    if (this._subscriptions.size > 0) {
-      if (this._connection) return;
-      this._connection = this._connect();
-    } else {
-      _optionalChain([this, 'access', _49 => _49._connection, 'optionalCall', _50 => _50()]);
-      this._connection = void 0;
-    }
+  /**
+   * @deprecated Use `beginEdit()` instead. This will be removed in 0.6.0.
+   */
+  edit() {
+    this.beginEdit();
   }
-  subscribe(callback) {
-    this._subscriptions.add(callback);
-    this._updateConnection();
-    return () => {
-      this._subscriptions.delete(callback);
-      this._updateConnection();
-    };
+  unstable_getAttachmentByIndex(idx) {
+    return new EditComposerAttachmentRuntime(
+      new ShallowMemoizeSubject({
+        getState: () => {
+          const attachments = this.getState().attachments;
+          const attachment = attachments[idx];
+          if (!attachment) return SKIP_UPDATE;
+          return {
+            ...attachment,
+            attachment,
+            source: "edit-composer"
+          };
+        },
+        subscribe: (callback) => this._core.subscribe(callback)
+      }),
+      this._core
+    );
   }
-}, _class3);
+};
 
 // src/api/subscribable/NestedSubscriptionSubject.ts
 var NestedSubscriptionSubject = class extends BaseSubject {
@@ -1780,68 +1984,23 @@ var NestedSubscriptionSubject = class extends BaseSubject {
       this.notifySubscribers();
     };
     let lastState = this.binding.getState();
-    let innerUnsubscribe = _optionalChain([lastState, 'optionalAccess', _51 => _51.subscribe, 'call', _52 => _52(callback)]);
+    let innerUnsubscribe = _optionalChain([lastState, 'optionalAccess', _68 => _68.subscribe, 'call', _69 => _69(callback)]);
     const onRuntimeUpdate = () => {
       const newState = this.binding.getState();
       if (newState === lastState) return;
       lastState = newState;
-      _optionalChain([innerUnsubscribe, 'optionalCall', _53 => _53()]);
-      innerUnsubscribe = _optionalChain([this, 'access', _54 => _54.binding, 'access', _55 => _55.getState, 'call', _56 => _56(), 'optionalAccess', _57 => _57.subscribe, 'call', _58 => _58(callback)]);
+      _optionalChain([innerUnsubscribe, 'optionalCall', _70 => _70()]);
+      innerUnsubscribe = _optionalChain([this, 'access', _71 => _71.binding, 'access', _72 => _72.getState, 'call', _73 => _73(), 'optionalAccess', _74 => _74.subscribe, 'call', _75 => _75(callback)]);
       callback();
     };
     const outerUnsubscribe = this.binding.subscribe(onRuntimeUpdate);
     return () => {
-      _optionalChain([outerUnsubscribe, 'optionalCall', _59 => _59()]);
-      _optionalChain([innerUnsubscribe, 'optionalCall', _60 => _60()]);
+      _optionalChain([outerUnsubscribe, 'optionalCall', _76 => _76()]);
+      _optionalChain([innerUnsubscribe, 'optionalCall', _77 => _77()]);
     };
   }
 };
 
-// src/api/subscribable/shallowEqual.ts
-function shallowEqual(objA, objB) {
-  if (objA === void 0 && objB === void 0) return true;
-  if (objA === void 0) return false;
-  if (objB === void 0) return false;
-  for (const key of Object.keys(objA)) {
-    const valueA = objA[key];
-    const valueB = objB[key];
-    if (!Object.is(valueA, valueB)) return false;
-  }
-  return true;
-}
-
-// src/api/subscribable/ShallowMemoizeSubject.ts
-var ShallowMemoizeSubject = (_class4 = class extends BaseSubject {
-  constructor(binding) {
-    super();_class4.prototype.__init7.call(this);;
-    this.binding = binding;
-    const state = binding.getState();
-    if (state === void 0)
-      throw new Error("Entry not available in the store");
-    this._previousState = state;
-  }
-  
-  __init7() {this.getState = () => {
-    if (!this.isConnected) this._syncState();
-    return this._previousState;
-  }}
-  _syncState() {
-    const state = this.binding.getState();
-    if (state === void 0) return false;
-    if (shallowEqual(state, this._previousState)) return false;
-    this._previousState = state;
-    return true;
-  }
-  _connect() {
-    const callback = () => {
-      if (this._syncState()) {
-        this.notifySubscribers();
-      }
-    };
-    return this.binding.subscribe(callback);
-  }
-}, _class4);
-
 // src/api/MessageRuntime.ts
 var COMPLETE_STATUS2 = {
   type: "complete"
@@ -1868,7 +2027,7 @@ var getContentPartState = (message, partIndex) => {
     if (message.content.length === 0 && partIndex === 0) {
       part = EMPTY_CONTENT;
     } else {
-      return void 0;
+      return SKIP_UPDATE;
     }
   } else if (message.content.length === 1 && part.type === "text" && part.text.length === 0) {
     part = EMPTY_CONTENT;
@@ -1876,12 +2035,12 @@ var getContentPartState = (message, partIndex) => {
   const status = toContentPartStatus(message, partIndex, part);
   return Object.freeze({ ...part, part, status });
 };
-var MessageRuntime = (_class5 = class {
-  constructor(_core, _threadBinding) {;_class5.prototype.__init8.call(this);
+var MessageRuntime = (_class6 = class {
+  constructor(_core, _threadBinding) {;_class6.prototype.__init10.call(this);
     this._core = _core;
     this._threadBinding = _threadBinding;
   }
-  __init8() {this.composer = new ComposerRuntime(
+  __init10() {this.composer = new EditComposerRuntime(
     new NestedSubscriptionSubject({
       getState: () => this._threadBinding.getState().getEditComposer(this._core.getState().id),
       subscribe: (callback) => this._threadBinding.subscribe(callback)
@@ -1958,7 +2117,24 @@ var MessageRuntime = (_class5 = class {
       this._threadBinding
     );
   }
-}, _class5);
+  unstable_getAttachmentByIndex(idx) {
+    return new MessageAttachmentRuntime(
+      new ShallowMemoizeSubject({
+        getState: () => {
+          const attachments = this.getState().attachments;
+          const attachment = _optionalChain([attachments, 'optionalAccess', _78 => _78[idx]]);
+          if (!attachment) return SKIP_UPDATE;
+          return {
+            ...attachment,
+            attachment,
+            source: "message"
+          };
+        },
+        subscribe: (callback) => this._core.subscribe(callback)
+      })
+    );
+  }
+}, _class6);
 
 // src/primitives/message/MessageContent.tsx
 
@@ -2035,7 +2211,7 @@ var MessageContentPartImpl = ({
 };
 var MessageContentPart = _react.memo.call(void 0, 
   MessageContentPartImpl,
-  (prev, next) => prev.partIndex === next.partIndex && _optionalChain([prev, 'access', _61 => _61.components, 'optionalAccess', _62 => _62.Text]) === _optionalChain([next, 'access', _63 => _63.components, 'optionalAccess', _64 => _64.Text]) && _optionalChain([prev, 'access', _65 => _65.components, 'optionalAccess', _66 => _66.Image]) === _optionalChain([next, 'access', _67 => _67.components, 'optionalAccess', _68 => _68.Image]) && _optionalChain([prev, 'access', _69 => _69.components, 'optionalAccess', _70 => _70.UI]) === _optionalChain([next, 'access', _71 => _71.components, 'optionalAccess', _72 => _72.UI]) && _optionalChain([prev, 'access', _73 => _73.components, 'optionalAccess', _74 => _74.tools]) === _optionalChain([next, 'access', _75 => _75.components, 'optionalAccess', _76 => _76.tools])
+  (prev, next) => prev.partIndex === next.partIndex && _optionalChain([prev, 'access', _79 => _79.components, 'optionalAccess', _80 => _80.Text]) === _optionalChain([next, 'access', _81 => _81.components, 'optionalAccess', _82 => _82.Text]) && _optionalChain([prev, 'access', _83 => _83.components, 'optionalAccess', _84 => _84.Image]) === _optionalChain([next, 'access', _85 => _85.components, 'optionalAccess', _86 => _86.Image]) && _optionalChain([prev, 'access', _87 => _87.components, 'optionalAccess', _88 => _88.UI]) === _optionalChain([next, 'access', _89 => _89.components, 'optionalAccess', _90 => _90.UI]) && _optionalChain([prev, 'access', _91 => _91.components, 'optionalAccess', _92 => _92.tools]) === _optionalChain([next, 'access', _93 => _93.components, 'optionalAccess', _94 => _94.tools])
 );
 var MessagePrimitiveContent = ({
   components
@@ -2061,86 +2237,93 @@ var AttachmentContext = _react.createContext.call(void 0,
 );
 function useAttachmentContext(options) {
   const context = _react.useContext.call(void 0, AttachmentContext);
-  if (!_optionalChain([options, 'optionalAccess', _77 => _77.optional]) && !context)
+  if (!_optionalChain([options, 'optionalAccess', _95 => _95.optional]) && !context)
     throw new Error(
       "This component must be used within a ComposerPrimitive.Attachments or MessagePrimitive.Attachments component."
     );
   return context;
 }
-function useComposerAttachmentContext(options) {
+function useThreadComposerAttachmentContext(options) {
+  const context = useAttachmentContext(options);
+  if (!context) return null;
+  if (context.source !== "thread-composer")
+    throw new Error(
+      "This component must be used within a thread's ComposerPrimitive.Attachments component."
+    );
+  return context;
+}
+function useEditComposerAttachmentContext(options) {
   const context = useAttachmentContext(options);
   if (!context) return null;
-  if (context.type !== "composer")
+  if (context.source !== "edit-composer")
     throw new Error(
-      "This component must be used within a ComposerPrimitive.Attachments component."
+      "This component must be used within a messages's ComposerPrimitive.Attachments component."
     );
   return context;
 }
 function useMessageAttachmentContext(options) {
   const context = useAttachmentContext(options);
   if (!context) return null;
-  if (context.type !== "message")
+  if (context.source !== "message")
     throw new Error(
       "This component must be used within a MessagePrimitive.Attachments component."
     );
   return context;
 }
-var { useAttachment, useAttachmentStore } = createContextStoreHook(
+function useAttachmentRuntime(options) {
+  const attachmentRuntime = useAttachmentContext(options);
+  if (!attachmentRuntime) return null;
+  return attachmentRuntime.useAttachmentRuntime();
+}
+var { useAttachment } = createContextStoreHook(
   useAttachmentContext,
   "useAttachment"
 );
-var {
-  useAttachment: useComposerAttachment,
-  useAttachmentStore: useComposerAttachmentStore
-} = createContextStoreHook(useComposerAttachmentContext, "useAttachment");
-var {
-  useAttachment: useMessageAttachment,
-  useAttachmentStore: useMessageAttachmentStore
-} = createContextStoreHook(useMessageAttachmentContext, "useAttachment");
+var { useAttachment: useThreadComposerAttachment } = createContextStoreHook(useThreadComposerAttachmentContext, "useAttachment");
+var { useAttachment: useEditComposerAttachment } = createContextStoreHook(useEditComposerAttachmentContext, "useAttachment");
+var { useAttachment: useMessageAttachment } = createContextStoreHook(
+  useMessageAttachmentContext,
+  "useAttachment"
+);
+
+// src/context/providers/AttachmentRuntimeProvider.tsx
+
 
-// src/context/providers/MessageAttachmentProvider.tsx
 
 
 
-var getAttachment = (message, useAttachment2, partIndex) => {
-  if (message.role !== "user") return null;
-  const attachments = message.attachments;
-  const attachment = attachments[partIndex];
-  if (!attachment) return null;
-  const currentState = _optionalChain([useAttachment2, 'optionalAccess', _78 => _78.getState, 'call', _79 => _79()]);
-  if (currentState && currentState.attachment === attachment) return null;
-  return Object.freeze({ attachment });
+
+
+var useAttachmentRuntimeStore = (runtime) => {
+  const [store] = _react.useState.call(void 0, () => _zustand.create.call(void 0, () => runtime));
+  _react.useEffect.call(void 0, () => {
+    writableStore(store).setState(runtime, true);
+  }, [runtime, store]);
+  return store;
 };
-var useMessageAttachmentContext2 = (partIndex) => {
-  const messageStore = useMessageStore();
-  const [context] = _react.useState.call(void 0, 
-    () => {
-      const useAttachment2 = _zustand.create.call(void 0, 
-        () => getAttachment(messageStore.getState(), void 0, partIndex)
-      );
-      return { type: "message", useAttachment: useAttachment2 };
-    }
-  );
+var useAttachmentStore = (runtime) => {
+  const [store] = _react.useState.call(void 0, () => _zustand.create.call(void 0, () => runtime.getState()));
   _react.useEffect.call(void 0, () => {
-    const syncAttachment = (messageState) => {
-      const newState = getAttachment(
-        messageState,
-        context.useAttachment,
-        partIndex
-      );
-      if (!newState) return;
-      writableStore(context.useAttachment).setState(newState, true);
-    };
-    syncAttachment(messageStore.getState());
-    return messageStore.subscribe(syncAttachment);
-  }, [context, messageStore, partIndex]);
-  return context;
+    const updateState = () => writableStore(store).setState(runtime.getState(), true);
+    updateState();
+    return runtime.subscribe(updateState);
+  }, [runtime, store]);
+  return store;
 };
-var MessageAttachmentProvider = ({
-  attachmentIndex: partIndex,
+var AttachmentRuntimeProvider = ({
+  runtime,
   children
 }) => {
-  const context = useMessageAttachmentContext2(partIndex);
+  const useAttachmentRuntime2 = useAttachmentRuntimeStore(runtime);
+  const useAttachment2 = useAttachmentStore(runtime);
+  const source = useAttachment2((s) => s.source);
+  const context = _react.useMemo.call(void 0, () => {
+    return {
+      source,
+      useAttachmentRuntime: useAttachmentRuntime2,
+      useAttachment: useAttachment2
+    };
+  }, [useAttachmentRuntime2, useAttachment2]);
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, AttachmentContext.Provider, { value: context, children });
 };
 
@@ -2150,11 +2333,11 @@ var getComponent = (components, attachment) => {
   const type = attachment.type;
   switch (type) {
     case "image":
-      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _80 => _80.Image]), () => ( _optionalChain([components, 'optionalAccess', _81 => _81.Attachment])));
+      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _96 => _96.Image]), () => ( _optionalChain([components, 'optionalAccess', _97 => _97.Attachment])));
     case "document":
-      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _82 => _82.Document]), () => ( _optionalChain([components, 'optionalAccess', _83 => _83.Attachment])));
+      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _98 => _98.Document]), () => ( _optionalChain([components, 'optionalAccess', _99 => _99.Attachment])));
     case "file":
-      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _84 => _84.File]), () => ( _optionalChain([components, 'optionalAccess', _85 => _85.Attachment])));
+      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _100 => _100.File]), () => ( _optionalChain([components, 'optionalAccess', _101 => _101.Attachment])));
     default:
       const _exhaustiveCheck = type;
       throw new Error(`Unknown attachment type: ${_exhaustiveCheck}`);
@@ -2168,11 +2351,16 @@ var AttachmentComponent = ({ components }) => {
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Component, {});
 };
 var MessageAttachmentImpl = ({ components, attachmentIndex }) => {
-  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, MessageAttachmentProvider, { attachmentIndex, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, AttachmentComponent, { components }) });
+  const messageRuntime = useMessageRuntime();
+  const runtime = _react.useMemo.call(void 0, 
+    () => messageRuntime.unstable_getAttachmentByIndex(attachmentIndex),
+    [messageRuntime, attachmentIndex]
+  );
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, AttachmentRuntimeProvider, { runtime, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, AttachmentComponent, { components }) });
 };
 var MessageAttachment = _react.memo.call(void 0, 
   MessageAttachmentImpl,
-  (prev, next) => prev.attachmentIndex === next.attachmentIndex && _optionalChain([prev, 'access', _86 => _86.components, 'optionalAccess', _87 => _87.Image]) === _optionalChain([next, 'access', _88 => _88.components, 'optionalAccess', _89 => _89.Image]) && _optionalChain([prev, 'access', _90 => _90.components, 'optionalAccess', _91 => _91.Document]) === _optionalChain([next, 'access', _92 => _92.components, 'optionalAccess', _93 => _93.Document]) && _optionalChain([prev, 'access', _94 => _94.components, 'optionalAccess', _95 => _95.File]) === _optionalChain([next, 'access', _96 => _96.components, 'optionalAccess', _97 => _97.File]) && _optionalChain([prev, 'access', _98 => _98.components, 'optionalAccess', _99 => _99.Attachment]) === _optionalChain([next, 'access', _100 => _100.components, 'optionalAccess', _101 => _101.Attachment])
+  (prev, next) => prev.attachmentIndex === next.attachmentIndex && _optionalChain([prev, 'access', _102 => _102.components, 'optionalAccess', _103 => _103.Image]) === _optionalChain([next, 'access', _104 => _104.components, 'optionalAccess', _105 => _105.Image]) && _optionalChain([prev, 'access', _106 => _106.components, 'optionalAccess', _107 => _107.Document]) === _optionalChain([next, 'access', _108 => _108.components, 'optionalAccess', _109 => _109.Document]) && _optionalChain([prev, 'access', _110 => _110.components, 'optionalAccess', _111 => _111.File]) === _optionalChain([next, 'access', _112 => _112.components, 'optionalAccess', _113 => _113.File]) && _optionalChain([prev, 'access', _114 => _114.components, 'optionalAccess', _115 => _115.Attachment]) === _optionalChain([next, 'access', _116 => _116.components, 'optionalAccess', _117 => _117.Attachment])
 );
 var MessagePrimitiveAttachments = ({ components }) => {
   const attachmentsCount = useMessage(({ message }) => {
@@ -2283,7 +2471,7 @@ var ComposerPrimitiveInput = _react.forwardRef.call(void 0,
         const { isRunning } = threadStore.getState();
         if (!isRunning) {
           e.preventDefault();
-          _optionalChain([textareaRef, 'access', _102 => _102.current, 'optionalAccess', _103 => _103.closest, 'call', _104 => _104("form"), 'optionalAccess', _105 => _105.requestSubmit, 'call', _106 => _106()]);
+          _optionalChain([textareaRef, 'access', _118 => _118.current, 'optionalAccess', _119 => _119.closest, 'call', _120 => _120("form"), 'optionalAccess', _121 => _121.requestSubmit, 'call', _122 => _122()]);
         }
       }
     };
@@ -2344,79 +2532,41 @@ var ComposerPrimitiveAddAttachment = createActionButton(
 // src/primitives/composer/ComposerAttachments.tsx
 
 
-// src/context/providers/ComposerAttachmentProvider.tsx
-
-
-
-var getAttachment2 = ({ attachments }, useAttachment2, partIndex) => {
-  const attachment = attachments[partIndex];
-  if (!attachment) return null;
-  const currentState = _optionalChain([useAttachment2, 'optionalAccess', _107 => _107.getState, 'call', _108 => _108()]);
-  if (currentState && currentState.attachment === attachment) return null;
-  return Object.freeze({ attachment });
-};
-var useComposerAttachmentContext2 = (partIndex) => {
-  const threadComposerStore = useThreadComposerStore();
-  const [context] = _react.useState.call(void 0, 
-    () => {
-      const useAttachment2 = _zustand.create.call(void 0, 
-        () => getAttachment2(threadComposerStore.getState(), void 0, partIndex)
-      );
-      return { type: "composer", useAttachment: useAttachment2 };
-    }
-  );
-  _react.useEffect.call(void 0, () => {
-    const syncAttachment = (composer) => {
-      const newState = getAttachment2(
-        composer,
-        context.useAttachment,
-        partIndex
-      );
-      if (!newState) return;
-      writableStore(context.useAttachment).setState(newState, true);
-    };
-    syncAttachment(threadComposerStore.getState());
-    return threadComposerStore.subscribe(syncAttachment);
-  }, [context, threadComposerStore, partIndex]);
-  return context;
-};
-var ComposerAttachmentProvider = ({ attachmentIndex: partIndex, children }) => {
-  const context = useComposerAttachmentContext2(partIndex);
-  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, AttachmentContext.Provider, { value: context, children });
-};
-
-// src/primitives/composer/ComposerAttachments.tsx
-
 var getComponent2 = (components, attachment) => {
   const type = attachment.type;
   switch (type) {
     case "image":
-      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _109 => _109.Image]), () => ( _optionalChain([components, 'optionalAccess', _110 => _110.Attachment])));
+      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _123 => _123.Image]), () => ( _optionalChain([components, 'optionalAccess', _124 => _124.Attachment])));
     case "document":
-      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _111 => _111.Document]), () => ( _optionalChain([components, 'optionalAccess', _112 => _112.Attachment])));
+      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _125 => _125.Document]), () => ( _optionalChain([components, 'optionalAccess', _126 => _126.Attachment])));
     case "file":
-      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _113 => _113.File]), () => ( _optionalChain([components, 'optionalAccess', _114 => _114.Attachment])));
+      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _127 => _127.File]), () => ( _optionalChain([components, 'optionalAccess', _128 => _128.Attachment])));
     default:
       const _exhaustiveCheck = type;
       throw new Error(`Unknown attachment type: ${_exhaustiveCheck}`);
   }
 };
 var AttachmentComponent2 = ({ components }) => {
-  const Component = useComposerAttachment(
-    (a) => getComponent2(components, a.attachment)
+  const Component = useThreadComposerAttachment(
+    (a) => getComponent2(components, a)
   );
   if (!Component) return null;
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Component, {});
 };
 var ComposerAttachmentImpl = ({ components, attachmentIndex }) => {
-  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ComposerAttachmentProvider, { attachmentIndex, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, AttachmentComponent2, { components }) });
+  const composerRuntime = useComposerRuntime();
+  const runtime = _react.useMemo.call(void 0, 
+    () => composerRuntime.unstable_getAttachmentByIndex(attachmentIndex),
+    [composerRuntime, attachmentIndex]
+  );
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, AttachmentRuntimeProvider, { runtime, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, AttachmentComponent2, { components }) });
 };
 var ComposerAttachment = _react.memo.call(void 0, 
   ComposerAttachmentImpl,
-  (prev, next) => prev.attachmentIndex === next.attachmentIndex && _optionalChain([prev, 'access', _115 => _115.components, 'optionalAccess', _116 => _116.Image]) === _optionalChain([next, 'access', _117 => _117.components, 'optionalAccess', _118 => _118.Image]) && _optionalChain([prev, 'access', _119 => _119.components, 'optionalAccess', _120 => _120.Document]) === _optionalChain([next, 'access', _121 => _121.components, 'optionalAccess', _122 => _122.Document]) && _optionalChain([prev, 'access', _123 => _123.components, 'optionalAccess', _124 => _124.File]) === _optionalChain([next, 'access', _125 => _125.components, 'optionalAccess', _126 => _126.File]) && _optionalChain([prev, 'access', _127 => _127.components, 'optionalAccess', _128 => _128.Attachment]) === _optionalChain([next, 'access', _129 => _129.components, 'optionalAccess', _130 => _130.Attachment])
+  (prev, next) => prev.attachmentIndex === next.attachmentIndex && _optionalChain([prev, 'access', _129 => _129.components, 'optionalAccess', _130 => _130.Image]) === _optionalChain([next, 'access', _131 => _131.components, 'optionalAccess', _132 => _132.Image]) && _optionalChain([prev, 'access', _133 => _133.components, 'optionalAccess', _134 => _134.Document]) === _optionalChain([next, 'access', _135 => _135.components, 'optionalAccess', _136 => _136.Document]) && _optionalChain([prev, 'access', _137 => _137.components, 'optionalAccess', _138 => _138.File]) === _optionalChain([next, 'access', _139 => _139.components, 'optionalAccess', _140 => _140.File]) && _optionalChain([prev, 'access', _141 => _141.components, 'optionalAccess', _142 => _142.Attachment]) === _optionalChain([next, 'access', _143 => _143.components, 'optionalAccess', _144 => _144.Attachment])
 );
 var ComposerPrimitiveAttachments = ({ components }) => {
-  const attachmentsCount = useThreadComposer((s) => s.attachments.length);
+  const attachmentsCount = useComposer((s) => s.attachments.length);
   return Array.from({ length: attachmentsCount }, (_, index) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
     ComposerAttachment,
     {
@@ -2633,7 +2783,7 @@ var makeMessageUtilsStore = () => _zustand.create.call(void 0, (set) => {
     },
     isSpeaking: false,
     stopSpeaking: () => {
-      _optionalChain([utterance, 'optionalAccess', _131 => _131.cancel, 'call', _132 => _132()]);
+      _optionalChain([utterance, 'optionalAccess', _145 => _145.cancel, 'call', _146 => _146()]);
     },
     addUtterance: (utt) => {
       utterance = utt;
@@ -2780,7 +2930,7 @@ var subscribeToMainThread = (runtime, callback) => {
   let first = true;
   let cleanup;
   const inner = () => {
-    _optionalChain([cleanup, 'optionalCall', _133 => _133()]);
+    _optionalChain([cleanup, 'optionalCall', _147 => _147()]);
     cleanup = runtime.thread.subscribe(callback);
     if (!first) {
       callback();
@@ -2791,7 +2941,7 @@ var subscribeToMainThread = (runtime, callback) => {
   inner();
   return () => {
     unsubscribe();
-    _optionalChain([cleanup, 'optionalCall', _134 => _134()]);
+    _optionalChain([cleanup, 'optionalCall', _148 => _148()]);
   };
 };
 
@@ -2799,8 +2949,8 @@ var subscribeToMainThread = (runtime, callback) => {
 
 
 // src/runtimes/core/BaseAssistantRuntimeCore.tsx
-var BaseAssistantRuntimeCore = (_class6 = class {
-  constructor(_thread) {;_class6.prototype.__init9.call(this);_class6.prototype.__init10.call(this);
+var BaseAssistantRuntimeCore = (_class7 = class {
+  constructor(_thread) {;_class7.prototype.__init11.call(this);_class7.prototype.__init12.call(this);
     this._thread = _thread;
     this._thread = _thread;
   }
@@ -2811,15 +2961,15 @@ var BaseAssistantRuntimeCore = (_class6 = class {
     this._thread = thread;
     this.subscriptionHandler();
   }
-  __init9() {this._subscriptions = /* @__PURE__ */ new Set()}
+  __init11() {this._subscriptions = /* @__PURE__ */ new Set()}
   subscribe(callback) {
     this._subscriptions.add(callback);
     return () => this._subscriptions.delete(callback);
   }
-  __init10() {this.subscriptionHandler = () => {
+  __init12() {this.subscriptionHandler = () => {
     for (const callback of this._subscriptions) callback();
   }}
-}, _class6);
+}, _class7);
 
 // src/internal.ts
 var internal_exports = {};
@@ -2838,10 +2988,11 @@ _chunkPZ5AY32Cjs.__export.call(void 0, internal_exports, {
 });
 
 // src/runtimes/composer/BaseComposerRuntimeCore.tsx
-var BaseComposerRuntimeCore = (_class7 = class {constructor() { _class7.prototype.__init11.call(this);_class7.prototype.__init12.call(this);_class7.prototype.__init13.call(this);_class7.prototype.__init14.call(this);_class7.prototype.__init15.call(this); }
-  __init11() {this.isEditing = true}
-  __init12() {this.attachmentAccept = "*"}
-  __init13() {this._attachments = []}
+var isAttachmentComplete = (a) => a.status.type === "complete";
+var BaseComposerRuntimeCore = (_class8 = class {constructor() { _class8.prototype.__init13.call(this);_class8.prototype.__init14.call(this);_class8.prototype.__init15.call(this);_class8.prototype.__init16.call(this);_class8.prototype.__init17.call(this); }
+  __init13() {this.isEditing = true}
+  __init14() {this.attachmentAccept = "*"}
+  __init15() {this._attachments = []}
   set attachments(value) {
     this._attachments = value;
     this.notifySubscribers();
@@ -2852,7 +3003,7 @@ var BaseComposerRuntimeCore = (_class7 = class {constructor() { _class7.prototyp
   get isEmpty() {
     return !this.text.trim() && !this.attachments.length;
   }
-  __init14() {this._text = ""}
+  __init16() {this._text = ""}
   get text() {
     return this._text;
   }
@@ -2867,9 +3018,14 @@ var BaseComposerRuntimeCore = (_class7 = class {constructor() { _class7.prototyp
   }
   async send() {
     const attachments = this._attachmentAdapter ? await Promise.all(
-      this.attachments.map(
-        async (a) => await this._attachmentAdapter.send(a)
-      )
+      this.attachments.map(async (a) => {
+        if (isAttachmentComplete(a)) return a;
+        const result = await this._attachmentAdapter.send(a);
+        if (_optionalChain([result, 'access', _149 => _149.status, 'optionalAccess', _150 => _150.type]) !== "complete") {
+          result.status = { type: "complete" };
+        }
+        return result;
+      })
     ) : [];
     const message = {
       role: "user",
@@ -2882,7 +3038,7 @@ var BaseComposerRuntimeCore = (_class7 = class {constructor() { _class7.prototyp
   
   setAttachmentAdapter(adapter) {
     this._attachmentAdapter = adapter;
-    const accept = _nullishCoalesce(_optionalChain([adapter, 'optionalAccess', _135 => _135.accept]), () => ( "*"));
+    const accept = _nullishCoalesce(_optionalChain([adapter, 'optionalAccess', _151 => _151.accept]), () => ( "*"));
     if (this.attachmentAccept !== accept) {
       this.attachmentAccept = accept;
       this.notifySubscribers();
@@ -2892,6 +3048,9 @@ var BaseComposerRuntimeCore = (_class7 = class {constructor() { _class7.prototyp
     if (!this._attachmentAdapter)
       throw new Error("Attachments are not supported");
     const attachment = await this._attachmentAdapter.add({ file });
+    if (attachment.status === void 0) {
+      attachment.status = { type: "requires-action", reason: "composer-send" };
+    }
     this._attachments = [...this._attachments, attachment];
     this.notifySubscribers();
   }
@@ -2905,7 +3064,7 @@ var BaseComposerRuntimeCore = (_class7 = class {constructor() { _class7.prototyp
     this._attachments = this._attachments.toSpliced(index, 1);
     this.notifySubscribers();
   }
-  __init15() {this._subscriptions = /* @__PURE__ */ new Set()}
+  __init17() {this._subscriptions = /* @__PURE__ */ new Set()}
   notifySubscribers() {
     for (const callback of this._subscriptions) callback();
   }
@@ -2913,19 +3072,22 @@ var BaseComposerRuntimeCore = (_class7 = class {constructor() { _class7.prototyp
     this._subscriptions.add(callback);
     return () => this._subscriptions.delete(callback);
   }
-}, _class7);
+}, _class8);
 
 // src/runtimes/composer/DefaultThreadComposerRuntimeCore.tsx
-var DefaultThreadComposerRuntimeCore = (_class8 = class extends BaseComposerRuntimeCore {
+var DefaultThreadComposerRuntimeCore = (_class9 = class extends BaseComposerRuntimeCore {
   constructor(runtime) {
-    super();_class8.prototype.__init16.call(this);;
+    super();_class9.prototype.__init18.call(this);;
     this.runtime = runtime;
     this.connect();
   }
-  __init16() {this._canCancel = false}
+  __init18() {this._canCancel = false}
   get canCancel() {
     return this._canCancel;
   }
+  get attachments() {
+    return super.attachments;
+  }
   connect() {
     return this.runtime.subscribe(() => {
       if (this.canCancel !== this.runtime.capabilities.cancel) {
@@ -2937,17 +3099,17 @@ var DefaultThreadComposerRuntimeCore = (_class8 = class extends BaseComposerRunt
   async handleSend(message) {
     this.runtime.append({
       ...message,
-      parentId: _nullishCoalesce(_optionalChain([this, 'access', _136 => _136.runtime, 'access', _137 => _137.messages, 'access', _138 => _138.at, 'call', _139 => _139(-1), 'optionalAccess', _140 => _140.id]), () => ( null))
+      parentId: _nullishCoalesce(_optionalChain([this, 'access', _152 => _152.runtime, 'access', _153 => _153.messages, 'access', _154 => _154.at, 'call', _155 => _155(-1), 'optionalAccess', _156 => _156.id]), () => ( null))
     });
   }
   async cancel() {
     this.runtime.cancelRun();
   }
-}, _class8);
+}, _class9);
 
 // src/utils/ProxyConfigProvider.ts
-var ProxyConfigProvider = (_class9 = class {constructor() { _class9.prototype.__init17.call(this); }
-  __init17() {this._providers = /* @__PURE__ */ new Set()}
+var ProxyConfigProvider = (_class10 = class {constructor() { _class10.prototype.__init19.call(this); }
+  __init19() {this._providers = /* @__PURE__ */ new Set()}
   getModelConfig() {
     return _chunk5KIEXJRKjs.mergeModelConfigs.call(void 0, this._providers);
   }
@@ -2957,7 +3119,7 @@ var ProxyConfigProvider = (_class9 = class {constructor() { _class9.prototype.__
       this._providers.delete(provider);
     };
   }
-}, _class9);
+}, _class10);
 
 // src/utils/idUtils.tsx
 var _nonsecure = require('nanoid/non-secure');
@@ -3024,11 +3186,11 @@ var findHead = (message) => {
   if ("current" in message) return message;
   return null;
 };
-var MessageRepository = (_class10 = class {constructor() { _class10.prototype.__init18.call(this);_class10.prototype.__init19.call(this);_class10.prototype.__init20.call(this); }
-  __init18() {this.messages = /* @__PURE__ */ new Map()}
+var MessageRepository = (_class11 = class {constructor() { _class11.prototype.__init20.call(this);_class11.prototype.__init21.call(this);_class11.prototype.__init22.call(this); }
+  __init20() {this.messages = /* @__PURE__ */ new Map()}
   // message_id -> item
-  __init19() {this.head = null}
-  __init20() {this.root = {
+  __init21() {this.head = null}
+  __init22() {this.root = {
     children: [],
     next: null
   }}
@@ -3070,7 +3232,7 @@ var MessageRepository = (_class10 = class {constructor() { _class10.prototype.__
     }
   }
   getMessages() {
-    const messages2 = new Array(_nullishCoalesce(_optionalChain([this, 'access', _141 => _141.head, 'optionalAccess', _142 => _142.level]), () => ( 0)));
+    const messages2 = new Array(_nullishCoalesce(_optionalChain([this, 'access', _157 => _157.head, 'optionalAccess', _158 => _158.level]), () => ( 0)));
     for (let current = this.head; current; current = current.prev) {
       messages2[current.level] = current.current;
     }
@@ -3108,7 +3270,7 @@ var MessageRepository = (_class10 = class {constructor() { _class10.prototype.__
         "MessageRepository(updateMessage): Message not found. This is likely an internal bug in assistant-ui."
       );
     return {
-      parentId: _nullishCoalesce(_optionalChain([message, 'access', _143 => _143.prev, 'optionalAccess', _144 => _144.current, 'access', _145 => _145.id]), () => ( null)),
+      parentId: _nullishCoalesce(_optionalChain([message, 'access', _159 => _159.prev, 'optionalAccess', _160 => _160.current, 'access', _161 => _161.id]), () => ( null)),
       message: message.current
     };
   }
@@ -3192,11 +3354,11 @@ var MessageRepository = (_class10 = class {constructor() { _class10.prototype.__
     for (const [, message] of this.messages) {
       exportItems.push({
         message: message.current,
-        parentId: _nullishCoalesce(_optionalChain([message, 'access', _146 => _146.prev, 'optionalAccess', _147 => _147.current, 'access', _148 => _148.id]), () => ( null))
+        parentId: _nullishCoalesce(_optionalChain([message, 'access', _162 => _162.prev, 'optionalAccess', _163 => _163.current, 'access', _164 => _164.id]), () => ( null))
       });
     }
     return {
-      headId: _nullishCoalesce(_optionalChain([this, 'access', _149 => _149.head, 'optionalAccess', _150 => _150.current, 'access', _151 => _151.id]), () => ( null)),
+      headId: _nullishCoalesce(_optionalChain([this, 'access', _165 => _165.head, 'optionalAccess', _166 => _166.current, 'access', _167 => _167.id]), () => ( null)),
       messages: exportItems
     };
   }
@@ -3204,9 +3366,9 @@ var MessageRepository = (_class10 = class {constructor() { _class10.prototype.__
     for (const { message, parentId } of messages2) {
       this.addOrUpdateMessage(parentId, message);
     }
-    this.resetHead(_nullishCoalesce(_nullishCoalesce(headId, () => ( _optionalChain([messages2, 'access', _152 => _152.at, 'call', _153 => _153(-1), 'optionalAccess', _154 => _154.message, 'access', _155 => _155.id]))), () => ( null)));
+    this.resetHead(_nullishCoalesce(_nullishCoalesce(headId, () => ( _optionalChain([messages2, 'access', _168 => _168.at, 'call', _169 => _169(-1), 'optionalAccess', _170 => _170.message, 'access', _171 => _171.id]))), () => ( null)));
   }
-}, _class10);
+}, _class11);
 
 // src/ui/base/tooltip-icon-button.tsx
 
@@ -3334,42 +3496,11 @@ var AssistantRuntime = class {
   }
 };
 
-// src/api/subscribable/LazyMemoizeSubject.ts
-var LazyMemoizeSubject = (_class11 = class extends BaseSubject {
-  constructor(binding) {
-    super();_class11.prototype.__init21.call(this);_class11.prototype.__init22.call(this);;
-    this.binding = binding;
-    const state = binding.getState();
-    if (state === void 0)
-      throw new Error("Entry not available in the store");
-    this._previousState = state;
-  }
-  __init21() {this._previousStateDirty = true}
-  
-  __init22() {this.getState = () => {
-    if (!this.isConnected || this._previousStateDirty) {
-      const newState = this.binding.getState();
-      if (newState !== void 0) {
-        this._previousState = newState;
-      }
-      this._previousStateDirty = false;
-    }
-    return this._previousState;
-  }}
-  _connect() {
-    const callback = () => {
-      this._previousStateDirty = true;
-      this.notifySubscribers();
-    };
-    return this.binding.subscribe(callback);
-  }
-}, _class11);
-
 // src/api/ThreadRuntime.ts
 var toAppendMessage = (messages2, message) => {
   if (typeof message === "string") {
     return {
-      parentId: _nullishCoalesce(_optionalChain([messages2, 'access', _156 => _156.at, 'call', _157 => _157(-1), 'optionalAccess', _158 => _158.id]), () => ( null)),
+      parentId: _nullishCoalesce(_optionalChain([messages2, 'access', _172 => _172.at, 'call', _173 => _173(-1), 'optionalAccess', _174 => _174.id]), () => ( null)),
       role: "user",
       content: [{ type: "text", text: message }],
       attachments: []
@@ -3379,7 +3510,7 @@ var toAppendMessage = (messages2, message) => {
     return message;
   }
   return {
-    parentId: _nullishCoalesce(_nullishCoalesce(message.parentId, () => ( _optionalChain([messages2, 'access', _159 => _159.at, 'call', _160 => _160(-1), 'optionalAccess', _161 => _161.id]))), () => ( null)),
+    parentId: _nullishCoalesce(_nullishCoalesce(message.parentId, () => ( _optionalChain([messages2, 'access', _175 => _175.at, 'call', _176 => _176(-1), 'optionalAccess', _177 => _177.id]))), () => ( null)),
     role: _nullishCoalesce(message.role, () => ( "user")),
     content: message.content,
     attachments: _nullishCoalesce(message.attachments, () => ( []))
@@ -3391,9 +3522,8 @@ var getThreadState = (runtime) => {
     threadId: runtime.threadId,
     capabilities: runtime.capabilities,
     isDisabled: runtime.isDisabled,
-    isRunning: _optionalChain([lastMessage, 'optionalAccess', _162 => _162.role]) !== "assistant" ? false : lastMessage.status.type === "running",
-    messages: runtime.messages,
-    unstable_synchronizer: runtime.unstable_synchronizer
+    isRunning: _optionalChain([lastMessage, 'optionalAccess', _178 => _178.role]) !== "assistant" ? false : lastMessage.status.type === "running",
+    messages: runtime.messages
   });
 };
 var ThreadRuntime = (_class12 = class {
@@ -3443,7 +3573,7 @@ var ThreadRuntime = (_class12 = class {
       subscribe: (callback) => threadBinding.subscribe(callback)
     };
   }
-  __init23() {this.composer = new ComposerRuntime(
+  __init23() {this.composer = new ThreadComposerRuntime(
     new NestedSubscriptionSubject({
       getState: () => this._threadBinding.getState().composer,
       subscribe: (callback) => this._threadBinding.subscribe(callback)
@@ -3500,13 +3630,13 @@ var ThreadRuntime = (_class12 = class {
     return this._threadBinding.getState().submitFeedback(options);
   }
   /**
-   * @deprecated This is a temporary API. This will be removed in 0.6.0.
+   * @deprecated Use `getMesssageById(id).unstable_getMessageByIndex(idx).composer` instead. This will be removed in 0.6.0.
    */
   getEditComposer(messageId) {
     return this._threadBinding.getState().getEditComposer(messageId);
   }
   /**
-   * @deprecated This is a temporary API. This will be removed in 0.6.0.
+   * @deprecated Use `getMesssageById(id).unstable_getMessageByIndex(idx).composer.beginEdit()` instead. This will be removed in 0.6.0.
    */
   beginEdit(messageId) {
     return this._threadBinding.getState().beginEdit(messageId);
@@ -3522,15 +3652,15 @@ var ThreadRuntime = (_class12 = class {
     return new MessageRuntime(
       new ShallowMemoizeSubject({
         getState: () => {
-          const messages2 = this.messages;
+          const messages2 = this.getState().messages;
           const message = messages2[idx];
-          if (!message) return void 0;
+          if (!message) return SKIP_UPDATE;
           const branches = this._threadBinding.getState().getBranches(message.id);
           return {
             ...message,
             message,
             isLast: idx === messages2.length - 1,
-            parentId: _nullishCoalesce(_optionalChain([messages2, 'access', _163 => _163[idx - 1], 'optionalAccess', _164 => _164.id]), () => ( null)),
+            parentId: _nullishCoalesce(_optionalChain([messages2, 'access', _179 => _179[idx - 1], 'optionalAccess', _180 => _180.id]), () => ( null)),
             branches,
             branchNumber: branches.indexOf(message.id) + 1,
             branchCount: branches.length
@@ -3582,6 +3712,9 @@ var fromLanguageModelMessages = (lm, { mergeRoundtrips }) => {
                 }
                 throw new Error("Only images with URL data are supported");
               }
+              case "file": {
+                throw new Error("File content parts are not supported");
+              }
               default: {
                 const unhandledType = type;
                 throw new Error(`Unknown content part type: ${unhandledType}`);
@@ -3606,7 +3739,7 @@ var fromLanguageModelMessages = (lm, { mergeRoundtrips }) => {
         });
         if (mergeRoundtrips) {
           const previousMessage = messages2[messages2.length - 1];
-          if (_optionalChain([previousMessage, 'optionalAccess', _165 => _165.role]) === "assistant") {
+          if (_optionalChain([previousMessage, 'optionalAccess', _181 => _181.role]) === "assistant") {
             previousMessage.content.push(...newContent);
             break;
           }
@@ -3619,7 +3752,7 @@ var fromLanguageModelMessages = (lm, { mergeRoundtrips }) => {
       }
       case "tool": {
         const previousMessage = messages2[messages2.length - 1];
-        if (_optionalChain([previousMessage, 'optionalAccess', _166 => _166.role]) !== "assistant")
+        if (_optionalChain([previousMessage, 'optionalAccess', _182 => _182.role]) !== "assistant")
           throw new Error(
             "A tool message must be preceded by an assistant message."
           );
@@ -3848,7 +3981,7 @@ var useEdgeRuntime = ({
 };
 
 // src/runtimes/local/shouldContinue.tsx
-var shouldContinue = (result) => _optionalChain([result, 'access', _167 => _167.status, 'optionalAccess', _168 => _168.type]) === "requires-action" && result.status.reason === "tool-calls" && result.content.every((c) => c.type !== "tool-call" || !!c.result);
+var shouldContinue = (result) => _optionalChain([result, 'access', _183 => _183.status, 'optionalAccess', _184 => _184.type]) === "requires-action" && result.status.reason === "tool-calls" && result.content.every((c) => c.type !== "tool-call" || !!c.result);
 
 // src/runtimes/composer/DefaultEditComposerRuntimeCore.tsx
 var DefaultEditComposerRuntimeCore = class extends BaseComposerRuntimeCore {
@@ -3932,18 +4065,18 @@ var LocalThreadRuntimeCore = (_class13 = class {
   set options({ initialMessages, ...options }) {
     this._options = options;
     let hasUpdates = false;
-    const canSpeak = _optionalChain([options, 'access', _169 => _169.adapters, 'optionalAccess', _170 => _170.speech]) !== void 0;
+    const canSpeak = _optionalChain([options, 'access', _185 => _185.adapters, 'optionalAccess', _186 => _186.speech]) !== void 0;
     if (this.capabilities.speak !== canSpeak) {
       this.capabilities.speak = canSpeak;
       hasUpdates = true;
     }
-    this.composer.setAttachmentAdapter(_optionalChain([options, 'access', _171 => _171.adapters, 'optionalAccess', _172 => _172.attachments]));
-    const canAttach = _optionalChain([options, 'access', _173 => _173.adapters, 'optionalAccess', _174 => _174.attachments]) !== void 0;
+    this.composer.setAttachmentAdapter(_optionalChain([options, 'access', _187 => _187.adapters, 'optionalAccess', _188 => _188.attachments]));
+    const canAttach = _optionalChain([options, 'access', _189 => _189.adapters, 'optionalAccess', _190 => _190.attachments]) !== void 0;
     if (this.capabilities.attachments !== canAttach) {
       this.capabilities.attachments = canAttach;
       hasUpdates = true;
     }
-    const canFeedback = _optionalChain([options, 'access', _175 => _175.adapters, 'optionalAccess', _176 => _176.feedback]) !== void 0;
+    const canFeedback = _optionalChain([options, 'access', _191 => _191.adapters, 'optionalAccess', _192 => _192.feedback]) !== void 0;
     if (this.capabilities.feedback !== canFeedback) {
       this.capabilities.feedback = canFeedback;
       hasUpdates = true;
@@ -4002,18 +4135,18 @@ var LocalThreadRuntimeCore = (_class13 = class {
   }
   async performRoundtrip(parentId, message) {
     const messages2 = this.repository.getMessages();
-    _optionalChain([this, 'access', _177 => _177.abortController, 'optionalAccess', _178 => _178.abort, 'call', _179 => _179()]);
+    _optionalChain([this, 'access', _193 => _193.abortController, 'optionalAccess', _194 => _194.abort, 'call', _195 => _195()]);
     this.abortController = new AbortController();
     const initialContent = message.content;
-    const initialRoundtrips = _optionalChain([message, 'access', _180 => _180.metadata, 'optionalAccess', _181 => _181.roundtrips]);
-    const initalCustom = _optionalChain([message, 'access', _182 => _182.metadata, 'optionalAccess', _183 => _183.custom]);
+    const initialRoundtrips = _optionalChain([message, 'access', _196 => _196.metadata, 'optionalAccess', _197 => _197.roundtrips]);
+    const initalCustom = _optionalChain([message, 'access', _198 => _198.metadata, 'optionalAccess', _199 => _199.custom]);
     const updateMessage = (m) => {
       message = {
         ...message,
         ...m.content ? { content: [...initialContent, ..._nullishCoalesce(m.content, () => ( []))] } : void 0,
         status: _nullishCoalesce(m.status, () => ( message.status)),
         // TODO deprecated, remove in v0.6
-        ..._optionalChain([m, 'access', _184 => _184.metadata, 'optionalAccess', _185 => _185.roundtrips]) ? {
+        ..._optionalChain([m, 'access', _200 => _200.metadata, 'optionalAccess', _201 => _201.roundtrips]) ? {
           roundtrips: [
             ..._nullishCoalesce(initialRoundtrips, () => ( [])),
             ...m.metadata.roundtrips
@@ -4028,7 +4161,7 @@ var LocalThreadRuntimeCore = (_class13 = class {
                 ...m.metadata.roundtrips
               ]
             } : void 0,
-            ..._optionalChain([m, 'access', _186 => _186.metadata, 'optionalAccess', _187 => _187.custom]) ? {
+            ..._optionalChain([m, 'access', _202 => _202.metadata, 'optionalAccess', _203 => _203.custom]) ? {
               custom: { ..._nullishCoalesce(initalCustom, () => ( {})), ...m.metadata.custom }
             } : void 0
           }
@@ -4038,7 +4171,7 @@ var LocalThreadRuntimeCore = (_class13 = class {
       this.notifySubscribers();
     };
     const maxToolRoundtrips = _nullishCoalesce(this.options.maxToolRoundtrips, () => ( 1));
-    const toolRoundtrips = _nullishCoalesce(_optionalChain([message, 'access', _188 => _188.metadata, 'optionalAccess', _189 => _189.roundtrips, 'optionalAccess', _190 => _190.length]), () => ( 0));
+    const toolRoundtrips = _nullishCoalesce(_optionalChain([message, 'access', _204 => _204.metadata, 'optionalAccess', _205 => _205.roundtrips, 'optionalAccess', _206 => _206.length]), () => ( 0));
     if (toolRoundtrips > maxToolRoundtrips) {
       updateMessage({
         status: {
@@ -4137,7 +4270,7 @@ var LocalThreadRuntimeCore = (_class13 = class {
   // TODO lift utterance state to thread runtime
   
   speak(messageId) {
-    const adapter = _optionalChain([this, 'access', _191 => _191.options, 'access', _192 => _192.adapters, 'optionalAccess', _193 => _193.speech]);
+    const adapter = _optionalChain([this, 'access', _207 => _207.options, 'access', _208 => _208.adapters, 'optionalAccess', _209 => _209.speech]);
     if (!adapter) throw new Error("Speech adapter not configured");
     const { message } = this.repository.getMessage(messageId);
     if (this._utterance) {
@@ -4154,7 +4287,7 @@ var LocalThreadRuntimeCore = (_class13 = class {
     return this._utterance;
   }
   submitFeedback({ messageId, type }) {
-    const adapter = _optionalChain([this, 'access', _194 => _194.options, 'access', _195 => _195.adapters, 'optionalAccess', _196 => _196.feedback]);
+    const adapter = _optionalChain([this, 'access', _210 => _210.options, 'access', _211 => _211.adapters, 'optionalAccess', _212 => _212.feedback]);
     if (!adapter) throw new Error("Feedback adapter not configured");
     const { message } = this.repository.getMessage(messageId);
     adapter.submit({ message, type });
@@ -4201,7 +4334,7 @@ var LocalRuntimeCore = class extends BaseAssistantRuntimeCore {
     const messages2 = fromCoreMessages(initialMessages);
     this.thread.import({
       messages: messages2.map((m, idx) => ({
-        parentId: _nullishCoalesce(_optionalChain([messages2, 'access', _197 => _197[idx - 1], 'optionalAccess', _198 => _198.id]), () => ( null)),
+        parentId: _nullishCoalesce(_optionalChain([messages2, 'access', _213 => _213[idx - 1], 'optionalAccess', _214 => _214.id]), () => ( null)),
         message: m
       }))
     });
@@ -4334,7 +4467,7 @@ var fromThreadMessageLike = (like, fallbackId, fallbackStatus) => {
 
 // src/runtimes/external-store/ExternalStoreThreadRuntimeCore.tsx
 var hasUpcomingMessage = (isRunning, messages2) => {
-  return isRunning && _optionalChain([messages2, 'access', _199 => _199[messages2.length - 1], 'optionalAccess', _200 => _200.role]) !== "assistant";
+  return isRunning && _optionalChain([messages2, 'access', _215 => _215[messages2.length - 1], 'optionalAccess', _216 => _216.role]) !== "assistant";
 };
 var ExternalStoreThreadRuntimeCore = (_class15 = class {
   constructor(configProvider, store) {;_class15.prototype.__init32.call(this);_class15.prototype.__init33.call(this);_class15.prototype.__init34.call(this);_class15.prototype.__init35.call(this);_class15.prototype.__init36.call(this);_class15.prototype.__init37.call(this);_class15.prototype.__init38.call(this);_class15.prototype.__init39.call(this);
@@ -4396,12 +4529,12 @@ var ExternalStoreThreadRuntimeCore = (_class15 = class {
       reload: this._store.onReload !== void 0,
       cancel: this._store.onCancel !== void 0,
       speak: this._store.onSpeak !== void 0,
-      unstable_copy: _optionalChain([this, 'access', _204 => _204._store, 'access', _205 => _205.unstable_capabilities, 'optionalAccess', _206 => _206.copy]) !== false,
+      unstable_copy: _optionalChain([this, 'access', _220 => _220._store, 'access', _221 => _221.unstable_capabilities, 'optionalAccess', _222 => _222.copy]) !== false,
       // default true
-      attachments: !!_optionalChain([this, 'access', _207 => _207.store, 'access', _208 => _208.adapters, 'optionalAccess', _209 => _209.attachments]),
-      feedback: !!_optionalChain([this, 'access', _210 => _210.store, 'access', _211 => _211.adapters, 'optionalAccess', _212 => _212.feedback])
+      attachments: !!_optionalChain([this, 'access', _223 => _223.store, 'access', _224 => _224.adapters, 'optionalAccess', _225 => _225.attachments]),
+      feedback: !!_optionalChain([this, 'access', _226 => _226.store, 'access', _227 => _227.adapters, 'optionalAccess', _228 => _228.feedback])
     };
-    this.composer.setAttachmentAdapter(_optionalChain([this, 'access', _213 => _213._store, 'access', _214 => _214.adapters, 'optionalAccess', _215 => _215.attachments]));
+    this.composer.setAttachmentAdapter(_optionalChain([this, 'access', _229 => _229._store, 'access', _230 => _230.adapters, 'optionalAccess', _231 => _231.attachments]));
     if (oldStore) {
       if (oldStore.convertMessage !== store.convertMessage) {
         this.converter = new ThreadMessageConverter();
@@ -4427,7 +4560,7 @@ var ExternalStoreThreadRuntimeCore = (_class15 = class {
     for (let i = 0; i < messages2.length; i++) {
       const message = messages2[i];
       const parent = messages2[i - 1];
-      this.repository.addOrUpdateMessage(_nullishCoalesce(_optionalChain([parent, 'optionalAccess', _216 => _216.id]), () => ( null)), message);
+      this.repository.addOrUpdateMessage(_nullishCoalesce(_optionalChain([parent, 'optionalAccess', _232 => _232.id]), () => ( null)), message);
     }
     if (this.assistantOptimisticId) {
       this.repository.deleteMessage(this.assistantOptimisticId);
@@ -4435,7 +4568,7 @@ var ExternalStoreThreadRuntimeCore = (_class15 = class {
     }
     if (hasUpcomingMessage(isRunning, messages2)) {
       this.assistantOptimisticId = this.repository.appendOptimisticMessage(
-        _nullishCoalesce(_optionalChain([messages2, 'access', _217 => _217.at, 'call', _218 => _218(-1), 'optionalAccess', _219 => _219.id]), () => ( null)),
+        _nullishCoalesce(_optionalChain([messages2, 'access', _233 => _233.at, 'call', _234 => _234(-1), 'optionalAccess', _235 => _235.id]), () => ( null)),
         {
           role: "assistant",
           content: []
@@ -4443,7 +4576,7 @@ var ExternalStoreThreadRuntimeCore = (_class15 = class {
       );
     }
     this.repository.resetHead(
-      _nullishCoalesce(_nullishCoalesce(this.assistantOptimisticId, () => ( _optionalChain([messages2, 'access', _220 => _220.at, 'call', _221 => _221(-1), 'optionalAccess', _222 => _222.id]))), () => ( null))
+      _nullishCoalesce(_nullishCoalesce(this.assistantOptimisticId, () => ( _optionalChain([messages2, 'access', _236 => _236.at, 'call', _237 => _237(-1), 'optionalAccess', _238 => _238.id]))), () => ( null))
     );
     this.messages = this.repository.getMessages();
     this.notifySubscribers();
@@ -4464,7 +4597,7 @@ var ExternalStoreThreadRuntimeCore = (_class15 = class {
     this.updateMessages(this.repository.getMessages());
   }
   async append(message) {
-    if (message.parentId !== (_nullishCoalesce(_optionalChain([this, 'access', _223 => _223.messages, 'access', _224 => _224.at, 'call', _225 => _225(-1), 'optionalAccess', _226 => _226.id]), () => ( null)))) {
+    if (message.parentId !== (_nullishCoalesce(_optionalChain([this, 'access', _239 => _239.messages, 'access', _240 => _240.at, 'call', _241 => _241(-1), 'optionalAccess', _242 => _242.id]), () => ( null)))) {
       if (!this._store.onEdit)
         throw new Error("Runtime does not support editing messages.");
       await this._store.onEdit(message);
@@ -4487,7 +4620,7 @@ var ExternalStoreThreadRuntimeCore = (_class15 = class {
     }
     let messages2 = this.repository.getMessages();
     const previousMessage = messages2[messages2.length - 1];
-    if (_optionalChain([previousMessage, 'optionalAccess', _227 => _227.role]) === "user" && previousMessage.id === _optionalChain([messages2, 'access', _228 => _228.at, 'call', _229 => _229(-1), 'optionalAccess', _230 => _230.id])) {
+    if (_optionalChain([previousMessage, 'optionalAccess', _243 => _243.role]) === "user" && previousMessage.id === _optionalChain([messages2, 'access', _244 => _244.at, 'call', _245 => _245(-1), 'optionalAccess', _246 => _246.id])) {
       this.repository.deleteMessage(previousMessage.id);
       if (!this.composer.text.trim()) {
         this.composer.setText(getThreadMessageText(previousMessage));
@@ -4512,7 +4645,7 @@ var ExternalStoreThreadRuntimeCore = (_class15 = class {
     return this._store.onSpeak(message);
   }
   submitFeedback({ messageId, type }) {
-    const adapter = _optionalChain([this, 'access', _231 => _231._store, 'access', _232 => _232.adapters, 'optionalAccess', _233 => _233.feedback]);
+    const adapter = _optionalChain([this, 'access', _247 => _247._store, 'access', _248 => _248.adapters, 'optionalAccess', _249 => _249.feedback]);
     if (!adapter) throw new Error("Feedback adapter not configured");
     const { message } = this.repository.getMessage(messageId);
     adapter.submit({ message, type });
@@ -4522,7 +4655,7 @@ var ExternalStoreThreadRuntimeCore = (_class15 = class {
     return () => this._subscriptions.delete(callback);
   }
   __init39() {this.updateMessages = (messages2) => {
-    _optionalChain([this, 'access', _234 => _234._store, 'access', _235 => _235.setMessages, 'optionalCall', _236 => _236(
+    _optionalChain([this, 'access', _250 => _250._store, 'access', _251 => _251.setMessages, 'optionalCall', _252 => _252(
       messages2.flatMap(getExternalStoreMessage).filter((m) => m != null)
     )]);
   }}
@@ -4819,12 +4952,15 @@ var SimpleImageAttachmentAdapter = (_class16 = class {constructor() { _class16.p
       id: state.file.name,
       type: "image",
       name: state.file.name,
-      file: state.file
+      contentType: state.file.type,
+      file: state.file,
+      status: { type: "requires-action", reason: "composer-send" }
     };
   }
   async send(attachment) {
     return {
       ...attachment,
+      status: { type: "complete" },
       content: [
         {
           type: "image",
@@ -4851,12 +4987,15 @@ var SimpleTextAttachmentAdapter = (_class17 = class {constructor() { _class17.pr
       id: state.file.name,
       type: "document",
       name: state.file.name,
-      file: state.file
+      contentType: state.file.type,
+      file: state.file,
+      status: { type: "requires-action", reason: "composer-send" }
     };
   }
   async send(attachment) {
     return {
       ...attachment,
+      status: { type: "complete" },
       content: [
         {
           type: "text",
@@ -4939,7 +5078,14 @@ var CompositeAttachmentAdapter = class {
   async remove(attachment) {
     const adapters = this._adapters.slice();
     for (const adapter of adapters) {
-      if (fileMatchesAccept(attachment.file, adapter.accept)) {
+      if (fileMatchesAccept(
+        {
+          name: attachment.name,
+          type: _nullishCoalesce(attachment.contentType, () => ( "unknown/unknown"))
+          // TODO remove after 0.6.0
+        },
+        adapter.accept
+      )) {
         return adapter.remove(attachment);
       }
     }
@@ -4963,7 +5109,7 @@ var ThreadConfigProvider = ({
 }) => {
   const hasAssistant = !!useAssistantRuntime({ 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', _237 => _237.runtime])) return configProvider;
+  if (!_optionalChain([config, 'optionalAccess', _253 => _253.runtime])) return configProvider;
   if (hasAssistant) {
     throw new Error(
       "You provided a runtime to <Thread> while simulataneously using <AssistantRuntimeProvider>. This is not allowed."
@@ -5157,7 +5303,7 @@ var useAllowBranchPicker = (ensureCapability = false) => {
   return allowBranchPicker && (!ensureCapability || branchPickerSupported);
 };
 var BranchPicker = () => {
-  const allowBranchPicker = useAllowBranchPicker();
+  const allowBranchPicker = useAllowBranchPicker(true);
   if (!allowBranchPicker) return null;
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, BranchPickerRoot, { hideWhenSingleBranch: true, children: [
     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, BranchPickerPrevious2, {}),
@@ -5291,7 +5437,7 @@ var AssistantMessageContent = _react.forwardRef.call(void 0, ({ components: comp
     {
       components: {
         ...componentsProp,
-        Text: _nullishCoalesce(_nullishCoalesce(_optionalChain([componentsProp, 'optionalAccess', _238 => _238.Text]), () => ( components.Text)), () => ( content_part_default.Text)),
+        Text: _nullishCoalesce(_nullishCoalesce(_optionalChain([componentsProp, 'optionalAccess', _254 => _254.Text]), () => ( components.Text)), () => ( content_part_default.Text)),
         tools: toolsComponents
       }
     }
@@ -5346,7 +5492,7 @@ var ComposerAttachmentRoot = withDefaults("div", {
 });
 ComposerAttachmentRoot.displayName = "ComposerAttachmentRoot";
 var ComposerAttachment2 = () => {
-  const attachment = useComposerAttachment((a) => a.attachment);
+  const attachment = useThreadComposerAttachment((a) => a.attachment);
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, ComposerAttachmentRoot, { children: [
     ".",
     attachment.name.split(".").pop(),
@@ -5360,10 +5506,9 @@ var ComposerAttachmentRemove = _react.forwardRef.call(void 0, (props, ref) => {
       composer: { removeAttachment: { tooltip = "Remove file" } = {} } = {}
     } = {}
   } = useThreadConfig();
-  const composerStore = useThreadComposerStore();
-  const attachmentStore = useAttachmentStore();
+  const attachmentRuntime = useAttachmentRuntime();
   const handleRemoveAttachment = () => {
-    composerStore.getState().removeAttachment(attachmentStore.getState().attachment.id);
+    attachmentRuntime.remove();
   };
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
     TooltipIconButton,
@@ -5434,7 +5579,7 @@ var ComposerAttachments = ({ components }) => {
     {
       components: {
         ...components,
-        Attachment: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _239 => _239.Attachment]), () => ( composer_attachment_default))
+        Attachment: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _255 => _255.Attachment]), () => ( composer_attachment_default))
       }
     }
   ) });
@@ -5566,7 +5711,7 @@ var ThreadWelcomeSuggestion = ({
 };
 var ThreadWelcomeSuggestions = () => {
   const { welcome: { suggestions } = {} } = useThreadConfig();
-  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ThreadWelcomeSuggestionContainer, { children: _optionalChain([suggestions, 'optionalAccess', _240 => _240.map, 'call', _241 => _241((suggestion, idx) => {
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ThreadWelcomeSuggestionContainer, { children: _optionalChain([suggestions, 'optionalAccess', _256 => _256.map, 'call', _257 => _257((suggestion, idx) => {
     const key = `${suggestion.prompt}-${idx}`;
     return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ThreadWelcomeSuggestion, { suggestion }, key);
   })]) });
@@ -5665,7 +5810,7 @@ var UserMessageContent = _react.forwardRef.call(void 0,
       {
         components: {
           ...components,
-          Text: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _242 => _242.Text]), () => ( content_part_default.Text))
+          Text: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _258 => _258.Text]), () => ( content_part_default.Text))
         }
       }
     ) });
@@ -5683,7 +5828,7 @@ var UserMessageAttachments = ({
     {
       components: {
         ...components,
-        Attachment: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _243 => _243.Attachment]), () => ( user_message_attachment_default))
+        Attachment: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _259 => _259.Attachment]), () => ( user_message_attachment_default))
       }
     }
   ) }) });
@@ -5784,10 +5929,10 @@ var ThreadMessages = ({ components, ...rest }) => {
     thread_exports.Messages,
     {
       components: {
-        UserMessage: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _244 => _244.UserMessage]), () => ( user_message_default)),
-        EditComposer: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _245 => _245.EditComposer]), () => ( edit_composer_default)),
-        AssistantMessage: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _246 => _246.AssistantMessage]), () => ( assistant_message_default)),
-        SystemMessage: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _247 => _247.SystemMessage]), () => ( SystemMessage))
+        UserMessage: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _260 => _260.UserMessage]), () => ( user_message_default)),
+        EditComposer: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _261 => _261.EditComposer]), () => ( edit_composer_default)),
+        AssistantMessage: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _262 => _262.AssistantMessage]), () => ( assistant_message_default)),
+        SystemMessage: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _263 => _263.SystemMessage]), () => ( SystemMessage))
       },
       ...rest
     }