bunnyquery 1.3.4 → 1.3.5

package/bunnyquery.js

@@ -1221,6 +1221,7 @@ ${options.inlineContentPlaceholder}
           this.enqueueTypewrite(aiIdx, answer, lid);
         }
       }
+      this._removeStrayPendingAssistants();
       this.promoteNextQueuedToRunning();
       this.updateHistoryCache();
       this.host.notify();
@@ -1263,6 +1264,7 @@ ${options.inlineContentPlaceholder}
           if (thPos2 !== -1) this.state.messages.splice(thPos2, 1);
         }
         if (serverId) this.cancelledServerIds.delete(serverId);
+        this._removeStrayPendingAssistants();
         this.promoteNextQueuedToRunning();
         this.updateHistoryCache();
         this.host.notify();
@@ -1276,6 +1278,7 @@ ${options.inlineContentPlaceholder}
         return;
       }
       this.insertAtTarget({ role: "assistant", content: getErrorMessage(err), isError: true }, targetIdx);
+      this._removeStrayPendingAssistants();
       this.promoteNextQueuedToRunning();
       this.updateHistoryCache();
       this.host.notify();
@@ -1437,16 +1440,48 @@ ${options.inlineContentPlaceholder}
       if (pendingIdx === -1) return Promise.resolve();
       if (latest.isError || !latest.content) {
         this.state.messages[pendingIdx] = { role: "assistant", content: latest.content || "", isError: !!latest.isError };
+        this._removeStrayPendingAssistants();
         this.host.notify();
         this.promoteNextQueuedToRunning();
         return Promise.resolve();
       }
       var lid = this._newLocalId();
       this.state.messages[pendingIdx] = { role: "assistant", content: "", isPending: false, _localId: lid };
+      this._removeStrayPendingAssistants();
       this.host.notify();
       this.promoteNextQueuedToRunning();
       return this.enqueueTypewrite(pendingIdx, latest.content, lid);
     }
+    // Remove any leftover non-background pending ("Thinking…") assistant bubbles.
+    // There is normally at most ONE such bubble at a time (promoteNext* refuses to
+    // add a second), so any extra is a duplicate — it appears when a concurrent
+    // history refetch re-maps the still-"running" turn into a pending placeholder
+    // (with a real _serverItemId) while the local pending bubble (no _serverItemId)
+    // is rescued and re-appended (see loadHistory rescue below). Each resolve path
+    // only replaces the FIRST pending bubble, so without this a stray "Thinking…"
+    // survives next to the reply/error. MUST run AFTER the resolved bubble has been
+    // made non-pending and BEFORE promoteNext*() (so a freshly-promoted Thinking,
+    // which is added only once no pending assistant remains, is preserved).
+    _removeStrayPendingAssistants() {
+      for (var k = this.state.messages.length - 1; k >= 0; k--) {
+        var m = this.state.messages[k];
+        if (m.isPending && m.role === "assistant" && !m.isBackgroundTask) this.state.messages.splice(k, 1);
+      }
+    }
+    // Drop the pending flags on the resolved turn's USER bubble (preserving its
+    // content + background-task marker). Needed because a bg "Indexing:" turn's user
+    // bubble carries isPendingInProcess; leaving it set keeps the bubble visually
+    // stuck and keeps its bgTaskQueue entry alive forever.
+    _clearPendingUserBubble(itemId) {
+      var uIdx = this.state.messages.findIndex(function(m) {
+        return m.role === "user" && m._serverItemId === itemId && (m.isPendingInProcess || m.isPendingQueued || m.isSendingToServer);
+      });
+      if (uIdx === -1) return;
+      var u = this.state.messages[uIdx];
+      var cleaned = { role: "user", content: u.content, _serverItemId: itemId };
+      if (u.isBackgroundTask) cleaned.isBackgroundTask = true;
+      this.state.messages[uIdx] = cleaned;
+    }
     // If an immediate-send request for the current cache key is still in flight
     // (e.g. the view unmounted then remounted mid-request), show the sending
     // state, await it, then render the reply from the cache. Skipped when the
