@swmansion/argent 0.24.1-next.8 → 0.24.1-next.9

package/dist/cli-cmds.mjs

@@ -21837,7 +21837,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.24.1-next.8";
+    return "0.24.1-next.9";
   }
   return "0.0.0";
 }

package/dist/installer.mjs

@@ -16690,7 +16690,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.24.1-next.8";
+    return "0.24.1-next.9";
   }
   return "0.0.0";
 }

package/dist/tool-server.cjs

@@ -94682,7 +94682,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.24.1-next.8";
+    return "0.24.1-next.9";
   }
   return "0.0.0";
 }
@@ -112176,17 +112176,27 @@ var SCROLL_CLASSES = /* @__PURE__ */ new Set([
   "androidx.recyclerview.widget.RecyclerView",
   "android.widget.ListView"
 ]);
-function isUiAutomatorScrollable(attrs) {
+function isUiAutomatorScrollable(attrs, inWebView = false) {
+  if (inWebView) return attrIsTrue(attrs, "scrollable");
   return SCROLL_CLASSES.has(attrs.class ?? "") || attrIsTrue(attrs, "scrollable");
 }
 var WEBVIEW_CLASSES = /* @__PURE__ */ new Set(["android.webkit.WebView", "android.webkit.WebViewChromium"]);
+function hasGestureFlag(attrs) {
+  return attrIsTrue(attrs, "clickable") || attrIsTrue(attrs, "long-clickable") || attrIsTrue(attrs, "checkable") || attrIsTrue(attrs, "scrollable");
+}
+function deriveWebRole(cls, attrs, label, hasRawChildren) {
+  if (cls === "android.view.View" && label && !hasRawChildren && !hasGestureFlag(attrs)) {
+    return "StaticText";
+  }
+  const role = deriveUiAutomatorRole(cls);
+  if (role === "ScrollView" && !attrIsTrue(attrs, "scrollable")) return "List";
+  return role;
+}
 function attrIsTrue(attrs, key2) {
   return attrs[key2] === "true";
 }
 function isInteractive(attrs) {
-  if (attrIsTrue(attrs, "clickable") || attrIsTrue(attrs, "long-clickable") || attrIsTrue(attrs, "checkable") || attrIsTrue(attrs, "scrollable")) {
-    return true;
-  }
+  if (hasGestureFlag(attrs)) return true;
   if (attrIsTrue(attrs, "focusable") && labelOf(attrs) !== "") return true;
   return false;
 }
@@ -112264,7 +112274,7 @@ function makeUiNode(attrs, role, pixelBounds, label, children) {
   return out;
 }
 function pruneSubtree(root, opts) {
-  const stack = [{ parsed: root, scrollClip: null, visited: false }];
+  const stack = [{ parsed: root, scrollClip: null, inWebView: false, visited: false }];
   const outputs = /* @__PURE__ */ new Map();
   while (stack.length > 0) {
     const top = stack[stack.length - 1];
@@ -112272,22 +112282,31 @@ function pruneSubtree(root, opts) {
       top.visited = true;
       const attrs = top.parsed.attrs;
       const myBounds = parseUiAutomatorBounds(attrs.bounds ?? "");
-      const isScroll = isUiAutomatorScrollable(attrs);
+      const isScroll = isUiAutomatorScrollable(attrs, top.inWebView);
       const childClip = isScroll && myBounds ? myBounds : top.scrollClip;
+      const childInWebView = top.inWebView || WEBVIEW_CLASSES.has(attrs.class ?? "");
       for (let i = top.parsed.children.length - 1; i >= 0; i--) {
         const c = top.parsed.children[i];
         if (c.tag === "node") {
-          stack.push({ parsed: c, scrollClip: childClip, visited: false });
+          stack.push({
+            parsed: c,
+            scrollClip: childClip,
+            inWebView: childInWebView,
+            visited: false
+          });
         }
       }
     } else {
-      outputs.set(top.parsed, computeNodeOutput(top.parsed, top.scrollClip, outputs, opts));
+      outputs.set(
+        top.parsed,
+        computeNodeOutput(top.parsed, top.scrollClip, top.inWebView, outputs, opts)
+      );
       stack.pop();
     }
   }
   return outputs.get(root) ?? [];
 }
-function computeNodeOutput(parsed, scrollClip, outputs, opts) {
+function computeNodeOutput(parsed, scrollClip, inWebView, outputs, opts) {
   const attrs = parsed.attrs;
   const cls = attrs.class ?? "";
   if (NOISY_CLASSES.has(cls)) return [];
@@ -112309,9 +112328,26 @@ function computeNodeOutput(parsed, scrollClip, outputs, opts) {
     }
   }
   if (WEBVIEW_CLASSES.has(cls)) {
-    if (!visible) return [];
-    const own = labelOf(attrs);
-    return [makeUiNode(attrs, "WebView", bounds, "[web-view] " + (own || "(no label)"), [])];
+    if (!visible) return keptChildren;
+    let label2 = labelOf(attrs);
+    let children = keptChildren;
+    const inner = children.length === 1 && children[0].webHost ? children[0] : void 0;
+    if (inner) {
+      children = inner.children;
+      if (!label2 && inner.label) label2 = inner.label;
+    }
+    if (!label2 && children.length === 0) label2 = "(no web content exposed)";
+    const node2 = makeUiNode(attrs, "WebView", bounds, label2, children);
+    node2.webHost = true;
+    if (inner) {
+      node2.clickable ||= inner.clickable;
+      node2.longClickable ||= inner.longClickable;
+      node2.scrollable ||= inner.scrollable;
+      if (!node2.identifier && inner.identifier) node2.identifier = inner.identifier;
+    }
+    const hidden = hiddenInScroll + (inner?.scrollHidden ?? 0);
+    if (hidden > 0) node2.scrollHidden = hidden;
+    return [node2];
   }
   const interactive = isInteractive(attrs);
   let label = labelOf(attrs);
@@ -112344,7 +112380,13 @@ function computeNodeOutput(parsed, scrollClip, outputs, opts) {
       (c) => !(c.role === "StaticText" && c.label && lower.includes(c.label.toLowerCase()) && !c.clickable)
     );
   }
-  const node = makeUiNode(attrs, deriveUiAutomatorRole(cls), bounds, label, keptChildren);
+  const role = inWebView ? deriveWebRole(
+    cls,
+    attrs,
+    label,
+    parsed.children.some((c) => c.tag === "node")
+  ) : deriveUiAutomatorRole(cls);
+  const node = makeUiNode(attrs, role, bounds, label, keptChildren);
   if (hiddenInScroll > 0) node.scrollHidden = hiddenInScroll;
   return [node];
 }
