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
fix(cua-driver): exit 64 for cua-driver extension usage errors (#4959)
Metanc3cd340d7a81
diff --git a/libs/cua-driver/rust/crates/cua-driver/src/extension_manager.rs b/libs/cua-driver/rust/crates/cua-driver/src/extension_manager.rsindex ca7813e080..7f0fb845b3 100644--- a/libs/cua-driver/rust/crates/cua-driver/src/extension_manager.rs+++ b/libs/cua-driver/rust/crates/cua-driver/src/extension_manager.rs@@ -620,7 +620,14 @@ fn sync_cap_dir(dir: &Dir) -> Result<()> {}pub fn run(args: &[String]) {- if let Err(error) = run_inner(args) {+ let parsed = match parse_command(args) {+ Ok(parsed) => parsed,+ Err(error) => {+ eprintln!("cua-driver extension: {error:#}");+ std::process::exit(64);+ }+ };+ if let Err(error) = run_inner(&parsed) {eprintln!("cua-driver extension: {error:#}");std::process::exit(1);}@@ -813,8 +820,7 @@ fn install_review(}}-fn run_inner(args: &[String]) -> Result<()> {- let parsed = parse_command(args)?;+fn run_inner(parsed: &ParsedCommand) -> Result<()> {let subcommand = parsed.subcommand.as_str();let id = parsed.id.as_deref();let json = parsed.json;@@ -830,7 +836,7 @@ fn run_inner(args: &[String]) -> Result<()> {),"inspect" => {let entry = registry_entry(required_id(id, "inspect")?)?;- let source = resolve_install_source(entry, &parsed, &store)?;+ let source = resolve_install_source(entry, parsed, &store)?;let inspected = inspect_without_mutation(entry, &source)?;print_preview(&install_review(@@ -850,7 +856,7 @@ fn run_inner(args: &[String]) -> Result<()> {"install" | "update" => {let id = required_id(id, subcommand)?;let entry = registry_entry(id)?;- let source = resolve_install_source(entry, &parsed, &store)?;+ let source = resolve_install_source(entry, parsed, &store)?;let inspected = inspect_without_mutation(entry, &source)?;let request = if subcommand == "update" {InstallReviewRequest::CliUpdatediff --git a/libs/cua-driver/rust/crates/cua-driver/tests/extension_manager_cli_test.rs b/libs/cua-driver/rust/crates/cua-driver/tests/extension_manager_cli_test.rsindex b4043b6c5e..7f391486c8 100644--- a/libs/cua-driver/rust/crates/cua-driver/tests/extension_manager_cli_test.rs+++ b/libs/cua-driver/rust/crates/cua-driver/tests/extension_manager_cli_test.rs@@ -490,27 +490,59 @@ fn mcp_inventory_exposes_only_the_confirm_gated_extension_installer() {fn cli_rejects_ambiguous_extension_arguments() {let temp = TempDir::new().unwrap();let home = temp.path().join("driver-home");- for args in [- vec!["extension", "list", "extra"],- vec!["extension", "status", "--json", "--json"],- vec!["extension", "install", "cua-perception", "--archive"],- vec![- "extension",- "install",- "cua-perception",- "--archive",- "x",- "--catalog",- "y",- "--allow-unsigned-local",- ],- vec!["extension", "path", "cua-perception"],+ for (args, message) in [+ (vec!["extension", "bogus"], "unknown subcommand \"bogus\""),+ (+ vec!["extension", "status", "--bogus"],+ "unknown extension option \"--bogus\"",+ ),+ (vec!["extension", "info"], "info requires an extension name"),+ (+ vec!["extension", "list", "extra"],+ "list does not accept an extension name",+ ),+ (+ vec!["extension", "status", "--json", "--json"],+ "duplicate flag --json",+ ),+ (+ vec!["extension", "install", "cua-perception", "--archive"],+ "--archive requires a value",+ ),+ (+ vec![+ "extension",+ "install",+ "cua-perception",+ "--archive",+ "x",+ "--catalog",+ "y",+ "--allow-unsigned-local",+ ],+ "--allow-unsigned-local cannot be combined with --catalog",+ ),] {let output = run(&home, &args);- assert!(!output.status.success(), "accepted {args:?}");+ let stderr = String::from_utf8_lossy(&output.stderr);+ assert_eq!(output.status.code(), Some(64), "{args:?}: {stderr}");+ assert!(stderr.contains(message), "{args:?}: {stderr}");}}+#[test]+fn cli_operation_failure_is_not_a_usage_error() {+ let temp = TempDir::new().unwrap();+ let home = temp.path().join("driver-home");+ let output = run(&home, &["extension", "path", "cua-perception"]);+ let stderr = String::from_utf8_lossy(&output.stderr);+ assert_eq!(output.status.code(), Some(1), "{stderr}");+ assert!(+ stderr.contains("cua-perception is not installed"),+ "{stderr}"+ );+}+#[test]fn cli_parse_errors_do_not_create_extension_state() {let temp = TempDir::new().unwrap();