@cosmicstack/mercury-agent 0.5.0 → 0.5.1

package/dist/index.js

@@ -115,7 +115,7 @@ function getDefaultConfig() {
       intervalMinutes: getEnvNum("HEARTBEAT_INTERVAL_MINUTES", 60)
     },
     tokens: {
-      dailyBudget: getEnvNum("DAILY_TOKEN_BUDGET", 5e4)
+      dailyBudget: getEnvNum("DAILY_TOKEN_BUDGET", 1e6)
     }
   };
 }
@@ -1396,7 +1396,8 @@ var CLIChannel = class extends BaseChannel {
 // src/core/agent.ts
 var ToolCallLoopDetector = class {
   recentCalls = [];
-  maxEntries = 10;
+  maxEntries = 16;
+  aborted = false;
   record(toolName, params) {
     const paramsKey = JSON.stringify(params).slice(0, 100);
     this.recentCalls.push({ tool: toolName, params: paramsKey });
@@ -1407,33 +1408,47 @@ var ToolCallLoopDetector = class {
   detect() {
     if (this.recentCalls.length < 3) return null;
     const last = this.recentCalls[this.recentCalls.length - 1];
-    let consecutiveCount = 0;
+    let identicalCount = 0;
     for (let i = this.recentCalls.length - 1; i >= 0; i--) {
       if (this.recentCalls[i].tool === last.tool && this.recentCalls[i].params === last.params) {
-        consecutiveCount++;
+        identicalCount++;
       } else {
         break;
       }
     }
-    if (consecutiveCount >= 3) {
-      return { tool: last.tool, count: consecutiveCount };
+    if (identicalCount >= 3) {
+      this.aborted = true;
+      return {
+        tool: last.tool,
+        count: identicalCount,
+        message: `You called "${last.tool}" ${identicalCount} times with identical parameters and got the same result. Stop repeating this call entirely.`
+      };
     }
     const lastTool = last.tool;
-    let toolCount = 0;
+    let sameToolCount = 0;
     for (let i = this.recentCalls.length - 1; i >= 0; i--) {
       if (this.recentCalls[i].tool === lastTool) {
-        toolCount++;
+        sameToolCount++;
       } else {
         break;
       }
     }
-    if (toolCount >= 4) {
-      return { tool: lastTool, count: toolCount };
+    if (sameToolCount >= 3) {
+      this.aborted = true;
+      return {
+        tool: lastTool,
+        count: sameToolCount,
+        message: `You called "${lastTool}" ${sameToolCount} times in a row with slightly different parameters and it isn't working. Stop \u2014 the approach is wrong. Step back, tell the user what you tried and what failed, and suggest alternatives instead of retrying.`
+      };
     }
     return null;
   }
+  isAborted() {
+    return this.aborted;
+  }
   reset() {
     this.recentCalls = [];
+    this.aborted = false;
   }
 };
 var MAX_STEPS = 10;
@@ -1613,7 +1628,7 @@ You can override this:
         if (toolCalls.length >= 3) {
           const last3 = toolCalls.slice(-3);
           if (last3[0] === last3[1] && last3[1] === last3[2]) {
-            loopWarning = `[SYSTEM WARNING] You have called ${last3[0]} 3+ times in a row with the same result. Stop repeating this call. Try a different approach \u2014 if you're failing on permissions, try a different path. If you're failing on git push auth, use github_api with PUT /repos/{owner}/{repo}/contents/{path} to push files directly through the API.`;
+            loopWarning = `[SYSTEM WARNING] In previous turns you called ${last3[0]} repeatedly. Do NOT call it again. If something failed, explain the failure to the user and suggest alternatives.`;
           }
         }
       }
@@ -1651,6 +1666,8 @@ You can override this:
       let lastError = null;
       let streamedText = "";
       const loopDetector = new ToolCallLoopDetector();
+      const loopAbortController = new AbortController();
+      let loopWarningSent = false;
       const canStream = msg.channelType === "cli" || msg.channelType === "telegram" && this.telegramStreaming;
       for (const provider of fallbackIterator) {
         try {
@@ -1662,6 +1679,7 @@ You can override this:
               messages,
               tools: this.capabilities.getTools(),
               maxSteps: MAX_STEPS,
+              abortSignal: loopAbortController.signal,
               onStepFinish: async ({ toolCalls }) => {
                 if (toolCalls && toolCalls.length > 0) {
                   const names = toolCalls.map((tc) => tc.toolName).join(", ");
@@ -1671,7 +1689,13 @@ You can override this:
                   }
                   const loop = loopDetector.detect();
                   if (loop) {
-                    logger.warn({ tool: loop.tool, count: loop.count }, "Tool call loop detected");
+                    logger.warn({ tool: loop.tool, count: loop.count }, "Tool call loop detected \u2014 aborting generation");
+                    if (!loopWarningSent && channel && msg.channelType !== "internal") {
+                      loopWarningSent = true;
+                      await channel.send(`\u26A0 Loop detected \u2014 ${loop.tool} called ${loop.count}x in a row. Stopping to save tokens.`, msg.channelId).catch(() => {
+                      });
+                    }
+                    loopAbortController.abort();
                   }
                   await channel.send(`  [Using: ${names}]`, msg.channelId).catch(() => {
                   });
@@ -1706,6 +1730,7 @@ You can override this:
               messages,
               tools: this.capabilities.getTools(),
               maxSteps: MAX_STEPS,
+              abortSignal: loopAbortController.signal,
               onStepFinish: async ({ toolCalls, text }) => {
                 if (toolCalls && toolCalls.length > 0) {
                   const names = toolCalls.map((tc) => tc.toolName).join(", ");
@@ -1715,7 +1740,13 @@ You can override this:
                   }
                   const loop = loopDetector.detect();
                   if (loop) {
-                    logger.warn({ tool: loop.tool, count: loop.count }, "Tool call loop detected");
+                    logger.warn({ tool: loop.tool, count: loop.count }, "Tool call loop detected \u2014 aborting generation");
+                    if (!loopWarningSent && channel && msg.channelType !== "internal") {
+                      loopWarningSent = true;
+                      await channel.send(`\u26A0 Loop detected \u2014 ${loop.tool} called ${loop.count}x in a row. Stopping to save tokens.`, msg.channelId).catch(() => {
+                      });
+                    }
+                    loopAbortController.abort();
                   }
                   if (channel && msg.channelType !== "internal") {
                     await channel.send(`  [Using: ${names}]`, msg.channelId).catch(() => {
@@ -1729,6 +1760,16 @@ You can override this:
           this.providers.markSuccess(provider.name);
           break;
         } catch (err) {
+          if (loopDetector.isAborted()) {
+            logger.info("Generation aborted due to loop detection \u2014 using partial response");
+            if (!result && streamedText) {
+              result = { text: streamedText, usage: void 0 };
+            }
+            if (usedProvider) {
+              this.providers.markSuccess(usedProvider.name);
+            }
+            break;
+          }
           lastError = err;
           logger.warn({ provider: provider.name, err: err.message }, "Provider failed, trying fallback");
           if (channel && msg.channelType !== "internal") {