From 6a100e38d42310c45f06988bec739d439afb7810 Mon Sep 17 00:00:00 2001
From: Sergey Ryabov <colriot@gmail.com>
Date: Thu, 29 Jan 2026 02:36:47 -0800
Subject: [PATCH] fix(telegram): preserve messageThreadId for DM reply threads

Previously, resolvedThreadId was always used for delivery, but
resolveTelegramForumThreadId() returns undefined for non-forum chats.
This caused DM reply threads to lose their thread context, sending
replies to the main chat instead of the thread.

Now we use messageThreadId directly for DM chats, while keeping
resolvedThreadId for forum groups where topic resolution is needed.
---
 src/telegram/bot-message-context.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/telegram/bot-message-context.ts b/src/telegram/bot-message-context.ts
index abd06cdef..73659f97d 100644
--- a/src/telegram/bot-message-context.ts
+++ b/src/telegram/bot-message-context.ts
@@ -656,7 +656,8 @@ export const buildTelegramMessageContext = async ({
     msg,
     chatId,
     isGroup,
-    resolvedThreadId,
+    // For DM reply threads use messageThreadId; for forum groups use resolvedThreadId
+    resolvedThreadId: isGroup ? resolvedThreadId : messageThreadId,
     isForum,
     historyKey,
     historyLimit,