Skip to content

fix(telegram): normalize dm threads and retry control sends#10371

Closed
rahimsais wants to merge 1 commit into
NousResearch:mainfrom
rahimsais:fix/telegram-dm-thread-normalization
Closed

fix(telegram): normalize dm threads and retry control sends#10371
rahimsais wants to merge 1 commit into
NousResearch:mainfrom
rahimsais:fix/telegram-dm-thread-normalization

Conversation

@rahimsais

@rahimsais rahimsais commented Apr 15, 2026

Copy link
Copy Markdown
Contributor

Summary

  • drop spurious Telegram DM reply-chain thread ids unless Telegram marks the message as a real topic message
  • retry control sends once without message_thread_id on Message thread not found
  • stabilize approval callback coverage under the current auth gate

Problem

Telegram DMs can carry reply-chain message_thread_id values that are not valid send targets. Hermes then reuses them for control/UI sends and gets Message thread not found failures.

Test Plan

  • source venv/bin/activate && python -m pytest -q tests/gateway/test_dm_topics.py tests/gateway/test_telegram_approval_buttons.py tests/gateway/test_telegram_model_picker.py

Closes #3206

@alt-glitch alt-glitch added type/bug Something isn't working P1 High — major feature broken, no workaround platform/telegram Telegram bot adapter comp/gateway Gateway runner, session dispatch, delivery labels Apr 26, 2026
@alt-glitch alt-glitch mentioned this pull request May 2, 2026
Closed
@barronlroth barronlroth mentioned this pull request May 8, 2026
Closed
@teknium1 teknium1 mentioned this pull request May 10, 2026
Merged
teknium1 pushed a commit that referenced this pull request May 11, 2026
@rahimsais @teknium1
fix(telegram): normalize dm threads and retry control sends
737314f 
Cherry-picked from PR #10371. Two-layer defense for the spurious-thread_id
issue (#3206):

1. _build_message_event filters DM thread_ids: only preserve thread_id
   for real topic messages (is_topic_message=True). Telegram puts
   message_thread_id on every DM that is a reply, but reply-chain ids
   route to nonexistent threads on send.

2. _send_message_with_thread_fallback helper: control sends
   (send_update_prompt, send_exec_approval / send_slash_confirm,
   send_model_picker) retry once without message_thread_id when
   Telegram returns BadRequest 'Message thread not found'. Mirrors
   the pattern PR #3390 added for the streaming send path.

Salvage notes:
- Conflict 1 (line ~4099): merged the contributor's DM is_topic_message
  filter with the existing forum General-topic default from #22423,
  preserving both behaviors.
- Conflict 2 (line ~1664 / 1690): kept main's delete_message (PR #23416)
  alongside the new helper. Tightened the helper's exception catch
  from bare 'Exception' to use the existing _is_bad_request_error +
  _is_thread_not_found_error helpers (line 484-496) for consistency
  with the streaming send path.
- Widened the fix to send_update_prompt (was bare self._bot.send_message,
  same bug class).

Authored by rahimsais via PR #10371 (re-attributed from donrhmexe@
local commit author).
@teknium1

teknium1 commented May 11, 2026

Copy link
Copy Markdown
Contributor

Merged via salvage PR #23458 (#23458). Cherry-picked onto current main with authorship re-attributed to your GitHub account (the original commit was authored under a different name+email locally). During salvage we resolved a conflict in _build_message_event to keep BOTH your DM is_topic_message filter AND the existing General-topic forum default from #22423 (your rewrite would have regressed it), tightened the retry helper's exception catch to use the existing _is_bad_request_error + _is_thread_not_found_error helpers instead of bare Exception, and widened the fix to send_update_prompt which had the same bug class. Thanks for the two-layer fix!

