Merged
Conversation
cla-bot
Bot
added
the
cla-signed
zed-community-bot
Bot
added
the
staff
zed-zippy
Bot
added
the
PR state:needs review
benbrandt
approved these changes
Apr 15, 2026
MrSubidubi
removed
the
PR state:needs review
5 tasks
bennetbo
added a commit
that referenced
this pull request
Apr 16, 2026
Follow up to #53999 Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Closes #ISSUE Release Notes: - N/A
Member
Author
|
/cherry-pick preview |
github-actions Bot
pushed a commit
that referenced
this pull request
Apr 16, 2026
Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - N/A
5 tasks
18 tasks
eholk
pushed a commit
that referenced
this pull request
Apr 16, 2026
Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - N/A
eholk
pushed a commit
that referenced
this pull request
Apr 16, 2026
Follow up to #53999 Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Closes #ISSUE Release Notes: - N/A
eholk
added a commit
that referenced
this pull request
Apr 16, 2026
We're doing another preview release today to get our latest parallel agents features out there. This PR is a rollup of all the changes we need to cherry pick. - [x] 7a26e48 from #54081 - [x] #54066 - [x] #53992 - [x] #54079 - [x] #54057 - [x] #54056 - [x] #54052 - [x] #53999 - [x] #54009 - [x] #53539 (already cherry picked as 25e02cb) - [x] #54070 - [x] #54053 - fix `run_tests.yml`: 67e92b5 - [x] #53979 - [x] #53884 - [x] #54067 - [x] #54014 (already on branch) - [x] #54030 (already on branch) - [x] #54094 Release Notes: - N/A --------- Co-authored-by: Lukas Wirth <me@lukaswirth.dev> Co-authored-by: Bennet Bo Fenner <bennet@zed.dev> Co-authored-by: Nathan Sobo <nathan@zed.dev> Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com> Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de> Co-authored-by: Danilo Leal <67129314+danilo-leal@users.noreply.github.com> Co-authored-by: Neel <neel@zed.dev> Co-authored-by: Richard Feldman <richard@zed.dev>
G36maid
pushed a commit
to G36maid/zed
that referenced
this pull request
Apr 29, 2026
Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - N/A
G36maid
pushed a commit
to G36maid/zed
that referenced
this pull request
Apr 29, 2026
Follow up to zed-industries#53999 Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Closes #ISSUE Release Notes: - N/A
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
3 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.
Adds ref-counting to native agent sessions. This ensures that we do not drop the session when
close_connectionis called in the case where there are still otherConversationView's holding a reference toAcpThread.Also guards against a race condition on load, by relying on a shared task and storing loading sessions inside
pending_sessions: HashMap<acp::SessionId, PendingSession>>Self-Review Checklist:
Release Notes: