bunnyquery 1.3.2 → 1.3.5

package/dist/engine.d.mts

@@ -162,6 +162,7 @@ declare function buildIndexingUserMessage(attachment: IndexingAttachmentInfo, op
  */
 declare function getErrorMessage(input: any): string;
 declare function isErrorResponseBody(response: any): boolean;
+declare function isNonRetryableRequestError(input: any): boolean;
 declare function isAuthExpiredError(input: any): boolean;
 
 declare var CONTEXT_WINDOW_DEFAULT: Record<string, number>;
@@ -474,6 +475,8 @@ declare class ChatSession {
     private typewriterQueue;
     enqueueTypewrite(idx: number, fullText: string, localId?: string): Promise<any>;
     typewriteLatestReply(key: string): Promise<any>;
+    _removeStrayPendingAssistants(): void;
+    _clearPendingUserBubble(itemId: string): void;
     resumePendingRequest(token: number): Promise<void>;
     handleHistoryItemResolution(itemId: string, response: any, platform: string): void;
     applyHistoryItemResolution(itemId: string, response: any, platform: string): void;
@@ -493,4 +496,4 @@ declare class ChatSession {
     bumpGate(): void;
 }
 
-export { type AttachmentFailureGroup, type AttachmentSaveInfo, BG_INDEXING_QUEUE_SUFFIX, type BgTaskEntry, type BoundedChatOptions, type BuildIndexingUserMessageOptions, CLAUDE_PER_REQUEST_INPUT_CAP, CONTEXT_WINDOW_BY_MODEL, CONTEXT_WINDOW_DEFAULT, type CallClaudeWithMcpParams, type ChatEngineConfig, type ChatHost, type ChatIdentity, type ChatMessage, ChatSession, type ChatState, type ChatSystemPromptParams, type ClaudeMcpServerRequest, type ClaudeMcpToolConfig, type ClaudeMessage, type ClaudeRole, type ComposedUserMessage, DEFAULT_CLAUDE_MODEL, DEFAULT_OPENAI_MODEL, EXPIRED_ATTACHMENT_URL_HOST, EXPIRED_ATTACHMENT_URL_ORIGIN, type ExtractDirective, HISTORY_TOKEN_BUDGET, type IndexingAttachmentInfo, type IndexingSystemPromptParams, LINK_LABEL_MAX_DISPLAY_CHARS, MAX_HISTORY_MESSAGES, MCP_NAME, MIN_INPUT_TOKEN_BUDGET, type MapHistoryOptions, OUTPUT_TOKEN_RESERVE, type OpenAIMessage, POLL_INTERVAL, TOOL_AND_RESPONSE_BUFFER, buildBoundedChatMessages, buildChatSystemPrompt, buildDisplayExpiredAttachmentHref, buildIndexingSystemPrompt, buildIndexingUserMessage, callClaudeWithMcp, callClaudeWithPublicMcp, callOpenAIWithPublicMcp, chatEngineConfig, composeUserMessage, configureChatEngine, createInlineLinkRegex, encodePathSegments, estimateMessageTokens, estimateTextTokens, extractClaudeText, extractLastUserTextFromRequest, extractOpenAIText, extractRemotePathFromAttachmentHref, filterListByClearHorizon, getChatHistory, getContextWindow, getErrorMessage, getExpiredAttachmentVisiblePath, groupAttachmentFailures, isAuthExpiredError, isErrorResponseBody, isOfficeFile, listClaudeModels, listOpenAIModels, makeExtractPlaceholder, mapHistoryListToMessages, normalizeAttachmentPathCandidate, normalizeTextContent, notifyAgentSaveAttachment, safeDecodeURIComponent, sanitizeAttachmentLinksForHistory, stripFileBlocksFromHistory, transformContentWithImages, transformContentWithOpenAIImages, truncateLabelForDisplay };
+export { type AttachmentFailureGroup, type AttachmentSaveInfo, BG_INDEXING_QUEUE_SUFFIX, type BgTaskEntry, type BoundedChatOptions, type BuildIndexingUserMessageOptions, CLAUDE_PER_REQUEST_INPUT_CAP, CONTEXT_WINDOW_BY_MODEL, CONTEXT_WINDOW_DEFAULT, type CallClaudeWithMcpParams, type ChatEngineConfig, type ChatHost, type ChatIdentity, type ChatMessage, ChatSession, type ChatState, type ChatSystemPromptParams, type ClaudeMcpServerRequest, type ClaudeMcpToolConfig, type ClaudeMessage, type ClaudeRole, type ComposedUserMessage, DEFAULT_CLAUDE_MODEL, DEFAULT_OPENAI_MODEL, EXPIRED_ATTACHMENT_URL_HOST, EXPIRED_ATTACHMENT_URL_ORIGIN, type ExtractDirective, HISTORY_TOKEN_BUDGET, type IndexingAttachmentInfo, type IndexingSystemPromptParams, LINK_LABEL_MAX_DISPLAY_CHARS, MAX_HISTORY_MESSAGES, MCP_NAME, MIN_INPUT_TOKEN_BUDGET, type MapHistoryOptions, OUTPUT_TOKEN_RESERVE, type OpenAIMessage, POLL_INTERVAL, TOOL_AND_RESPONSE_BUFFER, buildBoundedChatMessages, buildChatSystemPrompt, buildDisplayExpiredAttachmentHref, buildIndexingSystemPrompt, buildIndexingUserMessage, callClaudeWithMcp, callClaudeWithPublicMcp, callOpenAIWithPublicMcp, chatEngineConfig, composeUserMessage, configureChatEngine, createInlineLinkRegex, encodePathSegments, estimateMessageTokens, estimateTextTokens, extractClaudeText, extractLastUserTextFromRequest, extractOpenAIText, extractRemotePathFromAttachmentHref, filterListByClearHorizon, getChatHistory, getContextWindow, getErrorMessage, getExpiredAttachmentVisiblePath, groupAttachmentFailures, isAuthExpiredError, isErrorResponseBody, isNonRetryableRequestError, isOfficeFile, listClaudeModels, listOpenAIModels, makeExtractPlaceholder, mapHistoryListToMessages, normalizeAttachmentPathCandidate, normalizeTextContent, notifyAgentSaveAttachment, safeDecodeURIComponent, sanitizeAttachmentLinksForHistory, stripFileBlocksFromHistory, transformContentWithImages, transformContentWithOpenAIImages, truncateLabelForDisplay };

package/dist/engine.d.ts

@@ -162,6 +162,7 @@ declare function buildIndexingUserMessage(attachment: IndexingAttachmentInfo, op
  */
 declare function getErrorMessage(input: any): string;
 declare function isErrorResponseBody(response: any): boolean;
+declare function isNonRetryableRequestError(input: any): boolean;
 declare function isAuthExpiredError(input: any): boolean;
 
 declare var CONTEXT_WINDOW_DEFAULT: Record<string, number>;
@@ -474,6 +475,8 @@ declare class ChatSession {
     private typewriterQueue;
     enqueueTypewrite(idx: number, fullText: string, localId?: string): Promise<any>;
     typewriteLatestReply(key: string): Promise<any>;
+    _removeStrayPendingAssistants(): void;
+    _clearPendingUserBubble(itemId: string): void;
     resumePendingRequest(token: number): Promise<void>;
     handleHistoryItemResolution(itemId: string, response: any, platform: string): void;
     applyHistoryItemResolution(itemId: string, response: any, platform: string): void;
@@ -493,4 +496,4 @@ declare class ChatSession {
     bumpGate(): void;
 }
 
-export { type AttachmentFailureGroup, type AttachmentSaveInfo, BG_INDEXING_QUEUE_SUFFIX, type BgTaskEntry, type BoundedChatOptions, type BuildIndexingUserMessageOptions, CLAUDE_PER_REQUEST_INPUT_CAP, CONTEXT_WINDOW_BY_MODEL, CONTEXT_WINDOW_DEFAULT, type CallClaudeWithMcpParams, type ChatEngineConfig, type ChatHost, type ChatIdentity, type ChatMessage, ChatSession, type ChatState, type ChatSystemPromptParams, type ClaudeMcpServerRequest, type ClaudeMcpToolConfig, type ClaudeMessage, type ClaudeRole, type ComposedUserMessage, DEFAULT_CLAUDE_MODEL, DEFAULT_OPENAI_MODEL, EXPIRED_ATTACHMENT_URL_HOST, EXPIRED_ATTACHMENT_URL_ORIGIN, type ExtractDirective, HISTORY_TOKEN_BUDGET, type IndexingAttachmentInfo, type IndexingSystemPromptParams, LINK_LABEL_MAX_DISPLAY_CHARS, MAX_HISTORY_MESSAGES, MCP_NAME, MIN_INPUT_TOKEN_BUDGET, type MapHistoryOptions, OUTPUT_TOKEN_RESERVE, type OpenAIMessage, POLL_INTERVAL, TOOL_AND_RESPONSE_BUFFER, buildBoundedChatMessages, buildChatSystemPrompt, buildDisplayExpiredAttachmentHref, buildIndexingSystemPrompt, buildIndexingUserMessage, callClaudeWithMcp, callClaudeWithPublicMcp, callOpenAIWithPublicMcp, chatEngineConfig, composeUserMessage, configureChatEngine, createInlineLinkRegex, encodePathSegments, estimateMessageTokens, estimateTextTokens, extractClaudeText, extractLastUserTextFromRequest, extractOpenAIText, extractRemotePathFromAttachmentHref, filterListByClearHorizon, getChatHistory, getContextWindow, getErrorMessage, getExpiredAttachmentVisiblePath, groupAttachmentFailures, isAuthExpiredError, isErrorResponseBody, isOfficeFile, listClaudeModels, listOpenAIModels, makeExtractPlaceholder, mapHistoryListToMessages, normalizeAttachmentPathCandidate, normalizeTextContent, notifyAgentSaveAttachment, safeDecodeURIComponent, sanitizeAttachmentLinksForHistory, stripFileBlocksFromHistory, transformContentWithImages, transformContentWithOpenAIImages, truncateLabelForDisplay };
+export { type AttachmentFailureGroup, type AttachmentSaveInfo, BG_INDEXING_QUEUE_SUFFIX, type BgTaskEntry, type BoundedChatOptions, type BuildIndexingUserMessageOptions, CLAUDE_PER_REQUEST_INPUT_CAP, CONTEXT_WINDOW_BY_MODEL, CONTEXT_WINDOW_DEFAULT, type CallClaudeWithMcpParams, type ChatEngineConfig, type ChatHost, type ChatIdentity, type ChatMessage, ChatSession, type ChatState, type ChatSystemPromptParams, type ClaudeMcpServerRequest, type ClaudeMcpToolConfig, type ClaudeMessage, type ClaudeRole, type ComposedUserMessage, DEFAULT_CLAUDE_MODEL, DEFAULT_OPENAI_MODEL, EXPIRED_ATTACHMENT_URL_HOST, EXPIRED_ATTACHMENT_URL_ORIGIN, type ExtractDirective, HISTORY_TOKEN_BUDGET, type IndexingAttachmentInfo, type IndexingSystemPromptParams, LINK_LABEL_MAX_DISPLAY_CHARS, MAX_HISTORY_MESSAGES, MCP_NAME, MIN_INPUT_TOKEN_BUDGET, type MapHistoryOptions, OUTPUT_TOKEN_RESERVE, type OpenAIMessage, POLL_INTERVAL, TOOL_AND_RESPONSE_BUFFER, buildBoundedChatMessages, buildChatSystemPrompt, buildDisplayExpiredAttachmentHref, buildIndexingSystemPrompt, buildIndexingUserMessage, callClaudeWithMcp, callClaudeWithPublicMcp, callOpenAIWithPublicMcp, chatEngineConfig, composeUserMessage, configureChatEngine, createInlineLinkRegex, encodePathSegments, estimateMessageTokens, estimateTextTokens, extractClaudeText, extractLastUserTextFromRequest, extractOpenAIText, extractRemotePathFromAttachmentHref, filterListByClearHorizon, getChatHistory, getContextWindow, getErrorMessage, getExpiredAttachmentVisiblePath, groupAttachmentFailures, isAuthExpiredError, isErrorResponseBody, isNonRetryableRequestError, isOfficeFile, listClaudeModels, listOpenAIModels, makeExtractPlaceholder, mapHistoryListToMessages, normalizeAttachmentPathCandidate, normalizeTextContent, notifyAgentSaveAttachment, safeDecodeURIComponent, sanitizeAttachmentLinksForHistory, stripFileBlocksFromHistory, transformContentWithImages, transformContentWithOpenAIImages, truncateLabelForDisplay };

package/dist/engine.mjs

@@ -193,6 +193,36 @@ function isErrorResponseBody(response) {
   }
   return false;
 }
+function isNonRetryableRequestError(input) {
+  if (!input || typeof input !== "object") return false;
+  var status = typeof input.status_code === "number" ? input.status_code : typeof input.status === "number" ? input.status : void 0;
+  var param = void 0;
+  var blobs = [];
+  var sources = [input.error, input.body && input.body.error, input.body, input];
+  for (var i = 0; i < sources.length; i++) {
+    var e = sources[i];
+    if (!e) continue;
+    if (typeof e === "string") {
+      blobs.push(e);
+      continue;
+    }
+    if (typeof e !== "object") continue;
+    if (param === void 0 && e.param != null) param = e.param;
+    if (typeof e.code === "string") blobs.push(e.code);
+    if (typeof e.type === "string") blobs.push(e.type);
+    if (typeof e.message === "string") blobs.push(e.message);
+  }
+  var hay = blobs.join(" | ").toLowerCase();
+  if (hay.indexOf("unknown_parameter") !== -1 || hay.indexOf("unknown parameter") !== -1 || hay.indexOf("unsupported_parameter") !== -1 || hay.indexOf("unsupported parameter") !== -1) {
+    return true;
+  }
+  var isClientReqStatus = status === 400 || status === 422;
+  if (isClientReqStatus && param != null && param !== "") return true;
+  if (isClientReqStatus && hay.indexOf("invalid_request") !== -1 && (hay.indexOf("parameter") !== -1 || hay.indexOf("param") !== -1)) {
+    return true;
+  }
+  return false;
+}
 function isAuthExpiredError(input) {
   if (!input) return false;
   var blobs = [];
@@ -975,10 +1005,10 @@ var ChatSession = class {
       });
     };
     var run = sendAndPoll().catch(function(err) {
-      if (isAuthExpiredError(err)) return self.host.refreshSession().then(sendAndPoll);
+      if (isAuthExpiredError(err) && !isNonRetryableRequestError(err)) return self.host.refreshSession().then(sendAndPoll);
       throw err;
     }).then(function(response) {
-      if (isErrorResponseBody(response) && isAuthExpiredError(response)) {
+      if (isErrorResponseBody(response) && isAuthExpiredError(response) && !isNonRetryableRequestError(response)) {
         return self.host.refreshSession().then(sendAndPoll);
       }
       return response;
@@ -1216,6 +1246,7 @@ var ChatSession = class {
         this.enqueueTypewrite(aiIdx, answer, lid);
       }
     }
+    this._removeStrayPendingAssistants();
     this.promoteNextQueuedToRunning();
     this.updateHistoryCache();
     this.host.notify();
@@ -1258,6 +1289,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();
@@ -1271,6 +1303,7 @@ var ChatSession = class {
       return;
     }
     this.insertAtTarget({ role: "assistant", content: getErrorMessage(err), isError: true }, targetIdx);
+    this._removeStrayPendingAssistants();
     this.promoteNextQueuedToRunning();
     this.updateHistoryCache();
     this.host.notify();
@@ -1432,16 +1465,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
@@ -1480,6 +1545,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();
@@ -1596,7 +1662,7 @@ var ChatSession = class {
       return getChatHistory({ service: serviceId, owner, platform }, options);
     };
     return Promise.resolve().then(fetchHistory).catch(function(err) {
-      if (isAuthExpiredError(err)) return self.host.refreshSession().then(fetchHistory);
+      if (isAuthExpiredError(err) && !isNonRetryableRequestError(err)) return self.host.refreshSession().then(fetchHistory);
       throw err;
     }).then(function(history) {
       if (token !== self.state.gateRefreshToken) return;
@@ -1629,12 +1695,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];
@@ -1909,6 +1979,6 @@ var ChatSession = class {
   }
 };
 
-export { BG_INDEXING_QUEUE_SUFFIX, CLAUDE_PER_REQUEST_INPUT_CAP, CONTEXT_WINDOW_BY_MODEL, CONTEXT_WINDOW_DEFAULT, ChatSession, DEFAULT_CLAUDE_MODEL, DEFAULT_OPENAI_MODEL, EXPIRED_ATTACHMENT_URL_HOST, EXPIRED_ATTACHMENT_URL_ORIGIN, HISTORY_TOKEN_BUDGET, LINK_LABEL_MAX_DISPLAY_CHARS, MAX_HISTORY_MESSAGES, MCP_NAME, MIN_INPUT_TOKEN_BUDGET, OUTPUT_TOKEN_RESERVE, POLL_INTERVAL, TOOL_AND_RESPONSE_BUFFER, buildBoundedChatMessages, buildChatSystemPrompt, buildDisplayExpiredAttachmentHref, buildIndexingSystemPrompt, buildIndexingUserMessage, callClaudeWithMcp, callClaudeWithPublicMcp, callOpenAIWithPublicMcp, chatEngineConfig, composeUserMessage, configureChatEngine, createInlineLinkRegex, encodePathSegments, estimateMessageTokens, estimateTextTokens, extractClaudeText, extractLastUserTextFromRequest, extractOpenAIText, extractRemotePathFromAttachmentHref, filterListByClearHorizon, getChatHistory, getContextWindow, getErrorMessage, getExpiredAttachmentVisiblePath, groupAttachmentFailures, isAuthExpiredError, isErrorResponseBody, isOfficeFile, listClaudeModels, listOpenAIModels, makeExtractPlaceholder, mapHistoryListToMessages, normalizeAttachmentPathCandidate, normalizeTextContent, notifyAgentSaveAttachment, safeDecodeURIComponent, sanitizeAttachmentLinksForHistory, stripFileBlocksFromHistory, transformContentWithImages, transformContentWithOpenAIImages, truncateLabelForDisplay };
+export { BG_INDEXING_QUEUE_SUFFIX, CLAUDE_PER_REQUEST_INPUT_CAP, CONTEXT_WINDOW_BY_MODEL, CONTEXT_WINDOW_DEFAULT, ChatSession, DEFAULT_CLAUDE_MODEL, DEFAULT_OPENAI_MODEL, EXPIRED_ATTACHMENT_URL_HOST, EXPIRED_ATTACHMENT_URL_ORIGIN, HISTORY_TOKEN_BUDGET, LINK_LABEL_MAX_DISPLAY_CHARS, MAX_HISTORY_MESSAGES, MCP_NAME, MIN_INPUT_TOKEN_BUDGET, OUTPUT_TOKEN_RESERVE, POLL_INTERVAL, TOOL_AND_RESPONSE_BUFFER, buildBoundedChatMessages, buildChatSystemPrompt, buildDisplayExpiredAttachmentHref, buildIndexingSystemPrompt, buildIndexingUserMessage, callClaudeWithMcp, callClaudeWithPublicMcp, callOpenAIWithPublicMcp, chatEngineConfig, composeUserMessage, configureChatEngine, createInlineLinkRegex, encodePathSegments, estimateMessageTokens, estimateTextTokens, extractClaudeText, extractLastUserTextFromRequest, extractOpenAIText, extractRemotePathFromAttachmentHref, filterListByClearHorizon, getChatHistory, getContextWindow, getErrorMessage, getExpiredAttachmentVisiblePath, groupAttachmentFailures, isAuthExpiredError, isErrorResponseBody, isNonRetryableRequestError, isOfficeFile, listClaudeModels, listOpenAIModels, makeExtractPlaceholder, mapHistoryListToMessages, normalizeAttachmentPathCandidate, normalizeTextContent, notifyAgentSaveAttachment, safeDecodeURIComponent, sanitizeAttachmentLinksForHistory, stripFileBlocksFromHistory, transformContentWithImages, transformContentWithOpenAIImages, truncateLabelForDisplay };
 //# sourceMappingURL=engine.mjs.map
 //# sourceMappingURL=engine.mjs.map