fix telegram dm topic session routing

brokemac79 · brokemac79 · commit d904115e4cd0 · 2026-05-30T23:32:23.000+01:00
diff --git a/extensions/telegram/src/channel.ts b/extensions/telegram/src/channel.ts
@@ -553,19 +553,24 @@ function resolveTelegramOutboundSessionRoute(params: {
   if (isGroup) {
     return baseRoute;
   }
+  const outboundSessionThreadId =
+    resolvedThreadId !== undefined ? `${chatId}:${resolvedThreadId}` : undefined;
   const route = buildThreadAwareOutboundSessionRoute({
     route: baseRoute,
-    threadId: resolvedThreadId,
+    threadId: outboundSessionThreadId,
     currentSessionKey: params.currentSessionKey,
     precedence: ["threadId", "currentSession"],
     canRecoverCurrentThread: ({ route }) =>
       route.chatType !== "direct" || (params.cfg.session?.dmScope ?? "main") !== "main",
   });
+  const deliveryThreadId =
+    resolvedThreadId ?? parseTelegramThreadId(route.threadId) ?? route.threadId;
   return {
     ...route,
+    ...(deliveryThreadId !== undefined ? { threadId: deliveryThreadId } : {}),
     from:
-      route.threadId !== undefined
-        ? `telegram:${chatId}:topic:${route.threadId}`
+      deliveryThreadId !== undefined
+        ? `telegram:${chatId}:topic:${deliveryThreadId}`
         : `telegram:${chatId}`,
   };
 }
diff --git a/extensions/telegram/src/session-route.test.ts b/extensions/telegram/src/session-route.test.ts
@@ -2,18 +2,34 @@ import { describe, expect, it } from "vitest";
 import { telegramPlugin } from "./channel.js";
 
 describe("telegram session route", () => {
-  it("keeps direct topic thread ids in a thread session suffix", async () => {
+  it("scopes direct topic session suffixes by chat id", async () => {
     const route = await telegramPlugin.messaging?.resolveOutboundSessionRoute?.({
       cfg: {},
       agentId: "main",
       target: "12345:topic:99",
     });
 
-    expect(route?.sessionKey).toBe("agent:main:main:thread:99");
+    expect(route?.sessionKey).toBe("agent:main:main:thread:12345:99");
     expect(route?.baseSessionKey).toBe("agent:main:main");
     expect(route?.threadId).toBe(99);
   });
 
+  it("aligns isolated direct topic sessions with inbound reply routing", async () => {
+    const route = await telegramPlugin.messaging?.resolveOutboundSessionRoute?.({
+      cfg: { session: { dmScope: "per-account-channel-peer" } },
+      agentId: "finance",
+      accountId: "finance",
+      target: "104506878:topic:174872",
+    });
+
+    expect(route?.sessionKey).toBe(
+      "agent:finance:telegram:finance:direct:104506878:thread:104506878:174872",
+    );
+    expect(route?.baseSessionKey).toBe("agent:finance:telegram:finance:direct:104506878");
+    expect(route?.threadId).toBe(174872);
+    expect(route?.from).toBe("telegram:104506878:topic:174872");
+  });
+
   it("recovers direct topic thread routes from currentSessionKey when the DM scope is isolated", async () => {
     const route = await telegramPlugin.messaging?.resolveOutboundSessionRoute?.({
       cfg: { session: { dmScope: "per-channel-peer" } },
@@ -24,7 +40,8 @@ describe("telegram session route", () => {
 
     expect(route?.sessionKey).toBe("agent:main:telegram:direct:12345:thread:12345:99");
     expect(route?.baseSessionKey).toBe("agent:main:telegram:direct:12345");
-    expect(route?.threadId).toBe("12345:99");
+    expect(route?.threadId).toBe(99);
+    expect(route?.from).toBe("telegram:12345:topic:99");
   });
 
   it('does not recover currentSessionKey threads for shared dmScope "main" DMs', async () => {
