stim 1.8.0 → 1.10.0

package/dist/{android-BRgBYzU0.mjs → android-DBkeHwpm.mjs}

@@ -1,37 +1,39 @@
-import { t as getExecutor } from "./exec-B29XNuhP.mjs";
-import { B as validateDeviceSlot, C as withConfigLock, E as ownership_claim_exports, F as deviceSlotKey, I as deviceSlotPlatforms, P as deviceSlotFileKey, S as upsertProject, b as setDevice, f as getProject, g as loadConfig, l as getConcurrencyLimits, y as saveConfig } from "./config-B7iyKWkL.mjs";
-import { r as createNdjsonWriter } from "./ndjson-BZwI1NBv.mjs";
-import { _ as workspaceLogsDir, h as workspaceDir, o as writeWorkspaceState, r as readWorkspaceState, s as emulatorLogFile } from "./workspace-state-BT5E3SA2.mjs";
-import { T as removeTemporaryEntry, g as repoRoot, s as gitCommonDir, w as makeTemporaryDirectory } from "./worktree-FG_ZKKdb.mjs";
-import { a as findProjectRoot, c as projectShortcut, i as detectIsExpo, n as detectAndroidPackage, r as detectBundleId, t as appProjectProblem } from "./project-DDZWf_16.mjs";
-import { n as MODE_EXPO, p as writeWorkspaceLaunch, t as MODE_BARE } from "./state-DZobzxLW.mjs";
-import { r as waitForChild, t as createLineReader } from "./process-output-Dl5uKE03.mjs";
-import { a as resolveProjectMetro, i as pidExists, o as signalProcessTree } from "./metro-C7bcJ0uo.mjs";
-import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-Cp52QAK1.mjs";
-import { A as resolveSettings, B as artifactCachePolicy, D as remoteDeviceSettingError, E as remoteAndroidSetting, F as tunnelModeSetting, H as optimizationBuildProfile, I as unknownSettingKeys, N as settingShapeErrors, R as detectProviders, T as publicUrlSetting, U as resolveOptimizations, V as compilerCacheFallbackMessage, a as SETTING_SHAPE_REMEDY, d as cacheProviderSettingError, j as settingFile, k as resolveCacheProviderConfig, r as REMOTE_DEVICE_BACKENDS, s as androidAvdConfigSettingError, u as androidDataPartitionSizeGbSettingError, x as metroWarmupUrlSetting } from "./settings-BXXorVM2.mjs";
-import { B as waitForBoot, E as memoizeEmulatorProbe, F as resetAdoptedAvd, I as resolveOwnedAvdSerial, L as resolvePhysicalDevice, M as physicalDeviceModel, P as probeEmulatorSerial, S as listAdbDevices, _ as emulatorFailureRemedy, a as androidPoolNoCandidatesRefusal, g as emulatorDiskSpaceRemedy, i as androidPoolCandidates, n as androidDeviceAbi, o as androidSystemImageAbi, r as androidHome, s as androidToolCwd, t as androidBuildToolName, v as extractEmulatorFailure, w as listInstalledSystemImages, y as findBuildTool } from "./android-DWssqHQ8.mjs";
-import { _ as launchErrorPreview, c as launchErrorReport, g as stepTimer, h as stepClock, i as formatDuration, l as phaseLine, n as appReadinessMessage, p as shortHash } from "./command-output-B3ycpsYv.mjs";
-import { C as untrackedNativeFiles, D as readAssetManifest, E as compareAssetManifests, S as untrackedMissLine, T as captureAssetManifest, _ as providerUploadOutcome, b as storeBuild, c as buildCacheKey, d as filesystemBuildCapability, f as fingerprintDiffRecord, g as providerDownloadPath, h as prepareProviderDownloadDir, i as releaseBuildLock, l as describeFingerprintMiss, m as fingerprintProject, n as acquireBuildLock, o as takeoverLine, p as fingerprintDiffSuffix, s as waitForBuild, t as WAIT_CEILING_MS, v as refingerprintAfterMutation, w as assetDiffReason, x as storedAssetManifest, y as resolveBuild } from "./build-lock-CgtsB6TV.mjs";
-import { t as cleanLine } from "./server-expo-BVAA1OqJ.mjs";
-import { C as resolveRemote, S as resolveEasCliBin, _ as exitAfterFlush, f as RESOLVE_TIMEOUT_MS, g as easAuthNote, h as checkEasAuth, l as parkedMaxSetting, m as cacheLevel, p as UPLOAD_TIMEOUT_MS, v as isEasAuthFailureText, w as uploadRemote, y as loadProjectProvider } from "./teardown-BJqEzPo_.mjs";
-import { c as ensureWorkspaceStorageSafely, d as launchOutcomeRecord, f as noMetroMessage, g as warmMetro, i as detectEntryFile, m as resolveMetroWithRetry, n as pickDevClientScheme, o as needsPrebuild, p as noMetroRemedy, s as runPrebuild, t as devClientScheme, u as isPhysicalDeviceRequest, v as isEasBuildFailure, y as resolveEasDevelopmentBuild } from "./dev-client-BmT-ioFI.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BYfZz_S-.mjs";
-import { D as verifyAndroidReleaseLaunch, E as unverifiedLaunchLines, O as verifyLaunch, S as launchAndroidReleaseApp, _ as installConflictKind, c as RELEASE_VERIFY_WAIT_MS, d as androidDevClientUrl, g as installAndroidApp, h as deviceShellArg, i as LAUNCH_BUNDLING, l as VERIFY_TIMEOUT_MS, n as DEFAULT_METRO_PORT, o as LAUNCH_FATAL, s as LAUNCH_UNVERIFIED, t as ADB_INSTALL_TIMEOUT_MS, u as androidAppProcess, x as launchAndroidApp } from "./app-install-BDbsSgCl.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-BxRwdufO.mjs";
-import { r as releaseBuildSlot, t as acquireBuildSlot } from "./build-slots-C-oAHRT1.mjs";
-import { a as statsProjectKey, i as recordRunStats, n as readRunEstimates, t as createRunRecorder } from "./stats-BYcZ6n1h.mjs";
-import { i as ensureOwnedDevice, l as AvdBootError, o as unknownAndroidSystemImageRefusal, r as ensureBooted, t as checkDeviceCapacity, u as AvdRecoveryError } from "./device-BUoZyMoR.mjs";
-import { a as ensureMetroReachable, b as ownedSessionName, l as resolveRemoteContext, n as binOnPath, o as ensureRemoteBootOwned, s as remoteAndroidDeps } from "./device-remote-ByN8P6CB.mjs";
-import { a as buildAndroid, c as CCACHE_NOT_RUN, f as resolveCcache, l as CCACHE_UNAVAILABLE, n as resolveAndroidCas, o as productFlavorRefusal, p as formatDiagnostic, r as resolveAndroidCompilerCache, s as readProductFlavors, u as ccacheActivityLine } from "./android-cas-SWIjzeuL.mjs";
-import { d as startBuildHeartbeat, f as tailLines, n as HEARTBEAT_INTERVAL_MS } from "./xcode-B6YaWeg0.mjs";
-import { n as nativeRunCommand, t as launchSlotScope } from "./slot-launch-ZUUe0TQP.mjs";
-import { t as spawnEntry } from "./spawn-entry-nCE6m770.mjs";
-import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-D1Kaf-eT.mjs";
+import { L as deviceSlotFileKey, R as deviceSlotKey, S as setDevice, T as withConfigLock, V as parseDeviceSlotOption, W as validateDeviceSlot, f as getProject, g as loadConfig, k as ownership_claim_exports, l as getConcurrencyLimits, w as upsertProject, x as saveConfig, z as deviceSlotPlatforms } from "./config-BEq0Qw_a.mjs";
+import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
+import { r as createNdjsonWriter } from "./ndjson-CDY9IkVC.mjs";
+import { O as workspaceDir, b as emulatorLogFile, c as signalProcessTree, h as recordWorkspaceUse, i as pidExists, j as workspaceLogsDir, m as readWorkspaceState, s as resolveProjectMetro, y as writeWorkspaceState } from "./metro-BWLOJ_Wr.mjs";
+import { D as makeTemporaryDirectory, O as removeTemporaryEntry, s as gitCommonDir, y as repoRoot } from "./worktree-BlizKDpZ.mjs";
+import { a as detectIsExpo, i as detectBundleId, l as projectShortcut, n as appProjectProblem, o as findProjectRoot, r as detectAndroidPackage } from "./project-BXZzOABt.mjs";
+import { n as MODE_EXPO, p as writeWorkspaceLaunch, t as MODE_BARE } from "./state-WGdIbi_d.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BXA96myD.mjs";
+import { r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
+import { _ as stepTimer, c as launchErrorReport, f as refuseNoProject, g as stepClock, i as formatDuration, l as phaseLine, m as shortHash, n as appReadinessMessage, v as launchErrorPreview } from "./command-output-D5z2_bcF.mjs";
+import { A as resolveBuild, C as fingerprintDiffRecord, D as providerDownloadPath, E as prepareProviderDownloadDir, F as assetDiffReason, I as captureAssetManifest, L as compareAssetManifests, M as storedAssetManifest, N as untrackedMissLine, O as providerUploadOutcome, P as untrackedNativeFiles, R as readAssetManifest, S as filesystemBuildCapability, T as fingerprintProject, _ as waitForBuild, b as describeFingerprintMiss, g as releaseBuildLock, j as storeBuild, k as refingerprintAfterMutation, m as acquireBuildLock, v as waitForSharedBuild, w as fingerprintDiffSuffix, y as buildCacheKey } from "./device-lease-CbEaIk7b.mjs";
+import { n as NO_BUILD_PROGRESS, s as startBuildProgress } from "./build-progress-BXx-ZBe4.mjs";
+import { B as resolvePhysicalDevice, E as listInstalledSystemImages, F as physicalDeviceModel, L as probeEmulatorSerial, O as memoizeEmulatorProbe, R as resetAdoptedAvd, W as waitForBoot, _ as emulatorDiskSpaceRemedy, a as androidPoolNoCandidatesRefusal, b as findBuildTool, i as androidPoolCandidates, n as androidDeviceAbi, o as androidSystemImageAbi, r as androidHome, s as androidToolCwd, t as androidBuildToolName, v as emulatorFailureRemedy, w as listAdbDevices, y as extractEmulatorFailure, z as resolveOwnedAvdSerial } from "./android-787HhP5w.mjs";
+import { A as resolveCacheProviderConfig, E as publicUrlSetting, H as compilerCacheFallbackMessage, I as tunnelModeSetting, L as unknownSettingKeys, M as settingFile, O as remoteAndroidSetting, P as settingShapeErrors, S as metroWarmupUrlSetting, U as optimizationBuildProfile, V as artifactCachePolicy, W as resolveOptimizations, a as SETTING_SHAPE_REMEDY, d as cacheProviderSettingError, j as resolveSettings, r as REMOTE_DEVICE_BACKENDS, s as androidAvdConfigSettingError, u as androidDataPartitionSizeGbSettingError, z as detectProviders } from "./settings-DOugPlPz.mjs";
+import { y as parkedMaxSetting } from "./ownership-DZjdx8Gq.mjs";
+import { a as acquireBuildSlot, s as releaseBuildSlot } from "./in-use-CjUluqIX.mjs";
+import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-D2xbLVoz.mjs";
+import { t as cleanLine } from "./server-expo-BvOCeakp.mjs";
+import { A as UPLOAD_TIMEOUT_MS, B as resolveRemote, F as isEasAuthFailureText, I as loadProjectProvider, M as checkEasAuth, N as easAuthNote, P as exitAfterFlush, V as uploadRemote, a as ensureMetroReachable, c as remoteAndroidDeps, j as cacheLevel, k as RESOLVE_TIMEOUT_MS, n as binOnPath, o as ensureRemoteBootOwned, u as resolveRemoteContext, w as ownedSessionName, z as resolveEasCliBin } from "./device-remote-Dy1jGj3U.mjs";
+import { _ as launchAndroidReleaseApp, d as deviceShellArg, f as installAndroidApp, g as launchAndroidApp, o as androidAppProcess, p as installConflictKind, r as DEFAULT_METRO_PORT, s as androidDevClientUrl, t as ADB_INSTALL_TIMEOUT_MS } from "./app-install-CrJ6t_bv.mjs";
+import { a as VERIFY_TIMEOUT_MS, d as verifyLaunch, i as RELEASE_VERIFY_WAIT_MS, l as unverifiedLaunchLines, n as LAUNCH_FATAL, r as LAUNCH_UNVERIFIED, t as LAUNCH_BUNDLING, u as verifyAndroidReleaseLaunch } from "./launch-verify-CQS_Kg-C.mjs";
+import { d as isEasBuildFailure, f as resolveEasDevelopmentBuild, o as unknownAndroidSystemImageRefusal, r as checkDeviceCapacity } from "./simslim-Ca3487H6.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-Di8Q-9Ro.mjs";
+import { _ as isPhysicalDeviceRequest, b as warmMetro, c as runPrebuild, d as ensureOwnedDevice, f as AvdBootError, g as ensureWorkspaceStorageSafely, h as ensureDevServer, i as detectEntryFile, l as staleNativeDirRefusal, n as pickDevClientScheme, o as planPrebuild, p as AvdRecoveryError, s as recordPrebuild, t as devClientScheme, u as ensureBooted, v as launchOutcomeRecord } from "./dev-client-92U593KT.mjs";
+import { t as budgetGate } from "./budget-BP4jZZL4.mjs";
+import { f as spawnEntry, s as startDevServer } from "./start-F9gv5dcC.mjs";
+import { a as statsProjectKey, i as recordRunStats, n as readRunEstimates, t as createRunRecorder } from "./stats-BAgJaLA4.mjs";
+import { a as buildAndroid, c as CCACHE_NOT_RUN, f as resolveCcache, l as CCACHE_UNAVAILABLE, n as resolveAndroidCas, o as productFlavorRefusal, p as formatDiagnostic, r as resolveAndroidCompilerCache, s as readProductFlavors, u as ccacheActivityLine } from "./android-cas-CITmIeWY.mjs";
+import { d as startBuildHeartbeat, f as tailLines, n as HEARTBEAT_INTERVAL_MS } from "./xcode-B2tBkf0m.mjs";
+import { n as nativeRunCommand, t as launchSlotScope } from "./slot-launch-C5cg0fmk.mjs";
+import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-xxWKNO3-.mjs";
 import { constants, copyFileSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync, renameSync, rmSync } from "node:fs";
 import { InvalidArgumentError } from "commander";
 import { basename, dirname, isAbsolute, join, relative } from "node:path";
-import { createWarnOnce, loadCacheProvider, resolveTieredBuild, storeTieredBuild } from "@stim-cli/cache";
 import chalk from "chalk";
+import { createWarnOnce, loadCacheProvider, resolveTieredBuild, storeTieredBuild } from "@stim-cli/cache";
 //#region src/engine/apk-swap.ts
 const ANDROID_BUNDLE_NAME = "index.android.bundle";
 const LAST_LINES = 5;
@@ -437,7 +439,6 @@ function systemImageRefusal({ slot, flag, resolved, physical, remoteBackend, lis
 function isReleaseVariant(variant) {
 	return typeof variant === "string" && /release$/i.test(variant.trim());
 }
-const NO_METRO = "STIM_NO_METRO";
 const NO_FINGERPRINT = "STIM_NO_FINGERPRINT";
 const NO_DEVICE = "STIM_NO_DEVICE";
 const LAUNCH_FAILED = "STIM_LAUNCH_FAILED";
@@ -643,8 +644,8 @@ 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, needsPrebuildFor, prebuild, build, ccacheFor, swapApk, readState, now }) {
-	const { phase, out, estimates, stats } = progress;
+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;
 	const { variant, release, profile: buildProfile, cas, cache: cachePolicy } = buildPlan;
 	const useBuildCache = cachePolicy.read;
 	let androidPackage = initialPackage;
@@ -715,6 +716,7 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 			stats.setCacheKey(cacheKey);
 			return true;
 		}
+		step("cache-lookup");
 		const fingerprintTimer = stepTimer(now);
 		try {
 			const computed = await fingerprint(root, { platform: PLATFORM });
@@ -841,88 +843,37 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 	if (!easBuild) await resolveRemoteArtifact();
 	let waitedForBuild = null;
 	let releasedWait = null;
-	async function waitForSharedBuild() {
-		if (!useBuildCache) return true;
-		const waitStarted = now();
-		let failedHolder;
-		while (!apkPath) {
-			let attempt = null;
-			try {
-				attempt = acquireLock({
-					platform: PLATFORM,
-					key: cacheKey,
-					root,
-					logFile: buildLog
-				});
-			} catch (err) {
-				const refusal = (0, ownership_claim_exports.claimFailure)(err, "stim android");
-				if (refusal) {
-					phaseFailure = fail$1(refusal.code, refusal.message, refusal.remedy, { lastBuildStatus: true });
-					return false;
-				}
-				phase("build", chalk.yellow(`could not take the build lock: ${err?.message || err}; building anyway`));
-			}
-			if (attempt?.acquired) {
-				buildLock = attempt;
-				const previous = attempt.tookOver ?? failedHolder;
-				if (previous) phase("build", chalk.yellow(takeoverLine(previous)));
-				break;
-			} else if (attempt?.held) {
-				releasedWait = null;
-				const holder = attempt.held;
-				const who = holder.projectRoot || "another workspace";
-				phase("build", `${who} is already building ${shortHash(hash)} (pid ${holder.pid})${holder.logFile ? ` -- tail ${holder.logFile}` : ""} -- stim guide lifecycle concurrency`);
-				let waited = null;
-				try {
-					const ceilingMs = WAIT_CEILING_MS - (now() - waitStarted);
-					if (ceilingMs <= 0) throw Object.assign(/* @__PURE__ */ new Error(`Waited ${formatDuration(now() - waitStarted)} for shared builds without an artifact; ${who} (pid ${holder.pid}) holds ${attempt.path}.`), {
-						code: "STIM_BUILD_WAIT_TIMEOUT",
-						lockPath: attempt.path
-					});
-					waited = await waitForBuild({
-						platform: PLATFORM,
-						key: cacheKey,
-						out,
-						ceilingMs
-					});
-				} catch (err) {
-					const refusal = (0, ownership_claim_exports.claimFailure)(err, "stim android");
-					if (refusal) {
-						phaseFailure = fail$1(refusal.code, refusal.message, refusal.remedy, { lastBuildStatus: true });
-						return false;
-					}
-					const wtErr = err;
-					if (wtErr?.code !== "STIM_BUILD_WAIT_TIMEOUT") throw err;
-					phaseFailure = fail$1("STIM_BUILD_WAIT_TIMEOUT", wtErr.message, `Check pid ${holder.pid}; if it is not really building, remove ${wtErr.lockPath} and run \`stim android\` again.`, { lastBuildStatus: true });
-					return false;
-				}
-				if (waited?.hit) {
-					apkPath = waited.hit ?? null;
-					record.cacheHit = "local";
-					waitedForBuild = {
-						pid: holder.pid,
-						ms: waited.waitedMs
-					};
-					phase("build", `waited ${formatDuration(waited.waitedMs)} for ${who}'s build -> installed from cache -- stim guide lifecycle concurrency`);
-				} else if (waited?.lockReleased) {
-					failedHolder = void 0;
-					releasedWait = {
-						facts: {
-							pid: holder.pid,
-							ms: waited.waitedMs
-						},
-						who
-					};
-					phase("build", `${who}'s build lock was released; rechecking this workspace before building`);
-				} else {
-					phase("build", chalk.yellow(`${who}'s build ended without an artifact (${waited?.builderFailed}); retrying the build lock`));
-					failedHolder = holder;
-				}
-			} else break;
+	if (!easBuild && useBuildCache && !apkPath) {
+		const shared = await waitForSharedBuild({
+			platform: PLATFORM,
+			key: cacheKey,
+			fingerprint: hash,
+			root,
+			logFile: buildLog,
+			command: "stim android",
+			acquire: acquireLock,
+			wait: waitForBuild,
+			now,
+			phase: (text) => {
+				step("wait");
+				phase("build", text);
+			},
+			warn: (text) => phase("build", chalk.yellow(text)),
+			out
+		});
+		if (shared.refusal) {
+			const { code, message, remedy } = shared.refusal;
+			phaseFailure = fail$1(code, message, remedy, { lastBuildStatus: true });
+			return refused();
+		}
+		buildLock = shared.lock;
+		releasedWait = shared.released;
+		if (shared.hit) {
+			apkPath = shared.hit.path;
+			record.cacheHit = "local";
+			waitedForBuild = shared.hit.waited;
 		}
-		return true;
 	}
-	if (!easBuild && !await waitForSharedBuild()) return refused();
 	let swapDir = null;
 	let swapFellBack = false;
 	const installableCachedApk = async (key, cachedPath) => {
@@ -975,8 +926,23 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 				}
 				phase("build", chalk.yellow(`could not take a build slot: ${err?.message || err}; building anyway`));
 			}
-			if (needsPrebuildFor(root, "android", isExpo)) {
-				const pre = await prebuild(root, PLATFORM, writer, { isExpo });
+			const prebuildPlan = planPrebuildFor(root, PLATFORM, {
+				isExpo,
+				fingerprint: hash,
+				sources: fingerprintSources
+			});
+			if (prebuildPlan === "refuse") {
+				const refusal = staleNativeDirRefusal(PLATFORM);
+				phaseFailure = fail$1(refusal.code, refusal.message, refusal.remedy, { lastBuildStatus: true });
+				return false;
+			}
+			if (prebuildPlan === "generate" || prebuildPlan === "regenerate") {
+				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,
@@ -985,8 +951,8 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 					});
 					return false;
 				}
-				phase("prebuild", `android/ generated (${formatDuration(pre.durationMs)})`);
-				androidPackage = androidPackage || detectAndroidPackage(root);
+				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,
@@ -994,6 +960,7 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 					previousHash: hash,
 					fingerprint
 				});
