peachsim 0.1.1625 → 0.1.1640

package/src/swift-compile.ts

@@ -16,8 +16,9 @@ import {
 import os from 'node:os'
 import path from 'node:path'
 import { admittedMacBuilderSlot } from './admitted-mac-build'
-import { rnxHomeDir } from './home-paths'
+import { rnxHomeDir, swiftPackageCacheOptions } from './home-paths'
 import { terminateProcessGroup } from './process-group'
+import { swiftCompilerSourceDigest } from './swift-compiler-digest'
 import { designTimeDiagnostic, designTimeSource } from './swift-design-time'
 import {
   parseSwiftDistributionManifest,
@@ -32,26 +33,30 @@ import {
   swiftTargetModuleName,
   type SwiftPackageTarget,
 } from './swift-package'
+import { swiftEnvironment, swiftSdkOptions, type SwiftWasmSdk } from './swift-toolchain'
 import { isSwiftResourceBundles } from './swiftContract'
 import type { SwiftImageUpload } from './swift-submit'
-import type { SwiftWasmSdk } from './swift-toolchain'
 import type { SwiftResourceBundle } from './swiftContract'
 
 export { swiftIcuAsset, type SwiftIcuAsset }
 
 // compiler drivers own descendants such as admission and swiftpm workers.
 // cancellation waits for their pipes to close before releasing the build root.
+// `stream` echoes the output as it arrives: all of it, or only matching lines.
+// a successful run then echoes the rest minus lines matching `quiet`, its
+// warnings; a failed run's output goes to the caller's one diagnostic.
 async function runCompiler(
   command: string,
   args: string[],
   options: ExecFileOptions & { signal?: AbortSignal },
-  stream = false,
+  stream: boolean | RegExp = false,
+  quiet?: RegExp,
 ): Promise<void> {
   const { signal } = options
   signal?.throwIfAborted()
   const child = spawn(command, args, {
     cwd: options.cwd,
-    env: options.env,
+    env: swiftEnvironment(options.env),
     detached: true,
     stdio: ['ignore', 'pipe', 'pipe'],
   })
@@ -62,6 +67,7 @@ async function runCompiler(
       let timeout: ReturnType<typeof setTimeout> | undefined
       const chunks: Record<'stdout' | 'stderr', Buffer[]> = { stdout: [], stderr: [] }
       const sizes = { stdout: 0, stderr: 0 }
+      const partial = { stdout: '', stderr: '' }
       const stop = () => {
         stopping ??= terminateProcessGroup(child)
         // close and cancellation share the same awaited cleanup below.
@@ -69,7 +75,13 @@ async function runCompiler(
       }
       for (const name of ['stdout', 'stderr'] as const) {
         child[name].on('data', (bytes: Buffer) => {
-          if (stream) process[name].write(bytes)
+          if (stream === true) process[name].write(bytes)
+          else if (stream) {
+            const lines = (partial[name] + bytes.toString()).split('\n')
+            partial[name] = lines.pop()!
+            for (const line of lines)
+              if (stream.test(line)) process[name].write(`${line}\n`)
+          }
           sizes[name] += bytes.length
           if (sizes[name] <= (options.maxBuffer ?? 1024 * 1024)) chunks[name].push(bytes)
           else {
@@ -101,7 +113,13 @@ async function runCompiler(
               },
             ),
           )
-        else resolve()
+        else {
+          if (quiet)
+            for (const name of ['stdout', 'stderr'] as const)
+              for (const line of Buffer.concat(chunks[name]).toString().split('\n'))
+                if (line && !quiet.test(line)) process[name].write(`${line}\n`)
+          resolve()
+        }
       })
       if (options.timeout)
         timeout = setTimeout(() => {
@@ -117,6 +135,14 @@ async function runCompiler(
 
 const WASM_TRIPLE = 'wasm32-unknown-wasip1'
 
+// swiftpm's step counter, echoed while a build runs; its diagnostics print
+// once, with the failure.
+const SWIFTPM_PROGRESS = /^\[\d+\/\d+\] /
+// lines that are not diagnostics: progress, already echoed, and the notice
+// that the native build system peach selects is deprecated.
+const SWIFTPM_NOISE =
+  /^(?:\[\d+\/\d+\] |Building for production\.\.\.$|warning: '--build-system native' has been deprecated)/
+
 // compiler jobs match the fixture builder's cap to fit a 16GiB Linux slot.
 const BUILD_JOBS = String(
   Math.min(4, Math.max(1, Math.floor(os.availableParallelism() / 2))),
@@ -211,6 +237,10 @@ export function swiftModuleInputFiles(root: string): string[] {
     'scripts/contrast-app-Package.swift',
     'scripts/build-distribution.ts',
     'scripts/distribution-clang.ts',
+    'scripts/distribution-libxml2.ts',
+    'scripts/distribution-libxml2.json',
+    'Sources/libxml2/include/module.modulemap',
+    'Sources/libxml2/COPYING',
     'scripts/build-distribution-plugins.sh',
     'scripts/build-distribution-plugins-docker.sh',
     'scripts/build-preview-plugin.sh',
@@ -233,12 +263,8 @@ export function swiftModuleInputFiles(root: string): string[] {
   return files.sort()
 }
 
-// the host halves of the module's macros: the rnx plugin (#Preview, @Entry,
-// @Model) and #Predicate's FoundationMacros stand-in, which one script builds
-// side by side. manifest swiftSettings cannot load a plugin library (RAN: the
-// flag reaches the driver but the plugin never loads), so every build loads
-// both with -Xswiftc, as scripts/build.sh does for the fixtures. their
-// sources are under Sources/, which the artifact hash already covers.
+// the host macro plugins build side by side and load explicitly for every
+// app compile. their source inputs also participate in artifact identity.
 /** the host macro plugin libraries a module root compiles with, and whether a
  *  checkout's must be rebuilt (scripts/build-preview-plugin.sh) first. */
 export function swiftMacroPlugins(moduleRoot: string): {
@@ -261,11 +287,21 @@ export function swiftMacroPlugins(moduleRoot: string): {
   const plugins = [
     {
       library: path.join(dir, `libRnxPreviewMacros.${ext}`),
-      source: path.join(moduleRoot, 'Sources/RnxPreviewMacros/PreviewMacro.swift'),
+      sources: [path.join(moduleRoot, 'Sources/RnxPreviewMacros/PreviewMacro.swift')],
     },
     {
       library: path.join(dir, `libFoundationMacros.${ext}`),
-      source: path.join(moduleRoot, 'Sources/FoundationMacros/PredicateMacro.swift'),
+      sources: [
+        path.join(moduleRoot, 'Sources/FoundationMacros/PredicateMacro.swift'),
+        path.join(moduleRoot, 'Sources/SwiftMacroSupport/PredicateExpression.swift'),
+      ],
+    },
+    {
+      library: path.join(dir, `libTipKitMacros.${ext}`),
+      sources: [
+        path.join(moduleRoot, 'Sources/TipKitMacros/TipKitMacros.swift'),
+        path.join(moduleRoot, 'Sources/SwiftMacroSupport/PredicateExpression.swift'),
+      ],
     },
   ]
   return {
@@ -274,8 +310,9 @@ export function swiftMacroPlugins(moduleRoot: string): {
       !existsSync(compilerStamp) ||
       readFileSync(compilerStamp, 'utf8').trim() !== release ||
       plugins.some(
-        ({ library, source }) =>
-          !existsSync(library) || statSync(source).mtimeMs > statSync(library).mtimeMs,
+        ({ library, sources }) =>
+          !existsSync(library) ||
+          sources.some((source) => statSync(source).mtimeMs > statSync(library).mtimeMs),
       ),
   }
 }
@@ -341,6 +378,16 @@ export function swiftModuleDigest(root: string): Buffer {
   return digest
 }
 
+// optimized consumers can reference private symbols from an imported framework.
+// source revisions need separate object trees, while app edits keep one warm tree.
+export function swiftProjectBuildKey(moduleRoot: string, release: string): string {
+  return createHash('sha256')
+    .update(`${release}\0${swiftModuleSdk(moduleRoot).wasmSdkId}`)
+    .update(swiftModuleDigest(moduleRoot))
+    .digest('hex')
+    .slice(0, 32)
+}
+
 export function compileTargets(input: SwiftCompileInput): SwiftPackageTarget[] {
   const manifest = input.files['Package.swift']
   return manifest === undefined
@@ -378,21 +425,24 @@ export function withNativeSourceGlue(
 const OPTIONAL_FRAMEWORK_DEPENDENCIES: Record<string, string[]> = {
   GameplayKit: [],
   simd: [],
-  GLKit: [],
+  ModelIO: ['simd'],
+  GLKit: ['ModelIO'],
   Accelerate: [],
   CryptoKit: [],
   CommonCrypto: [],
+  ImagePlayground: [],
+  QuickLookThumbnailing: [],
+  libxml2: [],
   CoreText: [],
   Compression: ['PeachCodec'],
   zlib: ['PeachCodec'],
   PeachCodec: [],
-  Security: ['CryptoKit'],
   TikTokBusinessSDK: [],
   nSure: [],
   Statsig: [],
   TOCropViewController: [],
   RiveRuntime: ['MetalKit'],
-  MetalKit: [],
+  MetalKit: ['ModelIO'],
   DatadogCore: [],
   DatadogLogs: ['DatadogCore'],
   DatadogRUM: ['DatadogCore'],
@@ -554,13 +604,20 @@ export function swiftSdkPaths(
   toolchainBin: string,
 ): { sysroot: string; resources: string } {
   const sdk = swiftModuleSdk(moduleRoot).wasmSdkId
-  const key = `${toolchainBin}\0${sdk}`
+  const key = JSON.stringify([toolchainBin, sdk, swiftSdkOptions()])
   const cached = sdkPaths.get(key)
   if (cached) return cached
   const configuration = execFileSync(
     path.join(toolchainBin, 'swift'),
-    ['sdk', 'configure', '--show-configuration', sdk, 'wasm32-unknown-wasip1'],
-    { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'] },
+    [
+      'sdk',
+      'configure',
+      ...swiftSdkOptions(),
+      '--show-configuration',
+      sdk,
+      'wasm32-unknown-wasip1',
+    ],
+    { encoding: 'utf8', env: swiftEnvironment(), stdio: ['ignore', 'pipe', 'pipe'] },
   )
   const field = (name: string) => {
     const value = new RegExp(`^${name}:\\s*(.+)$`, 'm').exec(configuration)?.[1]?.trim()
@@ -586,7 +643,7 @@ export function swiftAvailableModules(
   toolchainBin: string,
 ): Set<string> {
   const sdk = swiftModuleSdk(moduleRoot).wasmSdkId
-  const key = `${moduleRoot}\0${sdk}`
+  const key = JSON.stringify([moduleRoot, sdk, swiftSdkOptions()])
   const cached = availableModules.get(key)
   if (cached) return cached
   const modules = new Set(swiftPeachModules(moduleRoot))
@@ -712,7 +769,14 @@ const EXECUTABLE_LINK_FLAGS = `          "-Xclang-linker", "-O0",
 const REACTOR_FLAG = '"-Xclang-linker", "-mexec-model=reactor",\n'
 
 /** bump with any change to the emitted multi-target manifest text. */
-export const MULTI_MANIFEST_VERSION = 38
+export const MULTI_MANIFEST_VERSION = 39
+
+// build-cli replaces this in every bundle; source runs read the files directly.
+declare const __SWIFT_COMPILER_DIGEST__: string | undefined
+const compilerSourceDigest =
+  typeof __SWIFT_COMPILER_DIGEST__ === 'string'
+    ? __SWIFT_COMPILER_DIGEST__
+    : swiftCompilerSourceDigest(import.meta.dirname)
 
 export function swiftArtifactHash(
   input: SwiftCompileInput,
@@ -720,56 +784,8 @@ export function swiftArtifactHash(
   moduleRoot: string,
 ): string {
   const hash = createHash('sha256')
-  // v49: NSObject metatype initialization reaches its explicit runtime boundary
-  // v48: top-level classes rooted in an Apple framework class stay out of C++
-  // v47: target ownership honors exclusions before lowering manifest-named files
-  // v46: view builder literals compile as design-time lookups
-  // v45: the link runs no wasm-opt pass, whatever the compiling machine has
-  // v44: fixed-signature optional type methods retain metatype dispatch
-  // v43: optional type-property witnesses preserve class getter dispatch
-  // v42: the source-checkout template route takes the same executable stack layout
-  // v41: executable stack size and layout match the native main-thread budget
-  // v40: generic classes expose fixed-signature optional SDK witnesses
-  // v39: target source files named Package.swift lower with their owning module
-  // v38: dependency manifests stay intact and backend threads match build jobs
-  // v37: optional requirement calls lower trailing closures without parentheses
-  // v36: javascript dialog witnesses preserve typed main actor completions
-  // v35: input-suggestion witnesses keep UIKit payload and optional results
-  // v34: typed async SDK witnesses keep imported names and completion results
-  // v33: Foundation-qualified authentication types use their networking owner
-  // v32: extension override slots resolve across each target's files
-  // v31: the text, table, scroll, collection and flow layout delegates'
-  // witnesses gain selector records, and their optional calls lower to
-  // selector sends
-  // v30: async methods answer their completion handler selector, async
-  // optional requirements get members, and non-escaping closures reach sends
-  // v29: the SDK's delegate protocols' witnesses gain selector records, and
-  // optional calls reach a requirement by its labels and witnesses by types
-  // v28: AnyClass method calls and IMP casts lower to selector sends
-  // v27: @objc protocols' optional requirements lower to selector sends
-  // v26: an @objc protocol is class-bound, #keyPath lowers to its string,
-  // and an override lifted from an extension keeps the extension's access
-  // v25: every Clang submodule import names its framework module
-  // v24: distribution objects use an ordered linker response file
-  // v22: Foundation sources see Darwin, which carries the libc and Mach
-  // v21: Foundation sources see the ObservableObject and Published aliases
-  // v20: supplied table editing and swipe methods preserve objective-c selectors
-  // v18: NSValue(time:) constructs NSStructBox through NSValue.boxedTime
-  // v17: AVAsset(url:) constructs AVURLAsset for the class cluster
-  // v16: overrides of @objc extension members rename to __peach_ovr_
-  // v15: Foundation-only sources see the platform libc (WASILibc, including
-  // math round) and its pthread mutexes (wasi_pthread)
-  // v14: AnyObject doubleValue lowers to the typed _objcNumber getter
-  // v13: implicit target resources synthesize Bundle.module
-  // v12: overrides in an extension of a same-file class lift into the class
-  // v10: Foundation-only sources see Dispatch queues
-  // v9: table cell and header footer view initializers compile required
-  // v8: optional framework products and distribution objects link on import
-  // v7: runtime class lookup uses the same objc class registry as messages
-  // v6: app and scene delegate classes compile final
-  // (v5: a target declaring resources gets SwiftPM's Bundle.module accessor;
-  // v4: sources compile through swiftSourceAsIOS)
-  hash.update(`swift-compile/v49\n${release}\n`)
+  hash.update(`swift-compile\n${release}\n`)
+  hash.update(compilerSourceDigest)
   if (input.oneModule) hash.update('one-module\n')
   hash.update(swiftModuleDigest(moduleRoot))
   for (const file of Object.keys(input.files).sort()) {
@@ -858,19 +874,18 @@ export function emitSwiftPackageManifest(args: {
   libraries?: Map<string, string>
 }): string {
   const { targets, siblings, moduleRoot, oneModule, spriteKit, distribution } = args
-  const reachedFrameworks = new Set(
-    [...siblings.values()]
-      .flat()
-      .filter(
-        (name) =>
-          OPTIONAL_FRAMEWORKS.has(name) &&
-          !targets.some((target) => target.name === name),
-      )
-      .flatMap((name) => [name, ...(OPTIONAL_FRAMEWORK_DEPENDENCIES[name] ?? [])]),
-  )
+  const reachedFrameworks = new Set<string>()
+  const reach = (name: string) => {
+    if (reachedFrameworks.has(name)) return
+    reachedFrameworks.add(name)
+    for (const dependency of OPTIONAL_FRAMEWORK_DEPENDENCIES[name] ?? [])
+      reach(dependency)
+  }
+  for (const name of [...siblings.values()].flat())
+    if (OPTIONAL_FRAMEWORKS.has(name) && !targets.some((target) => target.name === name))
+      reach(name)
   if (spriteKit) {
-    reachedFrameworks.add('SpriteKit')
-    reachedFrameworks.add('PeachBox2D')
+    for (const name of ['SpriteKit', 'PeachBox2D', 'simd', 'GLKit']) reach(name)
   }
   // the distribution builder names each object lib/<target>-<file>.o.
   // preserve link order while leaving unreached optional module objects out.
@@ -917,6 +932,10 @@ export function emitSwiftPackageManifest(args: {
   // each target compiles in the language mode and default isolation its
   // author declared, the way xcode builds the same package.
   const stanza = (target: SwiftPackageTarget): string => {
+    // system modules keep their upstream module map and resolve headers and
+    // libraries from the wasm SDK, never the build host's pkg-config paths.
+    if (target.systemLibrary)
+      return `    .systemLibrary(name: ${JSON.stringify(target.name)}, path: ${JSON.stringify(target.path)}),`
     const isolation = target.mainActorIsolation
       ? ' .defaultIsolation(MainActor.self),'
       : ''
@@ -980,17 +999,27 @@ export function emitSwiftPackageManifest(args: {
             .join('')
         : ''
     const kind = target.executable ? '.executableTarget' : '.target'
+    const linkedLibraries = (target.linkedLibraries ?? []).map(
+      (name) => `.linkedLibrary(${JSON.stringify(name)})`,
+    )
+    const librarySettings = [
+      ...linkedLibraries,
+      ...(args.libraries?.has(target.name)
+        ? [`.unsafeFlags([${JSON.stringify(args.libraries.get(target.name))}])`]
+        : []),
+    ]
     const link = target.executable
       ? `,
       linkerSettings: [
+        ${linkedLibraries.map((setting) => `${setting},`).join('\n        ')}
         .unsafeFlags([
           ${REACTOR_FLAG}${EXECUTABLE_LINK_FLAGS}          "-Xlinker", "--export-if-defined=__main_argc_argv"${library},
         ]),
         .unsafeFlags(["-Xlinker", "--strip-all"], .when(configuration: .release)),
       ]`
-      : args.libraries?.has(target.name)
+      : librarySettings.length > 0
         ? `,
-      linkerSettings: [.unsafeFlags([${JSON.stringify(args.libraries.get(target.name))}])]`
+      linkerSettings: [${librarySettings.join(', ')}]`
         : ''
     return [
       `    ${kind}(`,
@@ -1065,7 +1094,8 @@ export function syncSwiftTree(base: string, files: Map<string, string | Buffer>)
 }
 
 // the app runs as iOS, but it compiles for wasm, where `os(iOS)` is false and
-// every iOS branch of the app would compile out. a condition line names iOS
+// every iOS branch of the app would compile out. peach is the iOS simulator,
+// so `targetEnvironment(simulator)` holds too. a condition line names iOS
 // as `true` padded to the same length, so diagnostics keep their columns;
 // os(WASI) still holds for code written for wasm. only `#if` and `#elseif`
 // lines that begin in code change: a line inside a string literal or a block
@@ -1079,7 +1109,7 @@ export function syncSwiftTree(base: string, files: Map<string, string | Buffer>)
 // explicit `@objc(name:)` on a member, whose name becomes a string argument,
 // and a delegate class that becomes final (below).
 const DIRECTIVE = /^[ \t]*#(?:if|elseif)\b/
-const OS_IOS = /\bos\(\s*iOS\s*\)/g
+const OS_IOS = /\b(?:os\(\s*iOS\s*\)|targetEnvironment\(\s*simulator\s*\))/g
 const OBJC_ATTRIBUTE = /^@(?:objcMembers\b|objc\b(?:(\s*)\(([^()]*)\))?|IBAction\b)/
 const SELECTOR = /^#selector\b/
 const PROTOCOL_NAME = /^\s+[A-Za-z_]\w*(\s*:)?/
@@ -1654,25 +1684,32 @@ function objcRootedClasses(sources: string[]): Set<string> {
 // the header swift emits on iOS keeps an Objective-C class out of its C++
 // section. here its root is a swift class from a module with no C++ header,
 // so C++ that includes the header fails on the undeclared base. a top-level
-// class in `rooted` gains @_expose(!Cxx) in front of its declaration,
-// shifting that one line's columns. swift rejects the attribute in a local
+// class in `rooted` gains @_expose(!Cxx), keeping @main first so SwiftPM
+// recognizes the entry without changing source lines. swift rejects it in a local
 // scope, so a nested class keeps its exposure.
 function hideObjCClassesFromCxx(source: string, rooted: Set<string>): string {
   if (rooted.size === 0) return source
   const code = swiftCodeMask(source)
-  const starts: number[] = []
+  const insertions: { at: number; text: string }[] = []
   let depth = 0
   for (const match of code.matchAll(
     /[{}]|\bclass\s+(?!(?:func|var|let|subscript)\b)([A-Za-z_]\w*)/g,
   )) {
     if (match[0] === '{') depth++
     else if (match[0] === '}') depth--
-    else if (depth === 0 && rooted.has(match[1]!))
-      starts.push(declarationStart(code, match.index, 0))
+    else if (depth === 0 && rooted.has(match[1]!)) {
+      const start = declarationStart(code, match.index, 0)
+      const main = /@main\b/.exec(code.slice(start, match.index))
+      insertions.push(
+        main
+          ? { at: start + main.index + main[0].length, text: ' @_expose(!Cxx)' }
+          : { at: start, text: '@_expose(!Cxx) ' },
+      )
+    }
   }
   let out = source
-  for (const at of starts.reverse())
-    out = `${out.slice(0, at)}@_expose(!Cxx) ${out.slice(at)}`
+  for (const { at, text } of insertions.reverse())
+    out = `${out.slice(0, at)}${text}${out.slice(at)}`
   return out
 }
 
@@ -4359,7 +4396,7 @@ function lowerObjCRuntimeCalls(source: string, index: ObjCIndex): string {
 // char outside code (comments, strings, regex literals) reads as a space,
 // so an identifier that survives is code. newlines stay, keeping every
 // offset valid in both views.
-function swiftCodeMask(source: string): string {
+export function swiftCodeMask(source: string): string {
   const chars = source.split('')
   const blank = (from: number, to: number): void => {
     for (let i = Math.max(0, from); i < Math.min(to, chars.length); i++)
@@ -4474,6 +4511,710 @@ function swiftCodeMask(source: string): string {
   return chars.join('')
 }
 
+// darwin declares these in Foundation; the guest networking module owns them.
+const FOUNDATION_NETWORKING_TYPES = new Set([
+  'CachedURLResponse',
+  'HTTPCookieStorage',
+  'HTTPURLResponse',
+  'NSMutableURLRequest',
+  'NSURLConnection',
+  'NSURLConnectionDataDelegate',
+  'NSURLConnectionDelegate',
+  'NSURLConnectionDownloadDelegate',
+  'URLAuthenticationChallenge',
+  'URLAuthenticationChallengeSender',
+  'URLCache',
+  'URLCredential',
+  'URLCredentialStorage',
+  'URLProtectionSpace',
+  'URLProtocol',
+  'URLProtocolClient',
+  'URLRequest',
+  'URLResponse',
+  'URLSession',
+  'URLSessionConfiguration',
+  'URLSessionDataDelegate',
+  'URLSessionDataTask',
+  'URLSessionDelegate',
+  'URLSessionDownloadDelegate',
+  'URLSessionDownloadTask',
+  'URLSessionStreamDelegate',
+  'URLSessionStreamTask',
+  'URLSessionTask',
+  'URLSessionTaskDelegate',
+  'URLSessionTaskMetrics',
+  'URLSessionTaskTransactionMetrics',
+  'URLSessionUploadTask',
+  'URLSessionWebSocketDelegate',
+  'URLSessionWebSocketTask',
+])
+
+// Foundation overlay declarations live in the shared guest overlay module.
+const FOUNDATION_OVERLAY_TYPES = new Set([
+  'AsyncCharacterSequence',
+  'AsyncLineSequence',
+  'AsyncUnicodeScalarSequence',
+  'BlockOperation',
+  'DateComponentsFormatter',
+  'ErrorUserInfoKey',
+  'FileWrapper',
+  'HTTPCookie',
+  'HTTPCookiePropertyKey',
+  'HTTPCookieStringPolicy',
+  'InlinePresentationIntent',
+  'ListFormatter',
+  'LocalizedStringResource',
+  'MachError',
+  'MeasurementFormatUnitUsage',
+  'MeasurementFormatter',
+  'MessagePort',
+  'NSAssertionHandler',
+  'NSAttributedStringFormattingContextKey',
+  'NSBundleResourceRequest',
+  'NSCollectionChangeType',
+  'NSConditionLock',
+  'NSDataDetector',
+  'NSException',
+  'NSExtensionContext',
+  'NSExtensionItem',
+  'NSExtensionRequestHandling',
+  'NSFastEnumerationIterator',
+  'NSFastEnumerationState',
+  'NSFileAccessIntent',
+  'NSFileCoordinator',
+  'NSFileManagerResumeSyncBehavior',
+  'NSFileManagerSupportedSyncControls',
+  'NSFileManagerUploadLocalVersionConflictPolicy',
+  'NSFileProviderService',
+  'NSFileProviderServiceName',
+  'NSFileSecurity',
+  'NSFileVersion',
+  'NSGrammaticalCase',
+  'NSGrammaticalDefiniteness',
+  'NSGrammaticalDetermination',
+  'NSGrammaticalGender',
+  'NSGrammaticalNumber',
+  'NSGrammaticalPartOfSpeech',
+  'NSGrammaticalPerson',
+  'NSGrammaticalPronounType',
+  'NSHashEnumerator',
+  'NSHashTable',
+  'NSHashTableCallBacks',
+  'NSItemProvider',
+  'NSItemProviderFileOptions',
+  'NSItemProviderRepresentationVisibility',
+  'NSKeyValueOperator',
+  'NSKeyValueSetMutationKind',
+  'NSKeyValueSharedObservers',
+  'NSLinguisticTag',
+  'NSLinguisticTagScheme',
+  'NSLinguisticTagger',
+  'NSLinguisticTaggerUnit',
+  'NSMachPort',
+  'NSMapEnumerator',
+  'NSMapTable',
+  'NSMapTableKeyCallBacks',
+  'NSMapTableValueCallBacks',
+  'NSMetadataItem',
+  'NSMetadataQuery',
+  'NSMetadataQueryAttributeValueTuple',
+  'NSMetadataQueryDelegate',
+  'NSMetadataQueryResultGroup',
+  'NSOrderedCollectionChange',
+  'NSOrderedCollectionDifference',
+  'NSOrderedCollectionDifferenceCalculationOptions',
+  'NSPointerArray',
+  'NSPointerFunctions',
+  'NSPredicateValidating',
+  'NSProxy',
+  'NSPurgeableData',
+  'NSSecureUnarchiveFromDataTransformer',
+  'NSSwappedDouble',
+  'NSSwappedFloat',
+  'NSURLRequest',
+  'NSUbiquitousKeyValueStore',
+  'NSUserActivity',
+  'NSUserActivityDelegate',
+  'NSValueTransformerName',
+  'NSXPCCoder',
+  'NSXPCConnection',
+  'NSXPCInterface',
+  'NSXPCListener',
+  'NSXPCListenerDelegate',
+  'NSXPCListenerEndpoint',
+  'NetService',
+  'NetServiceBrowser',
+  'NetServiceBrowserDelegate',
+  'NetServiceDelegate',
+  'NotificationQueue',
+  'Operation',
+  'OperationQueue',
+  'PredicateCodableConfiguration',
+  'PresentationIntent',
+  'Progress',
+  'ProgressKind',
+  'ProgressUserInfoKey',
+  'RelativeDateTimeFormatter',
+  'SocketPort',
+  'StringEncodingDetectionOptionsKey',
+  'TermOfAddress',
+  'URLFileProtection',
+  'URLResource',
+  'URLThumbnailDictionaryItem',
+  'URLUbiquitousItemDownloadingStatus',
+  'URLUbiquitousSharedItemPermissions',
+  'URLUbiquitousSharedItemRole',
+  'UndoManager',
+  'ValueTransformer',
+  'XMLParser',
+  'XMLParserDelegate',
+])
+
+// existing overlay globals retain their declaration and runtime owner.
+const FOUNDATION_OVERLAY_GLOBALS = new Set([
+  'CFBridgingRetain',
+  'NSASCIIStringEncoding',
+  'NSAllHashTableObjects',
+  'NSAllMapTableKeys',
+  'NSAllMapTableValues',
+  'NSAllocateMemoryPages',
+  'NSAssertionHandlerKey',
+  'NSBuddhistCalendar',
+  'NSBundleErrorMaximum',
+  'NSBundleErrorMinimum',
+  'NSBundleExecutableArchitectureARM64',
+  'NSBundleExecutableArchitectureI386',
+  'NSBundleExecutableArchitecturePPC',
+  'NSBundleExecutableArchitecturePPC64',
+  'NSBundleExecutableArchitectureX86_64',
+  'NSBundleOnDemandResourceExceededMaximumSizeError',
+  'NSBundleOnDemandResourceInvalidTagError',
+  'NSBundleOnDemandResourceOutOfSpaceError',
+  'NSBundleResourceRequestLoadingPriorityUrgent',
+  'NSChineseCalendar',
+  'NSCloudSharingConflictError',
+  'NSCloudSharingErrorMaximum',
+  'NSCloudSharingErrorMinimum',
+  'NSCloudSharingNetworkFailureError',
+  'NSCloudSharingNoPermissionError',
+  'NSCloudSharingOtherError',
+  'NSCloudSharingQuotaExceededError',
+  'NSCloudSharingTooManyParticipantsError',
+  'NSCoderErrorMaximum',
+  'NSCoderErrorMinimum',
+  'NSCoderInvalidValueError',
+  'NSCompareHashTables',
+  'NSCompareMapTables',
+  'NSCompressionErrorMaximum',
+  'NSCompressionErrorMinimum',
+  'NSCompressionFailedError',
+  'NSConvertHostDoubleToSwapped',
+  'NSConvertHostFloatToSwapped',
+  'NSConvertSwappedDoubleToHost',
+  'NSConvertSwappedFloatToHost',
+  'NSCopyMemoryPages',
+  'NSCountHashTable',
+  'NSCountMapTable',
+  'NSCreateHashTable',
+  'NSCreateMapTable',
+  'NSDeallocateMemoryPages',
+  'NSDecompressionFailedError',
+  'NSEndHashTableEnumeration',
+  'NSEndMapTableEnumeration',
+  'NSEnumerateHashTable',
+  'NSEnumerateMapTable',
+  'NSExecutableErrorMaximum',
+  'NSExecutableErrorMinimum',
+  'NSExtensionItemAttachmentsKey',
+  'NSExtensionItemAttributedContentTextKey',
+  'NSExtensionItemAttributedTitleKey',
+  'NSExtensionItemsAndErrorsKey',
+  'NSExtensionJavaScriptFinalizeArgumentKey',
+  'NSExtensionJavaScriptPreprocessingResultsKey',
+  'NSFileErrorMaximum',
+  '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',
+  'NSGetUncaughtExceptionHandler',
+  'NSGregorianCalendar',
+  'NSHPUXOperatingSystem',
+  'NSHashGet',
+  'NSHashInsert',
+  'NSHashInsertIfAbsent',
+  'NSHashInsertKnownAbsent',
+  'NSHashRemove',
+  'NSHashTableCopyIn',
+  'NSHashTableObjectPointerPersonality',
+  'NSHashTableStrongMemory',
+  'NSHashTableWeakMemory',
+  'NSHebrewCalendar',
+  'NSHostByteOrder',
+  'NSISO2022JPStringEncoding',
+  'NSISO8601Calendar',
+  'NSISOLatin1StringEncoding',
+  'NSISOLatin2StringEncoding',
+  'NSIndianCalendar',
+  'NSIslamicCalendar',
+  'NSIslamicCivilCalendar',
+  'NSItemProviderPreferredImageSizeKey',
+  'NSJapaneseCalendar',
+  'NSJapaneseEUCStringEncoding',
+  'NSLoadedClasses',
+  'NSLocalizedFailureErrorKey',
+  'NSLogPageSize',
+  'NSMACHOperatingSystem',
+  'NSMacOSRomanStringEncoding',
+  'NSMapGet',
+  'NSMapInsert',
+  'NSMapInsertIfAbsent',
+  'NSMapInsertKnownAbsent',
+  'NSMapMember',
+  'NSMapRemove',
+  'NSMapTableCopyIn',
+  'NSMapTableObjectPointerPersonality',
+  'NSMapTableStrongMemory',
+  'NSMapTableWeakMemory',
+  'NSMetadataItemContentTypeKey',
+  'NSMetadataItemContentTypeTreeKey',
+  'NSMetadataItemDisplayNameKey',
+  'NSMetadataItemFSContentChangeDateKey',
+  'NSMetadataItemFSCreationDateKey',
+  'NSMetadataItemFSNameKey',
+  'NSMetadataItemFSSizeKey',
+  'NSMetadataItemIsUbiquitousKey',
+  'NSMetadataItemPathKey',
+  'NSMetadataItemURLKey',
+  'NSMetadataQueryAccessibleUbiquitousExternalDocumentsScope',
+  'NSMetadataQueryResultContentRelevanceAttribute',
+  'NSMetadataQueryUbiquitousDataScope',
+  'NSMetadataQueryUbiquitousDocumentsScope',
+  'NSMetadataQueryUpdateAddedItemsKey',
+  'NSMetadataQueryUpdateChangedItemsKey',
+  'NSMetadataQueryUpdateRemovedItemsKey',
+  'NSMetadataUbiquitousItemContainerDisplayNameKey',
+  'NSMetadataUbiquitousItemDownloadRequestedKey',
+  'NSMetadataUbiquitousItemDownloadingErrorKey',
+  'NSMetadataUbiquitousItemDownloadingStatusCurrent',
+  'NSMetadataUbiquitousItemDownloadingStatusDownloaded',
+  'NSMetadataUbiquitousItemDownloadingStatusKey',
+  'NSMetadataUbiquitousItemDownloadingStatusNotDownloaded',
+  'NSMetadataUbiquitousItemHasUnresolvedConflictsKey',
+  'NSMetadataUbiquitousItemIsDownloadingKey',
+  'NSMetadataUbiquitousItemIsExternalDocumentKey',
+  'NSMetadataUbiquitousItemIsSharedKey',
+  'NSMetadataUbiquitousItemIsUploadedKey',
+  'NSMetadataUbiquitousItemIsUploadingKey',
+  'NSMetadataUbiquitousItemPercentDownloadedKey',
+  'NSMetadataUbiquitousItemPercentUploadedKey',
+  'NSMetadataUbiquitousItemURLInLocalContainerKey',
+  'NSMetadataUbiquitousItemUploadingErrorKey',
+  'NSMetadataUbiquitousSharedItemCurrentUserPermissionsKey',
+  'NSMetadataUbiquitousSharedItemCurrentUserRoleKey',
+  'NSMetadataUbiquitousSharedItemMostRecentEditorNameComponentsKey',
+  'NSMetadataUbiquitousSharedItemOwnerNameComponentsKey',
+  'NSMetadataUbiquitousSharedItemPermissionsReadOnly',
+  'NSMetadataUbiquitousSharedItemPermissionsReadWrite',
+  'NSMetadataUbiquitousSharedItemRoleOwner',
+  'NSMetadataUbiquitousSharedItemRoleParticipant',
+  'NSMultipleUnderlyingErrorsKey',
+  'NSNEXTSTEPStringEncoding',
+  'NSNextHashEnumeratorItem',
+  'NSNextMapEnumeratorPair',
+  'NSNonLossyASCIIStringEncoding',
+  'NSNonOwnedPointerHashCallBacks',
+  'NSNonOwnedPointerMapKeyCallBacks',
+  'NSNonOwnedPointerMapValueCallBacks',
+  'NSNonOwnedPointerOrNullMapKeyCallBacks',
+  'NSNonRetainedObjectHashCallBacks',
+  'NSNonRetainedObjectMapKeyCallBacks',
+  'NSNonRetainedObjectMapValueCallBacks',
+  'NSOSF1OperatingSystem',
+  'NSObjectHashCallBacks',
+  'NSObjectMapKeyCallBacks',
+  'NSObjectMapValueCallBacks',
+  'NSOpenStepRootDirectory',
+  'NSOpenStepUnicodeReservedBase',
+  'NSOwnedObjectIdentityHashCallBacks',
+  'NSOwnedPointerHashCallBacks',
+  'NSOwnedPointerMapKeyCallBacks',
+  'NSOwnedPointerMapValueCallBacks',
+  'NSPersianCalendar',
+  'NSPointerToStructHashCallBacks',
+  'NSPropertyListErrorMaximum',
+  'NSPropertyListErrorMinimum',
+  'NSProprietaryStringEncoding',
+  'NSProtocolFromString',
+  'NSRepublicOfChinaCalendar',
+  'NSResetHashTable',
+  'NSResetMapTable',
+  'NSShiftJISStringEncoding',
+  'NSSolarisOperatingSystem',
+  'NSStringFromHashTable',
+  'NSStringFromMapTable',
+  'NSStringFromProtocol',
+  'NSSunOSOperatingSystem',
+  'NSSwapBigDoubleToHost',
+  'NSSwapBigFloatToHost',
+  'NSSwapBigIntToHost',
+  'NSSwapBigLongLongToHost',
+  'NSSwapBigLongToHost',
+  'NSSwapBigShortToHost',
+  'NSSwapDouble',
+  'NSSwapFloat',
+  'NSSwapHostDoubleToBig',
+  'NSSwapHostDoubleToLittle',
+  'NSSwapHostFloatToBig',
+  'NSSwapHostFloatToLittle',
+  'NSSwapHostIntToBig',
+  'NSSwapHostIntToLittle',
+  'NSSwapHostLongLongToBig',
+  'NSSwapHostLongLongToLittle',
+  'NSSwapHostLongToBig',
+  'NSSwapHostLongToLittle',
+  'NSSwapHostShortToBig',
+  'NSSwapHostShortToLittle',
+  'NSSwapInt',
+  'NSSwapLittleDoubleToHost',
+  'NSSwapLittleFloatToHost',
+  'NSSwapLittleIntToHost',
+  'NSSwapLittleLongLongToHost',
+  'NSSwapLittleLongToHost',
+  'NSSwapLittleShortToHost',
+  'NSSwapLong',
+  'NSSwapLongLong',
+  'NSSwapShort',
+  'NSSymbolStringEncoding',
+  'NSTextCheckingAllCustomTypes',
+  'NSTextCheckingAllSystemTypes',
+  'NSTextCheckingAllTypes',
+  'NSURLAuthenticationMethodHTMLForm',
+  'NSURLAuthenticationMethodNTLM',
+  'NSURLAuthenticationMethodNegotiate',
+  'NSURLCredentialStorageRemoveSynchronizableCredentials',
+  'NSURLErrorFileOutsideSafeArea',
+  'NSURLFileScheme',
+  'NSURLProtectionSpaceFTP',
+  'NSURLProtectionSpaceFTPProxy',
+  'NSURLProtectionSpaceHTTP',
+  'NSURLProtectionSpaceHTTPProxy',
+  'NSURLProtectionSpaceHTTPS',
+  'NSURLProtectionSpaceHTTPSProxy',
+  'NSURLProtectionSpaceSOCKSProxy',
+  'NSURLSessionDownloadTaskResumeData',
+  'NSURLSessionTransferSizeUnknown',
+  'NSURLSessionUploadTaskResumeData',
+  'NSUTF16BigEndianStringEncoding',
+  'NSUTF16LittleEndianStringEncoding',
+  'NSUTF16StringEncoding',
+  'NSUTF32BigEndianStringEncoding',
+  'NSUTF32LittleEndianStringEncoding',
+  'NSUTF32StringEncoding',
+  'NSUTF8StringEncoding',
+  'NSUbiquitousFileErrorMaximum',
+  'NSUbiquitousFileErrorMinimum',
+  'NSUbiquitousKeyValueStoreAccountChange',
+  'NSUbiquitousKeyValueStoreChangeReasonKey',
+  'NSUbiquitousKeyValueStoreChangedKeysKey',
+  'NSUbiquitousKeyValueStoreInitialSyncChange',
+  'NSUbiquitousKeyValueStoreQuotaViolationChange',
+  'NSUbiquitousKeyValueStoreServerChange',
+  'NSUndefinedDateComponent',
+  'NSUndoCloseGroupingRunLoopOrdering',
+  'NSUndoManagerGroupIsDiscardableKey',
+  'NSUnicodeStringEncoding',
+  'NSUserActivityErrorMaximum',
+  'NSUserActivityErrorMinimum',
+  'NSUserActivityTypeBrowsingWeb',
+  'NSValidationErrorMaximum',
+  'NSValidationErrorMinimum',
+  'NSWindows95OperatingSystem',
+  'NSWindowsCP1250StringEncoding',
+  'NSWindowsCP1251StringEncoding',
+  'NSWindowsCP1252StringEncoding',
+  'NSWindowsCP1253StringEncoding',
+  'NSWindowsCP1254StringEncoding',
+  'NSWindowsNTOperatingSystem',
+  'NSWrapCalendarComponents',
+  'NSXPCConnectionCodeSigningRequirementFailure',
+  'NSXPCConnectionErrorMaximum',
+  'NSXPCConnectionErrorMinimum',
+  'NS_BigEndian',
+  'NS_LittleEndian',
+  'NS_UnknownByteOrder',
+  'kCFStringEncodingASCII',
+])
+
+const CORE_FOUNDATION_OVERLAY_GLOBALS = new Set([
+  'kCFCoreFoundationVersionNumber10_0',
+  'kCFCoreFoundationVersionNumber10_0_3',
+  'kCFCoreFoundationVersionNumber10_1',
+  'kCFCoreFoundationVersionNumber10_10',
+  'kCFCoreFoundationVersionNumber10_10_1',
+  'kCFCoreFoundationVersionNumber10_10_2',
+  'kCFCoreFoundationVersionNumber10_10_3',
+  'kCFCoreFoundationVersionNumber10_10_4',
+  'kCFCoreFoundationVersionNumber10_10_5',
+  'kCFCoreFoundationVersionNumber10_10_Max',
+  'kCFCoreFoundationVersionNumber10_11',
+  'kCFCoreFoundationVersionNumber10_11_1',
+  'kCFCoreFoundationVersionNumber10_11_2',
+  'kCFCoreFoundationVersionNumber10_11_3',
+  'kCFCoreFoundationVersionNumber10_11_4',
+  'kCFCoreFoundationVersionNumber10_11_Max',
+  'kCFCoreFoundationVersionNumber10_1_1',
+  'kCFCoreFoundationVersionNumber10_1_2',
+  'kCFCoreFoundationVersionNumber10_1_3',
+  'kCFCoreFoundationVersionNumber10_1_4',
+  'kCFCoreFoundationVersionNumber10_2',
+  'kCFCoreFoundationVersionNumber10_2_1',
+  'kCFCoreFoundationVersionNumber10_2_2',
+  'kCFCoreFoundationVersionNumber10_2_3',
+  'kCFCoreFoundationVersionNumber10_2_4',
+  'kCFCoreFoundationVersionNumber10_2_5',
+  'kCFCoreFoundationVersionNumber10_2_6',
+  'kCFCoreFoundationVersionNumber10_2_7',
+  'kCFCoreFoundationVersionNumber10_2_8',
+  'kCFCoreFoundationVersionNumber10_3',
+  'kCFCoreFoundationVersionNumber10_3_1',
+  'kCFCoreFoundationVersionNumber10_3_2',
+  'kCFCoreFoundationVersionNumber10_3_3',
+  'kCFCoreFoundationVersionNumber10_3_4',
+  'kCFCoreFoundationVersionNumber10_3_5',
+  'kCFCoreFoundationVersionNumber10_3_6',
+  'kCFCoreFoundationVersionNumber10_3_7',
+  'kCFCoreFoundationVersionNumber10_3_8',
+  'kCFCoreFoundationVersionNumber10_3_9',
+  'kCFCoreFoundationVersionNumber10_4',
+  'kCFCoreFoundationVersionNumber10_4_1',
+  'kCFCoreFoundationVersionNumber10_4_10',
+  'kCFCoreFoundationVersionNumber10_4_11',
+  'kCFCoreFoundationVersionNumber10_4_2',
+  'kCFCoreFoundationVersionNumber10_4_3',
+  'kCFCoreFoundationVersionNumber10_4_4_Intel',
+  'kCFCoreFoundationVersionNumber10_4_4_PowerPC',
+  'kCFCoreFoundationVersionNumber10_4_5_Intel',
+  'kCFCoreFoundationVersionNumber10_4_5_PowerPC',
+  'kCFCoreFoundationVersionNumber10_4_6_Intel',
+  'kCFCoreFoundationVersionNumber10_4_6_PowerPC',
+  'kCFCoreFoundationVersionNumber10_4_7',
+  'kCFCoreFoundationVersionNumber10_4_8',
+  'kCFCoreFoundationVersionNumber10_4_9',
+  'kCFCoreFoundationVersionNumber10_5',
+  'kCFCoreFoundationVersionNumber10_5_1',
+  'kCFCoreFoundationVersionNumber10_5_2',
+  'kCFCoreFoundationVersionNumber10_5_3',
+  'kCFCoreFoundationVersionNumber10_5_4',
+  'kCFCoreFoundationVersionNumber10_5_5',
+  'kCFCoreFoundationVersionNumber10_5_6',
+  'kCFCoreFoundationVersionNumber10_5_7',
+  'kCFCoreFoundationVersionNumber10_5_8',
+  'kCFCoreFoundationVersionNumber10_6',
+  'kCFCoreFoundationVersionNumber10_6_1',
+  'kCFCoreFoundationVersionNumber10_6_2',
+  'kCFCoreFoundationVersionNumber10_6_3',
+  'kCFCoreFoundationVersionNumber10_6_4',
+  'kCFCoreFoundationVersionNumber10_6_5',
+  'kCFCoreFoundationVersionNumber10_6_6',
+  'kCFCoreFoundationVersionNumber10_6_7',
+  'kCFCoreFoundationVersionNumber10_6_8',
+  'kCFCoreFoundationVersionNumber10_7',
+  'kCFCoreFoundationVersionNumber10_7_1',
+  'kCFCoreFoundationVersionNumber10_7_2',
+  'kCFCoreFoundationVersionNumber10_7_3',
+  'kCFCoreFoundationVersionNumber10_7_4',
+  'kCFCoreFoundationVersionNumber10_7_5',
+  'kCFCoreFoundationVersionNumber10_8',
+  'kCFCoreFoundationVersionNumber10_8_1',
+  'kCFCoreFoundationVersionNumber10_8_2',
+  'kCFCoreFoundationVersionNumber10_8_3',
+  'kCFCoreFoundationVersionNumber10_8_4',
+  'kCFCoreFoundationVersionNumber10_9',
+  'kCFCoreFoundationVersionNumber10_9_1',
+  'kCFCoreFoundationVersionNumber10_9_2',
+  'kCFCoreFoundationVersionNumber_iOS_4_0',
+  'kCFCoreFoundationVersionNumber_iOS_4_1',
+  'kCFCoreFoundationVersionNumber_iOS_4_2',
+  'kCFCoreFoundationVersionNumber_iOS_4_3',
+  'kCFCoreFoundationVersionNumber_iOS_5_0',
+  'kCFCoreFoundationVersionNumber_iOS_5_1',
+  'kCFCoreFoundationVersionNumber_iOS_6_0',
+  'kCFCoreFoundationVersionNumber_iOS_6_1',
+  'kCFCoreFoundationVersionNumber_iOS_7_0',
+  'kCFCoreFoundationVersionNumber_iOS_7_1',
+  'kCFCoreFoundationVersionNumber_iOS_8_0',
+  'kCFCoreFoundationVersionNumber_iOS_8_1',
+  'kCFCoreFoundationVersionNumber_iOS_8_2',
+  'kCFCoreFoundationVersionNumber_iOS_8_3',
+  'kCFCoreFoundationVersionNumber_iOS_8_4',
+  'kCFCoreFoundationVersionNumber_iOS_8_x_Max',
+  'kCFCoreFoundationVersionNumber_iOS_9_0',
+  'kCFCoreFoundationVersionNumber_iOS_9_1',
+  'kCFCoreFoundationVersionNumber_iOS_9_2',
+  'kCFCoreFoundationVersionNumber_iOS_9_3',
+  'kCFCoreFoundationVersionNumber_iOS_9_4',
+  'kCFCoreFoundationVersionNumber_iOS_9_x_Max',
+  'kCFCoreFoundationVersionNumber_iPhoneOS_2_0',
+  'kCFCoreFoundationVersionNumber_iPhoneOS_2_1',
+  'kCFCoreFoundationVersionNumber_iPhoneOS_2_2',
+  'kCFCoreFoundationVersionNumber_iPhoneOS_3_0',
+  'kCFCoreFoundationVersionNumber_iPhoneOS_3_1',
+  'kCFCoreFoundationVersionNumber_iPhoneOS_3_2',
+])
+
+// the Darwin CoreFoundation overlay exposes Foundation's geometry identities.
+const CORE_FOUNDATION_GEOMETRY_TYPES = new Set([
+  'CGFloat',
+  'CGPoint',
+  'CGSize',
+  'CGRect',
+  'CGRectEdge',
+])
+
+const CORE_FOUNDATION_GRAPHICS_TYPES = new Set([
+  'CGAffineTransform',
+  'CGAffineTransformComponents',
+  'CGVector',
+])
+
+// scoped imports select native CF handles over overlay bridge aliases without
+// rewriting references or changing the overlay's measured storage contracts.
+const CORE_FOUNDATION_HANDLE_IMPORTS = [
+  'CFAllocator',
+  'CFArray',
+  'CFAttributedString',
+  'CFBoolean',
+  'CFData',
+  'CFDate',
+  'CFDictionary',
+  'CFError',
+  'CFMutableData',
+  'CFNumber',
+  'CFSet',
+  'CFString',
+  'CFURL',
+]
+  .map((name) => `import class CoreFoundation.${name}`)
+  .concat([
+    'import typealias CoreFoundation.CFPropertyList',
+    'import typealias CoreFoundation.CFTypeRef',
+    'import CoreGraphics',
+  ])
+  .join('; ')
+
 export function swiftSourceAsIOS(
   original: string,
   extraObjCExtensions?: Map<string, Set<string>>,
@@ -4539,25 +5280,80 @@ export function swiftSourceAsIOS(
     if (imported) {
       out +=
         conditioned.slice(copied, at) + `import ${imported[1]}`.padEnd(imported[0].length)
+      if (imported[1] === 'CoreFoundation') out += `; ${CORE_FOUNDATION_HANDLE_IMPORTS}`
       copied = at + imported[0].length
       continue
     }
+    const coreFoundationImport = /^import\s+CoreFoundation\b/.exec(rest)
+    if (coreFoundationImport) {
+      out +=
+        conditioned.slice(copied, at) +
+        coreFoundationImport[0] +
+        `; ${CORE_FOUNDATION_HANDLE_IMPORTS}`
+      copied = at + coreFoundationImport[0].length
+      continue
+    }
     if (/^NSClassFromString\b/.test(rest)) {
       out += conditioned.slice(copied, at) + '_peachClassFromString'
       copied = at + 'NSClassFromString'.length
       continue
     }
-    // darwin exports these types from Foundation; wasm leaves unavailable
-    // aliases there and their implementation lives in networking.
-    if (
-      /^Foundation\s*\.\s*(?:HTTPURLResponse|URLAuthenticationChallenge|URLAuthenticationChallengeSender|URLCredential|URLProtectionSpace|URLRequest|URLResponse|URLSession)\b/.test(
-        rest,
+    // darwin exposes these names through Foundation; the guest keeps networking
+    // and overlay declarations in their owning modules.
+    const foundationMember =
+      /^Foundation\s*\.\s*(?:`([A-Za-z_]\w*)`|([A-Za-z_]\w*)\b)/.exec(rest)
+    const foundationName = foundationMember?.[1] ?? foundationMember?.[2]
+    let foundationOwner: string | undefined
+    if (foundationName !== undefined) {
+      if (
+        foundationName === 'NSClassFromString' ||
+        foundationName === 'NSKeyValueChange' ||
+        foundationName === 'NSKeyValueObservedChange' ||
+        foundationName === 'NSKeyValueObservation'
       )
-    ) {
-      out += conditioned.slice(copied, at) + 'FoundationNetworking'
+        foundationOwner = 'PeachObjC'
+      else if (foundationName === 'DispatchData') foundationOwner = 'Dispatch'
+      else if (FOUNDATION_NETWORKING_TYPES.has(foundationName))
+        foundationOwner = 'FoundationNetworking'
+      else if (
+        FOUNDATION_OVERLAY_TYPES.has(foundationName) ||
+        FOUNDATION_OVERLAY_GLOBALS.has(foundationName) ||
+        CORE_FOUNDATION_OVERLAY_GLOBALS.has(foundationName)
+      )
+        foundationOwner = 'PeachFoundation'
+    }
+    if (foundationOwner !== undefined) {
+      out += conditioned.slice(copied, at) + foundationOwner
       copied = at + 'Foundation'.length
       continue
     }
+    const coreFoundationMember =
+      /^CoreFoundation\s*\.\s*(?:`([A-Za-z_]\w*)`|([A-Za-z_]\w*)\b)/.exec(rest)
+    const coreFoundationName = coreFoundationMember?.[1] ?? coreFoundationMember?.[2]
+    if (
+      coreFoundationName !== undefined &&
+      CORE_FOUNDATION_OVERLAY_GLOBALS.has(coreFoundationName)
+    ) {
+      out += conditioned.slice(copied, at) + 'PeachFoundation'
+      copied = at + 'CoreFoundation'.length
+      continue
+    }
+    if (
+      coreFoundationName !== undefined &&
+      CORE_FOUNDATION_GEOMETRY_TYPES.has(coreFoundationName)
+    ) {
+      out += conditioned.slice(copied, at) + 'Foundation'
+      copied = at + 'CoreFoundation'.length
+      continue
+    }
+    if (
+      coreFoundationName !== undefined &&
+      CORE_FOUNDATION_GRAPHICS_TYPES.has(coreFoundationName)
+    ) {
+      out += conditioned.slice(copied, at) + 'CoreGraphics'
+      copied = at + 'CoreFoundation'.length
+      continue
+    }
     if (rest.startsWith('class')) {
       const declared = CLASS_BASE.exec(rest)
       if (declared && reusableViews.has(declared[2]!.split('.').pop()!)) {
@@ -4823,7 +5619,9 @@ function swiftCodeScan(source: string): {
                     ? 'NSClassFromString'
                     : source.startsWith('Foundation', i)
                       ? 'Foundation'
-                      : null
+                      : source.startsWith('CoreFoundation', i)
+                        ? 'CoreFoundation'
+                        : null
       if (
         keyword &&
         !/[\w$]/.test(source[i - 1] ?? '') &&
@@ -5209,6 +6007,7 @@ function projectDiagnostic(
   const prefix = `${base}${path.sep}`
   return designTimeDiagnostic(output, files)
     .split('\n')
+    .filter((line) => !SWIFTPM_NOISE.test(line))
     .map((line) => (line.startsWith(prefix) ? line.slice(prefix.length) : line))
     .join('\n')
     .trim()
@@ -5390,7 +6189,9 @@ export function compileSwiftProjectUnit(
             hash,
             release: options.release,
             timeoutMs: options.timeoutMs,
-            buildKey: createHash('sha256').update(root).digest('hex').slice(0, 32),
+            // framework sources and compiler inputs own the shared object tree;
+            // unrelated app edits reuse it without retaining stale private ABI.
+            buildKey: swiftProjectBuildKey(moduleRoot, options.release),
           }),
         )
         try {
@@ -5451,12 +6252,14 @@ export function compileSwiftProjectUnit(
       const icu = swiftIcuAsset(options.toolchainBin, sdk)
       const buildArgs = [
         'build',
+        ...swiftPackageCacheOptions(),
         '--build-system',
         'native',
         '-j',
         BUILD_JOBS,
         '--package-path',
         root,
+        ...swiftSdkOptions(),
         '--swift-sdk',
         sdk,
         '-c',
@@ -5496,7 +6299,7 @@ export function compileSwiftProjectUnit(
       }
       report('compiling and linking Swift modules')
       try {
-        await runCompiler(swift, buildArgs, buildOptions, true)
+        await runCompiler(swift, buildArgs, buildOptions, SWIFTPM_PROGRESS, SWIFTPM_NOISE)
       } catch (error) {
         const output = outputOf(error)
         const moduleCache = path.join(
@@ -5512,7 +6315,13 @@ export function compileSwiftProjectUnit(
         ) {
           rmSync(moduleCache, { recursive: true, force: true })
           try {
-            await runCompiler(swift, buildArgs, buildOptions, true)
+            await runCompiler(
+              swift,
+              buildArgs,
+              buildOptions,
+              SWIFTPM_PROGRESS,
+              SWIFTPM_NOISE,
+            )
           } catch (retryError) {
             throw new Error(
               projectDiagnostic(outputOf(retryError), layout, input.files),