fix(telegram): retry forum replies without invalid thread id

Clausinho · Clausinho · commit 479540494caf · 2026-05-08T16:39:39.000+02:00
diff --git a/extensions/telegram/src/bot/delivery.send.ts b/extensions/telegram/src/bot/delivery.send.ts
@@ -68,7 +68,8 @@ export async function sendTelegramWithThreadFallback<T>(params: {
   send: (effectiveParams: Record<string, unknown>) => Promise<T>;
   shouldLog?: (err: unknown) => boolean;
 }): Promise<T> {
-  const allowThreadlessRetry = params.thread?.scope === "dm";
+  const allowThreadlessRetry =
+    params.thread?.scope === "dm" || params.thread?.scope === "forum";
   const hasThreadId = hasMessageThreadIdParam(params.requestParams);
   const hasNativeQuote = getTelegramNativeQuoteReplyMessageId(params.requestParams) != null;
   const shouldSuppressFirstErrorLog = (err: unknown) =>
diff --git a/extensions/telegram/src/bot/delivery.test.ts b/extensions/telegram/src/bot/delivery.test.ts
@@ -758,22 +758,32 @@ describe("deliverReplies", () => {
     expect(runtime.error).not.toHaveBeenCalled();
   });
 
-  it("does not retry forum sends without message_thread_id", async () => {
+  it("retries forum sends without message_thread_id when thread is missing", async () => {
     const runtime = createRuntime();
-    const sendMessage = vi.fn().mockRejectedValue(createThreadNotFoundError("sendMessage"));
+    const sendMessage = vi
+      .fn()
+      .mockRejectedValueOnce(createThreadNotFoundError("sendMessage"))
+      .mockResolvedValueOnce({
+        message_id: 7,
+        chat: { id: "123" },
+      });
     const bot = createBot({ sendMessage });
 
-    await expect(
-      deliverWith({
-        replies: [{ text: "hello" }],
-        runtime,
-        bot,
-        thread: { id: 42, scope: "forum" },
-      }),
-    ).rejects.toThrow("message thread not found");
+    await deliverWith({
+      replies: [{ text: "hello" }],
+      runtime,
+      bot,
+      thread: { id: 42, scope: "forum" },
+    });
 
-    expect(sendMessage).toHaveBeenCalledTimes(1);
-    expect(runtime.error).toHaveBeenCalledTimes(1);
+    expect(sendMessage).toHaveBeenCalledTimes(2);
+    expect(sendMessage.mock.calls[0]?.[2]).toEqual(
+      expect.objectContaining({
+        message_thread_id: 42,
+      }),
+    );
+    expect(sendMessage.mock.calls[1]?.[2]).not.toHaveProperty("message_thread_id");
+    expect(runtime.error).not.toHaveBeenCalled();
   });
 
   it("retries final text sends for wrapped pre-connect grammY HttpError envelopes", async () => {
