@assistant-ui/react 0.5.66 → 0.5.67

package/dist/index.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class; var _class2; var _class3; var _class4; var _class5; var _class6; var _class7; var _class8; var _class9; var _class10; var _class11; var _class12; var _class13;
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class; var _class2; var _class3; var _class4; var _class5; var _class6; var _class7; var _class8; var _class9; var _class10; var _class11; var _class12; var _class13; var _class14; var _class15; var _class16; var _class17;
 
 
 
@@ -144,7 +144,9 @@ var { useThread, useThreadStore } = createContextStoreHook(
   useThreadContext,
   "useThread"
 );
-var { useThreadMessages, useThreadMessagesStore } = createContextStoreHook(useThreadContext, "useThreadMessages");
+var messages = createContextStoreHook(useThreadContext, "useThreadMessages");
+var useThreadMessages = messages.useThreadMessages;
+var useThreadMessagesStore = messages.useThreadMessagesStore;
 var {
   useComposer: useThreadComposer,
   useComposerStore: useThreadComposerStore
@@ -154,56 +156,6 @@ var {
   useViewportStore: useThreadViewportStore
 } = createContextStoreHook(useThreadContext, "useViewport");
 
-// src/context/stores/ThreadComposer.ts
-
-var makeThreadComposerStore = (runtime) => {
-  const focusListeners = /* @__PURE__ */ new Set();
-  return _zustand.create.call(void 0, )((_, get) => {
-    return {
-      type: "thread",
-      get value() {
-        return get().text;
-      },
-      setValue(value) {
-        get().setText(value);
-      },
-      ...runtime.getState(),
-      canCancel: false,
-      // "TODO",
-      isEditing: true,
-      addAttachment: (file) => {
-        runtime.addAttachment(file);
-      },
-      removeAttachment: (attachmentId) => {
-        runtime.removeAttachment(attachmentId);
-      },
-      reset: () => {
-        runtime.reset();
-      },
-      setText: (text) => {
-        runtime.setText(text);
-      },
-      send: () => {
-        runtime.send();
-      },
-      cancel: () => {
-        runtime.cancel();
-      },
-      focus: () => {
-        for (const listener of focusListeners) {
-          listener();
-        }
-      },
-      onFocus: (listener) => {
-        focusListeners.add(listener);
-        return () => {
-          focusListeners.delete(listener);
-        };
-      }
-    };
-  });
-};
-
 // src/context/stores/ThreadViewport.tsx
 
 var makeThreadViewportStore = () => {
@@ -258,9 +210,9 @@ var useThreadMessagesStore2 = (runtime) => {
   return store;
 };
 var useThreadComposerStore2 = (runtime) => {
-  const [store] = _react.useState.call(void 0, () => makeThreadComposerStore(runtime));
+  const [store] = _react.useState.call(void 0, () => _zustand.create.call(void 0, () => runtime.getState()));
   _react.useEffect.call(void 0, () => {
-    const updateState = () => writableStore(store).setState(runtime.getState());
+    const updateState = () => writableStore(store).setState(runtime.getState(), true);
     updateState();
     return runtime.subscribe(updateState);
   }, [runtime, store]);
@@ -331,11 +283,47 @@ var useContentPartContext = createContextHook(
   ContentPartContext,
   "a component passed to <MessagePrimitive.Content components={...}>"
 );
+function useContentPartRuntime(options) {
+  const context = useContentPartContext(options);
+  if (!context) return null;
+  return context.useContentPartRuntime();
+}
 var { useContentPart, useContentPartStore } = createContextStoreHook(
   useContentPartContext,
   "useContentPart"
 );
 
+// src/api/ContentPartRuntime.ts
+var ContentPartRuntime = class {
+  constructor(contentBinding, messageApi, threadApi) {
+    this.contentBinding = contentBinding;
+    this.messageApi = messageApi;
+    this.threadApi = threadApi;
+  }
+  getState() {
+    return this.contentBinding.getState();
+  }
+  addToolResult(result) {
+    const message = this.messageApi.getState();
+    if (!message) throw new Error("Message is not available");
+    const state = this.contentBinding.getState();
+    if (!state) throw new Error("Content part is not available");
+    if (state.type !== "tool-call")
+      throw new Error("Tried to add tool result to non-tool content part");
+    const toolName = state.toolName;
+    const toolCallId = state.toolCallId;
+    this.threadApi.getState().addToolResult({
+      messageId: message.id,
+      toolName,
+      toolCallId,
+      result
+    });
+  }
+  subscribe(callback) {
+    return this.contentBinding.subscribe(callback);
+  }
+};
+
 // src/context/providers/TextContentPartProvider.tsx
 
 var COMPLETE_STATUS = {
@@ -346,18 +334,22 @@ var RUNNING_STATUS = {
 };
 var TextContentPartProvider = ({ children, text, isRunning }) => {
   const [context] = _react.useState.call(void 0, () => {
+    const useContentPartRuntime2 = _zustand.create.call(void 0, 
+      // TODO
+      () => new ContentPartRuntime(null, null, null)
+    );
     const useContentPart2 = _zustand.create.call(void 0, () => ({
       status: isRunning ? RUNNING_STATUS : COMPLETE_STATUS,
-      part: { type: "text", text }
+      part: { type: "text", text },
+      type: "text",
+      text
     }));
-    return {
-      useContentPart: useContentPart2
-    };
+    return { useContentPartRuntime: useContentPartRuntime2, useContentPart: useContentPart2 };
   });
   _react.useEffect.call(void 0, () => {
     const state = context.useContentPart.getState();
-    const textUpdated = state.part.text !== text;
-    const targetTextPart = textUpdated ? { type: "text", text } : state.part;
+    const textUpdated = state.text !== text;
+    const targetTextPart = textUpdated ? { type: "text", text } : state;
     const targetStatus = isRunning ? RUNNING_STATUS : COMPLETE_STATUS;
     const statusUpdated = state.status !== targetStatus;
     if (!textUpdated && !statusUpdated) return;
@@ -400,20 +392,25 @@ var { useEditComposer, useEditComposerStore } = createContextStoreHook(
 // src/context/react/ComposerContext.ts
 
 var useComposerContext = () => {
-  const { useComposer: useComposer2 } = useThreadContext();
+  const { useComposer: useThreadComposer2 } = useThreadContext();
   const { useEditComposer: useEditComposer2 } = _nullishCoalesce(useMessageContext({ optional: true }), () => ( {}));
   return _react.useMemo.call(void 0, 
     () => ({
-      useComposer: _nullishCoalesce(useEditComposer2, () => ( useComposer2)),
+      useComposer: _nullishCoalesce(useEditComposer2, () => ( useThreadComposer2)),
       type: useEditComposer2 ? "edit" : "new"
     }),
-    [useEditComposer2, useComposer2]
+    [useEditComposer2, useThreadComposer2]
   );
 };
 var { useComposer, useComposerStore } = createContextStoreHook(
   useComposerContext,
   "useComposer"
 );
+function useComposerRuntime(options) {
+  const messageRuntime = useMessageRuntime({ optional: true });
+  const threadRuntime = useThreadRuntime(options);
+  return messageRuntime ? messageRuntime.composer : _nullishCoalesce(_optionalChain([threadRuntime, 'optionalAccess', _5 => _5.composer]), () => ( null));
+}
 
 // src/hooks/useAppendMessage.tsx
 
@@ -462,7 +459,7 @@ var useAssistantTool = (tool) => {
     const unsub2 = render ? toolUIsStore.getState().setToolUI(toolName, render) : void 0;
     return () => {
       unsub1();
-      _optionalChain([unsub2, 'optionalCall', _5 => _5()]);
+      _optionalChain([unsub2, 'optionalCall', _6 => _6()]);
     };
   }, [assistantRuntime, toolUIsStore, tool]);
 };
@@ -579,12 +576,11 @@ var useActionBarCopy = ({
 // src/primitive-hooks/actionBar/useActionBarEdit.tsx
 
 var useActionBarEdit = () => {
-  const editComposerStore = useEditComposerStore();
-  const disabled = useEditComposer((c) => c.isEditing);
+  const composerRuntime = useComposerRuntime();
+  const disabled = useComposer((c) => c.isEditing);
   const callback = _react.useCallback.call(void 0, () => {
-    const { edit } = editComposerStore.getState();
-    edit();
-  }, [editComposerStore]);
+    composerRuntime.beginEdit();
+  }, [composerRuntime]);
   if (disabled) return null;
   return callback;
 };
@@ -594,7 +590,7 @@ var useActionBarEdit = () => {
 var useActionBarReload = () => {
   const messageStore = useMessageStore();
   const threadStore = useThreadStore();
-  const threadRuntime = useThreadRuntime();
+  const messageRuntime = useMessageRuntime();
   const threadComposerStore = useThreadComposerStore();
   const threadViewportStore = useThreadViewportStore();
   const disabled = useCombinedStore(
@@ -602,11 +598,10 @@ var useActionBarReload = () => {
     (t, m) => t.isRunning || t.isDisabled || m.role !== "assistant"
   );
   const callback = _react.useCallback.call(void 0, () => {
-    const { parentId } = messageStore.getState();
-    threadRuntime.startRun(parentId);
+    messageRuntime.reload();
     threadViewportStore.getState().scrollToBottom();
     threadComposerStore.getState().focus();
-  }, [threadRuntime, threadComposerStore, threadViewportStore, messageStore]);
+  }, [messageRuntime, threadComposerStore, threadViewportStore]);
   if (disabled) return null;
   return callback;
 };
@@ -616,19 +611,18 @@ var useActionBarReload = () => {
 var useActionBarSpeak = () => {
   const messageStore = useMessageStore();
   const editComposerStore = useEditComposerStore();
-  const threadRuntime = useThreadRuntime();
+  const messageRunime = useMessageRuntime();
   const messageUtilsStore = useMessageUtilsStore();
   const hasSpeakableContent = useCombinedStore(
     [messageStore, editComposerStore],
-    ({ message }, c) => {
+    (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 = _react.useCallback.call(void 0, async () => {
-    const { message } = messageStore.getState();
-    const utt = threadRuntime.speak(message.id);
+    const utt = messageRunime.speak();
     messageUtilsStore.getState().addUtterance(utt);
-  }, [threadRuntime, messageStore, messageUtilsStore]);
+  }, [messageRunime, messageUtilsStore]);
   if (!hasSpeakableContent) return null;
   return callback;
 };
@@ -648,32 +642,28 @@ var useActionBarStopSpeaking = () => {
 // src/primitive-hooks/actionBar/useActionBarFeedbackPositive.tsx
 
 var useActionBarFeedbackPositive = () => {
-  const threadRuntime = useThreadRuntime();
-  const messageStore = useMessageStore();
+  const messageRuntime = useMessageRuntime();
   const messageUtilsStore = useMessageUtilsStore();
   const callback = _react.useCallback.call(void 0, () => {
-    threadRuntime.submitFeedback({
-      messageId: messageStore.getState().id,
+    messageRuntime.submitFeedback({
       type: "positive"
     });
     messageUtilsStore.getState().setSubmittedFeedback("positive");
-  }, [messageStore, messageUtilsStore, threadRuntime]);
+  }, [messageUtilsStore, messageRuntime]);
   return callback;
 };
 
 // src/primitive-hooks/actionBar/useActionBarFeedbackNegative.tsx
 
 var useActionBarFeedbackNegative = () => {
-  const threadRuntime = useThreadRuntime();
-  const messageStore = useMessageStore();
+  const messageRuntime = useMessageRuntime();
   const messageUtilsStore = useMessageUtilsStore();
   const callback = _react.useCallback.call(void 0, () => {
-    threadRuntime.submitFeedback({
-      messageId: messageStore.getState().id,
+    messageRuntime.submitFeedback({
       type: "negative"
     });
     messageUtilsStore.getState().setSubmittedFeedback("negative");
-  }, [messageStore, messageUtilsStore, threadRuntime]);
+  }, [messageUtilsStore, messageRuntime]);
   return callback;
 };
 
@@ -782,7 +772,7 @@ var useComposerAddAttachment = () => {
       input.accept = attachmentAccept;
     }
     input.onchange = (e) => {
-      const file = _optionalChain([e, 'access', _6 => _6.target, 'access', _7 => _7.files, 'optionalAccess', _8 => _8[0]]);
+      const file = _optionalChain([e, 'access', _7 => _7.target, 'access', _8 => _8.files, 'optionalAccess', _9 => _9[0]]);
       if (!file) return;
       addAttachment(file);
     };
@@ -795,7 +785,7 @@ var useComposerAddAttachment = () => {
 // src/primitive-hooks/contentPart/useContentPartDisplay.tsx
 var useContentPartDisplay = () => {
   const display = useContentPart((c) => {
-    if (c.part.type !== "ui")
+    if (c.type !== "ui")
       throw new Error(
         "This component can only be used inside ui content parts."
       );
@@ -807,7 +797,7 @@ var useContentPartDisplay = () => {
 // src/primitive-hooks/contentPart/useContentPartImage.tsx
 var useContentPartImage = () => {
   const image = useContentPart((c) => {
-    if (c.part.type !== "image")
+    if (c.type !== "image")
       throw new Error(
         "ContentPartImage can only be used inside image content parts."
       );
@@ -819,7 +809,7 @@ var useContentPartImage = () => {
 // src/primitive-hooks/contentPart/useContentPartText.tsx
 var useContentPartText = () => {
   const text = useContentPart((c) => {
-    if (c.part.type !== "text")
+    if (c.type !== "text")
       throw new Error(
         "ContentPartText can only be used inside text content parts."
       );
@@ -857,20 +847,15 @@ var useMessageIf = (props) => {
 
 // src/primitive-hooks/thread/useThreadIf.tsx
 var useThreadIf = (props) => {
-  const threadStore = useThreadStore();
-  const threadMessagesStore = useThreadMessagesStore();
-  return useCombinedStore(
-    [threadStore, threadMessagesStore],
-    (thread, messages) => {
-      if (props.empty === true && messages.length !== 0) return false;
-      if (props.empty === false && messages.length === 0) return false;
-      if (props.running === true && !thread.isRunning) return false;
-      if (props.running === false && thread.isRunning) return false;
-      if (props.disabled === true && thread.isDisabled) return false;
-      if (props.disabled === false && thread.isDisabled) return false;
-      return true;
-    }
-  );
+  return useThread((thread) => {
+    if (props.empty === true && thread.messages.length !== 0) return false;
+    if (props.empty === false && thread.messages.length === 0) return false;
+    if (props.running === true && !thread.isRunning) return false;
+    if (props.running === false && thread.isRunning) return false;
+    if (props.disabled === true && thread.isDisabled) return false;
+    if (props.disabled === false && thread.isDisabled) return false;
+    return true;
+  });
 };
 
 // src/primitive-hooks/thread/useThreadEmpty.tsx
@@ -993,7 +978,7 @@ var ActionBarPrimitiveCopy = _react.forwardRef.call(void 0, ({ copiedDuration, o
       ref: forwardedRef,
       disabled: disabled || !callback,
       onClick: _primitive.composeEventHandlers.call(void 0, onClick, () => {
-        _optionalChain([callback, 'optionalCall', _9 => _9()]);
+        _optionalChain([callback, 'optionalCall', _10 => _10()]);
       })
     }
   );
@@ -1025,7 +1010,7 @@ var createActionButton = (displayName, useActionButton, forwardProps = []) => {
         ref: forwardedRef,
         disabled: primitiveProps.disabled || !callback,
         onClick: _primitive.composeEventHandlers.call(void 0, primitiveProps.onClick, () => {
-          _optionalChain([callback, 'optionalCall', _10 => _10()]);
+          _optionalChain([callback, 'optionalCall', _11 => _11()]);
         })
       }
     );
@@ -1074,7 +1059,7 @@ var ActionBarPrimitiveStopSpeaking = _react.forwardRef.call(void 0, (props, ref)
       ...props,
       ref,
       onClick: _primitive.composeEventHandlers.call(void 0, props.onClick, () => {
-        _optionalChain([callback, 'optionalCall', _11 => _11()]);
+        _optionalChain([callback, 'optionalCall', _12 => _12()]);
       })
     }
   );
@@ -1100,7 +1085,7 @@ var ActionBarPrimitiveFeedbackPositive = _react.forwardRef.call(void 0, ({ onCli
       ref: forwardedRef,
       disabled: disabled || !callback,
       onClick: _primitive.composeEventHandlers.call(void 0, onClick, () => {
-        _optionalChain([callback, 'optionalCall', _12 => _12()]);
+        _optionalChain([callback, 'optionalCall', _13 => _13()]);
       })
     }
   );
@@ -1126,7 +1111,7 @@ var ActionBarPrimitiveFeedbackNegative = _react.forwardRef.call(void 0, ({ onCli
       ref: forwardedRef,
       disabled: disabled || !callback,
       onClick: _primitive.composeEventHandlers.call(void 0, onClick, () => {
-        _optionalChain([callback, 'optionalCall', _13 => _13()]);
+        _optionalChain([callback, 'optionalCall', _14 => _14()]);
       })
     }
   );
@@ -1381,74 +1366,35 @@ MessagePrimitiveIf.displayName = "MessagePrimitive.If";
 // src/primitives/message/MessageContent.tsx
 
 
-// src/context/providers/ContentPartProvider.tsx
+// src/context/providers/ContentPartRuntimeProvider.tsx
 
 
 
-var COMPLETE_STATUS2 = {
-  type: "complete"
-};
-var toContentPartStatus = (message, partIndex, part) => {
-  if (message.role !== "assistant") return COMPLETE_STATUS2;
-  const isLastPart = partIndex === Math.max(0, message.content.length - 1);
-  if (part.type !== "tool-call") {
-    if ("reason" in message.status && message.status.reason === "tool-calls" && isLastPart)
-      throw new Error(
-        "Encountered unexpected requires-action status. This is likely an internal bug in assistant-ui."
-      );
-    return isLastPart ? message.status : COMPLETE_STATUS2;
-  }
-  if (!!part.result) {
-    return COMPLETE_STATUS2;
-  }
-  return message.status;
-};
-var EMPTY_CONTENT = Object.freeze({ type: "text", text: "" });
-var getContentPartState = ({ message }, useContentPart2, partIndex) => {
-  let part = message.content[partIndex];
-  if (!part) {
-    if (message.content.length === 0 && partIndex === 0) {
-      part = EMPTY_CONTENT;
-    } else {
-      return null;
-    }
-  } else if (message.content.length === 1 && part.type === "text" && part.text.length === 0) {
-    part = EMPTY_CONTENT;
-  }
-  const status = toContentPartStatus(message, partIndex, part);
-  const currentState = _optionalChain([useContentPart2, 'optionalAccess', _14 => _14.getState, 'call', _15 => _15()]);
-  if (currentState && currentState.part === part && currentState.status === status)
-    return null;
-  return Object.freeze({ part, status });
+var useContentPartRuntimeStore = (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 useContentPartContext2 = (partIndex) => {
-  const messageStore = useMessageStore();
-  const [context] = _react.useState.call(void 0, () => {
-    const useContentPart2 = _zustand.create.call(void 0, 
-      () => getContentPartState(messageStore.getState(), void 0, partIndex)
-    );
-    return { useContentPart: useContentPart2 };
-  });
+var useContentPartStore2 = (runtime) => {
+  const [store] = _react.useState.call(void 0, () => _zustand.create.call(void 0, () => runtime.getState()));
   _react.useEffect.call(void 0, () => {
-    const syncContentPart = (message) => {
-      const newState = getContentPartState(
-        message,
-        context.useContentPart,
-        partIndex
-      );
-      if (!newState) return;
-      writableStore(context.useContentPart).setState(newState, true);
-    };
-    syncContentPart(messageStore.getState());
-    return messageStore.subscribe(syncContentPart);
-  }, [context, messageStore, partIndex]);
-  return context;
+    const updateState = () => writableStore(store).setState(runtime.getState(), true);
+    updateState();
+    return runtime.subscribe(updateState);
+  }, [runtime, store]);
+  return store;
 };
-var ContentPartProvider = ({
-  partIndex,
+var ContentPartRuntimeProvider = ({
+  runtime,
   children
 }) => {
-  const context = useContentPartContext2(partIndex);
+  const useContentPartRuntime2 = useContentPartRuntimeStore(runtime);
+  const useContentPart2 = useContentPartStore2(runtime);
+  const [context] = _react.useState.call(void 0, () => {
+    return { useContentPartRuntime: useContentPartRuntime2, useContentPart: useContentPart2 };
+  });
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ContentPartContext.Provider, { value: context, children });
 };
 
@@ -1493,7 +1439,7 @@ var withSmoothContextProvider = (Component) => {
 };
 function useSmoothContext(options) {
   const context = _react.useContext.call(void 0, SmoothContext);
-  if (!_optionalChain([options, 'optionalAccess', _16 => _16.optional]) && !context)
+  if (!_optionalChain([options, 'optionalAccess', _15 => _15.optional]) && !context)
     throw new Error(
       "This component must be used within a SmoothContextProvider."
     );
@@ -1553,9 +1499,7 @@ var SMOOTH_STATUS = Object.freeze({
   type: "running"
 });
 var useSmooth = (state, smooth = false) => {
-  const {
-    part: { text }
-  } = state;
+  const { text } = state;
   const id = useMessage({
     optional: true,
     selector: (m) => m.id
@@ -1567,17 +1511,17 @@ var useSmooth = (state, smooth = false) => {
     setDisplayedText(text2);
     if (smoothStatusStore) {
       writableStore(smoothStatusStore).setState(
-        text2 !== state.part.text ? SMOOTH_STATUS : state.status
+        text2 !== state.text ? SMOOTH_STATUS : state.status
       );
     }
   });
   _react.useEffect.call(void 0, () => {
     if (smoothStatusStore) {
       writableStore(smoothStatusStore).setState(
-        text !== state.part.text ? SMOOTH_STATUS : state.status
+        text !== state.text ? SMOOTH_STATUS : state.status
       );
     }
-  }, [smoothStatusStore, text, displayedText, state.status, state.part.text]);
+  }, [smoothStatusStore, text, displayedText, state.status, state.text]);
   const [animatorRef] = _react.useState.call(void 0, 
     new TextStreamAnimator(text, setText)
   );
@@ -1604,6 +1548,8 @@ var useSmooth = (state, smooth = false) => {
   }, [animatorRef]);
   return _react.useMemo.call(void 0, 
     () => smooth ? {
+      type: "text",
+      text: displayedText,
       part: { type: "text", text: displayedText },
       status: text === displayedText ? state.status : SMOOTH_STATUS
     } : state,
@@ -1614,10 +1560,7 @@ var useSmooth = (state, smooth = false) => {
 // src/primitives/contentPart/ContentPartText.tsx
 
 var ContentPartPrimitiveText = _react.forwardRef.call(void 0, ({ smooth = true, component: Component = "span", ...rest }, forwardedRef) => {
-  const {
-    part: { text },
-    status
-  } = useSmooth(useContentPartText(), smooth);
+  const { text, status } = useSmooth(useContentPartText(), smooth);
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Component, { "data-status": status.type, ...rest, ref: forwardedRef, children: text });
 });
 ContentPartPrimitiveText.displayName = "ContentPartPrimitive.Text";
@@ -1627,18 +1570,14 @@ ContentPartPrimitiveText.displayName = "ContentPartPrimitive.Text";
 
 
 var ContentPartPrimitiveImage = _react.forwardRef.call(void 0, (props, forwardedRef) => {
-  const {
-    part: { image }
-  } = useContentPartImage();
+  const { image } = useContentPartImage();
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _reactprimitive.Primitive.img, { src: image, ...props, ref: forwardedRef });
 });
 ContentPartPrimitiveImage.displayName = "ContentPartPrimitive.Image";
 
 // src/primitives/contentPart/ContentPartDisplay.tsx
 var ContentPartPrimitiveDisplay = () => {
-  const {
-    part: { display }
-  } = useContentPartDisplay();
+  const { display } = useContentPartDisplay();
   return _nullishCoalesce(display, () => ( null));
 };
 ContentPartPrimitiveDisplay.displayName = "ContentPartPrimitive.Display";
@@ -1650,143 +1589,511 @@ var ContentPartPrimitiveInProgress = ({ children }) => {
 };
 ContentPartPrimitiveInProgress.displayName = "ContentPartPrimitive.InProgress";
 
-// src/primitives/message/MessageContent.tsx
-
-var ToolUIDisplay = ({
-  UI,
-  ...props
-}) => {
-  const Render = _nullishCoalesce(useToolUIs((s) => s.getToolUI(props.part.toolName)), () => ( UI));
-  if (!Render) return null;
-  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Render, { ...props });
+// src/api/ComposerRuntime.ts
+var METHOD_NOT_SUPPORTED = () => {
+  throw new Error("Composer is not available");
 };
-var defaultComponents = {
-  Text: () => /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "p", { style: { whiteSpace: "pre-line" }, children: [
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ContentPartPrimitiveText, {}),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ContentPartPrimitiveInProgress, { children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { style: { fontFamily: "revert" }, children: " \u25CF" }) })
-  ] }),
-  Image: () => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ContentPartPrimitiveImage, {}),
-  UI: () => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ContentPartPrimitiveDisplay, {})
+var EMPTY_ARRAY = Object.freeze([]);
+var getThreadComposerState = (type, runtime, beginEdit, focus, onFocus) => {
+  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)),
+    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))
+  });
 };
-var MessageContentPartComponent = ({
-  components: {
-    Text: Text2 = defaultComponents.Text,
-    Empty,
-    Image: Image2 = defaultComponents.Image,
-    UI = defaultComponents.UI,
-    tools: { by_name = {}, Fallback: Fallback2 = void 0 } = {}
-  } = {}
-}) => {
-  const messageStore = useMessageStore();
-  const threadRuntime = useThreadRuntime();
-  const { part, status } = useContentPart();
-  const type = part.type;
-  switch (type) {
-    case "text":
-      if (status.type === "requires-action")
-        throw new Error("Encountered unexpected requires-action status");
-      if (part === EMPTY_CONTENT && !!Empty) {
-        return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Empty, { status });
-      }
-      return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Text2, { part, status });
-    case "image":
-      if (status.type === "requires-action")
-        throw new Error("Encountered unexpected requires-action status");
-      return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Image2, { part, status });
-    case "ui":
-      if (status.type === "requires-action")
-        throw new Error("Encountered unexpected requires-action status");
-      return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, UI, { part, status });
-    case "tool-call": {
-      const Tool = by_name[part.toolName] || Fallback2;
-      const addResult = (result) => threadRuntime.addToolResult({
-        messageId: messageStore.getState().id,
-        toolName: part.toolName,
-        toolCallId: part.toolCallId,
-        result
-      });
-      return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-        ToolUIDisplay,
-        {
-          UI: Tool,
-          part,
-          status,
-          addResult
-        }
-      );
-    }
-    default:
-      const unhandledType = type;
-      throw new Error(`Unknown content part type: ${unhandledType}`);
+var ComposerRuntime = (_class2 = class {
+  constructor(_core, _beginEdit) {;_class2.prototype.__init5.call(this);
+    this._core = _core;
+    this._beginEdit = _beginEdit;
   }
-};
-var MessageContentPartImpl = ({
-  partIndex,
-  components
-}) => {
-  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ContentPartProvider, { partIndex, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, MessageContentPartComponent, { components }) });
-};
-var MessageContentPart = _react.memo.call(void 0, 
-  MessageContentPartImpl,
-  (prev, next) => prev.partIndex === next.partIndex && _optionalChain([prev, 'access', _17 => _17.components, 'optionalAccess', _18 => _18.Text]) === _optionalChain([next, 'access', _19 => _19.components, 'optionalAccess', _20 => _20.Text]) && _optionalChain([prev, 'access', _21 => _21.components, 'optionalAccess', _22 => _22.Image]) === _optionalChain([next, 'access', _23 => _23.components, 'optionalAccess', _24 => _24.Image]) && _optionalChain([prev, 'access', _25 => _25.components, 'optionalAccess', _26 => _26.UI]) === _optionalChain([next, 'access', _27 => _27.components, 'optionalAccess', _28 => _28.UI]) && _optionalChain([prev, 'access', _29 => _29.components, 'optionalAccess', _30 => _30.tools]) === _optionalChain([next, 'access', _31 => _31.components, 'optionalAccess', _32 => _32.tools])
-);
-var MessagePrimitiveContent = ({
-  components
-}) => {
-  const contentLength = useMessage((s) => s.content.length) || 1;
-  return Array.from({ length: contentLength }, (_, index) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, MessageContentPart, { partIndex: index, components }, index));
-};
-MessagePrimitiveContent.displayName = "MessagePrimitive.Content";
-
-// src/primitives/message/MessageInProgress.tsx
-var MessagePrimitiveInProgress = () => {
-  return null;
-};
-MessagePrimitiveInProgress.displayName = "MessagePrimitive.InProgress";
-
-// src/primitives/message/MessageAttachments.tsx
-
-
-// src/context/react/AttachmentContext.ts
-
-var AttachmentContext = _react.createContext.call(void 0, 
-  null
-);
-function useAttachmentContext(options) {
-  const context = _react.useContext.call(void 0, AttachmentContext);
-  if (!_optionalChain([options, 'optionalAccess', _33 => _33.optional]) && !context)
-    throw new Error(
-      "This component must be used within a ComposerPrimitive.Attachments or MessagePrimitive.Attachments component."
-    );
-  return context;
-}
-function useComposerAttachmentContext(options) {
-  const context = useAttachmentContext(options);
-  if (!context) return null;
-  if (context.type !== "composer")
-    throw new Error(
-      "This component must be used within a ComposerPrimitive.Attachments component."
-    );
-  return context;
-}
-function useMessageAttachmentContext(options) {
-  const context = useAttachmentContext(options);
-  if (!context) return null;
-  if (context.type !== "message")
-    throw new Error(
-      "This component must be used within a MessagePrimitive.Attachments component."
-    );
-  return context;
-}
-var { useAttachment, useAttachmentStore } = createContextStoreHook(
-  useAttachmentContext,
-  "useAttachment"
-);
-var {
-  useAttachment: useComposerAttachment,
-  useAttachmentStore: useComposerAttachmentStore
-} = createContextStoreHook(useComposerAttachmentContext, "useAttachment");
-var {
+  get type() {
+    return this._beginEdit ? "edit" : "thread";
+  }
+  /**
+   * @deprecated Use `getState().isEditing` instead. This will be removed in 0.6.0.
+   */
+  get isEditing() {
+    return this.getState().isEditing;
+  }
+  /**
+   * @deprecated Use `getState().isEmpty` instead. This will be removed in 0.6.0.
+   */
+  get isEmpty() {
+    return this.getState().isEmpty;
+  }
+  /**
+   * @deprecated Use `getState().canCancel` instead. This will be removed in 0.6.0.
+   */
+  get canCancel() {
+    return this.getState().canCancel;
+  }
+  /**
+   * @deprecated Use `getState().text` instead. This will be removed in 0.6.0.
+   */
+  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;
+  }
+  // TODO should this instead return getAttachmentByIndex([idx]) instead?
+  /**
+   * @deprecated Use `getState().attachments` instead. This will be removed in 0.6.0.
+   */
+  get attachments() {
+    return this.getState().attachments;
+  }
+  /**
+   * @deprecated Use `getState().text` instead. This will be removed in 0.6.0.
+   */
+  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");
+    core.setText(text);
+  }
+  setValue(text) {
+    this.setText(text);
+  }
+  addAttachment(file) {
+    const core = this._core.getState();
+    if (!core) throw new Error("Composer is not available");
+    return core.addAttachment(file);
+  }
+  // /**
+  //  * @deprecated Use `getAttachmentById(id).removeAttachment` instead. This will be removed in 0.6.0.
+  //  */
+  removeAttachment(attachmentId) {
+    const core = this._core.getState();
+    if (!core) throw new Error("Composer is not available");
+    return core.removeAttachment(attachmentId);
+  }
+  /**
+   * @deprecated This method will be removed in 0.6.0. Submit feedback if you need this functionality.
+   */
+  reset() {
+    const core = this._core.getState();
+    if (!core) throw new Error("Composer is not available");
+    core.reset();
+  }
+  send() {
+    const core = this._core.getState();
+    if (!core) throw new Error("Composer is not available");
+    core.send();
+  }
+  cancel() {
+    const core = this._core.getState();
+    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()}
+  focus() {
+    this._focusListeners.forEach((callback) => callback());
+  }
+  onFocus(callback) {
+    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()}
+  
+  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', _49 => _49._connection, 'optionalCall', _50 => _50()]);
+      this._connection = void 0;
+    }
+  }
+  subscribe(callback) {
+    this._subscriptions.add(callback);
+    this._updateConnection();
+    return () => {
+      this._subscriptions.delete(callback);
+      this._updateConnection();
+    };
+  }
+}, _class3);
+
+// src/api/subscribable/NestedSubscriptionSubject.ts
+var NestedSubscriptionSubject = class extends BaseSubject {
+  constructor(binding) {
+    super();
+    this.binding = binding;
+  }
+  getState() {
+    return this.binding.getState();
+  }
+  _connect() {
+    const callback = () => {
+      this.notifySubscribers();
+    };
+    let lastState = this.binding.getState();
+    let innerUnsubscribe = _optionalChain([lastState, 'optionalAccess', _51 => _51.subscribe, 'call', _52 => _52(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)]);
+      callback();
+    };
+    const outerUnsubscribe = this.binding.subscribe(onRuntimeUpdate);
+    return () => {
+      _optionalChain([outerUnsubscribe, 'optionalCall', _59 => _59()]);
+      _optionalChain([innerUnsubscribe, 'optionalCall', _60 => _60()]);
+    };
+  }
+};
+
+// 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"
+};
+var toContentPartStatus = (message, partIndex, part) => {
+  if (message.role !== "assistant") return COMPLETE_STATUS2;
+  const isLastPart = partIndex === Math.max(0, message.content.length - 1);
+  if (part.type !== "tool-call") {
+    if ("reason" in message.status && message.status.reason === "tool-calls" && isLastPart)
+      throw new Error(
+        "Encountered unexpected requires-action status. This is likely an internal bug in assistant-ui."
+      );
+    return isLastPart ? message.status : COMPLETE_STATUS2;
+  }
+  if (!!part.result) {
+    return COMPLETE_STATUS2;
+  }
+  return message.status;
+};
+var EMPTY_CONTENT = Object.freeze({ type: "text", text: "" });
+var getContentPartState = (message, partIndex) => {
+  let part = message.content[partIndex];
+  if (!part) {
+    if (message.content.length === 0 && partIndex === 0) {
+      part = EMPTY_CONTENT;
+    } else {
+      return void 0;
+    }
+  } else if (message.content.length === 1 && part.type === "text" && part.text.length === 0) {
+    part = EMPTY_CONTENT;
+  }
+  const status = toContentPartStatus(message, partIndex, part);
+  return Object.freeze({ ...part, part, status });
+};
+var MessageRuntime = (_class5 = class {
+  constructor(_core, _threadBinding) {;_class5.prototype.__init8.call(this);
+    this._core = _core;
+    this._threadBinding = _threadBinding;
+  }
+  __init8() {this.composer = new ComposerRuntime(
+    new NestedSubscriptionSubject({
+      getState: () => this._threadBinding.getState().getEditComposer(this._core.getState().id),
+      subscribe: (callback) => this._threadBinding.subscribe(callback)
+    }),
+    () => this._threadBinding.getState().beginEdit(this._core.getState().id)
+  )}
+  getState() {
+    return this._core.getState();
+  }
+  // TODO improve type
+  unstable_edit(message) {
+    const state = this._core.getState();
+    if (!state) throw new Error("Message is not available");
+    this._threadBinding.getState().append({
+      ...message,
+      parentId: state.parentId
+    });
+  }
+  reload() {
+    const state = this._core.getState();
+    if (!state) throw new Error("Message is not available");
+    if (state.role !== "assistant")
+      throw new Error("Can only reload assistant messages");
+    this._threadBinding.getState().startRun(state.parentId);
+  }
+  speak() {
+    const state = this._core.getState();
+    if (!state) throw new Error("Message is not available");
+    return this._threadBinding.getState().speak(state.id);
+  }
+  submitFeedback({ type }) {
+    const state = this._core.getState();
+    if (!state) throw new Error("Message is not available");
+    this._threadBinding.getState().submitFeedback({
+      messageId: state.id,
+      type
+    });
+  }
+  switchToBranch({
+    position,
+    branchId
+  }) {
+    const state = this._core.getState();
+    if (!state) throw new Error("Message is not available");
+    if (branchId && position) {
+      throw new Error("May not specify both branchId and position");
+    } else if (!branchId && !position) {
+      throw new Error("Must specify either branchId or position");
+    }
+    const thread = this._threadBinding.getState();
+    const branches = thread.getBranches(state.id);
+    let targetBranch = branchId;
+    if (position === "previous") {
+      targetBranch = branches[state.branchNumber - 2];
+    } else if (position === "next") {
+      targetBranch = branches[state.branchNumber];
+    }
+    if (!targetBranch) throw new Error("Branch not found");
+    this._threadBinding.getState().switchToBranch(targetBranch);
+  }
+  subscribe(callback) {
+    return this._core.subscribe(callback);
+  }
+  unstable_getContentPartByIndex(idx) {
+    if (idx < 0) throw new Error("Message index must be >= 0");
+    return new ContentPartRuntime(
+      new ShallowMemoizeSubject({
+        getState: () => {
+          return getContentPartState(this.getState(), idx);
+        },
+        subscribe: (callback) => this._core.subscribe(callback)
+      }),
+      this._core,
+      this._threadBinding
+    );
+  }
+}, _class5);
+
+// src/primitives/message/MessageContent.tsx
+
+var ToolUIDisplay = ({
+  UI,
+  ...props
+}) => {
+  const Render = _nullishCoalesce(useToolUIs((s) => s.getToolUI(props.toolName)), () => ( UI));
+  if (!Render) return null;
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Render, { ...props });
+};
+var defaultComponents = {
+  Text: () => /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "p", { style: { whiteSpace: "pre-line" }, children: [
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ContentPartPrimitiveText, {}),
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ContentPartPrimitiveInProgress, { children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { style: { fontFamily: "revert" }, children: " \u25CF" }) })
+  ] }),
+  Image: () => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ContentPartPrimitiveImage, {}),
+  UI: () => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ContentPartPrimitiveDisplay, {})
+};
+var MessageContentPartComponent = ({
+  components: {
+    Text: Text2 = defaultComponents.Text,
+    Empty,
+    Image: Image2 = defaultComponents.Image,
+    UI = defaultComponents.UI,
+    tools: { by_name = {}, Fallback: Fallback2 = void 0 } = {}
+  } = {}
+}) => {
+  const messageStore = useMessageStore();
+  const threadRuntime = useThreadRuntime();
+  const part = useContentPart();
+  const type = part.type;
+  switch (type) {
+    case "text":
+      if (part.status.type === "requires-action")
+        throw new Error("Encountered unexpected requires-action status");
+      if (part.part === EMPTY_CONTENT && !!Empty) {
+        return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Empty, { status: part.status });
+      }
+      return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Text2, { ...part, part });
+    case "image":
+      if (part.status.type === "requires-action")
+        throw new Error("Encountered unexpected requires-action status");
+      return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Image2, { ...part, part });
+    case "ui":
+      if (part.status.type === "requires-action")
+        throw new Error("Encountered unexpected requires-action status");
+      return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, UI, { ...part, part });
+    case "tool-call": {
+      const Tool = by_name[part.toolName] || Fallback2;
+      const addResult = (result) => threadRuntime.addToolResult({
+        messageId: messageStore.getState().id,
+        toolName: part.toolName,
+        toolCallId: part.toolCallId,
+        result
+      });
+      return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ToolUIDisplay, { ...part, part, UI: Tool, addResult });
+    }
+    default:
+      const unhandledType = type;
+      throw new Error(`Unknown content part type: ${unhandledType}`);
+  }
+};
+var MessageContentPartImpl = ({
+  partIndex,
+  components
+}) => {
+  const messageRuntime = useMessageRuntime();
+  const runtime = _react.useMemo.call(void 0, 
+    () => messageRuntime.unstable_getContentPartByIndex(partIndex),
+    [messageRuntime, partIndex]
+  );
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ContentPartRuntimeProvider, { runtime, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, MessageContentPartComponent, { components }) });
+};
+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])
+);
+var MessagePrimitiveContent = ({
+  components
+}) => {
+  const contentLength = useMessage((s) => s.content.length) || 1;
+  return Array.from({ length: contentLength }, (_, index) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, MessageContentPart, { partIndex: index, components }, index));
+};
+MessagePrimitiveContent.displayName = "MessagePrimitive.Content";
+
+// src/primitives/message/MessageInProgress.tsx
+var MessagePrimitiveInProgress = () => {
+  return null;
+};
+MessagePrimitiveInProgress.displayName = "MessagePrimitive.InProgress";
+
+// src/primitives/message/MessageAttachments.tsx
+
+
+// src/context/react/AttachmentContext.ts
+
+var AttachmentContext = _react.createContext.call(void 0, 
+  null
+);
+function useAttachmentContext(options) {
+  const context = _react.useContext.call(void 0, AttachmentContext);
+  if (!_optionalChain([options, 'optionalAccess', _77 => _77.optional]) && !context)
+    throw new Error(
+      "This component must be used within a ComposerPrimitive.Attachments or MessagePrimitive.Attachments component."
+    );
+  return context;
+}
+function useComposerAttachmentContext(options) {
+  const context = useAttachmentContext(options);
+  if (!context) return null;
+  if (context.type !== "composer")
+    throw new Error(
+      "This component must be used within a ComposerPrimitive.Attachments component."
+    );
+  return context;
+}
+function useMessageAttachmentContext(options) {
+  const context = useAttachmentContext(options);
+  if (!context) return null;
+  if (context.type !== "message")
+    throw new Error(
+      "This component must be used within a MessagePrimitive.Attachments component."
+    );
+  return context;
+}
+var { useAttachment, useAttachmentStore } = createContextStoreHook(
+  useAttachmentContext,
+  "useAttachment"
+);
+var {
+  useAttachment: useComposerAttachment,
+  useAttachmentStore: useComposerAttachmentStore
+} = createContextStoreHook(useComposerAttachmentContext, "useAttachment");
+var {
   useAttachment: useMessageAttachment,
   useAttachmentStore: useMessageAttachmentStore
 } = createContextStoreHook(useMessageAttachmentContext, "useAttachment");
