Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
refactor(webmcp): remove redundant invocation state and form scans
ldm082f125e641ff
diff --git a/moli-renderer-v8/src/context_bootstrap/web_mcp/api.rs b/moli-renderer-v8/src/context_bootstrap/web_mcp/api.rsindex 538dbb3f6..e459787a4 100644--- a/moli-renderer-v8/src/context_bootstrap/web_mcp/api.rs+++ b/moli-renderer-v8/src/context_bootstrap/web_mcp/api.rs@@ -463,14 +463,9 @@ fn execute_tool<'s>()})})- .map(|(document, entry)| {- (- *document,- v8::Global::new(scope, v8::Local::new(scope, &entry.target)),- )- })+ .map(|(document, _)| *document)};- let Some((document, target)) = target_document else {+ let Some(document) = target_document else {execution::reject_unavailable_tool(scope,host_ptr,@@ -485,7 +480,6 @@ fn execute_tool<'s>(host_ptr,caller_document,document,- target,reference.name,input,Some(resolver),diff --git a/moli-renderer-v8/src/context_bootstrap/web_mcp/declarative.rs b/moli-renderer-v8/src/context_bootstrap/web_mcp/declarative.rsindex 5c0d9be9f..c2aa18a33 100644--- a/moli-renderer-v8/src/context_bootstrap/web_mcp/declarative.rs+++ b/moli-renderer-v8/src/context_bootstrap/web_mcp/declarative.rs@@ -144,14 +144,10 @@ pub(crate) fn note_mutation(}}-// The native index includes closed shadow trees. Keep the existing traversal-// order for duplicate names without visiting every unrelated DOM node.+// The native index includes closed shadow trees. Candidate order matters only+// when synchronize_document sorts the affected forms before registration.fn form_handles(dom: &DomHost, root: DomHandle) -> Vec<DomHandle> {- let mut forms = dom.html_elements_by_local_name_in_shadow_including_subtree(root, "form");- forms.sort_unstable_by(|left, right| {- dom.compare_handles_in_shadow_including_tree_order(*left, *right)- });- forms+ dom.html_elements_by_local_name_in_shadow_including_subtree(root, "form")}fn form_registration_is_valid(dom: &DomHost, handle: DomHandle) -> bool {diff --git a/moli-renderer-v8/src/context_bootstrap/web_mcp/declarative/invocation.rs b/moli-renderer-v8/src/context_bootstrap/web_mcp/declarative/invocation.rsindex 660e75f21..97b3b55e5 100644--- a/moli-renderer-v8/src/context_bootstrap/web_mcp/declarative/invocation.rs+++ b/moli-renderer-v8/src/context_bootstrap/web_mcp/declarative/invocation.rs@@ -26,35 +26,23 @@ pub(in crate::context_bootstrap::web_mcp) fn start(input: &str,) {let host = unsafe { &*host_ptr };- if host- .native_bridge()- .web_mcp- .pending- .values()- .any(|pending| {- pending- .form- .as_ref()- .is_some_and(|active| active.handle == form)- })- {+ if host.native_bridge().web_mcp.pending_form_id(form).is_some() {execution::finish_error(scope, host_ptr, id, "Form tool is already running");return;}+ let controls = form_control_elements(host, form);let Some(plan) = prepare_fill(host.dom_host(),- schema::parameter_controls(host, form),+ schema::parameter_controls(host, controls.iter().copied()),input,) else {execution::finish_error(scope, host_ptr, id, "Invalid form tool input");return;};- let submitter = form_control_elements(host, form)- .into_iter()- .find(|control| {- is_valid_submit_button(host, *control)- && !form_control_is_effectively_disabled(host, *control)- });+ let submitter = controls.into_iter().find(|control| {+ is_valid_submit_button(host, *control)+ && !form_control_is_effectively_disabled(host, *control)+ });if !autosubmit && submitter.is_none() {execution::finish_error(scope, host_ptr, id, "Form tool requires a submit button");return;@@ -210,18 +198,14 @@ fn form_is_current(host: &JsContextHost, id: u64, form: DomHandle) -> bool {}pub(crate) fn begin_form_submit(host: &mut JsContextHost, form: DomHandle) -> Option<u64> {- host.native_bridge_mut()- .web_mcp- .pending- .iter_mut()- .find_map(|(id, pending)| {- let active = pending.form.as_mut()?;- if active.handle != form || !matches!(active.state, FormInvocationState::Ready) {- return None;- }- active.state = FormInvocationState::Submitting;- Some(*id)- })+ let store = &mut host.native_bridge_mut().web_mcp;+ let id = store.pending_form_id(form)?;+ let active = store.pending.get_mut(&id)?.form.as_mut()?;+ if !matches!(active.state, FormInvocationState::Ready) {+ return None;+ }+ active.state = FormInvocationState::Submitting;+ Some(id)}pub(crate) fn finish_form_submit<'s>(@@ -298,13 +282,10 @@ pub(crate) fn cancel_form_execution(host_ptr: *mut JsContextHost,form: DomHandle,) {- // start() allows at most one pending execution per form.let id = unsafe { &*host_ptr }.native_bridge().web_mcp- .pending- .iter()- .find_map(|(id, pending)| (pending.form.as_ref()?.handle == form).then_some(*id));+ .pending_form_id(form);if let Some(id) = id {execution::finish_error(scope, host_ptr, id, "Form tool execution was reset");}diff --git a/moli-renderer-v8/src/context_bootstrap/web_mcp/declarative/schema.rs b/moli-renderer-v8/src/context_bootstrap/web_mcp/declarative/schema.rsindex 19a2e83e1..4234ad519 100644--- a/moli-renderer-v8/src/context_bootstrap/web_mcp/declarative/schema.rs+++ b/moli-renderer-v8/src/context_bootstrap/web_mcp/declarative/schema.rs@@ -13,9 +13,12 @@ use crate::{},};-pub(super) fn parameter_controls(host: &JsContextHost, form: DomHandle) -> ParameterControls {+pub(super) fn parameter_controls(+ host: &JsContextHost,+ controls: impl IntoIterator<Item = DomHandle>,+) -> ParameterControls {let mut groups = ParameterControls::new();- for control in form_control_elements(host, form) {+ for control in controls {let Some(element) = host.dom_host().node(control).and_then(Node::as_element) else {continue;};@@ -40,7 +43,7 @@ pub(super) fn input_schema() -> String {moli_webmcp::input_schema(host.dom_host(),- parameter_controls(host, form),+ parameter_controls(host, form_control_elements(host, form)),|control| control_label_handles(host, control),pattern_is_usable,)diff --git a/moli-renderer-v8/src/context_bootstrap/web_mcp/devtools.rs b/moli-renderer-v8/src/context_bootstrap/web_mcp/devtools.rsindex 65fd63e87..a5fd9b19b 100644--- a/moli-renderer-v8/src/context_bootstrap/web_mcp/devtools.rs+++ b/moli-renderer-v8/src/context_bootstrap/web_mcp/devtools.rs@@ -90,15 +90,9 @@ pub(crate) fn dispatch_command<'s>(&& entry.frame_id == frame_id&& document_owner(host, **document) == Some(entry.owner)})- .map(|(document, entry)| {- (- *document,- entry.tools.contains_key(&name),- v8::Global::new(scope, v8::Local::new(scope, &entry.target)),- )- })+ .map(|(document, entry)| (*document, entry.tools.contains_key(&name)))};- let Some((document, registered, target)) = found else {+ let Some((document, registered)) = found else {return Err(RendererWebMcpError::InvalidParams(if frame_id.is_none() {"Tool not found"} else {@@ -109,7 +103,7 @@ pub(crate) fn dispatch_command<'s>(return Err(RendererWebMcpError::InvalidParams("Tool not found"));}execution::schedule_invocation(- scope, host_ptr, document, document, target, name, input, None, None,+ scope, host_ptr, document, document, name, input, None, None,).map(Some).ok_or(RendererWebMcpError::SchedulingFailed)diff --git a/moli-renderer-v8/src/context_bootstrap/web_mcp/execution.rs b/moli-renderer-v8/src/context_bootstrap/web_mcp/execution.rsindex 9a00ae93a..eede2e1ac 100644--- a/moli-renderer-v8/src/context_bootstrap/web_mcp/execution.rs+++ b/moli-renderer-v8/src/context_bootstrap/web_mcp/execution.rs@@ -174,13 +174,19 @@ pub(super) fn schedule_invocation<'s>(host_ptr: *mut JsContextHost,caller_document: DomHandle,document: DomHandle,- target: v8::Global<v8::Object>,name: String,input: String,resolver: Option<v8::Local<'s, v8::PromiseResolver>>,caller_signal: Option<v8::Local<'s, v8::Object>>,) -> Option<u64> {- let target_context = v8::Local::new(scope, &target).get_creation_context(scope)?;+ let target_context = {+ let entry = unsafe { &*host_ptr }+ .native_bridge()+ .web_mcp+ .documents+ .get(&document)?;+ v8::Local::new(scope, &entry.target).get_creation_context(scope)?+ };let scope = &mut v8::ContextScope::new(scope, target_context);let signal =crate::native_bridge::abort::create_signal(scope, unsafe { &mut *host_ptr }, false, None)?;@@ -204,7 +210,6 @@ pub(super) fn schedule_invocation<'s>(caller_document,frame_tree,name,- target,resolver: resolver.map(|resolver| v8::Global::new(scope, resolver)),signal: v8::Global::new(scope, signal),caller_abort,@@ -243,25 +248,27 @@ fn start_callback<'s>(entry.owner == pending.owner&& document_owner(host, pending.document) == Some(entry.owner)})- .and_then(|entry| entry.tools.get(&pending.name))- .map(|tool| match &tool.executor {- ToolExecutor::Callback(callback) => {- InvocationExecutor::Callback(callback.callback.prepare(scope))- }- ToolExecutor::Form {- handle, autosubmit, ..- } => InvocationExecutor::Form(*handle, *autosubmit),+ .and_then(|entry| {+ let tool = entry.tools.get(&pending.name)?;+ let executor = match &tool.executor {+ ToolExecutor::Callback(callback) => {+ InvocationExecutor::Callback(callback.callback.prepare(scope))+ }+ ToolExecutor::Form {+ handle, autosubmit, ..+ } => InvocationExecutor::Form(*handle, *autosubmit),+ };+ Some((executor, v8::Local::new(scope, &entry.target)))});(executor,pending.document,pending.name.clone(),v8::Local::new(scope, &pending.signal),- v8::Local::new(scope, &pending.target),pending.frame_tree,)};- let (Some(executor), document, name, signal, target, tree) = invocation else {+ let (Some((executor, target)), document, name, signal, tree) = invocation else {finish_error(scope, host_ptr, id, "Tool is no longer registered");return;};@@ -525,13 +532,21 @@ pub(super) fn abort_target(let signal = v8::Local::new(scope, &pending.signal);let reason = crate::native_bridge::abort::abort_error_value(scope);crate::native_bridge::abort::abort_signal(scope, signal, reason);- if document_owner(unsafe { &*host_ptr }, pending.document) == Some(pending.owner) {- dispatch_event(- scope,- v8::Local::new(scope, &pending.target),- "toolcancel",- Some(&pending.name),- );+ // Aborting runs author listeners, which may retire or replace the document.+ let target = {+ let host = unsafe { &*host_ptr };+ host.native_bridge()+ .web_mcp+ .documents+ .get(&pending.document)+ .filter(|entry| {+ entry.owner == pending.owner+ && document_owner(host, pending.document) == Some(pending.owner)+ })+ .map(|entry| v8::Local::new(scope, &entry.target))+ };+ if let Some(target) = target {+ dispatch_event(scope, target, "toolcancel", Some(&pending.name));}}diff --git a/moli-renderer-v8/src/context_bootstrap/web_mcp/navigation.rs b/moli-renderer-v8/src/context_bootstrap/web_mcp/navigation.rsindex 0dac510e7..63b4e30a4 100644--- a/moli-renderer-v8/src/context_bootstrap/web_mcp/navigation.rs+++ b/moli-renderer-v8/src/context_bootstrap/web_mcp/navigation.rs@@ -9,25 +9,16 @@ use moli_page_types::{RendererWebMcpEvent, RendererWebMcpNavigation, RendererWebuse crate::frame_owner_model::FrameDocumentNavigationLoadBinding;pub(crate) fn form_invocation(host: &JsContextHost, form: DomHandle) -> Option<u64> {- host.native_bridge()- .web_mcp- .pending- .iter()- .find_map(|(id, pending)| {- pending- .form- .as_ref()- .is_some_and(|active| {- active.handle == form- && matches!(- active.state,- FormInvocationState::Ready- | FormInvocationState::Submitting- | FormInvocationState::Navigating- )- })- .then_some(*id)- })+ let store = &host.native_bridge().web_mcp;+ let id = store.pending_form_id(form)?;+ let active = store.pending[&id].form.as_ref()?;+ matches!(+ active.state,+ FormInvocationState::Ready+ | FormInvocationState::Submitting+ | FormInvocationState::Navigating+ )+ .then_some(id)}fn mark_navigating(host: &mut JsContextHost, id: u64) {diff --git a/moli-renderer-v8/src/context_bootstrap/web_mcp/state.rs b/moli-renderer-v8/src/context_bootstrap/web_mcp/state.rsindex 981a3013c..519839b58 100644--- a/moli-renderer-v8/src/context_bootstrap/web_mcp/state.rs+++ b/moli-renderer-v8/src/context_bootstrap/web_mcp/state.rs@@ -92,7 +92,6 @@ pub(super) struct PendingInvocation {pub(super) caller_document: DomHandle,pub(super) frame_tree: Option<u64>,pub(super) name: String,- pub(super) target: v8::Global<v8::Object>,pub(super) resolver: Option<v8::Global<v8::PromiseResolver>>,pub(super) signal: v8::Global<v8::Object>,pub(super) caller_abort: Option<AbortRegistration>,@@ -117,6 +116,13 @@ pub(super) enum FormInvocationState {}impl ModelContextStore {+ // Declarative start allows at most one pending execution per form.+ pub(super) fn pending_form_id(&self, form: DomHandle) -> Option<u64> {+ self.pending+ .iter()+ .find_map(|(id, pending)| (pending.form.as_ref()?.handle == form).then_some(*id))+ }+pub(crate) fn set_object_wrapper(&mut self, wrapper: RendererInspectorObjectWrapper) {self.object_wrapper = Some(wrapper);}diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/web_mcp/discovery.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/web_mcp/discovery.rsindex 510cff3f6..0668428c9 100644--- a/moli-renderer-v8/src/script_vm/tests/browser_api/web_mcp/discovery.rs+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/web_mcp/discovery.rs@@ -1,5 +1,28 @@use super::*;+#[test]+fn web_mcp_form_execution_enumerates_controls_once_before_author_events() {+ use crate::native_bridge::element::take_form_lookup_work_for_test;++ let mut vm = new_storage_page_task_executor_test_vm("https://tools.test/");+ vm.eval(r#"+ document.body.innerHTML='<form toolname=confirm tooldescription=Confirm><input name=value><button>Submit</button></form>';+ globalThis.form=document.querySelector('form');+ globalThis.probe='pending';+ "#).unwrap();+ vm.eval_after_selected_page_tasks("undefined").unwrap();+ take_form_lookup_work_for_test();+ vm.eval("document.modelContext.getTools().then(([tool])=>document.modelContext.executeTool(tool,{value:'filled'})).catch(error=>probe=error.name)").unwrap();+ vm.eval_after_selected_page_tasks("undefined").unwrap();+ let work = take_form_lookup_work_for_test();+ assert_eq!(work.traversals, 1, "{work:?}");+ assert_eq!(+ vm.eval("form.querySelector('input').value+'|'+(document.activeElement===form.querySelector('button'))+'|'+probe")+ .unwrap(),+ "filled|true|pending"+ );+}+#[test]fn web_mcp_adopted_external_controls_update_both_document_schemas() {let mut vm = new_storage_page_task_executor_test_vm("https://tools.test/");diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/web_mcp/review_regressions.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/web_mcp/review_regressions.rsindex de37fb048..7d1ae38b9 100644--- a/moli-renderer-v8/src/script_vm/tests/browser_api/web_mcp/review_regressions.rs+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/web_mcp/review_regressions.rs@@ -1,6 +1,49 @@//! Regressions for policy, form lifecycle, task delivery and cancellation.use super::*;+#[test]+fn web_mcp_cancellation_rechecks_document_after_the_target_abort_listener() {+ for caller_retires in [false, true] {+ let mut vm = new_storage_page_task_executor_test_vm("https://tools.test/");+ vm.eval(&format!(r#"+ globalThis.log=[];+ globalThis.controller=new AbortController();+ globalThis.frame=document.createElement('iframe'); document.body.append(frame);+ const context=document.modelContext;+ context.addEventListener('toolcancel',()=>log.push('old toolcancel'));+ context.registerTool({{name:'wait',description:'Wait',execute(input,{{signal}}) {{+ globalThis.savedSignal=signal;+ signal.addEventListener('abort',()=>{{+ log.push('abort');+ document.open(); document.write('<!doctype html><body>new</body>'); document.close();+ document.modelContext.addEventListener('toolcancel',()=>log.push('new toolcancel'));+ }});+ return new Promise(()=>{{}});+ }}}}).then(()=>context.getTools()).then(([tool])=>{{+ const caller={caller_retires} ? frame.contentDocument.modelContext : context;+ return caller.executeTool(tool,{{}},{{signal:controller.signal}});+ }}).catch(()=>{{}});+ "#)).unwrap();+ assert_eq!(+ vm.eval_after_selected_page_tasks("savedSignal.aborted")+ .unwrap(),+ "false"+ );+ vm.eval(if caller_retires {+ "frame.remove()"+ } else {+ "controller.abort()"+ })+ .unwrap();+ assert_eq!(+ vm.eval_after_selected_page_tasks("savedSignal.aborted+'|'+log.join(',')")+ .unwrap(),+ "true|abort",+ "caller retirement: {caller_retires}"+ );+ }+}+#[test]fn web_mcp_target_can_complete_before_requested_cancellation_arrives() {for (result, expected) in [