stim 1.6.0 → 1.7.0

package/dist/{android-DLJB8ljN.mjs → android-Da-G_o3n.mjs}

@@ -1,39 +1,39 @@
-import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { C as withConfigLock, E as ownership_claim_exports, F as deviceSlotPlatforms, P as deviceSlotKey, S as upsertProject, b as setDevice, f as getProject, g as loadConfig, l as getConcurrencyLimits, y as saveConfig, z as validateDeviceSlot } from "./config-DMP7L7H6.mjs";
+import { t as getExecutor } from "./exec-B29XNuhP.mjs";
+import { B as validateDeviceSlot, C as withConfigLock, E as ownership_claim_exports, F as deviceSlotKey, I as deviceSlotPlatforms, P as deviceSlotFileKey, S as upsertProject, b as setDevice, f as getProject, g as loadConfig, l as getConcurrencyLimits, y as saveConfig } from "./config-B7iyKWkL.mjs";
 import { r as createNdjsonWriter } from "./ndjson-BZwI1NBv.mjs";
-import { _ as workspaceLogsDir, h as workspaceDir, o as writeWorkspaceState, r as readWorkspaceState, s as emulatorLogFile } from "./workspace-state-WVwWw_hB.mjs";
-import { T as removeTemporaryEntry, g as repoRoot, s as gitCommonDir, w as makeTemporaryDirectory } from "./worktree-DJnBbQZ9.mjs";
-import { a as findProjectRoot, c as projectShortcut, i as detectIsExpo, n as detectAndroidPackage, r as detectBundleId, t as appProjectProblem } from "./project-B_SDt4ip.mjs";
-import { n as MODE_EXPO, p as writeWorkspaceLaunch, t as MODE_BARE } from "./state-CnWzvCWP.mjs";
-import { r as waitForChild, t as createLineReader } from "./process-output-C7IlIzd7.mjs";
-import { i as resolveProjectMetro, r as pidExists } from "./metro-ato6ef3J.mjs";
-import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-CD_XnpDu.mjs";
-import { _ as launchErrorPreview, c as launchErrorReport, g as stepTimer, h as stepClock, i as formatDuration, l as phaseLine, n as appReadinessMessage, p as shortHash } from "./command-output-BuIb_ZOI.mjs";
-import { $ as providerDownloadPath, C as memoizeEmulatorProbe, G as buildCacheKey, J as filesystemBuildCapability, K as describeFingerprintMiss, L as waitForBoot, M as resetAdoptedAvd, N as resolveOwnedAvdSerial, P as resolvePhysicalDevice, Q as prepareProviderDownloadDir, R as WAIT_CEILING_MS, U as takeoverLine, V as releaseBuildLock, W as waitForBuild, X as fingerprintDiffSuffix, Y as fingerprintDiffRecord, Z as fingerprintProject, _ as findBuildTool, a as androidSystemImageAbi, at as untrackedMissLine, ct as captureAssetManifest, et as providerUploadOutcome, g as extractEmulatorFailure, h as emulatorFailureRemedy, i as androidPoolNoCandidatesRefusal, it as storedAssetManifest, j as probeEmulatorSerial, k as physicalDeviceModel, lt as compareAssetManifests, m as emulatorDiskSpaceRemedy, n as androidHome, nt as resolveBuild, ot as untrackedNativeFiles, r as androidPoolCandidates, rt as storeBuild, st as assetDiffReason, t as androidDeviceAbi, tt as refingerprintAfterMutation, ut as readAssetManifest, x as listInstalledSystemImages, y as listAdbDevices, z as acquireBuildLock } from "./android-BkYmndPp.mjs";
-import { A as resolveSettings, B as artifactCachePolicy, D as remoteDeviceSettingError, E as remoteAndroidSetting, F as tunnelModeSetting, H as optimizationBuildProfile, I as unknownSettingKeys, N as settingShapeErrors, R as detectProviders, T as publicUrlSetting, U as resolveOptimizations, V as compilerCacheFallbackMessage, a as SETTING_SHAPE_REMEDY, d as cacheProviderSettingError, j as settingFile, k as resolveCacheProviderConfig, r as REMOTE_DEVICE_BACKENDS, s as androidAvdConfigSettingError, u as androidDataPartitionSizeGbSettingError, x as metroWarmupUrlSetting } from "./settings-CGHTt5vb.mjs";
-import { t as cleanLine } from "./server-expo-CX-zkgWl.mjs";
-import { C as resolveRemote, S as resolveEasCliBin, _ as exitAfterFlush, f as RESOLVE_TIMEOUT_MS, g as easAuthNote, h as checkEasAuth, l as parkedMaxSetting, m as cacheLevel, p as UPLOAD_TIMEOUT_MS, v as isEasAuthFailureText, w as uploadRemote, y as loadProjectProvider } from "./teardown-sm1FwF6V.mjs";
-import { c as ensureWorkspaceStorageSafely, d as launchOutcomeRecord, f as noMetroMessage, g as warmMetro, i as detectEntryFile, m as resolveMetroWithRetry, n as pickDevClientScheme, o as needsPrebuild, p as noMetroRemedy, s as runPrebuild, t as devClientScheme, u as isPhysicalDeviceRequest, v as isEasBuildFailure, y as resolveEasDevelopmentBuild } from "./dev-client-BaTXAAnC.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-Bz19_R9R.mjs";
-import { D as verifyAndroidReleaseLaunch, E as unverifiedLaunchLines, O as verifyLaunch, S as launchAndroidReleaseApp, _ as installConflictKind, c as RELEASE_VERIFY_WAIT_MS, d as androidDevClientUrl, g as installAndroidApp, h as deviceShellArg, i as LAUNCH_BUNDLING, l as VERIFY_TIMEOUT_MS, n as DEFAULT_METRO_PORT, o as LAUNCH_FATAL, s as LAUNCH_UNVERIFIED, t as ADB_INSTALL_TIMEOUT_MS, u as androidAppProcess, x as launchAndroidApp } from "./app-install--PAocWvq.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-C0s_83Og.mjs";
-import { r as releaseBuildSlot, t as acquireBuildSlot } from "./build-slots-CuPszJDu.mjs";
-import { a as statsProjectKey, i as recordRunStats, n as readRunEstimates, t as createRunRecorder } from "./stats-Fo9ACIv7.mjs";
-import { i as ensureOwnedDevice, l as AvdBootError, o as unknownAndroidSystemImageRefusal, r as ensureBooted, t as checkDeviceCapacity, u as AvdRecoveryError } from "./device-XY_5eGdN.mjs";
-import { a as ensureMetroReachable, b as ownedSessionName, l as resolveRemoteContext, n as binOnPath, o as ensureRemoteBootOwned, s as remoteAndroidDeps } from "./device-remote-D9wN3CdE.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-CrzI_Zha.mjs";
-import { d as startBuildHeartbeat, f as tailLines, n as HEARTBEAT_INTERVAL_MS } from "./xcode-DUF7jrXj.mjs";
-import { n as nativeRunCommand, t as launchSlotScope } from "./slot-launch-BYjnljAs.mjs";
+import { _ as workspaceLogsDir, h as workspaceDir, o as writeWorkspaceState, r as readWorkspaceState, s as emulatorLogFile } from "./workspace-state-BT5E3SA2.mjs";
+import { T as removeTemporaryEntry, g as repoRoot, s as gitCommonDir, w as makeTemporaryDirectory } from "./worktree-FG_ZKKdb.mjs";
+import { a as findProjectRoot, c as projectShortcut, i as detectIsExpo, n as detectAndroidPackage, r as detectBundleId, t as appProjectProblem } from "./project-DDZWf_16.mjs";
+import { n as MODE_EXPO, p as writeWorkspaceLaunch, t as MODE_BARE } from "./state-DZobzxLW.mjs";
+import { r as waitForChild, t as createLineReader } from "./process-output-Dl5uKE03.mjs";
+import { a as resolveProjectMetro, i as pidExists, o as signalProcessTree } from "./metro-C7bcJ0uo.mjs";
+import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-Cp52QAK1.mjs";
+import { A as resolveSettings, B as artifactCachePolicy, D as remoteDeviceSettingError, E as remoteAndroidSetting, F as tunnelModeSetting, H as optimizationBuildProfile, I as unknownSettingKeys, N as settingShapeErrors, R as detectProviders, T as publicUrlSetting, U as resolveOptimizations, V as compilerCacheFallbackMessage, a as SETTING_SHAPE_REMEDY, d as cacheProviderSettingError, j as settingFile, k as resolveCacheProviderConfig, r as REMOTE_DEVICE_BACKENDS, s as androidAvdConfigSettingError, u as androidDataPartitionSizeGbSettingError, x as metroWarmupUrlSetting } from "./settings-BXXorVM2.mjs";
+import { B as waitForBoot, E as memoizeEmulatorProbe, F as resetAdoptedAvd, I as resolveOwnedAvdSerial, L as resolvePhysicalDevice, M as physicalDeviceModel, P as probeEmulatorSerial, S as listAdbDevices, _ as emulatorFailureRemedy, a as androidPoolNoCandidatesRefusal, g as emulatorDiskSpaceRemedy, i as androidPoolCandidates, n as androidDeviceAbi, o as androidSystemImageAbi, r as androidHome, s as androidToolCwd, t as androidBuildToolName, v as extractEmulatorFailure, w as listInstalledSystemImages, y as findBuildTool } from "./android-DWssqHQ8.mjs";
+import { _ as launchErrorPreview, c as launchErrorReport, g as stepTimer, h as stepClock, i as formatDuration, l as phaseLine, n as appReadinessMessage, p as shortHash } from "./command-output-B3ycpsYv.mjs";
+import { C as untrackedNativeFiles, D as readAssetManifest, E as compareAssetManifests, S as untrackedMissLine, T as captureAssetManifest, _ as providerUploadOutcome, b as storeBuild, c as buildCacheKey, d as filesystemBuildCapability, f as fingerprintDiffRecord, g as providerDownloadPath, h as prepareProviderDownloadDir, i as releaseBuildLock, l as describeFingerprintMiss, m as fingerprintProject, n as acquireBuildLock, o as takeoverLine, p as fingerprintDiffSuffix, s as waitForBuild, t as WAIT_CEILING_MS, v as refingerprintAfterMutation, w as assetDiffReason, x as storedAssetManifest, y as resolveBuild } from "./build-lock-CgtsB6TV.mjs";
+import { t as cleanLine } from "./server-expo-BVAA1OqJ.mjs";
+import { C as resolveRemote, S as resolveEasCliBin, _ as exitAfterFlush, f as RESOLVE_TIMEOUT_MS, g as easAuthNote, h as checkEasAuth, l as parkedMaxSetting, m as cacheLevel, p as UPLOAD_TIMEOUT_MS, v as isEasAuthFailureText, w as uploadRemote, y as loadProjectProvider } from "./teardown-5J5UXz2P.mjs";
+import { c as ensureWorkspaceStorageSafely, d as launchOutcomeRecord, f as noMetroMessage, g as warmMetro, i as detectEntryFile, m as resolveMetroWithRetry, n as pickDevClientScheme, o as needsPrebuild, p as noMetroRemedy, s as runPrebuild, t as devClientScheme, u as isPhysicalDeviceRequest, v as isEasBuildFailure, y as resolveEasDevelopmentBuild } from "./dev-client-DDUkWgJL.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BYfZz_S-.mjs";
+import { D as verifyAndroidReleaseLaunch, E as unverifiedLaunchLines, O as verifyLaunch, S as launchAndroidReleaseApp, _ as installConflictKind, c as RELEASE_VERIFY_WAIT_MS, d as androidDevClientUrl, g as installAndroidApp, h as deviceShellArg, i as LAUNCH_BUNDLING, l as VERIFY_TIMEOUT_MS, n as DEFAULT_METRO_PORT, o as LAUNCH_FATAL, s as LAUNCH_UNVERIFIED, t as ADB_INSTALL_TIMEOUT_MS, u as androidAppProcess, x as launchAndroidApp } from "./app-install-DJg7bVv-.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-DNSHL5z8.mjs";
+import { r as releaseBuildSlot, t as acquireBuildSlot } from "./build-slots-C-oAHRT1.mjs";
+import { a as statsProjectKey, i as recordRunStats, n as readRunEstimates, t as createRunRecorder } from "./stats-BYcZ6n1h.mjs";
+import { i as ensureOwnedDevice, l as AvdBootError, o as unknownAndroidSystemImageRefusal, r as ensureBooted, t as checkDeviceCapacity, u as AvdRecoveryError } from "./device-CLeDp-KH.mjs";
+import { a as ensureMetroReachable, b as ownedSessionName, l as resolveRemoteContext, n as binOnPath, o as ensureRemoteBootOwned, s as remoteAndroidDeps } from "./device-remote-BprxZp-m.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-SWIjzeuL.mjs";
+import { d as startBuildHeartbeat, f as tailLines, n as HEARTBEAT_INTERVAL_MS } from "./xcode-B6YaWeg0.mjs";
+import { n as nativeRunCommand, t as launchSlotScope } from "./slot-launch-DbLvyrup.mjs";
 import { t as spawnEntry } from "./spawn-entry-nCE6m770.mjs";