@@ -1800,7 +2107,7 @@ var getAttachment = (message, useAttachment2, partIndex) => {
   const attachments = message.attachments;
   const attachment = attachments[partIndex];
   if (!attachment) return null;
-  const currentState = _optionalChain([useAttachment2, 'optionalAccess', _34 => _34.getState, 'call', _35 => _35()]);
+  const currentState = _optionalChain([useAttachment2, 'optionalAccess', _78 => _78.getState, 'call', _79 => _79()]);
   if (currentState && currentState.attachment === attachment) return null;
   return Object.freeze({ attachment });
 };
@@ -1843,11 +2150,11 @@ var getComponent = (components, attachment) => {
   const type = attachment.type;
   switch (type) {
     case "image":
-      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _36 => _36.Image]), () => ( _optionalChain([components, 'optionalAccess', _37 => _37.Attachment])));
+      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _80 => _80.Image]), () => ( _optionalChain([components, 'optionalAccess', _81 => _81.Attachment])));
     case "document":
-      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _38 => _38.Document]), () => ( _optionalChain([components, 'optionalAccess', _39 => _39.Attachment])));
+      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _82 => _82.Document]), () => ( _optionalChain([components, 'optionalAccess', _83 => _83.Attachment])));
     case "file":
-      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _40 => _40.File]), () => ( _optionalChain([components, 'optionalAccess', _41 => _41.Attachment])));
+      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _84 => _84.File]), () => ( _optionalChain([components, 'optionalAccess', _85 => _85.Attachment])));
     default:
       const _exhaustiveCheck = type;
       throw new Error(`Unknown attachment type: ${_exhaustiveCheck}`);
