cherry-pick(main): CodeAgent explicit termination and silent recovery (#3969) onto main - #3976
Merged
Merged
Conversation
* fix(agent): enforce explicit CodeAgent termination * fix(test): restore CodeAgent CI compatibility
jeffwu-1999
requested review from
Dallas98,
WMC001,
YehongPan and
hhhhsc701
as code owners
September 20, 2026 13:37
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
2 participants
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.
Summary
Cherry-pick #3969 (
[fix] enforce explicit CodeAgent termination and silent recovery) ontomain.PR #3971 was squash-merged into main, so the original hotfix commits were not preserved in main history. When #3969 landed on
hotfix/v2.6.1afterwards, PR #3974 shows massive conflicts against main (11 commits, 4 conflicting files). This PR cherry-picks only the new commit10b38b9donto current main HEAD (bd54eea2d) — zero conflicts, since main tree atbd54eea2dis identical to the hotfix base.Changes
Notes
hotfix/v2.6.1branch should not be merged into main again (squash-merge history mismatch)