-import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-B5STzxqN.mjs";
-import { existsSync, mkdirSync, openSync, readFileSync, readdirSync, rmSync } from "node:fs";
+import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-D1Kaf-eT.mjs";
+import { constants, copyFileSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync, renameSync, rmSync } from "node:fs";
 import { InvalidArgumentError } from "commander";
-import { basename, dirname, join, relative } from "node:path";
+import { basename, dirname, isAbsolute, join, relative } from "node:path";
 import { createWarnOnce, loadCacheProvider, resolveTieredBuild, storeTieredBuild } from "@stim-cli/cache";
 import chalk from "chalk";
 //#region src/engine/apk-swap.ts
 const ANDROID_BUNDLE_NAME = "index.android.bundle";
-const ANDROID_BUNDLE_ENTRY = `assets/${ANDROID_BUNDLE_NAME}`;
 const LAST_LINES = 5;
 function hermesEnabledFromGradleProperties(text) {
 	if (typeof text !== "string") return true;
@@ -54,16 +54,21 @@ function readAndroidHermesEnabled(root) {
 	}
 }
 function hermescBinDir(platform = process.platform) {
-	return platform === "darwin" ? "osx-bin" : "linux64-bin";
+	if (platform === "darwin") return "osx-bin";
+	return platform === "win32" ? "win64-bin" : "linux64-bin";
+}
+function hermescName(platform) {
+	return platform === "win32" ? "hermesc.exe" : "hermesc";
 }
 function hermescCandidates(root, { platform = process.platform, reactNativePath = null } = {}) {
 	const bin = hermescBinDir(platform);
+	const name = hermescName(platform);
 	const rn = reactNativePath ?? join(root, "node_modules", "react-native");
 	return [.../* @__PURE__ */ new Set([
-		join(dirname(rn), "hermes-compiler", "hermesc", bin, "hermesc"),
-		join(root, "node_modules", "hermes-compiler", "hermesc", bin, "hermesc"),
-		join(root, "node_modules", "react-native", "sdks", "hermesc", bin, "hermesc"),
-		join(root, "node_modules", "react-native", "sdks", "hermes", "build", "bin", "hermesc")
+		join(dirname(rn), "hermes-compiler", "hermesc", bin, name),
+		join(root, "node_modules", "hermes-compiler", "hermesc", bin, name),
+		join(root, "node_modules", "react-native", "sdks", "hermesc", bin, name),
+		join(root, "node_modules", "react-native", "sdks", "hermes", "build", "bin", name)
 	])];
 }
 function androidHermescPath(root, { exists = existsSync, platform = process.platform, reactNativePath = null } = {}) {
@@ -117,8 +122,8 @@ function androidBundleCommand({ isExpo, entryFile, bundleOutput, assetsDest }) {
 		]
 	};
 }
