stim 1.13.0 → 1.15.0

package/dist/{build-plan-BTa93o_r.mjs → build-plan-aeGMFX7e.mjs}

@@ -1,29 +1,31 @@
-import { B as deviceSlotPlatforms, C as setDevice, E as withConfigLock$1, S as saveConfig, U as projectDeviceSlots, _ as loadConfig$1, a as clearDevice, d as getConfigDir, i as clearAndroidBootPending, k as acquireAvdClaim, t as allConsolePortsAndSerials, y as releaseAndroidConsolePort } from "./config-0jCcMM0E.mjs";
-import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { A as workspaceId, C as sharedBuildCache, _ as updateWorkspaceState, a as pidExists, h as readWorkspaceState$1 } from "./metro-BPeY1YMh.mjs";
-import { D as makeTemporaryDirectory, O as removeTemporaryEntry, c as gitCommonDirOnDisk } from "./worktree-DeBQSVtR.mjs";
-import { c as ownedDeviceLabel, r as detectIsExpo, s as isPackageResolvable } from "./project-DGeclhvO.mjs";
-import { a as spawnDeclared } from "./spawn-claims-PT8aQpCa.mjs";
-import { a as withWorkspaceProcessLock } from "./named-ports-n7tnJsI8.mjs";
-import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { i as formatDuration, l as phaseLine, m as shortHash, u as plural } from "./command-output-BIL7rlX7.mjs";
-import { C as diffFingerprintSources, I as storedSources, w as entryDir, y as artifactIn } from "./device-lease-CL9dZf73.mjs";
-import { $ as waitForBoot, A as listInstalledSystemImages, D as listAdbDevices, I as ownedAvdMatchesConfiguration, L as ownedAvdName, N as nextConsolePort, P as ownedAvdDeviceProfile, T as getAvdNameForSerial, U as pickDefaultSystemImage, _ as bootAndroidEmulator, at as dropParked, ct as parkedMaxSetting, d as assertOwnedAvdStopped, dt as selectParked, h as avdPoolConfiguration, it as adoptParked, k as listAvds, lt as readParked, n as OWNED_AVD_CONFIG_DEFAULTS, ot as isLegacyDeletionClaim, q as resolveOwnedAvdSerial, t as DEFAULT_AVD_DEVICE_PROFILE, v as configureNewOwnedAvd, y as createOwnedAvd, z as ownedAvdSystemImage } from "./android-qx_31wJo.mjs";
-import { l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting, v as iosSimSlimProfileSetting } from "./settings-xB0Frkg6.mjs";
-import { f as teardownOwnedAvd, g as teardownParkedIosSim, h as teardownParkedAvd } from "./ownership-PUP4Dwai.mjs";
-import { E as configuredIosSimulatorViewer, O as hostMemoryPressureAdvice, S as resolveOwnedIosSim, b as resetIosPrivacy, c as iosSimulatorFailureAdvice, d as listIosDeviceTypes, f as listIosRuntimes, g as parseRuntimeVersion, k as readHostMemoryPressure, l as listAllIosSims, m as ownedSimName, n as bootIosSim, r as createOwnedIosSim, v as renameIosSim, x as resolveIosCreation, y as resetIosKeychain } from "./ios-CmEzZiOj.mjs";
-import { o as estimateBuild } from "./build-progress-l7d-X-ZP.mjs";
-import { i as expoBinRefusal, r as expoBinPath, t as cleanLine } from "./server-expo-DUCg52-K.mjs";
-import { a as easAuthNote } from "./remote-cache--aehr4Pr.mjs";
-import { a as liveOwnedDeviceCount, i as deviceTypeMismatch, o as runtimeMismatch, t as reconcileSimSlim } from "./simslim-Bbg9UWrt.mjs";
-import { r as readStats } from "./stats-D8rUTPHd.mjs";
-import { d as startBuildHeartbeat, f as tailLines, n as HEARTBEAT_INTERVAL_MS } from "./xcode-LM6A8cNZ.mjs";
-import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync } from "node:fs";
-import { LAST_BUILD_KEYS, isJsonObject, loadConfig, readJsonObject, readWorkspaceState } from "@stim-cli/core/state";
+import { t as getExecutor } from "./exec-CaErVv7t.mjs";
+import { D as withConfigLock$1, H as projectDeviceSlots, _ as loadConfig$1, a as clearDevice, b as releaseAndroidConsolePort, i as clearAndroidBootPending, k as acquireAvdClaim, t as allConsolePortsAndSerials, w as setDevice, z as deviceSlotPlatforms } from "./config-D0DbpZtM.mjs";
+import { m as sharedBuildCache } from "./workspace-state-CL2V2Ons.mjs";
+import { D as makeTemporaryDirectory, O as removeTemporaryEntry, c as gitCommonDirOnDisk } from "./worktree-C0c5Udwa.mjs";
+import { c as ownedDeviceLabel } from "./project-CV3tDFHl.mjs";
+import { r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
+import { i as formatDuration, l as phaseLine, m as shortHash, u as plural } from "./command-output-CliHHn7a.mjs";
+import { C as diffFingerprintSources, I as storedSources, w as entryDir, y as artifactIn } from "./device-lease-W5Pi1q38.mjs";
+import { A as listAvds, B as ownedAvdSystemImage, E as getAvdNameForSerial, F as ownedAvdDeviceProfile, J as resolveOwnedAvdSerial, L as ownedAvdMatchesConfiguration, O as listAdbDevices, P as nextConsolePort, R as ownedAvdName, W as pickDefaultSystemImage, b as createOwnedAvd, dt as parkedMaxSetting, f as assertOwnedAvdStopped, ft as readParked, g as avdPoolConfiguration, j as listInstalledSystemImages, lt as isLegacyDeletionClaim, n as OWNED_AVD_CONFIG_DEFAULTS, ot as adoptParked, t as DEFAULT_AVD_DEVICE_PROFILE, tt as waitForBoot, v as bootAndroidEmulator, y as configureNewOwnedAvd } from "./android-Db2eEMaf.mjs";
+import { o as pidExists } from "./metro-Di8EN2Tb.mjs";
+import { l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting } from "./settings-CduVcoxj.mjs";
+import { i as teardownOwnedAvd, s as teardownParkedAvd } from "./teardown-BYuQafiA.mjs";
+import { j as readHostMemoryPressure, u as listAllIosSims } from "./ios-3CtCRhwr.mjs";
+import { o as estimateBuild, p as readStats } from "./build-progress-C2Jv1AtA.mjs";
+import { t as clearDeviceIdleShutdown } from "./idle-shutdown-B5LPaNyY.mjs";
+import { i as liveOwnedDeviceCount } from "./device-capacity-DMuKC7nx.mjs";
+import { b as tailLines, u as HEARTBEAT_INTERVAL_MS, y as startBuildHeartbeat } from "./toolchain-DmeYjXD9.mjs";
+import { t as cleanLine } from "./server-expo-DhtX6bom.mjs";
+import { i as staleNativeDirRefusal } from "./prebuild-BvxDlD6C.mjs";
+import { i as ensureOwnedIosDevice, r as ensureIosBooted } from "./device-ios-DMQBUPus.mjs";
+import { a as easAuthNote } from "./remote-cache-CO2elm_b.mjs";
+import { t as reconcileSimSlim } from "./simslim-Ciluxlq4.mjs";
+import { randomUUID } from "node:crypto";
+import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, relative } from "node:path";
+import { LAST_BUILD_KEYS, loadConfig, readWorkspaceState } from "@stim-cli/core/state";
 import { claimRemoveCommand, clearClaimChild, markClaimChildPending, processGroupAlive, releaseClaim, setClaimChild } from "@stim-cli/core/ownership-claim";
 import { captureProcessIdentity } from "@stim-cli/core/process-identity";
