@delt/claude-alarm 1.4.0 → 1.4.1

package/dist/cli.js

@@ -146,6 +146,52 @@ var init_logger = __esm({
   }
 });
 
+// src/codex/shutdown.ts
+async function closeWithinLimit(close) {
+  let timer;
+  try {
+    await Promise.race([
+      Promise.resolve().then(close),
+      new Promise((_resolve, reject) => {
+        timer = setTimeout(() => reject(new Error("Codex proxy cleanup timed out")), RUN_CLOSE_MS);
+      })
+    ]);
+  } finally {
+    clearTimeout(timer);
+  }
+}
+function exitAfterFlush(code, stdout, stderr, exit = process.exit) {
+  let exited2 = false;
+  let remaining = 2;
+  const finish = () => {
+    if (exited2) return;
+    exited2 = true;
+    clearTimeout(timer);
+    exit(code);
+  };
+  const timer = setTimeout(finish, CLI_EXIT_FLUSH_MS);
+  const flushed = () => {
+    if (--remaining === 0) finish();
+  };
+  for (const stream of [stdout, stderr]) {
+    try {
+      stream.write("", flushed);
+    } catch {
+      flushed();
+    }
+  }
+}
+var RUN_CLOSE_MS, SUPERVISOR_STOP_GRACE_MS, CLI_EXIT_FLUSH_MS;
+var init_shutdown = __esm({
+  "src/codex/shutdown.ts"() {
+    "use strict";
+    init_logger();
+    RUN_CLOSE_MS = 15e3;
+    SUPERVISOR_STOP_GRACE_MS = 3e4;
+    CLI_EXIT_FLUSH_MS = 1e3;
+  }
+});
+
 // src/shared/crash-guard.ts
 import fs3 from "fs";
 function appendToLog(text) {
@@ -1068,6 +1114,7 @@ var init_codex_supervisor = __esm({
   "src/hub/codex-supervisor.ts"() {
     "use strict";
     init_logger();
+    init_shutdown();
     HEALTHY_RUN_MS = 6e4;
     CodexSupervisor = class {
       constructor(script, opts = {}) {
@@ -1075,7 +1122,7 @@ var init_codex_supervisor = __esm({
         this.spawnFn = opts.spawnFn ?? spawn2;
         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;
       }
@@ -1098,11 +1145,22 @@ var init_codex_supervisor = __esm({
         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();
@@ -1351,9 +1409,9 @@ var init_server = __esm({
         });
       }
       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();
@@ -1373,6 +1431,8 @@ var init_server = __esm({
             resolve();
           }, 3e3);
         });
+        return Promise.all([serverStopped, adapterStopped]).then(() => {
+        });
       }
       // --- HTTP Handler ---
       handleHttp(req, res) {
@@ -2691,27 +2751,48 @@ var defaultSpawn = (command, args) => {
   shellSpawns.add(child);
   return child;
 };
-var queryProcesses = () => new Promise((resolve, reject) => {
-  const script = "@(Get-CimInstance Win32_Process | ForEach-Object { [pscustomobject]@{ pid = [int]$_.ProcessId; parentPid = [int]$_.ParentProcessId; creationTime = $_.CreationDate.ToUniversalTime().ToString('o') } }) | ConvertTo-Json -Compress";
-  execFile("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", script], { windowsHide: true, timeout: 5e3, maxBuffer: 4 * 1024 * 1024 }, (err, stdout) => {
-    if (err) {
-      reject(err);
-      return;
-    }
-    try {
-      const rows = JSON.parse(stdout);
-      if (!Array.isArray(rows) || rows.some((row) => !Number.isInteger(row.pid) || !Number.isInteger(row.parentPid) || typeof row.creationTime !== "string")) {
-        throw new Error("invalid process snapshot");
-      }
-      resolve(rows);
-    } catch (error) {
-      reject(error);
-    }
+var POWERSHELL_TIMEOUT_MS = 5e3;
+var powershell = (script, env) => new Promise((resolve, reject) => {
+  execFile("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", script], { windowsHide: true, timeout: POWERSHELL_TIMEOUT_MS, maxBuffer: 4 * 1024 * 1024, env }, (err, stdout) => {
+    if (err) reject(err);
+    else resolve(stdout);
   });
 });
-var runFile = (file, args, options, callback) => {
-  execFile(file, args, options, (err) => callback(err));
+var QUERY_SCRIPT = "@(Get-CimInstance Win32_Process | Where-Object CreationDate | Select-Object @{ n = 'pid'; e = { [int]$_.ProcessId } }, @{ n = 'parentPid'; e = { [int]$_.ParentProcessId } }, @{ n = 'creationTime'; e = { $_.CreationDate.ToUniversalTime().ToString('o') } }) | ConvertTo-Json -Compress";
+var processQuery = (prelude = "") => async () => {
+  const rows = JSON.parse(await powershell(prelude + QUERY_SCRIPT));
+  if (!Array.isArray(rows) || rows.some((row) => !Number.isInteger(row.pid) || !Number.isInteger(row.parentPid) || typeof row.creationTime !== "string")) {
+    throw new Error("invalid process snapshot");
+  }
+  return rows;
 };
+var queryProcesses = processQuery();
+var END_SCRIPT = [
+  "foreach ($t in ($env:CLAUDE_ALARM_END_TARGETS | ConvertFrom-Json)) {",
+  "  $p = Get-Process -Id $t.pid -ErrorAction SilentlyContinue",
+  // Reading Handle opens the process once, and StartTime, Stop-Process and Wait-Process then use that handle; a getter that throws reads as $null.
+  '  if ($null -eq $p -or $null -eq $p.Handle) { "$($t.pid) is gone or cannot be opened"; continue }',
+  "  $start = $p.StartTime",
+  '  if ($null -eq $start) { "$($t.pid) has no readable creation time"; continue }',
+  "  $start = $start.ToUniversalTime()",
+  // Win32_Process creation dates stop at microseconds.
+  `  if ($start.AddTicks(-($start.Ticks % 10)).ToString('o') -ne $t.creationTime) { "$($t.pid) now belongs to another process"; continue }`,
+  '  try { Stop-Process -InputObject $p -Force -ErrorAction Stop } catch { "$($t.pid) not ended: $($_.FullyQualifiedErrorId)" }',
+  // A refused termination usually means the process is already exiting, so it is waited for all the same.
+  '  try { Wait-Process -InputObject $p -Timeout 1 -ErrorAction Stop } catch { "$($t.pid) has not exited yet" }',
+  "}"
+].join("\n");
+var processEnder = (prelude = "") => async (targets) => {
+  await Promise.all(targets.map(async (target) => {
+    try {
+      const notes = await powershell(prelude + END_SCRIPT, { ...process.env, CLAUDE_ALARM_END_TARGETS: JSON.stringify([target]) });
+      for (const note of notes.split(/\r?\n/)) if (note) logger.debug(`codex process ${note}`);
+    } catch (err) {
+      logger.debug(`ending codex process ${target.pid} failed: ${err.killed ? "timed out" : String(err)}`);
+    }
+  }));
+};
+var endProcesses = processEnder();
 function descendantsOf(rootPid, rows) {
   const root = rows.find((row) => row.pid === rootPid);
   if (!root) return void 0;
@@ -2733,16 +2814,32 @@ function descendantsOf(rootPid, rows) {
   return found;
 }
 var exited = (child) => child.exitCode !== null || child.signalCode !== null;
-function treeKiller(platform = process.platform, run = runFile, query = queryProcesses, throughShell = spawnedThroughShell) {
-  const recorded = /* @__PURE__ */ new WeakMap();
-  const stop = (pid) => new Promise((resolve) => {
-    run("taskkill", ["/PID", String(pid), "/F"], { windowsHide: true }, (err) => {
-      if (err) logger.debug(`taskkill ${pid} failed: ${err.message}`);
-      resolve();
-    });
+var SHELL_EXIT_WAIT_MS = 1e3;
+var PROXY_TREE_CLOSE_BUDGET_MS = 2 * POWERSHELL_TIMEOUT_MS + SHELL_EXIT_WAIT_MS;
+var exitOf = (child) => new Promise((resolve) => {
+  if (exited(child)) {
+    resolve();
+    return;
+  }
+  const timer = setTimeout(() => {
+    logger.debug(`codex proxy shell ${child.pid} has not exited yet`);
+    resolve();
+  }, SHELL_EXIT_WAIT_MS);
+  child.once("exit", () => {
+    clearTimeout(timer);
+    resolve();
   });
-  const stopDeepestFirst = async (descendants) => {
-    for (const descendant of [...descendants].sort((a, b) => b.depth - a.depth)) await stop(descendant.pid);
+});
+var merged = (before, found) => [...before, ...found.filter((d) => !before.some((b) => b.pid === d.pid && b.creationTime === d.creationTime))];
+function treeKiller(platform = process.platform, end = endProcesses, query = queryProcesses, throughShell = spawnedThroughShell) {
+  const recorded = /* @__PURE__ */ new WeakMap();
+  const endByIdentity = async (descendants) => {
+    if (!descendants.length) return;
+    try {
+      await end([...descendants].sort((a, b) => b.depth - a.depth).map(({ depth, ...identity }) => identity));
+    } catch (err) {
+      logger.debug(`ending codex processes failed: ${String(err)}`);
+    }
   };
   const snapshot = async () => {
     try {
@@ -2758,20 +2855,12 @@ function treeKiller(platform = process.platform, run = runFile, query = queryPro
       if (!exited(child)) child.kill();
       return;
     }
-    if (!exited(child)) {
-      const rows = await snapshot();
-      if (!exited(child)) {
-        const descendants2 = rows && descendantsOf(child.pid, rows);
-        if (descendants2) await stopDeepestFirst(descendants2);
-        child.kill();
-        return;
-      }
-    }
-    const descendants = await recorded.get(child) ?? [];
-    if (!descendants.length) return;
-    const current = await snapshot();
-    if (!current) return;
-    await stopDeepestFirst(descendants.filter((d) => current.some((row) => row.pid === d.pid && row.creationTime === d.creationTime)));
+    const [rows, before] = await Promise.all([exited(child) ? void 0 : snapshot(), recorded.get(child)]);
+    const found = rows && !exited(child) ? descendantsOf(child.pid, rows) ?? [] : [];
+    await endByIdentity(merged(before ?? [], found));
+    if (exited(child)) return;
+    child.kill();
+    await exitOf(child);
   };
   killer.track = async (child) => {
     if (!isShellTree(child) || exited(child)) return;
@@ -2779,8 +2868,7 @@ function treeKiller(platform = process.platform, run = runFile, query = queryPro
     const latest = (async () => {
       const rows = await snapshot();
       const found = rows && !exited(child) ? descendantsOf(child.pid, rows) ?? [] : [];
-      const before = await earlier ?? [];
-      return [...before, ...found.filter((d) => !before.some((b) => b.pid === d.pid && b.creationTime === d.creationTime))];
+      return merged(await earlier ?? [], found);
     })();
     recorded.set(child, latest);
     await latest;
@@ -2849,6 +2937,7 @@ function connectProxy(command, spawnFn = defaultSpawn, timeoutMs = HANDSHAKE_TIM
 }
 
 // src/codex/run.ts
+init_shutdown();
 import path4 from "path";
 
 // src/codex/rpc.ts
@@ -3134,7 +3223,14 @@ async function runCodexTask(opts) {
     };
   } finally {
     for (const t of timers) clearTimeout(t);
-    await conn.close();
+    try {
+      await closeWithinLimit(() => conn.close());
+    } catch (err) {
+      try {
+        progress(`warning: Codex proxy cleanup failed: ${err.message}`);
+      } catch {
+      }
+    }
   }
 }
 var VALUE_FLAGS = {
@@ -3207,6 +3303,7 @@ async function runFromCli(argv, io) {
 }
 
 // src/cli.ts
+init_shutdown();
 init_constants();
 init_logger();
 init_crash_guard();
@@ -3958,8 +4055,10 @@ async function main2() {
     else if (sub === "start") await codexStart();
     else if (sub === "stop") process.exitCode = await stopAdapter(controlDeps(), loadConfig().codex?.enabled === true);
     else if (sub === "status") process.exitCode = await adapterStatus(controlDeps(), loadConfig().codex?.enabled === true);
-    else if (sub === "run") process.exitCode = await codexRun(args.slice(2));
-    else {
+    else if (sub === "run") {
+      const code = await codexRun(args.slice(2));
+      exitAfterFlush(code, process.stdout, process.stderr);
+    } else {
       console.error(`Unknown codex command: ${sub}`);
       printUsage();
       process.exit(1);