peachsim 0.1.661 → 0.1.662

package/cli/commands/inspect/wait-ready.ts

@@ -65,8 +65,17 @@ export async function runWaitReadySubcommand(opts: {
       )
       rnxExit(1)
     }
+    // the app keeps mounting while it settles, so report the settled tree,
+    // not the first one that counted as ready.
+    const settled = await inspectWaitReady(bridge, 1_000)
+    if (!settled.ready) {
+      console.error(
+        `  ⚠ wait ready: the app stopped being ready while it settled — ${waitReadyReason(settled)} (nodes: ${settled.nodes}, targets: ${settled.targets}, errors: ${settled.errors})`,
+      )
+      rnxExit(1)
+    }
     console.log(
-      `  ready in ${elapsedMs + idle.elapsed}ms: ${nodes} nodes, ${targets} targets${liveFrameActive ? `, ${liveFrameChannels} live surfaces` : ''}`,
+      `  ready in ${elapsedMs + idle.elapsed}ms: ${settled.nodes} nodes, ${settled.targets} targets${settled.liveFrameActive ? `, ${settled.liveFrameChannels} live surfaces` : ''}`,
     )
     return
   }

package/dist-lib/agent-daemon-client.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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/agent-events.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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/agent-identity.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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/agent-sessions.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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/attached-projects.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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/auth/shared-session.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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/backend-origin.cjs

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

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

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/beta.ts
 var IS_BETA = true;

package/dist-lib/bridge-constants.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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/bridge-contract-input.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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/bridge-contract-input.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/bridge-contract.ts
 var SIM_LONG_PRESS_MAX_MS = 5e3;

package/dist-lib/bridge-contract.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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/bridge-contract.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/bridge-contract.ts
 var REFUSED_PERFORM_STEP_TYPES = [

package/dist-lib/capture-contract.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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/capture-contract.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/capture-contract.ts
 var RNX_SCREEN_CAPTURE_VERSION = 1;

package/dist-lib/cli-constants.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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/cloud-contract.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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/cloud-contract.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/cloud-contract.ts
 var RNX_CLOUD_MAX_ARTIFACT_BYTES = 20 * 1024 * 1024;

package/dist-lib/cloud-test-args.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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/cloud-test-args.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/cloud-test-args.ts
 var CLOUD_TEST_ARGS_MAX_COUNT = 32;

package/dist-lib/cloud.cjs

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

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

package/dist-lib/config.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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/detox/index.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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-handler.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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/jump-to-source-babel.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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/kotlin-host.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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;
@@ -65,6 +65,81 @@ function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// src/kotlin-view-models.ts
+var VIEW_MODEL = "androidx.lifecycle.ViewModel";
+var ANDROID_VIEW_MODEL = "androidx.lifecycle.AndroidViewModel";
+var APPLICATION = "android.app.Application";
+var HANDLE = "androidx.lifecycle.SavedStateHandle";
+function strings(value) {
+  if (!Array.isArray(value) || !value.every((item) => typeof item === "string"))
+    throw new Error("abi-classes printed an invalid list");
+  return value;
+}
+function readAbiClasses(output) {
+  return output.split("\n").filter((line) => line.startsWith("{")).map((line) => {
+    const row = JSON.parse(line);
+    if (!isRecord(row) || typeof row.name !== "string" || typeof row.kind !== "string" || typeof row.modality !== "string" || typeof row.inner !== "boolean" || typeof row.generic !== "boolean" || !Array.isArray(row.constructors))
+      throw new Error(`abi-classes printed an invalid class: ${line}`);
+    return {
+      name: row.name,
+      kind: row.kind,
+      modality: row.modality,
+      inner: row.inner,
+      generic: row.generic,
+      supers: strings(row.supers),
+      constructors: row.constructors.map((constructor) => {
+        if (!isRecord(constructor) || typeof constructor.defaulted !== "boolean")
+          throw new Error(`abi-classes printed an invalid constructor: ${line}`);
+        return {
+          parameters: strings(constructor.parameters),
+          defaulted: constructor.defaulted
+        };
+      })
+    };
+  });
+}
+function matching(row, signature) {
+  for (const { parameters } of row.constructors) {
+    if (parameters.join() === signature.join()) return "match";
+    if (parameters.length === signature.length && signature.every((type) => parameters.includes(type)))
+      return "misordered";
+  }
+  return null;
+}
+function signatureOf(row, android) {
+  const handled = matching(row, android ? [APPLICATION, HANDLE] : [HANDLE]);
+  if (handled === "misordered") return "misordered";
+  if (handled) return android ? "application-handle" : "handle";
+  if (android)
+    return row.constructors.some(({ parameters }) => parameters.join() === APPLICATION) ? "application" : null;
+  return row.constructors.some(
+    ({ parameters, defaulted }) => parameters.length === 0 || defaulted
+  ) ? "none" : null;
+}
+function viewModelClasses(rows) {
+  const byName = new Map(rows.map((row) => [row.name, row]));
+  const base = (row, seen) => {
+    for (const name of row.supers) {
+      if (name === VIEW_MODEL || name === ANDROID_VIEW_MODEL) return name;
+      const parent = byName.get(name);
+      if (parent && !seen.has(name)) {
+        seen.add(name);
+        const found = base(parent, seen);
+        if (found) return found;
+      }
+    }
+    return null;
+  };
+  return rows.flatMap((row) => {
+    if (row.kind !== "CLASS" || row.inner || row.generic) return [];
+    if (row.modality === "ABSTRACT" || row.modality === "SEALED") return [];
+    const root = base(row, /* @__PURE__ */ new Set());
+    if (!root) return [];
+    const signature = signatureOf(row, root === ANDROID_VIEW_MODEL);
+    return signature ? [{ name: row.name, signature }] : [];
+  });
+}
+
 // src/kotlin-host.ts
 var run = (0, import_node_util.promisify)(import_node_child_process.execFile);
 var KOTLIN_ARTIFACT_PREFIX = "/__peach/kotlin-artifact/";
@@ -236,7 +311,7 @@ function entrySource(ids) {
     ""
   ].join("\n");
 }
