peachsim 0.1.2190 → 0.1.2192

package/src/swift-compile.ts

@@ -2255,6 +2255,11 @@ export function emitSwiftPackageManifest(args: {
       ...(!native?.clang && target.publicHeadersPath !== undefined
         ? [`      publicHeadersPath: ${JSON.stringify(target.publicHeadersPath)},`]
         : []),
+      // swiftpm appends the root package's name after a target's own flags
+      // unless the target opts out of package access
+      ...(!clang && target.swiftFlags?.includes('-package-name')
+        ? ['      packageAccess: false,']
+        : []),
       // the native backend supplies dependency module maps without their
       // compiled modules. textual c++ includes keep those dependencies usable.
       `      ${clang ? nativeSettings : swiftSettings}${link}`,
@@ -2733,117 +2738,6 @@ const FOUNDATION_OVERLAY_GLOBALS = new Set([
   'NSFileErrorMinimum',
   'NSFormattingErrorMaximum',
   'NSFormattingErrorMinimum',
-  'NSFoundationVersionNumber',
-  'NSFoundationVersionNumber10_0',
-  'NSFoundationVersionNumber10_1',
-  'NSFoundationVersionNumber10_10',
-  'NSFoundationVersionNumber10_10_1',
-  'NSFoundationVersionNumber10_10_2',
-  'NSFoundationVersionNumber10_10_3',
-  'NSFoundationVersionNumber10_10_4',
-  'NSFoundationVersionNumber10_10_5',
-  'NSFoundationVersionNumber10_10_Max',
-  'NSFoundationVersionNumber10_11',
-  'NSFoundationVersionNumber10_11_1',
-  'NSFoundationVersionNumber10_11_2',
-  'NSFoundationVersionNumber10_11_3',
-  'NSFoundationVersionNumber10_11_4',
-  'NSFoundationVersionNumber10_11_Max',
-  'NSFoundationVersionNumber10_1_1',
-  'NSFoundationVersionNumber10_1_2',
-  'NSFoundationVersionNumber10_1_3',
-  'NSFoundationVersionNumber10_1_4',
-  'NSFoundationVersionNumber10_2',
-  'NSFoundationVersionNumber10_2_1',
-  'NSFoundationVersionNumber10_2_2',
-  'NSFoundationVersionNumber10_2_3',
-  'NSFoundationVersionNumber10_2_4',
-  'NSFoundationVersionNumber10_2_5',
-  'NSFoundationVersionNumber10_2_6',
-  'NSFoundationVersionNumber10_2_7',
-  'NSFoundationVersionNumber10_2_8',
-  'NSFoundationVersionNumber10_3',
-  'NSFoundationVersionNumber10_3_1',
-  'NSFoundationVersionNumber10_3_2',
-  'NSFoundationVersionNumber10_3_3',
-  'NSFoundationVersionNumber10_3_4',
-  'NSFoundationVersionNumber10_3_5',
-  'NSFoundationVersionNumber10_3_6',
-  'NSFoundationVersionNumber10_3_7',
-  'NSFoundationVersionNumber10_3_8',
-  'NSFoundationVersionNumber10_3_9',
-  'NSFoundationVersionNumber10_4',
-  'NSFoundationVersionNumber10_4_1',
-  'NSFoundationVersionNumber10_4_10',
-  'NSFoundationVersionNumber10_4_11',
-  'NSFoundationVersionNumber10_4_2',
-  'NSFoundationVersionNumber10_4_3',
-  'NSFoundationVersionNumber10_4_4_Intel',
-  'NSFoundationVersionNumber10_4_4_PowerPC',
-  'NSFoundationVersionNumber10_4_5',
-  'NSFoundationVersionNumber10_4_6',
-  'NSFoundationVersionNumber10_4_7',
-  'NSFoundationVersionNumber10_4_8',
-  'NSFoundationVersionNumber10_4_9',
-  'NSFoundationVersionNumber10_5',
-  'NSFoundationVersionNumber10_5_1',
-  'NSFoundationVersionNumber10_5_2',
-  'NSFoundationVersionNumber10_5_3',
-  'NSFoundationVersionNumber10_5_4',
-  'NSFoundationVersionNumber10_5_5',
-  'NSFoundationVersionNumber10_5_6',
-  'NSFoundationVersionNumber10_5_7',
-  'NSFoundationVersionNumber10_5_8',
-  'NSFoundationVersionNumber10_6',
-  'NSFoundationVersionNumber10_6_1',
-  'NSFoundationVersionNumber10_6_2',
-  'NSFoundationVersionNumber10_6_3',
-  'NSFoundationVersionNumber10_6_4',
-  'NSFoundationVersionNumber10_6_5',
-  'NSFoundationVersionNumber10_6_6',
-  'NSFoundationVersionNumber10_6_7',
-  'NSFoundationVersionNumber10_6_8',
-  'NSFoundationVersionNumber10_7',
-  'NSFoundationVersionNumber10_7_1',
-  'NSFoundationVersionNumber10_7_2',
-  'NSFoundationVersionNumber10_7_3',
-  'NSFoundationVersionNumber10_7_4',
-  'NSFoundationVersionNumber10_8',
-  'NSFoundationVersionNumber10_8_1',
-  'NSFoundationVersionNumber10_8_2',
-  'NSFoundationVersionNumber10_8_3',
-  'NSFoundationVersionNumber10_8_4',
-  'NSFoundationVersionNumber10_9',
-  'NSFoundationVersionNumber10_9_1',
-  'NSFoundationVersionNumber10_9_2',
-  'NSFoundationVersionNumber_iOS_4_0',
-  'NSFoundationVersionNumber_iOS_4_1',
-  'NSFoundationVersionNumber_iOS_4_2',
-  'NSFoundationVersionNumber_iOS_4_3',
-  'NSFoundationVersionNumber_iOS_5_0',
-  'NSFoundationVersionNumber_iOS_5_1',
-  'NSFoundationVersionNumber_iOS_6_0',
-  'NSFoundationVersionNumber_iOS_6_1',
-  'NSFoundationVersionNumber_iOS_7_0',
-  'NSFoundationVersionNumber_iOS_7_1',
-  'NSFoundationVersionNumber_iOS_8_0',
-  'NSFoundationVersionNumber_iOS_8_1',
-  'NSFoundationVersionNumber_iOS_8_2',
-  'NSFoundationVersionNumber_iOS_8_3',
-  'NSFoundationVersionNumber_iOS_8_4',
-  'NSFoundationVersionNumber_iOS_8_x_Max',
-  'NSFoundationVersionNumber_iOS_9_0',
-  'NSFoundationVersionNumber_iOS_9_1',
-  'NSFoundationVersionNumber_iOS_9_2',
-  'NSFoundationVersionNumber_iOS_9_3',
-  'NSFoundationVersionNumber_iOS_9_4',
-  'NSFoundationVersionNumber_iOS_9_x_Max',
-  'NSFoundationVersionNumber_iPhoneOS_2_0',
-  'NSFoundationVersionNumber_iPhoneOS_2_1',
-  'NSFoundationVersionNumber_iPhoneOS_2_2',
-  'NSFoundationVersionNumber_iPhoneOS_3_0',
-  'NSFoundationVersionNumber_iPhoneOS_3_1',
-  'NSFoundationVersionNumber_iPhoneOS_3_2',
   'NSFoundationVersionWithFileManagerResourceForkSupport',
   'NSFreeHashTable',
   'NSFreeMapTable',
@@ -4328,7 +4222,13 @@ export function writeSwiftProject(
   for (const file of Object.keys(input.files)) {
     if (!file.endsWith('.swift')) continue
     const target = bySourcePath.find(
-      (candidate) => candidate.path === '.' || file.startsWith(`${candidate.path}/`),
+      (candidate) =>
+        (candidate.path === '.' || file.startsWith(`${candidate.path}/`)) &&
+        (candidate.sources === undefined ||
+          candidate.sources.some((source) => {
+            const selected = path.posix.join(candidate.path, source)
+            return file === selected || file.startsWith(`${selected}/`)
+          })),
     )
     // swiftpm never compiles an excluded file (a prebuilt core's Swift)
     const excluded = target?.exclude?.some(
@@ -4401,9 +4301,17 @@ export function writeSwiftProject(
   }
   const targetEntries = (target: SwiftPackageTarget) => {
     const prefix = target.path === '.' ? '' : `${target.path}/`
+    // targets may share a directory and pick their compiled files with `sources`;
+    // swiftpm leaves every header on disk for relative includes
     return Object.entries(input.files).filter(
       ([file]) =>
         file.startsWith(prefix) &&
+        (target.sources === undefined ||
+          !(file.endsWith('.swift') || isSwiftNativeTranslationUnit(file)) ||
+          target.sources.some((source) => {
+            const selected = path.posix.join(prefix, source)
+            return file === selected || file.startsWith(`${selected}/`)
+          })) &&
         !target.exclude?.some(
           (excluded) =>
             file === `${prefix}${excluded}` || file.startsWith(`${prefix}${excluded}/`),
@@ -4615,8 +4523,7 @@ export function writeSwiftProject(
       )) {
         const include = match[1]!
         const producer = /(?:^|\/)([^/]+)-Swift\.h$/.exec(include)?.[1]
-        if (producer && targets.some((value) => value.name === producer))
-          producers.add(producer)
+        if (producer && swiftTargets.has(producer)) producers.add(producer)
         const local = [
           path.posix.join(path.posix.dirname(file), include),
           `${includes}${include}`,

package/src/swift-distribution.lock.json

@@ -1,10 +1,10 @@
 {
-  "id": "2405235872029d30",
+  "id": "87fc4d2ff9d5d588",
   "release": "swift-6.4.0-RELEASE-custom-11345d60dca47496",
-  "wasmSdkId": "swift-6.4.0-RELEASE_wasm-peach-3452e5a2",
-  "wasmSdkUrl": "https://r2.sootsim.com/swift-wasm-sdk/swift-6.4.0-RELEASE_wasm-peach-3452e5a2.artifactbundle.tar.gz",
-  "wasmSdkChecksum": "fe042506d9418d5b73a3a30d62157931439c23e3bcb869871a0fcb8747223a02",
-  "source": "cdb449bf1d82ad311bfa5b7ce329fd557d753be6",
+  "wasmSdkId": "swift-6.4.0-RELEASE_wasm-peach-19471d4b",
+  "wasmSdkUrl": "https://r2.sootsim.com/swift-wasm-sdk/swift-6.4.0-RELEASE_wasm-peach-19471d4b.artifactbundle.tar.gz",
+  "wasmSdkChecksum": "764c16e7e34156bf90d6c3372a2b77b98b9d8c3470235520d0f9619f90f33456",
+  "source": "08519cc5f11db43a2f85f28c47ec6c8930843f93",
   "targets": [
     "ImagePlayground",
     "QuickLookThumbnailing",
@@ -131,6 +131,12 @@
     "CryptoKit",
     "CryptoTokenKit",
     "TikTokBusinessSDK",
+    "EXUpdatesInterface",
+    "EXManifests",
+    "EASClient",
+    "EXStructuredHeaders",
+    "EXUpdatesBSPatch",
+    "Reachability",
     "EXUpdates",
     "nSure",
     "TOCropViewController",
@@ -238,16 +244,16 @@
   },
   "hosts": {
     "darwin-arm64": {
-      "sha256": "58613631263d88f7717d8eae765f2b60485cc5b5f855c07d7945bae221ddc96e",
-      "size": 101433697
+      "sha256": "7444ad87688bb551601a49fee6b48d15978fcd877982a25a944280f553f439b5",
+      "size": 103297800
     },
     "linux-x64": {
-      "sha256": "974238270fadebc4d5ab105a808f4e96a6b8c2b594e3fea6b5313be8f4d5ac7a",
-      "size": 104150538
+      "sha256": "03edd8359c024c592bb53b8917d9efc59f9b76871966b41189838deb2b9c27f2",
+      "size": 106017072
     },
     "linux-arm64": {
-      "sha256": "62e2f1537e2418fb8a49e97004f2646aaaa8ea1cb3b2b0ff5426e16fdc7a7281",
-      "size": 103641611
+      "sha256": "00a89f46a581f73ea6b0343f21fa330bbe1ae444a1d29ad7251e87a86e4bc91b",
+      "size": 105508093
     }
   }
 }

package/src/swift-distribution.ts

@@ -10,7 +10,7 @@ import os from 'node:os'
 import path from 'node:path'
 import { installVerifiedTarball } from '@contrast/runtime-delivery'
 import { ensureLinuxBrowserLibraries } from '../cli/drivers/linux-browser-libs'
-import { peachSwiftSdksDir, rnxHomeDir } from './home-paths'
+import { rnxHomeDir } from './home-paths'
 import { swiftDistributionAt, swiftModuleSdk } from './swift-compile'
 import {
   SWIFT_DISTRIBUTION_MANIFEST,
@@ -22,6 +22,7 @@ import {
   confineSwiftScratch,
   ensureSwiftLinuxRuntime,
   installSwiftWasmSdk,
+  peachSwiftSdksDir,
   privateSwiftDistributionRoot,
   SWIFT_PRIVATE_DISTRIBUTION_ENV,
   swiftCompiler,
@@ -208,7 +209,6 @@ async function installSwiftToolchain(
   signal?: AbortSignal,
   compilerOnly = false,
 ): Promise<string> {
-  process.env.PEACH_SWIFT_SDKS_PATH = peachSwiftSdksDir()
   const root = path.resolve(swiftToolchainBin(release), '../..')
   // macOS installs where the locator looks first, the user's Toolchains
   // directory, and only into a directory without a compiler; linux installs
@@ -260,7 +260,7 @@ async function installSwiftToolchain(
   const ready = swiftToolchainReady(release, sdk)
   if (ready) return ready
   signal?.throwIfAborted()
-  const directory = process.env.PEACH_SWIFT_SDKS_PATH
+  const directory = peachSwiftSdksDir()
   process.stderr.write(`peach: installing Swift SDK ${sdk.wasmSdkId} to ${directory}…\n`)
   try {
     installSwiftWasmSdk(release, sdk)

package/src/swift-host.ts

@@ -1078,13 +1078,17 @@ async function buildXcodeLayout(root: string): Promise<XcodeLayout | null> {
             feature.configuration === packageConfiguration,
         )
         .map((feature) => feature.name),
-      swiftFlags: target.packageSwiftFlags
-        .filter(
-          (setting) =>
-            setting.configuration === null ||
-            setting.configuration === packageConfiguration,
-        )
-        .flatMap((setting) => setting.flags),
+      // the flat build gives every module one package; swiftpm names each
+      // module for its own package, which `@retroactive` and `package` read
+      swiftFlags: ['-package-name', swiftPackageIdentity(target.packageDir)].concat(
+        target.packageSwiftFlags
+          .filter(
+            (setting) =>
+              setting.configuration === null ||
+              setting.configuration === packageConfiguration,
+          )
+          .flatMap((setting) => setting.flags),
+      ),
       linkedLibraries: target.packageLibraries
         .filter(
           (library) =>
@@ -1575,7 +1579,7 @@ function xcodeManifest(layout: XcodeLayout): string {
     ...layout.targets.map((target) =>
       target.systemLibrary
         ? `  .systemLibrary(name: "${target.name}", path: "${target.path}"),`
-        : `  .target(name: "${target.name}", ${target.dependencies === undefined ? '' : `dependencies: [${dependencies(target)}], `}path: "${target.path}", ${target.exclude.length > 0 ? `exclude: ${JSON.stringify(target.exclude)}, ` : ''}${target.resources ? 'resources: [], ' : ''}${target.publicHeadersPath === undefined ? '' : `publicHeadersPath: ${JSON.stringify(target.publicHeadersPath)}, `}${clangSettings(target)}${swiftManifestSettings(target)}${libraries(target)}),`,
+        : `  .target(name: "${target.name}", ${target.dependencies === undefined ? '' : `dependencies: [${dependencies(target)}], `}path: "${target.path}", ${target.exclude.length > 0 ? `exclude: ${JSON.stringify(target.exclude)}, ` : ''}${target.sources === undefined ? '' : `sources: ${JSON.stringify(target.sources)}, `}${target.resources ? 'resources: [], ' : ''}${target.publicHeadersPath === undefined ? '' : `publicHeadersPath: ${JSON.stringify(target.publicHeadersPath)}, `}${clangSettings(target)}${swiftManifestSettings(target)}${libraries(target)}),`,
     ),
     '])',
     '',

package/src/swift-interface-bodies.ts

@@ -119,7 +119,13 @@ export function swiftInterfaceWithoutBodies(text: string, keepDefaults = false):
       continue
     }
     const char = text[i]!
-    if (char === '=' && parens > 0 && text[i - 1] === ' ' && text[i + 1] === ' ') {
+    if (
+      !keepDefaults &&
+      char === '=' &&
+      parens > 0 &&
+      text[i - 1] === ' ' &&
+      text[i + 1] === ' '
+    ) {
       out = out.trimEnd()
       i = skipExpression(text, i + 1)
       continue

package/src/swift-objc-standin.ts

@@ -800,10 +800,11 @@ export function objcView(
         '-module-cache-path',
         moduleCache,
         '-minimum-access-level',
-        // symbol graphs hide public underscored names at the public threshold.
-        // original clang headers remain the declaration boundary, and a swift
-        // overlay names its underscored and spi declarations.
-        original || surface.interface ? 'internal' : 'public',
+        // symbol graphs hide public underscored names at the public threshold,
+        // including a function with an underscored parameter. clang headers
+        // remain the declaration boundary, and a swift overlay names its
+        // underscored and spi declarations.
+        'internal',
         ...(surface.interface ? ['-include-spi-symbols'] : []),
         '-skip-synthesized-members',
         '-omit-extension-block-symbols',
@@ -928,6 +929,16 @@ export function objcView(
   // clang's builtin typedefs (stddef's size_t), which an apple sdk keeps in
   // their own builtin modules.
   const ownHeaders = new Set(headerFiles(headersDir).map((name) => path.basename(name)))
+  // the graph prints a c function pointer typedef as a plain function type,
+  // whose function-typed parameters swift treats as non-escaping; the importer
+  // gives every c function pointer @convention(c), which always escapes
+  const functionPointers = new Set(
+    [...originals.values()].flatMap((text) =>
+      [...text.matchAll(/\btypedef\b[^;{}]*?\(\s*\*\s*(\w+)\s*\)\s*\(/g)].map(
+        (match) => match[1]!,
+      ),
+    ),
+  )
   const graphs = fs
     .readdirSync(out)
     .filter((name) => name.endsWith('.symbols.json'))
@@ -936,10 +947,37 @@ export function objcView(
       const graph: SymbolGraph = JSON.parse(fs.readFileSync(path.join(out, name), 'utf8'))
       return {
         ...graph,
-        symbols: graph.symbols.filter((symbol) => {
-          const header = /^c:([^@]+\.h)@/.exec(symbol.identifier.precise)?.[1]
-          return !header || ownHeaders.has(header)
-        }),
+        symbols: graph.symbols
+          .filter((symbol) => {
+            const header = /^c:([^@]+\.h)@/.exec(symbol.identifier.precise)?.[1]
+            return !header || ownHeaders.has(header)
+          })
+          .map((symbol) => {
+            if (
+              symbol.kind.identifier !== 'swift.typealias' ||
+              !symbol.identifier.precise.startsWith('c:') ||
+              !functionPointers.has(symbol.pathComponents.at(-1) ?? '')
+            )
+              return symbol
+            const fragments = symbol.declarationFragments ?? []
+            const equals = fragments.findIndex((fragment) =>
+              fragment.spelling.includes('='),
+            )
+            const arrow = fragments.findLastIndex((fragment) =>
+              fragment.spelling.includes('->'),
+            )
+            return {
+              ...symbol,
+              declarationFragments: fragments.map((fragment, index) =>
+                index > equals &&
+                index < arrow &&
+                fragment.kind === 'typeIdentifier' &&
+                functionPointers.has(fragment.spelling)
+                  ? { ...fragment, spelling: `@escaping ${fragment.spelling}` }
+                  : fragment,
+              ),
+            }
+          }),
       }
     })
   inheritedDefaultInits(stagedSurface, graphs, toolchainBin, search, moduleCache, work)

package/src/swift-packages.ts

@@ -687,6 +687,7 @@ export function resolveSwiftPackages(options: {
         dir: target.dir,
         files,
         exclude: target.exclude,
+        ...(target.sources ? { sources: target.sources } : {}),
         packageDir: pkg.manifest.dir,
         remote: pkg.remote,
         iosDeployment: pkg.manifest.iosDeployment,

package/src/swift-toolchain.ts

@@ -34,22 +34,7 @@ export function sourceSwiftCheckout(): string {
 
 /** swiftpm's SDK directory option, shared by discovery and compilation. */
 export function swiftSdkOptions(): string[] {
-  const directory = process.env.PEACH_SWIFT_SDKS_PATH
-  if (directory) return ['--swift-sdks-path', path.resolve(directory)]
-  // child config is confined, but source checkouts still discover the SDK
-  // from the caller's original linux default, including a custom xdg home.
-  if (scratch && process.platform === 'linux') {
-    const config = process.env.XDG_CONFIG_HOME
-    if (config !== undefined && !path.isAbsolute(config))
-      throw new Error('XDG_CONFIG_HOME must be an absolute path')
-    return [
-      '--swift-sdks-path',
-      config === undefined
-        ? path.join(os.userInfo().homedir, '.swiftpm', 'swift-sdks')
-        : path.join(config, 'swiftpm', 'swift-sdks'),
-    ]
-  }
-  return []
+  return ['--swift-sdks-path', path.resolve(peachSwiftSdksDir())]
 }
 
 // host archives include the official driver/runtime and the qualified patched frontend.
@@ -395,9 +380,22 @@ export function ensureSwiftLinuxRuntime(release: string): void {
     process.stderr.write(`peach: installing Linux runtime libxml2.so.2 into ${root}…\n`)
     const download = `${plan.dest}.${process.pid}.tmp`
     try {
-      execFileSync('curl', ['-fsSL', '--show-error', plan.url, '-o', download], {
-        stdio: 'inherit',
-      })
+      execFileSync(
+        'curl',
+        [
+          '-fsSL',
+          '--show-error',
+          '--retry',
+          '3',
+          '--retry-all-errors',
+          plan.url,
+          '-o',
+          download,
+        ],
+        {
+          stdio: 'inherit',
+        },
+      )
       if (swiftFileChecksum(download) !== plan.checksum)
         throw new Error('declared Linux runtime checksum mismatch')
       fs.renameSync(download, plan.dest)
@@ -573,6 +571,11 @@ export function peachHome(): string {
   return override ? path.resolve(override) : path.join(os.homedir(), '.peach')
 }
 
+/** where the pinned wasm SDK installs unless PEACH_SWIFT_SDKS_PATH names another. */
+export function peachSwiftSdksDir(): string {
+  return process.env.PEACH_SWIFT_SDKS_PATH ?? path.join(peachHome(), 'swift', 'sdks')
+}
+
 export const BUILDERS_ROOT_ENV = 'CONTRAST_BUILDERS_ROOT'
 
 let agentBuildersRoot: string | undefined
@@ -935,10 +938,7 @@ function installSwiftSdkArchive(swift: string, sdk: SwiftWasmSdk, archive: strin
       store,
     ])
     const expected = swiftSdkPayloadChecksum(stagedBundle)
-    const directory = process.env.PEACH_SWIFT_SDKS_PATH
-    const locks = directory
-      ? path.join(path.resolve(directory), '.peach-locks')
-      : path.join(os.homedir(), '.swiftpm', 'builder-locks')
+    const locks = path.join(path.resolve(peachSwiftSdksDir()), '.peach-locks')
     fs.mkdirSync(locks, { recursive: true })
     execFileSync(
       'perl',
@@ -1004,9 +1004,22 @@ export function installSwiftWasmSdk(release: string, sdk: SwiftWasmSdk): void {
     if (sdk.wasmSdkUrl.startsWith('file:'))
       fs.copyFileSync(fileURLToPath(sdk.wasmSdkUrl), archive)
     else
-      execFileSync('curl', ['-fsSL', '--show-error', sdk.wasmSdkUrl, '-o', archive], {
-        stdio: 'inherit',
-      })
+      execFileSync(
+        'curl',
+        [
+          '-fsSL',
+          '--show-error',
+          '--retry',
+          '3',
+          '--retry-all-errors',
+          sdk.wasmSdkUrl,
+          '-o',
+          archive,
+        ],
+        {
+          stdio: 'inherit',
+        },
+      )
     installSwiftSdkArchive(swift, sdk, archive)
     swiftToolchain(release, sdk)
   } finally {
@@ -1166,10 +1179,7 @@ export function swiftSdkInstallStep(release: string, wasmSdk: SwiftWasmSdk): str
 function swiftSdkInstallCommand(release: string, wasmSdk: SwiftWasmSdk): string {
   const { wasmSdkId, wasmSdkUrl, wasmSdkChecksum } = wasmSdk
   const program = `import { installSwiftWasmSdk } from "peachsim/swift-toolchain"; installSwiftWasmSdk(${JSON.stringify(release)}, ${JSON.stringify({ wasmSdkId, wasmSdkUrl, wasmSdkChecksum })})`
-  const directory = process.env.PEACH_SWIFT_SDKS_PATH
-  const environment = directory
-    ? `PEACH_SWIFT_SDKS_PATH='${path.resolve(directory).replaceAll("'", "'\\''")}' `
-    : ''
+  const environment = `PEACH_SWIFT_SDKS_PATH='${path.resolve(peachSwiftSdksDir()).replaceAll("'", "'\\''")}' `
   return `${environment}node --input-type=module -e '${program.replaceAll("'", "'\\''")}'`
 }
 

package/src/swift-wasm-prune.ts

@@ -1121,10 +1121,11 @@ export function pruneSwiftWasmLink(
   const distDir = path.join(moduleRoot, 'lib')
   // the app's own struct and class field descriptors stay: SwiftUI attaches
   // @State and @StateObject by reflecting the app's view structs.
-  // the shim reflects its own wrappers and views (State, ObservedObject, Published), so SwiftUI and Combine keep their descriptors
+  // the shim reflects its own wrappers and views (State, ObservedObject, Published), so SwiftUI and Combine keep their descriptors.
+  // a framework's SwiftUI overlay (_StoreKit_SwiftUI) declares views whose @State and @Environment attach the same way.
   const dropsReflection = (obj: ParsedObject, name: string | undefined) =>
     !!name &&
-    !/^(SwiftUI|Combine)-/.test(path.basename(obj.file)) &&
+    !/^(SwiftUI|Combine|_[A-Za-z0-9]+_SwiftUI)-/.test(path.basename(obj.file)) &&
     (name.startsWith('l__swift5_reflection_descriptor') ||
       (name.startsWith('$s') &&
         (name.endsWith('CMF') || name.endsWith('VMF')) &&

package/src/turbo-runtime.lock.json

@@ -8,11 +8,11 @@
   },
   "compiler": "swift-6.4.0-RELEASE-custom-11345d60dca47496",
   "sdk": {
-    "id": "swift-6.4.0-RELEASE_wasm-peach-3452e5a2",
-    "checksum": "fe042506d9418d5b73a3a30d62157931439c23e3bcb869871a0fcb8747223a02"
+    "id": "swift-6.4.0-RELEASE_wasm-peach-19471d4b",
+    "checksum": "764c16e7e34156bf90d6c3372a2b77b98b9d8c3470235520d0f9619f90f33456"
   },
   "framework": {
-    "distribution": "2405235872029d30",
+    "distribution": "87fc4d2ff9d5d588",
     "wireAbi": "246b8412514b644113e6a26252c8ebd6de49ab4156ac5f5c98bb9e4c2ff2568b"
   },
   "archives": [
@@ -20,71 +20,71 @@
       "headers": {
         "reactNativeJsi": "0f8c2defbca69a27a848a81ae72363073bf9602fd316e57a75811be1a0528358"
       },
-      "sha256": "038855e8522f39ea85557bcafc84eb64ec5d9b155c686dca3cff6fa397de0165",
-      "size": 25395
+      "sha256": "6f416d065d88a6f592f0c34dca2d898f2c1adadeeacc07c2f8f4de453715f298",
+      "size": 25393
     },
     {
       "headers": {
         "reactNativeJsi": "21a624ea24fd17d56bf26832d496fc1177067f89640414c20e6486c7984dfb0a"
       },
-      "sha256": "b815028eb321b50907658ba883329d13204d29368cc598dab5c39b2a249de88f",
+      "sha256": "0c68d14139a733fa990e55fa23224589fe9a74ce82db0ce5b9b52da51211390e",
       "size": 26139
     },
     {
       "headers": {
         "reactNativeJsi": "324aefd8591d9ce688bce7589c4c2b516cd33ecb95d35c47239a87a8fcf6a8da"
       },
-      "sha256": "f8fd89f680b86d8abb42a644db8866eb33ff82b4370a7c373bc054efdec33095",
-      "size": 25395
+      "sha256": "adba5b074a4fc2d6c367de74f24aa4b6273363f8b39c9ad9d15be2775f08a2e1",
+      "size": 25394
     },
     {
       "headers": {
         "reactNativeJsi": "33596664ee7d7a6623f0796a6feb429543316c3a41b211150acda6e1d835286c"
       },
-      "sha256": "9190e3a9f312d8c156aacf727904cf1b9c543b30833f544164daa32e3c005d84",
-      "size": 25168
+      "sha256": "778f943ad7fcfba7060e2f29d2bf9d3d7365c60d09b8e2fcccfe11f95920b321",
+      "size": 25165
     },
     {
       "headers": {
         "reactNativeJsi": "66b2cd5a38511195207f6c8a76aba735f9b9cc66a52a0d00780ffe5d331623f7"
       },
-      "sha256": "89bc0c5214c848b06e50424dcecf1cb0d3b01b058270d606a86c2e799d529c15",
-      "size": 25401
+      "sha256": "06cdf08b6f177a54dbf734f76f23ff192c4eb50238fae5207e923fa8e0cfb4bd",
+      "size": 25398
     },
     {
       "headers": {
         "reactNativeJsi": "96db4e758dd53e9320cef7cad485e00aa06e7a982cefd920f17007de8a5bd9f9"
       },
-      "sha256": "8c0d4fa4b65b44dc649c7401df0832663c837098bb5794b143751073c800e66b",
-      "size": 26139
+      "sha256": "62920d91d1805ae0df3ad0f672f6405575c04df4e66948ea37b4e165f39f8eb5",
+      "size": 26141
     },
     {
       "headers": {
         "reactNativeJsi": "aeab590ddd1218df963462242d3954ce467b0fa88f70e91429e4ffc74d230893"
       },
-      "sha256": "ea3395926d0c9202404ca292fed40561c04537cbc11bb8b49ac8a7d9f983fa60",
+      "sha256": "fab02f584e10cee2197c10b5c488873d5203313e10f07b2940283bee3ae12a57",
       "size": 26138
     },
     {
       "headers": {
         "reactNativeJsi": "b5fb260522384dd7ab07d740cdc534b529922446fcec798341c7817d9eaa49f4"
       },
-      "sha256": "7a17d6b3e143a8cf38d73b18b21e142b40fc2c0076d7a01dfb1837194c977f43",
-      "size": 25268
+      "sha256": "72bbd117ff2d4495f46fceecd0959e8bd2a0647fdf514bf2e2e95922514bcb66",
+      "size": 25267
     },
     {
       "headers": {
         "reactNativeJsi": "c6b391a1e870ccf7cdd534be63582862840f8245b99ebd253317deece1e6ffd5"
       },
-      "sha256": "96f6b7bb8bd33d20ee9b6249c0f747e2d160d80515efbf74f9a263f57d847667",
-      "size": 26142
+      "sha256": "10e28d5ce3eb41c695bef897fa974f8919559558a2b847963047f13ce06dc6a0",
+      "size": 26144
     },
     {
       "headers": {
         "reactNativeJsi": "c8270f1315745ecc204c4209a4f50f58ff6f14b4a385ad6820a69800270b53c6"
       },
-      "sha256": "bf587717d6b32d1e7abc630e952f0c70ea964488f87e83c20028b86781317b6f",
-      "size": 25104
+      "sha256": "52226df9610d8b5f9b47fee6bedbdbaa04df7f2f562213bd8b433a5f998d8aa3",
+      "size": 25105
     }
   ]
 }

package/src/xcode-project.ts

@@ -1509,7 +1509,9 @@ function projectTargets(project: LoadedProject): TargetRef[] {
 }
 
 // an application target peach builds, for the iOS simulator like every
-// target here. one whose SDKROOT names another platform, such as a watchOS
+// target here. xcode builds a multiplatform target for an iOS destination
+// whenever its SUPPORTED_PLATFORMS lists one, whatever SDKROOT names; without
+// that list, a target whose SDKROOT names another platform, such as a watchOS
 // app beside the iOS one, is never the app peach runs.
 function isIosAppTarget(
   ref: TargetRef,
@@ -1524,10 +1526,10 @@ function isIosAppTarget(
     },
     options,
   )
+  const platforms = settingList(get('SUPPORTED_PLATFORMS'))
+  if (platforms.length > 0) return platforms.some(isIosPlatform)
   const sdk = get('SDKROOT')
-  return sdk === 'auto'
-    ? settingList(get('SUPPORTED_PLATFORMS')).some(isIosPlatform)
-    : sdk === '' || isIosPlatform(sdk)
+  return sdk === '' || isIosPlatform(sdk)
 }
 
 // the device or simulator sdk, bare or versioned such as iphonesimulator18.0.