@love-moon/conductor-cli 0.2.8 → 0.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@love-moon/conductor-cli",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "type": "module",
   "bin": {
     "conductor": "bin/conductor.js"
@@ -16,8 +16,8 @@
     "test": "node --test"
   },
   "dependencies": {
-    "@love-moon/tui-driver": "0.2.8",
-    "@love-moon/conductor-sdk": "0.2.8",
+    "@love-moon/tui-driver": "0.2.9",
+    "@love-moon/conductor-sdk": "0.2.9",
     "dotenv": "^16.4.5",
     "enquirer": "^2.4.1",
     "js-yaml": "^4.1.1",

package/src/daemon.js

@@ -61,6 +61,7 @@ export function startDaemon(config = {}, deps = {}) {
   const killFn = deps.kill || process.kill;
   let requestShutdown = async () => {};
   let shutdownSignalHandled = false;
+  let forcedSignalExitHandled = false;
 
   const exitAndReturn = (code) => {
     exitFn(code);
@@ -145,6 +146,14 @@ export function startDaemon(config = {}, deps = {}) {
     process.env.CONDUCTOR_STOP_FORCE_KILL_TIMEOUT_MS,
     5000,
   );
+  const SHUTDOWN_STATUS_REPORT_TIMEOUT_MS = parsePositiveInt(
+    process.env.CONDUCTOR_SHUTDOWN_STATUS_REPORT_TIMEOUT_MS,
+    1000,
+  );
+  const SHUTDOWN_DISCONNECT_TIMEOUT_MS = parsePositiveInt(
+    process.env.CONDUCTOR_SHUTDOWN_DISCONNECT_TIMEOUT_MS,
+    1000,
+  );
 
   try {
     mkdirSyncFn(WORKSPACE_ROOT, { recursive: true });
@@ -216,8 +225,16 @@ export function startDaemon(config = {}, deps = {}) {
   };
 
   process.on("exit", cleanupLock);
+  const signalExitCode = (signal) => (signal === "SIGINT" ? 130 : 143);
   const handleSignal = (signal) => {
-    if (shutdownSignalHandled) return;
+    if (shutdownSignalHandled) {
+      if (forcedSignalExitHandled) return;
+      forcedSignalExitHandled = true;
+      log(`Received ${signal} again, forcing exit now`);
+      cleanupLock();
+      exitFn(signalExitCode(signal));
+      return;
+    }
     shutdownSignalHandled = true;
     void (async () => {
       try {
@@ -227,7 +244,7 @@ export function startDaemon(config = {}, deps = {}) {
         logError(`Graceful shutdown failed on ${signal}: ${err?.message || err}`);
       } finally {
         cleanupLock();
-        exitFn(0);
+        exitFn(signalExitCode(signal));
       }
     })();
   };
@@ -892,15 +909,19 @@ export function startDaemon(config = {}, deps = {}) {
         activeEntries.map(async ([taskId, record]) => {
           suppressedExitStatusReports.add(taskId);
           try {
-            await client.sendJson({
-              type: "task_status_update",
-              payload: {
-                task_id: taskId,
-                project_id: record.projectId,
-                status: "KILLED",
-                summary: `daemon shutdown (${reason})`,
-              },
-            });
+            await withTimeout(
+              client.sendJson({
+                type: "task_status_update",
+                payload: {
+                  task_id: taskId,
+                  project_id: record.projectId,
+                  status: "KILLED",
+                  summary: `daemon shutdown (${reason})`,
+                },
+              }),
+              SHUTDOWN_STATUS_REPORT_TIMEOUT_MS,
+              `report shutdown status for ${taskId}`,
+            );
           } catch (err) {
             logError(`Failed to report shutdown status (KILLED) for ${taskId}: ${err?.message || err}`);
           }
@@ -923,7 +944,11 @@ export function startDaemon(config = {}, deps = {}) {
       activeTaskProcesses.clear();
 
       try {
-        await Promise.resolve(client.disconnect());
+        await withTimeout(
+          Promise.resolve(client.disconnect()),
+          SHUTDOWN_DISCONNECT_TIMEOUT_MS,
+          "disconnect daemon websocket",
+        );
       } catch (error) {
         logError(`Failed to disconnect client on daemon close: ${error?.message || error}`);
       }
@@ -989,6 +1014,25 @@ function parsePositiveInt(value, fallback) {
   return fallback;
 }
 
+async function withTimeout(promise, timeoutMs, label) {
+  let timer = null;
+  const timeoutPromise = new Promise((_, reject) => {
+    timer = setTimeout(() => {
+      reject(new Error(`${label} timed out after ${timeoutMs}ms`));
+    }, timeoutMs);
+    if (typeof timer?.unref === "function") {
+      timer.unref();
+    }
+  });
+  try {
+    return await Promise.race([promise, timeoutPromise]);
+  } finally {
+    if (timer) {
+      clearTimeout(timer);
+    }
+  }
+}
+
 function expandHomePath(inputPath, homeDir) {
   if (typeof inputPath !== "string" || !inputPath) {
     return inputPath;