Skip to content

Cherry-pick batch: Discord adapter (1/2) — 22 of 50 commits (#1922)#2017

Open
alexey-pelykh wants to merge 22 commits intomainfrom
staging/cherry-pick-1922
Open

Cherry-pick batch: Discord adapter (1/2) — 22 of 50 commits (#1922)#2017
alexey-pelykh wants to merge 22 commits intomainfrom
staging/cherry-pick-1922

Conversation

@alexey-pelykh
Copy link
Copy Markdown

Cherry-pick batch from upstream

Issue: #1922
Commits: 22 cherry-picked of 50 total (28 blocked by prerequisite issues)

Results

Result Count Details
PICKED/RESOLVED 22 Successfully cherry-picked with conflict resolution
CONFLICT 26 Blocked — depend on prerequisite cherry-pick batches
SKIPPED 2 Empty (already applied) or convergent

Resolved commits (22)

  1. 0743368013 fix(test): split discord monitor agent components
  2. 0bf11c1d69 Tests: guard channel setup import seams
  3. 14d6b762fb build: remove ineffective dynamic import shims
  4. 1c08455848 Discord: dedupe message action discovery state
  5. 1df78202b9 refactor: share approval gateway client setup
  6. 23deb3da98 refactor(discord): share native command plugin test setup
  7. 326c660775 fix: restore discord runtime api exports after rebase
  8. 36a59d5c79 fix(discord): drop stale carbon deploy option
  9. 387d9fa7c4 refactor(setup): reuse patched adapters in discord and signal
  10. 59bcc9ee46 Discord: advertise shared interactive support
  11. 7178a0d3cb fix: normalize discord commands allowFrom auth
  12. 4c9f411f6d test(discord): stabilize tool-result reply tests
  13. 6805a80da2 Tests: lock plugin slash commands to one runtime graph
  14. 7ab074631b refactor(setup): share allowlist wizard proxies
  15. 829ea70519 fix: remove duplicate setup helper imports
  16. 2c919078e1 refactor: share memory and discord singleton state
  17. 68170f99ac test: tighten discord monitor regression assertions
  18. 73ca53ee02 fix: remove discord setup rebase marker
  19. 79a8905fa4 Channels: centralize group policy contracts
  20. 80e9737db4 test: align discord action expectation
  21. 82508e3931 test(extensions): add discord and telegram coverage
  22. 8a111f1cb9 test: harden discord monitor regression assertions

Blocked commits (26)

These depend on prerequisite cherry-pick batches that haven't landed yet. The cherry-picked files reference modules/types from prerequisite infrastructure. All 470 type errors are in NEW files from this batch, not in existing fork code.

CI expectation

CI will fail (tsgo) because cherry-picked files import from modules that don't exist yet on the fork. These modules come from prerequisite cherry-pick issues. Once those land, the type errors will resolve.

See issue for full commit list.

Closes #1922

🤖 Generated with Claude Code

vincentkoc and others added 22 commits March 27, 2026 18:21
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.

Cherry-pick (blocked): Discord adapter (1/2) (50 commits)

5 participants