Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.
Rust agentai-agentapplecomputer-usecomputer-use-agentcontainerizationcuadesktop-automationhacktoberfestlumemacosmanusoperatorswiftvirtualizationvirtualization-frameworkwindowswindows-sandbox
refactor(cua-driver): fold duplicate daemon launch and socket-release wait paths (#5894)
injaneitye203842bf64a
diff --git a/libs/cua-driver/rust/crates/cua-driver/src/cli.rs b/libs/cua-driver/rust/crates/cua-driver/src/cli.rsindex 4098709288..252afc8186 100644--- a/libs/cua-driver/rust/crates/cua-driver/src/cli.rs+++ b/libs/cua-driver/rust/crates/cua-driver/src/cli.rs@@ -1409,7 +1409,6 @@ impl std::fmt::Display for LaunchDaemonError {impl std::error::Error for LaunchDaemonError {}-#[cfg(target_os = "macos")]pub fn launch_daemon_and_wait(socket_path: &str,timeout_secs: u64,@@ -1431,6 +1430,20 @@ pub fn launch_daemon_and_wait()}+fn wait_for_daemon_listening(socket_path: &str, timeout_secs: u64) -> bool {+ use std::time::{Duration, Instant};++ // 100ms tick matches Swift's `usleep(100_000)`.+ let deadline = Instant::now() + Duration::from_secs(timeout_secs);+ while Instant::now() < deadline {+ if crate::serve::is_daemon_listening(socket_path) {+ return true;+ }+ std::thread::sleep(Duration::from_millis(100));+ }+ false+}+#[cfg(target_os = "macos")]fn launch_daemon_with_state_and_wait(socket_path: &str,@@ -1440,7 +1453,6 @@ fn launch_daemon_with_state_and_wait(_allow_managed_restart: bool,) -> Result<(), LaunchDaemonError> {use std::process::{Command as Cmd, Stdio};- use std::time::{Duration, Instant};// Forward `--socket <path>` to the relaunched daemon when the caller// passed a non-default socket via `cua-driver mcp --socket /path`.@@ -1503,13 +1515,8 @@ fn launch_daemon_with_state_and_wait(}// Poll the UDS until the daemon answers a probe or we time out.- // 100ms tick matches Swift's `usleep(100_000)`.- let deadline = Instant::now() + Duration::from_secs(timeout_secs);- while Instant::now() < deadline {- if crate::serve::is_daemon_listening(socket_path) {- return Ok(());- }- std::thread::sleep(Duration::from_millis(100));+ if wait_for_daemon_listening(socket_path, timeout_secs) {+ return Ok(());}Err(LaunchDaemonError {@@ -1522,28 +1529,6 @@ fn launch_daemon_with_state_and_wait(})}-#[cfg(not(target_os = "macos"))]-pub fn launch_daemon_and_wait(- socket_path: &str,- timeout_secs: u64,- claude_code_compat: bool,- grants: &[String],- experimental_history: bool,-) -> Result<(), LaunchDaemonError> {- let state = crate::history_runtime::DaemonLaunchState {- claude_code_compat,- grants: grants.to_vec(),- ..Default::default()- };- launch_daemon_with_state_and_wait(- socket_path,- timeout_secs,- &state,- experimental_history,- true,- )-}-#[cfg(not(target_os = "macos"))]fn launch_daemon_with_state_and_wait(socket_path: &str,@@ -1552,8 +1537,6 @@ fn launch_daemon_with_state_and_wait(experimental_history: bool,allow_managed_restart: bool,) -> Result<(), LaunchDaemonError> {- use std::time::{Duration, Instant};-let executable = std::env::current_exe().map_err(|error| LaunchDaemonError {kind: LaunchDaemonErrorKind::Failed,message: format!("current Cua Driver executable is unavailable: {error}"),@@ -1584,12 +1567,8 @@ fn launch_daemon_with_state_and_wait(spawn_detached_windows_daemon(&executable, &arguments)?;}- let deadline = Instant::now() + Duration::from_secs(timeout_secs);- while Instant::now() < deadline {- if crate::serve::is_daemon_listening(socket_path) {- return Ok(());- }- std::thread::sleep(Duration::from_millis(100));+ if wait_for_daemon_listening(socket_path, timeout_secs) {+ return Ok(());}Err(LaunchDaemonError {kind: LaunchDaemonErrorKind::Timeout,@@ -1870,7 +1849,7 @@ where);}#[cfg(target_os = "macos")]- {+ let experimental_history = {let app_name = crate::bundle::app_name();eprintln!("{}: mcp launched without {app_name}.app's TCC grants; \@@ -1878,29 +1857,10 @@ whereand proxying MCP requests through it.",crate::bundle::cli_name());- if let Err(error) = launch_daemon_and_wait(- &socket_path,- 10,- claude_code_compat,- grants,- crate::history_runtime::preview_admitted_preference(),- ) {- if let Some(on_startup) = on_startup.take() {- on_startup(- if error.kind == LaunchDaemonErrorKind::Timeout {- McpDaemonStartup::LaunchTimeout- } else {- McpDaemonStartup::LaunchFailed- },- false,- );- }- return Err(error.into());- }- daemon = McpDaemonStartup::Launched;- }+ crate::history_runtime::preview_admitted_preference()+ };#[cfg(not(target_os = "macos"))]- {+ let experimental_history = {if !crate::history_runtime::preview_admitted_preference() {if let Some(on_startup) = on_startup.take() {on_startup(McpDaemonStartup::UnsupportedRelaunch, false);@@ -1913,23 +1873,28 @@ whereThen re-run `cua-driver mcp`.");}- if let Err(error) =- launch_daemon_and_wait(&socket_path, 10, claude_code_compat, grants, true)- {- if let Some(on_startup) = on_startup.take() {- on_startup(- if error.kind == LaunchDaemonErrorKind::Timeout {- McpDaemonStartup::LaunchTimeout- } else {- McpDaemonStartup::LaunchFailed- },- false,- );- }- return Err(error.into());+ true+ };+ if let Err(error) = launch_daemon_and_wait(+ &socket_path,+ 10,+ claude_code_compat,+ grants,+ experimental_history,+ ) {+ if let Some(on_startup) = on_startup.take() {+ on_startup(+ if error.kind == LaunchDaemonErrorKind::Timeout {+ McpDaemonStartup::LaunchTimeout+ } else {+ McpDaemonStartup::LaunchFailed+ },+ false,+ );}- daemon = McpDaemonStartup::Launched;+ return Err(error.into());}+ daemon = McpDaemonStartup::Launched;}if let Some(on_startup) = on_startup.take() {@@ -5499,6 +5464,15 @@ fn first_sentence(text: &str) -> String {#[cfg(test)]mod tests {+ #[test]+ fn wait_for_daemon_listening_zero_timeout_returns_false() {+ let directory = tempfile::tempdir().unwrap();+ let socket = directory.path().join("missing.sock");+ assert!(!super::wait_for_daemon_listening(+ socket.to_str().unwrap(),+ 0+ ));+ }#[test]fn cli_docs_json_examples_cover_every_command() {diff --git a/libs/cua-driver/rust/crates/cua-driver/src/serve.rs b/libs/cua-driver/rust/crates/cua-driver/src/serve.rsindex fce88c4fd7..919bfbc9e6 100644--- a/libs/cua-driver/rust/crates/cua-driver/src/serve.rs+++ b/libs/cua-driver/rust/crates/cua-driver/src/serve.rs@@ -2317,28 +2317,7 @@ pub fn run_stop_cmd(socket_path: &str) {client_kind: None,};match send_request(socket_path, &req) {- Ok(_) => {- // Poll until daemon stops responding (up to 2 seconds).- let deadline = std::time::Instant::now() + std::time::Duration::from_secs(2);- loop {- // On Windows the pipe path isn't a filesystem file; probe liveness instead.- let gone = if std::path::Path::new(socket_path).exists() {- false- } else {- !is_daemon_listening(socket_path)- };- if gone {- // Swift's `stop` exits silently on success (no stdout- // line) — match that for byte-for-byte parity.- return;- }- if std::time::Instant::now() >= deadline {- eprintln!("Cua Driver daemon did not release socket within 2s");- std::process::exit(1);- }- std::thread::sleep(std::time::Duration::from_millis(50));- }- }+ Ok(_) => wait_for_release(socket_path),Err(e) => {eprintln!("stop: {e}");std::process::exit(1);@@ -2346,6 +2325,29 @@ pub fn run_stop_cmd(socket_path: &str) {}}+/// Poll until the daemon stops responding (up to 2 seconds); exit 1 otherwise.+pub(crate) fn wait_for_release(socket_path: &str) {+ let deadline = std::time::Instant::now() + std::time::Duration::from_secs(2);+ loop {+ // On Windows the pipe path isn't a filesystem file; probe liveness instead.+ let gone = if std::path::Path::new(socket_path).exists() {+ false+ } else {+ !is_daemon_listening(socket_path)+ };+ if gone {+ // Swift's `stop` exits silently on success (no stdout+ // line) — match that for byte-for-byte parity.+ return;+ }+ if std::time::Instant::now() >= deadline {+ eprintln!("Cua Driver daemon did not release socket within 2s");+ std::process::exit(1);+ }+ std::thread::sleep(std::time::Duration::from_millis(50));+ }+}+/// `cua-driver status` implementation.pub fn run_status_cmd(socket_path: &str, pid_file_path: &str) {if is_daemon_listening(socket_path) {@@ -2545,6 +2547,13 @@ pub fn run_revoke_cmd(socket_path: &str, session: Option<&str>, all: bool) {#[cfg(all(test, unix))]mod socket_tests {+ #[test]+ fn wait_for_release_accepts_an_absent_socket() {+ let directory = tempfile::tempdir().unwrap();+ let socket = directory.path().join("absent.sock");+ super::wait_for_release(socket.to_str().unwrap());+ }+use super::{remove_owned_socket, secure_local_socket, socket_identity};use std::os::unix::fs::PermissionsExt as _;diff --git a/libs/cua-driver/rust/crates/cua-driver/src/stop.rs b/libs/cua-driver/rust/crates/cua-driver/src/stop.rsindex 214be2a05e..9cdec1ef98 100644--- a/libs/cua-driver/rust/crates/cua-driver/src/stop.rs+++ b/libs/cua-driver/rust/crates/cua-driver/src/stop.rs@@ -29,20 +29,5 @@ pub fn run_pid_bound_stop_cmd(socket_path: &str, expected_pid: u32) {std::process::exit(1);}- let deadline = std::time::Instant::now() + std::time::Duration::from_secs(2);- loop {- let gone = if std::path::Path::new(socket_path).exists() {- false- } else {- !crate::serve::is_daemon_listening(socket_path)- };- if gone {- return;- }- if std::time::Instant::now() >= deadline {- eprintln!("Cua Driver daemon did not release socket within 2s");- std::process::exit(1);- }- std::thread::sleep(std::time::Duration::from_millis(50));- }+ crate::serve::wait_for_release(socket_path);}