-function isNothingToDelete(text) {
-	return /nothing to do|name not matched|no matches found/i.test(String(text ?? ""));
+function jarPath({ javaHome = process.env.JAVA_HOME } = {}) {
+	return javaHome ? join(javaHome, "bin", "jar") : "jar";
 }
 function zipalignArgs({ buildToolsMajor, input, output }) {
 	return [
@@ -141,7 +146,7 @@ function resolveKeystore(root, settings) {
 	const bag = android && typeof android === "object" && !Array.isArray(android) ? android : {};
 	const configured = bag["keystore"];
 	return {
-		path: typeof configured === "string" && configured.trim() !== "" ? configured.trim().startsWith("/") ? configured.trim() : join(root, configured.trim()) : join(root, "android", "app", "debug.keystore"),
+		path: typeof configured === "string" && configured.trim() !== "" ? isAbsolute(configured.trim()) ? configured.trim() : join(root, configured.trim()) : join(root, "android", "app", "debug.keystore"),
 		pass: keystorePassArg(bag["keystorePassword"])
 	};
 }
@@ -155,7 +160,7 @@ function apksignerArgs({ keystore, apkPath }) {
 		apkPath
 	];
 }
-async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter = null, exec = null, spawnFn = null, mkdtemp = () => makeTemporaryDirectory(cachedApkPath, "stim-apk-swap-"), exists = existsSync, hermesEnabled = null, buildTools = null, findTool = findBuildTool, storedAssets = null, readManifest = readAssetManifest, now = Date.now, heartbeatMs = HEARTBEAT_INTERVAL_MS, onHeartbeat = (line) => console.error(line) }) {
+async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter = null, exec = null, spawnFn = null, mkdtemp = () => makeTemporaryDirectory(cachedApkPath, "stim-apk-swap-"), exists = existsSync, hermesEnabled = null, buildTools = null, findTool = findBuildTool, storedAssets = null, readManifest = readAssetManifest, now = Date.now, heartbeatMs = HEARTBEAT_INTERVAL_MS, onHeartbeat = (line) => console.error(line), platform = process.platform }) {
 	const e = exec || getExecutor();
 	const startedAt = now();
 	const elapsed = () => now() - startedAt;
@@ -183,15 +188,7 @@ async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter
 		const base = basename(cachedApkPath);
 		work = join(tmp, `unaligned-${base}`);
 		final = join(tmp, base);
-		try {
-			e.runFile("cp", [
-				"-c",
-				cachedApkPath,
-				work
-			]);
-		} catch {
-			e.runFile("cp", [cachedApkPath, work]);
-		}
+		copyApk(e, cachedApkPath, work, platform);
 	} catch (err) {
 		return fail("copy", `could not copy ${cachedApkPath} aside: ${describe(err)}`);
 	}
@@ -287,7 +284,7 @@ async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter
 					bundle: bundleOutput,
 					out: hbc
 				}));
-				e.runFile("mv", [hbc, bundleOutput]);
+				renameSync(hbc, bundleOutput);
 				hermes = true;
 			} catch (err) {
 				return fail("hermesc", `hermesc failed on ${bundleOutput}: ${describe(err)}`);
@@ -315,24 +312,19 @@ async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter
 	if (!fresh) return fail("assets", `could not hash the assets emitted into ${assetsDest}, so the asset set cannot be verified`);
 	const diff = compareAssetManifests(fresh, storedAssets);
 	if (!diff.same) return refuse(assetDiffReason(diff), diff);
+	const jar = jarPath();
 	try {
-		e.runFile("zip", [
-			"-d",
-			work,
-			ANDROID_BUNDLE_ENTRY
-		]);
-	} catch (err) {
-		if (!isNothingToDelete(describe(err))) return fail("zip", `zip -d ${ANDROID_BUNDLE_ENTRY} failed on ${work}: ${describe(err)}`);
-	}
-	try {
-		e.runFile("zip", [
-			"-0",
-			"-r",
+		e.runFile(jar, [
+			"--update",
+			"--file",
 			work,
+			"--no-compress",
+			"-C",
+			stage,
 			"assets"
-		], { cwd: stage });
+		]);
 	} catch (err) {
-		return fail("zip", `zip -0 -r ${work} assets failed: ${describe(err)}`);
+		return fail("zip", `${jar} --update ${work} failed: ${describe(err)}`);
 	}
 	const tools = buildTools ?? findTool(["zipalign"]);
 	if (!tools) return fail("zipalign", "no zipalign found under the Android SDK build-tools; install one with `sdkmanager \"build-tools;36.0.0\"`");
@@ -347,7 +339,7 @@ async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter
 	}
 	const signer = buildTools ? {
 		...buildTools,
-		path: join(dirname(buildTools.path), "apksigner")
+		path: join(dirname(buildTools.path), androidBuildToolName("apksigner"))
 	} : findTool(["apksigner"]);
 	if (!signer) return fail("apksigner", "no apksigner found under the Android SDK build-tools; install one with `sdkmanager \"build-tools;36.0.0\"`");
 	try {
@@ -374,6 +366,17 @@ async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter
 	if (note) result.note = note;
 	return result;
 }
