fix(telegram): preserve message_thread_id on media caption parse fallback

kesslerio · kesslerio · commit 16fe70e4f405 · 2026-07-03T10:58:55.000-07:00
ClawSweeper P1: the media wrapper passed removeMessageThreadIdParam(
plainMediaParams) even for the first attempt, so an HTML caption parse
error for a topic-scoped media send retried without message_thread_id and
could deliver topic media to the group root. Keep the thread for caption
parse fallback; only strip it for the allowed thread-not-found retry.
diff --git a/extensions/telegram/src/draft-stream.ts b/extensions/telegram/src/draft-stream.ts
@@ -685,7 +685,11 @@ export function createTelegramDraftStream(params: {
     // Rewind WITHOUT deleting; the old id is captured above.
     resetStreamToNewMessage();
     if (typeof supersededMessageId === "number" && Number.isFinite(supersededMessageId)) {
-      scheduleDetachedDelete(supersededMessageId, supersededVisibleSince, REPOSITION_DELETE_DELAY_MS);
+      scheduleDetachedDelete(
+        supersededMessageId,
+        supersededVisibleSince,
+        REPOSITION_DELETE_DELAY_MS,
+      );
       return supersededMessageId;
     }
     return undefined;
@@ -704,9 +708,7 @@ export function createTelegramDraftStream(params: {
     return streamMessageId;
   };
 
-  const finalizeToPreview = async (
-    preview: TelegramDraftPreview,
-  ): Promise<number | undefined> => {
+  const finalizeToPreview = async (preview: TelegramDraftPreview): Promise<number | undefined> => {
     const text = preview.text.trimEnd();
     if (!text) {
       return undefined;
diff --git a/extensions/telegram/src/send.test.ts b/extensions/telegram/src/send.test.ts
@@ -1969,6 +1969,56 @@ describe("sendMessageTelegram", () => {
     expect(result).toEqual({ messageId: "91", chatId });
   });
 
+  it("keeps message_thread_id on plain caption fallback for forum topic media sends", async () => {
+    const chatId = "-100123";
+    const caption = "hi **boss**";
+    const sendPhoto = vi
+      .fn()
+      .mockRejectedValueOnce(createHtmlParseError("sendPhoto"))
+      .mockResolvedValueOnce({
+        message_id: 92,
+        chat: { id: chatId },
+      });
+    const api = { sendPhoto } as unknown as {
+      sendPhoto: typeof sendPhoto;
+    };
+
+    mockLoadedMedia({
+      buffer: Buffer.from("fake-image"),
+      contentType: "image/jpeg",
+      fileName: "photo.jpg",
+    });
+
+    const result = await sendMessageTelegram(chatId, caption, {
+      cfg: TELEGRAM_TEST_CFG,
+      token: "tok",
+      api,
+      mediaUrl: "https://example.com/photo.jpg",
+      messageThreadId: 271,
+    });
+
+    expectMediaSendCall(
+      firstMockCall(sendPhoto, "first send photo call"),
+      "send photo call",
+      chatId,
+      {
+        caption: "hi <b>boss</b>",
+        parse_mode: "HTML",
+        message_thread_id: 271,
+      },
+    );
+    expectMediaSendCall(
+      mockCall(sendPhoto, 1, "plain caption retry call"),
+      "plain caption retry call",
+      chatId,
+      {
+        caption,
+        message_thread_id: 271,
+      },
+    );
+    expect(result).toEqual({ messageId: "92", chatId });
+  });
+
   it("sends video notes when requested and regular videos otherwise", async () => {
     const chatId = "123";
 
@@ -3135,6 +3185,7 @@ describe("sendMessageTelegram", () => {
     await expect(
       sendMessageTelegram(chatId, "photo", {
         token: "tok",
+        cfg: TELEGRAM_TEST_CFG,
         api,
         mediaUrl: "https://example.com/photo.jpg",
         messageThreadId: 271,
@@ -3543,6 +3594,7 @@ describe("sendStickerTelegram", () => {
     await expect(
       sendStickerTelegram(chatId, "fileId123", {
         token: "tok",
+        cfg: TELEGRAM_TEST_CFG,
         api,
         messageThreadId: 271,
       }),
diff --git a/extensions/telegram/src/send.ts b/extensions/telegram/src/send.ts
@@ -1512,12 +1512,18 @@ export async function sendMessageTelegram(
       opts.verbose,
       allowThreadlessFallback,
       async (effectiveParams, retryLabel) => {
-        const threadlessPlainMediaParams = removeMessageThreadIdParam(plainMediaParams);
+        // Keep message_thread_id on the caption parse fallback so topic-scoped
+        // media stays in the forum topic. withTelegramThreadFallback already
+        // strips the thread for the thread-not-found retry via effectiveParams;
+        // mirror that state onto the plain-caption fallback.
+        const effectivePlainMediaParams = hasMessageThreadIdParam(effectiveParams)
+          ? plainMediaParams
+          : removeMessageThreadIdParam(plainMediaParams);
         return await sendMedia(
           retryLabel,
           mediaSender.sender,
           effectiveParams,
-          threadlessPlainMediaParams,
+          effectivePlainMediaParams,
         );
       },
     );
