@delt/claude-alarm 1.3.0 → 1.4.1

package/dist/index.d.ts

@@ -49,6 +49,7 @@ type ChannelMessage = {
     title: string;
     message: string;
     level?: NotifyLevel;
+    to?: MessageSource;
 } | {
     type: 'reply';
     sessionId: string;
@@ -78,6 +79,10 @@ type ChannelMessage = {
     sessionId: string;
     reason: string;
     withText: boolean;
+} | {
+    type: 'message_rejected';
+    sessionId: string;
+    reason: string;
 } | {
     type: 'sessions_list';
     sessions: SessionInfo[];
@@ -321,8 +326,8 @@ declare class TelegramBot {
     private polling;
     private pollTimer;
     private messageSessionMap;
-    onMessageToSession?: (sessionId: string, content: string) => void;
-    onImageToSession?: (sessionId: string, imagePath: string, mimeType: string, caption?: string) => void;
+    onMessageToSession?: (sessionId: string, content: string) => boolean;
+    onImageToSession?: (sessionId: string, imagePath: string, mimeType: string, caption?: string) => boolean;
     onPermissionVerdict?: (sessionId: string, requestId: string, behavior: 'allow' | 'deny') => void;
     onChoiceVerdict?: (sessionId: string, requestId: string, choiceId: string) => void;
     private choiceTokens;
@@ -345,6 +350,7 @@ declare class TelegramBot {
     private scheduleNextPoll;
     private handleIncomingMessage;
     private deliverToSession;
+    private deliverPending;
     private deliverPhotoToSession;
     private deliverPhotoToSessionByFileId;
     private photoNotDelivered;

package/dist/index.js

@@ -249,6 +249,7 @@ var MAX_SELECTIONS = 20;
 var MAX_VISIBLE_CHARS = 4e3;
 var TRUNCATED = "\u2026(truncated)";
 var MAX_PHOTO_BYTES = 10 * 1024 * 1024;
+var NO_LONGER_CONNECTED = "the session is no longer connected";
 function visibleLength(html) {
   return html.replace(/<[^>]*>/g, "").replace(/&(?:amp|lt|gt);/g, "&").length;
 }
@@ -422,13 +423,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.");
           }
@@ -470,9 +465,13 @@ ${TRUNCATED}`);
     this.sendMessage("Multiple sessions active. Select one:", void 0, { inline_keyboard: rows });
   }
   deliverToSession(sessionId, content) {
-    if (this.onMessageToSession) {
-      this.onMessageToSession(sessionId, content);
-    }
+    const delivered = this.onMessageToSession?.(sessionId, content) === true;
+    if (!delivered) void this.sendMessage(`Not delivered: ${NO_LONGER_CONNECTED}`);
+    return delivered;
+  }
+  async deliverPending(sessionId, pending) {
+    if (pending.photoFileId) return this.deliverPhotoToSessionByFileId(sessionId, pending.photoFileId, pending.caption);
+    return pending.text ? this.deliverToSession(sessionId, pending.text) : false;
   }
   async deliverPhotoToSession(sessionId, photos, caption) {
     const largest = photos[photos.length - 1];
@@ -504,8 +503,19 @@ ${TRUNCATED}`);
       const filePath = path2.join(UPLOADS_DIR, filename);
       fs.writeFileSync(filePath, buffer);
       logger.info(`Telegram photo saved: ${filename} (${buffer.length} bytes)`);
-      if (this.onImageToSession) {
-        this.onImageToSession(sessionId, filePath, mimeType, caption);
+      let accepted = false;
+      try {
+        accepted = this.onImageToSession?.(sessionId, filePath, mimeType, caption) === true;
+      } catch (err) {
+        logger.warn(`Telegram photo hand-off failed: ${err.message}`);
+      }
+      if (!accepted) {
+        try {
+          fs.unlinkSync(filePath);
+        } catch {
+        }
+        this.photoNotDelivered(NO_LONGER_CONNECTED);
+        return false;
       }
       setTimeout(() => {
         try {
@@ -513,7 +523,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");
@@ -708,15 +718,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) {
@@ -841,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));
@@ -856,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;
   }
@@ -879,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();
@@ -1217,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();
@@ -1239,6 +1260,8 @@ var HubServer = class {
         resolve();
       }, 3e3);
     });
+    return Promise.all([serverStopped, adapterStopped]).then(() => {
+    });
   }
   // --- HTTP Handler ---
   handleHttp(req, res) {
@@ -1495,7 +1518,16 @@ var HubServer = class {
         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,
@@ -1697,6 +1729,11 @@ var HubServer = class {
           const channelWs = this.channelSockets.get(msg.sessionId);
           if (channelWs?.readyState === WebSocket.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 === WebSocket.OPEN) ws.send(JSON.stringify(rejected));
           }
         } else if (msg.type === "image_upload") {
           this.handleImageUpload(ws, msg);
@@ -1822,19 +1859,25 @@ var HubServer = class {
     this.telegramBot.getSessions = () => this.sessions.getAll();
     this.telegramBot.onMessageToSession = (sessionId, content) => {
       const channelWs = this.channelSockets.get(sessionId);
-      if (channelWs?.readyState === WebSocket.OPEN) {
-        const msg = { type: "message_to_session", sessionId, content, source: "telegram" };
-        channelWs.send(JSON.stringify(msg));
-        logger.info(`Telegram message forwarded to session: ${sessionId}`);
+      if (channelWs?.readyState !== WebSocket.OPEN) {
+        logger.warn(`Telegram message not delivered to ${sessionId}: the session is not connected`);
+        return false;
       }
+      const msg = { type: "message_to_session", sessionId, content, source: "telegram" };
+      channelWs.send(JSON.stringify(msg));
+      logger.info(`Telegram message forwarded to session: ${sessionId}`);
+      return true;
     };
     this.telegramBot.onImageToSession = (sessionId, imagePath, mimeType, caption) => {
       const channelWs = this.channelSockets.get(sessionId);
-      if (channelWs?.readyState === WebSocket.OPEN) {
-        const msg = { type: "image_to_session", sessionId, imagePath, mimeType, content: caption, source: "telegram" };
-        channelWs.send(JSON.stringify(msg));
-        logger.info(`Telegram photo forwarded to session: ${sessionId}`);
+      if (channelWs?.readyState !== WebSocket.OPEN) {
+        logger.warn(`Telegram photo not delivered to ${sessionId}: the session is not connected`);
+        return false;
       }
+      const msg = { type: "image_to_session", sessionId, imagePath, mimeType, content: caption, source: "telegram" };
+      channelWs.send(JSON.stringify(msg));
+      logger.info(`Telegram photo forwarded to session: ${sessionId}`);
+      return true;
     };
     this.telegramBot.onPermissionVerdict = (sessionId, requestId, behavior) => {
       if (this.forwardPermissionResponse({ sessionId, requestId, behavior })) {