@@ -1485,6 +1520,7 @@ ${options.inlineContentPlaceholder}
         return m.isPending && m._serverItemId === itemId;
       });
       if (idx !== -1) {
+        this._clearPendingUserBubble(itemId);
         if (isErr) {
           this.state.messages[idx] = { role: "assistant", content: answer, isError: true, _serverItemId: itemId };
           this.host.notify();
@@ -1634,12 +1670,16 @@ ${options.inlineContentPlaceholder}
           self.state.messages.forEach(function(m) {
             if (m.isCancelled && m._serverItemId) locallyCancelled[m._serverItemId] = 1;
           });
+          var mappedHasPendingAssistant = mapped.some(function(m) {
+            return m.isPending && m.role === "assistant" && !m.isBackgroundTask;
+          });
           var rescued = [];
           for (var ri = 0; ri < self.state.messages.length; ri++) {
             var mm = self.state.messages[ri];
             if (mm.isBackgroundTask) continue;
             if (mm._serverItemId && serverIds[mm._serverItemId]) continue;
             if (!mm._serverItemId) {
+              if (mappedHasPendingAssistant) continue;
               if (mm.isSendingToServer || mm.isPendingQueued || mm.isPendingInProcess || mm.isPending) rescued.push(mm);
               else if (self.state.sending && mm.role === "user") {
                 var next = self.state.messages[ri + 1];

package/dist/engine.cjs

@@ -1248,6 +1248,7 @@ var ChatSession = class {
         this.enqueueTypewrite(aiIdx, answer, lid);
       }
     }
+    this._removeStrayPendingAssistants();
     this.promoteNextQueuedToRunning();
     this.updateHistoryCache();
     this.host.notify();
@@ -1290,6 +1291,7 @@ var ChatSession = class {
         if (thPos2 !== -1) this.state.messages.splice(thPos2, 1);
       }
       if (serverId) this.cancelledServerIds.delete(serverId);
+      this._removeStrayPendingAssistants();
       this.promoteNextQueuedToRunning();
       this.updateHistoryCache();
       this.host.notify();
@@ -1303,6 +1305,7 @@ var ChatSession = class {
       return;
     }
     this.insertAtTarget({ role: "assistant", content: getErrorMessage(err), isError: true }, targetIdx);
+    this._removeStrayPendingAssistants();
     this.promoteNextQueuedToRunning();
     this.updateHistoryCache();
     this.host.notify();
@@ -1464,16 +1467,48 @@ var ChatSession = class {
     if (pendingIdx === -1) return Promise.resolve();
     if (latest.isError || !latest.content) {
       this.state.messages[pendingIdx] = { role: "assistant", content: latest.content || "", isError: !!latest.isError };
+      this._removeStrayPendingAssistants();
       this.host.notify();
       this.promoteNextQueuedToRunning();
       return Promise.resolve();
     }
     var lid = this._newLocalId();
     this.state.messages[pendingIdx] = { role: "assistant", content: "", isPending: false, _localId: lid };
+    this._removeStrayPendingAssistants();
     this.host.notify();
     this.promoteNextQueuedToRunning();
     return this.enqueueTypewrite(pendingIdx, latest.content, lid);
   }
+  // Remove any leftover non-background pending ("Thinking…") assistant bubbles.
+  // There is normally at most ONE such bubble at a time (promoteNext* refuses to
+  // add a second), so any extra is a duplicate — it appears when a concurrent
+  // history refetch re-maps the still-"running" turn into a pending placeholder
+  // (with a real _serverItemId) while the local pending bubble (no _serverItemId)
+  // is rescued and re-appended (see loadHistory rescue below). Each resolve path
+  // only replaces the FIRST pending bubble, so without this a stray "Thinking…"
+  // survives next to the reply/error. MUST run AFTER the resolved bubble has been
+  // made non-pending and BEFORE promoteNext*() (so a freshly-promoted Thinking,
+  // which is added only once no pending assistant remains, is preserved).
+  _removeStrayPendingAssistants() {
+    for (var k = this.state.messages.length - 1; k >= 0; k--) {
+      var m = this.state.messages[k];
+      if (m.isPending && m.role === "assistant" && !m.isBackgroundTask) this.state.messages.splice(k, 1);
+    }
+  }
+  // Drop the pending flags on the resolved turn's USER bubble (preserving its
+  // content + background-task marker). Needed because a bg "Indexing:" turn's user
+  // bubble carries isPendingInProcess; leaving it set keeps the bubble visually
+  // stuck and keeps its bgTaskQueue entry alive forever.
+  _clearPendingUserBubble(itemId) {
+    var uIdx = this.state.messages.findIndex(function(m) {
+      return m.role === "user" && m._serverItemId === itemId && (m.isPendingInProcess || m.isPendingQueued || m.isSendingToServer);
+    });
+    if (uIdx === -1) return;
+    var u = this.state.messages[uIdx];
+    var cleaned = { role: "user", content: u.content, _serverItemId: itemId };
+    if (u.isBackgroundTask) cleaned.isBackgroundTask = true;
+    this.state.messages[uIdx] = cleaned;
+  }
   // If an immediate-send request for the current cache key is still in flight
   // (e.g. the view unmounted then remounted mid-request), show the sending
   // state, await it, then render the reply from the cache. Skipped when the
@@ -1512,6 +1547,7 @@ var ChatSession = class {
       return m.isPending && m._serverItemId === itemId;
     });
     if (idx !== -1) {
+      this._clearPendingUserBubble(itemId);
       if (isErr) {
         this.state.messages[idx] = { role: "assistant", content: answer, isError: true, _serverItemId: itemId };
         this.host.notify();
@@ -1661,12 +1697,16 @@ var ChatSession = class {
         self.state.messages.forEach(function(m) {
           if (m.isCancelled && m._serverItemId) locallyCancelled[m._serverItemId] = 1;
         });
+        var mappedHasPendingAssistant = mapped.some(function(m) {
+          return m.isPending && m.role === "assistant" && !m.isBackgroundTask;
+        });
         var rescued = [];
         for (var ri = 0; ri < self.state.messages.length; ri++) {
           var mm = self.state.messages[ri];
           if (mm.isBackgroundTask) continue;
           if (mm._serverItemId && serverIds[mm._serverItemId]) continue;
           if (!mm._serverItemId) {
+            if (mappedHasPendingAssistant) continue;
             if (mm.isSendingToServer || mm.isPendingQueued || mm.isPendingInProcess || mm.isPending) rescued.push(mm);
             else if (self.state.sending && mm.role === "user") {
               var next = self.state.messages[ri + 1];