@delt/claude-alarm 1.3.0 → 1.4.0

package/dist/cli.js

@@ -301,7 +301,7 @@ var init_session_manager = __esm({
 
 // src/hub/notifier.ts
 import notifier from "node-notifier";
-import { execFile } from "child_process";
+import { execFile as execFile2 } from "child_process";
 var Notifier;
 var init_notifier = __esm({
   "src/hub/notifier.ts"() {
@@ -362,7 +362,7 @@ var init_notifier = __esm({
       }
       checkWindowsNotifications() {
         return new Promise((resolve) => {
-          execFile(
+          execFile2(
             "powershell",
             ["-Command", '(Get-ItemProperty -Path "HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\PushNotifications" -Name ToastEnabled -ErrorAction SilentlyContinue).ToastEnabled'],
             { windowsHide: true },
@@ -383,7 +383,7 @@ var init_notifier = __esm({
         logger.warn("Windows notifications are disabled. Opening notification settings...");
         logger.warn("Please enable notifications for this app, then try again.");
         if (process.platform === "win32") {
-          execFile("powershell", ["-Command", "Start-Process ms-settings:notifications"], { windowsHide: true });
+          execFile2("powershell", ["-Command", "Start-Process ms-settings:notifications"], { windowsHide: true });
         }
         setTimeout(() => {
           this.notificationSettingsOpened = false;
@@ -445,7 +445,7 @@ import { randomUUID as randomUUID2 } from "crypto";
 function visibleLength(html) {
   return html.replace(/<[^>]*>/g, "").replace(/&(?:amp|lt|gt);/g, "&").length;
 }
-var TELEGRAM_API, MAX_CHOICE_MESSAGES, MAX_SELECTIONS, MAX_VISIBLE_CHARS, TRUNCATED, MAX_PHOTO_BYTES, TelegramBot;
+var TELEGRAM_API, MAX_CHOICE_MESSAGES, MAX_SELECTIONS, MAX_VISIBLE_CHARS, TRUNCATED, MAX_PHOTO_BYTES, NO_LONGER_CONNECTED, TelegramBot;
 var init_telegram = __esm({
   "src/hub/telegram.ts"() {
     "use strict";
@@ -459,6 +459,7 @@ var init_telegram = __esm({
     MAX_VISIBLE_CHARS = 4e3;
     TRUNCATED = "\u2026(truncated)";
     MAX_PHOTO_BYTES = 10 * 1024 * 1024;
+    NO_LONGER_CONNECTED = "the session is no longer connected";
     TelegramBot = class _TelegramBot {
       config;
       offset = 0;
@@ -629,13 +630,7 @@ ${TRUNCATED}`);
               this.selections.delete(latest);
               const session = this.pendingSession(pending, parseInt(selectMatch[1], 10) - 1);
               if (session) {
-                let delivered = true;
-                if (pending.photoFileId) {
-                  delivered = await this.deliverPhotoToSessionByFileId(session.id, pending.photoFileId, pending.caption);
-                } else if (pending.text) {
-                  this.deliverToSession(session.id, pending.text);
-                }
-                if (delivered) this.sendMessage(`Sent to [${this.getLabel(session)}]`);
+                if (await this.deliverPending(session.id, pending)) this.sendMessage(`Sent to [${this.getLabel(session)}]`);
               } else {
                 this.sendMessage("Invalid session number.");
               }
@@ -677,9 +672,13 @@ ${TRUNCATED}`);
         this.sendMessage("Multiple sessions active. Select one:", void 0, { inline_keyboard: rows });
       }
       deliverToSession(sessionId2, content) {
-        if (this.onMessageToSession) {
-          this.onMessageToSession(sessionId2, content);
-        }
+        const delivered = this.onMessageToSession?.(sessionId2, content) === true;
+        if (!delivered) void this.sendMessage(`Not delivered: ${NO_LONGER_CONNECTED}`);
+        return delivered;
+      }
+      async deliverPending(sessionId2, pending) {
+        if (pending.photoFileId) return this.deliverPhotoToSessionByFileId(sessionId2, pending.photoFileId, pending.caption);
+        return pending.text ? this.deliverToSession(sessionId2, pending.text) : false;
       }
       async deliverPhotoToSession(sessionId2, photos, caption) {
         const largest = photos[photos.length - 1];
@@ -711,8 +710,19 @@ ${TRUNCATED}`);
           const filePath = path6.join(UPLOADS_DIR, filename);
           fs5.writeFileSync(filePath, buffer);
           logger.info(`Telegram photo saved: ${filename} (${buffer.length} bytes)`);
-          if (this.onImageToSession) {
-            this.onImageToSession(sessionId2, filePath, mimeType, caption);
+          let accepted = false;
+          try {
+            accepted = this.onImageToSession?.(sessionId2, filePath, mimeType, caption) === true;
+          } catch (err) {
+            logger.warn(`Telegram photo hand-off failed: ${err.message}`);
+          }
+          if (!accepted) {
+            try {
+              fs5.unlinkSync(filePath);
+            } catch {
+            }
+            this.photoNotDelivered(NO_LONGER_CONNECTED);
+            return false;
           }
           setTimeout(() => {
             try {
@@ -720,7 +730,7 @@ ${TRUNCATED}`);
             } catch {
             }
           }, 5 * 60 * 1e3).unref();
-          return this.onImageToSession !== void 0;
+          return true;
         } catch (err) {
           logger.warn(`Telegram photo download failed: ${err.message}`);
           this.photoNotDelivered("the download failed");
@@ -915,15 +925,10 @@ ${label}`);
           return;
         }
         this.selections.delete(selectionId);
-        if (pending.photoFileId) {
-          const delivered = await this.deliverPhotoToSessionByFileId(session.id, pending.photoFileId, pending.caption);
-          if (!delivered) {
-            await this.answerCallbackQuery(query.id, "Photo not delivered");
-            if (query.message) await this.removeButtons(query.message.chat.id, query.message.message_id);
-            return;
-          }
-        } else if (pending.text) {
-          this.deliverToSession(session.id, pending.text);
+        if (!await this.deliverPending(session.id, pending)) {
+          await this.answerCallbackQuery(query.id, pending.photoFileId ? "Photo not delivered" : "Not delivered");
+          if (query.message) await this.removeButtons(query.message.chat.id, query.message.message_id);
+          return;
         }
         await this.answerCallbackQuery(query.id, `Sent to ${this.getLabel(session)}`);
         if (query.message) {
@@ -1624,7 +1629,16 @@ var init_server = __esm({
             this.sessions.updateActivity(msg.sessionId);
             const notifySession = this.sessions.get(msg.sessionId);
             const notifyLabel = this.getSessionLabel(notifySession);
-            this.notifier.notifyWithSession(msg.sessionId, notifyLabel, `[${notifyLabel}] ${msg.title}`, msg.message, msg.level ?? "info");
+            const notifyTitle = `[${notifyLabel}] ${msg.title}`;
+            if (msg.to === "api") {
+              logger.info(`${notifyTitle}: ${msg.message}`);
+              break;
+            }
+            if (msg.to === "telegram") {
+              void this.telegramBot?.sendNotification(msg.sessionId, notifyLabel, notifyTitle, msg.message);
+              break;
+            }
+            if (msg.to !== "dashboard") this.notifier.notifyWithSession(msg.sessionId, notifyLabel, notifyTitle, msg.message, msg.level ?? "info");
             this.broadcastToDashboards({
               type: "notification",
               sessionId: msg.sessionId,
@@ -1826,6 +1840,11 @@ var init_server = __esm({
               const channelWs = this.channelSockets.get(msg.sessionId);
               if (channelWs?.readyState === WebSocket2.OPEN) {
                 channelWs.send(JSON.stringify({ ...msg, source: "dashboard" }));
+              } else {
+                const reason = "the session is not connected";
+                logger.warn(`Message rejected for ${msg.sessionId}: ${reason}`);
+                const rejected = { type: "message_rejected", sessionId: msg.sessionId, reason };
+                if (ws.readyState === WebSocket2.OPEN) ws.send(JSON.stringify(rejected));
               }
             } else if (msg.type === "image_upload") {
               this.handleImageUpload(ws, msg);
@@ -1951,19 +1970,25 @@ var init_server = __esm({
         this.telegramBot.getSessions = () => this.sessions.getAll();
         this.telegramBot.onMessageToSession = (sessionId2, content) => {
           const channelWs = this.channelSockets.get(sessionId2);
-          if (channelWs?.readyState === WebSocket2.OPEN) {
-            const msg = { type: "message_to_session", sessionId: sessionId2, content, source: "telegram" };
-            channelWs.send(JSON.stringify(msg));
-            logger.info(`Telegram message forwarded to session: ${sessionId2}`);
+          if (channelWs?.readyState !== WebSocket2.OPEN) {
+            logger.warn(`Telegram message not delivered to ${sessionId2}: the session is not connected`);
+            return false;
           }
+          const msg = { type: "message_to_session", sessionId: sessionId2, content, source: "telegram" };
+          channelWs.send(JSON.stringify(msg));
+          logger.info(`Telegram message forwarded to session: ${sessionId2}`);
+          return true;
         };
         this.telegramBot.onImageToSession = (sessionId2, imagePath, mimeType, caption) => {
           const channelWs = this.channelSockets.get(sessionId2);
-          if (channelWs?.readyState === WebSocket2.OPEN) {
-            const msg = { type: "image_to_session", sessionId: sessionId2, imagePath, mimeType, content: caption, source: "telegram" };
-            channelWs.send(JSON.stringify(msg));
-            logger.info(`Telegram photo forwarded to session: ${sessionId2}`);
+          if (channelWs?.readyState !== WebSocket2.OPEN) {
+            logger.warn(`Telegram photo not delivered to ${sessionId2}: the session is not connected`);
+            return false;
           }
+          const msg = { type: "image_to_session", sessionId: sessionId2, imagePath, mimeType, content: caption, source: "telegram" };
+          channelWs.send(JSON.stringify(msg));
+          logger.info(`Telegram photo forwarded to session: ${sessionId2}`);
+          return true;
         };
         this.telegramBot.onPermissionVerdict = (sessionId2, requestId, behavior) => {
           if (this.forwardPermissionResponse({ sessionId: sessionId2, requestId, behavior })) {
@@ -2627,7 +2652,7 @@ import { fileURLToPath as fileURLToPath2 } from "url";
 
 // src/codex/transport.ts
 init_logger();
-import { spawn } from "child_process";
+import { execFile, spawn } from "child_process";
 import fs2 from "fs";
 import path3 from "path";
 import { Duplex } from "stream";
@@ -2657,14 +2682,116 @@ function findCodex(command, platform = process.platform, env = process.env) {
   ];
   return candidates.find((file) => !!file && fs2.existsSync(file));
 }
+var shellSpawns = /* @__PURE__ */ new WeakSet();
+var spawnedThroughShell = (child) => shellSpawns.has(child);
 var defaultSpawn = (command, args) => {
   const { file, shell } = resolveCommand(command);
-  if (shell) return spawn(`"${file}" ${args.join(" ")}`, { stdio: "pipe", windowsHide: true, shell: true });
-  return spawn(file, args, { stdio: "pipe", windowsHide: true });
+  if (!shell) return spawn(file, args, { stdio: "pipe", windowsHide: true });
+  const child = spawn(`"${file}" ${args.join(" ")}`, { stdio: "pipe", windowsHide: true, shell: true });
+  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 runFile = (file, args, options, callback) => {
+  execFile(file, args, options, (err) => callback(err));
+};
+function descendantsOf(rootPid, rows) {
+  const root = rows.find((row) => row.pid === rootPid);
+  if (!root) return void 0;
+  const found = [];
+  const seen = /* @__PURE__ */ new Set([root.pid]);
+  let level = [root];
+  for (let depth = 1; level.length; depth++) {
+    const next = [];
+    for (const parent of level) {
+      for (const row of rows) {
+        if (row.parentPid !== parent.pid || seen.has(row.pid) || row.creationTime < parent.creationTime) continue;
+        seen.add(row.pid);
+        next.push(row);
+        found.push({ ...row, depth });
+      }
+    }
+    level = next;
+  }
+  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();
+    });
+  });
+  const stopDeepestFirst = async (descendants) => {
+    for (const descendant of [...descendants].sort((a, b) => b.depth - a.depth)) await stop(descendant.pid);
+  };
+  const snapshot = async () => {
+    try {
+      return await query();
+    } catch (err) {
+      logger.debug(`codex process query failed: ${String(err)}`);
+      return void 0;
+    }
+  };
+  const isShellTree = (child) => platform === "win32" && child.pid !== void 0 && throughShell(child);
+  const killer = async (child) => {
+    if (!isShellTree(child)) {
+      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)));
+  };
+  killer.track = async (child) => {
+    if (!isShellTree(child) || exited(child)) return;
+    const earlier = recorded.get(child);
+    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))];
+    })();
+    recorded.set(child, latest);
+    await latest;
+  };
+  return killer;
+}
+var killTree = treeKiller();
 var HANDSHAKE_TIMEOUT_MS = 1e4;
-function connectProxy(command, spawnFn = defaultSpawn, timeoutMs = HANDSHAKE_TIMEOUT_MS) {
+function connectProxy(command, spawnFn = defaultSpawn, timeoutMs = HANDSHAKE_TIMEOUT_MS, killTreeFn = killTree) {
   const child = spawnFn(command, ["app-server", "proxy"]);
+  void killTreeFn.track?.(child);
   child.stdin?.on("error", () => {
   });
   child.stderr?.on("data", (d) => logger.debug(`codex proxy: ${String(d).trim()}`));
@@ -2691,10 +2818,12 @@ function connectProxy(command, spawnFn = defaultSpawn, timeoutMs = HANDSHAKE_TIM
   const ws = new WebSocket("ws://localhost/", {
     createConnection: (() => stream)
   });
-  const close = () => {
+  let closing;
+  const close = () => closing ??= (async () => {
     ws.terminate();
-    child.kill();
-  };
+    child.stdin?.end();
+    await killTreeFn(child);
+  })();
   return new Promise((resolve, reject) => {
     let settled = false;
     const timer = setTimeout(() => fail(new Error(`codex daemon did not answer within ${timeoutMs / 1e3}s`)), timeoutMs);
@@ -2702,8 +2831,7 @@ function connectProxy(command, spawnFn = defaultSpawn, timeoutMs = HANDSHAKE_TIM
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      close();
-      reject(err);
+      void close().then(() => reject(err), () => reject(err));
     };
     child.on("error", fail);
     child.once("exit", (code) => fail(new Error(`codex proxy exited (code ${code})`)));
@@ -2714,6 +2842,7 @@ function connectProxy(command, spawnFn = defaultSpawn, timeoutMs = HANDSHAKE_TIM
       clearTimeout(timer);
       child.on("error", (err) => logger.warn(`codex proxy error: ${err.message}`));
       ws.on("error", (err) => logger.warn(`codex daemon socket error: ${err.message}`));
+      void killTreeFn.track?.(child);
       resolve({ ws, close });
     });
   });
@@ -3005,7 +3134,7 @@ async function runCodexTask(opts) {
     };
   } finally {
     for (const t of timers) clearTimeout(t);
-    conn.close();
+    await conn.close();
   }
 }
 var VALUE_FLAGS = {
@@ -3496,19 +3625,19 @@ async function hubStart(daemon) {
       process.exit(1);
     }
     fs9.writeFileSync(PID_FILE, String(pid), "utf-8");
-    let exited = false;
+    let exited2 = false;
     child.once("exit", () => {
-      exited = true;
+      exited2 = true;
     });
     child.unref();
     const startup = await waitForHub({
       url: `http://${displayHost}:${port}/api/status`,
       token: config2.hub.token,
       pid,
-      isAlive: () => !exited
+      isAlive: () => !exited2
     });
     if (startup !== "ready") {
-      if (!exited) child.kill();
+      if (!exited2) child.kill();
       if (fs9.existsSync(PID_FILE)) fs9.unlinkSync(PID_FILE);
       console.error(startup === "exited" ? `Hub exited during startup. See ${LOG_FILE}` : `Hub did not answer at http://${displayHost}:${port} within ${HUB_START_TIMEOUT_MS / 1e3}s and was stopped. See ${LOG_FILE}`);
       process.exit(1);