@teknium1 teknium1 closed this May 11, 2026
JZKK720 pushed a commit to JZKK720/hermes-agent that referenced this pull request May 11, 2026
@rahimsais
fix(telegram): normalize dm threads and retry control sends
bc5bcf7 
Cherry-picked from PR NousResearch#10371. Two-layer defense for the spurious-thread_id
issue (NousResearch#3206):

1. _build_message_event filters DM thread_ids: only preserve thread_id
   for real topic messages (is_topic_message=True). Telegram puts
   message_thread_id on every DM that is a reply, but reply-chain ids
   route to nonexistent threads on send.

2. _send_message_with_thread_fallback helper: control sends
   (send_update_prompt, send_exec_approval / send_slash_confirm,
   send_model_picker) retry once without message_thread_id when
   Telegram returns BadRequest 'Message thread not found'. Mirrors
   the pattern PR NousResearch#3390 added for the streaming send path.

Salvage notes:
- Conflict 1 (line ~4099): merged the contributor's DM is_topic_message
  filter with the existing forum General-topic default from NousResearch#22423,
  preserving both behaviors.
- Conflict 2 (line ~1664 / 1690): kept main's delete_message (PR NousResearch#23416)
  alongside the new helper. Tightened the helper's exception catch
  from bare 'Exception' to use the existing _is_bad_request_error +
  _is_thread_not_found_error helpers (line 484-496) for consistency
  with the streaming send path.
- Widened the fix to send_update_prompt (was bare self._bot.send_message,
  same bug class).

Authored by rahimsais via PR NousResearch#10371 (re-attributed from donrhmexe@
local commit author).
rmulligan pushed a commit to rmulligan/hermes-agent that referenced this pull request May 11, 2026
@rahimsais
fix(telegram): normalize dm threads and retry control sends
3616bef 
Cherry-picked from PR NousResearch#10371. Two-layer defense for the spurious-thread_id
issue (NousResearch#3206):

1. _build_message_event filters DM thread_ids: only preserve thread_id
   for real topic messages (is_topic_message=True). Telegram puts
   message_thread_id on every DM that is a reply, but reply-chain ids
   route to nonexistent threads on send.

2. _send_message_with_thread_fallback helper: control sends
   (send_update_prompt, send_exec_approval / send_slash_confirm,
   send_model_picker) retry once without message_thread_id when
   Telegram returns BadRequest 'Message thread not found'. Mirrors
   the pattern PR NousResearch#3390 added for the streaming send path.

Salvage notes:
- Conflict 1 (line ~4099): merged the contributor's DM is_topic_message
  filter with the existing forum General-topic default from NousResearch#22423,
  preserving both behaviors.
- Conflict 2 (line ~1664 / 1690): kept main's delete_message (PR NousResearch#23416)
  alongside the new helper. Tightened the helper's exception catch
  from bare 'Exception' to use the existing _is_bad_request_error +
  _is_thread_not_found_error helpers (line 484-496) for consistency
  with the streaming send path.
- Widened the fix to send_update_prompt (was bare self._bot.send_message,
  same bug class).

Authored by rahimsais via PR NousResearch#10371 (re-attributed from donrhmexe@
local commit author).
JinyuID pushed a commit to JinyuID/hermes-agent that referenced this pull request May 11, 2026
@rahimsais @teknium1
fix(telegram): normalize dm threads and retry control sends
3ec924e 
Cherry-picked from PR NousResearch#10371. Two-layer defense for the spurious-thread_id
issue (NousResearch#3206):

1. _build_message_event filters DM thread_ids: only preserve thread_id
   for real topic messages (is_topic_message=True). Telegram puts
   message_thread_id on every DM that is a reply, but reply-chain ids
   route to nonexistent threads on send.

2. _send_message_with_thread_fallback helper: control sends
   (send_update_prompt, send_exec_approval / send_slash_confirm,
   send_model_picker) retry once without message_thread_id when
   Telegram returns BadRequest 'Message thread not found'. Mirrors
   the pattern PR NousResearch#3390 added for the streaming send path.

Salvage notes:
- Conflict 1 (line ~4099): merged the contributor's DM is_topic_message
  filter with the existing forum General-topic default from NousResearch#22423,
  preserving both behaviors.
- Conflict 2 (line ~1664 / 1690): kept main's delete_message (PR NousResearch#23416)
  alongside the new helper. Tightened the helper's exception catch
  from bare 'Exception' to use the existing _is_bad_request_error +
  _is_thread_not_found_error helpers (line 484-496) for consistency
  with the streaming send path.
- Widened the fix to send_update_prompt (was bare self._bot.send_message,
  same bug class).

Authored by rahimsais via PR NousResearch#10371 (re-attributed from donrhmexe@
local commit author).
02356abc pushed a commit to 02356abc/hermes-agent that referenced this pull request May 14, 2026
@rahimsais @teknium1
fix(telegram): normalize dm threads and retry control sends
7e55628 
Cherry-picked from PR NousResearch#10371. Two-layer defense for the spurious-thread_id
issue (NousResearch#3206):

1. _build_message_event filters DM thread_ids: only preserve thread_id
   for real topic messages (is_topic_message=True). Telegram puts
   message_thread_id on every DM that is a reply, but reply-chain ids
   route to nonexistent threads on send.

2. _send_message_with_thread_fallback helper: control sends
   (send_update_prompt, send_exec_approval / send_slash_confirm,
   send_model_picker) retry once without message_thread_id when
   Telegram returns BadRequest 'Message thread not found'. Mirrors
   the pattern PR NousResearch#3390 added for the streaming send path.

Salvage notes:
- Conflict 1 (line ~4099): merged the contributor's DM is_topic_message
  filter with the existing forum General-topic default from NousResearch#22423,
  preserving both behaviors.
- Conflict 2 (line ~1664 / 1690): kept main's delete_message (PR NousResearch#23416)
  alongside the new helper. Tightened the helper's exception catch
  from bare 'Exception' to use the existing _is_bad_request_error +
  _is_thread_not_found_error helpers (line 484-496) for consistency
  with the streaming send path.
- Widened the fix to send_update_prompt (was bare self._bot.send_message,
  same bug class).

Authored by rahimsais via PR NousResearch#10371 (re-attributed from donrhmexe@
local commit author).
jsboige pushed a commit to jsboige/hermes-agent that referenced this pull request May 14, 2026
@rahimsais @teknium1
fix(telegram): normalize dm threads and retry control sends
1e8016f 
Cherry-picked from PR NousResearch#10371. Two-layer defense for the spurious-thread_id
issue (NousResearch#3206):

1. _build_message_event filters DM thread_ids: only preserve thread_id
   for real topic messages (is_topic_message=True). Telegram puts
   message_thread_id on every DM that is a reply, but reply-chain ids
   route to nonexistent threads on send.

2. _send_message_with_thread_fallback helper: control sends
   (send_update_prompt, send_exec_approval / send_slash_confirm,
   send_model_picker) retry once without message_thread_id when
   Telegram returns BadRequest 'Message thread not found'. Mirrors
   the pattern PR NousResearch#3390 added for the streaming send path.

Salvage notes:
- Conflict 1 (line ~4099): merged the contributor's DM is_topic_message
  filter with the existing forum General-topic default from NousResearch#22423,
  preserving both behaviors.
- Conflict 2 (line ~1664 / 1690): kept main's delete_message (PR NousResearch#23416)
  alongside the new helper. Tightened the helper's exception catch
  from bare 'Exception' to use the existing _is_bad_request_error +
  _is_thread_not_found_error helpers (line 484-496) for consistency
  with the streaming send path.
- Widened the fix to send_update_prompt (was bare self._bot.send_message,
  same bug class).

Authored by rahimsais via PR NousResearch#10371 (re-attributed from donrhmexe@
local commit author).
AlexFoxD pushed a commit to AlexFoxD/hermes-agent that referenced this pull request May 21, 2026
@rahimsais @AlexFoxD
fix(telegram): normalize dm threads and retry control sends
f7c5463 
Cherry-picked from PR NousResearch#10371. Two-layer defense for the spurious-thread_id
issue (NousResearch#3206):

1. _build_message_event filters DM thread_ids: only preserve thread_id
   for real topic messages (is_topic_message=True). Telegram puts
   message_thread_id on every DM that is a reply, but reply-chain ids
   route to nonexistent threads on send.

2. _send_message_with_thread_fallback helper: control sends
   (send_update_prompt, send_exec_approval / send_slash_confirm,
   send_model_picker) retry once without message_thread_id when
   Telegram returns BadRequest 'Message thread not found'. Mirrors
   the pattern PR NousResearch#3390 added for the streaming send path.

Salvage notes:
- Conflict 1 (line ~4099): merged the contributor's DM is_topic_message
  filter with the existing forum General-topic default from NousResearch#22423,
  preserving both behaviors.
- Conflict 2 (line ~1664 / 1690): kept main's delete_message (PR NousResearch#23416)
  alongside the new helper. Tightened the helper's exception catch
  from bare 'Exception' to use the existing _is_bad_request_error +
  _is_thread_not_found_error helpers (line 484-496) for consistency
  with the streaming send path.
- Widened the fix to send_update_prompt (was bare self._bot.send_message,
  same bug class).

Authored by rahimsais via PR NousResearch#10371 (re-attributed from donrhmexe@
local commit author).
gweeteve pushed a commit to gweeteve/hermes-agent that referenced this pull request Jun 2, 2026
@rahimsais @teknium1
fix(telegram): normalize dm threads and retry control sends
247d5ef 
Cherry-picked from PR NousResearch#10371. Two-layer defense for the spurious-thread_id
issue (NousResearch#3206):

1. _build_message_event filters DM thread_ids: only preserve thread_id
   for real topic messages (is_topic_message=True). Telegram puts
   message_thread_id on every DM that is a reply, but reply-chain ids
   route to nonexistent threads on send.

2. _send_message_with_thread_fallback helper: control sends
   (send_update_prompt, send_exec_approval / send_slash_confirm,
   send_model_picker) retry once without message_thread_id when
   Telegram returns BadRequest 'Message thread not found'. Mirrors
   the pattern PR NousResearch#3390 added for the streaming send path.

Salvage notes:
- Conflict 1 (line ~4099): merged the contributor's DM is_topic_message
  filter with the existing forum General-topic default from NousResearch#22423,
  preserving both behaviors.
- Conflict 2 (line ~1664 / 1690): kept main's delete_message (PR NousResearch#23416)
  alongside the new helper. Tightened the helper's exception catch
  from bare 'Exception' to use the existing _is_bad_request_error +
  _is_thread_not_found_error helpers (line 484-496) for consistency
  with the streaming send path.
- Widened the fix to send_update_prompt (was bare self._bot.send_message,
  same bug class).

Authored by rahimsais via PR NousResearch#10371 (re-attributed from donrhmexe@
local commit author).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

comp/gateway Gateway runner, session dispatch, delivery P1 High — major feature broken, no workaround platform/telegram Telegram bot adapter type/bug Something isn't working

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Bug]: Telegram DM sends fail with 'Message thread not found' — spurious thread_id from reply chains

4 participants

@rahimsais @teknium1 @alt-glitch @donrhmexe