peachsim 0.1.577 → 0.1.579

package/dist-lib/sdk.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.577 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.579 | (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;
@@ -77,6 +77,7 @@ __export(sdk_exports, {
   isShellCommandUnavailable: () => isShellCommandUnavailable,
   isSimSemanticTree: () => isSimSemanticTree,
   isTapSuccess: () => isTapSuccess,
+  layoutBoundFontFamily: () => layoutBoundFontFamily,
   layoutGetNativeEval: () => layoutGetNativeEval,
   rankInteractive: () => rankInteractive,
   readyProbeHasContent: () => readyProbeHasContent,
@@ -89,6 +90,7 @@ __export(sdk_exports, {
   shouldSkipAutoSettleForInspectPick: () => shouldSkipAutoSettleForInspectPick,
   tapBest: () => tapBest,
   tapById: () => tapById,
+  tapByQuery: () => tapByQuery,
   tapByText: () => tapByText,
   tapCommandForNode: () => tapCommandForNode,
   tapCoordinates: () => tapCoordinates,
@@ -260,6 +262,24 @@ async function inspectDescribe(bridge, dumpOpts) {
     nodeCount: result.total
   };
 }
+function layoutBoundFontFamily(style) {
+  const raw = typeof style === "object" && style !== null ? style.fontFamily : void 0;
+  if (typeof raw !== "string") return void 0;
+  const first = raw.split(",")[0].trim().replace(/^['"]|['"]$/g, "");
+  if (!first) return void 0;
+  const systemFamilies = /* @__PURE__ */ new Set([
+    "system",
+    "-apple-system",
+    "system-ui",
+    "blinkmacsystemfont",
+    "segoe ui",
+    "roboto",
+    "sans-serif",
+    "serif",
+    "monospace"
+  ]);
+  return systemFamilies.has(first.toLowerCase()) ? void 0 : first;
+}
 function scoreLayoutTextContrast(input) {
   const required = input.fontSize >= 18 || input.fontSize >= 14 && (input.fontWeight ?? 400) >= 700 ? 3 : 4.5;
   const { normal, background } = input;
@@ -412,6 +432,7 @@ function layoutGetNativeEval(opts = {}) {
         const n = w === 'bold' ? 700 : (typeof w === 'number' ? w : (typeof w === 'string' ? parseInt(w, 10) : NaN))
         return Number.isFinite(n) && n >= 600 ? n : undefined
       }
+      const familyOf = ${layoutBoundFontFamily.toString()}
       const decoOf = (style) => {
         const d = style && (style.textDecorationLine || style.textDecoration)
         return d && d !== 'none' && d !== 'normal' ? String(d).split(' ')[0] : undefined
@@ -459,6 +480,27 @@ function layoutGetNativeEval(opts = {}) {
         const layout = n.layout || { x: 0, y: 0, width: 0, height: 0 }
         const abs = n.absolute || n.absolutePosition || { x: layout.x, y: layout.y }
         const text = typeof n.text === 'string' && n.text.trim() ? n.text.trim() : undefined
+        const rawHitSlop =
+          n.hitSlop != null
+            ? n.hitSlop
+            : (n.props && n.props.hitSlop != null)
+              ? n.props.hitSlop
+              : (n.style && n.style.hitSlop != null)
+                ? n.style.hitSlop
+                : (n.authoredStyle && n.authoredStyle.hitSlop != null)
+                  ? n.authoredStyle.hitSlop
+                  : undefined
+        const hitSlop =
+          typeof rawHitSlop === 'number'
+            ? (rawHitSlop !== 0 ? rawHitSlop : undefined)
+            : rawHitSlop && typeof rawHitSlop === 'object'
+              ? {
+                  t: round(rawHitSlop.top ?? rawHitSlop.t),
+                  r: round(rawHitSlop.right ?? rawHitSlop.r),
+                  b: round(rawHitSlop.bottom ?? rawHitSlop.b),
+                  l: round(rawHitSlop.left ?? rawHitSlop.l),
+                }
+              : undefined
         const base = {
           ...(typeof n.nodeId === 'number'
             ? {
@@ -473,6 +515,7 @@ function layoutGetNativeEval(opts = {}) {
           type: typeof n.type === 'string' ? n.type : 'node',
           text,
           box: { x: round(abs.x), y: round(abs.y), w: round(layout.width), h: round(layout.height) },
+          ...(hitSlop !== undefined ? { hitSlop } : {}),
         }
         if (!includeStyle) return base
         // computedStyle has the resolved values; style is the curated subset \u2014
@@ -489,6 +532,7 @@ function layoutGetNativeEval(opts = {}) {
           bg: colorStr(style.backgroundColor),
           opacity: opacityOf(style),
           fontWeight: weightOf(style),
+          fontFamily: text ? familyOf(style) : undefined,
           textDecoration: decoOf(style),
           overflow: overflowOf(style),
           borderWidth,
@@ -588,11 +632,24 @@ function formatLayoutElements(elements, opts) {
       const uniform = p.t === p.r && p.r === p.b && p.b === p.l;
       parts.push(uniform ? `pad:${p.t}` : `pad:${p.t},${p.r},${p.b},${p.l}`);
     }
+    if (el.hitSlop !== void 0) {
+      if (typeof el.hitSlop === "number") {
+        parts.push(`hitSlop:${el.hitSlop}`);
+      } else {
+        const hs = el.hitSlop;
+        const uniform = hs.t === hs.r && hs.r === hs.b && hs.b === hs.l;
+        parts.push(
+          uniform ? `hitSlop:${hs.t}` : `hitSlop:${hs.t},${hs.r},${hs.b},${hs.l}`
+        );
+      }
+    }
     if (el.fontSize !== void 0 && el.fontSize > 0) {
       parts.push(`font:${el.fontSize}`);
     }
     if (opts?.styling) {
       if (el.fontWeight) parts.push(`weight:${el.fontWeight}`);
+      if (el.fontFamily) parts.push(`family:"${el.fontFamily}"`);
+      if (el.fontLoaded === false) parts.push(`fontLoaded:false`);
       if (el.color) parts.push(`color:${el.color}`);
       if (el.bg) parts.push(`bg:${el.bg}`);
       if (el.contrast) {
@@ -624,6 +681,7 @@ async function inspectAccessibilityTree(bridge) {
   });
   if (!isSemanticQueryResult(result)) return [];
   return result.nodes.flatMap((node) => {
+    if (node.accessibilityHidden) return [];
     if (!node.role && !node.label && !node.text && !node.pressable) return [];
     return [
       {
@@ -715,7 +773,8 @@ function scoreInteractive(n) {
 function tapCommandForNode(n) {
   if (n.testID) return `peach do tap-id ${shellEscape(n.testID)}`;
   const text = typeof n.text === "string" ? n.text.trim() : "";
-  if (text.length > 0 && text.length <= 80) return `peach do tap-text ${shellEscape(text)}`;
+  if (text.length > 0 && text.length <= 80)
+    return `peach do tap-text ${shellEscape(text)}`;
   const x = Math.round(((n.absolutePosition?.x ?? 0) + (n.layout?.width ?? 0) / 2) * 10) / 10;
   const y = Math.round(((n.absolutePosition?.y ?? 0) + (n.layout?.height ?? 0) / 2) * 10) / 10;
   return `peach do tap ${x} ${y}`;
@@ -1370,7 +1429,8 @@ async function waitForSootsimIdle({
   maxMs,
   pollMs = 50,
   stablePolls = 3,
-  strict = false
+  strict = false,
+  paintStill = false
 }) {
   const result = await bridge.send(
     {
@@ -1382,6 +1442,7 @@ async function waitForSootsimIdle({
       const pollMs = ${Math.max(1, Math.round(pollMs))}
       const requiredStablePolls = ${Math.max(1, Math.round(stablePolls))}
       const strict = ${strict ? "true" : "false"}
+      const paintStill = ${paintStill ? "true" : "false"}
       const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
 
       // route-aware settle: a tap that pushes/pops a screen is async \u2014 the
@@ -1413,10 +1474,12 @@ async function waitForSootsimIdle({
         let requestTotal = 0
         let requestInFlight = 0
         let renderStatsAvailable = false
+        let frameCount = -1
         try {
           const stats = await window.__sootsimRenderHost?.queryStats?.()
           if (stats) {
             renderStatsAvailable = true
+            frameCount = typeof stats.frameCount === 'number' ? stats.frameCount : -1
             animating =
               stats.hasActiveAnims === true ||
               stats.hasActiveNativeAnimations === true ||
@@ -1449,7 +1512,7 @@ async function waitForSootsimIdle({
           }
           walk(root)
         }
-        return { layout: nodes.join(';'), animating, layoutDirty, pendingFetches, renderStatsAvailable, requestTotal, requestInFlight }
+        return { layout: nodes.join(';'), frameCount, animating, layoutDirty, pendingFetches, renderStatsAvailable, requestTotal, requestInFlight }
       }
 
       // how long generic background network is allowed to keep us waiting AFTER
@@ -1464,6 +1527,8 @@ async function waitForSootsimIdle({
       // only within this grace once the screen is visually still.
       const networkQuietGraceMs = 1200
       let lastLayout = ''
+      let lastFrameCount = -2
+      let paintedPolls = 0
       let lastRequestTotal = -1
       let stable = 0
       let visuallyStillSince = 0
@@ -1480,13 +1545,18 @@ async function waitForSootsimIdle({
         if (snapshot.layoutDirty) dirtyPolls++
         if (snapshot.animating) animatingPolls++
         if (polls > 1 && snapshot.layout !== lastLayout) layoutChangedPolls++
+        const painted = paintStill && snapshot.frameCount !== lastFrameCount
+        if (polls > 1 && painted) paintedPolls++
         const strictOk =
           !strict ||
           (snapshot.renderStatsAvailable && !snapshot.animating && !snapshot.layoutDirty)
         // visually settled: no animations, no image content loading, layout
         // unchanged since the last poll.
         const visuallyStill =
-          strictOk && snapshot.pendingFetches === 0 && snapshot.layout === lastLayout
+          strictOk &&
+          !painted &&
+          snapshot.pendingFetches === 0 &&
+          snapshot.layout === lastLayout
         // generic network quiet: nothing in flight and no new requests issued.
         const networkQuiet =
           snapshot.requestInFlight === 0 && snapshot.requestTotal === lastRequestTotal
@@ -1507,6 +1577,7 @@ async function waitForSootsimIdle({
           visuallyStillSince = 0
         }
         lastLayout = snapshot.layout
+        lastFrameCount = snapshot.frameCount
         lastRequestTotal = snapshot.requestTotal
         await sleep(pollMs)
       }
@@ -1517,6 +1588,7 @@ async function waitForSootsimIdle({
       if (last.layoutDirty) blockers.push('layout still dirty')
       if (last.pendingFetches > 0) blockers.push(last.pendingFetches + ' image fetches pending')
       if (last.layout !== lastLayout) blockers.push('layout still changing')
+      if (paintStill && last.frameCount !== lastFrameCount) blockers.push('still painting')
       if (last.requestInFlight > 0) blockers.push(last.requestInFlight + ' requests in flight')
       return {
         settled: false,
@@ -1524,7 +1596,7 @@ async function waitForSootsimIdle({
         blockedBy:
           (blockers.length ? blockers.join(', ') : 'unknown') +
           ' over ' + polls + ' polls (layout changed ' + layoutChangedPolls +
-          'x, layoutDirty ' + dirtyPolls + 'x, animating ' + animatingPolls + 'x)',
+          'x, layoutDirty ' + dirtyPolls + 'x, animating ' + animatingPolls + 'x, painted ' + paintedPolls + 'x)',
       }
     })()`
     },
@@ -1840,6 +1912,48 @@ async function tapByText(bridge, query, options = {}, opts = {}) {
     }
   });
 }
+var TAP_QUERY_FINDERS = {
+  label: "findByLabel",
+  role: "findByRole",
+  hint: "findByHint",
+  state: "findByA11yState"
+};
+function isTapNode(value) {
+  return value !== null && typeof value === "object" && typeof Reflect.get(value, "nodeId") === "number";
+}
+function isTapTargetInfo(value) {
+  return value !== null && typeof value === "object" && typeof Reflect.get(value, "cx") === "number" && typeof Reflect.get(value, "cy") === "number" && isTapNode(Reflect.get(value, "target"));
+}
+async function tapByQuery(bridge, query, opts = {}) {
+  const call = (method, arg) => bridge.send({ type: "call", path: `SootSim.bridges.test.${method}`, args: [arg] });
+  return tapResolvedTarget(bridge, {
+    agent: opts.agent,
+    timing: opts.timing,
+    textFallback: typeof query.value === "string" ? query.value : void 0,
+    resolve: async () => {
+      const node = await call(TAP_QUERY_FINDERS[query.by], query.value);
+      if (!isTapNode(node)) return { cx: null };
+      const tap = await call("resolveTapTarget", node.nodeId);
+      if (!isTapTargetInfo(tap)) return { cx: null };
+      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
+        },
+        {
+          nodeId: node.nodeId,
+          testID: node.testID,
+          text: node.text ?? node.accessibilityLabel,
+          type: node.type
+        }
+      );
+    }
+  });
+}
 async function tapBest(bridge, query, opts = {}) {
   return tapResolvedTarget(bridge, {
     agent: opts.agent,
@@ -1904,6 +2018,11 @@ async function openAppUrl(bridge, target) {
   return normalized;
 }
 
+// src/sleep.ts
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
 // src/sim-client.ts
 var SimClientError = class extends Error {
   constructor(message) {
@@ -1946,9 +2065,6 @@ var SimResetError = class extends SimClientError {
     this.result = result;
   }
 };
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
 function decodePngDataUrl(dataUrl) {
   if (typeof dataUrl !== "string" || !dataUrl.startsWith("data:image/png;base64,")) {
     throw new SimClientError(
@@ -1971,7 +2087,8 @@ var TARGET_SEARCH_PARAMS = [
   "port",
   "inspectOpen",
   "appFonts",
-  "appSplash"
+  "appSplash",
+  "appCatalog"
 ];
 function buildSimOpenUrl(currentUrl, target) {
   const url = new URL(currentUrl);
@@ -2412,6 +2529,7 @@ var SimClient = class {
   isShellCommandUnavailable,
   isSimSemanticTree,
   isTapSuccess,
+  layoutBoundFontFamily,
   layoutGetNativeEval,
   rankInteractive,
   readyProbeHasContent,
@@ -2424,6 +2542,7 @@ var SimClient = class {
   shouldSkipAutoSettleForInspectPick,
   tapBest,
   tapById,
+  tapByQuery,
   tapByText,
   tapCommandForNode,
   tapCoordinates,

package/dist-lib/sdk.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.577 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.579 | (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);
@@ -164,6 +164,24 @@ async function inspectDescribe(bridge, dumpOpts) {
     nodeCount: result.total
   };
 }
+function layoutBoundFontFamily(style) {
+  const raw = typeof style === "object" && style !== null ? style.fontFamily : void 0;
+  if (typeof raw !== "string") return void 0;
+  const first = raw.split(",")[0].trim().replace(/^['"]|['"]$/g, "");
+  if (!first) return void 0;
+  const systemFamilies = /* @__PURE__ */ new Set([
+    "system",
+    "-apple-system",
+    "system-ui",
+    "blinkmacsystemfont",
+    "segoe ui",
+    "roboto",
+    "sans-serif",
+    "serif",
+    "monospace"
+  ]);
+  return systemFamilies.has(first.toLowerCase()) ? void 0 : first;
+}
 function scoreLayoutTextContrast(input) {
   const required = input.fontSize >= 18 || input.fontSize >= 14 && (input.fontWeight ?? 400) >= 700 ? 3 : 4.5;
   const { normal, background } = input;
@@ -316,6 +334,7 @@ function layoutGetNativeEval(opts = {}) {
         const n = w === 'bold' ? 700 : (typeof w === 'number' ? w : (typeof w === 'string' ? parseInt(w, 10) : NaN))
         return Number.isFinite(n) && n >= 600 ? n : undefined
       }
+      const familyOf = ${layoutBoundFontFamily.toString()}
       const decoOf = (style) => {
         const d = style && (style.textDecorationLine || style.textDecoration)
         return d && d !== 'none' && d !== 'normal' ? String(d).split(' ')[0] : undefined
@@ -363,6 +382,27 @@ function layoutGetNativeEval(opts = {}) {
         const layout = n.layout || { x: 0, y: 0, width: 0, height: 0 }
         const abs = n.absolute || n.absolutePosition || { x: layout.x, y: layout.y }
         const text = typeof n.text === 'string' && n.text.trim() ? n.text.trim() : undefined
+        const rawHitSlop =
+          n.hitSlop != null
+            ? n.hitSlop
+            : (n.props && n.props.hitSlop != null)
+              ? n.props.hitSlop
+              : (n.style && n.style.hitSlop != null)
+                ? n.style.hitSlop
+                : (n.authoredStyle && n.authoredStyle.hitSlop != null)
+                  ? n.authoredStyle.hitSlop
+                  : undefined
+        const hitSlop =
+          typeof rawHitSlop === 'number'
+            ? (rawHitSlop !== 0 ? rawHitSlop : undefined)
+            : rawHitSlop && typeof rawHitSlop === 'object'
+              ? {
+                  t: round(rawHitSlop.top ?? rawHitSlop.t),
+                  r: round(rawHitSlop.right ?? rawHitSlop.r),
+                  b: round(rawHitSlop.bottom ?? rawHitSlop.b),
+                  l: round(rawHitSlop.left ?? rawHitSlop.l),
+                }
+              : undefined
         const base = {
           ...(typeof n.nodeId === 'number'
             ? {
@@ -377,6 +417,7 @@ function layoutGetNativeEval(opts = {}) {
           type: typeof n.type === 'string' ? n.type : 'node',
           text,
           box: { x: round(abs.x), y: round(abs.y), w: round(layout.width), h: round(layout.height) },
+          ...(hitSlop !== undefined ? { hitSlop } : {}),
         }
         if (!includeStyle) return base
         // computedStyle has the resolved values; style is the curated subset \u2014
@@ -393,6 +434,7 @@ function layoutGetNativeEval(opts = {}) {
           bg: colorStr(style.backgroundColor),
           opacity: opacityOf(style),
           fontWeight: weightOf(style),
+          fontFamily: text ? familyOf(style) : undefined,
           textDecoration: decoOf(style),
           overflow: overflowOf(style),
           borderWidth,
@@ -492,11 +534,24 @@ function formatLayoutElements(elements, opts) {
       const uniform = p.t === p.r && p.r === p.b && p.b === p.l;
       parts.push(uniform ? `pad:${p.t}` : `pad:${p.t},${p.r},${p.b},${p.l}`);
     }
+    if (el.hitSlop !== void 0) {
+      if (typeof el.hitSlop === "number") {
+        parts.push(`hitSlop:${el.hitSlop}`);
+      } else {
+        const hs = el.hitSlop;
+        const uniform = hs.t === hs.r && hs.r === hs.b && hs.b === hs.l;
+        parts.push(
+          uniform ? `hitSlop:${hs.t}` : `hitSlop:${hs.t},${hs.r},${hs.b},${hs.l}`
+        );
+      }
+    }
     if (el.fontSize !== void 0 && el.fontSize > 0) {
       parts.push(`font:${el.fontSize}`);
     }
     if (opts?.styling) {
       if (el.fontWeight) parts.push(`weight:${el.fontWeight}`);
+      if (el.fontFamily) parts.push(`family:"${el.fontFamily}"`);
+      if (el.fontLoaded === false) parts.push(`fontLoaded:false`);
       if (el.color) parts.push(`color:${el.color}`);
       if (el.bg) parts.push(`bg:${el.bg}`);
       if (el.contrast) {
@@ -528,6 +583,7 @@ async function inspectAccessibilityTree(bridge) {
   });
   if (!isSemanticQueryResult(result)) return [];
   return result.nodes.flatMap((node) => {
+    if (node.accessibilityHidden) return [];
     if (!node.role && !node.label && !node.text && !node.pressable) return [];
     return [
       {
@@ -619,7 +675,8 @@ function scoreInteractive(n) {
 function tapCommandForNode(n) {
   if (n.testID) return `peach do tap-id ${shellEscape(n.testID)}`;
   const text = typeof n.text === "string" ? n.text.trim() : "";
-  if (text.length > 0 && text.length <= 80) return `peach do tap-text ${shellEscape(text)}`;
+  if (text.length > 0 && text.length <= 80)
+    return `peach do tap-text ${shellEscape(text)}`;
   const x = Math.round(((n.absolutePosition?.x ?? 0) + (n.layout?.width ?? 0) / 2) * 10) / 10;
   const y = Math.round(((n.absolutePosition?.y ?? 0) + (n.layout?.height ?? 0) / 2) * 10) / 10;
   return `peach do tap ${x} ${y}`;
@@ -1274,7 +1331,8 @@ async function waitForSootsimIdle({
   maxMs,
   pollMs = 50,
   stablePolls = 3,
-  strict = false
+  strict = false,
+  paintStill = false
 }) {
   const result = await bridge.send(
     {
@@ -1286,6 +1344,7 @@ async function waitForSootsimIdle({
       const pollMs = ${Math.max(1, Math.round(pollMs))}
       const requiredStablePolls = ${Math.max(1, Math.round(stablePolls))}
       const strict = ${strict ? "true" : "false"}
+      const paintStill = ${paintStill ? "true" : "false"}
       const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
 
       // route-aware settle: a tap that pushes/pops a screen is async \u2014 the
@@ -1317,10 +1376,12 @@ async function waitForSootsimIdle({
         let requestTotal = 0
         let requestInFlight = 0
         let renderStatsAvailable = false
+        let frameCount = -1
         try {
           const stats = await window.__sootsimRenderHost?.queryStats?.()
           if (stats) {
             renderStatsAvailable = true
+            frameCount = typeof stats.frameCount === 'number' ? stats.frameCount : -1
             animating =
               stats.hasActiveAnims === true ||
               stats.hasActiveNativeAnimations === true ||
@@ -1353,7 +1414,7 @@ async function waitForSootsimIdle({
           }
           walk(root)
         }
-        return { layout: nodes.join(';'), animating, layoutDirty, pendingFetches, renderStatsAvailable, requestTotal, requestInFlight }
+        return { layout: nodes.join(';'), frameCount, animating, layoutDirty, pendingFetches, renderStatsAvailable, requestTotal, requestInFlight }
       }
 
       // how long generic background network is allowed to keep us waiting AFTER
@@ -1368,6 +1429,8 @@ async function waitForSootsimIdle({
       // only within this grace once the screen is visually still.
       const networkQuietGraceMs = 1200
       let lastLayout = ''
+      let lastFrameCount = -2
+      let paintedPolls = 0
       let lastRequestTotal = -1
       let stable = 0
       let visuallyStillSince = 0
@@ -1384,13 +1447,18 @@ async function waitForSootsimIdle({
         if (snapshot.layoutDirty) dirtyPolls++
         if (snapshot.animating) animatingPolls++
         if (polls > 1 && snapshot.layout !== lastLayout) layoutChangedPolls++
+        const painted = paintStill && snapshot.frameCount !== lastFrameCount
+        if (polls > 1 && painted) paintedPolls++
         const strictOk =
           !strict ||
           (snapshot.renderStatsAvailable && !snapshot.animating && !snapshot.layoutDirty)
         // visually settled: no animations, no image content loading, layout
         // unchanged since the last poll.
         const visuallyStill =
-          strictOk && snapshot.pendingFetches === 0 && snapshot.layout === lastLayout
+          strictOk &&
+          !painted &&
+          snapshot.pendingFetches === 0 &&
+          snapshot.layout === lastLayout
         // generic network quiet: nothing in flight and no new requests issued.
         const networkQuiet =
           snapshot.requestInFlight === 0 && snapshot.requestTotal === lastRequestTotal
@@ -1411,6 +1479,7 @@ async function waitForSootsimIdle({
           visuallyStillSince = 0
         }
         lastLayout = snapshot.layout
+        lastFrameCount = snapshot.frameCount
         lastRequestTotal = snapshot.requestTotal
         await sleep(pollMs)
       }
@@ -1421,6 +1490,7 @@ async function waitForSootsimIdle({
       if (last.layoutDirty) blockers.push('layout still dirty')
       if (last.pendingFetches > 0) blockers.push(last.pendingFetches + ' image fetches pending')
       if (last.layout !== lastLayout) blockers.push('layout still changing')
+      if (paintStill && last.frameCount !== lastFrameCount) blockers.push('still painting')
       if (last.requestInFlight > 0) blockers.push(last.requestInFlight + ' requests in flight')
       return {
         settled: false,
@@ -1428,7 +1498,7 @@ async function waitForSootsimIdle({
         blockedBy:
           (blockers.length ? blockers.join(', ') : 'unknown') +
           ' over ' + polls + ' polls (layout changed ' + layoutChangedPolls +
-          'x, layoutDirty ' + dirtyPolls + 'x, animating ' + animatingPolls + 'x)',
+          'x, layoutDirty ' + dirtyPolls + 'x, animating ' + animatingPolls + 'x, painted ' + paintedPolls + 'x)',
       }
     })()`
     },
@@ -1744,6 +1814,48 @@ async function tapByText(bridge, query, options = {}, opts = {}) {
     }
   });
 }
+var TAP_QUERY_FINDERS = {
+  label: "findByLabel",
+  role: "findByRole",
+  hint: "findByHint",
+  state: "findByA11yState"
+};
+function isTapNode(value) {
+  return value !== null && typeof value === "object" && typeof Reflect.get(value, "nodeId") === "number";
+}
+function isTapTargetInfo(value) {
+  return value !== null && typeof value === "object" && typeof Reflect.get(value, "cx") === "number" && typeof Reflect.get(value, "cy") === "number" && isTapNode(Reflect.get(value, "target"));
+}
+async function tapByQuery(bridge, query, opts = {}) {
+  const call = (method, arg) => bridge.send({ type: "call", path: `SootSim.bridges.test.${method}`, args: [arg] });
+  return tapResolvedTarget(bridge, {
+    agent: opts.agent,
+    timing: opts.timing,
+    textFallback: typeof query.value === "string" ? query.value : void 0,
+    resolve: async () => {
+      const node = await call(TAP_QUERY_FINDERS[query.by], query.value);
+      if (!isTapNode(node)) return { cx: null };
+      const tap = await call("resolveTapTarget", node.nodeId);
+      if (!isTapTargetInfo(tap)) return { cx: null };
+      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
+        },
+        {
+          nodeId: node.nodeId,
+          testID: node.testID,
+          text: node.text ?? node.accessibilityLabel,
+          type: node.type
+        }
+      );
+    }
+  });
+}
 async function tapBest(bridge, query, opts = {}) {
   return tapResolvedTarget(bridge, {
     agent: opts.agent,
@@ -1808,6 +1920,11 @@ async function openAppUrl(bridge, target) {
   return normalized;
 }
 
+// src/sleep.ts
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
 // src/sim-client.ts
 var SimClientError = class extends Error {
   constructor(message) {
@@ -1850,9 +1967,6 @@ var SimResetError = class extends SimClientError {
     this.result = result;
   }
 };
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
 function decodePngDataUrl(dataUrl) {
   if (typeof dataUrl !== "string" || !dataUrl.startsWith("data:image/png;base64,")) {
     throw new SimClientError(
@@ -1875,7 +1989,8 @@ var TARGET_SEARCH_PARAMS = [
   "port",
   "inspectOpen",
   "appFonts",
-  "appSplash"
+  "appSplash",
+  "appCatalog"
 ];
 function buildSimOpenUrl(currentUrl, target) {
   const url = new URL(currentUrl);
@@ -2315,6 +2430,7 @@ export {
   isShellCommandUnavailable,
   isSimSemanticTree,
   isTapSuccess,
+  layoutBoundFontFamily,
   layoutGetNativeEval,
   rankInteractive,
   readyProbeHasContent,
@@ -2327,6 +2443,7 @@ export {
   shouldSkipAutoSettleForInspectPick,
   tapBest,
   tapById,
+  tapByQuery,
   tapByText,
   tapCommandForNode,
   tapCoordinates,