stim 1.18.0 → 1.19.0

package/dist/{android-BvwuMUJ9.mjs → android-BXc6BmEi.mjs}

@@ -1,46 +1,46 @@
 import { n as ownership_claim_exports } from "./process-identity-Biv3arCO.mjs";
-import { t as getExecutor } from "./exec-DWhCZDGm.mjs";
+import { t as getExecutor } from "./exec-i8GDPwq9.mjs";
 import { t as spawnEntry } from "./spawn-entry-Dcb7sDUz.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-CBtzyIgF.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-CgYMahz7.mjs";
-import { D as makeTemporaryDirectory, O as removeTemporaryEntry, s as gitCommonDir, y as repoRoot } from "./worktree-CsKYexJM.mjs";
-import { d as projectShortcut, i as detectIsExpo, n as appProjectProblem, s as findProjectRoot$1, t as NO_PROJECT_REFUSAL } from "./project-C3ChRLZy.mjs";
-import { l as resolveProjectMetro, o as pidExists, u as signalProcessTree } from "./metro-Dh8T4Ytd.mjs";
-import { c as writeWorkspaceState, g as workspaceAgentDeviceDir, i as recordWorkspaceUse, l as emulatorLogFile, r as readWorkspaceState$1, v as workspaceDir, x as workspaceLogsDir$1 } from "./workspace-state-C59dqG-Z.mjs";
-import { F as recordFinishedBuild, Ft as MODE_BARE, I as startBuildProgress, It as MODE_EXPO, Jt as writeWorkspaceLaunch, L as tapBuildLog, O as NO_BUILD_PROGRESS, R as createRunRecorder, U as recordRunStats, V as recordCapacityRefusal, W as statsProjectKey$1, t as budgetGate, z as readRunEstimates } from "./budget-DIhL2BKx.mjs";
-import { E as teardownOwnedAvd, N as releaseBuildSlot, j as acquireBuildSlot } from "./workspaces-xXItD8Dj.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-Co-EwifR.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, ft as parkedMaxSetting, i as androidDataFreeBytes, j as listInstalledSystemImages, k as listAvdDeviceProfiles, l as androidSystemImageAbi, q as resetAdoptedAvd, r as androidBuildToolName, rt as configuredAndroidEmulatorApp, t as DEFAULT_AVD_DEVICE_PROFILE, tt as waitForBoot, u as androidToolCwd } from "./android-DC3ZLuw0.mjs";
-import { a as workspaceLinks, i as workspaceLinkLine } from "./stim-desktop-Behws_fi.mjs";
-import { A as publicUrlSetting, C as metroWarmupUrlSetting, F as resolveSettings, H as tunnelModeSetting, I as settingFile, K as detectProviders, M as remoteAndroidSetting, P as resolveCacheProviderConfig, Q as resolveOptimizations, R as settingOriginScope, T as parseIosRemote, U as unknownSettingKeys, V as settingsLayers, X as compilerCacheFallbackMessage, Y as artifactCachePolicy, Z as optimizationBuildProfile, i as SETTING_SHAPE_REMEDY, l as androidDataPartitionSizeGbSettingError, o as androidAvdConfigSettingError, u as cacheProviderSettingError, x as metroPortSetting, z as settingShapeErrors } from "./settings-CQyMElEP.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-Bt8ygHE7.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-DC5jEtd1.mjs";
+import { c as writeWorkspaceState, g as workspaceAgentDeviceDir, i as recordWorkspaceUse, l as emulatorLogFile, r as readWorkspaceState$1, v as workspaceDir, x as workspaceLogsDir$1 } from "./workspace-state-CR9X86xJ.mjs";
+import { M as writeWorkspaceLaunch, b as MODE_EXPO, c as projectShortcut, p as detectIsExpo, r as findProjectRoot, s as projectProblem, t as NO_PROJECT_REFUSAL, y as MODE_BARE } from "./project-B5eQ1USs.mjs";
+import { A as publicUrlSetting, B as settingShapeErrors, C as metroWarmupUrlSetting, Ct as removeTemporaryEntry, Dt as optimizationBuildProfile, Et as compilerCacheFallbackMessage, F as resolveCacheProviderConfig, H as settingsLayers, I as resolveSettings, L as settingFile, M as remoteAndroidSetting, N as remoteEasFallbackSetting, Ot as resolveOptimizations, St as makeTemporaryDirectory, T as parseIosRemote, Tt as artifactCachePolicy, U as tunnelModeSetting, W as unknownSettingKeys, i as SETTING_SHAPE_REMEDY, l as androidDataPartitionSizeGbSettingError, mt as repoRoot, nt as gitCommonDir, o as androidAvdConfigSettingError, q as detectProviders, u as cacheProviderSettingError, x as metroPortSetting, z as settingOriginScope } from "./settings-CxgngUZk.mjs";
+import { d as signalProcessTree, s as pidExists, u as resolveProjectMetro } from "./metro-DI2AjPF_.mjs";
+import { F as recordFinishedBuild, I as startBuildProgress, L as tapBuildLog, O as NO_BUILD_PROGRESS, R as createRunRecorder, U as recordRunStats, V as recordCapacityRefusal, W as statsProjectKey$1, t as budgetGate, z as readRunEstimates } from "./budget-Dz-kyXLv.mjs";
+import { D as teardownOwnedAvd, M as acquireBuildSlot, P as releaseBuildSlot } from "./workspaces-Djb2gfi9.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-Cu7PtQpZ.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, ft as parkedMaxSetting, i as androidDataFreeBytes, j as listInstalledSystemImages, k as listAvdDeviceProfiles, l as androidSystemImageAbi, q as resetAdoptedAvd, r as androidBuildToolName, rt as configuredAndroidEmulatorApp, t as DEFAULT_AVD_DEVICE_PROFILE, tt as waitForBoot, u as androidToolCwd } from "./android-BdQC6zs1.mjs";
+import { a as workspaceLinks, i as workspaceLinkLine } from "./stim-desktop-C65jk_q2.mjs";
 import { r as createNdjsonWriter } from "./ndjson-LGZAMsqa.mjs";
