Skip to content

fix: detect Tailscale for App Store CLI path and hung status checks #406

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

Closed
Dimillian wants to merge 2 commits into from
Closed

fix: detect Tailscale for App Store CLI path and hung status checks #406

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
143715e
Fix Tailscale detect handling for App Store CLI and hung checks
Dimillian Feb 11, 2026
0533d5e
Merge branch 'main' into codex/github-mention-detect-tailscale-fails-…
Dimillian Feb 11, 2026
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
52 changes: 36 additions & 16 deletions src-tauri/src/tailscale/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ use self::core as tailscale_core;

#[cfg(any(target_os = "android", target_os = "ios"))]
const UNSUPPORTED_MESSAGE: &str = "Tailscale integration is only available on desktop.";
const TAILSCALE_COMMAND_TIMEOUT: Duration = Duration::from_secs(12);

#[cfg(target_os = "macos")]
fn tailscale_command(binary: &OsStr) -> tokio::process::Command {
Expand Down Expand Up @@ -52,7 +53,7 @@ fn tailscale_binary_candidates() -> Vec<OsString> {
#[cfg(target_os = "macos")]
{
candidates.push(OsString::from(
"/Applications/Tailscale.app/Contents/MacOS/Tailscale",
"/Applications/Tailscale.app/Contents/MacOS/tailscale",
));
candidates.push(OsString::from("/opt/homebrew/bin/tailscale"));
candidates.push(OsString::from("/usr/local/bin/tailscale"));
Expand Down Expand Up @@ -81,7 +82,7 @@ fn tailscale_binary_candidates() -> Vec<OsString> {
fn missing_tailscale_message() -> String {
#[cfg(target_os = "macos")]
{
return "Tailscale CLI not found on PATH or standard install paths (including /Applications/Tailscale.app/Contents/MacOS/Tailscale).".to_string();
return "Tailscale CLI not found on PATH or standard install paths (including /Applications/Tailscale.app/Contents/MacOS/tailscale).".to_string();
}
#[cfg(not(target_os = "macos"))]
{
Expand All @@ -92,12 +93,15 @@ fn missing_tailscale_message() -> String {
async fn resolve_tailscale_binary() -> Result<Option<(OsString, Output)>, String> {
let mut failures: Vec<String> = Vec::new();
for binary in tailscale_binary_candidates() {
let output = tailscale_command(binary.as_os_str())
.arg("version")
.output()
.await;
let output = timeout(TAILSCALE_COMMAND_TIMEOUT, async {
tailscale_command(binary.as_os_str())
.arg("version")
.output()
.await
Comment on lines +96 to +100
Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Terminate tailscale child process when timeout elapses

resolve_tailscale_binary now wraps Command::output() in tokio::time::timeout, but when the deadline fires the future is dropped without killing/reaping the spawned process (Tokio Command defaults to kill_on_drop(false)), so a hung tailscale/launchctl invocation continues in the background even though this call returns; repeated checks can accumulate stray processes and eventually exhaust process slots. The same timeout pattern is also used in tailscale_status, so both call paths should explicitly kill/reap on timeout (or enable kill_on_drop(true)).

Useful? React with 👍 / 👎.

})
.await;
match output {
Ok(version_output) => {
Ok(Ok(version_output)) => {
if version_output.status.success() {
return Ok(Some((binary, version_output)));
}
Expand All @@ -114,8 +118,15 @@ async fn resolve_tailscale_binary() -> Result<Option<(OsString, Output)>, String
OsStr::new(&binary).to_string_lossy()
));
}
Err(err) if err.kind() == ErrorKind::NotFound => continue,
Err(err) => failures.push(format!("{}: {err}", OsStr::new(&binary).to_string_lossy())),
Ok(Err(err)) if err.kind() == ErrorKind::NotFound => continue,
Ok(Err(err)) => {
failures.push(format!("{}: {err}", OsStr::new(&binary).to_string_lossy()))
}
Err(_) => failures.push(format!(
"{}: tailscale version timed out after {}s",
OsStr::new(&binary).to_string_lossy(),
TAILSCALE_COMMAND_TIMEOUT.as_secs()
)),
}
}

Expand Down Expand Up @@ -343,12 +354,21 @@ pub(crate) async fn tailscale_status() -> Result<TailscaleStatus, String> {
let version = trim_to_non_empty(std::str::from_utf8(&version_output.stdout).ok())
.and_then(|raw| raw.lines().next().map(str::trim).map(str::to_string));

let status_output = tailscale_command(tailscale_binary.as_os_str())
.arg("status")
.arg("--json")
.output()
.await
.map_err(|err| format!("Failed to run tailscale status --json: {err}"))?;
let status_output = timeout(TAILSCALE_COMMAND_TIMEOUT, async {
tailscale_command(tailscale_binary.as_os_str())
.arg("status")
.arg("--json")
.output()
.await
})
.await
.map_err(|_| {
format!(
"tailscale status --json timed out after {}s",
TAILSCALE_COMMAND_TIMEOUT.as_secs()
)
})?
.map_err(|err| format!("Failed to run tailscale status --json: {err}"))?;

if !status_output.status.success() {
let stderr_text = trim_to_non_empty(std::str::from_utf8(&status_output.stderr).ok())
Expand Down Expand Up @@ -424,7 +444,7 @@ mod tests {
{
assert!(candidates.iter().any(|candidate| {
candidate.to_string_lossy()
== "/Applications/Tailscale.app/Contents/MacOS/Tailscale"
== "/Applications/Tailscale.app/Contents/MacOS/tailscale"
}));
}
}
Expand Down