@@ -1865,7 +2172,7 @@ var MessageAttachmentImpl = ({ components, attachmentIndex }) => {
 };
 var MessageAttachment = _react.memo.call(void 0, 
   MessageAttachmentImpl,
-  (prev, next) => prev.attachmentIndex === next.attachmentIndex && _optionalChain([prev, 'access', _42 => _42.components, 'optionalAccess', _43 => _43.Image]) === _optionalChain([next, 'access', _44 => _44.components, 'optionalAccess', _45 => _45.Image]) && _optionalChain([prev, 'access', _46 => _46.components, 'optionalAccess', _47 => _47.Document]) === _optionalChain([next, 'access', _48 => _48.components, 'optionalAccess', _49 => _49.Document]) && _optionalChain([prev, 'access', _50 => _50.components, 'optionalAccess', _51 => _51.File]) === _optionalChain([next, 'access', _52 => _52.components, 'optionalAccess', _53 => _53.File]) && _optionalChain([prev, 'access', _54 => _54.components, 'optionalAccess', _55 => _55.Attachment]) === _optionalChain([next, 'access', _56 => _56.components, 'optionalAccess', _57 => _57.Attachment])
+  (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])
 );
 var MessagePrimitiveAttachments = ({ components }) => {
   const attachmentsCount = useMessage(({ message }) => {
@@ -1976,7 +2283,7 @@ var ComposerPrimitiveInput = _react.forwardRef.call(void 0,
         const { isRunning } = threadStore.getState();
         if (!isRunning) {
           e.preventDefault();
-          _optionalChain([textareaRef, 'access', _58 => _58.current, 'optionalAccess', _59 => _59.closest, 'call', _60 => _60("form"), 'optionalAccess', _61 => _61.requestSubmit, 'call', _62 => _62()]);
+          _optionalChain([textareaRef, 'access', _102 => _102.current, 'optionalAccess', _103 => _103.closest, 'call', _104 => _104("form"), 'optionalAccess', _105 => _105.requestSubmit, 'call', _106 => _106()]);
         }
       }
     };
@@ -2044,7 +2351,7 @@ var ComposerPrimitiveAddAttachment = createActionButton(
 var getAttachment2 = ({ attachments }, useAttachment2, partIndex) => {
   const attachment = attachments[partIndex];
   if (!attachment) return null;
-  const currentState = _optionalChain([useAttachment2, 'optionalAccess', _63 => _63.getState, 'call', _64 => _64()]);
+  const currentState = _optionalChain([useAttachment2, 'optionalAccess', _107 => _107.getState, 'call', _108 => _108()]);
   if (currentState && currentState.attachment === attachment) return null;
   return Object.freeze({ attachment });
 };
@@ -2084,11 +2391,11 @@ var getComponent2 = (components, attachment) => {
   const type = attachment.type;
   switch (type) {
     case "image":
-      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _65 => _65.Image]), () => ( _optionalChain([components, 'optionalAccess', _66 => _66.Attachment])));
+      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _109 => _109.Image]), () => ( _optionalChain([components, 'optionalAccess', _110 => _110.Attachment])));
     case "document":
