stim 1.10.1 → 1.12.0

package/dist/{android-Bu4mbDzc.mjs → android-B7X-8H7h.mjs}

@@ -1,36 +1,37 @@
-import { L as deviceSlotFileKey, R as deviceSlotKey, S as setDevice, T as withConfigLock, V as parseDeviceSlotOption, W as validateDeviceSlot, f as getProject, g as loadConfig, k as ownership_claim_exports, l as getConcurrencyLimits, w as upsertProject, x as saveConfig, z as deviceSlotPlatforms } from "./config-BEq0Qw_a.mjs";
+import { A as ownership_claim_exports, B as deviceSlotPlatforms, C as setDevice, E as withConfigLock$1, G as validateDeviceSlot, H as parseDeviceSlotOption, R as deviceSlotFileKey, S as saveConfig, T as upsertProject, _ as loadConfig$1, p as getProject, u as getConcurrencyLimits, z as deviceSlotKey } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CDY9IkVC.mjs";
-import { O as workspaceDir, b as emulatorLogFile, c as signalProcessTree, h as recordWorkspaceUse, i as pidExists, j as workspaceLogsDir, m as readWorkspaceState, s as resolveProjectMetro, y as writeWorkspaceState } from "./metro-BWLOJ_Wr.mjs";
-import { D as makeTemporaryDirectory, O as removeTemporaryEntry, s as gitCommonDir, y as repoRoot } from "./worktree-BlizKDpZ.mjs";
-import { a as detectIsExpo, i as detectBundleId, l as projectShortcut, n as appProjectProblem, o as findProjectRoot, r as detectAndroidPackage } from "./project-BXZzOABt.mjs";
-import { n as MODE_EXPO, p as writeWorkspaceLaunch, t as MODE_BARE } from "./state-WGdIbi_d.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BXA96myD.mjs";
+import { O as workspaceDir, b as emulatorLogFile, c as signalProcessTree, h as recordWorkspaceUse, i as pidExists, j as workspaceLogsDir, m as readWorkspaceState$1, s as resolveProjectMetro, y as writeWorkspaceState } from "./metro-Dzo30hvJ.mjs";
+import { D as makeTemporaryDirectory, O as removeTemporaryEntry, s as gitCommonDir, y as repoRoot } from "./worktree-DeBQSVtR.mjs";
+import { i as findProjectRoot, n as appProjectProblem, r as detectIsExpo, s as projectShortcut, t as NO_PROJECT_REFUSAL } from "./project-B8rbutVC.mjs";
+import { m as writeWorkspaceLaunch, n as MODE_EXPO, t as MODE_BARE } from "./state-DcDgzfu3.mjs";
 import { r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { _ as stepTimer, c as launchErrorReport, f as refuseNoProject, g as stepClock, i as formatDuration, l as phaseLine, m as shortHash, n as appReadinessMessage, v as launchErrorPreview } from "./command-output-D5z2_bcF.mjs";
-import { A as resolveBuild, C as fingerprintDiffRecord, D as providerDownloadPath, E as prepareProviderDownloadDir, F as assetDiffReason, I as captureAssetManifest, L as compareAssetManifests, M as storedAssetManifest, N as untrackedMissLine, O as providerUploadOutcome, P as untrackedNativeFiles, R as readAssetManifest, S as filesystemBuildCapability, T as fingerprintProject, _ as waitForBuild, b as describeFingerprintMiss, g as releaseBuildLock, j as storeBuild, k as refingerprintAfterMutation, m as acquireBuildLock, v as waitForSharedBuild, w as fingerprintDiffSuffix, y as buildCacheKey } from "./device-lease-CbEaIk7b.mjs";
-import { n as NO_BUILD_PROGRESS, s as startBuildProgress } from "./build-progress-BXx-ZBe4.mjs";
-import { B as resolvePhysicalDevice, E as listInstalledSystemImages, F as physicalDeviceModel, L as probeEmulatorSerial, O as memoizeEmulatorProbe, R as resetAdoptedAvd, W as waitForBoot, _ as emulatorDiskSpaceRemedy, a as androidPoolNoCandidatesRefusal, b as findBuildTool, i as androidPoolCandidates, n as androidDeviceAbi, o as androidSystemImageAbi, r as androidHome, s as androidToolCwd, t as androidBuildToolName, v as emulatorFailureRemedy, w as listAdbDevices, y as extractEmulatorFailure, z as resolveOwnedAvdSerial } from "./android-787HhP5w.mjs";
-import { A as resolveCacheProviderConfig, E as publicUrlSetting, H as compilerCacheFallbackMessage, I as tunnelModeSetting, L as unknownSettingKeys, M as settingFile, O as remoteAndroidSetting, P as settingShapeErrors, S as metroWarmupUrlSetting, U as optimizationBuildProfile, V as artifactCachePolicy, W as resolveOptimizations, a as SETTING_SHAPE_REMEDY, d as cacheProviderSettingError, j as resolveSettings, r as REMOTE_DEVICE_BACKENDS, s as androidAvdConfigSettingError, u as androidDataPartitionSizeGbSettingError, z as detectProviders } from "./settings-DOugPlPz.mjs";
-import { y as parkedMaxSetting } from "./ownership-BfPNRf3-.mjs";
-import { a as acquireBuildSlot, s as releaseBuildSlot } from "./in-use-CNIWU-r-.mjs";
-import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-D2xbLVoz.mjs";
-import { t as cleanLine } from "./server-expo-BvOCeakp.mjs";
-import { A as UPLOAD_TIMEOUT_MS, B as resolveRemote, F as isEasAuthFailureText, I as loadProjectProvider, M as checkEasAuth, N as easAuthNote, P as exitAfterFlush, V as uploadRemote, a as ensureMetroReachable, c as remoteAndroidDeps, j as cacheLevel, k as RESOLVE_TIMEOUT_MS, n as binOnPath, o as ensureRemoteBootOwned, u as resolveRemoteContext, w as ownedSessionName, z as resolveEasCliBin } from "./device-remote-powUHdbK.mjs";
-import { _ as launchAndroidReleaseApp, d as deviceShellArg, f as installAndroidApp, g as launchAndroidApp, o as androidAppProcess, p as installConflictKind, r as DEFAULT_METRO_PORT, s as androidDevClientUrl, t as ADB_INSTALL_TIMEOUT_MS } from "./app-install-Cfmqr3TQ.mjs";
-import { a as VERIFY_TIMEOUT_MS, d as verifyLaunch, i as RELEASE_VERIFY_WAIT_MS, l as unverifiedLaunchLines, n as LAUNCH_FATAL, r as LAUNCH_UNVERIFIED, t as LAUNCH_BUNDLING, u as verifyAndroidReleaseLaunch } from "./launch-verify-BhgkYAws.mjs";
-import { d as isEasBuildFailure, f as resolveEasDevelopmentBuild, o as unknownAndroidSystemImageRefusal, r as checkDeviceCapacity } from "./simslim-DZUxzsjq.mjs";
-import { a as lostLine, c as releaseLeaseOnSignal, i as leaseExpiryText, l as runLease, n as DEBUG_VERIFY_STEP_MS, o as lostRefusal, r as acquireRunLease, s as parseDeviceWait, t as selectFromPool, u as waitFlagConflict } from "./device-pool-BBWLAr55.mjs";
-import { _ as isPhysicalDeviceRequest, b as warmMetro, c as runPrebuild, d as ensureOwnedDevice, f as AvdBootError, g as ensureWorkspaceStorageSafely, h as ensureDevServer, i as detectEntryFile, l as staleNativeDirRefusal, n as pickDevClientScheme, o as planPrebuild, p as AvdRecoveryError, s as recordPrebuild, t as devClientScheme, u as ensureBooted, v as launchOutcomeRecord } from "./dev-client-DExzPiOa.mjs";
-import { t as budgetGate } from "./budget-nDCEwtJv.mjs";
-import { f as spawnEntry, s as startDevServer } from "./start-RbmFPeZ7.mjs";
-import { a as statsProjectKey, i as recordRunStats, n as readRunEstimates, t as createRunRecorder } from "./stats-BAgJaLA4.mjs";
-import { a as buildAndroid, c as CCACHE_NOT_RUN, f as resolveCcache, l as CCACHE_UNAVAILABLE, n as resolveAndroidCas, o as productFlavorRefusal, p as formatDiagnostic, r as resolveAndroidCompilerCache, s as readProductFlavors, u as ccacheActivityLine } from "./android-cas-CITmIeWY.mjs";
-import { d as startBuildHeartbeat, f as tailLines, n as HEARTBEAT_INTERVAL_MS } from "./xcode-B2tBkf0m.mjs";
-import { n as nativeRunCommand, t as launchSlotScope } from "./slot-launch-Dk4oTREM.mjs";
-import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-xxWKNO3-.mjs";
+import { _ as stepTimer, c as launchErrorReport, f as refuseNoProject, g as stepClock, i as formatDuration, l as phaseLine, m as shortHash, n as appReadinessMessage, v as launchErrorPreview } from "./command-output-BWCj5Vh-.mjs";
+import { A as resolveBuild, C as filesystemBuildCapability, D as providerDownloadPath, E as prepareProviderDownloadDir, F as untrackedNativeFiles, I as assetDiffReason, L as captureAssetManifest, M as storedAssetManifest, O as providerUploadOutcome, P as untrackedMissLine, R as compareAssetManifests, T as fingerprintProject, _ as waitForBuild, b as buildCacheKey, g as releaseBuildLock, j as storeBuild, k as refingerprintAfterMutation, m as acquireBuildLock, v as waitForSharedBuild, w as fingerprintDiffRecord, z as readAssetManifest } from "./device-lease-B9LAXIUH.mjs";
+import { B as pickDefaultSystemImage, D as listAvdDeviceProfiles, E as listAdbDevices, G as resolvePhysicalDevice, H as profileNeedsFoldFeature, J as systemImageSupportsFold, N as ownedAvdDeviceProfile, O as listAvds, P as ownedAvdDirectory, R as ownedAvdSystemImage, S as findBuildTool, U as resetAdoptedAvd, V as probeEmulatorSerial, W as resolveOwnedAvdSerial, X as waitForBoot, a as androidHome, b as emulatorFailureRemedy, c as androidSystemImageAbi, i as androidDeviceAbi, j as memoizeEmulatorProbe, k as listInstalledSystemImages, l as androidToolCwd, o as androidPoolCandidates, r as androidBuildToolName, s as androidPoolNoCandidatesRefusal, t as DEFAULT_AVD_DEVICE_PROFILE, tt as configuredAndroidEmulatorApp, w as hostSystemImageArch, x as extractEmulatorFailure, y as emulatorDiskSpaceRemedy, z as physicalDeviceModel } from "./android-75Sk2rIR.mjs";
+import { A as resolveCacheProviderConfig, E as publicUrlSetting, H as compilerCacheFallbackMessage, I as tunnelModeSetting, L as unknownSettingKeys, M as settingFile, O as remoteAndroidSetting, P as settingShapeErrors, S as metroWarmupUrlSetting, U as optimizationBuildProfile, V as artifactCachePolicy, W as resolveOptimizations, a as SETTING_SHAPE_REMEDY, d as cacheProviderSettingError, j as resolveSettings, r as REMOTE_DEVICE_BACKENDS, s as androidAvdConfigSettingError, u as androidDataPartitionSizeGbSettingError, z as detectProviders } from "./settings-BlyDn2Oz.mjs";
+import { y as parkedMaxSetting } from "./ownership-B8d4kXBx.mjs";
+import { c as startBuildProgress, n as NO_BUILD_PROGRESS } from "./build-progress-h60GPV27.mjs";
+import { a as acquireBuildSlot, s as releaseBuildSlot } from "./in-use-D9XYEgFD.mjs";
+import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-Dqnrjrio.mjs";
+import { t as cleanLine } from "./server-expo-CeT1nIIk.mjs";
+import { a as easAuthNote, c as loadProjectProvider, f as resolveEasCliBin, i as checkEasAuth, m as uploadRemote, n as UPLOAD_TIMEOUT_MS, o as exitAfterFlush, p as resolveRemote, r as cacheLevel, s as isEasAuthFailureText, t as RESOLVE_TIMEOUT_MS } from "./remote-cache-BRsRZru5.mjs";
+import { F as ownedSessionName, S as withNativeBuildRun, a as ensureMetroReachable, c as remoteAndroidDeps, m as cancelledFailure, n as binOnPath, o as ensureRemoteBootOwned, u as resolveRemoteContext, x as runCancellation } from "./device-remote-C0_o-tJH.mjs";
+import { _ as launchAndroidReleaseApp, d as deviceShellArg, f as installAndroidApp, g as launchAndroidApp, o as androidAppProcess, p as installConflictKind, r as DEFAULT_METRO_PORT, s as androidDevClientUrl, t as ADB_INSTALL_TIMEOUT_MS } from "./app-install-CsZi0SAT.mjs";
+import { a as VERIFY_TIMEOUT_MS, d as verifyLaunch, i as RELEASE_VERIFY_WAIT_MS, l as unverifiedLaunchLines, n as LAUNCH_FATAL, r as LAUNCH_UNVERIFIED, t as LAUNCH_BUNDLING, u as verifyAndroidReleaseLaunch } from "./launch-verify-B2oR_kFN.mjs";
+import { f as isEasBuildFailure, m as resolveEasDevelopmentBuild, o as unknownAndroidDeviceProfileRefusal, p as planEasDevelopmentBuild, r as checkDeviceCapacity, s as unknownAndroidSystemImageRefusal } from "./simslim-COtEEP7x.mjs";
+import { f as spawnEntry, m as detectAppIds, p as detectAndroidPackage, s as startDevServer } from "./start-BboE1HIS.mjs";
+import { a as lostLine, c as releaseLeaseOnSignal, i as leaseExpiryText, l as runLease, n as DEBUG_VERIFY_STEP_MS, o as lostRefusal, r as acquireRunLease, s as parseDeviceWait, t as selectFromPool, u as waitFlagConflict } from "./device-pool-BoezJd-c.mjs";
+import { C as ensureDevServer, E as launchOutcomeRecord, O as warmMetro, T as isPhysicalDeviceRequest, _ as staleNativeDirRefusal, a as refusePlan, b as AvdBootError, c as skippedMissReason, f as detectEntryFile, g as runPrebuild, h as recordPrebuild, i as printPlan, l as devClientScheme, m as planPrebuild, n as planFlagRefusal, o as explainBuildMiss, r as planPayload, s as fingerprintErrorMissReason, t as planCachedBuild, u as pickDevClientScheme, v as ensureBooted, w as ensureWorkspaceStorageSafely, x as AvdRecoveryError, y as ensureOwnedDevice } from "./build-plan-CqntbR7b.mjs";
+import { t as budgetGate } from "./budget-DbzW5VTD.mjs";
+import { a as statsProjectKey, i as recordRunStats, n as readRunEstimates, t as createRunRecorder } from "./stats-D8rUTPHd.mjs";
+import { a as buildAndroid, c as CCACHE_NOT_RUN, f as resolveCcache, l as CCACHE_UNAVAILABLE, n as resolveAndroidCas, o as productFlavorRefusal, p as formatDiagnostic, r as resolveAndroidCompilerCache, s as readProductFlavors, u as ccacheActivityLine } from "./android-cas-DzLPXiEn.mjs";
+import { d as startBuildHeartbeat, f as tailLines, n as HEARTBEAT_INTERVAL_MS } from "./xcode-BzplpQzc.mjs";
+import { n as nativeRunCommand, t as launchSlotScope } from "./slot-launch-DIACGEfH.mjs";
+import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-CCxjn31V.mjs";
 import { constants, copyFileSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync, renameSync, rmSync } from "node:fs";
 import { InvalidArgumentError } from "commander";
+import { LAST_BUILD_KEYS } from "@stim-cli/core/state";
 import { basename, dirname, isAbsolute, join, relative } from "node:path";
 import chalk from "chalk";
 import { createWarnOnce, loadCacheProvider, resolveTieredBuild, storeTieredBuild } from "@stim-cli/cache";
@@ -436,6 +437,51 @@ function systemImageRefusal({ slot, flag, resolved, physical, remoteBackend, lis
 		remedy: refusal.remedy
 	} : null;
 }
+function resolveDeviceProfile(flag, settings) {
+	const fromFlag = typeof flag === "string" && flag.trim() !== "" ? flag.trim() : null;
+	const android = settings?.["android"];
+	const raw = android && typeof android === "object" && !Array.isArray(android) ? android["deviceProfile"] : void 0;
+	return fromFlag || (typeof raw === "string" && raw.trim() !== "" ? raw.trim() : null);
+}
+function deviceProfileRefusal({ flag, resolved, physical, remoteBackend, listProfiles }) {
+	if (typeof flag === "string" && flag.trim() === "") return {
+		code: "STIM_BAD_ARG",
+		message: "--device-profile was given an empty id.",
+		remedy: "Pass `--device-profile <id>` with an id `avdmanager list device -c` prints, e.g. \"pixel_fold\"."
+	};
+	if (physical || remoteBackend || !resolved) return null;
+	let profiles;
+	try {
+		profiles = listProfiles();
+	} catch (error) {
+		return {
+			code: NO_DEVICE,
+			message: `Could not list the Android hardware profiles with avdmanager: ${error?.message || error}`,
+			remedy: "Check that JAVA_HOME and ANDROID_HOME are set and the SDK command-line tools are installed, then try again."
+		};
+	}
+	const refusal = unknownAndroidDeviceProfileRefusal(resolved, profiles);
+	return refusal ? {
+		code: "STIM_BAD_ARG",
+		message: refusal.message,
+		remedy: refusal.remedy
+	} : null;
+}
+function foldableImageRefusal({ profile, image, avdName, images, supportsFold }) {
+	if (!profileNeedsFoldFeature(profile) || !image || supportsFold(image)) return null;
+	const compatible = pickDefaultSystemImage(images().filter((candidate) => supportsFold(candidate.pkg)))?.pkg;
+	const message = `${avdName ? `This workspace's emulator ${avdName} uses device profile ${profile} on ${image}` : `Device profile ${profile} with system image ${image}`}, which the emulator refuses to boot: ${profile} needs a system image with foldable support (SupportPixelFold in its advancedFeatures.ini).`;
+	if (!compatible) return {
+		code: "STIM_BAD_ARG",
+		message,
+		remedy: `Install an image with foldable support, e.g. \`sdkmanager "system-images;android-36;google_apis;${hostSystemImageArch()}"\`, then pass it with \`--system-image\`, or pick another \`--device-profile\`.`
+	};
+	return {
+		code: "STIM_BAD_ARG",
+		message,
+		remedy: avdName ? `Pass \`--system-image "${compatible}"\`: it replaces ${avdName} if that emulator never finished a boot. Otherwise add \`--slot <name>\` to create the foldable beside it.` : `Pass \`--system-image "${compatible}"\` (or set android.systemImage to it), or pick another \`--device-profile\`.`
+	};
+}
 function isReleaseVariant(variant) {
 	return typeof variant === "string" && /release$/i.test(variant.trim());
 }
@@ -723,11 +769,16 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 			hash = computed?.hash ?? "";
 			fingerprintSources = computed?.sources ?? [];
 		} catch (err) {
-			phaseFailure = fail$1(NO_FINGERPRINT, `@expo/fingerprint could not fingerprint ${root}: ${err?.message || err}`, "Fix the @expo/fingerprint error above, then retry.");
+			const message = String(err?.message || err);
+			record.cacheSkipped = !useBuildCache;
+			record.missReason = fingerprintErrorMissReason(message);
+			phaseFailure = fail$1(NO_FINGERPRINT, `@expo/fingerprint could not fingerprint ${root}: ${message}`, "Fix the @expo/fingerprint error above, then retry.", { lastBuildStatus: true });
 			return false;
 		}
 		if (!hash) {
-			phaseFailure = fail$1(NO_FINGERPRINT, `@expo/fingerprint returned no hash for ${root}, so the build cache cannot be addressed.`, "Check the project native inputs and the @expo/fingerprint error above, then retry.");
+			record.cacheSkipped = !useBuildCache;
+			record.missReason = fingerprintErrorMissReason("no hash");
+			phaseFailure = fail$1(NO_FINGERPRINT, `@expo/fingerprint returned no hash for ${root}, so the build cache cannot be addressed.`, "Check the project native inputs and the @expo/fingerprint error above, then retry.", { lastBuildStatus: true });
 			return false;
 		}
 		record.fingerprint = hash;
