@wrongstack/telegram 0.319.0 → 0.320.1

package/dist/bot.d.ts

@@ -3,7 +3,7 @@ import type { TelegramBotOptions } from './bot-types.js';
 import { TelegramInbox } from './inbox.js';
 import { Poller } from './poller.js';
 import { TelegramOutbox } from './outbox.js';
-export type { TelegramBotOptions, TelegramBotResponse, TelegramIncomingMessage } from './bot-types.js';
+export type { TelegramBotOptions, TelegramBotResponse, TelegramIncomingMessage, } from './bot-types.js';
 export type { TelegramApprovalRequestInput, TelegramApprovalResult } from './approval-flow.js';
 export { escapeHtml, truncateForTelegram } from './text-format.js';
 export declare class TelegramBot {

package/dist/index.js

@@ -278,7 +278,8 @@ var ApprovalFlow = class {
     if (request?.state !== "pending") return false;
     request.state = state;
     clearTimeout(request.timer);
-    if (request.signal && request.abortHandler) request.signal.removeEventListener("abort", request.abortHandler);
+    if (request.signal && request.abortHandler)
+      request.signal.removeEventListener("abort", request.abortHandler);
     const leftover = request.pendingCallbacks.splice(0);
     for (const cq of leftover) {
       const notice = state === "expired" ? "Approval request expired" : state === "cancelled" ? "Approval request cancelled" : "Approval request settled";
@@ -298,7 +299,9 @@ var ApprovalFlow = class {
     const denialReason = this.inboundDenialReason(userId, chatId);
     if (denialReason) {
       const identity = denialReason === "user" ? userId ?? "unknown" : chatId ?? "unknown";
-      this.log.warn(`Ignoring callback_query from non-allowlisted ${denialReason} ${identity} (data="${key}") \u2014 possible hijack attempt.`);
+      this.log.warn(
+        `Ignoring callback_query from non-allowlisted ${denialReason} ${identity} (data="${key}") \u2014 possible hijack attempt.`
+      );
       await this.answerCallback(cq.id, "\u26D4 Not authorized", true);
       return;
     }
@@ -320,37 +323,68 @@ var ApprovalFlow = class {
     const chatType = cq.message?.chat.type;
     const wrongIdentity = userId === void 0 || chatId !== request.expectedChatId || !request.expectedUserIds.has(userId) || messageId !== request.promptMessageId || chatType !== "private" && !request.allowGroup;
     if (wrongIdentity) {
-      this.log.warn(`Ignoring callback_query that does not match approval request ${request.requestId} in session ${request.sessionId}.`);
+      this.log.warn(
+        `Ignoring callback_query that does not match approval request ${request.requestId} in session ${request.sessionId}.`
+      );
       await this.answerCallback(cq.id, "\u26D4 Not authorized for this approval", true);
       return;
     }
     const approved = action[2] === "yes";
     const fromUser = cq.from?.username ?? cq.from?.first_name ?? `user:${userId}`;
-    const resolved = this.settleApproval(requestId, "resolved", { approved, fromUser, fromUserId: cq.from?.id });
-    await this.answerCallback(cq.id, resolved ? approved ? "Approved \u2713" : "Denied \u2717" : "Approval request unavailable", !resolved);
+    const resolved = this.settleApproval(requestId, "resolved", {
+      approved,
+      fromUser,
+      fromUserId: cq.from?.id
+    });
+    await this.answerCallback(
+      cq.id,
+      resolved ? approved ? "Approved \u2713" : "Denied \u2717" : "Approval request unavailable",
+      !resolved
+    );
   }
   async answerCallback(callbackQueryId, text, showAlert) {
     try {
-      await this.api().answerCallbackQuery(callbackQueryId, text, showAlert, { signal: AbortSignal.timeout(5e3) });
+      await this.api().answerCallbackQuery(callbackQueryId, text, showAlert, {
+        signal: AbortSignal.timeout(5e3)
+      });
     } catch (err) {
       this.log.debug(`answerCallbackQuery failed: ${err.message}`);
     }
   }
   awaitApproval(input) {
-    if (input.expectedUserIds.length === 0) throw new Error("Telegram approval requires at least one expected user ID.");
-    if (this.callbackWaiters.has(input.requestId)) throw new Error(`Telegram approval request ${input.requestId} is already pending.`);
+    if (input.expectedUserIds.length === 0)
+      throw new Error("Telegram approval requires at least one expected user ID.");
+    if (this.callbackWaiters.has(input.requestId))
+      throw new Error(`Telegram approval request ${input.requestId} is already pending.`);
     return new Promise((resolve) => {
       const delayMs = Math.max(0, input.expiresAt - Date.now());
       const timer = setTimeout(() => {
         this.settleApproval(input.requestId, "expired", { approved: false, fromUser: "timeout" });
       }, delayMs);
-      const request = { requestId: input.requestId, sessionId: input.sessionId, expectedChatId: String(input.expectedChatId), expectedUserIds: new Set(input.expectedUserIds.map(String)), allowGroup: input.allowGroup, pendingCallbacks: [], expiresAt: input.expiresAt, state: "pending", resolve, timer, signal: input.signal };
-      if (input.signal) request.abortHandler = () => {
-        this.settleApproval(input.requestId, "cancelled", { approved: false, fromUser: "aborted" });
+      const request = {
+        requestId: input.requestId,
+        sessionId: input.sessionId,
+        expectedChatId: String(input.expectedChatId),
+        expectedUserIds: new Set(input.expectedUserIds.map(String)),
+        allowGroup: input.allowGroup,
+        pendingCallbacks: [],
+        expiresAt: input.expiresAt,
+        state: "pending",
+        resolve,
+        timer,
+        signal: input.signal
       };
+      if (input.signal)
+        request.abortHandler = () => {
+          this.settleApproval(input.requestId, "cancelled", {
+            approved: false,
+            fromUser: "aborted"
+          });
+        };
       this.callbackWaiters.set(input.requestId, request);
       if (input.signal?.aborted) request.abortHandler?.();
-      else if (input.signal && request.abortHandler) input.signal.addEventListener("abort", request.abortHandler, { once: true });
+      else if (input.signal && request.abortHandler)
+        input.signal.addEventListener("abort", request.abortHandler, { once: true });
     });
   }
   bindApprovalPrompt(requestId, promptMessageId) {
@@ -358,14 +392,20 @@ var ApprovalFlow = class {
     if (request?.state !== "pending" || request.promptMessageId !== void 0) return false;
     request.promptMessageId = promptMessageId;
     const pending = request.pendingCallbacks.splice(0);
-    for (const callback of pending) void this.dispatchCallback(callback).catch((err) => this.log.debug(`Callback dispatch failed: ${err instanceof Error ? err.message : String(err)}`));
+    for (const callback of pending)
+      void this.dispatchCallback(callback).catch(
+        (err) => this.log.debug(
+          `Callback dispatch failed: ${err instanceof Error ? err.message : String(err)}`
+        )
+      );
     return true;
   }
   cancelApproval(requestId, fromUser = "cancelled") {
     return this.settleApproval(requestId, "cancelled", { approved: false, fromUser });
   }
   cancelAll(fromUser) {
-    for (const requestId of Array.from(this.callbackWaiters.keys())) this.settleApproval(requestId, "cancelled", { approved: false, fromUser });
+    for (const requestId of Array.from(this.callbackWaiters.keys()))
+      this.settleApproval(requestId, "cancelled", { approved: false, fromUser });
   }
 };
 
@@ -431,7 +471,9 @@ var TelegramInbox = class {
     const userId = msg.from ? String(msg.from.id) : void 0;
     const denialReason = this.denialReason(userId, chatId);
     if (denialReason === "user") {
-      this.deps.log.debug(`Ignoring message from user ${userId ?? "unknown"} (not in allowedUsers)`);
+      this.deps.log.debug(
+        `Ignoring message from user ${userId ?? "unknown"} (not in allowedUsers)`
+      );
       void this.deps.sendNotice(chatId, "\u26D4 You are not authorized to interact with this bot.").catch(
         (err) => this.deps.log.debug(
           `Failed to send denial notice: ${err instanceof Error ? err.message : String(err)}`
@@ -463,6 +505,8 @@ var Poller = class _Poller {
   api;
   pollIntervalMs;
   log;
+  // Not readonly: start() swaps in a fresh controller when a previous stop()
+  // aborted this one (see start()).
   controller;
   offsetStore;
   lock;
@@ -507,6 +551,7 @@ var Poller = class _Poller {
     if (this.pollActive) return;
     this.pollActive = true;
     this._startedAt = Date.now();
+    if (this.controller.signal.aborted) this.controller = new AbortController();
     this.acquireAndPoll();
   }
   stop() {
@@ -526,7 +571,9 @@ var Poller = class _Poller {
     if (this.lock && !this.lock.tryAcquire()) {
       if (!this.standbyAnnounced) {
         this.standbyAnnounced = true;
-        this.log.info("Telegram: another wstack instance is already polling this bot token \u2014 standing by; will take over when it stops.");
+        this.log.info(
+          "Telegram: another wstack instance is already polling this bot token \u2014 standing by; will take over when it stops."
+        );
       }
       this.standbyTimer = setTimeout(() => this.acquireAndPoll(), this.standbyRetryMs);
       this.standbyTimer.unref?.();
@@ -544,7 +591,9 @@ var Poller = class _Poller {
       clearTimeout(this.pollTimer);
       this.pollTimer = null;
     }
-    this.log.warn("Telegram: poll lock lost to another instance \u2014 pausing polling and standing by.");
+    this.log.warn(
+      "Telegram: poll lock lost to another instance \u2014 pausing polling and standing by."
+    );
     this.standbyAnnounced = true;
     this.standbyTimer = setTimeout(() => this.acquireAndPoll(), this.standbyRetryMs);
     this.standbyTimer.unref?.();
@@ -559,7 +608,12 @@ var Poller = class _Poller {
   }
   async poll() {
     try {
-      const updates = await this.api().getUpdates({ offset: this.offset, timeoutSeconds: 10, deadlineMs: 15e3, signal: this.controller.signal });
+      const updates = await this.api().getUpdates({
+        offset: this.offset,
+        timeoutSeconds: 10,
+        deadlineMs: 15e3,
+        signal: this.controller.signal
+      });
       this._conflictStreak = 0;
       for (const upd of updates) {
         if (upd.update_id < this.offset) continue;
@@ -575,18 +629,22 @@ var Poller = class _Poller {
         }
         try {
           this.onMessageUpdate(raw);
-          this.offset = upd.update_id + 1;
         } catch (err) {
-          this.log.debug(`Telegram processMessage failed: ${err instanceof Error ? err.message : String(err)}`);
-          break;
+          this.log.debug(
+            `Telegram processMessage failed: ${err instanceof Error ? err.message : String(err)}`
+          );
         }
+        this.offset = upd.update_id + 1;
       }
       if (this.offsetStore && updates.length > 0) void this.saveOffset();
     } catch (err) {
       if (err instanceof TelegramNetworkError && err.aborted) return;
       if (err instanceof TelegramBotApiError && err.errorCode === 409) {
         this._conflictStreak++;
-        if (this._conflictStreak === _Poller.CONFLICT_BACKOFF_AFTER) this.log.warn(this.lock ? "Telegram: another consumer outside this machine is polling this bot token (HTTP 409) \u2014 backing off to 60s polls. Check other machines/bots using this token, or a registered webhook (deleteWebhook)." : "Telegram: another instance is polling this bot token (HTTP 409) \u2014 backing off to 60s polls until it stops.");
+        if (this._conflictStreak === _Poller.CONFLICT_BACKOFF_AFTER)
+          this.log.warn(
+            this.lock ? "Telegram: another consumer outside this machine is polling this bot token (HTTP 409) \u2014 backing off to 60s polls. Check other machines/bots using this token, or a registered webhook (deleteWebhook)." : "Telegram: another instance is polling this bot token (HTTP 409) \u2014 backing off to 60s polls until it stops."
+          );
         this.log.debug(`Telegram getUpdates failed: ${err.description}`);
         return;
       }
@@ -764,7 +822,11 @@ var TelegramBot = class {
       onMessage: opts.onMessage,
       sendNotice: (chatId, text) => this.sendMessage(chatId, text)
     });
-    this.outbox = new TelegramOutbox({ log: this.log, api: () => this.api, getParseMode: opts.getParseMode });
+    this.outbox = new TelegramOutbox({
+      log: this.log,
+      api: () => this.api,
+      getParseMode: opts.getParseMode
+    });
     this.approvals = new ApprovalFlow({
       log: this.log,
       api: () => this.api,
@@ -779,7 +841,11 @@ var TelegramBot = class {
       lock: opts.lock,
       standbyRetryMs: opts.standbyRetryMs ?? 15e3,
       onCallbackQuery: (cq) => {
-        void this.approvals.dispatchCallback(cq).catch((err) => this.log.debug(`Callback dispatch failed: ${err instanceof Error ? err.message : String(err)}`));
+        void this.approvals.dispatchCallback(cq).catch(
+          (err) => this.log.debug(
+            `Callback dispatch failed: ${err instanceof Error ? err.message : String(err)}`
+          )
+        );
       },
       onMessageUpdate: (msg) => this.processMessage({ ...msg, text: msg.text })
     });
@@ -879,7 +945,10 @@ var TELEGRAM_CONFIG_FIELDS = {
   outboundQueueConcurrency: { lifecycle: "restart" },
   rateLimitTokensPerSecond: { lifecycle: "hot", description: "Per-chat rate limit (tokens/sec)" },
   rateLimitBurst: { lifecycle: "hot", description: "Per-chat rate limit burst size" },
-  parseMode: { lifecycle: "hot", description: "Telegram parse mode: HTML, MarkdownV2, or empty for plain text" }
+  parseMode: {
+    lifecycle: "hot",
+    description: "Telegram parse mode: HTML, MarkdownV2, or empty for plain text"
+  }
 };
 var telegramConfigSchema = {
   type: "object",
@@ -1083,11 +1152,7 @@ function formatDelegateCompleted(e) {
   const task = e.task.length > 160 ? `${e.task.slice(0, 159)}\u2026` : e.task;
   const rawBody = e.summary?.trim() || `(no summary) \u2014 ${task}`;
   const body = redactSecrets(rawBody);
-  const stats = [
-    `\u23F1 ${fmtDuration(e.durationMs)}`,
-    `${e.iterations} iter`,
-    `${e.toolCalls} tools`
-  ];
+  const stats = [`\u23F1 ${fmtDuration(e.durationMs)}`, `${e.iterations} iter`, `${e.toolCalls} tools`];
   if (typeof e.costUsd === "number" && e.costUsd > 0) {
     stats.push(`\u{1F4B2}${e.costUsd.toFixed(4)}`);
   }
@@ -1565,10 +1630,15 @@ _Reply by tapping a button. Auto-denies in ${Math.round(timeoutMs / 1e3)}s._`;
       });
       let promptMessageId;
       try {
-        const sent = await opts.bot.sendMessageWithKeyboard(chatId, text, [
-          { text: "\u2705 Approve", callback_data: yesKey },
-          { text: "\u274C Deny", callback_data: noKey }
-        ], toolOpts?.signal);
+        const sent = await opts.bot.sendMessageWithKeyboard(
+          chatId,
+          text,
+          [
+            { text: "\u2705 Approve", callback_data: yesKey },
+            { text: "\u274C Deny", callback_data: noKey }
+          ],
+          toolOpts?.signal
+        );
         promptMessageId = sent.result?.message_id;
         if (promptMessageId === void 0) {
           throw new Error("Telegram approval prompt response did not include a message ID.");
@@ -1959,7 +2029,9 @@ var TelegramNotificationChannel = class {
         return { ok: true, channel: this.name, deliveredAt };
       }
       const res = await this.#bot.sendMessage(this.#chatId, truncated);
-      this.#log?.debug?.(`telegram notification delivered (${truncated.length} chars, ok=${res.ok})`);
+      this.#log?.debug?.(
+        `telegram notification delivered (${truncated.length} chars, ok=${res.ok})`
+      );
       return {
         ok: res.ok,
         channel: this.name,
@@ -2348,7 +2420,8 @@ var plugin = {
             level: "info",
             source: "session.end"
           }).then((r) => {
-            if (!r.ok) log.warn(`session.ended notification delivery failed: ${r.error ?? "unknown"}`);
+            if (!r.ok)
+              log.warn(`session.ended notification delivery failed: ${r.error ?? "unknown"}`);
           }).catch((err) => {
             log.debug(`session.ended notification delivery threw: ${err.message}`);
           });
@@ -2356,7 +2429,8 @@ var plugin = {
       );
       cleanups.push(
         api.events.on("tool.executed", (event) => {
-          if (!runtimeCfg.notifyChatId || !notifyChannel || runtimeCfg.longToolThresholdMs <= 0) return;
+          if (!runtimeCfg.notifyChatId || !notifyChannel || runtimeCfg.longToolThresholdMs <= 0)
+            return;
           if (event.durationMs < runtimeCfg.longToolThresholdMs) return;
           const payload = {
             name: event.name,
@@ -2370,7 +2444,8 @@ var plugin = {
             level: event.ok ? "info" : "warning",
             source: "tool.exec"
           }).then((r) => {
-            if (!r.ok) log.warn(`tool.executed notification delivery failed: ${r.error ?? "unknown"}`);
+            if (!r.ok)
+              log.warn(`tool.executed notification delivery failed: ${r.error ?? "unknown"}`);
           }).catch((err) => {
             log.debug(`tool.executed notification delivery threw: ${err.message}`);
           });
@@ -2392,9 +2467,14 @@ var plugin = {
             level: event.ok ? "info" : "warning",
             source: "delegate.completed"
           }).then((r) => {
-            if (!r.ok) log.warn(`delegate.completed notification delivery failed: ${r.error ?? "unknown"}`);
+            if (!r.ok)
+              log.warn(
+                `delegate.completed notification delivery failed: ${r.error ?? "unknown"}`
+              );
           }).catch((err) => {
-            log.debug(`delegate.completed notification delivery threw: ${err.message}`);
+            log.debug(
+              `delegate.completed notification delivery threw: ${err.message}`
+            );
           });
         })
       );
@@ -2407,36 +2487,66 @@ var plugin = {
         const fresh = telegramFromConfig(next);
         const hotSet = new Set(hotKeys);
         const HOT_APPLIERS = /* @__PURE__ */ new Map([
-          ["allowedOutboundChats", (r, f) => {
-            r.allowedOutboundChats = f.allowedOutboundChats;
-          }],
-          ["allowedUsers", (r, f) => {
-            r.allowedUserIds = f.allowedUserIds;
-          }],
-          ["notifyOnSessionEnd", (r, f) => {
-            r.notifyOnSessionEnd = f.notifyOnSessionEnd;
-          }],
-          ["notifyOnDelegate", (r, f) => {
-            r.notifyOnDelegate = f.notifyOnDelegate;
-          }],
-          ["longToolThresholdMs", (r, f) => {
-            r.longToolThresholdMs = f.longToolThresholdMs;
-          }],
-          ["maxMessageLength", (r, f) => {
-            r.maxMessageLength = f.maxMessageLength;
-          }],
-          ["allowGroupApprovals", (r, f) => {
-            r.allowGroupApprovals = f.allowGroupApprovals;
-          }],
-          ["rateLimitTokensPerSecond", (r, f) => {
-            r.rateLimitTokensPerSecond = f.rateLimitTokensPerSecond;
-          }],
-          ["rateLimitBurst", (r, f) => {
-            r.rateLimitBurst = f.rateLimitBurst;
-          }],
-          ["parseMode", (r, f) => {
-            r.parseMode = f.parseMode;
-          }]
+          [
+            "allowedOutboundChats",
+            (r, f) => {
+              r.allowedOutboundChats = f.allowedOutboundChats;
+            }
+          ],
+          [
+            "allowedUsers",
+            (r, f) => {
+              r.allowedUserIds = f.allowedUserIds;
+            }
+          ],
+          [
+            "notifyOnSessionEnd",
+            (r, f) => {
+              r.notifyOnSessionEnd = f.notifyOnSessionEnd;
+            }
+          ],
+          [
+            "notifyOnDelegate",
+            (r, f) => {
+              r.notifyOnDelegate = f.notifyOnDelegate;
+            }
+          ],
+          [
+            "longToolThresholdMs",
+            (r, f) => {
+              r.longToolThresholdMs = f.longToolThresholdMs;
+            }
+          ],
+          [
+            "maxMessageLength",
+            (r, f) => {
+              r.maxMessageLength = f.maxMessageLength;
+            }
+          ],
+          [
+            "allowGroupApprovals",
+            (r, f) => {
+              r.allowGroupApprovals = f.allowGroupApprovals;
+            }
+          ],
+          [
+            "rateLimitTokensPerSecond",
+            (r, f) => {
+              r.rateLimitTokensPerSecond = f.rateLimitTokensPerSecond;
+            }
+          ],
+          [
+            "rateLimitBurst",
+            (r, f) => {
+              r.rateLimitBurst = f.rateLimitBurst;
+            }
+          ],
+          [
+            "parseMode",
+            (r, f) => {
+              r.parseMode = f.parseMode;
+            }
+          ]
         ]);
         for (const [key, apply] of HOT_APPLIERS) {
           if (hotSet.has(key)) apply(runtimeCfg, fresh);

package/dist/poller.d.ts

@@ -6,7 +6,7 @@ export declare class Poller {
     private readonly api;
     private readonly pollIntervalMs;
     private readonly log;
-    private readonly controller;
+    private controller;
     private readonly offsetStore?;
     private readonly lock?;
     private readonly standbyRetryMs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrongstack/telegram",
-  "version": "0.319.0",
+  "version": "0.320.1",
   "license": "MIT",
   "description": "WrongStack plugin — Telegram bridge: send messages, receive prompts, get notified.",
   "repository": {
@@ -26,11 +26,11 @@
     "!dist/**/*.map"
   ],
   "peerDependencies": {
-    "@wrongstack/core": "0.319.0"
+    "@wrongstack/core": "0.320.1"
   },
   "devDependencies": {
     "@types/node": "^26.2.0",
-    "@wrongstack/core": "0.319.0",
+    "@wrongstack/core": "0.320.1",
     "typescript": "^7.0.2"
   },
   "publishConfig": {