Cherry-pick batch: Telegram adapter (44 commits)#1961
Merged
alexey-pelykh merged 54 commits intomainfrom Mar 24, 2026
Merged
Conversation
(cherry picked from commit 05a1b0c)
(cherry picked from commit 1b31ede)
(cherry picked from commit 1d99401)
(cherry picked from commit 2cd1a4b)
(cherry picked from commit 34a5523)
(cherry picked from commit 377be13)
(cherry picked from commit 3e8d9bc)
(cherry picked from commit 5197171)
(cherry picked from commit 5f78057)
(cherry picked from commit 60dc46a)
(cherry picked from commit 66aabf5)
(cherry picked from commit 833d0df)
(cherry picked from commit 9780e99)
(cherry picked from commit 9ecd189)
(cherry picked from commit a57c590)
(cherry picked from commit ba1d7b2)
(cherry picked from commit bc1cc2e)
(cherry picked from commit bd8ca6d)
(cherry picked from commit d78b7b3)
(cherry picked from commit d886ca6)
…enclaw#41932) Merged via squash. Prepared head SHA: 2f50c51 Co-authored-by: hougangdev <[email protected]> Co-authored-by: obviyus <[email protected]> Reviewed-by: @obviyus (cherry picked from commit e37e1ed)
(cherry picked from commit f201bad)
(cherry picked from commit fbdea7f)
(cherry picked from commit 0672156)
(cherry picked from commit 3cc1c7b)
* feat(telegram): auto-rename DM topics on first message fix(telegram): use bot.api for topic rename to avoid SecretRef resolution * fix(telegram): address security + test review feedback - Fix test assertion: DEFAULT_PROMPT_SUBSTRING matches 'very short' - Use RawBody instead of Body (no envelope metadata to LLM) - Truncate user message to 500 chars for LLM prompt - Remove user-derived content from verbose logs - Remove redundant threadSpec.id null check - Fix AutoTopicLabelParams type to match generateTopicLabel * fix(telegram): use effective dm auto-topic config * fix(telegram): detect direct auto-topic overrides * fix: auto-rename Telegram DM topics on first message (openclaw#51502) (thanks @Lukavyi) --------- Co-authored-by: Ayaan Zaidi <[email protected]> (cherry picked from commit 466debb)
(cherry picked from commit 55ad5d7)
(cherry picked from commit 5fb7a13)
(cherry picked from commit 60104de)
(cherry picked from commit 9a34a60)
(cherry picked from commit a516141)
(cherry picked from commit a4047bf)
) * fix: increase shutdown timeout to avoid SIGTERM hang * fix(telegram): abort polling fetch on shutdown to prevent SIGTERM hang * fix(gateway): enforce hard exit on shutdown timeout for SIGTERM * fix: tighten gateway shutdown watchdog * fix: harden gateway SIGTERM shutdown (openclaw#51242) (thanks @juliabush) --------- Co-authored-by: Ayaan Zaidi <[email protected]> (cherry picked from commit e94ebfa)
- Remove duplicate renameForumTopicTelegram function in send.ts - Restore tts.test.ts to fork version (upstream version has gutted pi-ai deps) Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
- monitor.test.ts: upstream version references tagTelegramNetworkError not in fork - send.test.ts: upstream version references missing test helpers and unexported functions Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
Use direct proxyTls spread instead of upstream's withPinnedLookup helper which was removed during fork restructuring. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
- Add missing GetReplyOptions/MsgContext imports to bot test - Fix warn parameter typing in draft-stream test Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
Upstream versions have deeply entangled barrel import paths that don't exist in the fork's restructured module layout. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
- Rename createNativeCommandTestParams -> createNativeCommandsHarness - Widen matchPluginCommand mock return type for test flexibility Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
Upstream harness refactoring changed return types incompatible with the test's existing assertions. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
The upstream refactoring of test helpers is incompatible with the fork's existing test patterns. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
Upstream version uses telegramDeps injection pattern not in fork. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
- Restore test files overwritten by upstream full-gate commit - Fix OpenClawConfig -> RemoteClawConfig in extension files - Fix barrel import paths in extension test files Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
- Remove setup/shared files that depend on upstream barrel exports - Move extension test files to src/telegram/ where their modules live - Restore channel.ts to fork version Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
- Restore types.plugin.ts to fork version (setup-wizard removed) - Remove normalize/status-issues tests (modules at extension paths) - Fix readonly array spread in allowed-updates test - Add explicit types for dm-access test callback parameters Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
Upstream version references vitest.channel-paths.mjs which doesn't exist in the fork. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
Upstream test changes reference infrastructure patterns (gateway injection, plugin runtime seams) not available in the fork. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
The upstream sendTelegramPayloadMessages refactor may have side effects on channel registration in tests. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
fa5950a to
31c586f
Compare
Upstream's symbol-based registry lookup breaks channel resolution in test isolation without the full gateway injection infrastructure. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick batch from upstream
Issue: #1872
Commits: 33 cherry-picked (28 PICK + 5 PARTIAL), 11 skipped/conflict
See issue for full commit list.
Closes #1872
🤖 Generated with Claude Code