Skip to content

remote: Fix connecting to remote with running server failing #47203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Veykril merged 1 commit into from
Jan 20, 2026
Merged

remote: Fix connecting to remote with running server failing #47203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions crates/remote/src/remote_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,18 +442,20 @@ impl RemoteClient {
return Err(error);
}
Err(_) => {
let mut error =
"remote client did not become ready within the timeout".to_owned();
let mut error = String::new();
if let Some(status) = io_task.now_or_never() {
error.push_str("Client exited with ");
match status {
Ok(exit_code) => {
error.push_str(&format!(", exit_code={exit_code:?}"))
error.push_str(&format!(" exit_code {exit_code:?}"))
}
Err(e) => error.push_str(&format!(", error={e:?}")),
Err(e) => error.push_str(&format!(" error {e:?}")),
}
} else {
error.push_str("client did not become ready within the timeout");
}
let error = anyhow::anyhow!("{error}");
log::error!("failed to establish connection: {}", error);
log::error!("failed to establish connection: {error}");
return Err(error);
}
}
Expand Down
86 changes: 51 additions & 35 deletions crates/remote_server/src/unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,34 +578,34 @@ impl ServerPaths {

#[derive(Debug, Error)]
pub enum ExecuteProxyError {
#[error("Failed to init server paths")]
#[error("Failed to init server paths: {0:#}")]
ServerPath(#[from] ServerPathError),

#[error(transparent)]
ServerNotRunning(#[from] ProxyLaunchError),

#[error("Failed to check PidFile '{path}'")]
#[error("Failed to check PidFile '{path}': {source:#}")]
CheckPidFile {
#[source]
source: CheckPidError,
path: PathBuf,
},

#[error("Failed to kill existing server with pid '{pid}'")]
#[error("Failed to kill existing server with pid '{pid}': {source:#}")]
KillRunningServer {
#[source]
source: std::io::Error,
pid: u32,
},

#[error("failed to spawn server")]
#[error("failed to spawn server: {0:#}")]
SpawnServer(#[source] SpawnServerError),

#[error("stdin_task failed")]
#[error("stdin_task failed: {0:#}")]
StdinTask(#[source] anyhow::Error),
#[error("stdout_task failed")]
#[error("stdout_task failed: {0:#}")]
StdoutTask(#[source] anyhow::Error),
#[error("stderr_task failed")]
#[error("stderr_task failed: {0:#}")]
StderrTask(#[source] anyhow::Error),
}

Expand Down Expand Up @@ -657,50 +657,66 @@ pub(crate) fn execute_proxy(
Some(server_pid) => Ok(server_pid),
}
} else {
match server_pid {
Some(pid) => {
log::info!(
"proxy found server already running with PID {}. Killing process and cleaning up files...",
pid
);
kill_running_server(pid, &server_paths).await?;
Ok(pid)
}
None => {
spawn_server(&server_paths)
.await
.map_err(ExecuteProxyError::SpawnServer)?;
std::fs::read_to_string(&server_paths.pid_file)
.and_then(|contents| {
contents.parse::<u32>().map_err(|_| {
std::io::Error::new(
std::io::ErrorKind::InvalidData,
"Invalid PID file contents",
)
})
})
.map_err(SpawnServerError::ProcessStatus)
.map_err(ExecuteProxyError::SpawnServer)
}
if let Some(pid) = server_pid {
log::info!(
"proxy found server already running with PID {}. Killing process and cleaning up files...",
pid
);
kill_running_server(pid, &server_paths).await?;
}
spawn_server(&server_paths)
.await
.map_err(ExecuteProxyError::SpawnServer)?;
std::fs::read_to_string(&server_paths.pid_file)
.and_then(|contents| {
contents.parse::<u32>().map_err(|_| {
std::io::Error::new(
std::io::ErrorKind::InvalidData,
"Invalid PID file contents",
)
})
})
.map_err(SpawnServerError::ProcessStatus)
.map_err(ExecuteProxyError::SpawnServer)
}
})?;

let stdin_task = smol::spawn(async move {
let stdin = smol::Unblock::new(std::io::stdin());
let stream = smol::net::unix::UnixStream::connect(&server_paths.stdin_socket).await?;
let stream = smol::net::unix::UnixStream::connect(&server_paths.stdin_socket)
.await
.with_context(|| {
format!(
"Failed to connect to stdin socket {}",
server_paths.stdin_socket.display()
)
})?;
handle_io(stdin, stream, "stdin").await
});

let stdout_task: smol::Task<Result<()>> = smol::spawn(async move {
let stdout = smol::Unblock::new(std::io::stdout());
let stream = smol::net::unix::UnixStream::connect(&server_paths.stdout_socket).await?;
let stream = smol::net::unix::UnixStream::connect(&server_paths.stdout_socket)
.await
.with_context(|| {
format!(
"Failed to connect to stdout socket {}",
server_paths.stdout_socket.display()
)
})?;
handle_io(stream, stdout, "stdout").await
});

let stderr_task: smol::Task<Result<()>> = smol::spawn(async move {
let mut stderr = smol::Unblock::new(std::io::stderr());
let mut stream = smol::net::unix::UnixStream::connect(&server_paths.stderr_socket).await?;
let mut stream = smol::net::unix::UnixStream::connect(&server_paths.stderr_socket)
.await
.with_context(|| {
format!(
"Failed to connect to stderr socket {}",
server_paths.stderr_socket.display()
)
})?;
let mut stderr_buffer = vec![0; 2048];
loop {
match stream
Expand Down