@aparte/core 0.3.0-alpha.0 → 0.4.0-alpha.0

package/dist/host/aparte-chat-host.d.ts

@@ -78,6 +78,12 @@ export declare class AparteChatHost {
     private _pendingSiblings?;
     /** Abort handle for an in-flight {@link streamTokens} loop. */
     private _streamAbort?;
+    /** Segment chunks written to the bubble, awaiting one coalesced state sync. */
+    private readonly _segmentBuffer;
+    /** {@link streamTokens} text written to the bubble, awaiting the same sync. */
+    private _tokenBuffer;
+    /** Handle of the scheduled coalesced sync, or null when none is pending. */
+    private _flushHandle;
     private _conversationId;
     private _controller?;
     private _teardown;
@@ -129,8 +135,35 @@ export declare class AparteChatHost {
     updateSegment(segmentId: string, updates: Partial<AparteSegment>): void;
     /** Remove a transient segment (e.g. pipeline-waiting indicator). */
     removeSegment(segmentId: string): void;
-    /** Append text to a segment's content in the last message. */
+    /**
+     * Append text to a segment's content in the last message — the streaming path
+     * for thinking blocks, tool pills and any segment that grows token by token.
+     *
+     * Two writes, deliberately asymmetric:
+     *  1. straight into the bubble, every chunk, so the text appears immediately —
+     *     the same direct path `appendToken` uses;
+     *  2. into the framework's message list, **coalesced to once per frame**.
+     *
+     * It used to do only (2), synchronously: a full list rebuild plus
+     * `setMessages` + `onMessagesChange` for every chunk, i.e. one complete
+     * framework render per token. At 60 tok/s from a local model that is unusable,
+     * and nothing in the imperative API hinted that `appendToSegment` cost so much
+     * more than `injectTokenStream`. Consumers had to write their own rAF batcher.
+     *
+     * Any structural change flushes the buffer first (see
+     * {@link _flushStreamState}), so ordering is never observable.
+     */
     appendToSegment(segmentId: string, content: string): void;
+    /** Schedule the coalesced segment-state sync (idempotent within a frame). */
+    private _scheduleStreamFlush;
+    /**
+     * Write every buffered stream chunk — segment chunks and {@link streamTokens}
+     * text alike — into the framework's message list in **one** update. Called by
+     * the scheduled frame, and eagerly by any mutation that would otherwise observe
+     * a stale list (a new segment, a new message, a conversation swap): flushing
+     * first keeps the emitted order identical to the call order.
+     */
+    private _flushStreamState;
     /** Read the current message list. */
     getMessages(): AparteMessage[];
     /** Clear all messages + reset viewport state. */
@@ -148,8 +181,21 @@ export declare class AparteChatHost {
      * appends each token, completes the message at the end. Per-framework
      * wrappers adapt their native stream type (RxJS Observable, AsyncIterable,
      * ReadableStream) into this.
+     *
+     * Each token reaches the bubble immediately and the framework's message list
+     * is synced **once per frame** (same discipline as {@link appendToSegment}),
+     * with a guaranteed flush before completion and on abort. Before that sync
+     * existed the two disagreed: the DOM had the reply, the framework list still
+     * held `content: ''` — so any re-render from state wiped it, and a custom
+     * bubble (which renders from that state) showed nothing at all.
      */
     streamTokens(messageId: string, tokens: AsyncIterable<string>): Promise<void>;
+    /**
+     * Buffer a streamed token for the coalesced state sync. A different message id
+     * (a second stream started without stopping the first) flushes the previous
+     * one, so text never migrates between messages.
+     */
+    private _bufferToken;
     /** Abort an in-flight {@link streamTokens} loop. */
     stopTokenStream(): void;
     /**

package/dist/host/aparte-chat-host.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aparte-chat-host.d.ts","sourceRoot":"","sources":["../../src/host/aparte-chat-host.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"aparte-chat-host.d.ts","sourceRoot":"","sources":["../../src/host/aparte-chat-host.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,aAAa,EACb,aAAa,EAIhB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EACH,4BAA4B,EAE/B,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAyCpE;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IAClC,6EAA6E;IAC7E,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,4EAA4E;IAC5E,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,gFAAgF;IAChF,QAAQ,CAAC,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAC;IAEtC,kDAAkD;IAClD,WAAW,IAAI,aAAa,EAAE,CAAC;IAC/B,qEAAqE;IACrE,WAAW,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;IAE7C,2EAA2E;IAC3E,gBAAgB,CAAC,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;IACnD,6EAA6E;IAC7E,iBAAiB,CAAC,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC;IACjD,4CAA4C;IAC5C,cAAc,CAAC,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAC;IACzC,0DAA0D;IAC1D,iBAAiB,CAAC,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;IACrD,wEAAwE;IACxE,WAAW,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAClC,wEAAwE;IACxE,aAAa,CAAC,IAAI,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,qBAAqB;IAClC,0EAA0E;IAC1E,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,sEAAsE;IACtE,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,8EAA8E;IAC9E,qBAAqB,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;CAC9B;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,cAAc;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwB;IAChD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwB;IAEhD,wEAAwE;IACxE,OAAO,CAAC,YAAY,CAAuB;IAC3C,0EAA0E;IAC1E,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD,6EAA6E;IAC7E,OAAO,CAAC,gBAAgB,CAAC,CAAsB;IAC/C,+DAA+D;IAC/D,OAAO,CAAC,YAAY,CAAC,CAAkB;IACvC,+EAA+E;IAC/E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6B;IAC5D,+EAA+E;IAC/E,OAAO,CAAC,YAAY,CAAoD;IACxE,4EAA4E;IAC5E,OAAO,CAAC,YAAY,CAAuB;IAE3C,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,WAAW,CAAC,CAA+B;IACnD,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,MAAM,CAAS;gBAEX,OAAO,EAAE,qBAAqB,EAAE,OAAO,GAAE,qBAA0B;IAQ/E;;;;OAIG;IACH,IAAI,IAAI,MAAM,IAAI;IA0BlB,MAAM,IAAI,IAAI;IAed,IAAI,WAAW,IAAI,MAAM,GAAG,IAAI,CAA8B;IAC9D,IAAI,WAAW,IAAI,OAAO,CAAuC;IAEjE,gFAAgF;IAChF,IAAI,sBAAsB,IAAI,4BAA4B,GAAG,SAAS,CAErE;IAED,qFAAqF;IACrF,gBAAgB,IAAI,IAAI;IAIxB,OAAO,CAAC,eAAe;IAQvB,gEAAgE;IAChE,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAKnD,OAAO,CAAC,iBAAiB,CAAC,CAAa;IAEvC,OAAO,CAAC,iBAAiB;IAoCzB,yEAAyE;IACzE,OAAO,CAAC,sBAAsB;IAe9B;;;;;;;;;;;;OAYG;IACH,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IAO3C,gDAAgD;IAChD,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI;IAevE,gEAAgE;IAChE,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI;IAYxE,yEAAyE;IACzE,UAAU,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IAcxC,qDAAqD;IACrD,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI;IAevE,oEAAoE;IACpE,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAatC;;;;;;;;;;;;;;;;;OAiBG;IACH,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAczD,6EAA6E;IAC7E,OAAO,CAAC,oBAAoB;IAa5B;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IAgDzB,qCAAqC;IACrC,WAAW,IAAI,aAAa,EAAE;IAE9B,iDAAiD;IACjD,aAAa,IAAI,IAAI;IAMrB,0EAA0E;IAC1E,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKpC,iEAAiE;IACjE,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,GAAG,MAAM,GAAG,IAAI;IAK1E,wDAAwD;IACxD,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IASrC,6EAA6E;IAC7E,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAWnD;;;;;;;;;;;;OAYG;IACG,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAwCnF;;;;OAIG;IACH,OAAO,CAAC,YAAY;IAQpB,oDAAoD;IACpD,eAAe,IAAI,IAAI;IAavB;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAYnB;;;OAGG;IACH,oBAAoB,IAAI,IAAI;IAiB5B,OAAO,CAAC,qBAAqB;IAe7B,4EAA4E;IAC5E,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,GAAG;IAIX,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,mBAAmB;IAiB3B,OAAO,CAAC,0BAA0B;IAmClC,OAAO,CAAC,yBAAyB;CAqCpC"}

package/dist/{index-CW2BCAqn.js → index-BBg6dsYx.js}

@@ -1165,13 +1165,24 @@ class AparteConfigClass {
     return this._artifactPreviewBuilder;
   }
   /**
-   * Get the current icon provider, or a proxy that falls back to DEFAULT_ICON_FALLBACKS
+   * The icon set as a **complete** provider: every name resolves, falling back
+   * to `DEFAULT_ICON_FALLBACKS` for anything the registered provider doesn't
+   * implement. Callers (bubble action bar, composer controls) can therefore
+   * invoke `icons.copy()` unconditionally.
+   *
+   * It used to hand back the registered provider verbatim, so a provider that
+   * implemented a subset — which `getIcon()` has always supported, and which
+   * the type now states — crashed every other icon with
+   * "icons.retry is not a function".
    */
   getIconProvider() {
-    if (this._iconProvider) return this._iconProvider;
-    return Object.fromEntries(
-      Object.entries(DEFAULT_ICON_FALLBACKS).map(([k, v]) => [k, () => v])
-    );
+    const registered = this._iconProvider;
+    const complete = {};
+    for (const name of Object.keys(DEFAULT_ICON_FALLBACKS)) {
+      const fn = registered?.[name];
+      complete[name] = fn ?? (() => DEFAULT_ICON_FALLBACKS[name]);
+    }
+    return complete;
   }
   /**
    * Set a custom avatar renderer. Lets framework consumers (Angular,
@@ -1296,9 +1307,8 @@ class AparteConfigClass {
    * Falls back to textual representation if no provider is set
    */
   getIcon(name) {
-    if (this._iconProvider && this._iconProvider[name]) {
-      return this._iconProvider[name]();
-    }
+    const icon = this._iconProvider?.[name];
+    if (icon) return icon();
     return DEFAULT_ICON_FALLBACKS[name];
   }
   /**
@@ -3319,6 +3329,19 @@ class ConversationManager {
     return text.trim() || "New Chat";
   }
 }
+function attachmentId() {
+  return typeof crypto !== "undefined" && crypto.randomUUID ? crypto.randomUUID() : `${Date.now()}-${Math.random().toString(36).slice(2)}`;
+}
+function filesToAttachments(files) {
+  return files.map((file) => ({
+    id: attachmentId(),
+    name: file.name,
+    type: file.type || "application/octet-stream",
+    url: URL.createObjectURL(file),
+    size: file.size,
+    blob: file
+  }));
+}
 class AparteConversationController {
   _binding;
   _options;
@@ -3363,16 +3386,7 @@ class AparteConversationController {
       if (targetId && targetId !== this._binding.hostId) return;
       const content = evt.detail?.content ?? "";
       const files = evt.detail?.files;
-      const attachments = files?.length ? files.map((f) => ({
-        id: typeof crypto !== "undefined" && crypto.randomUUID ? crypto.randomUUID() : `${Date.now()}-${Math.random()}`,
-        name: f.name,
-        type: f.type || "application/octet-stream",
-        url: URL.createObjectURL(f),
-        size: f.size,
-        // Carry the raw File so the storage adapter can persist it
-        // to its attachments table; reload reconstructs `url`.
-        blob: f
-      })) : void 0;
+      const attachments = files?.length ? filesToAttachments(files) : void 0;
       const userMsg = {
         id: typeof crypto !== "undefined" && crypto.randomUUID ? crypto.randomUUID() : `${Date.now()}-${Math.random()}`,
         role: "user",
@@ -3622,6 +3636,12 @@ class AparteChatHost {
   _pendingSiblings;
   /** Abort handle for an in-flight {@link streamTokens} loop. */
   _streamAbort;
+  /** Segment chunks written to the bubble, awaiting one coalesced state sync. */
+  _segmentBuffer = /* @__PURE__ */ new Map();
+  /** {@link streamTokens} text written to the bubble, awaiting the same sync. */
+  _tokenBuffer = null;
+  /** Handle of the scheduled coalesced sync, or null when none is pending. */
+  _flushHandle = null;
   _conversationId = null;
   _controller;
   _teardown = [];
@@ -3734,6 +3754,9 @@ class AparteChatHost {
   }
   /** Drop transient streaming state so a new conversation starts clean. */
   _beginConversationSwap() {
+    this._segmentBuffer.clear();
+    this._tokenBuffer = null;
+    this._flushStreamState();
     this.stopTokenStream();
     this._setStreamingId(null);
     this.binding.onTypingChange?.(false);
@@ -3755,12 +3778,14 @@ class AparteChatHost {
    * is the append-specific signal instead.
    */
   appendMessage(message) {
+    this._flushStreamState();
     if (message.role === "user") this._vp()?.setAutoScroll?.(true);
     this.binding.setMessages([...this.binding.getMessages(), message]);
     this.binding.onMessageAppended?.(message);
   }
   /** Atomic partial update of a message by id. */
   updateMessage(messageId, updates) {
+    this._flushStreamState();
     const msgs = this.binding.getMessages();
     const index = msgs.findIndex((m) => m.id === messageId);
     if (index === -1) return;
@@ -3786,6 +3811,7 @@ class AparteChatHost {
   }
   /** Add a segment to the last message (immediate bubble + state sync). */
   addSegment(segment) {
+    this._flushStreamState();
     const msgs = this.binding.getMessages();
     const last = msgs[msgs.length - 1];
     if (last && this._isOrphan(last.id)) return;
@@ -3799,6 +3825,7 @@ class AparteChatHost {
   }
   /** Update a segment in the last message in place. */
   updateSegment(segmentId, updates) {
+    this._flushStreamState();
     const msgs = this.binding.getMessages();
     const last = msgs[msgs.length - 1];
     if (last && this._isOrphan(last.id)) return;
@@ -3813,6 +3840,7 @@ class AparteChatHost {
   }
   /** Remove a transient segment (e.g. pipeline-waiting indicator). */
   removeSegment(segmentId) {
+    this._flushStreamState();
     this._lastBubble()?.removeSegment?.(segmentId);
     const msgs = this.binding.getMessages();
     const last = msgs[msgs.length - 1];
@@ -3823,18 +3851,85 @@ class AparteChatHost {
     this.binding.setMessages(next);
     this.binding.onMessagesChange?.(next);
   }
-  /** Append text to a segment's content in the last message. */
+  /**
+   * Append text to a segment's content in the last message — the streaming path
+   * for thinking blocks, tool pills and any segment that grows token by token.
+   *
+   * Two writes, deliberately asymmetric:
+   *  1. straight into the bubble, every chunk, so the text appears immediately —
+   *     the same direct path `appendToken` uses;
+   *  2. into the framework's message list, **coalesced to once per frame**.
+   *
+   * It used to do only (2), synchronously: a full list rebuild plus
+   * `setMessages` + `onMessagesChange` for every chunk, i.e. one complete
+   * framework render per token. At 60 tok/s from a local model that is unusable,
+   * and nothing in the imperative API hinted that `appendToSegment` cost so much
+   * more than `injectTokenStream`. Consumers had to write their own rAF batcher.
+   *
+   * Any structural change flushes the buffer first (see
+   * {@link _flushStreamState}), so ordering is never observable.
+   */
   appendToSegment(segmentId, content) {
     const msgs = this.binding.getMessages();
     const last = msgs[msgs.length - 1];
     if (!last || !last.segments) return;
     if (this._isOrphan(last.id)) return;
-    const segments = last.segments.map(
-      (s) => s.id === segmentId && "content" in s ? { ...s, content: s.content + content } : s
-    );
-    const next = [...msgs.slice(0, -1), { ...last, segments }];
-    this.binding.setMessages(next);
-    this.binding.onMessagesChange?.(next);
+    this._vp()?.appendToSegment?.(last.id, segmentId, content);
+    this._segmentBuffer.set(segmentId, (this._segmentBuffer.get(segmentId) ?? "") + content);
+    this._scheduleStreamFlush();
+  }
+  /** Schedule the coalesced segment-state sync (idempotent within a frame). */
+  _scheduleStreamFlush() {
+    if (this._flushHandle !== null) return;
+    const run = () => {
+      this._flushHandle = null;
+      this._flushStreamState();
+    };
+    this._flushHandle = typeof requestAnimationFrame === "function" ? requestAnimationFrame(run) : setTimeout(run, 0);
+  }
+  /**
+   * Write every buffered stream chunk — segment chunks and {@link streamTokens}
+   * text alike — into the framework's message list in **one** update. Called by
+   * the scheduled frame, and eagerly by any mutation that would otherwise observe
+   * a stale list (a new segment, a new message, a conversation swap): flushing
+   * first keeps the emitted order identical to the call order.
+   */
+  _flushStreamState() {
+    if (this._flushHandle !== null) {
+      if (typeof cancelAnimationFrame === "function") cancelAnimationFrame(this._flushHandle);
+      else clearTimeout(this._flushHandle);
+      this._flushHandle = null;
+    }
+    const tokens = this._tokenBuffer;
+    const pending = this._segmentBuffer.size > 0 ? new Map(this._segmentBuffer) : null;
+    if (!tokens && !pending) return;
+    this._tokenBuffer = null;
+    this._segmentBuffer.clear();
+    let msgs = this.binding.getMessages();
+    let changed = false;
+    if (tokens) {
+      const index = msgs.findIndex((m) => m.id === tokens.messageId);
+      if (index !== -1) {
+        const next = [...msgs];
+        next[index] = { ...next[index], content: (next[index].content ?? "") + tokens.text };
+        msgs = next;
+        changed = true;
+      }
+    }
+    if (pending) {
+      const last = msgs[msgs.length - 1];
+      if (last?.segments) {
+        const segments = last.segments.map((s) => {
+          const chunk = pending.get(s.id);
+          return chunk !== void 0 && "content" in s ? { ...s, content: s.content + chunk } : s;
+        });
+        msgs = [...msgs.slice(0, -1), { ...last, segments }];
+        changed = true;
+      }
+    }
+    if (!changed) return;
+    this.binding.setMessages(msgs);
+    this.binding.onMessagesChange?.(msgs);
   }
   /** Read the current message list. */
   getMessages() {
@@ -3880,6 +3975,13 @@ class AparteChatHost {
    * appends each token, completes the message at the end. Per-framework
    * wrappers adapt their native stream type (RxJS Observable, AsyncIterable,
    * ReadableStream) into this.
+   *
+   * Each token reaches the bubble immediately and the framework's message list
+   * is synced **once per frame** (same discipline as {@link appendToSegment}),
+   * with a guaranteed flush before completion and on abort. Before that sync
+   * existed the two disagreed: the DOM had the reply, the framework list still
+   * held `content: ''` — so any re-render from state wiped it, and a custom
+   * bubble (which renders from that state) showed nothing at all.
    */
   async streamTokens(messageId, tokens) {
     this.stopTokenStream();
@@ -3899,10 +4001,13 @@ class AparteChatHost {
         const res = await Promise.race([iterator.next(), aborted]);
         if (res === "aborted" || ac.signal.aborted || res.done) break;
         this._vp()?.appendToken?.(messageId, res.value);
+        this._bufferToken(messageId, res.value);
       }
+      this._flushStreamState();
       if (!ac.signal.aborted) this._vp()?.completeMessage?.(messageId);
       this._setStreamingId(null);
     } catch (err) {
+      this._flushStreamState();
       this._setStreamingId(null);
       throw err;
     } finally {
@@ -3915,11 +4020,22 @@ class AparteChatHost {
       if (this._streamAbort === ac) this._streamAbort = void 0;
     }
   }
+  /**
+   * Buffer a streamed token for the coalesced state sync. A different message id
+   * (a second stream started without stopping the first) flushes the previous
+   * one, so text never migrates between messages.
+   */
+  _bufferToken(messageId, chunk) {
+    if (this._tokenBuffer && this._tokenBuffer.messageId !== messageId) this._flushStreamState();
+    this._tokenBuffer = this._tokenBuffer ? { messageId, text: this._tokenBuffer.text + chunk } : { messageId, text: chunk };
+    this._scheduleStreamFlush();
+  }
   /** Abort an in-flight {@link streamTokens} loop. */
   stopTokenStream() {
     if (this._streamAbort) {
       this._streamAbort.abort();
       this._streamAbort = void 0;
+      this._flushStreamState();
       this._setStreamingId(null);
     }
   }
@@ -4864,8 +4980,9 @@ ${summary}`,
     const targetId = event.detail?.targetId;
     if (targetId) {
       const byId = document.getElementById(targetId);
-      if (byId && typeof byId.appendMessage === "function") {
-        targetElement = byId;
+      const resolved = this._asRenderTarget(byId);
+      if (resolved) {
+        targetElement = resolved;
       } else {
         console.warn("[AparteClient] ⚠️ targetId present but element not found or missing appendMessage:", targetId);
       }
@@ -6093,6 +6210,10 @@ function applyElementProps(el2, props, transformValue = (value) => value) {
     }
   }
 }
+function isAwaitingReply(message) {
+  if (message.status === "streaming" || message.status === "pending") return true;
+  return message.status === void 0 && message.role === "assistant" && !message.content?.trim() && !message.segments?.length;
+}
 function el(tag, className, text) {
   const node = document.createElement(tag);
   if (className) node.className = className;
@@ -6279,18 +6400,20 @@ export {
   BackendTransport as B,
   ConversationManager as C,
   DEFAULT_ICON_FALLBACKS as D,
-  isSafeUrl as E,
-  parseAparteEventStream as F,
-  parseMarkdownToSegments as G,
-  populateBubbleFromMessage as H,
-  readableToAsyncIterable as I,
-  registerDefaultRenderers as J,
-  registerSegmentRenderer as K,
-  requestUserInput as L,
+  isAwaitingReply as E,
+  isFormatAdapter as F,
+  isSafeUrl as G,
+  parseAparteEventStream as H,
+  parseMarkdownToSegments as I,
+  populateBubbleFromMessage as J,
+  readableToAsyncIterable as K,
+  registerDefaultRenderers as L,
   MessageRepository as M,
-  resolveConfig as N,
-  runWithConfig as O,
-  unregisterSegmentRenderer as P,
+  registerSegmentRenderer as N,
+  requestUserInput as O,
+  resolveConfig as P,
+  runWithConfig as Q,
+  unregisterSegmentRenderer as R,
   APARTE_HOST_ATTR as a,
   AparteChatHost as b,
   AparteClient as c,
@@ -6315,7 +6438,7 @@ export {
   defaultSanitizer as v,
   deriveArtifactKind as w,
   detachConfig as x,
-  getSegmentRenderer as y,
-  isFormatAdapter as z
+  filesToAttachments as y,
+  getSegmentRenderer as z
 };
-//# sourceMappingURL=index-CW2BCAqn.js.map
+//# sourceMappingURL=index-BBg6dsYx.js.map