peachsim 0.1.1620 → 0.1.1635

package/src/swift-compiler-digest.ts

@@ -0,0 +1,14 @@
+import { createHash } from 'node:crypto'
+import { readFileSync } from 'node:fs'
+import path from 'node:path'
+
+// the lowering and manifest code in swift-compile.ts and its design-time lowering
+// decide the emitted output, so their text addresses every swift artifact. bundled
+// builds cannot read these files at runtime, so build-cli injects this digest.
+export function swiftCompilerSourceDigest(srcDir: string): string {
+  const hash = createHash('sha256')
+  for (const file of ['swift-compile.ts', 'swift-design-time.ts']) {
+    hash.update(readFileSync(path.join(srcDir, file)))
+  }
+  return hash.digest('hex')
+}

package/src/swift-distribution.lock.json

@@ -1,11 +1,34 @@
 {
-  "id": "64fd4ea71bc39e4f",
-  "release": "swift-6.4.0-RELEASE",
-  "wasmSdkId": "swift-6.4.0-RELEASE_wasm-peach-dc9c8c67",
-  "wasmSdkUrl": "https://r2.sootsim.com/swift-wasm-sdk/swift-6.4.0-RELEASE_wasm-peach-dc9c8c67.artifactbundle.tar.gz",
-  "wasmSdkChecksum": "5d38f795f516ccfef3d7ac869b447cdedcd82a35af9761a65b9f88924eb6a89a",
-  "source": "77fbca997182e53ceb1944e27d8689f469f632c5",
+  "id": "4fdcd218fa180b52",
+  "release": "swift-6.4.0-RELEASE-custom-91504a66b3f012ac",
+  "wasmSdkId": "swift-6.4.0-RELEASE_wasm-peach-7fd9a101",
+  "wasmSdkUrl": "https://r2.sootsim.com/swift-wasm-sdk/swift-6.4.0-RELEASE_wasm-peach-7fd9a101.artifactbundle.tar.gz",
+  "wasmSdkChecksum": "72f7fec1d090d142d26148d6cc0cd5b1ce78da70bb97bd577dc1482eaf0299b2",
+  "source": "80c26dea3c4bbf0e29458c33a3a0e856b0942564",
   "targets": [
+    "System",
+    "_LocationEssentials",
+    "GeoToolbox",
+    "DataDetection",
+    "Accessibility",
+    "Contacts",
+    "CoreML",
+    "EventKit",
+    "CloudKit",
+    "IOSurface",
+    "OpenGLES",
+    "ContactsUI",
+    "CoreLocationUI",
+    "MediaPlayer",
+    "MusicKit",
+    "RealityKit",
+    "SecureElementCredential",
+    "Social",
+    "Speech",
+    "Vision",
+    "VisionKit",
+    "WorkoutKit",
+    "_PassKit_SwiftUI",
     "ExpoModulesCore",
     "_MapKit_SwiftUI",
     "PeachJSON",
@@ -13,14 +36,17 @@
     "FoundationNetworking",
     "DeveloperToolsSupport",
     "SwiftUI",
+    "os_workgroup",
     "Dispatch",
     "DarwinRecords",
     "Darwin",
     "MachO",
     "ObjectiveC",
     "PeachObjC",
+    "UIUtilities",
     "UIKitCore",
     "PeachICU",
+    "PeachCMark",
     "CoreImage",
     "QuartzCore",
     "CoreGraphics",
@@ -51,6 +77,7 @@
     "ActivityKit",
     "SwiftData",
     "UIKit",
+    "React",
     "Combine",
     "PeachFoundationCombine",
     "AppIntents",
@@ -132,6 +159,7 @@
     "systemVersion": ["string"],
     "colorScheme": ["string:light", "string:dark"],
     "semanticColors": ["object"],
+    "imageAssets": ["object"],
     "locale": ["string"],
     "dynamicTypeSize": [
       "string:xSmall",
@@ -153,16 +181,16 @@
   },
   "hosts": {
     "darwin-arm64": {
-      "sha256": "6b60bae2bc91957af3baee5e9cad44200f15ff3840d8e70afa5ddc63413d880f",
-      "size": 58565898
+      "sha256": "2b6768539f39bbdc2d77447fc91b00e9a7ee2d9ed732ea10e67a7b05c1c854ea",
+      "size": 69899802
     },
     "linux-x64": {
-      "sha256": "d97e287ca5d7ea0d00dfc9db60be746aec35a9b7412299461ce0d5e77f38b7a8",
-      "size": 58569694
+      "sha256": "2d357dc6c24559b1e4f792c4142de2608e2dd91a2b322c74013af31a9346ad6e",
+      "size": 69902826
     },
     "linux-arm64": {
-      "sha256": "495fe6adc7cf1c8ec9fc8de3410c976e65a7ff051ca50ee3f6d0d3fee8aa2c5d",
-      "size": 58567328
+      "sha256": "fdbdc2b25d102db38da6c00e74c6d198b87537aefe74365ef65793ec6feb3faa",
+      "size": 69900830
     }
   }
 }

package/src/swift-distribution.ts

@@ -27,13 +27,23 @@ export interface SwiftModule {
   toolchainBin: string
 }
 
-const installs = new Map<string, Promise<string>>()
+const installs = new Map<
+  string,
+  {
+    promise: Promise<string>
+    controller: AbortController
+    clients: number
+  }
+>()
 
 /** the installed distribution's root, downloading it on first use, or null
  *  when PEACH_SWIFT_ENDPOINT is unset. */
-export function swiftDistributionRoot(): Promise<string | null> {
+export async function swiftDistributionRoot(
+  signal?: AbortSignal,
+): Promise<string | null> {
+  signal?.throwIfAborted()
   const endpoint = process.env[SWIFT_ENDPOINT_ENV]?.trim().replace(/\/+$/, '')
-  if (!endpoint) return Promise.resolve(null)
+  if (!endpoint) return null
   const lock = parseSwiftDistributionLock(lockJson)
   const host = swiftDistributionHost(process.platform, process.arch)
   if (!host) {
@@ -46,13 +56,16 @@ export function swiftDistributionRoot(): Promise<string | null> {
   swiftToolchain(lock.release, lock)
   const dir = path.join(rnxHomeDir(), 'swift', `${lock.id}-${host}`)
   let pending = installs.get(dir)
+  if (pending?.controller.signal.aborted) pending = undefined
   if (!pending) {
-    pending = (async () => {
+    const controller = new AbortController()
+    const promise = (async () => {
       if (!fs.existsSync(path.join(dir, SWIFT_DISTRIBUTION_MANIFEST))) {
         process.stderr.write(
           `peach: downloading Swift distribution ${lock.id} (${host})…\n`,
         )
         await installVerifiedTarball({
+          signal: controller.signal,
           url: `${endpoint}/${swiftDistributionKey(lock.id, host)}`,
           digest: {
             algorithm: 'sha256',
@@ -69,11 +82,48 @@ export function swiftDistributionRoot(): Promise<string | null> {
         throw new Error(`${dir} does not hold Swift distribution ${lock.id} (${host})`)
       }
       return dir
-    })()
-    pending.catch(() => installs.delete(dir))
+    })().finally(() => {
+      if (installs.get(dir)?.controller === controller) installs.delete(dir)
+    })
+    pending = { promise, controller, clients: 0 }
     installs.set(dir, pending)
   }
-  return pending
+  const current = pending
+  current.clients++
+  let released = false
+  const release = () => {
+    if (released) return
+    released = true
+    if (--current.clients === 0) current.controller.abort(signal?.reason)
+  }
+  let abort: (() => void) | undefined
+  try {
+    const root = await new Promise<string>((resolve, reject) => {
+      abort = () => {
+        release()
+        const reason: unknown = signal?.reason
+        const error =
+          reason instanceof Error
+            ? reason
+            : new Error('Swift distribution installation canceled', { cause: reason })
+        // other callers retain ownership; the last caller waits for cleanup.
+        if (current.clients > 0) reject(error)
+        else
+          current.promise.then(
+            () => reject(error),
+            () => reject(error),
+          )
+      }
+      signal?.addEventListener('abort', abort, { once: true })
+      current.promise.then(resolve, reject)
+      if (signal?.aborted) abort()
+    })
+    signal?.throwIfAborted()
+    return root
+  } finally {
+    if (abort) signal?.removeEventListener('abort', abort)
+    release()
+  }
 }
 
 /** the module this process compiles app Swift against: the checkout beside a
@@ -81,7 +131,9 @@ export function swiftDistributionRoot(): Promise<string | null> {
  *  nothing without it, so a checkout's toolchain error surfaces to them. */
 export async function resolveSwiftModule({
   required = false,
-}: { required?: boolean } = {}): Promise<SwiftModule | null> {
+  signal,
+}: { required?: boolean; signal?: AbortSignal } = {}): Promise<SwiftModule | null> {
+  signal?.throwIfAborted()
   const checkout = path.resolve(import.meta.dirname, '../../sootsim-swift')
   if (fs.existsSync(path.join(checkout, 'toolchain.json'))) {
     // a checkout is implicit: without its toolchain, apps run without their
@@ -93,7 +145,7 @@ export async function resolveSwiftModule({
       return null
     }
   }
-  const root = await swiftDistributionRoot()
+  const root = await swiftDistributionRoot(signal)
   return root ? { root, ...swiftModuleToolchain(root) } : null
 }
 

package/src/swift-host.ts

@@ -2,7 +2,6 @@ import { createHash } from 'node:crypto'
 // the node host for every Swift preview: package inputs, one compile and
 // immutable artifact addresses. vite and the foreground CLI adapt this host.
 import fs from 'node:fs'
-import os from 'node:os'
 import path from 'node:path'
 import {
   enumerateBundleColors,
@@ -11,8 +10,10 @@ import {
   enumerateBundleResources,
   resolveSwiftImageResourceUrls,
 } from '../../sootsim-swift/src/bundleAssets'
+import { compileStringCatalog } from '../../sootsim-swift/src/stringCatalog'
 import { authHeaderValue, resolveCliAuth } from '../cli/auth'
 import { resolveContrastBackendOrigin } from './backend-origin'
+import { cacheDir } from './home-paths'
 import iosSdk from './ios-sdk-frameworks.json' with { type: 'json' }
 import { swiftBinaryModules } from './swift-binary-modules'
 import {
@@ -39,18 +40,19 @@ import {
 } from './swift-package'
 import { swiftPackageManifest } from './swift-package-manifest'
 import {
-  REMOTE_CHECKOUTS,
+  remoteSwiftCheckouts,
   resolveSwiftPackages,
   type SwiftPackageBinary,
   type SwiftPackageGap,
   type SwiftPackages,
 } from './swift-packages'
-import { readPackageFile } from './swift-source-file'
+import { readPackageFile as readSwiftSourceFile } from './swift-source-file'
 import { readSwiftStandinBehavior } from './swift-standin-config'
 import {
   standinGenerationInputs,
   standinLibrary,
   swiftStandins,
+  SWIFT_STANDINS_DIR,
   type SwiftStandin,
 } from './swift-standins'
 import {
@@ -67,6 +69,7 @@ import {
   MAX_SWIFT_COMPILE_IMAGE_TOTAL_BYTES,
   isSwiftNativeModules,
   compileSwiftProject,
+  DEFAULT_SWIFT_COMPILE_BUILD_MS,
   httpSwiftCompileSubmit,
   swiftNativeEntry,
   type SwiftImageUpload,
@@ -172,13 +175,18 @@ export interface SwiftProject {
   packagePath: string
   artifact: SwiftArtifact | null
   // the build in flight and the sources it was started from
-  building: { stamp: string; promise: Promise<SwiftArtifact> } | null
+  building: {
+    stamp: string
+    promise: Promise<SwiftArtifact>
+    signal?: AbortSignal
+  } | null
   // two bounded generations of immutable bytes cover in-flight asset reads.
   resourceFiles: Map<string, { bytes: Buffer; contentType: string }>
   resourcesPrevious: Map<string, { bytes: Buffer; contentType: string }>
   artifacts: SwiftArtifact[]
   hosted?: SwiftHostedCompileOptions
   signal?: AbortSignal
+  libraries?: Record<string, string>
 }
 
 // a project is its swiftpm package: the build, the artifact, and the dev
@@ -236,6 +244,8 @@ interface XcodeProjectEntry {
   packages?: {
     key: string
     standinKey: string
+    /** generation always uses the original closure, before stand-ins replace targets. */
+    binaries: SwiftPackageBinary[]
     packages: SwiftPackages
     standins: SwiftStandin[]
     /** why a framework the project vendors got no stand-in, by name. */
@@ -318,16 +328,18 @@ function swiftPackages(
   // emitter), so a changed input rebuilds instead of reusing stale output.
   let cached = entry.packages
   if (cached?.key !== key) {
+    const packages = resolveSwiftPackages({
+      rootDir: app.rootDir,
+      resolved: app.packageResolved,
+      products: app.linkedProducts,
+      localDirs: app.localPackageDirs,
+      provided: entry.provided,
+    })
     cached = {
       key,
       standinKey: '',
-      packages: resolveSwiftPackages({
-        rootDir: app.rootDir,
-        resolved: app.packageResolved,
-        products: app.linkedProducts,
-        localDirs: app.localPackageDirs,
-        provided: entry.provided,
-      }),
+      packages,
+      binaries: packages.binaries,
       standins: [],
       projectGaps: new Map(),
     }
@@ -354,10 +366,7 @@ function swiftPackages(
         ]
       : [],
   )
-  const reached = [
-    ...cached.packages.binaries.filter((binary) => binary.reached),
-    ...vendored,
-  ]
+  const reached = [...cached.binaries.filter((binary) => binary.reached), ...vendored]
   if (entry.moduleRoot && entry.provided && reached.length > 0) {
     const resolved = swiftModuleToolchain(entry.moduleRoot)
     const toolchain = {
@@ -379,6 +388,8 @@ function swiftPackages(
         ]),
         binaryGaps: built.gaps,
       })
+      for (const target of new Set(built.standins.map((standin) => standin.target)))
+        console.error(`Peach: target ${target} was replaced with a stand-in`)
       cached.standins = built.standins
       cached.projectGaps = new Map(
         vendored.flatMap(({ target }) => {
@@ -402,17 +413,17 @@ const XCODE_FRAMEWORKS_DIR = '__frameworks__'
 // remote package checkouts compile here: swiftpm owns `.build` in the
 // compile's package root as its scratch directory.
 const XCODE_PACKAGES_DIR = '__packages__'
-// each binary target's stand-in compiles as a target under its module's
-// directory here, from sources generated on this host.
-const XCODE_STANDINS_DIR = '__standins__'
-const CHECKOUTS_PREFIX = `${REMOTE_CHECKOUTS.split(path.sep).join(path.posix.sep)}/`
 
 // the compile input key of a root-relative path in an xcode layout.
 function xcodeInputKey(layout: XcodeLayout, file: string, relative: string): string {
   const owner = layout.targetDirs.get(file)
   if (owner) return path.posix.join(owner, relative)
-  return relative.startsWith(CHECKOUTS_PREFIX)
-    ? path.posix.join(XCODE_PACKAGES_DIR, relative.slice(CHECKOUTS_PREFIX.length))
+  const checkouts = remoteSwiftCheckouts(layout.app.rootDir)
+  return file.startsWith(`${checkouts}${path.sep}`)
+    ? path.posix.join(
+        XCODE_PACKAGES_DIR,
+        path.relative(checkouts, file).split(path.sep).join('/'),
+      )
     : relative
 }
 
@@ -485,7 +496,8 @@ function xcodeLayout(root: string): XcodeLayout | null {
   for (const standin of standins)
     targets.push({
       name: standin.module,
-      path: path.posix.join(XCODE_STANDINS_DIR, standin.module),
+      path: path.posix.join(SWIFT_STANDINS_DIR, standin.module),
+      dependencies: standin.dependencies?.map((name) => ({ kind: 'target', name })),
       executable: false,
       resources: false,
       exclude: [],
@@ -497,7 +509,7 @@ function xcodeLayout(root: string): XcodeLayout | null {
   const packageConfiguration = app.configuration === 'Debug' ? 'debug' : 'release'
   for (const target of packages.targets) {
     const relative = path.relative(
-      target.remote ? path.join(root, REMOTE_CHECKOUTS) : root,
+      target.remote ? remoteSwiftCheckouts(root) : root,
       target.dir,
     )
     if (
@@ -521,6 +533,13 @@ function xcodeLayout(root: string): XcodeLayout | null {
           )
           .map((define) => define.name),
       ],
+      linkedLibraries: target.packageLibraries
+        .filter(
+          (library) =>
+            library.configuration === null ||
+            library.configuration === packageConfiguration,
+        )
+        .map((library) => library.name),
     })
     if (target.resources) {
       resourceBundles.push({
@@ -565,14 +584,19 @@ function xcodeManifest(layout: XcodeLayout): string {
       ...(target.mainActorIsolation ? ['.defaultIsolation(MainActor.self)'] : []),
       ...(target.defines ?? []).map((name) => `.define(${JSON.stringify(name)})`),
     ].join(', ')}]`
+  const libraries = (target: SwiftPackageTarget) =>
+    target.linkedLibraries?.length
+      ? `, linkerSettings: [${target.linkedLibraries.map((name) => `.linkedLibrary(${JSON.stringify(name)})`).join(', ')}]`
+      : ''
   return [
     '// swift-tools-version: 6.2',
     'import PackageDescription',
     'let package = Package(name: "app", targets: [',
     `  .executableTarget(name: "${layout.app.moduleName}", path: "${XCODE_APP_DIR}", ${settings(layout.app)}),`,
-    ...layout.targets.map(
-      (target) =>
-        `  .target(name: "${target.name}", dependencies: ${JSON.stringify((target.dependencies ?? []).map((dependency) => dependency.name))}, path: "${target.path}", ${target.exclude.length > 0 ? `exclude: ${JSON.stringify(target.exclude)}, ` : ''}${target.resources ? 'resources: [], ' : ''}${settings(target)}),`,
+    ...layout.targets.map((target) =>
+      target.systemLibrary
+        ? `  .systemLibrary(name: "${target.name}", path: "${target.path}"),`
+        : `  .target(name: "${target.name}", dependencies: ${JSON.stringify((target.dependencies ?? []).map((dependency) => dependency.name))}, path: "${target.path}", ${target.exclude.length > 0 ? `exclude: ${JSON.stringify(target.exclude)}, ` : ''}${target.resources ? 'resources: [], ' : ''}${settings(target)}${libraries(target)}),`,
     ),
     '])',
     '',
@@ -587,6 +611,17 @@ function packageFiles(root: string): string[] {
   return xcode ? xcode.files : sourceTreeFiles(canonicalRoot, canonicalRoot)
 }
 
+// remote dependencies are enumerated from peach's checkout cache, while app
+// inputs retain their selected-project boundary and all symlink checks.
+function readPackageFile(root: string, file: string, maxBytes: number): Buffer {
+  if (xcodeProjects.has(root)) {
+    const checkouts = remoteSwiftCheckouts(root)
+    if (file.startsWith(`${checkouts}${path.sep}`))
+      return readSwiftSourceFile(checkouts, file, maxBytes)
+  }
+  return readSwiftSourceFile(root, file, maxBytes)
+}
+
 // every input file under `dir`, which must stay inside `canonicalRoot`.
 function sourceTreeFiles(dir: string, canonicalRoot: string): string[] {
   const found: string[] = []
@@ -980,6 +1015,13 @@ export function buildSwiftBundleFiles(
       const disk = path.join(packagePath, ...file.split('/'))
       const bytes = readPackageFile(packagePath, disk, limits.resourceBytes)
       addFile(bundlePath === '.' ? base : `${bundlePath}/${base}`, bytes)
+      if (base.endsWith('.xcstrings')) {
+        for (const [name, table] of Object.entries(
+          compileStringCatalog(bytes.toString('utf8'), base.slice(0, -10)),
+        )) {
+          addFile(bundlePath === '.' ? name : `${bundlePath}/${name}`, Buffer.from(table))
+        }
+      }
     }
   }
   return { files, bundles, watched }
@@ -1033,6 +1075,8 @@ export function sourceStamp(
   const hash = createHash('sha256')
   hash.update(packagePath)
   hash.update(JSON.stringify(xcodeProjects.get(packagePath)?.behavior ?? {}))
+  const libraries = projects.get(packagePath)?.libraries
+  if (libraries) hash.update(JSON.stringify(libraries))
   const projectInputs = new Set(packageFiles(packagePath))
   for (const file of [...projectInputs].sort()) {
     hash.update(path.relative(packagePath, file))
@@ -1043,6 +1087,24 @@ export function sourceStamp(
   return hash.digest('hex').slice(0, 16)
 }
 
+// sourceStamp's inputs read by content and relative to the package, so
+// another process's build copy of the same sources stamps the same.
+export function sourceContentStamp(
+  packagePath: string,
+  moduleRootOverride?: string,
+): string {
+  const hash = createHash('sha256')
+  hash.update(JSON.stringify(xcodeProjects.get(packagePath)?.behavior ?? {}))
+  const libraries = projects.get(packagePath)?.libraries
+  if (libraries) hash.update(JSON.stringify(libraries))
+  for (const file of [...new Set(packageFiles(packagePath))].sort()) {
+    hash.update(path.relative(packagePath, file))
+    hash.update(fs.readFileSync(file))
+  }
+  hash.update(moduleStamp(packagePath, moduleRootOverride, false))
+  return hash.digest('hex').slice(0, 16)
+}
+
 // the linked module's part of the source stamp
 function moduleStamp(
   packagePath: string,
@@ -1092,15 +1154,19 @@ export function icuUrl(origin: string, artifact: SwiftArtifact): string {
 // keyed by the stand-in target it links into; its own source then defines
 // nothing, so the library's functions run instead of the traps. one library
 // links once, through the first module its framework ships.
-function standinLibraries(layout: XcodeLayout): Map<string, SwiftStandin[]> {
+export function standinLibraries(
+  binaries: readonly SwiftPackageBinary[],
+  standins: readonly SwiftStandin[],
+  rootDir: string,
+): Map<string, SwiftStandin[]> {
   const linked = new Map<string, SwiftStandin[]>()
-  for (const binary of layout.binaries) {
-    const modules = layout.standins.filter(
+  for (const binary of binaries) {
+    const modules = standins.filter(
       (standin) =>
         standin.target === binary.target && `${standin.module}.c` in standin.files,
     )
     if (modules.length === 0) continue
-    const library = standinLibrary(binary, layout.app.rootDir)
+    const library = standinLibrary(binary, rootDir)
     if (!library) continue
     linked.set(library, modules)
   }
@@ -1131,7 +1197,7 @@ function packageSources(
     files['Package.swift'] = xcodeManifest(xcode)
     for (const standin of xcode.standins)
       for (const [file, text] of Object.entries(standin.files))
-        files[path.posix.join(XCODE_STANDINS_DIR, standin.module, file)] =
+        files[path.posix.join(SWIFT_STANDINS_DIR, standin.module, file)] =
           linked.has(standin) && file === `${standin.module}.c`
             ? `// ${standin.target}'s WebAssembly library defines ${standin.module}'s functions.\n`
             : text
@@ -1152,7 +1218,9 @@ interface SwiftPackageSnapshot {
 
 function packageSnapshot(project: SwiftProject, entry: string): SwiftPackageSnapshot {
   const layout = xcodeLayout(project.packagePath)
-  const linked = layout ? standinLibraries(layout) : new Map<string, SwiftStandin[]>()
+  const linked = layout
+    ? standinLibraries(layout.binaries, layout.standins, layout.app.rootDir)
+    : new Map<string, SwiftStandin[]>()
   const files = packageSources(project.packagePath, new Set([...linked.values()].flat()))
   const native = nativeSourceDescriptor(project.packagePath)
   return {
@@ -1166,9 +1234,7 @@ function packageSnapshot(project: SwiftProject, entry: string): SwiftPackageSnap
           .relative(project.packagePath, file)
           .split(path.sep)
           .join(path.posix.sep)
-        return layout && file.endsWith('.metal')
-          ? xcodeInputKey(layout, file, relative)
-          : relative
+        return layout ? xcodeInputKey(layout, file, relative) : relative
       }),
     ),
     resources: buildSwiftResourceTable(project, '', files),
@@ -1178,14 +1244,17 @@ function packageSnapshot(project: SwiftProject, entry: string): SwiftPackageSnap
       files,
     ),
     native,
-    ...(linked.size > 0
+    ...(linked.size > 0 || project.libraries
       ? {
-          libraries: Object.fromEntries(
-            [...linked].map(([library, [first]]) => [
-              first!.module,
-              fs.readFileSync(library).toString('base64'),
-            ]),
-          ),
+          libraries: {
+            ...project.libraries,
+            ...Object.fromEntries(
+              [...linked].map(([library, [first]]) => [
+                first!.module,
+                fs.readFileSync(library).toString('base64'),
+              ]),
+            ),
+          },
         }
       : {}),
     ...(native
@@ -1252,7 +1321,7 @@ async function compile(
     linkedModuleRoots(packagePath).find((root) =>
       fs.existsSync(path.join(root, 'toolchain.json')),
     ) ??
-    (await swiftDistributionRoot())
+    (await swiftDistributionRoot(signal))
   if (!moduleRoot)
     return {
       ...(await compileRemote(packagePath, snapshot, undefined, signal)),
@@ -1290,13 +1359,20 @@ async function compile(
       if (process.env.CONTRAST_SWIFT_BUILD_ROOT)
         return process.env.CONTRAST_SWIFT_BUILD_ROOT
       const resolvedPath = path.resolve(packagePath)
+      // units of one app share a root so the module cache stays warm.
+      // peach-expo-swift/<app>/<scope>/<package> shares <app>/<scope>, and
+      // the older <app>/<package> layout shares <app>. the scope is this
+      // process, so two servers do not compile into one tree.
+      const parts = resolvedPath.split(path.sep)
+      const expoAt = parts.lastIndexOf('peach-expo-swift')
+      const scoped = expoAt >= 0 && parts.length >= expoAt + 4
       const buildKeyPath =
-        path.basename(path.dirname(path.dirname(resolvedPath))) === 'peach-expo-swift'
-          ? path.dirname(resolvedPath)
+        expoAt >= 0 && parts.length >= expoAt + 3
+          ? parts.slice(0, scoped ? expoAt + 3 : expoAt + 2).join(path.sep)
           : resolvedPath
       return path.join(
-        os.tmpdir(),
-        'contrast-swift-build',
+        cacheDir(),
+        'swift-builds',
         createHash('sha256')
           .update(`${moduleRoot}\0${buildKeyPath}`)
           .digest('hex')
@@ -1482,7 +1558,7 @@ async function compileRemote(
     hosted?.authorization ?? (auth ? authHeaderValue(auth) : undefined)
   const signal = AbortSignal.any([
     ...(ownerSignal ? [ownerSignal] : []),
-    AbortSignal.timeout(5 * 60_000),
+    AbortSignal.timeout(DEFAULT_SWIFT_COMPILE_BUILD_MS + 60_000),
   ])
   const submit = httpSwiftCompileSubmit({
     endpoint: origin,
@@ -1559,8 +1635,11 @@ export function artifactFor(
   project: SwiftProject,
   entry: string,
   moduleRoot?: string,
+  signal: AbortSignal | undefined = project.signal,
 ): Promise<SwiftArtifact> {
-  project.signal?.throwIfAborted()
+  if (project.signal && signal !== project.signal)
+    signal = signal ? AbortSignal.any([project.signal, signal]) : project.signal
+  signal?.throwIfAborted()
   const stamp = sourceStamp(project.packagePath, moduleRoot, Boolean(project.hosted))
   if (project.artifact?.stamp === stamp) return Promise.resolve(project.artifact)
   if (project.building) {
@@ -1569,13 +1648,27 @@ export function artifactFor(
     // and ask again, which starts the build these sources need; joining it
     // would emit the older artifact and nothing would trigger another load.
     const running = project.building
-    if (running.stamp === stamp) return running.promise
-    const again = () => artifactFor(project, entry, moduleRoot)
-    return running.promise.then(again, again)
+    if (running.stamp === stamp && running.signal === signal) return running.promise
+    const again = () => artifactFor(project, entry, moduleRoot, signal)
+    const queued = running.promise.then(again, again)
+    if (!signal) return queued
+    return new Promise<SwiftArtifact>((resolve, reject) => {
+      const stop = () =>
+        reject(
+          signal.reason instanceof Error
+            ? signal.reason
+            : new Error('Swift compilation canceled', { cause: signal.reason }),
+        )
+      signal.addEventListener('abort', stop, { once: true })
+      if (signal.aborted) stop()
+      queued
+        .then(resolve, reject)
+        .finally(() => signal.removeEventListener('abort', stop))
+    })
   }
   const snapshot = packageSnapshot(project, entry)
   if (sourceStamp(project.packagePath, moduleRoot, Boolean(project.hosted)) !== stamp) {
-    return artifactFor(project, entry, moduleRoot)
+    return artifactFor(project, entry, moduleRoot, signal)
   }
   // a save that changed only view builder literals keeps the running bytes
   const compiled = project.artifact?.compiled
@@ -1600,7 +1693,7 @@ export function artifactFor(
     moduleRoot,
     project.hosted,
     snapshot,
-    project.signal,
+    signal,
   ).then(
     (artifact) => {
       project.artifact = artifact
@@ -1620,9 +1713,9 @@ export function artifactFor(
     sourceStamp(project.packagePath, moduleRoot, Boolean(project.hosted)) ===
     artifact.stamp
       ? artifact
-      : artifactFor(project, entry, moduleRoot),
+      : artifactFor(project, entry, moduleRoot, signal),
   )
-  project.building = { stamp, promise: fresh }
+  project.building = { stamp, promise: fresh, signal }
   return fresh
 }