+function copyApk(e, from, to, platform) {
+	if (platform === "darwin") try {
+		e.runFile("cp", [
+			"-c",
+			from,
+			to
+		]);
+		return;
+	} catch {}
+	copyFileSync(from, to, constants.COPYFILE_FICLONE);
+}
 function describe(err) {
 	const e = err;
 	const streams = [e?.stdout, e?.stderr].map((s) => s ? String(s).trim() : "").filter(Boolean).join("\n");
@@ -630,6 +633,519 @@ function androidBuildOptions({ release, physical, device, variant, deviceAbi, co
 	};
 }
 //#endregion
+//#region src/commands/android/artifact.ts
+const FALLBACK_LINES = 5;
+function fail$1(code, message, remedy, extra = {}) {
+	return {
+		code,
+		message,
+		remedy,
+		extra
+	};
+}
+async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo, device, physical, buildPlan, cacheProviderConfig, requestedBuildCache, easBuild, androidPackage: initialPackage, record, maxBuilds, progress }, { deviceAbi, fingerprint, untracked, resolveCached, storeCached, storedAssets, captureAssets, acquireLock, releaseLock, waitForBuild, loadProvider, easAuth, resolveRemoteBuild, uploadRemoteBuild, loadCacheProviderModule, acquireSlot, releaseSlot, needsPrebuildFor, prebuild, build, ccacheFor, swapApk, readState, now }) {
+	const { phase, out, estimates, stats } = progress;
+	const { variant, release, profile: buildProfile, cas, cache: cachePolicy } = buildPlan;
+	const useBuildCache = cachePolicy.read;
+	let androidPackage = initialPackage;
+	let ccacheActivity = CCACHE_NOT_RUN;
+	let phaseFailure = null;
+	const refused = () => ({
+		ok: false,
+		failure: phaseFailure,
+		ccache: ccacheActivity
+	});
+	let buildLock = null;
+	const releaseHeldLock = () => {
+		if (!buildLock) return;
+		const held = buildLock;
+		buildLock = null;
+		try {
+			releaseLock(held);
+		} catch (err) {
+			out(phaseLine("build", chalk.dim(`could not release the build lock at ${held.path}: ${err?.message || err}`)));
+		}
+	};
+	let buildSlot = null;
+	const releaseHeldSlot = () => {
+		if (!buildSlot) return;
+		const held = buildSlot;
+		buildSlot = null;
+		try {
+			releaseSlot(held);
+		} catch (err) {
+			out(phaseLine("build", chalk.dim(`could not release the build slot: ${err?.message || err}`)));
+		}
+	};
+	const { abi: buildAbi, runOptions: buildRunOptions, remoteRunOptions } = androidBuildOptions({
+		release,
+		physical,
+		device,
+		variant,
+		deviceAbi,
+		compiler: cas?.id,
+		buildProfile,
+		targetAbiOnly: buildPlan.targetAbiOnly
+	});
+	let hash = "";
+	let providerUpload = null;
+	let providerName = null;
+	let providerLoad = null;
+	const cacheWarn = createWarnOnce((line) => phase("cache", chalk.yellow(line)));
+	const loadTieredProvider = cachePolicy.remote && cacheProviderConfig ? () => providerLoad ??= loadCacheProviderModule({
+		projectRoot: root,
+		config: cacheProviderConfig
+	}) : null;
+	let fingerprintSources = [];
+	let cacheKey = "";
+	let storeHash = "";
+	let storeKey = "";
+	let storeSources = [];
+	let apkPath = null;
+	async function resolveInitialFingerprint() {
+		if (easBuild?.ok) {
+			hash = storeHash = easBuild.fingerprint;
+			cacheKey = storeKey = easBuild.cacheKey;
+			apkPath = easBuild.path;
+			record.fingerprint = hash;
+			record.cacheKey = cacheKey;
+			record.cacheHit = easBuild.cacheHit;
+			record.cacheSkipped = !useBuildCache;
+			providerName = "eas";
+			stats.setCacheKey(cacheKey);
+			return true;
+		}
+		const fingerprintTimer = stepTimer(now);
+		try {
+			const computed = await fingerprint(root, { platform: PLATFORM });
+			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.");
+			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.");
+			return false;
+		}
+		record.fingerprint = hash;
+		cacheKey = buildCacheKey(PLATFORM, hash, buildRunOptions);
+		stats.setCacheKey(cacheKey);
+		record.cacheKey = cacheKey;
+		storeHash = hash;
+		storeKey = cacheKey;
+		storeSources = fingerprintSources;
+		const found = await resolveTieredBuild({
+			local: filesystemBuildCapability({
+				resolve: resolveCached,
+				store: storeCached,
+				sources: fingerprintSources
+			}),
+			loadProvider: loadTieredProvider,
+			target: {
+				projectRoot: root,
+				platform: PLATFORM,
+				key: cacheKey
+			},
+			destinationDir: providerDownloadPath(workspaceDir(root)),
+			ensureDestination: prepareProviderDownloadDir,
+			skipRead: !useBuildCache,
+			warn: cacheWarn
+		});
+		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));
+		if (found?.tier === "provider") {
+			record.cacheHit = "remote";
+			providerName = found.providerName ?? null;
+			phase("cache", `provider hit (${providerName})${found.storedLocally ? " -> stored locally" : ""}`);
+		}
+		apkPath = found?.path ?? null;
+		return true;
+	}
+	if (!await resolveInitialFingerprint()) return refused();
+	let remote = null;
+	let abandonedRemote = false;
+	let uploadPending = null;
+	async function resolveRemoteArtifact() {
+		if (buildAbi || cas || buildProfile || !cachePolicy.remote) return;
+		if (!apkPath) {
+			const loaded = await loadProvider(root, { isExpo });
+			if (loaded?.unavailable) phase("cache", chalk.yellow(`provider not usable: ${loaded.unavailable}`));
+			else if (loaded?.provider) remote = loaded;
+			if (remote?.name === "eas") {
+				const auth = easAuth({
+					projectRoot: root,
+					owner: loaded?.owner || null
+				});
+				const authNote = easAuthNote(auth);
+				if (authNote) phase("cache", chalk.yellow(authNote));
+				if (auth?.code === "logged-out") remote = null;
+			}
+		}
+		if (remote && useBuildCache) {
+			const remoteTimer = stepTimer(now);
+			const hit = await resolveRemoteBuild({
+				logWriter: writer,
+				provider: remote.provider,
+				platform: PLATFORM,
+				projectRoot: root,
+				fingerprintHash: hash,
+				runOptions: remoteRunOptions
+			});
+			if (hit?.appPath) {
+				let stored = null;
+				try {
+					stored = storeCached(PLATFORM, cacheKey, hit.appPath, { sources: fingerprintSources });
+				} catch (err) {
+					phase("cache", chalk.yellow(`remote hit could not be stored locally: ${err?.message || err}`));
+				}
+				apkPath = stored || hit.appPath;
+				record.cacheHit = "remote";
+				phase("cache", `remote hit (${remote.name})${stored ? " -> stored locally" : ""} ${remoteTimer()}`);
+			} else if (hit?.timedOut) {
+				abandonedRemote = true;
+				phase("cache", chalk.yellow(`${remote.name} did not answer within ${formatDuration(RESOLVE_TIMEOUT_MS)}; building instead`));
+			} else if (hit?.failed) {
+				const authNote = remote.name === "eas" && isEasAuthFailureText(hit.failed) ? easAuthNote({
+					code: "logged-out",
+					reason: hit.failed
+				}) : null;
+				phase("cache", chalk.yellow(authNote || `${remote.name} could not be used: ${hit.failed}; building instead`));
+			} else phase("cache", `remote miss (${remote.name}) ${remoteTimer()}`);
+		}
+	}
+	if (!easBuild) await resolveRemoteArtifact();
+	let waitedForBuild = null;
+	let releasedWait = null;
+	async function waitForSharedBuild() {
+		if (!useBuildCache) return true;
+		const waitStarted = now();
+		let failedHolder;
+		while (!apkPath) {
+			let attempt = null;
+			try {
+				attempt = acquireLock({
+					platform: PLATFORM,
+					key: cacheKey,
+					root,
+					logFile: buildLog
+				});
+			} catch (err) {
+				const refusal = (0, ownership_claim_exports.claimFailure)(err, "stim android");
+				if (refusal) {
+					phaseFailure = fail$1(refusal.code, refusal.message, refusal.remedy, { lastBuildStatus: true });
+					return false;
+				}
+				phase("build", chalk.yellow(`could not take the build lock: ${err?.message || err}; building anyway`));
+			}
+			if (attempt?.acquired) {
+				buildLock = attempt;
+				const previous = attempt.tookOver ?? failedHolder;
+				if (previous) phase("build", chalk.yellow(takeoverLine(previous)));
+				break;
+			} else if (attempt?.held) {
+				releasedWait = null;
+				const holder = attempt.held;
+				const who = holder.projectRoot || "another workspace";
+				phase("build", `${who} is already building ${shortHash(hash)} (pid ${holder.pid})${holder.logFile ? ` -- tail ${holder.logFile}` : ""} -- stim guide lifecycle concurrency`);
+				let waited = null;
+				try {
+					const ceilingMs = WAIT_CEILING_MS - (now() - waitStarted);
+					if (ceilingMs <= 0) throw Object.assign(/* @__PURE__ */ new Error(`Waited ${formatDuration(now() - waitStarted)} for shared builds without an artifact; ${who} (pid ${holder.pid}) holds ${attempt.path}.`), {
+						code: "STIM_BUILD_WAIT_TIMEOUT",
+						lockPath: attempt.path
+					});
+					waited = await waitForBuild({
+						platform: PLATFORM,
+						key: cacheKey,
+						out,
+						ceilingMs
+					});
+				} catch (err) {
+					const refusal = (0, ownership_claim_exports.claimFailure)(err, "stim android");
+					if (refusal) {
+						phaseFailure = fail$1(refusal.code, refusal.message, refusal.remedy, { lastBuildStatus: true });
+						return false;
+					}
+					const wtErr = err;
+					if (wtErr?.code !== "STIM_BUILD_WAIT_TIMEOUT") throw err;
+					phaseFailure = fail$1("STIM_BUILD_WAIT_TIMEOUT", wtErr.message, `Check pid ${holder.pid}; if it is not really building, remove ${wtErr.lockPath} and run \`stim android\` again.`, { lastBuildStatus: true });
+					return false;
+				}
+				if (waited?.hit) {
+					apkPath = waited.hit ?? null;
+					record.cacheHit = "local";
+					waitedForBuild = {
+						pid: holder.pid,
+						ms: waited.waitedMs
+					};
+					phase("build", `waited ${formatDuration(waited.waitedMs)} for ${who}'s build -> installed from cache -- stim guide lifecycle concurrency`);
+				} else if (waited?.lockReleased) {
+					failedHolder = void 0;
+					releasedWait = {
+						facts: {
+							pid: holder.pid,
+							ms: waited.waitedMs
+						},
+						who
+					};
+					phase("build", `${who}'s build lock was released; rechecking this workspace before building`);
+				} else {
+					phase("build", chalk.yellow(`${who}'s build ended without an artifact (${waited?.builderFailed}); retrying the build lock`));
+					failedHolder = holder;
+				}
+			} else break;
+		}
+		return true;
+	}
+	if (!easBuild && !await waitForSharedBuild()) return refused();
+	let swapDir = null;
+	let swapFellBack = false;
+	const installableCachedApk = async (key, cachedPath) => {
+		if (!release) return cachedPath;
+		phase("swap", `regenerating this workspace's JS for the cached ${variant} APK`);
+		const swap = await swapApk({
+			root,
+			isExpo,
+			cachedApkPath: cachedPath,
+			keystore: resolveKeystore(root, settings),
+			logWriter: writer,
+			storedAssets: storedAssets(PLATFORM, key)
+		});
+		if (swap?.ok && swap.apkPath) {
+			if (swap.note) phase("swap", chalk.yellow(swap.note));
+			swapDir = swap.tmpDir ?? null;
+			phase("swap", `${swap.hermes ? "hermes bytecode" : "plain JS"} repacked (store), zipaligned and re-signed (${formatDuration(swap.durationMs)})`);
+			return swap.apkPath;
+		}
+		if (swap?.assetMismatch) phase("swap", chalk.yellow(`${swap.reason} -- building fresh instead` + (swap.assetDiff ? " (an APK cannot be made to carry an asset AAPT did not package)" : "")));
+		else phase("swap", chalk.yellow(`failed at ${swap?.step || "unknown step"}: ${swap?.reason || "unknown reason"} -- building fresh instead (a cached ${variant} APK carries its builder's JS; it is never installed after a failed swap)`));
+		for (const line of swap?.lastLines ?? []) phase("", chalk.dim(line));
+		swapFellBack = true;
+		return null;
+	};
+	async function prepareCachedArtifact() {
+		if (apkPath && record.cacheHit) {
+			const prepared = await installableCachedApk(cacheKey, apkPath);
+			apkPath = prepared;
+			if (!prepared) {
+				record.cacheHit = false;
+				waitedForBuild = null;
+			}
+		}
+	}
+	async function buildArtifact() {
+		if (!apkPath) try {
+			if (maxBuilds) try {
+				buildSlot = await acquireSlot({
+					max: maxBuilds,
+					root,
+					logFile: buildLog,
+					out
+				});
+			} catch (err) {
+				const refusal = (0, ownership_claim_exports.claimFailure)(err, "stim android");
+				if (refusal) {
+					phaseFailure = fail$1(refusal.code, refusal.message, refusal.remedy, { lastBuildStatus: true });
+					return false;
+				}
+				phase("build", chalk.yellow(`could not take a build slot: ${err?.message || err}; building anyway`));
+			}
+			if (needsPrebuildFor(root, "android", isExpo)) {
+				const pre = await prebuild(root, PLATFORM, writer, { isExpo });
+				if (pre.failed) {
+					phaseFailure = fail$1(pre.code, pre.reason, pre.remedy, {
+						lastBuildStatus: true,
+						lines: tail(pre.lastLines),
+						logPath: displayPath(root, buildLog)
+					});
+					return false;
+				}
+				phase("prebuild", `android/ generated (${formatDuration(pre.durationMs)})`);
+				androidPackage = androidPackage || detectAndroidPackage(root);
+				record.bundleId = androidPackage;
+				const after = await refingerprintAfterMutation({
+					projectRoot: root,
+					platform: PLATFORM,
+					previousHash: hash,
+					fingerprint
+				});
+				if (after?.moved) {
+					storeHash = after.hash;
+					storeSources = after.sources;
+					storeKey = buildCacheKey(PLATFORM, after.hash, buildRunOptions);
+					record.fingerprint = storeHash;
+					record.cacheKey = storeKey;
+					phase("fingerprint", chalk.dim(`${shortHash(hash)} -> ${shortHash(storeHash)} (after prebuild)`));
+					const late = useBuildCache ? resolveCached(PLATFORM, storeKey) : null;
+					if (late) {
+						const prepared = await installableCachedApk(storeKey, late);
+						if (prepared) {
+							apkPath = prepared;
+							record.cacheHit = "local";
+							phase("cache", `hit ${shortHash(storeHash)} (post-prebuild key)`);
+							if (releasedWait) {
+								waitedForBuild = releasedWait.facts;
+								phase("build", `waited ${formatDuration(waitedForBuild.ms)} for ${releasedWait.who}'s build -> installed from cache -- stim guide lifecycle concurrency`);
+							}
+						}
+					}
+				}
+			}
+			if (!apkPath) {
+				phase("build", `compiling ${variant || "debug"} with Gradle`);
+				const built = await build({
+					root,
+					logWriter: writer,
+					variant,
+					abi: buildAbi
+				}, {
+					estimateMs: estimates().coldBuildMs,
+					ccache: buildPlan.compilerCache === "ccache" ? ccacheFor({
+						root,
+						onNote: out
+					}) : null,
+					cas,
+					buildCache: buildPlan.gradleBuildCache,
+					pch: buildPlan.pch,
+					compilerCacheDisabled: buildPlan.compilerCache === "none"
+				});
+				ccacheActivity = built.ccache ?? CCACHE_UNAVAILABLE;
+				phase("cache", `compilation cache ${ccacheActivityLine(ccacheActivity)}`);
+				if (!built.ok) {
+					const diagnostics = built.diagnostics;
+					for (const diag of diagnostics) writer.write({
+						src: "build",
+						level: "error",
+						event: "gradle_diagnostic",
+						msg: formatDiagnostic(diag)
+					});
+					phase("build", chalk.red(`FAILED after ${formatDuration(built.durationMs)}`));
+					const extracted = diagnostics.map(formatDiagnostic);
+					if (built.truncated > 0) extracted.push(`... and ${built.truncated} more diagnostic(s) in the log`);
+					phaseFailure = fail$1(built.code, built.reason, diagnostics.find((d) => d.remedy)?.remedy || built.remedy || null, {
+						lastBuildStatus: true,
+						diagnostics: extracted,
+						lines: extracted.length ? [] : tail(built.lastLines),
+						logPath: displayPath(root, buildLog)
+					});
+					return false;
+				}
+				apkPath = built.apkPath;
+				stats.setBuildMs(built.durationMs);
+				phase("build", `ok (${formatDuration(built.durationMs)})`);
+				if (built.apkNote) phase("build", chalk.yellow(built.apkNote));
+				const beforeBuildHash = storeHash;
+				const afterBuild = await refingerprintAfterMutation({
+					projectRoot: root,
+					platform: PLATFORM,
+					previousHash: beforeBuildHash,
+					fingerprint
+				});
+				if (!afterBuild) {
+					record.fingerprint = null;
+					record.cacheKey = null;
+					phase("fingerprint", chalk.yellow("unavailable after Gradle; the build will be installed but not cached"));
+				} else {
+					if (afterBuild.moved) {
+						storeHash = afterBuild.hash;
+						storeSources = afterBuild.sources;
+						storeKey = buildCacheKey(PLATFORM, afterBuild.hash, buildRunOptions);
+						record.fingerprint = storeHash;
+						record.cacheKey = storeKey;
+						phase("fingerprint", chalk.dim(`${shortHash(beforeBuildHash)} -> ${shortHash(storeHash)} (after Gradle)`));
+					}
+					if (cachePolicy.write) {
+						const assetManifest = release ? captureAssets(root, { variant }) : null;
+						try {
+							const stored = await storeTieredBuild({
+								local: filesystemBuildCapability({
+									resolve: resolveCached,
+									store: storeCached,
+									sources: storeSources,
+									assetManifest
+								}),
+								loadProvider: loadTieredProvider,
+								target: {
+									projectRoot: root,
+									platform: PLATFORM,
+									key: storeKey
+								},
+								sourcePath: apkPath,
+								overwrite: !useBuildCache || swapFellBack,
+								warn: cacheWarn
+							});
+							providerUpload = stored.providerUpload;
+							providerName = stored.providerName ?? providerName;
+						} catch (err) {
+							phase("cache", chalk.yellow(`could not store the build: ${err?.message || err}`));
+						}
+					}
+					if (remote) uploadPending = uploadRemoteBuild({
+						logWriter: writer,
+						provider: remote.provider,
+						platform: PLATFORM,
+						projectRoot: root,
+						fingerprintHash: storeHash,
+						buildPath: apkPath,
+						runOptions: remoteRunOptions
+					});
+				}
+			}
+		} finally {
+			releaseHeldLock();
+			releaseHeldSlot();
+		}
+		return true;
+	}
+	if (!easBuild) {
+		await prepareCachedArtifact();
+		if (!await buildArtifact()) return refused();
+	}
+	return {
+		ok: true,
+		artifact: {
+			apkPath,
+			androidPackage,
+			swapDir,
+			waitedForBuild,
+			ccache: ccacheActivity,
+			uploadPending,
+			providerUpload,
+			providerName,
+			remote,
+			abandonedRemote
+		}
+	};
+}
+function tail(lines, n = FALLBACK_LINES) {
+	return (Array.isArray(lines) ? lines : []).slice(-n);
+}
+//#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 }) {
 	return {
@@ -775,11 +1291,11 @@ function collectorEntry() {
 	return spawnEntry("collector-run");
 }
 function collectorLogFile(root, slot = "default") {
-	return join(workspaceLogsDir(root), `collector-${deviceSlotKey(PLATFORM, slot)}.log`);
+	return join(workspaceLogsDir(root), `collector-${deviceSlotFileKey(PLATFORM, slot)}.log`);
 }
 const COLLECTOR_EXIT_WAIT_MS = 2e3;
 const COLLECTOR_POLL_MS = 25;
-function killPreviousCollector(root, { platform = PLATFORM, slot = "default", kill = (pid, signal) => process.kill(pid, signal), collectors = null, verify = verifyCollectorOwnership, isAlive = pidExists, note = (_line) => {} } = {}) {
+function killPreviousCollector(root, { platform = PLATFORM, slot = "default", kill = (pid, signal) => signalProcessTree(pid, signal), collectors = null, verify = verifyCollectorOwnership, isAlive = pidExists, note = (_line) => {} } = {}) {
 	const record = (collectors ?? readCollectors(root))?.[deviceSlotKey(platform, slot)];
 	const pid = Number(record?.pid);
 	if (!Number.isFinite(pid) || pid <= 0 || pid === process.pid) return null;
@@ -837,7 +1353,7 @@ async function startCollector({ root, slot = "default", serial, packageName, spa
 			"--package",
 			packageName
 		], {
-			cwd: root,
+			cwd: androidToolCwd() ?? root,
 			detached: true,
 			stdio,
 			env: process.env
@@ -965,6 +1481,7 @@ async function verifyAndroidRun({ root, slot, release, remoteRelease, remoteDevi
 		serial,
 		component,
 		devClientUrl: scheme ? androidDevClientUrl(scheme, metroPort ?? 8081, physical) : null,
+		devClient: Boolean(scheme),
 		mode: isExpo ? MODE_EXPO : MODE_BARE
 	})) phase("", chalk.yellow(line));
 	return { state: LAUNCH_UNVERIFIED };
@@ -1411,7 +1928,6 @@ function resolveAndroidRunPlan({ settings, settingsContext, slot, easProfile, va
 }
 //#endregion
 //#region src/commands/android.ts
-const FALLBACK_LINES = 5;
 function androidCommand(program) {
 	registerAndroid(program);
 }
@@ -1624,7 +2140,7 @@ async function runAndroid(options = {}) {
 		};
 	}
 	const logsDir = workspaceLogsDir(root);
-	const buildLog = join(logsDir, `build-${deviceSlotKey("android", slot)}.ndjson`);
+	const buildLog = join(logsDir, `build-${deviceSlotFileKey("android", slot)}.ndjson`);
 	const writer = createWriter(buildLog, {
 		truncate: true,
 		fields: { slot }
@@ -1638,28 +2154,6 @@ async function runAndroid(options = {}) {
 		avdName: null,
 		deviceName: null
 	};
-	let buildLock = null;
-	const releaseHeldLock = () => {
-		if (!buildLock) return;
-		const held = buildLock;
-		buildLock = null;
-		try {
-			releaseLock(held);
-		} catch (err) {
-			out(phaseLine("build", chalk.dim(`could not release the build lock at ${held.path}: ${err?.message || err}`)));
-		}
-	};
-	let buildSlot = null;
-	const releaseHeldSlot = () => {
-		if (!buildSlot) return;
-		const held = buildSlot;
-		buildSlot = null;
-		try {
-			releaseSlot(held);
-		} catch (err) {
-			out(phaseLine("build", chalk.dim(`could not release the build slot: ${err?.message || err}`)));
-		}
-	};
 	const phase = (label, text) => out(phaseLine(label, text));
 	const stats = createRunRecorder({
 		platform: PLATFORM,
@@ -1745,7 +2239,7 @@ async function runAndroid(options = {}) {
 	if (!planned.ok) return fail(planned.code, planned.message, planned.remedy, { lines: planned.lines });
 	const { plan } = planned;
 	const { build: buildPlan, target, isExpo, cacheProviderConfig } = plan;
-	const { variant, release, profile: buildProfile, cas, cache: cachePolicy } = buildPlan;
+	const { variant, release, cache: cachePolicy } = buildPlan;
 	const useBuildCache = cachePolicy.read;
 	const physical = target.kind === "physical";
 	const remoteBackend = target.kind === "remote" ? target.backend : null;
@@ -1936,115 +2430,6 @@ async function runAndroid(options = {}) {
 	record.avdName = device.avdName ?? null;
 	record.deviceName = device.deviceName ?? device.avdName ?? null;
 	record.systemImage = device.systemImage;
-	const { abi: buildAbi, runOptions: buildRunOptions, remoteRunOptions } = androidBuildOptions({
-		release,
-		physical,
-		device,
-		variant,
-		deviceAbi,
-		compiler: cas?.id,
-		buildProfile,
-		targetAbiOnly: buildPlan.targetAbiOnly
-	});
-	let hash = "";
-	let providerUpload = null;
-	let providerName = null;
-	let providerLoad = null;
-	const cacheWarn = createWarnOnce((line) => phase("cache", chalk.yellow(line)));
-	const loadTieredProvider = cachePolicy.remote && cacheProviderConfig ? () => providerLoad ??= loadCacheProviderModule({
-		projectRoot: root,
-		config: cacheProviderConfig
-	}) : null;
-	let fingerprintSources = [];
-	let cacheKey = "";
-	let storeHash = "";
-	let storeKey = "";
-	let storeSources = [];
-	let apkPath = null;
-	async function resolveInitialFingerprint() {
-		if (easBuild?.ok) {
-			hash = storeHash = easBuild.fingerprint;
-			cacheKey = storeKey = easBuild.cacheKey;
-			apkPath = easBuild.path;
-			record.fingerprint = hash;
-			record.cacheKey = cacheKey;
-			record.cacheHit = easBuild.cacheHit;
-			record.cacheSkipped = !useBuildCache;
-			providerName = "eas";
-			stats.setCacheKey(cacheKey);
-			return true;
-		}
-		const fingerprintTimer = stepTimer(now);
-		try {
-			const computed = await fingerprint(root, { platform: PLATFORM });
-			hash = computed?.hash ?? "";
-			fingerprintSources = computed?.sources ?? [];
-		} catch (err) {
-			phaseFailure = fail(NO_FINGERPRINT, `@expo/fingerprint could not fingerprint ${root}: ${err?.message || err}`, "Fix the @expo/fingerprint error above, then retry.");
-			return false;
-		}
-		if (!hash) {
-			phaseFailure = fail(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.");
-			return false;
-		}
-		record.fingerprint = hash;
-		cacheKey = buildCacheKey(PLATFORM, hash, buildRunOptions);
-		stats.setCacheKey(cacheKey);
-		record.cacheKey = cacheKey;
-		storeHash = hash;
-		storeKey = cacheKey;
-		storeSources = fingerprintSources;
-		const found = await resolveTieredBuild({
-			local: filesystemBuildCapability({
-				resolve: resolveCached,
-				store: storeCached,
-				sources: fingerprintSources
-			}),
-			loadProvider: loadTieredProvider,
-			target: {
-				projectRoot: root,
-				platform: PLATFORM,
-				key: cacheKey
-			},
-			destinationDir: providerDownloadPath(workspaceDir(root)),
-			ensureDestination: prepareProviderDownloadDir,
-			skipRead: !useBuildCache,
-			warn: cacheWarn
-		});
-		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));
-		if (found?.tier === "provider") {
-			record.cacheHit = "remote";
-			providerName = found.providerName ?? null;
-			phase("cache", `provider hit (${providerName})${found.storedLocally ? " -> stored locally" : ""}`);
-		}
-		apkPath = found?.path ?? null;
-		return true;
-	}
 	const runFromFingerprint = async () => {
 		if (metroCheck && metroPort !== null && plan.metroWarmup) prewarmMetro({
 			port: metroPort,
@@ -2053,346 +2438,62 @@ async function runAndroid(options = {}) {
 			appId: androidPackage,
 			bundleUrl: metroWarmupUrlSetting(settings, "android")
 		});
-		if (!await resolveInitialFingerprint()) return phaseFailure;
-		let remote = null;
-		let abandonedRemote = false;
-		let uploadPending = null;
-		async function resolveRemoteArtifact() {
-			if (buildAbi || cas || buildProfile || !cachePolicy.remote) return;
-			if (!apkPath) {
-				const loaded = await loadProvider(root, { isExpo });
-				if (loaded?.unavailable) phase("cache", chalk.yellow(`provider not usable: ${loaded.unavailable}`));
-				else if (loaded?.provider) remote = loaded;
-				if (remote?.name === "eas") {
-					const auth = easAuth({
-						projectRoot: root,
-						owner: loaded?.owner || null
-					});
-					const authNote = easAuthNote(auth);
-					if (authNote) phase("cache", chalk.yellow(authNote));
-					if (auth?.code === "logged-out") remote = null;
-				}
-			}
-			if (remote && useBuildCache) {
-				const remoteTimer = stepTimer(now);
-				const hit = await resolveRemoteBuild({
-					logWriter: writer,
-					provider: remote.provider,
-					platform: PLATFORM,
-					projectRoot: root,
-					fingerprintHash: hash,
-					runOptions: remoteRunOptions
-				});
-				if (hit?.appPath) {
-					let stored = null;
-					try {
-						stored = storeCached(PLATFORM, cacheKey, hit.appPath, { sources: fingerprintSources });
-					} catch (err) {
-						phase("cache", chalk.yellow(`remote hit could not be stored locally: ${err?.message || err}`));
-					}
-					apkPath = stored || hit.appPath;
-					record.cacheHit = "remote";
-					phase("cache", `remote hit (${remote.name})${stored ? " -> stored locally" : ""} ${remoteTimer()}`);
-				} else if (hit?.timedOut) {
-					abandonedRemote = true;
-					phase("cache", chalk.yellow(`${remote.name} did not answer within ${formatDuration(RESOLVE_TIMEOUT_MS)}; building instead`));
-				} else if (hit?.failed) {
-					const authNote = remote.name === "eas" && isEasAuthFailureText(hit.failed) ? easAuthNote({
-						code: "logged-out",
-						reason: hit.failed
-					}) : null;
-					phase("cache", chalk.yellow(authNote || `${remote.name} could not be used: ${hit.failed}; building instead`));
-				} else phase("cache", `remote miss (${remote.name}) ${remoteTimer()}`);
-			}
-		}
-		if (!easBuild) await resolveRemoteArtifact();
-		let waitedForBuild = null;
-		let releasedWait = null;
-		async function waitForSharedBuild() {
-			if (!useBuildCache) return true;
-			const waitStarted = now();
-			let failedHolder;
-			while (!apkPath) {
-				let attempt = null;
-				try {
-					attempt = acquireLock({
-						platform: PLATFORM,
-						key: cacheKey,
-						root,
-						logFile: buildLog
-					});
-				} catch (err) {
-					const refusal = (0, ownership_claim_exports.claimFailure)(err, "stim android");
-					if (refusal) {
-						phaseFailure = fail(refusal.code, refusal.message, refusal.remedy, { lastBuildStatus: true });
-						return false;
-					}
-					phase("build", chalk.yellow(`could not take the build lock: ${err?.message || err}; building anyway`));
-				}
-				if (attempt?.acquired) {
-					buildLock = attempt;
-					const previous = attempt.tookOver ?? failedHolder;
-					if (previous) phase("build", chalk.yellow(takeoverLine(previous)));
-					break;
-				} else if (attempt?.held) {
-					releasedWait = null;
-					const holder = attempt.held;
-					const who = holder.projectRoot || "another workspace";
-					phase("build", `${who} is already building ${shortHash(hash)} (pid ${holder.pid})${holder.logFile ? ` -- tail ${holder.logFile}` : ""} -- stim guide lifecycle concurrency`);
-					let waited = null;
-					try {
-						const ceilingMs = WAIT_CEILING_MS - (now() - waitStarted);
-						if (ceilingMs <= 0) throw Object.assign(/* @__PURE__ */ new Error(`Waited ${formatDuration(now() - waitStarted)} for shared builds without an artifact; ${who} (pid ${holder.pid}) holds ${attempt.path}.`), {
-							code: "STIM_BUILD_WAIT_TIMEOUT",
-							lockPath: attempt.path
-						});
-						waited = await waitForBuild({
-							platform: PLATFORM,
-							key: cacheKey,
-							out,
-							ceilingMs
-						});
-					} catch (err) {
-						const refusal = (0, ownership_claim_exports.claimFailure)(err, "stim android");
-						if (refusal) {
-							phaseFailure = fail(refusal.code, refusal.message, refusal.remedy, { lastBuildStatus: true });
-							return false;
-						}
-						const wtErr = err;
-						if (wtErr?.code !== "STIM_BUILD_WAIT_TIMEOUT") throw err;
-						phaseFailure = fail("STIM_BUILD_WAIT_TIMEOUT", wtErr.message, `Check pid ${holder.pid}; if it is not really building, remove ${wtErr.lockPath} and run \`stim android\` again.`, { lastBuildStatus: true });
-						return false;
-					}
-					if (waited?.hit) {
-						apkPath = waited.hit ?? null;
-						record.cacheHit = "local";
-						waitedForBuild = {
-							pid: holder.pid,
-							ms: waited.waitedMs
-						};
-						phase("build", `waited ${formatDuration(waited.waitedMs)} for ${who}'s build -> installed from cache -- stim guide lifecycle concurrency`);
-					} else if (waited?.lockReleased) {
-						failedHolder = void 0;
-						releasedWait = {
-							facts: {
-								pid: holder.pid,
-								ms: waited.waitedMs
-							},
-							who
-						};
-						phase("build", `${who}'s build lock was released; rechecking this workspace before building`);
-					} else {
-						phase("build", chalk.yellow(`${who}'s build ended without an artifact (${waited?.builderFailed}); retrying the build lock`));
-						failedHolder = holder;
-					}
-				} else break;
-			}
-			return true;
-		}
-		if (!easBuild && !await waitForSharedBuild()) return phaseFailure;
-		let swapDir = null;
-		let swapFellBack = false;
-		const installableCachedApk = async (key, cachedPath) => {
-			if (!release) return cachedPath;
-			phase("swap", `regenerating this workspace's JS for the cached ${variant} APK`);
-			const swap = await swapApk({
-				root,
-				isExpo,
-				cachedApkPath: cachedPath,
-				keystore: resolveKeystore(root, settings),
-				logWriter: writer,
-				storedAssets: storedAssets(PLATFORM, key)
-			});
-			if (swap?.ok && swap.apkPath) {
-				if (swap.note) phase("swap", chalk.yellow(swap.note));
-				swapDir = swap.tmpDir ?? null;
-				phase("swap", `${swap.hermes ? "hermes bytecode" : "plain JS"} repacked (store), zipaligned and re-signed (${formatDuration(swap.durationMs)})`);
-				return swap.apkPath;
-			}
-			if (swap?.assetMismatch) phase("swap", chalk.yellow(`${swap.reason} -- building fresh instead` + (swap.assetDiff ? " (an APK cannot be made to carry an asset AAPT did not package)" : "")));
-			else phase("swap", chalk.yellow(`failed at ${swap?.step || "unknown step"}: ${swap?.reason || "unknown reason"} -- building fresh instead (a cached ${variant} APK carries its builder's JS; it is never installed after a failed swap)`));
-			for (const line of swap?.lastLines ?? []) phase("", chalk.dim(line));
-			swapFellBack = true;
-			return null;
-		};
-		async function prepareCachedArtifact() {
-			if (apkPath && record.cacheHit) {
-				const prepared = await installableCachedApk(cacheKey, apkPath);
-				apkPath = prepared;
-				if (!prepared) {
-					record.cacheHit = false;
-					waitedForBuild = null;
-				}
-			}
-		}
-		async function buildArtifact() {
-			if (!apkPath) try {
-				if (limits.maxBuilds) try {
-					buildSlot = await acquireSlot({
-						max: limits.maxBuilds,
-						root,
-						logFile: buildLog,
-						out
-					});
-				} catch (err) {
-					const refusal = (0, ownership_claim_exports.claimFailure)(err, "stim android");
-					if (refusal) {
-						phaseFailure = fail(refusal.code, refusal.message, refusal.remedy, { lastBuildStatus: true });
-						return false;
-					}
-					phase("build", chalk.yellow(`could not take a build slot: ${err?.message || err}; building anyway`));
-				}
-				if (needsPrebuildFor(root, "android", isExpo)) {
-					const pre = await prebuild(root, PLATFORM, writer, { isExpo });
-					if (pre.failed) {
-						phaseFailure = fail(pre.code, pre.reason, pre.remedy, {
-							lastBuildStatus: true,
-							lines: tail(pre.lastLines),
-							logPath: displayPath(root, buildLog)
-						});
-						return false;
-					}
-					phase("prebuild", `android/ generated (${formatDuration(pre.durationMs)})`);
-					androidPackage = androidPackage || detectAndroidPackage(root);
-					record.bundleId = androidPackage;
-					const after = await refingerprintAfterMutation({
-						projectRoot: root,
-						platform: PLATFORM,
-						previousHash: hash,
-						fingerprint
-					});
-					if (after?.moved) {
-						storeHash = after.hash;
-						storeSources = after.sources;
-						storeKey = buildCacheKey(PLATFORM, after.hash, buildRunOptions);
-						record.fingerprint = storeHash;
-						record.cacheKey = storeKey;
-						phase("fingerprint", chalk.dim(`${shortHash(hash)} -> ${shortHash(storeHash)} (after prebuild)`));
-						const late = useBuildCache ? resolveCached(PLATFORM, storeKey) : null;
-						if (late) {
-							const prepared = await installableCachedApk(storeKey, late);
-							if (prepared) {
-								apkPath = prepared;
-								record.cacheHit = "local";
-								phase("cache", `hit ${shortHash(storeHash)} (post-prebuild key)`);
-								if (releasedWait) {
-									waitedForBuild = releasedWait.facts;
-									phase("build", `waited ${formatDuration(waitedForBuild.ms)} for ${releasedWait.who}'s build -> installed from cache -- stim guide lifecycle concurrency`);
-								}
-							}
-						}
-					}
-				}
-				if (!apkPath) {
-					phase("build", `compiling ${variant || "debug"} with Gradle`);
-					const built = await build({
-						root,
-						logWriter: writer,
-						variant,
-						abi: buildAbi
-					}, {
-						estimateMs: estimates().coldBuildMs,
-						ccache: buildPlan.compilerCache === "ccache" ? ccacheFor({
-							root,
-							onNote: out
-						}) : null,
-						cas,
-						buildCache: buildPlan.gradleBuildCache,
-						pch: buildPlan.pch,
-						compilerCacheDisabled: buildPlan.compilerCache === "none"
-					});
-					ccacheActivity = built.ccache ?? CCACHE_UNAVAILABLE;
-					phase("cache", `compilation cache ${ccacheActivityLine(ccacheActivity)}`);
-					if (!built.ok) {
-						const diagnostics = built.diagnostics;
-						for (const diag of diagnostics) writer.write({
-							src: "build",
-							level: "error",
-							event: "gradle_diagnostic",
-							msg: formatDiagnostic(diag)
-						});
-						phase("build", chalk.red(`FAILED after ${formatDuration(built.durationMs)}`));
-						const extracted = diagnostics.map(formatDiagnostic);
-						if (built.truncated > 0) extracted.push(`... and ${built.truncated} more diagnostic(s) in the log`);
-						phaseFailure = fail(built.code, built.reason, diagnostics.find((d) => d.remedy)?.remedy || built.remedy || null, {
-							lastBuildStatus: true,
-							diagnostics: extracted,
-							lines: extracted.length ? [] : tail(built.lastLines),
-							logPath: displayPath(root, buildLog)
-						});
-						return false;
-					}
-					apkPath = built.apkPath;
-					stats.setBuildMs(built.durationMs);
-					phase("build", `ok (${formatDuration(built.durationMs)})`);
-					if (built.apkNote) phase("build", chalk.yellow(built.apkNote));
-					const beforeBuildHash = storeHash;
-					const afterBuild = await refingerprintAfterMutation({
-						projectRoot: root,
-						platform: PLATFORM,
-						previousHash: beforeBuildHash,
-						fingerprint
-					});
-					if (!afterBuild) {
-						record.fingerprint = null;
-						record.cacheKey = null;
-						phase("fingerprint", chalk.yellow("unavailable after Gradle; the build will be installed but not cached"));
-					} else {
-						if (afterBuild.moved) {
-							storeHash = afterBuild.hash;
-							storeSources = afterBuild.sources;
-							storeKey = buildCacheKey(PLATFORM, afterBuild.hash, buildRunOptions);
-							record.fingerprint = storeHash;
-							record.cacheKey = storeKey;
-							phase("fingerprint", chalk.dim(`${shortHash(beforeBuildHash)} -> ${shortHash(storeHash)} (after Gradle)`));
-						}
-						if (cachePolicy.write) {
-							const assetManifest = release ? captureAssets(root, { variant }) : null;
-							try {
-								const stored = await storeTieredBuild({
-									local: filesystemBuildCapability({
-										resolve: resolveCached,
-										store: storeCached,
-										sources: storeSources,
-										assetManifest
-									}),
-									loadProvider: loadTieredProvider,
-									target: {
-										projectRoot: root,
-										platform: PLATFORM,
-										key: storeKey
-									},
-									sourcePath: apkPath,
-									overwrite: !useBuildCache || swapFellBack,
-									warn: cacheWarn
-								});
-								providerUpload = stored.providerUpload;
-								providerName = stored.providerName ?? providerName;
-							} catch (err) {
-								phase("cache", chalk.yellow(`could not store the build: ${err?.message || err}`));
-							}
-						}
-						if (remote) uploadPending = uploadRemoteBuild({
-							logWriter: writer,
-							provider: remote.provider,
-							platform: PLATFORM,
-							projectRoot: root,
-							fingerprintHash: storeHash,
-							buildPath: apkPath,
-							runOptions: remoteRunOptions
-						});
-					}
-				}
-			} finally {
-				releaseHeldLock();
-				releaseHeldSlot();
+		const acquiredArtifact = await acquireAndroidArtifact({
+			root,
+			buildLog,
+			writer,
+			settings,
+			isExpo,
+			device,
+			physical,
+			buildPlan,
+			cacheProviderConfig,
+			requestedBuildCache,
+			easBuild,
+			androidPackage,
+			record,
+			maxBuilds: limits.maxBuilds,
+			progress: {
+				phase,
+				out,
+				estimates,
+				stats
 			}
-			return true;
-		}
-		if (!easBuild) {
-			await prepareCachedArtifact();
-			if (!await buildArtifact()) return phaseFailure;
+		}, {
+			deviceAbi,
+			fingerprint,
+			untracked,
+			resolveCached,
+			storeCached,
+			storedAssets,
+			captureAssets,
+			acquireLock,
+			releaseLock,
+			waitForBuild,
+			loadProvider,
+			easAuth,
+			resolveRemoteBuild,
+			uploadRemoteBuild,
+			loadCacheProviderModule,
+			acquireSlot,
+			releaseSlot,
+			needsPrebuildFor,
+			prebuild,
+			build,
+			ccacheFor,
+			swapApk,
+			readState,
+			now
+		});
+		if (!acquiredArtifact.ok) {
+			ccacheActivity = acquiredArtifact.ccache;
+			const { failure } = acquiredArtifact;
+			return fail(failure.code, failure.message, failure.remedy, failure.extra);
 		}
+		const { artifact } = acquiredArtifact;
+		const { apkPath } = artifact;
+		ccacheActivity = artifact.ccache;
+		androidPackage = artifact.androidPackage;
 		record.appPath = apkPath;
 		let leaseHandle = null;
 		let stopLeaseSignals = null;
@@ -2459,15 +2560,15 @@ async function runAndroid(options = {}) {
 				bootDuration: () => bootDuration,
 				apkPath,
 				androidPackage,
-				swapDir,
+				swapDir: artifact.swapDir,
 				record,
-				waitedForBuild,
+				waitedForBuild: artifact.waitedForBuild,
 				ccache: ccacheActivity,
-				uploadPending,
-				providerUpload,
-				providerName,
-				remote,
-				abandonedRemote,
+				uploadPending: artifact.uploadPending,
+				providerUpload: artifact.providerUpload,
+				providerName: artifact.providerName,
+				remote: artifact.remote,
+				abandonedRemote: artifact.abandonedRemote,
 				started,
 				startedAt,
 				writer,
@@ -2505,8 +2606,5 @@ async function runAndroid(options = {}) {
 		throw error;
 	}
 }
-function tail(lines, n = FALLBACK_LINES) {
-	return (Array.isArray(lines) ? lines : []).slice(-n);
-}
 //#endregion
 export { NO_DEVICE, NO_FINGERPRINT, NO_METRO, androidDevClientScheme, androidFacts, androidSystemImageSetting, androidVariantSetting, apkDevClientFacts, apkPackage, collectorLogFile, androidCommand as default, displayPath, dumpApkManifest, findAapt, formatDuration, isReleaseVariant, killPreviousCollector, lastBuildRecord, noDeviceDiagnostic, parseXmltree, phaseLine, registerAndroid, resolveSystemImage, resolveVariant, runAndroid, shortHash, startCollector };