fix(loop-detection): block generic repeats with no-progress evidence

vincentkoc · vincentkoc · commit 9fd4b85d9a4b · 2026-04-28T07:37:34.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ Docs: https://docs.openclaw.ai
 
 ### Fixes
 
+- Agents/loop detection: require no-progress evidence before generic repeated tool calls escalate from warning to critical blocking, so legitimate repeated calls with changing output can continue. Fixes #54559; refs #60111, #60248, and #70546. Thanks @jwchmodx.
 - Control UI/WebChat: keep large attachment payloads out of Lit state and optimistic chat messages, using object URL previews plus send-time payload serialization so PDF/image uploads no longer trigger `RangeError: Maximum call stack size exceeded`. Fixes #73360; refs #54378 and #63432. Thanks @hejunhui-73, @Ansub, and @christianhernandez3-afk.
 - Agents/models: keep per-agent primary models strict when `fallbacks` is omitted, so probe-only custom providers are not tried as hidden fallback candidates unless the agent explicitly opts in. Fixes #73332. Thanks @haumanto.
 - Gateway/models: add `models.pricing.enabled` so offline or restricted-network installs can skip startup OpenRouter and LiteLLM pricing-catalog fetches while keeping explicit model costs working. Fixes #53639. Thanks @callebtc, @palewire, and @rjdjohnston.
diff --git a/docs/tools/loop-detection.md b/docs/tools/loop-detection.md
@@ -67,9 +67,9 @@ Per-agent override (optional):
 - `enabled`: Master switch. `false` means no loop detection is performed.
 - `historySize`: number of recent tool calls kept for analysis.
 - `warningThreshold`: threshold before classifying a pattern as warning-only.
-- `criticalThreshold`: threshold for blocking repetitive loop patterns.
+- `criticalThreshold`: threshold for blocking repetitive loop patterns once no-progress evidence is present.
 - `globalCircuitBreakerThreshold`: global no-progress breaker threshold.
-- `detectors.genericRepeat`: detects repeated same-tool + same-params patterns.
+- `detectors.genericRepeat`: detects repeated same-tool + same-params patterns. It warns on repeated arguments and escalates to critical only when the repeated calls also produce identical outcomes.
 - `detectors.knownPollNoProgress`: detects known polling-like patterns with no state change.
 - `detectors.pingPong`: detects alternating ping-pong patterns.
 
diff --git a/src/agents/tool-loop-detection.test.ts b/src/agents/tool-loop-detection.test.ts
@@ -396,6 +396,32 @@ describe("tool-loop-detection", () => {
       }
     });
 
+    it("does not escalate generic repeats to critical when outcomes are progressing", () => {
+      const state = createState();
+      const params = { path: "/same.txt" };
+
+      for (let index = 0; index < CRITICAL_THRESHOLD; index += 1) {
+        recordSuccessfulCall(
+          state,
+          "read",
+          params,
+          {
+            content: [{ type: "text", text: `changed output ${index}` }],
+            details: { ok: true },
+          },
+          index,
+        );
+      }
+
+      const loopResult = detectToolCallLoop(state, "read", params, enabledLoopDetectionConfig);
+      expect(loopResult.stuck).toBe(true);
+      if (loopResult.stuck) {
+        expect(loopResult.level).toBe("warning");
+        expect(loopResult.detector).toBe("generic_repeat");
+        expect(loopResult.count).toBe(CRITICAL_THRESHOLD);
+      }
+    });
+
     it("applies custom thresholds when detection is enabled", () => {
       const state = createState();
       const { params, result } = createNoProgressPollFixture("sess-custom");
diff --git a/src/agents/tool-loop-detection.ts b/src/agents/tool-loop-detection.ts
@@ -609,26 +609,26 @@ export function detectToolCallLoop(
     };
   }
 
-  // Generic detector: warn then block for repeated identical calls.
+  // Generic detector: warn on repeated identical calls, but block only with no-progress evidence.
   const recentCount = history.filter(
     (h) => h.toolName === toolName && h.argsHash === currentHash,
   ).length;
 
   if (
     !knownPollTool &&
     resolvedConfig.detectors.genericRepeat &&
-    recentCount >= resolvedConfig.criticalThreshold
+    noProgressStreak >= resolvedConfig.criticalThreshold
   ) {
     log.error(
-      `Critical loop detected: ${toolName} called ${recentCount} times with identical arguments`,
+      `Critical loop detected: ${toolName} repeated ${noProgressStreak} times with no progress`,
     );
     return {
       stuck: true,
       level: "critical",
       detector: "generic_repeat",
-      count: recentCount,
-      message: `CRITICAL: You have called ${toolName} ${recentCount} times with identical arguments and are making no progress. Session execution blocked to prevent runaway loops.`,
-      warningKey: `generic:${toolName}:${currentHash}`,
+      count: noProgressStreak,
+      message: `CRITICAL: You have called ${toolName} ${noProgressStreak} times with identical arguments and identical outcomes. Session execution blocked to prevent runaway loops.`,
+      warningKey: `generic:${toolName}:${currentHash}:${noProgress.latestResultHash ?? "none"}`,
     };
   }
 
