peachsim 0.1.629 → 0.1.631

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

@@ -1,4 +1,4 @@
-/*! rnx v0.1.629 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.631 | (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.629 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.631 | (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.629 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.631 | (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.629 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.631 | (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.629 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.631 | (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.629 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.631 | (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;
@@ -433,6 +433,10 @@ function readCloudSession(environment = process.env) {
   return encoded?.trim() ? parseCloudSession(encoded) : null;
 }
 
+// cli/commands/detect.ts
+var import_json5 = __toESM(require("json5"), 1);
+var import_yaml = require("yaml");
+
 // cli/cloud-client.ts
 var DEFAULT_RNX_CLOUD_ORIGIN = rnxPublicBrand.origin;
 function failureSentence(text) {
@@ -2461,16 +2465,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;
@@ -2494,85 +2508,102 @@ 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 }
+  );
+}
+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 tapBest(bridge, query, opts = {}) {
   return tapResolvedTarget(bridge, {
@@ -2594,17 +2625,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
           }
         };
       }
@@ -4160,7 +4193,7 @@ var swiftHost;
 var loadSwiftHost = () => swiftHost ??= import("peachsim/vite-swift");
 var KOTLIN_ROUTE_PREFIX = "/__peach/kotlin";
 var kotlinHost;
-var loadKotlinHost = () => kotlinHost ??= import("peachsim/vite-kotlin");
+var loadKotlinHost = () => kotlinHost ??= import("peachsim/kotlin-host");
 function rnxPlugin(options = {}) {
   const prefix2 = options.prefix || "/__soot";
   return {
@@ -4243,34 +4276,17 @@ function rnxPlugin(options = {}) {
         const pathname = (req.url ?? "").split("?")[0];
         if (!pathname.startsWith(KOTLIN_ROUTE_PREFIX)) return next();
         loadKotlinHost().then(async (host) => {
-          if (host.serveKotlinArtifact(pathname, res)) return;
-          if (pathname !== "/__peach/kotlin-package") return next();
           if (!kotlinModuleRoot) {
-            const moduleRoot = import_path3.default.join(
-              import_path3.default.dirname(
-                (0, import_node_module.createRequire)(import_path3.default.join(server.config.root, "package.json")).resolve(
-                  "peachsim/package.json"
-                )
-              ),
-              "kotlin"
-            );
-            kotlinModuleRoot = moduleRoot;
-            server.watcher.add(import_path3.default.join(moduleRoot, "Sources"));
-          }
-          try {
-            const artifact = await host.kotlinArtifact(
-              server.config.root,
-              kotlinModuleRoot,
-              devOrigin()
-            );
-            res.setHeader("access-control-allow-origin", "*");
-            res.setHeader("content-type", "application/json");
-            res.end(JSON.stringify({ ...artifact, hmrPath }));
-          } catch (error) {
-            res.statusCode = 500;
-            res.setHeader("access-control-allow-origin", "*");
-            res.end(error instanceof Error ? error.message : String(error));
+            kotlinModuleRoot = host.peachKotlinModuleRoot(server.config.root);
+            server.watcher.add(import_path3.default.join(kotlinModuleRoot, "Sources"));
           }
+          const served = await host.serveKotlinRequest(pathname, res, {
+            root: server.config.root,
+            moduleRoot: kotlinModuleRoot,
+            origin: devOrigin(),
+            hmrPath
+          });
+          if (!served) next();
         }).catch(next);
       });
       server.watcher.on("change", (file) => {
@@ -4482,6 +4498,110 @@ var import_fs5 = __toESM(require("fs"), 1);
 var import_module2 = require("module");
 var import_node_crypto5 = require("node:crypto");
 var import_path4 = __toESM(require("path"), 1);
+
+// src/native-firebase-config.ts
+var import_node_fs5 = __toESM(require("node:fs"), 1);
+var import_node_module2 = require("node:module");
+var import_node_path6 = __toESM(require("node:path"), 1);
+
+// src/plist.ts
+var import_plist = __toESM(require("@expo/plist"), 1);
+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;
+}
+
+// src/native-firebase-config.ts
+function readNativeFirebaseConfig(projectRoot) {
+  const result = {};
+  if (![
+    "app.json",
+    "app.config.js",
+    "app.config.ts",
+    "app.config.cjs",
+    "app.config.mjs"
+  ].some((name2) => import_node_fs5.default.existsSync(import_node_path6.default.join(projectRoot, name2))))
+    return result;
+  const require2 = (0, import_node_module2.createRequire)(import_node_path6.default.join(projectRoot, "package.json"));
+  const configModule = require2("@expo/config");
+  if (!isRecord(configModule) || typeof configModule.getConfig !== "function") {
+    throw new Error("Expo native configuration is unavailable.");
+  }
+  const resolved = Reflect.apply(configModule.getConfig, configModule, [
+    projectRoot,
+    { skipSDKVersionRequirement: true }
+  ]);
+  const config = isRecord(resolved) && isRecord(resolved.exp) ? resolved.exp : {};
+  for (const platform of ["ios", "android"]) {
+    const native = config[platform];
+    if (!isRecord(native) || typeof native.googleServicesFile !== "string") continue;
+    try {
+      const source = import_node_fs5.default.readFileSync(
+        import_node_path6.default.resolve(projectRoot, native.googleServicesFile),
+        "utf8"
+      );
+      const parsed = platform === "ios" ? parsePlistSource(source) : JSON.parse(source);
+      if (!isRecord(parsed)) throw new Error("Invalid Google services file.");
+      if (platform === "ios") {
+        result[platform] = {
+          apiKey: parsed.API_KEY,
+          appId: parsed.GOOGLE_APP_ID,
+          projectId: parsed.PROJECT_ID,
+          databaseURL: parsed.DATABASE_URL,
+          gaTrackingId: parsed.TRACKING_ID,
+          storageBucket: parsed.STORAGE_BUCKET,
+          messagingSenderId: parsed.GCM_SENDER_ID,
+          clientId: parsed.CLIENT_ID,
+          androidClientID: parsed.ANDROID_CLIENT_ID,
+          deepLinkUrlScheme: parsed.REVERSED_CLIENT_ID
+        };
+      } else {
+        const project = isRecord(parsed.project_info) ? parsed.project_info : {};
+        const clients = Array.isArray(parsed.client) ? parsed.client : [];
+        const client = clients.find((value) => {
+          if (!isRecord(value) || !isRecord(value.client_info)) return false;
+          const android = value.client_info.android_client_info;
+          return isRecord(android) && android.package_name === native.package;
+        });
+        if (!isRecord(client) || !isRecord(client.client_info))
+          throw new Error("No Google services client matches the Android package.");
+        const apiKeys = Array.isArray(client.api_key) ? client.api_key : [];
+        const apiKey = apiKeys.find(
+          (value) => isRecord(value) && typeof value.current_key === "string"
+        );
+        const oauthClients = Array.isArray(client.oauth_client) ? client.oauth_client : [];
+        const oauth = oauthClients.find(
+          (value) => isRecord(value) && value.client_type === 3
+        );
+        result[platform] = {
+          apiKey: isRecord(apiKey) ? apiKey.current_key : void 0,
+          appId: client.client_info.mobilesdk_app_id,
+          projectId: project.project_id,
+          databaseURL: project.firebase_url,
+          storageBucket: project.storage_bucket,
+          messagingSenderId: project.project_number,
+          clientId: isRecord(oauth) ? oauth.client_id : void 0
+        };
+      }
+    } catch (error) {
+      result[platform] = { error: error instanceof Error ? error.message : String(error) };
+    }
+  }
+  return result;
+}
+
+// src/metro-plugin.ts
 var prefix = "/__soot";
 function readCallableMetroExport(moduleValue, label) {
   const callable = typeof moduleValue === "function" ? moduleValue : typeof moduleValue === "object" && moduleValue !== null ? Reflect.get(moduleValue, "default") : void 0;
@@ -4602,6 +4722,22 @@ function withRNX(config) {
           });
           return;
         }
+        if ((req.url || "").split("?")[0] === "/__peach-native-firebase-config") {
+          try {
+            res.setHeader("Content-Type", "application/json");
+            res.setHeader("Cache-Control", "no-store");
+            res.setHeader("Access-Control-Allow-Origin", "*");
+            res.end(JSON.stringify(readNativeFirebaseConfig(cfgProjectRoot)));
+          } catch (error) {
+            res.statusCode = 400;
+            res.end(
+              JSON.stringify({
+                error: error instanceof Error ? error.message : String(error)
+              })
+            );
+          }
+          return;
+        }
         const url = req.url || "";
         const pathname = url.split("?")[0];
         const runtimeRoot = resolveRuntimeRootForRequestHost(req.headers?.host);
@@ -4670,13 +4806,13 @@ function resolveMetroPort(server) {
 var metro_plugin_default = withRNX;
 
 // src/jump-to-source-babel.ts
-function normalizeSourcePath(path8) {
-  const queryStart = path8.indexOf("?");
-  const clean = queryStart >= 0 ? path8.slice(0, queryStart) : path8;
+function normalizeSourcePath(path9) {
+  const queryStart = path9.indexOf("?");
+  const clean = queryStart >= 0 ? path9.slice(0, queryStart) : path9;
   return clean.replace(/\\/g, "/");
 }
-function matchesPath(path8, matcher) {
-  return typeof matcher === "string" ? path8.includes(matcher) : matcher.test(path8);
+function matchesPath(path9, matcher) {
+  return typeof matcher === "string" ? path9.includes(matcher) : matcher.test(path9);
 }
 function shouldStampFile(filename, options) {
   const normalized = normalizeSourcePath(filename);
@@ -4709,11 +4845,11 @@ function sootsimJumpToSourceBabelPlugin(api, options = {}) {
   return {
     name: "sootsim-jump-to-source",
     visitor: {
-      JSXOpeningElement(path8, state) {
+      JSXOpeningElement(path9, state) {
         if (options.enabled === false) return;
         const filename = state.file?.opts?.filename;
         if (!filename || !shouldStampFile(filename, options)) return;
-        const node = path8.node;
+        const node = path9.node;
         const tagName = getJSXName(node.name);
         if (!tagName || tagName === "Fragment" || tagName.endsWith(".Fragment")) return;
         if (hasAttribute(node, attrName)) return;

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

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