-import { _ as resolveBuildPlacement, a as offloadBuild, c as placementLoad, d as setRemoteLogSink, f as OffloadRefusal, h as parseBuildMachineOption, i as closeOffload, l as remotePhaseText, m as namedBuildMachine, n as buildPlacementCandidates, r as chooseBuildMachine, s as offloadPlacement } from "./client-DzhapoMB.mjs";
-import { n as DeviceAdmissionRefusal, r as checkDeviceCapacity, t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-EUOOYr8T.mjs";
-import { A as CCACHE_NOT_RUN, E as tailLines, F as resolveCcache, M as ccacheActivityLine, T as startBuildHeartbeat, g as HEARTBEAT_INTERVAL_MS, j as CCACHE_UNAVAILABLE, n as androidToolchain, t as androidRequirements } from "./toolchain-Bnyd_K3A.mjs";
-import { t as cleanLine } from "./server-expo-DoBHhuzK.mjs";
-import { r as hostedMetroSettings } from "./metro-gateway-CEUw9RMH.mjs";
-import { a as writeHostedAndroid, i as writeDevicePlacement, t as readHostedAndroid } from "./ios-state-B2pES6Vs.mjs";
-import { _ as AvdBootError, a as printPlan, b as automaticDevicePlacement, c as fingerprintErrorMissReason, d as detectEntryFile, f as refreshUpdatesManifestFile, g as ensureOwnedDevice, h as ensureBooted, i as planPayload, l as skippedMissReason, m as didSetUpDevice, n as planCachedBuild, o as refusePlan, r as planFlagRefusal, s as explainBuildMiss, t as planHostedDevice, u as UPDATES_MANIFEST_NAME, v as AvdRecoveryError, x as devicePlacementLine, y as warmMetro } from "./plan-placement-CtxkCO54.mjs";
-import { n as devicePlacementRecord, t as buildPlacementRecord } from "./placement-log-BcPhRwR4.mjs";
-import { n as prepareHostedAndroid, t as placeHostedAndroid } from "./hosted-android-Bv285t_t.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-D-PUENug.mjs";
-import { n as nativeRunCommand, r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-C1nqh4mu.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-hskNcWkZ.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-BGg7aGIZ.mjs";
-import { C as resolveSystemImage, S as resolveDeviceProfile, T as systemImageRefusal, _ as isReleaseVariant, a as PLATFORM, b as pooledAndroidDevice, d as apkPackage, f as deviceProfileRefusal, g as foldableImageRefusal, i as NO_FINGERPRINT, m as dumpApkManifest, n as LAUNCH_FAILED, o as androidBuildOptions, p as displayPath, r as NO_DEVICE, s as androidDevClientScheme, t as INSTALL_FAILED, v as noDeviceDiagnostic, w as resolveVariant, x as remoteAvdFlagRefusal } from "./support-Bwvbrq5-.mjs";
-import { a as ensureMetroReachable, c as remoteAndroidDeps, n as binOnPath, o as ensureRemoteBootOwned, u as resolveRemoteContext, w as ownedSessionName } from "./device-remote-tHbd1fKy.mjs";
-import { d as runCancellationSignal, f as withNativeBuildRun, r as cancelledFailure, u as runCancellation } from "./native-run-B06FkmZx.mjs";
-import { a as isEasBuildFailure, o as planEasDevelopmentBuild, s as resolveEasDevelopmentBuild } from "./simslim-EHBQ2R4G.mjs";
-import { c as startDevServer, m as detectAppIds, p as detectAndroidPackage } from "./start-D-IeOyoK.mjs";
-import { a as acquireRunLease, c as lostRefusal, d as runLease, f as waitFlagConflict, l as parseDeviceWait, o as leaseExpiryText, s as lostLine, t as DEBUG_VERIFY_STEP_MS, u as releaseLeaseOnSignal } from "./device-lease-run-w1xhCqIW.mjs";
-import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-D6Se7gg_.mjs";
-import { i as launchOutcomeRecord, n as ensureWorkspaceStorageSafely, r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-D_603JiC.mjs";
-import { t as selectFromPool } from "./device-pool-F5WvRPtD.mjs";
-import { i as staleNativeDirRefusal, n as recordPrebuild, r as runPrebuild, t as planPrebuild } from "./prebuild-juCyreaR.mjs";
-import { c as formatDiagnostic, i as buildAndroid, o as productFlavorRefusal, s as readProductFlavors } from "./gradle-C6GKnunQ.mjs";
-import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-BRXOqDzG.mjs";
-import { n as resolveAndroidCas, r as resolveAndroidCompilerCache } from "./android-cas-BBFyr9CA.mjs";
+import { A as resolveBuildPlacement, C as setRemoteLogSink, D as parseBuildMachineOption, E as namedBuildMachine, O as requireLocalBuild, S as withNativeBuildRun, a as offloadBuild, b as runCancellation, c as placementLoad, i as closeOffload, l as remotePhaseText, n as buildPlacementCandidates, p as cancelledFailure, r as chooseBuildMachine, s as offloadPlacement, w as OffloadRefusal, x as runCancellationSignal } from "./client-CuUo8Nvg.mjs";
+import { n as DeviceAdmissionRefusal, r as checkDeviceCapacity, t as DEFAULT_DEVICE_SLOT_WAIT_MS } from "./device-capacity-BoN1jQkO.mjs";
+import { i as ccacheActivityLine, n as CCACHE_NOT_RUN, r as CCACHE_UNAVAILABLE, s as resolveCcache } from "./manifest-CX0d1IkZ.mjs";
+import { E as startBuildHeartbeat, O as tailLines, h as HEARTBEAT_INTERVAL_MS, n as androidToolchain, t as androidRequirements } from "./toolchain-C3xSoyUl.mjs";
+import { t as cleanLine } from "./server-expo-n3tUi3Em.mjs";
+import { r as hostedMetroSettings } from "./metro-gateway-BxpJLIwh.mjs";
+import { a as writeHostedAndroid, i as writeDevicePlacement, t as readHostedAndroid } from "./ios-state-By0XuLTQ.mjs";
+import { _ as devicePlacementLine, a as UPDATES_MANIFEST_NAME, d as ensureOwnedDevice, f as AvdBootError, g as automaticDevicePlacement, h as checkEasFallback, i as skippedMissReason, l as didSetUpDevice, m as warmMetro, n as fingerprintErrorMissReason, o as detectEntryFile, p as AvdRecoveryError, s as refreshUpdatesManifestFile, t as explainBuildMiss, u as ensureBooted } from "./miss-reason-CjQCOKqq.mjs";
+import { n as devicePlacementRecord, t as buildPlacementRecord } from "./placement-log-Dxe34rJm.mjs";
+import { n as prepareHostedAndroid, t as placeHostedAndroid } from "./hosted-android-Bs7fytj7.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-CFI4ptUL.mjs";
+import { n as nativeRunCommand, r as siblingPlatformSlots, t as launchSlotScope } from "./slot-launch-HV_KtPIw.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-DCveSE6d.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-N3hAEaAL.mjs";
+import { C as resolveSystemImage, S as resolveDeviceProfile, T as systemImageRefusal, _ as isReleaseVariant, a as PLATFORM, b as pooledAndroidDevice, d as apkPackage, f as deviceProfileRefusal, g as foldableImageRefusal, i as NO_FINGERPRINT, m as dumpApkManifest, n as LAUNCH_FAILED, o as androidBuildOptions, p as displayPath, r as NO_DEVICE, s as androidDevClientScheme, t as INSTALL_FAILED, v as noDeviceDiagnostic, w as resolveVariant, x as remoteAvdFlagRefusal } from "./support-DsNaFg6D.mjs";
+import { d as productFlavorRefusal, f as readProductFlavors, h as formatDiagnostic, o as buildAndroid } from "./device-ios-B2ruohE-.mjs";
+import { T as ownedSessionName, a as ensureMetroReachable, c as remoteAndroidDeps, n as binOnPath, o as ensureRemoteBootOwned, u as resolveRemoteContext } from "./device-remote-B5GiUifk.mjs";
+import { a as isEasBuildFailure, o as planEasDevelopmentBuild, s as resolveEasDevelopmentBuild } from "./simslim-D9LkJxIO.mjs";
+import { c as startDevServer, m as detectAppIds, p as detectAndroidPackage } from "./start-DtxthMfI.mjs";
+import { a as acquireRunLease, c as lostRefusal, d as runLease, f as waitFlagConflict, l as parseDeviceWait, o as leaseExpiryText, s as lostLine, t as DEBUG_VERIFY_STEP_MS, u as releaseLeaseOnSignal } from "./device-lease-run-D38SnZtt.mjs";
+import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-EB0ySdGK.mjs";
+import { i as launchOutcomeRecord, n as ensureWorkspaceStorageSafely, r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-BGxsbfny.mjs";
+import { t as selectFromPool } from "./device-pool-CP4rAsHx.mjs";
+import { i as staleNativeDirRefusal, n as recordPrebuild, r as runPrebuild, t as planPrebuild } from "./prebuild-BKJ3wJI1.mjs";
+import { a as printPlan, i as planPayload, n as planCachedBuild, o as refusePlan, r as planFlagRefusal, s as runArtifactLifecycle, t as planHostedDevice } from "./plan-placement-BVY59qa8.mjs";
+import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics--v5HGOU0.mjs";
+import { n as resolveAndroidCas, r as resolveAndroidCompilerCache } from "./android-cas-C87geAg-.mjs";
 import { constants, copyFileSync, existsSync, mkdirSync, openSync, readFileSync, renameSync, rmSync, statSync } from "node:fs";
 import { basename, dirname, isAbsolute, join } from "node:path";
 import { buildDiagnostics, hostedAndroidStatus, machineCapacity, parseMachine } from "@stim-cli/core/state";
@@ -92,7 +92,7 @@ async function connectAndroidHosting({ root, slot, machine, release, metroCheck,
 		} };
 	}
 }
-async function selectAndroidPlacement({ target: selected, automatic = automaticDevicePlacement, checkBudget = budgetGate, note, phase, log, fromFlag, noWait, buildMachine, localSelectors, ...args }) {
+async function selectAndroidPlacement({ target: selected, automatic = automaticDevicePlacement, checkBudget = budgetGate, note, phase, log, fromFlag, noWait, buildMachine, localSelectors, eas, ...args }) {
 	const selectors = selected.kind === "hosted" ? {
 		...selected.systemImage ? { systemImage: selected.systemImage } : {},
 		...selected.deviceProfile ? { deviceProfile: selected.deviceProfile } : {}
@@ -126,14 +126,31 @@ async function selectAndroidPlacement({ target: selected, automatic = automaticD
 			platform: "android",
 			selectors,
 			buildMachine,
-			noWait
+			noWait,
+			...eas ? { eas } : {}
 		});
 		phase("placement:", devicePlacementLine(placed.placement, placed.skipped));
 		log?.(devicePlacementRecord({
 			platform: "android",
 			fromFlag,
+			easFallback: Boolean(eas),
 			placed
 		}));
+		if (placed.placement.decision === "eas") return {
+			target: {
+				kind: "remote",
+				backend: "eas",
+				systemImage: selected.systemImage,
+				deviceProfile: selected.deviceProfile
+			},
+			hostedTarget: null,
+			selectors,
+			budget: await checkBudget({
+				root: args.root,
+				note
+			}),
+			devicePlacement: placed.placement
+		};
 		if (placed.target && !args.release && !args.metroCheck) return { failure: {
 			code: "STIM_BAD_ARG",
 			message: "Hosted Debug runs require the local Metro supervisor; --no-metro-check cannot be used.",
@@ -344,7 +361,7 @@ function persistLastBuild({ recordBuild = recordFinishedBuild, root, record, sta
 }
 //#endregion
 //#region src/commands/android/hosted.ts
-async function finishHostedAndroidRun({ target, artifact, root, slot = "default", release, isExpo, metroPort, logsDir, selectors, place, writePlacement, verifyLaunch: verify, writeLaunch, readApkPackage, resolveDevClientScheme, now, started, startedAt, fail, phase, out, recordBuild, ...report }) {
+async function finishHostedAndroidRun({ target, artifact, root, slot = "default", release, isExpo, metroPort, logsDir, selectors, place, writePlacement, verifyLaunch: verify, writeLaunch, readApkPackage, resolveDevClientScheme, now, started, startedAt, fail, phase, enterPhase, out, recordBuild, ...report }) {
 	const packageName = artifact.androidPackage ?? readApkPackage(artifact.apkPath);
 	if (!artifact.apkPath || !packageName) return fail("STIM_INSTALL_FAILED", "The built APK has no package identity.");
 	const launchedAt = now();
@@ -360,7 +377,8 @@ async function finishHostedAndroidRun({ target, artifact, root, slot = "default"
 			selectors,
 			...!release && isExpo ? { devClientScheme: resolveDevClientScheme(root, artifact.apkPath) ?? void 0 } : {},
 			reserved: (placement) => writePlacement(root, slot, placement),
-			note: out
+			note: out,
+			enterPhase
 		});
 		writePlacement(root, slot, run.placement);
 		writeLaunch(root, "android", {
@@ -807,6 +825,13 @@ function fail$1(code, message, remedy, extra = {}) {
 		extra
 	};
 }
+var ArtifactRefusal = class extends Error {
+	failure;
+	constructor(failure) {
+		super(failure.message ?? failure.code);
+		this.failure = failure;
+	}
+};
 async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo, device, physical, hostedAbi, 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, waitingFor } = progress;
 	let fallbackMachine = null;
@@ -826,6 +851,7 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 			}
 		}));
 		if (namedBuildMachine(buildMachine)) throw new OffloadRefusal(buildMachine, reason);
+		requireLocalBuild(buildMachine);
 		record.offloadFallback = reason;
 		phase("build", `${line} -> building here`);
 	};
@@ -834,11 +860,6 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 	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;
@@ -957,7 +978,6 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 		apkPath = found?.path ?? null;
 		return true;
 	}
-	if (!await resolveInitialFingerprint()) return refused();
 	let remote = null;
 	let abandonedRemote = false;
 	let uploadPending = null;
@@ -1009,13 +1029,9 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 			} else phase("cache", `remote miss (${remote.name}) ${remoteTimer()}`);
 		}
 	}
-	if (!easBuild) {
-		await resolveRemoteArtifact();
-		if (!apkPath) miss(reasonForMiss([]).reason);
-	}
 	let waitedForBuild = null;
 	let releasedWait = null;
-	if (!easBuild && useBuildCache && !apkPath) {
+	async function awaitSharedBuild() {
 		const shared = await waitForSharedBuild({
 			platform: PLATFORM,
 			key: cacheKey,
@@ -1037,7 +1053,7 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 		if (shared.refusal) {
 			const { code, message, remedy } = shared.refusal;
 			phaseFailure = fail$1(code, message, remedy, { lastBuildStatus: true });
-			return refused();
+			throw new ArtifactRefusal(phaseFailure);
 		}
 		buildLock = shared.lock;
 		releasedWait = shared.released;
@@ -1046,6 +1062,7 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 			record.cacheHit = "local";
 			waitedForBuild = shared.hit.waited;
 		}
+		return apkPath;
 	}
 	let swapDir = null;
 	const installableCachedApk = async (key, cachedPath) => {
@@ -1071,15 +1088,13 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 		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 prepareCachedArtifact(cachedPath) {
+		const prepared = await installableCachedApk(cacheKey, cachedPath);
+		if (!prepared) {
+			record.cacheHit = false;
+			waitedForBuild = null;
 		}
+		return prepared;
 	}
 	function reasonForMiss(rekeyedBy) {
 		if (swapFellBack) return {
@@ -1122,9 +1137,11 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 		}
 	}
 	async function takeBuildSlot() {
+		requireLocalBuild(buildMachine);
 		if (!maxBuilds) return true;
 		try {
 			buildSlot = await acquireSlot({
+				automatic: buildMachine === "auto",
 				max: maxBuilds,
 				root,
 				logFile: buildLog,
@@ -1133,6 +1150,7 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 			});
 			slotWaitMs = buildSlot.slotWaitMs;
 		} catch (err) {
+			requireLocalBuild(buildMachine);
 			const refusal = (0, ownership_claim_exports.claimFailure)(err, "stim android");
 			if (refusal) {
 				phaseFailure = fail$1(refusal.code, refusal.message, refusal.remedy, { lastBuildStatus: true });
@@ -1144,12 +1162,13 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 	}
 	/** 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 { mode, machines, localEnabled } = buildPlacementCandidates(buildMachine);
+		if (localEnabled && 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,
+			localEnabled,
 			machines: machines.length,
 			here,
 			unsupported,
@@ -1330,228 +1349,284 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 		});
 		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, {
+	async function prepareSource() {
+		const rekeyedBy = [];
+		const prebuildPlan = planPrebuildFor(root, PLATFORM, {
+			isExpo,
+			fingerprint: hash,
+			sources: fingerprintSources
+		});
+		const prebuildRan = prebuildPlan === "generate" || prebuildPlan === "regenerate";
+		if (prebuildPlan === "refuse") {
+			const refusal = staleNativeDirRefusal(PLATFORM);
+			phaseFailure = fail$1(refusal.code, refusal.message, refusal.remedy, { lastBuildStatus: true });
+			throw new ArtifactRefusal(phaseFailure);
+		}
+		if (prebuildRan) {
+			miss(reasonForMiss([]).reason, true);
+			step("prebuild");
+			recordPrebuild(root, PLATFORM, null);
+			const pre = await prebuild(root, PLATFORM, writer, {
 				isExpo,
-				fingerprint: hash,
-				sources: fingerprintSources
+				clean: prebuildPlan === "regenerate"
 			});
-			const prebuildRan = prebuildPlan === "generate" || prebuildPlan === "regenerate";
-			if (prebuildPlan === "refuse") {
-				const refusal = staleNativeDirRefusal(PLATFORM);
-				phaseFailure = fail$1(refusal.code, refusal.message, refusal.remedy, { lastBuildStatus: true });
-				return false;
-			}
-			if (prebuildRan) {
-				miss(reasonForMiss([]).reason, true);
-				step("prebuild");
-				recordPrebuild(root, PLATFORM, null);
-				const pre = await prebuild(root, PLATFORM, writer, {
-					isExpo,
-					clean: prebuildPlan === "regenerate"
-				});
-				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", `${prebuildPlan === "generate" ? "android/ generated" : "android/ not generated from this fingerprint -> regenerated with --clean"} (${formatDuration(pre.durationMs)})`);
-				androidPackage = detectAndroidPackage(root) || androidPackage;
-				record.bundleId = androidPackage;
-				const after = await refingerprintAfterMutation({
-					projectRoot: root,
-					platform: PLATFORM,
-					previousHash: hash,
-					fingerprint
+			if (pre.failed) {
+				phaseFailure = fail$1(pre.code, pre.reason, pre.remedy, {
+					lastBuildStatus: true,
+					lines: tail(pre.lastLines),
+					logPath: displayPath(root, buildLog)
 				});
-				editedConfig = after ? configInputsChanged(fingerprintSources, after.sources, { prebuildRan }) : [];
-				if (after && !editedConfig.length) recordPrebuild(root, PLATFORM, after.hash);
-				if (after?.moved && !editedConfig.length) {
-					rekeyedBy.push("prebuild");
-					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";
-							lateHit();
-							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`);
-							}
+				throw new ArtifactRefusal(phaseFailure);
+			}
+			phase("prebuild", `${prebuildPlan === "generate" ? "android/ generated" : "android/ not generated from this fingerprint -> regenerated with --clean"} (${formatDuration(pre.durationMs)})`);
+			androidPackage = detectAndroidPackage(root) || androidPackage;
+			record.bundleId = androidPackage;
+		}
+		return {
+			prebuildRan,
+			rekeyedBy,
+			editedConfig: []
+		};
+	}
+	async function revalidateSource(preparation) {
+		const { prebuildRan, rekeyedBy } = preparation;
+		if (prebuildRan) {
+			const after = await refingerprintAfterMutation({
+				projectRoot: root,
+				platform: PLATFORM,
+				previousHash: hash,
+				fingerprint
+			});
+			preparation.editedConfig = after ? configInputsChanged(fingerprintSources, after.sources, { prebuildRan }) : [];
+			const { editedConfig } = preparation;
+			if (after && !editedConfig.length) recordPrebuild(root, PLATFORM, after.hash);
+			if (after?.moved && !editedConfig.length) {
+				rekeyedBy.push("prebuild");
+				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";
+						lateHit();
+						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 (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",
-					slotWaitMs,
-					deviceSlotWaitMs: stats.deviceSlotWaitMs(),
-					reason: record.offloadFallback ?? "offload failed",
-					...fallbackMachine ? { machine: fallbackMachine } : {}
-				});
-				else stats.setPlacement({
-					decision: "here",
-					reason: hereReason,
-					slotWaitMs,
-					deviceSlotWaitMs: stats.deviceSlotWaitMs()
-				});
-				record.builtOn = "here";
-				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,
-						buildDiagnostics: diagnostics,
-						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 = editedConfig.length ? null : await refingerprintAfterMutation({
-					projectRoot: root,
-					platform: PLATFORM,
-					previousHash: beforeBuildHash,
-					fingerprint
-				});
-				const changedDuringBuild = afterBuild ? inputsChangedDuringBuild({
-					platform: PLATFORM,
-					lookup: fingerprintSources,
-					prebuildRan,
-					compiled: storeSources,
-					current: afterBuild.sources
-				}) : editedConfig;
-				if (!afterBuild || changedDuringBuild.length) {
-					record.fingerprint = null;
-					record.cacheKey = null;
-					phase("fingerprint", chalk.yellow(changedDuringBuild.length ? changedDuringBuildLine(changedDuringBuild) : "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,
+		}
+		return apkPath ? { ready: apkPath } : null;
+	}
+	async function acquireRemoteArtifact(offload, { rekeyedBy, editedConfig }) {
+		explainMiss(rekeyedBy);
+		step("compile");
+		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) await compileElsewhere(choice, offload);
+		}
+		return apkPath ? { ready: apkPath } : null;
+	}
+	async function compileHere(offload, { rekeyedBy }) {
+		if (!offload) {
+			explainMiss(rekeyedBy);
+			step("compile");
+		}
+		if (offload) stats.setPlacement({
+			decision: "fell-back",
+			slotWaitMs,
+			deviceSlotWaitMs: stats.deviceSlotWaitMs(),
+			reason: record.offloadFallback ?? "offload failed",
+			...fallbackMachine ? { machine: fallbackMachine } : {}
+		});
+		else stats.setPlacement({
+			decision: "here",
+			reason: hereReason,
+			slotWaitMs,
+			deviceSlotWaitMs: stats.deviceSlotWaitMs()
+		});
+		requireLocalBuild(buildMachine);
+		record.builtOn = "here";
+		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,
+				buildDiagnostics: diagnostics,
+				lines: extracted.length ? [] : tail(built.lastLines),
+				logPath: displayPath(root, buildLog)
+			});
+			throw new ArtifactRefusal(phaseFailure);
+		}
+		apkPath = built.apkPath;
+		stats.setBuildMs(built.durationMs);
+		phase("build", `ok (${formatDuration(built.durationMs)})`);
+		if (built.apkNote) phase("build", chalk.yellow(built.apkNote));
+		return apkPath;
+	}
+	async function validateCompiled({ prebuildRan, editedConfig }) {
+		const beforeBuildHash = storeHash;
+		const afterBuild = editedConfig.length ? null : await refingerprintAfterMutation({
+			projectRoot: root,
+			platform: PLATFORM,
+			previousHash: beforeBuildHash,
+			fingerprint
+		});
+		const changedDuringBuild = afterBuild ? inputsChangedDuringBuild({
+			platform: PLATFORM,
+			lookup: fingerprintSources,
+			prebuildRan,
+			compiled: storeSources,
+			current: afterBuild.sources
+		}) : editedConfig;
+		if (!afterBuild || changedDuringBuild.length) {
+			record.fingerprint = null;
+			record.cacheKey = null;
+			phase("fingerprint", chalk.yellow(changedDuringBuild.length ? changedDuringBuildLine(changedDuringBuild) : "unavailable after Gradle; the build will be installed but not cached"));
+			return "uncacheable";
+		}
+		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)`));
+		}
+		return "cacheable";
+	}
+	async function storeArtifact(artifactPath) {
+		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,
-						fingerprintHash: storeHash,
-						buildPath: apkPath,
-						runOptions: remoteRunOptions
-					});
-				}
+						platform: PLATFORM,
+						key: storeKey
+					},
+					sourcePath: artifactPath,
+					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}`));
 			}
-		} 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();
 		}
-		return true;
+		if (remote) uploadPending = uploadRemoteBuild({
+			logWriter: writer,
+			provider: remote.provider,
+			platform: PLATFORM,
+			projectRoot: root,
+			fingerprintHash: storeHash,
+			buildPath: artifactPath,
+			runOptions: remoteRunOptions
+		});
 	}
-	if (!easBuild) {
-		await prepareCachedArtifact();
-		if (apkPath) lateHit();
-		else if (swapFellBack) miss(reasonForMiss([]).reason);
-		if (!await buildArtifact()) return refused();
+	try {
+		apkPath = await runArtifactLifecycle({
+			resolve: async () => {
+				if (!await resolveInitialFingerprint()) throw new ArtifactRefusal(phaseFailure);
+				if (easBuild) return {
+					kind: "ready",
+					artifact: apkPath
+				};
+				await resolveRemoteArtifact();
+				if (apkPath) return {
+					kind: "cached",
+					artifact: apkPath
+				};
+				miss(reasonForMiss([]).reason);
+				return { kind: "miss" };
+			},
+			claim: useBuildCache ? awaitSharedBuild : void 0,
+			reuse: async (cached) => {
+				apkPath = await prepareCachedArtifact(cached);
+				if (apkPath) lateHit();
+				else if (swapFellBack) miss(reasonForMiss([]).reason);
+				return apkPath;
+			},
+			build: {
+				placement: {
+					select: placeBuild,
+					acquire: acquireRemoteArtifact
+				},
+				admit: async () => {
+					if (!await takeBuildSlot()) throw new ArtifactRefusal(phaseFailure);
+				},
+				prepare: prepareSource,
+				revalidate: revalidateSource,
+				compile: compileHere,
+				validate: validateCompiled,
+				store: storeArtifact
+			},
+			release: () => {
+				if (openOffload.choice) closeOffload(openOffload.choice);
+				releaseHeldLock();
+				releaseHeldSlot();
+			}
+		});
+	} catch (error) {
+		if (error instanceof OffloadRefusal) {
+			const { code, message, remedy } = error;
+			return {
+				ok: false,
+				failure: fail$1(code, message, remedy, { lastBuildStatus: true }),
+				ccache: ccacheActivity
+			};
+		}
+		if (error instanceof ArtifactRefusal) return {
+			ok: false,
+			failure: error.failure,
+			ccache: ccacheActivity
+		};
+		throw error;
 	}
 	return {
 		ok: true,
@@ -1655,11 +1730,41 @@ async function startCollector({ root, slot = "default", serial, packageName, spa
 }
 //#endregion
 //#region src/commands/android/launch.ts
-async function verifyAndroidRun({ root, slot, release, remoteRelease, remoteDevice, verifyReleaseLaunched, verifyLaunched, serial, androidPackage, variant, metroCheck, logsDir, launchedAt, metroPort, isExpo, physical, device, scheme, component = null, phase }) {
-	const runCommand = nativeRunCommand("android", slot, {
-		physical,
-		deviceId: serial
-	});
+function androidProcessRuntime(prepare) {
+	return {
+		prepare,
+		scheme: () => void 0,
+		verificationWaitMs: RELEASE_VERIFY_WAIT_MS,
+		launch: async (_prepared, { serial, androidPackage, remoteDevice, launchRelease }) => remoteDevice ? remoteDevice.launch({
+			serial,
+			packageName: androidPackage,
+			metroPort: null
+		}) : launchRelease({
+			serial,
+			packageName: androidPackage
+		}),
+		verify: async (_prepared, context) => verifyAndroidProcessRun(context)
+	};
+}
+function androidMetroRuntime(prepare) {
+	return {
+		prepare,
+		scheme: (root, apkPath, resolve) => resolve(root, apkPath),
+		verificationWaitMs: DEBUG_VERIFY_STEP_MS,
+		launch: async ({ metroPort }, { serial, androidPackage, scheme, physical, launch }) => launch({
+			serial,
+			packageName: androidPackage,
+			metroPort: metroPort ?? 8081,
+			devClientScheme: scheme,
+			physical
+		}),
+		verify: async ({ metroPort }, context) => verifyAndroidMetroRun({
+			...context,
+			metroPort
+		})
+	};
+}
+async function verifyAndroidProcessRun({ root, slot, remoteDevice, verifyReleaseLaunched, serial, androidPackage, variant, logsDir, launchedAt, phase }) {
 	const readNativeCrashes = () => remoteDevice ? [] : captureNativeCrashes({
 		root,
 		slot,
@@ -1668,30 +1773,42 @@ async function verifyAndroidRun({ root, slot, release, remoteRelease, remoteDevi
 		appId: androidPackage,
 		since: launchedAt
 	}, logsDir);
-	if (remoteRelease) {
+	if (remoteDevice) {
 		phase("verify", chalk.yellow("UNVERIFIED: remote adapter launch accepted; process verification is unavailable"));
 		return { state: LAUNCH_UNVERIFIED };
 	}
-	if (release) {
-		const processCheck = await verifyReleaseLaunched({
-			serial,
-			packageName: androidPackage
-		});
-		const crashes = readNativeCrashes();
-		if (processCheck?.verified && !crashes.length) {
-			phase("verify", `process alive ${formatDuration(processCheck.waitedMs ?? 0)} after launch (${variant}: no bundle fetch to observe)`);
-			return { state: true };
-		}
-		if (processCheck?.reason === "probe-failed" && !crashes.length) {
-			phase("verify", chalk.yellow("UNVERIFIED: the app process check failed"));
-			return { state: LAUNCH_UNVERIFIED };
-		}
-		for (const line of launchErrorPreview(crashes, root)) phase("launch", chalk.red(line));
-		if (!crashes.length) phase("logs", "Process missing; no attributable native crash report captured. Read `stim logs --source device` for available output.");
-		phase("verify", chalk.yellow(crashes.length ? "FATAL: the app reported a native crash" : `FATAL: no ${androidPackage} process on ${serial} ${formatDuration(processCheck?.waitedMs ?? 0)} after launch`));
-		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 processCheck = await verifyReleaseLaunched({
+		serial,
+		packageName: androidPackage
+	});
+	const crashes = readNativeCrashes();
+	if (processCheck?.verified && !crashes.length) {
+		phase("verify", `process alive ${formatDuration(processCheck.waitedMs ?? 0)} after launch (${variant}: no bundle fetch to observe)`);
+		return { state: true };
+	}
+	if (processCheck?.reason === "probe-failed" && !crashes.length) {
+		phase("verify", chalk.yellow("UNVERIFIED: the app process check failed"));
+		return { state: LAUNCH_UNVERIFIED };
 	}
+	for (const line of launchErrorPreview(crashes, root)) phase("launch", chalk.red(line));
+	if (!crashes.length) phase("logs", "Process missing; no attributable native crash report captured. Read `stim logs --source device` for available output.");
+	phase("verify", chalk.yellow(crashes.length ? "FATAL: the app reported a native crash" : `FATAL: no ${androidPackage} process on ${serial} ${formatDuration(processCheck?.waitedMs ?? 0)} after launch`));
+	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 };
+}
+async function verifyAndroidMetroRun({ root, slot, remoteDevice, verifyLaunched, serial, androidPackage, metroCheck, logsDir, launchedAt, metroPort, isExpo, physical, device, scheme, component = null, phase }) {
+	const runCommand = nativeRunCommand("android", slot, {
+		physical,
+		deviceId: serial
+	});
+	const readNativeCrashes = () => remoteDevice ? [] : captureNativeCrashes({
+		root,
+		slot,
+		platform: "android",
+		deviceId: serial,
+		appId: androidPackage,
+		since: launchedAt
+	}, logsDir);
 	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)`);
@@ -1866,7 +1983,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, rebootDevice, dataFreeBytes = androidDataFreeBytes, trimCaches = trimAndroidCaches, wipeDevice = teardownOwnedAvd }) {
+async function finishAndroidRun({ runtime, runtimePreparation, 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) => {
@@ -1998,7 +2115,7 @@ async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCh
 	record.bundleId = androidPackage;
 	if (!androidPackage) return fail(LAUNCH_FAILED, "Could not determine this app's Android package name, so there is nothing to launch.", "Set `expo.android.package` in app.json / app.config.js, or `namespace` in android/app/build.gradle.", { lastBuildStatus: true });
 	if (physical) raiseLeaseFor(0, false);
-	const scheme = release ? void 0 : resolveDevClientScheme(root, apkPath);
+	const scheme = runtime.scheme(root, apkPath, resolveDevClientScheme);
 	enterPhase("launch");
 	const launchTimer = stepTimer(now);
 	const launchedAt = now();
@@ -2015,19 +2132,14 @@ async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCh
 		physical,
 		msg: `launching ${androidPackage} on ${serial}`
 	});
-	const launched = release ? remoteDevice ? remoteDevice.launch({
-		serial,
-		packageName: androidPackage,
-		metroPort: null
-	}) : launchRelease({
+	const launched = await runtime.launch(runtimePreparation, {
 		serial,
-		packageName: androidPackage
-	}) : launch({
-		serial,
-		packageName: androidPackage,
-		metroPort: metroPort ?? 8081,
-		devClientScheme: scheme,
-		physical
+		androidPackage,
+		scheme,
+		physical,
+		remoteDevice,
+		launch,
+		launchRelease
 	});
 	if (launched.failed) {
 		printNativeCrashReport({
@@ -2118,12 +2230,10 @@ async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCh
 		});
 		phase("logs", `${displayPath(root, logsDir)}${collectorPid ? ` (collector pid ${collectorPid})` : ""}`);
 	}
-	if (physical) raiseLeaseFor(release ? RELEASE_VERIFY_WAIT_MS : DEBUG_VERIFY_STEP_MS, false);
-	const { state: launchState, warning: launchWarning, unattributed } = await verifyAndroidRun({
+	if (physical) raiseLeaseFor(runtime.verificationWaitMs, false);
+	const { state: launchState, warning: launchWarning, unattributed } = await runtime.verify(runtimePreparation, {
 		root,
 		slot,
-		release,
-		remoteRelease,
 		remoteDevice: Boolean(remoteDevice),
 		verifyReleaseLaunched,
 		verifyLaunched,
@@ -2446,7 +2556,7 @@ function androidDeviceSelectorRefusal({ settingsContext, slot, systemImageFlag,
 //#endregion
 //#region src/commands/android/next-build.ts
 const DEFAULT_PLAN_DEPS = {
-	findRoot: findProjectRoot$1,
+	findRoot: findProjectRoot,
 	fingerprint: fingerprintProject,
 	listSystemImages: listInstalledSystemImages,
 	avdSystemImage: ownedAvdSystemImage,
@@ -2511,10 +2621,10 @@ async function planAndroid(opts, overrides = {}) {
 	if (flag) return refuse(planFlagRefusal(flag));
 	const root = deps.findRoot(process.cwd());
 	if (!root) return refuse(NO_PROJECT_REFUSAL);
-	const projectProblem = appProjectProblem(root);
-	if (projectProblem) return refuse({
+	const problem = projectProblem(root, "android");
+	if (problem) return refuse({
 		code: "STIM_NO_PROJECT",
-		...projectProblem
+		...problem
 	});
 	const slot = validateDeviceSlot(opts.slot);
 	const settingsContext = {
@@ -2522,8 +2632,9 @@ async function planAndroid(opts, overrides = {}) {
 		gitCommonDir: gitCommonDir(root),
 		repoRoot: repoRoot(root)
 	};
+	const settings = resolveSettings(settingsContext);
 	const planned = resolveAndroidRunPlan({
-		settings: resolveSettings(settingsContext),
+		settings,
 		settingsContext,
 		slot,
 		easProfile: opts.easProfile,
@@ -2608,7 +2719,17 @@ async function planAndroid(opts, overrides = {}) {
 				const local = localImage();
 				if ("refusal" in local || !("systemImage" in choice)) return null;
 				return androidSystemImageAbi(local.systemImage) === androidSystemImageAbi(choice.systemImage);
-			}
+			},
+			...remoteEasFallbackSetting(settings) ? { eas: () => checkEasFallback({
+				root,
+				platform: "android",
+				slot,
+				release: build.release,
+				isExpo,
+				tunnelMode: tunnelModeSetting(settings),
+				publicUrl: publicUrlSetting(settings),
+				localOnlyFlags: typeof opts.systemImage === "string" ? ["--system-image"] : []
+			}) } : {}
 		});
 		if (hostedPlan.kind === "unknown") return refuse({
 			code: "STIM_BAD_ARG",
@@ -2669,12 +2790,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("--remote-build <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 <target>", "Run on eas, proxy, or a named approved Mac from remote.machines; auto places on an approved Mac when this Mac is full or busy", (value) => {
-		if (!parseMachine(value)) throw new InvalidArgumentError("expected eas, proxy, auto, or a tailnet machine name");
+	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("--remote-build <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 <target>", "Run on eas, proxy, or a named approved Mac from remote.machines; auto places on an approved Mac when this Mac is full or busy; local runs here, whatever android.remote says", (value) => {
+		if (!parseMachine(value)) throw new InvalidArgumentError("expected eas, proxy, auto, local, or a tailnet machine name");
 		return value;
 	}).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). Without --device, wait for an owned-device slot (default 600 seconds; --no-wait refuses immediately).").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. Without --device, refuse a full device cap or existing slot queue immediately.").action(async (opts) => {
 		if (opts.plan) return planAndroid(opts);
-		const root = findProjectRoot$1(process.cwd());
+		const root = findProjectRoot(process.cwd());
 		if (!root) {
 			refuseNoProject({ json: Boolean(opts.json) });
 			return;
@@ -2876,9 +2997,9 @@ async function runAndroid(options = {}) {
 	const slot = validateDeviceSlot(options.slot);
 	const started = now();
 	const startedAt = new Date(started).toISOString();
-	const projectProblem = appProjectProblem(root);
-	if (projectProblem) {
-		const { message, remedy } = projectProblem;
+	const problem = projectProblem(root, "android");
+	if (problem) {
+		const { message, remedy } = problem;
 		out(phaseLine("error", chalk.red(`STIM_NO_PROJECT: ${message}`)));
 		out(phaseLine("remedy", remedy));
 		if (json) emit(JSON.stringify({
@@ -3041,6 +3162,7 @@ async function runAndroid(options = {}) {
 	if (!planned.ok) return fail(planned.code, planned.message, planned.remedy, { lines: planned.lines });
 	const { plan } = planned;
 	const deviceSlotWait = {
+		automatic: plan.target.kind === "hosted" && plan.target.machine === "auto",
 		signal: runCancellationSignal(),
 		waitMs: plan.deviceSlotWaitMs,
 		displayName: basename(root),
@@ -3066,6 +3188,16 @@ async function runAndroid(options = {}) {
 		resolveSerial: resolveAvdSerial,
 		prepare: options.prepareHostedAndroid,
 		automatic: options.automaticDevicePlacement,
+		...remoteEasFallbackSetting(settings) ? { eas: () => (options.checkEasFallback ?? checkEasFallback)({
+			root,
+			platform: PLATFORM,
+			slot,
+			release,
+			isExpo,
+			tunnelMode: tunnelModeSetting(settings),
+			publicUrl: publicUrlSetting(settings),
+			localOnlyFlags: [...typeof systemImageFlag === "string" ? ["--system-image"] : [], ...typeof deviceProfileFlag === "string" ? ["--device-profile"] : []]
+		}) } : {},
 		localSelectors: (target) => androidDeviceSelectorRefusal({
 			settingsContext,
 			slot,
@@ -3130,10 +3262,8 @@ async function runAndroid(options = {}) {
 	const reservedPort = project?.metroPort ?? null;
 	let metroPort = null;
 	let devServer = null;
-	let phaseFailure = null;
-	async function resolveMetroPort() {
-		if (release) phase("metro", `skipped (${variant}: the JS bundle is embedded, no dev server is used)`);
-		else if (metroCheck) {
+	async function prepareMetro() {
+		if (metroCheck) {
 			const gate = await ensureDevServer({
 				root,
 				port: reservedPort,
@@ -3145,27 +3275,54 @@ async function runAndroid(options = {}) {
 				readState
 			});
 			reclaimed = [...reclaimed, ...gate.reclaimed];
-			if (!gate.ok) {
-				phaseFailure = fail(gate.code, gate.message, gate.remedy, { lines: gate.lines });
-				return false;
-			}
+			if (!gate.ok) return {
+				ok: false,
+				error: {
+					code: gate.code,
+					message: gate.message,
+					remedy: gate.remedy,
+					lines: gate.lines
+				}
+			};
 			metroPort = gate.port;
 			devServer = gate.devServer;
 			phase("metro", `port ${metroPort} (${devServer ? `started: ${devServer.reason}` : `pid ${gate.pid ?? "unknown, started outside Stim"}`})`);
-			return true;
+			return {
+				ok: true,
+				prepared: { metroPort }
+			};
 		} else {
 			const pin = metroPortSetting(root);
-			if (pin.error) {
-				phaseFailure = fail("STIM_BAD_ARG", pin.error, SETTING_SHAPE_REMEDY);
-				return false;
-			}
+			if (pin.error) return {
+				ok: false,
+				error: {
+					code: "STIM_BAD_ARG",
+					message: pin.error,
+					remedy: SETTING_SHAPE_REMEDY
+				}
+			};
 			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;
+		return {
+			ok: true,
+			prepared: { metroPort }
+		};
 	}
-	if (!await resolveMetroPort()) return phaseFailure;
+	const runtime = options.runtimePlan ?? (release ? androidProcessRuntime(async () => {
+		phase("metro", `skipped (${variant}: the JS bundle is embedded, no dev server is used)`);
+		return {
+			ok: true,
+			prepared: { metroPort: null }
+		};
+	}) : androidMetroRuntime(prepareMetro));
+	const preparation = await runtime.prepare();
+	if (!preparation.ok) {
+		const { code, message, remedy, lines } = preparation.error;
+		return fail(code, message, remedy, { lines });
+	}
+	const runtimePreparation = preparation.prepared;
+	metroPort = runtimePreparation.metroPort;
 	if (remoteContext) {
 		remoteDevice = makeRemoteDeviceDeps(remoteContext.ctx);
 		if (metroPort !== null) {
@@ -3406,6 +3563,7 @@ async function runAndroid(options = {}) {
 			record,
 			fail,
 			phase,
+			enterPhase: progress.step,
 			out,
 			json,
 			useBuildCache,
@@ -3480,6 +3638,8 @@ async function runAndroid(options = {}) {
 		}
 		try {
 			return await finishAndroidRun({
+				runtime,
+				runtimePreparation,
 				slot,
 				lease: leaseHandle,
 				releaseLease,