peachsim 0.1.2224 → 0.1.2228

package/dist-lib/swift-compile.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2224 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2228 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = '', __sootsim_import_meta_filename = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; __sootsim_import_meta_filename = __filename; } catch {}
 "use strict";
 var __create = Object.create;
@@ -64,6 +64,7 @@ __export(swift_compile_exports, {
   swiftCompileSdkOptions: () => swiftCompileSdkOptions,
   swiftCrossImportFlags: () => swiftCrossImportFlags,
   swiftDistributionAt: () => swiftDistributionAt,
+  swiftHeaderWithSuperclassImports: () => swiftHeaderWithSuperclassImports,
   swiftIcuAddress: () => swiftIcuAddress,
   swiftIcuAsset: () => swiftIcuAsset,
   swiftIcuBundleAsset: () => swiftIcuBundleAsset,
@@ -88,12 +89,13 @@ __export(swift_compile_exports, {
   swiftTypedApplicationEntry: () => swiftTypedApplicationEntry,
   syncSwiftTree: () => syncSwiftTree,
   withNativeSourceGlue: () => withNativeSourceGlue,
+  withPreconcurrencyFoundationModules: () => withPreconcurrencyFoundationModules,
   withoutSwiftDeclarations: () => withoutSwiftDeclarations,
   wrapUIApplicationMainEntry: () => wrapUIApplicationMainEntry,
   writeSwiftProject: () => writeSwiftProject
 });
 module.exports = __toCommonJS(swift_compile_exports);
-var import_node_child_process18 = require("node:child_process");
+var import_node_child_process19 = require("node:child_process");
 var import_node_crypto13 = require("node:crypto");
 var import_node_fs25 = require("node:fs");
 var import_node_os11 = __toESM(require("node:os"), 1);
@@ -2677,6 +2679,42 @@ function swiftSdkOptions() {
 var SWIFT_HOST_COMPILER_RELEASE = "swift-6.4.0-RELEASE-custom-81b2c791c27276bf";
 var SWIFT_HOST_COMPILER_ID = "81b2c791c27276bf";
 var compilerArchives = {
+  "swift-6.4.0-RELEASE-custom-fb42d2535739dfd2": {
+    identity: "fb42d2535739dfd2",
+    archive: "tar.zst",
+    hosts: {
+      "darwin-arm64": {
+        checksum: "5e417d415ca74a435755e298a1d2d19ec47637fd03479de7a7d958eb382941f1",
+        manifest: "eb5a0356aebabe89c7b2780f8809e13d6e2ad6f342fed87cf99f9a5834344363"
+      },
+      "linux-arm64": {
+        checksum: "8ac7ad97f3d68bf485423001d1ce3cd92a8d4625313c47c8071867a9aeed3af9",
+        manifest: "6126266dd65b43c43d719e4dc4d33c4ea6a3267f99f34e3638637439a995af2e"
+      },
+      "linux-x64": {
+        checksum: "7d76463079619ba822123d250601bd35f6744ed5f8054a657ce472ce4dac76c8",
+        manifest: "f1a6c0c61d15eddb2ecfa4c3a72a5154621881ac2f0c413162ff1d0f4343bd0e"
+      }
+    }
+  },
+  "swift-6.4.0-RELEASE-custom-44ecd25f163bb359": {
+    identity: "44ecd25f163bb359",
+    archive: "tar.zst",
+    hosts: {
+      "darwin-arm64": {
+        checksum: "d06dda4435f99d8376179cc7a3804907aa7305513135ece6288fd8e6d4695ae6",
+        manifest: "bc0d8b955f923f096dda2aa8bbb1d56176a73f3d4a4df4cc9a1f59d31417061a"
+      },
+      "linux-x64": {
+        checksum: "f95b56440693c5de7995f10ea14c57fc7e659a161018a17f17a74b61a98e88a4",
+        manifest: "c18a60b14d5c89a8b2e1dbb2b4b52342c5fb92c7f3069fdc55c985bce61683a7"
+      },
+      "linux-arm64": {
+        checksum: "afb74ae60df2b5bd7792bfbcf29bcea03675a5c814b758dd6cb91a760c220cd2",
+        manifest: "ac037f6b0fdc4a6ae582eebc22bcf811fa2becdc30d083057137fc857f3c456a"
+      }
+    }
+  },
   "swift-6.4.0-RELEASE-custom-11345d60dca47496": {
     identity: "11345d60dca47496",
     archive: "tar.zst",
@@ -3084,7 +3122,7 @@ function validateSwiftSdkIdentity(sdk) {
 function swiftSdkBundle(swift, id, options) {
   const configuration = (0, import_node_child_process4.execFileSync)(
     swift,
-    ["sdk", "configure", ...options, "--show-configuration", id, "wasm32-unknown-wasip1"],
+    ["sdk", "configure", ...options, "--show-configuration", id, "wasm64-unknown-wasip1"],
     { encoding: "utf8", env: swiftEnvironment(), stdio: ["ignore", "pipe", "pipe"] }
   );
   const sysroot = /^sdkRootPath: (.+)$/m.exec(configuration)?.[1]?.trim();
@@ -3888,14 +3926,11 @@ function objcSdkIntakeFlags(headers, toolchainBin, minimum) {
   return [
     ...swiftObjCPlatformFlags(toolchainBin, minimum),
     // AvailabilityInternal.h derives these through __is_target_os(ios), which
-    // is false for wasm32. the maximum is the sdk the headers come from, as
+    // is false for wasm64. the maximum is the sdk the headers come from, as
     // xcode defines it, so `#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_26_0`
     // sources see the members the sdk declares instead of a 17.0 default.
     `-D__IPHONE_OS_VERSION_MIN_REQUIRED=${minimum}`,
     `-D__IPHONE_OS_VERSION_MAX_ALLOWED=__IPHONE_${NATIVE_GRAPH_SDK_VERSION.replace(".", "_")}`,
-    // apple's build setting for a 32-bit target to keep NSInteger and
-    // NSUInteger long, the nominal types they have on arm64.
-    "-DNS_BUILD_32_LIKE_64=1",
     // the installed libc's default feature set otherwise defines
     // _XOPEN_SOURCE, which darwin's sys/cdefs.h turns into a strict posix
     // level; iOS compiles at darwin's full level with neither defined.
@@ -4165,7 +4200,7 @@ function swiftSharedSdkViewOptions(moduleRoot, distribution, toolchainBin, sdk)
       ...swiftSdkOptions(),
       "--show-configuration",
       sdk,
-      "wasm32-unknown-wasip1"
+      "wasm64-unknown-wasip1"
     ],
     { encoding: "utf8", env: swiftEnvironment(), stdio: ["ignore", "pipe", "pipe"] }
   );
@@ -4302,7 +4337,7 @@ function compileDarwinRecords(args) {
     (0, import_node_child_process7.execFileSync)(
       import_node_path9.default.join(args.bin, "clang"),
       [
-        "--target=wasm32-unknown-wasip1",
+        "--target=wasm64-unknown-wasip1",
         `--sysroot=${args.sysroot}`,
         "-Oz",
         "-g0",
@@ -4313,7 +4348,7 @@ function compileDarwinRecords(args) {
         `-ffile-prefix-map=${records}${import_node_path9.default.sep}=DarwinRecords/`,
         // apple's headers select on the ios identity original units compile
         // with, and TargetConditionals.h refuses a compiler without it
-        ...file.endsWith(".m") ? objcSdkIntakeFlags(args.darwin, args.bin, args.minimum) : [
+        ...file === "sysctl.c" || file.endsWith(".m") ? objcSdkIntakeFlags(args.darwin, args.bin, args.minimum) : [
           ...swiftObjCPlatformFlags(args.bin, args.minimum),
           ...WASI_EMULATION_FLAGS,
           // the sdk build compiles these with libobjc2's headers in
@@ -4780,7 +4815,7 @@ var foundationCategoryObjects = [
 ];
 
 // src/swift-guest-compile.ts
-var import_node_child_process13 = require("node:child_process");
+var import_node_child_process14 = require("node:child_process");
 var import_node_fs17 = require("node:fs");
 var import_node_path19 = __toESM(require("node:path"), 1);
 
@@ -4839,7 +4874,7 @@ var swiftSdkProductSchema = v.pipe(
   v.object({
     id: v.string(),
     installName: v.string(),
-    target: v.literal("wasm32-unknown-wasip1"),
+    target: v.literal("wasm64-unknown-wasip1"),
     linkNames: v.array(v.string()),
     // absent records declare no framework namespace, even when a library name matches.
     frameworkAliases: v.optional(
@@ -4948,7 +4983,8 @@ function encodeULEB(val) {
   } while (val !== 0);
   return out;
 }
-var HAS_ADDEND = /* @__PURE__ */ new Set([3, 4, 5, 8, 9, 11, 13, 14, 15, 16, 21, 22, 23, 24, 25]);
+var HAS_ADDEND = /* @__PURE__ */ new Set([3, 4, 5, 8, 9, 11, 14, 15, 16, 17, 21, 22, 23, 25]);
+var WIDE_DATA_RELOCS = /* @__PURE__ */ new Set([16, 19, 22]);
 var ROOT_SEG_PREFIXES = [
   ".init_array",
   "__objc_init_func",
@@ -5844,7 +5880,7 @@ function pruneSwiftWasmLink(directory, toolchainBin, moduleRoot, staticClangTarg
       } else {
         lazyBuildObjects.set(t, parseWasmObjectCached(t, false, false));
       }
-    } else if (!inStartLib && t.endsWith(".a") && !t.endsWith("libclang_rt.builtins-wasm32.a") && import_node_fs9.default.existsSync(t)) {
+    } else if (!inStartLib && t.endsWith(".a") && !t.endsWith("libclang_rt.builtins-wasm64.a") && import_node_fs9.default.existsSync(t)) {
       const members = readArMembers(new Uint8Array(import_node_fs9.default.readFileSync(t)));
       for (const m of members) {
         extraArchiveObjs.push(parseWasmObjectBytes(`${t}(${m.name})`, m.bytes, false));
@@ -6326,7 +6362,11 @@ function pruneSwiftWasmLink(directory, toolchainBin, moduleRoot, staticClangTarg
       }
     }
     const keptDataRelocBytes = [];
-    const zeroDataRelocOffsets = [];
+    const zeroDataRelocs = [];
+    const zeroDataReloc = (r) => zeroDataRelocs.push({
+      ro: r.ro,
+      width: WIDE_DATA_RELOCS.has(r.rawBytes[0]) ? 8 : 4
+    });
     const usedSyms = /* @__PURE__ */ new Set();
     for (const r of keptCodeRelocs) if (r.rawBytes[0] !== 6) usedSyms.add(r.rs);
     for (const r of obj.dataRelocList) {
@@ -6337,7 +6377,7 @@ function pruneSwiftWasmLink(directory, toolchainBin, moduleRoot, staticClangTarg
           keptDataRelocBytes.push(r.rawBytes);
           usedSyms.add(r.rs);
         } else if (sName === "__objc_classes") {
-          zeroDataRelocOffsets.push(r.ro);
+          zeroDataReloc(r);
         } else {
           const repl = firstLiveInSpecialSeg.get(r.segIdx);
           const roBytes = encodeULEB(r.ro);
@@ -6350,17 +6390,17 @@ function pruneSwiftWasmLink(directory, toolchainBin, moduleRoot, staticClangTarg
       } else if (r.ownerSymIdx !== -1) {
         if (dLive.has(r.ownerSymIdx)) {
           if (obj.isDist && dropsReflection(obj, obj.symNames[r.rs])) {
-            zeroDataRelocOffsets.push(r.ro);
+            zeroDataReloc(r);
           } else {
             keptDataRelocBytes.push(r.rawBytes);
             usedSyms.add(r.rs);
           }
         } else if (sName === "__objc_class_refs") {
-          zeroDataRelocOffsets.push(r.ro);
+          zeroDataReloc(r);
         }
       } else if (sLive[r.segIdx] === 1) {
         if (obj.isDist && obj.symNames[r.rs]?.startsWith("l__swift5_reflection_descriptor") && dropsReflection(obj, obj.symNames[r.rs])) {
-          zeroDataRelocOffsets.push(r.ro);
+          zeroDataReloc(r);
         } else {
           keptDataRelocBytes.push(r.rawBytes);
           usedSyms.add(r.rs);
@@ -6543,11 +6583,8 @@ function pruneSwiftWasmLink(directory, toolchainBin, moduleRoot, staticClangTarg
           outChunks.push(buf.subarray(secStart, end));
         }
       } else {
-        if (id === 11 && zeroDataRelocOffsets.length > 0) {
-          for (const ro of zeroDataRelocOffsets) {
-            buf.fill(0, p + ro, p + ro + 4);
-          }
-        }
+        if (id === 11)
+          for (const { ro, width } of zeroDataRelocs) buf.fill(0, p + ro, p + ro + width);
         outChunks.push(buf.subarray(secStart, end));
       }
       pos = end;
@@ -6723,7 +6760,7 @@ function readNumber(bytes, position) {
   let value = 0;
   let shift = 0;
   for (; ; ) {
-    if (position >= bytes.length || shift > 28) throw new Error("invalid wasm integer");
+    if (position >= bytes.length || shift > 63) throw new Error("invalid wasm integer");
     const byte = bytes[position++];
     value += (byte & 127) * 2 ** shift;
     if (!(byte & 128)) return [value, position];
@@ -6770,7 +6807,7 @@ var OBJC_INIT_RECORD = ".objc_init";
 function rewriteObject(bytes, names, callerAlias, bindings, instrumentDynamicLookups, preserveCanonical) {
   if (Buffer.from(bytes.subarray(0, 8)).toString("hex") !== "0061736d01000000")
     throw new Error("expected wasm object");
-  const sections = [Buffer.from(bytes.subarray(0, 8))];
+  const sections2 = [Buffer.from(bytes.subarray(0, 8))];
   const types = [];
   const functionTypes = [];
   const definitions = [];
@@ -6827,12 +6864,12 @@ function rewriteObject(bytes, names, callerAlias, bindings, instrumentDynamicLoo
           if (referenceType !== 112 && referenceType !== 111)
             throw new Error("unsupported table type");
           const flags = number3();
-          if (flags & ~3) throw new Error("unsupported table limits");
+          if (flags & ~7) throw new Error("unsupported table limits");
           number3();
           if (flags & 1) number3();
         } else if (kind === 2) {
           const flags = number3();
-          if (flags & ~3) throw new Error("unsupported memory limits");
+          if (flags & ~7) throw new Error("unsupported memory limits");
           number3();
           if (flags & 1) number3();
         } else if (kind === 3) offset += 2;
@@ -6845,7 +6882,7 @@ function rewriteObject(bytes, names, callerAlias, bindings, instrumentDynamicLoo
         if (module2 === "env" && names.has(name2)) usedSymbols.add(name2);
         if (isDlsym || isDlerror) {
           const type = types[functionType];
-          const expected = isDlsym ? "127,127:127" : ":127";
+          const expected = isDlsym ? "126,126:126" : ":126";
           if (!type || `${type.parameters.join(",")}:${type.results.join(",")}` !== expected)
             throw new Error(`unexpected ${name2} import type`);
         }
@@ -6987,10 +7024,10 @@ function rewriteObject(bytes, names, callerAlias, bindings, instrumentDynamicLoo
         section = Buffer.concat(parts);
       }
     }
-    sections.push(Buffer.from([id]), encodeNumber(section.length), section);
+    sections2.push(Buffer.from([id]), encodeNumber(section.length), section);
   }
   return {
-    bytes: Buffer.concat(sections),
+    bytes: Buffer.concat(sections2),
     definitions,
     usesDlsym,
     usedSymbols: [...usedSymbols]
@@ -7157,7 +7194,7 @@ function createGuestImageLedger(input) {
     return [...bytes].map((byte) => `\\${byte.toString(16).padStart(2, "0")}`).join("");
   }).join("");
   const ir = [
-    'target triple = "wasm32-unknown-wasip1"',
+    'target triple = "wasm64-unknown-wasip1"',
     `@.names = private constant [${nameSize} x i8] c"${nameContents}"`
   ];
   for (const definition of exported.values()) {
@@ -7276,8 +7313,8 @@ function selectedGuestManifestInputs(plan, selection, identities) {
 }
 function createGuestImageManifest(image) {
   const target = {
-    triple: "wasm32-unknown-wasip1",
-    pointerWidth: 32,
+    triple: "wasm64-unknown-wasip1",
+    pointerWidth: 64,
     byteOrder: "little",
     cpuType: -1,
     cpuSubtype: 0
@@ -7337,6 +7374,7 @@ function number2(bytes, start) {
     shift += 7;
   }
 }
+var constant = (opcode) => opcode === 65 || opcode === 66;
 function signedAddress(bytes, start) {
   const [value, end] = number2(bytes, start);
   const bits = (end - start) * 7;
@@ -7346,16 +7384,16 @@ function signedAddress(bytes, start) {
 function layout(bytes) {
   if (Buffer.from(bytes.subarray(0, 8)).toString("hex") !== "0061736d01000000")
     throw new Error("expected linked wasm module");
-  const sections = /* @__PURE__ */ new Map();
+  const sections2 = /* @__PURE__ */ new Map();
   let offset = 8;
   while (offset < bytes.length) {
     const id = bytes[offset++];
     const [size, start] = number2(bytes, offset);
     if (start + size > bytes.length) throw new Error("invalid wasm section");
-    if (id) sections.set(id, [start, start + size]);
+    if (id) sections2.set(id, [start, start + size]);
     offset = start + size;
   }
-  const exports2 = sections.get(7);
+  const exports2 = sections2.get(7);
   if (!exports2) throw new Error("guest wasm does not export memory and table");
   let exportPosition = exports2[0];
   const readExport = () => {
@@ -7376,7 +7414,7 @@ function layout(bytes) {
     throw new Error("guest wasm does not export memory and table");
   let imports = 0;
   let memoryPages;
-  const section = sections.get(2);
+  const section = sections2.get(2);
   if (section) {
     let pos = section[0];
     const read = () => {
@@ -7391,7 +7429,7 @@ function layout(bytes) {
     };
     const limits = () => {
       const flags = read();
-      if (flags & ~3) throw new Error("unsupported wasm limits");
+      if (flags & ~7) throw new Error("unsupported wasm limits");
       const minimum = read();
       if (flags & 1) read();
       return minimum;
@@ -7419,7 +7457,7 @@ function layout(bytes) {
     }
     if (pos !== section[1]) throw new Error("invalid wasm imports");
   }
-  const memory = sections.get(5);
+  const memory = sections2.get(5);
   if (memory) {
     let pos = memory[0];
     const read = () => {
@@ -7430,14 +7468,14 @@ function layout(bytes) {
     if (read() !== 1 || memoryPages !== void 0)
       throw new Error("unsupported wasm memories");
     const flags = read();
-    if (flags & ~3) throw new Error("unsupported wasm memory limits");
+    if (flags & ~7) throw new Error("unsupported wasm memory limits");
     memoryPages = read();
     if (flags & 1) read();
     if (pos !== memory[1]) throw new Error("invalid wasm memory section");
   }
   if (memoryPages === void 0) throw new Error("guest wasm has no memory");
   const functionsByCodeOffset = /* @__PURE__ */ new Map();
-  const code = sections.get(10);
+  const code = sections2.get(10);
   if (code) {
     let pos = code[0];
     let count;
@@ -7453,7 +7491,7 @@ function layout(bytes) {
     if (pos !== code[1]) throw new Error("invalid wasm code section");
   }
   const functionsByTableSlot = /* @__PURE__ */ new Map();
-  const elements = sections.get(9);
+  const elements = sections2.get(9);
   if (elements) {
     let pos = elements[0];
     const read = () => {
@@ -7467,7 +7505,7 @@ function layout(bytes) {
       if (flags !== 0 && flags !== 2)
         throw new Error(`unsupported wasm element segment ${flags}`);
       if (flags === 2 && read() !== 0) throw new Error("unsupported wasm table index");
-      if (bytes[pos++] !== 65) throw new Error("nonconstant wasm table offset");
+      if (!constant(bytes[pos++])) throw new Error("nonconstant wasm table offset");
       let base;
       [base, pos] = signedAddress(bytes, pos);
       if (bytes[pos++] !== 11) throw new Error("invalid wasm table offset");
@@ -7484,7 +7522,7 @@ function layout(bytes) {
     if (pos !== elements[1]) throw new Error("invalid wasm element section");
   }
   const data = [];
-  const dataSection = sections.get(11);
+  const dataSection = sections2.get(11);
   if (dataSection) {
     let pos = dataSection[0];
     const read = () => {
@@ -7498,7 +7536,7 @@ function layout(bytes) {
       if (flags !== 0 && flags !== 2)
         throw new Error(`unsupported wasm data segment ${flags}`);
       if (flags === 2 && read() !== 0) throw new Error("unsupported wasm memory index");
-      if (bytes[pos++] !== 65) throw new Error("nonconstant wasm data offset");
+      if (!constant(bytes[pos++])) throw new Error("nonconstant wasm data offset");
       let address;
       [address, pos] = signedAddress(bytes, pos);
       if (bytes[pos++] !== 11) throw new Error("invalid wasm data offset");
@@ -7620,7 +7658,7 @@ function isSwiftGuestImageManifest(value) {
   const text2 = (value2) => typeof value2 === "string" && value2.length > 0 && value2.length <= 4096 && !value2.includes("\0");
   const name2 = (value2) => text2(value2) && new TextEncoder().encode(value2).length <= 16;
   const version2 = (value2) => isRecord(value2) && uint(value2.major, 65535) && uint(value2.minor, 255) && uint(value2.patch, 255);
-  if (!isRecord(value) || value.version !== 1 || !text2(value.id) || !text2(value.installName) || value.fileType !== "executable" && value.fileType !== "dylib" || !isRecord(value.target) || value.target.triple !== "wasm32-unknown-wasip1" || value.target.pointerWidth !== 32 || value.target.byteOrder !== "little" || value.target.cpuType !== -1 || value.target.cpuSubtype !== 0 || typeof value.inputsSha256 !== "string" || !/^[a-f0-9]{64}$/.test(value.inputsSha256) || value.uuid !== value.inputsSha256.slice(0, 32) || !isRecord(value.buildVersion) || !uint(value.buildVersion.platform, 4294967295) || !version2(value.buildVersion.minimum) || !version2(value.buildVersion.sdk) || !Array.isArray(value.regions))
+  if (!isRecord(value) || value.version !== 1 || !text2(value.id) || !text2(value.installName) || value.fileType !== "executable" && value.fileType !== "dylib" || !isRecord(value.target) || value.target.triple !== "wasm64-unknown-wasip1" || value.target.pointerWidth !== 64 || value.target.byteOrder !== "little" || value.target.cpuType !== -1 || value.target.cpuSubtype !== 0 || typeof value.inputsSha256 !== "string" || !/^[a-f0-9]{64}$/.test(value.inputsSha256) || value.uuid !== value.inputsSha256.slice(0, 32) || !isRecord(value.buildVersion) || !uint(value.buildVersion.platform, 4294967295) || !version2(value.buildVersion.minimum) || !version2(value.buildVersion.sdk) || !Array.isArray(value.regions))
     return false;
   return value.regions.every((region) => {
     if (!isRecord(region) || !name2(region.name) || region.space !== "linear-memory" && region.space !== "function-table" || !uint(region.address, 4294967295) || !uint(region.length, 4294967295) || region.address + region.length > 4294967296 || !uint(region.initialProtection, 7) || !uint(region.maximumProtection, 7) || (region.initialProtection & region.maximumProtection) !== region.initialProtection || !Array.isArray(region.sections))
@@ -9052,7 +9090,7 @@ function linkGuestImages(options) {
   import_node_fs13.default.writeFileSync(irPath, ledger.llvmIR);
   (0, import_node_child_process10.execFileSync)(
     clang,
-    ["--target=wasm32-unknown-wasip1", "-c", irPath, "-o", ledgerObject],
+    ["--target=wasm64-unknown-wasip1", "-c", irPath, "-o", ledgerObject],
     { stdio: "pipe" }
   );
   linkedOwners.set(ledgerObject, options.ledgerDataImage);
@@ -9725,6 +9763,7 @@ function clangIrLinkOptions(ir) {
   }
   return result;
 }
+var CLANG_TARGET_MODULE_WRAPPER = ".peach-clang";
 function sourceGuestClangLinkOptions(options) {
   const wanted = new Set(options.objects.map((file) => import_node_path15.default.resolve(file)));
   const commands = /* @__PURE__ */ new Map();
@@ -9767,10 +9806,16 @@ function sourceGuestClangLinkOptions(options) {
         throw new Error(`unsupported source object producer ${file}`);
       continue;
     }
-    if (command.tool !== "clang" || !command.args.length || (0, import_node_fs14.realpathSync)(command.args[0]) !== (0, import_node_fs14.realpathSync)(import_node_path15.default.join(options.toolchainBin, "clang")))
+    const compiler = command.args[0] ? (0, import_node_fs14.realpathSync)(command.args[0]) : "";
+    if (command.tool !== "clang" || compiler !== (0, import_node_fs14.realpathSync)(import_node_path15.default.join(options.toolchainBin, "clang")) && compiler !== (0, import_node_fs14.realpathSync)(import_node_path15.default.join(options.buildDirectory, CLANG_TARGET_MODULE_WRAPPER)))
       throw new Error(`unsupported source object producer ${file}`);
     const args = command.args.slice(1).filter((arg) => arg !== "-c");
-    const output = import_node_path15.default.join(options.directory, `clang-link-${index}.ll`);
+    const outputDirectory = import_node_path15.default.join(
+      options.directory,
+      import_node_path15.default.basename(import_node_path15.default.dirname(file))
+    );
+    (0, import_node_fs14.mkdirSync)(outputDirectory, { recursive: true });
+    const output = import_node_path15.default.join(outputDirectory, `clang-link-${index}.ll`);
     for (const flag of ["-o", "-MF"]) {
       const index2 = args.lastIndexOf(flag);
       if (index2 < 0 || index2 + 1 >= args.length)
@@ -10010,8 +10055,10 @@ function logicalGuestLinkOptions(args, identities, roots) {
 }
 
 // src/wasm-optimize.ts
+var import_node_child_process13 = require("node:child_process");
 var import_node_fs16 = require("node:fs");
 var import_node_path18 = require("node:path");
+var import_node_util = require("node:util");
 
 // ../contrast-runtime-delivery/src/index.ts
 var import_node_child_process12 = require("node:child_process");
@@ -10241,8 +10288,244 @@ function rnxHomeDir() {
 }
 var DAEMON_LOCKFILE_MAX_BYTES = 16 * 1024;
 
+// src/wasm-narrow-boundary.ts
+var I64 = 126;
+var VALUE_TYPES = /* @__PURE__ */ new Map([
+  [127, "i32"],
+  [I64, "i64"],
+  [125, "f32"],
+  [124, "f64"],
+  [123, "v128"],
+  [112, "funcref"],
+  [111, "externref"]
+]);
+var GUEST = "guest";
+var BOUNDARY = "boundary";
+var WIDE = "$wide.";
+var NARROW = "$narrow.";
+function encodeNumber2(value) {
+  const bytes = [];
+  for (let rest = value; ; ) {
+    const byte = rest % 128;
+    rest = Math.floor(rest / 128);
+    if (rest === 0) return [...bytes, byte];
+    bytes.push(byte | 128);
+  }
+}
+function encodeName(name2) {
+  const bytes = [...Buffer.from(name2)];
+  return [...encodeNumber2(bytes.length), ...bytes];
+}
+function reader(bytes, start, end) {
+  let at = start;
+  const number3 = () => {
+    let value = 0;
+    for (let shift = 0; ; shift += 7) {
+      if (at >= end || shift > 63) throw new Error("invalid wasm integer");
+      const byte = bytes[at++];
+      value += (byte & 127) * 2 ** shift;
+      if (!(byte & 128)) return value;
+    }
+  };
+  return {
+    number: number3,
+    byte: () => {
+      if (at >= end) throw new Error("truncated wasm section");
+      return bytes[at++];
+    },
+    name: () => {
+      const length = number3();
+      at += length;
+      if (at > end) throw new Error("truncated wasm name");
+      return Buffer.from(bytes.subarray(at - length, at)).toString();
+    },
+    position: () => at,
+    done: () => at === end
+  };
+}
+function sections(bytes) {
+  if (Buffer.from(bytes.subarray(0, 8)).toString("hex") !== "0061736d01000000")
+    throw new Error("not a wasm module");
+  const found = [];
+  for (let at = 8; at < bytes.length; ) {
+    const header = reader(bytes, at, bytes.length);
+    const id = header.byte();
+    const size = header.number();
+    const start = header.position();
+    found.push({ id, start, end: start + size });
+    at = start + size;
+  }
+  return found;
+}
+function withSections(bytes, layout2, replacements) {
+  const parts = [bytes.subarray(0, 8)];
+  let at = 8;
+  for (const section of layout2) {
+    const body = replacements.get(section.id);
+    parts.push(
+      body ? Uint8Array.from([section.id, ...encodeNumber2(body.length), ...body]) : bytes.subarray(at, section.end)
+    );
+    at = section.end;
+  }
+  return Buffer.concat(parts);
+}
+var quoted = (name2) => `"${[...Buffer.from(name2)].map((byte) => `\\${byte.toString(16).padStart(2, "0")}`).join("")}"`;
+var signature = (types, keyword, narrow) => types.length === 0 ? "" : ` (${keyword} ${types.map((type) => {
+  const name2 = VALUE_TYPES.get(narrow && type === I64 ? 127 : type);
+  if (!name2) throw new Error(`unsupported wasm boundary type ${type}`);
+  return name2;
+}).join(" ")})`;
+var wide = (type) => type.parameters.includes(I64) || type.results.includes(I64);
+function narrowWasmBoundary(bytes) {
+  const layout2 = sections(bytes);
+  const section = (id) => {
+    const found = layout2.find((entry) => entry.id === id);
+    return found && reader(bytes, found.start, found.end);
+  };
+  const types = [];
+  const typeSection = section(1);
+  if (typeSection) {
+    for (let count = typeSection.number(); count > 0; count--) {
+      if (typeSection.byte() !== 96) throw new Error("unsupported wasm type");
+      const values = () => Array.from({ length: typeSection.number() }, () => typeSection.byte());
+      types.push({ parameters: values(), results: values() });
+    }
+  }
+  const typeAt = (index) => {
+    const type = types[index];
+    if (!type) throw new Error("invalid wasm type index");
+    return type;
+  };
+  const thunks = [];
+  const functionTypes = [];
+  const importBody = [];
+  const importSection = section(2);
+  if (importSection) {
+    const count = importSection.number();
+    importBody.push(...encodeNumber2(count));
+    for (let index = 0; index < count; index++) {
+      const module2 = importSection.name();
+      const name2 = importSection.name();
+      const start = importSection.position();
+      const kind = importSection.byte();
+      const limits = () => {
+        const flags = importSection.number();
+        importSection.number();
+        if (flags & 1) importSection.number();
+      };
+      let type;
+      if (kind === 0) {
+        type = typeAt(importSection.number());
+        functionTypes.push(type);
+      } else if (kind === 1) {
+        importSection.byte();
+        limits();
+      } else if (kind === 2) limits();
+      else if (kind === 3) {
+        importSection.byte();
+        importSection.byte();
+      } else if (kind === 4) {
+        importSection.byte();
+        importSection.number();
+      } else throw new Error("unsupported wasm import");
+      const scalar64 = (parameter) => module2 === "wasi_snapshot_preview1" && (!name2.startsWith("peach_") || name2 === "peach_fs_path_birthtime_set" && parameter === 2) || module2 === "peach" && name2 === "hw_memsize" && parameter === null || module2 === "peach_notify" && name2 === "set" && parameter === 1;
+      const parameters = type?.parameters.map(
+        (value, index2) => value === I64 && !scalar64(index2) ? 127 : value
+      );
+      const results = type?.results.map(
+        (value) => value === I64 && !scalar64(null) ? 127 : value
+      );
+      if (type && parameters && results && (parameters.some((value, index2) => value !== type.parameters[index2]) || results.some((value, index2) => value !== type.results[index2]))) {
+        if (type.results.length > 1)
+          throw new Error(`import ${module2}.${name2} returns several values`);
+        const id = thunks.length;
+        const call = `(call $host${id}${type.parameters.map(
+          (value, at) => value !== parameters[at] ? ` (i32.wrap_i64 (local.get ${at}))` : ` (local.get ${at})`
+        ).join("")})`;
+        thunks.push(
+          `(import ${quoted(module2)} ${quoted(name2)} (func $host${id}${signature(parameters, "param", false)}${signature(results, "result", false)}))`,
+          `(func (export "${NARROW}${id}")${signature(type.parameters, "param", false)}${signature(type.results, "result", false)} ${type.results[0] !== results[0] ? `(i64.extend_i32_u ${call})` : call})`
+        );
+        importBody.push(...encodeName(BOUNDARY), ...encodeName(`${NARROW}${id}`));
+      } else importBody.push(...encodeName(module2), ...encodeName(name2));
+      importBody.push(...bytes.subarray(start, importSection.position()));
+    }
+    if (!importSection.done()) throw new Error("invalid wasm imports");
+  }
+  const functionSection = section(3);
+  if (functionSection)
+    for (let count = functionSection.number(); count > 0; count--)
+      functionTypes.push(typeAt(functionSection.number()));
+  const exportBody = [];
+  const exportSection = section(7);
+  if (exportSection) {
+    const count = exportSection.number();
+    exportBody.push(...encodeNumber2(count));
+    for (let index = 0; index < count; index++) {
+      const name2 = exportSection.name();
+      const kind = exportSection.byte();
+      const target = exportSection.number();
+      const type = kind === 0 ? functionTypes[target] : void 0;
+      if (kind === 0 && !type) throw new Error("invalid wasm export");
+      if (type && wide(type)) {
+        if (type.results.length > 1)
+          throw new Error(`export ${name2} returns several values`);
+        const id = thunks.length;
+        const call = `(call $guest${id}${type.parameters.map(
+          (value, at) => value === I64 ? ` (i64.extend_i32_u (local.get ${at}))` : ` (local.get ${at})`
+        ).join("")})`;
+        thunks.push(
+          `(import "${GUEST}" "${WIDE}${id}" (func $guest${id}${signature(type.parameters, "param", false)}${signature(type.results, "result", false)}))`,
+          `(func (export ${quoted(name2)})${signature(type.parameters, "param", true)}${signature(type.results, "result", true)} ${type.results[0] === I64 ? `(i32.wrap_i64 ${call})` : call})`
+        );
+        exportBody.push(...encodeName(`${WIDE}${id}`));
+      } else exportBody.push(...encodeName(name2));
+      exportBody.push(kind, ...encodeNumber2(target));
+    }
+    if (!exportSection.done()) throw new Error("invalid wasm exports");
+  }
+  if (thunks.length === 0) return void 0;
+  const imports = thunks.filter((line) => line.startsWith("(import"));
+  const functions = thunks.filter((line) => !line.startsWith("(import"));
+  return {
+    module: withSections(
+      bytes,
+      layout2,
+      /* @__PURE__ */ new Map([
+        [2, importBody],
+        [7, exportBody]
+      ])
+    ),
+    thunks: `(module
+${[...imports, ...functions].join("\n")}
+)
+`
+  };
+}
+var NARROW_MERGE_NAMES = { guest: GUEST, boundary: BOUNDARY };
+function dropBoundaryExports(bytes) {
+  const layout2 = sections(bytes);
+  const found = layout2.find((entry) => entry.id === 7);
+  if (!found) throw new Error("merged module has no exports");
+  const exportSection = reader(bytes, found.start, found.end);
+  const kept = [];
+  for (let count = exportSection.number(); count > 0; count--) {
+    const name2 = exportSection.name();
+    const kind = exportSection.byte();
+    const target = exportSection.number();
+    if (!name2.startsWith(WIDE) && !name2.startsWith(NARROW))
+      kept.push([...encodeName(name2), kind, ...encodeNumber2(target)]);
+  }
+  return withSections(
+    bytes,
+    layout2,
+    /* @__PURE__ */ new Map([[7, [...encodeNumber2(kept.length), ...kept.flat()]]])
+  );
+}
+
 // src/wasm-optimize.ts
 var FEATURES = [
+  "memory64",
   "threads",
   "bulk-memory",
   "bulk-memory-opt",
@@ -10255,7 +10538,8 @@ var FEATURES = [
   "sign-ext"
 ];
 var KEEP_WASM_NAMES = process.env.PEACH_SWIFT_NAMES === "1";
-var WASM_OPTIMIZE_IDENTITY = `wasm-opt ${import_wasm_opt.BINARYEN_VERSION} -Oz ${FEATURES.join(",")}${KEEP_WASM_NAMES ? " -g" : ""}`;
+var LOWERING = ["--memory64-lowering", "--table64-lowering"];
+var WASM_LOWER_IDENTITY = `binaryen ${import_wasm_opt.BINARYEN_VERSION} narrow ${LOWERING.join(" ")} ${FEATURES.join(",")} unoptimized-names`;
 var PINNED_BINARYEN_VERSION = "132";
 var BINARYEN_RELEASES = /* @__PURE__ */ new Map([
   [
@@ -10280,7 +10564,7 @@ var BINARYEN_RELEASES = /* @__PURE__ */ new Map([
     }
   ]
 ]);
-async function runWasmOpt(file, output, skipPasses, binary) {
+async function runWasmOpt(file, output, optimize, skipPasses, binary) {
   const admittedCores = windowAdmission()?.cores ?? Number(process.env.TM_EXEC_CPU_CORES);
   const requestedCores = Number(process.env.BINARYEN_CORES);
   const environment = { ...process.env, WASM_OPT_PATH: binary };
@@ -10288,18 +10572,43 @@ async function runWasmOpt(file, output, skipPasses, binary) {
     environment.BINARYEN_CORES = String(
       Number.isInteger(requestedCores) && requestedCores > 0 ? Math.min(admittedCores, requestedCores) : admittedCores
     );
+  const features = FEATURES.map((feature) => `--enable-${feature}`);
+  const names = optimize && !KEEP_WASM_NAMES ? [] : ["-g"];
+  const narrowed = narrowWasmBoundary((0, import_node_fs16.readFileSync)(file));
+  const merged = `${output}.narrowed`;
+  if (narrowed) {
+    const guest = `${output}.guest`;
+    const thunks = `${output}.thunks.wat`;
+    (0, import_node_fs16.writeFileSync)(guest, narrowed.module);
+    (0, import_node_fs16.writeFileSync)(thunks, narrowed.thunks);
+    await (0, import_node_util.promisify)(import_node_child_process13.execFile)((0, import_node_path18.join)((0, import_node_path18.dirname)(binary), "wasm-merge"), [
+      ...features,
+      ...names,
+      guest,
+      NARROW_MERGE_NAMES.guest,
+      thunks,
+      NARROW_MERGE_NAMES.boundary,
+      "-o",
+      merged
+    ]);
+    (0, import_node_fs16.writeFileSync)(merged, dropBoundaryExports((0, import_node_fs16.readFileSync)(merged)));
+    (0, import_node_fs16.rmSync)(guest);
+    (0, import_node_fs16.rmSync)(thunks);
+  }
   const result = await (0, import_wasm_opt.wasmOpt)(
     [
-      "-Oz",
-      ...KEEP_WASM_NAMES ? ["-g"] : [],
+      ...LOWERING,
+      ...optimize ? ["-Oz"] : [],
+      ...names,
       ...skipPasses.flatMap((pass) => ["--skip-pass", pass]),
-      ...FEATURES.map((feature) => `--enable-${feature}`),
-      file,
+      ...features,
+      narrowed ? merged : file,
       "-o",
       output
     ],
     { env: environment }
   );
+  if (narrowed) (0, import_node_fs16.rmSync)(merged);
   if (result.status !== 0)
     throw new Error(`wasm-opt exited ${result.status}: ${result.stderr}`);
 }
@@ -10322,8 +10631,14 @@ async function installWasmOpt() {
     });
   return binary;
 }
-async function optimizeWasm(file, output, skipPasses = []) {
-  await runWasmOpt(file, output, skipPasses, await installWasmOpt());
+async function lowerWasm(file, output, options) {
+  await runWasmOpt(
+    file,
+    output,
+    options.optimize,
+    options.skipPasses ?? [],
+    await installWasmOpt()
+  );
 }
 
 // src/swift-guest-compile.ts
@@ -10357,7 +10672,7 @@ async function compileGuestLink(options) {
   };
   const buildVersion = imageBuildVersion(entry.buildVersion);
   const clangOptions = [
-    "--target=wasm32-unknown-wasip1",
+    "--target=wasm64-unknown-wasip1",
     `--sysroot=${options.sysroot}`,
     `-I${import_node_path19.default.join(options.moduleRoot, "include")}`
   ];
@@ -10367,7 +10682,7 @@ async function compileGuestLink(options) {
     stubSource,
     '#include "guest-image-projection.h"\nconst struct peach_guest_image __peach_guest_images[] = {{0}};\nconst uint32_t __peach_guest_image_count = 0;\n'
   );
-  (0, import_node_child_process13.execFileSync)(
+  (0, import_node_child_process14.execFileSync)(
     import_node_path19.default.join(options.toolchainBin, "clang"),
     [...clangOptions, "-c", stubSource, "-o", stub],
     { stdio: "pipe" }
@@ -10665,9 +10980,10 @@ async function compileGuestLink(options) {
     }
   });
   if (!reserved || !projectionObject) throw new Error("guest projection was not reserved");
-  await optimizeWasm(options.output, options.optimized, [
-    "duplicate-function-elimination"
-  ]);
+  await lowerWasm(options.output, options.optimized, {
+    optimize: true,
+    skipPasses: ["duplicate-function-elimination"]
+  });
   const map = (0, import_node_fs17.readFileSync)(result.mapPath, "utf8");
   if (!/ __peach_guest_images$/m.test(map)) return;
   const finalized = finalizeGuestProjectionStorage({
@@ -10683,13 +10999,13 @@ async function compileGuestLink(options) {
 }
 
 // src/swift-icu.ts
-var import_node_child_process14 = require("node:child_process");
+var import_node_child_process15 = require("node:child_process");
 var import_node_crypto11 = require("node:crypto");
 var import_node_fs18 = require("node:fs");
 var import_promises4 = require("node:fs/promises");
 var import_node_os8 = __toESM(require("node:os"), 1);
 var import_node_path20 = __toESM(require("node:path"), 1);
-var import_node_util = require("node:util");
+var import_node_util2 = require("node:util");
 var import_node_zlib2 = require("node:zlib");
 
 // ../sootsim-swift/src/icuData.ts
@@ -10747,10 +11063,10 @@ function swiftIcuPack(blob, deflate2) {
 }
 
 // src/swift-icu.ts
-var run = (0, import_node_util.promisify)(import_node_child_process14.execFile);
-var deflate = (0, import_node_util.promisify)(import_node_zlib2.gzip);
-var compressBrotli = (0, import_node_util.promisify)(import_node_zlib2.brotliCompress);
-var inflateGzip = (0, import_node_util.promisify)(import_node_zlib2.gunzip);
+var run = (0, import_node_util2.promisify)(import_node_child_process15.execFile);
+var deflate = (0, import_node_util2.promisify)(import_node_zlib2.gzip);
+var compressBrotli = (0, import_node_util2.promisify)(import_node_zlib2.brotliCompress);
+var inflateGzip = (0, import_node_util2.promisify)(import_node_zlib2.gunzip);
 var ARCHIVE = "wasi/lib_FoundationICU.a";
 var MEMBER = "icu_packaged_data.cpp.obj";
 var raw = /* @__PURE__ */ new Map();
@@ -10831,7 +11147,7 @@ async function load(toolchainBin, sdk) {
       ...swiftSdkOptions(),
       "--show-configuration",
       sdk,
-      "wasm32-unknown-wasip1"
+      "wasm64-unknown-wasip1"
     ],
     { env: swiftEnvironment() }
   );
@@ -11079,7 +11395,7 @@ function swiftObjCModuleMap(module2, headers, submodules = /* @__PURE__ */ new S
 }
 
 // src/swift-project-user.ts
-var import_node_child_process15 = require("node:child_process");
+var import_node_child_process16 = require("node:child_process");
 var import_node_fs20 = require("node:fs");
 var import_node_path22 = __toESM(require("node:path"), 1);
 function prepareSwiftProjectProcess(root, user) {
@@ -11090,7 +11406,7 @@ function prepareSwiftProjectProcess(root, user) {
   (0, import_node_fs20.mkdirSync)(tmp, { recursive: true });
   const caches = ["cache", "config", "security"].map((name2) => import_node_path22.default.join(swiftpm, name2));
   for (const directory of caches) (0, import_node_fs20.mkdirSync)(directory, { recursive: true });
-  (0, import_node_child_process15.execFileSync)("chown", ["-R", "-P", `${user.uid}:${user.gid}`, root, home]);
+  (0, import_node_child_process16.execFileSync)("chown", ["-R", "-P", `${user.uid}:${user.gid}`, root, home]);
   (0, import_node_fs20.chmodSync)(root, 448);
   (0, import_node_fs20.chmodSync)(home, 448);
   return {
@@ -11113,7 +11429,7 @@ function prepareSwiftProjectProcess(root, user) {
   };
 }
 function endSwiftProjectProcesses(user) {
-  (0, import_node_child_process15.execFileSync)("sh", ["-c", "kill -s KILL -- -1 2>/dev/null || true"], {
+  (0, import_node_child_process16.execFileSync)("sh", ["-c", "kill -s KILL -- -1 2>/dev/null || true"], {
     uid: user.uid,
     gid: user.gid
   });
@@ -11160,7 +11476,7 @@ function swiftReproducibleBuildFlags(roots) {
 }
 
 // src/swift-root-lock.ts
-var import_node_child_process16 = require("node:child_process");
+var import_node_child_process17 = require("node:child_process");
 var import_node_crypto12 = require("node:crypto");
 var import_node_fs22 = require("node:fs");
 var import_node_os10 = require("node:os");
@@ -11326,7 +11642,7 @@ async function withSwiftRootLock(root, work, signal, wait = true) {
       }
     },
     spawn(command, args, options, companion) {
-      const child = (0, import_node_child_process16.spawn)(
+      const child = (0, import_node_child_process17.spawn)(
         "/bin/sh",
         ["-c", 'IFS= read -r go || exit 1; exec "$@" </dev/null', "sh", command, ...args],
         { ...options, detached: true, stdio: ["pipe", "pipe", "pipe"] }
@@ -11358,15 +11674,15 @@ async function withSwiftRootLock(root, work, signal, wait = true) {
 }
 
 // src/swift-uniform-type-constants.ts
-var import_node_child_process17 = require("node:child_process");
+var import_node_child_process18 = require("node:child_process");
 var import_node_path24 = __toESM(require("node:path"), 1);
 function compileUniformTypeConstants(args) {
   const source = import_node_path24.default.join(args.packageRoot, "runtime/UniformTypeIdentifiersConstants.m");
   const object3 = import_node_path24.default.join(args.out, "UniformTypeIdentifiers-NativeConstants.o");
-  (0, import_node_child_process17.execFileSync)(
+  (0, import_node_child_process18.execFileSync)(
     import_node_path24.default.join(args.bin, "clang"),
     [
-      "--target=wasm32-unknown-wasip1",
+      "--target=wasm64-unknown-wasip1",
       `--sysroot=${args.sysroot}`,
       "-Oz",
       "-g0",
@@ -11665,7 +11981,7 @@ async function runCompiler(command, args, options, stream = false, quiet) {
     detached: true,
     stdio: ["ignore", "pipe", "pipe"]
   };
-  const child = options.lease ? options.lease.spawn(command, args, launch, options.frameworkLease) : (0, import_node_child_process18.spawn)(command, args, launch);
+  const child = options.lease ? options.lease.spawn(command, args, launch, options.frameworkLease) : (0, import_node_child_process19.spawn)(command, args, launch);
   let stopping;
   try {
     return await new Promise((resolve, reject) => {
@@ -11739,7 +12055,7 @@ async function runCompiler(command, args, options, stream = false, quiet) {
     await stopping;
   }
 }
-var WASM_TRIPLE = "wasm32-unknown-wasip1";
+var WASM_TRIPLE = "wasm64-unknown-wasip1";
 var SWIFTPM_PROGRESS = /^\[\d+\/\d+\] /;
 var SWIFTPM_NOISE = /^(?:\[\d+\/\d+\] |Building for production\.\.\.$|warning: '--build-system native' has been deprecated)/;
 function swiftBuildJobs() {
@@ -11790,6 +12106,20 @@ var clangInterfaceHeader = (header) => header.replace(/^@import (?:UIKitCore|UIK
   /^@import (?:CoreFoundation|FoundationNetworking);$/gm,
   "@import Foundation;"
 ).replace(/\b_TtC10Foundation\d+(NS\w+)\b/g, "$1").replace(/\b__attribute__\(\(objc_subclassing_restricted\)\)\s*/g, "");
+function swiftHeaderWithSuperclassImports(header, interfaceFor) {
+  const superclasses = new Set(
+    [...header.matchAll(/@interface\s+\w+\s*:\s*(\w+)/g)].map((match) => match[1])
+  );
+  return header.replace(/^@import (\w+);$/gm, (statement, name2) => {
+    const dependency = interfaceFor(name2);
+    if (!dependency || ![...swiftInterfaceDeclarations(dependency.header)].some(
+      (name3) => superclasses.has(name3)
+    ))
+      return statement;
+    return `${statement}
+#import ${JSON.stringify(dependency.file)}`;
+  });
+}
 var swiftInterfaceDeclarations = (header) => /* @__PURE__ */ new Set([
   ...[
     ...header.matchAll(
@@ -12147,7 +12477,7 @@ var OPTIONAL_FRAMEWORKS = new Set(Object.keys(OPTIONAL_FRAMEWORK_DEPENDENCIES));
 function swiftOptionalFramework(name2) {
   return OPTIONAL_FRAMEWORKS.has(name2);
 }
-var SWIFT_IMPORT = /^\s*(?:@\w+(?:\([^)]*\))?\s+)*import\s+(?:(?:typealias|struct|class|enum|protocol|let|var|func)\s+)?([A-Za-z_][A-Za-z0-9_]*)/;
+var SWIFT_IMPORT = /^\s*(?:@\w+(?:\([^)]*\))?\s+|(?:public|package|internal|fileprivate|private)\s+)*import\s+(?:(?:typealias|struct|class|enum|protocol|let|var|func)\s+)?([A-Za-z_][A-Za-z0-9_]*)/;
 var kleeneNot = (value) => value === void 0 ? void 0 : !value;
 var kleeneAnd = (left, right) => left === false || right === false ? false : left === true && right === true ? true : void 0;
 var kleeneOr = (left, right) => left === true || right === true ? true : left === false && right === false ? false : void 0;
@@ -12167,10 +12497,11 @@ function swiftCondition(text2, available) {
     const call = /^(\w+)\s*\(\s*([^,()]*?)\s*(?:,[^()]*)?\)$/.exec(token ?? "");
     if (!call) return void 0;
     const [, name2, argument] = call;
-    if (name2 === "os") return argument === "iOS" || argument === "WASI";
-    if (name2 === "canImport") return available?.has(argument);
+    if (name2 === "os") return argument === "iOS";
+    if (name2 === "canImport")
+      return argument !== "FoundationNetworking" && available?.has(argument);
     if (name2 === "targetEnvironment") return argument === "simulator";
-    if (name2 === "arch") return argument === "wasm32";
+    if (name2 === "arch") return argument === "wasm64";
     return void 0;
   };
   const both = () => {
@@ -12239,7 +12570,7 @@ function swiftSdkPaths(moduleRoot, toolchainBin) {
   const key = JSON.stringify([toolchainBin, sdk, options]);
   const cached = sdkPaths.get(key);
   if (cached) return cached;
-  const configuration = (0, import_node_child_process18.execFileSync)(
+  const configuration = (0, import_node_child_process19.execFileSync)(
     import_node_path27.default.join(toolchainBin, "swift"),
     [
       "sdk",
@@ -12247,7 +12578,7 @@ function swiftSdkPaths(moduleRoot, toolchainBin) {
       ...options,
       "--show-configuration",
       sdk,
-      "wasm32-unknown-wasip1"
+      "wasm64-unknown-wasip1"
     ],
     { encoding: "utf8", env: swiftEnvironment(), stdio: ["ignore", "pipe", "pipe"] }
   );
@@ -12620,6 +12951,14 @@ var FOUNDATION_IMPLICIT_MODULES = [
   "PeachFoundationCombine",
   "Darwin"
 ];
+var PRECONCURRENCY_FOUNDATION_IMPORT = /^[ \t]*@preconcurrency[ \t]+(?:(?:public|package|internal|fileprivate|private)[ \t]+)?import[ \t]+(?:Foundation|UIKit|SwiftUI)[ \t]*(?:\/\/.*)?$/m;
+function withPreconcurrencyFoundationModules(source) {
+  if (!PRECONCURRENCY_FOUNDATION_IMPORT.test(source)) return source;
+  return `${source}${source.endsWith("\n") ? "" : "\n"}#if canImport(PeachObjC)
+${["ObjectiveC", ...FOUNDATION_IMPLICIT_MODULES].map((module2) => `@preconcurrency import ${module2}
+`).join("")}#endif
+`;
+}
 var FOUNDATION_IMPLICIT_FLAGS = FOUNDATION_IMPLICIT_MODULES.map(
   (module2) => `, "-Xfrontend", "-import-module", "-Xfrontend", "${module2}"`
 ).join("");
@@ -12635,11 +12974,11 @@ var executableLinkFlags = (root) => `          "-Xclang-linker", "-O0",
           "-Xlinker", "--wrap=swift_udata_open",
           "-Xlinker", "--wrap=swift_udata_openChoice",
 `;
-var darwinRecordsRegion = (quoted) => quoted.length ? ["-Wl,--start-lib", ...quoted, "-Wl,--end-lib"] : [];
+var darwinRecordsRegion = (quoted2) => quoted2.length ? ["-Wl,--start-lib", ...quoted2, "-Wl,--end-lib"] : [];
 var REACTOR_FLAG = '"-Xclang-linker", "-mexec-model=reactor",\n';
 var MULTI_MANIFEST_VERSION = 68;
 var SWIFT_HEADER_PRODUCTS_TARGET = "PeachHeaderProducts";
-var compilerSourceDigest = true ? "ae9e08389e6ab1901846342a7b347d7c10f8074172cf5d4d6505f7e955879ad4" : swiftCompilerSourceDigest(__sootsim_import_meta_dirname);
+var compilerSourceDigest = true ? "280e858b01b1c1393d3765c8d6ff1b3ce4a1a93d7fb7e3dd2d4d3e5f1d5f1ac2" : swiftCompilerSourceDigest(__sootsim_import_meta_dirname);
 function swiftArtifactHash(input, release, moduleRoot) {
   const hash = (0, import_node_crypto13.createHash)("sha256");
   hash.update(`swift-compile
@@ -12649,9 +12988,10 @@ ${release}
   if (input.oneModule) hash.update("one-module\n");
   if (KEEP_WASM_NAMES) hash.update("names\n");
   hash.update(swiftModuleDigest(moduleRoot));
-  if (input.optimize) hash.update(`optimize
-${WASM_OPTIMIZE_IDENTITY}
+  hash.update(`lower
+${WASM_LOWER_IDENTITY}
 `);
+  if (input.optimize) hash.update("optimize\n");
   for (const file of Object.keys(input.files).sort()) {
     hash.update((0, import_node_crypto13.createHash)("sha256").update(file).digest());
     hash.update((0, import_node_crypto13.createHash)("sha256").update(input.files[file]).digest());
@@ -12761,6 +13101,7 @@ function toolsetOrdersLibcxxBeforeDarwinOverlay(options) {
   const overlay = options.indexOf("=/darwin/wasm/include");
   return libcxx >= 0 && overlay > libcxx;
 }
+var SWIFTPM_DEFAULT_IOS_DEPLOYMENT_TARGET = "12.0";
 function emitSwiftPackageManifest(args) {
   const {
     targets,
@@ -12826,7 +13167,7 @@ function emitSwiftPackageManifest(args) {
         (name2) => !object3.startsWith(`lib/${name2}-`) || reachedFrameworks.has(name2)
       )
     );
-    const quoted = (object3) => `"${import_node_path27.default.join(moduleRoot, object3).replaceAll("\\", "\\\\").replaceAll('"', '\\"')}"`;
+    const quoted2 = (object3) => `"${import_node_path27.default.join(moduleRoot, object3).replaceAll("\\", "\\\\").replaceAll('"', '\\"')}"`;
     const categoryObjects = new Set(
       foundationCategoryObjects.map((name2) => `lib/Foundation-${name2}.o`)
     );
@@ -12835,11 +13176,11 @@ function emitSwiftPackageManifest(args) {
       objects.filter((object3) => roots.has(object3) || categoryObjects.has(object3))
     );
     const list = [
-      ...[...eager].map(quoted),
+      ...[...eager].map(quoted2),
       "-Wl,--start-lib",
-      ...available.filter((object3) => !eager.has(object3)).map(quoted),
+      ...available.filter((object3) => !eager.has(object3)).map(quoted2),
       "-Wl,--end-lib",
-      ...darwinRecordsRegion(distribution.objects.filter(isProvider).map(quoted))
+      ...darwinRecordsRegion(distribution.objects.filter(isProvider).map(quoted2))
     ].join("\n") + "\n";
     distributionLinkPath = distributionLink.path.replace(
       /\.rsp$/,
@@ -12961,7 +13302,8 @@ function emitSwiftPackageManifest(args) {
       (value) => value.late?.producers.includes(target.name)
     )) ? `, "-emit-objc-header-path", ${JSON.stringify(import_node_path27.default.join(args.headerDirectory, `${target.name}-Swift${args.nativeHeaderDeclarations?.[target.name] ? ".original" : ""}.h`))}` : "";
     const clangMode = target.cxxInterop ? "" : ', "-Xcc", "-fno-cxx-modules"';
-    const swiftSettings = `swiftSettings: [.swiftLanguageMode(.v${target.languageMode}),${isolation}${interoperability}${defines}${features}${upcoming} .unsafeFlags(${swiftFlagArray(`["-Osize", "-Xfrontend", "-enable-cross-import-overlays"${overlayFlags}${FOUNDATION_IMPLICIT_FLAGS}${oneModule ? ONE_IMPLICIT_FLAGS : ""}${imports}${nativeImportFlags}${objcFlags}${header}${clangMode}${upstream}]`)})]`;
+    const deployment = `, "-Xfrontend", "-peach-ios-deployment-target", "-Xfrontend", ${JSON.stringify(target.iosDeploymentTarget ?? SWIFTPM_DEFAULT_IOS_DEPLOYMENT_TARGET)}`;
+    const swiftSettings = `swiftSettings: [.swiftLanguageMode(.v${target.languageMode}),${isolation}${interoperability}${defines}${features}${upcoming} .unsafeFlags(${swiftFlagArray(`["-Osize", "-Xfrontend", "-enable-cross-import-overlays"${overlayFlags}${FOUNDATION_IMPLICIT_FLAGS}${oneModule ? ONE_IMPLICIT_FLAGS : ""}${imports}${nativeImportFlags}${objcFlags}${header}${clangMode}${deployment}${upstream}]`)})]`;
     const deps = [
       .../* @__PURE__ */ new Set([
         ...(target.dependencies ?? []).flatMap(
@@ -13146,6 +13488,7 @@ function syncSwiftTree(base, files) {
 }
 var DIRECTIVE = /^[ \t]*#(?:if|elseif)\b/;
 var OS_IOS = /\b(?:os\(\s*iOS\s*\)|targetEnvironment\(\s*simulator\s*\))/g;
+var NOT_ON_IOS = /\b(?:os\(\s*WASI\s*\)|canImport\(\s*FoundationNetworking\s*\))/g;
 var DELEGATE_CLASS = /^class\s+[A-Za-z_]\w*\s*(?:<[^>{]*>)?\s*:[^{]*\b(?:UIApplicationDelegate|UISceneDelegate|UIWindowSceneDelegate)\b[^{]*\{/;
 function compiledSwiftSources(files, targets, overlayFrameworks) {
   const ordered = [...targets].sort((a, b) => b.path.length - a.path.length);
@@ -13160,14 +13503,14 @@ function compiledSwiftSources(files, targets, overlayFrameworks) {
         );
       });
       const manifest = /(?:^|\/)Package(?:@swift-[\d.]+)?\.swift$/.test(file);
-      return [
-        file,
-        manifest && (!owner || /^Package(?:@swift-[\d.]+)?\.swift$/.test(file)) ? source : swiftSourceAsIOS(
-          source,
-          overlayFrameworks,
-          owner?.defines?.includes(SWIFT_XCODE_BUILD_CONDITION) && !owner.defines.includes("SWIFT_PACKAGE") ? false : void 0
-        )
-      ];
+      if (manifest && (!owner || /^Package(?:@swift-[\d.]+)?\.swift$/.test(file)))
+        return [file, source];
+      const ios = swiftSourceAsIOS(
+        source,
+        overlayFrameworks,
+        owner?.defines?.includes(SWIFT_XCODE_BUILD_CONDITION) && !owner.defines.includes("SWIFT_PACKAGE") ? false : void 0
+      );
+      return [file, withPreconcurrencyFoundationModules(ios)];
     })
   );
 }
@@ -13818,16 +14161,22 @@ function foundationOwnerOf(name2) {
     return "PeachFoundation";
   return void 0;
 }
-function swiftSourceAsIOS(source, overlayFrameworks, swiftPackage) {
-  const { lineStarts, tokens } = swiftCodeScan(source);
+function swiftPackageSourceAsIOS(source) {
+  return swiftConditionsAsIOS(source, swiftCodeScan(source).lineStarts);
+}
+function swiftConditionsAsIOS(source, lineStarts, swiftPackage) {
   let offset = 0;
-  const conditioned = source.split("\n").map((line) => {
+  return source.split("\n").map((line) => {
     const start = offset;
     offset += line.length + 1;
     if (!lineStarts.has(start) || !DIRECTIVE.test(line)) return line;
-    const platform = line.replace(OS_IOS, (match) => "true".padEnd(match.length));
+    const platform = line.replace(OS_IOS, (match) => "true".padEnd(match.length)).replace(NOT_ON_IOS, (match) => "false".padEnd(match.length));
     return swiftPackage === false ? platform.replace(/\bSWIFT_PACKAGE\b/g, (match) => "false".padEnd(match.length)) : platform;
   }).join("\n");
+}
+function swiftSourceAsIOS(source, overlayFrameworks, swiftPackage) {
+  const { lineStarts, tokens } = swiftCodeScan(source);
+  const conditioned = swiftConditionsAsIOS(source, lineStarts, swiftPackage);
   let out = "";
   let copied = 0;
   const sceneLifecycleBodies = /* @__PURE__ */ new Set();
@@ -14284,7 +14633,7 @@ var wasmMacroEnvironment = {
   ...emptyMacroEnvironment,
   defines: /* @__PURE__ */ new Map([
     ["__wasm__", "1"],
-    ["__wasm32__", "1"],
+    ["__wasm64__", "1"],
     ["__wasi__", "1"]
   ])
 };
@@ -15777,8 +16126,15 @@ module ${moduleName}.Swift {
       }) + moduleFiles
     );
   }
-  for (const [file, bytes] of Object.entries(input.packageFiles ?? {}))
-    files.set(import_node_path27.default.join(layout2.root, file), Buffer.from(bytes, "base64"));
+  for (const [file, bytes] of Object.entries(input.packageFiles ?? {})) {
+    const contents = Buffer.from(bytes, "base64");
+    files.set(
+      import_node_path27.default.join(layout2.root, file),
+      file.endsWith(".swift") && !/(?:^|\/)Package(?:@swift-[\d.]+)?\.swift$/.test(file) ? withPreconcurrencyFoundationModules(
+        swiftPackageSourceAsIOS(contents.toString("utf8"))
+      ) : contents
+    );
+  }
   for (const [file, bytes] of Object.entries(input.projectFiles ?? {})) {
     const destination = import_node_path27.default.join(layout2.root, file);
     if (files.has(destination)) continue;
@@ -15795,14 +16151,36 @@ module ${moduleName}.Swift {
         )
       ] : []
     ];
+    const clangWrapper2 = import_node_path27.default.join(layout2.root, CLANG_TARGET_MODULE_WRAPPER);
+    files.set(
+      clangWrapper2,
+      [
+        "#!/bin/sh",
+        "name=",
+        "prev=",
+        'for arg in "$@"; do',
+        '  if [ "$prev" = -o ]; then name=${arg%/*}; name=${name##*/}; fi',
+        "  prev=$arg",
+        "done",
+        "case $name in",
+        `  *.build) exec '${import_node_path27.default.join(nativeToolchain(), "clang")}' "-fmodule-name=\${name%.build}" "$@" ;;`,
+        `  *) exec '${import_node_path27.default.join(nativeToolchain(), "clang")}' "$@" ;;`,
+        "esac",
+        ""
+      ].join("\n")
+    );
     files.set(
       import_node_path27.default.join(layout2.root, ".peach-target-toolset.json"),
       JSON.stringify({
         schemaVersion: "1.0",
-        ...nativeToolsetFlags.length > 0 ? {
-          cCompiler: { extraCLIOptions: nativeToolsetFlags },
-          cxxCompiler: { extraCLIOptions: nativeToolsetFlags }
-        } : {},
+        cCompiler: {
+          extraCLIOptions: [
+            ...nativeToolsetFlags,
+            "-fmodules",
+            `-fmodules-cache-path=${import_node_path27.default.join(layout2.root, ".build", "ModuleCache")}`
+          ]
+        },
+        ...nativeToolsetFlags.length > 0 ? { cxxCompiler: { extraCLIOptions: nativeToolsetFlags } } : {},
         swiftCompiler: {
           extraCLIOptions: [
             ...headerAliasFlags.flatMap((flag) => ["-Xcc", flag]),
@@ -15883,6 +16261,8 @@ module ${moduleName}.Swift {
       "// dependency targets emit their native compatibility headers.\n"
     );
   syncSwiftTree(layout2.root, files);
+  const clangWrapper = import_node_path27.default.join(layout2.root, CLANG_TARGET_MODULE_WRAPPER);
+  if (files.has(clangWrapper)) (0, import_node_fs25.chmodSync)(clangWrapper, 493);
   const dependencies = new Map(
     swiftManifestTargets(
       (0, import_node_fs25.readFileSync)(import_node_path27.default.join(layout2.root, "Package.swift"), "utf8")
@@ -16329,6 +16709,9 @@ async function buildFrameworkProducts(scratch2, args) {
       "release",
       "-Xswiftc",
       "-Osize",
+      // the release link strips all debug info, so none is generated
+      "-Xswiftc",
+      "-gnone",
       "-Xswiftc",
       "-num-threads",
       "-Xswiftc",
@@ -16829,12 +17212,13 @@ function compileSwiftProjectOnce(input, options) {
               ] : []
             );
             const projectProcess = options.project ? prepareSwiftProjectProcess(root, options.project) : void 0;
+            const compiler = preparation.targetToolset ? { CC: import_node_path27.default.join(root, CLANG_TARGET_MODULE_WRAPPER) } : {};
             const appOptions = projectProcess ? {
               ...buildOptions,
               uid: projectProcess.uid,
               gid: projectProcess.gid,
-              confined: projectProcess.env
-            } : buildOptions;
+              confined: { ...projectProcess.env, ...compiler }
+            } : { ...buildOptions, env: { ...buildOptions.env, ...compiler } };
             const unprepared = preparation.targetFailures.map(
               (failure) => `error: target ${failure}`
             );
@@ -16864,6 +17248,9 @@ function compileSwiftProjectOnce(input, options) {
               ...preparation.targetToolset ? ["--toolset", import_node_path27.default.join(root, ".peach-target-toolset.json")] : [],
               "-c",
               "release",
+              // the link strips debug info, so none is generated (as for the framework)
+              "-Xswiftc",
+              "-gnone",
               "-Xswiftc",
               "-num-threads",
               "-Xswiftc",
@@ -16897,6 +17284,51 @@ function compileSwiftProjectOnce(input, options) {
             if ((0, import_node_fs25.existsSync)(linked) && (0, import_node_fs25.statSync)(linked).size <= 8)
               (0, import_node_fs25.rmSync)(linked, { force: true });
             report("compiling and linking Swift modules");
+            const frameworkInterfaces = /* @__PURE__ */ new Map();
+            const frameworkInterface = (name2) => {
+              if (frameworkInterfaces.has(name2)) return frameworkInterfaces.get(name2);
+              const source = distribution ? import_node_path27.default.join(frameworkRoot, "modules", `${name2}-Swift.h`) : import_node_path27.default.join(
+                prebuilt.modules,
+                "..",
+                `${name2}.build/include/${name2}-Swift.h`
+              );
+              if (!(0, import_node_fs25.existsSync)(source)) {
+                frameworkInterfaces.set(name2, null);
+                return null;
+              }
+              const headers = import_node_path27.default.join(
+                swiftSdkPaths(frameworkRoot, options.toolchainBin).darwin,
+                `System/Library/Frameworks/${name2}.framework/Headers`
+              );
+              const declared = /* @__PURE__ */ new Set();
+              if ((0, import_node_fs25.existsSync)(headers)) {
+                for (const file of (0, import_node_fs25.readdirSync)(headers, {
+                  recursive: true,
+                  encoding: "utf8"
+                }))
+                  if (file.endsWith(".h"))
+                    for (const name3 of swiftInterfaceDeclarations(
+                      (0, import_node_fs25.readFileSync)(import_node_path27.default.join(headers, file), "utf8")
+                    ))
+                      declared.add(name3);
+              }
+              const header = withoutSwiftDeclarations(
+                clangInterfaceHeader((0, import_node_fs25.readFileSync)(source, "utf8")),
+                declared,
+                `#import <${name2}/${name2}.h>`
+              );
+              const value = {
+                file: import_node_path27.default.join(root, ".build/peach-framework-objc", `${name2}-Swift.h`),
+                header
+              };
+              frameworkInterfaces.set(name2, value);
+              writeBuildFile(
+                value.file,
+                ((0, import_node_fs25.existsSync)(import_node_path27.default.join(headers, `${name2}.h`)) ? `#import <${name2}/${name2}.h>
+` : "") + swiftHeaderWithSuperclassImports(header, frameworkInterface)
+              );
+              return value;
+            };
             try {
               const headerBuilds = preparation.headerProductTarget ? [
                 ...Object.keys(preparation.nativeHeaderDeclarations),
@@ -16924,7 +17356,10 @@ function compileSwiftProjectOnce(input, options) {
                     writeBuildFile(
                       emitted,
                       withoutSwiftDeclarations(
-                        clangInterfaceHeader((0, import_node_fs25.readFileSync)(original, "utf8")),
+                        swiftHeaderWithSuperclassImports(
+                          clangInterfaceHeader((0, import_node_fs25.readFileSync)(original, "utf8")),
+                          frameworkInterface
+                        ),
                         new Set(preparation.nativeHeaderDeclarations[producer]),
                         `#import <${producer}/${producer}.h>`
                       )
@@ -17041,16 +17476,15 @@ function compileSwiftProjectOnce(input, options) {
                 output,
                 optimized
               });
-            else if (input.optimize) await optimizeWasm(output, optimized);
-            const executable = input.optimize ? optimized : output;
+            else await lowerWasm(output, optimized, { optimize: input.optimize === true });
             await runCompiler(
               import_node_path27.default.join(options.toolchainBin, "llvm-objcopy"),
-              ["--remove-section=.swift1_autolink_entries", executable],
+              ["--remove-section=.swift1_autolink_entries", optimized],
               buildOptions
             );
             const artifact = {
               hash,
-              bytes: (0, import_node_fs25.readFileSync)(executable),
+              bytes: (0, import_node_fs25.readFileSync)(optimized),
               icu: await icu
             };
             if (artifact.bytes.length <= 8)
@@ -17101,6 +17535,7 @@ function compileSwiftProjectOnce(input, options) {
   swiftCompileSdkOptions,
   swiftCrossImportFlags,
   swiftDistributionAt,
+  swiftHeaderWithSuperclassImports,
   swiftIcuAddress,
   swiftIcuAsset,
   swiftIcuBundleAsset,
@@ -17125,6 +17560,7 @@ function compileSwiftProjectOnce(input, options) {
   swiftTypedApplicationEntry,
   syncSwiftTree,
   withNativeSourceGlue,
+  withPreconcurrencyFoundationModules,
   withoutSwiftDeclarations,
   wrapUIApplicationMainEntry,
   writeSwiftProject