Skip to content

sidebar: Better handling for threads in remote workspaces#53451

Merged
eholk merged 19 commits intomainfrom
remote-sidebar
Apr 9, 2026
Merged

sidebar: Better handling for threads in remote workspaces#53451
eholk merged 19 commits intomainfrom
remote-sidebar

Conversation

@eholk
Copy link
Copy Markdown
Contributor

@eholk eholk commented Apr 8, 2026

This PR greatly improves our handling of remote threads in the sidebar.

One primary issue was that many parts of the sidebar were only looking at a thread's path list and not its remote connection information. The fix here is to use ProjectGroupKey more consistently throughout the sidebar which also includes remote connection information.

The second major change is to extend the MultiWorkspace with the ability to initiate the creation of remote workspaces when needed. This involved refactoring a lot of our remote workspace creation paths to share a single code path for better consistency.

Release Notes:

  • (Preview only) Fixed remote project threads appearing as a separate local project in the sidebar

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Apr 8, 2026
@zed-community-bot zed-community-bot bot added the staff Pull requests authored by a current member of Zed staff label Apr 8, 2026
@eholk eholk changed the title sidebar: Use ProjectGroupKey consistently for remote project awareness sidebar: Better handling for threads in remote workspaces Apr 9, 2026
@eholk eholk marked this pull request as ready for review April 9, 2026 05:59
@eholk eholk enabled auto-merge (squash) April 9, 2026 06:51
@eholk eholk merged commit d812adc into main Apr 9, 2026
32 checks passed
@eholk eholk deleted the remote-sidebar branch April 9, 2026 06:56
@rtfeldman
Copy link
Copy Markdown
Contributor

/cherry-pick preview

@zed-zippy
Copy link
Copy Markdown
Contributor

zed-zippy bot commented Apr 9, 2026

🍒💥 Cherry-pick did not succeed
https://github.com/zed-industries/zed/actions/runs/24213909747

rtfeldman pushed a commit that referenced this pull request Apr 10, 2026
This PR greatly improves our handling of remote threads in the sidebar.

One primary issue was that many parts of the sidebar were only looking
at a thread's path list and not its remote connection information. The
fix here is to use `ProjectGroupKey` more consistently throughout the
sidebar which also includes remote connection information.

The second major change is to extend the MultiWorkspace with the ability
to initiate the creation of remote workspaces when needed. This involved
refactoring a lot of our remote workspace creation paths to share a
single code path for better consistency.

Release Notes:

- (Preview only) Fixed remote project threads appearing as a separate
local project in the sidebar

---------

Co-authored-by: Anthony Eid <anthony@zed.dev>
Co-authored-by: Anthony Eid <hello@anthonyeid.me>
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
maxbrunsfeld added a commit that referenced this pull request Apr 10, 2026
Cherry-picked PRs (in order applied):

1. #53386
2. #53400
3. #53396
4. #53428
5. #53356
6. #53215
7. #53429
8. #53458
9. #53436
10. #53451
11. #53454
12. #53419
13. #53287
14. #53521
15. #53463
16. #52848
17. #53544
18. #53556
19. #53566
20. #53579
21. #53575
22. #53550
23. #53585
24. #53510
25. #53599
26. #53099
27. #53662
28. #53660
29. #53657
30. #53654


Release Notes:

- N/A

---------

Co-authored-by: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>
Co-authored-by: Bennet Bo Fenner <bennet@zed.dev>
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Anthony Eid <anthony@zed.dev>
Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
Co-authored-by: Eric Holk <eric@zed.dev>
Co-authored-by: Anthony Eid <hello@anthonyeid.me>
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-authored-by: Cameron Mcloughlin <cameron.studdstreet@gmail.com>
Co-authored-by: Cole Miller <cole@zed.dev>
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
Co-authored-by: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>
Co-authored-by: Katie Geer <katie@zed.dev>
Co-authored-by: ojpro <contact@ojpro.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants