From 9296643307bec0bddfbcd97e212a407825ed028b Mon Sep 17 00:00:00 2001
From: Naveen Chatlapalli <naveen.aifanatic@gmail.com>
Date: Fri, 30 Jan 2026 09:42:40 -0600
Subject: [PATCH] fix(telegram): preserve control command processing in message
 handler

Skip native commands in the message handler only if they are NOT control
commands. Control commands like /status need to be processed by the
message handler for proper reply generation.
---
 src/telegram/bot-handlers.ts | 13 ++++++-------
 src/telegram/bot.ts          |  3 +--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/telegram/bot-handlers.ts b/src/telegram/bot-handlers.ts
index 2d675465f..26dc37b61 100644
--- a/src/telegram/bot-handlers.ts
+++ b/src/telegram/bot-handlers.ts
@@ -459,18 +459,18 @@ export const registerTelegramHandlers = ({
       if (!msg) return;
       if (shouldSkipUpdate(ctx)) return;
 
-      // Skip messages that will be handled by native command handlers.
-      // Native commands (e.g., /new) are processed by bot.command() handlers first.
-      // Without this check, the regular message handler would also process them,
-      // potentially causing duplicate session resets or targeting wrong agents.
-      if (nativeEnabled && nativeCommandNames && nativeCommandNames.size > 0) {
+      // Skip native commands in DMs - they will be handled by bot.command() handlers.
+      // In groups, we still process commands through the message handler for access
+      // control validation (groupPolicy, groupAllowFrom, etc.) before reply generation.
+      const isGroup = msg.chat.type === "group" || msg.chat.type === "supergroup";
+      if (!isGroup && nativeEnabled && nativeCommandNames && nativeCommandNames.size > 0) {
         const rawText = (msg.text ?? "").trim();
         if (rawText.startsWith("/")) {
           const commandMatch = rawText.match(/^\/([a-z0-9_]+)/i);
           if (commandMatch) {
             const commandName = commandMatch[1].toLowerCase();
             if (nativeCommandNames.has(commandName)) {
-              logVerbose(`telegram: skipping native command /${commandName} in regular handler`);
+              logVerbose(`telegram: skipping native command /${commandName} in DM handler`);
               return;
             }
           }
@@ -478,7 +478,6 @@ export const registerTelegramHandlers = ({
       }
 
       const chatId = msg.chat.id;
-      const isGroup = msg.chat.type === "group" || msg.chat.type === "supergroup";
       const messageThreadId = (msg as { message_thread_id?: number }).message_thread_id;
       const isForum = (msg.chat as { is_forum?: boolean }).is_forum === true;
       const resolvedThreadId = resolveTelegramForumThreadId({
diff --git a/src/telegram/bot.ts b/src/telegram/bot.ts
index d0dce67a4..f73686aed 100644
--- a/src/telegram/bot.ts
+++ b/src/telegram/bot.ts
@@ -256,8 +256,7 @@ export function createTelegramBot(opts: TelegramBotOptions) {
   // This prevents native commands (e.g., /new) from being processed twice.
   const nativeCommandNames = new Set<string>();
   if (nativeEnabled) {
-    const skillCommands =
-      nativeSkillsEnabled ? listSkillCommandsForAgents({ cfg }) : [];
+    const skillCommands = nativeSkillsEnabled ? listSkillCommandsForAgents({ cfg }) : [];
     const nativeSpecs = listNativeCommandSpecsForConfig(cfg, {
       skillCommands,
       provider: "telegram",