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): share browser DevTools parsing in core (#4128)
Francesco Bonacci3fdb979a5146
diff --git a/libs/cua-driver/rust/crates/cua-driver-core/src/browser/adapter_support.rs b/libs/cua-driver/rust/crates/cua-driver-core/src/browser/adapter_support.rsnew file mode 100644index 0000000000..8af59a15f6--- /dev/null+++ b/libs/cua-driver/rust/crates/cua-driver-core/src/browser/adapter_support.rs@@ -0,0 +1,219 @@+//! Parsing, classification, and cursor bookkeeping shared by the platform+//! browser adapters.+//!+//! Every platform adapter reads Chromium's `DevToolsActivePort` file,+//! re-proves that a discovered websocket stays on the attested loopback+//! listener, recognizes Firefox, and keeps one visible browser cursor per+//! native window. Those semantics are platform-independent, so they live here+//! and the adapters stay thin.++use std::collections::HashMap;++/// Parse Chromium's `DevToolsActivePort` file.+///+/// The file must hold exactly two non-empty lines: the listener port and one+/// `/devtools/browser/<id>` path whose id is ASCII alphanumeric, `-`, or `_`.+/// Anything else, including page paths and trailing lines, is refused so the+/// caller never attaches to an endpoint the file does not name exactly.+pub fn parse_devtools_active_port(text: &str) -> Option<(u16, &str)> {+ let mut lines = text.lines().map(str::trim).filter(|line| !line.is_empty());+ let port = lines.next()?.parse::<u16>().ok()?;+ let path = lines.next()?;+ if lines.next().is_some() {+ return None;+ }+ let instance = path.strip_prefix("/devtools/browser/")?;+ (!instance.is_empty()+ && instance+ .bytes()+ .all(|byte| byte.is_ascii_alphanumeric() || byte == b'-' || byte == b'_'))+ .then_some((port, path))+}++/// Return the port of a loopback DevTools websocket URL.+///+/// Accepts `127.0.0.1`, `localhost`, and `[::1]` hosts only, so a+/// discovered URL that points anywhere else can never match the attested+/// listener port.+pub fn loopback_websocket_port(url: &str) -> Option<u16> {+ ["ws://127.0.0.1:", "ws://localhost:", "ws://[::1]:"]+ .iter()+ .find_map(|prefix| {+ url.strip_prefix(prefix)?+ .split('/')+ .next()?+ .parse::<u16>()+ .ok()+ })+}++/// Whether a process identity names Firefox.+///+/// `identity` is whatever the adapter has for the process: an executable+/// name, an executable path, or an app name joined with its bundle id. The+/// identity is split on every non-alphanumeric character and matches when one+/// token is exactly `firefox`, so `firefox.exe`, `/usr/lib/firefox-esr/firefox-esr`+/// and `org.mozilla.firefox` match while `FirefoxHelper` and `waterfox` do+/// not.+pub fn is_firefox(identity: &str) -> bool {+ identity+ .to_ascii_lowercase()+ .split(|ch: char| !ch.is_ascii_alphanumeric())+ .any(|token| token == "firefox")+}++#[derive(Debug, Clone, PartialEq, Eq)]+struct BrowserCursorBinding {+ window_id: u64,+ cdp_target_id: String,+}++/// Session-to-tab bindings for browser cursors.+///+/// An active tab owns the sole visible browser cursor in its native window.+/// An inactive tab hides only its own cursor and never disturbs the cursor for+/// the selected tab.+#[derive(Debug, Default)]+pub struct BrowserCursorTracker {+ bindings: HashMap<String, BrowserCursorBinding>,+}++impl BrowserCursorTracker {+ /// Record the session-to-tab binding and return the exact overlay+ /// visibility changes, as `(session, visible)` pairs, needed for this+ /// action.+ pub fn update(+ &mut self,+ session: &str,+ window_id: u64,+ cdp_target_id: &str,+ tab_is_active: bool,+ ) -> Vec<(String, bool)> {+ self.bindings.insert(+ session.to_owned(),+ BrowserCursorBinding {+ window_id,+ cdp_target_id: cdp_target_id.to_owned(),+ },+ );++ if !tab_is_active {+ return vec![(session.to_owned(), false)];+ }++ self.bindings+ .iter()+ .filter(|(_, binding)| binding.window_id == window_id)+ .map(|(key, binding)| {+ (+ key.clone(),+ key == session && binding.cdp_target_id == cdp_target_id,+ )+ })+ .collect()+ }+}++#[cfg(test)]+mod tests {+ use super::*;++ #[test]+ fn active_port_parser_requires_one_exact_browser_path() {+ assert_eq!(+ parse_devtools_active_port(+ "9222\n/devtools/browser/f1d991b4-2694-4b28-b63a-1f2a8da3a435\n"+ ),+ Some((+ 9222,+ "/devtools/browser/f1d991b4-2694-4b28-b63a-1f2a8da3a435"+ ))+ );+ assert_eq!(+ parse_devtools_active_port("9222\n/devtools/browser/abc_123\n"),+ Some((9222, "/devtools/browser/abc_123"))+ );+ for refused in [+ "9222\n/devtools/browser\n",+ "9222\n/devtools/browser/\n",+ "9222\n/devtools/page/id\n",+ "9222\n/devtools/browser/id\nextra\n",+ "9222\n/devtools/browser/../page\n",+ "not-a-port\n/devtools/browser/id\n",+ "9222\n",+ ] {+ assert_eq!(parse_devtools_active_port(refused), None, "{refused:?}");+ }+ }++ #[test]+ fn websocket_url_must_keep_the_attested_listener_port() {+ for (url, port) in [+ ("ws://127.0.0.1:9222/devtools/browser/id", Some(9222)),+ ("ws://localhost:9333/devtools/browser/id", Some(9333)),+ ("ws://[::1]:9444/devtools/browser/id", Some(9444)),+ ("ws://0.0.0.0:9222/devtools", None),+ ("ws://192.0.2.1:9222/devtools", None),+ ("wss://127.0.0.1:9222/devtools", None),+ ] {+ assert_eq!(loopback_websocket_port(url), port, "{url}");+ }+ }++ #[test]+ fn firefox_classifier_uses_product_tokens() {+ for identity in [+ "firefox.exe",+ "Mozilla Firefox.exe",+ "Firefox org.mozilla.firefox",+ "/usr/lib/firefox/firefox",+ "/usr/lib/firefox-esr/firefox-esr",+ ] {+ assert!(is_firefox(identity), "{identity}");+ }+ for identity in [+ "FirefoxHelper.exe",+ "FirefoxHelper com.example.FirefoxHelper",+ "waterfox",+ "Waterfox net.waterfox.current",+ ] {+ assert!(!is_firefox(identity), "{identity}");+ }+ }++ #[test]+ fn browser_cursor_tracker_shows_only_the_active_tabs_session_per_window() {+ let mut tracker = BrowserCursorTracker::default();+ assert_eq!(+ tracker.update("session-red", 77, "tab-A", false),+ vec![("session-red".to_owned(), false)]+ );++ let first_active = tracker.update("session-red", 77, "tab-A", true);+ assert_eq!(first_active, vec![("session-red".to_owned(), true)]);++ let second_active = tracker+ .update("session-blue", 77, "tab-B", true)+ .into_iter()+ .collect::<HashMap<_, _>>();+ assert_eq!(second_active.get("session-red"), Some(&false));+ assert_eq!(second_active.get("session-blue"), Some(&true));++ let mut back_to_red = tracker.update("session-red", 77, "tab-A", true);+ back_to_red.sort();+ assert_eq!(+ back_to_red,+ vec![+ ("session-blue".to_owned(), false),+ ("session-red".to_owned(), true)+ ]+ );++ let other_window = tracker.update("session-green", 88, "tab-C", true);+ assert_eq!(+ other_window,+ vec![("session-green".to_owned(), true)],+ "an active tab in another native window must not hide this window"+ );+ }+}diff --git a/libs/cua-driver/rust/crates/cua-driver-core/src/browser/mod.rs b/libs/cua-driver/rust/crates/cua-driver-core/src/browser/mod.rsindex c401844f02..8d6e5534e5 100644--- a/libs/cua-driver/rust/crates/cua-driver-core/src/browser/mod.rs+++ b/libs/cua-driver/rust/crates/cua-driver-core/src/browser/mod.rs@@ -35,6 +35,7 @@//! is re-proven before any mutation; frames whose identity or//! capability cannot be proven are omitted or refused, never guessed.+mod adapter_support;pub mod binding;pub mod cdp_ws;pub mod download;@@ -56,6 +57,9 @@ pub mod types;#[cfg(test)]mod v2_tests;+pub use adapter_support::{+ is_firefox, loopback_websocket_port, parse_devtools_active_port, BrowserCursorTracker,+};pub use engine::BrowserEngine;pub use platform::{BrowserConsentOutcome, BrowserConsentRequest, BrowserPlatform, BrowserVisualAction,diff --git a/libs/cua-driver/rust/crates/cua-driver-core/src/cdp.rs b/libs/cua-driver/rust/crates/cua-driver-core/src/cdp.rsindex 6b211a2beb..c7621a81a8 100644--- a/libs/cua-driver/rust/crates/cua-driver-core/src/cdp.rs+++ b/libs/cua-driver/rust/crates/cua-driver-core/src/cdp.rs@@ -89,12 +89,22 @@ async fn cdp_evaluate(Ok(serde_json::json!({ "result": result }))}-fn pick_page<'a>(pages: &'a [Value], hint: Option<&str>) -> Option<&'a Value> {+/// Pick the unique page whose `url` contains `hint` (case-insensitive), or+/// the first page when no hint is given.+///+/// Explicit hints fail closed when zero or multiple pages match: CDP target+/// ids carry no relationship to the caller's window, so a browser with more+/// than one tab open would otherwise be picked non-deterministically.+pub fn pick_page<'a>(+ pages: impl IntoIterator<Item = &'a Value>,+ hint: Option<&str>,+) -> Option<&'a Value> {+ let mut pages = pages.into_iter();match hint {- None => pages.first(),+ None => pages.next(),Some(hint) => {let hint_lower = hint.to_ascii_lowercase();- let mut matches = pages.iter().filter(|page| {+ let mut matches = pages.filter(|page| {page.get("url").and_then(Value::as_str).is_some_and(|url| url.to_ascii_lowercase().contains(&hint_lower))diff --git a/libs/cua-driver/rust/crates/platform-linux/src/browser_platform.rs b/libs/cua-driver/rust/crates/platform-linux/src/browser_platform.rsindex e4e2f4ccad..93adaaa529 100644--- a/libs/cua-driver/rust/crates/platform-linux/src/browser_platform.rs+++ b/libs/cua-driver/rust/crates/platform-linux/src/browser_platform.rs@@ -6,7 +6,6 @@ use std::path::PathBuf;use std::time::Duration;use async_trait::async_trait;-use cua_driver_core::browser::existing_profile_setup_descriptor;use cua_driver_core::browser::platform::{select_isolated_browser_executable, BrowserConsentOutcome, BrowserConsentRequest,BrowserPlatform, ExistingProfileSetupOutcome, ExistingProfileSetupRequest, PrepareAction,@@ -18,6 +17,10 @@ use cua_driver_core::browser::types::{EndpointOwnershipMethod, EndpointOwnershipProof, EndpointTransport, NativeOwnershipMethod,NativeOwnershipProof, NativeWindowInfo, OwnedEndpoint, ProcessFingerprint, Rect,};+use cua_driver_core::browser::{+ existing_profile_setup_descriptor, is_firefox, loopback_websocket_port,+ parse_devtools_active_port,+};use tokio::io::{AsyncReadExt, AsyncWriteExt};#[derive(Debug, Default)]@@ -78,16 +81,6 @@ fn is_chromium(name: &str) -> bool {is_chromium_identity(name)}-fn is_firefox(name: &str) -> bool {- name.to_ascii_lowercase().split_whitespace().any(|word| {- word.rsplit(['/', '\\'])- .next()- .unwrap_or(word)- .trim_end_matches(".exe")- == "firefox"- })-}-fn browser_product(identity: &str) -> BrowserProduct {let tokens = identity.to_ascii_lowercase()@@ -179,18 +172,6 @@ fn process_role_for_pid(pid: i64, product: BrowserProduct) -> BrowserProcessRole}}-fn loopback_websocket_port(url: &str) -> Option<u16> {- ["ws://127.0.0.1:", "ws://localhost:", "ws://[::1]:"]- .iter()- .find_map(|prefix| {- url.strip_prefix(prefix)?- .split('/')- .next()?- .parse::<u16>()- .ok()- })-}-fn parse_proc_net_loopback_listeners(text: &str) -> Vec<(u16, u64)> {text.lines().skip(1)@@ -299,21 +280,6 @@ fn loopback_ports_for_pid(pid: i64) -> Result<Vec<u16>, BrowserRefusal> {Ok(listeners)}-fn parse_devtools_active_port(text: &str) -> Option<(u16, &str)> {- let mut lines = text.lines().map(str::trim).filter(|line| !line.is_empty());- let port = lines.next()?.parse::<u16>().ok()?;- let path = lines.next()?;- if lines.next().is_some() {- return None;- }- let instance = path.strip_prefix("/devtools/browser/")?;- (!instance.is_empty()- && instance- .bytes()- .all(|byte| byte.is_ascii_alphanumeric() || byte == b'-' || byte == b'_'))- .then_some((port, path))-}-fn default_user_data_dir(product: BrowserProduct) -> Option<PathBuf> {let home = std::env::var_os("HOME").map(PathBuf::from)?;let relative = match product {@@ -1400,45 +1366,4 @@ mod tests {BrowserProduct::GoogleChrome);}-- #[test]- fn firefox_classifier_uses_product_tokens() {- assert!(is_firefox("firefox --new-instance"));- assert!(is_firefox("Mozilla Firefox"));- assert!(!is_firefox("firefox-helper"));- assert!(!is_firefox("waterfox"));- }-- #[test]- fn websocket_url_must_keep_the_attested_listener_port() {- assert_eq!(- loopback_websocket_port("ws://localhost:9222/devtools/browser/id"),- Some(9222)- );- assert_ne!(- loopback_websocket_port("ws://[::1]:9333/devtools/browser/foreign"),- Some(9222)- );- assert_eq!(loopback_websocket_port("ws://0.0.0.0:9222/devtools"), None);- }-- #[test]- fn active_port_parser_requires_one_exact_browser_path() {- assert_eq!(- parse_devtools_active_port("9222\n/devtools/browser/abc-123\n"),- Some((9222, "/devtools/browser/abc-123"))- );- assert_eq!(- parse_devtools_active_port("9222\n/devtools/browser\n"),- None- );- assert_eq!(- parse_devtools_active_port("9222\n/devtools/page/abc\n"),- None- );- assert_eq!(- parse_devtools_active_port("9222\n/devtools/browser/../page\n"),- None- );- }}diff --git a/libs/cua-driver/rust/crates/platform-macos/src/browser/cdp_client.rs b/libs/cua-driver/rust/crates/platform-macos/src/browser/cdp_client.rsindex 0dbc8076af..381997dd96 100644--- a/libs/cua-driver/rust/crates/platform-macos/src/browser/cdp_client.rs+++ b/libs/cua-driver/rust/crates/platform-macos/src/browser/cdp_client.rs@@ -3,6 +3,7 @@//! cua-driver-core's shared event-aware `CdpConnection` transport.use cua_driver_core::browser::cdp_ws::CdpConnection;+use cua_driver_core::cdp::pick_page;use std::collections::HashMap;use std::sync::Arc;use std::time::Duration;@@ -415,7 +416,7 @@ impl CdpSession {.iter().filter(|t| t.get("type").and_then(|v| v.as_str()) == Some("page")).collect();- let target = pick_target(&pages, target_url_contains).ok_or_else(|| {+ let target = pick_page(pages.iter().copied(), target_url_contains).ok_or_else(|| {anyhow::anyhow!("Target.getTargets returned no page target on port {port}")})?;let target_id = target@@ -478,7 +479,7 @@ async fn ws_url_for_page_target(}).unwrap_or_default();- let target = pick_target(&pages, target_url_contains)+ let target = pick_page(pages.iter().copied(), target_url_contains).ok_or_else(|| anyhow::anyhow!("No page target found on port {port}"))?;let ws_url = target.get("webSocketDebuggerUrl")@@ -495,39 +496,9 @@ async fn ws_url_for_page_target(Ok((ws_url, target_url))}-/// Pick the unique page target whose `url` contains `hint`-/// (case-insensitive), or the first page when no hint is given. Explicit-/// hints fail closed when zero or multiple pages match. Shared by both-/// discovery paths (classic `/json` and-/// `Target.getTargets`) since a browser with more than one tab open is-/// otherwise picked non-deterministically — CDP target ids carry no-/// relationship to the caller's `window_id`.-fn pick_target<'a>(- pages: &[&'a serde_json::Value],- hint: Option<&str>,-) -> Option<&'a serde_json::Value> {- match hint {- None => pages.first().copied(),- Some(hint) => {- let hint_lower = hint.to_ascii_lowercase();- let mut matches = pages.iter().copied().filter(|target| {- target- .get("url")- .and_then(|value| value.as_str())- .is_some_and(|url| url.to_ascii_lowercase().contains(&hint_lower))- });- let target = matches.next()?;- if matches.next().is_some() {- return None;- }- Some(target)- }- }-}-#[cfg(test)]mod tests {- use super::{pick_target, CdpSessionCache};+ use super::CdpSessionCache;use futures_util::{SinkExt, StreamExt};use std::sync::{atomic::{AtomicUsize, Ordering},@@ -538,47 +509,6 @@ mod tests {use tokio::net::TcpListener;use tokio_tungstenite::{accept_async, tungstenite::Message};- fn pages() -> Vec<serde_json::Value> {- vec![- serde_json::json!({ "type": "page", "url": "app://fixture/#window-a" }),- serde_json::json!({ "type": "page", "url": "app://fixture/#window-b" }),- ]- }-- #[test]- fn explicit_target_hint_selects_one_page() {- let pages = pages();- let refs = pages.iter().collect::<Vec<_>>();- assert_eq!(- pick_target(&refs, Some("#WINDOW-B")).and_then(|target| target["url"].as_str()),- Some("app://fixture/#window-b")- );- }-- #[test]- fn explicit_target_hint_never_falls_back() {- let pages = pages();- let refs = pages.iter().collect::<Vec<_>>();- assert!(pick_target(&refs, Some("#missing")).is_none());- }-- #[test]- fn ambiguous_target_hint_fails_closed() {- let pages = pages();- let refs = pages.iter().collect::<Vec<_>>();- assert!(pick_target(&refs, Some("app://fixture/")).is_none());- }-- #[test]- fn omitted_target_hint_keeps_legacy_first_page_behavior() {- let pages = pages();- let refs = pages.iter().collect::<Vec<_>>();- assert_eq!(- pick_target(&refs, None).and_then(|target| target["url"].as_str()),- Some("app://fixture/#window-a")- );- }-#[tokio::test]async fn targeted_evaluate_reuses_browser_websocket() {let listener = TcpListener::bind(("127.0.0.1", 0)).await.unwrap();diff --git a/libs/cua-driver/rust/crates/platform-macos/src/browser/platform.rs b/libs/cua-driver/rust/crates/platform-macos/src/browser/platform.rsindex 603f2ae4ec..af8cc134ec 100644--- a/libs/cua-driver/rust/crates/platform-macos/src/browser/platform.rs+++ b/libs/cua-driver/rust/crates/platform-macos/src/browser/platform.rs@@ -1,6 +1,5 @@//! macOS identity and endpoint evidence for the first-class browser tools.-use std::collections::HashMap;use std::hash::{Hash, Hasher};use std::path::PathBuf;use std::process::Stdio;@@ -8,7 +7,6 @@ use std::sync::{Arc, Mutex};use std::time::Duration;use async_trait::async_trait;-use cua_driver_core::browser::existing_profile_setup_descriptor;use cua_driver_core::browser::platform::{select_isolated_browser_executable, BrowserConsentOutcome, BrowserConsentRequest,BrowserPlatform, BrowserVisualAction, BrowserVisualActionKind, ExistingProfileSetupOutcome,@@ -20,6 +18,10 @@ use cua_driver_core::browser::types::{EndpointOwnershipMethod, EndpointOwnershipProof, EndpointTransport, NativeOwnershipMethod,NativeOwnershipProof, NativeWindowInfo, OwnedEndpoint, ProcessFingerprint, Rect,};+use cua_driver_core::browser::{+ existing_profile_setup_descriptor, is_firefox, loopback_websocket_port,+ parse_devtools_active_port, BrowserCursorTracker,+};use serde::Serialize;use tokio::io::{AsyncReadExt, AsyncWriteExt};@@ -202,54 +204,6 @@ pub struct MacOsBrowserPlatform {browser_cursors: Arc<Mutex<BrowserCursorTracker>>,}-#[derive(Debug, Clone, PartialEq, Eq)]-struct BrowserCursorBinding {- window_id: u64,- cdp_target_id: String,-}--#[derive(Debug, Default)]-struct BrowserCursorTracker {- bindings: HashMap<String, BrowserCursorBinding>,-}--impl BrowserCursorTracker {- /// Record the session-to-tab binding and return the exact overlay- /// visibility changes needed for this action. An active tab owns the sole- /// visible browser cursor in its native window. An inactive tab hides only- /// its own cursor and never disturbs the cursor for the selected tab.- fn update(- &mut self,- session: &str,- window_id: u64,- cdp_target_id: &str,- tab_is_active: bool,- ) -> Vec<(String, bool)> {- self.bindings.insert(- session.to_owned(),- BrowserCursorBinding {- window_id,- cdp_target_id: cdp_target_id.to_owned(),- },- );-- if !tab_is_active {- return vec![(session.to_owned(), false)];- }-- self.bindings- .iter()- .filter(|(_, binding)| binding.window_id == window_id)- .map(|(key, binding)| {- (- key.clone(),- key == session && binding.cdp_target_id == cdp_target_id,- )- })- .collect()- }-}-impl MacOsBrowserPlatform {pub fn new(cursor_registry: Arc<crate::cursor::CursorRegistry>) -> Self {Self {@@ -280,13 +234,6 @@ fn is_chromium(name: &str, bundle_id: &str) -> bool {.any(|token| products.contains(&token))}-fn is_firefox(name: &str, bundle_id: &str) -> bool {- format!("{name} {bundle_id}")- .to_ascii_lowercase()- .split(|ch: char| !ch.is_ascii_alphanumeric())- .any(|token| token == "firefox")-}-fn browser_product(name: &str, bundle_id: &str) -> BrowserProduct {let name = name.to_ascii_lowercase();let bundle_id = bundle_id.to_ascii_lowercase();@@ -381,18 +328,6 @@ fn has_trusted_codesign_identity()}-fn loopback_websocket_port(url: &str) -> Option<u16> {- ["ws://127.0.0.1:", "ws://localhost:", "ws://[::1]:"]- .iter()- .find_map(|prefix| {- url.strip_prefix(prefix)?- .split('/')- .next()?- .parse::<u16>()- .ok()- })-}-fn stable_hash(value: &str) -> u64 {let mut hasher = std::collections::hash_map::DefaultHasher::new();value.hash(&mut hasher);@@ -410,21 +345,6 @@ fn default_user_data_dir(product: BrowserProduct) -> Option<PathBuf> {Some(home.join(relative))}-fn parse_devtools_active_port(text: &str) -> Option<(u16, &str)> {- let mut lines = text.lines().map(str::trim).filter(|line| !line.is_empty());- let port = lines.next()?.parse::<u16>().ok()?;- let path = lines.next()?;- if lines.next().is_some() {- return None;- }- let instance = path.strip_prefix("/devtools/browser/")?;- (!instance.is_empty()- && instance- .bytes()- .all(|byte| byte.is_ascii_alphanumeric() || byte == b'-' || byte == b'_'))- .then_some((port, path))-}-fn process_arguments(pid: i64) -> Result<Vec<Vec<u8>>, BrowserRefusal> {let pid = libc::pid_t::try_from(pid).map_err(|_| {refusal(@@ -852,7 +772,7 @@ impl BrowserPlatform for MacOsBrowserPlatform {.unwrap_or("");let chromium = is_chromium(name, bundle_id);let webkit = bundle_id == "com.apple.Safari" || name.eq_ignore_ascii_case("Safari");- let gecko = is_firefox(name, bundle_id);+ let gecko = is_firefox(&format!("{name} {bundle_id}"));let product_kind = browser_product(name, bundle_id);let helper = name.to_ascii_lowercase().contains("helper")|| bundle_id.to_ascii_lowercase().contains(".helper")@@ -1634,32 +1554,6 @@ mod tests {);}- #[test]- fn browser_cursor_tracker_shows_only_the_active_tabs_session_per_window() {- let mut tracker = BrowserCursorTracker::default();- assert_eq!(- tracker.update("session-red", 77, "tab-A", false),- vec![("session-red".to_owned(), false)]- );-- let first_active = tracker.update("session-red", 77, "tab-A", true);- assert_eq!(first_active, vec![("session-red".to_owned(), true)]);-- let second_active = tracker- .update("session-blue", 77, "tab-B", true)- .into_iter()- .collect::<HashMap<_, _>>();- assert_eq!(second_active.get("session-red"), Some(&false));- assert_eq!(second_active.get("session-blue"), Some(&true));-- let other_window = tracker.update("session-green", 88, "tab-C", true);- assert_eq!(- other_window,- vec![("session-green".to_owned(), true)],- "an active tab in another native window must not hide this window"- );- }-#[test]fn lsof_parser_accepts_only_loopback_listeners() {let input = "n127.0.0.1:9222\nn*:9333\nn[::1]:9444\nn0.0.0.0:9555\n";@@ -1675,55 +1569,6 @@ mod tests {assert!(!is_chromium("Operator", "com.example.Operator"));}- #[test]- fn firefox_classifier_uses_product_tokens() {- assert!(is_firefox("Firefox", "org.mozilla.firefox"));- assert!(is_firefox("Mozilla Firefox", "org.mozilla.firefox"));- assert!(!is_firefox("FirefoxHelper", "com.example.FirefoxHelper"));- assert!(!is_firefox("Waterfox", "net.waterfox.current"));- }-- #[test]- fn websocket_url_must_keep_the_attested_listener_port() {- assert_eq!(- loopback_websocket_port("ws://127.0.0.1:9222/devtools/browser/id"),- Some(9222)- );- assert_ne!(- loopback_websocket_port("ws://localhost:9333/devtools/browser/foreign"),- Some(9222)- );- assert_eq!(- loopback_websocket_port("ws://192.0.2.1:9222/devtools"),- None- );- }-- #[test]- fn active_port_parser_requires_one_exact_browser_path() {- assert_eq!(- parse_devtools_active_port(- "9222\n/devtools/browser/f1d991b4-2694-4b28-b63a-1f2a8da3a435\n"- ),- Some((- 9222,- "/devtools/browser/f1d991b4-2694-4b28-b63a-1f2a8da3a435"- ))- );- assert_eq!(- parse_devtools_active_port("9222\n/devtools/page/id\n"),- None- );- assert_eq!(- parse_devtools_active_port("9222\n/devtools/browser/id\nextra\n"),- None- );- assert_eq!(- parse_devtools_active_port("9222\n/devtools/browser/../page\n"),- None- );- }-#[test]fn user_data_dir_parser_preserves_exact_custom_argv_path() {let custom = std::env::temp_dir().join("cua browser profile with spaces");diff --git a/libs/cua-driver/rust/crates/platform-windows/src/browser_platform.rs b/libs/cua-driver/rust/crates/platform-windows/src/browser_platform.rsindex 08837dc75d..7dc73c6058 100644--- a/libs/cua-driver/rust/crates/platform-windows/src/browser_platform.rs+++ b/libs/cua-driver/rust/crates/platform-windows/src/browser_platform.rs@@ -8,7 +8,6 @@ use std::sync::{Arc, Mutex};use std::time::Duration;use async_trait::async_trait;-use cua_driver_core::browser::existing_profile_setup_descriptor;use cua_driver_core::browser::platform::{select_isolated_browser_executable, BrowserConsentOutcome, BrowserConsentRequest,BrowserPlatform, BrowserVisualAction, BrowserVisualActionKind, ExistingProfileSetupOutcome,@@ -20,6 +19,9 @@ use cua_driver_core::browser::types::{EndpointOwnershipMethod, EndpointOwnershipProof, EndpointTransport, NativeOwnershipMethod,NativeOwnershipProof, NativeWindowInfo, OwnedEndpoint, ProcessFingerprint, Rect,};+use cua_driver_core::browser::{+ existing_profile_setup_descriptor, is_firefox, parse_devtools_active_port, BrowserCursorTracker,+};use tokio::io::{AsyncReadExt, AsyncWriteExt};use windows::core::PCWSTR;use windows::Win32::Foundation::{CloseHandle, E_ACCESSDENIED, FILETIME, HWND, RECT};@@ -47,50 +49,6 @@ pub struct WindowsBrowserPlatform {browser_cursors: Arc<Mutex<BrowserCursorTracker>>,}-#[derive(Debug, Clone, PartialEq, Eq)]-struct BrowserCursorBinding {- window_id: u64,- cdp_target_id: String,-}--#[derive(Debug, Default)]-struct BrowserCursorTracker {- bindings: HashMap<String, BrowserCursorBinding>,-}--impl BrowserCursorTracker {- fn update(- &mut self,- session: &str,- window_id: u64,- cdp_target_id: &str,- tab_is_active: bool,- ) -> Vec<(String, bool)> {- self.bindings.insert(- session.to_owned(),- BrowserCursorBinding {- window_id,- cdp_target_id: cdp_target_id.to_owned(),- },- );-- if !tab_is_active {- return vec![(session.to_owned(), false)];- }-- self.bindings- .iter()- .filter(|(_, binding)| binding.window_id == window_id)- .map(|(key, binding)| {- (- key.clone(),- key == session && binding.cdp_target_id == cdp_target_id,- )- })- .collect()- }-}-impl WindowsBrowserPlatform {pub fn new(cursor_registry: Arc<cursor_overlay::CursorRegistry>) -> Self {Self {@@ -120,12 +78,6 @@ fn is_chromium(name: &str) -> bool {.any(|token| products.contains(&token))}-fn is_firefox(name: &str) -> bool {- name.to_ascii_lowercase()- .split(|ch: char| !ch.is_ascii_alphanumeric())- .any(|token| token == "firefox")-}-fn browser_product(name: &str) -> BrowserProduct {let executable = name.rsplit(['/', '\\'])@@ -512,21 +464,6 @@ async fn browser_command_line(pid: u32) -> Result<String, BrowserRefusal> {Ok(command_line)}-fn parse_devtools_active_port(text: &str) -> Option<(u16, &str)> {- let mut lines = text.lines().map(str::trim).filter(|line| !line.is_empty());- let port = lines.next()?.parse::<u16>().ok()?;- let path = lines.next()?;- if lines.next().is_some() {- return None;- }- let instance = path.strip_prefix("/devtools/browser/")?;- (!instance.is_empty()- && instance- .bytes()- .all(|byte| byte.is_ascii_alphanumeric() || byte == b'-' || byte == b'_'))- .then_some((port, path))-}-async fn active_port_endpoint(pid: u32,product: BrowserProduct,@@ -2151,33 +2088,6 @@ mod tests {use std::sync::atomic::{AtomicUsize, Ordering};use std::sync::Arc;- #[test]- fn browser_cursor_tracker_shows_only_the_active_tabs_session_per_window() {- let mut tracker = BrowserCursorTracker::default();- assert_eq!(- tracker.update("tab-a", 101, "target-a", false),- vec![("tab-a".to_owned(), false)]- );- assert_eq!(- tracker.update("tab-b", 101, "target-b", false),- vec![("tab-b".to_owned(), false)]- );-- let mut updates = tracker.update("tab-a", 101, "target-a", true);- updates.sort();- assert_eq!(- updates,- vec![("tab-a".to_owned(), true), ("tab-b".to_owned(), false)]- );-- let mut updates = tracker.update("tab-b", 101, "target-b", true);- updates.sort();- assert_eq!(- updates,- vec![("tab-a".to_owned(), false), ("tab-b".to_owned(), true)]- );- }-#[test]fn netstat_parser_requires_loopback_listening_and_browser_process_tree() {let input = "\@@ -2413,14 +2323,6 @@ mod tests {);}- #[test]- fn firefox_classifier_uses_product_tokens() {- assert!(is_firefox("firefox.exe"));- assert!(is_firefox("Mozilla Firefox.exe"));- assert!(!is_firefox("FirefoxHelper.exe"));- assert!(!is_firefox("waterfox.exe"));- }-#[test]fn discovered_websocket_url_is_canonical_and_keeps_the_attested_port() {assert_eq!(@@ -2510,22 +2412,6 @@ mod tests {);}- #[test]- fn active_port_parser_rejects_non_browser_and_ambiguous_paths() {- assert_eq!(- parse_devtools_active_port("9222\n/devtools/browser/exact-id\n"),- Some((9222, "/devtools/browser/exact-id"))- );- assert_eq!(- parse_devtools_active_port("9222\n/devtools/page/id\n"),- None- );- assert_eq!(- parse_devtools_active_port("9222\n/devtools/browser/id\nextra\n"),- None- );- }-#[test]fn pre_enabled_setup_refuses_multiple_existing_exact_pid_ports() {assert_eq!(