From 899849cdd5cfafd8495cfacfb74f0f926565fafd Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Mon, 8 Jun 2026 23:32:16 +0700
Subject: [PATCH] Keep daemon worker alive on heartbeat stalls

---
 packages/server/src/server/daemon-worker.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/server/src/server/daemon-worker.ts b/packages/server/src/server/daemon-worker.ts
index c9cb89354..b84e608ef 100644
--- a/packages/server/src/server/daemon-worker.ts
+++ b/packages/server/src/server/daemon-worker.ts
@@ -237,6 +237,7 @@ async function main() {
       const ipcConnected = typeof process.connected === "boolean" ? process.connected : true;
       const heartbeatExpired = Date.now() - lastSupervisorHeartbeatAt > 3500;
       const supervisorChanged = process.ppid !== supervisorPid;
+
       if (ipcConnected === false) {
         exitAfterSupervisorLoss("ipc_disconnected");
         return;
@@ -245,12 +246,8 @@ async function main() {
         exitAfterSupervisorLoss("supervisor_parent_pid_changed");
         return;
       }
-      if (!isPidAlive(supervisorPid)) {
+      if (heartbeatExpired && !isPidAlive(supervisorPid)) {
         exitAfterSupervisorLoss("supervisor_pid_dead");
-        return;
-      }
-      if (heartbeatExpired) {
-        exitAfterSupervisorLoss("supervisor_heartbeat_expired");
       }
     }, 1000);
     timer.unref();