@assistant-ui/react 0.5.77 → 0.5.78

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; var _class14; var _class15; var _class16; var _class17; var _class18;
+"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;
 
 
 
@@ -411,15 +411,11 @@ function useComposerRuntime(options) {
 
 var useAppendMessage = () => {
   const threadRuntime = useThreadRuntime();
-  const threadViewportStore = useThreadViewportStore();
-  const threadComposerStore = useThreadComposerStore();
   const append = _react.useCallback.call(void 0, 
     (message) => {
       threadRuntime.append(message);
-      threadViewportStore.getState().scrollToBottom();
-      threadComposerStore.getState().focus();
     },
-    [threadRuntime, threadViewportStore, threadComposerStore]
+    [threadRuntime]
   );
   return append;
 };
@@ -428,11 +424,9 @@ var useAppendMessage = () => {
 
 var useSwitchToNewThread = () => {
   const assistantRuntime = useAssistantRuntime();
-  const threadComposerStore = useThreadComposerStore();
   const switchToNewThread = _react.useCallback.call(void 0, () => {
     assistantRuntime.switchToNewThread();
-    threadComposerStore.getState().focus();
-  }, [assistantRuntime, threadComposerStore]);
+  }, [assistantRuntime]);
   return switchToNewThread;
 };
 
@@ -545,25 +539,25 @@ var getThreadMessageText = (message) => {
 var useActionBarCopy = ({
   copiedDuration = 3e3
 } = {}) => {
-  const messageStore = useMessageStore();
+  const messageRuntime = useMessageRuntime();
+  const composerRuntime = useComposerRuntime();
   const messageUtilsStore = useMessageUtilsStore();
-  const editComposerStore = useEditComposerStore();
   const hasCopyableContent = useCombinedStore(
-    [messageStore, editComposerStore],
+    [messageRuntime, composerRuntime],
     (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, () => {
-    const message = messageStore.getState();
+    const message = messageRuntime.getState();
     const { setIsCopied } = messageUtilsStore.getState();
-    const { isEditing, text: composerValue } = editComposerStore.getState();
+    const { isEditing, text: composerValue } = composerRuntime.getState();
     const valueToCopy = isEditing ? composerValue : getThreadMessageText(message);
     navigator.clipboard.writeText(valueToCopy).then(() => {
       setIsCopied(true);
       setTimeout(() => setIsCopied(false), copiedDuration);
     });
-  }, [messageStore, messageUtilsStore, editComposerStore, copiedDuration]);
+  }, [messageRuntime, messageUtilsStore, composerRuntime, copiedDuration]);
   if (!hasCopyableContent) return null;
   return callback;
 };
@@ -583,20 +577,15 @@ var useActionBarEdit = () => {
 // src/primitive-hooks/actionBar/useActionBarReload.tsx
 
 var useActionBarReload = () => {
-  const messageStore = useMessageStore();
-  const threadStore = useThreadStore();
   const messageRuntime = useMessageRuntime();
-  const threadComposerStore = useThreadComposerStore();
-  const threadViewportStore = useThreadViewportStore();
+  const threadRuntime = useThreadRuntime();
   const disabled = useCombinedStore(
-    [threadStore, messageStore],
+    [threadRuntime, messageRuntime],
     (t, m) => t.isRunning || t.isDisabled || m.role !== "assistant"
   );
   const callback = _react.useCallback.call(void 0, () => {
     messageRuntime.reload();
-    threadViewportStore.getState().scrollToBottom();
-    threadComposerStore.getState().focus();
-  }, [messageRuntime, threadComposerStore, threadViewportStore]);
+  }, [messageRuntime]);
   if (disabled) return null;
   return callback;
 };
@@ -686,12 +675,11 @@ var useBranchPickerPrevious = () => {
 // src/primitive-hooks/composer/useComposerCancel.tsx
 
 var useComposerCancel = () => {
-  const composerStore = useComposerStore();
+  const composerRuntime = useComposerRuntime();
   const disabled = useComposer((c) => !c.canCancel);
   const callback = _react.useCallback.call(void 0, () => {
-    const { cancel } = composerStore.getState();
-    cancel();
-  }, [composerStore]);
+    composerRuntime.cancel();
+  }, [composerRuntime]);
   if (disabled) return null;
   return callback;
 };
@@ -708,21 +696,16 @@ var useComposerIf = (props) => {
 // src/primitive-hooks/composer/useComposerSend.tsx
 
 var useComposerSend = () => {
-  const threadStore = useThreadStore();
-  const threadViewportStore = useThreadViewportStore();
-  const composerStore = useComposerStore();
-  const threadComposerStore = useThreadComposerStore();
+  const composerRuntime = useComposerRuntime();
+  const threadRuntime = useThreadRuntime();
   const disabled = useCombinedStore(
-    [threadStore, composerStore],
+    [threadRuntime, composerRuntime],
     (t, c) => t.isRunning || !c.isEditing || c.isEmpty
   );
   const callback = _react.useCallback.call(void 0, () => {
-    const composerState = composerStore.getState();
-    if (!composerState.isEditing) return;
-    composerState.send();
-    threadViewportStore.getState().scrollToBottom();
-    threadComposerStore.getState().focus();
-  }, [threadComposerStore, composerStore, threadViewportStore]);
+    if (!composerRuntime.getState().isEditing) return;
+    composerRuntime.send();
+  }, [threadRuntime]);
   if (disabled) return null;
   return callback;
 };
