stim 1.14.0 → 1.15.0

package/dist/{android-LbPFRWVL.mjs → android-Cu_L4RpL.mjs}

@@ -1,38 +1,48 @@
-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-lvc7d3C2.mjs";
-import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
+import { t as getExecutor } from "./exec-CaErVv7t.mjs";
+import { C as saveConfig, D as withConfigLock$1, E as upsertProject, L as deviceSlotFileKey, R as deviceSlotKey, V as parseDeviceSlotOption, W as validateDeviceSlot, _ as loadConfig$1, j as formatBytes, p as getProject, u as getConcurrencyLimits, w as setDevice, z as deviceSlotPlatforms } from "./config-D0DbpZtM.mjs";
+import { n as ownership_claim_exports } from "./process-identity-BmRm1qV0.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CDY9IkVC.mjs";
-import { M as workspaceLogsDir, a as pidExists, b as writeWorkspaceState, c as resolveProjectMetro, g as recordWorkspaceUse, h as readWorkspaceState$1, k as workspaceDir, l as signalProcessTree, x as emulatorLogFile } from "./metro-CcEo8Fl8.mjs";
-import { D as makeTemporaryDirectory, O as removeTemporaryEntry, s as gitCommonDir, y as repoRoot } from "./worktree-BVrHsYZG.mjs";
-import { a as findProjectRoot, l as projectShortcut, n as appProjectProblem, r as detectIsExpo, t as NO_PROJECT_REFUSAL } from "./project-CWlvEaeN.mjs";
-import { m as writeWorkspaceLaunch, n as MODE_EXPO, t as MODE_BARE } from "./state-DHqvsbqC.mjs";
+import { C as workspaceLogsDir, b as workspaceDir, c as writeWorkspaceState, f as emulatorLogFile, i as recordWorkspaceUse, r as readWorkspaceState$1 } from "./workspace-state-CL2V2Ons.mjs";
+import { D as makeTemporaryDirectory, O as removeTemporaryEntry, s as gitCommonDir, y as repoRoot } from "./worktree-C0c5Udwa.mjs";
+import { a as findProjectRoot$1, l as projectShortcut, n as appProjectProblem, r as detectIsExpo, t as NO_PROJECT_REFUSAL } from "./project-CV3tDFHl.mjs";
+import { m as writeWorkspaceLaunch, n as MODE_EXPO, t as MODE_BARE } from "./state-CaeaHbDA.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-DVcpw6eE.mjs";
-import { A as providerDownloadPath, B as captureAssetManifest, D as fingerprintProject, E as fingerprintDiffRecord, F as storedAssetManifest, H as readAssetManifest, L as untrackedMissLine, M as refingerprintAfterMutation, N as resolveBuild, O as inputsChangedDuringBuild, P as storeBuild, R as untrackedNativeFiles, S as configInputsChanged, T as filesystemBuildCapability, V as compareAssetManifests, _ as waitForBuild, b as buildCacheKey, g as releaseBuildLock, j as providerUploadOutcome, k as prepareProviderDownloadDir, m as acquireBuildLock, v as waitForSharedBuild, x as changedDuringBuildLine, z as assetDiffReason } from "./device-lease-5c3WrVRm.mjs";
-import { $ as waitForBoot, A as listInstalledSystemImages, C as extractEmulatorFailure, D as listAdbDevices, E as hostSystemImageArch, F as ownedAvdDirectory, G as profileNeedsFoldFeature, H as physicalDeviceModel, J as resolvePhysicalDevice, K as resetAdoptedAvd, M as memoizeEmulatorProbe, O as listAvdDeviceProfiles, P as ownedAvdDeviceProfile, S as emulatorFailureRemedy, U as pickDefaultSystemImage, W as probeEmulatorSerial, Z as systemImageSupportsFold, a as androidHome, c as androidSystemImageAbi, ct as parkedMaxSetting, ft as configuredAndroidEmulatorApp, i as androidDeviceAbi, k as listAvds, l as androidToolCwd, o as androidPoolCandidates, q as resolveOwnedAvdSerial, r as androidBuildToolName, s as androidPoolNoCandidatesRefusal, t as DEFAULT_AVD_DEVICE_PROFILE, w as findBuildTool, x as emulatorDiskSpaceRemedy, z as ownedAvdSystemImage } from "./android-d6rGq1pA.mjs";
-import { A as resolveCacheProviderConfig, B as detectProviders, E as publicUrlSetting, G as resolveOptimizations, H as artifactCachePolicy, I as tunnelModeSetting, L as unknownSettingKeys, M as settingFile, O as remoteAndroidSetting, P as settingShapeErrors, S as metroWarmupUrlSetting, U as compilerCacheFallbackMessage, W as optimizationBuildProfile, a as SETTING_SHAPE_REMEDY, d as cacheProviderSettingError, j as resolveSettings, r as REMOTE_DEVICE_BACKENDS, s as androidAvdConfigSettingError, u as androidDataPartitionSizeGbSettingError } from "./settings-D61iNOsB.mjs";
-import { c as recordFinishedBuild, l as startBuildProgress, n as NO_BUILD_PROGRESS } from "./build-progress-DxKpwnaS.mjs";
-import { a as acquireBuildSlot, s as releaseBuildSlot } from "./in-use-DlqBDKqY.mjs";
-import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-DyYDF5ww.mjs";
-import { t as cleanLine } from "./server-expo-BVuwQ65v.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-CcR6o6lI.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-D87zEzaq.mjs";
-import { _ as launchAndroidReleaseApp, 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, y as restartedAppNote } from "./app-install-BpgSgkJj.mjs";
-import { a as VERIFY_TIMEOUT_MS, d as verifyAndroidReleaseLaunch, f as verifyLaunch, i as RELEASE_VERIFY_WAIT_MS, l as unattributedLaunchLines, n as LAUNCH_FATAL, r as LAUNCH_UNVERIFIED, t as LAUNCH_BUNDLING, u as unverifiedLaunchLines } from "./launch-verify-Deg4tB3Z.mjs";
-import { c as unknownAndroidSystemImageRefusal, h as resolveEasDevelopmentBuild, m as planEasDevelopmentBuild, p as isEasBuildFailure, r as checkDeviceCapacity, s as unknownAndroidDeviceProfileRefusal } from "./simslim-DrDN4WuV.mjs";
-import { f as spawnEntry, m as detectAppIds, p as detectAndroidPackage, s as startDevServer } from "./start-s4RXp1wy.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-BiyDyPP-.mjs";
-import { _ 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 warmMetro, x as AvdRecoveryError, y as ensureOwnedDevice } from "./build-plan-Dcr-3ie0.mjs";
-import { t as budgetGate } from "./budget-CGDkhvv_.mjs";
-import { i as launchOutcomeRecord, n as ensureWorkspaceStorageSafely, r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-DjBHRg5m.mjs";
-import { a as statsProjectKey, i as recordRunStats, n as readRunEstimates, t as createRunRecorder } from "./stats-CX1Z8Tca.mjs";
-import { c as readProductFlavors, d as ccacheActivityLine, l as CCACHE_NOT_RUN, m as formatDiagnostic, n as resolveAndroidCas, o as buildAndroid, p as resolveCcache, r as resolveAndroidCompilerCache, s as productFlavorRefusal, u as CCACHE_UNAVAILABLE } from "./android-cas-iZK3DOCr.mjs";
-import { d as startBuildHeartbeat, f as tailLines, n as HEARTBEAT_INTERVAL_MS } from "./xcode-Cp5KvK9x.mjs";
-import { n as nativeRunCommand, r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-D5t8EiMf.mjs";
-import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-C5HzcwCW.mjs";
-import { constants, copyFileSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync, renameSync, rmSync } from "node:fs";
+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-CliHHn7a.mjs";
+import { A as providerDownloadPath, B as captureAssetManifest, D as fingerprintProject, E as fingerprintDiffRecord, F as storedAssetManifest, H as readAssetManifest, L as untrackedMissLine, M as refingerprintAfterMutation, N as resolveBuild, O as inputsChangedDuringBuild, P as storeBuild, R as untrackedNativeFiles, S as configInputsChanged, T as filesystemBuildCapability, V as compareAssetManifests, _ as waitForBuild, b as buildCacheKey, g as releaseBuildLock, j as providerUploadOutcome, k as prepareProviderDownloadDir, m as acquireBuildLock, v as waitForSharedBuild, x as changedDuringBuildLine, z as assetDiffReason } from "./device-lease-W5Pi1q38.mjs";
+import { a as workspaceLinks, i as workspaceLinkLine } from "./stim-desktop-Cnz8CPnl.mjs";
+import { $ as trimAndroidCaches, A as listAvds, B as ownedAvdSystemImage, D as hostSystemImageArch, F as ownedAvdDeviceProfile, G as probeEmulatorSerial, I as ownedAvdDirectory, J as resolveOwnedAvdSerial, K as profileNeedsFoldFeature, O as listAdbDevices, Q as systemImageSupportsFold, T as findBuildTool, U as physicalDeviceModel, W as pickDefaultSystemImage, Y as resolvePhysicalDevice, a as androidDeviceAbi, dt as parkedMaxSetting, ht as configuredAndroidEmulatorApp, i as androidDataFreeBytes, j as listInstalledSystemImages, k as listAvdDeviceProfiles, q as resetAdoptedAvd, r as androidBuildToolName, t as DEFAULT_AVD_DEVICE_PROFILE, tt as waitForBoot, u as androidToolCwd } from "./android-Db2eEMaf.mjs";
+import { l as resolveProjectMetro, o as pidExists, u as signalProcessTree } from "./metro-Di8EN2Tb.mjs";
+import { A as remoteAndroidSetting, B as unknownSettingKeys, I as settingOriginScope, J as optimizationBuildProfile, K as artifactCachePolicy, L as settingShapeErrors, M as resolveCacheProviderConfig, N as resolveSettings, O as publicUrlSetting, P as settingFile, R as settingsLayers, S as metroPortSetting, U as detectProviders, Y as resolveOptimizations, a as SETTING_SHAPE_REMEDY, d as cacheProviderSettingError, q as compilerCacheFallbackMessage, r as REMOTE_DEVICE_BACKENDS, s as androidAvdConfigSettingError, u as androidDataPartitionSizeGbSettingError, w as metroWarmupUrlSetting, z as tunnelModeSetting } from "./settings-CduVcoxj.mjs";
+import { i as teardownOwnedAvd } from "./teardown-BYuQafiA.mjs";
+import { c as recordFinishedBuild, d as createRunRecorder, f as readRunEstimates, h as statsProjectKey$1, l as startBuildProgress, m as recordRunStats, n as NO_BUILD_PROGRESS, u as tapBuildLog } from "./build-progress-C2Jv1AtA.mjs";
+import { r as releaseBuildSlot, t as acquireBuildSlot } from "./build-slots-Df1ApSuH.mjs";
+import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-BkYxUtuj.mjs";
+import { S as restartedAppNote, b as launchAndroidReleaseApp, c as androidDevClientUrl, g as installConflictKind, h as installAndroidApp, r as DEFAULT_METRO_PORT, s as androidAppProcess, t as ADB_INSTALL_TIMEOUT_MS, y as launchAndroidApp } from "./app-install-CAAplXAt.mjs";
+import { t as checkDeviceCapacity } from "./device-capacity-DMuKC7nx.mjs";
+import { C as resolveSystemImage, S as resolveDeviceProfile, T as systemImageRefusal, _ as isReleaseVariant, a as PLATFORM, b as pooledAndroidDevice, c as androidSystemImageSetting, d as apkPackage, f as deviceProfileRefusal, g as foldableImageRefusal, h as findAapt, i as NO_FINGERPRINT, l as androidVariantSetting, m as dumpApkManifest, n as LAUNCH_FAILED, o as androidBuildOptions, p as displayPath, r as NO_DEVICE, s as androidDevClientScheme, t as INSTALL_FAILED, u as apkDevClientFacts, v as noDeviceDiagnostic, w as resolveVariant, x as remoteAvdFlagRefusal, y as parseXmltree } from "./support-CDQbDkL5.mjs";
+import { E as ccacheActivityLine, T as CCACHE_UNAVAILABLE, b as tailLines, k as resolveCcache, n as androidToolchain, t as androidRequirements, u as HEARTBEAT_INTERVAL_MS, w as CCACHE_NOT_RUN, y as startBuildHeartbeat } from "./toolchain-DmeYjXD9.mjs";
+import { t as cleanLine } from "./server-expo-DhtX6bom.mjs";
+import { a as offloadBuild, c as placementLoad, d as OffloadRefusal, f as namedBuildMachine, i as closeOffload, l as remotePhaseText, m as resolveBuildPlacement, n as buildPlacementCandidates, p as parseBuildMachineOption, r as chooseBuildMachine, s as offloadPlacement } from "./client-C2IS36Qf.mjs";
+import { t as spawnEntry } from "./spawn-entry-DncpJvWL.mjs";
+import { i as staleNativeDirRefusal, n as recordPrebuild, r as runPrebuild, t as planPrebuild } from "./prebuild-BvxDlD6C.mjs";
+import { c as formatDiagnostic, i as buildAndroid, o as productFlavorRefusal, s as readProductFlavors } from "./gradle-CmdOBq1d.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-CO2elm_b.mjs";
+import { a as ensureMetroReachable, c as remoteAndroidDeps, n as binOnPath, o as ensureRemoteBootOwned, u as resolveRemoteContext, w as ownedSessionName } from "./device-remote-9ulPsdhY.mjs";
+import { a as VERIFY_TIMEOUT_MS, d as verifyAndroidReleaseLaunch, f as verifyLaunch, i as RELEASE_VERIFY_WAIT_MS, l as unattributedLaunchLines, n as LAUNCH_FATAL, r as LAUNCH_UNVERIFIED, t as LAUNCH_BUNDLING, u as unverifiedLaunchLines } from "./launch-verify-CLlofxRt.mjs";
+import { d as withNativeBuildRun, r as cancelledFailure, u as runCancellation } from "./native-run-DFDoIRbY.mjs";
+import { a as isEasBuildFailure, o as planEasDevelopmentBuild, s as resolveEasDevelopmentBuild } from "./simslim-Ciluxlq4.mjs";
+import { c as startDevServer, m as detectAppIds, p as detectAndroidPackage } from "./start-CUD9nasA.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-B2r38YjS.mjs";
+import { _ as AvdRecoveryError, a as refusePlan, c as skippedMissReason, d as refreshUpdatesManifestFile, g as AvdBootError, h as ensureOwnedDevice, i as printPlan, l as UPDATES_MANIFEST_NAME, m as ensureBooted, n as planFlagRefusal, o as explainBuildMiss, p as didSetUpDevice, r as planPayload, s as fingerprintErrorMissReason, t as planCachedBuild, u as detectEntryFile, v as warmMetro } from "./build-plan-aeGMFX7e.mjs";
+import { t as budgetGate } from "./budget-CMiqghig.mjs";
+import { i as launchOutcomeRecord, n as ensureWorkspaceStorageSafely, r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-i6OkVg-w.mjs";
+import { n as nativeRunCommand, r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-BY0BrOLh.mjs";
+import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-Cb0P1WLS.mjs";
+import { n as resolveAndroidCas, r as resolveAndroidCompilerCache } from "./android-cas-PnKfAdB2.mjs";
+import { constants, copyFileSync, existsSync, mkdirSync, openSync, readFileSync, renameSync, rmSync, statSync } from "node:fs";
+import { basename, dirname, isAbsolute, join } from "node:path";
 import { InvalidArgumentError } from "commander";
-import { buildDiagnostics } from "@stim-cli/core/state";
-import { basename, dirname, isAbsolute, join, relative } from "node:path";
+import { buildDiagnostics, machineCapacity } from "@stim-cli/core/state";
 import chalk from "chalk";
 import { createWarnOnce, loadCacheProvider, resolveTieredBuild, storeTieredBuild } from "@stim-cli/cache";
 //#region src/engine/apk-swap.ts
@@ -316,6 +326,18 @@ async function swapApkBundle({ root, isExpo, cachedApkPath, keystore, logWriter
 	const diff = compareAssetManifests(fresh, storedAssets);
 	if (!diff.same) return refuse(assetDiffReason(diff), diff);
 	const jar = jarPath();
+	const updatesManifest = join(stage, "assets", UPDATES_MANIFEST_NAME);
+	try {
+		e.runFile(jar, [
+			"--extract",
+			"--file",
+			work,
+			`assets/${UPDATES_MANIFEST_NAME}`
+		], { cwd: stage });
+		if (exists(updatesManifest)) refreshUpdatesManifestFile(updatesManifest, now());
+	} catch (err) {
+		return fail("updates", `could not refresh the expo-updates manifest from ${work}: ${describe(err)}`);
+	}
 	try {
 		e.runFile(jar, [
 			"--update",
@@ -387,299 +409,6 @@ function describe(err) {
 	return streams ? `${message}: ${streams}` : message;
 }
 //#endregion
-//#region src/commands/android/support.ts
-const PLATFORM = "android";
-function androidVariantSetting(settings) {
-	const android = settings?.["android"];
-	if (!android || typeof android !== "object" || Array.isArray(android)) return null;
-	const raw = android["variant"];
-	return typeof raw === "string" && raw.trim() !== "" ? raw.trim() : null;
-}
-function resolveVariant(flag, settings) {
-	return (typeof flag === "string" && flag.trim() !== "" ? flag.trim() : null) || androidVariantSetting(settings);
-}
-function androidSystemImageSetting(settings) {
-	const android = settings?.["android"];
-	if (!android || typeof android !== "object" || Array.isArray(android)) return null;
-	const raw = android["systemImage"];
-	return typeof raw === "string" && raw.trim() !== "" ? raw.trim() : null;
-}
-function resolveSystemImage(flag, settings) {
-	return (typeof flag === "string" && flag.trim() !== "" ? flag.trim() : null) || androidSystemImageSetting(settings);
-}
-function systemImageRefusal({ slot, flag, resolved, physical, remoteBackend, listImages }) {
-	if (slot && slot !== "default" && remoteBackend) return {
-		code: "STIM_BAD_ARG",
-		message: "Named slots currently support local simulators and physical devices.",
-		remedy: "Use the default slot for a remote session."
-	};
-	if (typeof flag === "string" && flag.trim() === "") return {
-		code: "STIM_BAD_ARG",
-		message: "--system-image was given an empty id.",
-		remedy: "Pass `--system-image <id>` with an sdkmanager package id, e.g. \"system-images;android-36;google_apis;arm64-v8a\"."
-	};
-	if (physical || remoteBackend) return null;
-	if (!resolved) return null;
-	let images;
-	try {
-		images = listImages();
-	} catch (error) {
-		return {
-			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 refusal = unknownAndroidSystemImageRefusal(resolved, images);
-	return refusal ? {
-		code: "STIM_BAD_ARG",
-		message: refusal.message,
-		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());
-}
-const NO_FINGERPRINT = "STIM_NO_FINGERPRINT";
-const NO_DEVICE = "STIM_NO_DEVICE";
-const LAUNCH_FAILED = "STIM_LAUNCH_FAILED";
-function findAapt(home = androidHome(), { readDir = readdirSync, exists = existsSync } = {}) {
-	const found = findBuildTool(["aapt", "aapt2"], {
-		home,
-		readDir,
-		exists
-	});
-	return found ? {
-		path: found.path,
-		tool: found.tool,
-		version: found.version
-	} : null;
-}
-function dumpApkManifest(apkPath, { exec = null, aapt = null } = {}) {
-	if (typeof apkPath !== "string" || apkPath.trim() === "") return null;
-	const tool = aapt || findAapt();
-	if (!tool) return null;
-	const e = exec || getExecutor();
-	const args = tool.tool === "aapt2" ? [
-		"dump",
-		"xmltree",
-		"--file",
-		"AndroidManifest.xml",
-		apkPath
-	] : [
-		"dump",
-		"xmltree",
-		apkPath,
-		"AndroidManifest.xml"
-	];
-	try {
-		const out = e.runFile(tool.path, args);
-		return typeof out === "string" && out.includes("E: manifest") ? out : null;
-	} catch {
-		return null;
-	}
-}
-function parseXmltree(text) {
-	const root = {
-		tag: "#root",
-		attrs: {},
-		children: [],
-		indent: -1
-	};
-	const stack = [root];
-	for (const raw of String(text ?? "").split("\n")) {
-		const indent = raw.search(/\S/);
-		if (indent < 0) continue;
-		const line = raw.trim();
-		const element = /^E: ([\w.:-]+)/.exec(line);
-		if (element) {
-			while (stack.length > 1 && stack[stack.length - 1].indent >= indent) stack.pop();
-			const node = {
-				tag: element[1],
-				attrs: {},
-				children: [],
-				indent
-			};
-			stack[stack.length - 1].children.push(node);
-			stack.push(node);
-			continue;
-		}
-		const attr = /^A: ([^(=]+?)(?:\(0x[0-9a-f]+\))?=(.*)$/.exec(line);
-		if (attr && stack.length > 1) {
-			const name = attr[1].replace(/^http:\/\/schemas\.android\.com\/apk\/res\/android:/, "android:");
-			const value = /^"((?:[^"\\]|\\.)*)"/.exec(attr[2]);
-			stack[stack.length - 1].attrs[name] = value ? value[1] : null;
-		}
-	}
-	return root;
-}
-function eachNode(node, fn) {
-	fn(node);
-	for (const child of node.children) eachNode(child, fn);
-}
-function apkPackage(text) {
-	const pkg = parseXmltree(text).children.find((c) => c.tag === "manifest")?.attrs["package"];
-	return typeof pkg === "string" && pkg.trim() ? pkg.trim() : null;
-}
-function apkDevClientFacts(text) {
-	const root = parseXmltree(text);
-	const facts = {
-		devClient: false,
-		schemes: []
-	};
-	let launchable = null;
-	eachNode(root, (node) => {
-		const name = node.attrs["android:name"];
-		if (typeof name === "string" && name.startsWith("expo.modules.devlauncher")) facts.devClient = true;
-		if (node.tag !== "activity" && node.tag !== "activity-alias") return;
-		const filters = node.children.filter((c) => c.tag === "intent-filter");
-		if (!filters.some((f) => f.children.some((c) => c.tag === "action" && c.attrs["android:name"] === "android.intent.action.MAIN")) || launchable) return;
-		launchable = node;
-		for (const filter of filters) for (const data of filter.children) {
-			if (data.tag !== "data") continue;
-			const scheme = data.attrs["android:scheme"];
-			if (typeof scheme === "string" && scheme.trim()) facts.schemes.push(scheme.trim());
-		}
-	});
-	return facts;
-}
-function androidDevClientScheme(root, apkPath, { exec = null, dump = dumpApkManifest, aapt = null } = {}) {
-	const text = dump(apkPath, {
-		exec,
-		aapt
-	});
-	if (text) {
-		const facts = apkDevClientFacts(text);
-		if (!facts.devClient) return void 0;
-		const scheme = pickDevClientScheme(facts.schemes);
-		if (scheme) return scheme;
-	}
-	return devClientScheme(root, null);
-}
-function noDeviceDiagnostic({ reason, logFile, remedy, localEmulator = true, readLog = readEmulatorLogTail }) {
-	const text = localEmulator ? readLog(logFile) : "";
-	const logPath = text.trim() ? logFile : null;
-	const found = extractEmulatorFailure(text);
-	const diskRemedy = localEmulator ? emulatorDiskSpaceRemedy([reason, ...found]) : null;
-	if (found.length === 0) return {
-		message: reason,
-		remedy: diskRemedy ?? remedy,
-		lines: [],
-		logPath
-	};
-	return {
-		message: `${reason} The emulator reported: ${found[0]}`,
-		remedy: diskRemedy ?? emulatorFailureRemedy(found),
-		lines: found.slice(1),
-		logPath
-	};
-}
-function readEmulatorLogTail(file) {
-	try {
-		return readFileSync(file, "utf-8").split("\n").slice(-400).join("\n");
-	} catch {
-		return "";
-	}
-}
-function displayPath(root, path) {
-	const rel = relative(root, path);
-	return rel && !rel.startsWith("..") ? rel : path;
-}
-async function pooledAndroidDevice({ root, selectPool, listDevices, isEmulatorDevice, deviceModel, waitSeconds, noWait, now, warn }) {
-	const isEmulator = memoizeEmulatorProbe(isEmulatorDevice);
-	const pooled = await selectPool({
-		root,
-		platform: PLATFORM,
-		idLabel: "serial",
-		list: () => androidPoolCandidates(listDevices(), isEmulator).map((entry) => ({ id: entry.serial })),
-		noCandidates: () => {
-			const resolved = androidPoolNoCandidatesRefusal(listDevices(), isEmulator);
-			return {
-				message: resolved.error,
-				remedy: resolved.remedy
-			};
-		},
-		waitSeconds,
-		noWait,
-		now,
-		warn
-	});
-	if (pooled.status === "refused") {
-		const { code, message, remedy, lease } = pooled.refusal;
-		return {
-			code,
-			message,
-			remedy,
-			extra: lease === null ? {} : { lease }
-		};
-	}
-	return { device: {
-		serial: pooled.candidate.id,
-		deviceName: deviceModel(pooled.candidate.id) ?? pooled.candidate.id,
-		owned: false
-	} };
-}
-function androidBuildOptions({ release, physical, device, variant, deviceAbi, compiler, buildProfile, targetAbiOnly = true }) {
-	let abi = null;
-	if (targetAbiOnly && !release && physical && device.serial) abi = deviceAbi(device.serial);
-	if (targetAbiOnly && !release && !physical) abi = androidSystemImageAbi(device.systemImage);
-	const runOptions = {};
-	if (variant) runOptions.variant = variant;
-	if (abi) runOptions.abi = abi;
-	if (compiler) runOptions.compiler = compiler;
-	if (buildProfile) runOptions.buildProfile = buildProfile;
-	return {
-		abi,
-		runOptions,
-		remoteRunOptions: Object.keys(runOptions).length === 0 ? null : runOptions
-	};
-}
-//#endregion
 //#region src/commands/android/artifact.ts
 const FALLBACK_LINES = 5;
 function fail$1(code, message, remedy, extra = {}) {
@@ -690,8 +419,16 @@ function fail$1(code, message, remedy, extra = {}) {
 		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, planPrebuildFor, prebuild, build, ccacheFor, swapApk, readState, now }) {
-	const { phase, out, estimates, stats, step } = progress;
+async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo, device, physical, remote: remoteTarget, 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, planPrebuildFor, prebuild, build, ccacheFor, swapApk, readState, now }) {
+	const { phase, out, estimates, stats, step, miss, hit: lateHit, place, waitingOn } = progress;
+	let fallbackMachine = null;
+	let hereReason = null;
+	const buildMachine = record.buildMachine ?? "auto";
+	const fallBack = (reason, line = reason) => {
+		if (namedBuildMachine(buildMachine)) throw new OffloadRefusal(buildMachine, reason);
+		record.offloadFallback = reason;
+		phase("build", `${line} -> building here`);
+	};
 	const { variant, release, profile: buildProfile, cas, cache: cachePolicy } = buildPlan;
 	const useBuildCache = cachePolicy.read;
 	let androidPackage = initialPackage;
@@ -749,6 +486,7 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 	let storeKey = "";
 	let storeSources = [];
 	let apkPath = null;
+	let swapFellBack = false;
 	async function resolveInitialFingerprint() {
 		if (easBuild?.ok) {
 			hash = storeHash = easBuild.fingerprint;
@@ -869,7 +607,10 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 			} else phase("cache", `remote miss (${remote.name}) ${remoteTimer()}`);
 		}
 	}
-	if (!easBuild) await resolveRemoteArtifact();
+	if (!easBuild) {
+		await resolveRemoteArtifact();
+		if (!apkPath) miss(reasonForMiss([]).reason);
+	}
 	let waitedForBuild = null;
 	let releasedWait = null;
 	if (!easBuild && useBuildCache && !apkPath) {
@@ -887,6 +628,7 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 				step("wait");
 				phase("build", text);
 			},
+			waitingOn,
 			warn: (text) => phase("build", chalk.yellow(text)),
 			out
 		});
@@ -904,7 +646,6 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 		}
 	}
 	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`);
@@ -938,51 +679,219 @@ 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({
+	function reasonForMiss(rekeyedBy) {
+		if (swapFellBack) return {
+			reason: skippedMissReason("the cached APK could not be reused, so this run built it fresh"),
+			diff: null
+		};
+		if (!useBuildCache) return {
+			reason: skippedMissReason(requestedBuildCache ? "cache reuse off in config" : "cache reuse turned off by --no-build-cache"),
+			diff: null
+		};
+		const current = {
+			hash: storeHash,
+			sources: storeSources
+		};
+		const explained = explainBuildMiss({
+			root,
+			platform: PLATFORM,
+			current,
+			rekeyedBy,
+			baselineDeps: { readState }
+		});
+		return {
+			reason: explained.reason,
+			diff: explained.previousHash && explained.changedNames.length ? fingerprintDiffRecord({
 				changed: explained.changedNames,
 				previousHash: explained.previousHash,
 				hash: current.hash
-			}));
-		}
+			}) : null
+		};
+	}
+	function explainMiss(rekeyedBy) {
+		const explained = reasonForMiss(rekeyedBy);
+		record.missReason = explained.reason;
+		if (explained.diff) writer.write(explained.diff);
+		miss(record.missReason);
 		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 {
-				buildSlot = await acquireSlot({
-					max: maxBuilds,
-					root,
-					logFile: buildLog,
-					out
+	async function takeBuildSlot() {
+		if (!maxBuilds) return true;
+		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`));
+		}
+		return true;
+	}
+	/** Whether this build should leave this Mac, before any machine is asked; null builds here. */
+	function placeBuild() {
+		const { mode, machines } = buildPlacementCandidates(buildMachine);
+		if (machines.length === 0 && !namedBuildMachine(buildMachine) && buildMachine !== "local") return null;
+		const unsupported = physical ? "device builds build here" : remoteTarget ? "remote device builds build here" : release ? `${variant} builds build here` : cas ? "Apple Clang CAS builds build here" : !cachePolicy.write ? "the build cache is off" : null;
+		const here = machineCapacity();
+		const placement = offloadPlacement({
+			mode,
+			machines: machines.length,
+			here,
+			unsupported,
+			selected: buildMachine
+		});
+		if (!placement.offload) {
+			hereReason = placement.reason;
+			if (mode !== "off") phase("build", `placement: here (${placement.reason})`);
+			return null;
+		}
+		return {
+			mode,
+			here,
+			reason: placement.reason,
+			machines
+		};
+	}
+	const openOffload = { choice: null };
+	/** Asks the paired machines once the post-mutation key is known; null builds here. */
+	async function chooseMachine(candidate) {
+		const choice = await chooseBuildMachine({
+			projectRoot: root,
+			target: {
+				platform: "android",
+				local: androidToolchain(),
+				requires: androidRequirements(root)
+			},
+			mode: candidate.mode,
+			here: candidate.here,
+			note: (line) => phase("build", chalk.dim(`offload: ${line}`)),
+			machines: candidate.machines,
+			selected: buildMachine
+		});
+		if (typeof choice === "string") {
+			const only = candidate.machines.length === 1 ? candidate.machines[0].machine : null;
+			if (only && choice.startsWith(`${only}: `)) fallbackMachine = only;
+			fallBack(choice);
+			return null;
+		}
+		openOffload.choice = choice;
+		phase("build", `placement: ${choice.machine} (${candidate.reason}${placementLoad(choice)})`);
+		return choice;
+	}
+	/** Builds on the chosen machine and stores the APK under the post-mutation key; false builds here instead unless a machine was named. */
+	async function compileElsewhere(choice, candidate) {
+		if (!storeKey || !storeHash) {
+			if (namedBuildMachine(buildMachine)) fallBack("the build fingerprint or cache key is unavailable");
+			return false;
+		}
+		const stagingDir = join(workspaceDir(root), "offload", PLATFORM);
+		const outcome = await offloadBuild({
+			choice,
+			expectedFingerprint: storeHash,
+			request: {
+				platform: "android",
+				isExpo,
+				android: {
+					variant,
+					abi: buildAbi,
+					gradleBuildCache: buildPlan.gradleBuildCache,
+					pch: buildPlan.pch,
+					compilerCache: buildPlan.compilerCache === "none" ? "none" : "ccache"
+				}
+			},
+			stagingDir,
+			onPhase: (name, msg) => phase(name, remotePhaseText(name, msg, choice.machine)),
+			onEnter: (name) => {
+				if (name === "compile" || name === "build" || name === "prebuild" || name === "pods") record.builtOn = choice.machine;
+				place({
+					host: choice.machine,
+					phase: name
+				});
+				step(name === "prebuild" ? name : "compile");
+			},
+			onRecord: (entry) => writer.write({
+				...entry,
+				offloadedTo: choice.machine
+			}),
+			note: (line) => phase("build", line)
+		});
+		place(null);
+		let stored = null;
+		let reason = outcome.ok ? null : outcome.reason;
+		if (outcome.ok) {
+			const settled = await refingerprintAfterMutation({
+				projectRoot: root,
+				platform: PLATFORM,
+				previousHash: storeHash,
+				fingerprint
+			});
+			if (!settled || settled.moved) reason = "the checkout here changed while it built";
+			else try {
+				stored = storeCached(PLATFORM, storeKey, outcome.artifactPath, {
+					sources: storeSources,
+					overwrite: !useBuildCache
 				});
 			} 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`));
+				reason = `could not store the APK: ${err?.message || err}`;
 			}
+		}
+		try {
+			rmSync(stagingDir, {
+				recursive: true,
+				force: true
+			});
+		} catch {}
+		step("compile");
+		if (!outcome.ok || !stored) {
+			const why = reason ?? "the APK was not stored";
+			fallbackMachine = choice.machine;
+			fallBack(`${choice.machine}: ${why}`, `offload failed: ${why}`);
+			writer.write({
+				src: "build",
+				level: "warn",
+				event: "offload_failed",
+				msg: reason,
+				machine: choice.machine
+			});
+			return false;
+		}
+		const { timings } = outcome;
+		apkPath = stored;
+		record.builtOn = outcome.machine;
+		record.offloadedTo = outcome.machine;
+		stats.setPlacement({
+			decision: "offloaded",
+			machine: outcome.machine,
+			reason: `${candidate.reason}${placementLoad(choice)}`,
+			buildMs: timings.totalMs
+		});
+		ccacheActivity = outcome.ccache;
+		phase("build", `built on ${outcome.machine} in ${formatDuration(timings.totalMs)}: offer ${formatDuration(timings.offerMs)}, sync ${formatDuration(timings.syncMs)}, build ${formatDuration(timings.workerMs)}, fetch ${formatDuration(timings.fetchMs)}`);
+		phase("cache", `compilation cache on ${outcome.machine} ${ccacheActivityLine(ccacheActivity)}`);
+		writer.write({
+			src: "build",
+			level: "info",
+			event: "offload_done",
+			msg: `built on ${outcome.machine}`,
+			timings
+		});
+		return true;
+	}
+	async function buildArtifact() {
+		if (!apkPath) try {
+			const offload = placeBuild();
+			if (!offload && !await takeBuildSlot()) return false;
 			const rekeyedBy = [];
 			let editedConfig = [];
 			const prebuildPlan = planPrebuildFor(root, PLATFORM, {
@@ -997,6 +906,7 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 				return false;
 			}
 			if (prebuildRan) {
+				miss(reasonForMiss([]).reason, true);
 				step("prebuild");
 				recordPrebuild(root, PLATFORM, null);
 				const pre = await prebuild(root, PLATFORM, writer, {
@@ -1036,6 +946,7 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 						if (prepared) {
 							apkPath = prepared;
 							record.cacheHit = "local";
+							lateHit();
 							phase("cache", `hit ${shortHash(storeHash)} (post-prebuild key)`);
 							if (releasedWait) {
 								waitedForBuild = releasedWait.facts;
@@ -1045,9 +956,32 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 					}
 				}
 			}
-			if (!apkPath) {
+			if (offload && !apkPath) {
 				explainMiss(rekeyedBy);
 				step("compile");
+				let built = false;
+				if (editedConfig.length) fallBack("prebuild changed config inputs, so the APK cannot be cached", "offload failed: prebuild changed config inputs, so the APK cannot be cached");
+				else {
+					const choice = await chooseMachine(offload);
+					if (choice) built = await compileElsewhere(choice, offload);
+				}
+				if (!built && !await takeBuildSlot()) return false;
+			}
+			if (!apkPath) {
+				if (!offload) {
+					explainMiss(rekeyedBy);
+					step("compile");
+				}
+				if (offload) stats.setPlacement({
+					decision: "fell-back",
+					reason: record.offloadFallback ?? "offload failed",
+					...fallbackMachine ? { machine: fallbackMachine } : {}
+				});
+				else if (hereReason) stats.setPlacement({
+					decision: "here",
+					reason: hereReason
+				});
+				record.builtOn = "here";
 				phase("build", `compiling ${variant || "debug"} with Gradle`);
 				const built = await build({
 					root,
@@ -1155,7 +1089,13 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 					});
 				}
 			}
+		} catch (error) {
+			if (!(error instanceof OffloadRefusal)) throw error;
+			const refusal = error;
+			phaseFailure = fail$1(refusal.code, refusal.message, refusal.remedy, { lastBuildStatus: true });
+			return false;
 		} finally {
+			if (openOffload.choice) closeOffload(openOffload.choice);
 			releaseHeldLock();
 			releaseHeldSlot();
 		}
@@ -1163,6 +1103,8 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 	}
 	if (!easBuild) {
 		await prepareCachedArtifact();
+		if (apkPath) lateHit();
+		else if (swapFellBack) miss(reasonForMiss([]).reason);
 		if (!await buildArtifact()) return refused();
 	}
 	return {
@@ -1186,7 +1128,7 @@ function tail(lines, n = FALLBACK_LINES) {
 }
 //#endregion
 //#region src/commands/android/result.ts
-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 }) {
+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, buildMachine = "auto", builtOn, offloadedTo = null, offloadFallback = null }) {
 	return {
 		platform: PLATFORM,
 		...slot && slot !== "default" ? { slot } : {},
@@ -1201,6 +1143,10 @@ function androidFacts({ slot, serial, avdName = null, deviceName = null, systemI
 		metroPort: metroPort ?? null,
 		cacheHit: cacheLevel(cacheHit),
 		cacheSkipped: Boolean(cacheSkipped),
+		buildMachine,
+		...builtOn ? { builtOn } : {},
+		...offloadedTo ? { offloadedTo } : {},
+		...offloadFallback ? { offloadFallback } : {},
 		waitedForBuild: waitedForBuild ? {
 			pid: waitedForBuild.pid ?? null,
 			ms: waitedForBuild.ms ?? 0
@@ -1219,7 +1165,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, missReason = null, diagnostics = null, configuration = null }) {
+function lastBuildRecord({ fingerprint, cacheKey, cacheHit, cacheSkipped = false, durationMs, appPath, bundleId, startedAt, status, errorCode = null, avdName = null, deviceName = null, missReason = null, diagnostics = null, configuration = null, buildMachine = "auto", builtOn, offloadedTo = null, offloadFallback = null }) {
 	const record = {
 		platform: PLATFORM,
 		avdName: avdName ?? null,
@@ -1236,6 +1182,10 @@ function lastBuildRecord({ fingerprint, cacheKey, cacheHit, cacheSkipped = false
 		configuration: configuration ?? null
 	};
 	if (errorCode) record.errorCode = errorCode;
+	record.buildMachine = buildMachine;
+	if (builtOn) record.builtOn = builtOn;
+	if (offloadedTo) record.offloadedTo = offloadedTo;
+	if (offloadFallback) record.offloadFallback = offloadFallback;
 	if (missReason && !cacheLevel(cacheHit)) record.missReason = missReason;
 	const recorded = status === "failed" ? buildDiagnostics(diagnostics) : [];
 	if (recorded.length) record.diagnostics = recorded;
@@ -1258,12 +1208,14 @@ async function finishAndroidUpload(uploadPending, remote, phase) {
 	}
 	return false;
 }
-function reportAndroidResult({ slot, json, useBuildCache, variant, release, metroCheck, metroPort, logsDir, serial, apkPath, androidPackage, installSkipped, record, waitedForBuild, remote, providerName, launchState, launchWarning, launched, ccache, durationMs, writer, emit, lease, recordRun, reclaimed = [], devServer = null }) {
+function reportAndroidResult({ slot, json, useBuildCache, variant, release, metroCheck, metroPort, logsDir, serial, apkPath, androidPackage, installSkipped, record, waitedForBuild, remote, providerName, launchState, launchWarning, launched, ccache, durationMs, writer, emit, lease, recordRun, reclaimed = [], devServer = null, links }) {
+	const offloadedTo = record.offloadedTo ?? null;
 	recordRun({
 		failed: false,
 		cacheHit: cacheLevel(record.cacheHit),
 		waited: waitedForBuild,
-		durationMs
+		durationMs,
+		offloadedTo
 	});
 	const facts = androidFacts({
 		slot,
@@ -1290,18 +1242,23 @@ function reportAndroidResult({ slot, json, useBuildCache, variant, release, metr
 		logs: logsDir,
 		durationMs,
 		lease,
-		devServer
+		devServer,
+		buildMachine: record.buildMachine,
+		builtOn: record.builtOn ?? void 0,
+		offloadedTo,
+		offloadFallback: record.offloadFallback ?? null
 	});
 	writer.close();
-	if (json) emit(JSON.stringify(reclaimed.length ? {
+	if (json) emit(JSON.stringify({
 		...facts,
-		reclaimed
-	} : facts));
+		...links ? { links } : {},
+		...reclaimed.length ? { reclaimed } : {}
+	}));
 	else {
-		const summary = `${launchWarning ? "WARNING" : "OK"}: ${androidPackage} launched on ${serial}, ${release ? `${variant} (embedded JS, no Metro)` : `Metro port ${metroPort}`} (${cacheOutcome(record.cacheHit, remote?.name ?? providerName)})`;
+		const summary = `${launchWarning ? "WARNING" : "OK"}: ${androidPackage} launched on ${serial}, ${release ? `${variant} (embedded JS, no Metro)` : `Metro port ${metroPort}`} (${cacheOutcome(record.cacheHit, remote?.name ?? providerName, offloadedTo)})`;
 		const outcome = launchWarning ? chalk.yellow(`${summary} -- ${launchWarning}`) : launchState === "unverified" ? chalk.yellow(`${summary} -- launch UNVERIFIED`) : launchState === "bundling" ? chalk.green(`${summary} -- bundle requested, still building`) : chalk.green(summary);
 		const deviceName = record.avdName || record.deviceName || serial;
-		const cacheResult = useBuildCache ? cacheOutcome(record.cacheHit, remote?.name ?? providerName) : "bypassed; built";
+		const cacheResult = useBuildCache ? cacheOutcome(record.cacheHit, remote?.name ?? providerName, offloadedTo) : `bypassed; ${cacheOutcome(false, null, offloadedTo)}`;
 		const metroResult = release ? `embedded (${variant})` : !metroCheck ? `check skipped on port ${metroPort}` : launchState === "unverified" ? `state unverified on port ${metroPort}` : `running on port ${metroPort}${devServer ? ` (started: ${devServer.reason})` : ""}`;
 		emit([
 			outcome,
@@ -1312,13 +1269,14 @@ function reportAndroidResult({ slot, json, useBuildCache, variant, release, metr
 			...ccache.status === "not-run" ? [phaseLine("compilation cache", ccacheActivityLine(ccache))] : [],
 			phaseLine("logs", logsDir || "unavailable (remote device)")
 		].join("\n"));
+		if (links) console.error(chalk.dim(workspaceLinkLine(links)));
 	}
 	return facts;
 }
-function cacheOutcome(cacheHit, providerName = null) {
+function cacheOutcome(cacheHit, providerName = null, offloadedTo = null) {
 	if (cacheHit === "remote") return `cache hit from ${providerName || "the remote cache"}`;
 	if (cacheHit === "local") return "cache hit";
-	return "built";
+	return offloadedTo ? `built on ${offloadedTo}` : "built";
 }
 function persistLastBuild({ recordBuild = recordFinishedBuild, root, record, startedAt, durationMs, status, errorCode = null, diagnostics = null, out }) {
 	const lastBuild = lastBuildRecord({
@@ -1455,9 +1413,9 @@ async function verifyAndroidRun({ root, slot, release, remoteRelease, remoteDevi
 		phase("", chalk.yellow("A release process exited before readiness. Run `stim logs --errors` for captured crash reports, or `stim logs --source device` for the full device output."));
 		return { state: LAUNCH_FATAL };
 	}
-	const newEmulator = Boolean(device.created && device.owned && !remoteDevice);
-	const timeoutMs = newEmulator ? 6e4 : VERIFY_TIMEOUT_MS;
-	if (metroCheck && newEmulator) phase("verify", "waiting up to 60s for bundle load (new emulator)");
+	const freshEmulator = Boolean((device.created || device.adoptionPending) && device.owned && !remoteDevice);
+	const timeoutMs = freshEmulator ? 6e4 : VERIFY_TIMEOUT_MS;
+	if (metroCheck && freshEmulator) phase("verify", `waiting up to 60s for bundle load (${device.created ? "new" : "adopted"} emulator)`);
 	const siblings = metroCheck ? siblingPlatformSlots(root, "android", slot) : [];
 	const verification = metroCheck ? await verifyLaunched({
 		timeoutMs,
@@ -1553,6 +1511,60 @@ async function verifyAndroidRun({ root, slot, release, remoteRelease, remoteDevi
 	})) phase("", chalk.yellow(line));
 	return { state: LAUNCH_UNVERIFIED };
 }
+const ADOPTED_INSTALL_HEADROOM_BYTES = 536870912;
+const INSUFFICIENT_STORAGE = /INSTALL_FAILED_INSUFFICIENT_STORAGE/;
+async function wipeAdoptedAvd(room, free) {
+	room.phase("device", chalk.yellow(`${room.avdName} has ${free === null ? "too little space" : `${formatBytes(free)} free`} on /data after removing other apps and trimming caches; wiping its user data`));
+	const expectedRecord = deviceSlotPlatforms(loadConfig$1()?.projects?.[room.root], room.slot)?.android;
+	if (!expectedRecord?.adoptionPending || expectedRecord.avdName !== room.avdName) throw new Error("the emulator assignment changed before the wipe; its data was kept");
+	const wiped = room.wipeDevice(room.avdName, {
+		wipe: true,
+		owner: {
+			projectPath: room.root,
+			slot: room.slot,
+			expectedRecord
+		},
+		workspace: room.root
+	});
+	if (wiped.status !== "torn-down") throw new Error(`could not wipe it: ${wiped.reason ?? wiped.status}`);
+	const rebooted = await room.rebootDevice();
+	if (!rebooted.ok || !rebooted.serial) throw new Error(`it did not boot after its user data was wiped: ${rebooted.reason ?? "no serial"}`);
+	if (room.resolveAvdSerial(room.avdName).serial !== rebooted.serial) throw new Error(`${rebooted.serial} is not running ${room.avdName} after the wipe`);
+	room.phase("device", `${room.avdName} (${rebooted.serial}) booted with wiped user data`);
+	return rebooted.serial;
+}
+async function installOnAdoptedAvd(room, serial, installApk) {
+	const neededBytes = 2 * statSync(room.apkPath).size + ADOPTED_INSTALL_HEADROOM_BYTES;
+	const roomy = (free) => free === null || free >= neededBytes;
+	const outOfSpace = (result) => Boolean(result.failed) && INSUFFICIENT_STORAGE.test(result.reason ?? "");
+	let target = serial;
+	let wiped = false;
+	if (!roomy(room.dataFreeBytes(target))) {
+		room.trimCaches(target, neededBytes);
+		const free = room.dataFreeBytes(target);
+		if (roomy(free)) room.phase("install", `trimmed app caches on ${room.avdName} to make room for the APK`);
+		else {
+			target = await wipeAdoptedAvd(room, free);
+			wiped = true;
+		}
+	}
+	let installed = installApk(target);
+	if (wiped || !outOfSpace(installed)) return {
+		serial: target,
+		installed
+	};
+	room.trimCaches(target, neededBytes);
+	installed = installApk(target);
+	if (!outOfSpace(installed)) return {
+		serial: target,
+		installed
+	};
+	target = await wipeAdoptedAvd(room, room.dataFreeBytes(target));
+	return {
+		serial: target,
+		installed: installApk(target)
+	};
+}
 async function resolveInstallSerial({ root, slot, device, physical, remoteDevice, serial, resolveAvdSerial, waitForDeviceBoot, phase }) {
 	if (physical || remoteDevice || !device.owned || !device.avdName) return serial;
 	const resolved = resolveAvdSerial(device.avdName, { timeoutMs: 5e3 });
@@ -1575,7 +1587,7 @@ async function resolveInstallSerial({ root, slot, device, physical, remoteDevice
 	});
 	return resolved.serial;
 }
-async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCheck, useBuildCache, variant, release, isExpo, metroPort, logsDir, emuLog, device, physical, remoteDevice, bootPromise, resolveAvdSerial, waitForDeviceBoot, bootDuration, apkPath, androidPackage: initialPackage, swapDir, record, waitedForBuild, ccache, uploadPending, providerUpload, providerName, remote, abandonedRemote: remoteWasAbandoned, started, startedAt, writer, phase, fail, readApkPackage, install, launch, launchRelease, resolveDevClientScheme, verifyLaunched, verifyReleaseLaunched, spawn, kill, pidAlive, verifyCollector, writeLaunch, recordBuild, now, out, emit, recordRun, reclaimed, devServer, enterPhase }) {
+async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCheck, useBuildCache, variant, release, isExpo, metroPort, logsDir, emuLog, device, physical, remoteDevice, bootPromise, resolveAvdSerial, waitForDeviceBoot, bootDuration, apkPath, androidPackage: initialPackage, swapDir, record, waitedForBuild, ccache, uploadPending, providerUpload, providerName, remote, abandonedRemote: remoteWasAbandoned, started, startedAt, writer, phase, fail, readApkPackage, install, launch, launchRelease, resolveDevClientScheme, verifyLaunched, verifyReleaseLaunched, spawn, kill, pidAlive, verifyCollector, writeLaunch, recordBuild, now, out, emit, recordRun, reclaimed, devServer, enterPhase, rebootDevice, dataFreeBytes = androidDataFreeBytes, trimCaches = trimAndroidCaches, wipeDevice = teardownOwnedAvd }) {
 	let androidPackage = initialPackage;
 	let leaseWarned = false;
 	const raiseLeaseFor = (boundMs, beforeInstall) => {
@@ -1591,7 +1603,7 @@ async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCh
 		}
 		return null;
 	};
-	enterPhase("install");
+	enterPhase("device");
 	const booted = await bootPromise;
 	const runCommand = nativeRunCommand("android", slot, {
 		physical,
@@ -1635,13 +1647,37 @@ async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCh
 	}
 	const lostBeforeInstall = physical ? raiseLeaseFor(ADB_INSTALL_TIMEOUT_MS, true) : null;
 	if (lostBeforeInstall) return lostBeforeInstall;
-	const installTimer = stepTimer(now);
-	const installed = install({
-		serial,
-		apkPath,
-		packageName: androidPackage,
-		allowUninstall: release || adopting
-	});
+	enterPhase("install");
+	let installTimer = stepTimer(now);
+	const installApk = (target) => {
+		installTimer = stepTimer(now);
+		return install({
+			serial: target,
+			apkPath,
+			packageName: androidPackage,
+			allowUninstall: release || adopting
+		});
+	};
+	let installed;
+	if (adopting && device.avdName && apkPath) {
+		const room = {
+			root,
+			slot,
+			avdName: device.avdName,
+			apkPath,
+			phase,
+			rebootDevice,
+			dataFreeBytes,
+			trimCaches,
+			wipeDevice,
+			resolveAvdSerial
+		};
+		try {
+			({serial, installed} = await installOnAdoptedAvd(room, serial, installApk));
+		} catch (error) {
+			return fail(INSTALL_FAILED, `Could not make room on adopted emulator ${device.avdName}: ${String(error?.message || error)}`, `Run \`${runCommand}\` again; adoption remains pending, so it retries the cleanup.`);
+		}
+	} else installed = installApk(serial);
 	if (installed.failed) {
 		const installRemedy = remoteDevice?.failureRemedy() ?? localInstallRemedy({
 			reason: installed.reason,
@@ -1867,7 +1903,11 @@ async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCh
 		lease: physical ? leaseFacts : void 0,
 		recordRun,
 		reclaimed,
-		devServer
+		devServer,
+		links: workspaceLinks(root, {
+			platform: "android",
+			slot
+		})
 	});
 	if (remoteWasAbandoned || uploadWasAbandoned) exitAfterFlush(0);
 	return {
@@ -2004,10 +2044,12 @@ function resolveAndroidRunPlan({ settings, settingsContext, slot, easProfile, va
 	if ("error" in waitParsed) return fail("STIM_BAD_ARG", waitParsed.error, "Pass a whole number of seconds, e.g. --wait 90. `--wait 0` refuses a leased device at once.");
 	const waitSeconds = waitParsed.seconds;
 	const remoteBackend = physical ? null : commandRemoteBackend ?? remoteAndroidSetting(settings);
+	const settingsLayersForOrigin = settingsLayers(settingsContext);
 	const imageRefusal = systemImageRefusal({
 		slot,
 		flag: systemImageFlag,
 		resolved: systemImage,
+		origin: settingOriginScope(settingsLayersForOrigin, "android.systemImage"),
 		physical,
 		remoteBackend,
 		listImages: listSystemImages
@@ -2016,11 +2058,18 @@ function resolveAndroidRunPlan({ settings, settingsContext, slot, easProfile, va
 	const profileRefusal = deviceProfileRefusal({
 		flag: deviceProfileFlag,
 		resolved: deviceProfile,
+		origin: settingOriginScope(settingsLayersForOrigin, "android.deviceProfile"),
 		physical,
 		remoteBackend,
 		listProfiles: listDeviceProfiles
 	});
 	if (profileRefusal) return fail(profileRefusal.code, profileRefusal.message, profileRefusal.remedy);
+	const avdFlagRefusal = remoteAvdFlagRefusal({
+		systemImageFlag,
+		deviceProfileFlag,
+		remoteBackend
+	});
+	if (avdFlagRefusal) return fail(avdFlagRefusal.code, avdFlagRefusal.message, avdFlagRefusal.remedy);
 	if (!physical && !remoteBackend) {
 		const flagImage = typeof systemImageFlag === "string" && systemImageFlag.trim() ? systemImageFlag.trim() : null;
 		const existing = ownedAvd(root, slot);
@@ -2077,7 +2126,7 @@ function resolveAndroidRunPlan({ settings, settingsContext, slot, easProfile, va
 //#endregion
 //#region src/commands/android/next-build.ts
 const DEFAULT_PLAN_DEPS = {
-	findRoot: findProjectRoot,
+	findRoot: findProjectRoot$1,
 	fingerprint: fingerprintProject,
 	listSystemImages: listInstalledSystemImages,
 	avdSystemImage: ownedAvdSystemImage,
@@ -2180,7 +2229,7 @@ async function planAndroid(opts, overrides = {}) {
 		platform: PLATFORM,
 		slot,
 		root,
-		projectKey: statsProjectKey({
+		projectKey: statsProjectKey$1({
 			root,
 			commonDir: settingsContext.gitCommonDir,
 			repoRoot: settingsContext.repoRoot
@@ -2267,12 +2316,12 @@ 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("--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) => {
+	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("--build-machine <value>", "Build on auto, local, or one named machine; a name refuses without fallback", parseBuildMachineOption).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());
+		const root = findProjectRoot$1(process.cwd());
 		if (!root) {
 			refuseNoProject({ json: Boolean(opts.json) });
 			return;
@@ -2293,6 +2342,7 @@ function registerAndroid(program) {
 			try {
 				return await runAndroid({
 					root,
+					buildMachine: opts.buildMachine,
 					slot: opts.slot,
 					easProfile: opts.easProfile,
 					json: Boolean(opts.json),
@@ -2313,7 +2363,7 @@ function registerAndroid(program) {
 		}, { 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, 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, recordBuild, 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, dataFreeBytes, trimCaches, wipeDevice, 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, recordBuild, recordStats = recordRunStats, readEstimates = readRunEstimates, now = Date.now, out = (line) => console.error(line), emit = (line) => console.log(line) } = {}) {
 	return {
 		root,
 		json,
@@ -2354,6 +2404,9 @@ function resolveRunAndroidOptions({ root, json = false, remoteDevice: commandRem
 		ensureDeviceBooted,
 		resolveAvdSerial,
 		waitForDeviceBoot,
+		dataFreeBytes,
+		trimCaches,
+		wipeDevice,
 		resolveMetro,
 		prewarmMetro,
 		startServer,
@@ -2453,7 +2506,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, 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, recordBuild, 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, dataFreeBytes, trimCaches, wipeDevice, 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, recordBuild, recordStats, readEstimates, now, out, emit } = androidSlotOptions(options);
 	const progress = options.progress ?? NO_BUILD_PROGRESS;
 	const slot = validateDeviceSlot(options.slot);
 	const started = now();
@@ -2501,10 +2554,13 @@ async function runAndroid(options = {}) {
 	}
 	const logsDir = workspaceLogsDir(root);
 	const buildLog = join(logsDir, `build-${deviceSlotFileKey("android", slot)}.ndjson`);
-	const writer = createWriter(buildLog, {
+	const writer = tapBuildLog(createWriter(buildLog, {
 		truncate: true,
-		fields: { slot }
-	});
+		fields: {
+			platform: PLATFORM,
+			slot
+		}
+	}), progress);
 	const record = {
 		fingerprint: null,
 		cacheKey: null,
@@ -2520,12 +2576,13 @@ async function runAndroid(options = {}) {
 		write: recordStats,
 		now,
 		note: (line) => out(phaseLine("stats", chalk.dim(line))),
-		phases: () => progress.durations()
+		phases: () => progress.durations(),
+		deviceSetup: () => progress.deviceSetupKnown()
 	});
 	const recordRun = stats.record;
 	let ccacheActivity = CCACHE_NOT_RUN;
 	let reclaimed = [];
-	const fail = (code, message, remedy, { lastBuildStatus = false, diagnostics = [], buildDiagnostics: rawDiagnostics = [], lines = [], logPath = null, lease } = {}) => {
+	const fail = (code, message, remedy, { lastBuildStatus = false, setup = false, diagnostics = [], buildDiagnostics: rawDiagnostics = [], lines = [], logPath = null, lease } = {}) => {
 		const cancellation = cancelledFailure(PLATFORM, {
 			code,
 			message
@@ -2547,7 +2604,7 @@ async function runAndroid(options = {}) {
 		for (const line of lines) out(phaseLine("", chalk.dim(line)));
 		if (remedy) out(phaseLine("remedy", remedy));
 		if (logPath) out(phaseLine("log", logPath));
-		recordRun({
+		if (!setup) recordRun({
 			failed: true,
 			durationMs: now() - started
 		});
@@ -2576,18 +2633,25 @@ async function runAndroid(options = {}) {
 		gitCommonDir: gitCommonDir(root),
 		repoRoot: settingsRepoRoot
 	};
-	const projectKey = statsProjectKey({
+	const projectKey = statsProjectKey$1({
 		root,
 		commonDir: settingsContext.gitCommonDir,
 		repoRoot: settingsRepoRoot
 	});
 	stats.setProject(projectKey);
+	progress.estimate(projectKey);
 	let estimatesRead = null;
 	const estimates = () => estimatesRead ??= readEstimates({
 		projectKey,
 		platform: PLATFORM
 	});
 	const settings = resolveSettingsFor(settingsContext);
+	const placement = resolveBuildPlacement(options.buildMachine);
+	record.buildMachine = placement.selected;
+	if (placement.failure) {
+		const { code, message, remedy } = placement.failure;
+		return fail(code, message, remedy, { setup: true });
+	}
 	const planned = resolveAndroidRunPlan({
 		settings,
 		settingsContext,
@@ -2677,8 +2741,16 @@ async function runAndroid(options = {}) {
 			devServer = gate.devServer;
 			phase("metro", `port ${metroPort} (${devServer ? `started: ${devServer.reason}` : `pid ${gate.pid ?? "unknown, started outside Stim"}`})`);
 			return true;
-		} else phase("metro", reservedPort ? `port ${reservedPort} (not checked)` : `no reservation; using ${DEFAULT_METRO_PORT} (not checked)`);
-		metroPort = release ? null : reservedPort ?? 8081;
+		} else {
+			const pin = metroPortSetting(root);
+			if (pin.error) {
+				phaseFailure = fail("STIM_BAD_ARG", pin.error, SETTING_SHAPE_REMEDY);
+				return false;
+			}
+			metroPort = pin.port ?? reservedPort ?? 8081;
+			phase("metro", pin.port ?? reservedPort ? `port ${metroPort} (not checked)` : `no reservation; using ${DEFAULT_METRO_PORT} (not checked)`);
+		}
+		if (release) metroPort = null;
 		return true;
 	}
 	if (!await resolveMetroPort()) return phaseFailure;
@@ -2691,7 +2763,7 @@ async function runAndroid(options = {}) {
 				isExpo,
 				tunnelMode: tunnelModeSetting(settings) ?? void 0,
 				publicUrl: publicUrlSetting(settings),
-				available: detectRemoteProviders(binOnPath)
+				available: detectRemoteProviders(binOnPath, tunnelModeSetting(settings) ?? "auto")
 			});
 			if ("failed" in reachable) return fail(reachable.code ?? "STIM_NO_REMOTE_SESSION", reachable.failed, reachable.remedy);
 		}
@@ -2770,6 +2842,7 @@ async function runAndroid(options = {}) {
 			const failure = avdSetupFailure(err, root, emuLog);
 			return fail(failure.code, failure.message, failure.remedy, failure.extra);
 		}
+		progress.deviceSetup(didSetUpDevice(device, Boolean(remoteDevice)));
 		const prepareMs = prepare();
 		if (device.created || prepareMs >= 2e3) phase("device", `${device.avdName || device.deviceName || label} ${device.created ? "created" : "prepared"} (${formatDuration(prepareMs)})`);
 		const boot = () => Promise.resolve(ensureDeviceBooted({
@@ -2825,6 +2898,7 @@ async function runAndroid(options = {}) {
 			isExpo,
 			device,
 			physical,
+			remote: Boolean(remoteDevice),
 			buildPlan,
 			cacheProviderConfig,
 			requestedBuildCache,
@@ -2837,7 +2911,11 @@ async function runAndroid(options = {}) {
 				out,
 				estimates,
 				stats,
-				step: progress.step
+				step: progress.step,
+				miss: progress.miss,
+				hit: progress.hit,
+				place: progress.place,
+				waitingOn: progress.waitingOn
 			}
 		}, {
 			deviceAbi,
@@ -2877,7 +2955,7 @@ async function runAndroid(options = {}) {
 		record.appPath = apkPath;
 		if (runCancellation()) return fail("STIM_CANCELLED", "before install");
 		if (startRemoteBoot) {
-			progress.step("install");
+			progress.step("device");
 			bootPromise = startRemoteBoot();
 			const booted = await bootPromise;
 			if (booted.failed) {
@@ -2909,6 +2987,7 @@ async function runAndroid(options = {}) {
 			}
 		};
 		if (physical) {
+			progress.step("device");
 			const acquired = await acquireLease({
 				root,
 				platform: PLATFORM,
@@ -2956,6 +3035,9 @@ async function runAndroid(options = {}) {
 				bootPromise,
 				resolveAvdSerial,
 				waitForDeviceBoot,
+				dataFreeBytes,
+				trimCaches,
+				wipeDevice,
 				bootDuration: () => bootDuration,
 				apkPath,
 				androidPackage,
@@ -2992,7 +3074,20 @@ async function runAndroid(options = {}) {
 				recordRun,
 				reclaimed,
 				devServer,
-				enterPhase: progress.step
+				enterPhase: progress.step,
+				rebootDevice: () => Promise.resolve(ensureDeviceBooted({
+					platform: PLATFORM,
+					device: {
+						...device,
+						serial: void 0
+					},
+					projectPath: root,
+					out,
+					logFile: emuLog
+				})).catch((e) => ({
+					failed: true,
+					reason: String(e?.message || e)
+				}))
 			});
 		} finally {
 			releaseLease();