snow-ai 0.5.3 → 0.5.4

package/bundle/cli.mjs

@@ -425873,9 +425873,9 @@ var init_codebaseSearch = __esm({
         return dotProduct / (Math.sqrt(normA) * Math.sqrt(normB));
       }
       /**
-       * Search codebase using semantic similarity with retry logic
-       */
-      async search(query, topN = 10) {
+      * Search codebase using semantic similarity with retry logic
+      */
+      async search(query, topN = 10, abortSignal) {
         const config3 = loadCodebaseConfig();
         const enableAgentReview = config3.enableAgentReview;
         const { available, reason } = await this.isCodebaseIndexAvailable();
@@ -425943,7 +425943,7 @@ var init_codebaseSearch = __esm({
                 role: msg.role,
                 content: msg.content
               })).slice(-10)) || [];
-              const reviewResult = await codebaseReviewAgent.reviewResults(query, formattedResults, conversationContext.length > 0 ? conversationContext : void 0);
+              const reviewResult = await codebaseReviewAgent.reviewResults(query, formattedResults, conversationContext.length > 0 ? conversationContext : void 0, abortSignal);
               finalResults = reviewResult.filteredResults;
               reviewFailed = reviewResult.reviewFailed || false;
               removedCount = reviewResult.removedCount;
@@ -433746,7 +433746,7 @@ AI Tip: Provide searchContent (string) and replaceContent (string).`);
       const { codebaseSearchService: codebaseSearchService2 } = await Promise.resolve().then(() => (init_codebaseSearch(), codebaseSearch_exports));
       switch (actualToolName) {
         case "search":
-          result2 = await codebaseSearchService2.search(args2.query, args2.topN);
+          result2 = await codebaseSearchService2.search(args2.query, args2.topN, abortSignal);
           break;
         default:
           throw new Error(`Unknown codebase tool: ${actualToolName}`);
@@ -433839,9 +433839,13 @@ ${combinedOutput}`);
 async function executeOnExternalMCPService(serviceName, server, toolName, args2) {
   const client = await getPersistentClient(serviceName, server);
   logger.debug(`Using persistent MCP client for ${serviceName} tool ${toolName}`);
+  const timeout2 = server.timeout ?? 3e5;
   const result2 = await client.callTool({
     name: toolName,
     arguments: args2
+  }, void 0, {
+    timeout: timeout2,
+    resetTimeoutOnProgress: true
   });
   logger.debug(`result from ${serviceName} tool ${toolName}:`, result2);
   return result2.content;
@@ -523811,40 +523815,80 @@ function findPreserveStartIndex(messages) {
   return messages.length;
 }
 function cleanOrphanedToolCalls(messages) {
-  const toolResultIds = /* @__PURE__ */ new Set();
-  for (const msg of messages) {
-    if (msg.role === "tool" && msg.tool_call_id) {
-      toolResultIds.add(msg.tool_call_id);
-    }
-  }
-  const declaredToolCallIds = /* @__PURE__ */ new Set();
-  for (const msg of messages) {
-    if (msg.role === "assistant" && msg.tool_calls) {
-      for (const tc of msg.tool_calls) {
-        declaredToolCallIds.add(tc.id);
-      }
-    }
-  }
   const indicesToRemove = [];
-  for (let i = messages.length - 1; i >= 0; i--) {
+  for (let i = 0; i < messages.length; i++) {
     const msg = messages[i];
     if (!msg)
       continue;
-    if (msg.role === "assistant" && msg.tool_calls) {
-      const hasAllResults = msg.tool_calls.every((tc) => toolResultIds.has(tc.id));
-      if (!hasAllResults) {
-        const orphanedIds = msg.tool_calls.filter((tc) => !toolResultIds.has(tc.id)).map((tc) => tc.id);
-        console.warn("[contextCompressor:cleanOrphanedToolCalls] Removing assistant message with orphaned tool_calls", {
+    if (msg.role === "assistant" && msg.tool_calls && msg.tool_calls.length > 0) {
+      const nextMsg = messages[i + 1];
+      if (!nextMsg || nextMsg.role !== "tool") {
+        console.warn("[contextCompressor:cleanOrphanedToolCalls] Removing assistant message - next message is not tool result", {
           messageIndex: i,
           toolCallIds: msg.tool_calls.map((tc) => tc.id),
-          orphanedIds
+          nextMessageRole: (nextMsg == null ? void 0 : nextMsg.role) || "none"
+        });
+        indicesToRemove.push(i);
+        continue;
+      }
+      const expectedToolCallIds = new Set(msg.tool_calls.map((tc) => tc.id));
+      const foundToolCallIds = /* @__PURE__ */ new Set();
+      for (let j = i + 1; j < messages.length; j++) {
+        const followingMsg = messages[j];
+        if (!followingMsg)
+          continue;
+        if (followingMsg.role === "tool") {
+          if (followingMsg.tool_call_id) {
+            foundToolCallIds.add(followingMsg.tool_call_id);
+          }
+        } else {
+          break;
+        }
+      }
+      const missingIds = Array.from(expectedToolCallIds).filter((id) => !foundToolCallIds.has(id));
+      if (missingIds.length > 0) {
+        console.warn("[contextCompressor:cleanOrphanedToolCalls] Removing assistant message - missing immediate tool results", {
+          messageIndex: i,
+          toolCallIds: msg.tool_calls.map((tc) => tc.id),
+          missingIds
         });
         indicesToRemove.push(i);
       }
     }
     if (msg.role === "tool" && msg.tool_call_id) {
-      if (!declaredToolCallIds.has(msg.tool_call_id)) {
-        console.warn("[contextCompressor:cleanOrphanedToolCalls] Removing orphaned tool result", {
+      let foundCorrespondingAssistant = false;
+      for (let j = i - 1; j >= 0; j--) {
+        const prevMsg = messages[j];
+        if (!prevMsg)
+          continue;
+        if (prevMsg.role === "assistant" && prevMsg.tool_calls) {
+          const hasToolCall = prevMsg.tool_calls.some((tc) => tc.id === msg.tool_call_id);
+          if (hasToolCall) {
+            foundCorrespondingAssistant = true;
+            let isImmediatelyAfter = true;
+            for (let k = j + 1; k < i; k++) {
+              const betweenMsg = messages[k];
+              if (betweenMsg && betweenMsg.role !== "tool") {
+                isImmediatelyAfter = false;
+                break;
+              }
+            }
+            if (!isImmediatelyAfter) {
+              console.warn("[contextCompressor:cleanOrphanedToolCalls] Removing tool result - not immediately after assistant", {
+                messageIndex: i,
+                toolCallId: msg.tool_call_id,
+                assistantIndex: j
+              });
+              indicesToRemove.push(i);
+            }
+            break;
+          }
+        } else if (prevMsg.role !== "tool") {
+          break;
+        }
+      }
+      if (!foundCorrespondingAssistant) {
+        console.warn("[contextCompressor:cleanOrphanedToolCalls] Removing orphaned tool result - no corresponding assistant", {
           messageIndex: i,
           toolCallId: msg.tool_call_id
         });
@@ -523852,6 +523896,7 @@ function cleanOrphanedToolCalls(messages) {
       }
     }
   }
+  indicesToRemove.sort((a, b) => b - a);
   for (const idx2 of indicesToRemove) {
     messages.splice(idx2, 1);
   }
@@ -525604,14 +525649,6 @@ async function handleConversationWithTools(options3) {
         );
         if (controller.signal.aborted) {
           if (receivedToolCalls && receivedToolCalls.length > 0) {
-            const assistantMsgWithTools = conversationMessages.find((msg) => msg.role === "assistant" && msg.tool_calls && msg.tool_calls.some((tc) => receivedToolCalls.some((rtc) => rtc.id === tc.id)));
-            if (assistantMsgWithTools) {
-              try {
-                await saveMessage(assistantMsgWithTools);
-              } catch (error) {
-                console.error("Failed to save assistant message before abort:", error);
-              }
-            }
             for (const toolCall of receivedToolCalls) {
               const abortedResult = {
                 role: "tool",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "snow-ai",
-	"version": "0.5.3",
+	"version": "0.5.4",
 	"description": "Intelligent Command Line Assistant powered by AI",
 	"license": "MIT",
 	"bin": {