.changeset/loud-rules-dream.md (1)

5-5: Polish the changeset description grammar for clarity

Minor grammar/wording tweak makes this clearer and avoids redundancy.

-fix(runner): prevent retry immediately race condition which can cause stuck runs that end up being system failures
+fix(runner): prevent retry-immediately race condition that can cause stuck runs and system failures

packages/cli-v3/src/entryPoints/managed/execution.ts (3)

80-80: Make snapshot-change suppression reentrancy-safe (counter vs boolean)

Using a boolean here can be fragile if enableIgnoreSnapshotChanges is ever called nested (now or in the future) — the outer call’s finally would flip it back to false too early. A lightweight counter avoids that footgun.

-  private ignoreSnapshotChanges = false;
+  private ignoreSnapshotChangesDepth = 0;

Follow-up diffs for the guard and helper are provided in comments below.

---

241-249: Guard looks good; make it work with a counter and enrich logs with runId

Two tweaks:

• If you adopt the counter, check > 0 here.
• Add runId for faster correlation in logs.

-    if (this.ignoreSnapshotChanges) {
-      this.sendDebugLog("processSnapshotChange: ignoring snapshot change", {
-        incomingSnapshotId: snapshot.friendlyId,
-        completedWaitpoints: completedWaitpoints.length,
-        currentAttemptNumber: this.currentAttemptNumber,
-        newAttemptNumber: run.attemptNumber,
-      });
+    if (this.ignoreSnapshotChangesDepth > 0) {
+      this.sendDebugLog("processSnapshotChange: ignoring snapshot change", {
+        incomingSnapshotId: snapshot.friendlyId,
+        completedWaitpoints: completedWaitpoints.length,
+        currentAttemptNumber: this.currentAttemptNumber,
+        newAttemptNumber: run.attemptNumber,
+        runId: run.friendlyId,
+      });
       return;
     }

---

845-852: Refactor helper to support nesting (pairs with the counter change above)

This change makes suppression robust if nested calls ever occur.

-  private async enableIgnoreSnapshotChanges<T>(fn: () => Promise<T>): Promise<T> {
-    this.ignoreSnapshotChanges = true;
-    try {
-      return await fn();
-    } finally {
-      this.ignoreSnapshotChanges = false;
-    }
-  }
+  private async enableIgnoreSnapshotChanges<T>(fn: () => Promise<T>): Promise<T> {
+    this.ignoreSnapshotChangesDepth++;
+    try {
+      return await fn();
+    } finally {
+      this.ignoreSnapshotChangesDepth--;
+    }
+  }

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

💡 Knowledge Base configuration:

• MCP integration is disabled by default for public repositories
• Jira integration is disabled by default for public repositories
• Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.