coder-agent 2.9.9 → 2.9.11

package/dist/agent.js

@@ -248,11 +248,10 @@ function getLoopCheckKey(toolCalls) {
                 const end = args.end_line ?? "";
                 return `read_file_lines:${normalizedPath}:${start}-${end}`;
             case "write_file":
-                return `write_file:${normalizedPath}:${normalizeCode(args.content || "")}`;
+                return `write_file:${normalizedPath}`;
             case "patch_file":
                 const targetCode = normalizeCode(args.target_code || "");
-                const replacementCode = normalizeCode(args.replacement_code || "");
-                return `patch_file:${normalizedPath}:${targetCode}:${replacementCode}`;
+                return `patch_file:${normalizedPath}:${targetCode}`;
             case "list_directory":
                 return `list_directory:${normalizedPath}`;
             case "run_shell":
@@ -277,7 +276,7 @@ function hasRepeatingCycle(history) {
     const n = history.length;
     for (let len = 1; len <= 4; len++) {
         if (n >= len * 2) {
-            const minRepeats = len === 1 ? 3 : 2;
+            const minRepeats = len === 1 ? 2 : (len === 2 ? 3 : 2);
             if (n >= len * minRepeats) {
                 let isLoop = true;
                 const lastBlock = history.slice(n - len);
@@ -296,6 +295,59 @@ function hasRepeatingCycle(history) {
     }
     return false;
 }
+function getJaccardSimilarity(str1, str2) {
+    const getWords = (str) => {
+        return new Set(str
+            .toLowerCase()
+            .replace(/[^a-z0-9\s]/g, "")
+            .split(/\s+/)
+            .filter(w => w.length > 2));
+    };
+    const words1 = getWords(str1);
+    const words2 = getWords(str2);
+    if (words1.size === 0 && words2.size === 0)
+        return 1.0;
+    if (words1.size === 0 || words2.size === 0)
+        return 0.0;
+    let intersectionCount = 0;
+    for (const w of words1) {
+        if (words2.has(w)) {
+            intersectionCount++;
+        }
+    }
+    const unionSize = words1.size + words2.size - intersectionCount;
+    return intersectionCount / unionSize;
+}
+function hasRepeatingThoughtCycle(thoughts) {
+    const n = thoughts.length;
+    const nonEmptyThoughts = thoughts.filter(t => t.trim().length > 10);
+    const m = nonEmptyThoughts.length;
+    for (let len = 1; len <= 4; len++) {
+        if (m >= len * 2) {
+            const minRepeats = len === 1 ? 2 : (len === 2 ? 3 : 2);
+            if (m >= len * minRepeats) {
+                let isLoop = true;
+                const lastBlock = nonEmptyThoughts.slice(m - len);
+                for (let r = 1; r < minRepeats; r++) {
+                    const prevBlock = nonEmptyThoughts.slice(m - len * (r + 1), m - len * r);
+                    for (let i = 0; i < len; i++) {
+                        const sim = getJaccardSimilarity(lastBlock[i], prevBlock[i]);
+                        if (sim < 0.60) {
+                            isLoop = false;
+                            break;
+                        }
+                    }
+                    if (!isLoop)
+                        break;
+                }
+                if (isLoop) {
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
 // ─── Extract Text Tool Calls ──────────────────────────────────────────────────
 function extractTextToolCalls(content) {
     const calls = [];
@@ -757,6 +809,7 @@ export class Agent {
             const modifiedFiles = new Set();
             let cleanContent = "";
             const stateHistory = [];
+            const thoughtHistory = [];
             while (true) {
                 if (signal?.aborted) {
                     const abortErr = new Error("The user aborted a request.");
@@ -921,22 +974,35 @@ export class Agent {
                 // Loop detection & intervention
                 const currentKey = getLoopCheckKey(toolCalls);
                 const tempHistory = [...stateHistory, currentKey];
-                if (hasRepeatingCycle(tempHistory)) {
+                const currentThought = msg.content || "";
+                const tempThoughtHistory = [...thoughtHistory, currentThought];
+                let loopTriggered = false;
+                if (hasRepeatingCycle(tempHistory) || hasRepeatingThoughtCycle(tempThoughtHistory)) {
+                    loopTriggered = true;
+                }
+                if (loopTriggered) {
                     loopInterventions++;
                     if (loopInterventions >= 2) {
                         console.log(chalk.hex('#ff453a')('\n✕ Loop intervention failed: Coder is stuck in an execution loop. Exiting to prompt.'));
                         break;
                     }
-                    const warningMessage = `⚠️ [LOOP DETECTED] You are repeating the exact same thoughts or tool calls. Please break out of this loop. Do not repeat the same actions. Re-evaluate your strategy, look at a different file, run a different command, or ask the user for clarification if you cannot proceed.`;
-                    console.log(chalk.hex('#ff9f0a')('\n⚠ Loop detected! Intervening to break the loop...'));
-                    this.memory.add({
-                        role: "user",
-                        content: warningMessage,
-                    });
+                    const originalGoal = this.memory.getAll().find(m => m.role === "user")?.content || userMessage;
+                    const warningMessage = `⚠️ [LOOP DETECTED & CONTEXT RESET] You got stuck in a repeating thinking/execution loop. To break the loop, all intermediate repetitive chat context has been discarded.
+
+Here is your original goal:
+"${originalGoal}"
+
+Please start fresh. Re-evaluate your strategy, check other files, run different commands, or ask the user for clarification directly. Do NOT repeat the same failed tool calls.`;
+                    console.log(chalk.hex('#ff9f0a')('\n⚠ Loop detected! Compressing memory and resetting context window...'));
+                    this.memory.resetToInitialPrompt(warningMessage);
                     stateHistory.length = 0; // Reset history to allow a fresh start
+                    thoughtHistory.length = 0;
                 }
                 else {
                     stateHistory.push(currentKey);
+                    if (currentThought.trim().length > 10) {
+                        thoughtHistory.push(currentThought);
+                    }
                     if (loopInterventions > 0)
                         loopInterventions = 0;
                 }

package/dist/memory.js

@@ -524,6 +524,25 @@ export class Memory {
         this.messages = [this.messages[0]]; // keep system prompt
         console.log("  Memory cleared.");
     }
+    resetToInitialPrompt(warningMessage) {
+        if (this.messages.length <= 1)
+            return;
+        const systemMsg = this.messages[0];
+        const firstUserMsg = this.messages.find(m => m.role === "user");
+        if (firstUserMsg) {
+            this.messages = [
+                systemMsg,
+                firstUserMsg,
+                { role: "user", content: warningMessage }
+            ];
+        }
+        else {
+            this.messages = [
+                systemMsg,
+                { role: "user", content: warningMessage }
+            ];
+        }
+    }
     summary() {
         const turns = this.messages.filter(m => m.role === "user").length;
         return `${turns} turn(s) in memory (${getMemoryScopeDisplay(this.scope)} scope)`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coder-agent",
-  "version": "2.9.9",
+  "version": "2.9.11",
   "description": "CLI coding agent powered by Google Gemini",
   "type": "module",
   "main": "dist/index.js",