From ca3e55813e546a48bb5c7eaaf7b886a87f1980c0 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Tue, 5 May 2026 18:48:07 +0700
Subject: [PATCH] Keep daemon worker supervision explicit

---
 .../server/scripts/supervisor-entrypoint.ts   |  2 +-
 packages/server/src/server/bootstrap.ts       | 10 ----
 packages/server/src/server/daemon-worker.ts   | 52 +++++--------------
 3 files changed, 14 insertions(+), 50 deletions(-)

diff --git a/packages/server/scripts/supervisor-entrypoint.ts b/packages/server/scripts/supervisor-entrypoint.ts
index 4d75f6653..13ae75ebb 100644
--- a/packages/server/scripts/supervisor-entrypoint.ts
+++ b/packages/server/scripts/supervisor-entrypoint.ts
@@ -103,7 +103,7 @@ async function main(): Promise<void> {
   const config = parseConfig(process.argv.slice(2));
   const workerEntry = config.devMode ? resolveDevWorkerEntry() : resolveWorkerEntry();
   const workerExecArgv = resolveWorkerExecArgv(workerEntry);
-  const workerEnv: NodeJS.ProcessEnv = { ...process.env, PASEO_SUPERVISED: "1" };
+  const workerEnv: NodeJS.ProcessEnv = { ...process.env };
   const packagedNodeEntrypointRunner =
     process.env.ELECTRON_RUN_AS_NODE === "1"
       ? resolvePackagedNodeEntrypointRunnerPath(fileURLToPath(import.meta.url))
diff --git a/packages/server/src/server/bootstrap.ts b/packages/server/src/server/bootstrap.ts
index 021adfcf5..ed39df878 100644
--- a/packages/server/src/server/bootstrap.ts
+++ b/packages/server/src/server/bootstrap.ts
@@ -842,16 +842,6 @@ export async function createPaseoDaemon(
             github,
           );
 
-          if (typeof process.send === "function" && process.env.PASEO_SUPERVISED === "1") {
-            process.send({
-              type: "paseo:ready",
-              listen:
-                boundListenTarget.type === "tcp"
-                  ? `${boundListenTarget.host}:${boundListenTarget.port}`
-                  : boundListenTarget.path,
-            });
-          }
-
           if (relayEnabled) {
             const offer = await createConnectionOfferV2({
               serverId,
diff --git a/packages/server/src/server/daemon-worker.ts b/packages/server/src/server/daemon-worker.ts
index 5d87ccec2..2ad924bdb 100644
--- a/packages/server/src/server/daemon-worker.ts
+++ b/packages/server/src/server/daemon-worker.ts
@@ -2,13 +2,16 @@ import { createPaseoDaemon } from "./bootstrap.js";
 import { loadConfig } from "./config.js";
 import { resolvePaseoHome } from "./paseo-home.js";
 import { createRootLogger } from "./logger.js";
-import { acquirePidLock, PidLockError, releasePidLock, updatePidLock } from "./pid-lock.js";
 import type { DaemonLifecycleIntent } from "./bootstrap.js";
 
 type SupervisorLifecycleMessage =
   | {
       type: "paseo:shutdown";
     }
+  | {
+      type: "paseo:ready";
+      listen: string;
+    }
   | {
       type: "paseo:restart";
       reason?: string;
@@ -46,12 +49,10 @@ function applyCliFlagOverrides(config: ReturnType<typeof loadConfig>): void {
 }
 
 async function main() {
-  const { paseoHome, logger, config } = bootstrapFromEnvironment();
+  const { logger, config } = bootstrapFromEnvironment();
   let daemon: Awaited<ReturnType<typeof createPaseoDaemon>> | null = null;
   let shutdownPromise: Promise<number> | null = null;
   let exitHookInstalled = false;
-  const supervised = process.env.PASEO_SUPERVISED === "1" && typeof process.send === "function";
-  let pidLockAcquired = false;
 
   applyCliFlagOverrides(config);
 
@@ -87,10 +88,6 @@ async function main() {
             return 1;
           }
           await daemon.stop();
-          if (pidLockAcquired) {
-            await releasePidLock(paseoHome);
-            pidLockAcquired = false;
-          }
           clearTimeout(forceExit);
           logger.info("Server closed");
           return options?.successExitCode ?? 0;
@@ -149,11 +146,6 @@ async function main() {
   };
 
   try {
-    if (!supervised) {
-      await acquirePidLock(paseoHome, null);
-      pidLockAcquired = true;
-    }
-
     daemon = await createPaseoDaemon(
       {
         ...config,
@@ -162,40 +154,22 @@ async function main() {
       logger,
     );
   } catch (err) {
-    if (pidLockAcquired) {
-      await releasePidLock(paseoHome);
-      pidLockAcquired = false;
-    }
-    if (err instanceof PidLockError) {
-      logger.error({ pid: err.existingLock?.pid }, err.message);
-      process.exit(1);
-    }
     logger.fatal({ err }, "Daemon bootstrap failed");
     throw err;
   }
 
   try {
     await daemon.start();
-    if (!supervised) {
-      const listenTarget = daemon.getListenTarget();
-      const listen =
-        listenTarget?.type === "tcp"
-          ? `${listenTarget.host}:${listenTarget.port}`
-          : listenTarget?.path;
-      if (!listen) {
-        throw new Error("Daemon did not expose a listen target after startup");
-      }
-      await updatePidLock(paseoHome, { listen });
+    const listenTarget = daemon.getListenTarget();
+    const listen =
+      listenTarget?.type === "tcp"
+        ? `${listenTarget.host}:${listenTarget.port}`
+        : listenTarget?.path;
+    if (!listen) {
+      throw new Error("Daemon did not expose a listen target after startup");
     }
+    sendSupervisorLifecycleMessage({ type: "paseo:ready", listen });
   } catch (err) {
-    if (pidLockAcquired) {
-      await releasePidLock(paseoHome);
-      pidLockAcquired = false;
-    }
-    if (err instanceof PidLockError) {
-      logger.error({ pid: err.existingLock?.pid }, err.message);
-      process.exit(1);
-    }
     logger.fatal({ err }, "Daemon failed to start listening");
     throw err;
   }