fix(telegram): keep forum topic sessions stable

obviyus · obviyus · commit 194bf6a715b9 · 2026-06-08T09:09:04.000Z
diff --git a/extensions/telegram/src/bot-message-context.dm-threads.test.ts b/extensions/telegram/src/bot-message-context.dm-threads.test.ts
@@ -232,7 +232,7 @@ describe("buildTelegramMessageContext group sessions without forum", () => {
     expect(resolveStorePath).toHaveBeenCalledTimes(1);
   });
 
-  it("uses root-message topic session for forum groups with message_thread_id", async () => {
+  it("uses topic session for forum groups with message_thread_id", async () => {
     const ctx = await buildContext({
       message_id: 1,
       chat: { id: -1001234567890, type: "supergroup", title: "Test Forum", is_forum: true },
@@ -242,10 +242,8 @@ describe("buildTelegramMessageContext group sessions without forum", () => {
       from: { id: 42, first_name: "Alice" },
     });
 
-    // Session key should include the forum topic and root message for concurrent topic requests.
-    expect(ctx?.ctxPayload?.SessionKey).toBe(
-      "agent:main:telegram:group:-1001234567890:topic:99:thread:topic:99:message:1",
-    );
+    // Session key SHOULD include :topic:99 for forums
+    expect(ctx?.ctxPayload?.SessionKey).toBe("agent:main:telegram:group:-1001234567890:topic:99");
     expect(ctx?.ctxPayload?.MessageThreadId).toBe(99);
     expect(ctx?.ctxPayload?.OriginatingTo).toBe("telegram:-1001234567890:topic:99");
   });
diff --git a/extensions/telegram/src/bot-message-context.named-account-dm.test-support.ts b/extensions/telegram/src/bot-message-context.named-account-dm.test-support.ts
@@ -171,7 +171,7 @@ describe("buildTelegramMessageContext named-account DM fallback", () => {
     expect(ctx?.route.accountId).toBe("atlas");
     expect(ctx?.route.agentId).toBe("topic-agent");
     expect(ctx?.ctxPayload?.SessionKey).toBe(
-      "agent:topic-agent:telegram:group:-1001234567890:topic:42:thread:topic:42:message:1",
+      "agent:topic-agent:telegram:group:-1001234567890:topic:42",
     );
   });
 
diff --git a/extensions/telegram/src/bot-message-context.native-thread-session.test.ts b/extensions/telegram/src/bot-message-context.native-thread-session.test.ts
diff --git a/extensions/telegram/src/bot-message-context.require-mention.test.ts b/extensions/telegram/src/bot-message-context.require-mention.test.ts
@@ -169,9 +169,7 @@ describe("buildTelegramMessageContext requireMention precedence", () => {
     const [activationOptions] = activationCalls[0] ?? [];
     expect(activationOptions?.chatId).toBe(-1001234567890);
     expect(activationOptions?.messageThreadId).toBe(99);
-    expect(activationOptions?.sessionKey).toBe(
-      "agent:main:telegram:group:-1001234567890:topic:99:thread:topic:99:message:1",
-    );
+    expect(activationOptions?.sessionKey).toBe("agent:main:telegram:group:-1001234567890:topic:99");
   });
 
   it("lets explicit topic requireMention=true override always activation", async () => {
diff --git a/extensions/telegram/src/bot-message-context.test-harness.ts b/extensions/telegram/src/bot-message-context.test-harness.ts
@@ -23,7 +23,6 @@ type BuildTelegramMessageContextForTestParams = {
   message: Record<string, unknown>;
   me?: Record<string, unknown>;
   allMedia?: TelegramMediaRef[];
-  replyChain?: BuildTelegramMessageContextParams["replyChain"];
   options?: BuildTelegramMessageContextParams["options"];
   cfg?: Record<string, unknown>;
   accountId?: string;
@@ -113,7 +112,6 @@ export async function buildTelegramMessageContextForTest(
       me: { id: 7, username: "bot", ...params.me },
     } as never,
     allMedia: params.allMedia ?? [],
-    replyChain: params.replyChain ?? [],
     storeAllowFrom: [],
     options: params.options ?? {},
     bot: {
diff --git a/extensions/telegram/src/bot-message-context.topic-agentid.test.ts b/extensions/telegram/src/bot-message-context.topic-agentid.test.ts
@@ -64,9 +64,7 @@ describe("buildTelegramMessageContext per-topic agentId routing", () => {
   it("uses group-level agent when no topic agentId is set", async () => {
     const ctx = await buildForumContext({ topicConfig: { systemPrompt: "Be nice" } });
 
-    expect(ctx?.ctxPayload?.SessionKey).toBe(
-      "agent:main:telegram:group:-1001234567890:topic:3:thread:topic:3:message:1",
-    );
+    expect(ctx?.ctxPayload?.SessionKey).toBe("agent:main:telegram:group:-1001234567890:topic:3");
   });
 
   it("routes to topic-specific agent when agentId is set", async () => {
diff --git a/extensions/telegram/src/bot-message-context.ts b/extensions/telegram/src/bot-message-context.ts
@@ -86,50 +86,6 @@ type TelegramStatusReactionController = {
   restoreInitial: () => void | Promise<void>;
 };
 
-function normalizeTelegramNativeThreadMessageId(value: unknown): string | undefined {
-  if (typeof value === "number" && Number.isFinite(value)) {
-    return String(Math.trunc(value));
-  }
-  if (typeof value !== "string") {
-    return undefined;
-  }
-  const trimmed = value.trim();
-  return trimmed ? trimmed : undefined;
-}
-
-function resolveTelegramNativeReplyRootThreadId(params: {
-  isGroup: boolean;
-  isForum: boolean;
-  resolvedThreadId?: number;
-  msg: BuildTelegramMessageContextParams["primaryCtx"]["message"];
-  replyChain: NonNullable<BuildTelegramMessageContextParams["replyChain"]>;
-}): string | undefined {
-  if (!params.isGroup || !params.isForum) {
-    return undefined;
-  }
-
-  const chainRootId = params.replyChain
-    .toReversed()
-    .map((entry) => normalizeTelegramNativeThreadMessageId(entry.messageId))
-    .find(Boolean);
-  const directReplyId =
-    params.msg.reply_to_message?.forum_topic_created ||
-    params.msg.reply_to_message?.forum_topic_edited ||
-    params.msg.reply_to_message?.forum_topic_closed ||
-    params.msg.reply_to_message?.forum_topic_reopened
-      ? undefined
-      : normalizeTelegramNativeThreadMessageId(params.msg.reply_to_message?.message_id);
-  const rootMessageId =
-    chainRootId ?? directReplyId ?? normalizeTelegramNativeThreadMessageId(params.msg.message_id);
-  if (!rootMessageId) {
-    return undefined;
-  }
-
-  const topicPrefix =
-    params.resolvedThreadId != null ? `topic:${Math.trunc(params.resolvedThreadId)}:` : "";
-  return `${topicPrefix}message:${rootMessageId}`;
-}
-
 export type TelegramMessageContext = {
   ctxPayload: TelegramMessageContextPayload["ctxPayload"];
   turn: TelegramMessageContextPayload["turn"];
@@ -307,9 +263,6 @@ export const buildTelegramMessageContext = async ({
     candidate.matchedBy === "default";
   const isNamedAccountFallback = requiresExplicitAccountBinding(route);
   const hasExplicitTopicRoute = isGroup && Boolean(topicConfig?.agentId?.trim());
-  // Named-account groups still require an explicit binding; DMs get a
-  // per-account fallback session key below to preserve isolation. An explicit
-  // account-scoped topic agent is a configured group route, not a fallback.
   if (isNamedAccountFallback && isGroup && !hasExplicitTopicRoute) {
     logInboundDrop({
       log: logVerbose,
@@ -459,26 +412,10 @@ export const buildTelegramMessageContext = async ({
     dmThreadId,
     botHasTopicsEnabled: resolveTelegramBotHasTopicsEnabled(primaryCtx.me),
   });
-  const nativeReplyRootThreadId =
-    bindingMode.kind !== "none"
-      ? undefined
-      : resolveTelegramNativeReplyRootThreadId({
-          isGroup,
-          isForum,
-          resolvedThreadId,
-          msg,
-          replyChain,
-        });
   const threadKeys =
     useDmThreadSession && dmThreadId != null
       ? resolveThreadSessionKeys({ baseSessionKey, threadId: `${chatId}:${dmThreadId}` })
-      : nativeReplyRootThreadId
-        ? resolveThreadSessionKeys({
-            baseSessionKey,
-            threadId: nativeReplyRootThreadId,
-            parentSessionKey: baseSessionKey,
-          })
-        : null;
+      : null;
   const sessionKey = threadKeys?.sessionKey ?? baseSessionKey;
   route = {
     ...route,
