peachsim 0.1.657 → 0.1.659

package/dist-lib/native-app-identity.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.657 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.659 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/native-app-identity.ts
 var NATIVE_APP_IDENTITY_PREFIX = "globalThis.__sootsimNativeAppIdentity=";
@@ -11,6 +11,8 @@ function nonEmptyString(value) {
 }
 function isNativeAppIdentity(value) {
   if (!isRecord(value)) return false;
+  const descriptions = value.permissionUsageDescriptions;
+  if (descriptions !== void 0 && !isRecord(descriptions)) return false;
   const platform = value.platform;
   if (platform !== "ios" && platform !== "android") return false;
   const applicationName = value.applicationName;
@@ -32,7 +34,10 @@ function readNativeAppIdentity(value) {
     appVersion: value.appVersion,
     buildVersion: value.buildVersion,
     bundleIdentifier: value.bundleIdentifier,
-    platform: value.platform
+    platform: value.platform,
+    ...value.permissionUsageDescriptions === void 0 ? {} : {
+      permissionUsageDescriptions: { ...value.permissionUsageDescriptions }
+    }
   };
 }
 function applyNativeAppIdentity(identity) {
@@ -137,7 +142,7 @@ function readBuildSettingsBlock(source, start) {
 }
 function parseBuildSettings(block) {
   const settings = {};
-  const matchPattern = /([A-Z0-9_]+) = ("(?:[^"\\]|\\.)*"|[^;{}]*);/g;
+  const matchPattern = /([A-Za-z0-9_]+) = ("(?:[^"\\]|\\.)*"|[^;{}]*);/g;
   let match;
   while ((match = matchPattern.exec(block)) !== null) {
     const raw = match[2].trim();
@@ -173,27 +178,29 @@ function appTargetReleaseSettings(pbxproj, targetName, infoPlistRelativePath) {
     (candidate) => candidate.name === "Release" && named(candidate.settings)
   )?.settings ?? null;
 }
-function nativeAppIdentityFromIos(files) {
+function nativeAppIdentityFromIos(files, parseInfoPlist) {
+  const pbxprojPath = Object.keys(files).find(
+    (path) => /(?:^|\/)ios\/[^/]+\.xcodeproj\/project\.pbxproj$/.test(path)
+  );
+  if (!pbxprojPath) return null;
+  const pbxproj = files[pbxprojPath];
+  const applicationTargets = new Set(
+    [
+      ...pbxproj.matchAll(
+        /isa = PBXNativeTarget;[^}]*?name = "?([^";]+)"?;[^}]*?productType = "com\.apple\.product-type\.application";/g
+      )
+    ].map((match) => match[1])
+  );
   const appDelegatePattern = /(?:^|\/)ios\/([^/]+)\/AppDelegate\.(?:swift|mm|m)$/;
-  let targetName = null;
-  for (const path of Object.keys(files)) {
-    if (path.includes("/Pods/")) continue;
-    const match = path.match(appDelegatePattern);
-    if (match) {
-      targetName = match[1];
-      break;
-    }
-  }
+  const targetName = Object.keys(files).filter((path) => !path.includes("/Pods/")).map((path) => path.match(appDelegatePattern)?.[1]).find((name) => name !== void 0 && applicationTargets.has(name)) ?? null;
   if (!targetName) return null;
-  const plistPath = Object.keys(files).find(
-    (path) => path === `ios/${targetName}/Info.plist`
-  );
-  const plist = plistPath ? files[plistPath] : null;
+  const plist = files[`ios/${targetName}/Info.plist`];
   if (!plist) return null;
