From d055c1cad6b46bee80909d1feffc87be14598e00 Mon Sep 17 00:00:00 2001 From: Chris Yang <18487241+ysm-dev@users.noreply.github.com> Date: Wed, 18 Feb 2026 00:34:16 +0900 Subject: [PATCH] fix(desktop): avoid sidecar health-check timeout on shell startup (#13925) Co-authored-by: Brendan Allan --- packages/desktop/src-tauri/src/cli.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/desktop/src-tauri/src/cli.rs b/packages/desktop/src-tauri/src/cli.rs index 2b60120bb..8d02ba7d4 100644 --- a/packages/desktop/src-tauri/src/cli.rs +++ b/packages/desktop/src-tauri/src/cli.rs @@ -308,7 +308,7 @@ pub fn spawn_command( }; let mut cmd = Command::new(shell); - cmd.args(["-il", "-c", &line]); + cmd.args(["-l", "-c", &line]); for (key, value) in envs { cmd.env(key, value); @@ -363,6 +363,7 @@ pub fn spawn_command( } tokio::spawn(async move { + let mut kill_open = true; let status = loop { match child.try_wait() { Ok(Some(status)) => break Ok(status), @@ -371,8 +372,11 @@ pub fn spawn_command( } tokio::select! { - _ = kill_rx.recv() => { - let _ = child.start_kill(); + msg = kill_rx.recv(), if kill_open => { + if msg.is_some() { + let _ = child.start_kill(); + } + kill_open = false; } _ = tokio::time::sleep(Duration::from_millis(100)) => {} }