@@ -757,29 +808,7 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 		const cached = found?.tier === "local" ? found.path : null;
 		record.cacheHit = cached ? "local" : false;
 		record.cacheSkipped = !useBuildCache;
-		let missDiff = "";
-		let missUntracked = null;
-		if (!cached) {
-			const lastBuild = readState(root)?.lastBuild ?? null;
-			const miss = describeFingerprintMiss({
-				platform: PLATFORM,
-				current: {
-					hash,
-					sources: fingerprintSources
-				},
-				lastBuild
-			});
-			if (miss) {
-				missDiff = fingerprintDiffSuffix(miss.changed);
-				writer.write(fingerprintDiffRecord({
-					changed: miss.changed,
-					previousHash: miss.previousHash,
-					hash
-				}));
-			} else if (useBuildCache) missUntracked = untrackedMissLine(untracked({ projectRoot: root }));
-		}
-		phase("fingerprint", `${shortHash(hash)} ${cached ? "hit" : "miss"}${useBuildCache ? "" : !requestedBuildCache ? " (--no-build-cache)" : " (cache reuse off in config)"} ${fingerprintTimer()}${missDiff}`);
-		if (missUntracked) phase("fingerprint", chalk.dim(missUntracked));
+		phase("fingerprint", `${shortHash(hash)} ${cached ? "hit" : "miss"}${useBuildCache ? "" : !requestedBuildCache ? " (--no-build-cache)" : " (cache reuse off in config)"} ${fingerprintTimer()}`);
 		if (found?.tier === "provider") {
 			record.cacheHit = "remote";
 			providerName = found.providerName ?? null;
@@ -909,6 +938,34 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 			}
 		}
 	}
