cli-jaw 2.2.19 → 2.2.21

package/dist/src/slack/progress.js

@@ -10,6 +10,7 @@
 //     bursty tool events would otherwise burn the budget and get throttled.
 //   - Best-effort. A failed status post/edit must never break the answer path.
 import { slackApi, describeSlackError } from './api.js';
+import { startDraftStream } from '../messaging/draft-stream.js';
 import { toMrkdwn } from './format.js';
 /** Minimum gap between chat.update calls for one run (Slack tier limit). */
 const EDIT_INTERVAL_MS = 1200;
@@ -33,66 +34,53 @@ export function statusFromToolEvent(data, fallback) {
 }
 export async function startSlackProgress(token, target, initialText, options = {}) {
     const fetchOpts = options.fetchImpl ? { fetchImpl: options.fetchImpl } : {};
-    let messageTs = null;
-    let done = false;
-    let lastSentAt = 0;
-    let pendingText = null;
-    let flushTimer = null;
-    const post = await slackApi(token, 'chat.postMessage', {
-        channel: target.targetId,
-        text: toMrkdwn(truncateStatus(initialText)),
-        ...(target.threadId ? { thread_ts: target.threadId } : {}),
-    }, fetchOpts);
-    if (post.ok && post.data?.ts)
-        messageTs = post.data.ts;
-    const flush = async () => {
-        if (done || !messageTs || pendingText === null)
-            return;
-        const text = pendingText;
-        pendingText = null;
-        lastSentAt = Date.now();
-        await slackApi(token, 'chat.update', { channel: target.targetId, ts: messageTs, text: toMrkdwn(text) }, fetchOpts).catch(() => ({ ok: false, error: 'update_failed' }));
-    };
-    const schedule = () => {
-        if (done || flushTimer || pendingText === null)
-            return;
-        const wait = Math.max(0, EDIT_INTERVAL_MS - (Date.now() - lastSentAt));
-        flushTimer = setTimeout(() => {
-            flushTimer = null;
-            void flush().finally(() => { if (pendingText !== null)
-                schedule(); });
-        }, wait);
-        // A pending edit must never hold the process open.
-        flushTimer.unref?.();
+    const transport = {
+        async post(text) {
+            const result = await slackApi(token, 'chat.postMessage', {
+                channel: target.targetId,
+                text,
+                ...(target.threadId ? { thread_ts: target.threadId } : {}),
+            }, fetchOpts);
+            return result.ok && result.data?.ts ? result.data.ts : null;
+        },
+        async edit(ts, text) {
+            const result = await slackApi(token, 'chat.update', { channel: target.targetId, ts, text }, fetchOpts);
+            if (!result.ok) {
+                throw Object.assign(new Error(result.error || 'chat_update_failed'), {
+                    slackData: result.data,
+                });
+            }
+        },
+        async remove(ts) {
+            const result = await slackApi(token, 'chat.delete', { channel: target.targetId, ts }, fetchOpts);
+            if (!result.ok) {
+                throw Object.assign(new Error(result.error || 'chat_delete_failed'), {
+                    slackData: result.data,
+                });
+            }
+        },
     };
+    const stream = await startDraftStream(transport, toMrkdwn(truncateStatus(initialText)), {
+        minEditIntervalMs: EDIT_INTERVAL_MS,
+        maxChars: MAX_STATUS_LEN,
+        ...options.draftClock,
+        onError(operation, error) {
+            const typed = error;
+            describeSlackError(typed.message || `${operation}_failed`, typed.slackData);
+        },
+    });
     return {
         update(text) {
-            if (done || !messageTs)
-                return;
             const next = truncateStatus(text);
-            if (!next)
-                return;
-            pendingText = next;
-            schedule();
+            if (next)
+                stream.update(toMrkdwn(next));
         },
         async finish() {
-            done = true;
-            pendingText = null;
-            if (flushTimer) {
-                clearTimeout(flushTimer);
-                flushTimer = null;
-            }
-            if (!messageTs)
-                return;
-            const ts = messageTs;
-            messageTs = null;
             // The answer arrives as its own message, so the status placeholder
             // is deleted rather than left as a stale "working…" line.
-            const result = await slackApi(token, 'chat.delete', { channel: target.targetId, ts }, fetchOpts);
-            if (!result.ok)
-                describeSlackError(result.error || 'chat_delete_failed', result.data);
+            await stream.discard();
         },
-        ts() { return messageTs; },
+        ts() { return stream.handle(); },
     };
 }
 //# sourceMappingURL=progress.js.map

package/dist/src/slack/progress.js.map

@@ -1 +1 @@
-{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../../src/slack/progress.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../../src/slack/progress.ts"],"names":[],"mappings":"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"}

package/dist/src/slack/thread-tracker.js

@@ -78,6 +78,94 @@ export function isThreadParticipated(channel, threadTs) {
         return false;
     return load().has(threadKey(channel, threadTs));
 }
+/** key -> current owner and whether history was actually injected. */
+const prefetchClaimed = new Map();
+const PREFETCH_CLAIM_CAP = 500;
+let prefetchToken = 0;
+let prefetchUse = 0;
+function prefetchKey(channel, threadTs, owner) {
+    return `${threadKey(channel, threadTs)}:${owner.global}:${owner.scope}`;
+}
+/**
+ * Claim the one-time prefetch for a thread.
+ *
+ * Returns a token on success and 0 when the thread is already claimed.
+ * Synchronous test-and-set: the caller runs it before any `await`, so two
+ * envelopes arriving in the same tick cannot both win.
+ *
+ * The token exists because releasing is asynchronous. Without it a late
+ * release from an abandoned attempt would delete whichever claim happened to
+ * hold the key by then — the classic ABA: A claims, A times out and releases,
+ * B claims, A's straggler releases B's claim, and the thread gets prefetched
+ * twice.
+ */
+export function claimThreadPrefetch(channel, threadTs, owner) {
+    if (!channel || !threadTs)
+        return 0;
+    const key = prefetchKey(channel, threadTs, owner);
+    const existing = prefetchClaimed.get(key);
+    if (existing) {
+        existing.lastUsed = ++prefetchUse;
+        return 0;
+    }
+    if (prefetchClaimed.size >= PREFETCH_CLAIM_CAP) {
+        // Active owners are singleflight locks, not cache entries. Evicting one
+        // lets another envelope claim the same live thread and inject history
+        // twice. Only completed claims may give ground under pressure.
+        let removed = 0;
+        const target = Math.floor(PREFETCH_CLAIM_CAP / 2);
+        const completed = [...prefetchClaimed.entries()]
+            .filter(([, claim]) => claim.committed)
+            .sort((a, b) => a[1].lastUsed - b[1].lastUsed);
+        for (const [stale] of completed) {
+            prefetchClaimed.delete(stale);
+            removed += 1;
+            if (removed >= target)
+                break;
+        }
+        // All bounded slots can legitimately be in flight. Decline rather than
+        // queue or violate singleflight; a later message can retry after one
+        // owner commits or releases.
+        if (prefetchClaimed.size >= PREFETCH_CLAIM_CAP)
+            return 0;
+    }
+    const token = ++prefetchToken;
+    prefetchClaimed.set(key, { token, committed: false, lastUsed: ++prefetchUse });
+    return token;
+}
+/** Mark that this owner actually injected history; completed claims are evictable. */
+export function commitThreadPrefetch(channel, threadTs, owner, token) {
+    if (!channel || !threadTs || !token)
+        return false;
+    const claim = prefetchClaimed.get(prefetchKey(channel, threadTs, owner));
+    if (!claim || claim.token !== token)
+        return false;
+    claim.committed = true;
+    claim.lastUsed = ++prefetchUse;
+    return true;
+}
+/**
+ * Give a claim back when no history was actually injected.
+ *
+ * Without this a failed or skipped first attempt would silently consume the
+ * thread's only chance: every later message would see the thread as already
+ * prefetched and the agent would never receive the earlier conversation.
+ *
+ * Only the CURRENT owner may release. A stale token is a no-op.
+ */
+export function releaseThreadPrefetch(channel, threadTs, owner, token) {
+    if (!channel || !threadTs || !token)
+        return;
+    const key = prefetchKey(channel, threadTs, owner);
+    if (prefetchClaimed.get(key)?.token !== token)
+        return;
+    prefetchClaimed.delete(key);
+}
+export function resetThreadPrefetchClaims() {
+    prefetchClaimed.clear();
+    prefetchToken = 0;
+    prefetchUse = 0;
+}
 /** Test hook: point the store at a temp file and drop the cache. */
 export function resetThreadTrackerForTest(filePath) {
     threads = null;

package/dist/src/slack/thread-tracker.js.map

@@ -1 +1 @@
-{"version":3,"file":"thread-tracker.js","sourceRoot":"","sources":["../../../src/slack/thread-tracker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"thread-tracker.js","sourceRoot":"","sources":["../../../src/slack/thread-tracker.ts"],"names":[],"mappings":"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"}

package/dist/src/telegram/bot.js

@@ -26,6 +26,8 @@ import { getLastActiveTarget, registerTransport, setLastActiveTarget, setLatestS
 import { registerSendTransport, sendChannelOutput } from '../messaging/send.js';
 import { escapeHtmlTg, createForwarderLifecycle, createTelegramForwarder, relayTelegramImages, } from './forwarder.js';
 import { sendTelegramMarkdown } from './rich-message.js';
+import { db } from '../core/db.js';
+import { TelegramDurablePoller, TelegramUpdateOffsetStore } from './update-offset.js';
 export { escapeHtmlTg, markdownToTelegramHtml, chunkTelegramMessage, createForwarderLifecycle, createTelegramForwarder, } from './forwarder.js';
 // Re-exported from collect.ts (extracted in Phase B)
 import { orchestrateAndCollect, orchestrateAndCollectData } from '../orchestrator/collect.js';
@@ -33,8 +35,8 @@ import { log } from '../core/logger.js';
 export { orchestrateAndCollect };
 import { startPendingElicitation, handleElicitationCallback, discardPendingElicitation, } from './elicitation-buttons.js';
 import { redactOutboundPayload, redactOutboundText, logErrorText, userErrorText } from '../messaging/redact.js';
-import { createSeenSet, DELIVERY_DEDUPE_TTL_MS } from '../messaging/dedupe.js';
 import { sendWithRetryPolicy } from '../messaging/retry.js';
+import { handleApprovalCommand, registerProductionTransport } from '../core/dispatch-approval-ingress.js';
 // ─── State ───────────────────────────────────────────
 export let telegramBot = null;
 export const telegramActiveChatIds = new Set();
@@ -43,6 +45,8 @@ let tgInitLock = false;
 let tg409RetryCount = 0;
 const TG_MAX_RETRIES = 3;
 let botUsername = null;
+let telegramPoller = null;
+const telegramFinalDeliveryFailures = new Set();
 /**
  * The bot's own user id, learned from getMe at startup.
  *
@@ -50,6 +54,24 @@ let botUsername = null;
  * the is_bot flag, which is why those are two separate checks.
  */
 let botUserId = null;
+export function setTelegramBotUserIdForTest(value) { botUserId = value; }
+let telegramApprovalIngress = null;
+function createTelegramPollingIngress() {
+    const transport = Object.freeze({ platform: 'telegram' });
+    registerProductionTransport(transport);
+    return transport;
+}
+export function handleTelegramUpdate(update, transport = telegramApprovalIngress) {
+    const message = update['message'];
+    const text = typeof message?.text === 'string' ? message.text : '';
+    const fromIdRaw = message?.from?.id;
+    const fromId = typeof fromIdRaw === 'number' ? fromIdRaw : undefined;
+    const approval = handleApprovalCommand(transport, {
+        ...update,
+        __jawSelf: isSelfEcho({ fromId, isBot: message?.from?.is_bot, botUserId, allowBots: settings["telegram"]?.allowBots }),
+    }, text);
+    return approval.handled;
+}
 /**
  * Whether an update should be dropped as our own output or another bot's.
  *
@@ -66,8 +88,7 @@ export function isSelfEcho(input) {
         return true;
     return false;
 }
-/** Redelivered update_ids, so a reconnect replay does not run the agent twice. */
-const telegramSeenUpdates = createSeenSet(DELIVERY_DEDUPE_TTL_MS);
+const telegramUpdateOffsets = new TelegramUpdateOffsetStore(db);
 let targetReplyForwarderInstalled = false;
 const telegramForwarderLifecycle = createForwarderLifecycle({
     addListener: addBroadcastListener,
@@ -155,6 +176,16 @@ export async function shutdownTelegram() {
         tgRetryTimer = null;
     }
     detachTelegramForwarder();
+    if (telegramPoller) {
+        const oldPoller = telegramPoller;
+        telegramPoller = null;
+        try {
+            await oldPoller.stop();
+        }
+        catch (e) {
+            log.warn('[telegram:poller-stop]', logErrorText(e));
+        }
+    }
     if (!telegramBot)
         return;
     const old = telegramBot;
@@ -364,6 +395,11 @@ async function _initTelegramInner() {
             await new Promise(r => setTimeout(r, 2000));
         }
     }
+    const stoppingPoller = telegramPoller?.stop().catch((e) => {
+        log.warn('[telegram:poller-stop]', logErrorText(e));
+    });
+    telegramPoller = null;
+    await stoppingPoller;
     const envToken = process.env["TELEGRAM_TOKEN"];
     if (envToken)
         settings["telegram"].token = envToken;
@@ -467,38 +503,21 @@ async function _initTelegramInner() {
         }
         await next();
     });
-    // Drop a redelivered update. grammY replays from the last committed offset
-    // after a reconnect, so the same update_id can arrive twice — and each one
-    // would start another agent run.
-    //
-    // Placed AFTER the allowlist and mention gates deliberately: dedupe
-    // upstream of them lets traffic we never process fill the seen-set — memory
-    // an outsider controls, and a budget an unmentioned group message can
-    // exhaust before a real one arrives. A duplicate that WOULD be processed
-    // passes both gates too, so nothing is lost by checking later.
-    bot.use(async (ctx, next) => {
-        const updateId = ctx.update?.update_id;
-        if (updateId !== undefined && telegramSeenUpdates.seen(String(updateId))) {
-            log.info(`[tg:duplicate] update_id=${updateId}`);
-            return;
-        }
-        await next();
-    });
     bot.command('start', (ctx) => ctx.reply(t('tg.connected', {}, currentLocale())));
     bot.command('id', (ctx) => ctx.reply(`Chat ID: <code>${ctx.chat?.id ?? ''}</code>`, { parse_mode: 'HTML' }));
     // Inline-keyboard elicitation answers (single_select fences → buttons).
     bot.callbackQuery(/^elic:/, async (ctx) => {
         const cbChatId = ctx.chat?.id;
         if (!cbChatId) {
-            await ctx.answerCallbackQuery().catch(() => { });
+            await ctx.answerCallbackQuery();
             return;
         }
         const result = handleElicitationCallback(String(cbChatId), ctx.callbackQuery.data ?? '');
         if (result.kind === 'stale') {
-            await ctx.answerCallbackQuery({ text: t('tg.elicitationExpired', {}, currentLocale()) }).catch(() => { });
+            await ctx.answerCallbackQuery({ text: t('tg.elicitationExpired', {}, currentLocale()) });
             return;
         }
-        await ctx.answerCallbackQuery({ text: redactOutboundText(result.ack) }).catch(() => { });
+        await ctx.answerCallbackQuery({ text: redactOutboundText(result.ack) });
         // Best-effort: freeze the tapped question's keyboard so the choice reads as taken.
         await ctx.editMessageReplyMarkup({ reply_markup: { inline_keyboard: [] } }).catch(() => { });
         if (result.kind === 'complete') {
@@ -533,22 +552,54 @@ async function _initTelegramInner() {
         };
         if (result.action === 'queued') {
             log.info(`[tg:queue] agent busy, queued (${result.pending} pending)`);
-            await ctx.reply(t('tg.queued', { count: result.pending }, currentLocale()));
             // 큐 처리 후 응답을 이 채팅으로 전달 — requestId로 request-level 격리
             const requestId = result.requestId;
-            const queueHandler = (type, data) => {
-                if (type === 'orchestrate_done' && data["text"] && data["origin"] === 'telegram' && data["requestId"] === requestId) {
+            const finalDeliveryControl = {};
+            const finalDelivery = new Promise((resolve, reject) => {
+                let timer;
+                let settled = false;
+                const cleanup = () => {
+                    clearTimeout(timer);
                     removeBroadcastListener(queueHandler);
-                    sendTelegramMarkdown(ctx.api, chat.id, String(data["text"]), replyOptsOf(ctx))
-                        .then(async () => {
-                        await relayTelegramImages(bot, chat.id, String(data["text"]), responseTarget);
-                        await sendElicitationKeyboards(chat.id, data["elicitationSpecs"]);
+                };
+                finalDeliveryControl.cancel = (reason) => {
+                    if (settled)
+                        return;
+                    settled = true;
+                    cleanup();
+                    reject(reason);
+                };
+                const queueHandler = (type, data) => {
+                    if (type !== 'orchestrate_done' || !data["text"] || data["origin"] !== 'telegram' || data["requestId"] !== requestId)
+                        return;
+                    if (settled)
+                        return;
+                    settled = true;
+                    cleanup();
+                    void sendTelegramMarkdown(ctx.api, chat.id, String(data["text"]), replyOptsOf(ctx))
+                        .then(() => {
+                        resolve();
+                        void relayTelegramImages(bot, chat.id, String(data["text"]), responseTarget).catch(() => { });
+                        void sendElicitationKeyboards(chat.id, data["elicitationSpecs"]).catch(() => { });
                     })
-                        .catch(() => { });
-                }
-            };
-            addBroadcastListener(queueHandler);
-            setTimeout(() => removeBroadcastListener(queueHandler), 300000);
+                        .catch(reject);
+                };
+                timer = setTimeout(() => {
+                    finalDeliveryControl.cancel?.(new Error('telegram_queue_delivery_timeout'));
+                }, 300000);
+                addBroadcastListener(queueHandler);
+            });
+            void finalDelivery.catch(() => { });
+            try {
+                await ctx.reply(t('tg.queued', { count: result.pending }, currentLocale()));
+                await finalDelivery;
+            }
+            catch (error) {
+                finalDeliveryControl.cancel?.(error);
+                await finalDelivery.catch(() => { });
+                telegramFinalDeliveryFailures.add(ctx.update.update_id);
+                throw error;
+            }
             return;
         }
         if (result.action === 'rejected') {
@@ -649,6 +700,7 @@ async function _initTelegramInner() {
         } : null;
         if (toolHandler)
             addBroadcastListener(toolHandler);
+        let finalDeliveryStarted = false;
         try {
             const { text: collectedText, data: doneData } = await orchestrateAndCollectData(prompt, stripUndefined({
                 origin: 'telegram', chatId: chat.id, requestId: submitRequestId, _skipInsert: true,
@@ -667,10 +719,11 @@ async function _initTelegramInner() {
             if (statusMsgId) {
                 ctx.api.deleteMessage(chat.id, statusMsgId).catch(() => { });
             }
+            finalDeliveryStarted = true;
             await sendTelegramMarkdown(ctx.api, chat.id, collectedText, replyOptsOf(ctx));
-            await relayTelegramImages(bot, chat.id, collectedText, responseTarget);
-            await sendElicitationKeyboards(chat.id, doneData["elicitationSpecs"]);
             log.info(`[tg:out] ${chat.id}: ${redactOutboundText(collectedText).slice(0, 80)}`);
+            void relayTelegramImages(bot, chat.id, collectedText, responseTarget).catch(() => { });
+            void sendElicitationKeyboards(chat.id, doneData["elicitationSpecs"]).catch(() => { });
         }
         catch (err) {
             clearInterval(typingInterval);
@@ -685,6 +738,8 @@ async function _initTelegramInner() {
             }
             log.error('[tg:error]', logErrorText(err));
             await ctx.reply(`❌ Error: ${userErrorText(err)}`);
+            if (finalDeliveryStarted)
+                telegramFinalDeliveryFailures.add(ctx.update.update_id);
         }
     }
     bot.on('message:text', async (ctx) => {
@@ -742,7 +797,7 @@ async function _initTelegramInner() {
             }
             return;
         }
-        tgOrchestrate(ctx, text, text);
+        await tgOrchestrate(ctx, text, text);
     });
     bot.on('message:photo', async (ctx) => {
         const photos = ctx.message.photo;
@@ -757,7 +812,7 @@ async function _initTelegramInner() {
             }));
             const filePath = saveUpload(dlResult["buffer"], `photo${dlResult["ext"]}`);
             const prompt = buildMediaPrompt(filePath, caption);
-            tgOrchestrate(ctx, prompt, `${t('tg.imageCaption', { caption }, currentLocale())}`);
+            await tgOrchestrate(ctx, prompt, `${t('tg.imageCaption', { caption }, currentLocale())}`);
         }
         catch (err) {
             log.error('[tg:photo:error]', logErrorText(err));
@@ -776,14 +831,14 @@ async function _initTelegramInner() {
             }));
             const filePath = saveUpload(dlResult["buffer"], doc.file_name || 'document');
             const prompt = buildMediaPrompt(filePath, caption);
-            tgOrchestrate(ctx, prompt, `[📎 ${doc.file_name || 'file'}] ${caption}`);
+            await tgOrchestrate(ctx, prompt, `[📎 ${doc.file_name || 'file'}] ${caption}`);
         }
         catch (err) {
             log.error('[tg:doc:error]', logErrorText(err));
             await ctx.reply(t('tg.fileFail', { msg: userErrorText(err) }, currentLocale()));
         }
     });
-    bot.on('message:voice', (ctx) => handleVoice(ctx, currentLocale, tgOrchestrate));
+    bot.on('message:voice', async (ctx) => { await handleVoice(ctx, currentLocale, tgOrchestrate); });
     // Identity first: the self-echo guard needs it, and the refusal below has
     // to happen BEFORE anything is attached. Returning after attaching left the
     // forwarder wired to a bot that never starts, still trying to send.
@@ -794,17 +849,17 @@ async function _initTelegramInner() {
     botUserId = null;
     try {
         const me = await bot.api.getMe();
+        bot.botInfo = me;
         botUsername = me.username || null;
         botUserId = me.id ?? null;
     }
     catch (err) {
         log.warn('[tg] getMe failed; bot identity unknown', logErrorText(err));
     }
-    // Without an identity the guard has only the is_bot flag to work with — and
-    // allowBots turns that off. Starting anyway would leave the loop this guard
-    // exists to prevent wide open, so refuse instead.
-    if (botUserId === null && settings["telegram"]?.allowBots) {
-        log.error('[tg] refusing to start: allowBots is on but the bot identity could not be read');
+    // The durable offset is scoped by bot identity, so polling must not start
+    // when getMe cannot provide that identity.
+    if (botUserId === null) {
+        log.error(logErrorText('[tg] refusing to start durable polling: bot identity could not be read'));
         return;
     }
     // ─── Global Forwarding: non-Telegram responses → Telegram ───
@@ -814,18 +869,34 @@ async function _initTelegramInner() {
     void syncTelegramCommands(bot).catch((e) => {
         log.warn('[tg:commands] setMyCommands failed:', logErrorText(e));
     });
-    try {
-        await bot.api.raw.deleteWebhook({ drop_pending_updates: true });
-    }
-    catch { /* best effort */ }
-    bot.start({
-        drop_pending_updates: true,
+    const poller = new TelegramDurablePoller({
+        api: bot.api,
+        key: String(botUserId),
+        store: telegramUpdateOffsets,
+        handleUpdateThroughFinalDelivery: async (update) => {
+            try {
+                if (handleTelegramUpdate(update, telegramApprovalIngress))
+                    return;
+                await bot.handleUpdate(update);
+                if (telegramFinalDeliveryFailures.has(update.update_id)) {
+                    throw new Error('telegram_final_delivery_failed');
+                }
+            }
+            finally {
+                telegramFinalDeliveryFailures.delete(update.update_id);
+            }
+        },
         onStart: (info) => {
             tg409RetryCount = 0;
-            log.info(`[tg] ✅ @${info.username} polling active`);
+            const skipped = info.skippedThroughUpdateId === null ? '' : `; skipped through update ${info.skippedThroughUpdateId}`;
+            log.info(`[tg] ✅ @${botUsername ?? botUserId} durable polling active at offset ${info.nextOffset}${skipped}`);
         },
-    }).catch((err) => {
-        const is409 = err?.error_code === 409 || err?.message?.includes('409');
+    });
+    telegramPoller = poller;
+    telegramApprovalIngress = createTelegramPollingIngress();
+    poller.start().catch((err) => {
+        const telegramError = err;
+        const is409 = telegramError.error_code === 409 || telegramError.message?.includes('409');
         if (is409) {
             tg409RetryCount++;
             if (tg409RetryCount > TG_MAX_RETRIES) {
@@ -839,7 +910,7 @@ async function _initTelegramInner() {
             }
         }
         else {
-            log.error('[tg:fatal]', logErrorText(err));
+            log.error('[tg:fatal] Telegram durability bootstrap/polling failed; no uncommitted backlog consumed', logErrorText(err));
         }
     });
     telegramBot = bot;