+				if (after) recordPrebuild(root, PLATFORM, after.hash);
 				if (after?.moved) {
 					storeHash = after.hash;
 					storeSources = after.sources;
@@ -1017,6 +984,7 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 				}
 			}
 			if (!apkPath) {
+				step("compile");
 				phase("build", `compiling ${variant || "debug"} with Gradle`);
 				const built = await build({
 					root,
@@ -1147,7 +1115,7 @@ function tail(lines, n = FALLBACK_LINES) {
 }
 //#endregion
 //#region src/commands/android/result.ts
-function androidFacts({ slot, serial, avdName = null, deviceName = null, systemImage = null, fingerprint, cacheKey = null, variant = null, metroPort = null, cacheHit, cacheSkipped = false, waitedForBuild = null, appPath, bundleId, installSkipped = false, launched, ccache = CCACHE_UNAVAILABLE, logs, debugHttpHost = null, debugHttpHostNote = null, devClientUrl = null, durationMs, lease }) {
+function androidFacts({ slot, serial, avdName = null, deviceName = null, systemImage = null, fingerprint, cacheKey = null, variant = null, metroPort = null, cacheHit, cacheSkipped = false, waitedForBuild = null, appPath, bundleId, installSkipped = false, launched, ccache = CCACHE_UNAVAILABLE, logs, debugHttpHost = null, debugHttpHostNote = null, devClientUrl = null, durationMs, lease, devServer = null }) {
 	return {
 		platform: PLATFORM,
 		...slot && slot !== "default" ? { slot } : {},
@@ -1175,7 +1143,8 @@ function androidFacts({ slot, serial, avdName = null, deviceName = null, systemI
 		devClientUrl: devClientUrl ?? null,
 		logs: logs ?? null,
 		durationMs: typeof durationMs === "number" && Number.isFinite(durationMs) ? durationMs : null,
-		...lease === void 0 ? {} : { lease }
+		...lease === void 0 ? {} : { lease },
+		...devServer ? { devServer } : {}
 	};
 }
 function lastBuildRecord({ fingerprint, cacheKey, cacheHit, cacheSkipped = false, durationMs, appPath, bundleId, startedAt, status, errorCode = null, avdName = null, deviceName = null }) {
@@ -1213,7 +1182,7 @@ 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 }) {
+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 }) {
 	recordRun({
 		failed: false,
 		cacheHit: cacheLevel(record.cacheHit),
@@ -1243,16 +1212,20 @@ function reportAndroidResult({ slot, json, useBuildCache, variant, release, metr
 		ccache,
 		logs: logsDir,
 		durationMs,
-		lease
+		lease,
+		devServer
 	});
 	writer.close();
-	if (json) emit(JSON.stringify(facts));
+	if (json) emit(JSON.stringify(reclaimed.length ? {
+		...facts,
+		reclaimed
+	} : facts));
 	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 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 metroResult = release ? `embedded (${variant})` : !metroCheck ? `check skipped on port ${metroPort}` : launchState === "unverified" ? `state unverified on port ${metroPort}` : `running on port ${metroPort}`;
+		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,
 			phaseLine("device", `${deviceName} (${serial})`),
@@ -1508,7 +1481,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, writeState, now, out, emit, recordRun }) {
+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, writeState, now, out, emit, recordRun, reclaimed, devServer, enterPhase }) {
 	let androidPackage = initialPackage;
 	let leaseWarned = false;
 	const raiseLeaseFor = (boundMs, beforeInstall) => {
@@ -1524,6 +1497,7 @@ async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCh
 		}
 		return null;
 	};
+	enterPhase("install");
 	const booted = await bootPromise;
 	const runCommand = nativeRunCommand("android", slot, {
 		physical,
@@ -1575,9 +1549,12 @@ async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCh
 		allowUninstall: release || adopting
 	});
 	if (installed.failed) {
-		const conflict = installConflictKind(installed.reason);
-		const rerun = useBuildCache ? " Then run this command again; it installs the APK from cache without building it again." : " Then run this command again.";
-		const installRemedy = conflict ? `${androidPackage} is already installed on ${serial} ` + (conflict === "signature" ? "with a different signer" : "at a higher versionCode") + `. Uninstall it first (\`adb -s ${serial} uninstall ${androidPackage}\`); its data goes with it.` + rerun : `Check that ${serial} is still connected (\`adb devices\`) and has room for the APK.`;
+		const installRemedy = remoteDevice?.failureRemedy() ?? localInstallRemedy({
+			reason: installed.reason,
+			packageName: androidPackage,
+			serial,
+			useBuildCache
+		});
 		return fail(installed.code || "STIM_INSTALL_FAILED", installed.reason, installRemedy, { lastBuildStatus: true });
 	}
 	if (adopting) try {
@@ -1613,6 +1590,7 @@ async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCh
 	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);
+	enterPhase("launch");
 	const launchTimer = stepTimer(now);
 	const launchedAt = now();
 	writer.write({
@@ -1651,7 +1629,7 @@ async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCh
 			appId: androidPackage,
 			since: launchedAt
 		}, logsDir, (line) => phase("launch", chalk.red(line)), Boolean(remoteDevice));
-		return fail(launched.code || "STIM_LAUNCH_FAILED", launched.reason, `Check the app installed correctly (\`adb -s ${serial} shell pm list packages ${androidPackage}\`).`, { lastBuildStatus: true });
+		return fail(launched.code || "STIM_LAUNCH_FAILED", launched.reason, launchRemedy(remoteDevice, serial, androidPackage), { lastBuildStatus: true });
 	}
 	writer.write({
 		src: "build",
@@ -1671,17 +1649,15 @@ async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCh
 	} catch (error) {
 		out(phaseLine("state", chalk.yellow(`could not record Android launch: ${error?.message || error}`)));
 	}
-	const reversedSummary = (launched.reversed ?? []).join(", ") || `tcp:${metroPort}->tcp:${metroPort}`;
-	if (!release && launched.debugHttpHost) phase("metro", `debug_http_host ${launched.debugHttpHost} + adb reverse ${reversedSummary}`);
-	else if (!release) {
-		phase("metro", chalk.yellow(`adb reverse ${reversedSummary}; ${launched.debugHttpHostNote || "debug_http_host not written"}`));
-		writer.write({
-			src: "build",
-			level: "warn",
-			event: "debug_http_host_failed",
-			msg: `debug_http_host was not written for ${androidPackage} on ${serial}: ${launched.debugHttpHostNote || "unknown reason"}`
-		});
-	}
+	if (!release) reportMetroRoute({
+		launched,
+		remote: Boolean(remoteDevice),
+		metroPort,
+		androidPackage,
+		serial,
+		phase,
+		writer
+	});
 	if (launched.devClientNote) {
 		phase("metro", chalk.yellow(launched.devClientNote));
 		writer.write({
@@ -1704,7 +1680,21 @@ async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCh
 		out
 	});
 	const remoteRelease = Boolean(remoteDevice && release);
-	if (!remoteRelease) {
+	if (remoteDevice) {
+		killPreviousCollector(root, {
+			slot,
+			kill,
+			isAlive: pidAlive,
+			verify: verifyCollector,
+			note: (line) => out(phaseLine("logs", line))
+		});
+		writer.write({
+			src: "build",
+			level: "info",
+			event: "collector_skipped",
+			msg: `remote session ${serial}: device logs come from agent-device/EAS, so no adb logcat collector is attached`
+		});
+	} else {
 		if (physical) raiseLeaseFor(0, false);
 		const collectorPid = await startCollector({
 			root,
@@ -1780,7 +1770,9 @@ async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCh
 		writer,
 		emit,
 		lease: physical ? leaseFacts : void 0,
-		recordRun
+		recordRun,
+		reclaimed,
+		devServer
 	});
 	if (remoteWasAbandoned || uploadWasAbandoned) exitAfterFlush(0);
 	return {
@@ -1788,6 +1780,33 @@ async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCh
 		facts
 	};
 }
+function localInstallRemedy({ reason, packageName, serial, useBuildCache }) {
+	const conflict = installConflictKind(reason);
+	if (!conflict) return `Check that ${serial} is still connected (\`adb devices\`) and has room for the APK.`;
+	const rerun = useBuildCache ? " Then run this command again; it installs the APK from cache without building it again." : " Then run this command again.";
+	return `${packageName} is already installed on ${serial} ` + (conflict === "signature" ? "with a different signer" : "at a higher versionCode") + `. Uninstall it first (\`adb -s ${serial} uninstall ${packageName}\`); its data goes with it.` + rerun;
+}
+function launchRemedy(remoteDevice, serial, packageName) {
+	return remoteDevice?.failureRemedy() ?? `Check the app installed correctly (\`adb -s ${serial} shell pm list packages ${packageName}\`).`;
+}
+function reportMetroRoute({ launched, remote, metroPort, androidPackage, serial, phase, writer }) {
+	if (remote) {
+		phase("metro", `public origin ${launched.jsLocation}`);
+		return;
+	}
+	const reversedSummary = (launched.reversed ?? []).join(", ") || `tcp:${metroPort}->tcp:${metroPort}`;
+	if (launched.debugHttpHost) {
+		phase("metro", `debug_http_host ${launched.debugHttpHost} + adb reverse ${reversedSummary}`);
+		return;
+	}
+	phase("metro", chalk.yellow(`adb reverse ${reversedSummary}; ${launched.debugHttpHostNote || "debug_http_host not written"}`));
+	writer.write({
+		src: "build",
+		level: "warn",
+		event: "debug_http_host_failed",
+		msg: `debug_http_host was not written for ${androidPackage} on ${serial}: ${launched.debugHttpHostNote || "unknown reason"}`
+	});
+}
 function diagnoseBootFailure(booted, logFile, runCommand, physical) {
 	return noDeviceDiagnostic({
 		reason: booted.reason ?? "The emulator did not boot.",
@@ -1858,8 +1877,6 @@ function resolveAndroidRunPlan({ settings, settingsContext, slot, easProfile, va
 	if (dataPartitionSizeError) return fail("STIM_BAD_ARG", dataPartitionSizeError, "Set android.dataPartitionSizeGb to a whole number of GiB from 6 through 16384.");
 	const avdConfigError = validateAvdConfig(settings, root);
 	if (avdConfigError) return fail("STIM_BAD_ARG", avdConfigError, "Use only documented android.avdConfig keys, or an android.avdConfigFile fragment contained by the app directory.");
-	const remoteSettingError = remoteDeviceSettingError(settings);
-	if (remoteSettingError) return fail("STIM_BAD_ARG", remoteSettingError, `Set ios.remote and android.remote to one of: ${REMOTE_DEVICE_BACKENDS.join(", ")}.`);
 	const systemImage = resolveSystemImage(systemImageFlag, settings);
 	const variant = easProfile !== void 0 ? "debug" : resolveVariant(variantFlag, settings);
 	const flavorRefusal = productFlavorRefusal({
@@ -1932,36 +1949,51 @@ 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. Never starts the bundler -- run `stim start` first.").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)", validateDeviceSlot).option("--json", "Emit the facts as a single JSON line on stdout; every other line goes to stderr").option("--no-metro-check", "Skip the reserved-port Metro health check (the app will load no bundle unless something else serves it)").option("--no-build-cache", "Build fresh, ignoring cached artifacts (local and the project's build-cache provider); the fresh build still replaces the cache entry").option("--variant <name>", "Gradle variant to assemble and install (e.g. productionDebug on a flavored project); overrides the android.variant setting. A variant ending in Release embeds the JS bundle and skips Metro entirely. Default: debug").option("--system-image <id>", "Android system image to create this workspace's owned AVD from, as the sdkmanager package id (e.g. \"system-images;android-36;google_apis;arm64-v8a\"). Overrides the android.systemImage setting for this invocation. An unknown id refuses with STIM_BAD_ARG and prints the installed images.").option("--device [serial]", "Install and launch on a connected physical device instead of this workspace's owned emulator. With no serial, the first connected device this workspace can lease is used. Stim never creates, boots, or deletes a physical device.").option("--remote <backend>", "Install and launch on a remote device with proxy or EAS. Builds are local unless --eas-profile selects an existing EAS build.", (value) => {
+	program.command("android").description("Build (or install from the shared cache), install and launch this workspace's Android app on its owned emulator, wired to the reserved Metro port. A Debug run starts the dev server when it is not running.").option("--eas-profile <name>", "Download a matching EAS development build; on a miss, print the build command without running it").option("--slot <name>", "Reusable device slot within this workspace (default: default)", parseDeviceSlotOption).option("--json", "Emit the facts as a single JSON line on stdout; every other line goes to stderr").option("--no-metro-check", "Skip the reserved-port Metro health check and do not start it (the app will load no bundle unless something else serves it)").option("--no-build-cache", "Build fresh, ignoring cached artifacts (local and the project's build-cache provider); the fresh build still replaces the cache entry").option("--variant <name>", "Gradle variant to assemble and install (e.g. productionDebug on a flavored project); overrides the android.variant setting. A variant ending in Release embeds the JS bundle and skips Metro entirely. Default: debug").option("--system-image <id>", "Android system image to create this workspace's owned AVD from, as the sdkmanager package id (e.g. \"system-images;android-36;google_apis;arm64-v8a\"). Overrides the android.systemImage setting for this invocation. An unknown id refuses with STIM_BAD_ARG and prints the installed images.").option("--device [serial]", "Install and launch on a connected physical device instead of this workspace's owned emulator. With no serial, the first connected device this workspace can lease is used. Stim never creates, boots, or deletes a physical device.").option("--remote <backend>", "Install and launch on a remote device with proxy or EAS. Builds are local unless --eas-profile selects an existing EAS build.", (value) => {
 		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) => {
 		const root = findProjectRoot(process.cwd());
 		if (!root) {
-			console.error(chalk.red("Not in a React Native project (no package.json found)."));
-			process.exit(1);
+			refuseNoProject({ json: Boolean(opts.json) });
 			return;
 		}
-		if (!(await withWorkspaceProcessLock(workspaceDir(root), "native-run", () => runAndroid({
-			root,
-			slot: opts.slot,
-			easProfile: opts.easProfile,
-			json: Boolean(opts.json),
-			metroCheck: opts.metroCheck !== false,
-			useBuildCache: opts.buildCache !== false,
-			variant: opts.variant ?? null,
-			systemImage: opts.systemImage ?? null,
-			remoteDevice: opts.remote ?? null,
-			device: opts.device ?? null,
-			wait: opts.wait,
-			waitConflict: waitFlagConflict(process.argv)
-		}), {
+		if (!(await withWorkspaceProcessLock(workspaceDir(root), "native-run", async (claim) => {
+			recordWorkspaceUse(root);
+			const progress = startBuildProgress({
+				root,
+				platform: "android",
+				slot: opts.slot ?? "default",
+				claim,
+				note: (line) => console.error(chalk.dim(line))
+			});
+			try {
+				return await runAndroid({
+					root,
+					slot: opts.slot,
+					easProfile: opts.easProfile,
+					json: Boolean(opts.json),
+					metroCheck: opts.metroCheck !== false,
+					useBuildCache: opts.buildCache !== false,
+					variant: opts.variant ?? null,
+					systemImage: opts.systemImage ?? null,
+					remoteDevice: opts.remote ?? null,
+					device: opts.device ?? null,
+					wait: opts.wait,
+					waitConflict: waitFlagConflict(process.argv),
+					progress
+				});
+			} finally {
+				progress.clear();
+			}
+		}, {
 			external: true,
-			waitMs: 18e5
+			waitMs: 18e5,
+			declareSpawns: true
 		})).ok) process.exit(1);
 	});
 }
-function resolveRunAndroidOptions({ root, json = false, remoteDevice: commandRemoteBackend = null, resolveSettingsFor = resolveSettings, resolveRemoteDeviceContext = resolveRemoteContext, remoteDeviceDeps: makeRemoteDeviceDeps = remoteAndroidDeps, resolveEasBin = resolveEasCliBin, ensureMetroReachable: ensureRemoteMetro = ensureMetroReachable, ensureRemoteBootOwned: ensureRemoteOwned = ensureRemoteBootOwned, detectRemoteProviders = detectProviders, metroCheck = true, useBuildCache = true, easProfile, resolveEasDevelopmentBuild: resolveEasBuild = resolveEasDevelopmentBuild, variant: variantFlag = null, systemImage: systemImageFlag = null, device: deviceFlag = null, wait: waitFlag = void 0, waitConflict = false, acquireLease = acquireRunLease, makeRunLease = runLease, selectPool = selectFromPool, onLeaseSignal = releaseLeaseOnSignal, listDevices = listAdbDevices, deviceModel = physicalDeviceModel, deviceAbi = androidDeviceAbi, isEmulatorDevice = probeEmulatorSerial, readApkPackage = (apkPath) => apkPackage(dumpApkManifest(apkPath)), getLimits = getConcurrencyLimits, checkCapacity = checkDeviceCapacity, acquireSlot = acquireBuildSlot, releaseSlot = releaseBuildSlot, ensureDevice = ensureOwnedDevice, listSystemImages = listInstalledSystemImages, ensureDeviceBooted = ensureBooted, resolveAvdSerial = resolveOwnedAvdSerial, waitForDeviceBoot = waitForBoot, resolveMetro = resolveProjectMetro, warmMetro: prewarmMetro = warmMetro, resolveMetroRetrying = resolveMetroWithRetry, readState = readWorkspaceState, pidAlive = pidExists, verifyCollector = verifyCollectorOwnership, verifyLaunched = verifyLaunch, ensureStorage = ensureWorkspaceStorageSafely, fingerprint = fingerprintProject, untracked = untrackedNativeFiles, resolveCached = resolveBuild, storeCached = storeBuild, storedAssets = storedAssetManifest, captureAssets = captureAssetManifest, acquireLock = acquireBuildLock, releaseLock = releaseBuildLock, waitForBuild: waitForBuild$1 = waitForBuild, loadProvider = loadProjectProvider, easAuth = checkEasAuth, resolveRemoteBuild = resolveRemote, uploadRemoteBuild = uploadRemote, resolveCacheProvider = resolveCacheProviderConfig, loadCacheProviderModule = loadCacheProvider, needsPrebuildFor = needsPrebuild, prebuild = runPrebuild, build = buildAndroid, ccacheFor = resolveCcache, install = installAndroidApp, launch = launchAndroidApp, launchRelease = launchAndroidReleaseApp, verifyReleaseLaunched = verifyAndroidReleaseLaunch, swapApk = swapApkBundle, resolveDevClientScheme = androidDevClientScheme, spawn = (cmd, args, opts) => getExecutor().spawn(cmd, args, opts), kill = (pid, signal) => process.kill(pid, signal), createWriter = createNdjsonWriter, writeLaunch = writeWorkspaceLaunch, writeState = writeWorkspaceState, recordStats = recordRunStats, readEstimates = readRunEstimates, now = Date.now, out = (line) => console.error(line), emit = (line) => console.log(line) } = {}) {
+function resolveRunAndroidOptions({ root, json = false, remoteDevice: commandRemoteBackend = null, resolveSettingsFor = resolveSettings, resolveRemoteDeviceContext = resolveRemoteContext, remoteDeviceDeps: makeRemoteDeviceDeps = remoteAndroidDeps, resolveEasBin = resolveEasCliBin, ensureMetroReachable: ensureRemoteMetro = ensureMetroReachable, ensureRemoteBootOwned: ensureRemoteOwned = ensureRemoteBootOwned, detectRemoteProviders = detectProviders, metroCheck = true, useBuildCache = true, easProfile, resolveEasDevelopmentBuild: resolveEasBuild = resolveEasDevelopmentBuild, variant: variantFlag = null, systemImage: systemImageFlag = null, device: deviceFlag = null, wait: waitFlag = void 0, waitConflict = false, acquireLease = acquireRunLease, makeRunLease = runLease, selectPool = selectFromPool, onLeaseSignal = releaseLeaseOnSignal, listDevices = listAdbDevices, deviceModel = physicalDeviceModel, deviceAbi = androidDeviceAbi, isEmulatorDevice = probeEmulatorSerial, readApkPackage = (apkPath) => apkPackage(dumpApkManifest(apkPath)), getLimits = getConcurrencyLimits, checkCapacity = checkDeviceCapacity, acquireSlot = acquireBuildSlot, releaseSlot = releaseBuildSlot, ensureDevice = ensureOwnedDevice, listSystemImages = listInstalledSystemImages, ensureDeviceBooted = ensureBooted, resolveAvdSerial = resolveOwnedAvdSerial, waitForDeviceBoot = waitForBoot, resolveMetro = resolveProjectMetro, warmMetro: prewarmMetro = warmMetro, startServer = startDevServer, readState = readWorkspaceState, pidAlive = pidExists, verifyCollector = verifyCollectorOwnership, verifyLaunched = verifyLaunch, ensureStorage = ensureWorkspaceStorageSafely, fingerprint = fingerprintProject, untracked = untrackedNativeFiles, resolveCached = resolveBuild, storeCached = storeBuild, storedAssets = storedAssetManifest, captureAssets = captureAssetManifest, acquireLock = acquireBuildLock, releaseLock = releaseBuildLock, waitForBuild: waitForBuild$1 = waitForBuild, loadProvider = loadProjectProvider, easAuth = checkEasAuth, resolveRemoteBuild = resolveRemote, uploadRemoteBuild = uploadRemote, resolveCacheProvider = resolveCacheProviderConfig, loadCacheProviderModule = loadCacheProvider, planPrebuildFor = planPrebuild, prebuild = runPrebuild, build = buildAndroid, ccacheFor = resolveCcache, install = installAndroidApp, launch = launchAndroidApp, launchRelease = launchAndroidReleaseApp, verifyReleaseLaunched = verifyAndroidReleaseLaunch, swapApk = swapApkBundle, resolveDevClientScheme = androidDevClientScheme, spawn = (cmd, args, opts) => getExecutor().spawn(cmd, args, opts), kill = (pid, signal) => process.kill(pid, signal), createWriter = createNdjsonWriter, writeLaunch = writeWorkspaceLaunch, writeState = writeWorkspaceState, recordStats = recordRunStats, readEstimates = readRunEstimates, now = Date.now, out = (line) => console.error(line), emit = (line) => console.log(line) } = {}) {
 	return {
 		root,
 		json,
@@ -2002,7 +2034,7 @@ function resolveRunAndroidOptions({ root, json = false, remoteDevice: commandRem
 		waitForDeviceBoot,
 		resolveMetro,
 		prewarmMetro,
-		resolveMetroRetrying,
+		startServer,
 		readState,
 		pidAlive,
 		verifyCollector,
@@ -2023,7 +2055,7 @@ function resolveRunAndroidOptions({ root, json = false, remoteDevice: commandRem
 		uploadRemoteBuild,
 		resolveCacheProvider,
 		loadCacheProviderModule,
-		needsPrebuildFor,
+		planPrebuildFor,
 		prebuild,
 		build,
 		ccacheFor,
@@ -2055,6 +2087,10 @@ function androidSlotOptions(options) {
 			...args,
 			slot
 		}),
+		ensureDeviceBooted: (args) => base.ensureDeviceBooted({
+			...args,
+			slot
+		}),
 		checkCapacity: (args) => base.checkCapacity({
 			...args,
 			slot
@@ -2094,7 +2130,8 @@ function avdSetupFailure(error, root, logFile) {
 	};
 }
 async function runAndroid(options = {}) {
-	let { root, json, commandRemoteBackend, resolveSettingsFor, resolveRemoteDeviceContext, makeRemoteDeviceDeps, resolveEasBin, ensureRemoteMetro, ensureRemoteOwned, detectRemoteProviders, metroCheck, useBuildCache: requestedBuildCache, easProfile, resolveEasBuild, variantFlag, systemImageFlag, deviceFlag, waitFlag, waitConflict, acquireLease, makeRunLease, selectPool, onLeaseSignal, listDevices, deviceModel, deviceAbi, isEmulatorDevice, readApkPackage, getLimits, checkCapacity, acquireSlot, releaseSlot, ensureDevice, listSystemImages, ensureDeviceBooted, resolveAvdSerial, waitForDeviceBoot, resolveMetro, prewarmMetro, resolveMetroRetrying, readState, pidAlive, verifyCollector, verifyLaunched, ensureStorage, fingerprint, untracked, resolveCached, storeCached, storedAssets, captureAssets, acquireLock, releaseLock, waitForBuild, loadProvider, easAuth, resolveRemoteBuild, uploadRemoteBuild, resolveCacheProvider, loadCacheProviderModule, needsPrebuildFor, prebuild, build, ccacheFor, install, launch, launchRelease, verifyReleaseLaunched, swapApk, resolveDevClientScheme, spawn, kill, createWriter, writeLaunch, writeState, recordStats, readEstimates, now, out, emit } = androidSlotOptions(options);
+	let { root, json, commandRemoteBackend, resolveSettingsFor, resolveRemoteDeviceContext, makeRemoteDeviceDeps, resolveEasBin, ensureRemoteMetro, ensureRemoteOwned, detectRemoteProviders, metroCheck, useBuildCache: requestedBuildCache, easProfile, resolveEasBuild, variantFlag, systemImageFlag, deviceFlag, waitFlag, waitConflict, acquireLease, makeRunLease, selectPool, onLeaseSignal, listDevices, deviceModel, deviceAbi, isEmulatorDevice, readApkPackage, getLimits, checkCapacity, acquireSlot, releaseSlot, ensureDevice, listSystemImages, ensureDeviceBooted, resolveAvdSerial, waitForDeviceBoot, resolveMetro, prewarmMetro, startServer, readState, pidAlive, verifyCollector, verifyLaunched, ensureStorage, fingerprint, untracked, resolveCached, storeCached, storedAssets, captureAssets, acquireLock, releaseLock, waitForBuild, loadProvider, easAuth, resolveRemoteBuild, uploadRemoteBuild, resolveCacheProvider, loadCacheProviderModule, planPrebuildFor, prebuild, build, ccacheFor, install, launch, launchRelease, verifyReleaseLaunched, swapApk, resolveDevClientScheme, spawn, kill, createWriter, writeLaunch, writeState, recordStats, readEstimates, now, out, emit } = androidSlotOptions(options);
+	const progress = options.progress ?? NO_BUILD_PROGRESS;
 	const slot = validateDeviceSlot(options.slot);
 	const started = now();
 	const startedAt = new Date(started).toISOString();
@@ -2159,10 +2196,12 @@ async function runAndroid(options = {}) {
 		platform: PLATFORM,
 		write: recordStats,
 		now,
-		note: (line) => out(phaseLine("stats", chalk.dim(line)))
+		note: (line) => out(phaseLine("stats", chalk.dim(line))),
+		phases: () => progress.durations()
 	});
 	const recordRun = stats.record;
 	let ccacheActivity = CCACHE_NOT_RUN;
+	let reclaimed = [];
 	const fail = (code, message, remedy, { lastBuildStatus = false, diagnostics = [], lines = [], logPath = null, lease } = {}) => {
 		if (lastBuildStatus) persistLastBuild({
 			writeState,
@@ -2188,7 +2227,8 @@ async function runAndroid(options = {}) {
 			message,
 			remedy: remedy ?? null,
 			...ccacheActivity.status === "not-run" ? {} : { ccache: ccacheActivity },
-			...lease === void 0 ? {} : { lease }
+			...lease === void 0 ? {} : { lease },
+			...reclaimed.length ? { reclaimed } : {}
 		}));
 		writer.close();
 		return {
@@ -2243,6 +2283,19 @@ async function runAndroid(options = {}) {
 	const useBuildCache = cachePolicy.read;
 	const physical = target.kind === "physical";
 	const remoteBackend = target.kind === "remote" ? target.backend : null;
+	const budget = await (options.checkBudget ?? budgetGate)({
+		root,
+		note: out
+	});
+	reclaimed = budget.reclaimed;
+	if (budget.refusal) return fail(budget.refusal.code, budget.refusal.message, budget.refusal.remedy);
+	const remoteContext = remoteBackend ? await resolveRemoteDeviceContext({
+		root,
+		platform: PLATFORM,
+		backend: remoteBackend,
+		easBin: resolveEasBin(root)?.file ?? null
+	}) : null;
+	if (remoteContext && "failed" in remoteContext) return fail(remoteContext.code ?? "STIM_NO_REMOTE_SESSION", remoteContext.failed, remoteContext.remedy);
 	const easBuild = await resolveEasBuild({
 		root,
 		platform: PLATFORM,
@@ -2267,46 +2320,37 @@ async function runAndroid(options = {}) {
 	let remoteDevice = null;
 	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) {
-			if (!reservedPort) {
-				phaseFailure = fail(NO_METRO, "No Metro port is reserved for this workspace.", "Run `stim start` first, or pass --no-metro-check.");
-				return false;
-			}
-			const held = await resolveMetroRetrying(resolveMetro, reservedPort, root, { onRetry: ({ delayMs }) => phase("metro", `port ${reservedPort} did not verify yet; retrying in ${Math.round(delayMs / 1e3)}s (Metro may still be indexing)`) });
-			if (!held.metro) {
-				const supervisor = readState(root)?.supervisor ?? null;
-				const supervisorAlive = Boolean(supervisor?.pid && pidAlive(supervisor.pid));
-				phaseFailure = fail(NO_METRO, noMetroMessage({
-					port: reservedPort,
-					resolution: held,
-					supervisor,
-					supervisorAlive
-				}), noMetroRemedy({
-					port: reservedPort,
-					supervisor,
-					supervisorAlive
-				}));
+			const gate = await ensureDevServer({
+				root,
+				port: reservedPort,
+				settings,
+				remote: remoteContext !== null,
+				note: out,
+				resolve: resolveMetro,
+				start: startServer,
+				readState
+			});
+			reclaimed = [...reclaimed, ...gate.reclaimed];
+			if (!gate.ok) {
+				phaseFailure = fail(gate.code, gate.message, gate.remedy, { lines: gate.lines });
 				return false;
 			}
-			phase("metro", `port ${reservedPort} (pid ${held.metro?.pid})`);
+			metroPort = gate.port;
+			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;
 		return true;
 	}
 	if (!await resolveMetroPort()) return phaseFailure;
-	if (remoteBackend) {
-		const resolved = await resolveRemoteDeviceContext({
-			root,
-			label,
-			platform: PLATFORM,
-			backend: remoteBackend,
-			easBin: resolveEasBin(root)?.file ?? null
-		});
-		if ("failed" in resolved) return fail(resolved.code ?? "STIM_NO_REMOTE_SESSION", resolved.failed, resolved.remedy);
-		remoteDevice = makeRemoteDeviceDeps(resolved.ctx);
+	if (remoteContext) {
+		remoteDevice = makeRemoteDeviceDeps(remoteContext.ctx);
 		if (metroPort !== null) {
 			const reachable = await ensureRemoteMetro({
 				ctx: remoteDevice.ctx,
@@ -2389,6 +2433,7 @@ async function runAndroid(options = {}) {
 		const boot = () => Promise.resolve(ensureDeviceBooted({
 			platform: PLATFORM,
 			device,
+			projectPath: root,
 			out,
 			logFile: emuLog
 		})).catch((e) => ({
@@ -2404,6 +2449,7 @@ async function runAndroid(options = {}) {
 			boot,
 			createdSessionId: remoteDevice.createdSessionId,
 			abandonCreatedSession: remoteDevice.abandonCreatedSession,
+			webPreviewUrl: remoteDevice.webPreviewUrl,
 			writeState,
 			register: registerProject
 		}) : boot()).then((result) => {
@@ -2457,7 +2503,8 @@ async function runAndroid(options = {}) {
 				phase,
 				out,
 				estimates,
-				stats
+				stats,
+				step: progress.step
 			}
 		}, {
 			deviceAbi,
@@ -2477,7 +2524,7 @@ async function runAndroid(options = {}) {
 			loadCacheProviderModule,
 			acquireSlot,
 			releaseSlot,
-			needsPrebuildFor,
+			planPrebuildFor,
 			prebuild,
 			build,
 			ccacheFor,
@@ -2590,7 +2637,10 @@ async function runAndroid(options = {}) {
 				now,
 				out,
 				emit,
-				recordRun
+				recordRun,
+				reclaimed,
+				devServer,
+				enterPhase: progress.step
 			});
 		} finally {
 			releaseLease();
@@ -2607,4 +2657,4 @@ async function runAndroid(options = {}) {
 	}
 }
 //#endregion
-export { NO_DEVICE, NO_FINGERPRINT, NO_METRO, androidDevClientScheme, androidFacts, androidSystemImageSetting, androidVariantSetting, apkDevClientFacts, apkPackage, collectorLogFile, androidCommand as default, displayPath, dumpApkManifest, findAapt, formatDuration, isReleaseVariant, killPreviousCollector, lastBuildRecord, noDeviceDiagnostic, parseXmltree, phaseLine, registerAndroid, resolveSystemImage, resolveVariant, runAndroid, shortHash, startCollector };
+export { NO_DEVICE, NO_FINGERPRINT, androidDevClientScheme, androidFacts, androidSystemImageSetting, androidVariantSetting, apkDevClientFacts, apkPackage, collectorLogFile, androidCommand as default, displayPath, dumpApkManifest, findAapt, formatDuration, isReleaseVariant, killPreviousCollector, lastBuildRecord, noDeviceDiagnostic, parseXmltree, phaseLine, registerAndroid, resolveSystemImage, resolveVariant, runAndroid, shortHash, startCollector };