Skip to content

Cherry-pick f64d25bd3: scope DM topic thread keys by chat id#1441

Merged
alexey-pelykh merged 1 commit intomainfrom
cherry-pick/f64d25bd3-scope-dm-topic-thread-keys
Mar 15, 2026
Merged

Cherry-pick f64d25bd3: scope DM topic thread keys by chat id#1441
alexey-pelykh merged 1 commit intomainfrom
cherry-pick/f64d25bd3-scope-dm-topic-thread-keys

Conversation

@alexey-pelykh
Copy link
Copy Markdown

Cherry-pick of upstream f64d25bd3 — fix(telegram): scope DM topic thread keys by chat id (openclaw#31064)

Conflicts resolved

  • src/agents/tools/nodes-tool.test.tsgit rm (gutted layer)
  • src/telegram/accounts.ts — kept fork's RemoteClawConfig type name with upstream formatting
  • src/telegram/bot-handlers.ts — kept HEAD (removed resolveTelegramSessionState function, gutted model resolution layer); the DM thread key scoping fix applies via auto-merged files

Part of #676.

Cherry-picked-from: f64d25b

* fix(telegram): scope DM topic thread keys by chat id

* test(telegram): update dm topic session-key expectation

* fix(telegram): parse scoped dm thread ids in outbound recovery

* chore(telegram): format accounts config merge block

* test(nodes): simplify mocked exports for ts tuple spreads

(cherry picked from commit f64d25b)
@alexey-pelykh alexey-pelykh merged commit 630e8b7 into main Mar 15, 2026
7 checks passed
@alexey-pelykh alexey-pelykh deleted the cherry-pick/f64d25bd3-scope-dm-topic-thread-keys branch March 15, 2026 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants