fix(telegram): preserve bot-self reply target context under allowlist visibility (#82002)

0xghost42 · 0xghost42 · commit 5dae2f55b04c · 2026-06-19T13:36:21.000+05:30
Telegram supplemental-context filter computed senderAllowed only from the
group allowlist, so a user reply to a bot-sent cron/system message would
drop the quoted bot text whenever the bot account was not in
effectiveGroupAllow under contextVisibility: "allowlist". Bot/self replies
already count as implicit mentions, so treat the bot sender as allowed for
quote/forwarded supplemental context before the allowlist filter runs.

Adds extensions/telegram/src/bot.test.ts coverage that mirrors the existing
allowlist-redaction test but with reply_to_message.from.id == primaryCtx.me.id;
ReplyToBody is now preserved instead of being filtered out.
diff --git a/extensions/telegram/src/bot-message-context.session.ts b/extensions/telegram/src/bot-message-context.session.ts
@@ -262,6 +262,7 @@ export async function buildTelegramInboundContextPayload(params: {
     channel: "telegram",
     accountId: route.accountId,
   });
+  const botSenderId = primaryCtx.me?.id != null ? String(primaryCtx.me.id) : undefined;
   const shouldIncludeGroupSupplementalContext = (paramsLocal: {
     kind: "quote" | "forwarded";
     senderId?: string;
@@ -270,13 +271,19 @@ export async function buildTelegramInboundContextPayload(params: {
     if (!isGroup) {
       return true;
     }
-    const senderAllowed = effectiveGroupAllow?.hasEntries
-      ? isSenderAllowed({
-          allow: effectiveGroupAllow,
-          senderId: paramsLocal.senderId,
-          senderUsername: paramsLocal.senderUsername,
-        })
-      : true;
+    // Bot/self messages already count as implicit mentions in groups; treat
+    // them as allowed supplemental context so a user replying to a bot-sent
+    // notification keeps the quoted bot text under allowlist visibility.
+    const isBotSelfSender = botSenderId != null && paramsLocal.senderId === botSenderId;
+    const senderAllowed = isBotSelfSender
+      ? true
+      : effectiveGroupAllow?.hasEntries
+        ? isSenderAllowed({
+            allow: effectiveGroupAllow,
+            senderId: paramsLocal.senderId,
+            senderUsername: paramsLocal.senderUsername,
+          })
+        : true;
     return evaluateSupplementalContextVisibility({
       mode: contextVisibilityMode,
       kind: paramsLocal.kind,
diff --git a/extensions/telegram/src/bot.test.ts b/extensions/telegram/src/bot.test.ts
@@ -3081,6 +3081,51 @@ describe("createTelegramBot", () => {
     expect(payload.Body).not.toContain("[Forwarded from Bob Smith (@bobsmith)");
   });
 
+  it("preserves bot-self reply target context under allowlist visibility", async () => {
+    onSpy.mockReset();
+    sendMessageSpy.mockReset();
+    replySpy.mockReset();
+    loadConfig.mockReturnValue({
+      channels: {
+        telegram: {
+          groupPolicy: "allowlist",
+          contextVisibility: "allowlist",
+          groups: {
+            "-1008": {
+              requireMention: false,
+              allowFrom: ["1"],
+            },
+          },
+        },
+      },
+    });
+
+    createTelegramBot({ token: "tok" });
+    const handler = getOnHandler("message") as (ctx: Record<string, unknown>) => Promise<void>;
+
+    await handler({
+      message: {
+        message_id: 9100,
+        chat: { id: -1008, type: "group", title: "Ops" },
+        text: "what happened?",
+        date: 1736380800,
+        from: { id: 1, first_name: "Ada", username: "ada", is_bot: false },
+        reply_to_message: {
+          message_id: 9099,
+          text: "cron notification body",
+          from: { id: 999, first_name: "OpenClaw", is_bot: true },
+        },
+      },
+      me: { id: 999, username: "openclaw_bot" },
+      getFile: async () => ({ download: async () => new Uint8Array() }),
+    });
+
+    expect(replySpy).toHaveBeenCalledTimes(1);
+    const payload = mockMsgContextArg(replySpy as unknown as MockCallSource, 0, 0, "replySpy call");
+    expect(payload.ReplyToId).toBe("9099");
+    expect(payload.ReplyToBody).toBe("cron notification body");
+  });
+
   it("accepts group replies to the bot without explicit mention when requireMention is enabled", async () => {
     onSpy.mockClear();
     replySpy.mockClear();