-  const pbxprojPath = Object.keys(files).find(
-    (path) => /(?:^|\/)ios\/[^/]+\.xcodeproj\/project\.pbxproj$/.test(path)
+  const settings = appTargetReleaseSettings(
+    pbxproj,
+    targetName,
+    `${targetName}/Info.plist`
   );
-  const settings = pbxprojPath ? appTargetReleaseSettings(files[pbxprojPath], targetName, `${targetName}/Info.plist`) : null;
   if (!settings) return null;
   const bundleIdentifier = identityFieldFrom(
     settings,
@@ -218,22 +225,47 @@ function nativeAppIdentityFromIos(files) {
     settings.PRODUCT_NAME
   ) ?? resolvedIdentityField(resolveBuildSetting(settings.PRODUCT_NAME ?? "", settings)) ?? resolvedIdentityField(targetName);
   if (!applicationName) return null;
+  const dictionary = parseInfoPlist(plist);
+  if (!isRecord(dictionary)) throw new Error("native app Info.plist is not a dictionary");
+  const permissionUsageDescriptions = {};
+  for (const [key, value] of Object.entries(dictionary)) {
+    if (!/^NS.*UsageDescription$/.test(key)) continue;
+    if (typeof value !== "string") {
+      permissionUsageDescriptions[key] = value;
+      continue;
+    }
+    const resolved = resolveBuildSetting(value, settings);
+    if (resolved === null) throw new Error(`native app Info.plist ${key} is unresolved`);
+    permissionUsageDescriptions[key] = resolved;
+  }
+  if (settings.GENERATE_INFOPLIST_FILE === "YES") {
+    for (const [setting, value] of Object.entries(settings)) {
+      if (!/^INFOPLIST_KEY_NS.*UsageDescription$/.test(setting)) continue;
+      const key = setting.slice("INFOPLIST_KEY_".length);
+      const resolved = resolveBuildSetting(value, settings);
+      if (resolved === null)
+        throw new Error(`native app build setting ${setting} is unresolved`);
+      permissionUsageDescriptions[key] = resolved;
+    }
+  }
   return {
     applicationName,
     appVersion,
     buildVersion,
     bundleIdentifier,
-    platform: "ios"
+    platform: "ios",
+    permissionUsageDescriptions
   };
 }
-function nativeAppIdentityFromAndroid() {
-  return null;
+function canExtractNativeAppIdentity(platform) {
+  return platform === "ios";
 }
-function extractNativeAppIdentityFromFiles(files, platform) {
-  return platform === "android" ? nativeAppIdentityFromAndroid() : nativeAppIdentityFromIos(files);
+function extractNativeAppIdentityFromFiles(files, platform, parseInfoPlist) {
+  return canExtractNativeAppIdentity(platform) ? nativeAppIdentityFromIos(files, parseInfoPlist) : null;
 }
 export {
   applyNativeAppIdentity,
+  canExtractNativeAppIdentity,
   createNativeAppIdentityFooter,
   detachNativeAppIdentityFooter,
   extractNativeAppIdentityFromFiles,

package/dist-lib/plist.cjs

@@ -0,0 +1,64 @@
+/*! rnx v0.1.659 | (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;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/plist.ts
+var plist_exports = {};
+__export(plist_exports, {
+  parsePlistSource: () => parsePlistSource
+});
+module.exports = __toCommonJS(plist_exports);
+var import_plist = __toESM(require("@expo/plist"), 1);
+
+// src/is-record.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+// src/plist.ts
+function resolvePlistParser(value) {
+  if (!isRecord(value)) return null;
+  const direct = value.parse;
+  if (typeof direct === "function") {
+    return (source) => Reflect.apply(direct, value, [source]);
+  }
+  const nested = value.default;
+  if (!isRecord(nested)) return null;
+  const nestedParse = nested.parse;
+  return typeof nestedParse === "function" ? (source) => Reflect.apply(nestedParse, nested, [source]) : null;
+}
+var parsePlist = resolvePlistParser(import_plist.default);
+function parsePlistSource(source) {
+  return parsePlist?.(source) ?? null;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  parsePlistSource
+});

package/dist-lib/plist.mjs

@@ -0,0 +1,29 @@
+/*! rnx v0.1.659 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+
+// src/plist.ts
+import plistModule from "@expo/plist";
+
+// src/is-record.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+// src/plist.ts
+function resolvePlistParser(value) {
+  if (!isRecord(value)) return null;
+  const direct = value.parse;
+  if (typeof direct === "function") {
+    return (source) => Reflect.apply(direct, value, [source]);
+  }
+  const nested = value.default;
+  if (!isRecord(nested)) return null;
+  const nestedParse = nested.parse;
+  return typeof nestedParse === "function" ? (source) => Reflect.apply(nestedParse, nested, [source]) : null;
+}
+var parsePlist = resolvePlistParser(plistModule);
+function parsePlistSource(source) {
+  return parsePlist?.(source) ?? null;
+}
+export {
+  parsePlistSource
+};

package/dist-lib/profiles.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.657 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.659 | (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.657 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.659 | (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.657 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.659 | (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.657 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.659 | (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.657 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.659 | (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.657 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.659 | (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;
@@ -228,7 +228,7 @@ function hasOwnKeys(value) {
 }
 function hasPeachConfig(config) {
   if (!config) return false;
-  return typeof config.runtimeVersion === "string" && config.runtimeVersion.length > 0 || hasOwnKeys(config.modules) || hasOwnKeys(config.turboModules) || hasOwnKeys(config.nativeModules) || hasOwnKeys(config.env) || hasOwnKeys(config.network?.remap) || hasOwnKeys(config.settings) || hasOwnKeys(config.initialState);
+  return typeof config.runtimeVersion === "string" && config.runtimeVersion.length > 0 || hasOwnKeys(config.modules) || hasOwnKeys(config.turboModules) || hasOwnKeys(config.nativeModules) || hasOwnKeys(config.nativeViews) || hasOwnKeys(config.env) || hasOwnKeys(config.network?.remap) || hasOwnKeys(config.settings) || hasOwnKeys(config.initialState);
 }
 function applyPeachConfigToUrl(url, config) {
   const parsed = new URL(url);

package/dist-lib/sdk.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.657 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.659 | (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;
@@ -1452,10 +1452,20 @@ function formatTimelineEvents(events) {
 }
 
 // cli/commands/inspect/resolve-target.ts
+function isScreenSize(value) {
+  if (value === null || typeof value !== "object") return false;
+  const width = Reflect.get(value, "width");
+  const height = Reflect.get(value, "height");
+  return typeof width === "number" && Number.isFinite(width) && width > 0 && typeof height === "number" && Number.isFinite(height) && height > 0;
+}
+function isOffscreen(x, y, screen) {
+  return !(x >= 0 && y >= 0 && x <= screen.width && y <= screen.height);
+}
+var UNREPORTED_SCREEN_ERROR = "this runtime does not report the screen size a targeted gesture needs; update it with `peach runtime install`, or use coordinates";
 async function resolveTargetCoords(bridge, target) {
   const result = await bridge.send({
     type: "resolve",
-    selector: target.mode === "testid" ? { testID: target.value } : { text: target.value }
+    selector: target.mode === "node" ? { nodeId: target.nodeId } : target.mode === "testid" ? { testID: target.value } : { text: target.value }
   });
   if (result === null) return null;
   if (typeof result !== "object") throw new Error("resolve returned an invalid result");
@@ -1463,6 +1473,9 @@ async function resolveTargetCoords(bridge, target) {
   const resolvedTarget = Reflect.get(result, "target");
   const semanticNodes = [match, resolvedTarget];
   const point = Reflect.get(result, "point");
+  const viewport = Reflect.get(result, "viewport");
+  const width = viewport !== null && typeof viewport === "object" ? Reflect.get(viewport, "width") : void 0;
+  const height = viewport !== null && typeof viewport === "object" ? Reflect.get(viewport, "height") : void 0;
   const x = point !== null && typeof point === "object" ? Reflect.get(point, "x") : void 0;
   const y = point !== null && typeof point === "object" ? Reflect.get(point, "y") : void 0;
   if (!isSimSemanticTree(semanticNodes) || typeof x !== "number" || !Number.isFinite(x) || typeof y !== "number" || !Number.isFinite(y)) {
@@ -1476,7 +1489,8 @@ async function resolveTargetCoords(bridge, target) {
     nodeId: semanticMatch.nodeId,
     testID: semanticMatch.testID ?? null,
     text: semanticMatch.text ?? (target.mode === "text" ? target.value : semanticMatch.label),
-    type: semanticMatch.type
+    type: semanticMatch.type,
+    ...typeof width === "number" && typeof height === "number" ? { viewport: { width, height } } : {}
   };
 }
 
@@ -1671,30 +1685,6 @@ async function waitForSootsimIdle({
 }
 
 // cli/commands/inspect/actions.ts
-function isScreenSize(value) {
-  if (value === null || typeof value !== "object") return false;
-  const width = Reflect.get(value, "width");
-  const height = Reflect.get(value, "height");
-  return typeof width === "number" && Number.isFinite(width) && width > 0 && typeof height === "number" && Number.isFinite(height) && height > 0;
-}
-function viewportFromCapture(value) {
-  if (value === null || typeof value !== "object") return void 0;
-  const tree = Reflect.get(value, "tree");
-  return tree !== null && typeof tree === "object" ? Reflect.get(tree, "viewport") : void 0;
-}
-async function readScreen(bridge) {
-  try {
-    const viewport = viewportFromCapture(
-      await bridge.send({ type: "capture", includeVisual: false })
-    );
-    return isScreenSize(viewport) ? { width: viewport.width, height: viewport.height } : null;
-  } catch {
-    return null;
-  }
-}
-function isOffscreen(cx, cy, screen) {
-  return !(cx >= 0 && cy >= 0 && cx <= screen.width && cy <= screen.height);
-}
 var DEFAULT_AGENT_TIMING = {
   initialWaitMs: 3e3,
   deadlineMs: 5e3,
@@ -1756,17 +1746,24 @@ async function tapResolvedTarget(bridge, args) {
   }
   const deadline = Date.now() + timing.deadlineMs;
   let lastOffscreenAt = null;
-  const screen = bridge.plane === "cloud" ? null : await readScreen(bridge);
   while (Date.now() <= deadline || attempts === 0) {
     attempts++;
-    const resolved = await args.resolve();
-    const payload = resolved && typeof resolved.cx === "number" && typeof resolved.cy === "number" && screen && isOffscreen(resolved.cx, resolved.cy, screen) ? { ...resolved, offscreen: true, screen } : resolved;
+    const { screen, ...resolved } = await args.resolve() ?? {};
+    const checksScreen = bridge.plane !== "cloud" && typeof resolved.cx === "number";
+    if (checksScreen && screen === void 0) {
+      throw new Error(UNREPORTED_SCREEN_ERROR);
+    }
+    const unsized = checksScreen && !isScreenSize(screen);
+    const payload = checksScreen && typeof resolved.cx === "number" && typeof resolved.cy === "number" && isScreenSize(screen) && isOffscreen(resolved.cx, resolved.cy, screen) ? { ...resolved, offscreen: true, screen } : resolved;
     lastPayload = payload;
     if (payload?.error === "bridge-not-ready" || payload?.ambiguous || payload?.nthOutOfRange) {
       return { payload, result: null, attempts, failure: "special" };
     }
     if (payload && typeof payload.cx === "number" && typeof payload.cy === "number") {
-      if (payload.offscreen) {
+      if (unsized) {
+        lastResult = { hit: false, reason: "screen-not-laid-out" };
+        lastOffscreenAt = null;
+      } else if (payload.offscreen) {
         lastResult = {
           hit: false,
           reason: "offscreen",
@@ -1839,6 +1836,7 @@ function payloadFromResolved(resolved, match, extra = {}) {
   return {
     cx: resolved.x,
     cy: resolved.y,
+    screen: resolved.viewport,
     match: {
       nodeId: match.nodeId ?? null,
       id: match.testID ?? null,
@@ -1972,24 +1970,12 @@ async function resolveTextTapTarget(bridge, query, options = {}) {
   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]
+  const resolved = await resolveTargetCoords(bridge, {
+    mode: "node",
+    nodeId: 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 }
-  );
+  if (!resolved) return { matched: 0, total };
+  return payloadFromResolved(resolved, node, { total, idx });
 }
 var TAP_QUERY_FINDERS = {
   label: "findByLabel",
@@ -2021,7 +2007,8 @@ async function tapByQuery(bridge, query, opts = {}) {
           nodeId: tap.target.nodeId,
           testID: tap.target.testID,
           text: tap.target.text ?? tap.target.accessibilityLabel,
-          type: tap.target.type
+          type: tap.target.type,
+          viewport: tap.viewport
         },
         {
           nodeId: node.nodeId,

package/dist-lib/sdk.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.657 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.659 | (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);
@@ -1352,10 +1352,20 @@ function formatTimelineEvents(events) {
 }
 
 // cli/commands/inspect/resolve-target.ts
+function isScreenSize(value) {
+  if (value === null || typeof value !== "object") return false;
+  const width = Reflect.get(value, "width");
+  const height = Reflect.get(value, "height");
+  return typeof width === "number" && Number.isFinite(width) && width > 0 && typeof height === "number" && Number.isFinite(height) && height > 0;
+}
+function isOffscreen(x, y, screen) {
+  return !(x >= 0 && y >= 0 && x <= screen.width && y <= screen.height);
+}
+var UNREPORTED_SCREEN_ERROR = "this runtime does not report the screen size a targeted gesture needs; update it with `peach runtime install`, or use coordinates";
 async function resolveTargetCoords(bridge, target) {
   const result = await bridge.send({
     type: "resolve",
-    selector: target.mode === "testid" ? { testID: target.value } : { text: target.value }
+    selector: target.mode === "node" ? { nodeId: target.nodeId } : target.mode === "testid" ? { testID: target.value } : { text: target.value }
   });
   if (result === null) return null;
   if (typeof result !== "object") throw new Error("resolve returned an invalid result");
@@ -1363,6 +1373,9 @@ async function resolveTargetCoords(bridge, target) {
   const resolvedTarget = Reflect.get(result, "target");
   const semanticNodes = [match, resolvedTarget];
   const point = Reflect.get(result, "point");
+  const viewport = Reflect.get(result, "viewport");
+  const width = viewport !== null && typeof viewport === "object" ? Reflect.get(viewport, "width") : void 0;
+  const height = viewport !== null && typeof viewport === "object" ? Reflect.get(viewport, "height") : void 0;
   const x = point !== null && typeof point === "object" ? Reflect.get(point, "x") : void 0;
   const y = point !== null && typeof point === "object" ? Reflect.get(point, "y") : void 0;
   if (!isSimSemanticTree(semanticNodes) || typeof x !== "number" || !Number.isFinite(x) || typeof y !== "number" || !Number.isFinite(y)) {
@@ -1376,7 +1389,8 @@ async function resolveTargetCoords(bridge, target) {
     nodeId: semanticMatch.nodeId,
     testID: semanticMatch.testID ?? null,
     text: semanticMatch.text ?? (target.mode === "text" ? target.value : semanticMatch.label),
-    type: semanticMatch.type
+    type: semanticMatch.type,
+    ...typeof width === "number" && typeof height === "number" ? { viewport: { width, height } } : {}
   };
 }
 
@@ -1571,30 +1585,6 @@ async function waitForSootsimIdle({
 }
 
 // cli/commands/inspect/actions.ts
-function isScreenSize(value) {
-  if (value === null || typeof value !== "object") return false;
-  const width = Reflect.get(value, "width");
-  const height = Reflect.get(value, "height");
-  return typeof width === "number" && Number.isFinite(width) && width > 0 && typeof height === "number" && Number.isFinite(height) && height > 0;
-}
-function viewportFromCapture(value) {
-  if (value === null || typeof value !== "object") return void 0;
-  const tree = Reflect.get(value, "tree");
-  return tree !== null && typeof tree === "object" ? Reflect.get(tree, "viewport") : void 0;
-}
-async function readScreen(bridge) {
-  try {
-    const viewport = viewportFromCapture(
-      await bridge.send({ type: "capture", includeVisual: false })
-    );
-    return isScreenSize(viewport) ? { width: viewport.width, height: viewport.height } : null;
-  } catch {
-    return null;
-  }
-}
-function isOffscreen(cx, cy, screen) {
-  return !(cx >= 0 && cy >= 0 && cx <= screen.width && cy <= screen.height);
-}
 var DEFAULT_AGENT_TIMING = {
   initialWaitMs: 3e3,
   deadlineMs: 5e3,
@@ -1656,17 +1646,24 @@ async function tapResolvedTarget(bridge, args) {
   }
   const deadline = Date.now() + timing.deadlineMs;
   let lastOffscreenAt = null;
-  const screen = bridge.plane === "cloud" ? null : await readScreen(bridge);
   while (Date.now() <= deadline || attempts === 0) {
     attempts++;
-    const resolved = await args.resolve();
-    const payload = resolved && typeof resolved.cx === "number" && typeof resolved.cy === "number" && screen && isOffscreen(resolved.cx, resolved.cy, screen) ? { ...resolved, offscreen: true, screen } : resolved;
+    const { screen, ...resolved } = await args.resolve() ?? {};
+    const checksScreen = bridge.plane !== "cloud" && typeof resolved.cx === "number";
+    if (checksScreen && screen === void 0) {
+      throw new Error(UNREPORTED_SCREEN_ERROR);
+    }
+    const unsized = checksScreen && !isScreenSize(screen);
+    const payload = checksScreen && typeof resolved.cx === "number" && typeof resolved.cy === "number" && isScreenSize(screen) && isOffscreen(resolved.cx, resolved.cy, screen) ? { ...resolved, offscreen: true, screen } : resolved;
     lastPayload = payload;
     if (payload?.error === "bridge-not-ready" || payload?.ambiguous || payload?.nthOutOfRange) {
       return { payload, result: null, attempts, failure: "special" };
     }
     if (payload && typeof payload.cx === "number" && typeof payload.cy === "number") {
-      if (payload.offscreen) {
+      if (unsized) {
+        lastResult = { hit: false, reason: "screen-not-laid-out" };
+        lastOffscreenAt = null;
+      } else if (payload.offscreen) {
         lastResult = {
           hit: false,
           reason: "offscreen",
@@ -1739,6 +1736,7 @@ function payloadFromResolved(resolved, match, extra = {}) {
   return {
     cx: resolved.x,
     cy: resolved.y,
+    screen: resolved.viewport,
     match: {
       nodeId: match.nodeId ?? null,
       id: match.testID ?? null,
@@ -1872,24 +1870,12 @@ async function resolveTextTapTarget(bridge, query, options = {}) {
   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]
+  const resolved = await resolveTargetCoords(bridge, {
+    mode: "node",
+    nodeId: 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 }
-  );
+  if (!resolved) return { matched: 0, total };
+  return payloadFromResolved(resolved, node, { total, idx });
 }
 var TAP_QUERY_FINDERS = {
   label: "findByLabel",
@@ -1921,7 +1907,8 @@ async function tapByQuery(bridge, query, opts = {}) {
           nodeId: tap.target.nodeId,
           testID: tap.target.testID,
           text: tap.target.text ?? tap.target.accessibilityLabel,
-          type: tap.target.type
+          type: tap.target.type,
+          viewport: tap.viewport
         },
         {
           nodeId: node.nodeId,