@swmansion/argent 0.27.1-next.14 → 0.27.1-next.15

package/dist/cli-cmds.mjs

@@ -21916,7 +21916,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.27.1-next.14";
+    return "0.27.1-next.15";
   }
   return "0.0.0";
 }

package/dist/client.d.ts

@@ -45,7 +45,7 @@ export interface UiTreeNode {
     bundleId?: string;
     editable?: boolean;
     heading?: boolean;
-    /** iOS: on screen, but behind an in-app presentation or a system alert. */
+    /** On screen, but behind an in-app presentation (iOS) or a system alert. */
     covered?: boolean;
     placeholder?: string;
     /** The input shows its placeholder: it holds no text, and `value` is unset. */
@@ -62,14 +62,23 @@ export interface UiTree {
         width: number;
         height: number;
     };
-    /** While an iOS system alert shows, the system app first and the app it covers second. */
+    /**
+     * iOS: while a system alert shows, the system app first and the app it covers
+     * second. Android: one root per window, topmost first.
+     */
     roots: UiTreeNode[];
     truncated: boolean;
     alertVisible?: boolean;
     keyboardVisible?: boolean;
-    /** The bundle id of the app in front, under any system alert. */
+    /**
+     * The bundle id or package of the app in front, under any system alert.
+     * Android: unset when the alert hides the app's window.
+     */
     foregroundApp?: string;
-    /** Fields this source cannot report. */
+    /**
+     * Fields this source cannot report. On Android they depend on the API level:
+     * `placeholder` and `hintShowing` need 26, `heading` 28.
+     */
     unsupportedFields: string[];
 }
 export interface CallToolOptions {

package/dist/installer.mjs

@@ -16730,7 +16730,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.27.1-next.14";
+    return "0.27.1-next.15";
   }
   return "0.0.0";
 }

package/dist/tool-server.cjs

@@ -94814,7 +94814,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.27.1-next.14";
+    return "0.27.1-next.15";
   }
   return "0.0.0";
 }
@@ -136454,26 +136454,40 @@ async function queryAndroidFullHierarchy(registry2, device) {
 }
 
 // ../tool-server/src/tools/ui-tree/android.ts
