@delt/claude-alarm 1.4.0 → 1.4.1

package/dist/codex/main.js

@@ -396,27 +396,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;
@@ -438,16 +459,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 {
@@ -463,20 +500,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;
@@ -484,8 +513,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;
@@ -1296,6 +1324,31 @@ var CodexAdapter = class {
   }
 };
 
+// src/codex/shutdown.ts
+var ADAPTER_SHUTDOWN_MS = 25e3;
+function createAdapterShutdown(opts) {
+  let exiting = false;
+  const shutdown2 = () => {
+    if (exiting) return;
+    exiting = true;
+    const timer = setTimeout(() => {
+      logger.warn(`Codex adapter shutdown did not finish within ${ADAPTER_SHUTDOWN_MS}ms; exiting`);
+      opts.exit();
+    }, ADAPTER_SHUTDOWN_MS);
+    const stopped = Promise.resolve().then(opts.stop);
+    const released = Promise.resolve().then(opts.release);
+    void Promise.allSettled([stopped, released]).then(() => {
+      clearTimeout(timer);
+      opts.exit();
+    });
+  };
+  opts.signals.on("SIGINT", shutdown2);
+  opts.signals.on("SIGTERM", shutdown2);
+  opts.stdin?.on("end", shutdown2);
+  opts.stdin?.on("close", shutdown2);
+  return shutdown2;
+}
+
 // src/shared/hub-url.ts
 import net from "net";
 function hubUrlHost(host) {
@@ -1518,22 +1571,14 @@ var supervised = process.argv.includes("--watch-stdin");
 var endpoint = controlEndpoint(CONFIG_DIR);
 var adapter;
 var release;
-var exiting = false;
-var shutdown = () => {
-  if (exiting) return;
-  exiting = true;
-  const stopped = adapter?.stop();
-  const exit = () => process.exit(0);
-  setTimeout(exit, 3e3).unref();
-  Promise.all([stopped, release?.()]).then(exit, exit);
-};
-process.on("SIGINT", shutdown);
-process.on("SIGTERM", shutdown);
-if (supervised) {
-  process.stdin.on("end", shutdown);
-  process.stdin.on("close", shutdown);
-  process.stdin.resume();
-}
+var shutdown = createAdapterShutdown({
+  signals: process,
+  stdin: supervised ? process.stdin : void 0,
+  stop: () => adapter?.stop(),
+  release: () => release?.(),
+  exit: () => process.exit(0)
+});
+if (supervised) process.stdin.resume();
 function send(message, then) {
   if (!process.send || !process.connected) {
     then?.();