cc-claw 0.12.7 → 0.12.8

package/dist/cli.js

@@ -72,7 +72,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = true ? "0.12.7" : (() => {
+    VERSION = true ? "0.12.8" : (() => {
       try {
         return JSON.parse(readFileSync(join2(process.cwd(), "package.json"), "utf-8")).version ?? "unknown";
       } catch {
@@ -4247,6 +4247,78 @@ var init_backends = __esm({
   }
 });
 
+// src/tool-loop-detector.ts
+function djb2Hash(str) {
+  let hash = 5381;
+  for (let i = 0; i < str.length; i++) {
+    hash = (hash << 5) + hash + str.charCodeAt(i) & 4294967295;
+  }
+  return hash.toString(36);
+}
+function extractKeyField(input) {
+  const key = input.file_path ?? input.path ?? input.file ?? input.command ?? input.cmd ?? input.url ?? input.query ?? input.search_query ?? input.pattern ?? input.content;
+  if (key !== void 0 && key !== null) {
+    return String(key);
+  }
+  const sorted = Object.keys(input).sort();
+  const parts = sorted.map((k) => `${k}:${JSON.stringify(input[k])}`);
+  return parts.join("|");
+}
+function fingerprint(toolName, input) {
+  const key = extractKeyField(input);
+  return `${toolName}:${djb2Hash(key)}`;
+}
+var DEFAULT_WINDOW_SIZE, DEFAULT_THRESHOLD, HARD_TURN_CAP, ToolLoopDetector;
+var init_tool_loop_detector = __esm({
+  "src/tool-loop-detector.ts"() {
+    "use strict";
+    DEFAULT_WINDOW_SIZE = 15;
+    DEFAULT_THRESHOLD = 3;
+    HARD_TURN_CAP = 200;
+    ToolLoopDetector = class {
+      windowSize;
+      threshold;
+      window = [];
+      constructor(windowSize = DEFAULT_WINDOW_SIZE, threshold = DEFAULT_THRESHOLD) {
+        this.windowSize = windowSize;
+        this.threshold = threshold;
+      }
+      /**
+       * Record a tool call and check for loops.
+       *
+       * @returns `{ isLoop: true, reason }` if the same fingerprint appears
+       *          `threshold` or more times in the sliding window.
+       */
+      addCall(toolName, input) {
+        const fp = fingerprint(toolName, input);
+        this.window.push(fp);
+        while (this.window.length > this.windowSize) {
+          this.window.shift();
+        }
+        let count = 0;
+        for (const entry of this.window) {
+          if (entry === fp) count++;
+        }
+        if (count >= this.threshold) {
+          return {
+            isLoop: true,
+            reason: `Tool "${toolName}" called ${count}\xD7 with same input in last ${this.window.length} calls`
+          };
+        }
+        return { isLoop: false };
+      }
+      /** Number of calls tracked so far. */
+      get callCount() {
+        return this.window.length;
+      }
+      /** Reset the detector (e.g., after a retry with a fresh session). */
+      reset() {
+        this.window.length = 0;
+      }
+    };
+  }
+});
+
 // src/memory/inject.ts
 function daysSince(dateStr) {
   const date = /* @__PURE__ */ new Date(dateStr.replace(" ", "T") + (dateStr.includes("Z") ? "" : "Z"));
@@ -9170,6 +9242,7 @@ function spawnQuery(adapter, config2, model2, cancelState, thinkingLevel, timeou
     let sawToolEvents = false;
     let sawResultEvent = false;
     let toolTurnCount = 0;
+    const loopDetector = new ToolLoopDetector();
     const t0 = Date.now();
     const elapsed = () => `${((Date.now() - t0) / 1e3).toFixed(1)}s`;
     const pendingTools = /* @__PURE__ */ new Map();
@@ -9215,10 +9288,19 @@ function spawnQuery(adapter, config2, model2, cancelState, thinkingLevel, timeou
                 error("[agent] tool action error:", err);
               });
             }
-            if (maxTurns && adapter.id !== "claude") {
+            if (adapter.id !== "claude") {
               toolTurnCount++;
-              if (toolTurnCount >= maxTurns) {
-                log(`[agent] Turn limit ${maxTurns} reached for ${adapter.id} -- stopping`);
+              if (ev.toolName) {
+                const check = loopDetector.addCall(ev.toolName, ev.toolInput ?? {});
+                if (check.isLoop) {
+                  warn(`[agent] Loop detected for ${adapter.id}: ${check.reason} \u2014 stopping`);
+                  killProcessGroup(proc, "SIGTERM");
+                }
+              }
+              const effectiveCap = maxTurns ?? HARD_TURN_CAP;
+              if (toolTurnCount >= effectiveCap) {
+                const label2 = maxTurns ? `Turn limit ${maxTurns}` : `Hard cap ${HARD_TURN_CAP}`;
+                warn(`[agent] ${label2} reached for ${adapter.id} \u2014 stopping`);
                 killProcessGroup(proc, "SIGTERM");
               }
             }
@@ -9523,6 +9605,7 @@ var activeChats, chatLocks, SPAWN_TIMEOUT_MS, MCP_CONFIG_FLAG;
 var init_agent = __esm({
   "src/agent.ts"() {
     "use strict";
+    init_tool_loop_detector();
     init_store5();
     init_backends();
     init_paths();
@@ -14571,7 +14654,6 @@ async function handleSideQuest(parentChatId, msg, channel) {
       backend: backend2 ?? void 0,
       settingsSourceChatId: parentChatId,
       agentMode: "native",
-      maxTurns: 10,
       timeoutMs: 3e5,
       bootstrapTier: "full"
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-claw",
-  "version": "0.12.7",
+  "version": "0.12.8",
   "description": "CC-Claw: Personal AI assistant on Telegram — multi-backend (Claude, Gemini, Codex, Cursor), sub-agent orchestration, MCP management",
   "type": "module",
   "main": "dist/cli.js",