-var BUILD_FORMAT = 7;
+var BUILD_FORMAT = 8;
 var builds = /* @__PURE__ */ new Map();
 function buildsDir() {
   return import_node_path2.default.join(kotlinHome(), "builds");
@@ -283,45 +358,68 @@ function viewsSource(viewIds) {
     "}"
   ].join("\n");
 }
+function viewModelInitializer({ name, signature }) {
+  const call = (args) => `            addInitializer(${name}::class) { ${name}(${args}) }`;
+  switch (signature) {
+    case "none":
+      return call("");
+    case "handle":
+      return call("createSavedStateHandle()");
+    case "application":
+      return call("dev.peach.app.peachApplication()");
+    case "application-handle":
+      return call("dev.peach.app.peachApplication(), createSavedStateHandle()");
+    case "misordered":
+      return `            addInitializer(${name}::class) { throw UnsupportedOperationException(${JSON.stringify(
+        `Class ${name.split(".").pop()} must have parameters in the proper order: [class android.app.Application, class androidx.lifecycle.SavedStateHandle]`
+      )}) }`;
+  }
+}
 async function kotlinAppArtifact(app, moduleRoot, origin) {
   const toolchain = readToolchain(moduleRoot);
   const kotlinString = (value) => JSON.stringify(value).replaceAll("$", "\\$");
+  const appEntry = (viewModels) => [
+    "@file:OptIn(kotlin.js.ExperimentalJsExport::class)",
+    "",
+    "import androidx.lifecycle.createSavedStateHandle",
+    "",
+    "@JsExport",
+    "fun peachAppMount(density: Float, fontScale: Float, locale: String, backend: String, stencilBits: Int,",
+    "    regular: String, medium: String, bold: String, insets: String, night: Boolean,",
+    "    invalidate: (Boolean) -> Unit): String = dev.peach.app.peachStartApp(",
+    "    dev.peach.app.PeachAppSpec(",
+    `        android.content.ComponentName(${kotlinString(app.packageName)}, ${kotlinString(app.launcher.name)}),`,
+    `        android.content.ComponentName(${kotlinString(app.packageName)}, ${kotlinString(app.launcher.targetClass)}),`,
+    "        android.view.WindowTheme(",
+    `            ${app.window.edgeToEdgeEnforced}, 0x${app.window.statusBarColor.toString(16).padStart(8, "0")}.toInt(),`,
+    `            0x${app.window.navigationBarColor.toString(16).padStart(8, "0")}.toInt(),`,
+    `            ${app.window.statusBarContrastEnforced}, ${app.window.navigationBarContrastEnforced},`,
+    `            ${app.window.lightStatusBar}, ${app.window.lightNavigationBar},`,
+    "        ),",
+    `        { ${app.applicationClass ?? "android.app.Application"}() },`,
+    `        { ${app.launcher.targetClass}() },`,
+    `        ${app.handlesUiMode},`,
+    "        androidx.lifecycle.viewmodel.viewModelFactory {",
+    ...viewModels.map(viewModelInitializer),
+    "        },",
+    "    ),",
+    "    density, fontScale, locale, backend, stencilBits, regular, medium, bold, insets, night, invalidate,",
+    ")",
+    "",
+    "@JsExport",
+    `fun peachAppBack(): Boolean = dev.peach.app.peachAppBack(${app.predictiveBack})`,
+    "",
+    "@JsExport",
+    "fun peachAppTask(foreground: Boolean) = dev.peach.app.peachAppTask(foreground)",
+    "",
+    "@JsExport",
+    "fun peachAppNight(night: Boolean) = dev.peach.app.peachAppNight(night)",
+    ""
+  ].join("\n");
   const generated = {
     "PeachEntry.kt": entrySource([]),
     "PeachViews.kt": viewsSource([]),
-    "PeachAppEntry.kt": [
-      "@file:OptIn(kotlin.js.ExperimentalJsExport::class)",
-      "",
-      "@JsExport",
-      "fun peachAppMount(density: Float, fontScale: Float, locale: String, backend: String, stencilBits: Int,",
-      "    regular: String, medium: String, bold: String, insets: String, night: Boolean,",
-      "    invalidate: (Boolean) -> Unit): String = dev.peach.app.peachStartApp(",
-      "    dev.peach.app.PeachAppSpec(",
-      `        android.content.ComponentName(${kotlinString(app.packageName)}, ${kotlinString(app.launcher.name)}),`,
-      `        android.content.ComponentName(${kotlinString(app.packageName)}, ${kotlinString(app.launcher.targetClass)}),`,
-      "        android.view.WindowTheme(",
-      `            ${app.window.edgeToEdgeEnforced}, 0x${app.window.statusBarColor.toString(16).padStart(8, "0")}.toInt(),`,
-      `            0x${app.window.navigationBarColor.toString(16).padStart(8, "0")}.toInt(),`,
-      `            ${app.window.statusBarContrastEnforced}, ${app.window.navigationBarContrastEnforced},`,
-      `            ${app.window.lightStatusBar}, ${app.window.lightNavigationBar},`,
-      "        ),",
-      `        { ${app.applicationClass ?? "android.app.Application"}() },`,
-      `        { ${app.launcher.targetClass}() },`,
-      `        ${app.handlesUiMode},`,
-      "    ),",
-      "    density, fontScale, locale, backend, stencilBits, regular, medium, bold, insets, night, invalidate,",
-      ")",
-      "",
-      "@JsExport",
-      `fun peachAppBack(): Boolean = dev.peach.app.peachAppBack(${app.predictiveBack})`,
-      "",
-      "@JsExport",
-      "fun peachAppTask(foreground: Boolean) = dev.peach.app.peachAppTask(foreground)",
-      "",
-      "@JsExport",
-      "fun peachAppNight(night: Boolean) = dev.peach.app.peachAppNight(night)",
-      ""
-    ].join("\n")
+    "PeachAppEntry.kt": appEntry([])
   };
   const shims = [
     ...kotlinSources(import_node_path2.default.join(moduleRoot, "Sources")),
@@ -336,13 +434,27 @@ async function kotlinAppArtifact(app, moduleRoot, origin) {
       sources: app.sources,
       generated,
       shims,
-      usesCompose: true
+      usesCompose: true,
+      viewModels: {
+        file: "PeachAppEntry.kt",
+        render: appEntry,
+        script: import_node_path2.default.join(moduleRoot, "tools/abi-classes.main.kts")
+      }
     },
     origin
   );
 }
 async function compileKotlin(input, origin) {
-  const { root, toolchain, language, sources, generated, shims, usesCompose } = input;
+  const {
+    root,
+    toolchain,
+    language,
+    sources,
+    generated,
+    shims,
+    usesCompose,
+    viewModels
+  } = input;
   const digest = (0, import_node_crypto.createHash)("sha256");
   digest.update(JSON.stringify({ format: BUILD_FORMAT, toolchain, language }));
   for (const file of [...shims, ...sources])
@@ -388,30 +500,49 @@ async function compileKotlin(input, origin) {
       "-libraries",
       libraries.join(import_node_path2.default.delimiter)
     ];
+    const compileKlib = (outputDir) => run(
+      kotlinc,
+      [
+        ...common,
+        ...usesCompose ? [
+          `-Xplugin=${import_node_path2.default.resolve(import_node_path2.default.dirname(kotlinc), "../lib/compose-compiler-plugin.jar")}`
+        ] : [],
+        "-language-version",
+        language,
+        "-api-version",
+        language,
+        "-nowarn",
+        "-nopack",
+        "-ir-output-dir",
+        outputDir,
+        "-ir-output-name",
+        "app",
+        ...shims,
+        ...sources,
+        ...Object.keys(generated).map((name) => import_node_path2.default.join(generatedDir, name))
+      ],
+      { maxBuffer: 16 * 1024 * 1024 }
+    );
     try {
-      await run(
-        kotlinc,
-        [
-          ...common,
-          ...usesCompose ? [
-            `-Xplugin=${import_node_path2.default.resolve(import_node_path2.default.dirname(kotlinc), "../lib/compose-compiler-plugin.jar")}`
-          ] : [],
-          "-language-version",
-          language,
-          "-api-version",
-          language,
-          "-nowarn",
-          "-nopack",
-          "-ir-output-dir",
-          import_node_path2.default.join(work, "klib"),
-          "-ir-output-name",
-          "app",
-          ...shims,
-          ...sources,
-          ...Object.keys(generated).map((name) => import_node_path2.default.join(generatedDir, name))
-        ],
-        { maxBuffer: 16 * 1024 * 1024 }
-      );
+      if (viewModels && sources.some((file) => import_node_fs.default.readFileSync(file, "utf8").includes("ViewModel"))) {
+        await compileKlib(import_node_path2.default.join(work, "abi"));
+        const { stdout } = await run(
+          import_node_path2.default.join(import_node_path2.default.dirname(kotlinc), "kotlinc"),
+          [
+            "-cp",
+            import_node_path2.default.resolve(import_node_path2.default.dirname(kotlinc), "../lib/kotlin-compiler.jar"),
+            "-script",
+            viewModels.script,
+            import_node_path2.default.join(work, "abi")
+          ],
+          { maxBuffer: 64 * 1024 * 1024 }
+        );
+        import_node_fs.default.writeFileSync(
+          import_node_path2.default.join(generatedDir, viewModels.file),
+          viewModels.render(viewModelClasses(readAbiClasses(stdout)))
+        );
+      }
+      await compileKlib(import_node_path2.default.join(work, "klib"));
       await run(
         kotlinc,
         [

package/dist-lib/menu.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/public-brand.ts
 var name = "Peach";

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

@@ -1,4 +1,4 @@
-/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (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.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.662 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/is-record.ts
 function isRecord(value) {

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

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