From 6f4381b39d4400cac60ecd7328c05dcf09fbbc78 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Thu, 2 Oct 2025 16:49:05 +0200
Subject: [PATCH] remote(wsl): Execute commands on wsl without spawning a shell
 (#39357)

Closes https://github.com/zed-industries/zed/issues/39091

Release Notes:

- Fixed wsl connection failing if user's shell prints to stdout on
startup
---
 crates/remote/src/transport/wsl.rs | 40 ++++++++++++++++--------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/crates/remote/src/transport/wsl.rs b/crates/remote/src/transport/wsl.rs
index 2096c25fa461df723c837314072b55fda6b3c988..eed7a19d923772167da08a2e1a4ec2a8448f170e 100644
--- a/crates/remote/src/transport/wsl.rs
+++ b/crates/remote/src/transport/wsl.rs
@@ -473,6 +473,27 @@ async fn windows_path_to_wsl_path_impl(
     run_wsl_command_impl(options, "wslpath", &["-u", &source]).await
 }
 
+async fn run_wsl_command_impl(
+    options: &WslConnectionOptions,
+    program: &str,
+    args: &[&str],
+) -> Result<String> {
+    let output = wsl_command_impl(options, program, args).output().await?;
+
+    if !output.status.success() {
+        return Err(anyhow!(
+            "Command '{}' failed: {}",
+            program,
+            String::from_utf8_lossy(&output.stderr).trim()
+        ));
+    }
+
+    Ok(String::from_utf8_lossy(&output.stdout).trim().to_owned())
+}
+
+/// Creates a new `wsl.exe` command that runs the given program with the given arguments.
+///
+/// If `exec` is true, the command will be executed in the WSL environment without spawning a new shell.
 fn wsl_command_impl(
     options: &WslConnectionOptions,
     program: &str,
@@ -492,26 +513,9 @@ fn wsl_command_impl(
         .arg(&options.distro_name)
         .arg("--cd")
         .arg("~")
+        .arg("--exec")
         .arg(program)
         .args(args);
 
     command
 }
-
-async fn run_wsl_command_impl(
-    options: &WslConnectionOptions,
-    program: &str,
-    args: &[&str],
-) -> Result<String> {
-    let output = wsl_command_impl(options, program, args).output().await?;
-
-    if !output.status.success() {
-        return Err(anyhow!(
-            "Command '{}' failed: {}",
-            program,
-            String::from_utf8_lossy(&output.stderr).trim()
-        ));
-    }
-
-    Ok(String::from_utf8_lossy(&output.stdout).trim().to_string())
-}