rnxsim 0.1.458 → 0.1.460

package/dist-lib/detox/index.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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 __create = Object.create;

package/dist-lib/dev-bundle-resolution.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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;

package/dist-lib/home-paths.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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 __create = Object.create;

package/dist-lib/host/bridge-host.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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 __create = Object.create;
@@ -8732,7 +8732,7 @@ var SootSimBridgeHost = class _SootSimBridgeHost {
   inflightScan = null;
   static SCAN_FRESH_MS = 2e3;
   constructor(opts = {}) {
-    this.preferredPort = opts.port || DEFAULT_SOOTSIM_BRIDGE_PORT;
+    this.preferredPort = opts.port ?? DEFAULT_SOOTSIM_BRIDGE_PORT;
     this.port = this.preferredPort;
     this.shouldWriteLockfile = opts.writeLockfile === true;
     this.shouldWriteDevLockfile = opts.writeDevLockfile === true;
@@ -8782,9 +8782,9 @@ var SootSimBridgeHost = class _SootSimBridgeHost {
     for (let attempt = 0; attempt < this.portFallbackCount; attempt++) {
       const candidate = this.preferredPort + attempt;
       try {
-        await this.bindOnce(candidate, options?.silent === true);
-        this.effectivePort = candidate;
-        this.port = candidate;
+        const boundPort = await this.bindOnce(candidate, options?.silent === true);
+        this.effectivePort = boundPort;
+        this.port = boundPort;
         this.startedAt = Date.now();
         if (attempt > 0 && !options?.silent) {
           process.stderr.write(
@@ -8793,7 +8793,7 @@ var SootSimBridgeHost = class _SootSimBridgeHost {
           );
         }
         this.afterBind();
-        return candidate;
+        return boundPort;
       } catch (err) {
         const e = err;
         if (e?.code !== "EADDRINUSE") {
@@ -8829,6 +8829,11 @@ var SootSimBridgeHost = class _SootSimBridgeHost {
       server.once("error", onError);
       server.listen(port, "127.0.0.1", () => {
         if (settled) return;
+        const address = server.address();
+        if (!address || typeof address === "string") {
+          onError(new Error("ws bridge has no bound TCP address"));
+          return;
+        }
         settled = true;
         server.removeListener("error", onError);
         server.on("error", (err) => {
@@ -8844,7 +8849,7 @@ var SootSimBridgeHost = class _SootSimBridgeHost {
             this.wss?.emit("connection", ws, req);
           });
         });
-        resolve5();
+        resolve5(address.port);
       });
     });
   }

package/dist-lib/host/fetch-proxy-handler.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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 __create = Object.create;

package/dist-lib/host/fetch-proxy-overrides.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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;

package/dist-lib/host/fetch-proxy-overrides.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/host/fetch-proxy-overrides.ts
 var FETCH_PROXY_BROWSER_USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/146.0.0.0 Safari/537.36";

package/dist-lib/host/replacement-module-handler.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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 __create = Object.create;

package/dist-lib/host/websocket-proxy.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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;

package/dist-lib/index.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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 __create = Object.create;
@@ -1931,11 +1931,12 @@ async function resolveTargetCoords(bridge, target) {
   if (!isSimSemanticTree(semanticNodes) || typeof x !== "number" || !Number.isFinite(x) || typeof y !== "number" || !Number.isFinite(y)) {
     throw new Error("resolve returned an invalid result");
   }
-  const semanticMatch = semanticNodes[0];
+  const semanticMatch = semanticNodes[1];
   if (!semanticMatch) throw new Error("resolve returned an invalid result");
   return {
     x,
     y,
+    nodeId: semanticMatch.nodeId,
     testID: semanticMatch.testID ?? null,
     text: semanticMatch.text ?? (target.mode === "text" ? target.value : semanticMatch.label),
     type: semanticMatch.type
@@ -2147,34 +2148,6 @@ function offscreenPayload(cx, cy, screen) {
   }
   return { offscreen: true, screen };
 }
-function geometryContains(geometry, x, y) {
-  return x >= geometry.x && y >= geometry.y && x <= geometry.x + geometry.width && y <= geometry.y + geometry.height;
-}
-function hitTestSemanticTree(nodes, x, y, ancestors = []) {
-  for (let index = nodes.length - 1; index >= 0; index--) {
-    const node = nodes[index];
-    if (!node || !geometryContains(node.geometry, x, y)) continue;
-    const childHit = node.children?.length ? hitTestSemanticTree(node.children, x, y, [...ancestors, node]) : null;
-    return childHit ?? { node, ancestors };
-  }
-  return null;
-}
-function nodeMatchesRequested(node, requested) {
-  if (typeof requested.nodeId === "number" && node.nodeId === requested.nodeId) {
-    return true;
-  }
-  if (requested.testID && node.testID === requested.testID) return true;
-  if (requested.id && node.testID === requested.id) return true;
-  return false;
-}
-function coveringNodeSummary(node) {
-  return {
-    nodeId: node.nodeId,
-    testID: node.testID ?? null,
-    text: node.text ?? node.label ?? null,
-    type: node.type
-  };
-}
 var DEFAULT_AGENT_TIMING = {
   initialWaitMs: 3e3,
   deadlineMs: 5e3,
@@ -2201,9 +2174,10 @@ function isTapSuccess(result) {
   return true;
 }
 function tapTargetFromPayload(payload, textFallback) {
+  const id = payload.target?.id ?? payload.match?.id ?? payload.node?.id;
   return {
     nodeId: payload.target?.nodeId ?? payload.match?.nodeId ?? payload.node?.nodeId ?? null,
-    id: payload.target?.id ?? payload.match?.id ?? payload.node?.id ?? null,
+    id: typeof id === "string" ? id : null,
     testID: payload.target?.testID ?? payload.match?.testID ?? payload.node?.testID ?? null,
     text: payload.target?.text ?? payload.target?.accessibilityLabel ?? payload.match?.text ?? payload.match?.accessibilityLabel ?? payload.node?.text ?? textFallback ?? null,
     type: payload.target?.type ?? payload.match?.type ?? payload.node?.type ?? null
@@ -2261,36 +2235,17 @@ async function tapResolvedTarget(bridge, args) {
       } else {
         lastOffscreenAt = null;
         const requestedTarget = tapTargetFromPayload(payload, args.textFallback);
-        const { tree } = await inspectTree(bridge, 50);
-        let moved = false;
-        if (Array.isArray(tree) && tree.length > 0) {
-          const hit = hitTestSemanticTree(tree, payload.cx, payload.cy);
-          const matched = hit !== null && (nodeMatchesRequested(hit.node, requestedTarget) || hit.ancestors.some(
-            (ancestor) => nodeMatchesRequested(ancestor, requestedTarget)
-          ));
-          const blocks = hit !== null && (hit.node.type === "text" || hit.node.pressable === true || hit.ancestors.some((ancestor) => ancestor.pressable === true));
-          if (hit && !matched && blocks) {
-            moved = subtreeMatchesRequested(hit.node, requestedTarget);
-            lastResult = {
-              hit: false,
-              reason: moved ? "target-moved" : "target-covered",
-              requestedTarget,
-              coordinateTarget: coveringNodeSummary(hit.node)
-            };
-            if (!moved)
-              return { payload, result: lastResult, attempts, failure: "missed" };
-          }
-        }
-        if (!moved) {
-          const result = await tapCoordinates(
-            bridge,
-            payload.cx,
-            payload.cy,
-            requestedTarget
-          );
-          lastResult = result;
-          if (isTapSuccess(result)) return { payload, result, attempts };
+        const result = await tapCoordinates(
+          bridge,
+          payload.cx,
+          payload.cy,
+          requestedTarget
+        );
+        lastResult = result;
+        if (result?.requestedTargetMatched === false) {
+          return { payload, result, attempts, failure: "missed" };
         }
+        if (isTapSuccess(result)) return { payload, result, attempts };
       }
     }
     const remaining = deadline - Date.now();
@@ -2319,13 +2274,6 @@ async function tapResolvedTarget(bridge, args) {
     failure: lastPayload && typeof lastPayload.cx === "number" ? "missed" : "not-found"
   };
 }
-function subtreeMatchesRequested(node, requested) {
-  for (const child of node.children ?? []) {
-    if (nodeMatchesRequested(child, requested) || subtreeMatchesRequested(child, requested))
-      return true;
-  }
-  return false;
-}
 async function tapCoordinates(bridge, x, y, target) {
   return bridge.send({
     type: "tap",
@@ -2346,7 +2294,7 @@ function payloadFromResolved(resolved, match, extra = {}) {
       type: match.type ?? null
     },
     target: {
-      nodeId: match.nodeId ?? null,
+      nodeId: resolved.nodeId ?? match.nodeId ?? null,
       id: resolved.testID ?? match.testID ?? null,
       testID: resolved.testID ?? match.testID ?? null,
       text: resolved.text ?? match.text ?? null,
@@ -2478,7 +2426,7 @@ async function tapBest(bridge, query, opts = {}) {
           ...payloadFromResolved(byId, byId),
           strategy: "testid",
           node: {
-            nodeId: null,
+            nodeId: byId.nodeId ?? null,
             id: byId.testID ?? query,
             testID: byId.testID ?? query,
             type: byId.type ?? null,
@@ -2492,7 +2440,7 @@ async function tapBest(bridge, query, opts = {}) {
           ...payloadFromResolved(byText, byText),
           strategy: "text",
           node: {
-            nodeId: null,
+            nodeId: byText.nodeId ?? null,
             id: byText.testID ?? null,
             testID: byText.testID ?? null,
             type: byText.type ?? null,
@@ -2811,11 +2759,16 @@ var SimClient = class {
       const { text, ...textOpts } = target;
       return this.throwUnlessTapped(await tapByText(this, text, textOpts), text);
     }
-    if ("testID" in target && typeof target.testID === "string") {
+    if ("testID" in target && typeof target.testID === "string" && typeof target.nodeId !== "number") {
       return this.throwUnlessTapped(await tapById(this, target.testID), target.testID);
     }
     const coords = this.coordsForTapTarget(target);
-    const result = await this.send({ type: "tap", x: coords.x, y: coords.y });
+    const result = await this.send({
+      type: "tap",
+      x: coords.x,
+      y: coords.y,
+      ..."nodeId" in target && typeof target.nodeId === "number" ? { target: { nodeId: target.nodeId } } : {}
+    });
     if (!isTapSuccess(result)) {
       throw new SimTapError(
         `tap at ${coords.x},${coords.y} missed: ${JSON.stringify(result)}`
@@ -2878,6 +2831,7 @@ var SimClient = class {
         x: target.x,
         y: target.y,
         target: {
+          nodeId: target.nodeId,
           testID: target.testID ?? void 0,
           text: target.text ?? void 0,
           type: target.type ?? void 0

package/dist-lib/jump-to-source-babel.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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;

package/dist-lib/jump-to-source-native.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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 __create = Object.create;

package/dist-lib/menu.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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;

package/dist-lib/menu.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/public-brand.ts
 var name = "rnx";

package/dist-lib/metro-fingerprint-registry.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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;

package/dist-lib/metro-fingerprint-registry.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/metro-fingerprint-registry.ts
 var RNX_METRO_FINGERPRINT_SCHEMA_VERSION = 2;

package/dist-lib/metro-production-bundle.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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;

package/dist-lib/metro-production-bundle.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/metro-production-bundle.ts
 var RNXSIM_METRO_MODULE_PATHS_PREFIX = "globalThis.__sootsimModulePaths=";

package/dist-lib/metro.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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 __create = Object.create;

package/dist-lib/profiles.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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 __create = Object.create;

package/dist-lib/public-brand.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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;

package/dist-lib/react-native-host-modules.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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;

package/dist-lib/react-native-host-modules.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/react-native-host-modules.ts
 var REACT_NATIVE_PASSTHROUGH_SPECIFIERS = [

package/dist-lib/render-mode.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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;

package/dist-lib/scripts/dev-server-scanner.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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 __create = Object.create;

package/dist-lib/sdk.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (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;
@@ -1349,11 +1349,12 @@ async function resolveTargetCoords(bridge, target) {
   if (!isSimSemanticTree(semanticNodes) || typeof x !== "number" || !Number.isFinite(x) || typeof y !== "number" || !Number.isFinite(y)) {
     throw new Error("resolve returned an invalid result");
   }
-  const semanticMatch = semanticNodes[0];
+  const semanticMatch = semanticNodes[1];
   if (!semanticMatch) throw new Error("resolve returned an invalid result");
   return {
     x,
     y,
+    nodeId: semanticMatch.nodeId,
     testID: semanticMatch.testID ?? null,
     text: semanticMatch.text ?? (target.mode === "text" ? target.value : semanticMatch.label),
     type: semanticMatch.type
@@ -1565,34 +1566,6 @@ function offscreenPayload(cx, cy, screen) {
   }
   return { offscreen: true, screen };
 }
-function geometryContains(geometry, x, y) {
-  return x >= geometry.x && y >= geometry.y && x <= geometry.x + geometry.width && y <= geometry.y + geometry.height;
-}
-function hitTestSemanticTree(nodes, x, y, ancestors = []) {
-  for (let index = nodes.length - 1; index >= 0; index--) {
-    const node = nodes[index];
-    if (!node || !geometryContains(node.geometry, x, y)) continue;
-    const childHit = node.children?.length ? hitTestSemanticTree(node.children, x, y, [...ancestors, node]) : null;
-    return childHit ?? { node, ancestors };
-  }
-  return null;
-}
-function nodeMatchesRequested(node, requested) {
-  if (typeof requested.nodeId === "number" && node.nodeId === requested.nodeId) {
-    return true;
-  }
-  if (requested.testID && node.testID === requested.testID) return true;
-  if (requested.id && node.testID === requested.id) return true;
-  return false;
-}
-function coveringNodeSummary(node) {
-  return {
-    nodeId: node.nodeId,
-    testID: node.testID ?? null,
-    text: node.text ?? node.label ?? null,
-    type: node.type
-  };
-}
 var DEFAULT_AGENT_TIMING = {
   initialWaitMs: 3e3,
   deadlineMs: 5e3,
@@ -1619,9 +1592,10 @@ function isTapSuccess(result) {
   return true;
 }
 function tapTargetFromPayload(payload, textFallback) {
+  const id = payload.target?.id ?? payload.match?.id ?? payload.node?.id;
   return {
     nodeId: payload.target?.nodeId ?? payload.match?.nodeId ?? payload.node?.nodeId ?? null,
-    id: payload.target?.id ?? payload.match?.id ?? payload.node?.id ?? null,
+    id: typeof id === "string" ? id : null,
     testID: payload.target?.testID ?? payload.match?.testID ?? payload.node?.testID ?? null,
     text: payload.target?.text ?? payload.target?.accessibilityLabel ?? payload.match?.text ?? payload.match?.accessibilityLabel ?? payload.node?.text ?? textFallback ?? null,
     type: payload.target?.type ?? payload.match?.type ?? payload.node?.type ?? null
@@ -1679,36 +1653,17 @@ async function tapResolvedTarget(bridge, args) {
       } else {
         lastOffscreenAt = null;
         const requestedTarget = tapTargetFromPayload(payload, args.textFallback);
-        const { tree } = await inspectTree(bridge, 50);
-        let moved = false;
-        if (Array.isArray(tree) && tree.length > 0) {
-          const hit = hitTestSemanticTree(tree, payload.cx, payload.cy);
-          const matched = hit !== null && (nodeMatchesRequested(hit.node, requestedTarget) || hit.ancestors.some(
-            (ancestor) => nodeMatchesRequested(ancestor, requestedTarget)
-          ));
-          const blocks = hit !== null && (hit.node.type === "text" || hit.node.pressable === true || hit.ancestors.some((ancestor) => ancestor.pressable === true));
-          if (hit && !matched && blocks) {
-            moved = subtreeMatchesRequested(hit.node, requestedTarget);
-            lastResult = {
-              hit: false,
-              reason: moved ? "target-moved" : "target-covered",
-              requestedTarget,
-              coordinateTarget: coveringNodeSummary(hit.node)
-            };
-            if (!moved)
-              return { payload, result: lastResult, attempts, failure: "missed" };
-          }
-        }
-        if (!moved) {
-          const result = await tapCoordinates(
-            bridge,
-            payload.cx,
-            payload.cy,
-            requestedTarget
-          );
-          lastResult = result;
-          if (isTapSuccess(result)) return { payload, result, attempts };
+        const result = await tapCoordinates(
+          bridge,
+          payload.cx,
+          payload.cy,
+          requestedTarget
+        );
+        lastResult = result;
+        if (result?.requestedTargetMatched === false) {
+          return { payload, result, attempts, failure: "missed" };
         }
+        if (isTapSuccess(result)) return { payload, result, attempts };
       }
     }
     const remaining = deadline - Date.now();
@@ -1737,13 +1692,6 @@ async function tapResolvedTarget(bridge, args) {
     failure: lastPayload && typeof lastPayload.cx === "number" ? "missed" : "not-found"
   };
 }
-function subtreeMatchesRequested(node, requested) {
-  for (const child of node.children ?? []) {
-    if (nodeMatchesRequested(child, requested) || subtreeMatchesRequested(child, requested))
-      return true;
-  }
-  return false;
-}
 async function tapCoordinates(bridge, x, y, target) {
   return bridge.send({
     type: "tap",
@@ -1764,7 +1712,7 @@ function payloadFromResolved(resolved, match, extra = {}) {
       type: match.type ?? null
     },
     target: {
-      nodeId: match.nodeId ?? null,
+      nodeId: resolved.nodeId ?? match.nodeId ?? null,
       id: resolved.testID ?? match.testID ?? null,
       testID: resolved.testID ?? match.testID ?? null,
       text: resolved.text ?? match.text ?? null,
@@ -1896,7 +1844,7 @@ async function tapBest(bridge, query, opts = {}) {
           ...payloadFromResolved(byId, byId),
           strategy: "testid",
           node: {
-            nodeId: null,
+            nodeId: byId.nodeId ?? null,
             id: byId.testID ?? query,
             testID: byId.testID ?? query,
             type: byId.type ?? null,
@@ -1910,7 +1858,7 @@ async function tapBest(bridge, query, opts = {}) {
           ...payloadFromResolved(byText, byText),
           strategy: "text",
           node: {
-            nodeId: null,
+            nodeId: byText.nodeId ?? null,
             id: byText.testID ?? null,
             testID: byText.testID ?? null,
             type: byText.type ?? null,
@@ -2229,11 +2177,16 @@ var SimClient = class {
       const { text, ...textOpts } = target;
       return this.throwUnlessTapped(await tapByText(this, text, textOpts), text);
     }
-    if ("testID" in target && typeof target.testID === "string") {
+    if ("testID" in target && typeof target.testID === "string" && typeof target.nodeId !== "number") {
       return this.throwUnlessTapped(await tapById(this, target.testID), target.testID);
     }
     const coords = this.coordsForTapTarget(target);
-    const result = await this.send({ type: "tap", x: coords.x, y: coords.y });
+    const result = await this.send({
+      type: "tap",
+      x: coords.x,
+      y: coords.y,
+      ..."nodeId" in target && typeof target.nodeId === "number" ? { target: { nodeId: target.nodeId } } : {}
+    });
     if (!isTapSuccess(result)) {
       throw new SimTapError(
         `tap at ${coords.x},${coords.y} missed: ${JSON.stringify(result)}`
@@ -2296,6 +2249,7 @@ var SimClient = class {
         x: target.x,
         y: target.y,
         target: {
+          nodeId: target.nodeId,
           testID: target.testID ?? void 0,
           text: target.text ?? void 0,
           type: target.type ?? void 0