fix: finish telegram reply fallback landing (openclaw#52524) (thanks @moltbot886)

steipete · steipete · commit 6237cfc6a6fd · 2026-03-22T18:54:01.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -103,6 +103,8 @@ Docs: https://docs.openclaw.ai
 - Gateway/restart: defer externally signaled unmanaged restarts through the in-process idle drain, and preserve the restored subagent run as remap fallback during orphan recovery so resumed sessions do not duplicate work. (#47719) Thanks @joeykrug.
 - Control UI/session routing: preserve established external delivery routes when webchat views or sends in externally originated sessions, so subagent completions still return to the original channel instead of the dashboard. (#47797) Thanks @brokemac79.
 - Configure/startup: move outbound send-deps resolution into a lightweight helper so `openclaw configure` no longer stalls after the banner while eagerly loading channel plugins. (#46301) Thanks @scoootscooob.
+- Mattermost/threading: honor `replyToMode: "off"` for already-threaded inbound posts so threaded follow-ups can fall back to top-level replies when configured. (#52543) Thanks @RichardCao.
+- Telegram/replies: set `allow_sending_without_reply` on reply-targeted sends and media-error notices so deleted parent messages no longer drop otherwise valid replies. (#52524) Thanks @moltbot886.
 - CLI/startup: lazy-load channel add and root help startup paths to trim avoidable RSS and help latency on constrained hosts. (#46784) Thanks @vincentkoc.
 - CLI/onboarding: import static provider definitions directly for onboarding model/config helpers so those paths no longer pull provider discovery just for built-in defaults. (#47467) Thanks @vincentkoc.
 - CLI/configure: clarify fresh-setup memory-search warnings so they say semantic recall needs at least one embedding provider, and scope the initial model allowlist picker to the provider selected in configure. Thanks @vincentkoc.
diff --git a/extensions/telegram/src/bot-handlers.runtime.ts b/extensions/telegram/src/bot-handlers.runtime.ts
@@ -1016,8 +1016,10 @@ export const registerTelegramHandlers = ({
             runtime,
             fn: () =>
               bot.api.sendMessage(chatId, `⚠️ File too large. Maximum size is ${limitMb}MB.`, {
-                reply_to_message_id: msg.message_id,
-                allow_sending_without_reply: true,
+                reply_parameters: {
+                  message_id: msg.message_id,
+                  allow_sending_without_reply: true,
+                },
               }),
           }).catch(() => {});
         }
@@ -1030,8 +1032,10 @@ export const registerTelegramHandlers = ({
         runtime,
         fn: () =>
           bot.api.sendMessage(chatId, "⚠️ Failed to download media. Please try again.", {
-            reply_to_message_id: msg.message_id,
-            allow_sending_without_reply: true,
+            reply_parameters: {
+              message_id: msg.message_id,
+              allow_sending_without_reply: true,
+            },
           }),
       }).catch(() => {});
       return;
diff --git a/extensions/telegram/src/bot.create-telegram-bot.channel-post-media.test.ts b/extensions/telegram/src/bot.create-telegram-bot.channel-post-media.test.ts
@@ -231,7 +231,12 @@ describe("createTelegramBot channel_post media", () => {
       expect(sendMessageSpy).toHaveBeenCalledWith(
         1234,
         "⚠️ Failed to download media. Please try again.",
-        { reply_to_message_id: 411 },
+        {
+          reply_parameters: {
+            message_id: 411,
+            allow_sending_without_reply: true,
+          },
+        },
       );
       expect(replySpy).not.toHaveBeenCalled();
     } finally {
diff --git a/extensions/telegram/src/bot/delivery.test.ts b/extensions/telegram/src/bot/delivery.test.ts
@@ -636,6 +636,7 @@ describe("deliverReplies", () => {
       expect.any(String),
       expect.objectContaining({
         reply_to_message_id: 500,
+        allow_sending_without_reply: true,
       }),
     );
     expect(sendMessage).toHaveBeenCalledWith(
@@ -744,6 +745,7 @@ describe("deliverReplies", () => {
     expect(sendMessage.mock.calls[0][2]).toEqual(
       expect.objectContaining({
         reply_to_message_id: 77,
+        allow_sending_without_reply: true,
         reply_markup: {
           inline_keyboard: [[{ text: "Ack", callback_data: "ack" }]],
         },
@@ -799,7 +801,10 @@ describe("deliverReplies", () => {
     expect(sendMessage.mock.calls.length).toBeGreaterThanOrEqual(2);
     // First chunk should have reply_to_message_id
     expect(sendMessage.mock.calls[0][2]).toEqual(
-      expect.objectContaining({ reply_to_message_id: 700 }),
+      expect.objectContaining({
+        reply_to_message_id: 700,
+        allow_sending_without_reply: true,
+      }),
     );
     // Second chunk should NOT have reply_to_message_id
     expect(sendMessage.mock.calls[1][2]).not.toHaveProperty("reply_to_message_id");
@@ -826,7 +831,12 @@ describe("deliverReplies", () => {
     expect(sendMessage.mock.calls.length).toBeGreaterThanOrEqual(2);
     // Both chunks should have reply_to_message_id
     for (const call of sendMessage.mock.calls) {
-      expect(call[2]).toEqual(expect.objectContaining({ reply_to_message_id: 800 }));
+      expect(call[2]).toEqual(
+        expect.objectContaining({
+          reply_to_message_id: 800,
+          allow_sending_without_reply: true,
+        }),
+      );
     }
   });
 
@@ -854,7 +864,10 @@ describe("deliverReplies", () => {
     expect(sendPhoto).toHaveBeenCalledTimes(2);
     // First media should have reply_to_message_id
     expect(sendPhoto.mock.calls[0][2]).toEqual(
-      expect.objectContaining({ reply_to_message_id: 900 }),
+      expect.objectContaining({
+        reply_to_message_id: 900,
+        allow_sending_without_reply: true,
+      }),
     );
     // Second media should NOT have reply_to_message_id
     expect(sendPhoto.mock.calls[1][2]).not.toHaveProperty("reply_to_message_id");
diff --git a/extensions/telegram/src/draft-stream.test.ts b/extensions/telegram/src/draft-stream.test.ts
@@ -218,6 +218,24 @@ describe("createTelegramDraftStream", () => {
     );
   });
 
+  it("keeps allow_sending_without_reply on message previews that target a reply", async () => {
+    const api = createMockDraftApi();
+    const stream = createDraftStream(api, {
+      thread: { id: 42, scope: "dm" },
+      previewTransport: "message",
+      replyToMessageId: 411,
+    });
+
+    stream.update("Hello");
+    await stream.flush();
+
+    expect(api.sendMessage).toHaveBeenCalledWith(123, "Hello", {
+      message_thread_id: 42,
+      reply_to_message_id: 411,
+      allow_sending_without_reply: true,
+    });
+  });
+
   it("materializes draft previews using rendered HTML text", async () => {
     const api = createMockDraftApi();
     const stream = createDraftStream(api, {
diff --git a/extensions/telegram/src/draft-stream.ts b/extensions/telegram/src/draft-stream.ts
@@ -125,7 +125,11 @@ export function createTelegramDraftStream(params: {
   const threadParams = buildTelegramThreadParams(params.thread);
   const replyParams =
     params.replyToMessageId != null
-      ? { ...threadParams, reply_to_message_id: params.replyToMessageId, allow_sending_without_reply: true }
+      ? {
+          ...threadParams,
+          reply_to_message_id: params.replyToMessageId,
+          allow_sending_without_reply: true,
+        }
       : threadParams;
   const resolvedDraftApi = prefersDraftTransport
     ? resolveSendMessageDraftApi(params.api)
