fix(telegram): preserve inline-keyboard payloads when suppressing NO_REPLY

1aifanatic · 1aifanatic · commit e2c30d921148 · 2026-05-07T11:11:08.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ Docs: https://docs.openclaw.ai
 
 ### Fixes
 
+- Telegram/silent reply: suppress the `NO_REPLY` sentinel inside `sendMessageTelegram` before any API call, mirroring the existing Slack guard, while preserving sends that carry an inline keyboard or media payload so structured replies still post. (#68304) Thanks @1aifanatic.
 - Agents/bootstrap: resolve bootstrap from workspace truth instead of stale session transcript markers, keep embedded bootstrap instructions on a hidden user-context prelude, suppress normal `/new` and `/reset` greetings while `BOOTSTRAP.md` is still pending, and make the embedded runner read the bootstrap ritual before replying normally.
 - Onboarding/non-interactive: preserve existing gateway auth tokens during re-onboard so active local gateway clients are not disconnected by an implicit token rotation. (#67821) Thanks @BKF-Gitty.
 - Gateway/hello-ok: always report negotiated auth metadata for successful shared-auth handshakes, including control-ui bypass coverage when no device token is issued. (#67810) Thanks @BunsDev.
diff --git a/extensions/telegram/src/send.test.ts b/extensions/telegram/src/send.test.ts
@@ -1764,6 +1764,33 @@ describe("sendMessageTelegram", () => {
     expect(sendMessage.mock.calls.map((call) => String(call[1] ?? "")).join("")).toBe(plainText);
     expect(res.messageId).toBe("96");
   });
+
+  it("suppresses NO_REPLY sentinel before any API call when no payload is attached", async () => {
+    const sendMessage = vi.fn();
+    const api = { sendMessage } as unknown as { sendMessage: typeof sendMessage };
+
+    const res = await sendMessageTelegram("123", "NO_REPLY", { token: "tok", api });
+
+    expect(sendMessage).not.toHaveBeenCalled();
+    expect(res).toEqual({ messageId: "suppressed", chatId: "" });
+  });
+
+  it("still sends NO_REPLY when inline buttons are attached so the keyboard payload is preserved", async () => {
+    const sendMessage = vi.fn().mockResolvedValue({ message_id: 7, chat: { id: "123" } });
+    const api = { sendMessage } as unknown as { sendMessage: typeof sendMessage };
+
+    const res = await sendMessageTelegram("123", "NO_REPLY", {
+      token: "tok",
+      api,
+      buttons: [[{ text: "OK", callback_data: "ok" }]],
+    });
+
+    expect(sendMessage).toHaveBeenCalledTimes(1);
+    expect(sendMessage.mock.calls[0][2]?.reply_markup).toEqual({
+      inline_keyboard: [[{ text: "OK", callback_data: "ok" }]],
+    });
+    expect(res.messageId).toBe("7");
+  });
 });
 
 describe("reactMessageTelegram", () => {
diff --git a/extensions/telegram/src/send.ts b/extensions/telegram/src/send.ts
@@ -620,7 +620,8 @@ export async function sendMessageTelegram(
   opts: TelegramSendOpts = {},
 ): Promise<TelegramSendResult> {
   const trimmedText = normalizeOptionalString(text) ?? "";
-  if (isSilentReplyText(trimmedText) && !opts.mediaUrl) {
+  const hasButtons = Array.isArray(opts.buttons) && opts.buttons.length > 0;
+  if (isSilentReplyText(trimmedText) && !opts.mediaUrl && !hasButtons) {
     logVerbose("telegram send: suppressed NO_REPLY token before API call");
     return { messageId: "suppressed", chatId: "" };
   }