-      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _67 => _67.Document]), () => ( _optionalChain([components, 'optionalAccess', _68 => _68.Attachment])));
+      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _111 => _111.Document]), () => ( _optionalChain([components, 'optionalAccess', _112 => _112.Attachment])));
     case "file":
-      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _69 => _69.File]), () => ( _optionalChain([components, 'optionalAccess', _70 => _70.Attachment])));
+      return _nullishCoalesce(_optionalChain([components, 'optionalAccess', _113 => _113.File]), () => ( _optionalChain([components, 'optionalAccess', _114 => _114.Attachment])));
     default:
       const _exhaustiveCheck = type;
       throw new Error(`Unknown attachment type: ${_exhaustiveCheck}`);
@@ -2106,7 +2413,7 @@ var ComposerAttachmentImpl = ({ components, attachmentIndex }) => {
 };
 var ComposerAttachment = _react.memo.call(void 0, 
   ComposerAttachmentImpl,
-  (prev, next) => prev.attachmentIndex === next.attachmentIndex && _optionalChain([prev, 'access', _71 => _71.components, 'optionalAccess', _72 => _72.Image]) === _optionalChain([next, 'access', _73 => _73.components, 'optionalAccess', _74 => _74.Image]) && _optionalChain([prev, 'access', _75 => _75.components, 'optionalAccess', _76 => _76.Document]) === _optionalChain([next, 'access', _77 => _77.components, 'optionalAccess', _78 => _78.Document]) && _optionalChain([prev, 'access', _79 => _79.components, 'optionalAccess', _80 => _80.File]) === _optionalChain([next, 'access', _81 => _81.components, 'optionalAccess', _82 => _82.File]) && _optionalChain([prev, 'access', _83 => _83.components, 'optionalAccess', _84 => _84.Attachment]) === _optionalChain([next, 'access', _85 => _85.components, 'optionalAccess', _86 => _86.Attachment])
+  (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])
 );
 var ComposerPrimitiveAttachments = ({ components }) => {
   const attachmentsCount = useThreadComposer((s) => s.attachments.length);
@@ -2311,45 +2618,6 @@ ThreadPrimitiveViewport.displayName = "ThreadPrimitive.Viewport";
 
 
 
-// src/context/stores/EditComposer.ts
-
-var makeEditComposerStore = ({
-  onEdit,
-  onSend
-}) => _zustand.create.call(void 0, )((set, get) => ({
-  type: "edit",
-  get value() {
-    return get().text;
-  },
-  setValue(value) {
-    get().setText(value);
-  },
-  text: "",
-  setText: (text) => {
-    set({ text, isEmpty: text.trim().length === 0 });
-  },
-  canCancel: false,
-  isEditing: false,
-  isEmpty: true,
-  edit: () => {
-    const text = onEdit();
-    set({
-      isEditing: true,
-      canCancel: true,
-      isEmpty: text.trim().length === 0,
-      text
-    });
-  },
-  send: () => {
-    const text = get().text;
-    set({ isEditing: false, canCancel: false });
-    onSend(text);
-  },
-  cancel: () => {
-    set({ isEditing: false, canCancel: false });
-  }
-}));
-
 // src/context/stores/MessageUtils.ts
 
 var makeMessageUtilsStore = () => _zustand.create.call(void 0, (set) => {
@@ -2365,7 +2633,7 @@ var makeMessageUtilsStore = () => _zustand.create.call(void 0, (set) => {
     },
     isSpeaking: false,
     stopSpeaking: () => {
-      _optionalChain([utterance, 'optionalAccess', _87 => _87.cancel, 'call', _88 => _88()]);
+      _optionalChain([utterance, 'optionalAccess', _131 => _131.cancel, 'call', _132 => _132()]);
     },
     addUtterance: (utt) => {
       utterance = utt;
@@ -2404,29 +2672,13 @@ var useMessageUtilsStore2 = () => {
   return store;
 };
 var useEditComposerStore2 = (useMessageRuntime2) => {
-  const [store] = _react.useState.call(void 0, 
-    () => makeEditComposerStore({
-      onEdit: () => {
-        const text = getThreadMessageText(
-          useMessageRuntime2.getState().getState()
-        );
-        return text;
-      },
-      onSend: (text) => {
-        const message = useMessageRuntime2.getState().getState();
-        const previousText = getThreadMessageText(message);
-        if (previousText === text) return;
-        const nonTextParts = message.content.filter(
-          (part) => part.type !== "text" && part.type !== "ui"
-        );
-        useMessageRuntime2.getState().edit({
-          role: message.role,
-          content: [{ type: "text", text }, ...nonTextParts],
-          attachments: _nullishCoalesce(message.attachments, () => ( []))
-        });
-      }
-    })
-  );
+  const runtime = useMessageRuntime2.getState().composer;
+  const [store] = _react.useState.call(void 0, () => _zustand.create.call(void 0, () => runtime.getState()));
+  _react.useEffect.call(void 0, () => {
+    const updateState = () => writableStore(store).setState(runtime.getState());
+    updateState();
+    return runtime.subscribe(updateState);
+  }, [runtime, store]);
   return store;
 };
 var MessageRuntimeProvider = ({
@@ -2500,7 +2752,7 @@ var ThreadMessage = _react.memo.call(void 0,
 var ThreadPrimitiveMessagesImpl = ({
   components
 }) => {
-  const messagesLength = useThreadMessages((t) => t.length);
+  const messagesLength = useThread((t) => t.messages.length);
   if (messagesLength === 0) return null;
   return Array.from({ length: messagesLength }, (_, index) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ThreadMessage, { messageIndex: index, components }, index));
 };
@@ -2528,7 +2780,7 @@ var subscribeToMainThread = (runtime, callback) => {
   let first = true;
   let cleanup;
   const inner = () => {
-    _optionalChain([cleanup, 'optionalCall', _89 => _89()]);
+    _optionalChain([cleanup, 'optionalCall', _133 => _133()]);
     cleanup = runtime.thread.subscribe(callback);
     if (!first) {
       callback();
@@ -2539,7 +2791,7 @@ var subscribeToMainThread = (runtime, callback) => {
   inner();
   return () => {
     unsubscribe();
-    _optionalChain([cleanup, 'optionalCall', _90 => _90()]);
+    _optionalChain([cleanup, 'optionalCall', _134 => _134()]);
   };
 };
 
@@ -2547,8 +2799,8 @@ var subscribeToMainThread = (runtime, callback) => {
 
 
 // src/runtimes/core/BaseAssistantRuntimeCore.tsx
-var BaseAssistantRuntimeCore = (_class2 = class {
-  constructor(_thread) {;_class2.prototype.__init5.call(this);_class2.prototype.__init6.call(this);
+var BaseAssistantRuntimeCore = (_class6 = class {
+  constructor(_thread) {;_class6.prototype.__init9.call(this);_class6.prototype.__init10.call(this);
     this._thread = _thread;
     this._thread = _thread;
   }
@@ -2559,22 +2811,22 @@ var BaseAssistantRuntimeCore = (_class2 = class {
     this._thread = thread;
     this.subscriptionHandler();
   }
-  __init5() {this._subscriptions = /* @__PURE__ */ new Set()}
+  __init9() {this._subscriptions = /* @__PURE__ */ new Set()}
   subscribe(callback) {
     this._subscriptions.add(callback);
     return () => this._subscriptions.delete(callback);
   }
-  __init6() {this.subscriptionHandler = () => {
+  __init10() {this.subscriptionHandler = () => {
     for (const callback of this._subscriptions) callback();
   }}
-}, _class2);
+}, _class6);
 
 // src/internal.ts
 var internal_exports = {};
 _chunkPZ5AY32Cjs.__export.call(void 0, internal_exports, {
   AssistantRuntime: () => AssistantRuntime,
   BaseAssistantRuntimeCore: () => BaseAssistantRuntimeCore,
-  BaseThreadComposerRuntimeCore: () => BaseThreadComposerRuntimeCore,
+  DefaultThreadComposerRuntimeCore: () => DefaultThreadComposerRuntimeCore,
   MessageRepository: () => MessageRepository,
   ProxyConfigProvider: () => ProxyConfigProvider,
   ThreadRuntime: () => ThreadRuntime,
@@ -2585,41 +2837,56 @@ _chunkPZ5AY32Cjs.__export.call(void 0, internal_exports, {
   withSmoothContextProvider: () => withSmoothContextProvider
 });
 
-// src/runtimes/utils/BaseThreadComposerRuntimeCore.tsx
-var BaseThreadComposerRuntimeCore = (_class3 = class {
-  constructor(runtime) {;_class3.prototype.__init7.call(this);_class3.prototype.__init8.call(this);_class3.prototype.__init9.call(this);_class3.prototype.__init10.call(this);_class3.prototype.__init11.call(this);
-    this.runtime = runtime;
-    this.connect();
+// 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 = []}
+  set attachments(value) {
+    this._attachments = value;
+    this.notifySubscribers();
+  }
+  get attachments() {
+    return this._attachments;
   }
-  
-  __init7() {this.attachmentAccept = "*"}
   get isEmpty() {
     return !this.text.trim() && !this.attachments.length;
   }
-  __init8() {this._canCancel = false}
-  get canCancel() {
-    return this._canCancel;
+  __init14() {this._text = ""}
+  get text() {
+    return this._text;
   }
-  connect() {
-    return this.runtime.subscribe(() => {
-      if (this.canCancel !== this.runtime.capabilities.cancel) {
-        this._canCancel = this.runtime.capabilities.cancel;
-        this.notifySubscribers();
-      }
-    });
+  setText(value) {
+    this._text = value;
+    this.notifySubscribers();
+  }
+  reset() {
+    this._text = "";
+    this._attachments = [];
+    this.notifySubscribers();
+  }
+  async send() {
+    const attachments = this._attachmentAdapter ? await Promise.all(
+      this.attachments.map(
+        async (a) => await this._attachmentAdapter.send(a)
+      )
+    ) : [];
+    const message = {
+      role: "user",
+      content: this.text ? [{ type: "text", text: this.text }] : [],
+      attachments
+    };
+    this.reset();
+    this.handleSend(message);
   }
+  
   setAttachmentAdapter(adapter) {
     this._attachmentAdapter = adapter;
-    const accept = _nullishCoalesce(_optionalChain([adapter, 'optionalAccess', _91 => _91.accept]), () => ( "*"));
+    const accept = _nullishCoalesce(_optionalChain([adapter, 'optionalAccess', _135 => _135.accept]), () => ( "*"));
     if (this.attachmentAccept !== accept) {
       this.attachmentAccept = accept;
-      return true;
+      this.notifySubscribers();
     }
-    return false;
-  }
-  __init9() {this._attachments = []}
-  get attachments() {
-    return this._attachments;
   }
   async addAttachment(file) {
     if (!this._attachmentAdapter)
@@ -2638,49 +2905,49 @@ var BaseThreadComposerRuntimeCore = (_class3 = class {
     this._attachments = this._attachments.toSpliced(index, 1);
     this.notifySubscribers();
   }
-  __init10() {this._text = ""}
-  get text() {
-    return this._text;
+  __init15() {this._subscriptions = /* @__PURE__ */ new Set()}
+  notifySubscribers() {
+    for (const callback of this._subscriptions) callback();
   }
-  setText(value) {
-    this._text = value;
-    this.notifySubscribers();
+  subscribe(callback) {
+    this._subscriptions.add(callback);
+    return () => this._subscriptions.delete(callback);
   }
-  reset() {
-    this._text = "";
-    this._attachments = [];
-    this.notifySubscribers();
+}, _class7);
+
+// src/runtimes/composer/DefaultThreadComposerRuntimeCore.tsx
+var DefaultThreadComposerRuntimeCore = (_class8 = class extends BaseComposerRuntimeCore {
+  constructor(runtime) {
+    super();_class8.prototype.__init16.call(this);;
+    this.runtime = runtime;
+    this.connect();
   }
-  async send() {
-    const attachments = this._attachmentAdapter ? await Promise.all(
-      this.attachments.map(
-        async (a) => await this._attachmentAdapter.send(a)
-      )
-    ) : [];
+  __init16() {this._canCancel = false}
+  get canCancel() {
+    return this._canCancel;
+  }
+  connect() {
+    return this.runtime.subscribe(() => {
+      if (this.canCancel !== this.runtime.capabilities.cancel) {
+        this._canCancel = this.runtime.capabilities.cancel;
+        this.notifySubscribers();
+      }
+    });
+  }
+  async handleSend(message) {
     this.runtime.append({
-      parentId: _nullishCoalesce(_optionalChain([this, 'access', _92 => _92.runtime, 'access', _93 => _93.messages, 'access', _94 => _94.at, 'call', _95 => _95(-1), 'optionalAccess', _96 => _96.id]), () => ( null)),
-      role: "user",
-      content: this.text ? [{ type: "text", text: this.text }] : [],
-      attachments
+      ...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))
     });
-    this.reset();
   }
   async cancel() {
     this.runtime.cancelRun();
   }
-  __init11() {this._subscriptions = /* @__PURE__ */ new Set()}
-  notifySubscribers() {
-    for (const callback of this._subscriptions) callback();
-  }
-  subscribe(callback) {
-    this._subscriptions.add(callback);
-    return () => this._subscriptions.delete(callback);
-  }
-}, _class3);
+}, _class8);
 
 // src/utils/ProxyConfigProvider.ts
-var ProxyConfigProvider = (_class4 = class {constructor() { _class4.prototype.__init12.call(this); }
-  __init12() {this._providers = /* @__PURE__ */ new Set()}
+var ProxyConfigProvider = (_class9 = class {constructor() { _class9.prototype.__init17.call(this); }
+  __init17() {this._providers = /* @__PURE__ */ new Set()}
   getModelConfig() {
     return _chunk5KIEXJRKjs.mergeModelConfigs.call(void 0, this._providers);
   }
@@ -2690,7 +2957,7 @@ var ProxyConfigProvider = (_class4 = class {constructor() { _class4.prototype.__
       this._providers.delete(provider);
     };
   }
-}, _class4);
+}, _class9);
 
 // src/utils/idUtils.tsx
 var _nonsecure = require('nanoid/non-secure');
@@ -2757,11 +3024,11 @@ var findHead = (message) => {
   if ("current" in message) return message;
   return null;
 };
-var MessageRepository = (_class5 = class {constructor() { _class5.prototype.__init13.call(this);_class5.prototype.__init14.call(this);_class5.prototype.__init15.call(this); }
-  __init13() {this.messages = /* @__PURE__ */ new Map()}
+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()}
   // message_id -> item
-  __init14() {this.head = null}
-  __init15() {this.root = {
+  __init19() {this.head = null}
+  __init20() {this.root = {
     children: [],
     next: null
   }}
@@ -2803,11 +3070,11 @@ var MessageRepository = (_class5 = class {constructor() { _class5.prototype.__in
     }
   }
   getMessages() {
-    const messages = new Array(_nullishCoalesce(_optionalChain([this, 'access', _97 => _97.head, 'optionalAccess', _98 => _98.level]), () => ( 0)));
+    const messages2 = new Array(_nullishCoalesce(_optionalChain([this, 'access', _141 => _141.head, 'optionalAccess', _142 => _142.level]), () => ( 0)));
     for (let current = this.head; current; current = current.prev) {
-      messages[current.level] = current.current;
+      messages2[current.level] = current.current;
     }
-    return messages;
+    return messages2;
   }
   addOrUpdateMessage(parentId, message) {
     const existingItem = this.messages.get(message.id);
@@ -2841,7 +3108,7 @@ var MessageRepository = (_class5 = class {constructor() { _class5.prototype.__in
         "MessageRepository(updateMessage): Message not found. This is likely an internal bug in assistant-ui."
       );
     return {
-      parentId: _nullishCoalesce(_optionalChain([message, 'access', _99 => _99.prev, 'optionalAccess', _100 => _100.current, 'access', _101 => _101.id]), () => ( null)),
+      parentId: _nullishCoalesce(_optionalChain([message, 'access', _143 => _143.prev, 'optionalAccess', _144 => _144.current, 'access', _145 => _145.id]), () => ( null)),
       message: message.current
     };
   }
@@ -2925,21 +3192,21 @@ var MessageRepository = (_class5 = class {constructor() { _class5.prototype.__in
     for (const [, message] of this.messages) {
       exportItems.push({
         message: message.current,
-        parentId: _nullishCoalesce(_optionalChain([message, 'access', _102 => _102.prev, 'optionalAccess', _103 => _103.current, 'access', _104 => _104.id]), () => ( null))
+        parentId: _nullishCoalesce(_optionalChain([message, 'access', _146 => _146.prev, 'optionalAccess', _147 => _147.current, 'access', _148 => _148.id]), () => ( null))
       });
     }
     return {
-      headId: _nullishCoalesce(_optionalChain([this, 'access', _105 => _105.head, 'optionalAccess', _106 => _106.current, 'access', _107 => _107.id]), () => ( null)),
+      headId: _nullishCoalesce(_optionalChain([this, 'access', _149 => _149.head, 'optionalAccess', _150 => _150.current, 'access', _151 => _151.id]), () => ( null)),
       messages: exportItems
     };
   }
-  import({ headId, messages }) {
-    for (const { message, parentId } of messages) {
+  import({ headId, messages: messages2 }) {
+    for (const { message, parentId } of messages2) {
       this.addOrUpdateMessage(parentId, message);
     }
-    this.resetHead(_nullishCoalesce(_nullishCoalesce(headId, () => ( _optionalChain([messages, 'access', _108 => _108.at, 'call', _109 => _109(-1), 'optionalAccess', _110 => _110.message, 'access', _111 => _111.id]))), () => ( null)));
+    this.resetHead(_nullishCoalesce(_nullishCoalesce(headId, () => ( _optionalChain([messages2, 'access', _152 => _152.at, 'call', _153 => _153(-1), 'optionalAccess', _154 => _154.message, 'access', _155 => _155.id]))), () => ( null)));
   }
-}, _class5);
+}, _class10);
 
 // src/ui/base/tooltip-icon-button.tsx
 
@@ -3017,85 +3284,25 @@ var Button = _react.forwardRef.call(void 0,
       {
         className: buttonVariants({ variant, size, className }),
         ...props,
-        ref
-      }
-    );
-  }
-);
-Button.displayName = "Button";
-
-// src/ui/base/tooltip-icon-button.tsx
-
-var TooltipIconButton = _react.forwardRef.call(void 0, ({ children, tooltip, side = "bottom", ...rest }, ref) => {
-  return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, Tooltip, { children: [
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, TooltipTrigger, { asChild: true, children: /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, Button, { variant: "ghost", size: "icon", ...rest, ref, children: [
-      children,
-      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "aui-sr-only", children: tooltip })
-    ] }) }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, TooltipContent, { side, children: tooltip })
-  ] });
-});
-TooltipIconButton.displayName = "TooltipIconButton";
-
-// src/api/subscribable/BaseSubject.ts
-var BaseSubject = (_class6 = class {constructor() { _class6.prototype.__init16.call(this); }
-  __init16() {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', _112 => _112._connection, 'optionalCall', _113 => _113()]);
-      this._connection = void 0;
-    }
-  }
-  subscribe(callback) {
-    this._subscriptions.add(callback);
-    this._updateConnection();
-    return () => {
-      this._subscriptions.delete(callback);
-      this._updateConnection();
-    };
-  }
-}, _class6);
-
-// src/api/subscribable/NestedSubscriptionSubject.ts
-var NestedSubscriptionSubject = class extends BaseSubject {
-  constructor(binding) {
-    super();
-    this.binding = binding;
-  }
-  getState() {
-    return this.binding.getState();
-  }
-  _connect() {
-    const callback = () => {
-      this.notifySubscribers();
-    };
-    let lastState = this.binding.getState();
-    let innerUnsubscribe = lastState.subscribe(callback);
-    const onRuntimeUpdate = () => {
-      const newState = this.binding.getState();
-      if (newState === lastState) return;
-      lastState = newState;
-      _optionalChain([innerUnsubscribe, 'optionalCall', _114 => _114()]);
-      innerUnsubscribe = this.binding.getState().subscribe(callback);
-      callback();
-    };
-    const outerUnsubscribe = this.binding.subscribe(onRuntimeUpdate);
-    return () => {
-      _optionalChain([outerUnsubscribe, 'optionalCall', _115 => _115()]);
-      innerUnsubscribe();
-    };
+        ref
+      }
+    );
   }
-};
+);
+Button.displayName = "Button";
+
+// src/ui/base/tooltip-icon-button.tsx
+
+var TooltipIconButton = _react.forwardRef.call(void 0, ({ children, tooltip, side = "bottom", ...rest }, ref) => {
+  return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, Tooltip, { children: [
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, TooltipTrigger, { asChild: true, children: /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, Button, { variant: "ghost", size: "icon", ...rest, ref, children: [
+      children,
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "aui-sr-only", children: tooltip })
+    ] }) }),
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, TooltipContent, { side, children: tooltip })
+  ] });
+});
+TooltipIconButton.displayName = "TooltipIconButton";
 
 // src/api/AssistantRuntime.ts
 var AssistantRuntime = class {
@@ -3127,245 +3334,42 @@ var AssistantRuntime = class {
   }
 };
 
-// src/api/ContentPartRuntime.ts
-var ContentPartRuntime = class {
-  constructor(contentBinding, messageApi, threadApi) {
-    this.contentBinding = contentBinding;
-    this.messageApi = messageApi;
-    this.threadApi = threadApi;
-  }
-  getState() {
-    return this.contentBinding.getState();
-  }
-  addToolResult(result) {
-    const message = this.messageApi.getState();
-    if (!message) throw new Error("Message is not available");
-    const state = this.contentBinding.getState();
-    if (!state) throw new Error("Content part is not available");
-    if (state.part.type !== "tool-call")
-      throw new Error("Tried to add tool result to non-tool content part");
-    const toolName = state.part.toolName;
-    const toolCallId = state.part.toolCallId;
-    this.threadApi.getState().addToolResult({
-      messageId: message.id,
-      toolName,
-      toolCallId,
-      result
-    });
-  }
-};
-
-// 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 = (_class7 = class extends BaseSubject {
+// src/api/subscribable/LazyMemoizeSubject.ts
+var LazyMemoizeSubject = (_class11 = class extends BaseSubject {
   constructor(binding) {
-    super();_class7.prototype.__init17.call(this);;
+    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}
   
-  __init17() {this.getState = () => {
-    if (!this.isConnected) this._syncState();
+  __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;
   }}
-  _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();
-      }
+      this._previousStateDirty = true;
+      this.notifySubscribers();
     };
     return this.binding.subscribe(callback);
   }
-}, _class7);
-
-// src/api/MessageRuntime.ts
-var MessageRuntime = class {
-  constructor(_core, _threadBinding) {
-    this._core = _core;
-    this._threadBinding = _threadBinding;
-  }
-  getState() {
-    return this._core.getState();
-  }
-  // TODO improve type
-  edit(message) {
-    const state = this._core.getState();
-    if (!state) throw new Error("Message is not available");
-    this._threadBinding.getState().append({
-      ...message,
-      parentId: state.parentId
-    });
-  }
-  reload() {
-    const state = this._core.getState();
-    if (!state) throw new Error("Message is not available");
-    this._threadBinding.getState().startRun(state.parentId);
-  }
-  speak() {
-    const state = this._core.getState();
-    if (!state) throw new Error("Message is not available");
-    this._threadBinding.getState().speak(state.id);
-  }
-  submitFeedback({ type }) {
-    const state = this._core.getState();
-    if (!state) throw new Error("Message is not available");
-    this._threadBinding.getState().submitFeedback({
-      messageId: state.id,
-      type
-    });
-  }
-  switchToBranch({
-    position,
-    branchId
-  }) {
-    const state = this._core.getState();
-    if (!state) throw new Error("Message is not available");
-    if (branchId && position) {
-      throw new Error("May not specify both branchId and position");
-    } else if (!branchId && !position) {
-      throw new Error("Must specify either branchId or position");
-    }
-    const thread = this._threadBinding.getState();
-    const branches = thread.getBranches(state.id);
-    let targetBranch = branchId;
-    if (position === "previous") {
-      targetBranch = branches[state.branchNumber - 2];
-    } else if (position === "next") {
-      targetBranch = branches[state.branchNumber];
-    }
-    if (!targetBranch) throw new Error("Branch not found");
-    this._threadBinding.getState().switchToBranch(targetBranch);
-  }
-  subscribe(callback) {
-    return this._core.subscribe(callback);
-  }
-  getContentPartByIdx(idx) {
-    if (idx < 0) throw new Error("Message index must be >= 0");
-    return new ContentPartRuntime(
-      new ShallowMemoizeSubject({
-        getState: () => {
-          const state = this.getState();
-          if (!state) return void 0;
-          const message = state.message;
-          const part = message.content[idx];
-          if (!part) return void 0;
-          return {
-            part,
-            status: toContentPartStatus(message, idx, part)
-          };
-        },
-        subscribe: (callback) => this._core.subscribe(callback)
-      }),
-      this._core,
-      this._threadBinding
-    );
-  }
-};
-
-// src/api/ThreadComposerRuntime.ts
-var getThreadComposerState = (runtime) => {
-  return Object.freeze({
-    canCancel: runtime.canCancel,
-    isEmpty: runtime.isEmpty,
-    text: runtime.text,
-    attachments: runtime.attachments,
-    attachmentAccept: runtime.attachmentAccept
-  });
-};
-var ThreadComposerRuntime = class {
-  constructor(_core) {
-    this._core = _core;
-  }
-  /**
-   * @deprecated Use `getState().isEmpty` instead. This will be removed in 0.6.0.
-   */
-  get isEmpty() {
-    return this._core.getState().isEmpty;
-  }
-  /**
-   * @deprecated Use `getState().canCancel` instead. This will be removed in 0.6.0.
-   */
-  get canCancel() {
-    return this._core.getState().canCancel;
-  }
-  /**
-   * @deprecated Use `getState().text` instead. This will be removed in 0.6.0.
-   */
-  get text() {
-    return this._core.getState().text;
-  }
-  /**
-   * @deprecated Use `getState().attachmentAccept` instead. This will be removed in 0.6.0.
-   */
-  get attachmentAccept() {
-    return this._core.getState().attachmentAccept;
-  }
-  // TODO should this instead return getAttachmentByIndex([idx]) instead?
-  /**
-   * @deprecated Use `getState().attachments` instead. This will be removed in 0.6.0.
-   */
-  get attachments() {
-    return this._core.getState().attachments;
-  }
-  getState() {
-    return getThreadComposerState(this._core.getState());
-  }
-  setText(text) {
-    this._core.getState().setText(text);
-  }
-  addAttachment(file) {
-    return this._core.getState().addAttachment(file);
-  }
-  // /**
-  //  * @deprecated Use `getAttachmentById(id).removeAttachment` instead. This will be removed in 0.6.0.
-  //  */
-  removeAttachment(attachmentId) {
-    return this._core.getState().removeAttachment(attachmentId);
-  }
-  /**
-   * @deprecated This method will be removed in 0.6.0. Submit feedback if you need this functionality.
-   */
-  reset() {
-    this._core.getState().reset();
-  }
-  send() {
-    this._core.getState().send();
-  }
-  cancel() {
-    this._core.getState().cancel();
-  }
-  subscribe(callback) {
-    return this._core.subscribe(callback);
-  }
-};
+}, _class11);
 
 // src/api/ThreadRuntime.ts
-var toAppendMessage = (messages, message) => {
+var toAppendMessage = (messages2, message) => {
   if (typeof message === "string") {
     return {
-      parentId: _nullishCoalesce(_optionalChain([messages, 'access', _116 => _116.at, 'call', _117 => _117(-1), 'optionalAccess', _118 => _118.id]), () => ( null)),
+      parentId: _nullishCoalesce(_optionalChain([messages2, 'access', _156 => _156.at, 'call', _157 => _157(-1), 'optionalAccess', _158 => _158.id]), () => ( null)),
       role: "user",
       content: [{ type: "text", text: message }],
       attachments: []
@@ -3375,7 +3379,7 @@ var toAppendMessage = (messages, message) => {
     return message;
   }
   return {
-    parentId: _nullishCoalesce(_nullishCoalesce(message.parentId, () => ( _optionalChain([messages, 'access', _119 => _119.at, 'call', _120 => _120(-1), 'optionalAccess', _121 => _121.id]))), () => ( null)),
+    parentId: _nullishCoalesce(_nullishCoalesce(message.parentId, () => ( _optionalChain([messages2, 'access', _159 => _159.at, 'call', _160 => _160(-1), 'optionalAccess', _161 => _161.id]))), () => ( null)),
     role: _nullishCoalesce(message.role, () => ( "user")),
     content: message.content,
     attachments: _nullishCoalesce(message.attachments, () => ( []))
@@ -3387,14 +3391,12 @@ var getThreadState = (runtime) => {
     threadId: runtime.threadId,
     capabilities: runtime.capabilities,
     isDisabled: runtime.isDisabled,
-    isRunning: _optionalChain([lastMessage, 'optionalAccess', _122 => _122.role]) !== "assistant" ? false : lastMessage.status.type === "running",
+    isRunning: _optionalChain([lastMessage, 'optionalAccess', _162 => _162.role]) !== "assistant" ? false : lastMessage.status.type === "running",
+    messages: runtime.messages,
     unstable_synchronizer: runtime.unstable_synchronizer
   });
 };
-var ThreadRuntime = (_class8 = class {
-  constructor(_threadBinding) {;_class8.prototype.__init18.call(this);
-    this._threadBinding = _threadBinding;
-  }
+var ThreadRuntime = (_class12 = class {
   // public path = "assistant.threads[main]"; // TODO
   /**
    * @deprecated Use `getState().threadId` instead. This will be removed in 0.6.0.
@@ -3420,21 +3422,35 @@ var ThreadRuntime = (_class8 = class {
   get capabilities() {
     return this.getState().capabilities;
   }
-  // TODO this should instead return getMessageByIndex([idx])
+  /**
+   * @deprecated Use `getState().messages` instead. This will be removed in 0.6.0.
+   */
   get messages() {
     return this._threadBinding.getState().messages;
   }
   unstable_getCore() {
     return this._threadBinding.getState();
   }
-  __init18() {this.composer = new ThreadComposerRuntime(
+  
+  constructor(threadBinding) {;_class12.prototype.__init23.call(this);
+    const stateBinding = new LazyMemoizeSubject({
+      getState: () => getThreadState(threadBinding.getState()),
+      subscribe: (callback) => threadBinding.subscribe(callback)
+    });
+    this._threadBinding = {
+      getState: () => threadBinding.getState(),
+      getStateState: () => stateBinding.getState(),
+      subscribe: (callback) => threadBinding.subscribe(callback)
+    };
+  }
+  __init23() {this.composer = new ComposerRuntime(
     new NestedSubscriptionSubject({
       getState: () => this._threadBinding.getState().composer,
       subscribe: (callback) => this._threadBinding.subscribe(callback)
     })
   )}
   getState() {
-    return getThreadState(this._threadBinding.getState());
+    return this._threadBinding.getStateState();
   }
   append(message) {
     this._threadBinding.getState().append(
@@ -3483,6 +3499,18 @@ var ThreadRuntime = (_class8 = class {
   submitFeedback(options) {
     return this._threadBinding.getState().submitFeedback(options);
   }
+  /**
+   * @deprecated This is a temporary API. 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.
+   */
+  beginEdit(messageId) {
+    return this._threadBinding.getState().beginEdit(messageId);
+  }
   export() {
     return this._threadBinding.getState().export();
   }
@@ -3494,15 +3522,15 @@ var ThreadRuntime = (_class8 = class {
     return new MessageRuntime(
       new ShallowMemoizeSubject({
         getState: () => {
-          const messages = this.messages;
-          const message = messages[idx];
+          const messages2 = this.messages;
+          const message = messages2[idx];
           if (!message) return void 0;
           const branches = this._threadBinding.getState().getBranches(message.id);
           return {
             ...message,
             message,
-            isLast: idx === messages.length - 1,
-            parentId: _nullishCoalesce(_optionalChain([messages, 'access', _123 => _123[idx - 1], 'optionalAccess', _124 => _124.id]), () => ( null)),
+            isLast: idx === messages2.length - 1,
+            parentId: _nullishCoalesce(_optionalChain([messages2, 'access', _163 => _163[idx - 1], 'optionalAccess', _164 => _164.id]), () => ( null)),
             branches,
             branchNumber: branches.indexOf(message.id) + 1,
             branchCount: branches.length
@@ -3513,16 +3541,16 @@ var ThreadRuntime = (_class8 = class {
       this._threadBinding
     );
   }
-}, _class8);
+}, _class12);
 
 // src/runtimes/edge/converters/fromLanguageModelMessages.ts
 var fromLanguageModelMessages = (lm, { mergeRoundtrips }) => {
-  const messages = [];
+  const messages2 = [];
   for (const lmMessage of lm) {
     const role = lmMessage.role;
     switch (role) {
       case "system": {
-        messages.push({
+        messages2.push({
           role: "system",
           content: [
             {
@@ -3534,7 +3562,7 @@ var fromLanguageModelMessages = (lm, { mergeRoundtrips }) => {
         break;
       }
       case "user": {
-        messages.push({
+        messages2.push({
           role: "user",
           content: lmMessage.content.map((part) => {
             const type = part.type;
@@ -3577,21 +3605,21 @@ var fromLanguageModelMessages = (lm, { mergeRoundtrips }) => {
           return part;
         });
         if (mergeRoundtrips) {
-          const previousMessage = messages[messages.length - 1];
-          if (_optionalChain([previousMessage, 'optionalAccess', _125 => _125.role]) === "assistant") {
+          const previousMessage = messages2[messages2.length - 1];
+          if (_optionalChain([previousMessage, 'optionalAccess', _165 => _165.role]) === "assistant") {
             previousMessage.content.push(...newContent);
             break;
           }
         }
-        messages.push({
+        messages2.push({
           role: "assistant",
           content: newContent
         });
         break;
       }
       case "tool": {
-        const previousMessage = messages[messages.length - 1];
-        if (_optionalChain([previousMessage, 'optionalAccess', _126 => _126.role]) !== "assistant")
+        const previousMessage = messages2[messages2.length - 1];
+        if (_optionalChain([previousMessage, 'optionalAccess', _166 => _166.role]) !== "assistant")
           throw new Error(
             "A tool message must be preceded by an assistant message."
           );
@@ -3616,7 +3644,7 @@ var fromLanguageModelMessages = (lm, { mergeRoundtrips }) => {
       }
     }
   }
-  return messages;
+  return messages2;
 };
 
 // src/runtimes/edge/converters/fromLanguageModelTools.ts
@@ -3774,7 +3802,7 @@ var EdgeChatAdapter = class {
   constructor(options) {
     this.options = options;
   }
-  async *run({ messages, abortSignal, config }) {
+  async *run({ messages: messages2, abortSignal, config }) {
     const headers = new Headers(this.options.headers);
     headers.set("Content-Type", "application/json");
     const result = await fetch(this.options.api, {
@@ -3783,7 +3811,7 @@ var EdgeChatAdapter = class {
       credentials: _nullishCoalesce(this.options.credentials, () => ( "same-origin")),
       body: JSON.stringify({
         system: config.system,
-        messages: _chunk5KIEXJRKjs.toCoreMessages.call(void 0, messages),
+        messages: _chunk5KIEXJRKjs.toCoreMessages.call(void 0, messages2),
         tools: config.tools ? _chunk5KIEXJRKjs.toLanguageModelTools.call(void 0, config.tools) : [],
         ...config.callSettings,
         ...config.config,
@@ -3820,28 +3848,65 @@ var useEdgeRuntime = ({
 };
 
 // src/runtimes/local/shouldContinue.tsx
-var shouldContinue = (result) => _optionalChain([result, 'access', _127 => _127.status, 'optionalAccess', _128 => _128.type]) === "requires-action" && result.status.reason === "tool-calls" && result.content.every((c) => c.type !== "tool-call" || !!c.result);
+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);
+
+// src/runtimes/composer/DefaultEditComposerRuntimeCore.tsx
+var DefaultEditComposerRuntimeCore = class extends BaseComposerRuntimeCore {
+  constructor(runtime, endEditCallback, { parentId, message }) {
+    super();
+    this.runtime = runtime;
+    this.endEditCallback = endEditCallback;
+    this._parentId = parentId;
+    this._previousText = getThreadMessageText(message);
+    this.setText(this._previousText);
+    this._nonTextParts = message.content.filter(
+      (part) => part.type !== "text" && part.type !== "ui"
+    );
+  }
+  get canCancel() {
+    return true;
+  }
+  
+  
+  
+  async handleSend(message) {
+    const text = getThreadMessageText(message);
+    if (text !== this._previousText) {
+      this.runtime.append({
+        ...message,
+        content: [...message.content, ...this._nonTextParts],
+        parentId: this._parentId
+      });
+    }
+    this.endEditCallback();
+    this.notifySubscribers();
+  }
+  async cancel() {
+    this.endEditCallback();
+    this.notifySubscribers();
+  }
+};
 
 // src/runtimes/local/LocalThreadRuntimeCore.tsx
-var LocalThreadRuntimeCore = (_class9 = class {
-  constructor(configProvider, adapter, { initialMessages, ...options }) {;_class9.prototype.__init19.call(this);_class9.prototype.__init20.call(this);_class9.prototype.__init21.call(this);_class9.prototype.__init22.call(this);_class9.prototype.__init23.call(this);_class9.prototype.__init24.call(this);
+var LocalThreadRuntimeCore = (_class13 = class {
+  constructor(configProvider, adapter, { initialMessages, ...options }) {;_class13.prototype.__init24.call(this);_class13.prototype.__init25.call(this);_class13.prototype.__init26.call(this);_class13.prototype.__init27.call(this);_class13.prototype.__init28.call(this);_class13.prototype.__init29.call(this);_class13.prototype.__init30.call(this);
     this.configProvider = configProvider;
     this.adapter = adapter;
     this.threadId = generateId();
     this.options = options;
     if (initialMessages) {
       let parentId = null;
-      const messages = fromCoreMessages(initialMessages);
-      for (const message of messages) {
+      const messages2 = fromCoreMessages(initialMessages);
+      for (const message of messages2) {
         this.repository.addOrUpdateMessage(parentId, message);
         parentId = message.id;
       }
     }
   }
-  __init19() {this._subscriptions = /* @__PURE__ */ new Set()}
-  __init20() {this.abortController = null}
-  __init21() {this.repository = new MessageRepository()}
-  __init22() {this.capabilities = {
+  __init24() {this._subscriptions = /* @__PURE__ */ new Set()}
+  __init25() {this.abortController = null}
+  __init26() {this.repository = new MessageRepository()}
+  __init27() {this.capabilities = {
     switchToBranch: true,
     edit: true,
     reload: true,
@@ -3852,11 +3917,11 @@ var LocalThreadRuntimeCore = (_class9 = class {
     feedback: false
   }}
   
-  __init23() {this.isDisabled = false}
+  __init28() {this.isDisabled = false}
   get messages() {
     return this.repository.getMessages();
   }
-  __init24() {this.composer = new BaseThreadComposerRuntimeCore(this)}
+  __init29() {this.composer = new DefaultThreadComposerRuntimeCore(this)}
   getModelConfig() {
     return this.configProvider.getModelConfig();
   }
@@ -3867,24 +3932,41 @@ var LocalThreadRuntimeCore = (_class9 = class {
   set options({ initialMessages, ...options }) {
     this._options = options;
     let hasUpdates = false;
-    const canSpeak = _optionalChain([options, 'access', _129 => _129.adapters, 'optionalAccess', _130 => _130.speech]) !== void 0;
+    const canSpeak = _optionalChain([options, 'access', _169 => _169.adapters, 'optionalAccess', _170 => _170.speech]) !== void 0;
     if (this.capabilities.speak !== canSpeak) {
       this.capabilities.speak = canSpeak;
       hasUpdates = true;
     }
-    this.composer.setAttachmentAdapter(_optionalChain([options, 'access', _131 => _131.adapters, 'optionalAccess', _132 => _132.attachments]));
-    const canAttach = _optionalChain([options, 'access', _133 => _133.adapters, 'optionalAccess', _134 => _134.attachments]) !== void 0;
+    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;
     if (this.capabilities.attachments !== canAttach) {
       this.capabilities.attachments = canAttach;
       hasUpdates = true;
     }
-    const canFeedback = _optionalChain([options, 'access', _135 => _135.adapters, 'optionalAccess', _136 => _136.feedback]) !== void 0;
+    const canFeedback = _optionalChain([options, 'access', _175 => _175.adapters, 'optionalAccess', _176 => _176.feedback]) !== void 0;
     if (this.capabilities.feedback !== canFeedback) {
       this.capabilities.feedback = canFeedback;
       hasUpdates = true;
     }
     if (hasUpdates) this.notifySubscribers();
   }
+  __init30() {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();
+  }
   getBranches(messageId) {
     return this.repository.getBranches(messageId);
   }
@@ -3919,19 +4001,19 @@ var LocalThreadRuntimeCore = (_class9 = class {
     } while (shouldContinue(message));
   }
   async performRoundtrip(parentId, message) {
-    const messages = this.repository.getMessages();
-    _optionalChain([this, 'access', _137 => _137.abortController, 'optionalAccess', _138 => _138.abort, 'call', _139 => _139()]);
+    const messages2 = this.repository.getMessages();
+    _optionalChain([this, 'access', _177 => _177.abortController, 'optionalAccess', _178 => _178.abort, 'call', _179 => _179()]);
     this.abortController = new AbortController();
     const initialContent = message.content;
-    const initialRoundtrips = _optionalChain([message, 'access', _140 => _140.metadata, 'optionalAccess', _141 => _141.roundtrips]);
-    const initalCustom = _optionalChain([message, 'access', _142 => _142.metadata, 'optionalAccess', _143 => _143.custom]);
+    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 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', _144 => _144.metadata, 'optionalAccess', _145 => _145.roundtrips]) ? {
+        ..._optionalChain([m, 'access', _184 => _184.metadata, 'optionalAccess', _185 => _185.roundtrips]) ? {
           roundtrips: [
             ..._nullishCoalesce(initialRoundtrips, () => ( [])),
             ...m.metadata.roundtrips
@@ -3946,7 +4028,7 @@ var LocalThreadRuntimeCore = (_class9 = class {
                 ...m.metadata.roundtrips
               ]
             } : void 0,
-            ..._optionalChain([m, 'access', _146 => _146.metadata, 'optionalAccess', _147 => _147.custom]) ? {
+            ..._optionalChain([m, 'access', _186 => _186.metadata, 'optionalAccess', _187 => _187.custom]) ? {
               custom: { ..._nullishCoalesce(initalCustom, () => ( {})), ...m.metadata.custom }
             } : void 0
           }
@@ -3956,7 +4038,7 @@ var LocalThreadRuntimeCore = (_class9 = class {
       this.notifySubscribers();
     };
     const maxToolRoundtrips = _nullishCoalesce(this.options.maxToolRoundtrips, () => ( 1));
-    const toolRoundtrips = _nullishCoalesce(_optionalChain([message, 'access', _148 => _148.metadata, 'optionalAccess', _149 => _149.roundtrips, 'optionalAccess', _150 => _150.length]), () => ( 0));
+    const toolRoundtrips = _nullishCoalesce(_optionalChain([message, 'access', _188 => _188.metadata, 'optionalAccess', _189 => _189.roundtrips, 'optionalAccess', _190 => _190.length]), () => ( 0));
     if (toolRoundtrips > maxToolRoundtrips) {
       updateMessage({
         status: {
@@ -3974,7 +4056,7 @@ var LocalThreadRuntimeCore = (_class9 = class {
     }
     try {
       const promiseOrGenerator = this.adapter.run({
-        messages,
+        messages: messages2,
         abortSignal: this.abortController.signal,
         config: this.configProvider.getModelConfig(),
         onUpdate: updateMessage
@@ -4055,7 +4137,7 @@ var LocalThreadRuntimeCore = (_class9 = class {
   // TODO lift utterance state to thread runtime
   
   speak(messageId) {
-    const adapter = _optionalChain([this, 'access', _151 => _151.options, 'access', _152 => _152.adapters, 'optionalAccess', _153 => _153.speech]);
+    const adapter = _optionalChain([this, 'access', _191 => _191.options, 'access', _192 => _192.adapters, 'optionalAccess', _193 => _193.speech]);
     if (!adapter) throw new Error("Speech adapter not configured");
     const { message } = this.repository.getMessage(messageId);
     if (this._utterance) {
@@ -4072,7 +4154,7 @@ var LocalThreadRuntimeCore = (_class9 = class {
     return this._utterance;
   }
   submitFeedback({ messageId, type }) {
-    const adapter = _optionalChain([this, 'access', _154 => _154.options, 'access', _155 => _155.adapters, 'optionalAccess', _156 => _156.feedback]);
+    const adapter = _optionalChain([this, 'access', _194 => _194.options, 'access', _195 => _195.adapters, 'optionalAccess', _196 => _196.feedback]);
     if (!adapter) throw new Error("Feedback adapter not configured");
     const { message } = this.repository.getMessage(messageId);
     adapter.submit({ message, type });
@@ -4084,7 +4166,7 @@ var LocalThreadRuntimeCore = (_class9 = class {
     this.repository.import(data);
     this.notifySubscribers();
   }
-}, _class9);
+}, _class13);
 
 // src/runtimes/local/LocalRuntimeCore.tsx
 var LocalRuntimeCore = class extends BaseAssistantRuntimeCore {
@@ -4116,10 +4198,10 @@ var LocalRuntimeCore = class extends BaseAssistantRuntimeCore {
   } = {}) {
     this.switchToThread(null);
     if (!initialMessages) return;
-    const messages = fromCoreMessages(initialMessages);
+    const messages2 = fromCoreMessages(initialMessages);
     this.thread.import({
-      messages: messages.map((m, idx) => ({
-        parentId: _nullishCoalesce(_optionalChain([messages, 'access', _157 => _157[idx - 1], 'optionalAccess', _158 => _158.id]), () => ( null)),
+      messages: messages2.map((m, idx) => ({
+        parentId: _nullishCoalesce(_optionalChain([messages2, 'access', _197 => _197[idx - 1], 'optionalAccess', _198 => _198.id]), () => ( null)),
         message: m
       }))
     });
@@ -4155,17 +4237,17 @@ var getExternalStoreMessage = (message) => {
 };
 
 // src/runtimes/external-store/ThreadMessageConverter.ts
-var ThreadMessageConverter = (_class10 = class {constructor() { _class10.prototype.__init25.call(this); }
-  __init25() {this.cache = /* @__PURE__ */ new WeakMap()}
-  convertMessages(messages, converter) {
-    return messages.map((m, idx) => {
+var ThreadMessageConverter = (_class14 = class {constructor() { _class14.prototype.__init31.call(this); }
+  __init31() {this.cache = /* @__PURE__ */ new WeakMap()}
+  convertMessages(messages2, converter) {
+    return messages2.map((m, idx) => {
       const cached = this.cache.get(m);
       const newMessage = converter(cached, m, idx);
       this.cache.set(m, newMessage);
       return newMessage;
     });
   }
-}, _class10);
+}, _class14);
 
 // src/runtimes/external-store/auto-status.tsx
 var AUTO_STATUS_RUNNING = Object.freeze({ type: "running" });
@@ -4251,18 +4333,18 @@ var fromThreadMessageLike = (like, fallbackId, fallbackStatus) => {
 };
 
 // src/runtimes/external-store/ExternalStoreThreadRuntimeCore.tsx
-var hasUpcomingMessage = (isRunning, messages) => {
-  return isRunning && _optionalChain([messages, 'access', _159 => _159[messages.length - 1], 'optionalAccess', _160 => _160.role]) !== "assistant";
+var hasUpcomingMessage = (isRunning, messages2) => {
+  return isRunning && _optionalChain([messages2, 'access', _199 => _199[messages2.length - 1], 'optionalAccess', _200 => _200.role]) !== "assistant";
 };
-var ExternalStoreThreadRuntimeCore = (_class11 = class {
-  constructor(configProvider, store) {;_class11.prototype.__init26.call(this);_class11.prototype.__init27.call(this);_class11.prototype.__init28.call(this);_class11.prototype.__init29.call(this);_class11.prototype.__init30.call(this);_class11.prototype.__init31.call(this);_class11.prototype.__init32.call(this);
+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);
     this.configProvider = configProvider;
     this.store = store;
   }
-  __init26() {this._subscriptions = /* @__PURE__ */ new Set()}
-  __init27() {this.repository = new MessageRepository()}
-  __init28() {this.assistantOptimisticId = null}
-  __init29() {this._capabilities = {
+  __init32() {this._subscriptions = /* @__PURE__ */ new Set()}
+  __init33() {this.repository = new MessageRepository()}
+  __init34() {this.assistantOptimisticId = null}
+  __init35() {this._capabilities = {
     switchToBranch: false,
     edit: false,
     reload: false,
@@ -4278,9 +4360,26 @@ var ExternalStoreThreadRuntimeCore = (_class11 = class {
   
   
   
-  __init30() {this.converter = new ThreadMessageConverter()}
+  __init36() {this.converter = new ThreadMessageConverter()}
   
-  __init31() {this.composer = new BaseThreadComposerRuntimeCore(this)}
+  __init37() {this.composer = new DefaultThreadComposerRuntimeCore(this)}
+  __init38() {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();
+  }
   get store() {
     return this._store;
   }
@@ -4297,12 +4396,12 @@ var ExternalStoreThreadRuntimeCore = (_class11 = class {
       reload: this._store.onReload !== void 0,
       cancel: this._store.onCancel !== void 0,
       speak: this._store.onSpeak !== void 0,
-      unstable_copy: _optionalChain([this, 'access', _164 => _164._store, 'access', _165 => _165.unstable_capabilities, 'optionalAccess', _166 => _166.copy]) !== false,
+      unstable_copy: _optionalChain([this, 'access', _204 => _204._store, 'access', _205 => _205.unstable_capabilities, 'optionalAccess', _206 => _206.copy]) !== false,
       // default true
-      attachments: !!_optionalChain([this, 'access', _167 => _167.store, 'access', _168 => _168.adapters, 'optionalAccess', _169 => _169.attachments]),
-      feedback: !!_optionalChain([this, 'access', _170 => _170.store, 'access', _171 => _171.adapters, 'optionalAccess', _172 => _172.feedback])
+      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])
     };
-    this.composer.setAttachmentAdapter(_optionalChain([this, 'access', _173 => _173._store, 'access', _174 => _174.adapters, 'optionalAccess', _175 => _175.attachments]));
+    this.composer.setAttachmentAdapter(_optionalChain([this, 'access', _213 => _213._store, 'access', _214 => _214.adapters, 'optionalAccess', _215 => _215.attachments]));
     if (oldStore) {
       if (oldStore.convertMessage !== store.convertMessage) {
         this.converter = new ThreadMessageConverter();
@@ -4311,7 +4410,7 @@ var ExternalStoreThreadRuntimeCore = (_class11 = class {
         return;
       }
     }
-    const messages = !store.convertMessage ? store.messages : this.converter.convertMessages(store.messages, (cache, m, idx) => {
+    const messages2 = !store.convertMessage ? store.messages : this.converter.convertMessages(store.messages, (cache, m, idx) => {
       if (!store.convertMessage) return m;
       const isLast = idx === store.messages.length - 1;
       const autoStatus = getAutoStatus(isLast, isRunning);
@@ -4325,18 +4424,18 @@ var ExternalStoreThreadRuntimeCore = (_class11 = class {
       newMessage[symbolInnerMessage] = m;
       return newMessage;
     });
-    for (let i = 0; i < messages.length; i++) {
-      const message = messages[i];
-      const parent = messages[i - 1];
-      this.repository.addOrUpdateMessage(_nullishCoalesce(_optionalChain([parent, 'optionalAccess', _176 => _176.id]), () => ( null)), message);
+    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);
     }
     if (this.assistantOptimisticId) {
       this.repository.deleteMessage(this.assistantOptimisticId);
       this.assistantOptimisticId = null;
     }
-    if (hasUpcomingMessage(isRunning, messages)) {
+    if (hasUpcomingMessage(isRunning, messages2)) {
       this.assistantOptimisticId = this.repository.appendOptimisticMessage(
-        _nullishCoalesce(_optionalChain([messages, 'access', _177 => _177.at, 'call', _178 => _178(-1), 'optionalAccess', _179 => _179.id]), () => ( null)),
+        _nullishCoalesce(_optionalChain([messages2, 'access', _217 => _217.at, 'call', _218 => _218(-1), 'optionalAccess', _219 => _219.id]), () => ( null)),
         {
           role: "assistant",
           content: []
@@ -4344,7 +4443,7 @@ var ExternalStoreThreadRuntimeCore = (_class11 = class {
       );
     }
     this.repository.resetHead(
-      _nullishCoalesce(_nullishCoalesce(this.assistantOptimisticId, () => ( _optionalChain([messages, 'access', _180 => _180.at, 'call', _181 => _181(-1), 'optionalAccess', _182 => _182.id]))), () => ( null))
+      _nullishCoalesce(_nullishCoalesce(this.assistantOptimisticId, () => ( _optionalChain([messages2, 'access', _220 => _220.at, 'call', _221 => _221(-1), 'optionalAccess', _222 => _222.id]))), () => ( null))
     );
     this.messages = this.repository.getMessages();
     this.notifySubscribers();
@@ -4365,7 +4464,7 @@ var ExternalStoreThreadRuntimeCore = (_class11 = class {
     this.updateMessages(this.repository.getMessages());
   }
   async append(message) {
-    if (message.parentId !== (_nullishCoalesce(_optionalChain([this, 'access', _183 => _183.messages, 'access', _184 => _184.at, 'call', _185 => _185(-1), 'optionalAccess', _186 => _186.id]), () => ( null)))) {
+    if (message.parentId !== (_nullishCoalesce(_optionalChain([this, 'access', _223 => _223.messages, 'access', _224 => _224.at, 'call', _225 => _225(-1), 'optionalAccess', _226 => _226.id]), () => ( null)))) {
       if (!this._store.onEdit)
         throw new Error("Runtime does not support editing messages.");
       await this._store.onEdit(message);
@@ -4386,19 +4485,19 @@ var ExternalStoreThreadRuntimeCore = (_class11 = class {
       this.repository.deleteMessage(this.assistantOptimisticId);
       this.assistantOptimisticId = null;
     }
-    let messages = this.repository.getMessages();
-    const previousMessage = messages[messages.length - 1];
-    if (_optionalChain([previousMessage, 'optionalAccess', _187 => _187.role]) === "user" && previousMessage.id === _optionalChain([messages, 'access', _188 => _188.at, 'call', _189 => _189(-1), 'optionalAccess', _190 => _190.id])) {
+    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])) {
       this.repository.deleteMessage(previousMessage.id);
       if (!this.composer.text.trim()) {
         this.composer.setText(getThreadMessageText(previousMessage));
       }
-      messages = this.repository.getMessages();
+      messages2 = this.repository.getMessages();
     } else {
       this.notifySubscribers();
     }
     setTimeout(() => {
-      this.updateMessages(messages);
+      this.updateMessages(messages2);
     }, 0);
   }
   addToolResult(options) {
@@ -4413,7 +4512,7 @@ var ExternalStoreThreadRuntimeCore = (_class11 = class {
     return this._store.onSpeak(message);
   }
   submitFeedback({ messageId, type }) {
-    const adapter = _optionalChain([this, 'access', _191 => _191._store, 'access', _192 => _192.adapters, 'optionalAccess', _193 => _193.feedback]);
+    const adapter = _optionalChain([this, 'access', _231 => _231._store, 'access', _232 => _232.adapters, 'optionalAccess', _233 => _233.feedback]);
     if (!adapter) throw new Error("Feedback adapter not configured");
     const { message } = this.repository.getMessage(messageId);
     adapter.submit({ message, type });
@@ -4422,9 +4521,9 @@ var ExternalStoreThreadRuntimeCore = (_class11 = class {
     this._subscriptions.add(callback);
     return () => this._subscriptions.delete(callback);
   }
-  __init32() {this.updateMessages = (messages) => {
-    _optionalChain([this, 'access', _194 => _194._store, 'access', _195 => _195.setMessages, 'optionalCall', _196 => _196(
-      messages.flatMap(getExternalStoreMessage).filter((m) => m != null)
+  __init39() {this.updateMessages = (messages2) => {
+    _optionalChain([this, 'access', _234 => _234._store, 'access', _235 => _235.setMessages, 'optionalCall', _236 => _236(
+      messages2.flatMap(getExternalStoreMessage).filter((m) => m != null)
     )]);
   }}
   import(repository) {
@@ -4433,7 +4532,7 @@ var ExternalStoreThreadRuntimeCore = (_class11 = class {
   export() {
     return this.repository.export();
   }
-}, _class11);
+}, _class15);
 
 // src/runtimes/external-store/ExternalStoreRuntimeCore.tsx
 var ExternalStoreRuntimeCore = class extends BaseAssistantRuntimeCore {
@@ -4491,12 +4590,12 @@ var useExternalStoreRuntime = (store) => {
 
 // src/runtimes/external-store/external-message-converter.tsx
 
-var joinExternalMessages = (messages) => {
+var joinExternalMessages = (messages2) => {
   const assistantMessage = {
     role: "assistant",
     content: []
   };
-  for (const output of messages) {
+  for (const output of messages2) {
     if (output.role === "tool") {
       const toolCallIdx = assistantMessage.content.findIndex(
         (c) => c.type === "tool-call" && c.toolCallId === output.toolCallId
@@ -4573,7 +4672,7 @@ var chunkExternalMessages = (callbackResults) => {
 };
 var useExternalMessageConverter = ({
   callback,
-  messages,
+  messages: messages2,
   isRunning
 }) => {
   const state = _react.useMemo.call(void 0, 
@@ -4587,7 +4686,7 @@ var useExternalMessageConverter = ({
   );
   return _react.useMemo.call(void 0, () => {
     const callbackResults = [];
-    for (const message of messages) {
+    for (const message of messages2) {
       let result = state.callbackCache.get(message);
       if (!result) {
         const output = state.callback(message);
@@ -4625,7 +4724,7 @@ var useExternalMessageConverter = ({
         return newMessage;
       }
     );
-  }, [state, messages, isRunning]);
+  }, [state, messages2, isRunning]);
 };
 var shallowArrayEqual = (a, b) => {
   if (a.length !== b.length) return false;
@@ -4643,13 +4742,13 @@ var DangerousInBrowserAdapter = class {
   constructor(options) {
     this.options = options;
   }
-  async *run({ messages, abortSignal, config }) {
+  async *run({ messages: messages2, abortSignal, config }) {
     const res = await _chunk5KIEXJRKjs.getEdgeRuntimeStream.call(void 0, {
       options: this.options,
       abortSignal,
       requestData: {
         system: config.system,
-        messages: _chunk5KIEXJRKjs.toCoreMessages.call(void 0, messages),
+        messages: _chunk5KIEXJRKjs.toCoreMessages.call(void 0, messages2),
         tools: config.tools ? _chunk5KIEXJRKjs.toLanguageModelTools.call(void 0, config.tools) : [],
         ...config.callSettings,
         ...config.config
@@ -4713,8 +4812,8 @@ var WebSpeechSynthesisAdapter = class {
 };
 
 // src/runtimes/attachment/SimpleImageAttachmentAdapter.ts
-var SimpleImageAttachmentAdapter = (_class12 = class {constructor() { _class12.prototype.__init33.call(this); }
-  __init33() {this.accept = "image/*"}
+var SimpleImageAttachmentAdapter = (_class16 = class {constructor() { _class16.prototype.__init40.call(this); }
+  __init40() {this.accept = "image/*"}
   async add(state) {
     return {
       id: state.file.name,
@@ -4736,7 +4835,7 @@ var SimpleImageAttachmentAdapter = (_class12 = class {constructor() { _class12.p
   }
   async remove() {
   }
-}, _class12);
+}, _class16);
 var getFileDataURL = (file) => new Promise((resolve, reject) => {
   const reader = new FileReader();
   reader.onload = () => resolve(reader.result);
@@ -4745,8 +4844,8 @@ var getFileDataURL = (file) => new Promise((resolve, reject) => {
 });
 
 // src/runtimes/attachment/SimpleTextAttachmentAdapter.ts
-var SimpleTextAttachmentAdapter = (_class13 = class {constructor() { _class13.prototype.__init34.call(this); }
-  __init34() {this.accept = "text/plain,text/html,text/markdown,text/csv,text/xml,text/json,text/css"}
+var SimpleTextAttachmentAdapter = (_class17 = class {constructor() { _class17.prototype.__init41.call(this); }
+  __init41() {this.accept = "text/plain,text/html,text/markdown,text/csv,text/xml,text/json,text/css"}
   async add(state) {
     return {
       id: state.file.name,
@@ -4770,7 +4869,7 @@ ${await getFileText(attachment.file)}
   }
   async remove() {
   }
-}, _class13);
+}, _class17);
 var getFileText = (file) => new Promise((resolve, reject) => {
   const reader = new FileReader();
   reader.onload = () => resolve(reader.result);
@@ -4864,7 +4963,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', _197 => _197.runtime])) return configProvider;
+  if (!_optionalChain([config, 'optionalAccess', _237 => _237.runtime])) return configProvider;
   if (hasAssistant) {
     throw new Error(
       "You provided a runtime to <Thread> while simulataneously using <AssistantRuntimeProvider>. This is not allowed."
@@ -5192,7 +5291,7 @@ var AssistantMessageContent = _react.forwardRef.call(void 0, ({ components: comp
     {
       components: {
         ...componentsProp,
-        Text: _nullishCoalesce(_nullishCoalesce(_optionalChain([componentsProp, 'optionalAccess', _198 => _198.Text]), () => ( components.Text)), () => ( content_part_default.Text)),
+        Text: _nullishCoalesce(_nullishCoalesce(_optionalChain([componentsProp, 'optionalAccess', _238 => _238.Text]), () => ( components.Text)), () => ( content_part_default.Text)),
         tools: toolsComponents
       }
     }
@@ -5335,7 +5434,7 @@ var ComposerAttachments = ({ components }) => {
     {
       components: {
         ...components,
-        Attachment: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _199 => _199.Attachment]), () => ( composer_attachment_default))
+        Attachment: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _239 => _239.Attachment]), () => ( composer_attachment_default))
       }
     }
   ) });
@@ -5467,7 +5566,7 @@ var ThreadWelcomeSuggestion = ({
 };
 var ThreadWelcomeSuggestions = () => {
   const { welcome: { suggestions } = {} } = useThreadConfig();
-  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ThreadWelcomeSuggestionContainer, { children: _optionalChain([suggestions, 'optionalAccess', _200 => _200.map, 'call', _201 => _201((suggestion, idx) => {
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ThreadWelcomeSuggestionContainer, { children: _optionalChain([suggestions, 'optionalAccess', _240 => _240.map, 'call', _241 => _241((suggestion, idx) => {
     const key = `${suggestion.prompt}-${idx}`;
     return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ThreadWelcomeSuggestion, { suggestion }, key);
   })]) });
@@ -5566,7 +5665,7 @@ var UserMessageContent = _react.forwardRef.call(void 0,
       {
         components: {
           ...components,
-          Text: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _202 => _202.Text]), () => ( content_part_default.Text))
+          Text: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _242 => _242.Text]), () => ( content_part_default.Text))
         }
       }
     ) });
@@ -5584,7 +5683,7 @@ var UserMessageAttachments = ({
     {
       components: {
         ...components,
-        Attachment: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _203 => _203.Attachment]), () => ( user_message_attachment_default))
+        Attachment: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _243 => _243.Attachment]), () => ( user_message_attachment_default))
       }
     }
   ) }) });
@@ -5685,10 +5784,10 @@ var ThreadMessages = ({ components, ...rest }) => {
     thread_exports.Messages,
     {
       components: {
-        UserMessage: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _204 => _204.UserMessage]), () => ( user_message_default)),
-        EditComposer: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _205 => _205.EditComposer]), () => ( edit_composer_default)),
-        AssistantMessage: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _206 => _206.AssistantMessage]), () => ( assistant_message_default)),
-        SystemMessage: _nullishCoalesce(_optionalChain([components, 'optionalAccess', _207 => _207.SystemMessage]), () => ( SystemMessage))
+        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))
       },
       ...rest
     }
@@ -5908,5 +6007,7 @@ var assistant_modal_default = Object.assign(AssistantModal, exports13);
 
 
 
-exports.ActionBarPrimitive = actionBar_exports; exports.AssistantActionBar = assistant_action_bar_default; exports.AssistantMessage = assistant_message_default; exports.AssistantModal = assistant_modal_default; exports.AssistantModalPrimitive = assistantModal_exports; exports.AssistantRuntimeProvider = AssistantRuntimeProvider; exports.BranchPicker = branch_picker_default; exports.BranchPickerPrimitive = branchPicker_exports; exports.Composer = composer_default; exports.ComposerAttachment = composer_attachment_default; exports.ComposerPrimitive = composer_exports; exports.CompositeAttachmentAdapter = CompositeAttachmentAdapter; exports.ContentPart = content_part_default; exports.ContentPartPrimitive = contentPart_exports; exports.EdgeChatAdapter = EdgeChatAdapter; exports.EditComposer = edit_composer_default; exports.INTERNAL = internal_exports; exports.MessagePrimitive = message_exports; exports.SimpleImageAttachmentAdapter = SimpleImageAttachmentAdapter; exports.SimpleTextAttachmentAdapter = SimpleTextAttachmentAdapter; exports.TextContentPartProvider = TextContentPartProvider; exports.Thread = thread_default; exports.ThreadConfigProvider = ThreadConfigProvider; exports.ThreadPrimitive = thread_exports; exports.ThreadWelcome = thread_welcome_default; exports.UserActionBar = user_action_bar_default; exports.UserMessage = user_message_default; exports.UserMessageAttachment = user_message_attachment_default; exports.WebSpeechSynthesisAdapter = WebSpeechSynthesisAdapter; exports.fromCoreMessage = fromCoreMessage; exports.fromCoreMessages = fromCoreMessages; exports.fromLanguageModelMessages = fromLanguageModelMessages; exports.fromLanguageModelTools = fromLanguageModelTools; exports.getExternalStoreMessage = getExternalStoreMessage; exports.makeAssistantTool = makeAssistantTool; exports.makeAssistantToolUI = makeAssistantToolUI; exports.streamUtils = streamUtils; exports.subscribeToMainThread = subscribeToMainThread; exports.toCoreMessage = _chunk5KIEXJRKjs.toCoreMessage; exports.toCoreMessages = _chunk5KIEXJRKjs.toCoreMessages; exports.toLanguageModelMessages = _chunk5KIEXJRKjs.toLanguageModelMessages; exports.toLanguageModelTools = _chunk5KIEXJRKjs.toLanguageModelTools; exports.useActionBarCopy = useActionBarCopy; exports.useActionBarEdit = useActionBarEdit; exports.useActionBarFeedbackNegative = useActionBarFeedbackNegative; exports.useActionBarFeedbackPositive = useActionBarFeedbackPositive; exports.useActionBarReload = useActionBarReload; exports.useActionBarSpeak = useActionBarSpeak; exports.useActionBarStopSpeaking = useActionBarStopSpeaking; exports.useAppendMessage = useAppendMessage; exports.useAssistantActions = useAssistantActions; exports.useAssistantActionsStore = useAssistantActionsStore; exports.useAssistantContext = useAssistantContext; exports.useAssistantInstructions = useAssistantInstructions; exports.useAssistantRuntime = useAssistantRuntime; exports.useAssistantRuntimeStore = useAssistantRuntimeStore; exports.useAssistantTool = useAssistantTool; exports.useAssistantToolUI = useAssistantToolUI; exports.useBranchPickerCount = useBranchPickerCount; exports.useBranchPickerNext = useBranchPickerNext; exports.useBranchPickerNumber = useBranchPickerNumber; exports.useBranchPickerPrevious = useBranchPickerPrevious; exports.useComposer = useComposer; exports.useComposerAddAttachment = useComposerAddAttachment; exports.useComposerCancel = useComposerCancel; exports.useComposerContext = useComposerContext; exports.useComposerIf = useComposerIf; exports.useComposerSend = useComposerSend; exports.useComposerStore = useComposerStore; exports.useContentPart = useContentPart; exports.useContentPartContext = useContentPartContext; exports.useContentPartDisplay = useContentPartDisplay; exports.useContentPartImage = useContentPartImage; exports.useContentPartStore = useContentPartStore; exports.useContentPartText = useContentPartText; exports.useDangerousInBrowserRuntime = useDangerousInBrowserRuntime; exports.useEdgeRuntime = useEdgeRuntime; exports.useEditComposer = useEditComposer; exports.useEditComposerStore = useEditComposerStore; exports.useExternalMessageConverter = useExternalMessageConverter; exports.useExternalStoreRuntime = useExternalStoreRuntime; exports.useLocalRuntime = useLocalRuntime; exports.useMessage = useMessage; exports.useMessageContext = useMessageContext; exports.useMessageIf = useMessageIf; exports.useMessageRuntime = useMessageRuntime; exports.useMessageStore = useMessageStore; exports.useMessageUtils = useMessageUtils; exports.useMessageUtilsStore = useMessageUtilsStore; exports.useSwitchToNewThread = useSwitchToNewThread; exports.useThread = useThread; exports.useThreadActions = useThreadActions; exports.useThreadActionsStore = useThreadActionsStore; exports.useThreadComposer = useThreadComposer; exports.useThreadComposerStore = useThreadComposerStore; exports.useThreadConfig = useThreadConfig; exports.useThreadContext = useThreadContext; exports.useThreadEmpty = useThreadEmpty; exports.useThreadIf = useThreadIf; exports.useThreadMessages = useThreadMessages; exports.useThreadMessagesStore = useThreadMessagesStore; exports.useThreadRuntime = useThreadRuntime; exports.useThreadRuntimeStore = useThreadRuntimeStore; exports.useThreadScrollToBottom = useThreadScrollToBottom; exports.useThreadStore = useThreadStore; exports.useThreadSuggestion = useThreadSuggestion; exports.useThreadViewport = useThreadViewport; exports.useThreadViewportStore = useThreadViewportStore; exports.useToolUIs = useToolUIs; exports.useToolUIsStore = useToolUIsStore;
+
+
+exports.ActionBarPrimitive = actionBar_exports; exports.AssistantActionBar = assistant_action_bar_default; exports.AssistantMessage = assistant_message_default; exports.AssistantModal = assistant_modal_default; exports.AssistantModalPrimitive = assistantModal_exports; exports.AssistantRuntimeProvider = AssistantRuntimeProvider; exports.BranchPicker = branch_picker_default; exports.BranchPickerPrimitive = branchPicker_exports; exports.Composer = composer_default; exports.ComposerAttachment = composer_attachment_default; exports.ComposerPrimitive = composer_exports; exports.CompositeAttachmentAdapter = CompositeAttachmentAdapter; exports.ContentPart = content_part_default; exports.ContentPartPrimitive = contentPart_exports; exports.EdgeChatAdapter = EdgeChatAdapter; exports.EditComposer = edit_composer_default; exports.INTERNAL = internal_exports; exports.MessagePrimitive = message_exports; exports.SimpleImageAttachmentAdapter = SimpleImageAttachmentAdapter; exports.SimpleTextAttachmentAdapter = SimpleTextAttachmentAdapter; exports.TextContentPartProvider = TextContentPartProvider; exports.Thread = thread_default; exports.ThreadConfigProvider = ThreadConfigProvider; exports.ThreadPrimitive = thread_exports; exports.ThreadWelcome = thread_welcome_default; exports.UserActionBar = user_action_bar_default; exports.UserMessage = user_message_default; exports.UserMessageAttachment = user_message_attachment_default; exports.WebSpeechSynthesisAdapter = WebSpeechSynthesisAdapter; exports.fromCoreMessage = fromCoreMessage; exports.fromCoreMessages = fromCoreMessages; exports.fromLanguageModelMessages = fromLanguageModelMessages; exports.fromLanguageModelTools = fromLanguageModelTools; exports.getExternalStoreMessage = getExternalStoreMessage; exports.makeAssistantTool = makeAssistantTool; exports.makeAssistantToolUI = makeAssistantToolUI; exports.streamUtils = streamUtils; exports.subscribeToMainThread = subscribeToMainThread; exports.toCoreMessage = _chunk5KIEXJRKjs.toCoreMessage; exports.toCoreMessages = _chunk5KIEXJRKjs.toCoreMessages; exports.toLanguageModelMessages = _chunk5KIEXJRKjs.toLanguageModelMessages; exports.toLanguageModelTools = _chunk5KIEXJRKjs.toLanguageModelTools; exports.useActionBarCopy = useActionBarCopy; exports.useActionBarEdit = useActionBarEdit; exports.useActionBarFeedbackNegative = useActionBarFeedbackNegative; exports.useActionBarFeedbackPositive = useActionBarFeedbackPositive; exports.useActionBarReload = useActionBarReload; exports.useActionBarSpeak = useActionBarSpeak; exports.useActionBarStopSpeaking = useActionBarStopSpeaking; exports.useAppendMessage = useAppendMessage; exports.useAssistantActions = useAssistantActions; exports.useAssistantActionsStore = useAssistantActionsStore; exports.useAssistantContext = useAssistantContext; exports.useAssistantInstructions = useAssistantInstructions; exports.useAssistantRuntime = useAssistantRuntime; exports.useAssistantRuntimeStore = useAssistantRuntimeStore; exports.useAssistantTool = useAssistantTool; exports.useAssistantToolUI = useAssistantToolUI; exports.useBranchPickerCount = useBranchPickerCount; exports.useBranchPickerNext = useBranchPickerNext; exports.useBranchPickerNumber = useBranchPickerNumber; exports.useBranchPickerPrevious = useBranchPickerPrevious; exports.useComposer = useComposer; exports.useComposerAddAttachment = useComposerAddAttachment; exports.useComposerCancel = useComposerCancel; exports.useComposerContext = useComposerContext; exports.useComposerIf = useComposerIf; exports.useComposerRuntime = useComposerRuntime; exports.useComposerSend = useComposerSend; exports.useComposerStore = useComposerStore; exports.useContentPart = useContentPart; exports.useContentPartContext = useContentPartContext; exports.useContentPartDisplay = useContentPartDisplay; exports.useContentPartImage = useContentPartImage; exports.useContentPartRuntime = useContentPartRuntime; exports.useContentPartStore = useContentPartStore; exports.useContentPartText = useContentPartText; exports.useDangerousInBrowserRuntime = useDangerousInBrowserRuntime; exports.useEdgeRuntime = useEdgeRuntime; exports.useEditComposer = useEditComposer; exports.useEditComposerStore = useEditComposerStore; exports.useExternalMessageConverter = useExternalMessageConverter; exports.useExternalStoreRuntime = useExternalStoreRuntime; exports.useLocalRuntime = useLocalRuntime; exports.useMessage = useMessage; exports.useMessageContext = useMessageContext; exports.useMessageIf = useMessageIf; exports.useMessageRuntime = useMessageRuntime; exports.useMessageStore = useMessageStore; exports.useMessageUtils = useMessageUtils; exports.useMessageUtilsStore = useMessageUtilsStore; exports.useSwitchToNewThread = useSwitchToNewThread; exports.useThread = useThread; exports.useThreadActions = useThreadActions; exports.useThreadActionsStore = useThreadActionsStore; exports.useThreadComposer = useThreadComposer; exports.useThreadComposerStore = useThreadComposerStore; exports.useThreadConfig = useThreadConfig; exports.useThreadContext = useThreadContext; exports.useThreadEmpty = useThreadEmpty; exports.useThreadIf = useThreadIf; exports.useThreadMessages = useThreadMessages; exports.useThreadMessagesStore = useThreadMessagesStore; exports.useThreadRuntime = useThreadRuntime; exports.useThreadRuntimeStore = useThreadRuntimeStore; exports.useThreadScrollToBottom = useThreadScrollToBottom; exports.useThreadStore = useThreadStore; exports.useThreadSuggestion = useThreadSuggestion; exports.useThreadViewport = useThreadViewport; exports.useThreadViewportStore = useThreadViewportStore; exports.useToolUIs = useToolUIs; exports.useToolUIsStore = useToolUIsStore;
 //# sourceMappingURL=index.js.map