-import { randomUUID } from "node:crypto";
 import chalk from "chalk";
 import { isDeepStrictEqual } from "node:util";
 import * as expoFingerprint from "@expo/fingerprint";
@@ -91,367 +93,6 @@ async function warmMetro({ port, platform, isExpo, appId, bundleUrl }) {
 	} catch {}
 }
 //#endregion
-//#region src/engine/device-ios.ts
-function startIosBoot(udid, configure, label, out, simulatorApp) {
-	const done = (async () => {
-		await bootIosSim(udid, {
-			label,
-			out,
-			simulatorApp
-		});
-		await configure();
-	})();
-	done.catch(() => {});
-	return {
-		udid,
-		done
-	};
-}
-async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, label, settings, flags, note, out, reconcileIosSimulator }) {
-	const memoryAdvice = hostMemoryPressureAdvice(readHostMemoryPressure());
-	if (memoryAdvice) out(chalk.yellow(phaseLine("memory", memoryAdvice)));
-	const simslimProfile = iosSimSlimProfileSetting(settings, settingsRoot);
-	if (record?.deviceUdid) {
-		if (record.owned) {
-			const resolved = resolveOwnedIosSim(record.deviceUdid);
-			if (resolved.notOwned) note(chalk.yellow(`Note: recorded sim is now named "${resolved.notOwned}", not Stim-owned -- creating a fresh owned sim instead of booting it.`));
-			else if (resolved.missing) {} else {
-				const sim = resolved.sim;
-				const wantedType = flags.deviceType || settings?.ios?.deviceType;
-				const deviceTypes = listIosDeviceTypes();
-				const mismatch = deviceTypeMismatch(sim.deviceTypeIdentifier, wantedType, deviceTypes);
-				if (mismatch) throw new Error(`${mismatch}. Stim will not silently boot a different model. Run \`stim worktree remove\` (or \`stim gc --delete\`) to reap the current sim, then \`stim ios\` again to create the requested one.`);
-				const versionMismatch = flags.runtimeFlag ? runtimeMismatch(sim.runtime, flags.runtimeFlag, listIosRuntimes()) : null;
-				if (versionMismatch) throw new Error(`${versionMismatch}. Stim will not silently boot a different iOS version. Run \`stim worktree remove\` (or \`stim gc --delete\`) to reap the current sim, then \`stim ios\` again to create the requested one, or pass \`--slot <name>\` to create it beside the current one.`);
-				const model = {
-					model: deviceTypes.find((d) => d.identifier === sim.deviceTypeIdentifier)?.name ?? null,
-					runtime: parseRuntimeVersion(sim.runtime)
-				};
-				const name = await withIosDeviceNameLock(() => renameToOwnedName(sim, label, model, projectPath));
-				const updated = {
-					deviceUdid: sim.udid,
-					owned: true,
-					deviceName: name,
-					...record.simslimManaged ? { simslimManaged: true } : {},
-					...record.adopted ? { adopted: true } : {},
-					...record.adoptionPending ? { adoptionPending: true } : {},
-					...record.parkedCacheKey ? { parkedCacheKey: record.parkedCacheKey } : {}
-				};
-				const configure = async () => {
-					if (record.adoptionPending) resetAdoptedSim(sim.udid, out);
-					return configureOwnedIosSim({
-						record: updated,
-						projectPath,
-						slot,
-						profile: simslimProfile,
-						out,
-						reconcileIosSimulator
-					});
-				};
-				const facts = {
-					deviceType: model.model,
-					runtime: model.runtime
-				};
-				if (sim.state !== "Booted") {
-					out(chalk.dim(phaseLine("device", `booting ${name} (${sim.udid})`)));
-					return {
-						...updated,
-						booting: startIosBoot(sim.udid, configure, name, out, flags.simulatorApp),
-						...facts
-					};
-				}
-				return {
-					...await configure(),
-					...facts
-				};
-			}
-		} else {
-			const sim = listAllIosSims().find((s) => s.udid === record.deviceUdid);
-			if (sim) {
-				if (sim.state !== "Booted") {
-					note(chalk.yellow(`Note: assigned sim ${sim.name} (${sim.udid}) is shut down and is not owned by Stim, so it will not be booted automatically.`));
-					note(chalk.dim("Boot it yourself, or run `stim gc --delete` to clear the assignment so Stim can create an owned sim."));
-				}
-				return record;
-			}
-		}
-		withConfigLock$1(() => {
-			const current = deviceSlotPlatforms(loadConfig$1()?.projects?.[projectPath], slot)?.ios;
-			if (!current) return;
-			if (current.deviceUdid !== record.deviceUdid || current.owned !== record.owned) throw new Error("The simulator assignment changed during recovery. Run `stim ios` again.");
-			clearDevice(projectPath, "ios", slot);
-		});
-	}
-	const choice = resolveIosCreation({
-		deviceType: flags.deviceType || settings.ios?.deviceType,
-		runtime: flags.runtime || settings.ios?.runtime
-	});
-	const adopted = parkedMaxSetting("ios").max > 0 ? await withIosDeviceNameLock(() => takeParkedIosSim({
-		projectPath,
-		slot,
-		label,
-		choice,
-		out
-	})) : null;
-	if (adopted) {
-		out(chalk.dim(phaseLine("device", `booting ${adopted.deviceName} (${adopted.deviceUdid})`)));
-		const booting = startIosBoot(adopted.deviceUdid, async () => {
-			resetAdoptedSim(adopted.deviceUdid, out);
-			await configureOwnedIosSim({
-				record: adopted,
-				projectPath,
-				slot,
-				profile: simslimProfile,
-				out,
-				reconcileIosSimulator
-			});
-		}, adopted.deviceName, out, flags.simulatorApp);
-		return {
-			...adopted,
-			booting,
-			deviceType: choice.deviceType,
-			runtime: choice.runtime
-		};
-	}
-	const created = await withIosDeviceNameLock(() => {
-		const suffix = ownedIosNameSuffix(label, {
-			model: choice.deviceType,
-			runtime: choice.runtime
-		}, projectPath);
-		const result = createOwnedIosSim(label, { suffix }, choice);
-		setDevice(projectPath, "ios", {
-			deviceUdid: result.udid,
-			owned: true,
-			deviceName: result.name
-		}, slot);
-		return result;
-	});
-	const newRecord = {
-		deviceUdid: created.udid,
-		owned: true,
-		deviceName: created.name
-	};
-	const booting = startIosBoot(created.udid, () => configureOwnedIosSim({
-		record: newRecord,
-		projectPath,
-		slot,
-		profile: simslimProfile,
-		out,
-		reconcileIosSimulator
-	}), created.name, out, flags.simulatorApp);
-	return {
-		...newRecord,
-		created: true,
-		booting,
-		deviceType: created.deviceType,
-		runtime: created.runtime
-	};
-}
-function withIosDeviceNameLock(fn) {
-	return withWorkspaceProcessLock(getConfigDir(), "ios-device-names", async () => fn(), { external: true });
-}
-function ownedIosNameSuffix(label, model, projectPath, udid) {
-	const names = new Set(listAllIosSims({ includeUnavailable: true }).filter((sim) => sim.udid !== udid).map((sim) => sim.name));
-	for (const project of Object.values(loadConfig$1()?.projects ?? {})) for (const { platforms } of projectDeviceSlots(project)) {
-		const record = platforms.ios;
-		if (record?.deviceUdid !== udid && record?.deviceName) names.add(record.deviceName);
-	}
-	for (const parked of readParked("ios")) if (parked.udid !== udid) names.add(parked.name);
-	let suffix = "";
-	for (let attempt = 0; names.has(ownedSimName(label, model, suffix)); attempt++) suffix = ` ${workspaceId(projectPath)}${attempt ? `-${attempt}` : ""}`;
-	return suffix;
-}
-function renameToOwnedName(sim, label, model, projectPath) {
-	const wanted = ownedSimName(label, model, ownedIosNameSuffix(label, model, projectPath, sim.udid));
-	if (sim.name === wanted) return wanted;
-	try {
-		renameIosSim(sim.udid, wanted);
-		return wanted;
-	} catch {
-		return sim.name;
-	}
-}
-function resetAdoptedSim(udid, out) {
-	out(chalk.dim(phaseLine("device", `resetting privacy grants and the keychain on ${udid}`)));
-	resetIosPrivacy(udid);
-	resetIosKeychain(udid);
-}
-function takeParkedIosSim({ projectPath, slot, label, choice, out }) {
-	const candidates = selectParked(readParked("ios"), {
-		deviceTypeIdentifier: choice.deviceTypeId,
-		runtimeIdentifier: choice.runtimeId
-	});
-	if (candidates.length === 0) return null;
-	const listed = new Map(listAllIosSims({ includeUnavailable: true }).map((sim) => [sim.udid, sim]));
-	for (const parked of candidates) {
-		const sim = listed.get(parked.udid);
-		if (!sim || !sim.available) {
-			const result = sim ? teardownParkedIosSim(parked.udid, { label: parked.name }) : null;
-			if (sim ? result?.status === "torn-down" : dropParked("ios", parked.udid)) out(chalk.dim(phaseLine("device", `deleted parked ${parked.name} (${parked.udid}): ${sim ? "unavailable" : "gone"}`)));
-			else if (result?.status === "failed") out(chalk.yellow(phaseLine("device", `could not delete unavailable parked ${parked.name} (${parked.udid}): ${result.reason}`)));
-			continue;
-		}
-		if (!sim.name.startsWith("stim-")) {
-			out(chalk.yellow(phaseLine("device", `kept parked record for ${parked.udid}: simulator is now named ${JSON.stringify(sim.name)} and is not Stim-owned`)));
-			continue;
-		}
-		const model = {
-			model: choice.deviceType,
-			runtime: choice.runtime
-		};
-		const name = ownedSimName(label, model, ownedIosNameSuffix(label, model, projectPath, parked.udid));
-		const device = {
-			deviceUdid: parked.udid,
-			owned: true,
-			deviceName: name,
-			adopted: true,
-			adoptionPending: true,
-			...parked.simslimManaged ? { simslimManaged: true } : {},
-			...parked.cacheKey ? { parkedCacheKey: parked.cacheKey } : {}
-		};
-		if (!adoptParked({
-			platform: "ios",
-			projectPath,
-			slot,
-			udid: parked.udid,
-			device
-		})) continue;
-		try {
-			renameIosSim(parked.udid, name);
-		} catch {}
-		return device;
-	}
-	return null;
-}
-function clearIosAdoptionPending(projectPath, slot = "default") {
-	withConfigLock$1(() => {
-		const cfg = loadConfig$1();
-		const ios = deviceSlotPlatforms(cfg?.projects?.[projectPath], slot)?.ios;
-		if (!cfg || !ios?.adoptionPending) return;
-		delete ios.adopted;
-		delete ios.adoptionPending;
-		delete ios.parkedCacheKey;
-		saveConfig(cfg);
-	});
-}
-async function configureOwnedIosSim({ record, projectPath, slot, profile, out, reconcileIosSimulator }) {
-	if (profile) out(chalk.dim(phaseLine("device", `applying the SimSlim profile to ${record.deviceUdid}`)));
-	else if (record.simslimManaged) out(chalk.dim(phaseLine("device", `restoring stock simulator services on ${record.deviceUdid}`)));
-	const previouslyManaged = Boolean(record.simslimManaged);
-	if (profile && !record.simslimManaged) {
-		const pending = {
-			...record,
-			simslimManaged: true
-		};
-		setDevice(projectPath, "ios", pending, slot);
-		record = pending;
-	}
-	const result = await reconcileIosSimulator({
-		udid: record.deviceUdid,
-		profile,
-		previouslyManaged,
-		out
-	});
-	const updated = { ...record };
-	if (result.managed) updated.simslimManaged = true;
-	else delete updated.simslimManaged;
-	setDevice(projectPath, "ios", updated, slot);
-	return updated;
-}
-async function ensureIosBooted({ device, simulatorApp, timeoutMs, pollMs, out }) {
-	const udid = device?.deviceUdid;
-	if (!udid) return {
-		failed: true,
-		reason: "No iOS simulator is recorded for this project."
-	};
-	const ready = () => {
-		try {
-			getExecutor().runFile("xcrun", [
-				"simctl",
-				"spawn",
-				udid,
-				"launchctl",
-				"list"
-			], { timeoutMs: 3e4 });
-			return {
-				ok: true,
-				udid
-			};
-		} catch (error) {
-			return {
-				failed: true,
-				reason: `Simulator ${udid} failed its process-spawn readiness check: ${error?.message || error}. ${iosSimulatorFailureAdvice()}`
-			};
-		}
-	};
-	const booting = device?.booting;
-	if (booting?.udid === udid) {
-		try {
-			await booting.done;
-		} catch (e) {
-			return {
-				failed: true,
-				reason: `Could not boot simulator ${udid}: ${e?.message || e}`
-			};
-		}
-		return ready();
-	}
-	let resolved;
-	try {
-		resolved = resolveOwnedIosSim(udid);
-	} catch (e) {
-		return {
-			failed: true,
-			reason: `Could not list simulators: ${e?.message || e}`
-		};
-	}
-	if (resolved.missing) return {
-		failed: true,
-		reason: `Simulator ${udid} no longer exists. Run \`stim ios\` again to create a fresh owned sim.`
-	};
-	if (resolved.notOwned) return {
-		failed: true,
-		reason: `Simulator ${udid} is now named "${resolved.notOwned}" and is not Stim-owned; refusing to boot it.`
-	};
-	const sim = resolved.sim;
-	if (sim.state === "Booted") {
-		const result = ready();
-		if (result.ok && simulatorApp !== void 0) configuredIosSimulatorViewer(simulatorApp).open(udid);
-		return result;
-	}
-	out(chalk.dim(phaseLine("device", `booting ${sim.name} (${udid})`)));
-	const bootDeadline = Date.now() + timeoutMs;
-	try {
-		await bootIosSim(udid, {
-			timeoutMs,
-			label: sim.name,
-			out,
-			simulatorApp
-		});
-	} catch (e) {
-		return {
-			failed: true,
-			reason: `Could not boot simulator ${udid}: ${e?.message || e}`
-		};
-	}
-	const deadline = Math.max(bootDeadline, Date.now() + 2 * pollMs);
-	while (Date.now() < deadline) {
-		await sleep(pollMs);
-		let state = null;
-		try {
-			state = listAllIosSims({ timeoutMs: 3e4 }).find((s) => s.udid === udid)?.state ?? null;
-		} catch {}
-		if (state === "Booted") return ready();
-	}
-	return {
-		failed: true,
-		reason: `Simulator ${udid} did not reach the Booted state within ${Math.round(timeoutMs / 1e3)}s.`
-	};
-}
-function sleep(ms) {
-	return new Promise((r) => setTimeout(r, ms));
-}
-//#endregion
 //#region src/engine/android-avd-setup.ts
 var AvdBootError = class extends Error {
 	remedy;
@@ -860,7 +501,8 @@ async function bootOwnedAvdOnFreshPort({ avdName, metadata, projectPath, slot, d
 		const { bootPending: _booted, ...booted } = claim;
 		return {
 			...booted,
-			serial
+			serial,
+			setup: true
 		};
 	} catch (error) {
 		releaseAndroidConsolePort(projectPath, claim.consolePort, slot);
@@ -987,7 +629,15 @@ async function ensureAndroidBooted({ device, projectPath, slot, timeoutMs, out,
 }
 //#endregion
 //#region src/engine/device.ts
+/**
+* Whether `ensureOwnedDevice` created, adopted or started booting the device, rather than finding it booted.
+* Undefined for a remote device, which those functions do not describe.
+*/
+function didSetUpDevice(device, remote) {
+	return remote ? void 0 : Boolean(device.setup || device.booting);
+}
 async function ensureOwnedDevice({ platform, project, projectPath, slot, settingsRoot = projectPath, label = ownedDeviceLabel(projectPath), settings, flags = {}, note = () => {}, out = () => {}, logFile = null, alive = pidExists, configureAvd = configureNewOwnedAvd, teardownAvd = teardownOwnedAvd, reconcileIosSimulator = reconcileSimSlim }) {
+	clearDeviceIdleShutdown(projectPath, platform, slot);
 	if (slot && slot !== "default") label = `${label}-${slot}`;
 	const record = deviceSlotPlatforms(project, slot)?.[platform] ?? null;
 	if (platform === "ios") return ensureOwnedIosDevice({
@@ -1042,210 +692,6 @@ async function ensureBooted({ platform, device, simulatorApp, timeoutMs, pollMs
 	};
 }
 //#endregion
-//#region src/engine/prebuild.ts
-const PREBUILD_ERROR = "STIM_PREBUILD_FAILED";
-const LAST_LINES$1 = 20;
-function nativeDirName(platform) {
-	return platform === "android" ? "android" : "ios";
-}
-function nativeDir(root, platform) {
-	return join(root, nativeDirName(platform));
-}
-function nativeDirInFingerprint(sources, platform) {
-	const dir = nativeDirName(platform);
-	return sources.some((source) => source.type === "dir" && source.filePath === dir && source.hash != null);
-}
-/**
-* @expo/fingerprint leaves a native directory out of the hash when git ignores it (CNG), so the cache
-* key only covers that directory when this workspace's recorded prebuild ran on the same fingerprint.
-*/
-function prebuildAction({ isExpo, nativeDirExists, nativeDirFingerprinted, nativeDirTracked, generatedFrom, fingerprint }) {
-	if (!isExpo) return "none";
-	if (!nativeDirExists) return "generate";
-	if (nativeDirFingerprinted || generatedFrom === fingerprint) return "none";
-	return nativeDirTracked ? "refuse" : "regenerate";
-}
-function prebuildRecord(state) {
-	const record = state?.prebuild;
-	return record && typeof record === "object" ? record : {};
-}
-function gitTracksNativeDir(root, platform) {
-	try {
-		return getExecutor().runFile("git", [
-			"-C",
-			root,
-			"ls-files",
-			"--",
-			nativeDirName(platform)
-		], { env: {
-			LC_ALL: "C",
-			LANGUAGE: "C"
-		} }).trim() !== "";
-	} catch (error) {
-		if (error?.code === "ENOENT") return false;
-		return !/not a git repository \(or any (of the parent directories|parent up to mount point)/.test(String(error?.message));
-	}
-}
-function planPrebuild(root, platform, { isExpo, fingerprint, sources }) {
-	const nativeDirExists = existsSync(nativeDir(root, platform));
-	const fingerprinted = nativeDirInFingerprint(sources, platform);
-	const generatedFrom = prebuildRecord(readWorkspaceState$1(root))[platform];
-	return prebuildAction({
-		isExpo,
-		nativeDirExists,
-		nativeDirFingerprinted: fingerprinted,
-		nativeDirTracked: nativeDirExists && !fingerprinted && gitTracksNativeDir(root, platform),
-		generatedFrom: typeof generatedFrom === "string" ? generatedFrom : null,
-		fingerprint
-	});
-}
-function recordPrebuild(root, platform, fingerprint) {
-	updateWorkspaceState(root, (state) => ({
-		...state,
-		prebuild: {
-			...prebuildRecord(state),
-			[platform]: fingerprint
-		}
-	}));
-}
-function staleNativeDirRefusal(platform) {
-	const dir = nativeDirName(platform);
-	return {
-		code: PREBUILD_ERROR,
-		message: `The fingerprint leaves ${dir}/ out of the cache key, and Stim cannot show that ${dir}/ was generated from the current app config. Git tracks files in it, or could not say whether it does, so Stim will not regenerate it with \`expo prebuild --clean\`.`,
-		remedy: `Stop excluding ${dir}/ from the fingerprint (check .fingerprintignore) so the cache key covers its files, or add ${dir}/ to .gitignore and untrack it so Stim regenerates it from the app config.`
-	};
-}
-function prebuildRefusal({ isExpo, platform, nativeDirExists }) {
-	if (nativeDirExists || isExpo) return null;
-	const dir = nativeDirName(platform);
-	return {
-		code: PREBUILD_ERROR,
-		message: `This project has no ${dir}/ directory and is not an Expo (CNG) project, so Stim cannot generate one.`,
-		remedy: `Check out or generate the native project (\`npx @react-native-community/cli init\` produced one originally), or add \`expo\` to the project so \`expo prebuild\` can create ${dir}/.`
-	};
-}
-function prebuildFailure(logWriter, result) {
-	logWriter?.write?.({
-		src: "build",
-		level: "error",
-		msg: result.reason || "Expo prebuild failed.",
-		event: "prebuild_failed"
-	});
-	return result;
-}
-async function runPrebuild(root, platform, logWriter, { spawnFn = null, now = Date.now, isExpo = null, clean = false } = {}) {
-	const dirExists = existsSync(nativeDir(root, platform));
-	const refusal = prebuildRefusal({
-		isExpo: isExpo === null ? detectIsExpo(root) : isExpo,
-		platform,
-		nativeDirExists: dirExists
-	});
-	if (refusal) return prebuildFailure(logWriter, {
-		failed: true,
-		code: refusal.code,
-		reason: refusal.message,
-		remedy: refusal.remedy,
-		error: refusal,
-		lastLines: []
-	});
-	const bin = expoBinPath(root);
-	if (!bin) {
-		const binRefusal = expoBinRefusal(root, "prebuild");
-		return prebuildFailure(logWriter, {
-			failed: true,
-			code: PREBUILD_ERROR,
-			reason: binRefusal.message,
-			remedy: binRefusal.remedy,
-			lastLines: []
-		});
-	}
-	const spawn = spawnFn || ((cmd, args, opts) => getExecutor().spawn(cmd, args, opts));
-	const startedAt = now();
-	const tail = [];
-	const push = (line) => {
-		const msg = stripAnsi(String(line)).trimEnd();
-		if (!msg.trim()) return;
-		tail.push(msg);
-		if (tail.length > LAST_LINES$1) tail.shift();
-		logWriter?.write?.({
-			src: "build",
-			level: "debug",
-			msg,
-			raw: true,
-			event: "prebuild"
-		});
-	};
-	let child;
-	try {
-		child = spawnDeclared(() => spawn(bin, [
-			"prebuild",
-			"-p",
-			platform,
-			"--no-install",
-			...clean ? ["--clean"] : []
-		], {
-			cwd: root,
-			stdio: [
-				"ignore",
-				"pipe",
-				"pipe"
-			],
-			env: {
-				...process.env,
-				FORCE_COLOR: "0",
-				CI: "1"
-			}
-		}));
-	} catch (err) {
-		return prebuildFailure(logWriter, {
-			failed: true,
-			code: PREBUILD_ERROR,
-			reason: `Could not run \`expo prebuild\`: ${err?.message || err}`,
-			lastLines: []
-		});
-	}
-	const outReader = createLineReader(push);
-	const errReader = createLineReader(push);
-	child.stdout?.setEncoding?.("utf-8");
-	child.stderr?.setEncoding?.("utf-8");
-	child.stdout?.on("data", (chunk) => outReader.push(chunk));
-	child.stderr?.on("data", (chunk) => errReader.push(chunk));
-	const result = await waitForChild(child);
-	outReader.flush();
-	errReader.flush();
-	const durationMs = now() - startedAt;
-	if (result.error) return prebuildFailure(logWriter, {
-		failed: true,
-		code: PREBUILD_ERROR,
-		reason: `Could not run \`expo prebuild\`: ${result.error?.message || result.error}`,
-		lastLines: tail.slice(),
-		durationMs
-	});
-	if (result.code !== 0) {
-		const how = result.signal ? `signal ${result.signal}` : `exit code ${result.code}`;
-		return prebuildFailure(logWriter, {
-			failed: true,
-			code: PREBUILD_ERROR,
-			reason: `\`expo prebuild -p ${platform}\` failed (${how}).`,
-			lastLines: tail.slice(),
-			durationMs
-		});
-	}
-	if (!existsSync(nativeDir(root, platform))) return prebuildFailure(logWriter, {
-		failed: true,
-		code: PREBUILD_ERROR,
-		reason: `\`expo prebuild -p ${platform}\` succeeded but did not create ${nativeDirName(platform)}/.`,
-		lastLines: tail.slice(),
-		durationMs
-	});
-	return {
-		ok: true,
-		durationMs,
-		nativeDir: nativeDir(root, platform)
-	};
-}
-//#endregion
 //#region src/engine/js-swap.ts
 const JS_BUNDLE_NAME = "main.jsbundle";
 const LAST_LINES = 5;
@@ -1287,7 +733,8 @@ function detectEntryFile(root) {
 	}
 	return pickEntryFile(entries);
 }
-function bundleCommand({ isExpo, entryFile, bundleOutput, assetsDest }) {
+function bundleCommand({ isExpo, entryFile, bundleOutput, assetsDest, assetCatalogDest = null }) {
+	const catalogArgs = assetCatalogDest ? ["--asset-catalog-dest", assetCatalogDest] : [];
 	if (isExpo) return {
 		file: "npx",
 		args: [
@@ -1300,7 +747,8 @@ function bundleCommand({ isExpo, entryFile, bundleOutput, assetsDest }) {
 			"--bundle-output",
 			bundleOutput,
 			"--assets-dest",
-			assetsDest
+			assetsDest,
+			...catalogArgs
 		]
 	};
 	return {
@@ -1317,10 +765,117 @@ function bundleCommand({ isExpo, entryFile, bundleOutput, assetsDest }) {
 			"--bundle-output",
 			bundleOutput,
 			"--assets-dest",
-			assetsDest
+			assetsDest,
+			...catalogArgs
 		]
 	};
 }
+const ASSET_CATALOG_BUNDLE = "RNAssets.bundle";
+/**
+* Where React Native 0.88+ keeps the app's packager images. With the `RCTUseAssetCatalog` Info.plist
+* key, `react-native-xcode.sh` compiles them with actool into RNAssets.bundle and the native image
+* loader reads only that catalog, so a swap has to rebuild it. Null means loose files under assets/.
+*/
+function assetCatalogTarget(infoPlist) {
+	if (!infoPlist || typeof infoPlist !== "object") return null;
+	const plist = infoPlist;
+	const flag = plist.RCTUseAssetCatalog;
+	if (!(flag === true || flag === 1 || typeof flag === "string" && [
+		"true",
+		"yes",
+		"1"
+	].includes(flag.toLowerCase()))) return null;
+	const families = Array.isArray(plist.UIDeviceFamily) ? plist.UIDeviceFamily : [1];
+	const targetDevices = [...families.includes(1) ? ["iphone"] : [], ...families.includes(2) ? ["ipad"] : []];
+	return {
+		platform: typeof plist.DTPlatformName === "string" ? plist.DTPlatformName : "iphoneos",
+		minimumDeploymentTarget: typeof plist.MinimumOSVersion === "string" ? plist.MinimumOSVersion : "15.1",
+		targetDevices: targetDevices.length ? targetDevices : ["iphone"]
+	};
+}
+function readPlistKey(e, plist, key, format) {
+	try {
+		return e.runFile("plutil", [
+			"-extract",
+			key,
+			format,
+			"-o",
+			"-",
+			plist
+		]);
+	} catch (err) {
+		if (/No value at that key path/.test(describe(err))) return null;
+		throw err;
+	}
+}
+function readAssetCatalogTarget(e, plist) {
+	const flag = readPlistKey(e, plist, "RCTUseAssetCatalog", "raw");
+	if (flag === null) return null;
+	const families = readPlistKey(e, plist, "UIDeviceFamily", "json");
+	return assetCatalogTarget({
+		RCTUseAssetCatalog: flag,
+		DTPlatformName: readPlistKey(e, plist, "DTPlatformName", "raw"),
+		MinimumOSVersion: readPlistKey(e, plist, "MinimumOSVersion", "raw"),
+		UIDeviceFamily: families === null ? void 0 : JSON.parse(families)
+	});
+}
+function actoolArgs({ catalog, out, target }) {
+	return [
+		"actool",
+		catalog,
+		"--compile",
+		out,
+		"--output-format",
+		"human-readable-text",
+		"--errors",
+		"--warnings",
+		"--notices",
+		"--platform",
+		target.platform,
+		"--minimum-deployment-target",
+		target.minimumDeploymentTarget,
+		...target.targetDevices.flatMap((device) => ["--target-device", device])
+	];
+}
+const ASSET_CATALOG_BUNDLE_INFO_PLIST = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleIdentifier</key>
+  <string>org.reactjs.RNAssets</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>RNAssets</string>
+  <key>CFBundlePackageType</key>
+  <string>BNDL</string>
+</dict>
+</plist>
+`;
+const UPDATES_MANIFEST_NAME = "app.manifest";
+/**
+* expo-updates launches the update with the newest `commitTime` among those built for the binary's
+* runtime version, and the embedded one is only a row in that race. A swapped copy keeps the id and
+* `commitTime` the cached build wrote, so an update downloaded after that build would launch instead
+* of the injected bundle. A full build writes a fresh id and `commitTime`; this does the same.
+*/
+function refreshUpdatesManifest(text, { id, commitTime }) {
+	const manifest = JSON.parse(text);
+	if (!manifest || typeof manifest !== "object" || Array.isArray(manifest)) throw new Error(`${UPDATES_MANIFEST_NAME} is not a JSON object`);
+	return JSON.stringify({
+		...manifest,
+		id,
+		commitTime
+	});
+}
+function refreshUpdatesManifestFile(path, commitTime) {
+	writeFileSync(path, refreshUpdatesManifest(readFileSync(path, "utf-8"), {
+		id: randomUUID(),
+		commitTime
+	}));
+}
+const IOS_UPDATES_MANIFESTS = [join("EXUpdates.bundle", UPDATES_MANIFEST_NAME), UPDATES_MANIFEST_NAME];
+const IOS_FRAMEWORK_UPDATES_MANIFEST = join("Frameworks", "EXUpdates.framework", "EXUpdates.bundle", UPDATES_MANIFEST_NAME);
 function hermescPath(root, { exists = existsSync } = {}) {
 	const candidates = [
 		join(root, "node_modules", "hermes-compiler", "hermesc", "osx-bin", "hermesc"),
@@ -1380,19 +935,34 @@ async function swapJsBundle({ root, isExpo, cachedAppPath, logWriter = null, exe
 	} catch (err) {
 		return fail("copy", `could not copy ${cachedAppPath} aside: ${describe(err)}`);
 	}
+	let catalogTarget;
+	const infoPlistPath = join(appCopy, "Info.plist");
+	try {
+		catalogTarget = readAssetCatalogTarget(e, infoPlistPath);
+	} catch (err) {
+		return fail("catalog", `could not read ${infoPlistPath}: ${describe(err)}`);
+	}
 	const bundleOutput = join(tmp, JS_BUNDLE_NAME);
 	const assetsDest = join(tmp, "assets");
+	const catalogStaging = catalogTarget ? join(tmp, "rn-assets") : null;
+	const catalogDir = catalogStaging ? join(catalogStaging, "RNAssets.xcassets") : null;
 	const command = bundleCommand({
 		isExpo,
 		entryFile: isExpo ? "index.js" : detectEntryFile(root),
 		bundleOutput,
-		assetsDest
+		assetsDest,
+		assetCatalogDest: catalogStaging
 	});
 	try {
 		mkdirSync(assetsDest, { recursive: true });
 	} catch (err) {
 		return fail("bundle", `could not create ${assetsDest}: ${describe(err)}`);
 	}
+	if (catalogDir) try {
+		mkdirSync(catalogDir, { recursive: true });
+	} catch (err) {
+		return fail("bundle", `could not create ${catalogDir}: ${describe(err)}`);
+	}
 	logWriter?.write?.({
 		src: "build",
 		level: "info",
@@ -1487,6 +1057,34 @@ async function swapJsBundle({ root, isExpo, cachedAppPath, logWriter = null, exe
 	} catch (err) {
 		return fail("replace", `could not replace the JS bundle inside ${appCopy}: ${describe(err)}`);
 	}
+	if (catalogTarget && catalogDir) {
+		const catalogBundle = join(appCopy, ASSET_CATALOG_BUNDLE);
+		try {
+			rmSync(catalogBundle, {
+				recursive: true,
+				force: true
+			});
+			if (readdirSync(catalogDir).some((name) => name.endsWith(".imageset"))) {
+				mkdirSync(catalogBundle);
+				const output = e.runFile("xcrun", actoolArgs({
+					catalog: catalogDir,
+					out: catalogBundle,
+					target: catalogTarget
+				}));
+				if (!exists(join(catalogBundle, "Assets.car"))) return fail("actool", `actool wrote no Assets.car into ${catalogBundle}`, tailLines(output.split("\n"), LAST_LINES));
+				writeFileSync(join(catalogBundle, "Info.plist"), ASSET_CATALOG_BUNDLE_INFO_PLIST);
+			}
+		} catch (err) {
+			const stdout = String(err?.stdout ?? "");
+			return fail("actool", `could not compile the image asset catalog into ${catalogBundle}: ${describe(err)}`, tailLines(stdout.split("\n"), LAST_LINES));
+		}
+	}
+	if (exists(join(appCopy, IOS_FRAMEWORK_UPDATES_MANIFEST))) return fail("updates", `the expo-updates manifest sits inside a nested framework (${IOS_FRAMEWORK_UPDATES_MANIFEST}), where a swap cannot refresh it without re-signing that framework`);
+	for (const manifest of IOS_UPDATES_MANIFESTS.map((name) => join(appCopy, name)).filter(exists)) try {
+		refreshUpdatesManifestFile(manifest, now());
+	} catch (err) {
+		return fail("updates", `could not refresh the expo-updates manifest ${manifest}: ${describe(err)}`);
+	}
 	try {
 		e.runFile("codesign", [
 			"--force",
@@ -1517,61 +1115,6 @@ function describe(err) {
 	return String(err?.message || err);
 }
 //#endregion
-//#region src/commands/dev-client.ts
-function devClientScheme(root, appPath = null, { exec = null } = {}) {
-	if (!hasDevClient(root)) return void 0;
-	const fromBundle = pickDevClientScheme(readBundleSchemes(appPath, { exec }));
-	if (fromBundle) return fromBundle;
-	const app = readJsonObject(join(root, "app.json"));
-	const expo = app?.expo;
-	const raw = (isJsonObject(expo) ? expo.scheme : void 0) ?? app?.scheme ?? null;
-	const scheme = Array.isArray(raw) ? raw.find((s) => typeof s === "string" && s.trim() !== "") : raw;
-	if (typeof scheme !== "string" || scheme.trim() === "") return void 0;
-	return scheme.trim();
-}
-function schemesFromInfoPlist(plist) {
-	const types = plist?.CFBundleURLTypes;
-	if (!Array.isArray(types)) return [];
-	const out = [];
-	for (const type of types) {
-		const schemes = type?.CFBundleURLSchemes;
-		if (Array.isArray(schemes)) out.push(...schemes.filter((s) => typeof s === "string" && s.trim() !== ""));
-	}
-	return out;
-}
-function readBundleSchemes(appPath, { exec = null } = {}) {
-	if (typeof appPath !== "string" || appPath.trim() === "") return [];
-	const e = exec || getExecutor();
-	let out;
-	try {
-		out = e.runFile("plutil", [
-			"-convert",
-			"json",
-			"-o",
-			"-",
-			join(appPath, "Info.plist")
-		]);
-	} catch {
-		return [];
-	}
-	try {
-		return schemesFromInfoPlist(JSON.parse(String(out)));
-	} catch {
-		return [];
-	}
-}
-const THIRD_PARTY_SCHEME = /^(?:fb\d+|com\.googleusercontent\.apps\.|msauth\.|msauthv2|twitterkit-|db-[a-z0-9]+$|spotify|snapchat|com\.facebook)/i;
-function pickDevClientScheme(schemes) {
-	const all = (Array.isArray(schemes) ? schemes : []).filter((s) => typeof s === "string" && s.trim() !== "").map((s) => s.trim()).filter((s) => !/^(?:https?|mailto|tel|sms|itms(?:-apps)?)$/i.test(s));
-	const expo = all.filter((s) => s.startsWith("exp+"));
-	return (expo.length ? expo : all.filter((s) => !THIRD_PARTY_SCHEME.test(s))).toSorted((a, b) => b.length - a.length)[0] ?? null;
-}
-function hasDevClient(root) {
-	const pkg = readJsonObject(join(root, "package.json"));
-	if ([pkg?.dependencies, pkg?.devDependencies].some((deps) => isJsonObject(deps) && "expo-dev-client" in deps)) return true;
-	return isPackageResolvable(root, "expo-dev-client");
-}
-//#endregion
 //#region src/cache/miss-reason.ts
 const MISS_CHANGE_CAP = 20;
 function recordedBuilds(state, platform) {
@@ -1924,7 +1467,7 @@ async function planCachedBuild(lookup, deps) {
 function planPayload({ platform, slot, projectKey }, found) {
 	const { refusal, missReason, ...rest } = found;
 	const outcome = refusal ? null : found.cacheHit ? "hit" : "cold";
-	const estimate = outcome ? estimateBuild(readStats().record?.history?.[projectKey], platform, outcome, "prepare") : {
+	const estimate = outcome ? estimateBuild(readStats().record?.history?.[projectKey], platform, outcome) : {
 		expectedMs: null,
 		basis: 0
 	};
@@ -1981,4 +1524,4 @@ function planFlagRefusal(flag) {
 	};
 }
 //#endregion
-export { warmMetro as C, clearIosAdoptionPending as S, staleNativeDirRefusal as _, refusePlan as a, AvdBootError as b, skippedMissReason as c, schemesFromInfoPlist as d, detectEntryFile as f, runPrebuild as g, recordPrebuild as h, printPlan as i, devClientScheme as l, planPrebuild as m, planFlagRefusal as n, explainBuildMiss as o, swapJsBundle as p, planPayload as r, fingerprintErrorMissReason as s, planCachedBuild as t, pickDevClientScheme as u, ensureBooted as v, AvdRecoveryError as x, ensureOwnedDevice as y };
+export { AvdRecoveryError as _, refusePlan as a, skippedMissReason as c, refreshUpdatesManifestFile as d, swapJsBundle as f, AvdBootError as g, ensureOwnedDevice as h, printPlan as i, UPDATES_MANIFEST_NAME as l, ensureBooted as m, planFlagRefusal as n, explainBuildMiss as o, didSetUpDevice as p, planPayload as r, fingerprintErrorMissReason as s, planCachedBuild as t, detectEntryFile as u, warmMetro as v };