Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ffa5bd63f6 | ||
|
|
926f08203c | ||
|
|
2b1a3c308a | ||
|
|
6c556e519d | ||
|
|
9e48b0757c |
Generated
+1
-1
@@ -45,7 +45,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "agent-browser-stealth"
|
||||
version = "0.27.0-fork.1"
|
||||
version = "0.27.0-fork.2"
|
||||
dependencies = [
|
||||
"aes-gcm",
|
||||
"async-trait",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "agent-browser-stealth"
|
||||
version = "0.27.0-fork.1"
|
||||
version = "0.27.0-fork.2"
|
||||
edition = "2021"
|
||||
description = "Fast browser automation CLI for AI agents"
|
||||
license = "Apache-2.0"
|
||||
|
||||
+81
-1
@@ -2180,7 +2180,33 @@ fn parse_find(rest: &[&str], id: &str) -> Result<Value, ParseError> {
|
||||
_ => "find <locator> <value> [action] [text]",
|
||||
},
|
||||
})?;
|
||||
let subaction = rest.get(2).unwrap_or(&"click");
|
||||
let raw_subaction = rest.get(2).copied();
|
||||
if let Some(s) = raw_subaction {
|
||||
if s.starts_with("--") {
|
||||
return Err(ParseError::InvalidValue {
|
||||
message: format!(
|
||||
"Missing action verb for `find {locator}` (got `{flag}` where action was expected).\n\
|
||||
Valid actions: click, fill, check, hover, text\n\
|
||||
Did you mean: agent-browser find {locator} <value> click {flag} ...?",
|
||||
locator = locator,
|
||||
flag = s,
|
||||
),
|
||||
usage: match *locator {
|
||||
"role" => "find role <role> <action> [--name <name>] [--exact]",
|
||||
"text" => "find text <text> <action> [--exact]",
|
||||
"label" => "find label <label> <action> [text] [--exact]",
|
||||
"placeholder" => "find placeholder <text> <action> [text] [--exact]",
|
||||
"alt" => "find alt <text> <action> [--exact]",
|
||||
"title" => "find title <text> <action> [--exact]",
|
||||
"testid" => "find testid <id> <action> [text]",
|
||||
"first" => "find first <selector> <action> [text]",
|
||||
"last" => "find last <selector> <action> [text]",
|
||||
_ => "find <locator> <value> <action> [text]",
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
let subaction = raw_subaction.unwrap_or("click");
|
||||
let mut name: Option<&str> = None;
|
||||
let mut exact = false;
|
||||
let mut fill_parts: Vec<&str> = Vec::new();
|
||||
@@ -5105,4 +5131,58 @@ mod tests {
|
||||
let cmd = parse_command(&args("batch"), &default_flags()).unwrap();
|
||||
assert!(cmd.get("commands").is_none());
|
||||
}
|
||||
|
||||
// === parse_find: friendly error when action verb is missing ===
|
||||
|
||||
#[test]
|
||||
fn test_find_role_missing_action_verb_with_name_flag() {
|
||||
let err = parse_command(
|
||||
&args("find role button --name Submit"),
|
||||
&default_flags(),
|
||||
)
|
||||
.unwrap_err();
|
||||
let msg = err.format();
|
||||
assert!(
|
||||
msg.contains("Missing action verb"),
|
||||
"expected 'Missing action verb' in error, got: {msg}"
|
||||
);
|
||||
assert!(
|
||||
msg.contains("Did you mean"),
|
||||
"expected 'Did you mean' suggestion, got: {msg}"
|
||||
);
|
||||
assert!(
|
||||
msg.contains("--name"),
|
||||
"error should echo the offending flag back, got: {msg}"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_find_testid_missing_action_verb_with_exact_flag() {
|
||||
let err = parse_command(
|
||||
&args("find testid foo --exact"),
|
||||
&default_flags(),
|
||||
)
|
||||
.unwrap_err();
|
||||
assert!(err.format().contains("Missing action verb"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_find_role_with_action_still_works() {
|
||||
let cmd = parse_command(
|
||||
&args("find role button click --name Submit"),
|
||||
&default_flags(),
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!(cmd["action"], "getbyrole");
|
||||
assert_eq!(cmd["subaction"], "click");
|
||||
assert_eq!(cmd["name"], "Submit");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_find_role_default_subaction_click_when_no_action() {
|
||||
// Backwards compat: `find role button` (no flags, no action) keeps
|
||||
// defaulting to click — only `--xxx` in action position errors.
|
||||
let cmd = parse_command(&args("find role button"), &default_flags()).unwrap();
|
||||
assert_eq!(cmd["subaction"], "click");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,6 +127,15 @@ fn get_version_path(session: &str) -> PathBuf {
|
||||
get_socket_dir().join(format!("{}.version", session))
|
||||
}
|
||||
|
||||
/// Path to the sidecar file that records the URL the previous daemon was on,
|
||||
/// used to restore navigation after a version-mismatch restart. Only written
|
||||
/// when the version-mismatch branch fires; cleared after the new daemon
|
||||
/// reads it. Manual `close` does not write this file, so a clean shutdown
|
||||
/// won't trigger surprise navigation.
|
||||
pub fn get_restore_url_path(session: &str) -> PathBuf {
|
||||
get_socket_dir().join(format!("{}.restore-url", session))
|
||||
}
|
||||
|
||||
/// Clean up stale socket and PID files for a session
|
||||
pub fn cleanup_stale_files(session: &str) {
|
||||
let pid_path = get_pid_path(session);
|
||||
@@ -135,6 +144,10 @@ pub fn cleanup_stale_files(session: &str) {
|
||||
let _ = fs::remove_file(&version_path);
|
||||
let stream_path = get_socket_dir().join(format!("{}.stream", session));
|
||||
let _ = fs::remove_file(&stream_path);
|
||||
// Note: the .restore-url sidecar is intentionally NOT removed here —
|
||||
// it lives across the brief window between killing the old daemon
|
||||
// and the new daemon reading it back. The new daemon deletes it after
|
||||
// restoring (see actions::auto_launch).
|
||||
|
||||
#[cfg(unix)]
|
||||
{
|
||||
@@ -527,6 +540,24 @@ fn daemon_version_matches(session: &str) -> bool {
|
||||
}
|
||||
}
|
||||
|
||||
/// One-shot socket query for the running daemon's current URL.
|
||||
/// Returns None on any kind of failure — caller must treat as best-effort.
|
||||
fn query_current_url(session: &str) -> Option<String> {
|
||||
let cmd = serde_json::json!({
|
||||
"id": format!("restore-url-probe-{}", std::process::id()),
|
||||
"action": "url",
|
||||
});
|
||||
let resp = send_command_once(&cmd, session).ok()?;
|
||||
if !resp.success {
|
||||
return None;
|
||||
}
|
||||
resp.data
|
||||
.as_ref()
|
||||
.and_then(|d| d.get("url"))
|
||||
.and_then(|v| v.as_str())
|
||||
.map(|s| s.to_string())
|
||||
}
|
||||
|
||||
/// Kill a running daemon by reading its PID file and sending a kill signal.
|
||||
fn kill_stale_daemon(session: &str) {
|
||||
// Remove the socket first so no new connections reach the old daemon
|
||||
@@ -592,6 +623,16 @@ pub fn ensure_daemon(session: &str, opts: &DaemonOptions) -> Result<DaemonResult
|
||||
"{} Daemon version mismatch detected, restarting...",
|
||||
crate::color::warning_indicator()
|
||||
);
|
||||
// Best-effort: ask the old daemon for its current URL so the
|
||||
// new daemon can restore navigation after auto-connect. If the
|
||||
// query fails (already shutting down, no browser, etc.) we
|
||||
// silently skip — the user just sees about:blank as before.
|
||||
if let Some(url) = query_current_url(session) {
|
||||
if !url.is_empty() && url != "about:blank" {
|
||||
let path = get_restore_url_path(session);
|
||||
let _ = fs::write(&path, &url);
|
||||
}
|
||||
}
|
||||
kill_stale_daemon(session);
|
||||
// Fall through to spawn a new daemon below
|
||||
} else {
|
||||
|
||||
@@ -9,7 +9,7 @@ use std::sync::Arc;
|
||||
use time::{format_description::well_known::Rfc3339, OffsetDateTime};
|
||||
use tokio::sync::{broadcast, oneshot, RwLock};
|
||||
|
||||
use crate::connection::get_socket_dir;
|
||||
use crate::connection::{get_restore_url_path, get_socket_dir};
|
||||
|
||||
use super::auth;
|
||||
use super::browser::{should_track_target, BrowserManager, WaitUntil};
|
||||
@@ -1552,6 +1552,7 @@ async fn auto_launch(state: &mut DaemonState) -> Result<(), String> {
|
||||
try_auto_restore_state(state).await;
|
||||
try_load_storage_state(state, &storage_state_path).await;
|
||||
apply_stealth_to_browser(state).await;
|
||||
try_restore_navigation(state).await;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
@@ -1573,6 +1574,7 @@ async fn auto_launch(state: &mut DaemonState) -> Result<(), String> {
|
||||
try_auto_restore_state(state).await;
|
||||
try_load_storage_state(state, &storage_state_path).await;
|
||||
apply_stealth_to_browser(state).await;
|
||||
try_restore_navigation(state).await;
|
||||
return Ok(());
|
||||
}
|
||||
Err(_e) => {
|
||||
@@ -1660,6 +1662,7 @@ async fn auto_launch(state: &mut DaemonState) -> Result<(), String> {
|
||||
try_load_storage_state(state, &storage_state_path).await;
|
||||
// Apply stealth anti-detection patches after browser is ready
|
||||
apply_stealth_to_browser(state).await;
|
||||
try_restore_navigation(state).await;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -1770,6 +1773,47 @@ async fn apply_stealth_to_browser(state: &DaemonState) {
|
||||
}
|
||||
}
|
||||
|
||||
/// If the previous daemon left a `.restore-url` sidecar (because it was killed
|
||||
/// by a version-mismatch restart), navigate the freshly-connected browser to
|
||||
/// that URL so `agent-browser get url` after `npm i -g` upgrade still reports
|
||||
/// the page the user was on. Read-and-delete: the file is removed regardless
|
||||
/// of whether navigation succeeds, so a stale sidecar can't haunt later
|
||||
/// auto-launches.
|
||||
async fn try_restore_navigation(state: &mut DaemonState) {
|
||||
let path = get_restore_url_path(&state.session_id);
|
||||
let url = match fs::read_to_string(&path) {
|
||||
Ok(s) => s.trim().to_string(),
|
||||
Err(_) => return,
|
||||
};
|
||||
let _ = fs::remove_file(&path);
|
||||
if url.is_empty() {
|
||||
return;
|
||||
}
|
||||
let Some(mgr) = state.browser.as_mut() else {
|
||||
return;
|
||||
};
|
||||
state.ref_map.clear();
|
||||
state.iframe_sessions.clear();
|
||||
state.active_frame_id = None;
|
||||
match mgr.navigate(&url, super::browser::WaitUntil::Load).await {
|
||||
Ok(_) => {
|
||||
eprintln!(
|
||||
"{} Restored previous URL: {}",
|
||||
crate::color::warning_indicator(),
|
||||
url
|
||||
);
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!(
|
||||
"{} Could not restore previous URL ({}): {}",
|
||||
crate::color::warning_indicator(),
|
||||
url,
|
||||
e
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn launch_options_from_env() -> LaunchOptions {
|
||||
let headed = env::var("AGENT_BROWSER_HEADED")
|
||||
.map(|v| v == "1" || v == "true")
|
||||
|
||||
+4
-4
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "agent-browser-stealth",
|
||||
"version": "0.27.0-fork.1",
|
||||
"version": "0.27.0-fork.2",
|
||||
"description": "Browser automation CLI for AI agents — stealth fork with anti-detection",
|
||||
"type": "module",
|
||||
"files": [
|
||||
@@ -11,9 +11,9 @@
|
||||
"extensions"
|
||||
],
|
||||
"bin": {
|
||||
"agent-browser-stealth": "./bin/agent-browser.js",
|
||||
"agent-browser": "./bin/agent-browser.js",
|
||||
"abs": "./bin/agent-browser.js"
|
||||
"agent-browser-stealth": "bin/agent-browser.js",
|
||||
"agent-browser": "bin/agent-browser.js",
|
||||
"abs": "bin/agent-browser.js"
|
||||
},
|
||||
"scripts": {
|
||||
"prepare": "husky",
|
||||
|
||||
Generated
+7
-11148
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user