bunnyquery 1.4.3 → 1.4.5

package/bunnyquery.js

@@ -1090,11 +1090,17 @@ ${options.inlineContentPlaceholder}
     }
     dispatchAgentRequest(params) {
       var self = this;
+      var dispatchItemId;
       var sendAndPoll = function() {
         return Promise.resolve(
           self._callProviderFor(params.aiPlatform, params.text, params.boundedMessages, params.systemPrompt, params.aiModel, params.userId, params.extractContent)
         ).then(function(initial) {
           if (initial && initial.poll && (initial.status === "pending" || initial.status === "running")) {
+            if (initial.id) {
+              if (dispatchItemId && dispatchItemId !== initial.id) self.historyItemPolls.delete(dispatchItemId);
+              dispatchItemId = initial.id;
+              self.historyItemPolls.set(initial.id, true);
+            }
             return initial.poll({ latency: POLL_INTERVAL });
           }
           return initial;
@@ -1116,13 +1122,39 @@ ${options.inlineContentPlaceholder}
       }).catch(function(err) {
         return { content: getErrorMessage(err), isError: true };
       }).then(function(result) {
-        var existing = self.aiChatHistoryCache[params.key] || { messages: [], endOfList: false, startKeyHistory: [] };
-        self.aiChatHistoryCache[params.key] = {
-          messages: existing.messages.concat([{ role: "assistant", content: result.content, isError: result.isError }]),
-          endOfList: existing.endOfList,
-          startKeyHistory: existing.startKeyHistory
-        };
         delete self.pendingAgentRequests[params.key];
+        if (dispatchItemId) self.historyItemPolls.delete(dispatchItemId);
+        var existing = self.aiChatHistoryCache[params.key] || { messages: [], endOfList: false, startKeyHistory: [] };
+        var reply = { role: "assistant", content: result.content, isError: result.isError };
+        var onThisVisibleChat = self.host.isViewMounted() && self.getHistoryCacheKey() === params.key;
+        if (onThisVisibleChat) {
+          self.aiChatHistoryCache[params.key] = {
+            messages: existing.messages.concat([reply]),
+            endOfList: existing.endOfList,
+            startKeyHistory: existing.startKeyHistory
+          };
+        } else {
+          var msgs = existing.messages.slice();
+          var idx = -1;
+          for (var i = msgs.length - 1; i >= 0; i--) {
+            var m = msgs[i];
+            if (m && m.isPending && m.role === "assistant" && !m.isBackgroundTask) {
+              idx = i;
+              break;
+            }
+          }
+          if (idx !== -1) {
+            reply._serverItemId = msgs[idx]._serverItemId;
+            msgs[idx] = reply;
+          } else {
+            msgs.push(reply);
+          }
+          self.aiChatHistoryCache[params.key] = {
+            messages: msgs,
+            endOfList: existing.endOfList,
+            startKeyHistory: existing.startKeyHistory
+          };
+        }
         return result;
       });
       this.pendingAgentRequests[params.key] = run;
@@ -1175,6 +1207,7 @@ ${options.inlineContentPlaceholder}
             self.host.notify();
           }
           if (result && result.poll && (result.status === "pending" || result.status === "running")) {
+            if (serverId) self.historyItemPolls.set(serverId, true);
             return result.poll({ latency: POLL_INTERVAL }).then(function(res) {
               return self.onQueuedSendResponse(capturedComposed, res, capturedPlatform, serverId);
             }).catch(function(err) {
@@ -1212,7 +1245,6 @@ ${options.inlineContentPlaceholder}
         serviceId: id.serviceId,
         history: historyForLlm
       });
-      var requestToken = this.state.gateRefreshToken;
       var run = this.dispatchAgentRequest({
         key,
         serviceId: id.serviceId,
@@ -1227,7 +1259,7 @@ ${options.inlineContentPlaceholder}
       });
       Promise.resolve(run).catch(function() {
       }).then(function() {
-        if (requestToken !== self.state.gateRefreshToken || self.getHistoryCacheKey() !== key) return;
+        if (!(self.host.isViewMounted() && self.getHistoryCacheKey() === key)) return;
         self.state.sending = false;
         return Promise.resolve(self.typewriteLatestReply(key)).then(function() {
           self.host.scrollToBottom(true);
@@ -1315,6 +1347,7 @@ ${options.inlineContentPlaceholder}
       else this.state.messages.push(msg);
     }
     onQueuedSendResponse(_composed, response, platform, serverId) {
+      if (serverId) this.historyItemPolls.delete(serverId);
       var targetIdx = this.resolveQueuedUserBubble(serverId);
       if (targetIdx === void 0) {
         this.host.notify();
@@ -1349,6 +1382,7 @@ ${options.inlineContentPlaceholder}
       this.host.scrollToBottom(true);
     }
     onQueuedSendError(_composed, err, serverId) {
+      if (serverId) this.historyItemPolls.delete(serverId);
       var isNotExists = err && (err.code === "NOT_EXISTS" || err.body && err.body.code === "NOT_EXISTS");
       if (isNotExists) {
         var userIdx = serverId ? this.state.messages.findIndex(function(m) {
@@ -1841,7 +1875,7 @@ ${options.inlineContentPlaceholder}
             if (item.status !== "running" && item.status !== "pending") return;
             if (!item.poll || !item.id) return;
             if (self.historyItemPolls.has(item.id)) return;
-            if (item.status === "running" && self.pendingAgentRequests[self.getHistoryCacheKey()]) return;
+            if ((item.status === "running" || item.status === "pending") && self.pendingAgentRequests[self.getHistoryCacheKey()]) return;
             self.historyItemPolls.set(item.id, true);
             var capturedId = item.id;
             var pp = item.poll({
@@ -2084,7 +2118,7 @@ ${options.inlineContentPlaceholder}
   (function() {
     var MCP_PROD = "https://mcp.broadwayinc.computer";
     var MCP_DEV = "https://mcp-dev.broadwayinc.computer";
-    var BQ_VERSION = "1.4.3" ;
+    var BQ_VERSION = "1.4.5" ;
     var ATTACHMENT_URL_EXPIRES_SECONDS = 600;
     var GOOGLE_AUTH_URL = "https://accounts.google.com/o/oauth2/v2/auth";
     var GOOGLE_TOKEN_URL = "https://oauth2.googleapis.com/token";

package/dist/engine.cjs

@@ -1124,11 +1124,17 @@ var ChatSession = class {
   }
   dispatchAgentRequest(params) {
     var self = this;
+    var dispatchItemId;
     var sendAndPoll = function() {
       return Promise.resolve(
         self._callProviderFor(params.aiPlatform, params.text, params.boundedMessages, params.systemPrompt, params.aiModel, params.userId, params.extractContent)
       ).then(function(initial) {
         if (initial && initial.poll && (initial.status === "pending" || initial.status === "running")) {
+          if (initial.id) {
+            if (dispatchItemId && dispatchItemId !== initial.id) self.historyItemPolls.delete(dispatchItemId);
+            dispatchItemId = initial.id;
+            self.historyItemPolls.set(initial.id, true);
+          }
           return initial.poll({ latency: POLL_INTERVAL });
         }
         return initial;
@@ -1150,13 +1156,39 @@ var ChatSession = class {
     }).catch(function(err) {
       return { content: getErrorMessage(err), isError: true };
     }).then(function(result) {
-      var existing = self.aiChatHistoryCache[params.key] || { messages: [], endOfList: false, startKeyHistory: [] };
-      self.aiChatHistoryCache[params.key] = {
-        messages: existing.messages.concat([{ role: "assistant", content: result.content, isError: result.isError }]),
-        endOfList: existing.endOfList,
-        startKeyHistory: existing.startKeyHistory
-      };
       delete self.pendingAgentRequests[params.key];
+      if (dispatchItemId) self.historyItemPolls.delete(dispatchItemId);
+      var existing = self.aiChatHistoryCache[params.key] || { messages: [], endOfList: false, startKeyHistory: [] };
+      var reply = { role: "assistant", content: result.content, isError: result.isError };
+      var onThisVisibleChat = self.host.isViewMounted() && self.getHistoryCacheKey() === params.key;
+      if (onThisVisibleChat) {
+        self.aiChatHistoryCache[params.key] = {
+          messages: existing.messages.concat([reply]),
+          endOfList: existing.endOfList,
+          startKeyHistory: existing.startKeyHistory
+        };
+      } else {
+        var msgs = existing.messages.slice();
+        var idx = -1;
+        for (var i = msgs.length - 1; i >= 0; i--) {
+          var m = msgs[i];
+          if (m && m.isPending && m.role === "assistant" && !m.isBackgroundTask) {
+            idx = i;
+            break;
+          }
+        }
+        if (idx !== -1) {
+          reply._serverItemId = msgs[idx]._serverItemId;
+          msgs[idx] = reply;
+        } else {
+          msgs.push(reply);
+        }
+        self.aiChatHistoryCache[params.key] = {
+          messages: msgs,
+          endOfList: existing.endOfList,
+          startKeyHistory: existing.startKeyHistory
+        };
+      }
       return result;
     });
     this.pendingAgentRequests[params.key] = run;
@@ -1209,6 +1241,7 @@ var ChatSession = class {
           self.host.notify();
         }
         if (result && result.poll && (result.status === "pending" || result.status === "running")) {
+          if (serverId) self.historyItemPolls.set(serverId, true);
           return result.poll({ latency: POLL_INTERVAL }).then(function(res) {
             return self.onQueuedSendResponse(capturedComposed, res, capturedPlatform, serverId);
           }).catch(function(err) {
@@ -1246,7 +1279,6 @@ var ChatSession = class {
       serviceId: id.serviceId,
       history: historyForLlm
     });
-    var requestToken = this.state.gateRefreshToken;
     var run = this.dispatchAgentRequest({
       key,
       serviceId: id.serviceId,
@@ -1261,7 +1293,7 @@ var ChatSession = class {
     });
     Promise.resolve(run).catch(function() {
     }).then(function() {
-      if (requestToken !== self.state.gateRefreshToken || self.getHistoryCacheKey() !== key) return;
+      if (!(self.host.isViewMounted() && self.getHistoryCacheKey() === key)) return;
       self.state.sending = false;
       return Promise.resolve(self.typewriteLatestReply(key)).then(function() {
         self.host.scrollToBottom(true);
@@ -1349,6 +1381,7 @@ var ChatSession = class {
     else this.state.messages.push(msg);
   }
   onQueuedSendResponse(_composed, response, platform, serverId) {
+    if (serverId) this.historyItemPolls.delete(serverId);
     var targetIdx = this.resolveQueuedUserBubble(serverId);
     if (targetIdx === void 0) {
       this.host.notify();
@@ -1383,6 +1416,7 @@ var ChatSession = class {
     this.host.scrollToBottom(true);
   }
   onQueuedSendError(_composed, err, serverId) {
+    if (serverId) this.historyItemPolls.delete(serverId);
     var isNotExists = err && (err.code === "NOT_EXISTS" || err.body && err.body.code === "NOT_EXISTS");
     if (isNotExists) {
       var userIdx = serverId ? this.state.messages.findIndex(function(m) {
@@ -1875,7 +1909,7 @@ var ChatSession = class {
           if (item.status !== "running" && item.status !== "pending") return;
           if (!item.poll || !item.id) return;
           if (self.historyItemPolls.has(item.id)) return;
-          if (item.status === "running" && self.pendingAgentRequests[self.getHistoryCacheKey()]) return;
+          if ((item.status === "running" || item.status === "pending") && self.pendingAgentRequests[self.getHistoryCacheKey()]) return;
           self.historyItemPolls.set(item.id, true);
           var capturedId = item.id;
           var pp = item.poll({