perf(observation): reduce document processing scheduling overhead

CHANGELOG.md

@@ -5,13 +5,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 Starting from 0.2.0, CLI / Extension / DSH Plugin share the same version number.
 
-## [Unreleased]
-
-### Added
-
-- [Scroll-to element primitive](docs/scroll-to.md) across CLI, Extension and DSH Plugin,
-  with ancestor-clipped visible bounds, iframe support and cooperative cancellation
-
 ## [0.2.1] - 2026-09-09
 
 ### Changed

README.md

@@ -207,9 +207,6 @@ through the [plugin](#deepseek-harness-plugin): the agent calls injected
 
 ## For Developers
 
-The [scroll-to primitive reference](docs/scroll-to.md) covers its CLI, protocol
-and plugin entry points, visible bounds and interruption behavior.
-
 The repository is a Cargo + pnpm workspace:
 
 - `crates/bsk-cli` — `bsk` CLI and local daemon

README.zh-CN.md

@@ -177,8 +177,6 @@ Agent 不直接与浏览器通信。它通过 `bsk` CLI 下发浏览器任务；
 
 ## 面向开发者
 
-[scroll-to 原语说明](docs/scroll-to.md)介绍 CLI、协议和插件入口，以及可见区域、错误和中断语义。
-
 本仓库是 Cargo + pnpm workspace：
 
 - `crates/bsk-cli` — `bsk` CLI 与本地 daemon

apps/extension/src/browser-driver/__tests__/chromium-cdp.test.ts

@@ -29,24 +29,6 @@ function fakeApi() {
 }
 
 describe("ChromiumCdp", () => {
-  it("changes attachment identity only across real debugger attachments", async () => {
-    const { api, onEvent, onDetach } = fakeApi();
-    const cdp = new ChromiumCdp(api);
-    expect(cdp.getAttachmentId(4)).toBeUndefined();
-    await cdp.ensureAttached(4);
-    const first = cdp.getAttachmentId(4);
-    expect(first).toBeTruthy();
-    await cdp.ensureAttached(4);
-    onEvent.fire({ tabId: 4 }, "Target.attachedToTarget", { sessionId: "child" });
-    expect(cdp.getAttachmentId(4)).toBe(first);
-    onDetach.fire({ tabId: 4 }, "target_closed");
-    expect(cdp.getAttachmentId(4)).toBeUndefined();
-    await cdp.ensureAttached(4);
-    expect(cdp.getAttachmentId(4)).not.toBe(first);
-    await cdp.detach(4);
-    expect(cdp.getAttachmentId(4)).toBeUndefined();
-  });
-
   it("discovers multiple iframe targets and recursively routes nested OOPIF commands", async () => {
     const { api, onEvent } = fakeApi();
     (api.sendCommand as ReturnType<typeof vi.fn>).mockImplementation(

apps/extension/src/browser-driver/chromium-cdp.ts

@@ -164,7 +164,6 @@ async function settleBeforeDeadline(promises: Promise<void>[], deadline: number)
 export class ChromiumCdp {
   private readonly api: CdpDebuggerApi;
   private readonly attachedTabs = new Set<number>();
-  private readonly attachmentIds = new Map<number, string>();
   private readonly attachInFlight = new Map<number, Promise<void>>();
   private readonly detachInFlight = new Map<number, Promise<void>>();
   private readonly tabOwners = new Map<number, Set<string>>();
@@ -199,11 +198,6 @@ export class ChromiumCdp {
     this.bindFrameTargetHandler();
   }
 
-  /** Identity of this actual debugger attachment, independent of frame topology. */
-  getAttachmentId(tabId: number): string | undefined {
-    return this.attachmentIds.get(tabId);
-  }
-
   /** Attach to `tabId` if we haven't already in this driver. */
   async ensureAttached(tabId: number): Promise<void> {
     // Returning a tab clears the cache before Chrome finishes detaching.
@@ -223,7 +217,6 @@ export class ChromiumCdp {
         await this.enableConsoleDomains(tabId);
         await this.enableNetworkDomainBestEffort(tabId);
         this.attachedTabs.add(tabId);
-        this.attachmentIds.set(tabId, crypto.randomUUID());
         await this.enableFrameDiscovery({ tabId }).catch((err) => {
           console.debug("[bsk cdp] frame discovery unavailable", { tabId, err });
         });
@@ -451,7 +444,6 @@ export class ChromiumCdp {
     this.attachInFlight.delete(tabId);
     if (!this.attachedTabs.has(tabId)) return;
     this.attachedTabs.delete(tabId);
-    this.attachmentIds.delete(tabId);
     this.clearDialogState(tabId);
     this.clearConsoleState(tabId);
     this.clearNetworkState(tabId);
@@ -510,7 +502,6 @@ export class ChromiumCdp {
     this.attachInFlight.clear();
     this.tabOwners.clear();
     this.attachedTabs.clear();
-    this.attachmentIds.clear();
     this.dialogBuffers.clear();
     this.dialogSequences.clear();
     this.consoleBuffers.clear();
@@ -857,7 +848,6 @@ export class ChromiumCdp {
     const listener = (source: chrome.debugger.Debuggee, _reason: string) => {
       if (typeof source.tabId === "number") {
         this.attachedTabs.delete(source.tabId);
-        this.attachmentIds.delete(source.tabId);
         this.attachInFlight.delete(source.tabId);
         this.tabOwners.delete(source.tabId);
         this.clearDialogState(source.tabId);

apps/extension/src/session-manager/ref-store.ts

@@ -1,11 +1,19 @@
-import type { VisualCandidate } from "@/tools/vom/visual-discovery";
-
-/** Session-local refs describe the latest observation. Reusing eN does not identify
- * which observation a caller read; generation is internal bookkeeping only. */
+/**
+ * Per-session map from `@e<N>` snapshot refs to a CDP node address.
+ *
+ * Each fresh `tool.snapshot` resets the store: M6 will call
+ * `replace(...)` with the new ref → node address pairs. A node address
+ * includes the owning flat CDP session/frame when the element lives in
+ * an OOPIF; tools resolve live geometry from that identity at call time.
+ *
+ * Refs are session-scoped (§7): looking up a ref in the wrong session
+ * returns `null`, never silently leaks. Storing values in different
+ * sessions is fine; they live in independent `RefStore` instances
+ * inside the `SessionContext`.
+ */
 export type BackendNodeId = number;
 
-export interface DomRefEntry {
-  readonly kind: "dom";
+export interface RefEntry {
   backendNodeId: BackendNodeId;
   tabId: number | null;
   frameId?: string;
@@ -13,15 +21,7 @@ export interface DomRefEntry {
   generation: number;
 }
 
-export interface VisualRefInput {
-  readonly kind: "visual-region";
-  readonly candidate: VisualCandidate;
-}
-
-export type RefEntry = DomRefEntry | (VisualRefInput & { readonly generation: number });
-
 export type RefInput =
-  | VisualRefInput
   | BackendNodeId
   | {
       backendNodeId: BackendNodeId;
@@ -31,7 +31,7 @@ export type RefInput =
     };
 
 export class RefStore {
-  private map = new Map<string, RefEntry>();
+  private readonly map = new Map<string, RefEntry>();
   private generation = 0;
 
   size(): number {
@@ -44,7 +44,7 @@ export class RefStore {
 
   resolve(ref: string, opts: { tabId?: number } = {}): BackendNodeId | null {
     const entry = this.map.get(normaliseRef(ref));
-    if (!entry || entry.kind !== "dom") return null;
+    if (!entry) return null;
     if (opts.tabId !== undefined && entry.tabId !== opts.tabId) return null;
     return entry.backendNodeId;
   }
@@ -58,11 +58,9 @@ export class RefStore {
    * Used after every fresh `tool.snapshot`.
    */
   replace(entries: Iterable<readonly [string, RefInput]>): void {
-    const generation = this.generation + 1;
-    const next = new Map<string, RefEntry>();
-    for (const [ref, input] of entries) next.set(normaliseRef(ref), this.entry(input, generation));
-    this.map = next;
-    this.generation = generation;
+    this.map.clear();
+    this.generation += 1;
+    for (const [ref, input] of entries) this.map.set(normaliseRef(ref), this.entry(input));
   }
 
   set(
@@ -75,7 +73,6 @@ export class RefStore {
     } = {},
   ): void {
     this.map.set(normaliseRef(ref), {
-      kind: "dom",
       backendNodeId: id,
       tabId: opts.tabId ?? null,
       ...(opts.frameId ? { frameId: opts.frameId } : {}),
@@ -92,37 +89,20 @@ export class RefStore {
     return this.map.entries();
   }
 
-  private entry(input: RefInput, generation: number): RefEntry {
-    if (typeof input !== "number" && "kind" in input) {
-      const { document } = input.candidate;
-      if (
-        !document?.attachmentId ||
-        !document.frameId ||
-        !Number.isSafeInteger(document.target?.tabId) ||
-        !Number.isSafeInteger(document.documentElementBackendNodeId) ||
-        document.documentElementBackendNodeId <= 0 ||
-        !Number.isSafeInteger(input.candidate.backendNodeId) ||
-        input.candidate.backendNodeId <= 0
-      )
-        throw new TypeError("visual ref requires a verified DOM identity and anchor");
-      // Preserve the read-only evidence and shared clipping chain; do not clone ancestors per ref.
-      return { kind: "visual-region", candidate: input.candidate, generation };
-    }
+  private entry(input: RefInput): RefEntry {
     if (typeof input === "number") {
       return {
-        kind: "dom",
         backendNodeId: input,
         tabId: null,
-        generation,
+        generation: this.generation,
       };
     }
     return {
-      kind: "dom",
       backendNodeId: input.backendNodeId,
       tabId: input.tabId,
       ...(input.frameId ? { frameId: input.frameId } : {}),
       ...(input.cdpSessionId ? { cdpSessionId: input.cdpSessionId } : {}),
-      generation,
+      generation: this.generation,
     };
   }
 }

apps/extension/src/tools/__tests__/dispatcher.test.ts

@@ -599,79 +599,6 @@ describe("ToolDispatcher", () => {
     expect(onSessionsChanged).toHaveBeenCalledTimes(2);
   });
 
-  it.each([
-    "focus",
-    "blur",
-    "scroll_to",
-  ] as const)("routes %s with hover cleanup and cooperative cancellation", async (action) => {
-    const tab = { id: 7, windowId: 4242, active: true };
-    vi.stubGlobal("chrome", {
-      tabs: {
-        get: vi.fn(async () => tab),
-        query: vi.fn(async () => [tab]),
-        sendMessage: vi.fn(async () => undefined),
-      },
-    });
-    const sessions = new SessionManager({
-      agentWindow: {
-        create: async () => 4242,
-        remove: async () => {},
-        ensureActiveTab: async () => 7,
-      },
-    });
-    const ctx = await sessions.start("aa11");
-    ctx.refStore.set("e1", 12, { tabId: 7 });
-    const { transport, sent, deliver } = fakeTransport();
-    const onBrowserControlResumed = vi.fn();
-    let resolveNode: ((value: object) => void) | undefined;
-    const cdp = {
-      send: vi.fn(async (_tabId: number, method: string) => {
-        if (method === "DOM.resolveNode")
-          return new Promise((resolve) => {
-            resolveNode = resolve;
-          });
-        if (method === "Runtime.callFunctionOn") return { result: { value: true } };
-        return {};
-      }),
-    } as unknown as TestDispatcherCdp;
-    const dispatcher = new ToolDispatcher({ transport, sessions, cdp, onBrowserControlResumed });
-    const hover = dispatcher as unknown as {
-      rememberHover: (sessionId: string, result: object) => void;
-      setHoverBypass: (sessionId: string, tabId: number, enabled: boolean) => Promise<void>;
-    };
-    hover.rememberHover("aa11", { tab_id: 7, x: 10, y: 20 });
-    await hover.setHoverBypass("aa11", 7, true);
-    dispatcher.start();
-    deliver(makeRequest(`tool.${action}`, { session_id: "aa11", ref: "e1" }));
-    await vi.waitFor(() => expect(resolveNode).toBeDefined());
-    expect(onBrowserControlResumed).toHaveBeenCalledWith("aa11");
-    deliver({ id: "cancel-focus", method: "cancel", params: { rpc_id: "r-1" } });
-    resolveNode!({ object: { objectId: "focus-target" } });
-    await vi.waitFor(() => expect(sent).toHaveLength(2));
-    expect(sent).toContainEqual({ id: "cancel-focus", result: { cancelled: true } });
-    expect(sent).toContainEqual({
-      id: "r-1",
-      error: expect.objectContaining({ code: "cancelled" }),
-    });
-    expect(cdp.send).not.toHaveBeenCalledWith(7, "DOM.focus", expect.anything());
-    expect(cdp.send).not.toHaveBeenCalledWith(7, "Runtime.callFunctionOn", expect.anything());
-    if (action === "scroll_to") {
-      expect(cdp.send).toHaveBeenCalledWith(7, "Runtime.releaseObjectGroup", {
-        objectGroup: expect.any(String),
-      });
-    } else {
-      expect(cdp.send).toHaveBeenCalledWith(7, "Runtime.releaseObject", {
-        objectId: "focus-target",
-      });
-    }
-    expect(chrome.tabs.sendMessage).toHaveBeenCalledWith(
-      7,
-      expect.objectContaining({ enabled: false }),
-    );
-    expect(dispatcher.inflightAbortControllers.size).toBe(0);
-    dispatcher.stop();
-  });
-
   it("invokes onBrowserControlResumed for browser-control tools but not passive reads", async () => {
     vi.stubGlobal("chrome", {
       tabs: {

apps/extension/src/tools/__tests__/file-transfer.test.ts

@@ -436,8 +436,6 @@ describe("file transfer tools", () => {
         if (method === "DOM.getContentQuads") {
           return { quads: [[10, 20, 210, 20, 210, 120, 10, 120]] };
         }
-        if (method === "Runtime.evaluate")
-          return { result: { value: { width: 400, height: 300 } } };
         if (method === "Page.getLayoutMetrics") {
           return { cssLayoutViewport: { clientWidth: 400, clientHeight: 300 } };
         }

apps/extension/src/tools/__tests__/focus.browser.test.ts

@@ -1,166 +0,0 @@
-// @vitest-environment node
-// Opt in with BSK_FOCUS_CHROME=/path/to/chrome; each test owns its browser/profile.
-import { describe, expect, it } from "vitest";
-import { SessionManager } from "@/session-manager/manager";
-import { handleBlur, handleFocus } from "../interaction";
-import type { CdpRunner } from "../shared";
-
-type Send = <T = Record<string, unknown>>(
-  method: string,
-  params?: object,
-  sessionId?: string,
-) => Promise<T>;
-
-async function withFocusBrowser(
-  run: (h: {
-    evaluate: (expression: string) => Promise<unknown>;
-    ref: () => Promise<void>;
-    focus: (signal?: AbortSignal) => ReturnType<typeof handleFocus>;
-    blur: (signal?: AbortSignal) => ReturnType<typeof handleBlur>;
-    calls: string[];
-    afterCommand: { current: (method: string) => void };
-  }) => Promise<void>,
-) {
-  // Reuse the existing isolated Chrome launcher; no new browser dependency.
-  const { withChrome } = await import(
-    new URL(
-      "../../../../../evals/browser/cases/regression/snapshot-coordinates/chrome.mjs",
-      import.meta.url,
-    ).href
-  );
-  await withChrome(
-    { executable: process.env.BSK_FOCUS_CHROME, deviceScale: 1, zoom: 1 },
-    async (send: Send) => {
-      const { targetId } = await send<{ targetId: string }>("Target.createTarget", {
-        url: "about:blank",
-      });
-      const { sessionId } = await send<{ sessionId: string }>("Target.attachToTarget", {
-        targetId,
-        flatten: true,
-      });
-      await send("Page.bringToFront", {}, sessionId);
-      const evaluate = async (expression: string) => {
-        const reply = await send<{ result: { value: unknown }; exceptionDetails?: unknown }>(
-          "Runtime.evaluate",
-          { expression, returnByValue: true },
-          sessionId,
-        );
-        expect(reply.exceptionDetails).toBeUndefined();
-        return reply.result.value;
-      };
-      await evaluate(
-        `document.body.innerHTML = '<input id="target"><input id="other">'; window.probe = document.querySelector('#target');`,
-      );
-      const manager = new SessionManager({
-        agentWindow: {
-          create: async () => 100,
-          remove: async () => {},
-          ensureActiveTab: async () => 4,
-        },
-      });
-      const ctx = await manager.start("aa11");
-      const calls: string[] = [];
-      const afterCommand = { current: (_method: string) => {} };
-      const cdp: CdpRunner = {
-        send: async (_tabId, method, params) => {
-          calls.push(method);
-          const result = await send(method, params, sessionId);
-          afterCommand.current(method);
-          return result as never;
-        },
-      };
-      const deps = {
-        cdp,
-        tabsApi: {
-          get: async (id: number) => ({ id, windowId: 100, active: true }) as chrome.tabs.Tab,
-          query: async () => [{ id: 4, windowId: 100, active: true } as chrome.tabs.Tab],
-        },
-      };
-      await run({
-        evaluate,
-        calls,
-        afterCommand,
-        ref: async () => {
-          const { result } = await send<{ result: { objectId: string } }>(
-            "Runtime.evaluate",
-            { expression: "window.probe" },
-            sessionId,
-          );
-          const { node } = await send<{ node: { backendNodeId: number } }>(
-            "DOM.describeNode",
-            { objectId: result.objectId },
-            sessionId,
-          );
-          await send("Runtime.releaseObject", { objectId: result.objectId }, sessionId);
-          ctx.refStore.set("e1", node.backendNodeId, { tabId: 4 });
-        },
-        focus: (signal) =>
-          handleFocus(manager, { session_id: "aa11", ref: "e1" }, { ...deps, signal }),
-        blur: (signal) =>
-          handleBlur(manager, { session_id: "aa11", ref: "e1" }, { ...deps, signal }),
-      });
-    },
-  );
-}
-
-describe.skipIf(!process.env.BSK_FOCUS_CHROME)("real browser focus and blur", () => {
-  it.each(["light", "open", "closed"])("verifies focus and blur in %s DOM", async (mode) => {
-    await withFocusBrowser(async (h) => {
-      if (mode !== "light")
-        await h.evaluate(`(() => {
-        const host = document.createElement('div'); document.body.append(host);
-        const nested = document.createElement('div'); host.attachShadow({mode:'${mode}'}).append(nested);
-        const input = document.createElement('input'); nested.attachShadow({mode:'${mode}'}).append(input);
-        window.probe = input;
-      })()`);
-      await h.ref();
-      expect(await h.focus()).toMatchObject({ focused: true });
-      expect(await h.evaluate("window.probe.matches(':focus')")).toBe(true);
-      expect(await h.blur()).toMatchObject({ was_focused: true, focused: false });
-      expect(await h.evaluate("window.probe.matches(':focus')")).toBe(false);
-      expect(h.calls.filter((method) => method === "Runtime.releaseObject")).toHaveLength(2);
-    });
-  });
-
-  it("detects focus changes from event-handler microtasks", async () => {
-    await withFocusBrowser(async (h) => {
-      await h.ref();
-      await h.evaluate(
-        "window.probe.addEventListener('focus', () => queueMicrotask(() => document.querySelector('#other').focus()), {once:true})",
-      );
-      expect(await h.focus()).toMatchObject({ code: "cdp_failed" });
-      expect(await h.focus()).toMatchObject({ focused: true });
-      await h.evaluate(
-        "window.probe.addEventListener('blur', () => queueMicrotask(() => window.probe.focus()), {once:true})",
-      );
-      expect(await h.blur()).toMatchObject({ code: "cdp_failed" });
-      expect(await h.evaluate("window.probe.matches(':focus')")).toBe(true);
-    });
-  });
-
-  it("cancels before blur while still releasing the resolved object", async () => {
-    await withFocusBrowser(async (h) => {
-      await h.ref();
-      await h.focus();
-      const abort = new AbortController();
-      h.afterCommand.current = (method) => {
-        if (method === "DOM.resolveNode") abort.abort();
-      };
-      expect(await h.blur(abort.signal)).toMatchObject({ code: "cancelled" });
-      expect(await h.evaluate("window.probe.matches(':focus')")).toBe(true);
-      expect(h.calls.at(-1)).toBe("Runtime.releaseObject");
-    });
-  });
-
-  it("reports a page exception with its cause", async () => {
-    await withFocusBrowser(async (h) => {
-      await h.ref();
-      await h.evaluate("window.probe.blur = () => { throw new Error('page blur failed'); }");
-      expect(await h.blur()).toMatchObject({
-        code: "cdp_failed",
-        message: expect.stringContaining("page blur failed"),
-      });
-      expect(h.calls.at(-1)).toBe("Runtime.releaseObject");
-    });
-  });
-});

apps/extension/src/tools/__tests__/focus.test.ts

@@ -1,293 +0,0 @@
-import { afterEach, describe, expect, it, vi } from "vitest";
-import type { CdpTarget } from "@/browser-driver/frame-graph";
-import { SessionManager } from "@/session-manager/manager";
-import { handleBlur, handleFocus } from "../interaction";
-import type { CdpRunner } from "../shared";
-
-interface ScriptParams {
-  functionDeclaration: string;
-}
-interface Call {
-  target: CdpTarget;
-  method: string;
-}
-
-async function setup(element?: HTMLElement, childSession = false) {
-  if (!element) {
-    document.body.innerHTML = '<input id="target"><input id="other">';
-    element = document.querySelector<HTMLInputElement>("#target")!;
-  }
-  const targetElement = element;
-  const manager = new SessionManager({
-    agentWindow: {
-      create: async () => 100,
-      remove: async () => {},
-      ensureActiveTab: async () => 4,
-    },
-  });
-  const ctx = await manager.start("aa11");
-  ctx.refStore.set("e1", 12, {
-    tabId: 4,
-    ...(childSession ? { frameId: "child", cdpSessionId: "child-session" } : {}),
-  });
-  const calls: Call[] = [];
-  const afterCommand = vi.fn<(call: Call) => void>();
-  const script = vi.fn(async (params: ScriptParams) => {
-    try {
-      const fn = new Function(`return (${params.functionDeclaration})`)();
-      return { result: { value: await fn.call(targetElement) } };
-    } catch (error) {
-      return { exceptionDetails: { text: "Uncaught", exception: { description: String(error) } } };
-    }
-  });
-  const focus = vi.fn(() => targetElement.focus());
-  const release = vi.fn(async () => ({}));
-  const send = async (target: CdpTarget, method: string, params?: object) => {
-    const call = { target, method };
-    calls.push(call);
-    try {
-      switch (method) {
-        case "DOM.getDocument":
-          return { root: { nodeId: 1 } };
-        case "DOM.querySelector":
-          return { nodeId: 2 };
-        case "DOM.describeNode":
-          return { node: { backendNodeId: 12 } };
-        case "DOM.scrollIntoViewIfNeeded":
-          return {};
-        case "DOM.resolveNode":
-          return { object: { objectId: "focus-target" } };
-        case "DOM.focus":
-          focus();
-          return {};
-        case "Runtime.callFunctionOn":
-          return await script(params as ScriptParams);
-        case "Runtime.releaseObject":
-          return await release();
-        default:
-          throw new Error(`unexpected ${method}`);
-      }
-    } finally {
-      afterCommand(call);
-    }
-  };
-  const cdp: CdpRunner = {
-    send: (tabId, method, params) => send({ tabId }, method, params) as never,
-    sendToTarget: send as CdpRunner["sendToTarget"],
-    getFrameGraph: vi.fn(async () => ({
-      rootFrameId: "main",
-      frames: [
-        { frameId: "main", target: { tabId: 4 } },
-        ...(childSession
-          ? [
-              {
-                frameId: "child",
-                parentFrameId: "main",
-                ownerBackendNodeId: 99,
-                target: { tabId: 4, sessionId: "child-session" },
-              },
-            ]
-          : []),
-      ],
-    })),
-  };
-  const tabsApi = {
-    get: vi.fn(async (id: number) => ({ id, windowId: 100, active: true }) as chrome.tabs.Tab),
-    query: vi.fn(async () => [{ id: 4, windowId: 100, active: true } as chrome.tabs.Tab]),
-  };
-  return {
-    element: targetElement,
-    calls,
-    afterCommand,
-    script,
-    focus,
-    release,
-    cdp,
-    tabsApi,
-    run: (
-      action: "focus" | "blur",
-      signal?: AbortSignal,
-      params: { ref?: string; selector?: string; tab_id?: number } = { ref: "e1" },
-    ) =>
-      (action === "focus" ? handleFocus : handleBlur)(
-        manager,
-        { session_id: "aa11", ...params },
-        { cdp, tabsApi, signal },
-      ),
-  };
-}
-
-afterEach(() => {
-  vi.restoreAllMocks();
-  document.body.innerHTML = "";
-});
-
-describe("focus and blur state verification", () => {
-  it.each(["open", "closed"] as const)("handles nested %s shadow roots", async (mode) => {
-    const host = document.createElement("div");
-    document.body.append(host);
-    const outer = host.attachShadow({ mode });
-    const innerHost = document.createElement("div");
-    outer.append(innerHost);
-    const inner = innerHost.attachShadow({ mode });
-    const element = document.createElement("input");
-    inner.append(element);
-    const h = await setup(element);
-    expect(await h.run("focus")).toMatchObject({ focused: true });
-    expect(inner.activeElement).toBe(element);
-    expect(await h.run("blur")).toMatchObject({ was_focused: true, focused: false });
-    expect(inner.activeElement).toBeNull();
-    expect(h.release).toHaveBeenCalledTimes(2);
-  });
-
-  it("keeps DOM focus usable when the document is in the background", async () => {
-    const h = await setup();
-    vi.spyOn(document, "hasFocus").mockReturnValue(false);
-    expect(await h.run("focus")).toMatchObject({ focused: true });
-    expect(await h.run("blur")).toMatchObject({ was_focused: true, focused: false });
-  });
-
-  it("blurring an unfocused target preserves the other element's focus", async () => {
-    const h = await setup();
-    const other = document.querySelector<HTMLInputElement>("#other")!;
-    other.focus();
-    expect(await h.run("blur")).toMatchObject({ was_focused: false, focused: false });
-    expect(document.activeElement).toBe(other);
-  });
-
-  it("detects focus redirected by a focus handler's microtask", async () => {
-    const h = await setup();
-    h.element.addEventListener("focus", () =>
-      queueMicrotask(() => document.querySelector<HTMLInputElement>("#other")!.focus()),
-    );
-    expect(await h.run("focus")).toMatchObject({
-      code: "cdp_failed",
-      message: "target element did not become focused",
-    });
-    expect(h.release).toHaveBeenCalledOnce();
-  });
-
-  it("does not report blur success when a microtask restores focus", async () => {
-    const h = await setup();
-    h.element.focus();
-    h.element.addEventListener("blur", () => queueMicrotask(() => h.element.focus()));
-    expect(await h.run("blur")).toMatchObject({
-      code: "cdp_failed",
-      message: "target element remained focused after blur()",
-    });
-    expect(document.activeElement).toBe(h.element);
-    expect(h.release).toHaveBeenCalledOnce();
-  });
-
-  it.each(["focus", "blur"] as const)("rejects a detached %s target", async (action) => {
-    const h = await setup();
-    h.element.remove();
-    expect(await h.run(action)).toMatchObject({ code: "cdp_failed" });
-    expect(h.release).toHaveBeenCalledOnce();
-  });
-
-  it("preserves a script exception's cause", async () => {
-    const h = await setup();
-    vi.spyOn(h.element, "blur").mockImplementation(() => {
-      throw new Error("page blur failed");
-    });
-    expect(await h.run("blur")).toMatchObject({
-      code: "cdp_failed",
-      message: expect.stringContaining("page blur failed"),
-    });
-    expect(h.release).toHaveBeenCalledOnce();
-  });
-
-  it.each(["focus", "blur"] as const)("rejects malformed %s script results", async (action) => {
-    const h = await setup();
-    h.script.mockResolvedValueOnce({ result: { value: null } });
-    expect(await h.run(action)).toMatchObject({
-      code: "cdp_failed",
-      message: expect.stringContaining("unexpected result"),
-    });
-    expect(h.release).toHaveBeenCalledOnce();
-  });
-
-  it.each([
-    "focus",
-    "blur",
-  ] as const)("keeps %s, verification and cleanup in the OOPIF session", async (action) => {
-    const h = await setup(undefined, true);
-    if (action === "blur") h.element.focus();
-    expect(await h.run(action)).toMatchObject({ focused: action === "focus" });
-    const targetCalls = h.calls.filter((call) => call.method !== "DOM.scrollIntoViewIfNeeded");
-    expect(targetCalls.every((call) => call.target.sessionId === "child-session")).toBe(true);
-    expect(targetCalls.at(-1)?.method).toBe("Runtime.releaseObject");
-  });
-
-  it.each(["focus", "blur"] as const)("rejects %s on a user tab before CDP", async (action) => {
-    const h = await setup();
-    h.tabsApi.get.mockResolvedValue({ id: 9, windowId: 200, active: true } as chrome.tabs.Tab);
-    expect(await h.run(action, undefined, { ref: "e1", tab_id: 9 })).toMatchObject({
-      code: "permission_denied",
-    });
-    expect(h.calls).toEqual([]);
-  });
-
-  it("does not replace a successful result when navigation disposed the remote object", async () => {
-    const h = await setup();
-    h.release.mockRejectedValue(new Error("Cannot find context"));
-    expect(await h.run("focus")).toMatchObject({ focused: true });
-  });
-});
-
-describe("focus and blur cancellation", () => {
-  const boundaries = [
-    "DOM.getDocument",
-    "DOM.querySelector",
-    "DOM.describeNode",
-    "DOM.resolveNode",
-    "Runtime.callFunctionOn",
-  ];
-  for (const action of ["focus", "blur"] as const) {
-    it.each(
-      action === "focus" ? [...boundaries, "DOM.scrollIntoViewIfNeeded", "DOM.focus"] : boundaries,
-    )(`${action} stops after cancellation during %s`, async (method) => {
-      const h = await setup();
-      const abort = new AbortController();
-      let cancelledAfter = 0;
-      h.afterCommand.mockImplementation((call) => {
-        if (call.method === method && !abort.signal.aborted) {
-          cancelledAfter = h.calls.length;
-          abort.abort();
-        }
-      });
-      expect(await h.run(action, abort.signal, { selector: "#target" })).toMatchObject({
-        code: "cancelled",
-      });
-      expect(abort.signal.aborted).toBe(true);
-      expect(
-        h.calls.slice(cancelledAfter).every((call) => call.method === "Runtime.releaseObject"),
-      ).toBe(true);
-      if (h.calls.some((call) => call.method === "DOM.resolveNode"))
-        expect(h.release).toHaveBeenCalledOnce();
-    });
-
-    it(`${action} stops if cancellation arrives while resolving the tab`, async () => {
-      const h = await setup();
-      const abort = new AbortController();
-      h.tabsApi.query.mockImplementation(async () => {
-        abort.abort();
-        return [{ id: 4, windowId: 100, active: true } as chrome.tabs.Tab];
-      });
-      expect(await h.run(action, abort.signal)).toMatchObject({ code: "cancelled" });
-      expect(h.calls).toEqual([]);
-    });
-  }
-
-  it("does not scroll frame owners after cancellation in an OOPIF", async () => {
-    const h = await setup(undefined, true);
-    const abort = new AbortController();
-    h.afterCommand.mockImplementation((call) => {
-      if (call.method === "DOM.scrollIntoViewIfNeeded") abort.abort();
-    });
-    expect(await h.run("focus", abort.signal)).toMatchObject({ code: "cancelled" });
-    expect(h.calls.filter((call) => call.method === "DOM.scrollIntoViewIfNeeded")).toHaveLength(1);
-    expect(h.focus).not.toHaveBeenCalled();
-  });
-});

apps/extension/src/tools/__tests__/frame-geometry.test.ts

@@ -13,138 +13,7 @@ import {
 import { GeometryContext } from "../geometry/frame-context";
 import type { CdpRunner } from "../shared";
 
-function scrollbarDriver(
-  visible = { width: 185, height: 89 },
-  frameSize: unknown = { width: 200, height: 100 },
-) {
-  const send = vi.fn(async (target: { sessionId?: string }, method: string) => {
-    if (method === "Runtime.evaluate") return { result: { value: frameSize } };
-    if (method === "Page.getLayoutMetrics")
-      return {
-        cssLayoutViewport: {
-          clientWidth: target.sessionId ? visible.width : 800,
-          clientHeight: target.sessionId ? visible.height : 600,
-        },
-      };
-    if (method === "DOM.getBoxModel")
-      return {
-        model: {
-          content: target.sessionId
-            ? [0, 0, 200, 0, 200, 100, 0, 100]
-            : [100, 100, 500, 100, 500, 300, 100, 300],
-        },
-      };
-    if (method === "DOM.getContentQuads")
-      return { quads: [[180, 80, 230, 80, 230, 120, 180, 120]] };
-    throw new Error(`unexpected ${method}`);
-  });
-  const cdp: CdpRunner = {
-    send: (tabId, method) => send({ tabId } as never, method) as never,
-    sendToTarget: send as CdpRunner["sendToTarget"],
-    getFrameGraph: async () => ({
-      rootFrameId: "main",
-      frames: [
-        { frameId: "main", target: { tabId: 4 } },
-        {
-          frameId: "child",
-          parentFrameId: "main",
-          ownerBackendNodeId: 10,
-          target: { tabId: 4, sessionId: "child" },
-        },
-        {
-          frameId: "same-child",
-          parentFrameId: "child",
-          ownerBackendNodeId: 20,
-          target: { tabId: 4, sessionId: "child" },
-        },
-      ],
-    }),
-  };
-  return { cdp, send };
-}
-
 describe("frame geometry projection", () => {
-  it.each([
-    { width: 200, height: 100 },
-    { width: 185, height: 100 },
-    { width: 200, height: 89 },
-    { width: 185, height: 89 },
-  ])("preserves scale and clips scrollbar strips for visible viewport $width × $height", async (visible) => {
-    const { cdp, send } = scrollbarDriver(visible);
-    const geometry = await resolveNodeGeometry(cdp, 4, {
-      target: { tabId: 4, sessionId: "child" },
-      frameId: "child",
-      backendNodeId: 101,
-    });
-    expect(geometry).toMatchObject({
-      topBounds: {
-        x: 460,
-        y: 260,
-        width: (visible.width - 180) * 2,
-        height: (visible.height - 80) * 2,
-      },
-      actionPoint: { x: 460 + visible.width - 180, y: 260 + visible.height - 80 },
-      targetActionPoint: { x: (180 + visible.width) / 2, y: (80 + visible.height) / 2 },
-    });
-    expect(send.mock.calls.filter(([, method]) => method === "Runtime.evaluate")).toHaveLength(1);
-    expect(send.mock.calls.filter(([, method]) => method === "Page.getLayoutMetrics")).toHaveLength(
-      2,
-    );
-  });
-
-  it("shares the full viewport read across same-target frames, and refreshes it next operation", async () => {
-    const { cdp, send } = scrollbarDriver();
-    const context = new GeometryContext(cdp, 4);
-    await Promise.all([context.targetProjection("child"), context.targetProjection("same-child")]);
-    expect(send.mock.calls.filter(([, method]) => method === "Runtime.evaluate")).toHaveLength(1);
-    await new GeometryContext(cdp, 4).targetProjection("child");
-    expect(send.mock.calls.filter(([, method]) => method === "Runtime.evaluate")).toHaveLength(2);
-  });
-
-  it.each([
-    null,
-    {},
-    { width: 0, height: 100 },
-    { width: 200, height: NaN },
-  ])("rejects unavailable full viewport dimensions: %j", async (size) => {
-    const { cdp } = scrollbarDriver(undefined, size);
-    expect(await new GeometryContext(cdp, 4).targetProjection("child")).toBeNull();
-  });
-
-  it("clips an inner OOPIF against an intermediate OOPIF's occupied scrollbar strips", async () => {
-    const { cdp } = scrollbarDriver();
-    const outer = cdp.sendToTarget!;
-    cdp.sendToTarget = async (target, method, params) => {
-      if (method === "DOM.getBoxModel")
-        return { model: { content: [150, 60, 250, 60, 250, 120, 150, 120] } } as never;
-      if (target.sessionId !== "inner") return outer(target, method, params);
-      if (method === "Runtime.evaluate")
-        return { result: { value: { width: 100, height: 60 } } } as never;
-      if (method === "Page.getLayoutMetrics")
-        return { cssLayoutViewport: { clientWidth: 90, clientHeight: 50 } } as never;
-      if (method === "DOM.getContentQuads")
-        return { quads: [[0, 0, 100, 0, 100, 60, 0, 60]] } as never;
-      throw new Error(`unexpected ${method}`);
-    };
-    const graph = await cdp.getFrameGraph!(4);
-    graph.frames[2] = {
-      frameId: "inner",
-      parentFrameId: "child",
-      ownerBackendNodeId: 20,
-      target: { tabId: 4, sessionId: "inner" },
-    };
-    cdp.getFrameGraph = async () => graph;
-    expect(
-      await resolveNodeGeometry(cdp, 4, {
-        target: { tabId: 4, sessionId: "inner" },
-        frameId: "inner",
-        backendNodeId: 101,
-      }),
-    ).toMatchObject({
-      topBounds: { x: 400, y: 220, width: 70, height: 58 },
-    });
-  });
-
   it("keeps region bounds separate from polygon area", () => {
     const region = [
       rectPolygon({ x: 0, y: 0, w: 10, h: 10 }),
@@ -208,8 +77,6 @@ describe("frame geometry projection", () => {
     const cdp: CdpRunner = {
       send: send as CdpRunner["send"],
       sendToTarget: vi.fn(async (_target, method) => {
-        if (method === "Runtime.evaluate")
-          return { result: { value: { width: 200, height: 100 } } };
         if (method === "Page.getLayoutMetrics") {
           return { cssLayoutViewport: { clientWidth: 200, clientHeight: 100 } };
         }
@@ -268,8 +135,6 @@ describe("frame geometry projection", () => {
         throw new Error(`unexpected root command ${method}`);
       }) as CdpRunner["send"],
       sendToTarget: vi.fn(async (_target, method) => {
-        if (method === "Runtime.evaluate")
-          return { result: { value: { width: 200, height: 100 } } };
         if (method === "Page.getLayoutMetrics") {
           return { cssLayoutViewport: { clientWidth: 200, clientHeight: 100 } };
         }
@@ -331,8 +196,6 @@ describe("frame geometry projection", () => {
       }) as CdpRunner["send"],
       sendToTarget: vi.fn(async (_target, method) => {
         if (method === "DOM.scrollIntoViewIfNeeded") return {};
-        if (method === "Runtime.evaluate")
-          return { result: { value: { width: 200, height: 100 } } };
         if (method === "Page.getLayoutMetrics") {
           return { cssLayoutViewport: { clientWidth: 200, clientHeight: 100 } };
         }

apps/extension/src/tools/__tests__/geometry-context.test.ts

@@ -5,10 +5,9 @@ import { rectPolygon } from "../geometry";
 import {
   projectSnapshotRect,
   screenshotPageRect,
-  snapshotCoordinates,
   snapshotViewportRect,
 } from "../geometry/coordinate-types";
-import { GeometryContext, snapshotLayoutScale } from "../geometry/frame-context";
+import { GeometryContext } from "../geometry/frame-context";
 import type { CdpRunner } from "../shared";
 
 const target = { tabId: 4 };
@@ -23,11 +22,7 @@ const graph: CdpFrameGraph = {
 function driver() {
   const send = vi.fn(async (_tab: number, method: string): Promise<object> => {
     if (method === "Page.getLayoutMetrics")
-      return {
-        visualViewport: { clientWidth: 1000 },
-        cssVisualViewport: { clientWidth: 1000 },
-        cssLayoutViewport: { clientWidth: 1000, clientHeight: 1000 },
-      };
+      return { cssLayoutViewport: { clientWidth: 1000, clientHeight: 1000 } };
     if (method === "DOM.getBoxModel")
       return { model: { content: [52.5, 612.5, 427.5, 612.5, 427.5, 862.5, 52.5, 862.5] } };
     if (method === "DOM.resolveNode") return { object: { objectId: "owner" } };
@@ -40,63 +35,6 @@ function driver() {
 }
 
 describe("measurement geometry context", () => {
-  it.each([0.8, 1, 1.25, 2])("normalizes snapshot layout units at scale %s", (scale) => {
-    const measured = snapshotLayoutScale({
-      visualViewport: { clientWidth: 997.25, zoom: 1.1 },
-      cssVisualViewport: { clientWidth: 997.25 / scale, zoom: 1.1 },
-      // Rounded layout dimensions must not supply the scale.
-      layoutViewport: { clientWidth: 997 },
-      cssLayoutViewport: { clientWidth: Math.floor(997.25 / scale) },
-    });
-    expect(measured).toBeCloseTo(scale, 12);
-    const coordinates = snapshotCoordinates(
-      { scrollOffsetX: 80 * scale, scrollOffsetY: 200 * scale },
-      measured,
-      { x: 999, y: 999 },
-    );
-    expect(
-      snapshotViewportRect(
-        [160 * scale, 320 * scale, 120 * scale, 40 * scale],
-        { target },
-        coordinates,
-      )?.rect,
-    ).toEqual({ x: 80, y: 120, width: 120, height: 40 });
-  });
-
-  it("uses CSS root scroll only for missing snapshot offsets, without scaling it twice", () => {
-    const coordinates = snapshotCoordinates({ scrollOffsetX: 80 }, 2, { x: 999, y: 100 });
-    expect(snapshotViewportRect([200, 800, 240, 80], { target }, coordinates)?.rect).toEqual({
-      x: 60,
-      y: 300,
-      width: 120,
-      height: 40,
-    });
-    expect(snapshotCoordinates({ scrollOffsetX: 0 }, 2)).toBeNull();
-    expect(
-      snapshotCoordinates({ scrollOffsetX: NaN, scrollOffsetY: 0 }, 2, { x: 0, y: 0 }),
-    ).toBeNull();
-  });
-
-  it("does not infer snapshot units from missing, invalid, or CSS-only metrics", () => {
-    expect(snapshotLayoutScale({ cssLayoutViewport: { clientWidth: 800 } })).toBeNull();
-    for (const raw of [0, -1, NaN, Infinity]) {
-      expect(
-        snapshotLayoutScale({
-          visualViewport: { clientWidth: raw },
-          cssVisualViewport: { clientWidth: 800 },
-        }),
-      ).toBeNull();
-    }
-    expect(
-      snapshotLayoutScale({
-        visualViewport: { clientWidth: 0, clientHeight: 600 },
-        cssVisualViewport: { clientWidth: 0, clientHeight: 300 },
-      }),
-    ).toBe(2);
-    expect(snapshotCoordinates({ scrollOffsetX: 0, scrollOffsetY: 0 }, null)).toBeNull();
-    expect(snapshotViewportRect([10, 20, 120, 40], { target }, null)).toBeNull();
-  });
-
   it("shares in-flight frame measurements, but never shares them with the next context", async () => {
     const cdp = driver();
     const context = new GeometryContext(cdp, 4);
@@ -123,20 +61,14 @@ describe("measurement geometry context", () => {
       height: 1000,
     });
     if (projection.status !== "available") throw new Error("expected available projection");
-    const input = snapshotViewportRect([17, 23, 120, 40], source, {
-      layoutUnitsPerCssPixel: 1,
-      scrollCss: { x: 0, y: 0 },
-    });
+    const input = snapshotViewportRect([17, 23, 120, 40], source, { x: 0, y: 0 });
     expect(projectSnapshotRect(input!, projection.projection)).toEqual({
       x: 73.75,
       y: 641.25,
       width: 150,
       height: 50,
     });
-    const scrolled = snapshotViewportRect([17, 23, 120, 40], source, {
-      layoutUnitsPerCssPixel: 1,
-      scrollCss: { x: 0, y: 10 },
-    });
+    const scrolled = snapshotViewportRect([17, 23, 120, 40], source, { x: 0, y: 10 });
     expect(projectSnapshotRect(scrolled!, projection.projection)?.y).toBe(628.75);
     await context.snapshotProjection(source, 10, [], { width: 1000, height: 1000 });
     expect(cdp.calls.mock.calls.filter(([, method]) => method === "DOM.resolveNode")).toHaveLength(
@@ -241,7 +173,7 @@ describe("measurement geometry context", () => {
     const input = snapshotViewportRect(
       [30, 50, 120, 40],
       { target, frameId: "main" },
-      { layoutUnitsPerCssPixel: 1, scrollCss: { x: 10, y: 20 } },
+      { x: 10, y: 20 },
     )!;
     const projection = {
       source: { target, frameId: "main" },
@@ -262,20 +194,8 @@ describe("measurement geometry context", () => {
         source: { target: { tabId: 5 }, frameId: "main" },
       }),
     ).toBeNull();
-    expect(
-      snapshotViewportRect(
-        [0, 0, NaN, 40],
-        { target },
-        { layoutUnitsPerCssPixel: 1, scrollCss: { x: 0, y: 0 } },
-      ),
-    ).toBeNull();
-    expect(
-      snapshotViewportRect(
-        [0, 0, 10, 40],
-        { target },
-        { layoutUnitsPerCssPixel: 1, scrollCss: { x: Infinity, y: 0 } },
-      ),
-    ).toBeNull();
+    expect(snapshotViewportRect([0, 0, NaN, 40], { target }, { x: 0, y: 0 })).toBeNull();
+    expect(snapshotViewportRect([0, 0, 10, 40], { target }, { x: Infinity, y: 0 })).toBeNull();
   });
 
   it("does not turn a border quad or a failed owner read into a content projection", async () => {
@@ -308,7 +228,7 @@ describe("measurement geometry context", () => {
     const input = snapshotViewportRect(
       [0, 0, 300, 200],
       { target, frameId: "nested" },
-      { layoutUnitsPerCssPixel: 1, scrollCss: { x: 0, y: 0 } },
+      { x: 0, y: 0 },
     );
     expect(projectSnapshotRect(input!, projection.projection)).toEqual({
       x: 60,
@@ -358,11 +278,7 @@ describe("measurement geometry context", () => {
       peak = Math.max(peak, active);
       await new Promise<void>((resolve) => release.push(resolve));
       active--;
-      return {
-        visualViewport: { clientWidth: 1000 },
-        cssVisualViewport: { clientWidth: 1000 },
-        cssLayoutViewport: { clientWidth: 100, clientHeight: 100 },
-      };
+      return { cssLayoutViewport: { clientWidth: 100, clientHeight: 100 } };
     });
     const controller = new AbortController();
     const context = new GeometryContext(

apps/extension/src/tools/__tests__/human-loop.test.ts

@@ -405,7 +405,6 @@ describe("handleRequestHelp", () => {
               agentWindowId: 99,
               refStore: {
                 resolveEntry: () => ({
-                  kind: "dom",
                   backendNodeId: 42,
                   tabId: 5,
                   frameId: "child",
@@ -434,7 +433,6 @@ describe("handleRequestHelp", () => {
       if (method === "DOM.getContentQuads") {
         return { quads: [[10, 20, 110, 20, 110, 60, 10, 60]] };
       }
-      if (method === "Runtime.evaluate") return { result: { value: { width: 200, height: 100 } } };
       if (method === "Page.getLayoutMetrics") {
         return { cssLayoutViewport: { clientWidth: 200, clientHeight: 100 } };
       }

apps/extension/src/tools/__tests__/interaction.test.ts

@@ -2,10 +2,8 @@ import { describe, expect, it, vi } from "vitest";
 import { SessionManager } from "@/session-manager/manager";
 import type { CdpRunner } from "@/tools/shared";
 import {
-  handleBlur,
   handleClick,
   handleFill,
-  handleFocus,
   handleHover,
   handlePress,
   handleSelect,
@@ -203,7 +201,6 @@ describe("handleClick", () => {
       if (method === "DOM.getContentQuads") {
         return { quads: [[10, 20, 110, 20, 110, 60, 10, 60]] };
       }
-      if (method === "Runtime.evaluate") return { result: { value: { width: 200, height: 100 } } };
       if (method === "Page.getLayoutMetrics") {
         return { cssLayoutViewport: { clientWidth: 200, clientHeight: 100 } };
       }
@@ -223,7 +220,6 @@ describe("handleClick", () => {
       { sessionId: "child-session", method: "DOM.scrollIntoViewIfNeeded" },
       { sessionId: "child-session", method: "DOM.getContentQuads" },
       { sessionId: "child-session", method: "Page.getLayoutMetrics" },
-      { sessionId: "child-session", method: "Runtime.evaluate" },
     ]);
     expect(fake.sent.filter((call) => call.method === "Input.dispatchMouseEvent")).toHaveLength(3);
   });
@@ -544,161 +540,6 @@ describe("handleHover", () => {
   });
 });
 
-describe("handleFocus and handleBlur", () => {
-  it("focuses a ref and verifies the deep active element", async () => {
-    const sm = new SessionManager({ agentWindow: fakeAgentWindow([100]) });
-    const ctx = await sm.start("aa11");
-    ctx.refStore.set("e3", 1234, { tabId: 4 });
-    const fake = makeFakeCdp({
-      "DOM.scrollIntoViewIfNeeded": () => ({}),
-      "DOM.focus": () => ({}),
-      "DOM.resolveNode": () => ({ object: { objectId: "focus-target" } }),
-      "Runtime.callFunctionOn": () => ({ result: { value: true } }),
-    });
-
-    const res = await handleFocus(
-      sm,
-      { session_id: "aa11", ref: "@e3" },
-      { cdp: fake.cdp, tabsApi: fake.tabsApi },
-    );
-
-    if ("code" in res) throw new Error(`unexpected error: ${JSON.stringify(res)}`);
-    expect(res).toMatchObject({ tab_id: 4, used_ref: "e3", focused: true });
-    expect(fake.sent.map((call) => call.method)).toEqual([
-      "DOM.scrollIntoViewIfNeeded",
-      "DOM.resolveNode",
-      "DOM.focus",
-      "Runtime.callFunctionOn",
-      "Runtime.releaseObject",
-    ]);
-  });
-
-  it("focuses an OOPIF ref in its CDP session", async () => {
-    const sm = new SessionManager({ agentWindow: fakeAgentWindow([100]) });
-    const ctx = await sm.start("aa11");
-    ctx.refStore.set("e3", 1234, {
-      tabId: 4,
-      frameId: "child-frame",
-      cdpSessionId: "child-session",
-    });
-    const fake = makeFakeCdp({
-      "DOM.scrollIntoViewIfNeeded": () => ({}),
-    });
-    fake.cdp.getFrameGraph = vi.fn(async () => ({
-      rootFrameId: "main",
-      frames: [
-        { frameId: "main", target: { tabId: 4 } },
-        {
-          frameId: "child-frame",
-          parentFrameId: "main",
-          ownerBackendNodeId: 99,
-          target: { tabId: 4, sessionId: "child-session" },
-        },
-      ],
-    }));
-    const targetCalls: Array<{ sessionId?: string; method: string }> = [];
-    fake.cdp.sendToTarget = vi.fn(async (target, method) => {
-      targetCalls.push({ sessionId: target.sessionId, method });
-      if (method === "DOM.scrollIntoViewIfNeeded") return {};
-      if (method === "DOM.focus" || method === "Runtime.releaseObject") return {};
-      if (method === "DOM.resolveNode") return { object: { objectId: "focus-target" } };
-      if (method === "Runtime.callFunctionOn") return { result: { value: true } };
-      throw new Error(`unexpected child CDP call ${method}`);
-    }) as CdpRunner["sendToTarget"];
-
-    const res = await handleFocus(
-      sm,
-      { session_id: "aa11", ref: "@e3" },
-      { cdp: fake.cdp, tabsApi: fake.tabsApi },
-    );
-
-    if ("code" in res) throw new Error(`unexpected error: ${JSON.stringify(res)}`);
-    expect(res.focused).toBe(true);
-    expect(targetCalls).toEqual([
-      { sessionId: "child-session", method: "DOM.scrollIntoViewIfNeeded" },
-      { sessionId: "child-session", method: "DOM.resolveNode" },
-      { sessionId: "child-session", method: "DOM.focus" },
-      { sessionId: "child-session", method: "Runtime.callFunctionOn" },
-      { sessionId: "child-session", method: "Runtime.releaseObject" },
-    ]);
-  });
-
-  it("does not focus after cancellation during scrolling", async () => {
-    const sm = new SessionManager({ agentWindow: fakeAgentWindow([100]) });
-    const ctx = await sm.start("aa11");
-    ctx.refStore.set("e3", 1234, { tabId: 4 });
-    const abort = new AbortController();
-    const fake = makeFakeCdp({
-      "DOM.scrollIntoViewIfNeeded": () => {
-        abort.abort();
-        return {};
-      },
-    });
-
-    const res = await handleFocus(
-      sm,
-      { session_id: "aa11", ref: "@e3" },
-      { cdp: fake.cdp, tabsApi: fake.tabsApi, signal: abort.signal },
-    );
-
-    expect(res).toMatchObject({ code: "cancelled" });
-    expect(fake.sent.some((call) => call.method === "DOM.focus")).toBe(false);
-  });
-
-  it("blurs a ref and returns its previous focus state", async () => {
-    const sm = new SessionManager({ agentWindow: fakeAgentWindow([100]) });
-    const ctx = await sm.start("aa11");
-    ctx.refStore.set("e3", 1234, { tabId: 4 });
-    const fake = makeFakeCdp({
-      "DOM.resolveNode": () => ({ object: { objectId: "focus-target" } }),
-      "Runtime.callFunctionOn": vi
-        .fn()
-        .mockResolvedValueOnce({ result: { value: { ok: true, was_focused: true } } })
-        .mockResolvedValueOnce({ result: { value: false } }),
-    });
-
-    const res = await handleBlur(
-      sm,
-      { session_id: "aa11", ref: "@e3" },
-      { cdp: fake.cdp, tabsApi: fake.tabsApi },
-    );
-
-    if ("code" in res) throw new Error(`unexpected error: ${JSON.stringify(res)}`);
-    expect(res).toMatchObject({
-      tab_id: 4,
-      used_ref: "e3",
-      was_focused: true,
-      focused: false,
-    });
-    expect(fake.sent.map((call) => call.method)).toEqual([
-      "DOM.resolveNode",
-      "Runtime.callFunctionOn",
-      "Runtime.callFunctionOn",
-      "Runtime.releaseObject",
-    ]);
-  });
-
-  it("rejects a target that does not implement blur", async () => {
-    const sm = new SessionManager({ agentWindow: fakeAgentWindow([100]) });
-    const ctx = await sm.start("aa11");
-    ctx.refStore.set("e3", 1234, { tabId: 4 });
-    const fake = makeFakeCdp({
-      "DOM.resolveNode": () => ({ object: { objectId: "focus-target" } }),
-      "Runtime.callFunctionOn": () => ({
-        result: { value: { ok: false, was_focused: false, focused: false } },
-      }),
-    });
-
-    const res = await handleBlur(
-      sm,
-      { session_id: "aa11", ref: "@e3" },
-      { cdp: fake.cdp, tabsApi: fake.tabsApi },
-    );
-
-    expect(res).toMatchObject({ code: "invalid_params", message: /does not support blur/ });
-  });
-});
-
 function successfulFillScript(params: unknown) {
   const script = params as { arguments?: Array<{ value: unknown }>; functionDeclaration: string };
   const args = script.arguments ?? [];

apps/extension/src/tools/__tests__/scroll.browser.test.ts

@@ -1,348 +0,0 @@
-// @vitest-environment node
-// Opt in with BSK_SCROLL_CHROME=/path/to/chrome. Uses an isolated browser/profile.
-import { describe, expect, it } from "vitest";
-import type { CdpFrame, CdpFrameGraph, CdpTarget } from "@/browser-driver/frame-graph";
-import { SessionManager } from "@/session-manager/manager";
-import type { ViewportRect } from "../geometry";
-import { handleScrollTo } from "../scroll";
-import type { CdpRunner } from "../shared";
-
-type Send = <T = Record<string, unknown>>(
-  method: string,
-  params?: object,
-  sessionId?: string,
-) => Promise<T>;
-type Tree = { frame: { id: string; parentId?: string; name?: string }; childFrames?: Tree[] };
-
-async function withBrowser(
-  run: (h: Awaited<ReturnType<typeof harness>>) => Promise<void>,
-  zoom = 1,
-) {
-  const { withChrome } = await import(
-    new URL(
-      "../../../../../evals/browser/cases/regression/snapshot-coordinates/chrome.mjs",
-      import.meta.url,
-    ).href
-  );
-  await withChrome(
-    { executable: process.env.BSK_SCROLL_CHROME, deviceScale: 1, zoom },
-    async (send: Send) => run(await harness(send)),
-  );
-}
-
-async function harness(send: Send) {
-  const { targetId } = await send<{ targetId: string }>("Target.createTarget", {
-    url: "about:blank",
-  });
-  const { sessionId: rootSession } = await send<{ sessionId: string }>("Target.attachToTarget", {
-    targetId,
-    flatten: true,
-  });
-  await send("Page.bringToFront", {}, rootSession);
-  const manager = new SessionManager({
-    agentWindow: {
-      create: async () => 100,
-      remove: async () => {},
-      ensureActiveTab: async () => 4,
-    },
-  });
-  const ctx = await manager.start("aa11");
-  const calls: { method: string; sessionId?: string }[] = [];
-  const after = { command: (_method: string) => {} };
-  const sessionFor = (target: CdpTarget) => target.sessionId ?? rootSession;
-  const forward = async <T>(target: CdpTarget, method: string, params?: object): Promise<T> => {
-    calls.push({ method, sessionId: target.sessionId });
-    const result = await send<T>(method, params, sessionFor(target));
-    after.command(method);
-    return result;
-  };
-  const cdp: CdpRunner = {
-    send: (_tab, method, params) => forward({ tabId: 4 }, method, params),
-    sendToTarget: forward,
-  };
-  const evaluate = async <T>(expression: string, frame?: CdpFrame): Promise<T> => {
-    const session = frame ? sessionFor(frame.target) : rootSession;
-    const world = frame
-      ? await send<{ executionContextId: number }>(
-          "Page.createIsolatedWorld",
-          {
-            frameId: frame.frameId,
-            worldName: "scroll-oracle",
-          },
-          session,
-        )
-      : undefined;
-    const reply = await send<{ result: { value: T }; exceptionDetails?: unknown }>(
-      "Runtime.evaluate",
-      {
-        expression,
-        contextId: world?.executionContextId,
-        returnByValue: true,
-        awaitPromise: true,
-      },
-      session,
-    );
-    expect(reply.exceptionDetails).toBeUndefined();
-    return reply.result.value;
-  };
-  const rememberRef = (frame: CdpFrame, backendNodeId: number) =>
-    ctx.refStore.set("e1", backendNodeId, {
-      tabId: 4,
-      frameId: frame.frameId,
-      cdpSessionId: frame.target.sessionId,
-    });
-  const ref = async (frame: CdpFrame, selector = "#probe") => {
-    const { executionContextId } = await send<{ executionContextId: number }>(
-      "Page.createIsolatedWorld",
-      {
-        frameId: frame.frameId,
-        worldName: "scroll-oracle",
-      },
-      sessionFor(frame.target),
-    );
-    const { result } = await send<{ result: { objectId: string } }>(
-      "Runtime.evaluate",
-      {
-        expression: `document.querySelector(${JSON.stringify(selector)})`,
-        contextId: executionContextId,
-      },
-      sessionFor(frame.target),
-    );
-    const { node } = await send<{ node: { backendNodeId: number } }>(
-      "DOM.describeNode",
-      { objectId: result.objectId },
-      sessionFor(frame.target),
-    );
-    await send("Runtime.releaseObject", { objectId: result.objectId }, sessionFor(frame.target));
-    rememberRef(frame, node.backendNodeId);
-  };
-  const scroll = (target: { selector: string } | { ref: string }, signal?: AbortSignal) =>
-    handleScrollTo(
-      manager,
-      { session_id: "aa11", ...target },
-      {
-        cdp,
-        signal,
-        tabsApi: {
-          get: async (id) => ({ id, windowId: 100, active: true }) as chrome.tabs.Tab,
-          query: async () => [{ id: 4, windowId: 100, active: true } as chrome.tabs.Tab],
-        },
-      },
-    );
-  const loadFrames = async () => {
-    const { targetInfos } = await send<{ targetInfos: { targetId: string; type: string }[] }>(
-      "Target.getTargets",
-    );
-    const sessions = [rootSession];
-    for (const target of targetInfos.filter((t) => t.type === "iframe")) {
-      const { sessionId } = await send<{ sessionId: string }>("Target.attachToTarget", {
-        targetId: target.targetId,
-        flatten: true,
-      });
-      sessions.push(sessionId);
-    }
-    const frames: (CdpFrame & { name: string })[] = [];
-    for (const session of sessions) {
-      const { frameTree } = await send<{ frameTree: Tree }>("Page.getFrameTree", {}, session);
-      const target = { tabId: 4, ...(session !== rootSession ? { sessionId: session } : {}) };
-      const visit = (tree: Tree, parentFrameId = tree.frame.parentId) => {
-        frames.push({ frameId: tree.frame.id, parentFrameId, target, name: tree.frame.name ?? "" });
-        for (const child of tree.childFrames ?? []) visit(child, tree.frame.id);
-      };
-      visit(frameTree);
-    }
-    for (const frame of frames) {
-      if (!frame.parentFrameId) continue;
-      const parent = frames.find((f) => f.frameId === frame.parentFrameId)!;
-      const owner = await send<{ backendNodeId: number }>(
-        "DOM.getFrameOwner",
-        { frameId: frame.frameId },
-        sessionFor(parent.target),
-      );
-      frame.ownerBackendNodeId = owner.backendNodeId;
-    }
-    const graph: CdpFrameGraph = { rootFrameId: frames[0].frameId, frames };
-    cdp.getFrameGraph = async () => graph;
-    return frames;
-  };
-  return { send, rootSession, evaluate, ref, rememberRef, scroll, loadFrames, calls, after };
-}
-
-function intersection(a: ViewportRect, b: ViewportRect): ViewportRect | null {
-  const x = Math.max(a.x, b.x),
-    y = Math.max(a.y, b.y);
-  const right = Math.min(a.x + a.width, b.x + b.width),
-    bottom = Math.min(a.y + a.height, b.y + b.height);
-  return right > x && bottom > y ? { x, y, width: right - x, height: bottom - y } : null;
-}
-
-function expectRect(actual: unknown, expected: ViewportRect) {
-  expect(actual).not.toHaveProperty("code");
-  for (const key of ["x", "y", "width", "height"] as const)
-    expect(Math.abs((actual as ViewportRect)[key] - expected[key]), key).toBeLessThan(2);
-}
-
-describe.skipIf(!process.env.BSK_SCROLL_CHROME)("real browser scroll-to", () => {
-  it("scrolls ordinary elements and reports the clipped portion of nested scrollers", async () => {
-    await withBrowser(async (h) => {
-      for (const html of [
-        '<div style="height:2200px"></div><div id="target" style="width:100px;height:40px"></div>',
-        '<div style="height:200px"></div><div id="clip" style="height:80px;width:200px;overflow:auto"><div id="target" style="width:100px;height:400px"></div></div>',
-        '<div style="height:200px"></div><div id="clip" style="height:80px;width:200px;overflow:auto;transform:scale(1.25);transform-origin:0 0"><div id="target" style="width:100px;height:400px"></div></div>',
-      ]) {
-        await h.evaluate(`document.body.innerHTML = ${JSON.stringify(html)}`);
-        const result = await h.scroll({ selector: "#target" });
-        const oracle = await h.evaluate<{ rect: ViewportRect; clip?: ViewportRect }>(`({
-          rect: document.querySelector('#target').getBoundingClientRect().toJSON(),
-          clip: document.querySelector('#clip')?.getBoundingClientRect().toJSON()
-        })`);
-        expectRect(result, oracle.clip ? intersection(oracle.rect, oracle.clip)! : oracle.rect);
-      }
-    });
-  });
-
-  it.each([
-    "visibility:hidden",
-    "opacity:0",
-    "display:none",
-    "content-visibility:hidden",
-  ])("rejects %s targets", async (style) => {
-    await withBrowser(async (h) => {
-      await h.evaluate(
-        `document.body.innerHTML = '<div style="${style}"><button id="target">Target</button></div>'`,
-      );
-      expect(await h.scroll({ selector: "#target" })).toMatchObject({
-        code: "permission_denied",
-        data: { reason: "element_not_visible" },
-      });
-    });
-  });
-
-  it("rejects targets fully outside an overflow:clip ancestor", async () => {
-    await withBrowser(async (h) => {
-      await h.evaluate(
-        `document.body.innerHTML = '<div style="height:80px;overflow:clip"><div style="height:150px"></div><button id="target">Target</button></div>'`,
-      );
-      expect(await h.scroll({ selector: "#target" })).toMatchObject({ code: "permission_denied" });
-    });
-  });
-
-  it.each(["open", "closed"])("clips %s shadow-root refs", async (mode) => {
-    await withBrowser(async (h) => {
-      await h.evaluate(`(() => {
-        const host = document.createElement('div'); document.body.append(host);
-        const root = host.attachShadow({mode:'${mode}'});
-        root.innerHTML = '<div style="height:60px;overflow:auto"><button id="probe" style="height:200px;width:100px">Target</button></div>';
-        window.probe = root.querySelector('#probe');
-      })()`);
-      const frames = await h.loadFrames();
-      const { result } = await h.send<{ result: { objectId: string } }>(
-        "Runtime.evaluate",
-        { expression: "window.probe" },
-        h.rootSession,
-      );
-      // Build the ref from the actual closed-root node, as an observation does.
-      const { node } = await h.send<{ node: { backendNodeId: number } }>(
-        "DOM.describeNode",
-        { objectId: result.objectId },
-        h.rootSession,
-      );
-      await h.send("Runtime.releaseObject", { objectId: result.objectId }, h.rootSession);
-      h.rememberRef(frames[0], node.backendNodeId);
-      expect(await h.scroll({ ref: "e1" })).toMatchObject({ height: 60 });
-    });
-  });
-
-  it("cancels after scrolling and releases the measurement object without follow-up reads", async () => {
-    await withBrowser(async (h) => {
-      await h.evaluate("document.body.innerHTML = '<button id=target>Target</button>'");
-      const abort = new AbortController();
-      h.after.command = (method) => {
-        if (method === "DOM.resolveNode") abort.abort();
-      };
-      expect(await h.scroll({ selector: "#target" }, abort.signal)).toMatchObject({
-        code: "cancelled",
-      });
-      expect(h.calls.at(-1)!.method).toBe("Runtime.releaseObjectGroup");
-      expect(h.calls.some((call) => call.method === "Runtime.callFunctionOn")).toBe(false);
-    });
-  });
-
-  it.each([
-    { fixture: "snapshot-coordinates", zoom: 1 },
-    { fixture: "snapshot-coordinates", zoom: 1.25 },
-    { fixture: "oopif-scrollbars", zoom: 1 },
-    { fixture: "oopif-scrollbars", zoom: 0.8 },
-  ])("scrolls nested frames: $fixture at zoom $zoom", async ({ fixture, zoom }) => {
-    const { createEvalServer } = await import(
-      new URL("../../../../../evals/browser/lib/server.mjs", import.meta.url).href
-    );
-    const server = createEvalServer();
-    const { baseUrl } = await server.start();
-    try {
-      await withBrowser(async (h) => {
-        await h.send("Page.navigate", { url: `${baseUrl}/${fixture}?run=scroll` }, h.rootSession);
-        await expect
-          .poll(
-            () =>
-              server
-                .snapshot("scroll")
-                .events.some(
-                  (e: { type: string; data: { root?: boolean } }) =>
-                    e.type === "geometry.ready" && e.data.root,
-                ),
-            { timeout: 10_000 },
-          )
-          .toBe(true);
-        const frames = await h.loadFrames();
-        expect(frames.length).toBe(fixture === "snapshot-coordinates" ? 5 : 3);
-        for (const frame of frames) {
-          await h.ref(frame);
-          const result = await h.scroll({ ref: "e1" });
-          // Independent DOM oracle: CSS border boxes plus this fixture's known
-          // axis-aligned iframe scales. Re-read after each scroll changes layout.
-          let rect = await h.evaluate<ViewportRect>(
-            "document.querySelector('#probe').getBoundingClientRect().toJSON()",
-            frame,
-          );
-          let current = frame;
-          while (true) {
-            const viewport = await h.evaluate<ViewportRect>(
-              "({ x:0, y:0, width:document.documentElement.clientWidth, height:document.documentElement.clientHeight })",
-              current,
-            );
-            rect = intersection(rect, viewport)!;
-            if (!current.parentFrameId) break;
-            const parent = frames.find((f) => f.frameId === current.parentFrameId)!;
-            const owner = await h.evaluate<{ x: number; y: number; scale: number }>(
-              `(() => {
-              const iframe = document.querySelector('iframe[name="${current.name}"]');
-              const r = iframe.getBoundingClientRect(); const s = getComputedStyle(iframe);
-              const scale = r.width / iframe.offsetWidth;
-              return { x:r.x + (iframe.clientLeft + parseFloat(s.paddingLeft))*scale,
-                y:r.y + (iframe.clientTop + parseFloat(s.paddingTop))*scale, scale };
-            })()`,
-              parent,
-            );
-            rect = {
-              x: owner.x + rect.x * owner.scale,
-              y: owner.y + rect.y * owner.scale,
-              width: rect.width * owner.scale,
-              height: rect.height * owner.scale,
-            };
-            current = parent;
-          }
-          expectRect(result, rect);
-        }
-        const child = frames.find((frame) => frame.parentFrameId === frames[0].frameId)!;
-        await h.ref(child);
-        await h.evaluate(
-          `document.querySelector('iframe[name="${child.name}"]').style.opacity = '0'`,
-        );
-        expect(await h.scroll({ ref: "e1" })).toMatchObject({ code: "permission_denied" });
-      }, zoom);
-    } finally {
-      await server.stop();
-    }
-  }, 30_000);
-});

apps/extension/src/tools/__tests__/scroll.test.ts

@@ -1,310 +0,0 @@
-import { afterEach, describe, expect, it, vi } from "vitest";
-import type { CdpFrameGraph, CdpTarget } from "@/browser-driver/frame-graph";
-import { SessionManager } from "@/session-manager/manager";
-import type { JavaScriptDialogInfo, ScrollToParams } from "@/transport/types";
-import type { ViewportRect } from "../geometry";
-import { handleScrollTo } from "../scroll";
-import type { CdpRunner } from "../shared";
-
-interface Call {
-  target: CdpTarget;
-  method: string;
-  params?: Record<string, unknown>;
-  aborted: boolean;
-}
-
-async function fixture(frame: "top" | "same-target" | "oopif" = "top") {
-  const manager = new SessionManager({
-    agentWindow: {
-      create: async () => 100,
-      remove: async () => {},
-      ensureActiveTab: async () => 4,
-    },
-  });
-  const ctx = await manager.start("aa11");
-  ctx.refStore.set("e3", 1234, {
-    tabId: 4,
-    ...(frame !== "top" ? { frameId: "child" } : {}),
-    ...(frame === "oopif" ? { cdpSessionId: "child-session" } : {}),
-  });
-  const abort = new AbortController();
-  const graph: CdpFrameGraph = {
-    rootFrameId: "main",
-    frames: [
-      { frameId: "main", target: { tabId: 4 } },
-      {
-        frameId: "child",
-        parentFrameId: "main",
-        ownerBackendNodeId: 99,
-        target: { tabId: 4, ...(frame === "oopif" ? { sessionId: "child-session" } : {}) },
-      },
-    ],
-  };
-  const rectangles = new Map<number, ViewportRect | null>([
-    [1234, { x: 10, y: 20, width: 100, height: 40 }],
-    [99, { x: 204, y: 306, width: 400, height: 200 }],
-  ]);
-  const calls: Call[] = [];
-  const hooks = {
-    after: (_call: Call) => {},
-    reply: (_call: Call): object | undefined => undefined,
-  };
-  const send = async <T>(target: CdpTarget, method: string, params?: object): Promise<T> => {
-    const call = {
-      target,
-      method,
-      params: params as Call["params"],
-      aborted: abort.signal.aborted,
-    };
-    calls.push(call);
-    const override = hooks.reply(call);
-    hooks.after(call);
-    if (override) return override as T;
-    const args = call.params ?? {};
-    const replies: Record<string, unknown> = {
-      "DOM.getDocument": { root: { nodeId: 1 } },
-      "DOM.querySelector": { nodeId: 2 },
-      "DOM.describeNode": { node: { backendNodeId: 1234 } },
-      "DOM.scrollIntoViewIfNeeded": {},
-      "DOM.resolveNode": { object: { objectId: String(args.backendNodeId) } },
-      "Runtime.callFunctionOn": {
-        result: {
-          value: String(args.functionDeclaration).includes("IntersectionObserver")
-            ? rectangles.get(Number(args.objectId))
-            : { width: 200, height: 100 },
-        },
-      },
-      "Runtime.releaseObject": {},
-      "Runtime.releaseObjectGroup": {},
-      "Runtime.evaluate": { result: { value: { width: 200, height: 100 } } },
-      "Page.getLayoutMetrics": {
-        cssLayoutViewport: {
-          clientWidth: target.sessionId ? 185 : 1280,
-          clientHeight: target.sessionId ? 89 : 720,
-        },
-      },
-      "DOM.getBoxModel": { model: { content: [204, 306, 604, 306, 604, 506, 204, 506] } },
-    };
-    if (!(method in replies)) throw new Error(`unexpected CDP call ${method}`);
-    return replies[method] as T;
-  };
-  const cdp: CdpRunner = {
-    send: (tabId, method, params) => send({ tabId }, method, params),
-    sendToTarget: send,
-    getFrameGraph: vi.fn(async () => {
-      hooks.after({ target: { tabId: 4 }, method: "getFrameGraph", aborted: abort.signal.aborted });
-      return graph;
-    }),
-    trackSessionTab: vi.fn(),
-  };
-  const tabsApi = {
-    get: vi.fn(async (id: number) => ({ id, windowId: 100, active: true }) as chrome.tabs.Tab),
-    query: vi.fn(async () => [{ id: 4, windowId: 100, active: true } as chrome.tabs.Tab]),
-  };
-  const run = (params: Partial<ScrollToParams> = {}) =>
-    handleScrollTo(
-      manager,
-      { session_id: "aa11", ref: "@e3", ...params },
-      { cdp, tabsApi, signal: abort.signal },
-    );
-  return { ctx, cdp, graph, rectangles, calls, hooks, abort, tabsApi, run };
-}
-
-afterEach(() => vi.restoreAllMocks());
-
-describe("handleScrollTo", () => {
-  it("scrolls a ref and returns renderer-clipped bounds", async () => {
-    const f = await fixture();
-    expect(await f.run()).toMatchObject({
-      tab_id: 4,
-      used_ref: "e3",
-      x: 10,
-      y: 20,
-      width: 100,
-      height: 40,
-    });
-    expect(f.calls[0]).toMatchObject({
-      method: "DOM.scrollIntoViewIfNeeded",
-      params: { backendNodeId: 1234 },
-    });
-    const group = f.calls.find((call) => call.method === "DOM.resolveNode")!.params!.objectGroup;
-    expect(f.calls.at(-1)).toMatchObject({
-      method: "Runtime.releaseObjectGroup",
-      params: { objectGroup: group },
-    });
-  });
-
-  it("resolves a selector and tracks the attached tab even when it is missing", async () => {
-    const f = await fixture();
-    expect(await f.run({ ref: undefined, selector: "#target" })).toMatchObject({
-      used_selector: "#target",
-    });
-    f.hooks.reply = ({ method }) => (method === "DOM.querySelector" ? { nodeId: 0 } : undefined);
-    expect(await f.run({ ref: undefined, selector: "#missing" })).toMatchObject({
-      code: "not_found",
-      data: { reason: "selector_not_found" },
-    });
-    expect(f.cdp.trackSessionTab).toHaveBeenCalledWith("aa11", 4);
-  });
-
-  it.each([
-    "same-target",
-    "oopif",
-  ] as const)("projects %s refs and scrolls their owners", async (frame) => {
-    const f = await fixture(frame);
-    expect(await f.run()).toMatchObject({ x: 224, y: 346, width: 200, height: 80 });
-    expect(
-      f.calls
-        .filter((call) => call.method === "DOM.scrollIntoViewIfNeeded")
-        .map((call) => call.params!.backendNodeId),
-    ).toEqual([99, 1234]);
-    expect(f.cdp.getFrameGraph).toHaveBeenCalledTimes(1);
-    if (frame === "oopif")
-      expect(f.calls.find((call) => call.params?.backendNodeId === 1234)!.target.sessionId).toBe(
-        "child-session",
-      );
-  });
-
-  it("clips OOPIF bounds to occupied scrollbars without changing the frame scale", async () => {
-    const f = await fixture("oopif");
-    f.rectangles.set(1234, { x: 180, y: 80, width: 5, height: 9 });
-    expect(await f.run()).toMatchObject({ x: 564, y: 466, width: 10, height: 18 });
-  });
-
-  it("clips against the iframe owner's ordinary DOM ancestors", async () => {
-    const f = await fixture("oopif");
-    f.rectangles.set(99, { x: 204, y: 306, width: 400, height: 80 });
-    expect(await f.run()).toMatchObject({ x: 224, y: 346, width: 200, height: 40 });
-  });
-
-  it.each([1234, 99])("rejects a hidden or fully clipped node %i", async (node) => {
-    const f = await fixture("oopif");
-    f.rectangles.set(node, null);
-    expect(await f.run()).toMatchObject({
-      code: "permission_denied",
-      data: { reason: "element_not_visible" },
-    });
-    expect(f.calls.at(-1)!.method).toBe("Runtime.releaseObjectGroup");
-  });
-
-  it.each([
-    { ref: undefined },
-    { selector: "#target" },
-    { timeout_ms: 0 },
-  ])("rejects invalid params %j", async (params) => {
-    const f = await fixture();
-    expect(await f.run(params)).toMatchObject({ code: "invalid_params" });
-    expect(f.calls).toEqual([]);
-  });
-
-  it.each(["stale", "other-tab"])("rejects %s refs before scrolling", async (mode) => {
-    const f = await fixture();
-    if (mode === "stale") f.ctx.refStore.clear();
-    else f.ctx.refStore.set("e3", 1234, { tabId: 8 });
-    expect(await f.run()).toMatchObject({ code: "not_found", data: { reason: "ref_not_found" } });
-    expect(f.calls).toEqual([]);
-  });
-
-  it("enforces the Agent Window boundary", async () => {
-    const f = await fixture();
-    f.tabsApi.query.mockResolvedValue([{ id: 4, windowId: 200, active: true } as chrome.tabs.Tab]);
-    f.tabsApi.get.mockResolvedValue({ id: 4, windowId: 200, active: true } as chrome.tabs.Tab);
-    expect(await f.run({ tab_id: 4 })).toMatchObject({ code: "permission_denied" });
-    expect(f.calls).toEqual([]);
-  });
-
-  it.each([
-    "getFrameGraph",
-    "DOM.scrollIntoViewIfNeeded",
-    "DOM.resolveNode",
-    "Runtime.callFunctionOn",
-    "Page.getLayoutMetrics",
-    "Runtime.evaluate",
-    "DOM.getBoxModel",
-  ])("honors cancellation during %s and only cleans up afterwards", async (method) => {
-    const f = await fixture("oopif");
-    f.hooks.after = (call) => {
-      if (call.method === method) f.abort.abort();
-    };
-    expect(await f.run()).toMatchObject({ code: "cancelled" });
-    expect(
-      f.calls.filter((call) => call.aborted && call.method !== "Runtime.releaseObjectGroup"),
-    ).toEqual([]);
-  });
-
-  it.each([
-    "DOM.getDocument",
-    "DOM.querySelector",
-    "DOM.describeNode",
-  ])("cancels selector resolution during %s", async (method) => {
-    const f = await fixture();
-    f.hooks.after = (call) => {
-      if (call.method === method) f.abort.abort();
-    };
-    expect(await f.run({ ref: undefined, selector: "#target" })).toMatchObject({
-      code: "cancelled",
-    });
-    expect(f.calls.filter((call) => call.aborted)).toEqual([]);
-  });
-
-  it("does not start after early cancellation", async () => {
-    const f = await fixture();
-    f.abort.abort();
-    expect(await f.run()).toMatchObject({ code: "cancelled" });
-    expect(f.calls).toEqual([]);
-    expect(f.tabsApi.query).not.toHaveBeenCalled();
-  });
-
-  it("does not issue fallback scrolling after cancellation", async () => {
-    const f = await fixture();
-    f.hooks.reply = ({ method }) => {
-      if (method === "DOM.scrollIntoViewIfNeeded") {
-        f.abort.abort();
-        throw new Error("scroll failed");
-      }
-      return undefined;
-    };
-    expect(await f.run()).toMatchObject({ code: "cancelled" });
-    expect(f.calls.map((call) => call.method)).toEqual(["DOM.scrollIntoViewIfNeeded"]);
-  });
-
-  it("stops target scrolling after a deadline expires while scrolling its owner", async () => {
-    const f = await fixture("oopif");
-    const now = vi.spyOn(Date, "now").mockReturnValue(100);
-    f.hooks.after = ({ method }) => {
-      if (method === "DOM.scrollIntoViewIfNeeded") now.mockReturnValue(201);
-    };
-    expect(await f.run({ timeout_ms: 100 })).toMatchObject({ code: "timeout" });
-    expect(f.calls.filter((call) => call.method === "DOM.scrollIntoViewIfNeeded")).toHaveLength(1);
-  });
-
-  it("reports measurement exceptions and releases objects even if cleanup fails", async () => {
-    const f = await fixture();
-    f.hooks.reply = ({ method }) => {
-      if (method === "Runtime.callFunctionOn")
-        return { exceptionDetails: { text: "measurement failed" } };
-      if (method === "Runtime.releaseObjectGroup") throw new Error("target closed");
-      return undefined;
-    };
-    expect(await f.run()).toMatchObject({ code: "cdp_failed", message: "measurement failed" });
-    expect(f.calls.at(-1)!.method).toBe("Runtime.releaseObjectGroup");
-  });
-
-  it("attaches dialogs observed during scrolling", async () => {
-    const f = await fixture();
-    f.cdp.dialogCursor = () => 5;
-    const dialogs: JavaScriptDialogInfo[] = [
-      {
-        sequence: 6,
-        tab_id: 4,
-        type: "alert",
-        message: "scrolled",
-        handled: "accepted",
-        url: "https://example.test",
-      },
-    ];
-    f.cdp.dialogsSince = vi.fn(() => dialogs);
-    expect(await f.run()).toHaveProperty("dialogs", dialogs);
-    expect(f.cdp.dialogsSince).toHaveBeenCalledWith(4, 5);
-  });
-});

apps/extension/src/tools/__tests__/snapshot-coordinates.browser.test.ts

@@ -1,355 +0,0 @@
-// @vitest-environment node
-import { describe, expect, it } from "vitest";
-import type { CdpFrame, CdpFrameGraph, CdpTarget } from "@/browser-driver/frame-graph";
-import { resolveNodeGeometry } from "../frame-geometry";
-import type { CdpRunner } from "../shared";
-import { captureObservationFacts } from "../vom/capture-coordinator";
-
-type Send = <T = Record<string, unknown>>(
-  method: string,
-  params?: object,
-  sessionId?: string,
-) => Promise<T>;
-type Tree = { frame: { id: string; parentId?: string; name?: string }; childFrames?: Tree[] };
-type Rect = { x: number; y: number; w: number; h: number };
-type Oracle = {
-  probes: Record<string, Rect>;
-  viewport: { width: number; height: number };
-  owners: Record<string, { x: number; y: number; scale: number }>;
-};
-
-function clip(rect: Rect, viewport: Oracle["viewport"]): Rect | null {
-  const x = Math.max(0, rect.x),
-    y = Math.max(0, rect.y);
-  const right = Math.min(viewport.width, rect.x + rect.w);
-  const bottom = Math.min(viewport.height, rect.y + rect.h);
-  return right > x && bottom > y ? { x, y, w: right - x, h: bottom - y } : null;
-}
-
-// The independent oracle uses DOM border boxes and this fixture's axis-aligned
-// iframe transforms. No production snapshot conversion/projection builds expectations.
-const oracleExpression = `(() => {
-  const probes = {};
-  for (const node of document.querySelectorAll('[data-geometry-probe]')) {
-    const box = node.getBoundingClientRect();
-    probes[node.id] = { x: box.x, y: box.y, w: box.width, h: box.height };
-  }
-  const owners = {};
-  for (const frame of document.querySelectorAll('iframe')) {
-    const rect = frame.getBoundingClientRect();
-    const style = getComputedStyle(frame);
-    const scale = rect.width / frame.offsetWidth;
-    owners[frame.name] = {
-      x: rect.x + (frame.clientLeft + parseFloat(style.paddingLeft)) * scale,
-      y: rect.y + (frame.clientTop + parseFloat(style.paddingTop)) * scale,
-      scale,
-    };
-  }
-  return { probes, viewport: { width: document.documentElement.clientWidth, height: document.documentElement.clientHeight }, owners };
-})()`;
-
-describe.skipIf(!process.env.BSK_GEOMETRY_CHROME)("real DOMSnapshot coordinate contract", () => {
-  it.each(
-    [
-      { deviceScale: 1, zoom: 1 },
-      { deviceScale: 0.8, zoom: 1 },
-      { deviceScale: 1, zoom: 1.25 },
-      { deviceScale: 2, zoom: 1 },
-      { deviceScale: 2, zoom: 0.8 },
-    ]
-      .flatMap((configuration) => [
-        { ...configuration, fixture: "snapshot-coordinates", scrollbars: "none" },
-        { ...configuration, fixture: "oopif-scrollbars", scrollbars: "both" },
-      ])
-      .concat(
-        ["vertical", "horizontal", "none"].map((scrollbars) => ({
-          deviceScale: 1,
-          zoom: 1,
-          fixture: "oopif-scrollbars",
-          scrollbars,
-        })),
-      ),
-  )("$fixture: device scale $deviceScale, zoom $zoom, scrollbars $scrollbars", async (configuration) => {
-    const evalRoot = new URL("../../../../../evals/browser/", import.meta.url);
-    const { createEvalServer } = await import(new URL("lib/server.mjs", evalRoot).href);
-    const { withChrome } = await import(
-      new URL("cases/regression/snapshot-coordinates/chrome.mjs", evalRoot).href
-    );
-    const server = createEvalServer();
-    const { baseUrl } = await server.start();
-    try {
-      await withChrome(
-        { executable: process.env.BSK_GEOMETRY_CHROME, ...configuration },
-        async (send: Send) => {
-          const { targetId } = await send<{ targetId: string }>("Target.createTarget", {
-            url: "about:blank",
-          });
-          const { sessionId: rootSession } = await send<{ sessionId: string }>(
-            "Target.attachToTarget",
-            { targetId, flatten: true },
-          );
-          await send(
-            "Page.navigate",
-            {
-              url: `${baseUrl}/${configuration.fixture}?run=coordinates&scrollbars=${configuration.scrollbars}`,
-            },
-            rootSession,
-          );
-          await expect
-            .poll(
-              () =>
-                server
-                  .snapshot("coordinates")
-                  .events.some(
-                    (event: { type: string; data: { root?: boolean } }) =>
-                      event.type === "geometry.ready" && event.data.root,
-                  ),
-              { timeout: 10_000 },
-            )
-            .toBe(true);
-
-          const targets = await send<{ targetInfos: { targetId: string; type: string }[] }>(
-            "Target.getTargets",
-          );
-          const sessions = [rootSession];
-          for (const target of targets.targetInfos.filter((target) => target.type === "iframe")) {
-            const { sessionId } = await send<{ sessionId: string }>("Target.attachToTarget", {
-              targetId: target.targetId,
-              flatten: true,
-            });
-            sessions.push(sessionId);
-          }
-          expect(sessions.length).toBe(configuration.fixture === "oopif-scrollbars" ? 3 : 2);
-          const frames: CdpFrame[] = [];
-          const names = new Map<string, string>();
-          const sessionFor = (target: CdpTarget) => target.sessionId ?? rootSession;
-          for (const sessionId of sessions) {
-            const { frameTree } = await send<{ frameTree: Tree }>(
-              "Page.getFrameTree",
-              {},
-              sessionId,
-            );
-            const target: CdpTarget = {
-              tabId: 1,
-              ...(sessionId === rootSession ? {} : { sessionId }),
-            };
-            const visit = (tree: Tree, parentFrameId = tree.frame.parentId) => {
-              frames.push({ frameId: tree.frame.id, parentFrameId, target });
-              names.set(tree.frame.id, tree.frame.name ?? "");
-              for (const child of tree.childFrames ?? []) visit(child, tree.frame.id);
-            };
-            visit(frameTree);
-          }
-          expect(frames).toHaveLength(configuration.fixture === "oopif-scrollbars" ? 3 : 5);
-          for (const frame of frames) {
-            if (!frame.parentFrameId) continue;
-            const parent = frames.find((item) => item.frameId === frame.parentFrameId)!;
-            const owner = await send<{ backendNodeId: number }>(
-              "DOM.getFrameOwner",
-              { frameId: frame.frameId },
-              sessionFor(parent.target),
-            );
-            frame.ownerBackendNodeId = owner.backendNodeId;
-          }
-          const graph: CdpFrameGraph = { rootFrameId: frames[0].frameId, frames };
-          const calls: string[] = [];
-          const cdp: CdpRunner = {
-            send: (tabId, method, params) => {
-              calls.push(`${tabId}:${method}`);
-              return send(method, params, rootSession);
-            },
-            sendToTarget: (target, method, params) => {
-              calls.push(`${target.sessionId ?? target.tabId}:${method}`);
-              if (
-                method === "Runtime.evaluate" &&
-                (params as { expression?: string })?.expression?.includes("window.innerWidth")
-              )
-                calls.push(`${target.sessionId ?? target.tabId}:viewport-size`);
-              return send(method, params, sessionFor(target));
-            },
-            getFrameGraph: async () => graph,
-            getAttachmentId: () => rootSession,
-          };
-          const oracles = new Map<string, Oracle>();
-          for (const frame of frames) {
-            const session = sessionFor(frame.target);
-            const { executionContextId } = await send<{ executionContextId: number }>(
-              "Page.createIsolatedWorld",
-              { frameId: frame.frameId, worldName: "coordinate-oracle" },
-              session,
-            );
-            await expect
-              .poll(
-                async () => {
-                  const ready = await send<{ result: { value: boolean } }>(
-                    "Runtime.evaluate",
-                    {
-                      expression: 'document.documentElement.dataset.geometryReady === "true"',
-                      contextId: executionContextId,
-                      returnByValue: true,
-                    },
-                    session,
-                  );
-                  return ready.result.value;
-                },
-                { timeout: 5_000 },
-              )
-              .toBe(true);
-            // Establish scroll after cross-process target creation/layout settles.
-            const scroll = frame.parentFrameId
-              ? names.get(frame.frameId) === "nested"
-                ? [10, 20]
-                : [40, 100]
-              : [80, 240];
-            await send(
-              "Runtime.evaluate",
-              {
-                expression: `(async () => { scrollTo(${scroll.join(",")}); await new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve))); })()`,
-                contextId: executionContextId,
-                awaitPromise: true,
-              },
-              session,
-            );
-            const reply = await send<{ result: { value: Oracle } }>(
-              "Runtime.evaluate",
-              { expression: oracleExpression, contextId: executionContextId, returnByValue: true },
-              session,
-            );
-            oracles.set(frame.frameId, reply.result.value);
-          }
-          const childViewport = await send<{
-            result: {
-              value: { width: number; height: number; clientWidth: number; clientHeight: number };
-            };
-          }>(
-            "Runtime.evaluate",
-            {
-              expression:
-                "({ width: innerWidth, height: innerHeight, clientWidth: document.documentElement.clientWidth, clientHeight: document.documentElement.clientHeight })",
-              returnByValue: true,
-            },
-            sessions[1],
-          );
-          for (const dimension of ["Width", "Height"] as const) {
-            const occupied =
-              childViewport.result.value[dimension === "Width" ? "width" : "height"] -
-              childViewport.result.value[`client${dimension}`];
-            if (
-              configuration.scrollbars === "both" ||
-              configuration.scrollbars === (dimension === "Width" ? "vertical" : "horizontal")
-            )
-              expect(occupied).toBeGreaterThan(0);
-            else expect(occupied).toBe(0);
-          }
-          const facts = await captureObservationFacts(cdp, 1);
-          expect(facts.issues).toEqual([]);
-          expect(calls.filter((call) => call.endsWith(":Page.getLayoutMetrics"))).toHaveLength(
-            sessions.length,
-          );
-          // Identity verification also uses Runtime.evaluate; count the full viewport reads separately.
-          const viewportReadsBeforeLive = calls.filter((call) => call.endsWith(":viewport-size"));
-          expect(new Set(viewportReadsBeforeLive).size).toBe(viewportReadsBeforeLive.length);
-          expect(viewportReadsBeforeLive.length).toBeLessThanOrEqual(sessions.length - 1);
-          for (const frame of frames) {
-            for (const [id, local] of Object.entries(oracles.get(frame.frameId)!.probes)) {
-              const node = facts.documents
-                .find((doc) => doc.frame.frameId === frame.frameId)
-                ?.domNodes.find((node) => node.attrs.id === id);
-              expect(node, `missing ${id} in ${names.get(frame.frameId) || "root"}`).toBeDefined();
-              let top = clip(local, oracles.get(frame.frameId)!.viewport);
-              let current = frame;
-              while (top && current.parentFrameId) {
-                const parentOracle = oracles.get(current.parentFrameId)!;
-                const owner = parentOracle.owners[names.get(current.frameId)!];
-                top = clip(
-                  {
-                    x: owner.x + top.x * owner.scale,
-                    y: owner.y + top.y * owner.scale,
-                    w: top.w * owner.scale,
-                    h: top.h * owner.scale,
-                  },
-                  parentOracle.viewport,
-                );
-                current = frames.find((item) => item.frameId === current.parentFrameId)!;
-              }
-              for (const key of ["x", "y", "w", "h"] as const)
-                expect(
-                  Math.abs(node!.localRect![key] - local[key]),
-                  `${names.get(frame.frameId)} ${id} local ${key}`,
-                ).toBeLessThan(2);
-              if (!top) {
-                expect(node!.rect, `${id} must be clipped out`).toBeNull();
-                if (configuration.fixture === "oopif-scrollbars")
-                  expect(
-                    await resolveNodeGeometry(cdp, 1, {
-                      target: frame.target,
-                      frameId: frame.frameId,
-                      backendNodeId: node!.backendNodeId,
-                    }),
-                  ).toMatchObject({ code: "permission_denied" });
-                continue;
-              }
-              expect(node!.rect).not.toBeNull();
-              for (const key of ["x", "y", "w", "h"] as const)
-                expect(
-                  Math.abs(node!.rect![key] - top[key]),
-                  `${names.get(frame.frameId)} ${id} top ${key}`,
-                ).toBeLessThan(2);
-              if (configuration.fixture !== "oopif-scrollbars") continue;
-              const live = await resolveNodeGeometry(cdp, 1, {
-                target: frame.target,
-                frameId: frame.frameId,
-                backendNodeId: node!.backendNodeId,
-              });
-              if ("code" in live) throw new Error(live.message);
-              for (const [key, liveKey] of [
-                ["x", "x"],
-                ["y", "y"],
-                ["w", "width"],
-                ["h", "height"],
-              ] as const)
-                expect(
-                  Math.abs(live.topBounds[liveKey] - top[key]),
-                  `${id} live ${key}`,
-                ).toBeLessThan(2);
-              const before = server.snapshot("coordinates").events.length;
-              for (const type of ["mousePressed", "mouseReleased"])
-                await send(
-                  "Input.dispatchMouseEvent",
-                  { type, ...live.actionPoint, button: "left", clickCount: 1 },
-                  rootSession,
-                );
-              await expect
-                .poll(
-                  () =>
-                    server
-                      .snapshot("coordinates")
-                      .events.slice(before)
-                      .some(
-                        (event: { type: string; path: string; data: { probe?: string } }) =>
-                          event.type === "geometry.clicked" &&
-                          event.data.probe === id &&
-                          event.path ===
-                            (frame.parentFrameId
-                              ? names.get(frame.frameId) === "nested"
-                                ? "/oopif-scrollbars/nested"
-                                : "/oopif-scrollbars/frame"
-                              : "/oopif-scrollbars"),
-                      ),
-                  { timeout: 3000 },
-                )
-                .toBe(true);
-            }
-          }
-          const metrics = await send<{
-            cssVisualViewport: { zoom: number };
-            visualViewport: { clientWidth: number };
-          }>("Page.getLayoutMetrics", {}, rootSession);
-          expect(metrics.cssVisualViewport.zoom).toBeCloseTo(configuration.zoom, 4);
-        },
-      );
-    } finally {
-      await server.stop();
-    }
-  }, 30_000);
-});

apps/extension/src/tools/__tests__/visual-ref.test.ts

@@ -1,208 +0,0 @@
-import { afterEach, describe, expect, it, vi } from "vitest";
-import { SessionManager } from "@/session-manager/manager";
-import { RefStore, type VisualRefInput } from "@/session-manager/ref-store";
-import { handleDownload } from "../download";
-import { handleRequestHelp, resetHelpLifecycleForTests } from "../human-loop";
-import { handleClick, handleFill, handleHover, handlePress, handleSelect } from "../interaction";
-import { handleGetHtml, handleScreenshot } from "../observation";
-import type { CdpRunner } from "../shared";
-import { lookupRefTarget, lookupSnapshotRef, resolveSnapshotRef } from "../snapshot-ref";
-import { handleUpload } from "../upload";
-
-function visual(): VisualRefInput {
-  return {
-    kind: "visual-region",
-    candidate: {
-      document: {
-        attachmentId: "a",
-        target: { tabId: 4, sessionId: "child" },
-        frameId: "frame",
-        documentElementBackendNodeId: 1,
-      },
-      backendNodeId: 42,
-      parentBackendNodeId: 1,
-      region: {
-        status: "available",
-        borderBox: { x: 0, y: 0, width: 100, height: 50 },
-        crop: { x: 0, y: 0, width: 100, height: 50 },
-      },
-    },
-  };
-}
-
-async function setup() {
-  const manager = new SessionManager({
-    agentWindow: {
-      create: async () => 100,
-      remove: async () => {},
-      ensureActiveTab: async () => 4,
-    },
-  });
-  const ctx = await manager.start("test");
-  ctx.refStore.replace([
-    ["e1", visual()],
-    ["e2", { backendNodeId: 43, tabId: 4 }],
-  ]);
-  const send = vi.fn(async () => {
-    throw new Error("unexpected target operation");
-  });
-  const cdp = { send, sendToTarget: send, trackSessionTab: vi.fn() } as unknown as CdpRunner;
-  const tab = { id: 4, windowId: 100, active: true, url: "https://example.com" } as chrome.tabs.Tab;
-  const tabsApi = { get: vi.fn(async () => tab), query: vi.fn(async () => [tab]) };
-  return { manager, ctx, send, cdp, tabsApi };
-}
-
-describe("typed visual refs", () => {
-  afterEach(() => resetHelpLifecycleForTests());
-
-  it("keeps candidate evidence and cannot resolve a visual anchor as a bare DOM node", () => {
-    const store = new RefStore();
-    const input = visual();
-    store.replace([
-      ["@e1", input],
-      ["e2", { backendNodeId: 43, tabId: 4 }],
-    ]);
-    const entry = store.resolveEntry("e1");
-    expect(entry?.kind).toBe("visual-region");
-    if (entry?.kind !== "visual-region") throw new Error("missing visual ref");
-    expect(entry.candidate).toBe(input.candidate);
-    expect(entry.generation).toBe(1);
-    expect(store.resolve("@e1")).toBeNull();
-    expect(store.resolve("e2")).toBe(43);
-    // The latest observation replaces both target kinds; eN strings carry no generation.
-    store.replace([["e1", { backendNodeId: 99, tabId: 4 }]]);
-    expect(store.resolve("e1")).toBe(99);
-    expect(store.resolveEntry("e1")).toMatchObject({ kind: "dom", generation: 2 });
-    expect(store.resolveEntry("e2")).toBeNull();
-  });
-
-  it("rejects missing visual identity without partially publishing a replacement", () => {
-    const store = new RefStore();
-    store.set("e1", 10, { tabId: 4 });
-    const invalid = visual();
-    invalid.candidate.document.attachmentId = "";
-    expect(() =>
-      store.replace([
-        ["e2", 20],
-        ["e3", invalid],
-      ]),
-    ).toThrow(TypeError);
-    expect(store.resolveEntry("e1")).toMatchObject({ generation: 0, backendNodeId: 10 });
-    expect(store.size()).toBe(1);
-    store.replace([["e1", visual()]]);
-    expect(store.resolveEntry("e1")?.generation).toBe(1);
-  });
-
-  it("isolates tabs/sessions and distinguishes unsupported targets from missing refs", async () => {
-    const { ctx } = await setup();
-    expect(lookupRefTarget(ctx, "@e1", 4)?.kind).toBe("visual-region");
-    expect(lookupRefTarget(ctx, "e1", 5)).toBeNull();
-    expect(lookupSnapshotRef(ctx, "e1", 4)).toBeNull();
-    expect(resolveSnapshotRef(ctx, "e1", 4)).toMatchObject({
-      code: "unsupported",
-      data: { reason: "ref_kind_unsupported" },
-    });
-    expect(resolveSnapshotRef(ctx, "e1", 5)).toMatchObject({
-      code: "not_found",
-      data: { reason: "ref_not_found" },
-    });
-    expect(lookupRefTarget({ ...ctx, refStore: new RefStore() }, "e1", 4)).toBeNull();
-    expect(lookupSnapshotRef(ctx, "e2", 4)).toMatchObject({ backendNodeId: 43 });
-  });
-
-  it.each([
-    "click",
-    "fill",
-    "hover",
-    "press",
-    "select",
-    "get_html",
-    "screenshot",
-  ])("rejects visual refs in %s before target effects", async (tool) => {
-    const { manager, send, cdp, tabsApi } = await setup();
-    const params = { session_id: "test", tab_id: 4, ref: "@e1" };
-    const deps = { cdp, tabsApi };
-    const captureVisibleTab = vi.fn();
-    let result: unknown;
-    switch (tool) {
-      case "click":
-        result = await handleClick(manager, params, deps);
-        break;
-      case "fill":
-        result = await handleFill(manager, { ...params, value: "hello" }, deps);
-        break;
-      case "hover":
-        result = await handleHover(manager, params, deps);
-        break;
-      case "press":
-        result = await handlePress(manager, { ...params, key: "Enter" }, deps);
-        break;
-      case "select":
-        result = await handleSelect(manager, { ...params, values: ["one"] }, deps);
-        break;
-      case "get_html":
-        result = await handleGetHtml(manager, params, deps);
-        break;
-      case "screenshot":
-        result = await handleScreenshot(manager, params, {
-          ...deps,
-          captureApi: { ...tabsApi, captureVisibleTab },
-        });
-        break;
-    }
-    expect(result).toMatchObject({ code: "unsupported", data: { reason: "ref_kind_unsupported" } });
-    expect(send).not.toHaveBeenCalled();
-    expect(captureVisibleTab).not.toHaveBeenCalled();
-  });
-
-  it.each([
-    "input",
-    "drop",
-    "download",
-  ] as const)("rejects visual refs before %s file-transfer setup", async (mode) => {
-    const { manager, send, cdp, tabsApi } = await setup();
-    const params = { session_id: "test", tab_id: 4, ref: "e1" };
-    const result =
-      mode === "download"
-        ? await handleDownload(
-            manager,
-            { ...params, browser_relative_dir: "test" },
-            { cdp, tabsApi },
-          )
-        : await handleUpload(
-            manager,
-            {
-              ...params,
-              mode,
-              files: [{ transfer_id: "test", name: "test.txt", staged_path: "/unused/test.txt" }],
-            },
-            { cdp, tabsApi },
-          );
-    expect(result).toMatchObject({ code: "unsupported", data: { reason: "ref_kind_unsupported" } });
-    expect(send).not.toHaveBeenCalled();
-  });
-
-  it("does not scroll or highlight a visual anchor in human help", async () => {
-    const { manager, cdp, tabsApi, send } = await setup();
-    const sendToTab = vi.fn(async (_tab: number, _message: unknown) => ({
-      type: "bsk-help-response",
-      outcome: "continued",
-    }));
-    const result = await handleRequestHelp(
-      manager,
-      { session_id: "test", tab_id: 4, prompt: "help", targets: [{ ref: "@e1" }] },
-      {
-        cdp,
-        tabsApi,
-        sendToTab,
-        windows: { update: vi.fn(async () => ({}) as never) },
-        activateTab: vi.fn(async () => {}),
-        notifications: null,
-        autoAttachLifecycle: false,
-      },
-    );
-    expect(result).toMatchObject({ resolved_targets: [{ ref: "@e1", matched: false }] });
-    expect(send).not.toHaveBeenCalled();
-    expect(sendToTab.mock.calls[0][1]).toMatchObject({ rects: [], selectors: [] });
-  });
-});

apps/extension/src/tools/dispatcher.ts

@@ -2,14 +2,12 @@ import { OVERLAY_AUTOMATION_BYPASS } from "@/lib/overlay-bridge";
 import type { SessionManager } from "@/session-manager/manager";
 import type { Transport } from "@/transport/transport";
 import type {
-  BlurParams,
   ClickParams,
   ConsoleParams,
   DownloadParams,
   EmulateParams,
   EvaluateParams,
   FillParams,
-  FocusParams,
   GetHtmlParams,
   HoverParams,
   HoverResult,
@@ -29,7 +27,6 @@ import type {
   ResponseFrame,
   RpcError,
   ScreenshotParams,
-  ScrollToParams,
   SelectParams,
   SnapshotParams,
   UploadParams,
@@ -42,15 +39,7 @@ import { type EmulateCdpRunner, handleEmulate } from "./emulate";
 import { classifyCdpError } from "./errors";
 import { handleEvaluate } from "./evaluate";
 import { handleRequestHelp } from "./human-loop";
-import {
-  handleBlur,
-  handleClick,
-  handleFill,
-  handleFocus,
-  handleHover,
-  handlePress,
-  handleSelect,
-} from "./interaction";
+import { handleClick, handleFill, handleHover, handlePress, handleSelect } from "./interaction";
 import {
   handleNavigate,
   handleNavigateBack,
@@ -72,7 +61,6 @@ import {
   handleRecordStop,
   type RecordRuntimeDeps,
 } from "./record";
-import { handleScrollTo } from "./scroll";
 import {
   handleSessionStart,
   handleSessionStop,
@@ -527,39 +515,6 @@ export class ToolDispatcher {
         );
         return this.rememberHover((req.params as HoverParams).session_id, result);
       }
-      case "tool.scroll_to":
-        return this.withHoverReleaseForRequest(
-          req.params as ScrollToParams,
-          () =>
-            handleScrollTo(
-              this.sessions,
-              req.params as ScrollToParams,
-              this.cdp ? { cdp: this.cdp, tabsApi: chromeTabsApi, signal } : undefined,
-            ),
-          signal,
-        );
-      case "tool.focus":
-        return this.withHoverReleaseForRequest(
-          req.params as FocusParams,
-          () =>
-            handleFocus(
-              this.sessions,
-              req.params as FocusParams,
-              this.cdp ? { cdp: this.cdp, tabsApi: chromeTabsApi, signal } : undefined,
-            ),
-          signal,
-        );
-      case "tool.blur":
-        return this.withHoverReleaseForRequest(
-          req.params as BlurParams,
-          () =>
-            handleBlur(
-              this.sessions,
-              req.params as BlurParams,
-              this.cdp ? { cdp: this.cdp, tabsApi: chromeTabsApi, signal } : undefined,
-            ),
-          signal,
-        );
       case "tool.fill":
         return this.withHoverReleaseForRequest(
           req.params as FillParams,
@@ -830,9 +785,6 @@ function sessionIdForBrowserControlMethod(req: RequestFrame): string | null {
     case "tool.reload":
     case "tool.click":
     case "tool.hover":
-    case "tool.scroll_to":
-    case "tool.focus":
-    case "tool.blur":
     case "tool.fill":
     case "tool.press":
     case "tool.select":

apps/extension/src/tools/frame-geometry.ts

@@ -161,8 +161,7 @@ export async function resolveNodeGeometry(
         return geometryError(`could not resolve frame geometry for ${address.frameId}`);
       topVisibleRegions = projectRegionToViewport(localRegion, projection);
       if (address.target.sessionId) {
-        const localViewport = await context.viewport(address.target);
-        if (!localViewport) return geometryError("could not resolve target viewport geometry");
+        const localViewport = projection.edges[0]?.sourceViewport ?? projection.topViewport;
         const localVisibleRegions = localRegion
           .map((polygon) =>
             clipPolygon(

apps/extension/src/tools/geometry/coordinate-types.ts

@@ -25,12 +25,6 @@ export interface UnavailableFrameProjection {
   ownerBackendNodeId: number;
 }
 
-export interface UnavailableSnapshotCoordinates {
-  status: "unavailable";
-  source: CoordinateOwner;
-  reason: "snapshot-coordinates-unavailable";
-}
-
 export type SnapshotProjectionResult =
   | { status: "available"; projection: SnapshotProjection }
   | UnavailableFrameProjection;
@@ -38,74 +32,25 @@ export type SnapshotProjectionResult =
 /** Descendants inherit the failed boundary without attempting another owner read. */
 export type FrameProjectionIssue =
   | UnavailableFrameProjection
-  | UnavailableSnapshotCoordinates
-  | {
-      status: "blocked";
-      source: CoordinateOwner;
-      cause: UnavailableFrameProjection | UnavailableSnapshotCoordinates;
-    };
+  | { status: "blocked"; source: CoordinateOwner; cause: UnavailableFrameProjection };
 
 export type FrameProjectionState = SnapshotProjectionResult | FrameProjectionIssue;
 
-export interface SnapshotCoordinates {
-  layoutUnitsPerCssPixel: number;
-  scrollCss: { x: number; y: number };
-}
-
-/** Snapshot scroll offsets share the raw layout units of its bounds. Only a
- * target's root document may fall back to that target's CSS layout viewport. */
-export function snapshotCoordinates(
-  document: { scrollOffsetX?: number; scrollOffsetY?: number },
-  layoutUnitsPerCssPixel: number | null,
-  rootScrollCss?: { x?: number; y?: number },
-): SnapshotCoordinates | null {
-  if (
-    layoutUnitsPerCssPixel === null ||
-    !Number.isFinite(layoutUnitsPerCssPixel) ||
-    layoutUnitsPerCssPixel <= 0
-  )
-    return null;
-  const x =
-    document.scrollOffsetX === undefined
-      ? rootScrollCss?.x
-      : document.scrollOffsetX / layoutUnitsPerCssPixel;
-  const y =
-    document.scrollOffsetY === undefined
-      ? rootScrollCss?.y
-      : document.scrollOffsetY / layoutUnitsPerCssPixel;
-  if (x === undefined || y === undefined || !Number.isFinite(x) || !Number.isFinite(y)) return null;
-  return { layoutUnitsPerCssPixel, scrollCss: { x, y } };
-}
-
-/** Convert raw document-relative Blink layout units exactly once, before any
- * CSS viewport clipping or frame projection. This scale is not screenshot zoom. */
+/** DOMSnapshot bounds are document-relative CSS pixels, independent of raster DPR. */
 export function snapshotViewportRect(
   bounds: number[],
   owner: CoordinateOwner,
-  coordinates: SnapshotCoordinates | null,
+  scroll: { x: number; y: number },
 ): FrameViewportRect | null {
-  if (!coordinates || bounds.length < 4 || !bounds.slice(0, 4).every(Number.isFinite)) return null;
-  const { layoutUnitsPerCssPixel: scale, scrollCss: scroll } = coordinates;
+  if (bounds.length < 4 || !bounds.slice(0, 4).every(Number.isFinite)) return null;
   const [x, y, width, height] = bounds;
-  if (
-    !Number.isFinite(scale) ||
-    scale <= 0 ||
-    width <= 0 ||
-    height <= 0 ||
-    !Number.isFinite(scroll.x) ||
-    !Number.isFinite(scroll.y)
-  ) {
+  if (width <= 0 || height <= 0 || !Number.isFinite(scroll.x) || !Number.isFinite(scroll.y)) {
     return null;
   }
   return {
     space: "frame-viewport-css",
     owner,
-    rect: {
-      x: x / scale - scroll.x,
-      y: y / scale - scroll.y,
-      width: width / scale,
-      height: height / scale,
-    },
+    rect: { x: x - scroll.x, y: y - scroll.y, width, height },
   };
 }
 

apps/extension/src/tools/geometry/frame-context.ts

@@ -9,10 +9,8 @@ import {
   type Polygon,
   type ProjectiveEdge,
   parseCdpQuad,
-  projectPolygon,
   type Quad,
   type Size,
-  viewportPolygon,
 } from "../geometry";
 import { type CdpRunner, sendToCdpTarget } from "../shared";
 import type { CoordinateOwner, CssViewport, SnapshotProjectionResult } from "./coordinate-types";
@@ -20,13 +18,8 @@ import type { CoordinateOwner, CssViewport, SnapshotProjectionResult } from "./c
 import { readSnapshotOwnerSizes } from "./snapshot-owner-sizes";
 
 export interface LayoutMetrics {
-  cssVisualViewport?: {
-    zoom?: number;
-    scale?: number;
-    clientWidth?: number;
-    clientHeight?: number;
-  };
-  visualViewport?: { zoom?: number; scale?: number; clientWidth?: number; clientHeight?: number };
+  cssVisualViewport?: { zoom?: number };
+  visualViewport?: { zoom?: number };
   cssLayoutViewport?: {
     clientWidth?: number;
     clientHeight?: number;
@@ -36,29 +29,6 @@ export interface LayoutMetrics {
   layoutViewport?: { clientWidth?: number; clientHeight?: number; pageX?: number; pageY?: number };
 }
 
-/** Chromium emits these paired floating-point dimensions before/after dividing
- * by LayoutZoomFactor. Integer layout viewport dimensions lose precision at
- * fractional zoom. Neither visualViewport.scale nor .zoom is this conversion.
- * See InspectorPageAgent::getLayoutMetrics in Chromium. */
-export function snapshotLayoutScale(metrics: LayoutMetrics): number | null {
-  for (const dimension of ["clientWidth", "clientHeight"] as const) {
-    const raw = metrics.visualViewport?.[dimension];
-    const css = metrics.cssVisualViewport?.[dimension];
-    if (
-      raw !== undefined &&
-      css !== undefined &&
-      Number.isFinite(raw) &&
-      Number.isFinite(css) &&
-      raw > 0 &&
-      css > 0
-    ) {
-      const scale = raw / css;
-      if (Number.isFinite(scale) && scale > 0) return scale;
-    }
-  }
-  return null;
-}
-
 /** The legacy field is a compatibility fallback, never a source of raster DPR. */
 export function cssViewport(metrics: LayoutMetrics): CssViewport {
   const value = metrics.cssLayoutViewport ?? metrics.layoutViewport;
@@ -74,7 +44,6 @@ export function cssViewport(metrics: LayoutMetrics): CssViewport {
 /** One read-only measurement phase. Discard after scrolling or any later operation. */
 export class GeometryContext {
   private readonly metrics = new Map<string, Promise<LayoutMetrics>>();
-  private readonly frameViewports = new Map<string, Promise<Size | null>>();
   private readonly owners = new Map<string, Promise<Quad | null>>();
   private readonly projections = new Map<string, Promise<GeometryProjection | null>>();
   private readonly snapshotOwners = new Map<string, Promise<{ quad: Quad; size: Size } | null>>();
@@ -165,35 +134,6 @@ export class GeometryContext {
       : null;
   }
 
-  /** The full OOPIF viewport maps to its owner's content quad. Layout metrics
-   * exclude occupied scrollbars and remain the clipping boundary, not the scale. */
-  private frameViewport(target: CdpTarget): Promise<Size | null> {
-    const key = cdpTargetKey(target);
-    let promise = this.frameViewports.get(key);
-    if (!promise) {
-      promise = this.request<{ result?: { value?: Size }; exceptionDetails?: unknown }>(
-        target,
-        "Runtime.evaluate",
-        {
-          expression: "({ width: window.innerWidth, height: window.innerHeight })",
-          returnByValue: true,
-        },
-      ).then(({ result, exceptionDetails }) => {
-        const size = result?.value;
-        return !exceptionDetails &&
-          size &&
-          Number.isFinite(size.width) &&
-          Number.isFinite(size.height) &&
-          size.width > 0 &&
-          size.height > 0
-          ? size
-          : null;
-      });
-      this.frameViewports.set(key, promise);
-    }
-    return promise;
-  }
-
   ownerContent(target: CdpTarget, backendNodeId: number): Promise<Quad | null> {
     const key = `${cdpTargetKey(target)}:${backendNodeId}`;
     let promise = this.owners.get(key);
@@ -379,19 +319,12 @@ export class GeometryContext {
       const parent = frames.get(root.parentFrameId);
       if (!parent || root.ownerBackendNodeId === undefined) return null;
       const destinationQuad = await this.ownerContent(parent.target, root.ownerBackendNodeId);
-      if (!destinationQuad) return null;
-      const source = await this.frameViewport(root.target);
-      const visible = await this.viewport(root.target);
+      const source = await this.viewport(root.target);
       const parentRoot = this.targetRoot(frames, parent);
-      if (!source || !visible || !parentRoot) return null;
+      if (!destinationQuad || !source || !parentRoot) return null;
       const destinationClips = await this.clips(frames, parent, parentRoot);
       if (!destinationClips) return null;
-      const edge = { sourceViewport: source, destinationQuad, destinationClips };
-      // Keep scrollbar strips clipped at every target boundary, including
-      // intermediate OOPIFs. Project the clip with the same full-viewport scale.
-      if (source.width !== visible.width || source.height !== visible.height)
-        destinationClips.push(projectPolygon(viewportPolygon(visible), edge));
-      edges.push(edge);
+      edges.push({ sourceViewport: source, destinationQuad, destinationClips });
       root = parentRoot;
     }
     const topViewport = await this.viewport(root.target);

apps/extension/src/tools/interaction.ts

@@ -1,4 +1,5 @@
-// DOM interaction tools — click, hover, focus/blur, fill, press, and select.
+// DOM interaction tools — `tool.click`, `tool.fill`, `tool.press`, and
+// `tool.select`.
 //
 // All interaction tools:
 // 1. Resolve target tab (sandbox: must be inside Agent Window).
@@ -13,14 +14,10 @@ import { ChromiumCdp } from "@/browser-driver/chromium-cdp";
 import type { CdpTarget } from "@/browser-driver/frame-graph";
 import type { SessionContext, SessionManager } from "@/session-manager/manager";
 import type {
-  BlurParams,
-  BlurResult,
   ClickParams,
   ClickResult,
   FillParams,
   FillResult,
-  FocusParams,
-  FocusResult,
   HoverParams,
   HoverResult,
   KeyModifier,
@@ -230,207 +227,6 @@ export async function resolveBackendNode(
   }
 }
 
-// Check the target's own root, then its hosts: closed shadow roots are not
-// reachable via host.shadowRoot. DOM focus remains meaningful in background tabs.
-const FOCUS_CHECK = `function() {
-  if (!this.isConnected) return false;
-  let element = this;
-  while (element) {
-    const root = element.getRootNode();
-    if (root.activeElement !== element) return false;
-    element = root.host;
-  }
-  return true;
-}`;
-
-const BLUR_TARGET = `function() {
-  if (!this.isConnected) throw new Error('blur target is detached');
-  const wasFocused = (${FOCUS_CHECK}).call(this);
-  if (typeof this.blur !== 'function') return { ok: false, was_focused: wasFocused };
-  this.blur();
-  return { ok: true, was_focused: wasFocused };
-}`;
-
-interface FocusScriptReply<T> {
-  result?: { value?: T };
-  exceptionDetails?: { text?: string; exception?: { description?: string } };
-}
-
-function checkFocusAbort(signal: AbortSignal | undefined): void {
-  if (signal?.aborted) throw new DOMException("interaction aborted", "AbortError");
-}
-
-// Only focus/blur use this view. Guard every CDP boundary, including commands
-// inside selector resolution and frame scrolling, without changing other tools.
-function focusCdp(cdp: CdpRunner, signal: AbortSignal | undefined): CdpRunner {
-  const send = <T = unknown>(target: CdpTarget, method: string, params?: object): Promise<T> => {
-    checkFocusAbort(signal);
-    return cdpRunnerForTarget(cdp, target).send<T>(target.tabId, method, params);
-  };
-  return {
-    send: (tabId, method, params) => send({ tabId }, method, params),
-    sendToTarget: send,
-    trackSessionTab: cdp.trackSessionTab?.bind(cdp),
-    getFrameGraph: cdp.getFrameGraph
-      ? (tabId) => {
-          checkFocusAbort(signal);
-          return cdp.getFrameGraph!(tabId);
-        }
-      : undefined,
-  };
-}
-
-// ---------------------------------------------------------------------------
-// tool.focus / tool.blur
-// ---------------------------------------------------------------------------
-
-export function handleFocus(
-  manager: SessionManager,
-  params: FocusParams,
-  deps: InteractionDeps = getDefaultDeps(),
-): Promise<FocusResult | RpcError> {
-  return changeFocus(manager, params, deps, "focus");
-}
-
-export function handleBlur(
-  manager: SessionManager,
-  params: BlurParams,
-  deps: InteractionDeps = getDefaultDeps(),
-): Promise<BlurResult | RpcError> {
-  return changeFocus(manager, params, deps, "blur");
-}
-
-function changeFocus(
-  manager: SessionManager,
-  params: FocusParams,
-  deps: InteractionDeps,
-  action: "focus",
-): Promise<FocusResult | RpcError>;
-function changeFocus(
-  manager: SessionManager,
-  params: BlurParams,
-  deps: InteractionDeps,
-  action: "blur",
-): Promise<BlurResult | RpcError>;
-async function changeFocus(
-  manager: SessionManager,
-  params: FocusParams | BlurParams,
-  deps: InteractionDeps,
-  action: "focus" | "blur",
-): Promise<FocusResult | BlurResult | RpcError> {
-  const ctx = lookupSession(manager, params, action);
-  if (isRpcError(ctx)) return ctx;
-  const cdp = focusCdp(deps.cdp, deps.signal);
-  let objectId: string | undefined;
-  let cleanupCdp: CdpRunner | undefined;
-  let tabId: number | undefined;
-  try {
-    checkFocusAbort(deps.signal);
-    const target = await resolveTargetTab(manager, ctx, params.tab_id, deps.tabsApi);
-    checkFocusAbort(deps.signal);
-    if (isRpcError(target)) return target;
-    const denied = enforceAgentWindow(ctx, target, action);
-    if (denied) return denied;
-    tabId = target.tabId;
-    const dialogCursor = markDialogCursor(deps.cdp, tabId);
-    const node = await resolveBackendNode(cdp, ctx, target, params, action);
-    checkFocusAbort(deps.signal);
-    if (isRpcError(node)) return node;
-    const nodeCdp = cdpRunnerForTarget(cdp, node.cdpTarget);
-    cleanupCdp = cdpRunnerForTarget(deps.cdp, node.cdpTarget);
-    deps.cdp.trackSessionTab?.(ctx.sessionId, tabId);
-
-    if (action === "focus") {
-      const scrollErr = await scrollElementAndFramesIntoView(
-        cdp,
-        tabId,
-        node.cdpTarget,
-        node.backendNodeId,
-        node.frameId,
-      );
-      checkFocusAbort(deps.signal);
-      if (scrollErr) return scrollErr;
-    }
-    const resolved = await backendNodeToObject(nodeCdp, tabId, node.backendNodeId);
-    // Keep the handle before checking cancellation so finally can release it.
-    if (!isRpcError(resolved)) objectId = resolved;
-    checkFocusAbort(deps.signal);
-    if (isRpcError(resolved)) return resolved;
-
-    const runScript = async <T>(functionDeclaration: string): Promise<T | undefined> => {
-      const reply = await nodeCdp.send<FocusScriptReply<T>>(
-        target.tabId,
-        "Runtime.callFunctionOn",
-        {
-          objectId,
-          functionDeclaration,
-          returnByValue: true,
-        },
-      );
-      checkFocusAbort(deps.signal);
-      if (reply.exceptionDetails) {
-        const details = reply.exceptionDetails;
-        throw new Error(
-          `${action} script failed: ${details.exception?.description ?? details.text ?? "unknown exception"}`,
-        );
-      }
-      return reply.result?.value;
-    };
-
-    let wasFocused: boolean | undefined;
-    if (action === "focus") {
-      await nodeCdp.send(tabId, "DOM.focus", { backendNodeId: node.backendNodeId });
-      checkFocusAbort(deps.signal);
-    } else {
-      const mutation = await runScript<{ ok: boolean; was_focused: boolean }>(BLUR_TARGET);
-      if (typeof mutation?.ok !== "boolean" || typeof mutation.was_focused !== "boolean") {
-        throw new Error("blur script returned an unexpected result");
-      }
-      if (!mutation.ok) {
-        return { code: "invalid_params", message: "target element does not support blur()" };
-      }
-      wasFocused = mutation.was_focused;
-    }
-    // Use a separate call so microtasks from focus/blur handlers finish before
-    // we report success. In particular, a blur handler can restore focus.
-    const focused = await runScript<boolean>(FOCUS_CHECK);
-    if (typeof focused !== "boolean") {
-      throw new Error(`${action} verification returned an unexpected result`);
-    }
-    if (focused !== (action === "focus")) {
-      throw new Error(
-        action === "focus"
-          ? "target element did not become focused"
-          : "target element remained focused after blur()",
-      );
-    }
-    return attachDialogs(deps.cdp, tabId, dialogCursor, {
-      tab_id: tabId,
-      used_ref: node.usedRef,
-      used_selector: node.usedSelector,
-      focused,
-      ...(action === "blur" ? { was_focused: wasFocused! } : {}),
-    });
-  } catch (err) {
-    return (
-      throwIfAborted(deps.signal) ?? {
-        code: "cdp_failed",
-        message: err instanceof Error ? err.message : String(err),
-      }
-    );
-  } finally {
-    if (objectId !== undefined && cleanupCdp && tabId !== undefined) {
-      // Cleanup must also run after cancellation. Navigation may have already
-      // disposed the object, which must not replace the operation's result.
-      try {
-        await cleanupCdp.send(tabId, "Runtime.releaseObject", { objectId });
-      } catch {
-        // The target or execution context may no longer exist.
-      }
-    }
-  }
-}
-
 export async function resolveActionTarget(
   cdp: CdpRunner,
   ctx: SessionContext,

apps/extension/src/tools/observation.ts

@@ -1,4 +1,3 @@
-import type { CapturedSceneInput } from "./vom/facts";
 // Observation handlers — `tool.snapshot`, `tool.get_html`, `tool.screenshot`,
 // and semantic `tool.observe` (design §7). Each handler resolves the target
 // tab (defaulting to the Agent Window's active tab when omitted) and
@@ -36,6 +35,7 @@ import { attachDialogs, markDialogCursor } from "./dialogs";
 import { rpcError } from "./errors";
 import { resolveNodeGeometry } from "./frame-geometry";
 import { screenshotPageRect } from "./geometry/coordinate-types";
+import { cssViewport, GeometryContext } from "./geometry/frame-context";
 import {
   type ChromeTabsApi,
   enforceToolTargetScope,
@@ -48,10 +48,16 @@ import {
   normaliseRef as sharedNormaliseRef,
   type ToolEffect,
 } from "./shared";
-import { lookupRefTarget, resolveSnapshotRef } from "./snapshot-ref";
-import { type CapturedNode, type CapturedSurfaceProbe, probeHoverSurfaces } from "./vom/capture";
-import { captureObservationFacts, semanticCapture } from "./vom/capture-coordinator";
-import type { FrameDocument as CapturedFrameDocument } from "./vom/frame-document";
+import { resolveSnapshotRef } from "./snapshot-ref";
+import {
+  type CapturedNode,
+  type CapturedSurfaceProbe,
+  type CapturedViewModel,
+  captureViewModel,
+  collectOverlayExcludedBackendIds,
+  probeHoverSurfaces,
+} from "./vom/capture";
+import { type CapturedFrameDocument, captureFrameData } from "./vom/frame-capture";
 import { withOverlayBypass } from "./vom/hover-perception";
 import { probeTooltipNames } from "./vom/name-enrichment";
 import {
@@ -308,12 +314,6 @@ export async function handleScreenshot(
     if (!deps.cdp) {
       return { code: "cdp_failed", message: "screenshot ref capture requires CDP" };
     }
-    if (lookupRefTarget(ctx, ref, target.tabId)?.kind === "visual-region")
-      return rpcError(
-        "unsupported",
-        "ref_kind_unsupported",
-        "visual-region screenshot execution is not available in this build",
-      );
     const node = resolveSnapshotRef(ctx, ref, target.tabId);
     if (isRpcError(node)) return node;
     if (signal?.aborted) return cancelled("screenshot");
@@ -531,7 +531,7 @@ function buildActiveScopeBlocks(nodes: VomNode[], signals: VomNodeDomSignals): A
 
 function buildConditionalSurfaces(
   nodes: VomNode[],
-  captured: CapturedSceneInput,
+  captured: CapturedViewModel,
   probes: CapturedSurfaceProbe[],
 ): CondSurface[] {
   if (probes.length === 0) return [];
@@ -661,9 +661,163 @@ export interface BuildVomSceneOptions {
 
 export type VomFrameDocument = CapturedFrameDocument<CdpAxNode>;
 
+function legacyFrameDocuments(
+  axNodes: CdpAxNode[],
+  captured: CapturedViewModel,
+  pageUrl?: string,
+  rootTarget: VomFrameDocument["target"] = { tabId: 0 },
+): VomFrameDocument[] {
+  const rootFrameId = captured.rootFrameId ?? "root";
+  const documents: VomFrameDocument[] = [
+    {
+      frameId: rootFrameId,
+      contextScopeId: rootFrameId,
+      target: rootTarget,
+      ...(pageUrl ? { url: pageUrl } : {}),
+      axNodes: [],
+      domNodes: captured.nodes.map((node) => ({ ...node, frameId: node.frameId ?? rootFrameId })),
+      excludedBackendNodeIds: captured.frameExcludedBackendNodeIds?.get(rootFrameId),
+    },
+  ];
+  const pending = [...captured.iframeNodes.entries()];
+  let progress = true;
+  let nextSyntheticFrame = 1;
+  while (pending.length > 0 && progress) {
+    progress = false;
+    for (let index = pending.length - 1; index >= 0; index -= 1) {
+      const [ownerBackendNodeId, domNodes] = pending[index];
+      const parent = documents.find((document) =>
+        document.domNodes.some((node) => node.backendNodeId === ownerBackendNodeId),
+      );
+      if (!parent) continue;
+      const frameId =
+        domNodes.find((node) => node.frameId)?.frameId ?? `legacy-frame-${nextSyntheticFrame++}`;
+      documents.push({
+        frameId,
+        parentFrameId: parent.frameId,
+        ownerBackendNodeId,
+        contextScopeId: frameId,
+        target: parent.target,
+        axNodes: [],
+        domNodes: domNodes.map((node) => ({ ...node, frameId: node.frameId ?? frameId })),
+        excludedBackendNodeIds: captured.frameExcludedBackendNodeIds?.get(frameId),
+      });
+      pending.splice(index, 1);
+      progress = true;
+    }
+  }
+
+  const documentByFrameId = new Map(documents.map((document) => [document.frameId, document]));
+  const backendFrame = new Map<number, string>();
+  const childFrameByOwner = new Map<number, string>();
+  for (const document of documents) {
+    if (document.ownerBackendNodeId !== undefined) {
+      childFrameByOwner.set(document.ownerBackendNodeId, document.frameId);
+    }
+    for (const node of document.domNodes) backendFrame.set(node.backendNodeId, document.frameId);
+  }
+  const axById = new Map(axNodes.map((node) => [node.nodeId, node]));
+  const ownership = new Map<string, string>();
+  const resolving = new Set<string>();
+  const frameForAx = (node: CdpAxNode): string => {
+    const cached = ownership.get(node.nodeId);
+    if (cached) return cached;
+    let frameId: string | undefined;
+    if (node.frameId && documentByFrameId.has(node.frameId)) frameId = node.frameId;
+    if (!frameId && typeof node.backendDOMNodeId === "number") {
+      frameId = backendFrame.get(node.backendDOMNodeId);
+    }
+    if (!frameId && node.parentId && !resolving.has(node.nodeId)) {
+      const parent = axById.get(node.parentId);
+      if (parent) {
+        frameId =
+          typeof parent.backendDOMNodeId === "number"
+            ? childFrameByOwner.get(parent.backendDOMNodeId)
+            : undefined;
+        if (!frameId) {
+          resolving.add(node.nodeId);
+          frameId = frameForAx(parent);
+          resolving.delete(node.nodeId);
+        }
+      }
+    }
+    frameId ??= rootFrameId;
+    ownership.set(node.nodeId, frameId);
+    return frameId;
+  };
+  for (const node of axNodes) frameForAx(node);
+  for (const node of axNodes) {
+    const frameId = ownership.get(node.nodeId) ?? rootFrameId;
+    const document = documentByFrameId.get(frameId) ?? documents[0];
+    document.axNodes.push({
+      ...node,
+      frameId,
+      ...(node.parentId && ownership.get(node.parentId) === frameId
+        ? { parentId: node.parentId }
+        : { parentId: undefined }),
+      ...(node.childIds
+        ? { childIds: node.childIds.filter((childId) => ownership.get(childId) === frameId) }
+        : {}),
+    });
+  }
+  return documents;
+}
+
+function withLegacyBackendIds(scene: VomScene): VomScene {
+  const used = new Set<number>();
+  const idMap = new Map<number, number>();
+  let nextVirtualId = -1;
+  for (const node of scene.nodes) {
+    const preferred = node.backendNodeId;
+    const id = preferred !== undefined && !used.has(preferred) ? preferred : nextVirtualId--;
+    used.add(id);
+    idMap.set(node.id, id);
+  }
+  return {
+    ...scene,
+    nodes: scene.nodes.map((node) => ({
+      ...node,
+      id: idMap.get(node.id) as number,
+      parentId: node.parentId === null ? null : (idMap.get(node.parentId) ?? null),
+      ...(node.domParentId !== undefined
+        ? { domParentId: node.domParentId === null ? null : (idMap.get(node.domParentId) ?? null) }
+        : {}),
+      ...(node.domAncestorIds
+        ? { domAncestorIds: node.domAncestorIds.flatMap((id) => idMap.get(id) ?? []) }
+        : {}),
+    })),
+    ...(scene.surfaces
+      ? {
+          surfaces: scene.surfaces.map((surface) => ({
+            ...surface,
+            triggerId: idMap.get(surface.triggerId) ?? surface.triggerId,
+          })),
+        }
+      : {}),
+    ...(scene.activeScopeBlocks
+      ? {
+          activeScopeBlocks: scene.activeScopeBlocks.map((block) => ({
+            ...block,
+            triggerId: idMap.get(block.triggerId) ?? block.triggerId,
+          })),
+        }
+      : {}),
+  };
+}
+
+export function buildVomScene(
+  axNodes: CdpAxNode[],
+  captured: CapturedViewModel,
+  options: BuildVomSceneOptions = {},
+): VomScene {
+  return withLegacyBackendIds(
+    buildFrameVomScene(legacyFrameDocuments(axNodes, captured, options.pageUrl), captured, options),
+  );
+}
+
 export function buildFrameVomScene(
   documents: VomFrameDocument[],
-  captured: CapturedSceneInput,
+  captured: CapturedViewModel,
   options: BuildVomSceneOptions = {},
 ): VomScene {
   const scene = buildSemanticVomScene({
@@ -679,7 +833,7 @@ export function buildFrameVomScene(
 function attachCapturedSceneAnnotations(
   scene: VomScene,
   documents: VomFrameDocument[],
-  captured: CapturedSceneInput,
+  captured: CapturedViewModel,
   surfaceProbes: CapturedSurfaceProbe[],
 ): VomScene {
   const rootDocument = documents.find((document) => document.frameId === scene.rootFrameId);
@@ -829,6 +983,45 @@ export async function handleGetHtml(
   }
 }
 
+function emptyCapturedViewModel(viewport = { width: 0, height: 0 }): CapturedViewModel {
+  return { viewport, nodes: [], iframeNodes: new Map(), excludedBackendNodeIds: new Set() };
+}
+
+async function fallbackCapturedViewModel(
+  cdp: CdpRunner,
+  tabId: number,
+  geometry: GeometryContext,
+  signal?: AbortSignal,
+): Promise<CapturedViewModel> {
+  throwIfAborted(signal, "observation");
+  let viewport = { width: 0, height: 0 };
+  try {
+    const metrics = await geometry.layoutMetrics({ tabId });
+    throwIfAborted(signal, "observation");
+    const source = cssViewport(metrics);
+    viewport = { width: source.width, height: source.height };
+  } catch (error) {
+    if (isAbortError(error)) throw error;
+  }
+  const excludedBackendNodeIds = await collectOverlayExcludedBackendIds(cdp, tabId, signal);
+  throwIfAborted(signal, "observation");
+  return { ...emptyCapturedViewModel(viewport), excludedBackendNodeIds };
+}
+
+async function captureForVom(
+  cdp: CdpRunner,
+  tabId: number,
+  options: CaptureVomObservationOptions,
+  geometry: GeometryContext,
+): Promise<CapturedViewModel> {
+  try {
+    return await captureViewModel(cdp, tabId, { signal: options.signal, geometry });
+  } catch (error) {
+    if (isAbortError(error)) throw error;
+    return fallbackCapturedViewModel(cdp, tabId, geometry, options.signal);
+  }
+}
+
 export interface HoverProbeOutcome {
   /** Whether any active hover was dispatched during this observation. */
   performed: boolean;
@@ -861,7 +1054,7 @@ const NO_HOVER_PROBES: HoverProbeOutcome = {
 async function runHoverProbes(
   cdp: CdpRunner,
   tabId: number,
-  captured: CapturedSceneInput,
+  captured: CapturedViewModel,
   documents: VomFrameDocument[],
   staticSemantics: ReturnType<typeof resolveSemanticGraph>,
   options: CaptureVomObservationOptions,
@@ -900,9 +1093,21 @@ export async function captureVomObservation(
   throwIfAborted(options.signal, "observation");
   await cdp.ensureAttachedToUrl?.(tabId, url);
   throwIfAborted(options.signal, "observation");
-  const facts = await captureObservationFacts<CdpAxNode>(cdp, tabId, options.signal, url);
-  const { captured, documents: normalizedDocuments } = semanticCapture(facts);
+  const geometry = new GeometryContext(cdp, tabId, undefined, options.signal);
+  const captured = await captureForVom(cdp, tabId, options, geometry);
   throwIfAborted(options.signal, "observation");
+  const documents = await captureFrameData<CdpAxNode>(
+    cdp,
+    tabId,
+    captured,
+    options.signal,
+    geometry,
+  );
+  throwIfAborted(options.signal, "observation");
+  const normalizedDocuments =
+    documents.length === 1 && captured.iframeNodes.size > 0
+      ? legacyFrameDocuments(documents[0].axNodes, captured, url, documents[0].target)
+      : documents;
   const semanticGraph = buildSemanticGraph({
     documents: normalizedDocuments,
     viewport: captured.viewport,
@@ -932,41 +1137,19 @@ export async function captureVomObservation(
   );
   // Reserve space using the renderer's character-based token estimate. Like VOM
   // headers, this integrity notice remains visible even under a tiny token budget.
-  const notices: string[] = [];
-  if (facts.issues.some((issue) => issue.stage === "geometry"))
-    notices.push(
-      "@warning geometry incomplete: some page or frame content has no top-level coordinates.",
-    );
-  const incompleteStages = ["dom", "ax", "forms", "ownership"].filter((stage) =>
-    facts.issues.some((issue) => issue.stage === stage),
-  );
-  if (incompleteStages.length)
-    notices.push(
-      `@warning observation incomplete: some ${incompleteStages.join(", ")} data is unavailable or omitted.`,
-    );
-  if (
-    facts.issues.some(
-      (issue) => issue.stage === "identity" && issue.reason !== "identity-unverified",
-    )
-  )
-    notices.push(
-      "@warning observation incomplete: some documents were omitted because their identity changed or could not be revalidated.",
-    );
-  if (facts.issues.some((issue) => issue.reason === "identity-unverified"))
-    notices.push(
-      "@warning document identity unverified: some retained documents could not be checked for changes during capture.",
-    );
-  const captureNotice = notices.join("\n");
+  const geometryNotice = captured.frameGeometryIssues?.length
+    ? "@warning iframe geometry incomplete: some frame content has no top-level coordinates.\n"
+    : "";
   const rendered = renderVom(decoratedScene, {
     maxDepth: options.maxDepth,
     maxTokens:
-      !captureNotice || options.maxTokens === undefined
+      !geometryNotice || options.maxTokens === undefined
         ? options.maxTokens
-        : Math.max(0, options.maxTokens - Math.ceil((captureNotice.length + 1) / 4)),
+        : Math.max(0, options.maxTokens - Math.ceil(geometryNotice.length / 4)),
     redactValues: options.redactValues,
     activeRegionPolicy: options.activeRegionPolicy,
   });
-  if (captureNotice) rendered.text += `\n${captureNotice}`;
+  if (geometryNotice) rendered.text += `\n${geometryNotice.trimEnd()}`;
   throwIfAborted(options.signal, "observation");
   return projectRecordSafeObservation({
     rootFrameId: captured.rootFrameId ?? normalizedDocuments[0]?.frameId ?? "root",

apps/extension/src/tools/scroll-visibility.ts

@@ -1,142 +0,0 @@
-import { cdpTargetKey } from "@/browser-driver/frame-graph";
-import type { NodeAddress } from "./frame-geometry";
-import {
-  clipPolygon,
-  projectRegionToViewport,
-  type Region,
-  rectPolygon,
-  regionBounds,
-  type ViewportRect,
-} from "./geometry";
-import { GeometryContext } from "./geometry/frame-context";
-import { type CdpRunner, sendToCdpTarget } from "./shared";
-
-// Ask the renderer to apply containing-block clips (including shadow DOM),
-// instead of treating layout quads as visible pixels. Each document is measured
-// locally; the existing frame projections supply the top-viewport coordinates.
-// IntersectionObserver reports a bounding rectangle, not an occlusion/hit test.
-const VISIBLE_RECT = `function(timeoutMs) {
-  const element = this;
-  const visible = () => element.isConnected && element.checkVisibility({
-    checkOpacity: true, checkVisibilityCSS: true, contentVisibilityAuto: true
-  });
-  if (typeof element.checkVisibility !== 'function' || !visible()) return null;
-  return new Promise((resolve, reject) => {
-    const observer = new IntersectionObserver(([entry]) => {
-      clearTimeout(timer);
-      observer.disconnect();
-      const rect = entry.intersectionRect;
-      resolve(visible() && entry.isIntersecting && rect.width > 0 && rect.height > 0
-        ? { x: rect.x, y: rect.y, width: rect.width, height: rect.height }
-        : null);
-    }, { root: element.ownerDocument });
-    const timer = setTimeout(() => {
-      observer.disconnect();
-      reject(new Error('scroll-to visibility measurement timed out'));
-    }, timeoutMs);
-    observer.observe(element);
-  });
-}`;
-
-async function visibleRect(
-  cdp: CdpRunner,
-  address: NodeAddress,
-  deadline: number,
-): Promise<ViewportRect | null> {
-  const resolved = await sendToCdpTarget<{ object?: { objectId?: string } }>(
-    cdp,
-    address.target,
-    "DOM.resolveNode",
-    { backendNodeId: address.backendNodeId },
-  );
-  if (!resolved.object?.objectId) throw new Error("scroll-to could not resolve the target element");
-  const reply = await sendToCdpTarget<{
-    result?: { value?: ViewportRect | null };
-    exceptionDetails?: { text?: string; exception?: { description?: string } };
-  }>(cdp, address.target, "Runtime.callFunctionOn", {
-    objectId: resolved.object.objectId,
-    functionDeclaration: VISIBLE_RECT,
-    // Bound this read even if a background document stops rendering. Its
-    // observer always disconnects; cancellation cannot leave a live observer.
-    arguments: [{ value: Math.max(1, Math.min(1_000, deadline - Date.now())) }],
-    awaitPromise: true,
-    returnByValue: true,
-  });
-  if (reply.exceptionDetails) {
-    const details = reply.exceptionDetails;
-    throw new Error(details.exception?.description ?? details.text ?? "visibility script failed");
-  }
-  const rect = reply.result?.value;
-  if (rect === null) return null;
-  if (
-    !rect ||
-    ![rect.x, rect.y, rect.width, rect.height].every(Number.isFinite) ||
-    rect.width <= 0 ||
-    rect.height <= 0
-  ) {
-    throw new Error("scroll-to visibility measurement returned invalid bounds");
-  }
-  return rect;
-}
-
-async function projectRect(
-  context: GeometryContext,
-  address: NodeAddress,
-  rect: ViewportRect,
-): Promise<Region> {
-  let region: Region = [rectPolygon({ x: rect.x, y: rect.y, w: rect.width, h: rect.height })];
-  if (!address.frameId) return region;
-  const frame = await context.frame(address.frameId);
-  if (!frame || cdpTargetKey(frame.target) !== cdpTargetKey(address.target)) {
-    throw new Error("scroll-to frame no longer belongs to its target");
-  }
-  const parent = frame.parentFrameId ? await context.frame(frame.parentFrameId) : undefined;
-  if (parent && cdpTargetKey(parent.target) === cdpTargetKey(frame.target)) {
-    // DOM rectangles are document-local. Same-target iframe quads are already
-    // target-local, so cross this one boundary before the target projection.
-    const viewport = await context.viewport(frame.target);
-    if (frame.ownerBackendNodeId === undefined || !viewport) {
-      throw new Error("scroll-to could not resolve the frame viewport");
-    }
-    const local = await context.snapshotProjection(address, frame.ownerBackendNodeId, [], viewport);
-    if (local.status !== "available") throw new Error("scroll-to could not project the frame");
-    region = projectRegionToViewport(region, local.projection.geometry);
-  }
-  const projection = await context.targetProjection(frame.frameId);
-  if (!projection) throw new Error("scroll-to could not project the target viewport");
-  return projectRegionToViewport(region, projection);
-}
-
-/** Only scroll-to needs renderer-clipped bounds; other interaction geometry is unchanged. */
-export async function scrollVisibleBounds(
-  cdp: CdpRunner,
-  tabId: number,
-  address: NodeAddress,
-  deadline: number,
-): Promise<ViewportRect | null> {
-  const context = new GeometryContext(cdp, tabId);
-  const rect = await visibleRect(cdp, address, deadline);
-  if (!rect) return null;
-  let region = await projectRect(context, address, rect);
-  if (address.frameId) {
-    const ancestry = await context.ancestry(address.frameId);
-    if (!ancestry) throw new Error("scroll-to could not resolve the frame ancestry");
-    for (const child of ancestry) {
-      const parent = child.parentFrameId ? await context.frame(child.parentFrameId) : undefined;
-      if (!parent || child.ownerBackendNodeId === undefined) {
-        throw new Error("scroll-to could not resolve the frame owner");
-      }
-      const owner = {
-        target: parent.target,
-        frameId: parent.frameId,
-        backendNodeId: child.ownerBackendNodeId,
-      };
-      // A visible child document can still have a hidden or clipped iframe.
-      const ownerRect = await visibleRect(cdp, owner, deadline);
-      if (!ownerRect) return null;
-      const clips = await projectRect(context, owner, ownerRect);
-      region = region.flatMap((polygon) => clips.map((clip) => clipPolygon(polygon, clip)));
-    }
-  }
-  return regionBounds(region);
-}

apps/extension/src/tools/scroll.ts

@@ -1,137 +0,0 @@
-import { ChromiumCdp } from "@/browser-driver/chromium-cdp";
-import { type CdpTarget, cdpTargetKey } from "@/browser-driver/frame-graph";
-import type { SessionManager } from "@/session-manager/manager";
-import type { RpcError, ScrollToParams, ScrollToResult } from "@/transport/types";
-import { attachDialogs, markDialogCursor } from "./dialogs";
-import { cdpError, rpcError } from "./errors";
-import { scrollElementAndFramesIntoView } from "./frame-geometry";
-import { resolveBackendNode } from "./interaction";
-import { scrollVisibleBounds } from "./scroll-visibility";
-import {
-  type CdpRunner,
-  type ChromeTabsApi,
-  chromeTabsApi,
-  enforceAgentWindow,
-  isRpcError,
-  lookupSession,
-  resolveTargetTab,
-  sendToCdpTarget,
-} from "./shared";
-
-export interface ScrollToDeps {
-  cdp: CdpRunner;
-  tabsApi: ChromeTabsApi;
-  signal?: AbortSignal;
-}
-
-let defaultDeps: { cdp: ChromiumCdp; tabsApi: ChromeTabsApi } | null = null;
-function getDefaultDeps(): { cdp: ChromiumCdp; tabsApi: ChromeTabsApi } {
-  if (!defaultDeps) defaultDeps = { cdp: new ChromiumCdp(), tabsApi: chromeTabsApi };
-  return defaultDeps;
-}
-
-export async function handleScrollTo(
-  manager: SessionManager,
-  params: ScrollToParams,
-  deps: ScrollToDeps = getDefaultDeps(),
-): Promise<ScrollToResult | RpcError> {
-  const ctxOrErr = lookupSession(manager, params, "scroll-to");
-  if (isRpcError(ctxOrErr)) return ctxOrErr;
-  const ctx = ctxOrErr;
-  const timeout = params.timeout_ms ?? 30_000;
-  if (!Number.isInteger(timeout) || timeout <= 0) {
-    return { code: "invalid_params", message: "timeout_ms must be a positive integer" };
-  }
-  const deadline = Date.now() + timeout;
-  const checkActive = () => {
-    if (deps.signal?.aborted) throw new DOMException("scroll-to aborted", "AbortError");
-    if (Date.now() >= deadline) throw new DOMException("scroll-to timed out", "TimeoutError");
-  };
-  const objectGroup = `bsk-scroll-${crypto.randomUUID()}`;
-  const objectTargets = new Map<string, CdpTarget>();
-  const send = async <T>(target: CdpTarget, method: string, args?: object): Promise<T> => {
-    checkActive();
-    // Also own objects allocated by the shared scroll fallback. Record the
-    // target before awaiting so cancellation cannot skip their cleanup.
-    if (method === "DOM.resolveNode") objectTargets.set(cdpTargetKey(target), target);
-    const result = await sendToCdpTarget<T>(
-      deps.cdp,
-      target,
-      method,
-      method === "DOM.resolveNode" ? { ...args, objectGroup } : args,
-    );
-    checkActive();
-    return result;
-  };
-  let graph: ReturnType<NonNullable<CdpRunner["getFrameGraph"]>> | undefined;
-  const cdp: CdpRunner = {
-    send: (tabId, method, args) => send({ tabId }, method, args),
-    sendToTarget: send,
-    trackSessionTab: deps.cdp.trackSessionTab?.bind(deps.cdp),
-    getFrameGraph: deps.cdp.getFrameGraph
-      ? async (tabId) => {
-          checkActive();
-          graph ??= deps.cdp.getFrameGraph!(tabId);
-          const result = await graph;
-          checkActive();
-          return result;
-        }
-      : undefined,
-  };
-  try {
-    checkActive();
-    const target = await resolveTargetTab(manager, ctx, params.tab_id, deps.tabsApi);
-    checkActive();
-    if (isRpcError(target)) return target;
-    const denied = enforceAgentWindow(ctx, target, "scroll-to");
-    if (denied) return denied;
-    const dialogCursor = markDialogCursor(deps.cdp, target.tabId);
-    const node = await resolveBackendNode(cdp, ctx, target, params, "scroll-to");
-    checkActive();
-    if (isRpcError(node)) return node;
-    deps.cdp.trackSessionTab?.(ctx.sessionId, target.tabId);
-    const scrollError = await scrollElementAndFramesIntoView(
-      cdp,
-      target.tabId,
-      node.cdpTarget,
-      node.backendNodeId,
-      node.frameId,
-    );
-    checkActive();
-    if (scrollError) return scrollError;
-    const bounds = await scrollVisibleBounds(
-      cdp,
-      target.tabId,
-      {
-        target: node.cdpTarget,
-        backendNodeId: node.backendNodeId,
-        frameId: node.frameId,
-      },
-      deadline,
-    );
-    checkActive();
-    if (!bounds)
-      return rpcError(
-        "permission_denied",
-        "element_not_visible",
-        "scroll-to target has no visible area",
-      );
-    return attachDialogs(deps.cdp, target.tabId, dialogCursor, {
-      tab_id: target.tabId,
-      used_ref: node.usedRef,
-      used_selector: node.usedSelector,
-      ...bounds,
-    });
-  } catch (error) {
-    if (deps.signal?.aborted) return { code: "cancelled", message: "scroll-to aborted" };
-    if (Date.now() >= deadline) return { code: "timeout", message: "scroll-to timed out" };
-    return cdpError(error);
-  } finally {
-    // Cleanup bypasses the cancellation guard and cannot replace the result.
-    for (const target of objectTargets.values()) {
-      await sendToCdpTarget(deps.cdp, target, "Runtime.releaseObjectGroup", { objectGroup }).catch(
-        () => {},
-      );
-    }
-  }
-}

apps/extension/src/tools/shared.ts

@@ -55,7 +55,6 @@ export interface CdpRunner {
   sendToTarget?<T = unknown>(target: CdpTarget, method: string, params?: object): Promise<T>;
   detach?(tabId: number): Promise<void>;
   getFrameGraph?(tabId: number): Promise<CdpFrameGraph>;
-  getAttachmentId?(tabId: number): string | undefined;
   ensureAttachedToUrl?(tabId: number, expectedUrl: string | undefined): Promise<void>;
   trackSessionTab?(sessionId: string, tabId: number): void;
   releaseSessionTab?(sessionId: string, tabId: number): Promise<void>;

apps/extension/src/tools/snapshot-ref.ts

@@ -3,7 +3,7 @@
 // `ref_not_found` errors for hard-failure tool paths.
 
 import type { SessionContext } from "@/session-manager/manager";
-import { normaliseRef, type RefEntry } from "@/session-manager/ref-store";
+import { normaliseRef } from "@/session-manager/ref-store";
 import type { RpcError } from "@/transport/types";
 import { rpcError } from "./errors";
 
@@ -14,22 +14,14 @@ export interface SnapshotRefLookup {
   cdpSessionId?: string;
 }
 
-/** Typed lookup never turns a visual anchor into a DOM operation target. */
-export function lookupRefTarget(
-  ctx: SessionContext,
-  refKey: string,
-  tabId: number,
-): RefEntry | null {
+function refEntryForTab(ctx: SessionContext, refKey: string, tabId: number) {
   const entry = ctx.refStore.resolveEntry(refKey);
-  if (!entry) return null;
-  const ownerTabId =
-    entry.kind === "visual-region" ? entry.candidate.document.target.tabId : entry.tabId;
-  return ownerTabId === tabId ? entry : null;
+  return entry?.tabId === tabId ? entry : null;
 }
 
 /**
  * Soft lookup: returns `null` when the ref is unknown or bound to a
- * different tab, or is a visual region. Used by paths that report `matched: false` instead of
+ * different tab. Used by paths that report `matched: false` instead of
  * emitting an RPC error (e.g. `tool.request_help`).
  */
 export function lookupSnapshotRef(
@@ -38,8 +30,8 @@ export function lookupSnapshotRef(
   tabId: number,
 ): SnapshotRefLookup | null {
   const refKey = normaliseRef(ref);
-  const entry = lookupRefTarget(ctx, refKey, tabId);
-  if (!entry || entry.kind !== "dom") return null;
+  const entry = refEntryForTab(ctx, refKey, tabId);
+  if (!entry) return null;
   return {
     backendNodeId: entry.backendNodeId,
     refKey,
@@ -58,13 +50,6 @@ export function resolveSnapshotRef(
   ref: string,
   tabId: number,
 ): SnapshotRefLookup | RpcError {
-  const entry = lookupRefTarget(ctx, ref, tabId);
-  if (entry?.kind === "visual-region")
-    return rpcError(
-      "unsupported",
-      "ref_kind_unsupported",
-      `ref ${ref} is a visual region, not a DOM operation target`,
-    );
   const looked = lookupSnapshotRef(ctx, ref, tabId);
   if (looked === null) {
     return rpcError(

apps/extension/src/tools/vom/__tests__/capture.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from "vitest";
 import { OVERLAY_HOST_MARKER_ATTR, OVERLAY_HOST_NAME } from "../../../lib/overlay-bridge";
-import { collectOverlayExcludedBackendIds, probeHoverSurfaces } from "../capture";
-import { captureObservationFacts, semanticCapture } from "../capture-coordinator";
+import type { CdpRunner } from "../../shared";
+import { captureViewModel, collectOverlayExcludedBackendIds, probeHoverSurfaces } from "../capture";
 
 // Minimal but format-accurate captureSnapshot reply: a body with one
 // fixed full-screen overlay div carrying a password input.
@@ -27,7 +27,6 @@ function fakeSnapshotReply() {
     strings: S,
     documents: [
       {
-        frameId: "root",
         nodes: {
           parentIndex: [-1, 0, 1, 2],
           nodeType: [1, 1, 1, 1],
@@ -75,7 +74,6 @@ function hoverTriggerSnapshotReply() {
     strings: S,
     documents: [
       {
-        frameId: "root",
         nodes: {
           parentIndex: [-1, 0, 1],
           nodeType: [1, 1, 1],
@@ -120,7 +118,6 @@ function twoHoverTriggerSnapshotReply() {
     strings: S,
     documents: [
       {
-        frameId: "root",
         nodes: {
           parentIndex: [-1, 0, 1, 1],
           nodeType: [1, 1, 1, 1],
@@ -174,7 +171,6 @@ function nestedHoverTriggerSnapshotReply() {
     strings: S,
     documents: [
       {
-        frameId: "root",
         nodes: {
           parentIndex: [-1, 0, 1, 2, 3],
           nodeType: [1, 1, 1, 1, 1],
@@ -215,11 +211,7 @@ function makeCdp(snapshot: unknown) {
       if (method === "DOMSnapshot.enable") return {};
       if (method === "DOMSnapshot.captureSnapshot") return snapshot;
       if (method === "Page.getLayoutMetrics") {
-        return {
-          visualViewport: { clientWidth: 1000 },
-          cssVisualViewport: { clientWidth: 1000 },
-          cssLayoutViewport: { clientWidth: 1000, clientHeight: 800, pageX: 0, pageY: 0 },
-        };
+        return { cssLayoutViewport: { clientWidth: 1000, clientHeight: 800, pageX: 0, pageY: 0 } };
       }
       if (method === "Runtime.evaluate") {
         return {
@@ -252,11 +244,13 @@ function makeCdp(snapshot: unknown) {
   };
 }
 
-describe("snapshot capture and hover", () => {
+describe("captureViewModel", () => {
   it("parses nodes, attrs, rects, paint order and styles", async () => {
-    const { nodes, viewport } = semanticCapture(
-      await captureObservationFacts(makeCdp(fakeSnapshotReply()), 4),
-    ).captured;
+    const { nodes, viewport, iframeNodes } = await captureViewModel(
+      makeCdp(fakeSnapshotReply()),
+      4,
+    );
+    expect(iframeNodes.size).toBe(0);
     expect(viewport).toEqual({ width: 1000, height: 800 });
     const div = nodes.find((n) => n.backendNodeId === 12);
     expect(div).toMatchObject({ tag: "div", position: "fixed", parentBackendNodeId: 11 });
@@ -268,11 +262,35 @@ describe("snapshot capture and hover", () => {
 
   it("never hovers the page while capturing", async () => {
     const cdp = makeCdp(fakeSnapshotReply());
-    semanticCapture(await captureObservationFacts(cdp, 4)).captured;
+    await captureViewModel(cdp, 4);
 
     expect(cdp.send).not.toHaveBeenCalledWith(4, "Input.dispatchMouseEvent", expect.anything());
   });
 
+  it("batch-enriches form controls without per-node object resolution", async () => {
+    const cdp = makeCdp(fakeSnapshotReply());
+    const result = await captureViewModel(cdp, 4);
+    const input = result.nodes.find((node) => node.backendNodeId === 13);
+
+    expect(input).toMatchObject({
+      formState: "filled",
+      formPlaceholder: "secret",
+      attrs: { type: "password" },
+    });
+    expect(input?.formValue).toBeUndefined();
+    expect(input?.formDefaultValue).toBeUndefined();
+    expect(cdp.send).toHaveBeenCalledWith(
+      4,
+      "Runtime.evaluate",
+      expect.objectContaining({
+        serializationOptions: expect.objectContaining({ serialization: "deep" }),
+      }),
+    );
+    expect(cdp.send).toHaveBeenCalledWith(4, "Runtime.releaseObjectGroup", expect.anything());
+    expect(cdp.send).not.toHaveBeenCalledWith(4, "DOM.resolveNode", expect.anything());
+    expect(cdp.send).not.toHaveBeenCalledWith(4, "Runtime.callFunctionOn", expect.anything());
+  });
+
   it("runs hover surface probes when explicitly enabled", async () => {
     let hoverStateCalls = 0;
     const cdp = {
@@ -281,8 +299,6 @@ describe("snapshot capture and hover", () => {
         if (method === "DOMSnapshot.captureSnapshot") return hoverTriggerSnapshotReply();
         if (method === "Page.getLayoutMetrics") {
           return {
-            visualViewport: { clientWidth: 1000 },
-            cssVisualViewport: { clientWidth: 1000 },
             cssLayoutViewport: { clientWidth: 1000, clientHeight: 800, pageX: 0, pageY: 0 },
           };
         }
@@ -314,7 +330,7 @@ describe("snapshot capture and hover", () => {
       }) as unknown as <T>(tabId: number, method: string, params?: object) => Promise<T>,
     };
 
-    const captured = semanticCapture(await captureObservationFacts(cdp, 4)).captured;
+    const captured = await captureViewModel(cdp, 4);
     const surfaceProbes = await probeHoverSurfaces(cdp, 4, captured.nodes);
 
     expect(surfaceProbes).toEqual([
@@ -346,8 +362,6 @@ describe("snapshot capture and hover", () => {
         if (method === "DOMSnapshot.captureSnapshot") return twoHoverTriggerSnapshotReply();
         if (method === "Page.getLayoutMetrics") {
           return {
-            visualViewport: { clientWidth: 1000 },
-            cssVisualViewport: { clientWidth: 1000 },
             cssLayoutViewport: { clientWidth: 1000, clientHeight: 800, pageX: 0, pageY: 0 },
           };
         }
@@ -376,7 +390,7 @@ describe("snapshot capture and hover", () => {
       }) as unknown as <T>(tabId: number, method: string, params?: object) => Promise<T>,
     };
 
-    const captured = semanticCapture(await captureObservationFacts(cdp, 4)).captured;
+    const captured = await captureViewModel(cdp, 4);
     const surfaceProbes = await probeHoverSurfaces(cdp, 4, captured.nodes);
 
     expect(surfaceProbes).toEqual([
@@ -396,8 +410,6 @@ describe("snapshot capture and hover", () => {
         if (method === "DOMSnapshot.captureSnapshot") return nestedHoverTriggerSnapshotReply();
         if (method === "Page.getLayoutMetrics") {
           return {
-            visualViewport: { clientWidth: 1000 },
-            cssVisualViewport: { clientWidth: 1000 },
             cssLayoutViewport: { clientWidth: 1000, clientHeight: 800, pageX: 0, pageY: 0 },
           };
         }
@@ -423,7 +435,7 @@ describe("snapshot capture and hover", () => {
       }) as unknown as <T>(tabId: number, method: string, params?: object) => Promise<T>,
     };
 
-    const captured = semanticCapture(await captureObservationFacts(cdp, 4)).captured;
+    const captured = await captureViewModel(cdp, 4);
     await probeHoverSurfaces(cdp, 4, captured.nodes);
 
     expect(hoverMoves).toBe(1);
@@ -455,7 +467,6 @@ describe("snapshot capture and hover", () => {
       strings: S,
       documents: [
         {
-          frameId: "root",
           nodes: {
             parentIndex: [-1, 0, 1, 0, 3, 4],
             nodeName: [i("html"), i("body"), i("div"), i(OVERLAY_HOST_NAME), i("div"), i("button")],
@@ -486,7 +497,7 @@ describe("snapshot capture and hover", () => {
       ],
     };
 
-    const { nodes } = semanticCapture(await captureObservationFacts(makeCdp(snapshot), 4)).captured;
+    const { nodes } = await captureViewModel(makeCdp(snapshot), 4);
     const ids = nodes.map((n) => n.backendNodeId);
     // Real page nodes survive.
     expect(ids).toContain(12);
@@ -517,7 +528,7 @@ describe("snapshot capture and hover", () => {
       strings: S,
       documents: [
         {
-          frameId: "root",
+          frameId: "main",
           nodes: {
             parentIndex: [-1, 0, 1, 0, 3, 4],
             nodeName: [i("html"), i("body"), i("div"), i(OVERLAY_HOST_NAME), i("div"), i("button")],
@@ -548,10 +559,12 @@ describe("snapshot capture and hover", () => {
       ],
     };
 
-    const { excludedBackendNodeIds } = semanticCapture(
-      await captureObservationFacts(makeCdp(snapshot), 4),
-    ).captured;
+    const { excludedBackendNodeIds, frameExcludedBackendNodeIds } = await captureViewModel(
+      makeCdp(snapshot),
+      4,
+    );
     expect(excludedBackendNodeIds).toEqual(new Set([13, 14, 15]));
+    expect(frameExcludedBackendNodeIds?.get("main")).toEqual(excludedBackendNodeIds);
   });
 
   it("excludes overlay host matched by tag name only", async () => {
@@ -571,7 +584,6 @@ describe("snapshot capture and hover", () => {
       strings: S,
       documents: [
         {
-          frameId: "root",
           nodes: {
             parentIndex: [-1, 0, 1],
             nodeName: [i("html"), i("body"), i(OVERLAY_HOST_NAME)],
@@ -594,9 +606,7 @@ describe("snapshot capture and hover", () => {
       ],
     };
 
-    const { nodes, excludedBackendNodeIds } = semanticCapture(
-      await captureObservationFacts(makeCdp(snapshot), 4),
-    ).captured;
+    const { nodes, excludedBackendNodeIds } = await captureViewModel(makeCdp(snapshot), 4);
     expect(nodes.map((n) => n.backendNodeId)).not.toContain(13);
     expect(excludedBackendNodeIds).toEqual(new Set([13]));
   });
@@ -619,7 +629,6 @@ describe("snapshot capture and hover", () => {
       strings: S,
       documents: [
         {
-          frameId: "root",
           nodes: {
             parentIndex: [-1, 0, 1],
             nodeName: [i("html"), i("body"), i("div")],
@@ -642,9 +651,7 @@ describe("snapshot capture and hover", () => {
       ],
     };
 
-    const { nodes, excludedBackendNodeIds } = semanticCapture(
-      await captureObservationFacts(makeCdp(snapshot), 4),
-    ).captured;
+    const { nodes, excludedBackendNodeIds } = await captureViewModel(makeCdp(snapshot), 4);
     expect(nodes.map((n) => n.backendNodeId)).not.toContain(13);
     expect(excludedBackendNodeIds).toEqual(new Set([13]));
   });
@@ -667,7 +674,6 @@ describe("snapshot capture and hover", () => {
       strings: S,
       documents: [
         {
-          frameId: "root",
           nodes: {
             parentIndex: [-1, 0, 1],
             nodeName: [i("html"), i("body"), i("div")],
@@ -690,7 +696,7 @@ describe("snapshot capture and hover", () => {
         },
       ],
     };
-    const { nodes } = semanticCapture(await captureObservationFacts(makeCdp(snapshot), 4)).captured;
+    const { nodes } = await captureViewModel(makeCdp(snapshot), 4);
     expect(nodes.find((n) => n.backendNodeId === 12)?.cursor).toBe("pointer");
     expect(nodes.find((n) => n.backendNodeId === 11)?.cursor).toBe("auto");
   });
@@ -702,7 +708,6 @@ describe("snapshot capture and hover", () => {
       strings: S,
       documents: [
         {
-          frameId: "root",
           nodes: {
             parentIndex: [-1, 0, 1, 1, 1],
             nodeName: [i("html"), i("body"), i("button"), i("button"), i("button")],
@@ -729,7 +734,7 @@ describe("snapshot capture and hover", () => {
       ],
     };
 
-    const { nodes } = semanticCapture(await captureObservationFacts(makeCdp(snapshot), 4)).captured;
+    const { nodes } = await captureViewModel(makeCdp(snapshot), 4);
 
     expect(nodes.find((node) => node.backendNodeId === 12)?.rendered).toBe(true);
     expect(nodes.find((node) => node.backendNodeId === 13)?.rendered).toBe(false);
@@ -743,28 +748,25 @@ describe("snapshot capture and hover", () => {
         if (method === "DOMSnapshot.captureSnapshot") return fakeSnapshotReply();
         if (method === "Page.getLayoutMetrics") {
           return {
-            visualViewport: { clientWidth: 1000 },
-            cssVisualViewport: { clientWidth: 1000 },
             cssLayoutViewport: { clientWidth: 1000, clientHeight: 800, pageX: 0, pageY: 200 },
           };
         }
         throw new Error(method);
       }) as unknown as <T>(tabId: number, method: string, params?: object) => Promise<T>,
     };
-    const { nodes } = semanticCapture(await captureObservationFacts(cdp, 4)).captured;
+    const { nodes } = await captureViewModel(cdp, 4);
     const div = nodes.find((n) => n.backendNodeId === 12);
     expect(div?.localRect?.y).toBe(-200);
     expect(div?.rect).toMatchObject({ y: 0, h: 600 });
   });
 
-  it("normalizes raw snapshot bounds before viewport clipping", async () => {
+  it("keeps CSS snapshot bounds independent of legacy metrics ratio", async () => {
     const S = ["html", "body", "div", "position", "fixed", "static", "pointer-events", "auto"];
     const i = (s: string) => S.indexOf(s);
     const snapshot = {
       strings: S,
       documents: [
         {
-          frameId: "root",
           nodes: {
             parentIndex: [-1, 0, 1],
             nodeName: [i("html"), i("body"), i("div")],
@@ -792,8 +794,6 @@ describe("snapshot capture and hover", () => {
         if (method === "DOMSnapshot.captureSnapshot") return snapshot;
         if (method === "Page.getLayoutMetrics") {
           return {
-            visualViewport: { clientWidth: 2000 },
-            cssVisualViewport: { clientWidth: 1000 },
             cssLayoutViewport: { clientWidth: 1000, clientHeight: 800, pageX: 0, pageY: 0 },
             layoutViewport: { clientWidth: 2000, clientHeight: 1600 },
           };
@@ -801,7 +801,7 @@ describe("snapshot capture and hover", () => {
         throw new Error(method);
       }) as unknown as <T>(tabId: number, method: string, params?: object) => Promise<T>,
     };
-    const { nodes } = semanticCapture(await captureObservationFacts(cdp, 4)).captured;
+    const { nodes } = await captureViewModel(cdp, 4);
     expect(nodes.find((n) => n.backendNodeId === 12)?.rect).toEqual({
       x: 0,
       y: 0,
@@ -811,8 +811,8 @@ describe("snapshot capture and hover", () => {
     expect(nodes.find((n) => n.backendNodeId === 12)?.localRect).toEqual({
       x: 0,
       y: 0,
-      w: 1000,
-      h: 800,
+      w: 2000,
+      h: 1600,
     });
   });
 
@@ -837,7 +837,6 @@ describe("snapshot capture and hover", () => {
       strings: S,
       documents: [
         {
-          frameId: "root",
           scrollOffsetX: 0,
           scrollOffsetY: 0,
           nodes: {
@@ -870,15 +869,13 @@ describe("snapshot capture and hover", () => {
         if (method === "DOMSnapshot.captureSnapshot") return snapshot;
         if (method === "Page.getLayoutMetrics") {
           return {
-            visualViewport: { clientWidth: 1000 },
-            cssVisualViewport: { clientWidth: 1000 },
             cssLayoutViewport: { clientWidth: 1000, clientHeight: 800, pageX: 0, pageY: 0 },
           };
         }
         throw new Error(method);
       }) as unknown as <T>(tabId: number, method: string, params?: object) => Promise<T>,
     };
-    const { nodes } = semanticCapture(await captureObservationFacts(cdp, 4)).captured;
+    const { nodes } = await captureViewModel(cdp, 4);
     const btn = nodes.find((n) => n.backendNodeId === 12);
     expect(btn?.textContent).toBe("登录");
     const link = nodes.find((n) => n.backendNodeId === 14);
@@ -888,7 +885,7 @@ describe("snapshot capture and hover", () => {
     expect(body?.textContent).toBeUndefined();
   });
 
-  it("retains explicit iframe document ownership and projected nodes", async () => {
+  it("parses iframe sub-documents and returns iframeNodes keyed by iframe backendNodeId", async () => {
     const S = [
       "html",
       "body",
@@ -962,8 +959,6 @@ describe("snapshot capture and hover", () => {
         if (method === "DOMSnapshot.captureSnapshot") return snapshot;
         if (method === "Page.getLayoutMetrics") {
           return {
-            visualViewport: { clientWidth: 1000 },
-            cssVisualViewport: { clientWidth: 1000 },
             cssLayoutViewport: { clientWidth: 1000, clientHeight: 800, pageX: 0, pageY: 0 },
           };
         }
@@ -976,21 +971,30 @@ describe("snapshot capture and hover", () => {
         throw new Error(method);
       }) as unknown as <T>(tabId: number, method: string, params?: object) => Promise<T>,
     };
-    const facts = await captureObservationFacts(cdp, 4);
-    const root = facts.documents.find((doc) => doc.frame.frameId === "main-frame")!;
-    const child = facts.documents.find((doc) => doc.frame.frameId === "child-frame")!;
-    expect(facts.documents).toHaveLength(2);
-    expect(root.domNodes.find((n) => n.backendNodeId === 13)?.tag).toBe("iframe");
-    const subNodes = child.domNodes;
+    const {
+      nodes,
+      iframeNodes,
+      frameNodes,
+      frameOwnerBackendNodeIds,
+      frameParentIds,
+      rootFrameId,
+    } = await captureViewModel(cdp, 4);
+    // Main frame has 4 nodes; iframe is included
+    expect(nodes.find((n) => n.backendNodeId === 13)?.tag).toBe("iframe");
+    // iframeNodes keyed by the <iframe> element's backendNodeId=13
+    expect(iframeNodes.size).toBe(1);
+    expect(iframeNodes.has(13)).toBe(true);
+    const subNodes = iframeNodes.get(13)!;
     const input = subNodes.find((n) => n.backendNodeId === 101);
     expect(input?.tag).toBe("input");
     expect(input?.attrs.type).toBe("text");
     expect(input?.ownerFrameBackendNodeId).toBe(13);
     expect(input?.localRect).toEqual({ x: 0, y: 0, w: 200, h: 40 });
     expect(input?.rect).toEqual({ x: 100, y: 300, w: 200, h: 40 });
-    expect(facts.rootFrameId).toBe("main-frame");
-    expect(child.frame.ownerBackendNodeId).toBe(13);
-    expect(child.frame.parentFrameId).toBe("main-frame");
+    expect(rootFrameId).toBe("main-frame");
+    expect(frameNodes?.get("child-frame")).toBe(subNodes);
+    expect(frameOwnerBackendNodeIds?.get("child-frame")).toBe(13);
+    expect(frameParentIds?.get("child-frame")).toBe("main-frame");
   });
 
   it("projects iframe documents independently of owner snapshot geometry", async () => {
@@ -1011,7 +1015,6 @@ describe("snapshot capture and hover", () => {
       strings: S,
       documents: [
         {
-          frameId: "root",
           scrollOffsetX: 0,
           scrollOffsetY: 0,
           nodes: {
@@ -1029,7 +1032,6 @@ describe("snapshot capture and hover", () => {
           },
         },
         {
-          frameId: "child",
           scrollOffsetX: 0,
           scrollOffsetY: 0,
           nodes: {
@@ -1053,8 +1055,6 @@ describe("snapshot capture and hover", () => {
         if (method === "DOMSnapshot.captureSnapshot") return snapshot;
         if (method === "Page.getLayoutMetrics") {
           return {
-            visualViewport: { clientWidth: 1000 },
-            cssVisualViewport: { clientWidth: 1000 },
             cssLayoutViewport: { clientWidth: 1000, clientHeight: 800, pageX: 0, pageY: 0 },
           };
         }
@@ -1068,10 +1068,8 @@ describe("snapshot capture and hover", () => {
       }) as unknown as <T>(tabId: number, method: string, params?: object) => Promise<T>,
     };
 
-    const { documents } = await captureObservationFacts(cdp, 4);
-    const input = documents
-      .find((doc) => doc.frame.frameId === "child")
-      ?.domNodes?.find((n) => n.backendNodeId === 101);
+    const { iframeNodes } = await captureViewModel(cdp, 4);
+    const input = iframeNodes.get(13)?.find((n) => n.backendNodeId === 101);
 
     expect(input?.localRect).toEqual({ x: 20, y: 20, w: 120, h: 60 });
     expect(input?.rect).toEqual({ x: 120, y: 320, w: 120, h: 60 });
@@ -1095,7 +1093,6 @@ describe("snapshot capture and hover", () => {
       strings: S,
       documents: [
         {
-          frameId: "root",
           nodes: {
             parentIndex: [-1, 0, 1],
             nodeName: [i("html"), i("body"), i("iframe")],
@@ -1117,9 +1114,6 @@ describe("snapshot capture and hover", () => {
           },
         },
         {
-          scrollOffsetX: 0,
-          scrollOffsetY: 0,
-          frameId: "child",
           nodes: {
             parentIndex: [-1, 0, 1],
             nodeName: [i("html"), i("body"), i("iframe")],
@@ -1141,9 +1135,6 @@ describe("snapshot capture and hover", () => {
           },
         },
         {
-          scrollOffsetX: 0,
-          scrollOffsetY: 0,
-          frameId: "nested",
           nodes: {
             parentIndex: [-1, 0],
             nodeName: [i("body"), i("input")],
@@ -1170,8 +1161,6 @@ describe("snapshot capture and hover", () => {
           if (method === "DOMSnapshot.captureSnapshot") return snapshot;
           if (method === "Page.getLayoutMetrics") {
             return {
-              visualViewport: { clientWidth: 1000 },
-              cssVisualViewport: { clientWidth: 1000 },
               cssLayoutViewport: { clientWidth: 1000, clientHeight: 800, pageX: 0, pageY: 0 },
             };
           }
@@ -1201,13 +1190,9 @@ describe("snapshot capture and hover", () => {
       ) as unknown as <T>(tabId: number, method: string, params?: object) => Promise<T>,
     };
 
-    const { documents } = await captureObservationFacts(cdp, 4);
-    const nestedIframe = documents
-      .find((doc) => doc.frame.frameId === "child")
-      ?.domNodes?.find((n) => n.backendNodeId === 23);
-    const input = documents
-      .find((doc) => doc.frame.frameId === "nested")
-      ?.domNodes?.find((n) => n.backendNodeId === 31);
+    const { iframeNodes } = await captureViewModel(cdp, 4);
+    const nestedIframe = iframeNodes.get(13)?.find((n) => n.backendNodeId === 23);
+    const input = iframeNodes.get(23)?.find((n) => n.backendNodeId === 31);
 
     expect(nestedIframe?.localRect).toEqual({ x: 5, y: 6, w: 100, h: 80 });
     expect(nestedIframe?.rect).toEqual({ x: 15, y: 26, w: 100, h: 80 });
@@ -1223,7 +1208,6 @@ describe("snapshot capture and hover", () => {
       strings: S,
       documents: [
         {
-          frameId: "root",
           nodes: {
             parentIndex: [-1, 0, 1],
             nodeName: [i("html"), i("body"), i("div")],
@@ -1251,8 +1235,6 @@ describe("snapshot capture and hover", () => {
         if (method === "DOMSnapshot.captureSnapshot") return snapshot;
         if (method === "Page.getLayoutMetrics") {
           return {
-            visualViewport: { clientWidth: 2000 },
-            cssVisualViewport: { clientWidth: 1000 },
             cssLayoutViewport: { clientWidth: 1000, clientHeight: 800, pageX: 0, pageY: 100 },
             layoutViewport: { clientWidth: 2000, clientHeight: 1600 },
           };
@@ -1260,8 +1242,8 @@ describe("snapshot capture and hover", () => {
         throw new Error(method);
       }) as unknown as <T>(tabId: number, method: string, params?: object) => Promise<T>,
     };
-    const { nodes } = semanticCapture(await captureObservationFacts(cdp, 4)).captured;
-    expect(nodes.find((n) => n.backendNodeId === 12)?.rect?.y).toBe(400 / 2 - 100);
+    const { nodes } = await captureViewModel(cdp, 4);
+    expect(nodes.find((n) => n.backendNodeId === 12)?.rect?.y).toBe(400 - 100);
   });
 
   it("collectOverlayExcludedBackendIds walks the pierced overlay host subtree", async () => {
@@ -1286,3 +1268,194 @@ describe("snapshot capture and hover", () => {
     expect(excluded).toEqual(new Set([200, 201, 202]));
   });
 });
+
+// Six sibling frames and one nested frame exercise scheduling through the real capture entry.
+function siblingCaptureFixture(
+  beforeReply: (method: string, params: Record<string, unknown>) => Promise<void> = async () => {},
+) {
+  const document = (id: number, owners: number[], childIndexes: number[]) => ({
+    frameId: `frame-${id}`,
+    nodes: {
+      parentIndex: [-1, ...owners.map(() => 0)],
+      nodeName: [0, ...owners.map(() => 1)],
+      backendNodeId: [1000 + id, ...owners],
+      attributes: [[], ...owners.map(() => [])],
+      contentDocumentIndex: { index: owners.map((_, i) => i + 1), value: childIndexes },
+    },
+    layout: {
+      nodeIndex: [0, ...owners.map((_, i) => i + 1)],
+      bounds: [[0, 0, 200, 100], ...owners.map(() => [0, 0, 200, 100])],
+    },
+  });
+  const snapshot = {
+    strings: ["body", "iframe"],
+    documents: [
+      document(0, [100, 101, 102, 103, 104, 105], [1, 2, 3, 4, 5, 6]),
+      document(1, [200], [7]),
+      ...Array.from({ length: 6 }, (_, i) => document(i + 2, [], [])),
+    ],
+  };
+  let active = 0;
+  let peak = 0;
+  const send = vi.fn(async (_tabId: number, method: string, params: object = {}) => {
+    const args = params as Record<string, unknown>;
+    active++;
+    peak = Math.max(peak, active);
+    try {
+      await beforeReply(method, args);
+      if (method === "DOMSnapshot.captureSnapshot") return snapshot;
+      if (method === "Page.getLayoutMetrics")
+        return { cssLayoutViewport: { clientWidth: 1000, clientHeight: 800 } };
+      if (method === "DOM.getBoxModel")
+        return { model: { content: [0, 0, 200, 0, 200, 100, 0, 100] } };
+      if (method === "DOM.resolveNode") return { object: { objectId: String(args.backendNodeId) } };
+      if (method === "Runtime.callFunctionOn")
+        return { result: { value: { width: 200, height: 100 } } };
+      return {};
+    } finally {
+      active--;
+    }
+  });
+  return {
+    cdp: { send: send as CdpRunner["send"] },
+    send,
+    peak: () => peak,
+    active: () => active,
+    measured: () =>
+      send.mock.calls
+        .filter(([, method]) => method === "DOM.getBoxModel")
+        .map(([, , params]) => (params as { backendNodeId: number }).backendNodeId),
+  };
+}
+
+describe("sibling frame measurement scheduling", () => {
+  it("batches same-target owner sizes without changing projected results", async () => {
+    const fixture = siblingCaptureFixture();
+    const original = fixture.cdp.send;
+    const methods: string[] = [];
+    fixture.cdp.send = async (tabId, method, params) => {
+      methods.push(method);
+      if (method === "Runtime.evaluate")
+        return {
+          result: {
+            deepSerializedValue: {
+              type: "array",
+              value: [100, 101, 102, 103, 104, 105, 200].map((backendNodeId) => ({
+                type: "array",
+                value: [
+                  { type: "node", value: { backendNodeId } },
+                  { type: "string", value: JSON.stringify({ width: 200, height: 100 }) },
+                ],
+              })),
+            },
+          },
+        } as never;
+      return original(tabId, method, params);
+    };
+    const captured = await captureViewModel(fixture.cdp, 4);
+    expect(captured.frameGeometryIssues).toEqual([]);
+    expect([...captured.iframeNodes.keys()]).toEqual([100, 200, 101, 102, 103, 104, 105]);
+    expect(captured.iframeNodes.get(200)?.[0].rect).toEqual({ x: 0, y: 0, w: 200, h: 100 });
+    expect(methods.filter((method) => method === "DOM.getBoxModel")).toHaveLength(7);
+    expect(methods.filter((method) => method === "Runtime.evaluate")).toHaveLength(1);
+    expect(methods.filter((method) => method === "Runtime.releaseObjectGroup")).toHaveLength(1);
+    expect(methods).not.toContain("DOM.resolveNode");
+    expect(methods).not.toContain("Runtime.callFunctionOn");
+  });
+
+  it("bounds concurrent reads, fills free slots and preserves depth-first output despite reordered replies", async () => {
+    const pending = new Map<number, () => void>();
+    const fixture = siblingCaptureFixture(async (method, params) => {
+      if (method === "DOM.getBoxModel" && Number(params.backendNodeId) < 200)
+        await new Promise<void>((resolve) => pending.set(Number(params.backendNodeId), resolve));
+    });
+    const capture = captureViewModel(fixture.cdp, 4);
+    await vi.waitFor(() => expect(pending.size).toBe(4));
+    expect(fixture.measured()).toEqual([100, 101, 102, 103]);
+    pending.get(103)!();
+    await vi.waitFor(() => expect(pending.has(104)).toBe(true));
+    pending.get(104)!();
+    await vi.waitFor(() => expect(pending.has(105)).toBe(true));
+    expect(fixture.measured()).not.toContain(200);
+    for (const id of [105, 102, 101, 100]) pending.get(id)!();
+    const captured = await capture;
+    expect(captured.frameGeometryIssues).toEqual([]);
+    expect(fixture.peak()).toBe(4);
+    expect(fixture.active()).toBe(0);
+    expect(fixture.measured()).toEqual([100, 101, 102, 103, 104, 105, 200]);
+    expect([...captured.iframeNodes.keys()]).toEqual([100, 200, 101, 102, 103, 104, 105]);
+    expect(captured.iframeNodes.get(200)?.[0].rect).toEqual({ x: 0, y: 0, w: 200, h: 100 });
+    for (const method of [
+      "DOM.getBoxModel",
+      "DOM.resolveNode",
+      "Runtime.callFunctionOn",
+      "Runtime.releaseObject",
+    ])
+      expect(fixture.send.mock.calls.filter(([, name]) => name === method)).toHaveLength(7);
+  });
+
+  it("does not measure descendants of a failed owner and retains sibling geometry and local nodes", async () => {
+    const fixture = siblingCaptureFixture(async (method, params) => {
+      if (method === "DOM.resolveNode" && params.backendNodeId === 100)
+        throw new Error("owner replaced");
+    });
+    const captured = await captureViewModel(fixture.cdp, 4);
+    expect(captured.frameGeometryIssues).toEqual([
+      {
+        status: "unavailable",
+        source: { target: { tabId: 4 }, frameId: "frame-1" },
+        ownerBackendNodeId: 100,
+      },
+      {
+        status: "blocked",
+        source: { target: { tabId: 4 }, frameId: "frame-7" },
+        cause: captured.frameGeometryIssues?.[0],
+      },
+    ]);
+    expect(fixture.measured()).not.toContain(200);
+    expect(captured.iframeNodes.get(200)?.[0]).toMatchObject({
+      tag: "body",
+      rect: null,
+      localRect: { x: 0, y: 0, w: 200, h: 100 },
+    });
+    expect(captured.iframeNodes.get(101)?.[0].rect).toEqual({ x: 0, y: 0, w: 200, h: 100 });
+    expect([...captured.iframeNodes.keys()]).toEqual([100, 200, 101, 102, 103, 104, 105]);
+  });
+
+  it("stops scheduling on cancellation and waits for resolved objects to be released", async () => {
+    const controller = new AbortController();
+    const resolutions = new Map<string, () => void>();
+    const releases = new Map<string, () => void>();
+    const fixture = siblingCaptureFixture(async (method, params) => {
+      if (method === "DOM.resolveNode")
+        await new Promise<void>((resolve) =>
+          resolutions.set(String(params.backendNodeId), resolve),
+        );
+      if (method === "Runtime.releaseObject")
+        await new Promise<void>((resolve) => releases.set(String(params.objectId), resolve));
+    });
+    let settled = false;
+    const capture = captureViewModel(fixture.cdp, 4, { signal: controller.signal });
+    const rejected = expect(capture).rejects.toMatchObject({ name: "AbortError" });
+    void capture.then(
+      () => {
+        settled = true;
+      },
+      () => {
+        settled = true;
+      },
+    );
+    await vi.waitFor(() => expect(resolutions.size).toBe(4));
+    controller.abort();
+    for (const resolve of resolutions.values()) resolve();
+    await vi.waitFor(() => expect(releases.size).toBe(4));
+    expect(settled).toBe(false);
+    expect(fixture.measured()).toEqual([100, 101, 102, 103]);
+    for (const release of releases.values()) release();
+    await rejected;
+    expect(fixture.active()).toBe(0);
+    expect(fixture.send.mock.calls.some(([, method]) => method === "Runtime.callFunctionOn")).toBe(
+      false,
+    );
+  });
+});

apps/extension/src/tools/vom/__tests__/document-identity.test.ts

@@ -1,151 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import type { CdpRunner } from "../../shared";
-import { verifyDocumentIdentity, verifyVisualTargetIdentity } from "../document-identity";
-import type { VisualCandidate } from "../visual-discovery";
-
-const candidate: VisualCandidate = {
-  document: {
-    attachmentId: "attached",
-    target: { tabId: 4, sessionId: "child-session" },
-    frameId: "child-frame",
-    documentElementBackendNodeId: 10,
-  },
-  backendNodeId: 20,
-  parentBackendNodeId: 10,
-  region: {
-    status: "available",
-    borderBox: { x: 0, y: 0, width: 10, height: 10 },
-    crop: { x: 0, y: 0, width: 10, height: 10 },
-  },
-};
-
-function fixture(
-  options: {
-    connected?: boolean;
-    sameDocument?: boolean;
-    root?: number;
-    missing?: boolean;
-    fail?: string;
-    abortAt?: string;
-    detachAt?: string;
-  } = {},
-) {
-  const controller = new AbortController();
-  let attachment = "attached";
-  const send = vi.fn(
-    async (_tab: number, _session: string, method: string, params: Record<string, unknown>) => {
-      if (options.abortAt === method) controller.abort();
-      if (options.detachAt === method) attachment = "new-attachment";
-      if (options.fail === method) throw new Error("CDP failed");
-      if (method === "Page.createIsolatedWorld") return { executionContextId: 7 };
-      if (method === "DOM.resolveNode")
-        return options.missing ? {} : { object: { objectId: "anchor" } };
-      if (method === "Runtime.evaluate" || method === "Runtime.callFunctionOn") {
-        let root: unknown = {};
-        if (method === "Runtime.callFunctionOn") {
-          const document = { documentElement: {} };
-          // Exercise the actual predicate, including connection and owner checks.
-          root = new Function("document", `return (${params.functionDeclaration}).call(this)`).call(
-            {
-              isConnected: options.connected ?? true,
-              ownerDocument: options.sameDocument === false ? {} : document,
-            },
-            document,
-          );
-        }
-        return {
-          result: {
-            deepSerializedValue:
-              root === null
-                ? { type: "null" }
-                : { type: "node", value: { backendNodeId: options.root ?? 10 } },
-          },
-        };
-      }
-      if (method === "Runtime.releaseObjectGroup") return {};
-      throw new Error(`unexpected ${method}`);
-    },
-  );
-  const cdp = {
-    send: vi.fn(),
-    sendToTarget: (
-      target: { tabId: number; sessionId?: string },
-      method: string,
-      params: Record<string, unknown>,
-    ) => send(target.tabId, target.sessionId!, method, params),
-    getAttachmentId: () => attachment,
-  } as unknown as CdpRunner;
-  return { cdp, send, controller };
-}
-
-describe("visual target identity", () => {
-  it("uses the exact frame and target with bounded local reads and releases objects", async () => {
-    const { cdp, send } = fixture();
-    expect(await verifyVisualTargetIdentity(cdp, candidate)).toBe("current");
-    expect(send.mock.calls.map((c) => c[2])).toEqual([
-      "Page.createIsolatedWorld",
-      "DOM.resolveNode",
-      "Runtime.callFunctionOn",
-      "Runtime.releaseObjectGroup",
-    ]);
-    expect(
-      send.mock.calls.every(([tab, session]) => tab === 4 && session === "child-session"),
-    ).toBe(true);
-    expect(send.mock.calls[0][3]).toMatchObject({ frameId: "child-frame" });
-    expect(send.mock.calls[1][3]).toMatchObject({ backendNodeId: 20, executionContextId: 7 });
-    expect(send.mock.calls[2][3]).toMatchObject({ objectId: "anchor" });
-    expect(send.mock.calls[3][3].objectGroup).toBe(send.mock.calls[1][3].objectGroup);
-  });
-
-  it.each([
-    { connected: false },
-    { sameDocument: false },
-    { root: 11 },
-  ])("rejects detached/adopted/replaced DOM: %j", async (options) => {
-    const { cdp } = fixture(options);
-    expect(await verifyVisualTargetIdentity(cdp, candidate)).toBe("changed");
-  });
-
-  it("does not add anchor reads to existing capture identity verification", async () => {
-    const { cdp, send } = fixture();
-    expect(await verifyDocumentIdentity(cdp, candidate.document)).toBe("current");
-    expect(send.mock.calls.map((c) => c[2])).toEqual([
-      "Page.createIsolatedWorld",
-      "Runtime.evaluate",
-      "Runtime.releaseObjectGroup",
-    ]);
-  });
-
-  it.each([
-    "Page.createIsolatedWorld",
-    "DOM.resolveNode",
-    "Runtime.callFunctionOn",
-  ])("fails closed and cleans up when %s fails", async (fail) => {
-    const { cdp, send } = fixture({ fail });
-    expect(await verifyVisualTargetIdentity(cdp, candidate)).toBe("unavailable");
-    expect(send.mock.calls.at(-1)?.[2]).toBe("Runtime.releaseObjectGroup");
-  });
-
-  it("rejects attachment changes before and during verification", async () => {
-    const first = fixture();
-    expect(
-      await verifyVisualTargetIdentity({ ...first.cdp, getAttachmentId: () => "other" }, candidate),
-    ).toBe("changed");
-    expect(first.send).not.toHaveBeenCalled();
-    const second = fixture({ detachAt: "Runtime.callFunctionOn" });
-    expect(await verifyVisualTargetIdentity(second.cdp, candidate)).toBe("changed");
-    const missing = fixture({ missing: true });
-    expect(await verifyVisualTargetIdentity(missing.cdp, candidate)).toBe("unavailable");
-  });
-
-  it.each([
-    "DOM.resolveNode",
-    "Runtime.callFunctionOn",
-  ])("propagates cancellation at %s after releasing the object group", async (abortAt) => {
-    const { cdp, send, controller } = fixture({ abortAt });
-    await expect(
-      verifyVisualTargetIdentity(cdp, candidate, controller.signal),
-    ).rejects.toMatchObject({ name: "AbortError" });
-    expect(send.mock.calls.at(-1)?.[2]).toBe("Runtime.releaseObjectGroup");
-  });
-});

apps/extension/src/tools/vom/__tests__/facts.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it, vi } from "vitest";
 import { OVERLAY_HOST_MARKER_ATTR } from "@/lib/overlay-bridge";
 import { createCaptureCheckpoint } from "../capture-abort";
 import { buildDocumentIndex, type DecodedNode } from "../facts";
-import { decodeDocument, REQUESTED_STYLES, VISUAL_SNAPSHOT } from "../snapshot";
+import { decodeDocument, REQUESTED_STYLES } from "../snapshot";
 
 function node(id: number, parent: number | null): DecodedNode {
   return {
@@ -77,7 +77,7 @@ describe("document facts", () => {
     );
     expect(nodes[0].attrs).toEqual({ "aria-hidden": "true", inert: "" });
     expect(nodes[0].layout).toEqual({
-      boundsSpace: "snapshot-document-layout",
+      boundsSpace: "snapshot-document-css",
       bounds: [10, 20, 120, 40],
       styles: {
         position: "static",
@@ -125,44 +125,3 @@ describe("document facts", () => {
     expect(reads).toBeLessThanOrEqual(356);
   });
 });
-
-describe("visual ancestry facts", () => {
-  it("distinguishes document roots, malformed roots, missing parents and cycles", async () => {
-    const input = [
-      { ...node(0, null), nodeType: 9 },
-      { ...node(1, 0), nodeType: 1 },
-      { ...node(2, 1), nodeType: 11 },
-      node(3, 2),
-      node(4, 99),
-      node(5, 6),
-      node(6, 5),
-      node(7, 5),
-      { ...node(8, null), nodeType: 1 },
-      { ...node(9, null), nodeType: 9, parentMissing: true },
-    ];
-    const index = await buildDocumentIndex(input.reverse(), undefined, true);
-    for (const id of [0, 1, 2, 3]) expect(index.ancestryComplete!.get(id)).toBe(true);
-    for (const id of [4, 5, 6, 7, 8, 9]) expect(index.ancestryComplete!.get(id)).toBe(false);
-  });
-
-  it("retains client offsets in their source units and does not disguise missing parent indices", async () => {
-    const decoded = await decodeDocument(
-      {
-        nodes: { backendNodeId: [1, 2], nodeType: [1, 1], nodeName: [0, 0], parentIndex: [99] },
-        layout: {
-          nodeIndex: [0],
-          bounds: [[745, 455.625, 97, 59.5]],
-          clientRects: [[5, 5, 68, 38]],
-        },
-      },
-      ["div"],
-      undefined,
-      VISUAL_SNAPSHOT,
-    );
-    expect(decoded.nodes[0].layout?.clientRect).toEqual([5, 5, 68, 38]);
-    expect(decoded.nodes[0].layout?.bounds).toEqual([745, 455.625, 97, 59.5]);
-    expect(decoded.nodes.every((node) => node.parentMissing)).toBe(true);
-    const index = await buildDocumentIndex(decoded.nodes, undefined, true);
-    expect([...index.ancestryComplete!.values()]).toEqual([false, false]);
-  });
-});

apps/extension/src/tools/vom/__tests__/frame-capture.test.ts

@@ -0,0 +1,271 @@
+import { describe, expect, it, vi } from "vitest";
+import { OVERLAY_HOST_MARKER_ATTR } from "@/lib/overlay-bridge";
+import type { CdpRunner } from "../../shared";
+import type { CapturedNode, CapturedViewModel } from "../capture";
+import { captureFrameData } from "../frame-capture";
+
+function ownerNode(backendNodeId: number, x: number): CapturedNode {
+  return {
+    backendNodeId,
+    parentBackendNodeId: 1,
+    frameId: "main",
+    ownerFrameBackendNodeId: null,
+    tag: "iframe",
+    attrs: {},
+    rect: { x, y: 100, w: 300, h: 200 },
+    localRect: { x, y: 100, w: 300, h: 200 },
+    paintOrder: 1,
+    position: "static",
+    pointerEvents: "auto",
+  };
+}
+
+function childSnapshot(frameId: string, backendNodeId: number) {
+  const strings = [frameId, "body", "button", "static", "auto", "pointer"];
+  return {
+    strings,
+    documents: [
+      {
+        frameId,
+        nodes: {
+          parentIndex: [-1, 0],
+          nodeName: [1, 2],
+          backendNodeId: [backendNodeId - 1, backendNodeId],
+          attributes: [[], []] as number[][],
+        },
+        layout: {
+          nodeIndex: [0, 1],
+          styles: [
+            [3, 4, 4],
+            [3, 4, 5],
+          ],
+          bounds: [
+            [0, 0, 300, 200],
+            [10, 20, 100, 40],
+          ],
+          paintOrders: [0, 1],
+        },
+      },
+    ],
+  };
+}
+
+describe("captureFrameData", () => {
+  it("retains nested owner failures when merging a captured OOPIF", async () => {
+    const owner = ownerNode(10, 50);
+    const captured: CapturedViewModel = {
+      nodes: [owner],
+      viewport: { width: 1000, height: 800 },
+      iframeNodes: new Map(),
+      frameNodes: new Map([["main", [owner]]]),
+      rootFrameId: "main",
+      excludedBackendNodeIds: new Set(),
+    };
+    const child = childSnapshot("child", 101);
+    const nested = childSnapshot("nested", 201);
+    const document = child.documents[0];
+    const snapshot = {
+      strings: child.strings,
+      documents: [
+        {
+          ...document,
+          nodes: { ...document.nodes, contentDocumentIndex: { index: [1], value: [1] } },
+        },
+        nested.documents[0],
+      ],
+    };
+    const reply = async (_target: unknown, method: string) => {
+      if (method === "Page.getLayoutMetrics")
+        return { cssLayoutViewport: { clientWidth: 300, clientHeight: 200 } };
+      if (method === "DOMSnapshot.captureSnapshot") return snapshot;
+      if (method === "DOM.getBoxModel")
+        return { model: { content: [50, 100, 350, 100, 350, 300, 50, 300] } };
+      if (method === "DOM.resolveNode") throw new Error("nested owner replaced");
+      return {};
+    };
+    const cdp: CdpRunner = {
+      send: vi.fn(reply) as CdpRunner["send"],
+      sendToTarget: vi.fn(reply) as NonNullable<CdpRunner["sendToTarget"]>,
+      getFrameGraph: vi.fn(async () => ({
+        rootFrameId: "main",
+        frames: [
+          { frameId: "main", target: { tabId: 4 } },
+          {
+            frameId: "child",
+            parentFrameId: "main",
+            ownerBackendNodeId: 10,
+            target: { tabId: 4, sessionId: "child-session" },
+          },
+        ],
+      })),
+    };
+    await captureFrameData(cdp, 4, captured);
+    expect(captured.frameGeometryIssues).toEqual([
+      {
+        status: "unavailable",
+        source: { target: { tabId: 4, sessionId: "child-session" }, frameId: "nested" },
+        ownerBackendNodeId: 101,
+      },
+    ]);
+    expect(captured.frameNodes?.get("nested")?.[1]).toMatchObject({
+      rect: null,
+      localRect: { x: 10, y: 20, w: 100, h: 40 },
+    });
+  });
+
+  it("captures and positions multiple OOPIF documents missing from the root snapshot", async () => {
+    const leftOwner = ownerNode(10, 50);
+    const rightOwner = ownerNode(20, 500);
+    const captured: CapturedViewModel = {
+      nodes: [leftOwner, rightOwner],
+      viewport: { width: 1000, height: 800 },
+      iframeNodes: new Map(),
+      frameNodes: new Map([["main", [leftOwner, rightOwner]]]),
+      frameOwnerBackendNodeIds: new Map(),
+      rootFrameId: "main",
+      excludedBackendNodeIds: new Set(),
+    };
+    const sendToTarget = vi.fn(async (target, method) => {
+      if (method === "Page.getLayoutMetrics") {
+        return { cssLayoutViewport: { clientWidth: 300, clientHeight: 200, pageX: 0, pageY: 0 } };
+      }
+      if (method === "DOMSnapshot.enable" || method === "Accessibility.enable") return {};
+      if (method === "DOMSnapshot.captureSnapshot") {
+        if (target.sessionId !== "left-session") return childSnapshot("right", 201);
+        const snapshot = childSnapshot("left", 101);
+        const marker = snapshot.strings.push(OVERLAY_HOST_MARKER_ATTR) - 1;
+        const nodes = snapshot.documents[0].nodes;
+        nodes.backendNodeId.push(201); // Same id as a real button in the other target.
+        nodes.parentIndex.push(0);
+        nodes.nodeName.push(2);
+        nodes.attributes.push([marker, -1]);
+        return snapshot;
+      }
+      if (method === "Accessibility.getFullAXTree") return { nodes: [] };
+      throw new Error(`unexpected ${method}`);
+    });
+    const cdp: CdpRunner = {
+      send: vi.fn(async (_tabId, method, params) => {
+        if (method === "Accessibility.enable") return {};
+        if (method === "Accessibility.getFullAXTree") return { nodes: [] };
+        if (method === "DOM.getBoxModel") {
+          const backendNodeId = (params as { backendNodeId?: number })?.backendNodeId;
+          const x = backendNodeId === 10 ? 50 : 500;
+          return { model: { content: [x, 100, x + 300, 100, x + 300, 300, x, 300] } };
+        }
+        if (method === "Page.getLayoutMetrics") {
+          return { cssLayoutViewport: { clientWidth: 1000, clientHeight: 800 } };
+        }
+        throw new Error(`unexpected root ${method}`);
+      }) as CdpRunner["send"],
+      sendToTarget: sendToTarget as unknown as NonNullable<CdpRunner["sendToTarget"]>,
+      getFrameGraph: vi.fn(async () => ({
+        rootFrameId: "main",
+        frames: [
+          { frameId: "main", target: { tabId: 4 } },
+          {
+            frameId: "left",
+            parentFrameId: "main",
+            ownerBackendNodeId: 10,
+            target: { tabId: 4, sessionId: "left-session" },
+          },
+          {
+            frameId: "right",
+            parentFrameId: "main",
+            ownerBackendNodeId: 20,
+            target: { tabId: 4, sessionId: "right-session" },
+          },
+        ],
+      })),
+    };
+
+    const trees = await captureFrameData(cdp, 4, captured);
+
+    expect(trees.find((tree) => tree.frameId === "left")?.excludedBackendNodeIds).toEqual(
+      new Set([201]),
+    );
+    expect(trees.find((tree) => tree.frameId === "right")?.excludedBackendNodeIds?.size).toBe(0);
+    expect(trees.map((tree) => tree.frameId)).toEqual(["main", "left", "right"]);
+    expect(
+      captured.frameNodes?.get("left")?.find((node) => node.backendNodeId === 101)?.rect,
+    ).toEqual({ x: 60, y: 120, w: 100, h: 40 });
+    expect(
+      captured.frameNodes?.get("right")?.find((node) => node.backendNodeId === 201)?.rect,
+    ).toEqual({ x: 510, y: 120, w: 100, h: 40 });
+    expect(captured.frameOwnerBackendNodeIds).toEqual(
+      new Map([
+        ["left", 10],
+        ["right", 20],
+      ]),
+    );
+    expect(captured.frameParentIds).toEqual(
+      new Map([
+        ["left", "main"],
+        ["right", "main"],
+      ]),
+    );
+  });
+
+  it("keeps OOPIF semantics when viewport projection is unavailable", async () => {
+    const owner = { ...ownerNode(10, 50), rect: null, localRect: null };
+    const captured: CapturedViewModel = {
+      nodes: [owner],
+      viewport: { width: 1000, height: 800 },
+      iframeNodes: new Map(),
+      frameNodes: new Map([["main", [owner]]]),
+      rootFrameId: "main",
+      excludedBackendNodeIds: new Set(),
+    };
+    const cdp: CdpRunner = {
+      send: vi.fn(async (_tabId, method) => {
+        if (method === "Accessibility.enable") return {};
+        if (method === "Accessibility.getFullAXTree") return { nodes: [] };
+        if (method === "DOM.getBoxModel") throw new Error("owner geometry unavailable");
+        if (method === "Page.getLayoutMetrics") {
+          return { cssLayoutViewport: { clientWidth: 1000, clientHeight: 800 } };
+        }
+        throw new Error(`unexpected root ${method}`);
+      }) as CdpRunner["send"],
+      sendToTarget: vi.fn(async (_target, method) => {
+        if (method === "Page.getLayoutMetrics") throw new Error("viewport unavailable");
+        if (method === "DOMSnapshot.enable" || method === "Accessibility.enable") return {};
+        if (method === "DOMSnapshot.captureSnapshot") return childSnapshot("child", 101);
+        if (method === "Accessibility.getFullAXTree") {
+          return {
+            nodes: [
+              {
+                nodeId: "button",
+                backendDOMNodeId: 101,
+                role: { type: "role", value: "button" },
+                name: { type: "computedString", value: "Continue" },
+              },
+            ],
+          };
+        }
+        throw new Error(`unexpected ${method}`);
+      }) as unknown as NonNullable<CdpRunner["sendToTarget"]>,
+      getFrameGraph: vi.fn(async () => ({
+        rootFrameId: "main",
+        frames: [
+          { frameId: "main", target: { tabId: 4 } },
+          {
+            frameId: "child",
+            parentFrameId: "main",
+            ownerBackendNodeId: 10,
+            target: { tabId: 4, sessionId: "child-session" },
+          },
+        ],
+      })),
+    };
+
+    const documents = await captureFrameData(cdp, 4, captured);
+    const childDocument = documents.find((document) => document.frameId === "child");
+
+    expect(childDocument?.axNodes).toEqual([
+      expect.objectContaining({ backendDOMNodeId: 101, frameId: "child" }),
+    ]);
+    expect(childDocument?.domNodes.find((node) => node.backendNodeId === 101)).toEqual(
+      expect.objectContaining({ rect: null, localRect: { x: 10, y: 20, w: 100, h: 40 } }),
+    );
+  });
+});

apps/extension/src/tools/vom/__tests__/frame-document.test.ts

@@ -1,12 +1,7 @@
-import { describe, expect, it, vi } from "vitest";
+import { describe, expect, it } from "vitest";
 import type { CdpFrameGraph } from "@/browser-driver/frame-graph";
-import type { CapturedNode } from "../capture";
-import {
-  buildFrameDocuments,
-  type FrameAxBatch,
-  type FrameDomInput,
-  type FrameOwnedAxNode,
-} from "../frame-document";
+import type { CapturedNode, CapturedViewModel } from "../capture";
+import { buildFrameDocuments, type FrameAxBatch, type FrameOwnedAxNode } from "../frame-document";
 
 function domNode(frameId: string, backendNodeId: number): CapturedNode {
   return {
@@ -22,11 +17,14 @@ function domNode(frameId: string, backendNodeId: number): CapturedNode {
   };
 }
 
-function captured(frameNodes: Map<string, CapturedNode[]>): FrameDomInput {
+function captured(frameNodes: Map<string, CapturedNode[]>): CapturedViewModel {
   return {
     nodes: frameNodes.get("main") ?? [],
+    viewport: { width: 800, height: 600 },
+    iframeNodes: new Map(),
     frameNodes,
     rootFrameId: "main",
+    excludedBackendNodeIds: new Set(),
   };
 }
 
@@ -159,12 +157,10 @@ describe("buildFrameDocuments", () => {
       ["child", [domNode("child", 9)]],
     ]);
     const capture = captured(frameNodes);
+    capture.frameOwnerBackendNodeIds = new Map([["child", 7]]);
+    capture.frameParentIds = new Map([["child", "left"]]);
     const frames = ["main", "left", "right", "child"].map((frameId) => ({
-      frame: {
-        frameId,
-        target: { tabId: 4 },
-        ...(frameId === "child" ? { parentFrameId: "left", ownerBackendNodeId: 7 } : {}),
-      },
+      frame: { frameId, target: { tabId: 4 } },
       nodes: [],
     }));
 
@@ -175,23 +171,6 @@ describe("buildFrameDocuments", () => {
       ownerBackendNodeId: 7,
     });
   });
-  it("rejects explicit AX frame ownership in a different target", async () => {
-    const frames = [
-      { frameId: "main", target: { tabId: 4 } },
-      { frameId: "remote", target: { tabId: 4, sessionId: "remote" } },
-    ];
-    const unresolved = vi.fn();
-    const documents = await buildFrameDocuments(
-      { rootFrameId: "main", frames },
-      [{ frame: frames[0], nodes: [{ nodeId: "wrong", frameId: "remote" }] }],
-      captured(new Map()),
-      undefined,
-      unresolved,
-    );
-    expect(documents.every((doc) => doc.axNodes.length === 0)).toBe(true);
-    expect(unresolved).toHaveBeenCalledOnce();
-  });
-
   it("resolves a reverse-ordered deep AX parent chain without recursion", async () => {
     const frame = { frameId: "main", target: { tabId: 4 } };
     const nodes: FrameOwnedAxNode[] = Array.from({ length: 10000 }, (_, i) => ({

apps/extension/src/tools/vom/__tests__/visual-dedup.test.ts

@@ -1,147 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { deduplicateVisualCandidates, MAX_VISUAL_DEDUP_KEYS } from "../visual-dedup";
-import type { VisualCandidate, VisualDiscoveryResult } from "../visual-discovery";
-
-function candidate(id: number, width = 100, parent = 1): VisualCandidate {
-  const crop = { x: 0, y: 0, width, height: 100 };
-  return {
-    document: {
-      attachmentId: "a",
-      target: { tabId: 1 },
-      frameId: "main",
-      documentElementBackendNodeId: 1,
-    },
-    backendNodeId: id,
-    parentBackendNodeId: parent,
-    region: { status: "available", borderBox: crop, crop },
-  };
-}
-function discovery(candidates: VisualCandidate[]): VisualDiscoveryResult {
-  return { candidates, complete: true, issues: [], captureIssues: [] };
-}
-
-describe("visual candidate deduplication", () => {
-  it("preserves small, unnamed and labelled candidates and their original evidence", async () => {
-    const small = { ...candidate(3, 1), label: '  A "label"\n😀' };
-    const large = candidate(2, 1000);
-    const input = discovery([small, large]);
-    Object.freeze(input.candidates);
-    Object.freeze(small);
-    Object.freeze(large);
-    for (let i = 0; i < 2; i++) {
-      const result = await deduplicateVisualCandidates(input);
-      expect(result.candidates).toEqual([small, large]);
-      expect(result.candidates[0]).toBe(small);
-      expect(result.candidates[1]).toBe(large);
-      expect(result).toMatchObject({
-        candidateCount: 2,
-        deduplicatedCount: 0,
-        dedupDegraded: false,
-      });
-    }
-  });
-
-  it("only deduplicates exact crops within the same full DOM identity and direct parent", async () => {
-    const base = candidate(20);
-    const variants = [
-      candidate(30, 100, 2),
-      { ...candidate(40), parentBackendNodeId: null },
-      ...["x", "y", "width", "height"].map((axis) => ({
-        ...base,
-        region: {
-          ...base.region,
-          crop: {
-            ...base.region.crop,
-            [axis]: base.region.crop[axis as keyof typeof base.region.crop] + 0.001,
-          },
-        },
-      })),
-      ...[
-        { frameId: "child" },
-        { target: { tabId: 2 } },
-        { target: { tabId: 1, sessionId: "remote" } },
-        { documentElementBackendNodeId: 9 },
-        { attachmentId: "b" },
-      ].map((identity) => ({ ...base, document: { ...base.document, ...identity } })),
-    ];
-    const duplicate = { ...candidate(10), label: "Not a new target" };
-    const result = await deduplicateVisualCandidates(discovery([base, ...variants, duplicate]));
-    expect(result.candidates).toEqual([base, ...variants]);
-    expect(result.candidates[0]).toBe(base);
-    expect(result.deduplicatedCount).toBe(1);
-  });
-
-  it.each([
-    50_001, 100_000,
-  ])("keeps all %s distinct candidates including the last tiny Canvas", async (count) => {
-    const input = Array.from({ length: count }, (_, i) => candidate(i + 1, 100, i + 1));
-    input[count - 1] = candidate(count, 1, count);
-    // A remembered key still deduplicates; an unremembered key passes through.
-    input.push({ ...input[0] }, { ...input[count - 1] });
-    const result = await deduplicateVisualCandidates(discovery(input));
-    expect(result.candidates).toEqual([...input.slice(0, count), input[count + 1]]);
-    expect(result.candidates[count - 1]).toBe(input[count - 1]);
-    expect(result).toMatchObject({
-      candidateCount: count + 2,
-      deduplicatedCount: 1,
-      dedupDegraded: true,
-    });
-  });
-
-  it("does not report degradation when every key fits", async () => {
-    const input = Array.from({ length: MAX_VISUAL_DEDUP_KEYS }, (_, i) => candidate(i, 1, i));
-    input.push({ ...input[0] });
-    const result = await deduplicateVisualCandidates(discovery(input));
-    expect(result.candidates).toHaveLength(MAX_VISUAL_DEDUP_KEYS);
-    expect(result.dedupDegraded).toBe(false);
-    expect(result.deduplicatedCount).toBe(1);
-  });
-
-  it("preserves upstream unknowns without counting issues as Canvas nodes", async () => {
-    const input: VisualDiscoveryResult = {
-      ...discovery([candidate(2)]),
-      complete: false,
-      issues: [{ reason: "geometry-unavailable", target: { tabId: 1 }, frameId: "missing" }],
-      captureIssues: [{ stage: "ax", reason: "capture-unavailable", target: { tabId: 1 } }],
-    };
-    const result = await deduplicateVisualCandidates(input);
-    expect(result.complete).toBe(false);
-    expect(result.candidateCount).toBe(1);
-    expect(result.issues).toBe(input.issues);
-    expect(result.captureIssues).toBe(input.captureIssues);
-    const absent = await deduplicateVisualCandidates({
-      ...input,
-      candidates: [],
-      issues: [{ reason: "visual-facts-not-collected" }],
-    });
-    expect(absent).toMatchObject({
-      complete: false,
-      candidateCount: 0,
-      issues: [{ reason: "visual-facts-not-collected" }],
-    });
-    expect(await deduplicateVisualCandidates(discovery([]))).toMatchObject({
-      complete: true,
-      candidates: [],
-      candidateCount: 0,
-      dedupDegraded: false,
-    });
-  });
-
-  it("drains cancellation through the shared checkpoint", async () => {
-    const controller = new AbortController();
-    controller.abort();
-    await expect(
-      deduplicateVisualCandidates(discovery([]), controller.signal),
-    ).rejects.toMatchObject({ name: "AbortError" });
-    const during = new AbortController();
-    const input = discovery(Array.from({ length: 100_000 }, (_, i) => candidate(i, 100, i)));
-    const timer = setTimeout(() => during.abort(), 0);
-    try {
-      await expect(deduplicateVisualCandidates(input, during.signal)).rejects.toMatchObject({
-        name: "AbortError",
-      });
-    } finally {
-      clearTimeout(timer);
-    }
-  });
-});

apps/extension/src/tools/vom/__tests__/visual-discovery.test.ts

@@ -1,502 +0,0 @@
-import { describe, expect, it } from "vitest";
-import type { CdpFrame } from "@/browser-driver/frame-graph";
-import { OVERLAY_HOST_MARKER_ATTR } from "@/lib/overlay-bridge";
-import type { GeometryProjection } from "../../geometry";
-import { buildDocumentIndex, type DocumentFacts, type ObservationFacts } from "../facts";
-import type { FrameOwnedAxNode } from "../frame-document";
-import { normalizeDocument } from "../normalize";
-import { VISUAL_SNAPSHOT, VISUAL_STYLES } from "../snapshot";
-import { discoverVisualCandidates } from "../visual-discovery";
-
-const defaults: Record<string, string> = {
-  position: "static",
-  "pointer-events": "auto",
-  cursor: "auto",
-  visibility: "visible",
-  opacity: "1",
-  display: "block",
-  "overflow-x": "visible",
-  "overflow-y": "visible",
-  transform: "none",
-  zoom: "1",
-  "clip-path": "none",
-  "mask-image": "none",
-  rotate: "none",
-  scale: "none",
-  perspective: "none",
-  clip: "auto",
-  contain: "none",
-  "overflow-clip-margin": "0px",
-};
-const projection: GeometryProjection = {
-  sourceClips: [],
-  edges: [],
-  topViewport: { width: 1000, height: 800 },
-};
-interface Spec {
-  id: number;
-  parent?: number;
-  tag?: string;
-  styles?: Record<string, string>;
-  bounds?: number[] | null;
-  client?: number[];
-  attrs?: Record<string, string>;
-}
-async function document(
-  nodes: Spec[],
-  options: {
-    frame?: CdpFrame;
-    projection?: GeometryProjection;
-    pageScale?: number;
-    scrollY?: number;
-    layoutScale?: number;
-  } = {},
-): Promise<DocumentFacts<FrameOwnedAxNode>> {
-  const frame = options.frame ?? { frameId: "main", target: { tabId: 1 } };
-  const strings: string[] = [];
-  const str = (value: string) => {
-    const index = strings.indexOf(value);
-    if (index >= 0) return index;
-    strings.push(value);
-    return strings.length - 1;
-  };
-  const input: Spec[] = [
-    { id: 0, tag: "#document", bounds: null },
-    { id: 1, parent: 0, tag: "html", bounds: [0, 0, 1000, 800] },
-    ...nodes,
-  ];
-  const layouts = input.filter((node) => node.bounds !== null);
-  const normalized = await normalizeDocument(
-    {
-      nodes: {
-        backendNodeId: input.map((n) => n.id),
-        nodeType: input.map((n) =>
-          n.tag === "#document" ? 9 : n.tag === "#document-fragment" ? 11 : 1,
-        ),
-        parentIndex: input.map((n) =>
-          n.parent === undefined ? -1 : input.findIndex((p) => p.id === n.parent),
-        ),
-        nodeName: input.map((n) => str(n.tag ?? "canvas")),
-        attributes: input.map((n) =>
-          Object.entries(n.attrs ?? {}).flatMap(([k, v]) => [str(k), str(v)]),
-        ),
-      },
-      layout: {
-        nodeIndex: layouts.map((n) => input.indexOf(n)),
-        bounds: layouts.map((n) => n.bounds ?? [10, 20, 120, 40]),
-        clientRects: layouts.map((n) => n.client ?? [0, 0, 1000, 800]),
-        styles: layouts.map((n) =>
-          VISUAL_STYLES.map((key) => str({ ...defaults, ...n.styles }[key])),
-        ),
-      },
-    },
-    strings,
-    {
-      frameId: frame.frameId,
-      ownerFrameBackendNodeId: frame.ownerBackendNodeId ?? null,
-      target: frame.target,
-      projection: {
-        status: "available",
-        projection: {
-          source: { target: frame.target, frameId: frame.frameId },
-          geometry: options.projection ?? projection,
-        },
-      },
-      coordinates: {
-        layoutUnitsPerCssPixel: options.layoutScale ?? 1,
-        scrollCss: { x: 0, y: options.scrollY ?? 0 },
-      },
-      pageScale: options.pageScale ?? 1,
-    },
-    undefined,
-    VISUAL_SNAPSHOT,
-  );
-  return {
-    frame,
-    identity: {
-      attachmentId: "attached",
-      target: frame.target,
-      frameId: frame.frameId,
-      documentElementBackendNodeId: 1,
-    },
-    index: normalized.index,
-    geometry: normalized.geometry,
-    domNodes: normalized.nodes,
-    axNodes: [],
-  };
-}
-function facts(
-  documents: DocumentFacts<FrameOwnedAxNode>[],
-  issues: ObservationFacts<FrameOwnedAxNode>["issues"] = [],
-): ObservationFacts<FrameOwnedAxNode> {
-  return {
-    visualFactsCollected: true,
-    rootFrameId: "main",
-    documents,
-    viewport: { width: 1000, height: 800 },
-    issues,
-    startedAt: 1,
-    finishedAt: 2,
-  };
-}
-
-describe("Canvas discovery", () => {
-  it("distinguishes visual facts not collected from complete empty discovery and honors cancellation", async () => {
-    const empty = facts([]);
-    expect(await discoverVisualCandidates(empty)).toMatchObject({
-      complete: true,
-      candidates: [],
-      issues: [],
-    });
-    expect(await discoverVisualCandidates({ ...empty, visualFactsCollected: false })).toMatchObject(
-      { complete: false, candidates: [], issues: [{ reason: "visual-facts-not-collected" }] },
-    );
-    const controller = new AbortController();
-    controller.abort();
-    await expect(
-      discoverVisualCandidates({ ...empty, visualFactsCollected: false }, controller.signal),
-    ).rejects.toMatchObject({ name: "AbortError" });
-  });
-
-  it("discovers Canvas and frame contents without corner radius facts", async () => {
-    const own = await document([{ id: 2, parent: 1, styles: {} }]);
-    expect(await discoverVisualCandidates(facts([own]))).toMatchObject({
-      candidates: [{ backendNodeId: 2 }],
-      complete: true,
-      issues: [],
-    });
-    const parent = await document([{ id: 2, parent: 1, tag: "iframe", styles: {} }]);
-    const child = await document([{ id: 3, parent: 1 }], {
-      frame: {
-        frameId: "child",
-        parentFrameId: "main",
-        ownerBackendNodeId: 2,
-        target: { tabId: 1 },
-      },
-    });
-    expect(await discoverVisualCandidates(facts([parent, child]))).toMatchObject({
-      candidates: [{ backendNodeId: 3 }],
-      complete: true,
-      issues: [],
-    });
-  });
-
-  it.each([
-    0.8, 1, 1.25, 2,
-  ])("combines layout-unit bounds with CSS client clips at scale %s", async (scale) => {
-    const doc = await document(
-      [
-        {
-          id: 2,
-          parent: 1,
-          tag: "div",
-          bounds: [100, 200, 64, 34].map((n) => n * scale),
-          client: [2, 2, 60, 30],
-          styles: { "overflow-x": "hidden", "overflow-y": "hidden" },
-        },
-        { id: 3, parent: 2, bounds: [102, 202, 120, 40].map((n) => n * scale) },
-      ],
-      { layoutScale: scale, scrollY: 75 },
-    );
-    const result = await discoverVisualCandidates(facts([doc]));
-    expect(result.issues).toEqual([]);
-    const expected = {
-      borderBox: { x: 102, y: 127, width: 120, height: 40 },
-      crop: { x: 102, y: 127, width: 60, height: 30 },
-    };
-    for (const box of ["borderBox", "crop"] as const)
-      for (const key of ["x", "y", "width", "height"] as const)
-        expect(result.candidates[0].region[box][key]).toBeCloseTo(expected[box][key], 8);
-  });
-
-  it("normalizes a zero-width ancestor origin before one-axis clipping", async () => {
-    const doc = await document(
-      [
-        {
-          id: 2,
-          parent: 1,
-          tag: "div",
-          bounds: [200, 400, 0, 60],
-          client: [0, 0, 0, 30],
-          styles: { "overflow-y": "hidden" },
-        },
-        { id: 3, parent: 2, bounds: [200, 400, 240, 80] },
-      ],
-      { layoutScale: 2, scrollY: 75 },
-    );
-    const result = await discoverVisualCandidates(facts([doc]));
-    expect(result.issues).toEqual([]);
-    expect(result.candidates[0].region.crop).toEqual({ x: 100, y: 125, width: 120, height: 30 });
-  });
-
-  it("keeps unnamed, semantic, aria-hidden, inert, pointer-none and visibility override Canvas", async () => {
-    const doc = await document([
-      { id: 2, parent: 1 },
-      { id: 3, parent: 1, attrs: { "aria-label": "Chart" } },
-      {
-        id: 4,
-        parent: 1,
-        attrs: { "aria-hidden": "true", inert: "" },
-        styles: { "pointer-events": "none" },
-      },
-      { id: 5, parent: 1, tag: "div", styles: { visibility: "hidden" } },
-      { id: 6, parent: 5, styles: { visibility: "visible" } },
-      { id: 7, parent: 1, attrs: { hidden: "" }, styles: { display: "block" } },
-    ]);
-    doc.axNodes.push({ nodeId: "canvas", backendDOMNodeId: 2 } as FrameOwnedAxNode);
-    const result = await discoverVisualCandidates(facts([doc]));
-    expect(result.candidates.map((c) => c.backendNodeId)).toEqual([2, 3, 4, 6, 7]);
-    expect(result.candidates[1].label).toBe("Chart");
-    expect(result.complete).toBe(true);
-  });
-
-  it("excludes CSS transparent subtrees, hidden/zero/no-layout/fully clipped nodes and overlays", async () => {
-    const doc = await document([
-      { id: 2, parent: 1, tag: "div", styles: { opacity: "0" } },
-      { id: 3, parent: 2 },
-      { id: 4, parent: 1, styles: { visibility: "hidden" } },
-      { id: 5, parent: 1, bounds: [0, 0, 0, 40] },
-      { id: 6, parent: 1, bounds: null },
-      { id: 7, parent: 1, bounds: [1200, 0, 100, 50] },
-      { id: 8, parent: 1, tag: "div", attrs: { [OVERLAY_HOST_MARKER_ATTR]: "" } },
-      { id: 9, parent: 8, tag: "#document-fragment", bounds: null },
-      { id: 10, parent: 9 },
-    ]);
-    expect(await discoverVisualCandidates(facts([doc]))).toMatchObject({
-      candidates: [],
-      issues: [],
-      complete: true,
-    });
-  });
-
-  it.each([
-    ["both", "hidden", "hidden", [0, 0, 60, 30], [60, 30]],
-    ["x", "clip", "visible", [0, 0, 60, 20], [60, 40]],
-    ["border", "hidden", "hidden", [5, 5, 68, 38], [64, 34]],
-  ])("uses client box for %s clipping", async (_name, x, y, client, expected) => {
-    const doc = await document([
-      {
-        id: 2,
-        parent: 1,
-        tag: "div",
-        bounds: [0, 0, 78, 48],
-        client: client as number[],
-        styles: { "overflow-x": x as string, "overflow-y": y as string },
-      },
-      {
-        id: 3,
-        parent: 2,
-        bounds: x === "clip" || _name === "both" ? [0, 0, 120, 40] : [9, 9, 120, 40],
-      },
-    ]);
-    const [candidate] = (await discoverVisualCandidates(facts([doc]))).candidates;
-    expect([candidate.region.crop.width, candidate.region.crop.height]).toEqual(expected);
-    expect(candidate.region.clips?.backendNodeId).toBe(2);
-  });
-
-  it("keeps Canvas border-box and clips partial viewport intersections", async () => {
-    const doc = await document([{ id: 2, parent: 1, bounds: [950, 20, 130, 50] }]);
-    const [candidate] = (await discoverVisualCandidates(facts([doc]))).candidates;
-    expect(candidate.region.borderBox.width).toBe(130);
-    expect(candidate.region.crop).toEqual({ x: 950, y: 20, width: 50, height: 50 });
-  });
-
-  it("propagates owner ancestry across targets, without depending on semantic parents", async () => {
-    const parent = await document([
-      {
-        id: 2,
-        parent: 1,
-        tag: "div",
-        bounds: [0, 0, 200, 100],
-        client: [0, 0, 200, 100],
-        styles: { "overflow-x": "hidden", "overflow-y": "hidden" },
-      },
-      { id: 3, parent: 2, tag: "iframe", bounds: [100, 0, 200, 200] },
-    ]);
-    parent.domNodes.splice(0); // Visual discovery never reads the semantic subset.
-    const child = await document([{ id: 2, parent: 1, bounds: [0, 0, 200, 200] }], {
-      frame: {
-        frameId: "child",
-        parentFrameId: "main",
-        ownerBackendNodeId: 3,
-        target: { tabId: 1, sessionId: "remote" },
-      },
-      projection: {
-        ...projection,
-        edges: [
-          {
-            sourceViewport: { width: 200, height: 200 },
-            destinationQuad: [
-              { x: 100, y: 0 },
-              { x: 300, y: 0 },
-              { x: 300, y: 200 },
-              { x: 100, y: 200 },
-            ],
-          },
-        ],
-      },
-    });
-    const result = await discoverVisualCandidates(facts([child, parent]));
-    expect(result.complete).toBe(true);
-    expect(result.candidates[0]).toMatchObject({
-      document: { frameId: "child", target: { sessionId: "remote" } },
-      region: { crop: { x: 100, y: 0, width: 100, height: 100 } },
-    });
-    const owner = parent.index.nodes.get(3)!;
-    owner.layout!.styles = { ...owner.layout!.styles, visibility: "hidden" };
-    expect((await discoverVisualCandidates(facts([parent, child]))).candidates).toHaveLength(0);
-  });
-
-  it.each<Record<string, string>>([
-    { transform: "matrix(0,1,-1,0,0,0)" },
-    { "clip-path": "circle(50%)" },
-    { "mask-image": "url(mask)" },
-    { zoom: "1.25", "overflow-x": "hidden" },
-  ])("reports unsupported ancestor geometry: %o", async (styles) => {
-    const doc = await document([
-      { id: 2, parent: 1, tag: "div", styles },
-      { id: 3, parent: 2 },
-    ]);
-    const result = await discoverVisualCandidates(facts([doc]));
-    expect(result.candidates).toHaveLength(0);
-    expect(result.issues[0].reason).toBe("geometry-unsupported");
-  });
-
-  it("supports positive scale without overflow, rejects pinch and non-rectangular frame projection", async () => {
-    const nodes = [
-      {
-        id: 2,
-        parent: 1,
-        styles: { transform: "matrix(1.25,0,0,1.25,0,0)" },
-        bounds: [10, 20, 150, 50],
-      },
-    ];
-    expect(
-      (await discoverVisualCandidates(facts([await document(nodes)]))).candidates,
-    ).toHaveLength(1);
-    expect(
-      (await discoverVisualCandidates(facts([await document(nodes, { pageScale: 1.5 })]))).issues[0]
-        .reason,
-    ).toBe("geometry-unsupported");
-    const rotated = {
-      ...projection,
-      edges: [
-        {
-          sourceViewport: { width: 200, height: 200 },
-          destinationQuad: [
-            { x: 10, y: 0 },
-            { x: 200, y: 10 },
-            { x: 190, y: 200 },
-            { x: 0, y: 190 },
-          ] as [
-            { x: number; y: number },
-            { x: number; y: number },
-            { x: number; y: number },
-            { x: number; y: number },
-          ],
-        },
-      ],
-    };
-    expect(
-      (await discoverVisualCandidates(facts([await document(nodes, { projection: rotated })])))
-        .issues[0].reason,
-    ).toBe("geometry-unsupported");
-  });
-
-  it("keeps partial capture separate from valid geometry, rejects unverified identities", async () => {
-    const doc = await document([{ id: 2, parent: 1 }]);
-    const partial = facts(
-      [doc],
-      [{ target: doc.frame.target, frameId: "main", stage: "ax", reason: "capture-unavailable" }],
-    );
-    const result = await discoverVisualCandidates(partial);
-    expect(result.candidates).toHaveLength(1);
-    expect(result.captureIssues).toBe(partial.issues);
-    expect(result.complete).toBe(false);
-    const unverified = { ...doc, identity: undefined };
-    const failed = await discoverVisualCandidates(facts([unverified]));
-    expect(failed.candidates).toHaveLength(0);
-    expect(failed.issues[0].reason).toBe("identity-unverified");
-  });
-
-  it("does not trust orphan, cyclic, boxless or missing frame-owner ancestry", async () => {
-    const doc = await document([
-      { id: 2, parent: 1, tag: "div" },
-      { id: 3, parent: 2 },
-    ]);
-    for (const parent of [99, 3]) {
-      doc.index.nodes.get(2)!.parentBackendNodeId = parent;
-      const index = await buildDocumentIndex([...doc.index.nodes.values()], undefined, true);
-      const result = await discoverVisualCandidates(facts([{ ...doc, index }]));
-      expect(result.candidates).toHaveLength(0);
-      expect(result.issues[0].reason).toBe("ancestry-incomplete");
-    }
-    const boxless = await document([
-      { id: 2, parent: 1, tag: "div", bounds: null },
-      { id: 3, parent: 2 },
-    ]);
-    expect((await discoverVisualCandidates(facts([boxless]))).issues[0].reason).toBe(
-      "facts-unavailable",
-    );
-    const child = {
-      ...doc,
-      frame: { ...doc.frame, frameId: "child", parentFrameId: "absent", ownerBackendNodeId: 2 },
-    };
-    expect((await discoverVisualCandidates(facts([child]))).issues[0].reason).toBe(
-      "ownership-unresolved",
-    );
-  });
-
-  it("is deterministic, does not deduplicate or mutate inputs", async () => {
-    const input = facts([
-      await document([
-        { id: 2, parent: 1 },
-        { id: 3, parent: 1 },
-      ]),
-    ]);
-    const freeze = (value: unknown): void => {
-      if (!value || typeof value !== "object" || Object.isFrozen(value)) return;
-      if (value instanceof Map) for (const item of value.values()) freeze(item);
-      for (const item of Object.values(value)) freeze(item);
-      Object.freeze(value);
-    };
-    freeze(input);
-    const first = await discoverVisualCandidates(input);
-    expect(await discoverVisualCandidates(input)).toEqual(first);
-    expect(first.candidates).toHaveLength(2);
-  });
-
-  it.each([
-    1000, 10000, 100000,
-  ])("memoizes deep ancestry across %i nodes and checks cancellation", async (count) => {
-    const doc = await document([{ id: 2, parent: 1 }]);
-    const template = doc.index.nodes.get(2)!;
-    let reads = 0;
-    const input = [doc.index.nodes.get(0)!, doc.index.nodes.get(1)!];
-    for (let id = 2; id < count + 2; id++) {
-      const node = {
-        ...template,
-        backendNodeId: id,
-        tag: id < count / 2 ? "div" : "canvas",
-        parentBackendNodeId: id < count / 2 ? id - 1 : count / 2 - 1,
-      };
-      Object.defineProperty(node, "parentBackendNodeId", {
-        get: () => {
-          reads++;
-          return id < count / 2 ? id - 1 : count / 2 - 1;
-        },
-      });
-      input.push(node);
-    }
-    const index = await buildDocumentIndex(input, undefined, true);
-    reads = 0;
-    const result = await discoverVisualCandidates(facts([{ ...doc, index }]));
-    expect(result.candidates).toHaveLength(count / 2 + 2);
-    expect(reads).toBeLessThan(count * 5);
-    const controller = new AbortController();
-    controller.abort();
-    await expect(discoverVisualCandidates(facts([doc]), controller.signal)).rejects.toMatchObject({
-      name: "AbortError",
-    });
-  });
-});

apps/extension/src/tools/vom/__tests__/visual-region.test.ts

@@ -1,250 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-  EMPTY_VISUAL_CONTEXT,
-  extendVisualContext,
-  projectVisualBox,
-  resolveVisualRegion,
-  type VisualAncestor,
-} from "../visual-region";
-
-const styles = {
-  position: "static",
-  visibility: "visible",
-  opacity: "1",
-  display: "block",
-  transform: "none",
-  zoom: "1",
-  "overflow-x": "visible",
-  "overflow-y": "visible",
-  "clip-path": "none",
-  "mask-image": "none",
-  rotate: "none",
-  scale: "none",
-  perspective: "none",
-  clip: "auto",
-  contain: "none",
-  "overflow-clip-margin": "0px",
-};
-const ancestor: VisualAncestor = {
-  document: {
-    attachmentId: "a",
-    target: { tabId: 1 },
-    frameId: "main",
-    documentElementBackendNodeId: 1,
-  },
-  backendNodeId: 2,
-  styles,
-  clientBox: { x: 5, y: 5, width: 60, height: 30 },
-};
-const box = { x: 0, y: 0, width: 120, height: 40 };
-
-describe("shared visual region rules", () => {
-  it.each([
-    "visible",
-    "hidden",
-    "auto",
-    "scroll",
-    "clip",
-  ])("keeps %s screenshot bounds independent of rounded styling", (overflow) => {
-    for (const clipContents of [true, false]) {
-      const node = {
-        ...ancestor,
-        styles: { ...styles, "overflow-x": overflow, "overflow-y": overflow },
-      };
-      const baseline = extendVisualContext(EMPTY_VISUAL_CONTEXT, node, clipContents);
-      for (const radius of ["0px", "8px", "50%", "4px 8px"]) {
-        const rounded = extendVisualContext(
-          EMPTY_VISUAL_CONTEXT,
-          {
-            ...node,
-            styles: {
-              ...node.styles,
-              "border-top-left-radius": radius,
-              "border-top-right-radius": radius,
-              "border-bottom-left-radius": radius,
-              "border-bottom-right-radius": radius,
-            },
-          },
-          clipContents,
-        );
-        expect(rounded).toEqual(baseline);
-        expect(
-          resolveVisualRegion({
-            borderBox: box,
-            frameVisibleBox: box,
-            visibility: "visible",
-            context: rounded,
-          }),
-        ).toMatchObject({ status: "available" });
-        expect(
-          resolveVisualRegion({
-            borderBox: box,
-            frameVisibleBox: box,
-            visibility: "hidden",
-            context: rounded,
-          }),
-        ).toEqual({ status: "empty" });
-        if (clipContents && overflow !== "visible")
-          expect(
-            resolveVisualRegion({
-              borderBox: box,
-              frameVisibleBox: { x: 80, y: 0, width: 20, height: 20 },
-              visibility: "visible",
-              context: rounded,
-            }),
-          ).toEqual({ status: "empty" });
-      }
-    }
-  });
-
-  it("accepts independently supplied normalized facts and preserves clipping policy", () => {
-    const context = extendVisualContext(EMPTY_VISUAL_CONTEXT, {
-      ...ancestor,
-      styles: { ...styles, "overflow-x": "hidden" },
-    });
-    expect(
-      resolveVisualRegion({ borderBox: box, frameVisibleBox: box, visibility: "visible", context }),
-    ).toMatchObject({
-      status: "available",
-      crop: { x: 5, y: 0, width: 60, height: 40 },
-      clips: { overflowX: "hidden", overflowY: "visible" },
-    });
-    const differentPolicy = extendVisualContext(EMPTY_VISUAL_CONTEXT, {
-      ...ancestor,
-      styles: { ...styles, "overflow-x": "scroll" },
-    });
-    expect(differentPolicy.clip).toEqual(context.clip);
-    expect(differentPolicy.clips).not.toEqual(context.clips);
-  });
-
-  it("distinguishes fully clipped, missing client geometry and invalid rectangles", () => {
-    const clipping = { ...ancestor, styles: { ...styles, "overflow-x": "hidden" } };
-    const context = extendVisualContext(EMPTY_VISUAL_CONTEXT, {
-      ...clipping,
-      clientBox: { x: 0, y: 0, width: 0, height: 20 },
-    });
-    expect(
-      resolveVisualRegion({ borderBox: box, frameVisibleBox: box, visibility: "visible", context })
-        .status,
-    ).toBe("empty");
-    const unavailable = extendVisualContext(EMPTY_VISUAL_CONTEXT, { ...clipping, clientBox: null });
-    expect(
-      resolveVisualRegion({
-        borderBox: box,
-        frameVisibleBox: box,
-        visibility: "visible",
-        context: unavailable,
-      }),
-    ).toEqual({ status: "unavailable", reason: "geometry-unavailable" });
-    expect(
-      resolveVisualRegion({
-        borderBox: { ...box, x: NaN },
-        frameVisibleBox: box,
-        visibility: "visible",
-        context: EMPTY_VISUAL_CONTEXT,
-      }).status,
-    ).toBe("unavailable");
-    expect(projectVisualBox({ x: 5, y: 5, width: 0, height: 20 }, [])).toEqual({
-      x: 5,
-      y: 5,
-      width: 0,
-      height: 20,
-    });
-  });
-
-  it.each<Record<string, string>>([
-    { rotate: "45deg" },
-    { scale: "-1 1" },
-    { perspective: "100px" },
-    { clip: "rect(0px, 20px, 20px, 0px)" },
-    { contain: "paint" },
-    { "overflow-x": "clip", "overflow-clip-margin": "10px" },
-    { transform: "matrix3d(1,0,0,0,0,1,0,0,0,0,1,0.01,0,0,0,1)" },
-  ])("refuses unsupported CSS evidence without changing DOM geometry: %o", (change) => {
-    const context = extendVisualContext(EMPTY_VISUAL_CONTEXT, {
-      ...ancestor,
-      styles: { ...styles, ...change },
-    });
-    expect(context.issue).toBe("geometry-unsupported");
-  });
-
-  it("accepts axis-preserving matrix3d translation and independent positive scale", () => {
-    for (const change of [
-      { transform: "matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,10,20,0,1)" },
-      { scale: "1.25" },
-    ])
-      expect(
-        extendVisualContext(EMPTY_VISUAL_CONTEXT, { ...ancestor, styles: { ...styles, ...change } })
-          .issue,
-      ).toBeUndefined();
-  });
-
-  it.each([
-    "matrix(1,0,0,1,0,0)",
-    "matrix(1,0,0,1,10,20)",
-  ])("accepts unscaled overflow transform %s", (transform) => {
-    const context = extendVisualContext(EMPTY_VISUAL_CONTEXT, {
-      ...ancestor,
-      styles: {
-        ...styles,
-        transform,
-        position: "relative",
-        "overflow-x": "hidden",
-        "overflow-y": "hidden",
-      },
-    });
-    expect(context.issue).toBeUndefined();
-    const child = extendVisualContext(
-      context,
-      {
-        ...ancestor,
-        styles: {
-          ...styles,
-          position: "absolute",
-          "overflow-x": "clip",
-          "overflow-y": "clip",
-          "overflow-clip-margin": "content-box",
-        },
-      },
-      false,
-    );
-    expect(
-      resolveVisualRegion({
-        borderBox: box,
-        frameVisibleBox: box,
-        visibility: "visible",
-        context: child,
-      }),
-    ).toMatchObject({ status: "available", crop: { x: 5, y: 5, width: 60, height: 30 } });
-  });
-
-  it("supports positioned overflow containers but refuses uncertain out-of-flow clipping", () => {
-    const overflow = { ...ancestor, styles: { ...styles, "overflow-x": "hidden" } };
-    const staticParent = extendVisualContext(EMPTY_VISUAL_CONTEXT, overflow);
-    expect(
-      extendVisualContext(
-        staticParent,
-        { ...ancestor, styles: { ...styles, position: "absolute" } },
-        false,
-      ).issue,
-    ).toBe("geometry-unsupported");
-    const positionedParent = extendVisualContext(EMPTY_VISUAL_CONTEXT, {
-      ...overflow,
-      styles: { ...overflow.styles, position: "relative" },
-    });
-    const child = extendVisualContext(
-      positionedParent,
-      { ...ancestor, styles: { ...styles, position: "absolute" } },
-      false,
-    );
-    expect(child.issue).toBeUndefined();
-    expect(child.clip).toEqual(positionedParent.clip);
-    expect(
-      extendVisualContext(
-        positionedParent,
-        { ...ancestor, styles: { ...styles, position: "fixed" } },
-        false,
-      ).issue,
-    ).toBe("geometry-unsupported");
-  });
-});

apps/extension/src/tools/vom/capture-coordinator.ts

@@ -1,430 +0,0 @@
-import {
-  type CdpFrame,
-  type CdpFrameGraph,
-  type CdpTarget,
-  cdpTargetKey,
-} from "@/browser-driver/frame-graph";
-import { cssViewport, GeometryContext } from "../geometry/frame-context";
-import { type CdpRunner, cdpRunnerForTarget } from "../shared";
-import { collectOverlayExcludedBackendIds } from "./capture";
-import {
-  isAbortError as isCaptureAbort,
-  throwIfAborted as throwCaptureAborted,
-} from "./capture-abort";
-import { verifyDocumentIdentity } from "./document-identity";
-import type { CapturedSceneInput, DocumentIdentity } from "./facts";
-import { buildDocumentIndex, type CaptureIssue, type ObservationFacts } from "./facts";
-import { enrichFormControlStates } from "./form-capture";
-import {
-  buildFrameDocuments,
-  type FrameAxBatch,
-  type FrameDocument,
-  type FrameOwnedAxNode,
-} from "./frame-document";
-import { type NormalizedFrameDocument, normalizeSnapshot } from "./normalize";
-import {
-  BASIC_SNAPSHOT,
-  describeSnapshotFrames,
-  type SnapshotReply,
-  VISUAL_SNAPSHOT,
-} from "./snapshot";
-
-interface TargetBatch<T extends FrameOwnedAxNode> {
-  target: CdpTarget;
-  frames: CdpFrame[];
-  snapshotAttachmentId?: string;
-  documents: NormalizedFrameDocument[];
-  ax: FrameAxBatch<T>[];
-  fallbackExcluded: Set<number>;
-  snapshotFrameIds?: Set<string>;
-  rootFrameId?: string;
-}
-
-/** A fixed worker pool scoped to one capture; each worker issues at most one
- * collection request at a time. Geometry has its own measurement-phase bound. */
-async function collectTasks<T>(
-  items: readonly T[],
-  collect: (item: T) => Promise<void>,
-  signal?: AbortSignal,
-): Promise<void> {
-  let cursor = 0;
-  let failed = false;
-  let failure: unknown;
-  await Promise.all(
-    Array.from({ length: Math.min(4, items.length) }, async () => {
-      try {
-        while (cursor < items.length && !failed && !signal?.aborted) {
-          const item = items[cursor++];
-          await collect(item);
-        }
-      } catch (error) {
-        if (!failed) failure = error;
-        failed = true;
-      }
-    }),
-  );
-  // A worker's rejection must not let the capture outlive its own task scope.
-  // In-flight reads and their finally blocks settle before cancellation/failure.
-  throwCaptureAborted(signal);
-  if (failed) throw failure;
-}
-
-export async function captureObservationFacts<T extends FrameOwnedAxNode>(
-  cdp: CdpRunner,
-  tabId: number,
-  signal?: AbortSignal,
-  pageUrl?: string,
-  options: { includeVisualFacts?: boolean } = {},
-): Promise<ObservationFacts<T>> {
-  const profile = options.includeVisualFacts ? VISUAL_SNAPSHOT : BASIC_SNAPSHOT;
-  const startedAt = Date.now();
-  throwCaptureAborted(signal);
-  let graph: CdpFrameGraph | undefined;
-  try {
-    graph = await cdp.getFrameGraph?.(tabId);
-  } catch (error) {
-    if (isCaptureAbort(error)) throw error;
-  }
-  throwCaptureAborted(signal);
-  const geometry = new GeometryContext(cdp, tabId, graph, signal);
-  const issues: CaptureIssue[] = [];
-  const graphFrames = new Map(graph?.frames.map((frame) => [frame.frameId, frame]) ?? []);
-  const groups = new Map<string, TargetBatch<T>>();
-  for (const frame of graph?.frames ?? []) {
-    const key = cdpTargetKey(frame.target);
-    let group = groups.get(key);
-    if (!group) {
-      group = {
-        target: frame.target,
-        frames: [],
-        documents: [],
-        ax: [],
-        fallbackExcluded: new Set(),
-      };
-      groups.set(key, group);
-    }
-    group.frames.push(
-      !frame.target.sessionId && frame.frameId === graph?.rootFrameId && !frame.url && pageUrl
-        ? { ...frame, url: pageUrl }
-        : frame,
-    );
-  }
-  if (!groups.has(cdpTargetKey({ tabId })))
-    groups.set(cdpTargetKey({ tabId }), {
-      target: { tabId },
-      frames: [],
-      documents: [],
-      ax: [],
-      fallbackExcluded: new Set(),
-    });
-  const batches = [...groups.values()];
-  const unavailable = (batch: TargetBatch<T>, stage: CaptureIssue["stage"], frameId?: string) =>
-    issues.push({ target: batch.target, frameId, stage, reason: "capture-unavailable" });
-  let firstFailure: unknown;
-  const axReady = new Set<TargetBatch<T>>();
-  await collectTasks(
-    batches,
-    async (batch) => {
-      const scoped = cdpRunnerForTarget(cdp, batch.target);
-      try {
-        throwCaptureAborted(signal);
-        await scoped.send(tabId, "DOMSnapshot.enable", {});
-        throwCaptureAborted(signal);
-        batch.snapshotAttachmentId = cdp.getAttachmentId?.(tabId);
-        const snapshot = await scoped.send<SnapshotReply>(tabId, "DOMSnapshot.captureSnapshot", {
-          computedStyles: profile.computedStyles,
-          includePaintOrder: true,
-          includeDOMRects: true,
-        });
-        throwCaptureAborted(signal);
-        const observed = describeSnapshotFrames(snapshot, batch.target, graphFrames, pageUrl);
-        batch.snapshotFrameIds = observed.ids;
-        batch.rootFrameId = observed.rootFrameId;
-        // Keep graph-only frames for AX fallback, never in preference to observed membership.
-        batch.frames = [
-          ...observed.frames,
-          ...batch.frames.filter((frame) => !observed.ids.has(frame.frameId)),
-        ];
-        batch.documents = await normalizeSnapshot(
-          snapshot,
-          batch.target,
-          batch.frames.filter((frame) => observed.ids.has(frame.frameId)),
-          geometry,
-          issues,
-          signal,
-          observed.rootFrameId,
-          profile,
-        );
-        const formsAvailable = await enrichFormControlStates(
-          scoped,
-          tabId,
-          batch.documents.map((doc) => doc.nodes),
-          signal,
-        );
-        throwCaptureAborted(signal);
-        if (!formsAvailable) unavailable(batch, "forms");
-        const present = new Set(batch.documents.map((doc) => doc.frame.frameId));
-        for (const frame of batch.frames)
-          if (!present.has(frame.frameId)) unavailable(batch, "dom", frame.frameId);
-      } catch (error) {
-        throwCaptureAborted(signal);
-        if (isCaptureAbort(error)) throw error;
-        firstFailure ??= error;
-        unavailable(batch, "dom");
-        batch.fallbackExcluded = await collectOverlayExcludedBackendIds(scoped, tabId, signal);
-      }
-      if (!batch.frames.length && !graph)
-        batch.frames = [
-          {
-            frameId: "root",
-            target: batch.target,
-            ...(!batch.target.sessionId && pageUrl ? { url: pageUrl } : {}),
-          },
-        ];
-      try {
-        throwCaptureAborted(signal);
-        await scoped.send(tabId, "Accessibility.enable", {});
-      } catch (error) {
-        throwCaptureAborted(signal);
-        if (isCaptureAbort(error)) throw error;
-        firstFailure ??= error;
-        unavailable(batch, "ax");
-        return;
-      }
-      axReady.add(batch);
-    },
-    signal,
-  );
-
-  // Schedule AX by frame across all ready targets, rather than nesting pools.
-  // Keep result slots in source order even when CDP replies arrive out of order.
-  const axTasks: { batch: TargetBatch<T>; frame: CdpFrame; result?: FrameAxBatch<T> }[] =
-    batches.flatMap((batch) =>
-      axReady.has(batch) ? batch.frames.map((frame) => ({ batch, frame })) : [],
-    );
-  await collectTasks(
-    axTasks,
-    async (task) => {
-      const { batch, frame } = task;
-      try {
-        throwCaptureAborted(signal);
-        const result = await cdpRunnerForTarget(cdp, batch.target).send<{ nodes?: T[] }>(
-          tabId,
-          "Accessibility.getFullAXTree",
-          frame.frameId === "root" ? {} : { frameId: frame.frameId },
-        );
-        throwCaptureAborted(signal);
-        task.result = { frame, nodes: result.nodes ?? [] };
-      } catch (error) {
-        throwCaptureAborted(signal);
-        if (isCaptureAbort(error)) throw error;
-        firstFailure ??= error;
-        unavailable(batch, "ax", frame.frameId);
-      }
-    },
-    signal,
-  );
-  for (const task of axTasks) if (task.result) task.batch.ax.push(task.result);
-
-  let viewport = { width: 0, height: 0 };
-  try {
-    const measured = cssViewport(await geometry.layoutMetrics({ tabId }));
-    viewport = { width: measured.width, height: measured.height };
-  } catch (error) {
-    if (isCaptureAbort(error)) throw error;
-  }
-
-  // A snapshot claim outranks an old graph hint. Conflicting actual claims
-  // cannot be resolved by completion order or by overwriting a frameId map.
-  const claims = new Map<string, string>();
-  const invalid = new Set<string>();
-  for (const batch of batches) {
-    const targetKey = cdpTargetKey(batch.target);
-    for (const id of batch.snapshotFrameIds ?? []) {
-      const previous = claims.get(id);
-      if (previous !== undefined && previous !== targetKey) invalid.add(id);
-      claims.set(id, targetKey);
-    }
-    const accepted = new Set(batch.frames.map((frame) => frame.frameId));
-    for (const id of batch.snapshotFrameIds ?? []) if (!accepted.has(id)) invalid.add(id);
-  }
-  const currentFrames = batches.flatMap((batch) =>
-    batch.frames.filter(
-      (frame) =>
-        !claims.has(frame.frameId) || claims.get(frame.frameId) === cdpTargetKey(batch.target),
-    ),
-  );
-  const rootBatch = batches.find((batch) => !batch.target.sessionId);
-  const rootFrameId =
-    rootBatch?.rootFrameId ?? graph?.rootFrameId ?? rootBatch?.frames[0]?.frameId ?? "root";
-  const ownershipInvalid = new Set(invalid);
-  const identities = new Map<string, DocumentIdentity>();
-  const selected = new Map(currentFrames.map((frame) => [frame.frameId, frame]));
-  const checks = batches.flatMap((batch) => {
-    const docs = new Map(batch.documents.map((doc) => [doc.frame.frameId, doc]));
-    return batch.frames
-      .filter(
-        (frame) =>
-          !invalid.has(frame.frameId) &&
-          cdpTargetKey(selected.get(frame.frameId)!.target) === cdpTargetKey(batch.target),
-      )
-      .map((frame) => ({ batch, frame, doc: docs.get(frame.frameId) }));
-  });
-  await collectTasks(
-    checks,
-    async ({ batch, frame, doc }) => {
-      throwCaptureAborted(signal);
-      if (!batch.snapshotAttachmentId || doc?.documentElementBackendNodeId === undefined) {
-        issues.push({
-          target: frame.target,
-          frameId: frame.frameId,
-          stage: "identity",
-          reason: "identity-unverified",
-        });
-        return;
-      }
-      const identity: DocumentIdentity = {
-        attachmentId: batch.snapshotAttachmentId,
-        target: frame.target,
-        frameId: frame.frameId,
-        documentElementBackendNodeId: doc.documentElementBackendNodeId,
-      };
-      const verified = await verifyDocumentIdentity(cdp, identity, signal);
-      const status = cdp.getAttachmentId?.(tabId) === identity.attachmentId ? verified : "changed";
-      if (status === "current") identities.set(frame.frameId, identity);
-      else {
-        invalid.add(frame.frameId);
-        issues.push({
-          target: frame.target,
-          frameId: frame.frameId,
-          stage: "identity",
-          reason: status === "changed" ? "document-changed" : "identity-unavailable",
-        });
-      }
-    },
-    signal,
-  );
-  const children = new Map<string, string[]>();
-  for (const frame of currentFrames) {
-    if (!frame.parentFrameId) continue;
-    const siblings = children.get(frame.parentFrameId);
-    if (siblings) siblings.push(frame.frameId);
-    else children.set(frame.parentFrameId, [frame.frameId]);
-  }
-  const blocked = [...invalid];
-  for (let i = 0; i < blocked.length; i++) {
-    for (const child of children.get(blocked[i]) ?? []) {
-      if (!invalid.has(child)) {
-        invalid.add(child);
-        blocked.push(child);
-      }
-    }
-  }
-  for (const frame of currentFrames) {
-    if (ownershipInvalid.has(frame.frameId))
-      issues.push({
-        target: frame.target,
-        frameId: frame.frameId,
-        stage: "ownership",
-        reason: "frame-ownership-unresolved",
-      });
-  }
-  if (invalid.has(rootFrameId))
-    throw new Error(
-      ownershipInvalid.has(rootFrameId)
-        ? "observation root document ownership is ambiguous"
-        : "observation document identity changed or could not be verified; observe again",
-    );
-  const frames = currentFrames.filter((frame) => !invalid.has(frame.frameId));
-  const frameById = new Map(frames.map((frame) => [frame.frameId, frame]));
-  const belongs = (frame: CdpFrame) => {
-    const current = frameById.get(frame.frameId);
-    return current && cdpTargetKey(current.target) === cdpTargetKey(frame.target);
-  };
-  const decoded = new Map(
-    batches
-      .flatMap((batch) => batch.documents)
-      .filter((doc) => belongs(doc.frame))
-      .map((doc) => [doc.frame.frameId, doc]),
-  );
-  const ax = batches.flatMap((batch) => batch.ax).filter((batch) => belongs(batch.frame));
-  const documents = await buildFrameDocuments(
-    { rootFrameId, frames },
-    ax,
-    {
-      nodes: [],
-      rootFrameId,
-      frameNodes: new Map([...decoded].map(([id, doc]) => [id, doc.nodes])),
-      frameExcludedBackendNodeIds: new Map(
-        [...decoded].map(([id, doc]) => [id, doc.index.excludedBackendNodeIds]),
-      ),
-    },
-    signal,
-    (frame) =>
-      issues.push({
-        target: frame.target,
-        frameId: frame.frameId,
-        stage: "ownership",
-        reason: "frame-ownership-unresolved",
-      }),
-  );
-  const facts: ObservationFacts<T>["documents"][number][] = [];
-  for (const document of documents) {
-    const doc = decoded.get(document.frameId);
-    const index = doc?.index ?? (await buildDocumentIndex([], signal));
-    const fallback = groups.get(cdpTargetKey(document.target))?.fallbackExcluded;
-    const {
-      domNodes,
-      axNodes,
-      contextScopeId: _scope,
-      excludedBackendNodeIds: _excluded,
-      ...frame
-    } = document;
-    facts.push({
-      frame,
-      identity: identities.get(document.frameId),
-      ...(doc?.geometry ? { geometry: doc.geometry } : {}),
-      index: fallback?.size ? { ...index, excludedBackendNodeIds: fallback } : index,
-      domNodes,
-      axNodes,
-    });
-  }
-  throwCaptureAborted(signal);
-  if (firstFailure && facts.every((doc) => !doc.domNodes.length && !doc.axNodes.length))
-    throw firstFailure;
-  return {
-    visualFactsCollected: profile.includeVisualFacts,
-    rootFrameId,
-    viewport,
-    documents: facts,
-    issues,
-    startedAt,
-    finishedAt: Date.now(),
-  };
-}
-
-/** Existing semantic consumers get a narrow view; no raw snapshot
- * data can leak through recording's allowlisted output DTO. */
-export function semanticCapture<T extends FrameOwnedAxNode>(
-  facts: ObservationFacts<T>,
-): { captured: CapturedSceneInput; documents: FrameDocument<T>[] } {
-  const documents = facts.documents.map((doc) => ({
-    ...doc.frame,
-    contextScopeId: doc.frame.frameId,
-    domNodes: doc.domNodes.filter(
-      (node) => !doc.index.excludedBackendNodeIds.has(node.backendNodeId),
-    ),
-    axNodes: doc.axNodes,
-    excludedBackendNodeIds: doc.index.excludedBackendNodeIds,
-  }));
-  const root = documents.find((doc) => doc.frameId === facts.rootFrameId);
-  return {
-    documents,
-    captured: {
-      nodes: root?.domNodes ?? [],
-      viewport: facts.viewport,
-      rootFrameId: facts.rootFrameId,
-      excludedBackendNodeIds: root?.excludedBackendNodeIds ?? new Set(),
-    },
-  };
-}

apps/extension/src/tools/vom/capture.ts

@@ -1,18 +1,59 @@
-// Browser-side hover probes and overlay exclusion fallback. Static collection
-// lives in capture-coordinator; snapshot decoding has no browser dependency.
+// Coordinate DOMSnapshot acquisition, frame geometry and hover probes.
+// Snapshot decoding and form enrichment live in their own modules.
+
+import type { Viewport } from "@browser-skill/vom";
+import type { CdpTarget } from "@/browser-driver/frame-graph";
 import { evaluateHoverTrigger } from "@/lib/hover-trigger-policy";
 import { OVERLAY_HOST_SELECTOR } from "../../lib/overlay-bridge";
+import { type FrameProjectionIssue, type FrameProjectionState } from "../geometry/coordinate-types";
+import { cssViewport, GeometryContext, type LayoutMetrics } from "../geometry/frame-context";
 import type { CdpRunner } from "../shared";
-import type { CapturedNode } from "./capture-types";
-import type { CapturedSurfaceProbe } from "./facts";
-
-export type {
-  CapturedNode,
-  CapturedSurfaceProbe,
-} from "./facts";
-
 import { isAbortError, throwIfAborted } from "./capture-abort";
+import type { CapturedNode } from "./capture-types";
+import { enrichFormControlStates } from "./form-capture";
 import { clearHover, ProbeBudget, waitForHover } from "./hover-perception";
+import { type FrameContext, normalizeDocument } from "./normalize";
+import {
+  REQUESTED_STYLES,
+  type SnapshotDocument,
+  type SnapshotReply,
+  snapshotFrameId,
+  sparseIndexMap,
+} from "./snapshot";
+
+export type { CapturedNode } from "./capture-types";
+
+export type CapturedIframeNodes = Map<number, CapturedNode[]>;
+
+export interface CapturedSurfaceProbe {
+  triggerBackendNodeId: number;
+  triggerPoint?: { x: number; y: number };
+  triggerAction: "hover" | "focus" | string;
+  subItems: string[];
+  confidence?: "high" | "medium" | "low";
+}
+
+export interface CapturedViewModel {
+  nodes: CapturedNode[];
+  viewport: Viewport;
+  iframeNodes: CapturedIframeNodes;
+  frameNodes?: Map<string, CapturedNode[]>;
+  frameExcludedBackendNodeIds?: Map<string, ReadonlySet<number>>;
+  frameOwnerBackendNodeIds?: Map<string, number>;
+  /** Explicit DOMSnapshot frame ancestry; never inferred from backend node ids. */
+  frameParentIds?: Map<string, string>;
+  rootFrameId?: string;
+  /** Failed boundaries and descendants blocked by them; clipping is not a failure. */
+  frameGeometryIssues?: FrameProjectionIssue[];
+  /** Backend node ids belonging to the agent overlay host + its shadow subtree. */
+  excludedBackendNodeIds: Set<number>;
+}
+
+export interface CaptureViewModelOptions {
+  signal?: AbortSignal;
+  geometry?: GeometryContext;
+  target?: CdpTarget;
+}
 
 interface RuntimeEvaluateReply {
   result?: {
@@ -443,3 +484,270 @@ export async function collectOverlayExcludedBackendIds(
   }
   return excluded;
 }
+
+interface ParseFrameDocumentsResult {
+  frameGeometryIssues: FrameProjectionIssue[];
+  iframeNodes: CapturedIframeNodes;
+  frameOwnerBackendNodeIds: Map<string, number>;
+  frameParentIds: Map<string, string>;
+  frameExcludedBackendNodeIds: Map<string, ReadonlySet<number>>;
+  excludedBackendNodeIds: Set<number>;
+}
+
+async function parseChildFrameDocuments(
+  documents: SnapshotDocument[],
+  strings: string[],
+  parentDocIndex: number,
+  parentContext: FrameContext,
+  geometry: GeometryContext,
+  signal?: AbortSignal,
+  visited = new Set<number>(),
+): Promise<ParseFrameDocumentsResult> {
+  const frameGeometryIssues: FrameProjectionIssue[] = [];
+  const iframeNodes: CapturedIframeNodes = new Map();
+  const frameOwnerBackendNodeIds = new Map<string, number>();
+  const frameParentIds = new Map<string, string>();
+  const frameExcludedBackendNodeIds = new Map<string, ReadonlySet<number>>();
+  const excludedBackendNodeIds = new Set<number>();
+  const parentDoc = documents[parentDocIndex];
+  const cdi = sparseIndexMap(parentDoc?.nodes?.contentDocumentIndex);
+  if (cdi.size === 0) {
+    return {
+      iframeNodes,
+      frameOwnerBackendNodeIds,
+      frameParentIds,
+      frameExcludedBackendNodeIds,
+      excludedBackendNodeIds,
+      frameGeometryIssues,
+    };
+  }
+
+  const parentBackendIds = parentDoc?.nodes?.backendNodeId ?? [];
+
+  const children = [...cdi].flatMap(([nodeArrayIdx, childDocIndex]) => {
+    const childDoc = documents[childDocIndex];
+    const iframeBackendId = parentBackendIds[nodeArrayIdx];
+    if (visited.has(childDocIndex) || !childDoc || iframeBackendId === undefined) return [];
+    const source = { target: parentContext.target, frameId: snapshotFrameId(childDoc, strings) };
+    const parent = parentContext.projection;
+    const projection: FrameProjectionState =
+      parent.status === "available"
+        ? { status: "unavailable", source, ownerBackendNodeId: iframeBackendId }
+        : { status: "blocked", source, cause: parent.status === "blocked" ? parent.cause : parent };
+    return [
+      {
+        childDocIndex,
+        childDoc,
+        iframeBackendId,
+        source,
+        projection: projection as FrameProjectionState,
+      },
+    ];
+  });
+  const parentProjection =
+    parentContext.projection.status === "available"
+      ? parentContext.projection.projection.geometry
+      : null;
+  if (parentProjection) {
+    // Measure only direct siblings. Recursion starts after these workers finish,
+    // so descendants never hold or recursively acquire a measurement slot.
+    const edge = parentProjection.edges[0];
+    const clips = edge
+      ? [edge.destinationQuad, ...(edge.destinationClips ?? [])]
+      : parentProjection.sourceClips;
+    let cursor = 0;
+    let failure: unknown;
+    await Promise.all(
+      Array.from({ length: Math.min(4, children.length) }, async () => {
+        while (cursor < children.length && !signal?.aborted && !failure) {
+          const child = children[cursor++];
+          try {
+            // Owner quads are target-relative; do not apply the parent transform twice.
+            child.projection = await geometry.snapshotProjection(
+              child.source,
+              child.iframeBackendId,
+              clips,
+              parentProjection.topViewport,
+            );
+          } catch (error) {
+            failure ??= error;
+          }
+        }
+      }),
+    );
+    // Join all active reads, including object cleanup, before propagating abort.
+    if (failure) throw failure;
+  }
+  throwIfAborted(signal);
+
+  // Completion order must not change document traversal or result insertion order.
+  for (const { childDocIndex, childDoc, iframeBackendId, source, projection } of children) {
+    throwIfAborted(signal);
+    if (projection.status !== "available") frameGeometryIssues.push(projection);
+    const childContext: FrameContext = {
+      frameId: source.frameId,
+      target: source.target,
+      ownerFrameBackendNodeId: iframeBackendId,
+      projection,
+      scrollX: childDoc.scrollOffsetX ?? 0,
+      scrollY: childDoc.scrollOffsetY ?? 0,
+    };
+    const nextVisited = new Set(visited);
+    nextVisited.add(childDocIndex);
+    const parsed = await normalizeDocument(childDoc, strings, childContext, signal);
+    iframeNodes.set(iframeBackendId, parsed.nodes);
+    if (childContext.frameId) {
+      frameOwnerBackendNodeIds.set(childContext.frameId, iframeBackendId);
+      frameExcludedBackendNodeIds.set(childContext.frameId, parsed.index.excludedBackendNodeIds);
+      if (parentContext.frameId) frameParentIds.set(childContext.frameId, parentContext.frameId);
+    }
+    for (const id of parsed.index.excludedBackendNodeIds) excludedBackendNodeIds.add(id);
+
+    const nested = await parseChildFrameDocuments(
+      documents,
+      strings,
+      childDocIndex,
+      childContext,
+      geometry,
+      signal,
+      nextVisited,
+    );
+    frameGeometryIssues.push(...nested.frameGeometryIssues);
+    for (const [nestedFrameId, nestedNodes] of nested.iframeNodes) {
+      iframeNodes.set(nestedFrameId, nestedNodes);
+    }
+    for (const [frameId, ownerBackendNodeId] of nested.frameOwnerBackendNodeIds) {
+      frameOwnerBackendNodeIds.set(frameId, ownerBackendNodeId);
+    }
+    for (const [frameId, parentFrameId] of nested.frameParentIds) {
+      frameParentIds.set(frameId, parentFrameId);
+    }
+    for (const [frameId, excluded] of nested.frameExcludedBackendNodeIds)
+      frameExcludedBackendNodeIds.set(frameId, excluded);
+    for (const id of nested.excludedBackendNodeIds) excludedBackendNodeIds.add(id);
+  }
+
+  return {
+    iframeNodes,
+    frameOwnerBackendNodeIds,
+    frameParentIds,
+    frameExcludedBackendNodeIds,
+    excludedBackendNodeIds,
+    frameGeometryIssues,
+  };
+}
+
+export async function captureViewModel(
+  cdp: CdpRunner,
+  tabId: number,
+  options: CaptureViewModelOptions = {},
+): Promise<CapturedViewModel> {
+  throwIfAborted(options.signal);
+  const target = options.target ?? { tabId };
+  const geometry = options.geometry ?? new GeometryContext(cdp, tabId, undefined, options.signal);
+  let metrics: LayoutMetrics = {};
+  try {
+    metrics = await geometry.layoutMetrics(target);
+  } catch (error) {
+    if (isAbortError(error)) throw error;
+    console.debug("[bsk capture] layout metrics unavailable", error);
+  }
+  throwIfAborted(options.signal);
+  const measured = cssViewport(metrics);
+  const viewport: Viewport = { width: measured.width, height: measured.height };
+  const scrollX = measured.scrollX;
+  const scrollY = measured.scrollY;
+
+  await cdp.send(tabId, "DOMSnapshot.enable", {});
+  throwIfAborted(options.signal);
+  const snap = await cdp.send<SnapshotReply>(tabId, "DOMSnapshot.captureSnapshot", {
+    computedStyles: REQUESTED_STYLES,
+    includePaintOrder: true,
+    includeDOMRects: true,
+  });
+  throwIfAborted(options.signal);
+
+  const strings = snap.strings ?? [];
+  const documents = snap.documents ?? [];
+  const doc0 = documents[0];
+  if (!doc0?.nodes?.backendNodeId) {
+    return {
+      nodes: [],
+      viewport,
+      iframeNodes: new Map(),
+      excludedBackendNodeIds: new Set(),
+    };
+  }
+
+  const topContext: FrameContext = {
+    frameId: snapshotFrameId(doc0, strings),
+    ownerFrameBackendNodeId: null,
+    target,
+    projection: {
+      status: "available",
+      projection: {
+        source: { target, frameId: snapshotFrameId(doc0, strings) },
+        geometry: { sourceClips: [], edges: [], topViewport: viewport },
+      },
+    },
+    scrollX,
+    scrollY,
+  };
+  const mainParsed = await normalizeDocument(doc0, strings, topContext, options.signal);
+  const nodes = mainParsed.nodes;
+  const excludedBackendNodeIds = new Set(mainParsed.index.excludedBackendNodeIds);
+
+  const ownerIds = new Set<number>();
+  for (const document of documents) {
+    for (const index of document.nodes?.contentDocumentIndex?.index ?? []) {
+      const id = document.nodes?.backendNodeId?.[index];
+      if (id !== undefined) ownerIds.add(id);
+    }
+  }
+  geometry.registerSnapshotOwners(target, ownerIds);
+  const frameParsed = await parseChildFrameDocuments(
+    documents,
+    strings,
+    0,
+    topContext,
+    geometry,
+    options.signal,
+  );
+  const iframeNodes = frameParsed.iframeNodes;
+  if (topContext.frameId)
+    frameParsed.frameExcludedBackendNodeIds.set(
+      topContext.frameId,
+      mainParsed.index.excludedBackendNodeIds,
+    );
+  for (const id of frameParsed.excludedBackendNodeIds) {
+    excludedBackendNodeIds.add(id);
+  }
+
+  await enrichFormControlStates(cdp, tabId, [nodes, ...iframeNodes.values()], options.signal);
+  throwIfAborted(options.signal);
+
+  const frameNodes = new Map<string, CapturedNode[]>();
+  if (topContext.frameId) frameNodes.set(topContext.frameId, nodes);
+  for (const iframeFrameNodes of iframeNodes.values()) {
+    const frameId = iframeFrameNodes.find((node) => node.frameId)?.frameId;
+    if (frameId) frameNodes.set(frameId, iframeFrameNodes);
+  }
+  for (const [frameId, ownerBackendNodeId] of frameParsed.frameOwnerBackendNodeIds) {
+    if (!frameNodes.has(frameId)) {
+      frameNodes.set(frameId, iframeNodes.get(ownerBackendNodeId) ?? []);
+    }
+  }
+
+  return {
+    nodes,
+    viewport,
+    iframeNodes,
+    frameNodes,
+    frameGeometryIssues: frameParsed.frameGeometryIssues,
+    frameOwnerBackendNodeIds: frameParsed.frameOwnerBackendNodeIds,
+    frameExcludedBackendNodeIds: frameParsed.frameExcludedBackendNodeIds,
+    frameParentIds: frameParsed.frameParentIds,
+    ...(topContext.frameId ? { rootFrameId: topContext.frameId } : {}),
+    excludedBackendNodeIds,
+  };
+}

apps/extension/src/tools/vom/document-identity.ts

@@ -1,91 +0,0 @@
-import type { CdpRunner } from "../shared";
-import { sendToCdpTarget } from "../shared";
-import { isAbortError, throwIfAborted } from "./capture-abort";
-import type { DocumentIdentity } from "./facts";
-import type { VisualCandidate } from "./visual-discovery";
-
-/** Compare the snapshot root with the current root in that exact frame.
- * Deep serialization supplies the backend ID without a separate describeNode. */
-export async function verifyDocumentIdentity(
-  cdp: CdpRunner,
-  identity: DocumentIdentity,
-  signal?: AbortSignal,
-): Promise<"current" | "changed" | "unavailable"> {
-  return verifyIdentity(cdp, identity, signal);
-}
-
-/** Verify the visual anchor in its original frame; geometry is checked by screenshot execution. */
-export async function verifyVisualTargetIdentity(
-  cdp: CdpRunner,
-  candidate: VisualCandidate,
-  signal?: AbortSignal,
-): Promise<"current" | "changed" | "unavailable"> {
-  return verifyIdentity(cdp, candidate.document, signal, candidate.backendNodeId);
-}
-
-async function verifyIdentity(
-  cdp: CdpRunner,
-  identity: DocumentIdentity,
-  signal?: AbortSignal,
-  anchorBackendNodeId?: number,
-): Promise<"current" | "changed" | "unavailable"> {
-  const attached = () => cdp.getAttachmentId?.(identity.target.tabId) === identity.attachmentId;
-  throwIfAborted(signal);
-  if (!attached()) return "changed";
-  const objectGroup = `bsk-document-identity-${crypto.randomUUID()}`;
-  const send = <T>(method: string, params: object) => {
-    throwIfAborted(signal);
-    return sendToCdpTarget<T>(cdp, identity.target, method, params);
-  };
-  try {
-    const world = await send<{ executionContextId: number }>("Page.createIsolatedWorld", {
-      frameId: identity.frameId,
-      worldName: "bsk-document-identity",
-    });
-    const serializationOptions = {
-      serialization: "deep",
-      additionalParameters: { maxNodeDepth: 0, includeShadowTree: "none" },
-    };
-    type RootReply = {
-      result?: { deepSerializedValue?: { type: string; value?: { backendNodeId?: number } } };
-    };
-    let reply: RootReply;
-    if (anchorBackendNodeId === undefined) {
-      reply = await send<RootReply>("Runtime.evaluate", {
-        expression: "document.documentElement",
-        contextId: world.executionContextId,
-        objectGroup,
-        serializationOptions,
-      });
-    } else {
-      const anchor = await send<{ object?: { objectId?: string } }>("DOM.resolveNode", {
-        backendNodeId: anchorBackendNodeId,
-        executionContextId: world.executionContextId,
-        objectGroup,
-      });
-      if (!anchor.object?.objectId) return "unavailable";
-      reply = await send<RootReply>("Runtime.callFunctionOn", {
-        objectId: anchor.object.objectId,
-        functionDeclaration:
-          "function() { return this.isConnected && this.ownerDocument === document ? document.documentElement : null; }",
-        objectGroup,
-        serializationOptions,
-      });
-    }
-    if (!attached()) return "changed";
-    const root = reply.result?.deepSerializedValue;
-    if (root?.type === "null") return "changed";
-    const id = root?.type === "node" ? root.value?.backendNodeId : undefined;
-    if (id === undefined) return "unavailable";
-    return id === identity.documentElementBackendNodeId ? "current" : "changed";
-  } catch (error) {
-    throwIfAborted(signal);
-    if (isAbortError(error)) throw error;
-    return attached() ? "unavailable" : "changed";
-  } finally {
-    await sendToCdpTarget(cdp, identity.target, "Runtime.releaseObjectGroup", {
-      objectGroup,
-    }).catch(() => {});
-    throwIfAborted(signal);
-  }
-}

apps/extension/src/tools/vom/facts.ts

@@ -1,36 +1,26 @@
-import type { Viewport } from "@browser-skill/vom";
-import type { CdpFrame, CdpTarget } from "@/browser-driver/frame-graph";
 import { isOverlayHostNode } from "@/lib/overlay-bridge";
-import type { GeometryProjection } from "../geometry";
-import type { FrameProjectionIssue, SnapshotCoordinates } from "../geometry/coordinate-types";
 import { createCaptureCheckpoint } from "./capture-abort";
 import type { CapturedNode } from "./capture-types";
-import type { FrameOwnedAxNode } from "./frame-document";
 
-/** Bounds retain their raw snapshot document layout units until normalization. */
+/** Bounds retain their snapshot document CSS units until normalization. */
 export interface SnapshotLayout {
-  readonly boundsSpace: "snapshot-document-layout";
+  readonly boundsSpace: "snapshot-document-css";
   bounds?: number[];
-  /** [clientLeft, clientTop, clientWidth, clientHeight], untransformed local CSS units. */
-  clientRect?: number[];
   styles: Readonly<Record<string, string>>;
 }
 
 export interface DecodedNode extends Omit<CapturedNode, "rect" | "localRect" | "rendered"> {
   nodeType?: number;
-  parentMissing?: boolean;
   layout?: SnapshotLayout;
 }
 
 export interface NodeFacts extends CapturedNode {
   nodeType?: number;
-  parentMissing?: boolean;
   layout?: SnapshotLayout;
 }
 
 export interface DocumentIndex<T extends DecodedNode = NodeFacts> {
   readonly nodes: ReadonlyMap<number, T>;
-  readonly ancestryComplete?: ReadonlyMap<number, boolean>;
   readonly excludedBackendNodeIds: ReadonlySet<number>;
 }
 
@@ -43,12 +33,10 @@ export interface DecodedDocument {
 export async function buildDocumentIndex<T extends DecodedNode>(
   input: readonly T[],
   signal?: AbortSignal,
-  includeVisualFacts = false,
 ): Promise<DocumentIndex<T>> {
   const checkpoint = createCaptureCheckpoint(signal);
   const nodes = new Map<number, T>();
   const overlayByNode = new Map<number, boolean>();
-  const ancestryComplete = includeVisualFacts ? new Map<number, boolean>() : undefined;
   const excludedBackendNodeIds = new Set<number>();
   for (let i = 0; i < input.length; i++) {
     if (i % 256 === 0) {
@@ -69,7 +57,6 @@ export async function buildDocumentIndex<T extends DecodedNode>(
     const visiting = new Set<number>();
     let current: DecodedNode | undefined = node;
     let overlay = false;
-    let complete = false;
     while (current && !overlayByNode.has(current.backendNodeId)) {
       if (work++ % 256 === 0) {
         const pending = checkpoint();
@@ -85,16 +72,13 @@ export async function buildDocumentIndex<T extends DecodedNode>(
       visiting.add(current.backendNodeId);
       path.push(current);
       if (current.parentBackendNodeId === null) {
-        if (ancestryComplete) complete = !current.parentMissing && current.nodeType === 9;
         current = undefined;
         break;
       }
       current = nodes.get(current.parentBackendNodeId);
     }
-    if (current && overlayByNode.has(current.backendNodeId)) {
+    if (current && overlayByNode.has(current.backendNodeId))
       overlay = overlayByNode.get(current.backendNodeId)!;
-      if (ancestryComplete) complete = ancestryComplete.get(current.backendNodeId) === true;
-    }
     for (let i = path.length - 1; i >= 0; i--) {
       if (work++ % 256 === 0) {
         const pending = checkpoint();
@@ -103,80 +87,8 @@ export async function buildDocumentIndex<T extends DecodedNode>(
       const item = path[i];
       overlay = overlay || isOverlayHostNode(item.tag, Object.keys(item.attrs));
       overlayByNode.set(item.backendNodeId, overlay);
-      if (ancestryComplete) {
-        complete = complete && !item.parentMissing;
-        ancestryComplete.set(item.backendNodeId, complete);
-      }
       if (overlay) excludedBackendNodeIds.add(item.backendNodeId);
     }
   }
-  return { nodes, ...(ancestryComplete ? { ancestryComplete } : {}), excludedBackendNodeIds };
+  return { nodes, excludedBackendNodeIds };
 }
-
-export interface DocumentIdentity {
-  attachmentId: string;
-  target: CdpTarget;
-  frameId: string;
-  documentElementBackendNodeId: number;
-}
-
-/** Narrow input shared by the existing semantic scene/hover consumers. */
-export interface CapturedSceneInput {
-  nodes: CapturedNode[];
-  viewport: Viewport;
-  rootFrameId?: string;
-  excludedBackendNodeIds: ReadonlySet<number>;
-}
-
-export interface CaptureIssue {
-  /** Owner failure or inherited blockage; absent for other geometry failures. */
-  projectionIssue?: FrameProjectionIssue;
-  target: CdpTarget;
-  frameId?: string;
-  stage: "dom" | "ax" | "identity" | "ownership" | "geometry" | "forms";
-  reason:
-    | "document-changed"
-    | "identity-unavailable"
-    | "identity-unverified"
-    | "capture-unavailable"
-    | "frame-ownership-unresolved"
-    | "geometry-unavailable";
-}
-
-/** Shared per document; never retain the live GeometryContext in published facts. */
-export interface DocumentGeometry {
-  readonly projections: readonly GeometryProjection[];
-  readonly coordinates: SnapshotCoordinates;
-  /** Visual viewport scale (pinch), distinct from browser UI zoom. */
-  readonly pageScale?: number;
-}
-
-export interface DocumentFacts<T extends FrameOwnedAxNode> {
-  readonly geometry?: DocumentGeometry;
-  readonly frame: CdpFrame;
-  readonly identity?: DocumentIdentity;
-  readonly index: DocumentIndex;
-  readonly domNodes: CapturedNode[];
-  readonly axNodes: T[];
-}
-
-export interface ObservationFacts<T extends FrameOwnedAxNode> {
-  /** Whether visual collection was enabled; partial capture failures remain in issues. */
-  readonly visualFactsCollected: boolean;
-  readonly rootFrameId: string;
-  readonly viewport: Viewport;
-  readonly documents: readonly DocumentFacts<T>[];
-  readonly issues: readonly CaptureIssue[];
-  readonly startedAt: number;
-  readonly finishedAt: number;
-}
-
-export interface CapturedSurfaceProbe {
-  triggerBackendNodeId: number;
-  triggerPoint?: { x: number; y: number };
-  triggerAction: "hover" | "focus" | string;
-  subItems: string[];
-  confidence?: "high" | "medium" | "low";
-}
-
-export type { CapturedNode } from "./capture-types";

apps/extension/src/tools/vom/frame-capture.ts

@@ -0,0 +1,183 @@
+import type { CdpFrame, CdpFrameGraph } from "@/browser-driver/frame-graph";
+import { type GeometryProjection, projectRectToViewport } from "../geometry";
+import { GeometryContext } from "../geometry/frame-context";
+import { type CdpRunner, cdpRunnerForTarget, sendToCdpTarget } from "../shared";
+import { type CapturedNode, type CapturedViewModel, captureViewModel } from "./capture";
+import {
+  buildFrameDocuments,
+  type FrameAxBatch,
+  type FrameDocument,
+  type FrameOwnedAxNode,
+} from "./frame-document";
+
+export type FrameAxNode = FrameOwnedAxNode;
+export type CapturedFrameDocument<T extends FrameAxNode> = FrameDocument<T>;
+
+function throwIfAborted(signal?: AbortSignal): void {
+  if (signal?.aborted) throw new DOMException("observation aborted", "AbortError");
+}
+
+function isAbortError(err: unknown): boolean {
+  return err instanceof Error && err.name === "AbortError";
+}
+
+function transformFrameNodes(
+  nodes: CapturedNode[],
+  projection: GeometryProjection | null,
+): CapturedNode[] {
+  return nodes.map((node) => ({
+    ...node,
+    rect: projection
+      ? (() => {
+          const bounds = projectRectToViewport(node.rect, projection);
+          return bounds ? { x: bounds.x, y: bounds.y, w: bounds.width, h: bounds.height } : null;
+        })()
+      : null,
+  }));
+}
+
+async function captureMissingFrameDocuments(
+  cdp: CdpRunner,
+  tabId: number,
+  graph: CdpFrameGraph,
+  captured: CapturedViewModel,
+  geometry: GeometryContext,
+  signal?: AbortSignal,
+): Promise<void> {
+  if (!captured.frameNodes) captured.frameNodes = new Map();
+  if (!captured.frameOwnerBackendNodeIds) captured.frameOwnerBackendNodeIds = new Map();
+  if (!captured.frameParentIds) captured.frameParentIds = new Map();
+
+  for (const frame of graph.frames) {
+    if (!frame.target.sessionId || captured.frameNodes.has(frame.frameId)) continue;
+    try {
+      const child = await captureViewModel(cdpRunnerForTarget(cdp, frame.target), tabId, {
+        signal,
+        geometry,
+        target: frame.target,
+      });
+      if (child.frameExcludedBackendNodeIds?.size) {
+        captured.frameExcludedBackendNodeIds ??= new Map();
+        for (const [id, excluded] of child.frameExcludedBackendNodeIds)
+          captured.frameExcludedBackendNodeIds.set(id, excluded);
+      }
+      if (child.frameGeometryIssues?.length) {
+        (captured.frameGeometryIssues ??= []).push(...child.frameGeometryIssues);
+      }
+      let projection: GeometryProjection | null = null;
+      try {
+        projection = await geometry.targetProjection(frame.frameId);
+      } catch (err) {
+        if (isAbortError(err)) throw err;
+        console.debug("[bsk observation] child frame geometry projection failed", {
+          frameId: frame.frameId,
+          err,
+        });
+      }
+      const rootFrameId = child.rootFrameId ?? frame.frameId;
+      const childFrames = child.frameNodes ?? new Map<string, CapturedNode[]>();
+      if (!childFrames.has(rootFrameId)) childFrames.set(rootFrameId, child.nodes);
+      if (rootFrameId !== frame.frameId && !childFrames.has(frame.frameId)) {
+        childFrames.set(
+          frame.frameId,
+          child.nodes.map((node) => ({ ...node, frameId: frame.frameId })),
+        );
+      }
+      for (const [childFrameId, nodes] of childFrames) {
+        captured.frameNodes.set(childFrameId, transformFrameNodes(nodes, projection));
+      }
+      if (frame.ownerBackendNodeId !== undefined) {
+        captured.iframeNodes.set(
+          frame.ownerBackendNodeId,
+          captured.frameNodes.get(frame.frameId) ?? [],
+        );
+        captured.frameOwnerBackendNodeIds.set(frame.frameId, frame.ownerBackendNodeId);
+      }
+      if (frame.parentFrameId) captured.frameParentIds.set(frame.frameId, frame.parentFrameId);
+      for (const [childFrameId, ownerBackendNodeId] of child.frameOwnerBackendNodeIds ?? []) {
+        captured.frameOwnerBackendNodeIds.set(childFrameId, ownerBackendNodeId);
+      }
+      for (const [childFrameId, parentFrameId] of child.frameParentIds ?? []) {
+        captured.frameParentIds.set(childFrameId, parentFrameId);
+      }
+    } catch (err) {
+      if (isAbortError(err)) throw err;
+      console.debug("[bsk observation] child frame DOM capture failed", {
+        frameId: frame.frameId,
+        err,
+      });
+    }
+  }
+}
+
+async function captureAxTrees<T extends FrameAxNode>(
+  cdp: CdpRunner,
+  tabId: number,
+  discoveredFrames: CdpFrame[],
+  captured: CapturedViewModel,
+  signal?: AbortSignal,
+): Promise<FrameAxBatch<T>[]> {
+  let frames = [...discoveredFrames];
+  const capturedFrameIds = [...(captured.frameNodes?.keys() ?? [])];
+  if (frames.length === 0) {
+    const rootFrameId = captured.rootFrameId ?? capturedFrameIds[0] ?? "root";
+    frames = [{ frameId: rootFrameId, target: { tabId } }];
+  }
+  for (const frameId of capturedFrameIds) {
+    if (!frames.some((frame) => frame.frameId === frameId)) {
+      frames.push({ frameId, target: { tabId } });
+    }
+  }
+
+  let firstFailure: unknown;
+  const trees = await Promise.all(
+    frames.map(async (frame): Promise<FrameAxBatch<T>> => {
+      try {
+        throwIfAborted(signal);
+        await sendToCdpTarget(cdp, frame.target, "Accessibility.enable", {});
+        const result = await sendToCdpTarget<{ nodes?: T[] }>(
+          cdp,
+          frame.target,
+          "Accessibility.getFullAXTree",
+          frame.frameId === "root" ? {} : { frameId: frame.frameId },
+        );
+        throwIfAborted(signal);
+        return {
+          frame,
+          nodes: result.nodes ?? [],
+        };
+      } catch (err) {
+        if (isAbortError(err)) throw err;
+        firstFailure ??= err;
+        console.debug("[bsk observation] frame AX capture failed", {
+          frameId: frame.frameId,
+          err,
+        });
+        return { frame, nodes: [] };
+      }
+    }),
+  );
+  const capturedNodeCount = [...captured.iframeNodes.values()].reduce(
+    (count, nodes) => count + nodes.length,
+    captured.nodes.length,
+  );
+  if (firstFailure && capturedNodeCount === 0 && trees.every((tree) => tree.nodes.length === 0)) {
+    throw firstFailure;
+  }
+  return trees;
+}
+
+export async function captureFrameData<T extends FrameAxNode>(
+  cdp: CdpRunner,
+  tabId: number,
+  captured: CapturedViewModel,
+  signal?: AbortSignal,
+  geometry = new GeometryContext(cdp, tabId, undefined, signal),
+): Promise<CapturedFrameDocument<T>[]> {
+  const graph = await geometry.graph();
+  const frames = graph?.frames ?? [];
+  if (graph) await captureMissingFrameDocuments(cdp, tabId, graph, captured, geometry, signal);
+  throwIfAborted(signal);
+  const batches = await captureAxTrees<T>(cdp, tabId, frames, captured, signal);
+  return buildFrameDocuments(graph, batches, captured, signal);
+}

apps/extension/src/tools/vom/frame-document.ts

@@ -32,6 +32,8 @@ export interface FrameDomInput {
   nodes: CapturedNode[];
   rootFrameId?: string;
   frameNodes?: ReadonlyMap<string, CapturedNode[]>;
+  frameOwnerBackendNodeIds?: ReadonlyMap<string, number>;
+  frameParentIds?: ReadonlyMap<string, string>;
   frameExcludedBackendNodeIds?: ReadonlyMap<string, ReadonlySet<number>>;
 }
 
@@ -57,13 +59,27 @@ function targetBackendKey(target: CdpTarget, backendNodeId: number): string {
 function frameList<T extends FrameOwnedAxNode>(
   graph: CdpFrameGraph | null,
   batches: FrameAxBatch<T>[],
+  captured: FrameDomInput,
 ): CdpFrame[] {
   const frames = new Map<string, CdpFrame>();
   for (const frame of graph?.frames ?? []) frames.set(frame.frameId, frame);
   for (const batch of batches) {
     if (!frames.has(batch.frame.frameId)) frames.set(batch.frame.frameId, batch.frame);
   }
-  return [...frames.values()];
+  for (const frameId of captured.frameNodes?.keys() ?? []) {
+    if (!frames.has(frameId))
+      frames.set(frameId, { frameId, target: { tabId: batches[0]?.frame.target.tabId ?? 0 } });
+  }
+  return [...frames.values()].map((frame) => {
+    const ownerBackendNodeId =
+      frame.ownerBackendNodeId ?? captured.frameOwnerBackendNodeIds?.get(frame.frameId);
+    const parentFrameId = frame.parentFrameId ?? captured.frameParentIds?.get(frame.frameId);
+    return {
+      ...frame,
+      ...(ownerBackendNodeId !== undefined ? { ownerBackendNodeId } : {}),
+      ...(parentFrameId ? { parentFrameId } : {}),
+    };
+  });
 }
 
 export async function buildFrameDocuments<T extends FrameOwnedAxNode>(
@@ -71,11 +87,10 @@ export async function buildFrameDocuments<T extends FrameOwnedAxNode>(
   batches: FrameAxBatch<T>[],
   captured: FrameDomInput,
   signal?: AbortSignal,
-  unresolved?: (frame: CdpFrame) => void,
 ): Promise<FrameDocument<T>[]> {
   const checkpoint = createCaptureCheckpoint(signal);
   let work = 0;
-  const frames = frameList(graph, batches);
+  const frames = frameList(graph, batches, captured);
   const frameById = new Map(frames.map((frame) => [frame.frameId, frame]));
   const rootFrameId = graph?.rootFrameId ?? captured.rootFrameId ?? frames[0]?.frameId;
   const domNodesForFrame = (frameId: string): CapturedNode[] =>
@@ -101,7 +116,6 @@ export async function buildFrameDocuments<T extends FrameOwnedAxNode>(
       }
       nodeById.set(node.nodeId, node);
     }
-    let reported = false;
     const ownershipByNodeId = new Map<string, Ownership>();
     for (const node of batch.nodes) {
       const path: T[] = [];
@@ -120,18 +134,8 @@ export async function buildFrameDocuments<T extends FrameOwnedAxNode>(
         }
         if (visiting.has(current.nodeId)) break;
         visiting.add(current.nodeId);
-        if (current.frameId) {
-          const frame = frameById.get(current.frameId);
-          // An explicit contradiction must not fall through to a guessed owner.
-          if (!frame || cdpTargetKey(frame.target) !== cdpTargetKey(batch.frame.target)) {
-            if (!reported) {
-              unresolved?.(batch.frame);
-              reported = true;
-            }
-            ownership = { frameId: "", strength: 0 };
-            break;
-          }
-          ownership = { frameId: frame.frameId, strength: 4 };
+        if (current.frameId && frameById.has(current.frameId)) {
+          ownership = { frameId: current.frameId, strength: 4 };
           ownershipByNodeId.set(current.nodeId, ownership);
           break;
         }
@@ -156,7 +160,6 @@ export async function buildFrameDocuments<T extends FrameOwnedAxNode>(
         ownershipByNodeId.set(path[i].nodeId, ownership);
       }
       if (!ownershipByNodeId.has(node.nodeId)) ownershipByNodeId.set(node.nodeId, ownership);
-      if (!ownership.frameId) continue;
       const key = targetNodeKey(batch.frame.target, node.nodeId);
       const existing = candidates.get(key);
       if (!existing || ownership.strength > existing.ownership.strength) {

apps/extension/src/tools/vom/normalize.ts

@@ -1,54 +1,25 @@
-import type { Viewport } from "@browser-skill/vom";
-import { type CdpFrame, type CdpTarget, cdpTargetKey } from "@/browser-driver/frame-graph";
-import { type GeometryProjection, projectRectToViewport } from "../geometry";
+import type { CdpTarget } from "@/browser-driver/frame-graph";
 import {
   type FrameProjectionState,
   projectSnapshotRect,
-  type SnapshotCoordinates,
-  snapshotCoordinates,
   snapshotViewportRect,
 } from "../geometry/coordinate-types";
-import {
-  GeometryContext,
-  type LayoutMetrics,
-  snapshotLayoutScale,
-} from "../geometry/frame-context";
-import {
-  createCaptureCheckpoint,
-  isAbortError as isCaptureAbort,
-  throwIfAborted as throwCaptureAborted,
-} from "./capture-abort";
-import {
-  buildDocumentIndex,
-  type CaptureIssue,
-  type DocumentGeometry,
-  type DocumentIndex,
-  type NodeFacts,
-} from "./facts";
-import {
-  BASIC_SNAPSHOT,
-  decodeDocument,
-  type SnapshotDocument,
-  type SnapshotProfile,
-  type SnapshotReply,
-  snapshotFrameId,
-} from "./snapshot";
+import { createCaptureCheckpoint } from "./capture-abort";
+import { buildDocumentIndex, type DocumentIndex, type NodeFacts } from "./facts";
+import { decodeDocument, type SnapshotDocument } from "./snapshot";
 
 export interface FrameContext {
   frameId?: string;
   ownerFrameBackendNodeId: number | null;
-  projection: FrameProjectionState | null;
-  targetProjection?: GeometryProjection | null;
+  projection: FrameProjectionState;
   target: CdpTarget;
-  coordinates: SnapshotCoordinates | null;
-  pageScale?: number;
+  scrollX: number;
+  scrollY: number;
 }
 
 export interface NormalizedDocument {
-  geometry?: DocumentGeometry;
   nodes: NodeFacts[];
   index: DocumentIndex;
-  documentElementBackendNodeId?: number;
 }
 
 /** Interpret one document using a supplied projection. No live reads or frame scheduling. */
@@ -57,9 +28,8 @@ export async function normalizeDocument(
   strings: string[],
   context: FrameContext,
   signal?: AbortSignal,
-  profile: SnapshotProfile = BASIC_SNAPSHOT,
 ): Promise<NormalizedDocument> {
-  const decoded = await decodeDocument(doc, strings, signal, profile);
+  const decoded = await decodeDocument(doc, strings, signal);
   const checkpoint = createCaptureCheckpoint(signal);
   const nodes: NodeFacts[] = [];
   for (let i = 0; i < decoded.nodes.length; i++) {
@@ -68,24 +38,16 @@ export async function normalizeDocument(
       if (pending) await pending;
     }
     const node = decoded.nodes[i];
-    const bounds = node.layout?.bounds ?? [];
     const input = snapshotViewportRect(
-      bounds,
+      node.layout?.bounds ?? [],
       { target: context.target, frameId: context.frameId },
-      context.coordinates,
+      { x: context.scrollX, y: context.scrollY },
     );
     const local = input?.rect;
-    let rect =
-      input && context.projection?.status === "available"
+    const rect =
+      input && context.projection.status === "available"
         ? projectSnapshotRect(input, context.projection.projection)
         : null;
-    if (rect && context.targetProjection !== undefined)
-      rect = context.targetProjection
-        ? projectRectToViewport(
-            { x: rect.x, y: rect.y, w: rect.width, h: rect.height },
-            context.targetProjection,
-          )
-        : null;
     const visibility = node.layout?.styles.visibility || "visible";
     const opacity = node.layout?.styles.opacity || "1";
     nodes.push({
@@ -95,262 +57,17 @@ export async function normalizeDocument(
       localRect: local ? { x: local.x, y: local.y, w: local.width, h: local.height } : null,
       rect: rect ? { x: rect.x, y: rect.y, w: rect.width, h: rect.height } : null,
       rendered:
-        bounds.length >= 4 &&
-        bounds.slice(0, 4).every(Number.isFinite) &&
-        bounds[2] > 0 &&
-        bounds[3] > 0 &&
+        !!local &&
         visibility !== "hidden" &&
         visibility !== "collapse" &&
         (Number.parseFloat(opacity) || 0) > 0,
     });
   }
-  const index = await buildDocumentIndex(nodes, signal, profile.includeVisualFacts);
+  const index = await buildDocumentIndex(nodes, signal);
   return {
     nodes: nodes.filter(
       (node) => !node.tag.startsWith("#") && !index.excludedBackendNodeIds.has(node.backendNodeId),
     ),
     index,
-    ...(profile.includeVisualFacts &&
-    context.coordinates &&
-    context.projection?.status === "available" &&
-    context.targetProjection !== null
-      ? {
-          geometry: {
-            projections: [
-              context.projection.projection.geometry,
-              ...(context.targetProjection ? [context.targetProjection] : []),
-            ],
-            coordinates: context.coordinates,
-            pageScale: context.pageScale,
-          },
-        }
-      : {}),
-    documentElementBackendNodeId: nodes.find(
-      (node) =>
-        node.nodeType === 1 &&
-        node.parentBackendNodeId !== null &&
-        index.nodes.get(node.parentBackendNodeId)?.nodeType === 9,
-    )?.backendNodeId,
   };
 }
-
-export interface NormalizedFrameDocument extends NormalizedDocument {
-  frame: CdpFrame;
-}
-
-/** One target's snapshot. Source ownership is checked before interpreting any
- * coordinates. Snapshot and live quad coordinates are deliberately not conflated. */
-export async function normalizeSnapshot(
-  snapshot: SnapshotReply,
-  target: CdpTarget,
-  frames: readonly CdpFrame[],
-  geometry: GeometryContext,
-  issues: CaptureIssue[],
-  signal?: AbortSignal,
-  rootFrameId?: string,
-  profile: SnapshotProfile = BASIC_SNAPSHOT,
-): Promise<NormalizedFrameDocument[]> {
-  const strings = snapshot.strings ?? [];
-  const raw = snapshot.documents ?? [];
-  const ownerIds = new Set<number>();
-  for (const document of raw) {
-    for (const index of document.nodes?.contentDocumentIndex?.index ?? []) {
-      const id = document.nodes?.backendNodeId?.[index];
-      if (id !== undefined) ownerIds.add(id);
-    }
-  }
-  geometry.registerSnapshotOwners(target, ownerIds);
-  const frameById = new Map(frames.map((frame) => [frame.frameId, frame]));
-  const sources = new Map<string, SnapshotDocument>();
-  for (const doc of raw) {
-    const id = snapshotFrameId(doc, strings);
-    if (!id || !frameById.has(id) || sources.has(id)) {
-      issues.push({
-        target,
-        frameId: id,
-        stage: "ownership",
-        reason: "frame-ownership-unresolved",
-      });
-      continue;
-    }
-    sources.set(id, doc);
-  }
-  let metrics: LayoutMetrics = {};
-  try {
-    metrics = await geometry.layoutMetrics(target);
-  } catch (error) {
-    if (isCaptureAbort(error)) throw error;
-  }
-  const viewport: Viewport = {
-    width: metrics.cssLayoutViewport?.clientWidth ?? 0,
-    height: metrics.cssLayoutViewport?.clientHeight ?? 0,
-  };
-  const layoutUnitsPerCssPixel = snapshotLayoutScale(metrics);
-  const viewportAvailable = [viewport.width, viewport.height].every(
-    (size) => Number.isFinite(size) && size > 0,
-  );
-
-  const children = new Map<string, CdpFrame[]>();
-  const pending: CdpFrame[] = [];
-  for (const frame of frames) {
-    if (!frame.parentFrameId || !frameById.has(frame.parentFrameId)) pending.push(frame);
-    else {
-      const siblings = children.get(frame.parentFrameId);
-      if (siblings) siblings.push(frame);
-      else children.set(frame.parentFrameId, [frame]);
-    }
-  }
-  const projections = new Map<string, FrameProjectionState | null>();
-  const result: NormalizedFrameDocument[] = [];
-  let targetProjection: GeometryProjection | null = null;
-  const targetRoot = rootFrameId ? frameById.get(rootFrameId) : undefined;
-  if (target.sessionId && targetRoot) {
-    try {
-      const known = await geometry.frame(targetRoot.frameId);
-      if (known && cdpTargetKey(known.target) === cdpTargetKey(target))
-        targetProjection = await geometry.targetProjection(targetRoot.frameId);
-    } catch (error) {
-      if (isCaptureAbort(error)) throw error;
-    }
-  }
-  const checkpoint = createCaptureCheckpoint(signal);
-  const visited = new Set<string>();
-  const remaining = frames[Symbol.iterator]();
-  for (let cursor = 0; visited.size < frames.length; cursor++) {
-    if (cursor >= pending.length) {
-      let next = remaining.next();
-      while (!next.done && visited.has(next.value.frameId)) next = remaining.next();
-      if (next.done) break;
-      pending.push(next.value);
-    }
-    if (cursor % 256 === 0) {
-      const pending = checkpoint();
-      if (pending) await pending;
-    }
-    const frame = pending[cursor];
-    if (visited.has(frame.frameId)) continue;
-    visited.add(frame.frameId);
-    for (const child of children.get(frame.frameId) ?? []) pending.push(child);
-    const doc = sources.get(frame.frameId);
-    if (!doc) continue;
-    const source = { target, frameId: frame.frameId };
-    const coordinates = snapshotCoordinates(
-      doc,
-      layoutUnitsPerCssPixel,
-      frame.frameId === rootFrameId
-        ? { x: metrics.cssLayoutViewport?.pageX, y: metrics.cssLayoutViewport?.pageY }
-        : undefined,
-    );
-    let state: FrameProjectionState | null =
-      frame.frameId === rootFrameId
-        ? viewportAvailable && coordinates
-          ? {
-              status: "available",
-              projection: {
-                source,
-                geometry: { sourceClips: [], edges: [], topViewport: viewport },
-              },
-            }
-          : { status: "unavailable", source, reason: "snapshot-coordinates-unavailable" }
-        : (projections.get(frame.frameId) ?? null);
-    if (!state && frame.frameId !== rootFrameId)
-      issues.push({
-        target,
-        frameId: frame.frameId,
-        stage: "ownership",
-        reason: "frame-ownership-unresolved",
-      });
-    if (!coordinates && (!state || state.status === "available"))
-      state = { status: "unavailable", source, reason: "snapshot-coordinates-unavailable" };
-    projections.set(frame.frameId, state);
-    const projection = state?.status === "available" ? state.projection : null;
-    if (!projection || (target.sessionId && !targetProjection))
-      issues.push({
-        target,
-        frameId: frame.frameId,
-        stage: "geometry",
-        reason: "geometry-unavailable",
-        ...(state && state.status !== "available" ? { projectionIssue: state } : {}),
-      });
-
-    // Only direct siblings share this pool. Keep normalization in its existing
-    // breadth-first order, independent of owner read completion order.
-    const siblings = (children.get(frame.frameId) ?? []).filter((child) =>
-      sources.has(child.frameId),
-    );
-    const edge = projection?.geometry.edges[0];
-    const clips = edge
-      ? [edge.destinationQuad, ...(edge.destinationClips ?? [])]
-      : (projection?.geometry.sourceClips ?? []);
-    let next = 0;
-    let failure: unknown;
-    await Promise.all(
-      Array.from({ length: Math.min(4, siblings.length) }, async () => {
-        while (next < siblings.length && !signal?.aborted && !failure) {
-          const child = siblings[next++];
-          const childSource = { target, frameId: child.frameId };
-          if (!projection) {
-            projections.set(
-              child.frameId,
-              state && state.status !== "available"
-                ? {
-                    status: "blocked",
-                    source: childSource,
-                    cause: state.status === "blocked" ? state.cause : state,
-                  }
-                : null,
-            );
-            continue;
-          }
-          if (child.ownerBackendNodeId === undefined) {
-            projections.set(child.frameId, null);
-            continue;
-          }
-          if (!snapshotCoordinates(sources.get(child.frameId)!, layoutUnitsPerCssPixel)) {
-            projections.set(child.frameId, {
-              status: "unavailable",
-              source: childSource,
-              reason: "snapshot-coordinates-unavailable",
-            });
-            continue;
-          }
-          try {
-            projections.set(
-              child.frameId,
-              await geometry.snapshotProjection(
-                childSource,
-                child.ownerBackendNodeId,
-                clips,
-                viewport,
-              ),
-            );
-          } catch (error) {
-            failure ??= error;
-          }
-        }
-      }),
-    );
-    // Join active reads and their cleanup before returning cancellation.
-    if (failure) throw failure;
-    throwCaptureAborted(signal);
-    const normalized = await normalizeDocument(
-      doc,
-      strings,
-      {
-        frameId: frame.frameId,
-        ownerFrameBackendNodeId: frame.ownerBackendNodeId ?? null,
-        projection: state,
-        ...(profile.includeVisualFacts
-          ? { pageScale: metrics.cssVisualViewport?.scale ?? metrics.visualViewport?.scale }
-          : {}),
-        target,
-        ...(target.sessionId ? { targetProjection } : {}),
-        coordinates,
-      },
-      signal,
-      profile,
-    );
-    result.push({ ...normalized, frame });
-  }
-  return result;
-}

apps/extension/src/tools/vom/snapshot.ts

@@ -1,4 +1,3 @@
-import { type CdpFrame, type CdpTarget, cdpTargetKey } from "@/browser-driver/frame-graph";
 import { createCaptureCheckpoint } from "./capture-abort";
 import type { CapturedNode } from "./capture-types";
 import type { DecodedDocument, DecodedNode } from "./facts";
@@ -9,30 +8,9 @@ export const REQUESTED_STYLES = [
   "visibility",
   "opacity",
 ] as const;
-export const VISUAL_STYLES = [
-  ...REQUESTED_STYLES,
-  "display",
-  "overflow-x",
-  "overflow-y",
-  "transform",
-  "zoom",
-  "clip-path",
-  "mask-image",
-  "rotate",
-  "scale",
-  "perspective",
-  "clip",
-  "contain",
-  "overflow-clip-margin",
-] as const;
-
-/** The same profile owns request columns, decoding and visual-only derived facts. */
-export const BASIC_SNAPSHOT = {
-  includeVisualFacts: false,
-  computedStyles: REQUESTED_STYLES,
-} as const;
-export const VISUAL_SNAPSHOT = { includeVisualFacts: true, computedStyles: VISUAL_STYLES } as const;
-export type SnapshotProfile = typeof BASIC_SNAPSHOT | typeof VISUAL_SNAPSHOT;
+const STYLE_COL = Object.fromEntries(
+  REQUESTED_STYLES.map((name, index) => [name, index]),
+) as Record<(typeof REQUESTED_STYLES)[number], number>;
 /** Sparse array format Chrome uses for infrequently-set per-node fields. */
 interface SparseArray {
   index: number[];
@@ -45,7 +23,6 @@ interface RareBooleanData {
 
 export interface SnapshotDocument {
   frameId?: string | number;
-  documentURL?: number;
   scrollOffsetX?: number;
   scrollOffsetY?: number;
   nodes?: {
@@ -70,7 +47,6 @@ export interface SnapshotDocument {
     nodeIndex?: number[];
     styles?: number[][];
     bounds?: number[][];
-    clientRects?: number[][];
     paintOrders?: number[];
   };
 }
@@ -125,7 +101,6 @@ export async function decodeDocument(
   doc: SnapshotDocument,
   strings: string[],
   signal?: AbortSignal,
-  profile: SnapshotProfile = BASIC_SNAPSHOT,
 ): Promise<DecodedDocument> {
   const checkpoint = createCaptureCheckpoint(signal);
   const dn = doc.nodes;
@@ -193,17 +168,13 @@ export async function decodeDocument(
     const li = layoutByNode.get(n);
     const styleRow = li === undefined ? [] : (dl?.styles?.[li] ?? []);
     const styles: Record<string, string> = {};
-    for (let i = 0; i < profile.computedStyles.length; i++)
-      styles[profile.computedStyles[i]] = str(strings, styleRow[i]);
+    for (const name of REQUESTED_STYLES) styles[name] = str(strings, styleRow[STYLE_COL[name]]);
     const layout =
       li === undefined
         ? undefined
         : {
-            boundsSpace: "snapshot-document-layout" as const,
+            boundsSpace: "snapshot-document-css" as const,
             bounds: dl?.bounds?.[li],
-            ...(profile.includeVisualFacts && dl?.clientRects?.[li]
-              ? { clientRect: dl.clientRects[li] }
-              : {}),
             styles,
           };
 
@@ -227,10 +198,6 @@ export async function decodeDocument(
       backendNodeId,
       nodeType: dn.nodeType?.[n],
       parentBackendNodeId,
-      ...(profile.includeVisualFacts &&
-      (dn.parentIndex?.[n] === undefined || (parentIdx >= 0 && parentBackendNodeId === null))
-        ? { parentMissing: true }
-        : {}),
 
       tag,
       attrs,
@@ -255,68 +222,3 @@ export async function decodeDocument(
   }
   return { nodes };
 }
-
-/** Snapshot membership and same-target edges are current response evidence.
- * The earlier graph only supplies compatible metadata and cross-target edges. */
-export function describeSnapshotFrames(
-  snapshot: SnapshotReply,
-  target: CdpTarget,
-  hintById: ReadonlyMap<string, CdpFrame>,
-  pageUrl?: string,
-): { frames: CdpFrame[]; ids: Set<string>; rootFrameId?: string } {
-  const raw = snapshot.documents ?? [];
-  const strings = snapshot.strings ?? [];
-  const ids = new Set<string>();
-  const invalid = new Set<string>();
-  const frames = raw.map((doc) => {
-    const frameId = snapshotFrameId(doc, strings);
-    if (!frameId) return undefined;
-    if (ids.has(frameId)) invalid.add(frameId);
-    ids.add(frameId);
-    const hint = hintById.get(frameId);
-    const compatible =
-      hint && cdpTargetKey(hint.target) === cdpTargetKey(target) ? hint : undefined;
-    const url =
-      (doc.documentURL === undefined ? undefined : strings[doc.documentURL]) || compatible?.url;
-    return { frameId, target, ...(url ? { url } : {}) } as CdpFrame;
-  });
-  const root = frames[0];
-  if (root) {
-    const hint = hintById.get(root.frameId);
-    const parent = hint?.parentFrameId ? hintById.get(hint.parentFrameId) : undefined;
-    if (
-      target.sessionId &&
-      hint &&
-      cdpTargetKey(hint.target) === cdpTargetKey(target) &&
-      parent &&
-      cdpTargetKey(parent.target) !== cdpTargetKey(target)
-    ) {
-      root.parentFrameId = parent.frameId;
-      root.ownerBackendNodeId = hint.ownerBackendNodeId;
-    }
-    if (!target.sessionId && !root.url && pageUrl) root.url = pageUrl;
-  }
-  const owned = new Set<string>();
-  for (let i = 0; i < raw.length; i++) {
-    const edges = raw[i].nodes?.contentDocumentIndex;
-    const parent = frames[i];
-    if (!parent || !edges) continue;
-    for (let e = 0; e < edges.index.length; e++) {
-      const child = frames[edges.value[e]];
-      const owner = raw[i].nodes?.backendNodeId?.[edges.index[e]];
-      if (!child || owner === undefined) continue;
-      if (child === root || child === parent || owned.has(child.frameId)) {
-        invalid.add(child.frameId);
-        continue;
-      }
-      owned.add(child.frameId);
-      child.parentFrameId = parent.frameId;
-      child.ownerBackendNodeId = owner;
-    }
-  }
-  return {
-    frames: frames.filter((frame): frame is CdpFrame => !!frame && !invalid.has(frame.frameId)),
-    ids,
-    rootFrameId: root?.frameId,
-  };
-}

apps/extension/src/tools/vom/visual-dedup.ts

@@ -1,64 +0,0 @@
-import { createCaptureCheckpoint } from "./capture-abort";
-import type { VisualCandidate, VisualDiscoveryResult } from "./visual-discovery";
-
-export const MAX_VISUAL_DEDUP_KEYS = 50_000;
-
-export interface VisualDedupResult extends VisualDiscoveryResult {
-  /** Known valid candidates in this capture, not the total Canvas count on the page. */
-  readonly candidateCount: number;
-  /** Candidates actually removed by exact coverage deduplication. */
-  readonly deduplicatedCount: number;
-  readonly dedupDegraded: boolean;
-}
-
-/** Keep the first real anchor for each exact DOM/parent/crop key, in encounter order.
- * Once the key set is full, unknown keys pass through: capacity never drops candidates. */
-export async function deduplicateVisualCandidates(
-  discovery: VisualDiscoveryResult,
-  signal?: AbortSignal,
-): Promise<VisualDedupResult> {
-  const checkpoint = createCaptureCheckpoint(signal);
-  const keys = new Set<string>();
-  const candidates: VisualCandidate[] = [];
-  let deduplicatedCount = 0;
-  let dedupDegraded = false;
-  for (let i = 0; i < discovery.candidates.length; i++) {
-    if (i % 256 === 0) {
-      const pending = checkpoint();
-      if (pending) await pending;
-    }
-    const candidate = discovery.candidates[i];
-    const {
-      document,
-      region: { crop },
-    } = candidate;
-    const key = JSON.stringify([
-      document.attachmentId,
-      document.target.tabId,
-      document.target.sessionId ?? null,
-      document.frameId,
-      document.documentElementBackendNodeId,
-      candidate.parentBackendNodeId,
-      crop.x,
-      crop.y,
-      crop.width,
-      crop.height,
-    ]);
-    if (keys.has(key)) {
-      deduplicatedCount++;
-      continue;
-    }
-    if (keys.size < MAX_VISUAL_DEDUP_KEYS) keys.add(key);
-    else dedupDegraded = true;
-    candidates.push(candidate);
-  }
-  const pending = checkpoint();
-  if (pending) await pending;
-  return {
-    ...discovery,
-    candidates,
-    candidateCount: discovery.candidates.length,
-    deduplicatedCount,
-    dedupDegraded,
-  };
-}

apps/extension/src/tools/vom/visual-discovery.ts

@@ -1,321 +0,0 @@
-import { type CdpTarget } from "@/browser-driver/frame-graph";
-import type { ViewportRect } from "../geometry";
-import { createCaptureCheckpoint } from "./capture-abort";
-import type {
-  CaptureIssue,
-  DocumentFacts,
-  DocumentIdentity,
-  NodeFacts,
-  ObservationFacts,
-} from "./facts";
-import type { FrameOwnedAxNode } from "./frame-document";
-import {
-  EMPTY_VISUAL_CONTEXT,
-  extendVisualContext,
-  projectVisualBox,
-  resolveVisualRegion,
-  type VisualContext,
-  type VisualIssueReason,
-  type VisualRegionResult,
-  visualProjectionIssue,
-} from "./visual-region";
-
-export interface VisualCandidate {
-  readonly document: DocumentIdentity;
-  readonly backendNodeId: number;
-  readonly parentBackendNodeId: number | null;
-  readonly label?: string;
-  readonly region: Extract<VisualRegionResult, { status: "available" }>;
-}
-
-export type VisualDiscoveryIssue =
-  | {
-      readonly reason: "visual-facts-not-collected";
-      readonly target?: never;
-      readonly frameId?: never;
-      readonly backendNodeId?: never;
-    }
-  | {
-      readonly target: CdpTarget;
-      readonly frameId: string;
-      readonly backendNodeId?: number;
-      readonly reason: VisualIssueReason;
-    };
-
-export interface VisualDiscoveryResult {
-  readonly candidates: readonly VisualCandidate[];
-  readonly issues: readonly VisualDiscoveryIssue[];
-  /** Preserve upstream failures, including those that do not invalidate Canvas geometry. */
-  readonly captureIssues: readonly CaptureIssue[];
-  readonly complete: boolean;
-}
-
-type Document = DocumentFacts<FrameOwnedAxNode>;
-interface NodeContext {
-  self: VisualContext;
-  children: VisualContext;
-}
-
-function viewportRect(
-  rect: { x: number; y: number; w: number; h: number } | null | undefined,
-): ViewportRect | null {
-  return rect ? { x: rect.x, y: rect.y, width: rect.w, height: rect.h } : null;
-}
-
-/** Client offsets are unscaled local CSS units. Only ordinary, untransformed
- * overflow chains consume this adapter; other combinations are rejected by policy. */
-function clientBox(node: NodeFacts, document: Document): ViewportRect | null {
-  const client = node.layout?.clientRect;
-  const bounds = node.layout?.bounds;
-  const border =
-    node.localRect ??
-    (bounds?.length === 4 && bounds.every(Number.isFinite) && document.geometry
-      ? {
-          x:
-            bounds[0] / document.geometry.coordinates.layoutUnitsPerCssPixel -
-            document.geometry.coordinates.scrollCss.x,
-          y:
-            bounds[1] / document.geometry.coordinates.layoutUnitsPerCssPixel -
-            document.geometry.coordinates.scrollCss.y,
-        }
-      : null);
-  if (
-    !client ||
-    client.length !== 4 ||
-    !client.every(Number.isFinite) ||
-    client[2] < 0 ||
-    client[3] < 0 ||
-    !border ||
-    !document.geometry
-  )
-    return null;
-  return projectVisualBox(
-    { x: border.x + client[0], y: border.y + client[1], width: client[2], height: client[3] },
-    document.geometry.projections,
-  );
-}
-
-/** Pure Facts consumer: no CDP, ref registration, selection, or semantic keep/drop.
- * Both frame and node ancestry are memoized in this call, using iterative walks. */
-export async function discoverVisualCandidates(
-  facts: ObservationFacts<FrameOwnedAxNode>,
-  signal?: AbortSignal,
-): Promise<VisualDiscoveryResult> {
-  const checkpoint = createCaptureCheckpoint(signal);
-  if (!facts.visualFactsCollected)
-    return {
-      candidates: [],
-      complete: false,
-      captureIssues: facts.issues,
-      issues: [{ reason: "visual-facts-not-collected" }],
-    };
-  let work = 0;
-  const candidates: VisualCandidate[] = [];
-  const issues: VisualDiscoveryIssue[] = [];
-  const documents = new Map(facts.documents.map((document) => [document.frame.frameId, document]));
-  const contexts = new Map<string, Map<number, NodeContext>>();
-  const roots = new Map<string, VisualContext>();
-
-  async function nodeContext(document: Document, id: number): Promise<NodeContext> {
-    const cache = contexts.get(document.frame.frameId)!;
-    const path: NodeFacts[] = [];
-    let node = document.index.nodes.get(id);
-    while (node && !cache.has(node.backendNodeId)) {
-      if (work++ % 256 === 0) {
-        const pending = checkpoint();
-        if (pending) await pending;
-      }
-      if (
-        !document.index.ancestryComplete?.get(node.backendNodeId) ||
-        path.length >= document.index.nodes.size
-      ) {
-        const incomplete = {
-          ...roots.get(document.frame.frameId)!,
-          issue: roots.get(document.frame.frameId)!.issue ?? ("ancestry-incomplete" as const),
-        };
-        cache.set(node.backendNodeId, { self: incomplete, children: incomplete });
-        break;
-      }
-      path.push(node);
-      node =
-        node.parentBackendNodeId === null
-          ? undefined
-          : document.index.nodes.get(node.parentBackendNodeId);
-    }
-    let parent = node
-      ? cache.get(node.backendNodeId)!.children
-      : roots.get(document.frame.frameId)!;
-    for (let i = path.length - 1; i >= 0; i--) {
-      if (work++ % 256 === 0) {
-        const pending = checkpoint();
-        if (pending) await pending;
-      }
-      const current = path[i];
-      let self = parent;
-      let children = parent;
-      if (document.index.excludedBackendNodeIds.has(current.backendNodeId)) {
-        self = children = { ...parent, hidden: true };
-      } else if (current.nodeType === 1) {
-        if (!current.layout) {
-          // An element without layout is not evidence that descendants are hidden
-          // (e.g. a boxless ancestor). Keep the missing style evidence explicit.
-          self = children = { ...parent, issue: parent.issue ?? "facts-unavailable" };
-        } else if (document.identity) {
-          const ancestor = {
-            document: document.identity,
-            backendNodeId: current.backendNodeId,
-            styles: current.layout.styles,
-            clientBox: clientBox(current, document),
-          };
-          children = extendVisualContext(
-            parent,
-            ancestor,
-            current.tag !== "iframe" && current.tag !== "frame",
-          );
-          self = current.tag === "canvas" ? extendVisualContext(parent, ancestor, false) : children;
-        }
-      }
-      const result = { self, children };
-      cache.set(current.backendNodeId, result);
-      parent = children;
-    }
-    return (
-      cache.get(id) ?? {
-        self: { ...parent, issue: "ancestry-incomplete" },
-        children: { ...parent, issue: "ancestry-incomplete" },
-      }
-    );
-  }
-
-  // Process parent documents first, independent of snapshot/target completion order.
-  for (const document of facts.documents) {
-    const path: Document[] = [];
-    const visiting = new Set<string>();
-    let current: Document | undefined = document;
-    while (current && !roots.has(current.frame.frameId)) {
-      if (work++ % 256 === 0) {
-        const pending = checkpoint();
-        if (pending) await pending;
-      }
-      if (visiting.has(current.frame.frameId)) {
-        roots.set(current.frame.frameId, {
-          ...EMPTY_VISUAL_CONTEXT,
-          issue: "ownership-unresolved",
-        });
-        contexts.set(current.frame.frameId, new Map());
-        break;
-      }
-      visiting.add(current.frame.frameId);
-      path.push(current);
-      current = current.frame.parentFrameId
-        ? documents.get(current.frame.parentFrameId)
-        : undefined;
-    }
-    for (let i = path.length - 1; i >= 0; i--) {
-      const doc = path[i];
-      const { frame } = doc;
-      let root: VisualContext = roots.get(frame.frameId) ?? EMPTY_VISUAL_CONTEXT;
-      if (frame.parentFrameId) {
-        const parent = documents.get(frame.parentFrameId);
-        if (
-          !parent ||
-          !roots.has(parent.frame.frameId) ||
-          frame.ownerBackendNodeId === undefined ||
-          !parent.identity
-        ) {
-          root = { ...root, issue: "ownership-unresolved" };
-        } else {
-          const owner = parent.index.nodes.get(frame.ownerBackendNodeId);
-          const ownerState = await nodeContext(parent, frame.ownerBackendNodeId);
-          root = {
-            ...ownerState.children,
-            // CSS visibility inside a child document cannot override its hidden owner.
-            hidden:
-              ownerState.children.hidden ||
-              owner?.layout?.styles.visibility === "hidden" ||
-              owner?.layout?.styles.visibility === "collapse",
-            // Frame scaling is already interpreted by the shared content-quad projection.
-            transformed: false,
-            localClip: false,
-            unpositionedClip: false,
-          };
-        }
-      } else if (frame.frameId !== facts.rootFrameId)
-        root = { ...root, issue: "ownership-unresolved" };
-      root = {
-        ...root,
-        issue:
-          root.issue ??
-          (!doc.identity ? "identity-unverified" : visualProjectionIssue(doc.geometry)),
-      };
-      roots.set(frame.frameId, root);
-      contexts.set(frame.frameId, new Map());
-    }
-  }
-
-  for (const document of facts.documents) {
-    for (const node of document.index.nodes.values()) {
-      if (work++ % 256 === 0) {
-        const pending = checkpoint();
-        if (pending) await pending;
-      }
-      if (node.tag !== "canvas" || document.index.excludedBackendNodeIds.has(node.backendNodeId))
-        continue;
-      // No layout/zero size is positive evidence of no screenshot area for this node.
-      if (!node.layout) continue;
-      const bounds = node.layout.bounds;
-      if (
-        bounds?.length === 4 &&
-        bounds.every(Number.isFinite) &&
-        (bounds[2] <= 0 || bounds[3] <= 0)
-      )
-        continue;
-      const context = (await nodeContext(document, node.backendNodeId)).self;
-      const local = viewportRect(node.localRect);
-      const borderBox =
-        local && document.geometry ? projectVisualBox(local, document.geometry.projections) : null;
-      const region = resolveVisualRegion({
-        borderBox,
-        frameVisibleBox: viewportRect(node.rect),
-        context,
-        visibility: node.layout.styles.visibility,
-      });
-      if (region.status === "unavailable") {
-        issues.push({
-          target: document.frame.target,
-          frameId: document.frame.frameId,
-          backendNodeId: node.backendNodeId,
-          reason: region.reason,
-        });
-      } else if (region.status === "available" && document.identity) {
-        const label = node.attrs["aria-label"]?.trim() || node.attrs.title?.trim();
-        candidates.push({
-          document: document.identity,
-          backendNodeId: node.backendNodeId,
-          parentBackendNodeId: node.parentBackendNodeId,
-          ...(label ? { label } : {}),
-          region,
-        });
-      }
-    }
-  }
-  // AX-only/missing documents have no Canvas nodes to carry the missing evidence.
-  const reportedFrames = new Set(issues.map((issue) => issue.frameId));
-  for (const document of facts.documents) {
-    const reason = roots.get(document.frame.frameId)?.issue;
-    if (
-      reason &&
-      !reportedFrames.has(document.frame.frameId) &&
-      (!document.identity || !document.index.nodes.size)
-    )
-      issues.push({ target: document.frame.target, frameId: document.frame.frameId, reason });
-  }
-  const pending = checkpoint();
-  if (pending) await pending;
-  return {
-    candidates,
-    issues,
-    captureIssues: facts.issues,
-    complete: issues.length === 0 && facts.issues.length === 0,
-  };
-}

apps/extension/src/tools/vom/visual-region.ts

@@ -1,318 +0,0 @@
-import {
-  type GeometryProjection,
-  type Polygon,
-  projectPolygon,
-  rectPolygon,
-  regionBounds,
-  type ViewportRect,
-} from "../geometry";
-import type { DocumentGeometry, DocumentIdentity } from "./facts";
-
-export type VisualIssueReason =
-  | "ancestry-incomplete"
-  | "facts-unavailable"
-  | "geometry-unavailable"
-  | "geometry-unsupported"
-  | "identity-unverified"
-  | "ownership-unresolved";
-
-/** Top viewport CSS coordinates. Unconstrained axes have infinite bounds. */
-export interface VisualClip {
-  readonly left: number;
-  readonly top: number;
-  readonly right: number;
-  readonly bottom: number;
-}
-
-/** Shared persistent chain: one entry per clipping ancestor, not per Canvas. */
-export interface VisualClipSource {
-  readonly document: DocumentIdentity;
-  readonly backendNodeId: number;
-  readonly x: boolean;
-  readonly y: boolean;
-  readonly overflowX: string;
-  readonly overflowY: string;
-  readonly box: ViewportRect;
-  readonly parent?: VisualClipSource;
-}
-
-export interface VisualContext {
-  readonly clip: VisualClip;
-  readonly clips?: VisualClipSource;
-  readonly hidden: boolean;
-  /** A local CSS scale/zoom makes snapshot client offsets ambiguous. */
-  readonly transformed: boolean;
-  readonly localClip?: boolean;
-  /** Overflow between an absolute target and its nearest positioned ancestor. */
-  readonly unpositionedClip?: boolean;
-  readonly issue?: VisualIssueReason;
-}
-
-export const EMPTY_VISUAL_CONTEXT: VisualContext = {
-  clip: { left: -Infinity, top: -Infinity, right: Infinity, bottom: Infinity },
-  hidden: false,
-  transformed: false,
-};
-
-function axisRect(polygon: Polygon): boolean {
-  if (polygon.length !== 4 || polygon.some((p) => !Number.isFinite(p.x) || !Number.isFinite(p.y)))
-    return false;
-  const [a, b, c, d] = polygon;
-  return a.y === b.y && b.x === c.x && c.y === d.y && d.x === a.x && b.x > a.x && d.y > a.y;
-}
-
-/** Check evidence before projectRectToViewport can reduce a polygon to its bounds. */
-export function visualProjectionIssue(
-  geometry: DocumentGeometry | undefined,
-): VisualIssueReason | undefined {
-  if (!geometry || !geometry.projections.length || geometry.pageScale === undefined)
-    return "geometry-unavailable";
-  if (!Number.isFinite(geometry.pageScale) || geometry.pageScale <= 0)
-    return "geometry-unavailable";
-  if (geometry.pageScale !== 1) return "geometry-unsupported";
-  const { layoutUnitsPerCssPixel, scrollCss } = geometry.coordinates;
-  if (
-    !Number.isFinite(layoutUnitsPerCssPixel) ||
-    layoutUnitsPerCssPixel <= 0 ||
-    ![scrollCss.x, scrollCss.y].every(Number.isFinite)
-  )
-    return "geometry-unavailable";
-  for (const projection of geometry.projections) {
-    if (
-      ![projection.topViewport.width, projection.topViewport.height].every(
-        (n) => Number.isFinite(n) && n > 0,
-      )
-    )
-      return "geometry-unavailable";
-    if (projection.sourceClips.some((clip) => !axisRect(clip))) return "geometry-unsupported";
-    for (const edge of projection.edges) {
-      if (
-        ![edge.sourceViewport.width, edge.sourceViewport.height].every(
-          (n) => Number.isFinite(n) && n > 0,
-        )
-      )
-        return "geometry-unavailable";
-      if (!axisRect(edge.destinationQuad) || edge.destinationClips?.some((clip) => !axisRect(clip)))
-        return "geometry-unsupported";
-    }
-  }
-}
-
-/** Uses the same projection math as DOM geometry, without clipping away box origins. */
-export function projectVisualBox(
-  box: ViewportRect,
-  projections: readonly GeometryProjection[],
-): ViewportRect | null {
-  let polygon: Polygon = rectPolygon({ x: box.x, y: box.y, w: box.width, h: box.height });
-  for (const projection of projections)
-    for (const edge of projection.edges) polygon = projectPolygon(polygon, edge);
-  // Preserve zero-size client boxes: they can prove a fully clipped axis.
-  if (box.width === 0 || box.height === 0) {
-    const [a, , c] = polygon;
-    return { x: a.x, y: a.y, width: c.x - a.x, height: c.y - a.y };
-  }
-  return regionBounds([polygon]);
-}
-
-function axisTransformScale(value: string): [number, number] | null {
-  if (value === "none") return [1, 1];
-  const match = /^matrix(3d)?\(([^)]+)\)$/.exec(value);
-  if (!match) return null;
-  const values = match[2].split(",").map((part) => Number(part.trim()));
-  if (!values.every(Number.isFinite)) return null;
-  if (match[1])
-    return values.length === 16 &&
-      values[0] > 0 &&
-      values[5] > 0 &&
-      values[10] === 1 &&
-      values[15] === 1 &&
-      [1, 2, 3, 4, 6, 7, 8, 9, 11, 14].every((index) => values[index] === 0)
-      ? [values[0], values[5]]
-      : null;
-  return values.length === 6 && values[0] > 0 && values[3] > 0 && values[1] === 0 && values[2] === 0
-    ? [values[0], values[3]]
-    : null;
-}
-
-export interface VisualAncestor {
-  readonly document: DocumentIdentity;
-  readonly backendNodeId: number;
-  readonly styles: Readonly<Record<string, string>>;
-  /** Already in top viewport CSS units, from a source-specific adapter. */
-  readonly clientBox?: ViewportRect | null;
-}
-
-/** One ancestor step, reusable by discovery and the future live local adapter. */
-export function extendVisualContext(
-  parent: VisualContext,
-  node: VisualAncestor,
-  clipContents = true,
-): VisualContext {
-  const styles = node.styles;
-  const opacity = styles.opacity?.trim() ? Number(styles.opacity) : NaN;
-  const zoom = styles.zoom === "normal" ? 1 : styles.zoom?.trim() ? Number(styles.zoom) : NaN;
-  const scale =
-    styles.scale === "none" ? [1] : (styles.scale ?? "").trim().split(/\s+/).map(Number);
-  const scaleSupported =
-    scale.length >= 1 &&
-    scale.length <= 3 &&
-    scale.every((n) => Number.isFinite(n) && n > 0) &&
-    (scale.length < 3 || scale[2] === 1);
-  const transformScale = axisTransformScale(styles.transform ?? "");
-  // Identity/translation changes origins, which bounds already capture, but
-  // leaves client offsets in the same units. Only scaling makes them ambiguous.
-  const transformed =
-    parent.transformed ||
-    transformScale?.some((n) => n !== 1) === true ||
-    zoom !== 1 ||
-    scale.some((n) => n !== 1);
-  const hidden = parent.hidden || opacity === 0 || styles.display === "none";
-  let issue = parent.issue;
-  if (
-    !Number.isFinite(opacity) ||
-    !Number.isFinite(zoom) ||
-    zoom <= 0 ||
-    !styles.display ||
-    !styles.visibility
-  )
-    issue ??= "facts-unavailable";
-  if (!styles.transform || !styles["clip-path"] || !styles["mask-image"])
-    issue ??= "facts-unavailable";
-  else if (!transformScale || styles["clip-path"] !== "none" || styles["mask-image"] !== "none")
-    issue ??= "geometry-unsupported";
-
-  if (
-    !["rotate", "scale", "perspective", "clip", "contain", "overflow-clip-margin"].every(
-      (key) => styles[key],
-    )
-  )
-    issue ??= "facts-unavailable";
-  else if (
-    !scaleSupported ||
-    !["none", "0deg"].includes(styles.rotate) ||
-    styles.perspective !== "none" ||
-    styles.clip !== "auto" ||
-    /(?:^|\s)(paint|strict|content)(?:$|\s)/.test(styles.contain)
-  )
-    issue ??= "geometry-unsupported";
-  // Do not pretend every DOM ancestor clips out-of-flow descendants. Support
-  // the ordinary positioned-container case; other containing-block cases stay explicit.
-  if (
-    (styles.position === "absolute" && parent.unpositionedClip) ||
-    (styles.position === "fixed" && parent.localClip)
-  )
-    issue ??= "geometry-unsupported";
-  const overflow = [styles["overflow-x"], styles["overflow-y"]];
-  if (clipContents && overflow.includes("clip") && styles["overflow-clip-margin"] !== "0px")
-    issue ??= "geometry-unsupported";
-  if (
-    overflow.some(
-      (value) => !["visible", "hidden", "clip", "scroll", "auto", "overlay"].includes(value),
-    )
-  )
-    issue ??= "facts-unavailable";
-  const [x, y] = overflow.map((value) => value !== "visible");
-  let clip = parent.clip;
-  let clips = parent.clips;
-  if (clipContents && (x || y)) {
-    if (transformed) issue ??= "geometry-unsupported";
-    const box = node.clientBox;
-    if (
-      !box ||
-      ![box.x, box.y, box.width, box.height].every(Number.isFinite) ||
-      box.width < 0 ||
-      box.height < 0
-    )
-      issue ??= "geometry-unavailable";
-    else {
-      clip = {
-        left: x ? Math.max(clip.left, box.x) : clip.left,
-        right: x ? Math.min(clip.right, box.x + box.width) : clip.right,
-        top: y ? Math.max(clip.top, box.y) : clip.top,
-        bottom: y ? Math.min(clip.bottom, box.y + box.height) : clip.bottom,
-      };
-      clips = {
-        document: node.document,
-        backendNodeId: node.backendNodeId,
-        x,
-        y,
-        overflowX: styles["overflow-x"],
-        overflowY: styles["overflow-y"],
-        box,
-        parent: clips,
-      };
-    }
-  }
-  const clipsHere = clipContents && (x || y);
-  return {
-    hidden,
-    transformed,
-    issue,
-    clip,
-    clips,
-    localClip: parent.localClip || clipsHere,
-    unpositionedClip:
-      styles.position !== "static" ||
-      styles.transform !== "none" ||
-      /(?:^|\s)layout(?:$|\s)/.test(styles.contain ?? "")
-        ? false
-        : parent.unpositionedClip || clipsHere,
-  };
-}
-
-/** A page screenshot rectangle, not an exact mask of visible Canvas pixels.
- * Rounded corners are rendered by the browser and do not invalidate this range. */
-export type VisualRegionResult =
-  | { status: "available"; borderBox: ViewportRect; crop: ViewportRect; clips?: VisualClipSource }
-  | { status: "empty" }
-  | { status: "unavailable"; reason: VisualIssueReason };
-
-/** Box and frameVisibleBox must come from the same box kind (Canvas border-box).
- * Frame/viewport clipping is supplied by the shared geometry adapter. */
-export function resolveVisualRegion(input: {
-  borderBox: ViewportRect | null;
-  frameVisibleBox: ViewportRect | null;
-  context: VisualContext;
-  visibility: string;
-}): VisualRegionResult {
-  const { borderBox, frameVisibleBox, context, visibility } = input;
-  if (context.hidden || visibility === "hidden" || visibility === "collapse")
-    return { status: "empty" };
-  if (context.issue) return { status: "unavailable", reason: context.issue };
-  if (visibility !== "visible") return { status: "unavailable", reason: "facts-unavailable" };
-  if (!borderBox) return { status: "unavailable", reason: "geometry-unavailable" };
-  if (!frameVisibleBox) return { status: "empty" };
-  if (
-    ![
-      borderBox.x,
-      borderBox.y,
-      borderBox.width,
-      borderBox.height,
-      frameVisibleBox.x,
-      frameVisibleBox.y,
-      frameVisibleBox.width,
-      frameVisibleBox.height,
-    ].every(Number.isFinite)
-  )
-    return { status: "unavailable", reason: "geometry-unavailable" };
-  if (
-    borderBox.width <= 0 ||
-    borderBox.height <= 0 ||
-    frameVisibleBox.width < 0 ||
-    frameVisibleBox.height < 0 ||
-    Object.values(context.clip).some(Number.isNaN)
-  )
-    return { status: "unavailable", reason: "geometry-unavailable" };
-  const x = Math.max(frameVisibleBox.x, context.clip.left);
-  const y = Math.max(frameVisibleBox.y, context.clip.top);
-  const right = Math.min(frameVisibleBox.x + frameVisibleBox.width, context.clip.right);
-  const bottom = Math.min(frameVisibleBox.y + frameVisibleBox.height, context.clip.bottom);
-  return right > x && bottom > y
-    ? {
-        status: "available",
-        borderBox,
-        crop: { x, y, width: right - x, height: bottom - y },
-        clips: context.clips,
-      }
-    : { status: "empty" };
-}

apps/extension/src/transport/types.ts

@@ -24,7 +24,6 @@ export type RpcErrorReason =
   | "agent_window_scope"
   | "element_not_visible"
   | "ref_not_found"
-  | "ref_kind_unsupported"
   | "selector_not_found"
   | "target_not_fillable"
   | "fill_value_invalid"
@@ -471,59 +470,6 @@ export interface HoverResult {
   dialogs?: JavaScriptDialogInfo[];
 }
 
-export interface ScrollToParams {
-  session_id: string;
-  ref?: string;
-  selector?: string;
-  tab_id?: number;
-  timeout_ms?: number;
-}
-
-export interface ScrollToResult {
-  tab_id: number;
-  used_ref?: string;
-  used_selector?: string;
-  /** Clipped border-box bounds in top-level viewport CSS pixels; not an occlusion test. */
-  x: number;
-  y: number;
-  width: number;
-  height: number;
-  dialogs?: JavaScriptDialogInfo[];
-}
-
-export interface FocusParams {
-  session_id: string;
-  ref?: string;
-  selector?: string;
-  tab_id?: number;
-  timeout_ms?: number;
-}
-
-export interface FocusResult {
-  tab_id: number;
-  used_ref?: string;
-  used_selector?: string;
-  focused: boolean;
-  dialogs?: JavaScriptDialogInfo[];
-}
-
-export interface BlurParams {
-  session_id: string;
-  ref?: string;
-  selector?: string;
-  tab_id?: number;
-  timeout_ms?: number;
-}
-
-export interface BlurResult {
-  tab_id: number;
-  used_ref?: string;
-  used_selector?: string;
-  was_focused: boolean;
-  focused: boolean;
-  dialogs?: JavaScriptDialogInfo[];
-}
-
 export interface FillParams {
   session_id: string;
   value: string;

crates/bsk-cli/skill/SKILL.md

@@ -55,20 +55,10 @@ Use this default loop:
 ```text
 bsk navigate <url> --session <id>
 bsk observe --session <id>
-bsk click|hover|scroll-to|focus|blur|fill|select|press ... --session <id>
+bsk click|hover|fill|select|press ... --session <id>
 bsk observe --session <id>             # after navigation or a meaningful DOM change
 ```
 
-`bsk scroll-to <ref-or-selector> --session <id>` scrolls an element and its frame owners into view.
-Use a fresh element ref for iframe/shadow-root targets; CSS selectors search the main document.
-The result is the visible border-box portion's bounds in top-level viewport CSS pixels after
-ancestor clipping. Partial visibility is enough; hidden or fully clipped targets fail with
-`permission_denied` and `data.reason=element_not_visible`. This does not test occlusion by other elements.
-For a specific tab or deadline: `bsk scroll-to @e3 --session <id> --tab-id 42 --timeout 5s`.
-
-`bsk focus <ref>` explicitly focuses a target; `bsk blur <ref>` removes focus and reports whether
-it was focused. Use these for UI states triggered by focus changes.
-
 Prefer fresh `@eN` refs over CSS selectors. Navigation invalidates refs; large DOM changes may also
 make them stale. Observe again before the next interaction.
 
@@ -124,7 +114,7 @@ This list of names is complete. Never invent a command outside it; read
 session start|stop|list   browsers   status   doctor   update   logs
 navigate   navigate-back   navigate-forward   reload   wait-for-navigation   wait-ms
 observe   snapshot   get-html   screenshot   console   network
-click   hover   scroll-to   focus   blur   fill   select   press   evaluate
+click   hover   fill   select   press   evaluate
 tab list|create|close|select|borrow|return   window resize   emulate
 upload   download   request-help   record start|stop
 ```

crates/bsk-cli/src/cli/interaction.rs

@@ -1,5 +1,4 @@
-//! `bsk click` / `bsk focus` / `bsk blur` / `bsk fill` / `bsk press`
-//! interaction tools.
+//! `bsk click` / `bsk fill` / `bsk press` (M7 interaction tools).
 //!
 //! The `<target>` positional accepts either a snapshot ref (`@e3`,
 //! `e3`) or a CSS selector. Use `--ref` / `--selector` explicitly when
@@ -11,9 +10,8 @@ use std::time::Duration;
 use anyhow::Context;
 use bsk_protocol::Method;
 use bsk_protocol::tools::{
-    BlurParams, BlurResult, ClickParams, ClickResult, FillParams, FillResult, FocusParams,
-    FocusResult, HoverParams, HoverResult, KeyModifier, MouseButton, PressParams, PressResult,
-    SelectParams, SelectResult,
+    ClickParams, ClickResult, FillParams, FillResult, HoverParams, HoverResult, KeyModifier,
+    MouseButton, PressParams, PressResult, SelectParams, SelectResult,
 };
 use clap::{Args, ValueEnum};
 
@@ -276,124 +274,6 @@ pub fn dispatch_hover(args: HoverArgs, format: Format) -> Result<(), CliError> {
     Ok(())
 }
 
-// ---------------------------------------------------------------------------
-// bsk focus / bsk blur
-// ---------------------------------------------------------------------------
-
-#[derive(Debug, Clone, Args)]
-pub struct FocusArgs {
-    /// Snapshot ref (`@e3`, `e3`) or CSS selector. Optional when `--ref`/`--selector` is used.
-    pub target: Option<String>,
-
-    #[arg(long = "ref")]
-    pub ref_: Option<String>,
-
-    #[arg(long = "selector")]
-    pub selector: Option<String>,
-
-    #[arg(long)]
-    pub session: String,
-
-    #[arg(long = "tab-id")]
-    pub tab_id: Option<i64>,
-
-    #[arg(long, default_value = "30s", value_parser = parse_timeout_ms)]
-    pub timeout: u32,
-}
-
-pub fn dispatch_focus(args: FocusArgs, format: Format) -> Result<(), CliError> {
-    let info = ensure_daemon().context("ensure daemon is running")?;
-    let (ref_, selector) = split_target(args.target, args.ref_, args.selector)?;
-    let params = FocusParams {
-        session_id: args.session,
-        ref_,
-        selector,
-        tab_id: args.tab_id,
-        timeout_ms: Some(args.timeout),
-    };
-    let reply: FocusResult = call(
-        info.sock_path,
-        Method::ToolFocus,
-        params,
-        "focus-1",
-        args.timeout,
-    )?;
-    match format {
-        Format::Json => println!(
-            "{}",
-            serde_json::to_string_pretty(&reply)
-                .map_err(|e| CliError::Local(anyhow::anyhow!(e)))?
-        ),
-        Format::Human => {
-            let target =
-                format_used_target(reply.used_ref.as_deref(), reply.used_selector.as_deref());
-            println!(
-                "focus ok tab={} target={target} focused={}",
-                reply.tab_id, reply.focused
-            );
-            print_dialog_summaries(&reply.dialogs);
-        }
-    }
-    Ok(())
-}
-
-#[derive(Debug, Clone, Args)]
-pub struct BlurArgs {
-    /// Snapshot ref (`@e3`, `e3`) or CSS selector. Optional when `--ref`/`--selector` is used.
-    pub target: Option<String>,
-
-    #[arg(long = "ref")]
-    pub ref_: Option<String>,
-
-    #[arg(long = "selector")]
-    pub selector: Option<String>,
-
-    #[arg(long)]
-    pub session: String,
-
-    #[arg(long = "tab-id")]
-    pub tab_id: Option<i64>,
-
-    #[arg(long, default_value = "30s", value_parser = parse_timeout_ms)]
-    pub timeout: u32,
-}
-
-pub fn dispatch_blur(args: BlurArgs, format: Format) -> Result<(), CliError> {
-    let info = ensure_daemon().context("ensure daemon is running")?;
-    let (ref_, selector) = split_target(args.target, args.ref_, args.selector)?;
-    let params = BlurParams {
-        session_id: args.session,
-        ref_,
-        selector,
-        tab_id: args.tab_id,
-        timeout_ms: Some(args.timeout),
-    };
-    let reply: BlurResult = call(
-        info.sock_path,
-        Method::ToolBlur,
-        params,
-        "blur-1",
-        args.timeout,
-    )?;
-    match format {
-        Format::Json => println!(
-            "{}",
-            serde_json::to_string_pretty(&reply)
-                .map_err(|e| CliError::Local(anyhow::anyhow!(e)))?
-        ),
-        Format::Human => {
-            let target =
-                format_used_target(reply.used_ref.as_deref(), reply.used_selector.as_deref());
-            println!(
-                "blur ok tab={} target={target} was_focused={} focused={}",
-                reply.tab_id, reply.was_focused, reply.focused
-            );
-            print_dialog_summaries(&reply.dialogs);
-        }
-    }
-    Ok(())
-}
-
 // ---------------------------------------------------------------------------
 // bsk fill
 // ---------------------------------------------------------------------------

crates/bsk-cli/src/cli/mod.rs

@@ -28,7 +28,6 @@ pub mod record_recovery;
 pub mod record_state;
 pub mod render_error;
 pub mod screenshot;
-pub mod scroll;
 pub mod session;
 pub mod snapshot;
 pub mod status;
@@ -48,15 +47,12 @@ use crate::cli::evaluate::EvaluateArgs;
 use crate::cli::get_html::GetHtmlArgs;
 use crate::cli::human_loop::RequestHelpArgs;
 use crate::cli::install_skill::InstallSkillArgs;
-use crate::cli::interaction::{
-    BlurArgs, ClickArgs, FillArgs, FocusArgs, HoverArgs, PressArgs, SelectArgs,
-};
+use crate::cli::interaction::{ClickArgs, FillArgs, HoverArgs, PressArgs, SelectArgs};
 use crate::cli::navigate::{NavigateCommand, NavigateHistoryArgs, ReloadArgs};
 use crate::cli::network::NetworkArgs;
 use crate::cli::observe::ObserveArgs;
 use crate::cli::record::RecordCmd;
 use crate::cli::screenshot::ScreenshotArgs;
-use crate::cli::scroll::ScrollToArgs;
 use crate::cli::session::SessionCmd;
 use crate::cli::snapshot::SnapshotArgs;
 use crate::cli::tab::TabCmd;
@@ -177,16 +173,6 @@ pub enum Command {
     /// Hover a snapshot ref or CSS selector.
     Hover(HoverArgs),
 
-    /// Scroll a snapshot ref or CSS selector into the visible viewport.
-    #[command(name = "scroll-to")]
-    ScrollTo(ScrollToArgs),
-
-    /// Focus a snapshot ref or CSS selector.
-    Focus(FocusArgs),
-
-    /// Remove focus from a snapshot ref or CSS selector.
-    Blur(BlurArgs),
-
     /// Fill an input / textarea / contenteditable.
     Fill(FillArgs),
 

crates/bsk-cli/src/cli/render_error.rs

@@ -40,7 +40,6 @@ use bsk_protocol::ErrorCode;
 pub mod reason {
     pub const AGENT_WINDOW_SCOPE: &str = "agent_window_scope";
     pub const ELEMENT_NOT_VISIBLE: &str = "element_not_visible";
-    pub const REF_KIND_UNSUPPORTED: &str = "ref_kind_unsupported";
     pub const REF_NOT_FOUND: &str = "ref_not_found";
     pub const SELECTOR_NOT_FOUND: &str = "selector_not_found";
     pub const TARGET_NOT_FILLABLE: &str = "target_not_fillable";
@@ -248,13 +247,6 @@ pub fn info_for_error(code: ErrorCode, data: Option<&serde_json::Value>) -> Rend
             ),
             exit_code: base.exit_code,
         },
-        (ErrorCode::Unsupported, reason::REF_KIND_UNSUPPORTED) => RenderInfo {
-            summary: "this tool does not support the ref target type",
-            hint: Some(
-                "use a DOM ref for DOM operations; visual-region refs require an available visual screenshot path",
-            ),
-            exit_code: base.exit_code,
-        },
         (ErrorCode::NotFound, reason::REF_NOT_FOUND) => RenderInfo {
             summary: "snapshot ref was not found for this tab",
             hint: Some("rerun `bsk snapshot` for the current tab and use one of the returned refs"),
@@ -672,15 +664,6 @@ mod tests {
         assert!(info.summary.contains("timed out after browser dispatch"));
     }
 
-    #[test]
-    fn visual_ref_type_error_has_specific_guidance() {
-        let data = serde_json::json!({ "reason": reason::REF_KIND_UNSUPPORTED });
-        let info = info_for_error(ErrorCode::Unsupported, Some(&data));
-        assert!(info.summary.contains("ref target type"));
-        assert!(info.hint.unwrap().contains("DOM ref"));
-        assert_eq!(info.exit_code, info_for(ErrorCode::Unsupported).exit_code);
-    }
-
     #[test]
     fn ref_not_found_overrides_not_found_copy() {
         let data = serde_json::json!({ "reason": reason::REF_NOT_FOUND });

crates/bsk-cli/src/cli/scroll.rs

@@ -1,100 +0,0 @@
-//! `bsk scroll-to` — bring a target element into the visible viewport.
-
-use std::time::Duration;
-
-use anyhow::Context;
-use bsk_protocol::Method;
-use bsk_protocol::tools::{ScrollToParams, ScrollToResult};
-use clap::Args;
-
-use crate::cli::dialogs::print_dialog_summaries;
-use crate::cli::ensure_daemon::ensure_daemon;
-use crate::cli::error::{CliError, Format};
-use crate::cli::interaction::split_target;
-use crate::cli::navigate::parse_timeout_ms;
-
-#[derive(Debug, Clone, Args)]
-pub struct ScrollToArgs {
-    /// Snapshot ref (`@e3`, `e3`) or CSS selector. Optional when `--ref`/`--selector` is used.
-    pub target: Option<String>,
-
-    #[arg(long = "ref")]
-    pub ref_: Option<String>,
-
-    #[arg(long = "selector")]
-    pub selector: Option<String>,
-
-    #[arg(long)]
-    pub session: String,
-
-    #[arg(long = "tab-id")]
-    pub tab_id: Option<i64>,
-
-    #[arg(long, default_value = "30s", value_parser = parse_timeout_ms)]
-    pub timeout: u32,
-}
-
-pub fn dispatch(args: ScrollToArgs, format: Format) -> Result<(), CliError> {
-    let (ref_, selector) = split_target(args.target, args.ref_, args.selector)?;
-    let info = ensure_daemon().context("ensure daemon is running")?;
-    let params = ScrollToParams {
-        session_id: args.session,
-        ref_,
-        selector,
-        tab_id: args.tab_id,
-        timeout_ms: Some(args.timeout),
-    };
-    let reply: ScrollToResult = crate::cli::business_rpc::call(
-        info.sock_path,
-        "scroll-to-1",
-        Method::ToolScrollTo,
-        Some(params),
-        ipc_timeout(args.timeout),
-    )?;
-    match format {
-        Format::Json => println!(
-            "{}",
-            serde_json::to_string_pretty(&reply)
-                .map_err(|e| CliError::Local(anyhow::anyhow!(e)))?
-        ),
-        Format::Human => {
-            let target =
-                format_used_target(reply.used_ref.as_deref(), reply.used_selector.as_deref());
-            println!(
-                "scroll-to ok tab={} target={target} bounds=({}, {}, {}, {})",
-                reply.tab_id, reply.x, reply.y, reply.width, reply.height
-            );
-            print_dialog_summaries(&reply.dialogs);
-        }
-    }
-    Ok(())
-}
-
-fn format_used_target(used_ref: Option<&str>, used_selector: Option<&str>) -> String {
-    used_ref
-        .map(|r| format!("@{r}"))
-        .or_else(|| used_selector.map(str::to_string))
-        .unwrap_or_else(|| "?".into())
-}
-
-fn ipc_timeout(timeout_ms: u32) -> Duration {
-    Duration::from_millis(u64::from(timeout_ms))
-        .checked_add(Duration::from_secs(15))
-        .unwrap_or(Duration::from_secs(u64::from(timeout_ms / 1_000) + 15))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn split_target_detects_refs_and_selectors() {
-        let (ref_, selector) = split_target(Some("@e3".into()), None, None).unwrap();
-        assert_eq!(ref_.as_deref(), Some("@e3"));
-        assert!(selector.is_none());
-
-        let (ref_, selector) = split_target(Some("#target".into()), None, None).unwrap();
-        assert!(ref_.is_none());
-        assert_eq!(selector.as_deref(), Some("#target"));
-    }
-}

crates/bsk-cli/src/daemon/ipc.rs

@@ -253,9 +253,6 @@ pub fn full_handler(status: DaemonStatus, state: Arc<DaemonState>) -> RpcHandler
                 | Method::ToolReload
                 | Method::ToolClick
                 | Method::ToolHover
-                | Method::ToolScrollTo
-                | Method::ToolFocus
-                | Method::ToolBlur
                 | Method::ToolFill
                 | Method::ToolPress
                 | Method::ToolSelect

crates/bsk-cli/src/main.rs

@@ -94,9 +94,6 @@ fn dispatch(cli: Cli, format: Format) -> Result<(), CliError> {
         Command::Reload(args) => cli::navigate::dispatch_reload(args, format),
         Command::Click(args) => cli::interaction::dispatch_click(args, format),
         Command::Hover(args) => cli::interaction::dispatch_hover(args, format),
-        Command::ScrollTo(args) => cli::scroll::dispatch(args, format),
-        Command::Focus(args) => cli::interaction::dispatch_focus(args, format),
-        Command::Blur(args) => cli::interaction::dispatch_blur(args, format),
         Command::Fill(args) => cli::interaction::dispatch_fill(args, format),
         Command::Press(args) => cli::interaction::dispatch_press(args, format),
         Command::Select(args) => cli::interaction::dispatch_select(args, format),

crates/bsk-cli/tests/cli_parse.rs

@@ -255,65 +255,6 @@ fn parses_hover_with_settle() {
     assert_eq!(args.settle, 300);
 }
 
-#[test]
-fn parses_scroll_to_target() {
-    let cli = parse(&["bsk", "scroll-to", "@e2", "--session", "s1"]);
-    let Command::ScrollTo(args) = cli.command else {
-        panic!("expected scroll-to command");
-    };
-    assert_eq!(args.target.as_deref(), Some("@e2"));
-}
-
-#[test]
-fn parses_scroll_to_explicit_target_tab_and_timeout() {
-    for flag in ["--ref", "--selector"] {
-        let cli = parse(&[
-            "bsk",
-            "scroll-to",
-            flag,
-            "e3",
-            "--session",
-            "s1",
-            "--tab-id",
-            "42",
-            "--timeout",
-            "5s",
-        ]);
-        let Command::ScrollTo(args) = cli.command else {
-            panic!("expected scroll-to command");
-        };
-        assert_eq!(args.tab_id, Some(42));
-        assert_eq!(args.timeout, 5_000);
-        assert_eq!(
-            if flag == "--ref" {
-                args.ref_
-            } else {
-                args.selector
-            }
-            .as_deref(),
-            Some("e3")
-        );
-    }
-}
-
-#[test]
-fn parses_focus_target() {
-    let cli = parse(&["bsk", "focus", "@e2", "--session", "s1"]);
-    let Command::Focus(args) = cli.command else {
-        panic!("expected focus command");
-    };
-    assert_eq!(args.target.as_deref(), Some("@e2"));
-}
-
-#[test]
-fn parses_blur_selector() {
-    let cli = parse(&["bsk", "blur", "--selector", "#search", "--session", "s1"]);
-    let Command::Blur(args) = cli.command else {
-        panic!("expected blur command");
-    };
-    assert_eq!(args.selector.as_deref(), Some("#search"));
-}
-
 #[test]
 fn rejects_zero_click_count() {
     assert!(

crates/bsk-cli/tests/session_user_interrupt.rs

@@ -293,15 +293,6 @@ async fn session_user_interrupt_event_cancels_inflight_with_user_aborted() {
 /// catch a tool dispatched arbitrarily later.
 #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
 async fn user_interrupt_rejects_next_mutating_tool_call_when_session_was_idle() {
-    assert_idle_interrupt_rejects(Method::ToolClick).await;
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-async fn user_interrupt_rejects_scroll_to_before_forwarding() {
-    assert_idle_interrupt_rejects(Method::ToolScrollTo).await;
-}
-
-async fn assert_idle_interrupt_rejects(method: Method) {
     let (handle, sock) = spawn_daemon().await;
     let mut ws = connect_ext(handle.ws_addr()).await;
     let _ = handshake_as_ext(&mut ws).await;
@@ -310,11 +301,10 @@ async fn assert_idle_interrupt_rejects(method: Method) {
 
     // Fake extension: answer tool.session_start, observe other
     // requests but never reply. We expect the daemon to reject the
-    // tool call BEFORE it ever forwards a browser-input frame.
+    // tool call BEFORE it ever forwards a tool.click frame.
     let ws_sink_for_responder = Arc::clone(&ws_sink);
-    let observed_call_count = Arc::new(std::sync::atomic::AtomicUsize::new(0));
-    let observed_call_count_clone = Arc::clone(&observed_call_count);
-    let forwarded_method = method.clone();
+    let observed_click_count = Arc::new(std::sync::atomic::AtomicUsize::new(0));
+    let observed_click_count_clone = Arc::clone(&observed_click_count);
     let responder = tokio::spawn(async move {
         let mut ws_stream = ws_stream;
         while let Some(Ok(msg)) = ws_stream.next().await {
@@ -339,8 +329,8 @@ async fn assert_idle_interrupt_rejects(method: Method) {
                     g.send(Message::Text(serde_json::to_string(&reply).unwrap()))
                         .await
                         .unwrap();
-                } else if req.method == forwarded_method {
-                    observed_call_count_clone.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
+                } else if req.method == Method::ToolClick {
+                    observed_click_count_clone.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
                     // Deliberately do NOT reply — daemon should reject before
                     // ever forwarding to us.
                     let _ = req;
@@ -387,12 +377,12 @@ async fn assert_idle_interrupt_rejects(method: Method) {
     let state = handle.state();
     wait_for_session_interrupt_pending(&state, &start.session_id).await;
 
-    // The CLI now issues a browser-input (mutating). The daemon must
+    // The CLI now issues a tool.click (mutating). The daemon must
     // reject it WITHOUT forwarding to the extension.
-    let outcome = ipc
+    let click_outcome = ipc
         .call::<_, serde_json::Value>(
-            "input-after-interrupt",
-            method,
+            "click-after-interrupt",
+            Method::ToolClick,
             Some(json!({
                 "session_id": start.session_id,
                 "ref": "fake-ref-1",
@@ -401,7 +391,7 @@ async fn assert_idle_interrupt_rejects(method: Method) {
         )
         .await
         .unwrap();
-    let err = outcome.expect_err("browser-input must be rejected");
+    let err = click_outcome.expect_err("tool.click must be rejected");
     assert_eq!(
         err.code,
         ErrorCode::UserAborted,
@@ -409,11 +399,11 @@ async fn assert_idle_interrupt_rejects(method: Method) {
         err
     );
 
-    // Crucially: the extension never saw a browser-input frame.
+    // Crucially: the extension never saw a tool.click frame.
     assert_eq!(
-        observed_call_count.load(std::sync::atomic::Ordering::SeqCst),
+        observed_click_count.load(std::sync::atomic::Ordering::SeqCst),
         0,
-        "browser-input must NOT have been forwarded to the extension"
+        "tool.click must NOT have been forwarded to the extension"
     );
 
     responder.abort();

crates/bsk-cli/tests/tools_m7_ipc.rs

@@ -1,4 +1,5 @@
-//! M7 integration: drive interaction and navigation tool RPCs
+//! M7 integration: drive the 7 new tool RPCs (navigate /
+//! navigate_back / navigate_forward / reload / click / fill / press)
 //! through the IPC + per-session queue + fake extension and assert
 //! the wire shapes line up. The extension stub mirrors each method's
 //! `*Result` so we exercise the daemon's serialise → forward →
@@ -12,13 +13,11 @@ use bsk::daemon::{self, DaemonConfig};
 use bsk::ipc_client::IpcClient;
 use bsk_protocol::system::{HandshakeParams, HandshakeResult};
 use bsk_protocol::tools::{
-    BlurParams, BlurResult, ClickParams, ClickResult, FillParams, FillResult, FocusParams,
-    FocusResult, KeyModifier, MouseButton, NavigateBackParams, NavigateBackResult,
-    NavigateForwardParams, NavigateForwardResult, NavigateParams, NavigateResult, PressParams,
-    PressResult, ReloadParams, ReloadResult, SelectParams, SelectResult, SessionStartParams,
-    SessionStartResult, WaitUntil,
+    ClickParams, ClickResult, FillParams, FillResult, KeyModifier, MouseButton, NavigateBackParams,
+    NavigateBackResult, NavigateForwardParams, NavigateForwardResult, NavigateParams,
+    NavigateResult, PressParams, PressResult, ReloadParams, ReloadResult, SelectParams,
+    SelectResult, SessionStartParams, SessionStartResult, WaitUntil,
 };
-use bsk_protocol::tools::{ScrollToParams, ScrollToResult};
 use bsk_protocol::{
     BrowserPeerInfo, ErrorCode, Frame, Method, RequestFrame, ResponseBody, ResponseFrame, RpcError,
 };
@@ -383,137 +382,6 @@ async fn click_round_trips_ref_and_modifiers() {
     handle.shutdown().await;
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn focus_round_trips_verified_state() {
-    let (handle, sock) = spawn_daemon().await;
-    let mut ws = connect_ext(handle.ws_addr()).await;
-    let _ = do_handshake(&mut ws).await;
-
-    run_extension(ws, |req| {
-        assert_eq!(req.method, Method::ToolFocus);
-        let params = req.params.clone().unwrap();
-        let p: FocusParams = serde_json::from_value(params).unwrap();
-        assert_eq!(p.ref_.as_deref(), Some("@e3"));
-        ResponseBody::Ok(
-            serde_json::to_value(FocusResult {
-                tab_id: 9,
-                used_ref: Some("e3".into()),
-                used_selector: None,
-                focused: true,
-                dialogs: vec![],
-            })
-            .unwrap(),
-        )
-    });
-
-    let session_id = ipc_session_start(&sock).await;
-    let result: FocusResult = ipc_tool_call(
-        &sock,
-        Method::ToolFocus,
-        FocusParams {
-            session_id,
-            ref_: Some("@e3".into()),
-            selector: None,
-            tab_id: None,
-            timeout_ms: Some(5_000),
-        },
-    )
-    .await
-    .expect("focus ok");
-    assert!(result.focused);
-    assert_eq!(result.used_ref.as_deref(), Some("e3"));
-    handle.shutdown().await;
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn blur_round_trips_previous_focus_state() {
-    let (handle, sock) = spawn_daemon().await;
-    let mut ws = connect_ext(handle.ws_addr()).await;
-    let _ = do_handshake(&mut ws).await;
-
-    run_extension(ws, |req| {
-        assert_eq!(req.method, Method::ToolBlur);
-        let params = req.params.clone().unwrap();
-        let p: BlurParams = serde_json::from_value(params).unwrap();
-        assert_eq!(p.selector.as_deref(), Some("#search"));
-        ResponseBody::Ok(
-            serde_json::to_value(BlurResult {
-                tab_id: 9,
-                used_ref: None,
-                used_selector: Some("#search".into()),
-                was_focused: true,
-                focused: false,
-                dialogs: vec![],
-            })
-            .unwrap(),
-        )
-    });
-
-    let session_id = ipc_session_start(&sock).await;
-    let result: BlurResult = ipc_tool_call(
-        &sock,
-        Method::ToolBlur,
-        BlurParams {
-            session_id,
-            ref_: None,
-            selector: Some("#search".into()),
-            tab_id: None,
-            timeout_ms: Some(5_000),
-        },
-    )
-    .await
-    .expect("blur ok");
-    assert!(result.was_focused);
-    assert!(!result.focused);
-    assert_eq!(result.used_selector.as_deref(), Some("#search"));
-    handle.shutdown().await;
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn scroll_to_round_trips_visible_bounds() {
-    let (handle, sock) = spawn_daemon().await;
-    let mut ws = connect_ext(handle.ws_addr()).await;
-    let _ = do_handshake(&mut ws).await;
-
-    run_extension(ws, |req| {
-        assert_eq!(req.method, Method::ToolScrollTo);
-        let params = req.params.clone().unwrap();
-        let parsed: ScrollToParams = serde_json::from_value(params).unwrap();
-        assert_eq!(parsed.ref_.as_deref(), Some("@e3"));
-        ResponseBody::Ok(
-            serde_json::to_value(ScrollToResult {
-                tab_id: 9,
-                used_ref: Some("e3".into()),
-                used_selector: None,
-                x: 10.0,
-                y: 20.0,
-                width: 100.0,
-                height: 40.0,
-                dialogs: vec![],
-            })
-            .unwrap(),
-        )
-    });
-
-    let session_id = ipc_session_start(&sock).await;
-    let result: ScrollToResult = ipc_tool_call(
-        &sock,
-        Method::ToolScrollTo,
-        ScrollToParams {
-            session_id,
-            ref_: Some("@e3".into()),
-            selector: None,
-            tab_id: None,
-            timeout_ms: Some(5_000),
-        },
-    )
-    .await
-    .expect("scroll-to ok");
-    assert_eq!(result.used_ref.as_deref(), Some("e3"));
-    assert_eq!(result.width, 100.0);
-    handle.shutdown().await;
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn fill_round_trips_clear_before_default() {
     let (handle, sock) = spawn_daemon().await;

crates/bsk-protocol/schema/tool_blur_params.json

@@ -1,42 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "BlurParams",
-  "type": "object",
-  "required": [
-    "session_id"
-  ],
-  "properties": {
-    "ref": {
-      "description": "Optional `@e<N>` ref allocated by the last observation. Mutually exclusive with `selector`.",
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "selector": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "session_id": {
-      "type": "string"
-    },
-    "tab_id": {
-      "description": "Target tab. Defaults to the Agent Window's active tab.",
-      "type": [
-        "integer",
-        "null"
-      ],
-      "format": "int64"
-    },
-    "timeout_ms": {
-      "type": [
-        "integer",
-        "null"
-      ],
-      "format": "uint32",
-      "minimum": 1.0
-    }
-  }
-}

crates/bsk-protocol/schema/tool_blur_result.json

@@ -1,112 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "BlurResult",
-  "type": "object",
-  "required": [
-    "focused",
-    "tab_id",
-    "was_focused"
-  ],
-  "properties": {
-    "dialogs": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/JavaScriptDialogInfo"
-      }
-    },
-    "focused": {
-      "description": "Always false for a successful blur; included for machine verification.",
-      "type": "boolean"
-    },
-    "tab_id": {
-      "type": "integer",
-      "format": "int64"
-    },
-    "used_ref": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "used_selector": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "was_focused": {
-      "description": "Whether the target held focus before the call.",
-      "type": "boolean"
-    }
-  },
-  "definitions": {
-    "JavaScriptDialogHandledAction": {
-      "description": "How the extension resolved the dialog so CDP could continue.",
-      "type": "string",
-      "enum": [
-        "accepted",
-        "dismissed"
-      ]
-    },
-    "JavaScriptDialogInfo": {
-      "description": "One observed + handled JavaScript dialog during a tool call.",
-      "type": "object",
-      "required": [
-        "handled",
-        "message",
-        "sequence",
-        "tab_id",
-        "type"
-      ],
-      "properties": {
-        "default_prompt": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "handled": {
-          "$ref": "#/definitions/JavaScriptDialogHandledAction"
-        },
-        "has_browser_handler": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        },
-        "message": {
-          "type": "string"
-        },
-        "sequence": {
-          "description": "Monotonic per-tab sequence for ordering within a session.",
-          "type": "integer",
-          "format": "uint64",
-          "minimum": 0.0
-        },
-        "tab_id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "type": {
-          "$ref": "#/definitions/JavaScriptDialogType"
-        },
-        "url": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      }
-    },
-    "JavaScriptDialogType": {
-      "description": "Native JS dialog kind reported by CDP.",
-      "type": "string",
-      "enum": [
-        "alert",
-        "confirm",
-        "prompt",
-        "beforeunload"
-      ]
-    }
-  }
-}

crates/bsk-protocol/schema/tool_focus_params.json

@@ -1,42 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "FocusParams",
-  "type": "object",
-  "required": [
-    "session_id"
-  ],
-  "properties": {
-    "ref": {
-      "description": "Optional `@e<N>` ref allocated by the last observation. Mutually exclusive with `selector`.",
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "selector": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "session_id": {
-      "type": "string"
-    },
-    "tab_id": {
-      "description": "Target tab. Defaults to the Agent Window's active tab.",
-      "type": [
-        "integer",
-        "null"
-      ],
-      "format": "int64"
-    },
-    "timeout_ms": {
-      "type": [
-        "integer",
-        "null"
-      ],
-      "format": "uint32",
-      "minimum": 1.0
-    }
-  }
-}

crates/bsk-protocol/schema/tool_focus_result.json

@@ -1,107 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "FocusResult",
-  "type": "object",
-  "required": [
-    "focused",
-    "tab_id"
-  ],
-  "properties": {
-    "dialogs": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/JavaScriptDialogInfo"
-      }
-    },
-    "focused": {
-      "description": "Whether the target holds DOM focus in its document or shadow root after the call.",
-      "type": "boolean"
-    },
-    "tab_id": {
-      "type": "integer",
-      "format": "int64"
-    },
-    "used_ref": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "used_selector": {
-      "type": [
-        "string",
-        "null"
-      ]
-    }
-  },
-  "definitions": {
-    "JavaScriptDialogHandledAction": {
-      "description": "How the extension resolved the dialog so CDP could continue.",
-      "type": "string",
-      "enum": [
-        "accepted",
-        "dismissed"
-      ]
-    },
-    "JavaScriptDialogInfo": {
-      "description": "One observed + handled JavaScript dialog during a tool call.",
-      "type": "object",
-      "required": [
-        "handled",
-        "message",
-        "sequence",
-        "tab_id",
-        "type"
-      ],
-      "properties": {
-        "default_prompt": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "handled": {
-          "$ref": "#/definitions/JavaScriptDialogHandledAction"
-        },
-        "has_browser_handler": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        },
-        "message": {
-          "type": "string"
-        },
-        "sequence": {
-          "description": "Monotonic per-tab sequence for ordering within a session.",
-          "type": "integer",
-          "format": "uint64",
-          "minimum": 0.0
-        },
-        "tab_id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "type": {
-          "$ref": "#/definitions/JavaScriptDialogType"
-        },
-        "url": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      }
-    },
-    "JavaScriptDialogType": {
-      "description": "Native JS dialog kind reported by CDP.",
-      "type": "string",
-      "enum": [
-        "alert",
-        "confirm",
-        "prompt",
-        "beforeunload"
-      ]
-    }
-  }
-}

crates/bsk-protocol/schema/tool_scroll_to_params.json

@@ -1,42 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "ScrollToParams",
-  "type": "object",
-  "required": [
-    "session_id"
-  ],
-  "properties": {
-    "ref": {
-      "description": "Optional `@e<N>` ref allocated by the last observation. Mutually exclusive with `selector`.",
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "selector": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "session_id": {
-      "type": "string"
-    },
-    "tab_id": {
-      "description": "Target tab. Defaults to the Agent Window's active tab.",
-      "type": [
-        "integer",
-        "null"
-      ],
-      "format": "int64"
-    },
-    "timeout_ms": {
-      "type": [
-        "integer",
-        "null"
-      ],
-      "format": "uint32",
-      "minimum": 1.0
-    }
-  }
-}

crates/bsk-protocol/schema/tool_scroll_to_result.json

@@ -1,123 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "ScrollToResult",
-  "type": "object",
-  "required": [
-    "height",
-    "tab_id",
-    "width",
-    "x",
-    "y"
-  ],
-  "properties": {
-    "dialogs": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/JavaScriptDialogInfo"
-      }
-    },
-    "height": {
-      "type": "number",
-      "format": "double"
-    },
-    "tab_id": {
-      "type": "integer",
-      "format": "int64"
-    },
-    "used_ref": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "used_selector": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "width": {
-      "type": "number",
-      "format": "double"
-    },
-    "x": {
-      "description": "Bounding rectangle of the element's visible border-box portion, in top-level viewport CSS pixels, after ancestor and viewport clipping. Partial visibility is sufficient. This is not an occlusion or hit test.",
-      "type": "number",
-      "format": "double"
-    },
-    "y": {
-      "type": "number",
-      "format": "double"
-    }
-  },
-  "definitions": {
-    "JavaScriptDialogHandledAction": {
-      "description": "How the extension resolved the dialog so CDP could continue.",
-      "type": "string",
-      "enum": [
-        "accepted",
-        "dismissed"
-      ]
-    },
-    "JavaScriptDialogInfo": {
-      "description": "One observed + handled JavaScript dialog during a tool call.",
-      "type": "object",
-      "required": [
-        "handled",
-        "message",
-        "sequence",
-        "tab_id",
-        "type"
-      ],
-      "properties": {
-        "default_prompt": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "handled": {
-          "$ref": "#/definitions/JavaScriptDialogHandledAction"
-        },
-        "has_browser_handler": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        },
-        "message": {
-          "type": "string"
-        },
-        "sequence": {
-          "description": "Monotonic per-tab sequence for ordering within a session.",
-          "type": "integer",
-          "format": "uint64",
-          "minimum": 0.0
-        },
-        "tab_id": {
-          "type": "integer",
-          "format": "int64"
-        },
-        "type": {
-          "$ref": "#/definitions/JavaScriptDialogType"
-        },
-        "url": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      }
-    },
-    "JavaScriptDialogType": {
-      "description": "Native JS dialog kind reported by CDP.",
-      "type": "string",
-      "enum": [
-        "alert",
-        "confirm",
-        "prompt",
-        "beforeunload"
-      ]
-    }
-  }
-}

crates/bsk-protocol/src/bin/dump-schema.rs

@@ -79,12 +79,6 @@ fn main() {
     dump!(ClickResult, "tool_click_result");
     dump!(HoverParams, "tool_hover_params");
     dump!(HoverResult, "tool_hover_result");
-    dump!(ScrollToParams, "tool_scroll_to_params");
-    dump!(ScrollToResult, "tool_scroll_to_result");
-    dump!(FocusParams, "tool_focus_params");
-    dump!(FocusResult, "tool_focus_result");
-    dump!(BlurParams, "tool_blur_params");
-    dump!(BlurResult, "tool_blur_result");
     dump!(FillParams, "tool_fill_params");
     dump!(FillResult, "tool_fill_result");
     dump!(PressParams, "tool_press_params");

crates/bsk-protocol/src/method.rs

@@ -72,12 +72,6 @@ pub enum Method {
     ToolClick,
     #[serde(rename = "tool.hover")]
     ToolHover,
-    #[serde(rename = "tool.scroll_to")]
-    ToolScrollTo,
-    #[serde(rename = "tool.focus")]
-    ToolFocus,
-    #[serde(rename = "tool.blur")]
-    ToolBlur,
     #[serde(rename = "tool.fill")]
     ToolFill,
     #[serde(rename = "tool.press")]
@@ -174,9 +168,6 @@ impl Method {
             | Method::ToolNavigateForward
             | Method::ToolReload
             | Method::ToolClick
-            | Method::ToolScrollTo
-            | Method::ToolFocus
-            | Method::ToolBlur
             | Method::ToolFill
             | Method::ToolPress
             | Method::ToolSelect
@@ -314,9 +305,6 @@ mod tests {
         assert!(Method::ToolNavigateForward.is_mutating());
         assert!(Method::ToolReload.is_mutating());
         assert!(Method::ToolClick.is_mutating());
-        assert!(Method::ToolScrollTo.is_mutating());
-        assert!(Method::ToolFocus.is_mutating());
-        assert!(Method::ToolBlur.is_mutating());
         assert!(Method::ToolFill.is_mutating());
         assert!(Method::ToolPress.is_mutating());
         assert!(Method::ToolSelect.is_mutating());
@@ -361,9 +349,6 @@ mod tests {
         assert_eq!(Method::ToolHover.effect(), MethodEffect::TransientInput);
         assert_eq!(Method::ToolObserve.effect(), MethodEffect::TransientInput);
         assert_eq!(Method::ToolClick.effect(), MethodEffect::BrowserMutation);
-        assert_eq!(Method::ToolScrollTo.effect(), MethodEffect::BrowserMutation);
-        assert_eq!(Method::ToolFocus.effect(), MethodEffect::BrowserMutation);
-        assert_eq!(Method::ToolBlur.effect(), MethodEffect::BrowserMutation);
         assert_eq!(Method::Cancel.effect(), MethodEffect::ControlPlane);
     }
 
@@ -373,9 +358,6 @@ mod tests {
         assert!(Method::ToolHover.requires_interrupt_gate());
         assert!(Method::ToolObserve.requires_interrupt_gate());
         assert!(Method::ToolClick.requires_interrupt_gate());
-        assert!(Method::ToolScrollTo.requires_interrupt_gate());
-        assert!(Method::ToolFocus.requires_interrupt_gate());
-        assert!(Method::ToolBlur.requires_interrupt_gate());
         assert!(!Method::Cancel.requires_interrupt_gate());
     }
 }

crates/bsk-protocol/src/tools/interaction.rs

@@ -1,5 +1,5 @@
-//! DOM interaction tools (`tool.click`, `tool.hover`, `tool.focus`,
-//! `tool.blur`, `tool.fill`, `tool.press`, `tool.select`).
+//! DOM interaction tools (`tool.click`, `tool.fill`, `tool.press`,
+//! `tool.select`).
 //!
 //! Element-targeted tools accept either a snapshot `ref` (`@e<N>` form,
 //! normalised against the session's RefStore) **or** a CSS selector
@@ -131,82 +131,6 @@ pub struct HoverResult {
     pub dialogs: Vec<JavaScriptDialogInfo>,
 }
 
-// ---------------------------------------------------------------------------
-// focus / blur
-// ---------------------------------------------------------------------------
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
-pub struct FocusParams {
-    pub session_id: String,
-    /// Optional `@e<N>` ref allocated by the last observation.
-    /// Mutually exclusive with `selector`.
-    #[serde(
-        rename = "ref",
-        alias = "ref_",
-        default,
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub ref_: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub selector: Option<String>,
-    /// Target tab. Defaults to the Agent Window's active tab.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub tab_id: Option<i64>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    #[schemars(range(min = 1))]
-    pub timeout_ms: Option<u32>,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
-pub struct FocusResult {
-    pub tab_id: i64,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub used_ref: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub used_selector: Option<String>,
-    /// Whether the target holds DOM focus in its document or shadow root after the call.
-    pub focused: bool,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub dialogs: Vec<JavaScriptDialogInfo>,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
-pub struct BlurParams {
-    pub session_id: String,
-    /// Optional `@e<N>` ref allocated by the last observation.
-    /// Mutually exclusive with `selector`.
-    #[serde(
-        rename = "ref",
-        alias = "ref_",
-        default,
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub ref_: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub selector: Option<String>,
-    /// Target tab. Defaults to the Agent Window's active tab.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub tab_id: Option<i64>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    #[schemars(range(min = 1))]
-    pub timeout_ms: Option<u32>,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
-pub struct BlurResult {
-    pub tab_id: i64,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub used_ref: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub used_selector: Option<String>,
-    /// Whether the target held focus before the call.
-    pub was_focused: bool,
-    /// Always false for a successful blur; included for machine verification.
-    pub focused: bool,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub dialogs: Vec<JavaScriptDialogInfo>,
-}
-
 // ---------------------------------------------------------------------------
 // fill
 // ---------------------------------------------------------------------------
@@ -401,37 +325,6 @@ mod tests {
         assert_eq!(round, p);
     }
 
-    #[test]
-    fn focus_params_serialise_ref_field_name() {
-        let p = FocusParams {
-            session_id: "abcd".into(),
-            ref_: Some("@e4".into()),
-            selector: None,
-            tab_id: Some(42),
-            timeout_ms: Some(5_000),
-        };
-        let v = serde_json::to_value(&p).unwrap();
-        assert_eq!(v.get("ref").and_then(|v| v.as_str()), Some("@e4"));
-        assert!(v.get("ref_").is_none());
-        let round: FocusParams = serde_json::from_value(v).unwrap();
-        assert_eq!(round, p);
-    }
-
-    #[test]
-    fn blur_result_round_trips_focus_state() {
-        let result = BlurResult {
-            tab_id: 42,
-            used_ref: Some("e4".into()),
-            used_selector: None,
-            was_focused: true,
-            focused: false,
-            dialogs: vec![],
-        };
-        let value = serde_json::to_value(&result).unwrap();
-        let round: BlurResult = serde_json::from_value(value).unwrap();
-        assert_eq!(round, result);
-    }
-
     #[test]
     fn modifiers_render_as_lowercase_strings() {
         let v = serde_json::to_value(KeyModifier::Ctrl).unwrap();

crates/bsk-protocol/src/tools/mod.rs

@@ -14,7 +14,6 @@ mod record_common;
 mod record_v2;
 mod record_v3;
 pub mod script;
-pub mod scroll;
 pub mod session;
 pub mod tabs;
 pub mod waits;
@@ -31,7 +30,6 @@ pub use network::*;
 pub use observation::*;
 pub use record::*;
 pub use script::*;
-pub use scroll::*;
 pub use session::*;
 pub use tabs::*;
 pub use waits::*;

crates/bsk-protocol/src/tools/scroll.rs

@@ -1,67 +0,0 @@
-//! Element scrolling primitive (`tool.scroll_to`).
-
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-use super::JavaScriptDialogInfo;
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
-pub struct ScrollToParams {
-    pub session_id: String,
-    /// Optional `@e<N>` ref allocated by the last observation.
-    /// Mutually exclusive with `selector`.
-    #[serde(
-        rename = "ref",
-        alias = "ref_",
-        default,
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub ref_: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub selector: Option<String>,
-    /// Target tab. Defaults to the Agent Window's active tab.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub tab_id: Option<i64>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    #[schemars(range(min = 1))]
-    pub timeout_ms: Option<u32>,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
-pub struct ScrollToResult {
-    pub tab_id: i64,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub used_ref: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub used_selector: Option<String>,
-    /// Bounding rectangle of the element's visible border-box portion, in
-    /// top-level viewport CSS pixels, after ancestor and viewport clipping.
-    /// Partial visibility is sufficient. This is not an occlusion or hit test.
-    pub x: f64,
-    pub y: f64,
-    pub width: f64,
-    pub height: f64,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub dialogs: Vec<JavaScriptDialogInfo>,
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn params_serialise_ref_field_name() {
-        let params = ScrollToParams {
-            session_id: "abcd".into(),
-            ref_: Some("@e3".into()),
-            selector: None,
-            tab_id: Some(42),
-            timeout_ms: Some(5_000),
-        };
-        let value = serde_json::to_value(&params).unwrap();
-        assert_eq!(value.get("ref").and_then(|v| v.as_str()), Some("@e3"));
-        assert!(value.get("ref_").is_none());
-        let round: ScrollToParams = serde_json::from_value(value).unwrap();
-        assert_eq!(round, params);
-    }
-}

docs/architecture.md

@@ -84,11 +84,6 @@ Shared Rust types + JSON Schema generation. TypeScript mirrors frame shapes in
 4. Extension dispatcher validates sandbox rules, invokes CDP via `BrowserDriver`.
 5. Response travels CLI ← daemon ← extension; CLI prints result and exits.
 
-The [scroll-to primitive reference](scroll-to.md) documents `tool.scroll_to`,
-including its CLI/plugin mappings, visible-bounds contract and cancellation
-behavior. It follows the same routing path and is classified as a browser
-mutation for session queueing and user-interruption gating.
-
 ## Session and sandbox model
 
 - **Session** = opaque ID (4 lowercase letters in v0.1) + dedicated **Agent Window**

docs/scroll-to.md

@@ -1,131 +0,0 @@
-# Scroll-to primitive
-
-`scroll-to` brings an existing element and its containing frames into view, then
-returns the visible portion's bounds. Use it to reveal a target before inspecting
-the page or taking a screenshot. It accepts an element target rather than a pixel
-distance or scroll direction.
-
-| Entry point | Name |
-| --- | --- |
-| CLI | `bsk scroll-to` |
-| Wire protocol | `tool.scroll_to` |
-| DeepSeek Harness | `browser_interact` with `action: "scroll-to"` |
-
-## CLI
-
-Use a session you started and a fresh ref from an observation. The ids below are
-examples; substitute the session, tab and ref returned by your own calls.
-
-```sh
-bsk scroll-to @e3 --session abcd --tab-id 42 --timeout 5s --json
-bsk scroll-to --selector '#details' --session abcd
-```
-
-Supply exactly one target: a positional ref or selector, `--ref`, or `--selector`.
-Refs accept `@e3` and `e3`. CSS selectors search only the main document; use refs
-for elements in iframes (including out-of-process iframes) or shadow roots.
-Refs belong to one session and tab and may become stale after page changes.
-
-`--session` is required. `--tab-id` defaults to the Agent Window's active tab.
-`--timeout` defaults to `30s` and must be positive; durations such as `5000ms` and
-`5s` are accepted. The command operates on Agent Window tabs, including user tabs
-explicitly borrowed into that window.
-
-Example JSON output:
-
-```json
-{
-  "tab_id": 42,
-  "used_ref": "e3",
-  "x": 10,
-  "y": 20,
-  "width": 100,
-  "height": 80
-}
-```
-
-`used_ref` or `used_selector` identifies the resolved target. The optional
-`dialogs` array reports JavaScript dialogs handled during the call.
-
-## Result contract
-
-`x` and `y` are the upper-left corner, and `width` and `height` are the size of
-the visible border-box portion's bounding rectangle. All four values use
-**top-level viewport CSS pixels**, after scrolling and clipping by ancestor
-containers and frame viewports. They are not document or screenshot pixel
-coordinates.
-
-Partial visibility is sufficient: a 400px-high element clipped by an 80px-high
-scroll container can succeed with `height: 80`. Hidden or fully clipped targets
-fail. The rectangle is not an occlusion or hit test: another element can cover
-the target, and the rectangle's center is not a guaranteed click point. Layout
-can change after the result; use fresh refs for subsequent interactions.
-
-## Protocol and plugin
-
-The CLI sends a normal request through the daemon to the extension:
-
-```json
-{
-  "id": "scroll-1",
-  "method": "tool.scroll_to",
-  "params": {
-    "session_id": "abcd",
-    "ref": "@e3",
-    "tab_id": 42,
-    "timeout_ms": 5000
-  }
-}
-```
-
-Protocol callers must supply exactly one nonempty `ref` or `selector`.
-`tab_id` is optional; `timeout_ms` is a positive integer and defaults to 30000.
-These target constraints are enforced by the handler. See the generated
-[parameter schema](../crates/bsk-protocol/schema/tool_scroll_to_params.json) and
-[result schema](../crates/bsk-protocol/schema/tool_scroll_to_result.json) for field
-types. The wire response wraps the result above in `{ "id": "scroll-1", "result": ... }`.
-
-The plugin exposes the same action with its usual camelCase parameters:
-
-```json
-{
-  "action": "scroll-to",
-  "session": "abcd",
-  "target": "@e3",
-  "tabId": 42,
-  "timeoutMs": 5000
-}
-```
-
-Call this through `browser_interact` using a plugin-owned session. Its result
-contains `session`, `tabId`, `x`, `y`, `width` and `height` with the same bounds
-semantics. Omitted `session` uses the plugin's current session.
-
-## Errors and interruption
-
-The wire response uses the normal `error.code`, `error.message` and optional
-`error.data.reason` fields. Common cases are:
-
-| Code | `data.reason` | Meaning |
-| --- | --- | --- |
-| `invalid_params` | — | Missing/conflicting target or invalid timeout/tab id |
-| `not_found` | `ref_not_found` | Ref is unknown, expired or belongs to another tab |
-| `not_found` | `selector_not_found` | Main-document selector matched no element |
-| `permission_denied` | `agent_window_scope` | Target tab has not been borrowed into the Agent Window |
-| `permission_denied` | `element_not_visible` | No visible area remains after scrolling |
-| `cancelled` | — | The call was cancelled |
-| `timeout` | — | The action deadline expired |
-| `cdp_failed` | varies | Browser command, frame geometry or visibility measurement failed |
-
-The protocol classifies scroll-to as a browser mutation, so it uses the existing
-per-session queue and user-interruption gate. The extension releases any retained
-hover state before dispatch. Cancellation and deadline checks surround each CDP
-step, including frame lookup, scrolling and measurement. Once detected, they
-prevent further scrolling and a successful response; remote-object cleanup still
-runs. Already performed scrolling is not rolled back, so inspect the current
-page before retrying an interrupted call.
-
-The implementation is scoped to scroll-to: it reuses frame scrolling and
-coordinate projection, with a separate visibility measurement that accounts for
-ancestor clipping and hidden frame owners. Shared click, hover and screenshot
-geometry is unchanged.

evals/browser/cases/regression/oopif-scrollbars/README.md

@@ -1,41 +0,0 @@
-# OOPIF occupied-scrollbar regression
-
-An iframe's content quad includes its child viewport's scrollbar space, while
-`Page.getLayoutMetrics().cssLayoutViewport` excludes that space. Mapping the latter
-onto the whole quad stretches positions and sizes. The full target-local viewport
-must determine scale; the visible viewport must still clip content at every OOPIF
-boundary and constrain target-local action points.
-
-This fixture alternates loopback hostnames across two nested OOPIFs. It includes
-scrolling, borders, padding, scaled iframe owners, a partially clipped button and
-a fully clipped button. Custom scrollbars occupy different widths and heights.
-The `scrollbars` query parameter accepts `both` (default), `vertical`, `horizontal`
-or `none`.
-
-Run the numerical regression with Node 22+ and a local Chrome executable:
-
-```sh
-BSK_GEOMETRY_CHROME=/path/to/chrome pnpm --filter @browser-skill/extension exec vitest run \
-  src/tools/__tests__/snapshot-coordinates.browser.test.ts
-```
-
-The existing browser runner is shared with the snapshot-unit regression. The test:
-
-- Verifies actual OOPIF targets and occupied scrollbar dimensions.
-- Compares snapshot and live geometry with independent DOM rectangles and clipping.
-- Dispatches real root-target clicks and verifies the intended frame/button received them.
-- Rejects fully clipped controls and checks snapshot measurement reuse per target.
-- Covers five device-scale/browser-zoom combinations plus single-axis and no-scrollbar cases.
-
-The runner creates and removes isolated browser profiles. It is opt-in and skipped
-in normal unit runs when `BSK_GEOMETRY_CHROME` is unset.
-
-Run the CLI fixture smoke with a connected test extension:
-
-```sh
-BSK_AUTO_UPDATE=off pnpm eval:browser smoke --case oopif-scrollbars --bsk ./target/debug/bsk
-```
-
-The smoke assertions verify both nested frames have occupied scrollbars, that the
-marker is observed and that the session is closed. Numeric geometry and actual
-click assertions are exercised by the browser test above, not by smoke alone.

evals/browser/cases/regression/oopif-scrollbars/oopif-scrollbars.case.json

@@ -1,39 +0,0 @@
-{
-  "$schema": "../../../schemas/case.schema.json",
-  "schemaVersion": 1,
-  "id": "oopif-scrollbars",
-  "title": "Nested OOPIFs with occupied scrollbars and clipped controls",
-  "suite": "regression",
-  "tags": ["geometry", "iframe", "scroll"],
-  "fixture": { "startPath": "/oopif-scrollbars" },
-  "prompts": {
-    "en": "Open {url}, observe the page and its frames, report the OOPIF-SCROLLBARS marker, then close the session.",
-    "zh-CN": "打开 {url}，观察页面及其 iframe，报告 OOPIF-SCROLLBARS 标记，然后关闭会话。"
-  },
-  "coverage": ["session.start", "session.stop", "page.navigate", "inspect.observe"],
-  "assertions": {
-    "site": [
-      {
-        "label": "nested frame fixture settled",
-        "type": "geometry.ready",
-        "where": { "data.root": true },
-        "minCount": 1
-      },
-      {
-        "label": "both child frames have occupied scrollbars",
-        "type": "geometry.scrollbars",
-        "where": { "data.vertical": true, "data.horizontal": true },
-        "minCount": 2
-      }
-    ],
-    "response": [{ "label": "observed the fixture marker", "includes": "OOPIF-SCROLLBARS" }],
-    "adapter": [{ "label": "browser session was closed", "key": "sessionStopped" }]
-  },
-  "smoke": {
-    "steps": [
-      { "action": "navigate" },
-      { "action": "wait-site-event", "type": "geometry.ready", "where": { "root": true } },
-      { "action": "observe" }
-    ]
-  }
-}

evals/browser/cases/regression/oopif-scrollbars/oopif-scrollbars.fixture.mjs

@@ -1,56 +0,0 @@
-import { page, withRun } from "../../../lib/fixtures.mjs";
-
-export default {
-  id: "oopif-scrollbars",
-  routes: ["/oopif-scrollbars", "/oopif-scrollbars/frame", "/oopif-scrollbars/nested"],
-  render({ pathname, runId, query }) {
-    const root = pathname === "/oopif-scrollbars";
-    const nested = pathname.endsWith("/nested");
-    const mode = query.get("scrollbars") ?? "both";
-    return page({
-      title: "OOPIF scrollbar geometry regression",
-      body: `
-        <style>
-          main { margin: 0; width: auto; }
-          body { width: 2000px; height: 2400px; }
-          html { overflow-anchor: none; }
-          ${!root ? `html { overflow-x: ${mode === "vertical" || mode === "none" ? "hidden" : "scroll"}; overflow-y: ${mode === "horizontal" || mode === "none" ? "hidden" : "scroll"}; } html::-webkit-scrollbar { width: 17px; height: 11px; }` : ""}
-          button { position: absolute; padding: 0; border: 0; border-radius: 0; }
-          #probe { left: ${root ? 180 : nested ? 30 : 100}px; top: ${root ? 360 : nested ? 40 : 160}px; width: 60px; height: 20px; }
-          #edge { position: fixed; right: -20px; bottom: -15px; width: 80px; height: 60px; }
-          #outside { position: fixed; left: calc(100% + 2px); top: calc(100% + 2px); width: 10px; height: 10px; }
-          iframe { position: absolute; box-sizing: content-box; width: 420px; height: 320px;
-            left: 340px; top: 400px; border: 6px solid black; padding: 8px; transform: scale(1.2); transform-origin: 0 0; }
-          #nested { left: 150px; top: 210px; width: 200px; height: 120px; border-width: 4px; padding: 6px; transform: scale(0.8); }
-        </style>
-        <button id="probe" data-geometry-probe>OOPIF-SCROLLBARS</button>
-        ${!root ? '<button id="edge" data-geometry-probe>EDGE</button><button id="outside" data-geometry-probe>OUTSIDE</button>' : ""}
-        ${!nested ? `<iframe id="${root ? "cross" : "nested"}" name="${root ? "cross" : "nested"}" title="${root ? "outer" : "nested"} cross-site frame"></iframe>` : ""}
-      `,
-      script: `
-        history.scrollRestoration = "manual";
-        const child = document.querySelector("iframe");
-        if (child) {
-          const url = new URL(${JSON.stringify(withRun(root ? "/oopif-scrollbars/frame" : "/oopif-scrollbars/nested", runId, { scrollbars: mode }))}, location.href);
-          url.hostname = location.hostname === "127.0.0.1" ? "localhost" : "127.0.0.1";
-          child.src = url.href;
-        }
-        document.addEventListener("click", event => {
-          const probe = event.target.closest("[data-geometry-probe]");
-          if (probe) browserEval.send("geometry.clicked", { probe: probe.id });
-        });
-        window.addEventListener("load", () => {
-          scrollTo(${root ? "80, 240" : nested ? "10, 20" : "40, 100"});
-          requestAnimationFrame(() => requestAnimationFrame(() => {
-            document.documentElement.dataset.geometryReady = "true";
-            if (!${root}) browserEval.send("geometry.scrollbars", {
-              vertical: innerWidth > document.documentElement.clientWidth,
-              horizontal: innerHeight > document.documentElement.clientHeight,
-            });
-            browserEval.send("geometry.ready", { root: ${root} });
-          }));
-        });
-      `,
-    });
-  },
-};

evals/browser/cases/regression/snapshot-coordinates/README.md

@@ -1,41 +0,0 @@
-# DOMSnapshot layout-unit regression (#195)
-
-Source: https://github.com/Tencent/BrowserSkill/pull/195
-
-DOMSnapshot bounds and document scroll offsets retain Blink layout units. Treating them as CSS
-pixels changes both positions and sizes under device scaling/browser zoom, before iframe
-projection or viewport clipping even starts.
-
-The fixture contains a scrolled root, a scrolled same-process iframe, an OOPIF served from the
-other loopback hostname, and a nested iframe in each. Owners have borders, padding and CSS
-transforms. The geometry test compares the production capture's local and top-level rectangles
-against independent DOM border boxes, with at most 2 CSS pixels of layout rounding. It also
-checks that each target reads layout metrics only once. No credentials or personal tabs are used.
-
-Run the geometric assertions with Node 22+ and a local Chrome executable:
-
-```sh
-BSK_GEOMETRY_CHROME=/path/to/chrome pnpm --filter @browser-skill/extension exec vitest run \
-  src/tools/__tests__/snapshot-coordinates.browser.test.ts
-```
-
-The test launches and cleans up its own headless Chrome profiles. It explicitly verifies the
-requested browser zoom and OOPIF topology, so unsupported setups fail rather than silently
-testing a different configuration. It is skipped in ordinary unit runs unless the executable
-is specified. No browser download or new package dependency is required.
-
-The corpus smoke case checks fixture readiness and observable semantics through the real CLI:
-
-```sh
-BSK_AUTO_UPDATE=off pnpm eval:browser smoke --case snapshot-coordinates --bsk ./target/debug/bsk
-```
-
-Smoke alone does **not** certify coordinate accuracy; CLI observations do not expose raw boxes.
-Use the geometric test above for the regression's numeric assertions.
-
-## Related scrollbar regression
-
-The unit-conversion fixture keeps non-occupying OOPIF scrollbars by default. The same
-browser test also runs the dedicated [OOPIF scrollbar fixture](../oopif-scrollbars/README.md),
-which covers occupied scrollbars, two OOPIF boundaries, clipping and real clicks.
-Append `&classic-scrollbars` to this fixture's URL to enable its normal OOPIF scrollbars.

evals/browser/cases/regression/snapshot-coordinates/chrome.mjs

@@ -1,99 +0,0 @@
-import { spawn } from "node:child_process";
-import { once } from "node:events";
-import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
-// This regression owns its browser/profile. It never attaches to a user's Chrome.
-export async function withChrome({ executable, deviceScale, zoom }, run) {
-  const profile = await mkdtemp(join(tmpdir(), "bsk-snapshot-coordinates-"));
-  let chrome;
-  let socket;
-  const pending = new Map();
-  try {
-    await mkdir(join(profile, "Default"));
-    await writeFile(
-      join(profile, "Default", "Preferences"),
-      JSON.stringify({
-        partition: { default_zoom_level: { x: Math.log(zoom) / Math.log(1.2) } },
-      }),
-    );
-    chrome = spawn(
-      executable,
-      [
-        "--headless=new",
-        "--no-first-run",
-        "--no-default-browser-check",
-        "--disable-extensions",
-        "--site-per-process",
-        "--remote-debugging-port=0",
-        "--window-size=1600,1200",
-        `--force-device-scale-factor=${deviceScale}`,
-        `--user-data-dir=${profile}`,
-        "about:blank",
-      ],
-      { stdio: ["ignore", "ignore", "pipe"] },
-    );
-    const endpoint = await new Promise((resolve, reject) => {
-      let output = "";
-      const timeout = setTimeout(
-        () => reject(new Error(`Chrome startup timed out: ${output}`)),
-        15_000,
-      );
-      const fail = (error) => {
-        clearTimeout(timeout);
-        reject(error);
-      };
-      chrome.once("error", fail);
-      chrome.once("exit", (code) => fail(new Error(`Chrome exited (${code}): ${output}`)));
-      chrome.stderr.on("data", (chunk) => {
-        output += chunk;
-        const match = output.match(/DevTools listening on (ws:\/\/\S+)/);
-        if (match) {
-          clearTimeout(timeout);
-          resolve(match[1]);
-        }
-      });
-    });
-    socket = new WebSocket(endpoint);
-    await new Promise((resolve, reject) => {
-      socket.addEventListener("open", resolve, { once: true });
-      socket.addEventListener("error", reject, { once: true });
-    });
-    socket.addEventListener("message", ({ data }) => {
-      const reply = JSON.parse(data);
-      const request = pending.get(reply.id);
-      if (!request) return;
-      clearTimeout(request.timeout);
-      pending.delete(reply.id);
-      if (reply.error) request.reject(new Error(JSON.stringify(reply.error)));
-      else request.resolve(reply.result);
-    });
-    let sequence = 0;
-    const send = (method, params = {}, sessionId) =>
-      new Promise((resolve, reject) => {
-        const id = ++sequence;
-        const timeout = setTimeout(() => {
-          pending.delete(id);
-          reject(new Error(`CDP timed out: ${method}`));
-        }, 10_000);
-        pending.set(id, { resolve, reject, timeout });
-        socket.send(JSON.stringify({ id, method, params, sessionId }));
-      });
-    await run(send);
-  } finally {
-    for (const request of pending.values()) {
-      clearTimeout(request.timeout);
-      request.reject(new Error("regression browser closed"));
-    }
-    socket?.close();
-    if (chrome && chrome.exitCode === null && chrome.signalCode === null) {
-      const exited = once(chrome, "exit");
-      const timeout = setTimeout(() => chrome.kill("SIGKILL"), 5_000);
-      chrome.kill();
-      await exited;
-      clearTimeout(timeout);
-    }
-    await rm(profile, { recursive: true, force: true });
-  }
-}

evals/browser/cases/regression/snapshot-coordinates/snapshot-coordinates.case.json

@@ -1,33 +0,0 @@
-{
-  "$schema": "../../../schemas/case.schema.json",
-  "schemaVersion": 1,
-  "id": "snapshot-coordinates",
-  "title": "Scrolled and nested frame coordinate fixture",
-  "suite": "regression",
-  "tags": ["geometry", "iframe", "scroll"],
-  "fixture": { "startPath": "/snapshot-coordinates" },
-  "prompts": {
-    "en": "Open {url}, observe the page and its frames, report the GEOMETRY marker, then close the session.",
-    "zh-CN": "打开 {url}，观察页面及其 iframe，报告 GEOMETRY 标记，然后关闭会话。"
-  },
-  "coverage": ["session.start", "session.stop", "page.navigate", "inspect.observe"],
-  "assertions": {
-    "site": [
-      {
-        "label": "root fixture scrolled and settled",
-        "type": "geometry.ready",
-        "where": { "data.root": true },
-        "minCount": 1
-      }
-    ],
-    "response": [{ "label": "observed the fixture marker", "includes": "GEOMETRY-195" }],
-    "adapter": [{ "label": "browser session was closed", "key": "sessionStopped" }]
-  },
-  "smoke": {
-    "steps": [
-      { "action": "navigate" },
-      { "action": "wait-site-event", "type": "geometry.ready", "where": { "root": true } },
-      { "action": "observe" }
-    ]
-  }
-}

evals/browser/cases/regression/snapshot-coordinates/snapshot-coordinates.fixture.mjs

@@ -1,52 +0,0 @@
-import { page, withRun } from "../../../lib/fixtures.mjs";
-
-export default {
-  id: "snapshot-coordinates",
-  routes: ["/snapshot-coordinates", "/snapshot-coordinates/frame", "/snapshot-coordinates/nested"],
-  render({ pathname, runId, query }) {
-    const root = pathname === "/snapshot-coordinates";
-    const nested = pathname.endsWith("/nested");
-    return page({
-      title: "Snapshot coordinate regression",
-      body: `
-        <style>
-          main { margin: 0; width: auto; }
-          body { width: 2000px; height: 2400px; }
-          html { overflow-anchor: none; }
-          ${query.get("scrollbars") === "none" ? "html { scrollbar-width: none; }" : ""}
-          button { position: absolute; box-sizing: border-box; padding: 0; border: 2px solid black; border-radius: 0; }
-          #probe { left: ${root ? 180 : 100}px; top: ${root ? 360 : 160}px; width: 120px; height: 40px; }
-          iframe { position: absolute; box-sizing: content-box; width: 320px; height: 220px;
-            border: 6px solid black; padding: 8px; transform: scale(1.25); transform-origin: 0 0; }
-          #same { left: 340px; top: 400px; }
-          #cross { left: 820px; top: 400px; }
-          #nested { left: 150px; top: 210px; width: 130px; height: 70px; border-width: 2px; padding: 4px; transform: scale(0.8); }
-          ${nested ? "#probe { left: 30px; top: 40px; width: 60px; height: 20px; }" : ""}
-        </style>
-        <button id="probe" data-geometry-probe>GEOMETRY-195</button>
-        ${root ? `<iframe id="same" name="same" title="same-process frame" src="${withRun("/snapshot-coordinates/frame", runId)}"></iframe><iframe id="cross" name="cross" title="cross-site frame"></iframe>` : ""}
-        ${!root && !nested ? `<iframe id="nested" name="nested" title="nested frame" src="${withRun("/snapshot-coordinates/nested", runId)}"></iframe>` : ""}
-      `,
-      script: `
-        history.scrollRestoration = "manual";
-        const cross = document.querySelector("#cross");
-        if (cross) {
-          const url = new URL(${JSON.stringify(withRun("/snapshot-coordinates/frame", runId))}, location.href);
-          url.hostname = location.hostname === "127.0.0.1" ? "localhost" : "127.0.0.1";
-          // Isolate unit conversion from the pre-existing OOPIF scrollbar-width
-          // projection issue. ?classic-scrollbars retains that separate reproduction.
-          if (!new URLSearchParams(location.search).has("classic-scrollbars")) url.searchParams.set("scrollbars", "none");
-          cross.src = url.href;
-        }
-        window.addEventListener("load", () => {
-          scrollTo(${root ? "80, 240" : nested ? "10, 20" : "40, 100"});
-          requestAnimationFrame(() => requestAnimationFrame(() => {
-            window.geometryReady = true;
-            document.documentElement.dataset.geometryReady = "true";
-            browserEval.send("geometry.ready", { root: ${root} });
-          }));
-        });
-      `,
-    });
-  },
-};

evals/browser/tests/eval.test.mjs

@@ -41,23 +41,17 @@ test("case manifests are discovered, ordered, and grouped into suites", () => {
       "diagnostics",
       "mobile-emulation",
       "generated-form",
-      "oopif-scrollbars",
-      "snapshot-coordinates",
     ],
   );
-  assert.deepEqual(repositorySummary(cases, fixtureRegistry).suites, {
-    core: 6,
-    matrix: 1,
-    regression: 2,
-  });
+  assert.deepEqual(repositorySummary(cases, fixtureRegistry).suites, { core: 6, matrix: 1 });
 });
 
 test("repository validation links every case to a fixture and valid workflow evidence", () => {
   assert.deepEqual(validateRepositoryCases(cases, fixtureRegistry), []);
   const summary = repositorySummary(cases, fixtureRegistry);
-  assert.equal(summary.cases, 9);
-  assert.equal(summary.fixtureModules, 10);
-  assert.equal(summary.fixtureRoutes, 18);
+  assert.equal(summary.cases, 7);
+  assert.equal(summary.fixtureModules, 8);
+  assert.equal(summary.fixtureRoutes, 12);
 });
 
 test("manifest validation rejects unknown operations and incomplete workflow steps", () => {

packages/dsh-plugin-browserskill/README.md

@@ -54,13 +54,10 @@ the `bsk` CLI and browser extension separately when a release requires it.
 | `browser_session` | `start`, `stop`, `list` | Manage plugin-owned Agent Window sessions. |
 | `browser_page` | `navigate`, `back`, `forward`, `reload`, `wait` | Navigate the active tab and wait for page lifecycle events. |
 | `browser_inspect` | `observe`, `snapshot`, `html`, `screenshot`, `console`, `network` | Read semantic or diagnostic page state and capture screenshots. |
-| `browser_interact` | `click`, `hover`, `scroll-to`, `focus`, `blur`, `fill`, `select`, `press` | Interact with controls using fresh refs or selectors. |
+| `browser_interact` | `click`, `hover`, `fill`, `select`, `press` | Interact with controls using fresh refs or selectors. |
 | `browser_tabs` | `list`, `create`, `select`, `close`, `borrow`, `return` | Manage Agent Window tabs and temporarily borrow user tabs. |
 | `browser_assist` | `resize`, `emulate`, `request-help` | Resize or emulate the browser and pause for human-only steps. |
 
-For `browser_interact` with `action: "scroll-to"`, see the
-[scroll-to reference](../../docs/scroll-to.md) for parameters, visible bounds and errors.
-
 Arbitrary page-script evaluation and interaction recording are not supported.
 
 ## Multi-session model

packages/dsh-plugin-browserskill/skill/SKILL.md

@@ -51,13 +51,8 @@ Use `browser_inspect` action `observe` as the primary semantic page view. It ret
 text, and `@eN` refs. Prefer fresh refs over raw selectors. Refs invalidate after navigation and may
 also become stale after large DOM changes, so observe again before the next interaction.
 
-Use `browser_interact` with `action=scroll-to` to bring an element into view. Its bounds are the
-visible border-box portion in top-level viewport CSS pixels after ancestor clipping; partial
-visibility is enough. Hidden or fully clipped targets fail. This does not test occlusion by other
-elements. Use fresh element refs for iframe/shadow-root targets; selectors search the main document.
-
-Use `browser_interact` for click, hover, scroll-to, focus, blur, fill, select, and key actions. Focus and blur
-explicitly enter or leave UI states triggered by focus changes. An observation marks a hover-only surface as `@e1 button "Products" [hover first: Shoes | Bags]`. The listed items are
+Use `browser_interact` for click, hover, fill, select, and key actions. An observation marks a
+hover-only surface as `@e1 button "Products" [hover first: Shoes | Bags]`. The listed items are
 labels, not usable refs: hover the trigger, observe again, then act on the revealed item's own ref.
 Do not click the trigger itself unless the user wants the trigger's action.
 

packages/dsh-plugin-browserskill/src/browser-tools.ts

@@ -167,15 +167,12 @@ const BROWSER_TOOL_SPECS: BrowserToolSpec[] = [
   {
     name: "browser_interact",
     description:
-      "Interact with an element in the active Agent Window tab. Actions: click, hover, scroll-to, focus, blur, fill, select, " +
-      "press. click/hover/scroll-to/focus/blur/fill/select require target; fill also requires value; select requires " +
+      "Interact with an element in the active Agent Window tab. Actions: click, hover, fill, select, " +
+      "press. click/hover/fill/select require target; fill also requires value; select requires " +
       "values; press requires key and may optionally focus target first.",
     actions: {
       click: "interact.click",
       hover: "interact.hover",
-      "scroll-to": "interact.scroll-to",
-      focus: "interact.focus",
-      blur: "interact.blur",
       fill: "interact.fill",
       select: "interact.select",
       press: "interact.press",

packages/dsh-plugin-browserskill/src/observation.ts

@@ -562,10 +562,6 @@ export function actionForLabel(label: string): string {
       return "clicking";
     case "hover":
       return "hovering";
-    case "focus":
-      return "focusing";
-    case "blur":
-      return "blurring";
     case "fill":
       return "filling";
     case "select":

packages/dsh-plugin-browserskill/src/phase-one-tools-interaction.ts

@@ -13,7 +13,7 @@ import type { ToolDeps } from "./tools";
 
 const MODIFIERS = ["alt", "ctrl", "meta", "shift"] as const;
 
-/** Add interaction primitives without bypassing session ownership or observation. */
+/** Add hover and select without bypassing session ownership or observation. */
 export function registerPhaseOneInteractionTools(
   deps: ToolDeps,
   register: ToolRegistrar,
@@ -100,171 +100,6 @@ export function registerPhaseOneInteractionTools(
     }),
   );
 
-  register(
-    defineTool({
-      name: "interact.scroll-to",
-      description:
-        "Scroll an element and its frame owners into view. Returns the visible portion's " +
-        "bounds in top-level viewport CSS pixels; fails if no visible area remains. " +
-        "Use a fresh ref for iframe targets; selectors search the main document.",
-      parameters: {
-        target: {
-          type: "string",
-          required: true,
-          description: "Element ref (@e3 / e3) or main-document CSS selector to scroll into view.",
-        },
-        session: SESSION_PARAM,
-        tabId: TAB_ID_PARAM,
-        timeoutMs: TIMEOUT_MS_PARAM,
-      },
-      output: {
-        schema: {
-          type: "object",
-          additionalProperties: false,
-          properties: {
-            session: { type: "string", required: true },
-            tabId: { type: "integer", required: true },
-            x: { type: "number", required: true },
-            y: { type: "number", required: true },
-            width: { type: "number", required: true },
-            height: { type: "number", required: true },
-          },
-        },
-        render: (_args, value) => [
-          {
-            type: "text",
-            text:
-              `[session ${value.session}] scrolled into view on tab ${value.tabId}: ` +
-              `(${value.x}, ${value.y}, ${value.width}, ${value.height})`,
-          },
-        ],
-      },
-      async execute(args, exec) {
-        requireNonEmpty(args.target, "target");
-        requirePositive(args.timeoutMs, "timeoutMs");
-        const sessionId = registry.resolve(args.session, "browser_interact(action=scroll-to)");
-        const cmdArgs = ["scroll-to", "--session", sessionId];
-        appendTabId(cmdArgs, args.tabId);
-        if (args.timeoutMs !== undefined) cmdArgs.push("--timeout", `${args.timeoutMs}ms`);
-        appendTarget(cmdArgs, args.target);
-        const reply = (await runtime.run(
-          exec,
-          cmdArgs,
-          "scroll-to",
-          sessionId,
-          runnerTimeout(deps, args.timeoutMs),
-        )) as {
-          tab_id: number;
-          x: number;
-          y: number;
-          width: number;
-          height: number;
-        };
-        return {
-          session: sessionId,
-          tabId: reply.tab_id,
-          x: reply.x,
-          y: reply.y,
-          width: reply.width,
-          height: reply.height,
-        };
-      },
-      presentCall: (args) => ({
-        card: "terminal",
-        title: runtime.commandLine([
-          "scroll-to",
-          args.target,
-          "--session",
-          args.session ?? "(current)",
-        ]),
-        description: "Scroll an element into view",
-      }),
-      presentResult: runtime.presentTerminalResult,
-    }),
-  );
-
-  for (const action of ["focus", "blur"] as const) {
-    register(
-      defineTool({
-        name: `interact.${action}`,
-        description:
-          action === "focus"
-            ? "Focus an element and verify its DOM focus state."
-            : "Remove focus from an element and report whether it was focused.",
-        parameters: {
-          target: {
-            type: "string",
-            required: true,
-            description: "Snapshot ref (@e3 / e3) or CSS selector of the element.",
-          },
-          session: SESSION_PARAM,
-          tabId: TAB_ID_PARAM,
-          timeoutMs: TIMEOUT_MS_PARAM,
-        },
-        output: {
-          schema: {
-            type: "object",
-            additionalProperties: false,
-            properties: {
-              session: { type: "string", required: true },
-              tabId: { type: "integer", required: true },
-              focused: { type: "boolean", required: true },
-              wasFocused: {
-                type: "boolean",
-                description: "Whether the target was focused before blur.",
-              },
-            },
-          },
-          render: (_args, value) => [
-            {
-              type: "text",
-              text:
-                `[session ${value.session}] ${action} on tab ${value.tabId}: focused=${value.focused}` +
-                (value.wasFocused === undefined ? "" : `, wasFocused=${value.wasFocused}`),
-            },
-          ],
-        },
-        async execute(args, exec) {
-          requireNonEmpty(args.target, "target");
-          requirePositive(args.timeoutMs, "timeoutMs");
-          const sessionId = registry.resolve(args.session, `browser_interact(action=${action})`);
-          const cmdArgs = [action, "--session", sessionId];
-          appendTabId(cmdArgs, args.tabId);
-          if (args.timeoutMs !== undefined) cmdArgs.push("--timeout", `${args.timeoutMs}ms`);
-          appendTarget(cmdArgs, args.target);
-          const reply = (await runtime.run(
-            exec,
-            cmdArgs,
-            action,
-            sessionId,
-            runnerTimeout(deps, args.timeoutMs),
-          )) as {
-            tab_id: number;
-            focused: boolean;
-            was_focused?: boolean;
-          };
-          return {
-            session: sessionId,
-            tabId: reply.tab_id,
-            focused: reply.focused,
-            ...(action === "blur" ? { wasFocused: reply.was_focused } : {}),
-          };
-        },
-        presentCall: (args) => ({
-          card: "terminal",
-          title: runtime.commandLine([
-            action,
-            args.target,
-            "--session",
-            args.session ?? "(current)",
-          ]),
-          description: action === "focus" ? "Focus an element" : "Remove focus from an element",
-        }),
-        presentResult: runtime.presentTerminalResult,
-      }),
-    );
-  }
-
   register(
     defineTool({
       name: "interact.select",

packages/dsh-plugin-browserskill/tests/tools.test.ts

@@ -102,9 +102,6 @@ const ACTION_ROUTES: Record<string, readonly [string, string]> = {
   "inspect.network": ["browser_inspect", "network"],
   "interact.click": ["browser_interact", "click"],
   "interact.hover": ["browser_interact", "hover"],
-  "interact.scroll-to": ["browser_interact", "scroll-to"],
-  "interact.focus": ["browser_interact", "focus"],
-  "interact.blur": ["browser_interact", "blur"],
   "interact.fill": ["browser_interact", "fill"],
   "interact.select": ["browser_interact", "select"],
   "interact.press": ["browser_interact", "press"],
@@ -203,7 +200,7 @@ const EXPECTED_ACTIONS = {
   browser_session: ["start", "stop", "list"],
   browser_page: ["navigate", "back", "forward", "reload", "wait"],
   browser_inspect: ["observe", "snapshot", "html", "screenshot", "console", "network"],
-  browser_interact: ["click", "hover", "scroll-to", "focus", "blur", "fill", "select", "press"],
+  browser_interact: ["click", "hover", "fill", "select", "press"],
   browser_tabs: ["list", "create", "select", "close", "borrow", "return"],
   browser_assist: ["resize", "emulate", "request-help"],
 } as const;
@@ -502,85 +499,6 @@ describe("interaction tools", () => {
     ]);
   });
 
-  it.each([
-    "focus",
-    "blur",
-  ] as const)("interact.%s maps focus state, target, tab and timeout", async (action) => {
-    const { tools, calls } = setup({
-      "session start": START_REPLY("s1"),
-      [action]: {
-        tab_id: 7,
-        focused: action === "focus",
-        ...(action === "blur" ? { was_focused: true } : {}),
-      },
-    });
-    await startSession(tools);
-    const target = action === "focus" ? "@e3" : "#field";
-    const value = await tools
-      .get(`interact.${action}`)
-      ?.execute({ target, tabId: 7, timeoutMs: 150_000 }, makeExec());
-    expect(value).toEqual({
-      session: "s1",
-      tabId: 7,
-      focused: action === "focus",
-      ...(action === "blur" ? { wasFocused: true } : {}),
-    });
-    expect(calls[1].args).toEqual([
-      action,
-      "--session",
-      "s1",
-      "--tab-id",
-      "7",
-      "--timeout",
-      "150000ms",
-      target,
-    ]);
-    expect(calls[1].options.timeoutMs).toBe(165_000);
-  });
-
-  it.each([
-    "focus",
-    "blur",
-    "scroll-to",
-  ] as const)("interact.%s validates arguments and session ownership before running", async (action) => {
-    const { tools, calls } = setup({ "session start": START_REPLY("s1") });
-    await startSession(tools);
-    const tool = tools.get(`interact.${action}`)!;
-    await expect(tool.execute({}, makeExec())).rejects.toThrow(/invalid arguments/i);
-    await expect(tool.execute({ target: " " }, makeExec())).rejects.toThrow(/non-empty/i);
-    await expect(tool.execute({ target: "e1", timeoutMs: 0 }, makeExec())).rejects.toThrow(
-      /greater than zero/i,
-    );
-    await expect(tool.execute({ target: "e1", session: "foreign" }, makeExec())).rejects.toThrow(
-      /session/i,
-    );
-    expect(calls).toHaveLength(1);
-  });
-
-  it.each(["@e3", "#target"])("interact.scroll-to maps %s, bounds and timeout", async (target) => {
-    const { tools, calls } = setup({
-      "session start": START_REPLY("s1"),
-      "scroll-to": { tab_id: 7, x: 10, y: 20, width: 100, height: 80 },
-    });
-    await startSession(tools);
-    expect(
-      await tools
-        .get("interact.scroll-to")
-        ?.execute({ target, tabId: 7, timeoutMs: 150_000 }, makeExec()),
-    ).toEqual({ session: "s1", tabId: 7, x: 10, y: 20, width: 100, height: 80 });
-    expect(calls[1].args).toEqual([
-      "scroll-to",
-      "--session",
-      "s1",
-      "--tab-id",
-      "7",
-      "--timeout",
-      "150000ms",
-      target,
-    ]);
-    expect(calls[1].options.timeoutMs).toBe(165_000);
-  });
-
   it("interact.fill passes value and --no-clear", async () => {
     const { tools, calls } = setup(responses);
     await startSession(tools);

skill/SKILL.md

@@ -55,20 +55,10 @@ Use this default loop:
 ```text
 bsk navigate <url> --session <id>
 bsk observe --session <id>
-bsk click|hover|scroll-to|focus|blur|fill|select|press ... --session <id>
+bsk click|hover|fill|select|press ... --session <id>
 bsk observe --session <id>             # after navigation or a meaningful DOM change
 ```
 
-`bsk scroll-to <ref-or-selector> --session <id>` scrolls an element and its frame owners into view.
-Use a fresh element ref for iframe/shadow-root targets; CSS selectors search the main document.
-The result is the visible border-box portion's bounds in top-level viewport CSS pixels after
-ancestor clipping. Partial visibility is enough; hidden or fully clipped targets fail with
-`permission_denied` and `data.reason=element_not_visible`. This does not test occlusion by other elements.
-For a specific tab or deadline: `bsk scroll-to @e3 --session <id> --tab-id 42 --timeout 5s`.
-
-`bsk focus <ref>` explicitly focuses a target; `bsk blur <ref>` removes focus and reports whether
-it was focused. Use these for UI states triggered by focus changes.
-
 Prefer fresh `@eN` refs over CSS selectors. Navigation invalidates refs; large DOM changes may also
 make them stale. Observe again before the next interaction.
 
@@ -124,7 +114,7 @@ This list of names is complete. Never invent a command outside it; read
 session start|stop|list   browsers   status   doctor   update   logs
 navigate   navigate-back   navigate-forward   reload   wait-for-navigation   wait-ms
 observe   snapshot   get-html   screenshot   console   network
-click   hover   scroll-to   focus   blur   fill   select   press   evaluate
+click   hover   fill   select   press   evaluate
 tab list|create|close|select|borrow|return   window resize   emulate
 upload   download   request-help   record start|stop
 ```