browserclaw 0.2.4 → 0.2.5

package/dist/index.cjs

@@ -701,10 +701,20 @@ async function pageTargetId(page) {
 }
 async function findPageByTargetId(browser, targetId, cdpUrl) {
   const pages = await getAllPages(browser);
+  let resolvedViaCdp = false;
   for (const page of pages) {
-    const tid = await pageTargetId(page).catch(() => null);
+    let tid = null;
+    try {
+      tid = await pageTargetId(page);
+      resolvedViaCdp = true;
+    } catch {
+      tid = null;
+    }
     if (tid && tid === targetId) return page;
   }
+  if (!resolvedViaCdp && pages.length === 1) {
+    return pages[0];
+  }
   if (cdpUrl) {
     try {
       const listUrl = `${cdpUrl.replace(/\/+$/, "").replace(/^ws:/, "http:").replace(/\/cdp$/, "")}/json/list`;
@@ -835,6 +845,27 @@ function getIndentLevel(line) {
   const match = line.match(/^(\s*)/);
   return match ? Math.floor(match[1].length / 2) : 0;
 }
+function matchInteractiveSnapshotLine(line, options) {
+  const depth = getIndentLevel(line);
+  if (options.maxDepth !== void 0 && depth > options.maxDepth) {
+    return null;
+  }
+  const match = line.match(/^(\s*-\s*)(\w+)(?:\s+"([^"]*)")?(.*)$/);
+  if (!match) {
+    return null;
+  }
+  const [, , roleRaw, name, suffix] = match;
+  if (roleRaw.startsWith("/")) {
+    return null;
+  }
+  const role = roleRaw.toLowerCase();
+  return {
+    roleRaw,
+    role,
+    ...name ? { name } : {},
+    suffix
+  };
+}
 function createRoleNameTracker() {
   const counts = /* @__PURE__ */ new Map();
   const refsByKey = /* @__PURE__ */ new Map();
@@ -908,14 +939,11 @@ function buildRoleSnapshotFromAriaSnapshot(ariaSnapshot, options = {}) {
   if (options.interactive) {
     const result2 = [];
     for (const line of lines) {
-      const depth = getIndentLevel(line);
-      if (options.maxDepth !== void 0 && depth > options.maxDepth) continue;
-      const match = line.match(/^(\s*-\s*)(\w+)(?:\s+"([^"]*)")?(.*)$/);
-      if (!match) continue;
-      const [, prefix, roleRaw, name, suffix] = match;
-      if (roleRaw.startsWith("/")) continue;
-      const role = roleRaw.toLowerCase();
+      const parsed = matchInteractiveSnapshotLine(line, options);
+      if (!parsed) continue;
+      const { roleRaw, role, name, suffix } = parsed;
       if (!INTERACTIVE_ROLES.has(role)) continue;
+      const prefix = line.match(/^(\s*-\s*)/)?.[1] ?? "";
       const ref = nextRef();
       const nth = tracker.getNextIndex(role, name);
       tracker.trackRef(role, name, ref);
@@ -978,16 +1006,13 @@ function buildRoleSnapshotFromAiSnapshot(aiSnapshot, options = {}) {
   if (options.interactive) {
     const out2 = [];
     for (const line of lines) {
-      const depth = getIndentLevel(line);
-      if (options.maxDepth !== void 0 && depth > options.maxDepth) continue;
-      const match = line.match(/^(\s*-\s*)(\w+)(?:\s+"([^"]*)")?(.*)$/);
-      if (!match) continue;
-      const [, prefix, roleRaw, name, suffix] = match;
-      if (roleRaw.startsWith("/")) continue;
-      const role = roleRaw.toLowerCase();
+      const parsed = matchInteractiveSnapshotLine(line, options);
+      if (!parsed) continue;
+      const { roleRaw, role, name, suffix } = parsed;
       if (!INTERACTIVE_ROLES.has(role)) continue;
       const ref = parseAiSnapshotRef(suffix);
       if (!ref) continue;
+      const prefix = line.match(/^(\s*-\s*)/)?.[1] ?? "";
       refs[ref] = { role, ...name ? { name } : {} };
       out2.push(`${prefix}${roleRaw}${name ? ` "${name}"` : ""}${suffix}`);
     }