From 7451415f36d529623136e08609a5c0d4b2e98ada Mon Sep 17 00:00:00 2001
From: Vignesh Natarajan <vignesh.natarajan92@gmail.com>
Date: Wed, 29 Apr 2026 13:53:36 -0700
Subject: [PATCH] Agents: fix heartbeat rebase conflict (#74189)

---
 src/infra/heartbeat-runner.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/infra/heartbeat-runner.ts b/src/infra/heartbeat-runner.ts
index e7baa1b8162..897a713c67c 100644
--- a/src/infra/heartbeat-runner.ts
+++ b/src/infra/heartbeat-runner.ts
@@ -1852,8 +1852,11 @@ export function startHeartbeatRunner(opts: {
             });
             continue;
           }
-          if (commitmentRes.status === "skipped" && commitmentRes.reason === "requests-in-flight") {
-            requestsInFlight = true;
+          if (
+            commitmentRes.status === "skipped" &&
+            isRetryableHeartbeatBusySkipReason(commitmentRes.reason)
+          ) {
+            retryableBusySkip = true;
             return commitmentRes;
           }
           if (commitmentRes.status === "ran") {