-var UNSUPPORTED_FIELDS = [
+var LEGACY_UNSUPPORTED_FIELDS2 = [
   "placeholder",
   "hintShowing",
   "hidden",
   "heading",
   "keyboardVisible",
-  "foregroundApp"
+  "foregroundApp",
+  "alertVisible"
 ];
-function mapNode(xml, screenW, screenH, isRoot) {
+var TYPE_APPLICATION = 1;
+var TYPE_INPUT_METHOD = 2;
+var TYPE_SYSTEM = 3;
+var SYSTEM_DIALOG_PACKAGES = /* @__PURE__ */ new Set([
+  "com.android.packageinstaller",
+  "com.google.android.packageinstaller",
+  "com.android.permissioncontroller",
+  "com.google.android.permissioncontroller",
+  "com.android.systemui"
+]);
+var SYSTEM_SHEET_PACKAGES = /* @__PURE__ */ new Set(["android", "com.android.intentresolver"]);
+function mapNode(xml, screenW, screenH, isRoot, v2) {
   const a = xml.attrs;
   const type = a.class ?? "";
   const password = attrIsTrue(a, "password");
-  const text = password ? "" : a.text ?? "";
+  const hintShowing = v2 && attrIsTrue(a, "showing-hint");
+  const text = password || hintShowing ? "" : a.text ?? "";
   const desc = a["content-desc"] ?? "";
   const rect = parseUiAutomatorBounds(a.bounds ?? "");
-  const editable = type.endsWith("EditText") || type.endsWith("AutoCompleteTextView");
+  const textInput = type.endsWith("EditText") || type.endsWith("AutoCompleteTextView");
+  const editable = v2 ? attrIsTrue(a, "editable") || textInput && a.enabled === "false" : textInput;
   const node = { role: deriveUiAutomatorRole(type), children: [] };
   if (type) node.type = type;
   if (text || desc) node.label = text || desc;
-  if (editable && text) node.value = text;
+  if ((editable || textInput) && text) node.value = text;
   if (desc) node.contentDescription = desc;
   if (a["resource-id"]) node.identifier = a["resource-id"];
   if (isRoot && a.package) node.bundleId = a.package;
@@ -136491,31 +136505,87 @@ function mapNode(xml, screenW, screenH, isRoot) {
   if (attrIsTrue(a, "checkable")) node.checked = attrIsTrue(a, "checked");
   if (password) node.password = true;
   if (editable) node.editable = true;
+  if (v2) {
+    if (a.hint) node.placeholder = a.hint;
+    if (hintShowing) node.hintShowing = true;
+    const empty2 = node.frame && (node.frame.width <= 0 || node.frame.height <= 0);
+    if (a["visible-to-user"] === "false" || empty2) node.hidden = true;
+    if (attrIsTrue(a, "heading")) node.heading = true;
+  }
   for (const child of xml.children) {
-    if (child.tag === "node") node.children.push(mapNode(child, screenW, screenH, false));
+    if (child.tag === "node") node.children.push(mapNode(child, screenW, screenH, false, v2));
   }
   return node;
 }
-function adaptAndroidTree(xml, truncated, screen) {
-  const root = parseUiAutomatorXml(xml);
-  const roots = (root?.children ?? []).filter((c) => c.tag === "node").map((c) => mapNode(c, screen.width, screen.height, true));
-  return {
+function onScreen(frame) {
+  if (!frame) return false;
+  const w = Math.min(frame.x + frame.width, 1) - Math.max(frame.x, 0);
+  const h = Math.min(frame.y + frame.height, 1) - Math.max(frame.y, 0);
+  return w > 0 && h > 0;
+}
+function fillsScreen(frame) {
+  return !!frame && frame.x <= 0 && frame.x + frame.width >= 1 && frame.y <= 0.1;
+}
+function markCovered(node) {
+  node.covered = true;
+  for (const child of node.children) markCovered(child);
+}
+function adaptAndroidTree(capture, screen) {
+  const { xml, truncated } = capture;
+  const v2 = (capture.treeVersion ?? 1) >= 2;
+  const windows = (parseUiAutomatorXml(xml)?.children ?? []).filter((c) => c.tag === "node");
+  const roots = windows.map((c) => mapNode(c, screen.width, screen.height, true, v2));
+  const tree = {
     schemaVersion: 1,
     source: "android-devtools",
     screen: { width: screen.width, height: screen.height },
     roots,
     truncated,
-    unsupportedFields: UNSUPPORTED_FIELDS
+    unsupportedFields: LEGACY_UNSUPPORTED_FIELDS2
   };
+  if (!v2) return tree;
+  const unsupported = [];
+  const sdk = capture.sdkInt ?? 0;
+  if (sdk < 26) unsupported.push("placeholder", "hintShowing");
+  if (sdk < 28) unsupported.push("heading");
+  if (capture.captureMode === "active-window") {
+    unsupported.push("keyboardVisible", "foregroundApp", "alertVisible");
+  } else {
+    let keyboard = false;
+    let foreground;
+    let alert = false;
+    windows.forEach((w, i) => {
+      const windowType = Number(w.attrs["window-type"]);
+      const root = roots[i];
+      if (windowType === TYPE_INPUT_METHOD && onScreen(root.frame)) keyboard = true;
+      if (foreground !== void 0 || !root.bundleId) return;
+      if (windowType === TYPE_SYSTEM && root.bundleId === "android") alert = true;
+      if (windowType !== TYPE_APPLICATION) return;
+      if (SYSTEM_SHEET_PACKAGES.has(root.bundleId) || SYSTEM_DIALOG_PACKAGES.has(root.bundleId) && !fillsScreen(root.frame)) {
+        alert = true;
+      } else foreground = i;
+    });
+    const unknown2 = truncated ? void 0 : false;
+    tree.keyboardVisible = keyboard || unknown2;
+    if (foreground !== void 0) tree.foregroundApp = roots[foreground].bundleId;
+    tree.alertVisible = alert || (foreground === void 0 ? unknown2 : false);
+    if (alert && foreground !== void 0) {
+      for (let i = foreground; i < roots.length; i++) {
+        if (roots[i].bundleId === tree.foregroundApp) markCovered(roots[i]);
+      }
+    }
+  }
+  tree.unsupportedFields = unsupported;
+  return tree;
 }
 async function readAndroidUiTree(registry2, device) {
   const ref = androidDevtoolsRef(device);
   const devtools = await registry2.resolveService(ref.urn, ref.options);
-  const [{ xml, truncated }, size] = await Promise.all([
+  const [capture, size] = await Promise.all([
     devtools.getHierarchy({ maxNodes: FLOW_MAX_NODES, clearCache: true }),
     devtools.getScreenSize()
   ]);
-  return adaptAndroidTree(xml, truncated, size);
+  return adaptAndroidTree(capture, size);
 }
 
 // ../tool-server/src/tools/ui-tree/index.ts
@@ -149916,12 +149986,12 @@ function wrapPreservingFailure(message, err) {
   return signal ? new FailureError(message, signal, { cause }) : new Error(message, { cause });
 }
 function projectIosDeviceNode(node) {
-  const onScreen = node.frame.width > 0 && node.frame.height > 0;
+  const onScreen2 = node.frame.width > 0 && node.frame.height > 0;
   return {
     skip: false,
     children: node.children,
     // Off-screen text must not hoist.
-    ownText: onScreen ? nodeText(node) : "",
+    ownText: onScreen2 ? nodeText(node) : "",
     leaf: { ...node, children: [] },
     shield: Boolean(node.identifier),
     // Scroll-clip inputs (see `flattenHoisting`), in the adapter's normalized
@@ -149956,12 +150026,12 @@ async function queryIosDeviceFlowTree(registry2, device) {
 
 // ../tool-server/src/tools/flows/flow-chromium-tree.ts
 function projectChromiumNode(node) {
-  const onScreen = node.frame.width > 0 && node.frame.height > 0;
+  const onScreen2 = node.frame.width > 0 && node.frame.height > 0;
   const addressable = Boolean(
     node.identifier || node.label || node.value || node.clickable || node.focused
   );
   let leaf = null;
-  if (onScreen && addressable) {
+  if (onScreen2 && addressable) {
     leaf = { ...node, children: [] };
     if (node.password) {
       leaf.label = "[password]";
@@ -149974,7 +150044,7 @@ function projectChromiumNode(node) {
     // Off-screen text must not hoist, or a text assert against an ancestor
     // would pass on content the screen doesn't show. A password's text never
     // bubbles up.
-    ownText: onScreen && !node.password ? nodeText(node) : "",
+    ownText: onScreen2 && !node.password ? nodeText(node) : "",
     leaf,
     shield: Boolean(node.identifier) || node.password === true
   };
@@ -150000,13 +150070,13 @@ async function queryChromiumTree(registry2, device) {
 
 // ../tool-server/src/tools/flows/flow-vega-tree.ts
 function projectVegaNode(node) {
-  const onScreen = node.frame.width > 0 && node.frame.height > 0;
+  const onScreen2 = node.frame.width > 0 && node.frame.height > 0;
   return {
     skip: false,
     children: node.children,
     // Off-screen text must not hoist, or a text assert against an ancestor
     // would pass on content the screen doesn't show.
-    ownText: onScreen ? nodeText(node) : "",
+    ownText: onScreen2 ? nodeText(node) : "",
     leaf: { ...node, children: [] },
     shield: isAuthoredVegaTestId(node.identifier)
   };

package/package.json

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