Removing remaining CDP generic

Follow up to https://github.com/lightpanda-io/browser/pull/1990 which makes both BrowserContext and Command non-generic.
Merge pull request #2049 from lightpanda-io/refactor/getNodeDetails-param-order
2026-03-31 09:29:42 +00:00 · 2026-03-31 16:53:58 +08:00 · 2026-03-31 07:58:28 +02:00 · 2026-03-31 07:29:33 +02:00 · 2026-03-31 07:08:36 +02:00 · 2026-03-31 06:43:01 +02:00
37 changed files with 1092 additions and 939 deletions
--- a/src/Config.zig
+++ b/src/Config.zig
@@ -249,9 +249,7 @@ pub const Fetch = struct {
    with_frames: bool = false,
    strip: dump.Opts.Strip = .{},
    wait_ms: u32 = 5000,
-    wait_until: ?WaitUntil = null,
-    wait_script: ?[:0]const u8 = null,
-    wait_selector: ?[:0]const u8 = null,
+    wait_until: WaitUntil = .done,
 };

 pub const Common = struct {
@@ -415,24 +413,12 @@ pub fn printUsageAndExit(self: *const Config, success: bool) void {
        \\
        \\--with-frames   Includes the contents of iframes. Defaults to false.
        \\
-        \\--wait-ms       Wait time in milliseconds. Supersedes all other --wait
-        \\                parameters.
+        \\--wait-ms       Wait time in milliseconds.
        \\                Defaults to 5000.
        \\
-        \\--wait-until    Wait until the specified event. Checked before the other
-        \\                --wait- options. Supported events: load, domcontentloaded,
-        \\                networkidle, done.
-        \\                Defaults to 'done'. If --wait-selector, --wait-script or
-        \\                --wait-script-file are specified, defaults to none.
-        \\
-        \\--wait-selector Wait for an element matching the CSS selector to appear.
-        \\                Checked after --wait-until condition is met.
-        \\
-        \\--wait-script   Wait for a JavaScript expression to return truthy.
-        \\                Checked after --wait-until condition is met.
-        \\
-        \\--wait-script-file
-        \\                Like --wait-script, but reads the script from a file.
+        \\--wait-until    Wait until the specified event.
+        \\                Supported events: load, domcontentloaded, networkidle, done.
+        \\                Defaults to 'done'.
        \\
    ++ common_options ++
        \\
@@ -699,9 +685,7 @@ fn parseFetchArgs(
    var common: Common = .{};
    var strip: dump.Opts.Strip = .{};
    var wait_ms: u32 = 5000;
-    var wait_until: ?WaitUntil = null;
-    var wait_script: ?[:0]const u8 = null;
-    var wait_selector: ?[:0]const u8 = null;
+    var wait_until: WaitUntil = .done;

    while (args.next()) |opt| {
        if (std.mem.eql(u8, "--wait-ms", opt) or std.mem.eql(u8, "--wait_ms", opt)) {
@@ -728,36 +712,6 @@ fn parseFetchArgs(
            continue;
        }

-        if (std.mem.eql(u8, "--wait-selector", opt) or std.mem.eql(u8, "--wait_selector", opt)) {
-            const str = args.next() orelse {
-                log.fatal(.app, "missing argument value", .{ .arg = opt });
-                return error.InvalidArgument;
-            };
-            wait_selector = try allocator.dupeZ(u8, str);
-            continue;
-        }
-
-        if (std.mem.eql(u8, "--wait-script", opt) or std.mem.eql(u8, "--wait_script", opt)) {
-            const str = args.next() orelse {
-                log.fatal(.app, "missing argument value", .{ .arg = opt });
-                return error.InvalidArgument;
-            };
-            wait_script = try allocator.dupeZ(u8, str);
-            continue;
-        }
-
-        if (std.mem.eql(u8, "--wait-script-file", opt) or std.mem.eql(u8, "--wait_script_file", opt)) {
-            const path = args.next() orelse {
-                log.fatal(.app, "missing argument value", .{ .arg = opt });
-                return error.InvalidArgument;
-            };
-            wait_script = std.fs.cwd().readFileAllocOptions(allocator, path, 1024 * 1024, null, .of(u8), 0) catch |err| {
-                log.fatal(.app, "failed to read file", .{ .arg = opt, .path = path, .err = err });
-                return error.InvalidArgument;
-            };
-            continue;
-        }
-
        if (std.mem.eql(u8, "--dump", opt)) {
            var peek_args = args.*;
            if (peek_args.next()) |next_arg| {
@@ -848,8 +802,6 @@ fn parseFetchArgs(
        .with_frames = with_frames,
        .wait_ms = wait_ms,
        .wait_until = wait_until,
-        .wait_selector = wait_selector,
-        .wait_script = wait_script,
    };
 }

--- a/src/Notification.zig
+++ b/src/Notification.zig
@@ -74,6 +74,8 @@ const EventListeners = struct {
    page_network_idle: List = .{},
    page_network_almost_idle: List = .{},
    page_frame_created: List = .{},
+    page_dom_content_loaded: List = .{},
+    page_loaded: List = .{},
    http_request_fail: List = .{},
    http_request_start: List = .{},
    http_request_intercept: List = .{},
@@ -91,6 +93,8 @@ const Events = union(enum) {
    page_network_idle: *const PageNetworkIdle,
    page_network_almost_idle: *const PageNetworkAlmostIdle,
    page_frame_created: *const PageFrameCreated,
+    page_dom_content_loaded: *const PageDOMContentLoaded,
+    page_loaded: *const PageLoaded,
    http_request_fail: *const RequestFail,
    http_request_start: *const RequestStart,
    http_request_intercept: *const RequestIntercept,
@@ -137,6 +141,18 @@ pub const PageFrameCreated = struct {
    timestamp: u64,
 };

+pub const PageDOMContentLoaded = struct {
+    req_id: u32,
+    frame_id: u32,
+    timestamp: u64,
+};
+
+pub const PageLoaded = struct {
+    req_id: u32,
+    frame_id: u32,
+    timestamp: u64,
+};
+
 pub const RequestStart = struct {
    transfer: *Transfer,
 };
--- a/src/SemanticTree.zig
+++ b/src/SemanticTree.zig
@@ -95,9 +95,11 @@ const NodeData = struct {
    name: ?[]const u8,
    value: ?[]const u8,
    options: ?[]OptionData = null,
+    checked: ?bool = null,
    xpath: []const u8,
-    is_interactive: bool,
-    node_name: []const u8,
+    interactive: bool,
+    disabled: bool,
+    tag_name: []const u8,
 };

 const WalkContext = struct {
@@ -148,16 +150,21 @@ fn walk(
    const role = try axn.getRole();

    var is_interactive = false;
+    var is_disabled = false;
    var value: ?[]const u8 = null;
    var options: ?[]OptionData = null;
-    var node_name: []const u8 = "text";
+    var checked: ?bool = null;
+    var tag_name: []const u8 = "text";

    if (node.is(Element)) |el| {
-        node_name = el.getTagNameLower();
+        tag_name = el.getTagNameLower();

        if (el.is(Element.Html.Input)) |input| {
            value = input.getValue();
-            if (el.getAttributeSafe(comptime lp.String.wrap("list"))) |list_id| {
+            if (input._input_type == .checkbox or input._input_type == .radio) {
+                checked = input.getChecked();
+            }
+            if (el.getAttributeSafe(comptime .wrap("list"))) |list_id| {
                options = try extractDataListOptions(list_id, self.page, self.arena);
            }
        } else if (el.is(Element.Html.TextArea)) |textarea| {
@@ -172,8 +179,10 @@ fn walk(
                is_interactive = true;
            }
        }
+
+        is_disabled = el.isDisabled();
    } else if (node._type == .document or node._type == .document_fragment) {
-        node_name = "root";
+        tag_name = "root";
    }

    const initial_xpath_len = ctx.xpath_buffer.items.len;
@@ -234,9 +243,11 @@ fn walk(
        .name = name,
        .value = value,
        .options = options,
+        .checked = checked,
        .xpath = xpath,
-        .is_interactive = is_interactive,
-        .node_name = node_name,
+        .interactive = is_interactive,
+        .disabled = is_disabled,
+        .tag_name = tag_name,
    };

    if (should_visit) {
@@ -335,7 +346,7 @@ const JsonVisitor = struct {
        try self.jw.write(data.id);

        try self.jw.objectField("nodeName");
-        try self.jw.write(data.node_name);
+        try self.jw.write(data.tag_name);

        try self.jw.objectField("xpath");
        try self.jw.write(data.xpath);
@@ -345,7 +356,12 @@ const JsonVisitor = struct {
            try self.jw.write(1);

            try self.jw.objectField("isInteractive");
-            try self.jw.write(data.is_interactive);
+            try self.jw.write(data.interactive);
+
+            if (data.disabled) {
+                try self.jw.objectField("isDisabled");
+                try self.jw.write(true);
+            }

            try self.jw.objectField("role");
            try self.jw.write(data.role);
@@ -373,6 +389,11 @@ const JsonVisitor = struct {
                try self.jw.endObject();
            }

+            if (data.checked) |checked| {
+                try self.jw.objectField("checked");
+                try self.jw.write(checked);
+            }
+
            if (data.options) |options| {
                try self.jw.objectField("options");
                try self.jw.beginArray();
@@ -459,6 +480,9 @@ const TextVisitor = struct {
        const is_text_only = std.mem.eql(u8, data.role, "StaticText") or std.mem.eql(u8, data.role, "none") or std.mem.eql(u8, data.role, "generic");

        try self.writer.print("{d}", .{data.id});
+        if (data.interactive) {
+            try self.writer.writeAll(if (data.disabled) " [i:disabled]" else " [i]");
+        }
        if (!is_text_only) {
            try self.writer.print(" {s}", .{data.role});
        }
@@ -472,6 +496,14 @@ const TextVisitor = struct {
            }
        }

+        if (data.checked) |c| {
+            if (c) {
+                try self.writer.writeAll(" [checked]");
+            } else {
+                try self.writer.writeAll(" [unchecked]");
+            }
+        }
+
        if (data.options) |options| {
            try self.writer.writeAll(" options=[");
            for (options, 0..) |opt, i| {
@@ -509,13 +541,189 @@ const TextVisitor = struct {
    }
 };

+pub const NodeDetails = struct {
+    backendNodeId: CDPNode.Id,
+    tag_name: []const u8,
+    role: []const u8,
+    name: ?[]const u8,
+    interactive: bool,
+    disabled: bool,
+    value: ?[]const u8 = null,
+    input_type: ?[]const u8 = null,
+    placeholder: ?[]const u8 = null,
+    href: ?[]const u8 = null,
+    id: ?[]const u8 = null,
+    class: ?[]const u8 = null,
+    checked: ?bool = null,
+    options: ?[]OptionData = null,
+
+    pub fn jsonStringify(self: *const NodeDetails, jw: anytype) !void {
+        try jw.beginObject();
+
+        try jw.objectField("backendNodeId");
+        try jw.write(self.backendNodeId);
+
+        try jw.objectField("tagName");
+        try jw.write(self.tag_name);
+
+        try jw.objectField("role");
+        try jw.write(self.role);
+
+        if (self.name) |n| {
+            try jw.objectField("name");
+            try jw.write(n);
+        }
+
+        try jw.objectField("isInteractive");
+        try jw.write(self.interactive);
+
+        if (self.disabled) {
+            try jw.objectField("isDisabled");
+            try jw.write(true);
+        }
+
+        if (self.value) |v| {
+            try jw.objectField("value");
+            try jw.write(v);
+        }
+
+        if (self.input_type) |v| {
+            try jw.objectField("inputType");
+            try jw.write(v);
+        }
+
+        if (self.placeholder) |v| {
+            try jw.objectField("placeholder");
+            try jw.write(v);
+        }
+
+        if (self.href) |v| {
+            try jw.objectField("href");
+            try jw.write(v);
+        }
+
+        if (self.id) |v| {
+            try jw.objectField("id");
+            try jw.write(v);
+        }
+
+        if (self.class) |v| {
+            try jw.objectField("class");
+            try jw.write(v);
+        }
+
+        if (self.checked) |c| {
+            try jw.objectField("checked");
+            try jw.write(c);
+        }
+
+        if (self.options) |opts| {
+            try jw.objectField("options");
+            try jw.beginArray();
+            for (opts) |opt| {
+                try jw.beginObject();
+                try jw.objectField("value");
+                try jw.write(opt.value);
+                try jw.objectField("text");
+                try jw.write(opt.text);
+                if (opt.selected) {
+                    try jw.objectField("selected");
+                    try jw.write(true);
+                }
+                try jw.endObject();
+            }
+            try jw.endArray();
+        }
+
+        try jw.endObject();
+    }
+};
+
+pub fn getNodeDetails(
+    arena: std.mem.Allocator,
+    node: *Node,
+    registry: *CDPNode.Registry,
+    page: *Page,
+) !NodeDetails {
+    const cdp_node = try registry.register(node);
+    const axn = AXNode.fromNode(node);
+    const role = try axn.getRole();
+    const name = try axn.getName(page, arena);
+
+    var is_interactive = false;
+    var is_disabled = false;
+    var tag_name: []const u8 = "text";
+    var value: ?[]const u8 = null;
+    var input_type: ?[]const u8 = null;
+    var placeholder: ?[]const u8 = null;
+    var href: ?[]const u8 = null;
+    var id_attr: ?[]const u8 = null;
+    var class_attr: ?[]const u8 = null;
+    var checked: ?bool = null;
+    var options: ?[]OptionData = null;
+
+    if (node.is(Element)) |el| {
+        tag_name = el.getTagNameLower();
+        is_disabled = el.isDisabled();
+        id_attr = el.getAttributeSafe(comptime .wrap("id"));
+        class_attr = el.getAttributeSafe(comptime .wrap("class"));
+        placeholder = el.getAttributeSafe(comptime .wrap("placeholder"));
+
+        if (el.getAttributeSafe(comptime .wrap("href"))) |h| {
+            const URL = lp.URL;
+            href = URL.resolve(arena, page.base(), h, .{ .encode = true }) catch h;
+        }
+
+        if (el.is(Element.Html.Input)) |input| {
+            value = input.getValue();
+            input_type = input._input_type.toString();
+            if (input._input_type == .checkbox or input._input_type == .radio) {
+                checked = input.getChecked();
+            }
+            if (el.getAttributeSafe(comptime .wrap("list"))) |list_id| {
+                options = try extractDataListOptions(list_id, page, arena);
+            }
+        } else if (el.is(Element.Html.TextArea)) |textarea| {
+            value = textarea.getValue();
+        } else if (el.is(Element.Html.Select)) |select| {
+            value = select.getValue(page);
+            options = try extractSelectOptions(el.asNode(), page, arena);
+        }
+
+        if (el.is(Element.Html)) |html_el| {
+            const listener_targets = try interactive.buildListenerTargetMap(page, arena);
+            var pointer_events_cache: Element.PointerEventsCache = .empty;
+            if (interactive.classifyInteractivity(page, el, html_el, listener_targets, &pointer_events_cache) != null) {
+                is_interactive = true;
+            }
+        }
+    }
+
+    return .{
+        .backendNodeId = cdp_node.id,
+        .tag_name = tag_name,
+        .role = role,
+        .name = name,
+        .interactive = is_interactive,
+        .disabled = is_disabled,
+        .value = value,
+        .input_type = input_type,
+        .placeholder = placeholder,
+        .href = href,
+        .id = id_attr,
+        .class = class_attr,
+        .checked = checked,
+        .options = options,
+    };
+}
+
 const testing = @import("testing.zig");

 test "SemanticTree backendDOMNodeId" {
    var registry: CDPNode.Registry = .init(testing.allocator);
    defer registry.deinit();

-    var page = try testing.pageTest("cdp/registry1.html", .{});
+    var page = try testing.pageTest("cdp/registry1.html");
    defer testing.reset();
    defer page._session.removePage();

@@ -539,7 +747,7 @@ test "SemanticTree max_depth" {
    var registry: CDPNode.Registry = .init(testing.allocator);
    defer registry.deinit();

-    var page = try testing.pageTest("cdp/registry1.html", .{});
+    var page = try testing.pageTest("cdp/registry1.html");
    defer testing.reset();
    defer page._session.removePage();

--- a/src/browser/HttpClient.zig
+++ b/src/browser/HttpClient.zig
@@ -1348,15 +1348,15 @@ pub const Transfer = struct {
            }
        }

+        transfer.req.notification.dispatch(.http_response_header_done, &.{
+            .transfer = transfer,
+        });
+
        const proceed = transfer.req.header_callback(transfer) catch |err| {
            log.err(.http, "header_callback", .{ .err = err, .req = transfer });
            return err;
        };

-        transfer.req.notification.dispatch(.http_response_header_done, &.{
-            .transfer = transfer,
-        });
-
        return proceed and transfer.aborted == false;
    }

--- a/src/browser/Page.zig
+++ b/src/browser/Page.zig
@@ -487,7 +487,6 @@ pub fn navigate(self: *Page, request_url: [:0]const u8, opts: NavigateOpts) !voi
                return error.InjectBlankFailed;
            };
        }
-        self.documentIsComplete();

        session.notification.dispatch(.page_navigate, &.{
            .frame_id = self._frame_id,
@@ -519,6 +518,8 @@ pub fn navigate(self: *Page, request_url: [:0]const u8, opts: NavigateOpts) !voi

        // force next request id manually b/c we won't create a real req.
        _ = session.browser.http_client.incrReqId();
+
+        self.documentIsComplete();
        return;
    }

@@ -738,6 +739,12 @@ pub fn _documentIsLoaded(self: *Page) !void {
        self.document.asEventTarget(),
        event,
    );
+
+    self._session.notification.dispatch(.page_dom_content_loaded, &.{
+        .frame_id = self._frame_id,
+        .req_id = self._req_id,
+        .timestamp = timestamp(.monotonic),
+    });
 }

 pub fn scriptsCompletedLoading(self: *Page) void {
@@ -796,19 +803,6 @@ pub fn documentIsComplete(self: *Page) void {
    self._documentIsComplete() catch |err| {
        log.err(.page, "document is complete", .{ .err = err, .type = self._type, .url = self.url });
    };
-
-    if (self._navigated_options) |no| {
-        // _navigated_options will be null in special short-circuit cases, like
-        // "navigating" to about:blank, in which case this notification has
-        // already been sent
-        self._session.notification.dispatch(.page_navigated, &.{
-            .frame_id = self._frame_id,
-            .req_id = self._req_id,
-            .opts = no,
-            .url = self.url,
-            .timestamp = timestamp(.monotonic),
-        });
-    }
 }

 fn _documentIsComplete(self: *Page) !void {
@@ -827,6 +821,12 @@ fn _documentIsComplete(self: *Page) !void {
        try self._event_manager.dispatchDirect(window_target, event, self.window._on_load, .{ .inject_target = false, .context = "page load" });
    }

+    self._session.notification.dispatch(.page_loaded, &.{
+        .frame_id = self._frame_id,
+        .req_id = self._req_id,
+        .timestamp = timestamp(.monotonic),
+    });
+
    if (self._event_manager.hasDirectListeners(window_target, "pageshow", self.window._on_pageshow)) {
        const pageshow_event = (try PageTransitionEvent.initTrusted(comptime .wrap("pageshow"), .{}, self)).asEvent();
        try self._event_manager.dispatchDirect(window_target, pageshow_event, self.window._on_pageshow, .{ .context = "page show" });
@@ -879,6 +879,19 @@ fn pageHeaderDoneCallback(transfer: *HttpClient.Transfer) !bool {
        });
    }

+    if (self._navigated_options) |no| {
+        // _navigated_options will be null in special short-circuit cases, like
+        // "navigating" to about:blank, in which case this notification has
+        // already been sent
+        self._session.notification.dispatch(.page_navigated, &.{
+            .frame_id = self._frame_id,
+            .req_id = self._req_id,
+            .opts = no,
+            .url = self.url,
+            .timestamp = timestamp(.monotonic),
+        });
+    }
+
    return true;
 }

--- a/src/browser/Runner.zig
+++ b/src/browser/Runner.zig
@@ -22,14 +22,10 @@ const builtin = @import("builtin");

 const log = @import("../log.zig");

-const js = @import("js/js.zig");
 const Page = @import("Page.zig");
 const Session = @import("Session.zig");
 const HttpClient = @import("HttpClient.zig");

-const Node = @import("webapi/Node.zig");
-const Selector = @import("webapi/selector/Selector.zig");
-
 const IS_DEBUG = builtin.mode == .Debug;

 const Runner = @This();
@@ -240,111 +236,3 @@ fn _tick(self: *Runner, comptime is_cdp: bool, opts: TickOpts) !CDPTickResult {
        .raw_done => return .done,
    }
 }
-
-pub fn waitForSelector(self: *Runner, selector: [:0]const u8, timeout_ms: u32) !*Node.Element {
-    const arena = try self.session.getArena(.{ .debug = "Runner.waitForSelector" });
-    defer self.session.releaseArena(arena);
-
-    var timer = try std.time.Timer.start();
-    const parsed_selector = try Selector.parseLeaky(arena, selector);
-
-    while (true) {
-        // self.page can change between ticks
-        const page = self.page;
-        if (try parsed_selector.query(page.document.asNode(), page)) |el| {
-            return el;
-        }
-
-        const elapsed: u32 = @intCast(timer.read() / std.time.ns_per_ms);
-        if (elapsed >= timeout_ms) {
-            return error.Timeout;
-        }
-        switch (try self.tick(.{ .ms = timeout_ms - elapsed })) {
-            .done => return error.Timeout,
-            .ok => |recommended_sleep_ms| {
-                if (recommended_sleep_ms > 0) {
-                    std.Thread.sleep(std.time.ns_per_ms * recommended_sleep_ms);
-                }
-            },
-        }
-    }
-}
-
-pub fn waitForScript(runner: *Runner, script: [:0]const u8, timeout_ms: u32) !void {
-    var timer = try std.time.Timer.start();
-
-    while (true) {
-        const page = runner.page;
-
-        // Execute the script and check if it returns truthy
-        var ls: js.Local.Scope = undefined;
-        page.js.localScope(&ls);
-        defer ls.deinit();
-
-        var try_catch: js.TryCatch = undefined;
-        try_catch.init(&ls.local);
-        defer try_catch.deinit();
-
-        const value = ls.local.exec(script, "wait_script") catch |err| {
-            const caught = try_catch.caughtOrError(page.call_arena, err);
-            log.err(.app, "wait script error", .{ .err = caught });
-            return error.ScriptError;
-        };
-
-        if (value.toBool()) {
-            return;
-        }
-
-        const elapsed: u32 = @intCast(timer.read() / std.time.ns_per_ms);
-        if (elapsed >= timeout_ms) {
-            return error.Timeout;
-        }
-        switch (try runner.tick(.{ .ms = timeout_ms - elapsed })) {
-            .done => return error.Timeout,
-            .ok => |recommended_sleep_ms| {
-                if (recommended_sleep_ms > 0) {
-                    std.Thread.sleep(std.time.ns_per_ms * recommended_sleep_ms);
-                }
-            },
-        }
-    }
-}
-
-const testing = @import("../testing.zig");
-test "Runner: no page" {
-    try testing.expectError(error.NoPage, Runner.init(testing.test_session, .{}));
-}
-
-test "Runner: waitForSelector timeout" {
-    const page = try testing.pageTest("runner/runner1.html", .{});
-    defer page._session.removePage();
-
-    var runner = try page._session.runner(.{});
-    try testing.expectError(error.Timeout, runner.waitForSelector("#nope", 10));
-}
-
-test "Runner: waitForSelector" {
-    defer testing.reset();
-    const page = try testing.pageTest("runner/runner1.html", .{});
-    defer page._session.removePage();
-
-    var runner = try page._session.runner(.{});
-    const el = try runner.waitForSelector("#sel1", 10);
-    try testing.expectEqual("selector-1-content", try el.asNode().getTextContentAlloc(testing.arena_allocator));
-}
-
-test "Runner: waitForScript timeout" {
-    const page = try testing.pageTest("runner/runner1.html", .{});
-    defer page._session.removePage();
-
-    var runner = try page._session.runner(.{});
-    try testing.expectError(error.Timeout, runner.waitForScript("document.querySelector('#nope')", 10));
-}
-
-test "Runner: waitForScript" {
-    const page = try testing.pageTest("runner/runner1.html", .{});
-    defer page._session.removePage();
-
-    var runner = try page._session.runner(.{});
-    try runner.waitForScript("document.querySelector('#sel1')", 10);
-}
--- a/src/browser/StyleManager.zig
+++ b/src/browser/StyleManager.zig
@@ -114,7 +114,7 @@ fn addRawRule(self: *StyleManager, selector_text: []const u8, block_text: []cons

    if (!props.isRelevant()) return;

-    const selectors = SelectorParser.parseList(self.arena, selector_text) catch return;
+    const selectors = SelectorParser.parseList(self.arena, selector_text, self.page) catch return;
    for (selectors) |selector| {
        const rightmost = if (selector.segments.len > 0) selector.segments[selector.segments.len - 1].compound else selector.first;
        const bucket_key = getBucketKey(rightmost) orelse continue;
@@ -484,7 +484,7 @@ fn addRule(self: *StyleManager, style_rule: *CSSStyleRule) !void {
    }

    // Parse the selector list
-    const selectors = SelectorParser.parseList(self.arena, selector_text) catch return;
+    const selectors = SelectorParser.parseList(self.arena, selector_text, self.page) catch return;
    if (selectors.len == 0) {
        return;
    }
--- a/src/browser/actions.zig
+++ b/src/browser/actions.zig
@@ -110,10 +110,28 @@ pub fn waitForSelector(selector: [:0]const u8, timeout_ms: u32, session: *Sessio
    var runner = try session.runner(.{});
    try runner.wait(.{ .ms = timeout_ms, .until = .load });

-    const elapsed: u32 = @intCast(timer.read() / std.time.ns_per_ms);
-    const remaining = timeout_ms -| elapsed;
-    if (remaining == 0) return error.Timeout;
+    while (true) {
+        const page = runner.page;
+        const element = Selector.querySelector(page.document.asNode(), selector, page) catch {
+            return error.InvalidSelector;
+        };

-    const el = try runner.waitForSelector(selector, timeout_ms);
-    return el.asNode();
+        if (element) |el| {
+            return el.asNode();
+        }
+
+        const elapsed: u32 = @intCast(timer.read() / std.time.ns_per_ms);
+        if (elapsed >= timeout_ms) {
+            return error.Timeout;
+        }
+        switch (try runner.tick(.{ .ms = timeout_ms - elapsed })) {
+            .done => return error.Timeout,
+            .ok => |recommended_sleep_ms| {
+                if (recommended_sleep_ms > 0) {
+                    // guanrateed to be <= 20ms
+                    std.Thread.sleep(std.time.ns_per_ms * recommended_sleep_ms);
+                }
+            },
+        }
+    }
 }
--- a/src/browser/tests/runner/runner1.html
+++ b/src/browser/tests/runner/runner1.html
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset="UTF-8">
-<div id=sel0>selector-0-content</div>
-<div id=sel1>selector-1-content</div>
--- a/src/browser/webapi/element/Attribute.zig
+++ b/src/browser/webapi/element/Attribute.zig
@@ -26,8 +26,6 @@ const GenericIterator = @import("../collections/iterator.zig").Entry;
 const Page = @import("../../Page.zig");
 const String = @import("../../../string.zig").String;

-const Allocator = std.mem.Allocator;
-
 const IS_DEBUG = @import("builtin").mode == .Debug;

 pub fn registerTypes() []const type {
@@ -421,7 +419,7 @@ pub fn validateAttributeName(name: String) !void {
    }
 }

-fn normalizeNameForLookup(name: String, page: *Page) !String {
+pub fn normalizeNameForLookup(name: String, page: *Page) !String {
    if (!needsLowerCasing(name.str())) {
        return name;
    }
@@ -433,14 +431,6 @@ fn normalizeNameForLookup(name: String, page: *Page) !String {
    return .wrap(normalized);
 }

-pub fn normalizeNameForLookupAlloc(allocator: Allocator, name: String) !String {
-    if (!needsLowerCasing(name.str())) {
-        return name.dupe(allocator);
-    }
-    const normalized = try std.ascii.allocLowerString(allocator, name.str());
-    return .wrap(normalized);
-}
-
 fn needsLowerCasing(name: []const u8) bool {
    var remaining = name;
    if (comptime std.simd.suggestVectorLength(u8)) |vector_len| {
--- a/src/browser/webapi/selector/Parser.zig
+++ b/src/browser/webapi/selector/Parser.zig
@@ -74,7 +74,7 @@ fn preprocessInput(arena: Allocator, input: []const u8) ![]const u8 {
    return result.items;
 }

-pub fn parseList(arena: Allocator, input: []const u8) ParseError![]const Selector.Selector {
+pub fn parseList(arena: Allocator, input: []const u8, page: *Page) ParseError![]const Selector.Selector {
    // Preprocess input to normalize line endings
    const preprocessed = try preprocessInput(arena, input);

@@ -140,7 +140,7 @@ pub fn parseList(arena: Allocator, input: []const u8) ParseError![]const Selecto
        const selector_input = std.mem.trimRight(u8, trimmed[0..comma_pos], &std.ascii.whitespace);

        if (selector_input.len > 0) {
-            const selector = try parse(arena, selector_input);
+            const selector = try parse(arena, selector_input, page);
            try selectors.append(arena, selector);
        }

@@ -155,7 +155,7 @@ pub fn parseList(arena: Allocator, input: []const u8) ParseError![]const Selecto
    return selectors.items;
 }

-pub fn parse(arena: Allocator, input: []const u8) ParseError!Selector.Selector {
+pub fn parse(arena: Allocator, input: []const u8, page: *Page) ParseError!Selector.Selector {
    var parser = Parser{ .input = input };
    var segments: std.ArrayList(Segment) = .empty;
    var current_compound: std.ArrayList(Part) = .empty;
@@ -164,7 +164,7 @@ pub fn parse(arena: Allocator, input: []const u8) ParseError!Selector.Selector {
    while (parser.skipSpaces()) {
        if (parser.peek() == 0) break;

-        const part = try parser.parsePart(arena);
+        const part = try parser.parsePart(arena, page);
        try current_compound.append(arena, part);

        // Check what comes after this part
@@ -238,7 +238,7 @@ pub fn parse(arena: Allocator, input: []const u8) ParseError!Selector.Selector {
        while (parser.skipSpaces()) {
            if (parser.peek() == 0) break;

-            const part = try parser.parsePart(arena);
+            const part = try parser.parsePart(arena, page);
            try current_compound.append(arena, part);

            // Check what comes after this part
@@ -289,7 +289,7 @@ pub fn parse(arena: Allocator, input: []const u8) ParseError!Selector.Selector {
    };
 }

-fn parsePart(self: *Parser, arena: Allocator) !Part {
+fn parsePart(self: *Parser, arena: Allocator, page: *Page) !Part {
    return switch (self.peek()) {
        '#' => .{ .id = try self.id(arena) },
        '.' => .{ .class = try self.class(arena) },
@@ -297,17 +297,16 @@ fn parsePart(self: *Parser, arena: Allocator) !Part {
            self.input = self.input[1..];
            break :blk .universal;
        },
-        '[' => .{ .attribute = try self.attribute(arena) },
-        ':' => .{ .pseudo_class = try self.pseudoClass(arena) },
+        '[' => .{ .attribute = try self.attribute(arena, page) },
+        ':' => .{ .pseudo_class = try self.pseudoClass(arena, page) },
        'a'...'z', 'A'...'Z', '_', '\\', 0x80...0xFF => blk: {
            // Use parseIdentifier for full escape support
            const tag_name = try self.parseIdentifier(arena, error.InvalidTagSelector);
            if (tag_name.len > 256) {
                return error.InvalidTagSelector;
            }
-            var buf: [256]u8 = undefined;
            // Try to match as a known tag enum for optimization
-            const lower = std.ascii.lowerString(&buf, tag_name);
+            const lower = std.ascii.lowerString(&page.buf, tag_name);
            if (Node.Element.Tag.parseForMatch(lower)) |known_tag| {
                break :blk .{ .tag = known_tag };
            }
@@ -374,7 +373,7 @@ fn consumeUntilCommaOrParen(self: *Parser) []const u8 {
    return result;
 }

-fn pseudoClass(self: *Parser, arena: Allocator) !Selector.PseudoClass {
+fn pseudoClass(self: *Parser, arena: Allocator, page: *Page) !Selector.PseudoClass {
    if (comptime IS_DEBUG) {
        // Should have been verified by caller
        std.debug.assert(self.peek() == ':');
@@ -446,7 +445,7 @@ fn pseudoClass(self: *Parser, arena: Allocator) !Selector.PseudoClass {
                if (self.peek() == 0) return error.InvalidPseudoClass;

                // Parse a full selector (with potential combinators and compounds)
-                const selector = try parse(arena, self.consumeUntilCommaOrParen());
+                const selector = try parse(arena, self.consumeUntilCommaOrParen(), page);
                try selectors.append(arena, selector);

                _ = self.skipSpaces();
@@ -473,7 +472,7 @@ fn pseudoClass(self: *Parser, arena: Allocator) !Selector.PseudoClass {
                if (self.peek() == ')') break;
                if (self.peek() == 0) return error.InvalidPseudoClass;

-                const selector = try parse(arena, self.consumeUntilCommaOrParen());
+                const selector = try parse(arena, self.consumeUntilCommaOrParen(), page);
                try selectors.append(arena, selector);

                _ = self.skipSpaces();
@@ -500,7 +499,7 @@ fn pseudoClass(self: *Parser, arena: Allocator) !Selector.PseudoClass {
                if (self.peek() == ')') break;
                if (self.peek() == 0) return error.InvalidPseudoClass;

-                const selector = try parse(arena, self.consumeUntilCommaOrParen());
+                const selector = try parse(arena, self.consumeUntilCommaOrParen(), page);
                try selectors.append(arena, selector);

                _ = self.skipSpaces();
@@ -527,7 +526,7 @@ fn pseudoClass(self: *Parser, arena: Allocator) !Selector.PseudoClass {
                if (self.peek() == ')') break;
                if (self.peek() == 0) return error.InvalidPseudoClass;

-                const selector = try parse(arena, self.consumeUntilCommaOrParen());
+                const selector = try parse(arena, self.consumeUntilCommaOrParen(), page);
                try selectors.append(arena, selector);

                _ = self.skipSpaces();
@@ -899,7 +898,7 @@ fn tag(self: *Parser) ![]const u8 {
    return input[0..i];
 }

-fn attribute(self: *Parser, arena: Allocator) !Selector.Attribute {
+fn attribute(self: *Parser, arena: Allocator, page: *Page) !Selector.Attribute {
    if (comptime IS_DEBUG) {
        // should have been verified by caller
        std.debug.assert(self.peek() == '[');
@@ -911,7 +910,8 @@ fn attribute(self: *Parser, arena: Allocator) !Selector.Attribute {
    const attr_name = try self.attributeName();

    // Normalize the name to lowercase for fast matching (consistent with Attribute.normalizeNameForLookup)
-    const name = try Attribute.normalizeNameForLookupAlloc(arena, .wrap(attr_name));
+    const normalized = try Attribute.normalizeNameForLookup(.wrap(attr_name), page);
+    const name = try normalized.dupe(arena);
    var case_insensitive = false;
    _ = self.skipSpaces();

--- a/src/browser/webapi/selector/Selector.zig
+++ b/src/browser/webapi/selector/Selector.zig
@@ -20,24 +20,41 @@ const std = @import("std");

 const String = @import("../../../string.zig").String;

+const Parser = @import("Parser.zig");
 const Node = @import("../Node.zig");
 const Page = @import("../../Page.zig");
-
-const Parser = @import("Parser.zig");
 pub const List = @import("List.zig");

-const Allocator = std.mem.Allocator;
-
-pub fn parseLeaky(arena: Allocator, input: []const u8) !Parsed {
+pub fn querySelector(root: *Node, input: []const u8, page: *Page) !?*Node.Element {
    if (input.len == 0) {
        return error.SyntaxError;
    }
-    return .{ .selectors = try Parser.parseList(arena, input) };
-}

-pub fn querySelector(root: *Node, input: []const u8, page: *Page) !?*Node.Element {
-    const parsed = try parseLeaky(page.call_arena, input);
-    return parsed.query(root, page);
+    const arena = page.call_arena;
+    const selectors = try Parser.parseList(arena, input, page);
+
+    for (selectors) |selector| {
+        // Fast path: single compound with only an ID selector
+        if (selector.segments.len == 0 and selector.first.parts.len == 1) {
+            const first = selector.first.parts[0];
+            if (first == .id) {
+                const el = page.getElementByIdFromNode(root, first.id) orelse continue;
+                // Check if the element is within the root subtree
+                const node = el.asNode();
+                if (node != root and root.contains(node)) {
+                    return el;
+                }
+                continue;
+            }
+        }
+
+        if (List.initOne(root, selector, page)) |node| {
+            if (node.is(Node.Element)) |el| {
+                return el;
+            }
+        }
+    }
+    return null;
 }

 pub fn querySelectorAll(root: *Node, input: []const u8, page: *Page) !*List {
@@ -50,7 +67,7 @@ pub fn querySelectorAll(root: *Node, input: []const u8, page: *Page) !*List {

    var nodes: std.AutoArrayHashMapUnmanaged(*Node, void) = .empty;

-    const selectors = try Parser.parseList(arena, input);
+    const selectors = try Parser.parseList(arena, input, page);
    for (selectors) |selector| {
        try List.collect(arena, root, selector, &nodes, page);
    }
@@ -69,7 +86,7 @@ pub fn matches(el: *Node.Element, input: []const u8, page: *Page) !bool {
    }

    const arena = page.call_arena;
-    const selectors = try Parser.parseList(arena, input);
+    const selectors = try Parser.parseList(arena, input, page);

    for (selectors) |selector| {
        if (List.matches(el.asNode(), selector, el.asNode(), page)) {
@@ -87,7 +104,7 @@ pub fn matchesWithScope(el: *Node.Element, input: []const u8, scope: *Node.Eleme
    }

    const arena = page.call_arena;
-    const selectors = try Parser.parseList(arena, input);
+    const selectors = try Parser.parseList(arena, input, page);

    for (selectors) |selector| {
        if (List.matches(el.asNode(), selector, scope.asNode(), page)) {
@@ -275,32 +292,3 @@ pub const Selector = struct {
        }
    }
 };
-
-pub const Parsed = struct {
-    selectors: []const Selector,
-
-    pub fn query(self: Parsed, root: *Node, page: *Page) !?*Node.Element {
-        for (self.selectors) |selector| {
-            // Fast path: single compound with only an ID selector
-            if (selector.segments.len == 0 and selector.first.parts.len == 1) {
-                const first = selector.first.parts[0];
-                if (first == .id) {
-                    const el = page.getElementByIdFromNode(root, first.id) orelse continue;
-                    // Check if the element is within the root subtree
-                    const node = el.asNode();
-                    if (node != root and root.contains(node)) {
-                        return el;
-                    }
-                    continue;
-                }
-            }
-
-            if (List.initOne(root, selector, page)) |node| {
-                if (node.is(Node.Element)) |el| {
-                    return el;
-                }
-            }
-        }
-        return null;
-    }
-};
--- a/src/cdp/AXNode.zig
+++ b/src/cdp/AXNode.zig
@@ -1179,7 +1179,7 @@ test "AXNode: writer" {
    var registry = Node.Registry.init(testing.allocator);
    defer registry.deinit();

-    var page = try testing.pageTest("cdp/dom3.html", .{});
+    var page = try testing.pageTest("cdp/dom3.html");
    defer page._session.removePage();
    var doc = page.window._document;

--- a/src/cdp/CDP.zig
+++ b/src/cdp/CDP.zig
--- a/src/cdp/Node.zig
+++ b/src/cdp/Node.zig
@@ -343,7 +343,7 @@ test "cdp Node: Registry register" {
    try testing.expectEqual(0, registry.lookup_by_id.count());
    try testing.expectEqual(0, registry.lookup_by_node.count());

-    var page = try testing.pageTest("cdp/registry1.html", .{});
+    var page = try testing.pageTest("cdp/registry1.html");
    defer page._session.removePage();
    var doc = page.window._document;

@@ -400,7 +400,7 @@ test "cdp Node: search list" {
    }

    {
-        var page = try testing.pageTest("cdp/registry2.html", .{});
+        var page = try testing.pageTest("cdp/registry2.html");
        defer page._session.removePage();
        var doc = page.window._document;

@@ -440,7 +440,7 @@ test "cdp Node: Writer" {
    var registry = Registry.init(testing.allocator);
    defer registry.deinit();

-    var page = try testing.pageTest("cdp/registry3.html", .{});
+    var page = try testing.pageTest("cdp/registry3.html");
    defer page._session.removePage();
    var doc = page.window._document;

--- a/src/cdp/domains/accessibility.zig
+++ b/src/cdp/domains/accessibility.zig
@@ -18,8 +18,9 @@

 const std = @import("std");
 const id = @import("../id.zig");
+const CDP = @import("../CDP.zig");

-pub fn processMessage(cmd: anytype) !void {
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        enable,
        disable,
@@ -32,15 +33,15 @@ pub fn processMessage(cmd: anytype) !void {
        .getFullAXTree => return getFullAXTree(cmd),
    }
 }
-fn enable(cmd: anytype) !void {
+fn enable(cmd: *CDP.Command) !void {
    return cmd.sendResult(null, .{});
 }

-fn disable(cmd: anytype) !void {
+fn disable(cmd: *CDP.Command) !void {
    return cmd.sendResult(null, .{});
 }

-fn getFullAXTree(cmd: anytype) !void {
+fn getFullAXTree(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        depth: ?i32 = null,
        frameId: ?[]const u8 = null,
--- a/src/cdp/domains/browser.zig
+++ b/src/cdp/domains/browser.zig
@@ -17,6 +17,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.

 const std = @import("std");
+const CDP = @import("../CDP.zig");

 // TODO: hard coded data
 const PROTOCOL_VERSION = "1.3";
@@ -35,7 +36,7 @@ const PRODUCT = "Chrome/124.0.6367.29";
 const JS_VERSION = "12.4.254.8";
 const DEV_TOOLS_WINDOW_ID = 1923710101;

-pub fn processMessage(cmd: anytype) !void {
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        getVersion,
        setPermission,
@@ -57,7 +58,7 @@ pub fn processMessage(cmd: anytype) !void {
    }
 }

-fn getVersion(cmd: anytype) !void {
+fn getVersion(cmd: *CDP.Command) !void {
    // TODO: pre-serialize?
    return cmd.sendResult(.{
        .protocolVersion = PROTOCOL_VERSION,
@@ -69,7 +70,7 @@ fn getVersion(cmd: anytype) !void {
 }

 // TODO: noop method
-fn setDownloadBehavior(cmd: anytype) !void {
+fn setDownloadBehavior(cmd: *CDP.Command) !void {
    // const params = (try cmd.params(struct {
    //     behavior: []const u8,
    //     browserContextId: ?[]const u8 = null,
@@ -80,7 +81,7 @@ fn setDownloadBehavior(cmd: anytype) !void {
    return cmd.sendResult(null, .{ .include_session_id = false });
 }

-fn getWindowForTarget(cmd: anytype) !void {
+fn getWindowForTarget(cmd: *CDP.Command) !void {
    // const params = (try cmd.params(struct {
    //     targetId: ?[]const u8 = null,
    // })) orelse return error.InvalidParams;
@@ -91,22 +92,22 @@ fn getWindowForTarget(cmd: anytype) !void {
 }

 // TODO: noop method
-fn setWindowBounds(cmd: anytype) !void {
+fn setWindowBounds(cmd: *CDP.Command) !void {
    return cmd.sendResult(null, .{});
 }

 // TODO: noop method
-fn grantPermissions(cmd: anytype) !void {
+fn grantPermissions(cmd: *CDP.Command) !void {
    return cmd.sendResult(null, .{});
 }

 // TODO: noop method
-fn setPermission(cmd: anytype) !void {
+fn setPermission(cmd: *CDP.Command) !void {
    return cmd.sendResult(null, .{});
 }

 // TODO: noop method
-fn resetPermissions(cmd: anytype) !void {
+fn resetPermissions(cmd: *CDP.Command) !void {
    return cmd.sendResult(null, .{});
 }

--- a/src/cdp/domains/css.zig
+++ b/src/cdp/domains/css.zig
@@ -17,8 +17,9 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.

 const std = @import("std");
+const CDP = @import("../CDP.zig");

-pub fn processMessage(cmd: anytype) !void {
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        enable,
    }, cmd.input.action) orelse return error.UnknownMethod;
--- a/src/cdp/domains/dom.zig
+++ b/src/cdp/domains/dom.zig
@@ -18,17 +18,18 @@

 const std = @import("std");
 const id = @import("../id.zig");
-const log = @import("../../log.zig");
+const CDP = @import("../CDP.zig");
 const Node = @import("../Node.zig");
+
+const log = @import("../../log.zig");
+const dump = @import("../../browser/dump.zig");
+const js = @import("../../browser/js/js.zig");
 const DOMNode = @import("../../browser/webapi/Node.zig");
 const Selector = @import("../../browser/webapi/selector/Selector.zig");

-const dump = @import("../../browser/dump.zig");
-const js = @import("../../browser/js/js.zig");
-
 const Allocator = std.mem.Allocator;

-pub fn processMessage(cmd: anytype) !void {
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        enable,
        getDocument,
@@ -69,7 +70,7 @@ pub fn processMessage(cmd: anytype) !void {
 }

 // https://chromedevtools.github.io/devtools-protocol/tot/DOM/#method-getDocument
-fn getDocument(cmd: anytype) !void {
+fn getDocument(cmd: *CDP.Command) !void {
    const Params = struct {
        // CDP documentation implies that 0 isn't valid, but it _does_ work in Chrome
        depth: i32 = 3,
@@ -89,7 +90,7 @@ fn getDocument(cmd: anytype) !void {
 }

 // https://chromedevtools.github.io/devtools-protocol/tot/DOM/#method-performSearch
-fn performSearch(cmd: anytype) !void {
+fn performSearch(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        query: []const u8,
        includeUserAgentShadowDOM: ?bool = null,
@@ -116,7 +117,7 @@ fn performSearch(cmd: anytype) !void {
 // hierarchy of each nodes.
 // We dispatch event in the reverse order: from the top level to the direct parents.
 // We should dispatch a node only if it has never been sent.
-fn dispatchSetChildNodes(cmd: anytype, dom_nodes: []const *DOMNode) !void {
+fn dispatchSetChildNodes(cmd: *CDP.Command, dom_nodes: []const *DOMNode) !void {
    const arena = cmd.arena;
    const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;
    const session_id = bc.session_id orelse return error.SessionIdNotLoaded;
@@ -172,7 +173,7 @@ fn dispatchSetChildNodes(cmd: anytype, dom_nodes: []const *DOMNode) !void {
 }

 // https://chromedevtools.github.io/devtools-protocol/tot/DOM/#method-discardSearchResults
-fn discardSearchResults(cmd: anytype) !void {
+fn discardSearchResults(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        searchId: []const u8,
    })) orelse return error.InvalidParams;
@@ -184,7 +185,7 @@ fn discardSearchResults(cmd: anytype) !void {
 }

 // https://chromedevtools.github.io/devtools-protocol/tot/DOM/#method-getSearchResults
-fn getSearchResults(cmd: anytype) !void {
+fn getSearchResults(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        searchId: []const u8,
        fromIndex: u32,
@@ -209,7 +210,7 @@ fn getSearchResults(cmd: anytype) !void {
    return cmd.sendResult(.{ .nodeIds = node_ids[params.fromIndex..params.toIndex] }, .{});
 }

-fn querySelector(cmd: anytype) !void {
+fn querySelector(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        nodeId: Node.Id,
        selector: []const u8,
@@ -235,7 +236,7 @@ fn querySelector(cmd: anytype) !void {
    }, .{});
 }

-fn querySelectorAll(cmd: anytype) !void {
+fn querySelectorAll(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        nodeId: Node.Id,
        selector: []const u8,
@@ -266,7 +267,7 @@ fn querySelectorAll(cmd: anytype) !void {
    }, .{});
 }

-fn resolveNode(cmd: anytype) !void {
+fn resolveNode(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        nodeId: ?Node.Id = null,
        backendNodeId: ?u32 = null,
@@ -327,7 +328,7 @@ fn resolveNode(cmd: anytype) !void {
    } }, .{});
 }

-fn describeNode(cmd: anytype) !void {
+fn describeNode(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        nodeId: ?Node.Id = null,
        backendNodeId: ?Node.Id = null,
@@ -374,7 +375,7 @@ fn rectToQuad(rect: DOMNode.Element.DOMRect) Quad {
    };
 }

-fn scrollIntoViewIfNeeded(cmd: anytype) !void {
+fn scrollIntoViewIfNeeded(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        nodeId: ?Node.Id = null,
        backendNodeId: ?u32 = null,
@@ -397,7 +398,7 @@ fn scrollIntoViewIfNeeded(cmd: anytype) !void {
    return cmd.sendResult(null, .{});
 }

-fn getNode(arena: Allocator, bc: anytype, node_id: ?Node.Id, backend_node_id: ?Node.Id, object_id: ?[]const u8) !*Node {
+fn getNode(arena: Allocator, bc: *CDP.BrowserContext, node_id: ?Node.Id, backend_node_id: ?Node.Id, object_id: ?[]const u8) !*Node {
    const input_node_id = node_id orelse backend_node_id;
    if (input_node_id) |input_node_id_| {
        return bc.node_registry.lookup_by_id.get(input_node_id_) orelse return error.NodeNotFound;
@@ -417,7 +418,7 @@ fn getNode(arena: Allocator, bc: anytype, node_id: ?Node.Id, backend_node_id: ?N

 // https://chromedevtools.github.io/devtools-protocol/tot/DOM/#method-getContentQuads
 // Related to: https://drafts.csswg.org/cssom-view/#the-geometryutils-interface
-fn getContentQuads(cmd: anytype) !void {
+fn getContentQuads(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        nodeId: ?Node.Id = null,
        backendNodeId: ?Node.Id = null,
@@ -443,7 +444,7 @@ fn getContentQuads(cmd: anytype) !void {
    return cmd.sendResult(.{ .quads = &.{quad} }, .{});
 }

-fn getBoxModel(cmd: anytype) !void {
+fn getBoxModel(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        nodeId: ?Node.Id = null,
        backendNodeId: ?u32 = null,
@@ -472,7 +473,7 @@ fn getBoxModel(cmd: anytype) !void {
    } }, .{});
 }

-fn requestChildNodes(cmd: anytype) !void {
+fn requestChildNodes(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        nodeId: Node.Id,
        depth: i32 = 1,
@@ -496,7 +497,7 @@ fn requestChildNodes(cmd: anytype) !void {
    return cmd.sendResult(null, .{});
 }

-fn getFrameOwner(cmd: anytype) !void {
+fn getFrameOwner(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        frameId: []const u8,
    })) orelse return error.InvalidParams;
@@ -512,7 +513,7 @@ fn getFrameOwner(cmd: anytype) !void {
    return cmd.sendResult(.{ .nodeId = node.id, .backendNodeId = node.id }, .{});
 }

-fn getOuterHTML(cmd: anytype) !void {
+fn getOuterHTML(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        nodeId: ?Node.Id = null,
        backendNodeId: ?Node.Id = null,
@@ -534,7 +535,7 @@ fn getOuterHTML(cmd: anytype) !void {
    return cmd.sendResult(.{ .outerHTML = aw.written() }, .{});
 }

-fn requestNode(cmd: anytype) !void {
+fn requestNode(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        objectId: []const u8,
    })) orelse return error.InvalidParams;
--- a/src/cdp/domains/emulation.zig
+++ b/src/cdp/domains/emulation.zig
@@ -17,9 +17,10 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.

 const std = @import("std");
+const CDP = @import("../CDP.zig");
 const log = @import("../../log.zig");

-pub fn processMessage(cmd: anytype) !void {
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        setEmulatedMedia,
        setFocusEmulationEnabled,
@@ -38,7 +39,7 @@ pub fn processMessage(cmd: anytype) !void {
 }

 // TODO: noop method
-fn setEmulatedMedia(cmd: anytype) !void {
+fn setEmulatedMedia(cmd: *CDP.Command) !void {
    // const input = (try const incoming.params(struct {
    //     media: ?[]const u8 = null,
    //     features: ?[]struct{
@@ -51,7 +52,7 @@ fn setEmulatedMedia(cmd: anytype) !void {
 }

 // TODO: noop method
-fn setFocusEmulationEnabled(cmd: anytype) !void {
+fn setFocusEmulationEnabled(cmd: *CDP.Command) !void {
    // const input = (try const incoming.params(struct {
    //     enabled: bool,
    // })) orelse return error.InvalidParams;
@@ -59,16 +60,16 @@ fn setFocusEmulationEnabled(cmd: anytype) !void {
 }

 // TODO: noop method
-fn setDeviceMetricsOverride(cmd: anytype) !void {
+fn setDeviceMetricsOverride(cmd: *CDP.Command) !void {
    return cmd.sendResult(null, .{});
 }

 // TODO: noop method
-fn setTouchEmulationEnabled(cmd: anytype) !void {
+fn setTouchEmulationEnabled(cmd: *CDP.Command) !void {
    return cmd.sendResult(null, .{});
 }

-fn setUserAgentOverride(cmd: anytype) !void {
+fn setUserAgentOverride(cmd: *CDP.Command) !void {
    log.info(.app, "setUserAgentOverride ignored", .{});
    return cmd.sendResult(null, .{});
 }
--- a/src/cdp/domains/fetch.zig
+++ b/src/cdp/domains/fetch.zig
@@ -17,17 +17,19 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.

 const std = @import("std");
-const Allocator = std.mem.Allocator;

 const id = @import("../id.zig");
+const CDP = @import("../CDP.zig");
 const log = @import("../../log.zig");
-const network = @import("network.zig");

 const HttpClient = @import("../../browser/HttpClient.zig");
 const net_http = @import("../../network/http.zig");
 const Notification = @import("../../Notification.zig");

-pub fn processMessage(cmd: anytype) !void {
+const network = @import("network.zig");
+const Allocator = std.mem.Allocator;
+
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        disable,
        enable,
@@ -135,13 +137,13 @@ const ErrorReason = enum {
    BlockedByResponse,
 };

-fn disable(cmd: anytype) !void {
+fn disable(cmd: *CDP.Command) !void {
    const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;
    bc.fetchDisable();
    return cmd.sendResult(null, .{});
 }

-fn enable(cmd: anytype) !void {
+fn enable(cmd: *CDP.Command) !void {
    const params = (try cmd.params(EnableParam)) orelse EnableParam{};
    if (!arePatternsSupported(params.patterns)) {
        log.warn(.not_implemented, "Fetch.enable", .{ .params = "pattern" });
@@ -180,7 +182,7 @@ fn arePatternsSupported(patterns: []RequestPattern) bool {
    return true;
 }

-pub fn requestIntercept(bc: anytype, intercept: *const Notification.RequestIntercept) !void {
+pub fn requestIntercept(bc: *CDP.BrowserContext, intercept: *const Notification.RequestIntercept) !void {
    // detachTarget could be called, in which case, we still have a page doing
    // things, but no session.
    const session_id = bc.session_id orelse return;
@@ -215,7 +217,7 @@ pub fn requestIntercept(bc: anytype, intercept: *const Notification.RequestInter
    intercept.wait_for_interception.* = true;
 }

-fn continueRequest(cmd: anytype) !void {
+fn continueRequest(cmd: *CDP.Command) !void {
    const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;
    const params = (try cmd.params(struct {
        requestId: []const u8, // INT-{d}"
@@ -275,7 +277,7 @@ const AuthChallengeResponse = enum {
    ProvideCredentials,
 };

-fn continueWithAuth(cmd: anytype) !void {
+fn continueWithAuth(cmd: *CDP.Command) !void {
    const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;
    const params = (try cmd.params(struct {
        requestId: []const u8, // "INT-{d}"
@@ -318,7 +320,7 @@ fn continueWithAuth(cmd: anytype) !void {
    return cmd.sendResult(null, .{});
 }

-fn fulfillRequest(cmd: anytype) !void {
+fn fulfillRequest(cmd: *CDP.Command) !void {
    const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;

    const params = (try cmd.params(struct {
@@ -360,7 +362,7 @@ fn fulfillRequest(cmd: anytype) !void {
    return cmd.sendResult(null, .{});
 }

-fn failRequest(cmd: anytype) !void {
+fn failRequest(cmd: *CDP.Command) !void {
    const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;
    const params = (try cmd.params(struct {
        requestId: []const u8, // "INT-{d}"
@@ -382,7 +384,7 @@ fn failRequest(cmd: anytype) !void {
    return cmd.sendResult(null, .{});
 }

-pub fn requestAuthRequired(bc: anytype, intercept: *const Notification.RequestAuthRequired) !void {
+pub fn requestAuthRequired(bc: *CDP.BrowserContext, intercept: *const Notification.RequestAuthRequired) !void {
    // detachTarget could be called, in which case, we still have a page doing
    // things, but no session.
    const session_id = bc.session_id orelse return;
--- a/src/cdp/domains/input.zig
+++ b/src/cdp/domains/input.zig
@@ -17,8 +17,9 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.

 const std = @import("std");
+const CDP = @import("../CDP.zig");

-pub fn processMessage(cmd: anytype) !void {
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        dispatchKeyEvent,
        dispatchMouseEvent,
@@ -33,7 +34,7 @@ pub fn processMessage(cmd: anytype) !void {
 }

 // https://chromedevtools.github.io/devtools-protocol/tot/Input/#method-dispatchKeyEvent
-fn dispatchKeyEvent(cmd: anytype) !void {
+fn dispatchKeyEvent(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        type: Type,
        key: []const u8 = "",
@@ -74,7 +75,7 @@ fn dispatchKeyEvent(cmd: anytype) !void {
 }

 // https://chromedevtools.github.io/devtools-protocol/tot/Input/#method-dispatchMouseEvent
-fn dispatchMouseEvent(cmd: anytype) !void {
+fn dispatchMouseEvent(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        x: f64,
        y: f64,
@@ -104,7 +105,7 @@ fn dispatchMouseEvent(cmd: anytype) !void {
 }

 // https://chromedevtools.github.io/devtools-protocol/tot/Input/#method-insertText
-fn insertText(cmd: anytype) !void {
+fn insertText(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        text: []const u8, // The text to insert
    })) orelse return error.InvalidParams;
--- a/src/cdp/domains/inspector.zig
+++ b/src/cdp/domains/inspector.zig
@@ -17,8 +17,9 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.

 const std = @import("std");
+const CDP = @import("../CDP.zig");

-pub fn processMessage(cmd: anytype) !void {
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        enable,
        disable,
--- a/src/cdp/domains/log.zig
+++ b/src/cdp/domains/log.zig
@@ -17,8 +17,9 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.

 const std = @import("std");
+const CDP = @import("../CDP.zig");

-pub fn processMessage(cmd: anytype) !void {
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        enable,
        disable,
--- a/src/cdp/domains/lp.zig
+++ b/src/cdp/domains/lp.zig
@@ -18,18 +18,23 @@

 const std = @import("std");
 const lp = @import("lightpanda");
+
+const CDP = @import("../CDP.zig");
+
+const Node = @import("../Node.zig");
+const DOMNode = @import("../../browser/webapi/Node.zig");
+
 const markdown = lp.markdown;
 const SemanticTree = lp.SemanticTree;
 const interactive = lp.interactive;
 const structured_data = lp.structured_data;
-const Node = @import("../Node.zig");
-const DOMNode = @import("../../browser/webapi/Node.zig");

-pub fn processMessage(cmd: anytype) !void {
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        getMarkdown,
        getSemanticTree,
        getInteractiveElements,
+        getNodeDetails,
        getStructuredData,
        detectForms,
        clickNode,
@@ -42,6 +47,7 @@ pub fn processMessage(cmd: anytype) !void {
        .getMarkdown => return getMarkdown(cmd),
        .getSemanticTree => return getSemanticTree(cmd),
        .getInteractiveElements => return getInteractiveElements(cmd),
+        .getNodeDetails => return getNodeDetails(cmd),
        .getStructuredData => return getStructuredData(cmd),
        .detectForms => return detectForms(cmd),
        .clickNode => return clickNode(cmd),
@@ -141,6 +147,24 @@ fn getInteractiveElements(cmd: anytype) !void {
    }, .{});
 }

+fn getNodeDetails(cmd: anytype) !void {
+    const Params = struct {
+        backendNodeId: Node.Id,
+    };
+    const params = (try cmd.params(Params)) orelse return error.InvalidParam;
+
+    const bc = cmd.browser_context orelse return error.NoBrowserContext;
+    const page = bc.session.currentPage() orelse return error.PageNotLoaded;
+
+    const node = (bc.node_registry.lookup_by_id.get(params.backendNodeId) orelse return error.InvalidNodeId).dom;
+
+    const details = SemanticTree.getNodeDetails(cmd.arena, node, &bc.node_registry, page) catch return error.InternalError;
+
+    return cmd.sendResult(.{
+        .nodeDetails = details,
+    }, .{});
+}
+
 fn getStructuredData(cmd: anytype) !void {
    const bc = cmd.browser_context orelse return error.NoBrowserContext;
    const page = bc.session.currentPage() orelse return error.PageNotLoaded;
--- a/src/cdp/domains/network.zig
+++ b/src/cdp/domains/network.zig
@@ -18,18 +18,21 @@

 const std = @import("std");
 const lp = @import("lightpanda");
-const Allocator = std.mem.Allocator;
+
 const log = @import("../../log.zig");

-const CdpStorage = @import("storage.zig");
-
 const id = @import("../id.zig");
+const CDP = @import("../CDP.zig");
+
 const URL = @import("../../browser/URL.zig");
 const Transfer = @import("../../browser/HttpClient.zig").Transfer;
 const Notification = @import("../../Notification.zig");
 const Mime = @import("../../browser/Mime.zig");

-pub fn processMessage(cmd: anytype) !void {
+const CdpStorage = @import("storage.zig");
+const Allocator = std.mem.Allocator;
+
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        enable,
        disable,
@@ -59,19 +62,19 @@ pub fn processMessage(cmd: anytype) !void {
    }
 }

-fn enable(cmd: anytype) !void {
+fn enable(cmd: *CDP.Command) !void {
    const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;
    try bc.networkEnable();
    return cmd.sendResult(null, .{});
 }

-fn disable(cmd: anytype) !void {
+fn disable(cmd: *CDP.Command) !void {
    const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;
    bc.networkDisable();
    return cmd.sendResult(null, .{});
 }

-fn setExtraHTTPHeaders(cmd: anytype) !void {
+fn setExtraHTTPHeaders(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        headers: std.json.ArrayHashMap([]const u8),
    })) orelse return error.InvalidParams;
@@ -110,7 +113,7 @@ fn cookieMatches(cookie: *const Cookie, name: []const u8, domain: ?[]const u8, p
    return true;
 }

-fn deleteCookies(cmd: anytype) !void {
+fn deleteCookies(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        name: []const u8,
        url: ?[:0]const u8 = null,
@@ -144,14 +147,14 @@ fn deleteCookies(cmd: anytype) !void {
    return cmd.sendResult(null, .{});
 }

-fn clearBrowserCookies(cmd: anytype) !void {
+fn clearBrowserCookies(cmd: *CDP.Command) !void {
    if (try cmd.params(struct {}) != null) return error.InvalidParams;
    const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;
    bc.session.cookie_jar.clearRetainingCapacity();
    return cmd.sendResult(null, .{});
 }

-fn setCookie(cmd: anytype) !void {
+fn setCookie(cmd: *CDP.Command) !void {
    const params = (try cmd.params(
        CdpStorage.CdpCookie,
    )) orelse return error.InvalidParams;
@@ -162,7 +165,7 @@ fn setCookie(cmd: anytype) !void {
    try cmd.sendResult(.{ .success = true }, .{});
 }

-fn setCookies(cmd: anytype) !void {
+fn setCookies(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        cookies: []const CdpStorage.CdpCookie,
    })) orelse return error.InvalidParams;
@@ -178,7 +181,7 @@ fn setCookies(cmd: anytype) !void {
 const GetCookiesParam = struct {
    urls: ?[]const [:0]const u8 = null,
 };
-fn getCookies(cmd: anytype) !void {
+fn getCookies(cmd: *CDP.Command) !void {
    const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;
    const params = (try cmd.params(GetCookiesParam)) orelse GetCookiesParam{};

@@ -201,7 +204,7 @@ fn getCookies(cmd: anytype) !void {
    try cmd.sendResult(.{ .cookies = writer }, .{});
 }

-fn getResponseBody(cmd: anytype) !void {
+fn getResponseBody(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        requestId: []const u8, // "REQ-{d}"
    })) orelse return error.InvalidParams;
@@ -227,7 +230,7 @@ fn getResponseBody(cmd: anytype) !void {
    }, .{});
 }

-pub fn httpRequestFail(bc: anytype, msg: *const Notification.RequestFail) !void {
+pub fn httpRequestFail(bc: *CDP.BrowserContext, msg: *const Notification.RequestFail) !void {
    // It's possible that the request failed because we aborted when the client
    // sent Target.closeTarget. In that case, bc.session_id will be cleared
    // already, and we can skip sending these messages to the client.
@@ -247,7 +250,7 @@ pub fn httpRequestFail(bc: anytype, msg: *const Notification.RequestFail) !void
    }, .{ .session_id = session_id });
 }

-pub fn httpRequestStart(bc: anytype, msg: *const Notification.RequestStart) !void {
+pub fn httpRequestStart(bc: *CDP.BrowserContext, msg: *const Notification.RequestStart) !void {
    // detachTarget could be called, in which case, we still have a page doing
    // things, but no session.
    const session_id = bc.session_id orelse return;
@@ -276,7 +279,7 @@ pub fn httpRequestStart(bc: anytype, msg: *const Notification.RequestStart) !voi
    }, .{ .session_id = session_id });
 }

-pub fn httpResponseHeaderDone(arena: Allocator, bc: anytype, msg: *const Notification.ResponseHeaderDone) !void {
+pub fn httpResponseHeaderDone(arena: Allocator, bc: *CDP.BrowserContext, msg: *const Notification.ResponseHeaderDone) !void {
    // detachTarget could be called, in which case, we still have a page doing
    // things, but no session.
    const session_id = bc.session_id orelse return;
@@ -293,7 +296,7 @@ pub fn httpResponseHeaderDone(arena: Allocator, bc: anytype, msg: *const Notific
    }, .{ .session_id = session_id });
 }

-pub fn httpRequestDone(bc: anytype, msg: *const Notification.RequestDone) !void {
+pub fn httpRequestDone(bc: *CDP.BrowserContext, msg: *const Notification.RequestDone) !void {
    // detachTarget could be called, in which case, we still have a page doing
    // things, but no session.
    const session_id = bc.session_id orelse return;
--- a/src/cdp/domains/page.zig
+++ b/src/cdp/domains/page.zig
@@ -1,4 +1,5 @@
 // Copyright (C) 2023-2025  Lightpanda (Selecy SAS)
+
 //
 // Francis Bouvier <francis@lightpanda.io>
 // Pierre Tachoire <pierre@lightpanda.io>
@@ -22,6 +23,8 @@ const lp = @import("lightpanda");
 const screenshot_png = @embedFile("screenshot.png");

 const id = @import("../id.zig");
+const CDP = @import("../CDP.zig");
+
 const log = @import("../../log.zig");
 const js = @import("../../browser/js/js.zig");
 const URL = @import("../../browser/URL.zig");
@@ -31,7 +34,7 @@ const Notification = @import("../../Notification.zig");

 const Allocator = std.mem.Allocator;

-pub fn processMessage(cmd: anytype) !void {
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        enable,
        getFrameTree,
@@ -78,7 +81,7 @@ const Frame = struct {
    gatedAPIFeatures: [][]const u8 = &[0][]const u8{},
 };

-fn getFrameTree(cmd: anytype) !void {
+fn getFrameTree(cmd: *CDP.Command) !void {
    // Stagehand parses the response and error if we don't return a
    // correct one for this call when browser context or target id are missing.
    const startup = .{
@@ -108,7 +111,7 @@ fn getFrameTree(cmd: anytype) !void {
    }, .{});
 }

-fn setLifecycleEventsEnabled(cmd: anytype) !void {
+fn setLifecycleEventsEnabled(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        enabled: bool,
    })) orelse return error.InvalidParams;
@@ -149,7 +152,7 @@ fn setLifecycleEventsEnabled(cmd: anytype) !void {
    return cmd.sendResult(null, .{});
 }

-fn addScriptToEvaluateOnNewDocument(cmd: anytype) !void {
+fn addScriptToEvaluateOnNewDocument(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        source: []const u8,
        worldName: ?[]const u8 = null,
@@ -179,7 +182,7 @@ fn addScriptToEvaluateOnNewDocument(cmd: anytype) !void {
    }, .{});
 }

-fn removeScriptToEvaluateOnNewDocument(cmd: anytype) !void {
+fn removeScriptToEvaluateOnNewDocument(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        identifier: []const u8,
    })) orelse return error.InvalidParams;
@@ -198,7 +201,7 @@ fn removeScriptToEvaluateOnNewDocument(cmd: anytype) !void {
    return cmd.sendResult(null, .{});
 }

-fn close(cmd: anytype) !void {
+fn close(cmd: *CDP.Command) !void {
    const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;

    const target_id = bc.target_id orelse return error.TargetNotLoaded;
@@ -235,7 +238,7 @@ fn close(cmd: anytype) !void {
    bc.target_id = null;
 }

-fn createIsolatedWorld(cmd: anytype) !void {
+fn createIsolatedWorld(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        frameId: []const u8,
        worldName: []const u8,
@@ -255,7 +258,7 @@ fn createIsolatedWorld(cmd: anytype) !void {
    return cmd.sendResult(.{ .executionContextId = js_context.id }, .{});
 }

-fn navigate(cmd: anytype) !void {
+fn navigate(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        url: [:0]const u8,
        // referrer: ?[]const u8 = null,
@@ -289,7 +292,7 @@ fn navigate(cmd: anytype) !void {
    });
 }

-fn doReload(cmd: anytype) !void {
+fn doReload(cmd: *CDP.Command) !void {
    const params = try cmd.params(struct {
        ignoreCache: ?bool = null,
        scriptToEvaluateOnLoad: ?[]const u8 = null,
@@ -319,7 +322,7 @@ fn doReload(cmd: anytype) !void {
    });
 }

-pub fn pageNavigate(bc: anytype, event: *const Notification.PageNavigate) !void {
+pub fn pageNavigate(bc: *CDP.BrowserContext, event: *const Notification.PageNavigate) !void {
    // detachTarget could be called, in which case, we still have a page doing
    // things, but no session.
    const session_id = bc.session_id orelse return;
@@ -371,7 +374,7 @@ pub fn pageNavigate(bc: anytype, event: *const Notification.PageNavigate) !void
    }, .{ .session_id = session_id });
 }

-pub fn pageRemove(bc: anytype) !void {
+pub fn pageRemove(bc: *CDP.BrowserContext) !void {
    // Clear all remote object mappings to prevent stale objectIds from being used
    // after the context is destroy
    bc.inspector_session.inspector.resetContextGroup();
@@ -382,7 +385,7 @@ pub fn pageRemove(bc: anytype) !void {
    }
 }

-pub fn pageCreated(bc: anytype, page: *Page) !void {
+pub fn pageCreated(bc: *CDP.BrowserContext, page: *Page) !void {
    _ = bc.cdp.page_arena.reset(.{ .retain_with_limit = 1024 * 512 });

    for (bc.isolated_worlds.items) |isolated_world| {
@@ -394,7 +397,7 @@ pub fn pageCreated(bc: anytype, page: *Page) !void {
    bc.captured_responses = .empty;
 }

-pub fn pageFrameCreated(bc: anytype, event: *const Notification.PageFrameCreated) !void {
+pub fn pageFrameCreated(bc: *CDP.BrowserContext, event: *const Notification.PageFrameCreated) !void {
    const session_id = bc.session_id orelse return;

    const cdp = bc.cdp;
@@ -415,12 +418,11 @@ pub fn pageFrameCreated(bc: anytype, event: *const Notification.PageFrameCreated
    }
 }

-pub fn pageNavigated(arena: Allocator, bc: anytype, event: *const Notification.PageNavigated) !void {
+pub fn pageNavigated(arena: Allocator, bc: *CDP.BrowserContext, event: *const Notification.PageNavigated) !void {
    // detachTarget could be called, in which case, we still have a page doing
    // things, but no session.
    const session_id = bc.session_id orelse return;

-    const timestamp = event.timestamp;
    const frame_id = &id.toFrameId(event.frame_id);
    const loader_id = &id.toLoaderId(event.req_id);

@@ -472,9 +474,9 @@ pub fn pageNavigated(arena: Allocator, bc: anytype, event: *const Notification.P
    const page = bc.session.currentPage() orelse return error.PageNotLoaded;

    // When we actually recreated the context we should have the inspector send
-    // this event, see: resetContextGroup Sending this event will tell the
-    // client that the context ids they had are invalid and the context shouls
-    // be dropped The client will expect us to send new contextCreated events,
+    // this event, see: resetContextGroup. Sending this event will tell the
+    // client that the context ids they had are invalid and the context should
+    // be dropped. The client will expect us to send new contextCreated events,
    // such that the client has new id's for the active contexts.
    // Only send executionContextsCleared for main frame navigations. For child
    // frames (iframes), clearing all contexts would destroy the main frame's
@@ -484,6 +486,18 @@ pub fn pageNavigated(arena: Allocator, bc: anytype, event: *const Notification.P
        try cdp.sendEvent("Runtime.executionContextsCleared", null, .{ .session_id = session_id });
    }

+    // frameNavigated event
+    try cdp.sendEvent("Page.frameNavigated", .{
+        .type = "Navigation",
+        .frame = Frame{
+            .id = frame_id,
+            .url = event.url,
+            .loaderId = loader_id,
+            .securityOrigin = bc.security_origin,
+            .secureContextType = bc.secure_context_type,
+        },
+    }, .{ .session_id = session_id });
+
    {
        const aux_data = try std.fmt.allocPrint(arena, "{{\"isDefault\":true,\"type\":\"default\",\"frameId\":\"{s}\",\"loaderId\":\"{s}\"}}", .{ frame_id, loader_id });

@@ -554,18 +568,22 @@ pub fn pageNavigated(arena: Allocator, bc: anytype, event: *const Notification.P
    // chromedp client expects to receive the events is this order.
    // see https://github.com/chromedp/chromedp/issues/1558
    try cdp.sendEvent("DOM.documentUpdated", null, .{ .session_id = session_id });
+}
+
+pub fn pageDOMContentLoaded(bc: anytype, event: *const Notification.PageDOMContentLoaded) !void {
+    const session_id = bc.session_id orelse return;
+    const timestamp = event.timestamp;
+    var cdp = bc.cdp;

-    // domContentEventFired event
-    // TODO: partially hard coded
    try cdp.sendEvent(
        "Page.domContentEventFired",
        .{ .timestamp = timestamp },
        .{ .session_id = session_id },
    );

-    // lifecycle DOMContentLoaded event
-    // TODO: partially hard coded
    if (bc.page_life_cycle_events) {
+        const frame_id = &id.toFrameId(event.frame_id);
+        const loader_id = &id.toLoaderId(event.req_id);
        try cdp.sendEvent("Page.lifecycleEvent", LifecycleEvent{
            .timestamp = timestamp,
            .name = "DOMContentLoaded",
@@ -573,16 +591,23 @@ pub fn pageNavigated(arena: Allocator, bc: anytype, event: *const Notification.P
            .loaderId = loader_id,
        }, .{ .session_id = session_id });
    }
+}
+
+pub fn pageLoaded(bc: anytype, event: *const Notification.PageLoaded) !void {
+    const session_id = bc.session_id orelse return;
+    const timestamp = event.timestamp;
+    var cdp = bc.cdp;
+
+    const frame_id = &id.toFrameId(event.frame_id);

-    // loadEventFired event
    try cdp.sendEvent(
        "Page.loadEventFired",
        .{ .timestamp = timestamp },
        .{ .session_id = session_id },
    );

-    // lifecycle DOMContentLoaded event
    if (bc.page_life_cycle_events) {
+        const loader_id = &id.toLoaderId(event.req_id);
        try cdp.sendEvent("Page.lifecycleEvent", LifecycleEvent{
            .timestamp = timestamp,
            .name = "load",
@@ -591,21 +616,20 @@ pub fn pageNavigated(arena: Allocator, bc: anytype, event: *const Notification.P
        }, .{ .session_id = session_id });
    }

-    // frameStoppedLoading
    return cdp.sendEvent("Page.frameStoppedLoading", .{
        .frameId = frame_id,
    }, .{ .session_id = session_id });
 }

-pub fn pageNetworkIdle(bc: anytype, event: *const Notification.PageNetworkIdle) !void {
+pub fn pageNetworkIdle(bc: *CDP.BrowserContext, event: *const Notification.PageNetworkIdle) !void {
    return sendPageLifecycle(bc, "networkIdle", event.timestamp, &id.toFrameId(event.frame_id), &id.toLoaderId(event.req_id));
 }

-pub fn pageNetworkAlmostIdle(bc: anytype, event: *const Notification.PageNetworkAlmostIdle) !void {
+pub fn pageNetworkAlmostIdle(bc: *CDP.BrowserContext, event: *const Notification.PageNetworkAlmostIdle) !void {
    return sendPageLifecycle(bc, "networkAlmostIdle", event.timestamp, &id.toFrameId(event.frame_id), &id.toLoaderId(event.req_id));
 }

-fn sendPageLifecycle(bc: anytype, name: []const u8, timestamp: u64, frame_id: []const u8, loader_id: []const u8) !void {
+fn sendPageLifecycle(bc: *CDP.BrowserContext, name: []const u8, timestamp: u64, frame_id: []const u8, loader_id: []const u8) !void {
    // detachTarget could be called, in which case, we still have a page doing
    // things, but no session.
    const session_id = bc.session_id orelse return;
@@ -640,7 +664,7 @@ fn base64Encode(comptime input: []const u8) [std.base64.standard.Encoder.calcSiz
    return buf;
 }

-fn captureScreenshot(cmd: anytype) !void {
+fn captureScreenshot(cmd: *CDP.Command) !void {
    const Params = struct {
        format: ?[]const u8 = "png",
        quality: ?u8 = null,
@@ -676,7 +700,7 @@ fn captureScreenshot(cmd: anytype) !void {
    }, .{});
 }

-fn getLayoutMetrics(cmd: anytype) !void {
+fn getLayoutMetrics(cmd: *CDP.Command) !void {
    const width = 1920;
    const height = 1080;

--- a/src/cdp/domains/performance.zig
+++ b/src/cdp/domains/performance.zig
@@ -17,8 +17,9 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.

 const std = @import("std");
+const CDP = @import("../CDP.zig");

-pub fn processMessage(cmd: anytype) !void {
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        enable,
        disable,
--- a/src/cdp/domains/runtime.zig
+++ b/src/cdp/domains/runtime.zig
@@ -19,7 +19,9 @@
 const std = @import("std");
 const builtin = @import("builtin");

-pub fn processMessage(cmd: anytype) !void {
+const CDP = @import("../CDP.zig");
+
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        enable,
        runIfWaitingForDebugger,
@@ -36,7 +38,7 @@ pub fn processMessage(cmd: anytype) !void {
    }
 }

-fn sendInspector(cmd: anytype, action: anytype) !void {
+fn sendInspector(cmd: *CDP.Command, action: anytype) !void {
    // save script in file at debug mode
    if (builtin.mode == .Debug) {
        try logInspector(cmd, action);
@@ -48,7 +50,7 @@ fn sendInspector(cmd: anytype, action: anytype) !void {
    bc.callInspector(cmd.input.json);
 }

-fn logInspector(cmd: anytype, action: anytype) !void {
+fn logInspector(cmd: *CDP.Command, action: anytype) !void {
    const script = switch (action) {
        .evaluate => blk: {
            const params = (try cmd.params(struct {
--- a/src/cdp/domains/security.zig
+++ b/src/cdp/domains/security.zig
@@ -17,8 +17,9 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.

 const std = @import("std");
+const CDP = @import("../CDP.zig");

-pub fn processMessage(cmd: anytype) !void {
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        enable,
        disable,
@@ -32,7 +33,7 @@ pub fn processMessage(cmd: anytype) !void {
    }
 }

-fn setIgnoreCertificateErrors(cmd: anytype) !void {
+fn setIgnoreCertificateErrors(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        ignore: bool,
    })) orelse return error.InvalidParams;
--- a/src/cdp/domains/storage.zig
+++ b/src/cdp/domains/storage.zig
@@ -18,13 +18,16 @@

 const std = @import("std");

+const CDP = @import("../CDP.zig");
+
 const log = @import("../../log.zig");
 const URL = @import("../../browser/URL.zig");
 const Cookie = @import("../../browser/webapi/storage/storage.zig").Cookie;
+
 const CookieJar = Cookie.Jar;
 pub const PreparedUri = Cookie.PreparedUri;

-pub fn processMessage(cmd: anytype) !void {
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        clearCookies,
        setCookies,
@@ -40,7 +43,7 @@ pub fn processMessage(cmd: anytype) !void {

 const BrowserContextParam = struct { browserContextId: ?[]const u8 = null };

-fn clearCookies(cmd: anytype) !void {
+fn clearCookies(cmd: *CDP.Command) !void {
    const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;
    const params = (try cmd.params(BrowserContextParam)) orelse BrowserContextParam{};

@@ -55,7 +58,7 @@ fn clearCookies(cmd: anytype) !void {
    return cmd.sendResult(null, .{});
 }

-fn getCookies(cmd: anytype) !void {
+fn getCookies(cmd: *CDP.Command) !void {
    const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;
    const params = (try cmd.params(BrowserContextParam)) orelse BrowserContextParam{};

@@ -69,7 +72,7 @@ fn getCookies(cmd: anytype) !void {
    try cmd.sendResult(.{ .cookies = writer }, .{});
 }

-fn setCookies(cmd: anytype) !void {
+fn setCookies(cmd: *CDP.Command) !void {
    const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;
    const params = (try cmd.params(struct {
        cookies: []const CdpCookie,
--- a/src/cdp/domains/target.zig
+++ b/src/cdp/domains/target.zig
@@ -20,11 +20,13 @@ const std = @import("std");
 const lp = @import("lightpanda");

 const id = @import("../id.zig");
+const CDP = @import("../CDP.zig");
+
 const log = @import("../../log.zig");
 const URL = @import("../../browser/URL.zig");
 const js = @import("../../browser/js/js.zig");

-pub fn processMessage(cmd: anytype) !void {
+pub fn processMessage(cmd: *CDP.Command) !void {
    const action = std.meta.stringToEnum(enum {
        getTargets,
        attachToTarget,
@@ -60,7 +62,7 @@ pub fn processMessage(cmd: anytype) !void {
    }
 }

-fn getTargets(cmd: anytype) !void {
+fn getTargets(cmd: *CDP.Command) !void {
    // If no context available, return an empty array.
    const bc = cmd.browser_context orelse {
        return cmd.sendResult(.{
@@ -86,7 +88,7 @@ fn getTargets(cmd: anytype) !void {
    }, .{ .include_session_id = false });
 }

-fn getBrowserContexts(cmd: anytype) !void {
+fn getBrowserContexts(cmd: *CDP.Command) !void {
    var browser_context_ids: []const []const u8 = undefined;
    if (cmd.browser_context) |bc| {
        browser_context_ids = &.{bc.id};
@@ -99,7 +101,7 @@ fn getBrowserContexts(cmd: anytype) !void {
    }, .{ .include_session_id = false });
 }

-fn createBrowserContext(cmd: anytype) !void {
+fn createBrowserContext(cmd: *CDP.Command) !void {
    const params = try cmd.params(struct {
        disposeOnDetach: bool = false,
        proxyServer: ?[:0]const u8 = null,
@@ -130,7 +132,7 @@ fn createBrowserContext(cmd: anytype) !void {
    }, .{});
 }

-fn disposeBrowserContext(cmd: anytype) !void {
+fn disposeBrowserContext(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        browserContextId: []const u8,
    })) orelse return error.InvalidParams;
@@ -141,7 +143,7 @@ fn disposeBrowserContext(cmd: anytype) !void {
    try cmd.sendResult(null, .{});
 }

-fn createTarget(cmd: anytype) !void {
+fn createTarget(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        url: [:0]const u8 = "about:blank",
        // width: ?u64 = null,
@@ -230,7 +232,7 @@ fn createTarget(cmd: anytype) !void {
    }, .{});
 }

-fn attachToTarget(cmd: anytype) !void {
+fn attachToTarget(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        targetId: []const u8,
        flatten: bool = true,
@@ -247,7 +249,7 @@ fn attachToTarget(cmd: anytype) !void {
    return cmd.sendResult(.{ .sessionId = bc.session_id }, .{});
 }

-fn attachToBrowserTarget(cmd: anytype) !void {
+fn attachToBrowserTarget(cmd: *CDP.Command) !void {
    const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;

    const session_id = bc.session_id orelse cmd.cdp.session_id_gen.next();
@@ -269,7 +271,7 @@ fn attachToBrowserTarget(cmd: anytype) !void {
    return cmd.sendResult(.{ .sessionId = bc.session_id }, .{});
 }

-fn closeTarget(cmd: anytype) !void {
+fn closeTarget(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        targetId: []const u8,
    })) orelse return error.InvalidParams;
@@ -310,7 +312,7 @@ fn closeTarget(cmd: anytype) !void {
    bc.target_id = null;
 }

-fn getTargetInfo(cmd: anytype) !void {
+fn getTargetInfo(cmd: *CDP.Command) !void {
    const Params = struct {
        targetId: ?[]const u8 = null,
    };
@@ -347,7 +349,7 @@ fn getTargetInfo(cmd: anytype) !void {
    }, .{ .include_session_id = false });
 }

-fn sendMessageToTarget(cmd: anytype) !void {
+fn sendMessageToTarget(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        message: []const u8,
        sessionId: []const u8,
@@ -365,32 +367,19 @@ fn sendMessageToTarget(cmd: anytype) !void {
        return error.UnknownSessionId;
    }

-    const Capture = struct {
-        aw: std.Io.Writer.Allocating,
-
-        pub fn sendJSON(self: *@This(), message: anytype) !void {
-            return std.json.Stringify.value(message, .{
-                .emit_null_optional_fields = false,
-            }, &self.aw.writer);
-        }
-    };
-
-    var capture = Capture{
-        .aw = .init(cmd.arena),
-    };
-
-    cmd.cdp.dispatch(cmd.arena, &capture, params.message) catch |err| {
+    var aw = std.Io.Writer.Allocating.init(cmd.arena);
+    cmd.cdp.dispatch(cmd.arena, .{ .capture = &aw.writer }, params.message) catch |err| {
        log.err(.cdp, "internal dispatch error", .{ .err = err, .id = cmd.input.id, .message = params.message });
        return err;
    };

    try cmd.sendEvent("Target.receivedMessageFromTarget", .{
-        .message = capture.aw.written(),
+        .message = aw.written(),
        .sessionId = params.sessionId,
    }, .{});
 }

-fn detachFromTarget(cmd: anytype) !void {
+fn detachFromTarget(cmd: *CDP.Command) !void {
    if (cmd.browser_context) |bc| {
        if (bc.session_id) |session_id| {
            try cmd.sendEvent("Target.detachedFromTarget", .{
@@ -404,11 +393,11 @@ fn detachFromTarget(cmd: anytype) !void {
 }

 // TODO: noop method
-fn setDiscoverTargets(cmd: anytype) !void {
+fn setDiscoverTargets(cmd: *CDP.Command) !void {
    return cmd.sendResult(null, .{});
 }

-fn setAutoAttach(cmd: anytype) !void {
+fn setAutoAttach(cmd: *CDP.Command) !void {
    const params = (try cmd.params(struct {
        autoAttach: bool,
        waitForDebuggerOnStart: bool,
@@ -468,7 +457,7 @@ fn setAutoAttach(cmd: anytype) !void {
    try cmd.sendResult(null, .{});
 }

-fn doAttachtoTarget(cmd: anytype, target_id: []const u8) !void {
+fn doAttachtoTarget(cmd: *CDP.Command, target_id: []const u8) !void {
    const bc = cmd.browser_context.?;
    const session_id = bc.session_id orelse cmd.cdp.session_id_gen.next();

--- a/src/cdp/testing.zig
+++ b/src/cdp/testing.zig
@@ -64,7 +64,7 @@ const TestContext = struct {
        session_id: ?[]const u8 = null,
        url: ?[:0]const u8 = null,
    };
-    pub fn loadBrowserContext(self: *TestContext, opts: BrowserContextOpts) !*CDP.BrowserContext(CDP) {
+    pub fn loadBrowserContext(self: *TestContext, opts: BrowserContextOpts) !*CDP.BrowserContext {
        var c = self.cdp();
        if (c.browser_context) |bc| {
            _ = c.disposeBrowserContext(bc.id);
--- a/src/lightpanda.zig
+++ b/src/lightpanda.zig
@@ -48,9 +48,7 @@ const IS_DEBUG = @import("builtin").mode == .Debug;

 pub const FetchOpts = struct {
    wait_ms: u32 = 5000,
-    wait_until: ?Config.WaitUntil = null,
-    wait_script: ?[:0]const u8 = null,
-    wait_selector: ?[:0]const u8 = null,
+    wait_until: Config.WaitUntil = .load,
    dump: dump.Opts,
    dump_mode: ?Config.DumpFormat = null,
    writer: ?*std.Io.Writer = null,
@@ -113,31 +111,7 @@ pub fn fetch(app: *App, url: [:0]const u8, opts: FetchOpts) !void {
        .kind = .{ .push = null },
    });
    var runner = try session.runner(.{});
-
-    var timer = try std.time.Timer.start();
-
-    if (opts.wait_until) |wu| {
-        try runner.wait(.{ .ms = opts.wait_ms, .until = wu });
-    } else if (opts.wait_selector == null and opts.wait_script == null) {
-        // We default to .done if both wait_selector and wait_script are null
-        // This allows the caller to ONLY --wait-selector or ONLY --wait-script
-        // or combine --wait-until WITH --wait-selector/script
-        try runner.wait(.{ .ms = opts.wait_ms, .until = .done });
-    }
-
-    if (opts.wait_selector) |selector| {
-        const elapsed: u32 = @intCast(timer.read() / std.time.ns_per_ms);
-        const remaining = opts.wait_ms -| elapsed;
-        if (remaining == 0) return error.Timeout;
-        _ = try runner.waitForSelector(selector, opts.wait_ms);
-    }
-
-    if (opts.wait_script) |script| {
-        const elapsed: u32 = @intCast(timer.read() / std.time.ns_per_ms);
-        const remaining = opts.wait_ms -| elapsed;
-        if (remaining == 0) return error.Timeout;
-        try runner.waitForScript(script, opts.wait_ms);
-    }
+    try runner.wait(.{ .ms = opts.wait_ms, .until = opts.wait_until });

    const writer = opts.writer orelse return;
    if (opts.dump_mode) |mode| {
--- a/src/main.zig
+++ b/src/main.zig
@@ -123,8 +123,6 @@ fn run(allocator: Allocator, main_arena: Allocator) !void {
            var fetch_opts = lp.FetchOpts{
                .wait_ms = opts.wait_ms,
                .wait_until = opts.wait_until,
-                .wait_script = opts.wait_script,
-                .wait_selector = opts.wait_selector,
                .dump_mode = opts.dump_mode,
                .dump = .{
                    .strip = opts.strip,
--- a/src/mcp/tools.zig
+++ b/src/mcp/tools.zig
@@ -75,6 +75,19 @@ pub const tool_list = [_]protocol.Tool{
            \\}
        ),
    },
+    .{
+        .name = "nodeDetails",
+        .description = "Get detailed information about a specific node by its backend node ID. Returns tag, role, name, interactivity, disabled state, value, input type, placeholder, href, checked state, and select options.",
+        .inputSchema = protocol.minify(
+            \\{
+            \\  "type": "object",
+            \\  "properties": {
+            \\    "backendNodeId": { "type": "integer", "description": "The backend node ID of the element to inspect." }
+            \\  },
+            \\  "required": ["backendNodeId"]
+            \\}
+        ),
+    },
    .{
        .name = "interactiveElements",
        .description = "Extract interactive elements from the opened page. If a url is provided, it navigates to that url first.",
@@ -256,6 +269,7 @@ const ToolAction = enum {
    navigate,
    markdown,
    links,
+    nodeDetails,
    interactiveElements,
    structuredData,
    detectForms,
@@ -272,6 +286,7 @@ const tool_map = std.StaticStringMap(ToolAction).initComptime(.{
    .{ "navigate", .navigate },
    .{ "markdown", .markdown },
    .{ "links", .links },
+    .{ "nodeDetails", .nodeDetails },
    .{ "interactiveElements", .interactiveElements },
    .{ "structuredData", .structuredData },
    .{ "detectForms", .detectForms },
@@ -305,6 +320,7 @@ pub fn handleCall(server: *Server, arena: std.mem.Allocator, req: protocol.Reque
        .goto, .navigate => try handleGoto(server, arena, req.id.?, call_params.arguments),
        .markdown => try handleMarkdown(server, arena, req.id.?, call_params.arguments),
        .links => try handleLinks(server, arena, req.id.?, call_params.arguments),
+        .nodeDetails => try handleNodeDetails(server, arena, req.id.?, call_params.arguments),
        .interactiveElements => try handleInteractiveElements(server, arena, req.id.?, call_params.arguments),
        .structuredData => try handleStructuredData(server, arena, req.id.?, call_params.arguments),
        .detectForms => try handleDetectForms(server, arena, req.id.?, call_params.arguments),
@@ -373,6 +389,32 @@ fn handleSemanticTree(server: *Server, arena: std.mem.Allocator, id: std.json.Va
    };
 }

+fn handleNodeDetails(server: *Server, arena: std.mem.Allocator, id: std.json.Value, arguments: ?std.json.Value) !void {
+    const Params = struct {
+        backendNodeId: CDPNode.Id,
+    };
+    const args = try parseArgs(Params, arena, arguments, server, id, "nodeDetails");
+
+    _ = server.session.currentPage() orelse {
+        return server.sendError(id, .PageNotLoaded, "Page not loaded");
+    };
+
+    const node = server.node_registry.lookup_by_id.get(args.backendNodeId) orelse {
+        return server.sendError(id, .InvalidParams, "Node not found");
+    };
+
+    const page = server.session.currentPage().?;
+    const details = lp.SemanticTree.getNodeDetails(arena, node.dom, &server.node_registry, page) catch {
+        return server.sendError(id, .InternalError, "Failed to get node details");
+    };
+
+    var aw: std.Io.Writer.Allocating = .init(arena);
+    try std.json.Stringify.value(&details, .{}, &aw.writer);
+
+    const content = [_]protocol.TextContent([]const u8){.{ .text = aw.written() }};
+    try server.sendResult(id, protocol.CallToolResult([]const u8){ .content = &content });
+}
+
 fn handleInteractiveElements(server: *Server, arena: std.mem.Allocator, id: std.json.Value, arguments: ?std.json.Value) !void {
    const args = try parseArgsOrDefault(UrlParams, arena, arguments, server, id);
    const page = try ensurePage(server, id, args.url);
--- a/src/testing.zig
+++ b/src/testing.zig
@@ -452,10 +452,8 @@ fn runWebApiTest(test_file: [:0]const u8) !void {
    }
 }

-const PageTestOpts = struct {
-    wait_until_done: bool = true,
-};
-pub fn pageTest(comptime test_file: []const u8, opts: PageTestOpts) !*Page {
+// Used by a few CDP tests - wouldn't be sad to see this go.
+pub fn pageTest(comptime test_file: []const u8) !*Page {
    const page = try test_session.createPage();
    errdefer test_session.removePage();

@@ -468,9 +466,7 @@ pub fn pageTest(comptime test_file: []const u8, opts: PageTestOpts) !*Page {

    try page.navigate(url, .{});
    var runner = try test_session.runner(.{});
-    if (opts.wait_until_done) {
-        try runner.wait(.{ .ms = 2000 });
-    }
+    try runner.wait(.{ .ms = 2000 });
    return page;
 }
Author	SHA1	Message	Date
Karl Seguin	26653120fa	Removing remaining CDP generic Follow up to https://github.com/lightpanda-io/browser/pull/1990 which makes both BrowserContext and Command non-generic.	2026-03-31 16:53:58 +08:00
Adrià Arrufat	55666ab7cd	Merge pull request #2049 from lightpanda-io/refactor/getNodeDetails-param-order Some checks are pending e2e-test / zig build release (push) Waiting to run Details e2e-test / demo-scripts (push) Blocked by required conditions Details e2e-test / wba-demo-scripts (push) Blocked by required conditions Details e2e-test / wba-test (push) Blocked by required conditions Details e2e-test / cdp-and-hyperfine-bench (push) Blocked by required conditions Details e2e-test / perf-fmt (push) Blocked by required conditions Details e2e-test / browser fetch (push) Blocked by required conditions Details zig-test / zig fmt (push) Waiting to run Details zig-test / zig test using v8 in debug mode (push) Waiting to run Details zig-test / zig test (push) Waiting to run Details zig-test / perf-fmt (push) Blocked by required conditions Details SemanticTree: reorder getNodeDetails params	2026-03-31 07:58:28 +02:00
Adrià Arrufat	008235222b	SemanticTree: reorder getNodeDetails params	2026-03-31 07:29:33 +02:00
Adrià Arrufat	b03dbc77ab	Merge pull request #2048 from lightpanda-io/feature/semantic-tree-checked-state SemanticTree: add checked state to node data and output	2026-03-31 07:08:36 +02:00
Adrià Arrufat	fc057a3bb3	SemanticTree: add checked state to node data and output	2026-03-31 06:43:01 +02:00
Adrià Arrufat	16f17ead9a	Merge pull request #2045 from lightpanda-io/semantic-tree-node-details SemanticTree: Add nodeDetails tool	2026-03-31 05:28:24 +02:00
Adrià Arrufat	367d20d39f	SemanticTree: simplify lp.String.wrap calls	2026-03-31 05:20:32 +02:00
Karl Seguin	a6a8752787	Merge pull request #2032 from lightpanda-io/cdp_navigation_event_order Some checks failed e2e-test / zig build release (push) Has been cancelled Details e2e-test / demo-scripts (push) Has been cancelled Details e2e-test / wba-demo-scripts (push) Has been cancelled Details e2e-test / wba-test (push) Has been cancelled Details e2e-test / cdp-and-hyperfine-bench (push) Has been cancelled Details e2e-test / perf-fmt (push) Has been cancelled Details e2e-test / browser fetch (push) Has been cancelled Details zig-test / zig fmt (push) Has been cancelled Details zig-test / zig test using v8 in debug mode (push) Has been cancelled Details zig-test / zig test (push) Has been cancelled Details zig-test / perf-fmt (push) Has been cancelled Details Improve/Fix CDP navigation event order	2026-03-31 07:12:14 +08:00
Karl Seguin	568fa25add	Remove DOMContentLoaded and Loaded events from page_navigated These were moved to their own distinct events, and should have been removed from here.	2026-03-31 06:56:01 +08:00
Karl Seguin	752184b12b	Improve/Fix CDP navigation event order These changes all better align with chrome's event ordering/timing. There are two big changes. The first is that our internal page_navigated event, which is kind of our heavy hitter, is sent once the header is received as opposed to (much later) on document load. The main goal of this internal event is to trigger the "Page.frameNavigated" CDP event which is meant to happen once the URL is committed, which _is_ on header response. To accommodate this earlier trigger, new explicit events for DOMContentLoaded and load have be added. This drastically changes the flow of events as things go from: Start Page Navigation Response Received Start Frame Navigation Response Received End Frame Navigation End Page Navigation context clear + reset DOMContentLoaded Loaded TO: Start Page Navigation Response Received End Page Navigation context clear + reset Start Frame Navigation Response Received End Frame Navigation DOMContentLoaded Loaded So not only does it remove the nesting, but it ensures that the context are cleared and reset once the main page's navigation is locked in, and before any frame is created.	2026-03-31 06:56:00 +08:00
Adrià Arrufat	9c8fe9b20f	SemanticTree: Add nodeDetails tool Adds a tool to retrieve detailed node metadata and updates the semantic tree to track and display the disabled state of elements.	2026-03-30 16:38:23 +02:00