remote: Reuse existing SSH ControlMaster sessions#51604
Merged
Veykril merged 3 commits intozed-industries:mainfrom Apr 21, 2026
Merged
remote: Reuse existing SSH ControlMaster sessions#51604Veykril merged 3 commits intozed-industries:mainfrom
Veykril merged 3 commits intozed-industries:mainfrom
Conversation
|
We require contributors to sign our Contributor License Agreement, and we don't have @nicosalm on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
Contributor
Author
|
@cla-bot check |
|
The cla-bot has been summoned, and re-checked this pull request! |
Veykril
approved these changes
Apr 21, 2026
Member
Veykril
left a comment
There was a problem hiding this comment.
Thanks, and sorry for the late review!
Member
|
Hey @nicosalm -- improvements like this make the DX better for everyone. Thanks for working on this and congratulations on your first contribution to Zed! 💖 |
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.
Closes #45271
Zed hardcodes
ControlMaster=yeswith aControlPathin a random temp directory, so it can never find a ControlMaster session the user already has open. This means you get prompted for credentials again even if you're already authenticated.This patch checks for an existing master before spawning a new one. It runs
ssh -Gto resolve the user's configuredcontrolpath(with%h,%p, etc. already expanded), thenssh -O checkto verify it's alive. If it is, Zed skips askpass and uses the existing socket. If not, the current behavior is unchanged. Both commands are local and don't hit the network.Also adds a
killed: AtomicBooltoSshRemoteConnectionbecausehas_been_killed()was usingmaster_process.is_none()as a proxy for "connection is dead." When reusing an external master,master_processstarts asNone, so the connection pool would discard it immediately.Tested against a university SSH setup with
ControlMaster autoconfigured. The reuse path connects without prompting, and the fallback path works normally when no master exists. Windows is unaffected.Release Notes: