Merge pull request #86 from makespacemadrid/codex/fix-group-chat-responses-for-subgroup

Keep Telegram command replies in forum topics

Author: luisriverag

app/web/routes/main_routes.py

@@ -945,7 +945,14 @@ def _answer_and_send(ctx):
         ),
     )
     if TELEGRAM_BOT_TOKEN and chat_id and result["kind"] == "send_message":
-        TelegramClient(TELEGRAM_BOT_TOKEN, str(chat_id), "").send_message(result["text"])
+        # Commands can arrive inside a forum topic just like natural-language
+        # messages.  Keep their deterministic replies in that same topic rather
+        # than silently posting them to the supergroup's General topic.
+        TelegramClient(
+            TELEGRAM_BOT_TOKEN,
+            str(chat_id),
+            str(message_ctx.get("message_thread_id") or ""),
+        ).send_message(result["text"])
 
     return {"ok": True}, 200
 

docs/APIDOC.md

@@ -646,7 +646,8 @@ In private chats every non-command message is eligible. In groups, the assistant
 responds when a member addresses it with an `@mention` or replies to one of its
 messages; other group conversation is ignored. Set `TELEGRAM_BOT_USERNAME` so
 mentions can be matched exactly when the bot's Telegram privacy mode is disabled.
-Responses stay in the incoming forum topic when `message_thread_id` is present.
+Assistant and command responses stay in the incoming forum topic when
+`message_thread_id` is present.
 Mutating tool calls are never executed immediately: the administrator must send
 `/confirm` within `TELEGRAM_CONFIRM_TTL_SECONDS` (default: 300) to execute the
 pending action or `/cancel` to discard it. Conversation

tests/test_app_functionality.py

@@ -1700,6 +1700,41 @@ def test_telegram_webhook_non_command_message_is_ignored(self):
         conn.close()
         self.assertEqual(total, 0)
 
+    def test_telegram_webhook_command_reply_stays_in_forum_topic(self):
+        from app.web.routes import main_routes
+
+        clients = []
+
+        def _fake_send_message(client, message):
+            clients.append((client.chat_id, client.thread_id, message))
+            return True
+
+        old_secret = main_routes.TELEGRAM_WEBHOOK_SECRET
+        old_token = main_routes.TELEGRAM_BOT_TOKEN
+        main_routes.TELEGRAM_WEBHOOK_SECRET = "hook-secret"
+        main_routes.TELEGRAM_BOT_TOKEN = "bot-token"
+        try:
+            with patch.object(main_routes.TelegramClient, "send_message", new=_fake_send_message):
+                response = self.client.post(
+                    "/telegram/webhook/hook-secret",
+                    json={
+                        "message": {
+                            "text": "/help",
+                            "from": {"username": "admin"},
+                            "chat": {"id": -100123, "type": "supergroup"},
+                            "message_thread_id": 42,
+                        }
+                    },
+                )
+        finally:
+            main_routes.TELEGRAM_WEBHOOK_SECRET = old_secret
+            main_routes.TELEGRAM_BOT_TOKEN = old_token
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(clients), 1)
+        self.assertEqual(clients[0][:2], ("-100123", "42"))
+        self.assertIn("ManaVote bot is running", clients[0][2])
+
     def test_telegram_webhook_supports_edited_message_payload(self):
         poll_id = self._latest_poll_id()
         from app.web.routes import main_routes