peachsim 0.1.672 → 0.1.674

package/dist-lib/vite-swift.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.672 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.674 | (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;
@@ -46,7 +46,7 @@ __export(vite_plugin_swift_exports, {
 });
 module.exports = __toCommonJS(vite_plugin_swift_exports);
 var import_node_fs5 = __toESM(require("node:fs"), 1);
-var import_node_path6 = __toESM(require("node:path"), 1);
+var import_node_path7 = __toESM(require("node:path"), 1);
 
 // ../sootsim-swift/src/entryModule.ts
 function nativeExportLines(args, commonjs) {
@@ -351,7 +351,7 @@ var ONE_IMPLICIT_FLAGS = ', "-Xfrontend", "-import-module", "-Xfrontend", "One"'
 var MULTI_MANIFEST_VERSION = 6;
 function swiftArtifactHash(input, release, moduleRoot) {
   const hash = (0, import_node_crypto2.createHash)("sha256");
-  hash.update(`swift-compile/v6
+  hash.update(`swift-compile/v7
 ${release}
 `);
   if (input.oneModule) hash.update("one-module\n");
@@ -469,6 +469,17 @@ function swiftSourceAsIOS(source) {
   let copied = 0;
   for (const at of tokens) {
     const rest = conditioned.slice(at, at + 400);
+    const imported = /^import\s+CoreImage\.CIFilterBuiltins\b/.exec(rest);
+    if (imported) {
+      out += conditioned.slice(copied, at) + "import CoreImage".padEnd(imported[0].length);
+      copied = at + imported[0].length;
+      continue;
+    }
+    if (/^NSClassFromString\b/.test(rest)) {
+      out += conditioned.slice(copied, at) + "_peachClassFromString";
+      copied = at + "NSClassFromString".length;
+      continue;
+    }
     if (rest.startsWith("class")) {
       const modifiers = conditioned.slice(conditioned.lastIndexOf("\n", at - 1) + 1, at);
       if (DELEGATE_CLASS.test(rest) && !/\b(?:final|open)\b/.test(modifiers)) {
@@ -569,12 +580,15 @@ function swiftCodeScan(source) {
       if (top.parens === 0 && stack.length > 1) stack.pop();
       else top.parens--;
       i++;
-    } else if (source.startsWith("class", i) && !/[\w$]/.test(source[i - 1] ?? "") && !/[\w$]/.test(source[i + 5] ?? "")) {
-      tokens.push(i);
-      i += 5;
     } else {
-      if (char === "@") tokens.push(i);
-      i++;
+      const keyword = source.startsWith("class", i) ? "class" : source.startsWith("import", i) ? "import" : source.startsWith("NSClassFromString", i) ? "NSClassFromString" : null;
+      if (keyword && !/[\w$]/.test(source[i - 1] ?? "") && !/[\w$]/.test(source[i + keyword.length] ?? "")) {
+        tokens.push(i);
+        i += keyword.length;
+      } else {
+        if (char === "@") tokens.push(i);
+        i++;
+      }
     }
   }
   return { lineStarts: starts, tokens };
@@ -745,8 +759,18 @@ function compileSwiftProjectUnit(input, options) {
 // src/swift-host.ts
 var import_node_crypto3 = require("node:crypto");
 var import_node_fs4 = __toESM(require("node:fs"), 1);
-var import_node_os3 = __toESM(require("node:os"), 1);
-var import_node_path5 = __toESM(require("node:path"), 1);
+var import_node_os4 = __toESM(require("node:os"), 1);
+var import_node_path6 = __toESM(require("node:path"), 1);
+
+// ../../src/compile/swiftToolchain.ts
+var import_node_os2 = __toESM(require("node:os"), 1);
+var import_node_path3 = __toESM(require("node:path"), 1);
+function swiftToolchainBin(release) {
+  return process.platform === "darwin" ? import_node_path3.default.join(
+    import_node_os2.default.homedir(),
+    `Library/Developer/Toolchains/${release}.xctoolchain/usr/bin`
+  ) : import_node_path3.default.join(process.env.CONTRAST_SWIFT_TOOLCHAINS ?? "/opt/swift", release, "usr/bin");
+}
 
 // ../sootsim-swift/src/bundleAssets.ts
 var import_svgpath = __toESM(require("svgpath"), 1);
@@ -780,8 +804,8 @@ function pickImagesetFile(images) {
     scale: pick.scale === "2x" ? 2 : pick.scale === "3x" ? 3 : 1
   };
 }
-function flatScale(path6) {
-  const match = /@([23])x\.[^./]+$/.exec(path6);
+function flatScale(path7) {
+  const match = /@([23])x\.[^./]+$/.exec(path7);
   return match ? Number(match[1]) : 1;
 }
 function providesNamespace(text) {
@@ -808,13 +832,13 @@ function catalogEntryName(contentsPath, kind, readText) {
   }
   return segments.join("/");
 }
-function isFlatResourceImage(path6) {
-  return path6.split("/").includes("Resources") && RASTER_EXTENSIONS.has(extOf(path6));
+function isFlatResourceImage(path7) {
+  return path7.split("/").includes("Resources") && RASTER_EXTENSIONS.has(extOf(path7));
 }
 function enumerateBundleImages(paths, readText) {
   const table = [];
   const seen = /* @__PURE__ */ new Set();
-  const catalogs = paths.filter((path6) => baseOf(path6) === "Contents.json");
+  const catalogs = paths.filter((path7) => baseOf(path7) === "Contents.json");
   for (const contentsPath of catalogs) {
     const name = catalogEntryName(contentsPath, ".imageset", readText);
     if (name === null || seen.has(name)) continue;
@@ -835,12 +859,12 @@ function enumerateBundleImages(paths, readText) {
     seen.add(name);
     table.push({ name, file: `${dir}/${pick.filename}`, scale: pick.scale });
   }
-  for (const path6 of paths) {
-    if (!isFlatResourceImage(path6)) continue;
-    const name = baseOf(path6).slice(0, -extOf(path6).length);
+  for (const path7 of paths) {
+    if (!isFlatResourceImage(path7)) continue;
+    const name = baseOf(path7).slice(0, -extOf(path7).length);
     if (name === "" || seen.has(name)) continue;
     seen.add(name);
-    table.push({ name, file: path6, scale: flatScale(path6) });
+    table.push({ name, file: path7, scale: flatScale(path7) });
   }
   return table;
 }
@@ -869,7 +893,7 @@ function colorsetValue(color) {
 }
 function enumerateBundleColors(paths, readText) {
   const table = {};
-  for (const contentsPath of paths.filter((path6) => baseOf(path6) === "Contents.json")) {
+  for (const contentsPath of paths.filter((path7) => baseOf(path7) === "Contents.json")) {
     const name = catalogEntryName(contentsPath, ".colorset", readText);
     if (name === null || name in table) continue;
     let colors;
@@ -934,8 +958,8 @@ function axisExtremes(points) {
 function pathBounds(d) {
   const xs = [];
   const ys = [];
-  for (const path6 of d)
-    (0, import_svgpath.default)(path6).abs().unshort().unarc().iterate((segment, _index, x, y) => {
+  for (const path7 of d)
+    (0, import_svgpath.default)(path7).abs().unshort().unarc().iterate((segment, _index, x, y) => {
       const [command, ...args] = segment;
       if (command === "M" || command === "L") {
         xs.push(Number(args[0]));
@@ -962,7 +986,7 @@ function guide(svg, id, axis) {
 }
 function enumerateBundleSymbols(paths, readText) {
   const table = {};
-  for (const contentsPath of paths.filter((path6) => baseOf(path6) === "Contents.json")) {
+  for (const contentsPath of paths.filter((path7) => baseOf(path7) === "Contents.json")) {
     const name = catalogEntryName(contentsPath, ".symbolset", readText);
     if (name === null || name in table) continue;
     let symbols;
@@ -995,8 +1019,8 @@ function enumerateBundleSymbols(paths, readText) {
       viewBox: "0 0 24 24",
       advance,
       box: [12 - advance / 2, 12 - tall / 2, advance, tall],
-      layers: d.map((path6) => ({
-        d: (0, import_svgpath.default)(path6).abs().scale(scale).translate(translateX, translateY).round(3).toString()
+      layers: d.map((path7) => ({
+        d: (0, import_svgpath.default)(path7).abs().scale(scale).translate(translateX, translateY).round(3).toString()
       }))
     };
   }
@@ -1006,7 +1030,7 @@ function enumerateBundleJson(paths) {
   const found = [];
   const seen = /* @__PURE__ */ new Set();
   const ordered = [...paths].filter(
-    (path6) => path6.split("/").includes("Resources") && path6.split("/").every((segment) => segment !== "" && segment !== "..") && (extOf(path6) === ".json" || extOf(path6) === ".xcstrings")
+    (path7) => path7.split("/").includes("Resources") && path7.split("/").every((segment) => segment !== "" && segment !== "..") && (extOf(path7) === ".json" || extOf(path7) === ".xcstrings")
   ).sort((a, b) => {
     const aDepth = a.split("/").length;
     const bDepth = b.split("/").length;
@@ -1023,22 +1047,22 @@ function enumerateBundleJson(paths) {
 
 // src/auth/shared-session.ts
 var import_node_fs3 = require("node:fs");
-var import_node_path4 = require("node:path");
+var import_node_path5 = require("node:path");
 
 // src/home-paths.ts
-var import_node_os2 = require("node:os");
-var import_node_path3 = __toESM(require("node:path"), 1);
+var import_node_os3 = require("node:os");
+var import_node_path4 = __toESM(require("node:path"), 1);
 var PEACH_HOME_ENV = "PEACH_HOME";
 function rnxHomeDir() {
   const override = process.env[PEACH_HOME_ENV];
-  if (override && override.length > 0) return import_node_path3.default.resolve(override);
-  return import_node_path3.default.join((0, import_node_os2.homedir)(), ".peach");
+  if (override && override.length > 0) return import_node_path4.default.resolve(override);
+  return import_node_path4.default.join((0, import_node_os3.homedir)(), ".peach");
 }
 function electronDir() {
-  return import_node_path3.default.join(rnxHomeDir(), "electron");
+  return import_node_path4.default.join(rnxHomeDir(), "electron");
 }
 function electronUserDataDir() {
-  return import_node_path3.default.join(electronDir(), "userData");
+  return import_node_path4.default.join(electronDir(), "userData");
 }
 var DAEMON_LOCKFILE_MAX_BYTES = 16 * 1024;
 
@@ -1055,14 +1079,14 @@ var DEFAULT_ORIGIN = "https://contrast.dev";
 function getBaseDir() {
   const explicit = process.env[SESSION_FILE_ENV];
   if (explicit?.trim()) {
-    return (0, import_node_path4.dirname)((0, import_node_path4.resolve)(explicit));
+    return (0, import_node_path5.dirname)((0, import_node_path5.resolve)(explicit));
   }
   return electronUserDataDir();
 }
 function getSharedDesktopAuthFilePath() {
   const explicit = process.env[SESSION_FILE_ENV];
-  if (explicit?.trim()) return (0, import_node_path4.resolve)(explicit);
-  return (0, import_node_path4.join)(getBaseDir(), "desktop-auth.json");
+  if (explicit?.trim()) return (0, import_node_path5.resolve)(explicit);
+  return (0, import_node_path5.join)(getBaseDir(), "desktop-auth.json");
 }
 function normalizeUser(input) {
   if (!input || typeof input !== "object") return null;
@@ -1372,17 +1396,17 @@ var SKIP_SOURCE_DIRS = /* @__PURE__ */ new Set([
 var NATIVE_DESCRIPTOR = ".one-native-source.json";
 var NATIVE_GLUE = ".one-native-source.swift.txt";
 function swiftPackageId(packagePath) {
-  return import_node_path5.default.basename(packagePath).replace(/[^A-Za-z0-9_]/g, "_").replace(/^(\d)/, "_$1");
+  return import_node_path6.default.basename(packagePath).replace(/[^A-Za-z0-9_]/g, "_").replace(/^(\d)/, "_$1");
 }
 function nativeSourceDescriptor(packagePath) {
   packagePath = import_node_fs4.default.realpathSync(packagePath);
-  const file = import_node_path5.default.join(packagePath, NATIVE_DESCRIPTOR);
+  const file = import_node_path6.default.join(packagePath, NATIVE_DESCRIPTOR);
   if (!import_node_fs4.default.existsSync(file)) return null;
   const value = JSON.parse(
     readPackageFile(packagePath, file, MAX_SWIFT_COMPILE_SOURCE_BYTES).toString("utf8")
   );
   const invalid = () => new Error(`${file}: invalid One native source descriptor; run one typegen`);
-  if (!value || typeof value !== "object" || Reflect.get(value, "generatedBy") !== "one typegen" || !import_node_fs4.default.existsSync(import_node_path5.default.join(packagePath, NATIVE_GLUE))) {
+  if (!value || typeof value !== "object" || Reflect.get(value, "generatedBy") !== "one typegen" || !import_node_fs4.default.existsSync(import_node_path6.default.join(packagePath, NATIVE_GLUE))) {
     throw invalid();
   }
   if (!isSwiftNativeModules(value) || value.packageId !== swiftPackageId(packagePath)) {
@@ -1392,7 +1416,7 @@ function nativeSourceDescriptor(packagePath) {
 }
 function nativeSourceFiles(packagePath) {
   packagePath = import_node_fs4.default.realpathSync(packagePath);
-  return [NATIVE_DESCRIPTOR, NATIVE_GLUE].map((name) => import_node_path5.default.join(packagePath, name)).filter((file) => import_node_fs4.default.existsSync(file));
+  return [NATIVE_DESCRIPTOR, NATIVE_GLUE].map((name) => import_node_path6.default.join(packagePath, name)).filter((file) => import_node_fs4.default.existsSync(file));
 }
 var projects = /* @__PURE__ */ new Map();
 function projectFor(packagePath, hosted) {
@@ -1423,15 +1447,15 @@ function packageFiles(root) {
     for (const entry of import_node_fs4.default.readdirSync(dir, { withFileTypes: true }).sort((left, right) => left.name.localeCompare(right.name))) {
       if (entry.name.startsWith(".") && entry.name !== NATIVE_DESCRIPTOR && entry.name !== NATIVE_GLUE || SKIP_SOURCE_DIRS.has(entry.name))
         continue;
-      const full = import_node_path5.default.join(dir, entry.name);
+      const full = import_node_path6.default.join(dir, entry.name);
       if (entry.isSymbolicLink()) throw new Error(`swift input is a symlink: ${full}`);
       const real = import_node_fs4.default.realpathSync(full);
-      const relative = import_node_path5.default.relative(canonicalRoot, real);
-      if (relative.startsWith(`..${import_node_path5.default.sep}`) || relative === ".." || import_node_path5.default.isAbsolute(relative)) {
+      const relative = import_node_path6.default.relative(canonicalRoot, real);
+      if (relative.startsWith(`..${import_node_path6.default.sep}`) || relative === ".." || import_node_path6.default.isAbsolute(relative)) {
         throw new Error(`swift input escapes the selected package: ${full}`);
       }
       if (entry.isDirectory()) {
-        if (import_node_fs4.default.existsSync(import_node_path5.default.join(full, "Package.swift"))) continue;
+        if (import_node_fs4.default.existsSync(import_node_path6.default.join(full, "Package.swift"))) continue;
         walk(full);
       } else if (entry.isFile()) {
         found.push(full);
@@ -1444,16 +1468,16 @@ function packageFiles(root) {
 }
 function readPackageFile(root, file, maxBytes) {
   const canonicalRoot = import_node_fs4.default.realpathSync(root);
-  const relative = import_node_path5.default.relative(canonicalRoot, import_node_fs4.default.realpathSync(file));
-  if (relative === ".." || relative.startsWith(`..${import_node_path5.default.sep}`) || import_node_path5.default.isAbsolute(relative)) {
+  const relative = import_node_path6.default.relative(canonicalRoot, import_node_fs4.default.realpathSync(file));
+  if (relative === ".." || relative.startsWith(`..${import_node_path6.default.sep}`) || import_node_path6.default.isAbsolute(relative)) {
     throw new Error(`swift input escapes the selected package: ${file}`);
   }
-  let ancestor = import_node_path5.default.resolve(file);
+  let ancestor = import_node_path6.default.resolve(file);
   while (ancestor !== canonicalRoot) {
     if (import_node_fs4.default.lstatSync(ancestor).isSymbolicLink()) {
       throw new Error(`swift input is a symlink: ${ancestor}`);
     }
-    const parent = import_node_path5.default.dirname(ancestor);
+    const parent = import_node_path6.default.dirname(ancestor);
     if (parent === ancestor)
       throw new Error(`swift input escapes the selected package: ${file}`);
     ancestor = parent;
@@ -1506,7 +1530,7 @@ var RESOURCE_CONTENT_TYPES = {
 function buildSwiftResourceTable(project, baseUrl) {
   const absolute = resourceCandidateFiles(project.packagePath);
   const relative = absolute.map(
-    (file) => import_node_path5.default.relative(project.packagePath, file).split(import_node_path5.default.sep).join(import_node_path5.default.posix.sep)
+    (file) => import_node_path6.default.relative(project.packagePath, file).split(import_node_path6.default.sep).join(import_node_path6.default.posix.sep)
   );
   const byRelative = new Map(absolute.map((file, index) => [relative[index], file]));
   const readContents = (candidate) => {
@@ -1540,10 +1564,10 @@ function buildSwiftResourceTable(project, baseUrl) {
     );
     imageBytes += bytes.length;
     const hash = (0, import_node_crypto3.createHash)("sha256").update(bytes).digest("hex").slice(0, 16);
-    const ext = import_node_path5.default.posix.extname(file).toLowerCase();
+    const ext = import_node_path6.default.posix.extname(file).toLowerCase();
     table[name] = { uri: `${baseUrl}${RESOURCE_PATH}${hash}${ext}`, scale };
     images[name] = {
-      file: import_node_path5.default.posix.basename(file),
+      file: import_node_path6.default.posix.basename(file),
       data: bytes.toString("base64")
     };
     watched.push(file);
@@ -1572,14 +1596,14 @@ var BUNDLE_MAX_TOTAL_BYTES = MAX_SWIFT_COMPILE_RESOURCE_TOTAL_BYTES;
 function buildSwiftBundleFiles(packagePath) {
   packagePath = import_node_fs4.default.realpathSync(packagePath);
   const relative = resourceCandidateFiles(packagePath).map(
-    (file) => import_node_path5.default.relative(packagePath, file).split(import_node_path5.default.sep).join(import_node_path5.default.posix.sep)
+    (file) => import_node_path6.default.relative(packagePath, file).split(import_node_path6.default.sep).join(import_node_path6.default.posix.sep)
   );
   const files = {};
   const watched = [];
   let total = 0;
   for (const { base, file } of enumerateBundleJson(relative)) {
     watched.push(file);
-    const disk = import_node_path5.default.join(packagePath, ...file.split("/"));
+    const disk = import_node_path6.default.join(packagePath, ...file.split("/"));
     if (Object.keys(files).length >= BUNDLE_MAX_FILES || total + import_node_fs4.default.statSync(disk).size > BUNDLE_MAX_TOTAL_BYTES) {
       throw new Error(
         `swift bundle pack exceeds ${BUNDLE_MAX_FILES} files / ${BUNDLE_MAX_TOTAL_BYTES} bytes`
@@ -1600,7 +1624,7 @@ function linkedModuleRoots(packagePath) {
   try {
     manifest = readPackageFile(
       packagePath,
-      import_node_path5.default.join(packagePath, "Package.swift"),
+      import_node_path6.default.join(packagePath, "Package.swift"),
       MAX_SWIFT_COMPILE_SOURCE_BYTES
     ).toString("utf8");
   } catch {
@@ -1609,8 +1633,8 @@ function linkedModuleRoots(packagePath) {
   const roots = /* @__PURE__ */ new Set();
   const dependency = /\.package\(\s*path:\s*"([^"]+)"\s*\)/g;
   for (const match of manifest.replace(/^\s*\/\/.*$/gm, "").matchAll(dependency)) {
-    const root = import_node_path5.default.resolve(packagePath, match[1]);
-    if (import_node_fs4.default.existsSync(import_node_path5.default.join(root, "Package.swift"))) roots.add(root);
+    const root = import_node_path6.default.resolve(packagePath, match[1]);
+    if (import_node_fs4.default.existsSync(import_node_path6.default.join(root, "Package.swift"))) roots.add(root);
   }
   return [...roots].sort();
 }
@@ -1619,25 +1643,25 @@ function sourceStamp(packagePath, moduleRootOverride, hosted = false) {
   hash.update(packagePath);
   const projectInputs = new Set(packageFiles(packagePath));
   for (const file of [...projectInputs].sort()) {
-    hash.update(import_node_path5.default.relative(packagePath, file));
+    hash.update(import_node_path6.default.relative(packagePath, file));
     const stat = import_node_fs4.default.statSync(file);
     hash.update(`${stat.mtimeMs}/${stat.ctimeMs}/${stat.size}`);
   }
   const moduleRoot = hosted ? void 0 : moduleRootOverride ?? linkedModuleRoots(packagePath).find(
-    (root) => import_node_fs4.default.existsSync(import_node_path5.default.join(root, "toolchain.json"))
+    (root) => import_node_fs4.default.existsSync(import_node_path6.default.join(root, "toolchain.json"))
   );
   if (moduleRoot) {
     hash.update(moduleRoot);
     for (const relative of swiftModuleInputFiles(moduleRoot)) {
       hash.update(relative);
-      hash.update(String(import_node_fs4.default.statSync(import_node_path5.default.join(moduleRoot, relative)).mtimeMs));
+      hash.update(String(import_node_fs4.default.statSync(import_node_path6.default.join(moduleRoot, relative)).mtimeMs));
     }
   }
   return hash.digest("hex").slice(0, 16);
 }
 function entryRootId(packagePath, file) {
-  const relative = import_node_path5.default.relative(packagePath, file).split(import_node_path5.default.sep).join(import_node_path5.default.posix.sep);
-  return `${import_node_path5.default.basename(packagePath)}${import_node_path5.default.posix.sep}${relative}`;
+  const relative = import_node_path6.default.relative(packagePath, file).split(import_node_path6.default.sep).join(import_node_path6.default.posix.sep);
+  return `${import_node_path6.default.basename(packagePath)}${import_node_path6.default.posix.sep}${relative}`;
 }
 function icuUrl(origin, artifact) {
   return "url" in artifact.icu ? artifact.icu.url : `${origin}${ICU_PATH}${artifact.icu.sha256}`;
@@ -1652,7 +1676,7 @@ function packageSources(packagePath) {
     throw new Error("swift source byte cap exceeded");
   const files = {};
   for (const file of sources) {
-    const relative = import_node_path5.default.relative(packagePath, file).split(import_node_path5.default.sep).join(import_node_path5.default.posix.sep);
+    const relative = import_node_path6.default.relative(packagePath, file).split(import_node_path6.default.sep).join(import_node_path6.default.posix.sep);
     files[relative] = readPackageFile(
       packagePath,
       file,
@@ -1672,7 +1696,7 @@ function packageSnapshot(project) {
     ...native ? {
       glue: readPackageFile(
         project.packagePath,
-        import_node_path5.default.join(project.packagePath, NATIVE_GLUE),
+        import_node_path6.default.join(project.packagePath, NATIVE_GLUE),
         MAX_SWIFT_COMPILE_SOURCE_BYTES
       ).toString("utf8")
     } : {}
@@ -1710,7 +1734,7 @@ async function compile(packagePath, entry, stamp, moduleRootOverride, hosted, sn
       package: content
     };
   const moduleRoot = moduleRootOverride ?? linkedModuleRoots(packagePath).find(
-    (root) => import_node_fs4.default.existsSync(import_node_path5.default.join(root, "toolchain.json"))
+    (root) => import_node_fs4.default.existsSync(import_node_path6.default.join(root, "toolchain.json"))
   );
   if (!moduleRoot)
     return {
@@ -1729,10 +1753,10 @@ async function compile(packagePath, entry, stamp, moduleRootOverride, hosted, sn
     // server and a capture, or two checkouts) build each other's sources. so
     // each app and module checkout gets its own root, which keeps the same
     // app's incremental build across restarts.
-    buildRoot: process.env.CONTRAST_SWIFT_BUILD_ROOT ?? import_node_path5.default.join(
-      import_node_os3.default.tmpdir(),
+    buildRoot: process.env.CONTRAST_SWIFT_BUILD_ROOT ?? import_node_path6.default.join(
+      import_node_os4.default.tmpdir(),
       "contrast-swift-build",
-      (0, import_node_crypto3.createHash)("sha256").update(`${moduleRoot}\0${import_node_path5.default.resolve(packagePath)}`).digest("hex").slice(0, 16)
+      (0, import_node_crypto3.createHash)("sha256").update(`${moduleRoot}\0${import_node_path6.default.resolve(packagePath)}`).digest("hex").slice(0, 16)
     ),
     moduleRoot,
     ...toolchain
@@ -1740,24 +1764,21 @@ async function compile(packagePath, entry, stamp, moduleRootOverride, hosted, sn
   return { ...artifact, stamp, package: content };
 }
 function localSwiftToolchain(moduleRoot) {
-  const manifest = import_node_path5.default.join(moduleRoot, "toolchain.json");
+  const manifest = import_node_path6.default.join(moduleRoot, "toolchain.json");
   if (!import_node_fs4.default.existsSync(manifest)) return null;
   const toolchain = JSON.parse(import_node_fs4.default.readFileSync(manifest, "utf8"));
   const release = toolchain && typeof toolchain === "object" ? Reflect.get(toolchain, "release") : void 0;
   if (typeof release !== "string") {
     throw new Error(`swift toolchain manifest at ${moduleRoot} has no release`);
   }
-  const toolchainBin = import_node_path5.default.join(
-    import_node_os3.default.homedir(),
-    `Library/Developer/Toolchains/${release}.xctoolchain/usr/bin`
-  );
-  return import_node_fs4.default.existsSync(import_node_path5.default.join(toolchainBin, "swift")) ? { release, toolchainBin } : null;
+  const toolchainBin = swiftToolchainBin(release);
+  return import_node_fs4.default.existsSync(import_node_path6.default.join(toolchainBin, "swift")) ? { release, toolchainBin } : null;
 }
 async function compileRemote(packagePath, entry, snapshot, hosted) {
   const auth = hosted ? null : resolveCliAuth();
   if (!hosted && (!auth || auth.kind === "github")) {
     throw new Error(
-      `compiling ${import_node_path5.default.basename(packagePath)} for Peach needs \`peach login\` or PEACH_API_KEY: this peachsim has no local SwiftUI module, so Contrast compiles it`
+      `compiling ${import_node_path6.default.basename(packagePath)} for Peach needs \`peach login\` or PEACH_API_KEY: this peachsim has no local SwiftUI module, so Contrast compiles it`
     );
   }
   const origin = hosted?.origin ?? resolveContrastBackendOrigin(auth?.kind === "session" ? auth.origin : null);
@@ -1787,7 +1808,7 @@ async function compileRemote(packagePath, entry, snapshot, hosted) {
   );
   if (descriptor && address.native?.hash !== descriptor.hash) {
     throw new Error(
-      `${import_node_path5.default.basename(packagePath)}: Contrast compiled native contract ${address.native?.hash ?? "none"} but one typegen wrote ${descriptor.hash}; the app's One and the compile host's differ, or the compile host is older than this peachsim`
+      `${import_node_path6.default.basename(packagePath)}: Contrast compiled native contract ${address.native?.hash ?? "none"} but one typegen wrote ${descriptor.hash}; the app's One and the compile host's differ, or the compile host is older than this peachsim`
     );
   }
   const response = await fetch(address.url, { signal });
@@ -1862,11 +1883,11 @@ function artifactFor(project, entry, moduleRoot) {
 function swiftPackageWatchFiles(packagePath, moduleRoot) {
   packagePath = import_node_fs4.default.realpathSync(packagePath);
   return [
-    import_node_path5.default.join(packagePath, "Package.swift"),
+    import_node_path6.default.join(packagePath, "Package.swift"),
     ...sourceFiles(packagePath),
     ...nativeSourceFiles(packagePath),
     ...resourceCandidateFiles(packagePath),
-    ...moduleRoot ? swiftModuleInputFiles(moduleRoot).map((file) => import_node_path5.default.join(moduleRoot, file)) : []
+    ...moduleRoot ? swiftModuleInputFiles(moduleRoot).map((file) => import_node_path6.default.join(moduleRoot, file)) : []
   ];
 }
 async function swiftPackageMetadata(packagePath, packageName, moduleRoot, origin, hosted) {
@@ -1883,7 +1904,7 @@ async function swiftPackageMetadata(packagePath, packageName, moduleRoot, origin
     );
   }
   const project = projectFor(packagePath, hosted);
-  const entry = mains.length === 1 ? import_node_path5.default.relative(packagePath, mains[0]).split(import_node_path5.default.sep).join(import_node_path5.default.posix.sep) : Object.entries(native?.files ?? {}).find(
+  const entry = mains.length === 1 ? import_node_path6.default.relative(packagePath, mains[0]).split(import_node_path6.default.sep).join(import_node_path6.default.posix.sep) : Object.entries(native?.files ?? {}).find(
     ([_file, names]) => names.length > 0
   )?.[0];
   if (!entry) throw new Error(`swift package ${packageName} has no native module source`);
@@ -1972,12 +1993,12 @@ function artifactUrl(project, artifact) {
   return `${serverOrigin()}${ARTIFACT_PATH2}${artifact.hash}.wasm`;
 }
 function packageFor(file) {
-  let dir = import_node_path6.default.dirname(file);
+  let dir = import_node_path7.default.dirname(file);
   const stop = devServer?.config.root;
   for (; ; ) {
-    if (import_node_fs5.default.existsSync(import_node_path6.default.join(dir, "Package.swift"))) return dir;
-    if (stop !== void 0 && dir === stop || import_node_path6.default.dirname(dir) === dir) break;
-    dir = import_node_path6.default.dirname(dir);
+    if (import_node_fs5.default.existsSync(import_node_path7.default.join(dir, "Package.swift"))) return dir;
+    if (stop !== void 0 && dir === stop || import_node_path7.default.dirname(dir) === dir) break;
+    dir = import_node_path7.default.dirname(dir);
   }
   throw new Error(
     `no Package.swift above ${file}${stop === void 0 ? "" : ` (searched up to ${stop})`}; a .swift import needs a swiftpm package like the one in packages/sootsim-swift/example`
@@ -1998,7 +2019,7 @@ function swiftPlugin(options = {}) {
       if (!resolved) throw new Error(`cannot resolve swift source ${source}`);
       let id = resolved.id;
       if (importer && (source.startsWith("./") || source.startsWith("../"))) {
-        const raw2 = import_node_path6.default.resolve(import_node_path6.default.dirname(importer.split("?")[0] ?? importer), source);
+        const raw2 = import_node_path7.default.resolve(import_node_path7.default.dirname(importer.split("?")[0] ?? importer), source);
         try {
           if (import_node_fs5.default.realpathSync(raw2) === import_node_fs5.default.realpathSync(resolved.id)) id = raw2;
         } catch {
@@ -2012,19 +2033,19 @@ function swiftPlugin(options = {}) {
       if (!import_node_fs5.default.existsSync(file)) throw new Error(`swift source ${file} no longer exists`);
       const packagePath = options.packagePath ?? packageFor(file);
       const project = projectFor(packagePath);
-      const entry = import_node_path6.default.relative(packagePath, file).split(import_node_path6.default.sep).join(import_node_path6.default.posix.sep);
+      const entry = import_node_path7.default.relative(packagePath, file).split(import_node_path7.default.sep).join(import_node_path7.default.posix.sep);
       for (const source of [
         ...sourceFiles(packagePath),
         ...nativeSourceFiles(packagePath)
       ])
         this.addWatchFile(source);
-      this.addWatchFile(import_node_path6.default.join(packagePath, "Package.swift"));
+      this.addWatchFile(import_node_path7.default.join(packagePath, "Package.swift"));
       const moduleRoot = linkedModuleRoots(packagePath).find(
-        (root) => import_node_fs5.default.existsSync(import_node_path6.default.join(root, "toolchain.json"))
+        (root) => import_node_fs5.default.existsSync(import_node_path7.default.join(root, "toolchain.json"))
       );
       if (moduleRoot)
         for (const relative of swiftModuleInputFiles(moduleRoot))
-          this.addWatchFile(import_node_path6.default.join(moduleRoot, relative));
+          this.addWatchFile(import_node_path7.default.join(moduleRoot, relative));
       let artifact;
       try {
         artifact = await artifactFor(project, entry);
@@ -2043,7 +2064,7 @@ function swiftPlugin(options = {}) {
         ...artifact.package.resources.watched,
         ...artifact.package.bundleFiles.watched
       ])
-        this.addWatchFile(import_node_path6.default.join(packagePath, ...watched.split(import_node_path6.default.posix.sep)));
+        this.addWatchFile(import_node_path7.default.join(packagePath, ...watched.split(import_node_path7.default.posix.sep)));
       const colors = artifact.package.resources.colors;
       const symbols = artifact.package.resources.symbols;
       const bundleFiles = artifact.package.bundleFiles.files;

package/dist-lib/vite.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.672 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.674 | (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/kotlin/fixtures/kotlin-app-variants/Icons.kt

@@ -0,0 +1,59 @@
+package dev.contrast.kotlinapp
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Favorite
+import androidx.compose.material.icons.filled.FavoriteBorder
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material.icons.rounded.Home
+import androidx.compose.material.icons.sharp.Delete
+import androidx.compose.material.icons.twotone.Star
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+
+// material-icons-core vectors in each theme, at the default and a large
+// size and tinted, and an IconButton that swaps its icon
+@Composable
+fun IconsScreen() {
+    var liked by remember { mutableStateOf(false) }
+    Column(
+        Modifier.fillMaxSize().background(Color(0xFFE8EEF8)).safeDrawingPadding().padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Text("Icons: liked $liked")
+        Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
+            Icon(Icons.Filled.Add, contentDescription = "Add")
+            Icon(Icons.Outlined.Settings, contentDescription = "Settings")
+            Icon(Icons.Rounded.Home, contentDescription = "Home")
+            Icon(Icons.Sharp.Delete, contentDescription = "Delete")
+            Icon(Icons.TwoTone.Star, contentDescription = "Star")
+        }
+        Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
+            Icon(Icons.Filled.Favorite, contentDescription = null, Modifier.size(64.dp), tint = Color(0xFFE91E63))
+            Icon(Icons.Outlined.Settings, contentDescription = null, Modifier.size(96.dp), tint = Color(0xFF6750A4))
+        }
+        IconButton(onClick = { liked = !liked }) {
+            Icon(
+                if (liked) Icons.Filled.Favorite else Icons.Filled.FavoriteBorder,
+                contentDescription = "Like",
+            )
+        }
+    }
+}

package/kotlin/toolchain.json

@@ -281,6 +281,11 @@
       "name": "navigation-compose-wasm-js-2.10.0-beta01.klib",
       "url": "https://repo1.maven.org/maven2/org/jetbrains/androidx/navigation/navigation-compose-wasm-js/2.10.0-beta01/navigation-compose-wasm-js-2.10.0-beta01.klib",
       "sha256": "35e147105bfc48ef083c56b5108436234f8d8ab4747bce855e48a30243b15cd6"
+    },
+    {
+      "name": "material-icons-core-wasm-js-1.7.3.klib",
+      "url": "https://repo1.maven.org/maven2/org/jetbrains/compose/material/material-icons-core-wasm-js/1.7.3/material-icons-core-wasm-js-1.7.3.klib",
+      "sha256": "b49e6d71be88de8ff909b7b741f21b744c7d24d7c73e2949e75dfbf581561020"
     }
   ],
   "compose": {
@@ -293,7 +298,8 @@
       "materialRipple": "1.13.0-alpha02",
       "material3Ripple": "1.5.0-alpha27",
       "navigation": "2.10.0",
-      "activity": "1.13.0"
+      "activity": "1.13.0",
+      "materialIcons": "1.7.6"
     },
     "mappingSources": [
       "https://repo1.maven.org/maven2/org/jetbrains/compose/ui/ui-android/1.13.0-alpha01/ui-android-1.13.0-alpha01.module",
@@ -313,7 +319,8 @@
       "https://repo1.maven.org/maven2/org/jetbrains/compose/material/material-ripple-android/1.13.0-alpha01/material-ripple-android-1.13.0-alpha01.module",
       "https://repo1.maven.org/maven2/org/jetbrains/compose/animation/animation-core-android/1.13.0-alpha01/animation-core-android-1.13.0-alpha01.module",
       "https://repo1.maven.org/maven2/org/jetbrains/compose/material3/material3-ripple-android/1.13.0-alpha01/material3-ripple-android-1.13.0-alpha01.module",
-      "https://repo1.maven.org/maven2/org/jetbrains/androidx/navigation/navigation-compose-android/2.10.0-beta01/navigation-compose-android-2.10.0-beta01.module"
+      "https://repo1.maven.org/maven2/org/jetbrains/androidx/navigation/navigation-compose-android/2.10.0-beta01/navigation-compose-android-2.10.0-beta01.module",
+      "https://repo1.maven.org/maven2/org/jetbrains/compose/material/material-icons-core/1.7.3/material-icons-core-1.7.3.module"
     ],
     "skiko": "0.152.0-alpha02"
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peachsim",
-  "version": "0.1.672",
+  "version": "0.1.674",
   "description": "Vite and Metro plugins, testing drivers, and SDK exports for peach.",
   "author": "Tamagui LLC",
   "license": "SEE LICENSE IN LICENSE",