peachsim 0.1.628 → 0.1.630

package/dist-lib/sdk.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.628 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.630 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;
@@ -1799,16 +1799,26 @@ function payloadFromResolved(resolved, match, extra = {}) {
     ...extra
   };
 }
-function collectTextCandidates(nodes, ancestors = [], pressableOwnerText = "") {
+function collectTextCandidates(nodes, ancestors = [], pressableOwnerText = "", actionableAncestor = false, actionableRole) {
   const out = [];
   for (const node of nodes) {
     const text = nodeText(node);
     const caption = !!text && text === pressableOwnerText && !node.pressable;
-    if (!caption) out.push({ node, ancestorTestIDs: ancestors });
+    const actionable = !!node.pressable || actionableAncestor;
+    const role = node.role ?? actionableRole;
+    if (!caption) out.push({ node, ancestorTestIDs: ancestors, actionable, role });
     if (node.children?.length) {
       const next = node.testID ? [...ancestors, node.testID] : ancestors;
       const owner = text ? node.pressable ? text : "" : pressableOwnerText;
-      out.push(...collectTextCandidates(node.children, next, owner));
+      out.push(
+        ...collectTextCandidates(
+          node.children,
+          next,
+          owner,
+          actionable,
+          node.pressable ? node.role : actionableRole
+        )
+      );
     }
   }
   return out;
@@ -1832,85 +1842,96 @@ async function tapByText(bridge, query, options = {}, opts = {}) {
     agent: opts.agent,
     timing: opts.timing,
     textFallback: query,
-    resolve: async () => {
-      const { tree } = await inspectTree(bridge, 50);
-      if (!Array.isArray(tree)) return { matched: 0, total: 0 };
-      const needle = options.exact ? query : query.toLowerCase();
-      let candidates = collectTextCandidates(tree).filter(({ node: node2, ancestorTestIDs }) => {
-        const text = nodeText(node2);
-        if (!text) return false;
-        if (options.exact ? text !== needle : !text.toLowerCase().includes(needle)) {
-          return false;
-        }
-        if (options.role && node2.role !== options.role) return false;
-        if (options.within && !ancestorTestIDs.includes(options.within)) return false;
-        const ax = node2.geometry.x;
-        const ay = node2.geometry.y;
-        if (options.minX != null && !(ax >= options.minX)) return false;
-        if (options.maxX != null && !(ax <= options.maxX)) return false;
-        if (options.minY != null && !(ay >= options.minY)) return false;
-        if (options.maxY != null && !(ay <= options.maxY)) return false;
-        return true;
-      });
-      if (options.near) {
-        const { x, y } = options.near;
-        candidates.sort(
-          (a, b) => Math.hypot(a.node.geometry.x - x, a.node.geometry.y - y) - Math.hypot(b.node.geometry.x - x, b.node.geometry.y - y)
-        );
-      } else {
-        candidates.sort((a, b) => {
-          if (Math.abs(a.node.geometry.y - b.node.geometry.y) > 2) {
-            return a.node.geometry.y - b.node.geometry.y;
-          }
-          return a.node.geometry.x - b.node.geometry.x;
-        });
-      }
-      const total = candidates.length;
-      if (total === 0) return { matched: 0, total: 0 };
-      let idx = 0;
-      if (options.nth != null) {
-        idx = options.nth < 0 ? total + options.nth : options.nth;
-        if (idx < 0 || idx >= total) {
-          return { matched: 0, total, nthOutOfRange: true, nth: options.nth };
-        }
-      } else if (total > 1 && !options.first && !options.near) {
-        return {
-          ambiguous: true,
-          total,
-          candidates: candidates.slice(0, 10).map((candidate, index) => ({
-            idx: index,
-            nodeId: candidate.node.nodeId,
-            type: candidate.node.type,
-            testID: candidate.node.testID ?? null,
-            text: nodeText(candidate.node).slice(0, 60),
-            abs: { x: candidate.node.geometry.x, y: candidate.node.geometry.y },
-            layout: {
-              width: Math.round(candidate.node.geometry.width),
-              height: Math.round(candidate.node.geometry.height)
-            },
-            ancestorTestIDs: candidate.ancestorTestIDs.slice(0, 5)
-          }))
-        };
+    resolve: () => resolveTextTapTarget(bridge, query, options)
+  });
+}
+async function resolveTextTapTarget(bridge, query, options = {}) {
+  const { tree } = await inspectTree(bridge, 50);
+  if (!Array.isArray(tree)) return { matched: 0, total: 0 };
+  const needle = options.exact ? query : query.toLowerCase();
+  let candidates = collectTextCandidates(tree).filter(
+    ({ node: node2, ancestorTestIDs, role }) => {
+      const text = nodeText(node2);
+      if (!text) return false;
+      if (options.exact ? text !== needle : !text.toLowerCase().includes(needle)) {
+        return false;
       }
-      const picked = candidates[idx];
-      if (!picked) return { matched: 0, total };
-      const node = picked.node;
-      let resolved = node.testID ? await resolveTargetCoords(bridge, { mode: "testid", value: node.testID }) : await resolveTargetCoords(bridge, {
-        mode: "text",
-        value: nodeText(node) || query
-      });
-      if (!resolved) {
-        resolved = {
-          x: node.geometry.x + node.geometry.width / 2,
-          y: node.geometry.y + node.geometry.height / 2,
-          testID: node.testID ?? null,
-          text: nodeText(node) || query,
-          type: node.type
-        };
+      if (options.role && role !== options.role) return false;
+      if (options.within && !ancestorTestIDs.includes(options.within)) return false;
+      const ax = node2.geometry.x;
+      const ay = node2.geometry.y;
+      if (options.minX != null && !(ax >= options.minX)) return false;
+      if (options.maxX != null && !(ax <= options.maxX)) return false;
+      if (options.minY != null && !(ay >= options.minY)) return false;
+      if (options.maxY != null && !(ay <= options.maxY)) return false;
+      return true;
+    }
+  );
+  if (options.nth == null && !options.first && !options.near) {
+    const actionable = candidates.filter((candidate) => candidate.actionable);
+    if (actionable.length > 0) candidates = actionable;
+  }
+  if (options.near) {
+    const { x, y } = options.near;
+    candidates.sort(
+      (a, b) => Math.hypot(a.node.geometry.x - x, a.node.geometry.y - y) - Math.hypot(b.node.geometry.x - x, b.node.geometry.y - y)
+    );
+  } else {
+    candidates.sort((a, b) => {
+      if (Math.abs(a.node.geometry.y - b.node.geometry.y) > 2) {
+        return a.node.geometry.y - b.node.geometry.y;
       }
-      return payloadFromResolved(resolved, node, { total, idx });
+      return a.node.geometry.x - b.node.geometry.x;
+    });
+  }
+  const total = candidates.length;
+  if (total === 0) return { matched: 0, total: 0 };
+  let idx = 0;
+  if (options.nth != null) {
+    idx = options.nth < 0 ? total + options.nth : options.nth;
+    if (idx < 0 || idx >= total) {
+      return { matched: 0, total, nthOutOfRange: true, nth: options.nth };
     }
+  } else if (total > 1 && !options.first && !options.near) {
+    return {
+      ambiguous: true,
+      total,
+      candidates: candidates.slice(0, 10).map((candidate, index) => ({
+        idx: index,
+        nodeId: candidate.node.nodeId,
+        type: candidate.node.type,
+        testID: candidate.node.testID ?? null,
+        text: nodeText(candidate.node).slice(0, 60),
+        abs: { x: candidate.node.geometry.x, y: candidate.node.geometry.y },
+        layout: {
+          width: Math.round(candidate.node.geometry.width),
+          height: Math.round(candidate.node.geometry.height)
+        },
+        ancestorTestIDs: candidate.ancestorTestIDs.slice(0, 5)
+      }))
+    };
+  }
+  const picked = candidates[idx];
+  if (!picked) return { matched: 0, total };
+  const node = picked.node;
+  const tap = await bridge.send({
+    type: "call",
+    path: "SootSim.bridges.test.resolveTapTarget",
+    args: [node.nodeId]
   });
+  if (!isTapTargetInfo(tap)) return { matched: 0, total };
+  return payloadFromResolved(
+    {
+      x: tap.cx,
+      y: tap.cy,
+      nodeId: tap.target.nodeId,
+      testID: tap.target.testID,
+      text: tap.target.text ?? tap.target.accessibilityLabel,
+      type: tap.target.type
+    },
+    node,
+    { total, idx }
+  );
 }
 var TAP_QUERY_FINDERS = {
   label: "findByLabel",
@@ -1974,17 +1995,19 @@ async function tapBest(bridge, query, opts = {}) {
           }
         };
       }
-      const byText = await resolveTargetCoords(bridge, { mode: "text", value: query });
-      if (byText) {
+      const byText = await resolveTextTapTarget(bridge, query);
+      if ("ambiguous" in byText) {
+        return {
+          ambiguous: true,
+          error: `multiple text matches for "${query}"; use tap-text with --nth, --within or --near`
+        };
+      }
+      if ("cx" in byText && typeof byText.cx === "number") {
         return {
-          ...payloadFromResolved(byText, byText),
+          ...byText,
           strategy: "text",
           node: {
-            nodeId: byText.nodeId ?? null,
-            id: byText.testID ?? null,
-            testID: byText.testID ?? null,
-            type: byText.type ?? null,
-            text: byText.text ?? query
+            ...byText.target
           }
         };
       }

package/dist-lib/sdk.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.628 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.630 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -1701,16 +1701,26 @@ function payloadFromResolved(resolved, match, extra = {}) {
     ...extra
   };
 }
-function collectTextCandidates(nodes, ancestors = [], pressableOwnerText = "") {
+function collectTextCandidates(nodes, ancestors = [], pressableOwnerText = "", actionableAncestor = false, actionableRole) {
   const out = [];
   for (const node of nodes) {
     const text = nodeText(node);
     const caption = !!text && text === pressableOwnerText && !node.pressable;
-    if (!caption) out.push({ node, ancestorTestIDs: ancestors });
+    const actionable = !!node.pressable || actionableAncestor;
+    const role = node.role ?? actionableRole;
+    if (!caption) out.push({ node, ancestorTestIDs: ancestors, actionable, role });
     if (node.children?.length) {
       const next = node.testID ? [...ancestors, node.testID] : ancestors;
       const owner = text ? node.pressable ? text : "" : pressableOwnerText;
-      out.push(...collectTextCandidates(node.children, next, owner));
+      out.push(
+        ...collectTextCandidates(
+          node.children,
+          next,
+          owner,
+          actionable,
+          node.pressable ? node.role : actionableRole
+        )
+      );
     }
   }
   return out;
@@ -1734,85 +1744,96 @@ async function tapByText(bridge, query, options = {}, opts = {}) {
     agent: opts.agent,
     timing: opts.timing,
     textFallback: query,
-    resolve: async () => {
-      const { tree } = await inspectTree(bridge, 50);
-      if (!Array.isArray(tree)) return { matched: 0, total: 0 };
-      const needle = options.exact ? query : query.toLowerCase();
-      let candidates = collectTextCandidates(tree).filter(({ node: node2, ancestorTestIDs }) => {
-        const text = nodeText(node2);
-        if (!text) return false;
-        if (options.exact ? text !== needle : !text.toLowerCase().includes(needle)) {
-          return false;
-        }
-        if (options.role && node2.role !== options.role) return false;
-        if (options.within && !ancestorTestIDs.includes(options.within)) return false;
-        const ax = node2.geometry.x;
-        const ay = node2.geometry.y;
-        if (options.minX != null && !(ax >= options.minX)) return false;
-        if (options.maxX != null && !(ax <= options.maxX)) return false;
-        if (options.minY != null && !(ay >= options.minY)) return false;
-        if (options.maxY != null && !(ay <= options.maxY)) return false;
-        return true;
-      });
-      if (options.near) {
-        const { x, y } = options.near;
-        candidates.sort(
-          (a, b) => Math.hypot(a.node.geometry.x - x, a.node.geometry.y - y) - Math.hypot(b.node.geometry.x - x, b.node.geometry.y - y)
-        );
-      } else {
-        candidates.sort((a, b) => {
-          if (Math.abs(a.node.geometry.y - b.node.geometry.y) > 2) {
-            return a.node.geometry.y - b.node.geometry.y;
-          }
-          return a.node.geometry.x - b.node.geometry.x;
-        });
-      }
-      const total = candidates.length;
-      if (total === 0) return { matched: 0, total: 0 };
-      let idx = 0;
-      if (options.nth != null) {
-        idx = options.nth < 0 ? total + options.nth : options.nth;
-        if (idx < 0 || idx >= total) {
-          return { matched: 0, total, nthOutOfRange: true, nth: options.nth };
-        }
-      } else if (total > 1 && !options.first && !options.near) {
-        return {
-          ambiguous: true,
-          total,
-          candidates: candidates.slice(0, 10).map((candidate, index) => ({
-            idx: index,
-            nodeId: candidate.node.nodeId,
-            type: candidate.node.type,
-            testID: candidate.node.testID ?? null,
-            text: nodeText(candidate.node).slice(0, 60),
-            abs: { x: candidate.node.geometry.x, y: candidate.node.geometry.y },
-            layout: {
-              width: Math.round(candidate.node.geometry.width),
-              height: Math.round(candidate.node.geometry.height)
-            },
-            ancestorTestIDs: candidate.ancestorTestIDs.slice(0, 5)
-          }))
-        };
+    resolve: () => resolveTextTapTarget(bridge, query, options)
+  });
+}
+async function resolveTextTapTarget(bridge, query, options = {}) {
+  const { tree } = await inspectTree(bridge, 50);
+  if (!Array.isArray(tree)) return { matched: 0, total: 0 };
+  const needle = options.exact ? query : query.toLowerCase();
+  let candidates = collectTextCandidates(tree).filter(
+    ({ node: node2, ancestorTestIDs, role }) => {
+      const text = nodeText(node2);
+      if (!text) return false;
+      if (options.exact ? text !== needle : !text.toLowerCase().includes(needle)) {
+        return false;
       }
-      const picked = candidates[idx];
-      if (!picked) return { matched: 0, total };
-      const node = picked.node;
-      let resolved = node.testID ? await resolveTargetCoords(bridge, { mode: "testid", value: node.testID }) : await resolveTargetCoords(bridge, {
-        mode: "text",
-        value: nodeText(node) || query
-      });
-      if (!resolved) {
-        resolved = {
-          x: node.geometry.x + node.geometry.width / 2,
-          y: node.geometry.y + node.geometry.height / 2,
-          testID: node.testID ?? null,
-          text: nodeText(node) || query,
-          type: node.type
-        };
+      if (options.role && role !== options.role) return false;
+      if (options.within && !ancestorTestIDs.includes(options.within)) return false;
+      const ax = node2.geometry.x;
+      const ay = node2.geometry.y;
+      if (options.minX != null && !(ax >= options.minX)) return false;
+      if (options.maxX != null && !(ax <= options.maxX)) return false;
+      if (options.minY != null && !(ay >= options.minY)) return false;
+      if (options.maxY != null && !(ay <= options.maxY)) return false;
+      return true;
+    }
+  );
+  if (options.nth == null && !options.first && !options.near) {
+    const actionable = candidates.filter((candidate) => candidate.actionable);
+    if (actionable.length > 0) candidates = actionable;
+  }
+  if (options.near) {
+    const { x, y } = options.near;
+    candidates.sort(
+      (a, b) => Math.hypot(a.node.geometry.x - x, a.node.geometry.y - y) - Math.hypot(b.node.geometry.x - x, b.node.geometry.y - y)
+    );
+  } else {
+    candidates.sort((a, b) => {
+      if (Math.abs(a.node.geometry.y - b.node.geometry.y) > 2) {
+        return a.node.geometry.y - b.node.geometry.y;
       }
-      return payloadFromResolved(resolved, node, { total, idx });
+      return a.node.geometry.x - b.node.geometry.x;
+    });
+  }
+  const total = candidates.length;
+  if (total === 0) return { matched: 0, total: 0 };
+  let idx = 0;
+  if (options.nth != null) {
+    idx = options.nth < 0 ? total + options.nth : options.nth;
+    if (idx < 0 || idx >= total) {
+      return { matched: 0, total, nthOutOfRange: true, nth: options.nth };
     }
+  } else if (total > 1 && !options.first && !options.near) {
+    return {
+      ambiguous: true,
+      total,
+      candidates: candidates.slice(0, 10).map((candidate, index) => ({
+        idx: index,
+        nodeId: candidate.node.nodeId,
+        type: candidate.node.type,
+        testID: candidate.node.testID ?? null,
+        text: nodeText(candidate.node).slice(0, 60),
+        abs: { x: candidate.node.geometry.x, y: candidate.node.geometry.y },
+        layout: {
+          width: Math.round(candidate.node.geometry.width),
+          height: Math.round(candidate.node.geometry.height)
+        },
+        ancestorTestIDs: candidate.ancestorTestIDs.slice(0, 5)
+      }))
+    };
+  }
+  const picked = candidates[idx];
+  if (!picked) return { matched: 0, total };
+  const node = picked.node;
+  const tap = await bridge.send({
+    type: "call",
+    path: "SootSim.bridges.test.resolveTapTarget",
+    args: [node.nodeId]
   });
+  if (!isTapTargetInfo(tap)) return { matched: 0, total };
+  return payloadFromResolved(
+    {
+      x: tap.cx,
+      y: tap.cy,
+      nodeId: tap.target.nodeId,
+      testID: tap.target.testID,
+      text: tap.target.text ?? tap.target.accessibilityLabel,
+      type: tap.target.type
+    },
+    node,
+    { total, idx }
+  );
 }
 var TAP_QUERY_FINDERS = {
   label: "findByLabel",
@@ -1876,17 +1897,19 @@ async function tapBest(bridge, query, opts = {}) {
           }
         };
       }
-      const byText = await resolveTargetCoords(bridge, { mode: "text", value: query });
-      if (byText) {
+      const byText = await resolveTextTapTarget(bridge, query);
+      if ("ambiguous" in byText) {
+        return {
+          ambiguous: true,
+          error: `multiple text matches for "${query}"; use tap-text with --nth, --within or --near`
+        };
+      }
+      if ("cx" in byText && typeof byText.cx === "number") {
         return {
-          ...payloadFromResolved(byText, byText),
+          ...byText,
           strategy: "text",
           node: {
-            nodeId: byText.nodeId ?? null,
-            id: byText.testID ?? null,
-            testID: byText.testID ?? null,
-            type: byText.type ?? null,
-            text: byText.text ?? query
+            ...byText.target
           }
         };
       }