+	function explainMiss(rekeyedBy) {
+		if (swapFellBack) record.missReason = skippedMissReason("the cached APK could not be reused, so this run built it fresh");
+		else if (!useBuildCache) record.missReason = skippedMissReason(requestedBuildCache ? "cache reuse off in config" : "cache reuse turned off by --no-build-cache");
+		else {
+			const current = {
+				hash: storeHash,
+				sources: storeSources
+			};
+			const explained = explainBuildMiss({
+				root,
+				platform: PLATFORM,
+				current,
+				rekeyedBy,
+				baselineDeps: { readState }
+			});
+			record.missReason = explained.reason;
+			if (explained.previousHash && explained.changedNames.length) writer.write(fingerprintDiffRecord({
+				changed: explained.changedNames,
+				previousHash: explained.previousHash,
+				hash: current.hash
+			}));
+		}
+		phase("cache", `miss: ${record.missReason.summary}`);
+		if (record.missReason.kind === "no-baseline") {
+			const line = untrackedMissLine(untracked({ projectRoot: root }));
+			if (line) phase("fingerprint", chalk.dim(line));
+		}
+	}
 	async function buildArtifact() {
 		if (!apkPath) try {
 			if (maxBuilds) try {
@@ -926,6 +983,7 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 				}
 				phase("build", chalk.yellow(`could not take a build slot: ${err?.message || err}; building anyway`));
 			}
+			const rekeyedBy = [];
 			const prebuildPlan = planPrebuildFor(root, PLATFORM, {
 				isExpo,
 				fingerprint: hash,
@@ -962,6 +1020,7 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 				});
 				if (after) recordPrebuild(root, PLATFORM, after.hash);
 				if (after?.moved) {
+					rekeyedBy.push("prebuild");
 					storeHash = after.hash;
 					storeSources = after.sources;
 					storeKey = buildCacheKey(PLATFORM, after.hash, buildRunOptions);
@@ -984,6 +1043,7 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 				}
 			}
 			if (!apkPath) {
+				explainMiss(rekeyedBy);
 				step("compile");
 				phase("build", `compiling ${variant || "debug"} with Gradle`);
 				const built = await build({
@@ -1115,7 +1175,7 @@ function tail(lines, n = FALLBACK_LINES) {
 }
 //#endregion
 //#region src/commands/android/result.ts
-function androidFacts({ slot, serial, avdName = null, deviceName = null, systemImage = null, fingerprint, cacheKey = null, variant = null, metroPort = null, cacheHit, cacheSkipped = false, waitedForBuild = null, appPath, bundleId, installSkipped = false, launched, ccache = CCACHE_UNAVAILABLE, logs, debugHttpHost = null, debugHttpHostNote = null, devClientUrl = null, durationMs, lease, devServer = null }) {
+function androidFacts({ slot, serial, avdName = null, deviceName = null, systemImage = null, deviceProfile = null, fingerprint, cacheKey = null, variant = null, metroPort = null, cacheHit, cacheSkipped = false, waitedForBuild = null, appPath, bundleId, installSkipped = false, launched, ccache = CCACHE_UNAVAILABLE, logs, debugHttpHost = null, debugHttpHostNote = null, devClientUrl = null, durationMs, lease, devServer = null }) {
 	return {
 		platform: PLATFORM,
 		...slot && slot !== "default" ? { slot } : {},
@@ -1123,6 +1183,7 @@ function androidFacts({ slot, serial, avdName = null, deviceName = null, systemI
 		avdName: avdName ?? null,
 		deviceName: deviceName ?? avdName ?? null,
 		systemImage: systemImage ?? null,
+		deviceProfile: deviceProfile ?? null,
 		fingerprint: fingerprint ?? null,
 		cacheKey: cacheKey ?? null,
 		variant: variant ?? null,
@@ -1147,7 +1208,7 @@ function androidFacts({ slot, serial, avdName = null, deviceName = null, systemI
 		...devServer ? { devServer } : {}
 	};
 }
-function lastBuildRecord({ fingerprint, cacheKey, cacheHit, cacheSkipped = false, durationMs, appPath, bundleId, startedAt, status, errorCode = null, avdName = null, deviceName = null }) {
+function lastBuildRecord({ fingerprint, cacheKey, cacheHit, cacheSkipped = false, durationMs, appPath, bundleId, startedAt, status, errorCode = null, avdName = null, deviceName = null, missReason = null }) {
 	const record = {
 		platform: PLATFORM,
 		avdName: avdName ?? null,
@@ -1163,6 +1224,7 @@ function lastBuildRecord({ fingerprint, cacheKey, cacheHit, cacheSkipped = false
 		status
 	};
 	if (errorCode) record.errorCode = errorCode;
+	if (missReason && !cacheLevel(cacheHit)) record.missReason = missReason;
 	return record;
 }
 async function finishAndroidUpload(uploadPending, remote, phase) {
@@ -1195,6 +1257,7 @@ function reportAndroidResult({ slot, json, useBuildCache, variant, release, metr
 		avdName: record.avdName,
 		deviceName: record.deviceName,
 		systemImage: record.systemImage,
+		deviceProfile: record.deviceProfile,
 		debugHttpHost: launched.debugHttpHost ?? null,
 		debugHttpHostNote: launched.debugHttpHostNote ?? null,
 		devClientUrl: launched.devClientUrl ?? null,
@@ -1252,7 +1315,10 @@ function persistLastBuild({ writeState, root, record, startedAt, durationMs, sta
 		errorCode
 	});
 	try {
-		writeState(root, { lastBuild });
+		writeState(root, {
+			lastBuild,
+			[LAST_BUILD_KEYS[PLATFORM]]: lastBuild
+		});
 	} catch (err) {
 		out(phaseLine("state", chalk.yellow(`could not record lastBuild: ${err?.message || err}`)));
 	}
@@ -1471,8 +1537,8 @@ async function resolveInstallSerial({ root, slot, device, physical, remoteDevice
 		phase("device", `reopen agent-device on ${resolved.serial}`);
 	}
 	const consolePort = Number(resolved.serial.replace(/^emulator-/, ""));
-	withConfigLock(() => {
-		const current = deviceSlotPlatforms(loadConfig()?.projects?.[root], slot)?.android;
+	withConfigLock$1(() => {
+		const current = deviceSlotPlatforms(loadConfig$1()?.projects?.[root], slot)?.android;
 		if (!current?.owned || current.avdName !== device.avdName) throw new Error("The owned emulator assignment changed before installation.");
 		if (current.consolePort !== consolePort) setDevice(root, PLATFORM, {
 			...current,
@@ -1558,8 +1624,8 @@ async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCh
 		return fail(installed.code || "STIM_INSTALL_FAILED", installed.reason, installRemedy, { lastBuildStatus: true });
 	}
 	if (adopting) try {
-		withConfigLock(() => {
-			const config = loadConfig();
+		withConfigLock$1(() => {
+			const config = loadConfig$1();
 			const current = deviceSlotPlatforms(config?.projects?.[root], slot)?.android;
 			if (!config || !current || current.avdName !== device.avdName) throw new Error("The adopted emulator assignment changed during installation.");
 			delete current.adoptionPending;
@@ -1817,6 +1883,16 @@ function diagnoseBootFailure(booted, logFile, runCommand, physical) {
 }
 //#endregion
 //#region src/commands/android/plan.ts
+function slotOwnedAvd(projectPath, slot) {
+	const android = deviceSlotPlatforms(getProject(projectPath), slot)?.android;
+	if (!android?.owned || !android.avdName || android.setupIncomplete) return null;
+	const systemImage = ownedAvdSystemImage(android.avdName);
+	return systemImage ? {
+		avdName: android.avdName,
+		systemImage,
+		deviceProfile: ownedAvdDeviceProfile(android.avdName)
+	} : null;
+}
 function fail(code, message, remedy, { lines = [] } = {}) {
 	return {
 		ok: false,
@@ -1850,7 +1926,7 @@ function androidCompilerCache({ root, optimizations, settingsContext }) {
 		})}`
 	};
 }
-function resolveAndroidRunPlan({ settings, settingsContext, slot, easProfile, variant: variantFlag, systemImage: systemImageFlag, device: deviceFlag, wait: waitFlag, waitConflict, remote: commandRemoteBackend, buildCache: requestedBuildCache }, { warn, resolveCompilerCache = androidCompilerCache, resolveCacheProvider = resolveCacheProviderConfig, validateAvdConfig = androidAvdConfigSettingError, readFlavors = readProductFlavors, detectExpo = detectIsExpo, listSystemImages = listInstalledSystemImages, parkedLimit = parkedMaxSetting }) {
+function resolveAndroidRunPlan({ settings, settingsContext, slot, easProfile, variant: variantFlag, systemImage: systemImageFlag, deviceProfile: deviceProfileFlag, device: deviceFlag, wait: waitFlag, waitConflict, remote: commandRemoteBackend, buildCache: requestedBuildCache }, { warn, resolveCompilerCache = androidCompilerCache, resolveCacheProvider = resolveCacheProviderConfig, validateAvdConfig = androidAvdConfigSettingError, readFlavors = readProductFlavors, detectExpo = detectIsExpo, listSystemImages = listInstalledSystemImages, listDeviceProfiles = listAvdDeviceProfiles, parkedLimit = parkedMaxSetting, supportsFold = systemImageSupportsFold, ownedAvd = slotOwnedAvd }) {
 	const root = settingsContext.projectPath;
 	const [shapeError, ...moreShapeErrors] = [parkedLimit("android").error, ...settingShapeErrors(settings)].filter((error) => Boolean(error));
 	if (shapeError) return fail("STIM_BAD_ARG", shapeError, SETTING_SHAPE_REMEDY, { lines: moreShapeErrors });
@@ -1878,6 +1954,7 @@ function resolveAndroidRunPlan({ settings, settingsContext, slot, easProfile, va
 	const avdConfigError = validateAvdConfig(settings, root);
 	if (avdConfigError) return fail("STIM_BAD_ARG", avdConfigError, "Use only documented android.avdConfig keys, or an android.avdConfigFile fragment contained by the app directory.");
 	const systemImage = resolveSystemImage(systemImageFlag, settings);
+	const deviceProfile = resolveDeviceProfile(deviceProfileFlag, settings);
 	const variant = easProfile !== void 0 ? "debug" : resolveVariant(variantFlag, settings);
 	const flavorRefusal = productFlavorRefusal({
 		flavors: readFlavors(root),
@@ -1907,6 +1984,29 @@ function resolveAndroidRunPlan({ settings, settingsContext, slot, easProfile, va
 		listImages: listSystemImages
 	});
 	if (imageRefusal) return fail(imageRefusal.code, imageRefusal.message, imageRefusal.remedy);
+	const profileRefusal = deviceProfileRefusal({
+		flag: deviceProfileFlag,
+		resolved: deviceProfile,
+		physical,
+		remoteBackend,
+		listProfiles: listDeviceProfiles
+	});
+	if (profileRefusal) return fail(profileRefusal.code, profileRefusal.message, profileRefusal.remedy);
+	if (!physical && !remoteBackend) {
+		const flagImage = typeof systemImageFlag === "string" && systemImageFlag.trim() ? systemImageFlag.trim() : null;
+		const existing = ownedAvd(root, slot);
+		const profile = deviceProfile ?? existing?.deviceProfile ?? DEFAULT_AVD_DEVICE_PROFILE;
+		const image = () => flagImage ?? existing?.systemImage ?? systemImage ?? pickDefaultSystemImage(listSystemImages())?.pkg ?? null;
+		const checked = profileNeedsFoldFeature(profile) ? image() : null;
+		const foldRefusal = checked !== null && foldableImageRefusal({
+			profile,
+			image: checked,
+			avdName: existing && existing.systemImage === checked && existing.deviceProfile === profile ? existing.avdName : null,
+			images: listSystemImages,
+			supportsFold
+		});
+		if (foldRefusal) return fail(foldRefusal.code, foldRefusal.message, foldRefusal.remedy);
+	}
 	const target = physical ? {
 		kind: "physical",
 		serial: typeof deviceFlag === "string" ? deviceFlag : null,
@@ -1917,10 +2017,12 @@ function resolveAndroidRunPlan({ settings, settingsContext, slot, easProfile, va
 	} : remoteBackend ? {
 		kind: "remote",
 		backend: remoteBackend,
-		systemImage
+		systemImage,
+		deviceProfile
 	} : {
 		kind: "emulator",
-		systemImage
+		systemImage,
+		deviceProfile
 	};
 	return {
 		ok: true,
@@ -1944,21 +2046,213 @@ function resolveAndroidRunPlan({ settings, settingsContext, slot, easProfile, va
 	};
 }
 //#endregion
+//#region src/commands/android/next-build.ts
+const DEFAULT_PLAN_DEPS = {
+	findRoot: findProjectRoot,
+	fingerprint: fingerprintProject,
+	listSystemImages: listInstalledSystemImages,
+	avdSystemImage: ownedAvdSystemImage,
+	avdDirectory: ownedAvdDirectory,
+	listAvds,
+	loadCacheProvider,
+	loadProjectProvider,
+	checkEasAuth,
+	resolveRemote,
+	planPrebuild
+};
+function note(line) {
+	console.error(line);
+}
+function runOnlyFlag(opts) {
+	if (isPhysicalDeviceRequest(opts.device)) return "--device";
+	if (opts.remote) return "--remote";
+	if (opts.wait !== void 0) return opts.wait === false ? "--no-wait" : "--wait";
+	if (opts.metroCheck === false) return "--no-metro-check";
+	return null;
+}
+function emulatorImage(root, slot, requested, deps) {
+	const record = deviceSlotPlatforms(getProject(root), slot)?.android;
+	if (record?.avdName && !record.setupIncomplete) {
+		if (record.owned && deps.avdDirectory(record.avdName)) return { systemImage: deps.avdSystemImage(record.avdName) };
+		if (!record.owned && avdListed(record.avdName, deps.listAvds)) return { systemImage: null };
+	}
+	let images;
+	try {
+		images = deps.listSystemImages();
+	} catch (error) {
+		return { refusal: {
+			code: NO_DEVICE,
+			message: `Could not read the installed Android system images: ${error?.message || error}`,
+			remedy: "Check that ANDROID_HOME points at a readable SDK, then try again."
+		} };
+	}
+	const picked = pickDefaultSystemImage(images, requested ? { systemImage: requested } : {});
+	if (picked) return { systemImage: picked.pkg };
+	const arch = hostSystemImageArch();
+	return { refusal: {
+		code: NO_DEVICE,
+		message: `No ${arch} Android system image is installed, so the emulator build's ABI and cache key are unknown.`,
+		remedy: `Install one, e.g.: sdkmanager "system-images;android-36;google_apis;${arch}", then try again.`
+	} };
+}
+function avdListed(avdName, list) {
+	try {
+		return list({ timeoutMs: 1e4 }).includes(avdName);
+	} catch {
+		return false;
+	}
+}
+async function planAndroid(opts, overrides = {}) {
+	const deps = {
+		...DEFAULT_PLAN_DEPS,
+		...overrides
+	};
+	const json = Boolean(opts.json);
+	const refuse = (refusal, lines = []) => refusePlan(refusal, json, lines);
+	const flag = runOnlyFlag(opts);
+	if (flag) return refuse(planFlagRefusal(flag));
+	const root = deps.findRoot(process.cwd());
+	if (!root) return refuse(NO_PROJECT_REFUSAL);
+	const projectProblem = appProjectProblem(root);
+	if (projectProblem) return refuse({
+		code: "STIM_NO_PROJECT",
+		...projectProblem
+	});
+	const slot = validateDeviceSlot(opts.slot);
+	const settingsContext = {
+		projectPath: root,
+		gitCommonDir: gitCommonDir(root),
+		repoRoot: repoRoot(root)
+	};
+	const planned = resolveAndroidRunPlan({
+		settings: resolveSettings(settingsContext),
+		settingsContext,
+		slot,
+		easProfile: opts.easProfile,
+		variant: opts.variant ?? null,
+		systemImage: opts.systemImage ?? null,
+		device: null,
+		wait: void 0,
+		waitConflict: false,
+		remote: null,
+		buildCache: opts.buildCache !== false
+	}, {
+		warn: (label, message) => note(phaseLine(label, chalk.yellow(message))),
+		resolveCompilerCache: ({ optimizations }) => ({
+			cas: null,
+			optimizations,
+			warning: null
+		}),
+		listSystemImages: deps.listSystemImages
+	});
+	if (!planned.ok) return refuse(planned, planned.lines);
+	const { build, target, isExpo, cacheProviderConfig } = planned.plan;
+	const planTarget = {
+		platform: PLATFORM,
+		slot,
+		root,
+		projectKey: statsProjectKey({
+			root,
+			commonDir: settingsContext.gitCommonDir,
+			repoRoot: settingsContext.repoRoot
+		})
+	};
+	if (opts.easProfile !== void 0) {
+		const eas = await planEasDevelopmentBuild({
+			root,
+			platform: PLATFORM,
+			profile: opts.easProfile,
+			note,
+			isExpo,
+			selectors: [opts.variant],
+			buildCache: opts.buildCache
+		});
+		if (!eas.ok) return refuse(eas);
+		return printPlan(planPayload(planTarget, {
+			fingerprint: eas.fingerprint,
+			cacheKey: eas.cacheKey,
+			cacheHit: eas.buildId ? "remote" : false,
+			provider: "eas",
+			cacheSkipped: false,
+			prebuild: null,
+			refusal: eas.missing
+		}), json);
+	}
+	if (target.kind !== "emulator") {
+		if (target.kind === "physical") return refuse(planFlagRefusal("--device"));
+		return refuse({
+			code: "STIM_BAD_ARG",
+			message: `android.remote routes this workspace's runs to a ${target.backend} device, whose ABI --plan cannot read without a session.`,
+			remedy: "Run `stim android` to build for the remote device, or unset android.remote to plan the owned emulator."
+		});
+	}
+	if (build.compilerCache === "cas") return refuse({
+		code: "STIM_BAD_ARG",
+		message: "The experimental Android compiler CAS keys builds by a toolchain Stim sets up, which --plan does not.",
+		remedy: "Run `stim android` to build with the CAS, or set optimizations.android.compilerCache to ccache."
+	});
+	const image = build.targetAbiOnly && !build.release ? emulatorImage(root, slot, target.systemImage, deps) : { systemImage: null };
+	if ("refusal" in image) return refuse(image.refusal);
+	const { abi, runOptions, remoteRunOptions } = androidBuildOptions({
+		release: build.release,
+		physical: false,
+		device: { systemImage: image.systemImage },
+		variant: build.variant,
+		deviceAbi: () => null,
+		buildProfile: build.profile,
+		targetAbiOnly: build.targetAbiOnly
+	});
+	let fingerprint;
+	try {
+		fingerprint = await deps.fingerprint(root, { platform: PLATFORM });
+	} catch (error) {
+		return refuse({
+			code: NO_FINGERPRINT,
+			message: `@expo/fingerprint could not fingerprint ${root}: ${error?.message || error}`,
+			remedy: "Fix the @expo/fingerprint error above, then retry."
+		});
+	}
+	if (!fingerprint?.hash) return refuse({
+		code: NO_FINGERPRINT,
+		message: `@expo/fingerprint returned no hash for ${root}, so the build cache cannot be addressed.`,
+		remedy: "Check the project native inputs and the @expo/fingerprint error above, then retry."
+	});
+	const plan = await planCachedBuild({
+		...planTarget,
+		isExpo,
+		fingerprint: fingerprint.hash,
+		sources: fingerprint.sources ?? [],
+		cacheKey: buildCacheKey(PLATFORM, fingerprint.hash, runOptions),
+		cachePolicy: build.cache,
+		providerConfig: cacheProviderConfig,
+		expoRemote: abi || build.profile || !build.cache.remote ? null : { runOptions: remoteRunOptions }
+	}, {
+		...deps,
+		note
+	});
+	printPlan(plan, json);
+}
+//#endregion
 //#region src/commands/android.ts
 function androidCommand(program) {
 	registerAndroid(program);
 }
 function registerAndroid(program) {
-	program.command("android").description("Build (or install from the shared cache), install and launch this workspace's Android app on its owned emulator, wired to the reserved Metro port. A Debug run starts the dev server when it is not running.").option("--eas-profile <name>", "Download a matching EAS development build; on a miss, print the build command without running it").option("--slot <name>", "Reusable device slot within this workspace (default: default)", parseDeviceSlotOption).option("--json", "Emit the facts as a single JSON line on stdout; every other line goes to stderr").option("--no-metro-check", "Skip the reserved-port Metro health check and do not start it (the app will load no bundle unless something else serves it)").option("--no-build-cache", "Build fresh, ignoring cached artifacts (local and the project's build-cache provider); the fresh build still replaces the cache entry").option("--variant <name>", "Gradle variant to assemble and install (e.g. productionDebug on a flavored project); overrides the android.variant setting. A variant ending in Release embeds the JS bundle and skips Metro entirely. Default: debug").option("--system-image <id>", "Android system image to create this workspace's owned AVD from, as the sdkmanager package id (e.g. \"system-images;android-36;google_apis;arm64-v8a\"). Overrides the android.systemImage setting for this invocation. An unknown id refuses with STIM_BAD_ARG and prints the installed images.").option("--device [serial]", "Install and launch on a connected physical device instead of this workspace's owned emulator. With no serial, the first connected device this workspace can lease is used. Stim never creates, boots, or deletes a physical device.").option("--remote <backend>", "Install and launch on a remote device with proxy or EAS. Builds are local unless --eas-profile selects an existing EAS build.", (value) => {
+	program.command("android").description("Build (or install from the shared cache), install and launch this workspace's Android app on its owned emulator, wired to the reserved Metro port. A Debug run starts the dev server when it is not running.").option("--eas-profile <name>", "Download a matching EAS development build; on a miss, print the build command without running it").option("--slot <name>", "Reusable device slot within this workspace (default: default)", parseDeviceSlotOption).option("--json", "Emit the facts as a single JSON line on stdout; every other line goes to stderr").option("--plan", "Predict the next build without building, booting or installing: resolve the fingerprint, check the local then remote cache, and print the expected cache result and duration. Writes no Stim state.").option("--no-metro-check", "Skip the reserved-port Metro health check and do not start it (the app will load no bundle unless something else serves it)").option("--no-build-cache", "Build fresh, ignoring cached artifacts (local and the project's build-cache provider); the fresh build still replaces the cache entry").option("--variant <name>", "Gradle variant to assemble and install (e.g. productionDebug on a flavored project); overrides the android.variant setting. A variant ending in Release embeds the JS bundle and skips Metro entirely. Default: debug").option("--system-image <id>", "Android system image to create this workspace's owned AVD from, as the sdkmanager package id (e.g. \"system-images;android-36;google_apis;arm64-v8a\"). Overrides the android.systemImage setting for this invocation. An unknown id refuses with STIM_BAD_ARG and prints the installed images.").option("--device-profile <id>", "Hardware profile to create this workspace's owned AVD with, as an `avdmanager list device -c` id (e.g. \"pixel_fold\", \"pixel_tablet\"). Overrides the android.deviceProfile setting for this invocation. An unknown id refuses with STIM_BAD_ARG and prints the available ids.").option("--device [serial]", "Install and launch on a connected physical device instead of this workspace's owned emulator. With no serial, the first connected device this workspace can lease is used. Stim never creates, boots, or deletes a physical device.").option("--remote <backend>", "Install and launch on a remote device with proxy or EAS. Builds are local unless --eas-profile selects an existing EAS build.", (value) => {
 		if (REMOTE_DEVICE_BACKENDS.includes(value)) return value;
 		throw new InvalidArgumentError(`expected one of: ${REMOTE_DEVICE_BACKENDS.join(", ")}`);
 	}).option("--wait <seconds>", "How long to wait for another workspace to release the device it leases, before refusing with STIM_DEVICE_BUSY (default 60, 0 refuses at once). Only with --device.").option("--no-wait", "Install on a device another workspace leases instead of waiting: this run takes no lease and, when both workspaces build the same app id, the install terminates the holder's running app. Only with --device.").action(async (opts) => {
+		if (opts.plan) return planAndroid(opts);
 		const root = findProjectRoot(process.cwd());
 		if (!root) {
 			refuseNoProject({ json: Boolean(opts.json) });
 			return;
 		}
-		if (!(await withWorkspaceProcessLock(workspaceDir(root), "native-run", async (claim) => {
+		if (!(await withNativeBuildRun(root, {
+			command: "android",
+			platform: "android",
+			slot: opts.slot ?? "default"
+		}, async (claim) => {
 			recordWorkspaceUse(root);
 			const progress = startBuildProgress({
 				root,
@@ -1977,6 +2271,7 @@ function registerAndroid(program) {
 					useBuildCache: opts.buildCache !== false,
 					variant: opts.variant ?? null,
 					systemImage: opts.systemImage ?? null,
+					deviceProfile: opts.deviceProfile ?? null,
 					remoteDevice: opts.remote ?? null,
 					device: opts.device ?? null,
 					wait: opts.wait,
@@ -1986,14 +2281,10 @@ function registerAndroid(program) {
 			} finally {
 				progress.clear();
 			}
-		}, {
-			external: true,
-			waitMs: 18e5,
-			declareSpawns: true
-		})).ok) process.exit(1);
+		}, { write: (line) => console.error(chalk.dim(phaseLine("lock", line))) })).ok) process.exit(runCancellation() ? 130 : 1);
 	});
 }
-function resolveRunAndroidOptions({ root, json = false, remoteDevice: commandRemoteBackend = null, resolveSettingsFor = resolveSettings, resolveRemoteDeviceContext = resolveRemoteContext, remoteDeviceDeps: makeRemoteDeviceDeps = remoteAndroidDeps, resolveEasBin = resolveEasCliBin, ensureMetroReachable: ensureRemoteMetro = ensureMetroReachable, ensureRemoteBootOwned: ensureRemoteOwned = ensureRemoteBootOwned, detectRemoteProviders = detectProviders, metroCheck = true, useBuildCache = true, easProfile, resolveEasDevelopmentBuild: resolveEasBuild = resolveEasDevelopmentBuild, variant: variantFlag = null, systemImage: systemImageFlag = null, device: deviceFlag = null, wait: waitFlag = void 0, waitConflict = false, acquireLease = acquireRunLease, makeRunLease = runLease, selectPool = selectFromPool, onLeaseSignal = releaseLeaseOnSignal, listDevices = listAdbDevices, deviceModel = physicalDeviceModel, deviceAbi = androidDeviceAbi, isEmulatorDevice = probeEmulatorSerial, readApkPackage = (apkPath) => apkPackage(dumpApkManifest(apkPath)), getLimits = getConcurrencyLimits, checkCapacity = checkDeviceCapacity, acquireSlot = acquireBuildSlot, releaseSlot = releaseBuildSlot, ensureDevice = ensureOwnedDevice, listSystemImages = listInstalledSystemImages, ensureDeviceBooted = ensureBooted, resolveAvdSerial = resolveOwnedAvdSerial, waitForDeviceBoot = waitForBoot, resolveMetro = resolveProjectMetro, warmMetro: prewarmMetro = warmMetro, startServer = startDevServer, readState = readWorkspaceState, pidAlive = pidExists, verifyCollector = verifyCollectorOwnership, verifyLaunched = verifyLaunch, ensureStorage = ensureWorkspaceStorageSafely, fingerprint = fingerprintProject, untracked = untrackedNativeFiles, resolveCached = resolveBuild, storeCached = storeBuild, storedAssets = storedAssetManifest, captureAssets = captureAssetManifest, acquireLock = acquireBuildLock, releaseLock = releaseBuildLock, waitForBuild: waitForBuild$1 = waitForBuild, loadProvider = loadProjectProvider, easAuth = checkEasAuth, resolveRemoteBuild = resolveRemote, uploadRemoteBuild = uploadRemote, resolveCacheProvider = resolveCacheProviderConfig, loadCacheProviderModule = loadCacheProvider, planPrebuildFor = planPrebuild, prebuild = runPrebuild, build = buildAndroid, ccacheFor = resolveCcache, install = installAndroidApp, launch = launchAndroidApp, launchRelease = launchAndroidReleaseApp, verifyReleaseLaunched = verifyAndroidReleaseLaunch, swapApk = swapApkBundle, resolveDevClientScheme = androidDevClientScheme, spawn = (cmd, args, opts) => getExecutor().spawn(cmd, args, opts), kill = (pid, signal) => process.kill(pid, signal), createWriter = createNdjsonWriter, writeLaunch = writeWorkspaceLaunch, writeState = writeWorkspaceState, recordStats = recordRunStats, readEstimates = readRunEstimates, now = Date.now, out = (line) => console.error(line), emit = (line) => console.log(line) } = {}) {
+function resolveRunAndroidOptions({ root, json = false, remoteDevice: commandRemoteBackend = null, resolveSettingsFor = resolveSettings, resolveRemoteDeviceContext = resolveRemoteContext, remoteDeviceDeps: makeRemoteDeviceDeps = remoteAndroidDeps, resolveEasBin = resolveEasCliBin, ensureMetroReachable: ensureRemoteMetro = ensureMetroReachable, ensureRemoteBootOwned: ensureRemoteOwned = ensureRemoteBootOwned, detectRemoteProviders = detectProviders, metroCheck = true, useBuildCache = true, easProfile, resolveEasDevelopmentBuild: resolveEasBuild = resolveEasDevelopmentBuild, variant: variantFlag = null, systemImage: systemImageFlag = null, deviceProfile: deviceProfileFlag, device: deviceFlag = null, wait: waitFlag = void 0, waitConflict = false, acquireLease = acquireRunLease, makeRunLease = runLease, selectPool = selectFromPool, onLeaseSignal = releaseLeaseOnSignal, listDevices = listAdbDevices, deviceModel = physicalDeviceModel, deviceAbi = androidDeviceAbi, isEmulatorDevice = probeEmulatorSerial, readApkPackage = (apkPath) => apkPackage(dumpApkManifest(apkPath)), getLimits = getConcurrencyLimits, checkCapacity = checkDeviceCapacity, acquireSlot = acquireBuildSlot, releaseSlot = releaseBuildSlot, ensureDevice = ensureOwnedDevice, listSystemImages = listInstalledSystemImages, listDeviceProfiles, ensureDeviceBooted = ensureBooted, resolveAvdSerial = resolveOwnedAvdSerial, waitForDeviceBoot = waitForBoot, resolveMetro = resolveProjectMetro, warmMetro: prewarmMetro = warmMetro, startServer = startDevServer, readState = readWorkspaceState$1, pidAlive = pidExists, verifyCollector = verifyCollectorOwnership, verifyLaunched = verifyLaunch, ensureStorage = ensureWorkspaceStorageSafely, fingerprint = fingerprintProject, untracked = untrackedNativeFiles, resolveCached = resolveBuild, storeCached = storeBuild, storedAssets = storedAssetManifest, captureAssets = captureAssetManifest, acquireLock = acquireBuildLock, releaseLock = releaseBuildLock, waitForBuild: waitForBuild$1 = waitForBuild, loadProvider = loadProjectProvider, easAuth = checkEasAuth, resolveRemoteBuild = resolveRemote, uploadRemoteBuild = uploadRemote, resolveCacheProvider = resolveCacheProviderConfig, loadCacheProviderModule = loadCacheProvider, planPrebuildFor = planPrebuild, prebuild = runPrebuild, build = buildAndroid, ccacheFor = resolveCcache, install = installAndroidApp, launch = launchAndroidApp, launchRelease = launchAndroidReleaseApp, verifyReleaseLaunched = verifyAndroidReleaseLaunch, swapApk = swapApkBundle, resolveDevClientScheme = androidDevClientScheme, spawn = (cmd, args, opts) => getExecutor().spawn(cmd, args, opts), kill = (pid, signal) => process.kill(pid, signal), createWriter = createNdjsonWriter, writeLaunch = writeWorkspaceLaunch, writeState = writeWorkspaceState, recordStats = recordRunStats, readEstimates = readRunEstimates, now = Date.now, out = (line) => console.error(line), emit = (line) => console.log(line) } = {}) {
 	return {
 		root,
 		json,
@@ -2011,6 +2302,7 @@ function resolveRunAndroidOptions({ root, json = false, remoteDevice: commandRem
 		resolveEasBuild,
 		variantFlag,
 		systemImageFlag,
+		deviceProfileFlag,
 		deviceFlag,
 		waitFlag,
 		waitConflict,
@@ -2029,6 +2321,7 @@ function resolveRunAndroidOptions({ root, json = false, remoteDevice: commandRem
 		releaseSlot,
 		ensureDevice,
 		listSystemImages,
+		listDeviceProfiles,
 		ensureDeviceBooted,
 		resolveAvdSerial,
 		waitForDeviceBoot,
@@ -2130,7 +2423,7 @@ function avdSetupFailure(error, root, logFile) {
 	};
 }
 async function runAndroid(options = {}) {
-	let { root, json, commandRemoteBackend, resolveSettingsFor, resolveRemoteDeviceContext, makeRemoteDeviceDeps, resolveEasBin, ensureRemoteMetro, ensureRemoteOwned, detectRemoteProviders, metroCheck, useBuildCache: requestedBuildCache, easProfile, resolveEasBuild, variantFlag, systemImageFlag, deviceFlag, waitFlag, waitConflict, acquireLease, makeRunLease, selectPool, onLeaseSignal, listDevices, deviceModel, deviceAbi, isEmulatorDevice, readApkPackage, getLimits, checkCapacity, acquireSlot, releaseSlot, ensureDevice, listSystemImages, ensureDeviceBooted, resolveAvdSerial, waitForDeviceBoot, resolveMetro, prewarmMetro, startServer, readState, pidAlive, verifyCollector, verifyLaunched, ensureStorage, fingerprint, untracked, resolveCached, storeCached, storedAssets, captureAssets, acquireLock, releaseLock, waitForBuild, loadProvider, easAuth, resolveRemoteBuild, uploadRemoteBuild, resolveCacheProvider, loadCacheProviderModule, planPrebuildFor, prebuild, build, ccacheFor, install, launch, launchRelease, verifyReleaseLaunched, swapApk, resolveDevClientScheme, spawn, kill, createWriter, writeLaunch, writeState, recordStats, readEstimates, now, out, emit } = androidSlotOptions(options);
+	let { root, json, commandRemoteBackend, resolveSettingsFor, resolveRemoteDeviceContext, makeRemoteDeviceDeps, resolveEasBin, ensureRemoteMetro, ensureRemoteOwned, detectRemoteProviders, metroCheck, useBuildCache: requestedBuildCache, easProfile, resolveEasBuild, variantFlag, systemImageFlag, deviceProfileFlag, deviceFlag, waitFlag, waitConflict, acquireLease, makeRunLease, selectPool, onLeaseSignal, listDevices, deviceModel, deviceAbi, isEmulatorDevice, readApkPackage, getLimits, checkCapacity, acquireSlot, releaseSlot, ensureDevice, listSystemImages, listDeviceProfiles, ensureDeviceBooted, resolveAvdSerial, waitForDeviceBoot, resolveMetro, prewarmMetro, startServer, readState, pidAlive, verifyCollector, verifyLaunched, ensureStorage, fingerprint, untracked, resolveCached, storeCached, storedAssets, captureAssets, acquireLock, releaseLock, waitForBuild, loadProvider, easAuth, resolveRemoteBuild, uploadRemoteBuild, resolveCacheProvider, loadCacheProviderModule, planPrebuildFor, prebuild, build, ccacheFor, install, launch, launchRelease, verifyReleaseLaunched, swapApk, resolveDevClientScheme, spawn, kill, createWriter, writeLaunch, writeState, recordStats, readEstimates, now, out, emit } = androidSlotOptions(options);
 	const progress = options.progress ?? NO_BUILD_PROGRESS;
 	const slot = validateDeviceSlot(options.slot);
 	const started = now();
@@ -2203,6 +2496,11 @@ async function runAndroid(options = {}) {
 	let ccacheActivity = CCACHE_NOT_RUN;
 	let reclaimed = [];
 	const fail = (code, message, remedy, { lastBuildStatus = false, diagnostics = [], lines = [], logPath = null, lease } = {}) => {
+		const cancellation = cancelledFailure(PLATFORM, {
+			code,
+			message
+		});
+		if (cancellation) ({code, message, remedy, lines} = cancellation);
 		if (lastBuildStatus) persistLastBuild({
 			writeState,
 			root,
@@ -2266,6 +2564,7 @@ async function runAndroid(options = {}) {
 		easProfile,
 		variant: variantFlag,
 		systemImage: systemImageFlag,
+		deviceProfile: deviceProfileFlag,
 		device: deviceFlag,
 		wait: waitFlag,
 		waitConflict,
@@ -2274,6 +2573,7 @@ async function runAndroid(options = {}) {
 	}, {
 		resolveCacheProvider,
 		listSystemImages,
+		listDeviceProfiles,
 		warn: (label, message) => out(phaseLine(label, chalk.yellow(message)))
 	});
 	if (!planned.ok) return fail(planned.code, planned.message, planned.remedy, { lines: planned.lines });
@@ -2307,10 +2607,11 @@ async function runAndroid(options = {}) {
 		buildCache: requestedBuildCache
 	});
 	if (isEasBuildFailure(easBuild)) return fail(easBuild.code, easBuild.message, easBuild.remedy);
-	let androidPackage = detectAndroidPackage(root);
+	const appIds = detectAppIds(root);
+	let androidPackage = appIds.androidPackage;
 	record.bundleId = androidPackage;
 	const registerProject = () => upsertProject(root, {
-		bundleId: detectBundleId(root) ?? void 0,
+		bundleId: appIds.bundleId ?? void 0,
 		androidPackage: androidPackage ?? void 0,
 		isExpo
 	});
@@ -2373,6 +2674,7 @@ async function runAndroid(options = {}) {
 	let device;
 	let bootDuration = "";
 	let bootPromise;
+	let startRemoteBoot = null;
 	if (target.kind === "physical" && !target.serial) {
 		const pooled = await pooledAndroidDevice({
 			root,
@@ -2404,6 +2706,11 @@ async function runAndroid(options = {}) {
 			serial: resolved.serial
 		});
 	} else {
+		if (!remoteDevice) try {
+			configuredAndroidEmulatorApp();
+		} catch (err) {
+			return fail("STIM_BAD_ARG", err.message, "Run `stim settings set androidEmulatorApp emulator` or `stim settings set androidEmulatorApp stim-desktop`.");
+		}
 		const capacity = checkCapacity({
 			platform: PLATFORM,
 			project,
@@ -2418,7 +2725,11 @@ async function runAndroid(options = {}) {
 				projectPath: root,
 				settingsRoot,
 				settings,
-				flags: { systemImage: target.systemImage },
+				flags: {
+					systemImage: target.systemImage,
+					systemImageFlag: systemImageFlag?.trim() || null,
+					deviceProfile: target.deviceProfile
+				},
 				note: out,
 				out,
 				logFile: emuLog
@@ -2429,7 +2740,6 @@ async function runAndroid(options = {}) {
 		}
 		const prepareMs = prepare();
 		if (device.created || prepareMs >= 2e3) phase("device", `${device.avdName || device.deviceName || label} ${device.created ? "created" : "prepared"} (${formatDuration(prepareMs)})`);
-		const bootTimer = stepTimer(now);
 		const boot = () => Promise.resolve(ensureDeviceBooted({
 			platform: PLATFORM,
 			device,
@@ -2441,41 +2751,32 @@ async function runAndroid(options = {}) {
 			reason: String(e?.message || e),
 			serial: void 0
 		}));
-		bootPromise = (remoteDevice?.ctx.backend === "eas" ? ensureRemoteOwned({
-			root,
-			platform: PLATFORM,
-			sessionName: ownedSessionName(remoteDevice.ctx.label),
-			startedAt,
-			boot,
-			createdSessionId: remoteDevice.createdSessionId,
-			abandonCreatedSession: remoteDevice.abandonCreatedSession,
-			webPreviewUrl: remoteDevice.webPreviewUrl,
-			writeState,
-			register: registerProject
-		}) : boot()).then((result) => {
-			bootDuration = bootTimer();
-			return result;
-		});
-	}
-	if (remoteDevice) {
-		const booted = await bootPromise;
-		if (booted.failed) {
-			if (booted.code) return fail(booted.code, booted.reason ?? "The remote device did not boot.", booted.remedy ?? null);
-			const diag = noDeviceDiagnostic({
-				reason: booted.reason ?? "The remote device did not boot.",
-				logFile: emuLog,
-				remedy: "Run `stim status` to inspect the remote device, then retry the command.",
-				localEmulator: false
-			});
-			return fail(NO_DEVICE, diag.message, diag.remedy, {
-				lines: diag.lines,
-				logPath: diag.logPath ? displayPath(root, diag.logPath) : null
+		const startBoot = () => {
+			const bootTimer = stepTimer(now);
+			return (remoteDevice?.ctx.backend === "eas" ? ensureRemoteOwned({
+				root,
+				platform: PLATFORM,
+				sessionName: ownedSessionName(remoteDevice.ctx.label),
+				startedAt: new Date(now()).toISOString(),
+				boot,
+				createdSessionId: remoteDevice.createdSessionId,
+				abandonCreatedSession: remoteDevice.abandonCreatedSession,
+				webPreviewUrl: remoteDevice.webPreviewUrl,
+				writeState,
+				register: registerProject,
+				notice: (line) => out(chalk.dim(phaseLine("lock", line)))
+			}) : boot()).then((result) => {
+				bootDuration = bootTimer();
+				return result;
 			});
-		}
+		};
+		if (remoteDevice) startRemoteBoot = startBoot;
+		else bootPromise = startBoot();
 	}
 	record.avdName = device.avdName ?? null;
 	record.deviceName = device.deviceName ?? device.avdName ?? null;
 	record.systemImage = device.systemImage;
+	record.deviceProfile = device.deviceProfile;
 	const runFromFingerprint = async () => {
 		if (metroCheck && metroPort !== null && plan.metroWarmup) prewarmMetro({
 			port: metroPort,
@@ -2542,6 +2843,25 @@ async function runAndroid(options = {}) {
 		ccacheActivity = artifact.ccache;
 		androidPackage = artifact.androidPackage;
 		record.appPath = apkPath;
+		if (runCancellation()) return fail("STIM_CANCELLED", "before install");
+		if (startRemoteBoot) {
+			progress.step("install");
+			bootPromise = startRemoteBoot();
+			const booted = await bootPromise;
+			if (booted.failed) {
+				if (booted.code) return fail(booted.code, booted.reason ?? "The remote device did not boot.", booted.remedy ?? null);
+				const diag = noDeviceDiagnostic({
+					reason: booted.reason ?? "The remote device did not boot.",
+					logFile: emuLog,
+					remedy: "Run `stim status` to inspect the remote device, then retry the command.",
+					localEmulator: false
+				});
+				return fail(NO_DEVICE, diag.message, diag.remedy, {
+					lines: diag.lines,
+					logPath: diag.logPath ? displayPath(root, diag.logPath) : null
+				});
+			}
+		}
 		let leaseHandle = null;
 		let stopLeaseSignals = null;
 		const releaseLease = () => {