@@ -788,10 +771,10 @@ var useContentPartText = () => {
 
 // src/primitive-hooks/message/useMessageIf.tsx
 var useMessageIf = (props) => {
-  const messageStore = useMessageStore();
+  const messageRuntime = useMessageRuntime();
   const messageUtilsStore = useMessageUtilsStore();
   return useCombinedStore(
-    [messageStore, messageUtilsStore],
+    [messageRuntime, messageUtilsStore],
     ({
       role,
       attachments,
@@ -846,11 +829,9 @@ var useThreadEmpty = () => {
 var useThreadScrollToBottom = () => {
   const isAtBottom = useThreadViewport((s) => s.isAtBottom);
   const threadViewportStore = useThreadViewportStore();
-  const threadComposerStore = useThreadComposerStore();
   const handleScrollToBottom = _react.useCallback.call(void 0, () => {
     threadViewportStore.getState().scrollToBottom();
-    threadComposerStore.getState().focus();
-  }, [threadViewportStore, threadComposerStore]);
+  }, [threadViewportStore]);
   if (isAtBottom) return null;
   return handleScrollToBottom;
 };
@@ -861,20 +842,16 @@ var useThreadSuggestion = ({
   prompt,
   autoSend
 }) => {
-  const threadStore = useThreadStore();
-  const composerStore = useThreadComposerStore();
-  const append = useAppendMessage();
+  const threadRuntime = useThreadRuntime();
   const disabled = useThread((t) => t.isDisabled);
   const callback = _react.useCallback.call(void 0, () => {
-    const thread = threadStore.getState();
-    const composer = composerStore.getState();
-    if (autoSend && !thread.isRunning) {
-      append(prompt);
-      composer.setText("");
+    if (autoSend && !threadRuntime.getState().isRunning) {
+      threadRuntime.append(prompt);
+      threadRuntime.composer.setText("");
     } else {
-      composer.setText(prompt);
+      threadRuntime.composer.setText(prompt);
     }
-  }, [threadStore, composerStore, autoSend, append, prompt]);
+  }, [threadRuntime, autoSend, prompt]);
   if (disabled) return null;
   return callback;
 };
@@ -902,11 +879,11 @@ var useActionBarFloatStatus = ({
   autohide,
   autohideFloat
 }) => {
-  const threadStore = useThreadStore();
-  const messageStore = useMessageStore();
+  const threadRuntime = useThreadRuntime();
+  const messageRuntime = useMessageRuntime();
   const messageUtilsStore = useMessageUtilsStore();
   return useCombinedStore(
-    [threadStore, messageStore, messageUtilsStore],
+    [threadRuntime, messageRuntime, messageUtilsStore],
     (t, m, mu) => {
       if (hideWhenRunning && t.isRunning) return "hidden" /* Hidden */;
       const autohideEnabled = autohide === "always" || autohide === "not-last" && !m.isLast;
@@ -1110,42 +1087,40 @@ _chunkPZ5AY32Cjs.__export.call(void 0, assistantModal_exports, {
 var _reactpopover = require('@radix-ui/react-popover'); var PopoverPrimitive2 = _interopRequireWildcard(_reactpopover); var PopoverPrimitive = _interopRequireWildcard(_reactpopover); var PopoverPrimitive3 = _interopRequireWildcard(_reactpopover); var PopoverPrimitive4 = _interopRequireWildcard(_reactpopover); var PopoverPrimitive5 = _interopRequireWildcard(_reactpopover);
 
 
-// src/utils/hooks/useOnComposerFocus.tsx
-var _reactusecallbackref = require('@radix-ui/react-use-callback-ref');
-
-var useOnComposerFocus = (callback) => {
-  const callbackRef = _reactusecallbackref.useCallbackRef.call(void 0, callback);
-  const threadComposerStore = useThreadComposerStore();
-  _react.useEffect.call(void 0, () => {
-    return threadComposerStore.getState().onFocus(() => {
-      callbackRef();
-    });
-  }, [threadComposerStore, callbackRef]);
-};
-
 // src/primitives/assistantModal/scope.tsx
 
 var usePopoverScope = PopoverPrimitive.createPopoverScope();
 
 // src/primitives/assistantModal/AssistantModalRoot.tsx
 
-var useAssistantModalOpenState = (defaultOpen = false) => {
+var useAssistantModalOpenState = ({
+  defaultOpen = false,
+  unstable_openOnRunStart = true
+}) => {
   const state = _react.useState.call(void 0, defaultOpen);
   const [, setOpen] = state;
-  useOnComposerFocus(() => {
-    setOpen(true);
-  });
+  const threadRuntime = useThreadRuntime();
+  _react.useEffect.call(void 0, () => {
+    if (!unstable_openOnRunStart) return void 0;
+    return threadRuntime.unstable_on("run-start", () => {
+      setOpen(true);
+    });
+  }, [unstable_openOnRunStart]);
   return state;
 };
 var AssistantModalPrimitiveRoot = ({
   __scopeAssistantModal,
   defaultOpen,
+  unstable_openOnRunStart,
   open,
   onOpenChange,
   ...rest
 }) => {
   const scope = usePopoverScope(__scopeAssistantModal);
-  const [modalOpen, setOpen] = useAssistantModalOpenState(defaultOpen);
+  const [modalOpen, setOpen] = useAssistantModalOpenState({
+    defaultOpen,
+    unstable_openOnRunStart
+  });
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
     PopoverPrimitive2.Root,
     {
@@ -1496,7 +1471,7 @@ var ContentPartRuntimeProvider = ({
 
 // src/utils/smooth/useSmooth.tsx
 
-
+var _reactusecallbackref = require('@radix-ui/react-use-callback-ref');
 
 // src/utils/smooth/SmoothContext.tsx
 
@@ -1836,7 +1811,7 @@ var METHOD_NOT_SUPPORTED = () => {
   throw new Error("Composer is not available");
 };
 var EMPTY_ARRAY = Object.freeze([]);
-var getThreadComposerState = (runtime, focus, onFocus) => {
+var getThreadComposerState = (runtime) => {
   return Object.freeze({
     type: "thread",
     isEditing: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _24 => _24.isEditing]), () => ( false)),
@@ -1850,8 +1825,6 @@ var getThreadComposerState = (runtime, focus, onFocus) => {
     // edit: beginEdit,
     send: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _36 => _36.send, 'access', _37 => _37.bind, 'call', _38 => _38(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
     cancel: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _39 => _39.cancel, 'access', _40 => _40.bind, 'call', _41 => _41(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
-    focus,
-    onFocus,
     reset: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _42 => _42.reset, 'access', _43 => _43.bind, 'call', _44 => _44(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
     addAttachment: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _45 => _45.addAttachment, 'access', _46 => _46.bind, 'call', _47 => _47(runtime)]), () => ( METHOD_NOT_SUPPORTED)),
     removeAttachment: _nullishCoalesce(_optionalChain([runtime, 'optionalAccess', _48 => _48.removeAttachment, 'access', _49 => _49.bind, 'call', _50 => _50(runtime)]), () => ( METHOD_NOT_SUPPORTED))
@@ -1961,24 +1934,20 @@ var ComposerRuntimeImpl = class {
     return core.getAttachmentAccept();
   }
 };
-var ThreadComposerRuntimeImpl = (_class5 = class extends ComposerRuntimeImpl {
+var ThreadComposerRuntimeImpl = class extends ComposerRuntimeImpl {
   get type() {
     return "thread";
   }
   
   constructor(core) {
     const stateBinding = new LazyMemoizeSubject({
-      getState: () => getThreadComposerState(
-        core.getState(),
-        this.focus.bind(this),
-        this.onFocus.bind(this)
-      ),
+      getState: () => getThreadComposerState(core.getState()),
       subscribe: (callback) => core.subscribe(callback)
     });
     super({
       getState: () => core.getState(),
       subscribe: (callback) => stateBinding.subscribe(callback)
-    });_class5.prototype.__init9.call(this);;
+    });
     this._getState = stateBinding.getState.bind(stateBinding);
   }
   get attachments() {
@@ -1987,21 +1956,6 @@ var ThreadComposerRuntimeImpl = (_class5 = class extends ComposerRuntimeImpl {
   getState() {
     return this._getState();
   }
-  // TODO replace with events
-  __init9() {this._focusListeners = /* @__PURE__ */ new Set()}
-  /**
-   * @deprecated This feature is being removed in 0.6.0. Submit feedback if you need it.
-   */
-  focus() {
-    this._focusListeners.forEach((callback) => callback());
-  }
-  /**
-   * @deprecated This feature is being removed in 0.6.0. Submit feedback if you need it.
-   */
-  onFocus(callback) {
-    this._focusListeners.add(callback);
-    return () => this._focusListeners.delete(callback);
-  }
   getAttachmentByIndex(idx) {
     return new ThreadComposerAttachmentRuntimeImpl(
       new ShallowMemoizeSubject({
@@ -2020,7 +1974,7 @@ var ThreadComposerRuntimeImpl = (_class5 = class extends ComposerRuntimeImpl {
       this._core
     );
   }
-}, _class5);
+};
 var EditComposerRuntimeImpl = class extends ComposerRuntimeImpl {
   constructor(core, _beginEdit) {
     const stateBinding = new LazyMemoizeSubject({
@@ -2079,6 +2033,9 @@ var NestedSubscriptionSubject = class extends BaseSubject {
   getState() {
     return this.binding.getState();
   }
+  outerSubscribe(callback) {
+    return this.binding.subscribe(callback);
+  }
   _connect() {
     const callback = () => {
       this.notifySubscribers();
@@ -2093,7 +2050,7 @@ var NestedSubscriptionSubject = class extends BaseSubject {
       innerUnsubscribe = _optionalChain([this, 'access', _75 => _75.binding, 'access', _76 => _76.getState, 'call', _77 => _77(), 'optionalAccess', _78 => _78.subscribe, 'call', _79 => _79(callback)]);
       callback();
     };
-    const outerUnsubscribe = this.binding.subscribe(onRuntimeUpdate);
+    const outerUnsubscribe = this.outerSubscribe(onRuntimeUpdate);
     return () => {
       _optionalChain([outerUnsubscribe, 'optionalCall', _80 => _80()]);
       _optionalChain([innerUnsubscribe, 'optionalCall', _81 => _81()]);
@@ -2135,12 +2092,12 @@ var getContentPartState = (message, partIndex) => {
   const status = toContentPartStatus(message, partIndex, part);
   return Object.freeze({ ...part, part, status });
 };
-var MessageRuntimeImpl = (_class6 = class {
-  constructor(_core, _threadBinding) {;_class6.prototype.__init10.call(this);
+var MessageRuntimeImpl = (_class5 = class {
+  constructor(_core, _threadBinding) {;_class5.prototype.__init9.call(this);
     this._core = _core;
     this._threadBinding = _threadBinding;
   }
-  __init10() {this.composer = new EditComposerRuntimeImpl(
+  __init9() {this.composer = new EditComposerRuntimeImpl(
     new NestedSubscriptionSubject({
       getState: () => this._threadBinding.getState().getEditComposer(this._core.getState().id),
       subscribe: (callback) => this._threadBinding.subscribe(callback)
@@ -2235,7 +2192,7 @@ var MessageRuntimeImpl = (_class6 = class {
       })
     );
   }
-}, _class6);
+}, _class5);
 
 // src/primitives/message/MessageContent.tsx
 
@@ -2264,8 +2221,7 @@ var MessageContentPartComponent = ({
     tools: { by_name = {}, Fallback: Fallback2 = void 0 } = {}
   } = {}
 }) => {
-  const messageStore = useMessageStore();
-  const threadRuntime = useThreadRuntime();
+  const contentPartRuntime = useContentPartRuntime();
   const part = useContentPart();
   const type = part.type;
   switch (type) {
@@ -2286,12 +2242,7 @@ var MessageContentPartComponent = ({
       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
-      });
+      const addResult = (result) => contentPartRuntime.addToolResult(result);
       return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, ToolUIDisplay, { ...part, part, UI: Tool, addResult });
     }
     default:
@@ -2480,6 +2431,19 @@ var _reactslot = require('@radix-ui/react-slot');
 var _reacttextareaautosize = require('react-textarea-autosize'); var _reacttextareaautosize2 = _interopRequireDefault(_reacttextareaautosize);
 
 
+// src/utils/hooks/useOnScrollToBottom.tsx
+
+
+var useOnScrollToBottom = (callback) => {
+  const callbackRef = _reactusecallbackref.useCallbackRef.call(void 0, callback);
+  const onScrollToBottom = useThreadViewport((vp) => vp.onScrollToBottom);
+  _react.useEffect.call(void 0, () => {
+    return onScrollToBottom(callbackRef);
+  }, [onScrollToBottom, callbackRef]);
+};
+
+// src/primitives/composer/ComposerInput.tsx
+
 var ComposerPrimitiveInput = _react.forwardRef.call(void 0, 
   ({
     autoFocus = false,
@@ -2489,10 +2453,13 @@ var ComposerPrimitiveInput = _react.forwardRef.call(void 0,
     onKeyDown,
     submitOnEnter = true,
     cancelOnEscape = true,
+    unstable_focusOnRunStart = true,
+    unstable_focusOnScrollToBottom = true,
+    unstable_focusOnThreadSwitched = true,
     ...rest
   }, forwardedRef) => {
-    const threadStore = useThreadStore();
-    const composerStore = useComposerStore();
+    const threadRuntime = useThreadRuntime();
+    const composerRuntime = useComposerRuntime();
     const value = useComposer((c) => {
       if (!c.isEditing) return "";
       return c.text;
@@ -2503,9 +2470,8 @@ var ComposerPrimitiveInput = _react.forwardRef.call(void 0,
     const ref = _reactcomposerefs.useComposedRefs.call(void 0, forwardedRef, textareaRef);
     _reactuseescapekeydown.useEscapeKeydown.call(void 0, (e) => {
       if (!cancelOnEscape) return;
-      const composer = composerStore.getState();
-      if (composer.canCancel) {
-        composer.cancel();
+      if (composerRuntime.getState().canCancel) {
+        composerRuntime.cancel();
         e.preventDefault();
       }
     });
@@ -2513,7 +2479,7 @@ var ComposerPrimitiveInput = _react.forwardRef.call(void 0,
       if (isDisabled || !submitOnEnter) return;
       if (e.nativeEvent.isComposing) return;
       if (e.key === "Enter" && e.shiftKey === false) {
-        const { isRunning } = threadStore.getState();
+        const { isRunning } = threadRuntime.getState();
         if (!isRunning) {
           e.preventDefault();
           _optionalChain([textareaRef, 'access', _123 => _123.current, 'optionalAccess', _124 => _124.closest, 'call', _125 => _125("form"), 'optionalAccess', _126 => _126.requestSubmit, 'call', _127 => _127()]);
@@ -2521,7 +2487,7 @@ var ComposerPrimitiveInput = _react.forwardRef.call(void 0,
       }
     };
     const autoFocusEnabled = autoFocus && !isDisabled;
-    const focus = _react.useCallback.call(void 0, () => {
+    const focus2 = _react.useCallback.call(void 0, () => {
       const textarea = textareaRef.current;
       if (!textarea || !autoFocusEnabled) return;
       textarea.focus({ preventScroll: true });
@@ -2530,12 +2496,22 @@ var ComposerPrimitiveInput = _react.forwardRef.call(void 0,
         textareaRef.current.value.length
       );
     }, [autoFocusEnabled]);
-    _react.useEffect.call(void 0, () => focus(), [focus]);
-    useOnComposerFocus(() => {
-      if (composerStore.getState().type === "thread") {
-        focus();
+    _react.useEffect.call(void 0, () => focus2(), [focus2]);
+    useOnScrollToBottom(() => {
+      if (composerRuntime.type === "thread" && unstable_focusOnScrollToBottom) {
+        focus2();
       }
     });
+    _react.useEffect.call(void 0, () => {
+      if (composerRuntime.type !== "thread" || !unstable_focusOnRunStart)
+        return void 0;
+      return threadRuntime.unstable_on("run-start", focus2);
+    }, [unstable_focusOnRunStart]);
+    _react.useEffect.call(void 0, () => {
+      if (composerRuntime.type !== "thread" || !unstable_focusOnThreadSwitched)
+        return void 0;
+      return threadRuntime.unstable_on("switched-to", focus2);
+    }, [unstable_focusOnThreadSwitched]);
     return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
       Component,
       {
@@ -2545,9 +2521,8 @@ var ComposerPrimitiveInput = _react.forwardRef.call(void 0,
         ref,
         disabled: isDisabled,
         onChange: _primitive.composeEventHandlers.call(void 0, onChange, (e) => {
-          const composerState = composerStore.getState();
-          if (!composerState.isEditing) return;
-          return composerState.setText(e.target.value);
+          if (!composerRuntime.getState().isEditing) return;
+          return composerRuntime.setText(e.target.value);
         }),
         onKeyDown: _primitive.composeEventHandlers.call(void 0, onKeyDown, handleKeyPress)
       }
@@ -2731,22 +2706,10 @@ var useOnResizeContent = (callback) => {
   return useManagedRef(refCallback);
 };
 
-// src/utils/hooks/useOnScrollToBottom.tsx
-
-
-var useOnScrollToBottom = (callback) => {
-  const callbackRef = _reactusecallbackref.useCallbackRef.call(void 0, callback);
-  const threadViewportStore = useThreadViewportStore();
-  _react.useEffect.call(void 0, () => {
-    return threadViewportStore.getState().onScrollToBottom(() => {
-      callbackRef();
-    });
-  }, [threadViewportStore, callbackRef]);
-};
-
 // src/primitive-hooks/thread/useThreadViewportAutoScroll.tsx
 var useThreadViewportAutoScroll = ({
-  autoScroll = true
+  autoScroll = true,
+  unstable_scrollToBottomOnRunStart = true
 }) => {
   const divRef = _react.useRef.call(void 0, null);
   const threadViewportStore = useThreadViewportStore();
@@ -2792,6 +2755,11 @@ var useThreadViewportAutoScroll = ({
   useOnScrollToBottom(() => {
     scrollToBottom("auto");
   });
+  const threadRuntime = useThreadRuntime();
+  _react.useEffect.call(void 0, () => {
+    if (!unstable_scrollToBottomOnRunStart) return void 0;
+    return threadRuntime.unstable_on("run-start", focus);
+  }, [unstable_scrollToBottomOnRunStart]);
   return autoScrollRef;
 };
 
@@ -2978,8 +2946,8 @@ var subscribeToMainThread = (runtime, callback) => {
 
 
 // src/runtimes/core/BaseAssistantRuntimeCore.tsx
-var BaseAssistantRuntimeCore = (_class7 = class {
-  constructor(_thread) {;_class7.prototype.__init11.call(this);_class7.prototype.__init12.call(this);
+var BaseAssistantRuntimeCore = (_class6 = class {
+  constructor(_thread) {;_class6.prototype.__init10.call(this);_class6.prototype.__init11.call(this);
     this._thread = _thread;
     this._thread = _thread;
   }
@@ -2990,15 +2958,15 @@ var BaseAssistantRuntimeCore = (_class7 = class {
     this._thread = thread;
     this.subscriptionHandler();
   }
-  __init11() {this._subscriptions = /* @__PURE__ */ new Set()}
+  __init10() {this._subscriptions = /* @__PURE__ */ new Set()}
   subscribe(callback) {
     this._subscriptions.add(callback);
     return () => this._subscriptions.delete(callback);
   }
-  __init12() {this.subscriptionHandler = () => {
+  __init11() {this.subscriptionHandler = () => {
     for (const callback of this._subscriptions) callback();
   }}
-}, _class7);
+}, _class6);
 
 // src/internal.ts
 var internal_exports = {};
@@ -3018,12 +2986,12 @@ _chunkPZ5AY32Cjs.__export.call(void 0, internal_exports, {
 
 // src/runtimes/composer/BaseComposerRuntimeCore.tsx
 var isAttachmentComplete = (a) => a.status.type === "complete";
-var BaseComposerRuntimeCore = (_class8 = class {constructor() { _class8.prototype.__init13.call(this);_class8.prototype.__init14.call(this);_class8.prototype.__init15.call(this);_class8.prototype.__init16.call(this); }
-  __init13() {this.isEditing = true}
+var BaseComposerRuntimeCore = (_class7 = class {constructor() { _class7.prototype.__init12.call(this);_class7.prototype.__init13.call(this);_class7.prototype.__init14.call(this);_class7.prototype.__init15.call(this); }
+  __init12() {this.isEditing = true}
   getAttachmentAccept() {
     return _nullishCoalesce(_optionalChain([this, 'access', _152 => _152.getAttachmentAdapter, 'call', _153 => _153(), 'optionalAccess', _154 => _154.accept]), () => ( "*"));
   }
-  __init14() {this._attachments = []}
+  __init13() {this._attachments = []}
   set attachments(value) {
     this._attachments = value;
     this.notifySubscribers();
@@ -3034,7 +3002,7 @@ var BaseComposerRuntimeCore = (_class8 = class {constructor() { _class8.prototyp
   get isEmpty() {
     return !this.text.trim() && !this.attachments.length;
   }
-  __init15() {this._text = ""}
+  __init14() {this._text = ""}
   get text() {
     return this._text;
   }
@@ -3087,7 +3055,7 @@ var BaseComposerRuntimeCore = (_class8 = class {constructor() { _class8.prototyp
     this._attachments = this._attachments.toSpliced(index, 1);
     this.notifySubscribers();
   }
-  __init16() {this._subscriptions = /* @__PURE__ */ new Set()}
+  __init15() {this._subscriptions = /* @__PURE__ */ new Set()}
   notifySubscribers() {
     for (const callback of this._subscriptions) callback();
   }
@@ -3095,16 +3063,16 @@ var BaseComposerRuntimeCore = (_class8 = class {constructor() { _class8.prototyp
     this._subscriptions.add(callback);
     return () => this._subscriptions.delete(callback);
   }
-}, _class8);
+}, _class7);
 
 // src/runtimes/composer/DefaultThreadComposerRuntimeCore.tsx
-var DefaultThreadComposerRuntimeCore = (_class9 = class extends BaseComposerRuntimeCore {
+var DefaultThreadComposerRuntimeCore = (_class8 = class extends BaseComposerRuntimeCore {
   constructor(runtime) {
-    super();_class9.prototype.__init17.call(this);;
+    super();_class8.prototype.__init16.call(this);;
     this.runtime = runtime;
     this.connect();
   }
-  __init17() {this._canCancel = false}
+  __init16() {this._canCancel = false}
   get canCancel() {
     return this._canCancel;
   }
@@ -3131,11 +3099,11 @@ var DefaultThreadComposerRuntimeCore = (_class9 = class extends BaseComposerRunt
   async cancel() {
     this.runtime.cancelRun();
   }
-}, _class9);
+}, _class8);
 
 // src/utils/ProxyConfigProvider.ts
-var ProxyConfigProvider = (_class10 = class {constructor() { _class10.prototype.__init18.call(this); }
-  __init18() {this._providers = /* @__PURE__ */ new Set()}
+var ProxyConfigProvider = (_class9 = class {constructor() { _class9.prototype.__init17.call(this); }
+  __init17() {this._providers = /* @__PURE__ */ new Set()}
   getModelConfig() {
     return _chunkKVXP3Q6Kjs.mergeModelConfigs.call(void 0, this._providers);
   }
@@ -3145,7 +3113,7 @@ var ProxyConfigProvider = (_class10 = class {constructor() { _class10.prototype.
       this._providers.delete(provider);
     };
   }
-}, _class10);
+}, _class9);
 
 // src/utils/idUtils.tsx
 var _nonsecure = require('nanoid/non-secure');
@@ -3212,11 +3180,11 @@ var findHead = (message) => {
   if ("current" in message) return message;
   return null;
 };
-var MessageRepository = (_class11 = class {constructor() { _class11.prototype.__init19.call(this);_class11.prototype.__init20.call(this);_class11.prototype.__init21.call(this); }
-  __init19() {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
-  __init20() {this.head = null}
-  __init21() {this.root = {
+  __init19() {this.head = null}
+  __init20() {this.root = {
     children: [],
     next: null
   }}
@@ -3394,7 +3362,7 @@ var MessageRepository = (_class11 = class {constructor() { _class11.prototype.__
     }
     this.resetHead(_nullishCoalesce(_nullishCoalesce(headId, () => ( _optionalChain([messages2, 'access', _176 => _176.at, 'call', _177 => _177(-1), 'optionalAccess', _178 => _178.message, 'access', _179 => _179.id]))), () => ( null)));
   }
-}, _class11);
+}, _class10);
 
 // src/ui/base/tooltip-icon-button.tsx
 
@@ -3525,7 +3493,7 @@ var getThreadState = (runtime) => {
     speech: runtime.speech
   });
 };
-var ThreadRuntimeImpl = (_class12 = class {
+var ThreadRuntimeImpl = (_class11 = class {
   // public path = "assistant.threads[main]"; // TODO
   /**
    * @deprecated Use `getState().threadId` instead. This will be removed in 0.6.0.
@@ -3579,7 +3547,7 @@ var ThreadRuntimeImpl = (_class12 = class {
     return this._threadBinding.getState();
   }
   
-  constructor(threadBinding) {;_class12.prototype.__init22.call(this);
+  constructor(threadBinding) {;_class11.prototype.__init21.call(this);_class11.prototype.__init22.call(this);
     const stateBinding = new LazyMemoizeSubject({
       getState: () => getThreadState(threadBinding.getState()),
       subscribe: (callback) => threadBinding.subscribe(callback)
@@ -3587,10 +3555,11 @@ var ThreadRuntimeImpl = (_class12 = class {
     this._threadBinding = {
       getState: () => threadBinding.getState(),
       getStateState: () => stateBinding.getState(),
+      outerSubscribe: (callback) => threadBinding.outerSubscribe(callback),
       subscribe: (callback) => threadBinding.subscribe(callback)
     };
   }
-  __init22() {this.composer = new ThreadComposerRuntimeImpl(
+  __init21() {this.composer = new ThreadComposerRuntimeImpl(
     new NestedSubscriptionSubject({
       getState: () => this._threadBinding.getState().composer,
       subscribe: (callback) => this._threadBinding.subscribe(callback)
@@ -3699,7 +3668,21 @@ var ThreadRuntimeImpl = (_class12 = class {
       this._threadBinding
     );
   }
-}, _class12);
+  __init22() {this._eventListenerNestedSubscriptions = /* @__PURE__ */ new Map()}
+  unstable_on(event, callback) {
+    let subject = this._eventListenerNestedSubscriptions.get(event);
+    if (!subject) {
+      subject = new NestedSubscriptionSubject({
+        getState: () => ({
+          subscribe: (callback2) => this._threadBinding.getState().unstable_on(event, callback2)
+        }),
+        subscribe: (callback2) => this._threadBinding.outerSubscribe(callback2)
+      });
+      this._eventListenerNestedSubscriptions.set(event, subject);
+    }
+    return subject.subscribe(callback);
+  }
+}, _class11);
 
 // src/api/AssistantRuntime.ts
 var AssistantRuntimeImpl = class _AssistantRuntimeImpl {
@@ -4134,8 +4117,8 @@ var DefaultEditComposerRuntimeCore = class extends BaseComposerRuntimeCore {
 };
 
 // src/runtimes/core/BaseThreadRuntimeCore.tsx
-var BaseThreadRuntimeCore = (_class13 = class {
-  constructor(configProvider) {;_class13.prototype.__init23.call(this);_class13.prototype.__init24.call(this);_class13.prototype.__init25.call(this);_class13.prototype.__init26.call(this);_class13.prototype.__init27.call(this);
+var BaseThreadRuntimeCore = (_class12 = class {
+  constructor(configProvider) {;_class12.prototype.__init23.call(this);_class12.prototype.__init24.call(this);_class12.prototype.__init25.call(this);_class12.prototype.__init26.call(this);_class12.prototype.__init27.call(this);_class12.prototype.__init28.call(this);
     this.configProvider = configProvider;
   }
   __init23() {this._subscriptions = /* @__PURE__ */ new Set()}
@@ -4162,18 +4145,23 @@ var BaseThreadRuntimeCore = (_class13 = class {
         this.repository.getMessage(messageId)
       )
     );
-    this.notifySubscribers();
+    this._notifySubscribers();
   }
   getBranches(messageId) {
     return this.repository.getBranches(messageId);
   }
   switchToBranch(branchId) {
     this.repository.switchToBranch(branchId);
-    this.notifySubscribers();
+    this._notifySubscribers();
   }
-  notifySubscribers() {
+  _notifySubscribers() {
     for (const callback of this._subscriptions) callback();
   }
+  _notifyEventSubscribers(event) {
+    const subscribers = this._eventSubscribers.get(event);
+    if (!subscribers) return;
+    for (const callback of subscribers) callback();
+  }
   subscribe(callback) {
     this._subscriptions.add(callback);
     return () => this._subscriptions.delete(callback);
@@ -4188,7 +4176,7 @@ var BaseThreadRuntimeCore = (_class13 = class {
     const { message } = this.repository.getMessage(messageId);
     adapter.submit({ message, type });
     this._submittedFeedback[messageId] = { type };
-    this.notifySubscribers();
+    this._notifySubscribers();
   }
   
   
@@ -4205,10 +4193,10 @@ var BaseThreadRuntimeCore = (_class13 = class {
       } else {
         this.speech = { messageId, status: utterance.status };
       }
-      this.notifySubscribers();
+      this._notifySubscribers();
     });
     this.speech = { messageId, status: utterance.status };
-    this.notifySubscribers();
+    this._notifySubscribers();
     this._stopSpeaking = () => {
       utterance.cancel();
       unsub();
@@ -4219,21 +4207,34 @@ var BaseThreadRuntimeCore = (_class13 = class {
   stopSpeaking() {
     if (!this._stopSpeaking) throw new Error("No message is being spoken");
     this._stopSpeaking();
-    this.notifySubscribers();
+    this._notifySubscribers();
   }
   export() {
     return this.repository.export();
   }
   import(data) {
     this.repository.import(data);
-    this.notifySubscribers();
+    this._notifySubscribers();
   }
-}, _class13);
+  __init28() {this._eventSubscribers = /* @__PURE__ */ new Map()}
+  unstable_on(event, callback) {
+    const subscribers = this._eventSubscribers.get(event);
+    if (!subscribers) {
+      this._eventSubscribers.set(event, /* @__PURE__ */ new Set([callback]));
+    } else {
+      subscribers.add(callback);
+    }
+    return () => {
+      const subscribers2 = this._eventSubscribers.get(event);
+      subscribers2.delete(callback);
+    };
+  }
+}, _class12);
 
 // src/runtimes/local/LocalThreadRuntimeCore.tsx
-var LocalThreadRuntimeCore = (_class14 = class extends BaseThreadRuntimeCore {
+var LocalThreadRuntimeCore = (_class13 = class extends BaseThreadRuntimeCore {
   constructor(configProvider, adapter, { initialMessages, ...options }) {
-    super(configProvider);_class14.prototype.__init28.call(this);_class14.prototype.__init29.call(this);_class14.prototype.__init30.call(this);_class14.prototype.__init31.call(this);;
+    super(configProvider);_class13.prototype.__init29.call(this);_class13.prototype.__init30.call(this);_class13.prototype.__init31.call(this);_class13.prototype.__init32.call(this);;
     this.adapter = adapter;
     this.threadId = generateId();
     this.options = options;
@@ -4246,7 +4247,7 @@ var LocalThreadRuntimeCore = (_class14 = class extends BaseThreadRuntimeCore {
       }
     }
   }
-  __init28() {this.capabilities = {
+  __init29() {this.capabilities = {
     switchToBranch: true,
     edit: true,
     reload: true,
@@ -4256,10 +4257,10 @@ var LocalThreadRuntimeCore = (_class14 = class extends BaseThreadRuntimeCore {
     attachments: false,
     feedback: false
   }}
-  __init29() {this.abortController = null}
+  __init30() {this.abortController = null}
   
-  __init30() {this.isDisabled = false}
-  __init31() {this.suggestions = []}
+  __init31() {this.isDisabled = false}
+  __init32() {this.suggestions = []}
   get adapters() {
     return this.options.adapters;
   }
@@ -4288,7 +4289,7 @@ var LocalThreadRuntimeCore = (_class14 = class extends BaseThreadRuntimeCore {
       this.capabilities.feedback = canFeedback;
       hasUpdates = true;
     }
-    if (hasUpdates) this.notifySubscribers();
+    if (hasUpdates) this._notifySubscribers();
   }
   async append(message) {
     const newMessage = fromCoreMessage(message, {
@@ -4299,7 +4300,7 @@ var LocalThreadRuntimeCore = (_class14 = class extends BaseThreadRuntimeCore {
       await this.startRun(newMessage.id);
     } else {
       this.repository.resetHead(newMessage.id);
-      this.notifySubscribers();
+      this._notifySubscribers();
     }
   }
   async startRun(parentId) {
@@ -4312,6 +4313,7 @@ var LocalThreadRuntimeCore = (_class14 = class extends BaseThreadRuntimeCore {
       content: [],
       createdAt: /* @__PURE__ */ new Date()
     };
+    this._notifyEventSubscribers("run-start");
     do {
       message = await this.performRoundtrip(parentId, message);
     } while (shouldContinue(message));
@@ -4343,7 +4345,7 @@ var LocalThreadRuntimeCore = (_class14 = class extends BaseThreadRuntimeCore {
         } : void 0
       };
       this.repository.addOrUpdateMessage(parentId, message);
-      this.notifySubscribers();
+      this._notifySubscribers();
     };
     const maxSteps = this.options.maxSteps ? this.options.maxSteps : (_nullishCoalesce(this.options.maxToolRoundtrips, () => ( 1))) + 1;
     const steps = _nullishCoalesce(_optionalChain([message, 'access', _223 => _223.metadata, 'optionalAccess', _224 => _224.steps, 'optionalAccess', _225 => _225.length]), () => ( 0));
@@ -4434,7 +4436,7 @@ var LocalThreadRuntimeCore = (_class14 = class extends BaseThreadRuntimeCore {
       this.performRoundtrip(parentId, message);
     }
   }
-}, _class14);
+}, _class13);
 
 // src/runtimes/local/LocalRuntimeCore.tsx
 var LocalRuntimeCore = class extends BaseAssistantRuntimeCore {
@@ -4454,6 +4456,7 @@ var LocalRuntimeCore = class extends BaseAssistantRuntimeCore {
       this.thread.adapter,
       options
     );
+    this.thread._notifyEventSubscribers("switched-to");
   }
   switchToThread(threadId) {
     if (threadId !== null) {
@@ -4511,8 +4514,8 @@ var getExternalStoreMessage = (message) => {
 };
 
 // src/runtimes/external-store/ThreadMessageConverter.ts
-var ThreadMessageConverter = (_class15 = class {constructor() { _class15.prototype.__init32.call(this); }
-  __init32() {this.cache = /* @__PURE__ */ new WeakMap()}
+var ThreadMessageConverter = (_class14 = class {constructor() { _class14.prototype.__init33.call(this); }
+  __init33() {this.cache = /* @__PURE__ */ new WeakMap()}
   convertMessages(messages2, converter) {
     return messages2.map((m, idx) => {
       const cached = this.cache.get(m);
@@ -4521,7 +4524,7 @@ var ThreadMessageConverter = (_class15 = class {constructor() { _class15.prototy
       return newMessage;
     });
   }
-}, _class15);
+}, _class14);
 
 // src/runtimes/external-store/auto-status.tsx
 var AUTO_STATUS_RUNNING = Object.freeze({ type: "running" });
@@ -4611,9 +4614,9 @@ var EMPTY_ARRAY2 = Object.freeze([]);
 var hasUpcomingMessage = (isRunning, messages2) => {
   return isRunning && _optionalChain([messages2, 'access', _231 => _231[messages2.length - 1], 'optionalAccess', _232 => _232.role]) !== "assistant";
 };
-var ExternalStoreThreadRuntimeCore = (_class16 = class extends BaseThreadRuntimeCore {
-  __init33() {this.assistantOptimisticId = null}
-  __init34() {this._capabilities = {
+var ExternalStoreThreadRuntimeCore = (_class15 = class extends BaseThreadRuntimeCore {
+  __init34() {this.assistantOptimisticId = null}
+  __init35() {this._capabilities = {
     switchToBranch: false,
     edit: false,
     reload: false,
@@ -4635,9 +4638,9 @@ var ExternalStoreThreadRuntimeCore = (_class16 = class extends BaseThreadRuntime
   get adapters() {
     return this._store.adapters;
   }
-  __init35() {this.suggestions = []}
-  __init36() {this.extras = void 0}
-  __init37() {this._converter = new ThreadMessageConverter()}
+  __init36() {this.suggestions = []}
+  __init37() {this.extras = void 0}
+  __init38() {this._converter = new ThreadMessageConverter()}
   
   beginEdit(messageId) {
     if (!this.store.onEdit)
@@ -4645,7 +4648,7 @@ var ExternalStoreThreadRuntimeCore = (_class16 = class extends BaseThreadRuntime
     super.beginEdit(messageId);
   }
   constructor(configProvider, store) {
-    super(configProvider);_class16.prototype.__init33.call(this);_class16.prototype.__init34.call(this);_class16.prototype.__init35.call(this);_class16.prototype.__init36.call(this);_class16.prototype.__init37.call(this);_class16.prototype.__init38.call(this);;
+    super(configProvider);_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.store = store;
   }
   get store() {
@@ -4675,7 +4678,7 @@ var ExternalStoreThreadRuntimeCore = (_class16 = class extends BaseThreadRuntime
       if (oldStore.convertMessage !== store.convertMessage) {
         this._converter = new ThreadMessageConverter();
       } else if (oldStore.isRunning === store.isRunning && oldStore.messages === store.messages) {
-        this.notifySubscribers();
+        this._notifySubscribers();
         return;
       }
     }
@@ -4715,7 +4718,7 @@ var ExternalStoreThreadRuntimeCore = (_class16 = class extends BaseThreadRuntime
       _nullishCoalesce(_nullishCoalesce(this.assistantOptimisticId, () => ( _optionalChain([messages2, 'access', _252 => _252.at, 'call', _253 => _253(-1), 'optionalAccess', _254 => _254.id]))), () => ( null))
     );
     this._messages = this.repository.getMessages();
-    this.notifySubscribers();
+    this._notifySubscribers();
   }
   switchToBranch(branchId) {
     if (!this._store.setMessages)
@@ -4754,7 +4757,7 @@ var ExternalStoreThreadRuntimeCore = (_class16 = class extends BaseThreadRuntime
       }
       messages2 = this.repository.getMessages();
     } else {
-      this.notifySubscribers();
+      this._notifySubscribers();
     }
     setTimeout(() => {
       this.updateMessages(messages2);
@@ -4765,12 +4768,12 @@ var ExternalStoreThreadRuntimeCore = (_class16 = class extends BaseThreadRuntime
       throw new Error("Runtime does not support tool results.");
     this._store.onAddToolResult(options);
   }
-  __init38() {this.updateMessages = (messages2) => {
+  __init39() {this.updateMessages = (messages2) => {
     _optionalChain([this, 'access', _263 => _263._store, 'access', _264 => _264.setMessages, 'optionalCall', _265 => _265(
       messages2.flatMap(getExternalStoreMessage).filter((m) => m != null)
     )]);
   }}
-}, _class16);
+}, _class15);
 
 // src/runtimes/external-store/ExternalStoreRuntimeCore.tsx
 var ExternalStoreRuntimeCore = class extends BaseAssistantRuntimeCore {
@@ -4797,6 +4800,7 @@ var ExternalStoreRuntimeCore = class extends BaseAssistantRuntimeCore {
       }
     );
     await this.thread.store.onSwitchToNewThread();
+    this.thread._notifyEventSubscribers("switched-to");
   }
   async switchToThread(threadId) {
     if (threadId !== null) {
@@ -4810,7 +4814,8 @@ var ExternalStoreRuntimeCore = class extends BaseAssistantRuntimeCore {
           // ignore messages until rerender
         }
       );
-      this.thread.store.onSwitchToThread(threadId);
+      await this.thread.store.onSwitchToThread(threadId);
+      this.thread._notifyEventSubscribers("switched-to");
     } else {
       this.switchToNewThread();
     }
@@ -5051,8 +5056,8 @@ var WebSpeechSynthesisAdapter = class {
 };
 
 // src/runtimes/attachment/SimpleImageAttachmentAdapter.ts
-var SimpleImageAttachmentAdapter = (_class17 = class {constructor() { _class17.prototype.__init39.call(this); }
-  __init39() {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,
@@ -5077,7 +5082,7 @@ var SimpleImageAttachmentAdapter = (_class17 = class {constructor() { _class17.p
   }
   async remove() {
   }
-}, _class17);
+}, _class16);
 var getFileDataURL = (file) => new Promise((resolve, reject) => {
   const reader = new FileReader();
   reader.onload = () => resolve(reader.result);
@@ -5086,8 +5091,8 @@ var getFileDataURL = (file) => new Promise((resolve, reject) => {
 });
 
 // src/runtimes/attachment/SimpleTextAttachmentAdapter.ts
-var SimpleTextAttachmentAdapter = (_class18 = class {constructor() { _class18.prototype.__init40.call(this); }
-  __init40() {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,
@@ -5114,7 +5119,7 @@ ${await getFileText(attachment.file)}
   }
   async remove() {
   }
-}, _class18);
+}, _class17);
 var getFileText = (file) => new Promise((resolve, reject) => {
   const reader = new FileReader();
   reader.onload = () => resolve(reader.result);