@delt/claude-alarm 1.4.0 → 1.4.1

package/dist/index.js

@@ -846,6 +846,11 @@ ${bodyLines.join("\n")}`;
 import { spawn } from "child_process";
 import fs2 from "fs";
 import path3 from "path";
+
+// src/codex/shutdown.ts
+var SUPERVISOR_STOP_GRACE_MS = 3e4;
+
+// src/hub/codex-supervisor.ts
 var HEALTHY_RUN_MS = 6e4;
 function resolveAdapterScript(baseDir) {
   return [path3.join(baseDir, "..", "codex", "main.js"), path3.join(baseDir, "codex", "main.js")].find((p) => fs2.existsSync(p));
@@ -861,7 +866,7 @@ var CodexSupervisor = class {
     this.spawnFn = opts.spawnFn ?? spawn;
     this.minDelayMs = opts.minDelayMs ?? 2e3;
     this.maxDelayMs = opts.maxDelayMs ?? 6e4;
-    this.stopGraceMs = opts.stopGraceMs ?? 3e3;
+    this.stopGraceMs = opts.stopGraceMs ?? SUPERVISOR_STOP_GRACE_MS;
     this.env = opts.env;
     this.delay = this.minDelayMs;
   }
@@ -884,11 +889,22 @@ var CodexSupervisor = class {
     this.timer = void 0;
     const child = this.child;
     this.child = void 0;
-    if (!child) return;
-    child.stdin?.end();
-    const force = setTimeout(() => child.kill(), this.stopGraceMs);
-    force.unref();
-    child.once("exit", () => clearTimeout(force));
+    if (!child) return Promise.resolve();
+    return new Promise((resolve) => {
+      const done = () => {
+        clearTimeout(force);
+        child.removeListener("exit", done);
+        resolve();
+      };
+      const force = setTimeout(() => {
+        logger.warn(`Codex adapter did not exit within ${this.stopGraceMs}ms of stop; killing it`);
+        child.kill();
+        done();
+      }, this.stopGraceMs);
+      force.unref();
+      child.once("exit", done);
+      child.stdin?.end();
+    });
   }
   launch() {
     const startedAt = Date.now();
@@ -1222,9 +1238,9 @@ var HubServer = class {
     });
   }
   stop() {
-    return new Promise((resolve) => {
-      this.codexSupervisor?.stop();
-      this.codexSupervisor = void 0;
+    const adapterStopped = this.codexSupervisor?.stop();
+    this.codexSupervisor = void 0;
+    const serverStopped = new Promise((resolve) => {
       if (this.heartbeatInterval) clearInterval(this.heartbeatInterval);
       if (this.telegramBot) this.telegramBot.stopPolling();
       for (const ws of this.channelSockets.values()) ws.terminate();
@@ -1244,6 +1260,8 @@ var HubServer = class {
         resolve();
       }, 3e3);
     });
+    return Promise.all([serverStopped, adapterStopped]).then(() => {
+    });
   }
   // --- HTTP Handler ---
   handleHttp(req, res) {