@@ -113252,7 +113294,10 @@ async function describeAndroid(registry2, serial, _bundleId, isTv) {
         devtools.getHierarchy(),
         devtools.getScreenSize()
       ]);
-      const tree2 = parseUiAutomatorDump(xml, size2.width, size2.height);
+      const tree2 = await awaitWebViewPublished(
+        parseUiAutomatorDump(xml, size2.width, size2.height),
+        async () => parseUiAutomatorDump((await devtools.getHierarchy()).xml, size2.width, size2.height)
+      );
       return { tree: tree2, source: "android-devtools", hint };
     } catch (serviceErr) {
       console.debug(
@@ -113260,16 +113305,32 @@ async function describeAndroid(registry2, serial, _bundleId, isTv) {
       );
     }
   }
+  const [size, raw] = await Promise.all([getAndroidScreenSize(serial), uiautomatorDump(serial)]);
+  const tree = await awaitWebViewPublished(
+    parseDump(raw, size),
+    async () => parseDump(await uiautomatorDump(serial), size)
+  );
+  return { tree, source: "uiautomator", hint };
+}
+var WEBVIEW_PUBLISH_STEP_MS = 250;
+var WEBVIEW_PUBLISH_BUDGET_MS = 1500;
+async function awaitWebViewPublished(first, read) {
+  let tree = first;
+  for (let waited = 0; waited < WEBVIEW_PUBLISH_BUDGET_MS && hasUnreadWebView(tree); ) {
+    await new Promise((r) => setTimeout(r, WEBVIEW_PUBLISH_STEP_MS));
+    waited += WEBVIEW_PUBLISH_STEP_MS;
+    tree = await read();
+  }
+  return tree;
+}
+async function uiautomatorDump(serial) {
   const randomSuffix = `${Date.now().toString(36)}-${Math.floor(Math.random() * 1e9).toString(36)}`;
   const dumpPath = `/data/local/tmp/argent-ui-dump-${randomSuffix}.xml`;
-  const [size, rawBuf] = await Promise.all([
-    getAndroidScreenSize(serial),
-    adbExecOutBinary(
-      serial,
-      `uiautomator dump --compressed ${dumpPath} >/dev/null && cat ${dumpPath}; rm -f ${dumpPath}`,
-      { timeoutMs: 2e4 }
-    )
-  ]);
+  const rawBuf = await adbExecOutBinary(
+    serial,
+    `uiautomator dump --compressed ${dumpPath} >/dev/null && cat ${dumpPath}; rm -f ${dumpPath}`,
+    { timeoutMs: 2e4 }
+  );
   const raw = rawBuf.toString("utf-8");
   const trimmed = raw.trim();
   if (/^ERROR:/i.test(trimmed) || !trimmed.includes("<hierarchy") && /error/i.test(trimmed)) {
@@ -113285,9 +113346,17 @@ async function describeAndroid(registry2, serial, _bundleId, isTv) {
       }
     );
   }
+  return raw;
+}
+function parseDump(raw, size) {
   const oriented = orientScreenSize(size, parseDumpRotation(raw));
-  const tree = parseUiAutomatorDump(raw, oriented.width, oriented.height);
-  return { tree, source: "uiautomator", hint };
+  return parseUiAutomatorDump(raw, oriented.width, oriented.height);
+}
+function hasUnreadWebView(node) {
+  if (node.children.length === 0 && (node.role === "WebView" || node.label === "Web View")) {
+    return true;
+  }
+  return node.children.some(hasUnreadWebView);
 }
 
 // ../tool-server/src/preview.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/argent",
-  "version": "0.24.1-next.8",
+  "version": "0.24.1-next.9",
   "mcpName": "io.github.software-mansion/argent",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",