@piwitests/reporter 0.39.0 → 0.40.0

package/dist/internal/capture/capture-fixtures.js

@@ -31,11 +31,17 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var capture_fixtures_exports = {};
 __export(capture_fixtures_exports, {
   CAPTURED_ATTRS_ARG: () => CAPTURED_ATTRS_ARG,
+  LocatorPageLog: () => LocatorPageLog,
   ariaSnapshotBestEffort: () => ariaSnapshotBestEffort,
   ariaSnapshotJSONBestEffort: () => ariaSnapshotJSONBestEffort,
+  boxCaptureFrames: () => boxCaptureFrames,
   buildPageState: () => buildPageState,
+  callMethod: () => callMethod,
   computeCoreVitals: () => computeCoreVitals,
   extendPiwiFixtures: () => extendPiwiFixtures,
+  internalCall: () => internalCall,
+  noteLocatorCall: () => noteLocatorCall,
+  noteNavigation: () => noteNavigation,
   piwiFixtures: () => piwiFixtures,
   probeElementAttrs: () => probeElementAttrs
 });
@@ -44,7 +50,30 @@ var import_node_zlib2 = require("zlib");
 
 // ../picker-dom/src/probe.ts
 function probeElementAttrs(el, arg) {
-  const { keep, tagRoles, inputRoles, roleSources, includeStructural, includeLabelText } = arg;
+  const { keep, tagRoles, inputRoles, roleSources, includeStructural } = arg;
+  const FIELD_TAGS = ["input", "select", "textarea"];
+  const textWithout = (root, skip) => {
+    if (root === skip) return "";
+    if (root.nodeType === 3) return root.nodeValue || "";
+    let text = "";
+    const kids = root.childNodes || [];
+    for (let i = 0; i < kids.length; i++) text += textWithout(kids[i], skip);
+    return text;
+  };
+  const labelTextOf = (n) => {
+    try {
+      const ids = (n.getAttribute("aria-labelledby") || "").split(/\s+/).filter(Boolean);
+      let text = "";
+      for (const id of ids) {
+        const ref = n.ownerDocument.getElementById(id);
+        if (ref) text += ` ${textWithout(ref, n)}`;
+      }
+      if (!text.trim() && n.labels && n.labels.length > 0) text = textWithout(n.labels[0], n);
+      return text.replace(/\s+/g, " ").trim().slice(0, 120) || null;
+    } catch {
+      return null;
+    }
+  };
   const attrMap = {};
   for (const key of keep) {
     const v = el.getAttribute(key) ?? el[key];
@@ -124,10 +153,18 @@ function probeElementAttrs(el, arg) {
       const targetRole = roleOf(el);
       const targetLevel = targetRole === "heading" ? levelOf(el) : null;
       const nameOf = (n) => {
+        const labelledBy = !!n.getAttribute("aria-labelledby");
+        const isField = FIELD_TAGS.indexOf((n.tagName || "").toLowerCase()) !== -1;
+        const lt = labelledBy || isField ? labelTextOf(n) : null;
+        if (lt && labelledBy) return lt;
         const al = n.getAttribute("aria-label");
         if (al) return al;
-        const txt = (n.textContent || "").replace(/\s+/g, " ").trim();
-        if (txt) return txt;
+        if (isField) {
+          if (lt) return lt;
+        } else {
+          const txt = (n.textContent || "").replace(/\s+/g, " ").trim();
+          if (txt) return txt;
+        }
         return n.getAttribute("title") || n.getAttribute("placeholder") || null;
       };
       const targetName = nameOf(el);
@@ -319,16 +356,7 @@ function probeElementAttrs(el, arg) {
     }
   }
   const hasLabel = !!(el.labels && el.labels.length > 0);
-  let labelText;
-  if (includeLabelText) {
-    labelText = null;
-    try {
-      const label = hasLabel ? el.labels[0] : null;
-      labelText = (label && label.textContent || "").replace(/\s+/g, " ").trim().slice(0, 120) || null;
-    } catch {
-      labelText = null;
-    }
-  }
+  const labelText = labelTextOf(el);
   return {
     tagName: el.tagName?.toLowerCase?.() ?? "unknown",
     attributes: attrMap,
@@ -340,7 +368,7 @@ function probeElementAttrs(el, arg) {
       y: Math.round(r.y + r.height / 2)
     },
     hasLabel,
-    ...includeLabelText ? { labelText } : {},
+    labelText,
     selectorCounts,
     ...includeStructural ? { rolePosition, ancestors } : {}
   };
@@ -1311,9 +1339,15 @@ function generateAlternatives(attrs) {
 }
 function approximateAccessibleName(attrs) {
   const a = attrs.attributes;
+  const labelText = attrs.labelText || null;
+  if (a["aria-labelledby"] && labelText) return labelText;
   const ariaLabel = a["aria-label"];
   if (ariaLabel) return ariaLabel;
-  if (attrs.textContent) return attrs.textContent;
+  if (["input", "select", "textarea"].includes(attrs.tagName)) {
+    if (labelText) return labelText;
+  } else if (attrs.textContent) {
+    return attrs.textContent;
+  }
   const title = a["title"];
   if (title) return title;
   const placeholder = a["placeholder"];
@@ -1743,6 +1777,7 @@ var ATTACHMENT_NAMES = {
   dialogs: "piwi-dialogs",
   network: "piwi-network",
   pageInventory: "piwi-page-inventory",
+  locatorPages: "piwi-locator-pages",
   webVitals: "piwi-web-vitals",
   locatorSuggestion: "piwi-locator-suggestion",
   pageState: "piwi-page-state",
@@ -1869,6 +1904,94 @@ function inventoryPageKey(url) {
   }
 }
 
+// ../core/src/page-key.ts
+function normalizeRoute(url) {
+  try {
+    const parsed = new URL(url);
+    let pathname = parsed.pathname;
+    pathname = pathname.replace(/\/eyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+(?=\/|$)/g, "/:jwt");
+    pathname = pathname.replace(/\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}(?=\/|$)/gi, "/:uuid");
+    pathname = pathname.replace(/\/[0-9ABCDEFGHJKMNPQRSTVWXYZ]{26}(?=\/|$)/gi, "/:ulid");
+    pathname = pathname.replace(/\/[A-Za-z0-9_-]{40,}(?=\/|$)/g, "/:token");
+    pathname = pathname.replace(/\/[0-9a-f]{32,}(?=\/|$)/gi, "/:token");
+    pathname = pathname.replace(/\/\d+(?=\/|$)/g, "/:id");
+    let queryString = "";
+    if (parsed.search) {
+      const params = new URLSearchParams(parsed.search);
+      const redacted = new URLSearchParams();
+      for (const [key] of params) {
+        redacted.set(key, "<redacted>");
+      }
+      queryString = "?" + redacted.toString();
+    }
+    return `${pathname}${queryString}`;
+  } catch {
+    return url;
+  }
+}
+var PATH_ANCHOR_HOST = "piwi.invalid";
+function pageKey(url) {
+  const hasScheme = /^[a-z][a-z0-9+.-]*:/i.test(url);
+  if (hasScheme && !/^https?:\/\//i.test(url)) return null;
+  const absolute = /^https?:\/\//i.test(url) ? url : `http://${PATH_ANCHOR_HOST}${url.startsWith("/") ? "" : "/"}${url}`;
+  const normalized = normalizeRoute(absolute);
+  const q = normalized.indexOf("?");
+  return q < 0 ? normalized : normalized.slice(0, q);
+}
+
+// src/internal/capture/locator-pages.ts
+var MAX_LOCATOR_PAGE_ENTRIES = 1e3;
+var MAX_LOCATOR_CHARS = 1e3;
+var NON_INTERACTIONS = /* @__PURE__ */ new Set(["waitFor"]);
+var interactions = /* @__PURE__ */ new WeakMap();
+function noteNavigation(page) {
+  interactions.set(page, 0);
+}
+function isOnArrival(page) {
+  return (interactions.get(page) ?? 0) === 0;
+}
+function noteLocatorCall(page, method, assertion = false) {
+  const arrival = isOnArrival(page);
+  if (!assertion && !NON_INTERACTIONS.has(method)) interactions.set(page, (interactions.get(page) ?? 0) + 1);
+  return arrival;
+}
+function pageOf(url) {
+  const key = pageKey(url);
+  if (key === null) return null;
+  try {
+    const origin = new URL(url).origin;
+    return origin && origin !== "null" ? { origin, page: key } : null;
+  } catch {
+    return null;
+  }
+}
+var LocatorPageLog = class {
+  constructor() {
+    this.entries = /* @__PURE__ */ new Map();
+  }
+  /** Record one call. Silently skipped without a call site, off an http(s) page, or past the limits. */
+  record(call) {
+    if (!call.location || !call.locator || call.locator.length > MAX_LOCATOR_CHARS) return;
+    const where = pageOf(call.url);
+    if (!where) return;
+    const key = `${call.location}\0${call.locator}\0${where.origin}\0${where.page}`;
+    const existing = this.entries.get(key);
+    if (existing) {
+      existing.arrival ||= call.arrival;
+      return;
+    }
+    if (this.entries.size >= MAX_LOCATOR_PAGE_ENTRIES) return;
+    this.entries.set(key, { location: call.location, locator: call.locator, ...where, arrival: call.arrival });
+  }
+  get size() {
+    return this.entries.size;
+  }
+  /** The entries in the order the calls first happened. */
+  list() {
+    return [...this.entries.values()];
+  }
+};
+
 // src/internal/probe/mode.ts
 var fs2 = __toESM(require("fs"));
 var path3 = __toESM(require("path"));
@@ -1987,8 +2110,8 @@ function parseRouteKey(routeKey) {
   return { method: routeKey.slice(0, space).toUpperCase(), pattern: routeKey.slice(space + 1) };
 }
 function patternToRegex(pattern) {
-  const path6 = pattern.split("?")[0] ?? pattern;
-  const escaped = path6.replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(/:[A-Za-z0-9_]+/g, "[^/]+");
+  const path8 = pattern.split("?")[0] ?? pattern;
+  const escaped = path8.replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(/:[A-Za-z0-9_]+/g, "[^/]+");
   return new RegExp(`^${escaped}$`);
 }
 function suitePathEqual(a, b) {
@@ -2011,13 +2134,13 @@ function matchProbeItem(plan, test) {
 function requestMatchesRoute(method, url, routeKey) {
   const { method: rm, pattern } = parseRouteKey(routeKey);
   if (rm && rm !== method.toUpperCase()) return false;
-  let path6;
+  let path8;
   try {
-    path6 = new URL(url).pathname;
+    path8 = new URL(url).pathname;
   } catch {
-    path6 = url.split("?")[0] ?? url;
+    path8 = url.split("?")[0] ?? url;
   }
-  return patternToRegex(pattern).test(path6);
+  return patternToRegex(pattern).test(path8);
 }
 function createProbeState() {
   return { navigated: false, matches: 0 };
@@ -2039,10 +2162,10 @@ function isProbeMode() {
 function loadPlan() {
   if (planCache !== void 0) return planCache;
   planCache = null;
-  const path6 = process.env[PIWI_PROBE_ENV.plan];
-  if (path6) {
+  const path8 = process.env[PIWI_PROBE_ENV.plan];
+  if (path8) {
     try {
-      planCache = JSON.parse(fs2.readFileSync(path6, "utf8"));
+      planCache = JSON.parse(fs2.readFileSync(path8, "utf8"));
     } catch {
       planCache = null;
     }
@@ -2064,10 +2187,10 @@ function outcomeFromStatus(status, applied) {
   return status === "failed" || status === "timedOut" || status === "interrupted" ? "noticed" : "not-noticed";
 }
 function recordProbeOutcome(line) {
-  const path6 = process.env[PIWI_PROBE_ENV.results];
-  if (!path6) return;
+  const path8 = process.env[PIWI_PROBE_ENV.results];
+  if (!path8) return;
   try {
-    fs2.appendFileSync(path6, `${JSON.stringify(line)}
+    fs2.appendFileSync(path8, `${JSON.stringify(line)}
 `);
   } catch {
   }
@@ -2249,7 +2372,7 @@ async function installProbeInterception(page, item) {
       });
       applied = out.changed;
       if (applied) appliedFault = item.fault;
-      if (out.delayMs > 0) await new Promise((resolve) => setTimeout(resolve, out.delayMs));
+      if (out.delayMs > 0) await new Promise((resolve2) => setTimeout(resolve2, out.delayMs));
       const headers = fulfillHeaders(response.headers(), out.contentType);
       await route.fulfill({ status: out.status, body: out.body, headers });
     } catch {
@@ -2791,6 +2914,79 @@ function isDueForAriaSample(testInfo) {
   return set.has(ariaSampleIdentity(relativeTestFile(testInfo.file), testInfo.title));
 }
 
+// src/internal/capture/quiet-capture.ts
+var import_node_module = require("module");
+var path7 = __toESM(require("path"));
+
+// src/internal/support/reporter-version.ts
+var fs4 = __toESM(require("fs"));
+var path6 = __toESM(require("path"));
+var CANDIDATE_OFFSETS = ["..", "../../.."];
+function findOwnPackageJson(fromDir) {
+  for (const offset of CANDIDATE_OFFSETS) {
+    try {
+      const pkgPath = path6.resolve(fromDir, offset, "package.json");
+      const pkg = JSON.parse(fs4.readFileSync(pkgPath, "utf-8"));
+      const { name, version } = pkg;
+      if (name === "@piwitests/reporter" && typeof version === "string")
+        return { version, root: path6.dirname(pkgPath) };
+    } catch {
+    }
+  }
+  return void 0;
+}
+
+// src/internal/capture/quiet-capture.ts
+var BOXED_PREFIX_EXPORTS = [
+  [
+    "playwright-core/lib/coreBundle",
+    (mod) => mod?.utils?.setBoxedStackPrefixes
+  ],
+  ["playwright-core/lib/utils", (mod) => mod?.setBoxedStackPrefixes]
+];
+var boxing;
+function resolveBoxing() {
+  try {
+    const root = findOwnPackageJson(__dirname)?.root;
+    if (!root) return null;
+    const testPackageJson = (0, import_node_module.createRequire)(__filename).resolve("@playwright/test/package.json");
+    const playwrightPackageJson = (0, import_node_module.createRequire)(testPackageJson).resolve("playwright/package.json");
+    const requireFromPlaywright = (0, import_node_module.createRequire)(playwrightPackageJson);
+    for (const [moduleId, pick] of BOXED_PREFIX_EXPORTS) {
+      let set;
+      try {
+        set = pick(requireFromPlaywright(moduleId));
+      } catch {
+        continue;
+      }
+      if (typeof set !== "function") continue;
+      return {
+        set,
+        prefixes: [path7.dirname(playwrightPackageJson), path7.join(root, "dist") + path7.sep]
+      };
+    }
+  } catch {
+  }
+  return null;
+}
+function boxCaptureFrames(extraPrefixes = []) {
+  const first = boxing === void 0;
+  if (first) boxing = resolveBoxing();
+  if (!boxing) return;
+  const added = extraPrefixes.filter((prefix) => !boxing.prefixes.includes(prefix));
+  if (!first && added.length === 0) return;
+  boxing.prefixes.push(...added);
+  try {
+    boxing.set([...boxing.prefixes]);
+  } catch {
+  }
+}
+function internalCall(owner, run) {
+  const wrap = owner?._wrapApiCall;
+  if (typeof wrap !== "function") return run();
+  return wrap.call(owner, run, { internal: true, title: "Piwi capture" });
+}
+
 // src/internal/capture/capture-fixtures.ts
 function computeCoreVitals(lcpEntries, shiftEntries, eventEntries) {
   const lastLcp = lcpEntries && lcpEntries.length > 0 ? lcpEntries[lcpEntries.length - 1] : null;
@@ -2841,7 +3037,8 @@ function createSink() {
     probeItem: null,
     probeInterception: null,
     pickOffered: false,
-    userPick: null
+    userPick: null,
+    locatorPages: new LocatorPageLog()
   };
 }
 var currentSink = null;
@@ -2851,8 +3048,8 @@ async function drainPendingProbes(capMs) {
   let cap;
   await Promise.race([
     Promise.allSettled(PENDING_PROBES),
-    new Promise((resolve) => {
-      cap = setTimeout(resolve, capMs);
+    new Promise((resolve2) => {
+      cap = setTimeout(resolve2, capMs);
     })
   ]);
   clearTimeout(cap);
@@ -2892,10 +3089,10 @@ async function readWebVitals(page) {
         const key = entry.name.replace(/-([a-z])/g, (_, l) => l.toUpperCase());
         paint[key] = Math.round(entry.startTime);
       }
-      const readBuffered = (type, extra) => new Promise((resolve) => {
+      const readBuffered = (type, extra) => new Promise((resolve2) => {
         try {
           const PO = globalThis.PerformanceObserver;
-          if (!PO || !(PO.supportedEntryTypes || []).includes(type)) return resolve(null);
+          if (!PO || !(PO.supportedEntryTypes || []).includes(type)) return resolve2(null);
           const out = [];
           const po = new PO((list) => out.push(...list.getEntries()));
           po.observe({ type, buffered: true, ...extra });
@@ -2905,10 +3102,10 @@ async function readWebVitals(page) {
               po.disconnect();
             } catch {
             }
-            resolve(out);
+            resolve2(out);
           }, 0);
         } catch {
-          resolve(null);
+          resolve2(null);
         }
       });
       const [lcpRaw, shiftRaw, eventRaw, firstInputRaw] = await Promise.all([
@@ -3021,12 +3218,12 @@ var PAGE_INVENTORY_IN_PAGE_CAP = 2e3;
 var PAGE_INVENTORY_EVAL_TIMEOUT_MS = 2e3;
 var MAX_PAGE_INVENTORY_WINDOWS = 64;
 function withTimeout(promise, ms) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     const timer = setTimeout(() => reject(new Error("page inventory read timed out")), ms);
     promise.then(
       (value) => {
         clearTimeout(timer);
-        resolve(value);
+        resolve2(value);
       },
       (error) => {
         clearTimeout(timer);
@@ -3060,7 +3257,7 @@ async function recordPageWindow(sink, page) {
   if (sink.pageInventories.length >= MAX_PAGE_INVENTORY_WINDOWS) return;
   if (key && !inventoriedPageKeys.has(key)) {
     inventoriedPageKeys.add(key);
-    const content = await readPageInventory(page);
+    const content = await internalCall(page, () => readPageInventory(page));
     if (sink.pageInventories.length >= MAX_PAGE_INVENTORY_WINDOWS) return;
     sink.pageInventories.push({
       url: content?.url ?? url,
@@ -3077,6 +3274,9 @@ async function stashPageState(sink, closing) {
   if (!page || isPageClosed(page)) return;
   const belongsToClosing = closing.page === page || closing.context !== void 0 && pageContext(page) === closing.context;
   if (!belongsToClosing) return;
+  await internalCall(page, () => readPageBeforeClose(sink, page));
+}
+async function readPageBeforeClose(sink, page) {
   const vitals = await readWebVitals(page);
   if (vitals) sink.stashedWebVitals = vitals;
   if (process.env.PIWI_CAPTURE_PAGE_STATE !== "false") {
@@ -3118,7 +3318,10 @@ async function maybeOpenPicker(sink, closing) {
     console.log("[piwi] locator picker: no failing locator could be identified in this failure \u2014 nothing to replace.");
     return;
   }
-  const pick = await runLocatorPicker(page, testInfo, failed, { fn: probeElementAttrs, arg: CAPTURED_ATTRS_ARG });
+  const pick = await internalCall(
+    page,
+    () => runLocatorPicker(page, testInfo, failed, { fn: probeElementAttrs, arg: CAPTURED_ATTRS_ARG })
+  );
   if (!pick) return;
   sink.userPick = pick;
   applyPickToSnapshots(sink.capturedLocators, pick);
@@ -3137,12 +3340,8 @@ var CAPTURED_ATTRS_ARG = {
   // special-cased logic in the probe, so add them explicitly).
   roleSources: [.../* @__PURE__ */ new Set(["[role]", "input", "select", ...Object.keys(TAG_TO_ROLE)])].join(","),
   // The reporter always wants ancestor-anchored alternatives (the picker's
-  // anchors step and generateAnchoredAlternatives both need them). `labelText`
-  // is what names a form field, and the probe reads it from `el.labels` in the
-  // same pass — so asking for it here is free and settles the accessible name
-  // of a labeled field without a second round trip (`exactAccessibleName`).
-  includeStructural: true,
-  includeLabelText: true
+  // anchors step and generateAnchoredAlternatives both need them).
+  includeStructural: true
 };
 var PROBE_GLOBAL = "__piwiProbeElement";
 var PROBE_INIT_SCRIPT = `(() => {
@@ -3153,15 +3352,18 @@ var PROBE_INIT_SCRIPT = `(() => {
 var PROBE_UNSEEDED_PAGES = /* @__PURE__ */ new WeakSet();
 function probeElement(page, target) {
   const shipSource = () => target.evaluate(probeElementAttrs, CAPTURED_ATTRS_ARG);
-  if (!page || PROBE_UNSEEDED_PAGES.has(page)) return shipSource();
-  return target.evaluate((el, name) => {
-    const seeded = globalThis[name];
-    return typeof seeded === "function" ? seeded(el) : null;
-  }, PROBE_GLOBAL).then((attrs) => {
-    if (attrs) return attrs;
-    PROBE_UNSEEDED_PAGES.add(page);
-    return shipSource();
-  });
+  if (!page || PROBE_UNSEEDED_PAGES.has(page)) return internalCall(page, shipSource);
+  return internalCall(
+    page,
+    () => target.evaluate((el, name) => {
+      const seeded = globalThis[name];
+      return typeof seeded === "function" ? seeded(el) : null;
+    }, PROBE_GLOBAL).then((attrs) => {
+      if (attrs) return attrs;
+      PROBE_UNSEEDED_PAGES.add(page);
+      return shipSource();
+    })
+  );
 }
 async function ariaSnapshotBestEffort(target, timeout) {
   if (typeof target.ariaSnapshot !== "function") return null;
@@ -3212,7 +3414,7 @@ function startElementCapture(sink, page, target, seq, callerLocation, used) {
       const role = resolveAriaRole({ ...attrs, accessibleName: null });
       const isFormField = FORM_FIELD_TAGS.has(attrs.tagName);
       const exactName = exactAccessibleName(attrs, role);
-      const aria = exactName === null && (role || isFormField) ? await ariaSnapshotBestEffort(target, 500) : null;
+      const aria = exactName === null && (role || isFormField) ? await internalCall(page, () => ariaSnapshotBestEffort(target, 500)) : null;
       const accessibleName = exactName ?? (extractAccessibleName(aria) || approximateAccessibleName({ ...attrs, accessibleName: null }));
       sink.capturedLocators[seq] = {
         location: callerLocation,
@@ -3240,15 +3442,23 @@ function startElementCapture(sink, page, target, seq, callerLocation, used) {
   })();
   sink.capturePromises.push(resolveAttrs);
 }
+function callMethod(target, prop, args) {
+  return target[prop](...args);
+}
+function recordLocatorPage(sink, page, locator, location, arrival) {
+  try {
+    sink.locatorPages.record({ location, locator: String(locator), url: page.url(), arrival });
+  } catch {
+  }
+}
 function wrapLocator(page, locator, originMethod, originArgs) {
   return new Proxy(locator, {
     get(target, prop) {
       const original = Reflect.get(target, prop);
       if (typeof original !== "function") return original;
-      const fn = original;
       if (CHAIN_METHOD_SET.has(prop)) {
         return (...args) => {
-          const next = fn.apply(target, args);
+          const next = callMethod(target, prop, args);
           if (LOCATOR_CREATING_CHAINS.has(prop)) {
             return wrapLocator(page, next, String(prop), args);
           }
@@ -3260,11 +3470,12 @@ function wrapLocator(page, locator, originMethod, originArgs) {
           const sink = currentSink;
           const expression = typeof callArgs[0] === "string" ? callArgs[0] : "";
           const isNot = Boolean(callArgs[1]?.isNot);
+          const callerLocation = sink ? captureCallerLocation() : null;
+          if (sink) recordLocatorPage(sink, page, target, callerLocation, noteLocatorCall(page, EXPECT_METHOD, true));
           if (!sink || isNot || !EXPECT_CAPTURE_EXPRESSIONS.has(expression)) {
-            return fn.apply(target, callArgs);
+            return callMethod(target, prop, callArgs);
           }
           sink.lastActivePage = page;
-          const callerLocation = captureCallerLocation();
           const used = {
             method: originMethod,
             args: originArgs,
@@ -3276,7 +3487,7 @@ function wrapLocator(page, locator, originMethod, originArgs) {
             seq = sink.capturedLocators.length;
             sink.capturedLocators.push({ location: callerLocation, used, element: null, alternatives: [] });
           }
-          const result = await fn.apply(target, callArgs);
+          const result = await callMethod(target, prop, callArgs);
           const matches = result?.matches;
           if (matches === true && !alreadyProbed) {
             if (callerLocation) sink.probedLocations.add(callerLocation);
@@ -3290,9 +3501,10 @@ function wrapLocator(page, locator, originMethod, originArgs) {
       if (!ACTION_METHOD_SET.has(prop)) return original;
       return async (...callArgs) => {
         const sink = currentSink;
-        if (!sink) return fn.apply(target, callArgs);
+        if (!sink) return callMethod(target, prop, callArgs);
         sink.lastActivePage = page;
         const callerLocation = captureCallerLocation();
+        recordLocatorPage(sink, page, target, callerLocation, noteLocatorCall(page, String(prop)));
         const used = {
           method: originMethod,
           args: originArgs,
@@ -3311,7 +3523,7 @@ function wrapLocator(page, locator, originMethod, originArgs) {
         }
         let result;
         try {
-          result = await fn.apply(target, callArgs);
+          result = await callMethod(target, prop, callArgs);
         } catch (error) {
           sink.failedLocators.push({ method: originMethod, args: originArgs, location: callerLocation });
           throw error;
@@ -3330,11 +3542,10 @@ function wrapFrameLocator(page, frameLocator) {
     get(target, prop) {
       const original = Reflect.get(target, prop);
       if (typeof original !== "function") return original;
-      const fn = original;
       if (!LOCATOR_METHOD_SET.has(prop)) return original;
       return (...args) => {
         if (currentSink) currentSink.lastActivePage = page;
-        return wrapLocator(page, fn.apply(target, args), String(prop), args);
+        return wrapLocator(page, callMethod(target, prop, args), String(prop), args);
       };
     }
   });
@@ -3381,7 +3592,13 @@ function instrumentPage(page) {
       };
     }
     if (typeof page.on === "function") {
-      page.on("framenavigated", () => PROBE_UNSEEDED_PAGES.delete(page));
+      page.on("framenavigated", (frame) => {
+        PROBE_UNSEEDED_PAGES.delete(page);
+        try {
+          if (frame === page.mainFrame()) noteNavigation(page);
+        } catch {
+        }
+      });
     }
   }
   if (typeof page.on === "function" && process.env.PIWI_CAPTURE_PAGE_INVENTORY === "true") {
@@ -3520,13 +3737,19 @@ function patchBrowser(browser) {
     };
   }
 }
+function readRootAria(page) {
+  return internalCall(page, () => ariaSnapshotBestEffort(page.locator(":root")));
+}
+function readRootAriaJson(page) {
+  return internalCall(page, () => ariaSnapshotJSONBestEffort(page.locator(":root")));
+}
 async function flushSink(sink, testInfo) {
   await Promise.allSettled(sink.pendingHandlers);
   let drainDeadline;
   await Promise.race([
     Promise.allSettled(sink.capturePromises),
-    new Promise((resolve) => {
-      drainDeadline = setTimeout(resolve, 2e3);
+    new Promise((resolve2) => {
+      drainDeadline = setTimeout(resolve2, 2e3);
     })
   ]);
   clearTimeout(drainDeadline);
@@ -3542,15 +3765,21 @@ async function flushSink(sink, testInfo) {
       body: Buffer.from(JSON.stringify(dedupeSnapshotsByLocation(sink.capturedLocators)))
     });
   }
+  if (sink.locatorPages.size > 0) {
+    await testInfo.attach(ATTACHMENT_NAMES.locatorPages, {
+      contentType: "application/json",
+      body: Buffer.from(JSON.stringify(sink.locatorPages.list()))
+    });
+  }
   if (testInfo.status !== "passed" && testInfo.status !== "skipped") {
     try {
-      const snapshot = (pageReadable ? await ariaSnapshotBestEffort(page.locator(":root")) : null) ?? sink.stashedAria;
+      const snapshot = (pageReadable ? await readRootAria(page) : null) ?? sink.stashedAria;
       if (snapshot) {
         await testInfo.attach(ATTACHMENT_NAMES.ariaSnapshot, {
           contentType: "text/plain",
           body: snapshot
         });
-        const snapshotJson = (pageReadable ? await ariaSnapshotJSONBestEffort(page.locator(":root")) : null) ?? sink.stashedAriaJson;
+        const snapshotJson = (pageReadable ? await readRootAriaJson(page) : null) ?? sink.stashedAriaJson;
         if (snapshotJson) {
           await testInfo.attach(ATTACHMENT_NAMES.ariaSnapshotJson, {
             contentType: "application/json",
@@ -3575,13 +3804,13 @@ async function flushSink(sink, testInfo) {
   }
   if (testInfo.status === "passed" && process.env.PIWI_SAMPLE_ARIA_ON_PASS !== "false" && isDueForAriaSample(testInfo)) {
     try {
-      const snapshot = (pageReadable ? await ariaSnapshotBestEffort(page.locator(":root")) : null) ?? sink.stashedAria;
+      const snapshot = (pageReadable ? await readRootAria(page) : null) ?? sink.stashedAria;
       if (snapshot) {
         await testInfo.attach(ATTACHMENT_NAMES.ariaSnapshot, {
           contentType: "text/plain",
           body: snapshot
         });
-        const snapshotJson = (pageReadable ? await ariaSnapshotJSONBestEffort(page.locator(":root")) : null) ?? sink.stashedAriaJson;
+        const snapshotJson = (pageReadable ? await readRootAriaJson(page) : null) ?? sink.stashedAriaJson;
         if (snapshotJson) {
           await testInfo.attach(ATTACHMENT_NAMES.ariaSnapshotJson, {
             contentType: "application/json",
@@ -3627,7 +3856,7 @@ async function flushSink(sink, testInfo) {
       body: Buffer.from(JSON.stringify(sink.networkRequests))
     });
   }
-  const webVitals = (pageReadable ? await readWebVitals(page) : null) ?? sink.stashedWebVitals;
+  const webVitals = (pageReadable ? await internalCall(page, () => readWebVitals(page)) : null) ?? sink.stashedWebVitals;
   if (webVitals) {
     await testInfo.attach(ATTACHMENT_NAMES.webVitals, {
       contentType: "application/json",
@@ -3635,7 +3864,7 @@ async function flushSink(sink, testInfo) {
     });
   }
   if (process.env.PIWI_CAPTURE_PAGE_STATE !== "false") {
-    const pageState = (pageReadable ? await readPageState(page) : null) ?? sink.stashedPageState;
+    const pageState = (pageReadable ? await internalCall(page, () => readPageState(page)) : null) ?? sink.stashedPageState;
     if (pageState) {
       await testInfo.attach(ATTACHMENT_NAMES.pageState, {
         contentType: "application/json",
@@ -3676,6 +3905,7 @@ var piwiFixtures = {
   // requested, so suites that never destructure `page` are still captured.
   piwiCapture: [
     async ({}, use, testInfo) => {
+      boxCaptureFrames();
       const sink = createSink();
       sink.testInfo = testInfo;
       if (isProbeMode())
@@ -3720,11 +3950,17 @@ function extendPiwiFixtures(test) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CAPTURED_ATTRS_ARG,
+  LocatorPageLog,
   ariaSnapshotBestEffort,
   ariaSnapshotJSONBestEffort,
+  boxCaptureFrames,
   buildPageState,
+  callMethod,
   computeCoreVitals,
   extendPiwiFixtures,
+  internalCall,
+  noteLocatorCall,
+  noteNavigation,
   piwiFixtures,
   probeElementAttrs
 });