APEX/BrowserUse_and_ComputerUse_skills
5
0
Fork 0
Code Issues 6 Pull requests 1 Projects 1 Releases Packages Wiki Activity Actions

fix: forward thread_id metadata for Telegram forum topic routing

Browse source 
Replies in Telegram forum topics (supergroups with topics) now land in
the correct topic thread instead of 'General'.

- base.py: build thread_id metadata from event.source, pass to all
  send/media calls; add metadata param to send_typing, send_image,
  send_animation, send_voice, send_video, send_document, send_image_file,
  _keep_typing
- telegram.py: extract thread_id from metadata and pass as
  message_thread_id to all Bot API calls (send_photo, send_voice,
  send_audio, send_animation, send_chat_action)
- run.py: pass thread_id metadata to progress/streaming send calls
- discord/slack/whatsapp/homeassistant: update send_typing signature

Based on the fix proposed by @Bitstreamono in PR #656.
This commit is contained in:
teknium1 2026-03-10 06:21:15 -07:00
parent 2a062e2f45
commit a630ca15de
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gateway/platforms/base.py
View file

@ -687,7 +687,8 @@ class BasePlatformAdapter(ABC):
self._active_sessions[session_key] = interrupt_event self._active_sessions[session_key] = interrupt_event
# Start continuous typing indicator (refreshes every 2 seconds) # Start continuous typing indicator (refreshes every 2 seconds)
typing_task = asyncio.create_task(self._keep_typing(event.source.chat_id)) _thread_metadata = {"thread_id": event.source.thread_id} if event.source.thread_id else None
typing_task = asyncio.create_task(self._keep_typing(event.source.chat_id, metadata=_thread_metadata))
try: try:
# Call the handler (this can take a while with tool calls) # Call the handler (this can take a while with tool calls)
@ -711,7 +712,8 @@ class BasePlatformAdapter(ABC):
result = await self.send( result = await self.send(
chat_id=event.source.chat_id, chat_id=event.source.chat_id,
content=text_content, content=text_content,
reply_to=event.message_id reply_to=event.message_id,
metadata=_thread_metadata,
) )
# Log send failures (don't raise - user already saw tool progress) # Log send failures (don't raise - user already saw tool progress)
@ -721,7 +723,8 @@ class BasePlatformAdapter(ABC):
fallback_result = await self.send( fallback_result = await self.send(
chat_id=event.source.chat_id, chat_id=event.source.chat_id,
content=f"(Response formatting failed, plain text:)\n\n{text_content[:3500]}", content=f"(Response formatting failed, plain text:)\n\n{text_content[:3500]}",
reply_to=event.message_id reply_to=event.message_id,
metadata=_thread_metadata,
) )
if not fallback_result.success: if not fallback_result.success:
print(f"[{self.name}] Fallback send also failed: {fallback_result.error}") print(f"[{self.name}] Fallback send also failed: {fallback_result.error}")
@ -743,12 +746,14 @@ class BasePlatformAdapter(ABC):
chat_id=event.source.chat_id, chat_id=event.source.chat_id,
animation_url=image_url, animation_url=image_url,
caption=alt_text if alt_text else None, caption=alt_text if alt_text else None,
metadata=_thread_metadata,
) )
else: else:
img_result = await self.send_image( img_result = await self.send_image(
chat_id=event.source.chat_id, chat_id=event.source.chat_id,
image_url=image_url, image_url=image_url,
caption=alt_text if alt_text else None, caption=alt_text if alt_text else None,
metadata=_thread_metadata,
) )
if not img_result.success: if not img_result.success:
logger.error("[%s] Failed to send image: %s", self.name, img_result.error) logger.error("[%s] Failed to send image: %s", self.name, img_result.error)
@ -769,21 +774,25 @@ class BasePlatformAdapter(ABC):
media_result = await self.send_voice( media_result = await self.send_voice(
chat_id=event.source.chat_id, chat_id=event.source.chat_id,
audio_path=media_path, audio_path=media_path,
metadata=_thread_metadata,
) )
elif ext in _VIDEO_EXTS: elif ext in _VIDEO_EXTS:
media_result = await self.send_video( media_result = await self.send_video(
chat_id=event.source.chat_id, chat_id=event.source.chat_id,
video_path=media_path, video_path=media_path,
metadata=_thread_metadata,
) )
elif ext in _IMAGE_EXTS: elif ext in _IMAGE_EXTS:
media_result = await self.send_image_file( media_result = await self.send_image_file(
chat_id=event.source.chat_id, chat_id=event.source.chat_id,
image_path=media_path, image_path=media_path,
metadata=_thread_metadata,
) )
else: else:
media_result = await self.send_document( media_result = await self.send_document(
chat_id=event.source.chat_id, chat_id=event.source.chat_id,
file_path=media_path, file_path=media_path,
metadata=_thread_metadata,
) )
if not media_result.success: if not media_result.success:

8
gateway/run.py
View file

@ -2656,6 +2656,8 @@ class GatewayRunner:
# Background task to send progress messages # Background task to send progress messages
# Accumulates tool lines into a single message that gets edited # Accumulates tool lines into a single message that gets edited
_progress_metadata = {"thread_id": source.thread_id} if source.thread_id else None
async def send_progress_messages(): async def send_progress_messages():
if not progress_queue: if not progress_queue:
return return
@ -2685,15 +2687,15 @@ class GatewayRunner:
# Platform doesn't support editing — stop trying, # Platform doesn't support editing — stop trying,
# send just this new line as a separate message # send just this new line as a separate message
can_edit = False can_edit = False
await adapter.send(chat_id=source.chat_id, content=msg) await adapter.send(chat_id=source.chat_id, content=msg, metadata=_progress_metadata)
else: else:
if can_edit: if can_edit:
# First tool: send all accumulated text as new message # First tool: send all accumulated text as new message
full_text = "\n".join(progress_lines) full_text = "\n".join(progress_lines)
result = await adapter.send(chat_id=source.chat_id, content=full_text) result = await adapter.send(chat_id=source.chat_id, content=full_text, metadata=_progress_metadata)
else: else:
# Editing unsupported: send just this line # Editing unsupported: send just this line
result = await adapter.send(chat_id=source.chat_id, content=msg) result = await adapter.send(chat_id=source.chat_id, content=msg, metadata=_progress_metadata)
if result.success and result.message_id: if result.success and result.message_id:
progress_msg_id = result.message_id progress_msg_id = result.message_id