Fix ghost project when selecting remote project group - #59272
Merged
Conversation
When selecting a project group that has a remote host (SSH, WSL, Docker) from the window project picker, or when closing/removing a workspace with a remote neighbor group, the code was unconditionally calling find_or_create_local_workspace. This created a local project with the remote server's paths, producing a 'ghost' project where language servers and file watchers fail trying to access paths that don't exist locally. Three locations fixed: 1. RecentProjectsDelegate::confirm (recent_projects.rs) - window project picker selecting a ProjectGroup entry. Routes to find_or_create_workspace with connect_with_modal for remote hosts. 2. MultiWorkspace::close_workspace (multi_workspace.rs) - closing a workspace whose neighboring group is remote. Falls through to the empty workspace fallback instead of creating a ghost project. 3. MultiWorkspace::remove_project_group (multi_workspace.rs) - removing a project group whose neighbor is remote. Same fallback. All three detect remoteness via key.host().is_some() and skip find_or_create_local_workspace when set. Includes regression tests for all three paths using mock remote connections.
Veykril
self-requested a review
June 15, 2026 06:53
Veykril
reviewed
Jun 15, 2026
Comment on lines
+1198
to
+1228
| if host.is_some() { | ||
| let modal_workspace = multi_workspace.workspace().clone(); | ||
| multi_workspace.find_or_create_workspace( | ||
| path_list, | ||
| host, | ||
| Some(key.clone()), | ||
| move |options, window, cx| { | ||
| connect_with_modal( | ||
| &modal_workspace, | ||
| options, | ||
| window, | ||
| cx, | ||
| ) | ||
| }, | ||
| &[], | ||
| None, | ||
| OpenMode::Activate, | ||
| window, | ||
| cx, | ||
| ) | ||
| } else { | ||
| multi_workspace.find_or_create_local_workspace( | ||
| path_list, | ||
| Some(key.clone()), | ||
| &[], | ||
| None, | ||
| OpenMode::Activate, | ||
| window, | ||
| cx, | ||
| ) | ||
| } |
Member
There was a problem hiding this comment.
I think this can just be
Suggested change
| if host.is_some() { | |
| let modal_workspace = multi_workspace.workspace().clone(); | |
| multi_workspace.find_or_create_workspace( | |
| path_list, | |
| host, | |
| Some(key.clone()), | |
| move |options, window, cx| { | |
| connect_with_modal( | |
| &modal_workspace, | |
| options, | |
| window, | |
| cx, | |
| ) | |
| }, | |
| &[], | |
| None, | |
| OpenMode::Activate, | |
| window, | |
| cx, | |
| ) | |
| } else { | |
| multi_workspace.find_or_create_local_workspace( | |
| path_list, | |
| Some(key.clone()), | |
| &[], | |
| None, | |
| OpenMode::Activate, | |
| window, | |
| cx, | |
| ) | |
| } | |
| let modal_workspace = multi_workspace.workspace().clone(); | |
| multi_workspace.find_or_create_workspace( | |
| path_list, | |
| host, | |
| Some(key.clone()), | |
| move |options, window, cx| { | |
| connect_with_modal( | |
| &modal_workspace, | |
| options, | |
| window, | |
| cx, | |
| ) | |
| }, | |
| &[], | |
| None, | |
| OpenMode::Activate, | |
| window, | |
| cx, | |
| ) |
Veykril
enabled auto-merge
June 15, 2026 08:48
Veykril
reviewed
Jun 15, 2026
5 tasks
This was referenced Jun 18, 2026
Closed
This was referenced Jul 1, 2026
This was referenced Jul 10, 2026
jolutz
pushed a commit
to jolutz/zed
that referenced
this pull request
Aug 8, 2026
…#59272) # Objective Fixes zed-industries#54882: When selecting a project group that has a remote host (SSH, WSL, Docker) from the window project picker, or when closing/removing a workspace with a remote neighbor group, the code was unconditionally calling find_or_create_local_workspace. This created a local project with the remote server's paths, producing a 'ghost' project where language servers and file watchers fail trying to access paths that don't exist locally. ## Solution Three locations fixed: 1. RecentProjectsDelegate::confirm (recent_projects.rs) - window project picker selecting a ProjectGroup entry. Routes to find_or_create_workspace with connect_with_modal for remote hosts. 2. MultiWorkspace::close_workspace (multi_workspace.rs) - closing a workspace whose neighboring group is remote. Falls through to the empty workspace fallback instead of creating a ghost project. 3. MultiWorkspace::remove_project_group (multi_workspace.rs) - removing a project group whose neighbor is remote. Same fallback. All three detect remoteness via key.host().is_some() and skip find_or_create_local_workspace when set. Includes regression tests for all three paths using mock remote connections. ## Testing - Not yet tested with a custom build - Unit tests added ## 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 adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable ## Showcase --- Release Notes: - Fixed ghost project appearing in the window project picker and sidebar when switching between local and remote projects. --------- Co-authored-by: Lukas Wirth <me@lukaswirth.dev>
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.
Objective
Fixes #54882:
When selecting a project group that has a remote host (SSH, WSL, Docker) from the window project picker, or when closing/removing a workspace with a remote neighbor group, the code was unconditionally calling find_or_create_local_workspace. This created a local project with the remote server's paths, producing a 'ghost' project where language servers and file watchers fail trying to access paths that don't exist locally.
Solution
Three locations fixed:
RecentProjectsDelegate::confirm (recent_projects.rs) - window project picker selecting a ProjectGroup entry. Routes to find_or_create_workspace with connect_with_modal for remote hosts.
MultiWorkspace::close_workspace (multi_workspace.rs) - closing a workspace whose neighboring group is remote. Falls through to the empty workspace fallback instead of creating a ghost project.
MultiWorkspace::remove_project_group (multi_workspace.rs) - removing a project group whose neighbor is remote. Same fallback.
All three detect remoteness via key.host().is_some() and skip find_or_create_local_workspace when set.
Includes regression tests for all three paths using mock remote connections.
Testing
Self-Review Checklist:
Showcase
Release Notes: