stim 1.1.0 → 1.3.0

package/dist/{android-DnZlT3aU.mjs → android-CqcW1hrP.mjs}

@@ -1,34 +1,35 @@
-import { t as getExecutor } from "./exec-bsN9MJXb.mjs";
-import { C as withConfigLock, S as upsertProject, f as getProject, g as loadConfig, l as getConcurrencyLimits, y as saveConfig } from "./config-D7uu8Gbq.mjs";
-import { r as createNdjsonWriter } from "./ndjson-DcAtEx_K.mjs";
-import { D as workspaceLogsDir, T as workspaceDir, _ as writeWorkspaceState, g as writeWorkspaceLaunch, n as MODE_EXPO, p as readWorkspaceState, t as MODE_BARE, v as emulatorLogFile } from "./state-IYEY-zi8.mjs";
-import { C as removeTemporaryEntry, S as makeTemporaryDirectory, g as repoRoot, s as gitCommonDir } from "./worktree-Dx3ZC5lS.mjs";
-import { a as findProjectRoot, c as projectShortcut, i as detectIsExpo, n as detectAndroidPackage, r as detectBundleId, t as appProjectProblem } from "./project-COj6nzzh.mjs";
+import { t as getExecutor } from "./exec-CyylIdq9.mjs";
+import { C as withConfigLock, I as deviceSlotKey, L as deviceSlotPlatforms, S as upsertProject, V as validateDeviceSlot, b as setDevice, f as getProject, g as loadConfig, l as getConcurrencyLimits, y as saveConfig } from "./config-CcefMY2Q.mjs";
+import { r as createNdjsonWriter } from "./ndjson-BZwI1NBv.mjs";
+import { D as workspaceLogsDir, T as workspaceDir, _ as writeWorkspaceState, g as writeWorkspaceLaunch, n as MODE_EXPO, p as readWorkspaceState, t as MODE_BARE, v as emulatorLogFile } from "./state-B3XA2wp2.mjs";
+import { C as removeTemporaryEntry, S as makeTemporaryDirectory, g as repoRoot, s as gitCommonDir } from "./worktree-Eq6TLH8N.mjs";
+import { a as findProjectRoot, c as projectShortcut, i as detectIsExpo, n as detectAndroidPackage, r as detectBundleId, t as appProjectProblem } from "./project-fKmuIaMI.mjs";
 import { r as waitForChild, t as createLineReader } from "./process-output-C7IlIzd7.mjs";
-import { i as resolveProjectMetro, r as pidExists } from "./metro-B01H3EuD.mjs";
-import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-D8HmSv2E.mjs";
-import { a as easAuthNote, c as loadProjectProvider, d as resolveEasCliBin, f as resolveRemote, i as checkEasAuth, n as UPLOAD_TIMEOUT_MS, o as exitAfterFlush, p as uploadRemote, r as cacheLevel, s as isEasAuthFailureText, t as RESOLVE_TIMEOUT_MS, x as parkedMaxSetting } from "./remote-cache-DOi5-zLj.mjs";
-import { A as settingFile, B as compilerCacheFallbackMessage, E as remoteDeviceSettingError, F as unknownSettingKeys, H as resolveOptimizations, L as detectProviders, M as settingShapeErrors, O as resolveCacheProviderConfig, P as tunnelModeSetting, T as remoteAndroidSetting, V as optimizationBuildProfile, a as SETTING_SHAPE_REMEDY, d as cacheProviderSettingError, k as resolveSettings, r as REMOTE_DEVICE_BACKENDS, s as androidAvdConfigSettingError, u as androidDataPartitionSizeGbSettingError, w as publicUrlSetting, z as artifactCachePolicy } from "./settings-BSwrY4FZ.mjs";
+import { i as resolveProjectMetro, r as pidExists } from "./metro-CORqXyTL.mjs";
+import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-8O073GIC.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-8wHMEde0.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, 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-oZIQRbdD.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-vE45ZzJZ.mjs";
-import { r as claimFailure } from "./ownership-claim-CeJLEpjD.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-BlHXnYYs.mjs";
-import { r as releaseBuildSlot, t as acquireBuildSlot } from "./build-slots-CgacA9zQ.mjs";
-import { c as ensureWorkspaceStorageSafely, d as noMetroMessage, f as noMetroRemedy, i as detectEntryFile, n as pickDevClientScheme, o as needsPrebuild, p as resolveMetroWithRetry, s as runPrebuild, t as devClientScheme, u as launchOutcomeRecord } from "./dev-client-Bvky1hya.mjs";
-import { a as statsProjectKey, i as recordRunStats, n as readRunEstimates, t as createRunRecorder } from "./stats-wqxPm7Tv.mjs";
-import { E as physicalDeviceModel, O as probeEmulatorSerial, _ as listAdbDevices, a as androidSystemImageAbi, b as memoizeEmulatorProbe, f as emulatorDiskSpaceRemedy, h as findBuildTool, i as androidPoolNoCandidatesRefusal, j as resolvePhysicalDevice, k as resetAdoptedAvd, m as extractEmulatorFailure, n as androidHome, p as emulatorFailureRemedy, r as androidPoolCandidates, t as androidDeviceAbi, y as listInstalledSystemImages } from "./android-xmyGBNy5.mjs";
-import { S as unknownAndroidSystemImageRefusal, _ as checkDeviceCapacity, b as ensureOwnedDevice, f as startBuildHeartbeat, p as tailLines, r as HEARTBEAT_INTERVAL_MS, y as ensureBooted } from "./xcode-CDB6fytw.mjs";
-import { a as ensureMetroReachable, b as ownedSessionName, l as resolveRemoteContext, n as binOnPath, o as ensureRemoteBootOwned, s as remoteAndroidDeps } from "./device-remote-CCgkG82J.mjs";
-import { t as cleanLine } from "./server-expo-BEMr_m6p.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-DGlTStWu.mjs";
+import { r as claimFailure } from "./ownership-claim-Bf2CAfw3.mjs";
+import { $ as providerDownloadPath, C as memoizeEmulatorProbe, G as buildCacheKey, J as filesystemBuildCapability, K as describeFingerprintMiss, L as waitForBoot, M as resetAdoptedAvd, N as resolveOwnedAvdSerial, P as resolvePhysicalDevice, Q as prepareProviderDownloadDir, R as WAIT_CEILING_MS, U as takeoverLine, V as releaseBuildLock, W as waitForBuild, X as fingerprintDiffSuffix, Y as fingerprintDiffRecord, Z as fingerprintProject, _ as findBuildTool, a as androidSystemImageAbi, at as untrackedMissLine, ct as captureAssetManifest, et as providerUploadOutcome, g as extractEmulatorFailure, h as emulatorFailureRemedy, i as androidPoolNoCandidatesRefusal, it as storedAssetManifest, j as probeEmulatorSerial, k as physicalDeviceModel, lt as compareAssetManifests, m as emulatorDiskSpaceRemedy, n as androidHome, nt as resolveBuild, ot as untrackedNativeFiles, r as androidPoolCandidates, rt as storeBuild, st as assetDiffReason, t as androidDeviceAbi, tt as refingerprintAfterMutation, ut as readAssetManifest, x as listInstalledSystemImages, y as listAdbDevices, z as acquireBuildLock } from "./android-BqVIJoG7.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-DEJf6_kJ.mjs";
+import { t as cleanLine } from "./server-expo-DizT4OMk.mjs";
+import { C as uploadRemote, S as resolveRemote, _ as isEasAuthFailureText, c as parkedMaxSetting, d as RESOLVE_TIMEOUT_MS, f as UPLOAD_TIMEOUT_MS, g as exitAfterFlush, h as easAuthNote, m as checkEasAuth, p as cacheLevel, v as loadProjectProvider, x as resolveEasCliBin } from "./teardown-ClFp1Aax.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-BjisHDB5.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-3NcQnZ0X.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-DIp9riNx.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-CPbLGfrB.mjs";
+import { r as releaseBuildSlot, t as acquireBuildSlot } from "./build-slots-C3-R4XQr.mjs";
+import { a as statsProjectKey, i as recordRunStats, n as readRunEstimates, t as createRunRecorder } from "./stats-BR-kwj0B.mjs";
+import { C as unknownAndroidSystemImageRefusal, _ as AvdRecoveryError, b as ensureBooted, f as startBuildHeartbeat, p as tailLines, r as HEARTBEAT_INTERVAL_MS, v as checkDeviceCapacity, x as ensureOwnedDevice } from "./xcode-D7sAp-Zy.mjs";
+import { a as ensureMetroReachable, b as ownedSessionName, l as resolveRemoteContext, n as binOnPath, o as ensureRemoteBootOwned, s as remoteAndroidDeps } from "./device-remote-AkYCKS8U.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-BR5YJBYv.mjs";
+import { n as nativeRunCommand, t as launchSlotScope } from "./slot-launch-cci0xvmC.mjs";
 import { t as spawnEntry } from "./spawn-entry-nCE6m770.mjs";
-import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-B5IJwv3-.mjs";
+import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-DHC31rXA.mjs";
 import { existsSync, mkdirSync, openSync, readFileSync, readdirSync, rmSync } from "node:fs";
 import { InvalidArgumentError } from "commander";
 import { basename, dirname, join, relative } from "node:path";
-import chalk from "chalk";
 import { createWarnOnce, loadCacheProvider, resolveTieredBuild, storeTieredBuild } from "@stim-cli/cache";
+import chalk from "chalk";
 //#region src/engine/apk-swap.ts
 const ANDROID_BUNDLE_NAME = "index.android.bundle";
 const ANDROID_BUNDLE_ENTRY = `assets/${ANDROID_BUNDLE_NAME}`;
@@ -399,7 +400,12 @@ function androidSystemImageSetting(settings) {
 function resolveSystemImage(flag, settings) {
 	return (typeof flag === "string" && flag.trim() !== "" ? flag.trim() : null) || androidSystemImageSetting(settings);
 }
-function systemImageRefusal({ flag, resolved, physical, remoteBackend, listImages }) {
+function systemImageRefusal({ slot, flag, resolved, physical, remoteBackend, listImages }) {
+	if (slot && slot !== "default" && remoteBackend) return {
+		code: "STIM_BAD_ARG",
+		message: "Named slots currently support local simulators and physical devices.",
+		remedy: "Use the default slot for a remote session."
+	};
 	if (typeof flag === "string" && flag.trim() === "") return {
 		code: "STIM_BAD_ARG",
 		message: "--system-image was given an empty id.",
@@ -624,9 +630,10 @@ function androidBuildOptions({ release, physical, device, variant, deviceAbi, co
 }
 //#endregion
 //#region src/commands/android/result.ts
-function androidFacts({ 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 }) {
 	return {
 		platform: PLATFORM,
+		...slot && slot !== "default" ? { slot } : {},
 		serial: serial ?? null,
 		avdName: avdName ?? null,
 		deviceName: deviceName ?? avdName ?? null,
@@ -689,7 +696,7 @@ async function finishAndroidUpload(uploadPending, remote, phase) {
 	}
 	return false;
 }
-function reportAndroidResult({ 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 }) {
 	recordRun({
 		failed: false,
 		cacheHit: cacheLevel(record.cacheHit),
@@ -697,6 +704,7 @@ function reportAndroidResult({ json, useBuildCache, variant, release, metroCheck
 		durationMs
 	});
 	const facts = androidFacts({
+		slot,
 		serial,
 		avdName: record.avdName,
 		deviceName: record.deviceName,
@@ -765,18 +773,18 @@ function persistLastBuild({ writeState, root, record, startedAt, durationMs, sta
 function collectorEntry() {
 	return spawnEntry("collector-run");
 }
-function collectorLogFile(root) {
-	return join(workspaceLogsDir(root), `collector-${PLATFORM}.log`);
+function collectorLogFile(root, slot = "default") {
+	return join(workspaceLogsDir(root), `collector-${deviceSlotKey(PLATFORM, slot)}.log`);
 }
 const COLLECTOR_EXIT_WAIT_MS = 2e3;
 const COLLECTOR_POLL_MS = 25;
-function killPreviousCollector(root, { platform = PLATFORM, kill = (pid, signal) => process.kill(pid, signal), collectors = null, verify = verifyCollectorOwnership, isAlive = pidExists, note = (_line) => {} } = {}) {
-	const record = (collectors ?? readCollectors(root))?.[platform];
+function killPreviousCollector(root, { platform = PLATFORM, slot = "default", kill = (pid, signal) => process.kill(pid, signal), collectors = null, verify = verifyCollectorOwnership, isAlive = pidExists, note = (_line) => {} } = {}) {
+	const record = (collectors ?? readCollectors(root))?.[deviceSlotKey(platform, slot)];
 	const pid = Number(record?.pid);
 	if (!Number.isFinite(pid) || pid <= 0 || pid === process.pid) return null;
 	const ownership = verify({
 		pid,
-		platform,
+		platform: deviceSlotKey(platform, slot),
 		root,
 		isAlive,
 		expected: record
@@ -793,8 +801,9 @@ function killPreviousCollector(root, { platform = PLATFORM, kill = (pid, signal)
 		return null;
 	}
 }
-async function startCollector({ root, serial, packageName, spawn, kill, alive = pidExists, verify = verifyCollectorOwnership, waitMs = COLLECTOR_EXIT_WAIT_MS, sleep = (ms) => new Promise((r) => setTimeout(r, ms)), out }) {
+async function startCollector({ root, slot = "default", serial, packageName, spawn, kill, alive = pidExists, verify = verifyCollectorOwnership, waitMs = COLLECTOR_EXIT_WAIT_MS, sleep = (ms) => new Promise((r) => setTimeout(r, ms)), out }) {
 	const previousPid = killPreviousCollector(root, {
+		slot,
 		kill,
 		isAlive: alive,
 		verify,
@@ -807,7 +816,7 @@ async function startCollector({ root, serial, packageName, spawn, kill, alive =
 	let stdio = "ignore";
 	try {
 		mkdirSync(workspaceLogsDir(root), { recursive: true });
-		const fd = openSync(collectorLogFile(root), "a");
+		const fd = openSync(collectorLogFile(root, slot), "a");
 		stdio = [
 			"ignore",
 			fd,
@@ -821,6 +830,7 @@ async function startCollector({ root, serial, packageName, spawn, kill, alive =
 			PLATFORM,
 			"--root",
 			root,
+			...slot === "default" ? [] : ["--slot", slot],
 			"--serial",
 			serial,
 			"--package",
@@ -840,9 +850,14 @@ async function startCollector({ root, serial, packageName, spawn, kill, alive =
 }
 //#endregion
 //#region src/commands/android/launch.ts
-async function verifyAndroidRun({ root, release, remoteRelease, remoteDevice, verifyReleaseLaunched, verifyLaunched, serial, androidPackage, variant, metroCheck, logsDir, launchedAt, metroPort, isExpo, physical, scheme, component = null, phase }) {
+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
+	});
 	const readNativeCrashes = () => remoteDevice ? [] : captureNativeCrashes({
 		root,
+		slot,
 		platform: "android",
 		deviceId: serial,
 		appId: androidPackage,
@@ -872,7 +887,13 @@ async function verifyAndroidRun({ root, release, remoteRelease, remoteDevice, ve
 		phase("", chalk.yellow("A release process exited before readiness. Run `stim logs --errors` for captured crash reports, or `stim logs --source device` for the full device output."));
 		return { state: LAUNCH_FATAL };
 	}
+	const newEmulator = Boolean(device.created && device.owned && !remoteDevice);
+	const timeoutMs = newEmulator ? 6e4 : VERIFY_TIMEOUT_MS;
+	if (metroCheck && newEmulator) phase("verify", "waiting up to 60s for bundle load (new emulator)");
 	const verification = metroCheck ? await verifyLaunched({
+		timeoutMs,
+		requireBundleResponse: true,
+		slot: launchSlotScope(root, slot),
 		onReadinessPending: () => phase("readiness", "waiting for app readiness (up to 30s after bundle load)"),
 		logsDir,
 		since: launchedAt,
@@ -904,10 +925,10 @@ async function verifyAndroidRun({ root, release, remoteRelease, remoteDevice, ve
 		phase("verify", chalk.red(`FATAL after ${formatDuration(verification.waitedMs ?? 0)}: ${reason}`));
 		for (const line of launchErrorPreview(verification.errors ?? [], root)) phase("", chalk.red(line));
 		if (verification.processAlive === false && !verification.errors?.some((record) => record.event === "native_crash")) phase("logs", "No attributable native crash report captured yet. Run `stim logs --errors` again for delayed reports, or `stim logs --source device` for available output.");
-		if (nativeFatal || verification.processAlive === false) phase("remedy", chalk.yellow(`Fix the crash, then restart the app: \`adb -s ${deviceShellArg(serial)} shell am force-stop ${deviceShellArg(androidPackage)}\`, then run \`stim android\` again. A crashed Android process can remain alive behind the system crash dialog; Metro reload cannot recover it.`));
+		if (nativeFatal || verification.processAlive === false) phase("remedy", chalk.yellow(`Fix the crash, then restart the app: \`adb -s ${deviceShellArg(serial)} shell am force-stop ${deviceShellArg(androidPackage)}\`, then run \`${runCommand}\` again. A crashed Android process can remain alive behind the system crash dialog; Metro reload cannot recover it.`));
 		else if (verification.processAlive === true && metroPort !== null) {
 			const reloadRemedy = physical ? `run \`agent-device metro reload --metro-port ${metroPort}\`.` : "run `stim reload android`.";
-			phase("remedy", chalk.yellow(`The native app is still running. ${deliveryFailed ? "Check the Metro logs and device connection, then" : "Fix the JavaScript or TypeScript error, then"} ${reloadRemedy} Do not run \`stim android\` unless native inputs changed or the app process exits.`));
+			phase("remedy", chalk.yellow(`The native app is still running. ${deliveryFailed ? "Check the Metro logs and device connection, then" : "Fix the JavaScript or TypeScript error, then"} ${reloadRemedy} Do not run \`${runCommand}\` unless native inputs changed or the app process exits.`));
 		}
 		return { state: LAUNCH_FATAL };
 	}
@@ -918,7 +939,7 @@ async function verifyAndroidRun({ root, release, remoteRelease, remoteDevice, ve
 		for (const line of report.lines) phase("launch", chalk.yellow(line));
 		if (report.lines.length > 0 && verification.processAlive === true && metroPort !== null) {
 			const reloadRemedy = physical ? `run \`agent-device metro reload --metro-port ${metroPort}\`.` : "run `stim reload android`.";
-			phase("remedy", chalk.yellow(`The native app is still running. Fix the JavaScript or TypeScript error; Fast Refresh should apply the edit. If the error screen remains, ${reloadRemedy} Do not run \`stim android\` unless native inputs changed or the app process exits.`));
+			phase("remedy", chalk.yellow(`The native app is still running. Fix the JavaScript or TypeScript error; Fast Refresh should apply the edit. If the error screen remains, ${reloadRemedy} Do not run \`${runCommand}\` unless native inputs changed or the app process exits.`));
 		}
 		return {
 			state: true,
@@ -947,7 +968,29 @@ async function verifyAndroidRun({ root, release, remoteRelease, remoteDevice, ve
 	})) phase("", chalk.yellow(line));
 	return { state: LAUNCH_UNVERIFIED };
 }
-async function finishAndroidRun({ lease, releaseLease, root, json, metroCheck, useBuildCache, variant, release, isExpo, metroPort, logsDir, emuLog, device, physical, remoteDevice, bootPromise, 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 resolveInstallSerial({ root, slot, device, physical, remoteDevice, serial, resolveAvdSerial, waitForDeviceBoot, phase }) {
+	if (physical || remoteDevice || !device.owned || !device.avdName) return serial;
+	const resolved = resolveAvdSerial(device.avdName, { timeoutMs: 5e3 });
+	if (!resolved.serial) throw new Error(`Could not verify a running owned AVD ${device.avdName} before installation.`);
+	if (resolved.serial !== serial) {
+		phase("device", `${device.avdName} changed serial (${serial} -> ${resolved.serial}); checking readiness before installation`);
+		const ready = await waitForDeviceBoot(resolved.serial, 6e4, { commandTimeoutMs: 5e3 });
+		if (!ready.ok) throw new Error(`Emulator ${resolved.serial} never reported boot completion. Diagnostic: ${JSON.stringify(ready.diagnostic)}`);
+		if (resolveAvdSerial(device.avdName, { timeoutMs: 5e3 }).serial !== resolved.serial) throw new Error(`Could not verify AVD ${device.avdName} still runs on ${resolved.serial} after checking readiness.`);
+		phase("device", `reopen agent-device on ${resolved.serial}`);
+	}
+	const consolePort = Number(resolved.serial.replace(/^emulator-/, ""));
+	withConfigLock(() => {
+		const current = deviceSlotPlatforms(loadConfig()?.projects?.[root], slot)?.android;
+		if (!current?.owned || current.avdName !== device.avdName) throw new Error("The owned emulator assignment changed before installation.");
+		if (current.consolePort !== consolePort) setDevice(root, PLATFORM, {
+			...current,
+			consolePort
+		}, slot);
+	});
+	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 }) {
 	let androidPackage = initialPackage;
 	let leaseWarned = false;
 	const raiseLeaseFor = (boundMs, beforeInstall) => {
@@ -964,11 +1007,15 @@ async function finishAndroidRun({ lease, releaseLease, root, json, metroCheck, u
 		return null;
 	};
 	const booted = await bootPromise;
+	const runCommand = nativeRunCommand("android", slot, {
+		physical,
+		deviceId: booted.serial
+	});
 	if (booted.failed) {
 		const diag = noDeviceDiagnostic({
 			reason: booted.reason ?? "The emulator did not boot.",
 			logFile: emuLog,
-			remedy: "Run `stim status` to see what Stim thinks it owns; re-running `stim android` creates a fresh owned AVD.",
+			remedy: `Run \`stim status\` to see what Stim thinks it owns; re-running \`${runCommand}\` creates a fresh owned AVD.`,
 			localEmulator: !physical
 		});
 		return fail(NO_DEVICE, diag.message, diag.remedy, {
@@ -976,7 +1023,22 @@ async function finishAndroidRun({ lease, releaseLease, root, json, metroCheck, u
 			logPath: diag.logPath ? displayPath(root, diag.logPath) : null
 		});
 	}
-	const serial = booted.serial;
+	let serial;
+	try {
+		serial = await resolveInstallSerial({
+			root,
+			slot,
+			device,
+			physical,
+			remoteDevice,
+			serial: booted.serial,
+			resolveAvdSerial,
+			waitForDeviceBoot,
+			phase
+		});
+	} catch (error) {
+		return fail(NO_DEVICE, error instanceof Error ? error.message : String(error), `Run \`stim status\` to inspect the owned AVD, then retry \`${runCommand}\`; the APK was not installed.`);
+	}
 	phase("device", physical ? `${device.deviceName || serial} (${serial}) connected, not owned by Stim` : `${device.avdName || serial} (${serial}) ${device.adopted || device.adoptionPending ? "adopted" : "booted"} ${bootDuration()}`);
 	const packageFromApk = readApkPackage(apkPath);
 	if (packageFromApk && androidPackage && packageFromApk !== androidPackage) phase("install", chalk.dim(`applicationId ${packageFromApk} (from the APK; project files say ${androidPackage})`));
@@ -1008,7 +1070,7 @@ async function finishAndroidRun({ lease, releaseLease, root, json, metroCheck, u
 	if (adopting) try {
 		withConfigLock(() => {
 			const config = loadConfig();
-			const current = config?.projects?.[root]?.platforms?.android;
+			const current = deviceSlotPlatforms(config?.projects?.[root], slot)?.android;
 			if (!config || !current || current.avdName !== device.avdName) throw new Error("The adopted emulator assignment changed during installation.");
 			delete current.adoptionPending;
 			saveConfig(config);
@@ -1070,6 +1132,7 @@ async function finishAndroidRun({ lease, releaseLease, root, json, metroCheck, u
 	if (launched.failed) {
 		printNativeCrashReport({
 			root,
+			slot,
 			platform: "android",
 			deviceId: serial,
 			appId: androidPackage,
@@ -1132,6 +1195,7 @@ async function finishAndroidRun({ lease, releaseLease, root, json, metroCheck, u
 		if (physical) raiseLeaseFor(0, false);
 		const collectorPid = await startCollector({
 			root,
+			slot,
 			serial,
 			packageName: androidPackage,
 			spawn,
@@ -1145,6 +1209,7 @@ async function finishAndroidRun({ lease, releaseLease, root, json, metroCheck, u
 	if (physical) raiseLeaseFor(release ? RELEASE_VERIFY_WAIT_MS : DEBUG_VERIFY_STEP_MS, false);
 	const { state: launchState, warning: launchWarning } = await verifyAndroidRun({
 		root,
+		slot,
 		release,
 		remoteRelease,
 		remoteDevice: Boolean(remoteDevice),
@@ -1159,6 +1224,7 @@ async function finishAndroidRun({ lease, releaseLease, root, json, metroCheck, u
 		metroPort,
 		isExpo,
 		physical,
+		device,
 		scheme,
 		component: launched.component ?? null,
 		phase
@@ -1177,6 +1243,7 @@ async function finishAndroidRun({ lease, releaseLease, root, json, metroCheck, u
 	const leaseFacts = lease?.facts() ?? null;
 	releaseLease();
 	const facts = reportAndroidResult({
+		slot,
 		json,
 		useBuildCache,
 		variant,
@@ -1239,7 +1306,7 @@ 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("--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. The build still happens here.", (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. 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) => {
 		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) => {
@@ -1249,8 +1316,10 @@ function registerAndroid(program) {
 			process.exit(1);
 			return;
 		}
-		if (!(await runAndroid({
+		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,
@@ -1260,10 +1329,13 @@ function registerAndroid(program) {
 			device: opts.device ?? null,
 			wait: opts.wait,
 			waitConflict: waitFlagConflict(process.argv)
+		}), {
+			external: true,
+			waitMs: 18e5
 		})).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, 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, resolveMetro = resolveProjectMetro, 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, 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) } = {}) {
 	return {
 		root,
 		json,
@@ -1277,6 +1349,8 @@ function resolveRunAndroidOptions({ root, json = false, remoteDevice: commandRem
 		detectRemoteProviders,
 		metroCheck,
 		useBuildCache,
+		easProfile,
+		resolveEasBuild,
 		variantFlag,
 		systemImageFlag,
 		deviceFlag,
@@ -1298,7 +1372,10 @@ function resolveRunAndroidOptions({ root, json = false, remoteDevice: commandRem
 		ensureDevice,
 		listSystemImages,
 		ensureDeviceBooted,
+		resolveAvdSerial,
+		waitForDeviceBoot,
 		resolveMetro,
+		prewarmMetro,
 		resolveMetroRetrying,
 		readState,
 		pidAlive,
@@ -1342,8 +1419,38 @@ function resolveRunAndroidOptions({ root, json = false, remoteDevice: commandRem
 		emit
 	};
 }
+function androidSlotOptions(options) {
+	const base = resolveRunAndroidOptions(options);
+	const slot = validateDeviceSlot(options.slot);
+	if (slot === "default") return base;
+	return {
+		...base,
+		ensureDevice: (args) => base.ensureDevice({
+			...args,
+			slot
+		}),
+		checkCapacity: (args) => base.checkCapacity({
+			...args,
+			slot
+		}),
+		selectPool: (args) => base.selectPool({
+			...args,
+			slot
+		}),
+		acquireLease: (args) => base.acquireLease({
+			...args,
+			slot
+		}),
+		makeRunLease: (args) => base.makeRunLease({
+			...args,
+			slot
+		}),
+		writeLaunch: ((projectRoot, platform, record) => base.writeLaunch(projectRoot, platform, record, slot))
+	};
+}
 async function runAndroid(options = {}) {
-	let { root, json, commandRemoteBackend, resolveSettingsFor, resolveRemoteDeviceContext, makeRemoteDeviceDeps, resolveEasBin, ensureRemoteMetro, ensureRemoteOwned, detectRemoteProviders, metroCheck, useBuildCache: requestedBuildCache, variantFlag, systemImageFlag, deviceFlag, waitFlag, waitConflict, acquireLease, makeRunLease, selectPool, onLeaseSignal, listDevices, deviceModel, deviceAbi, isEmulatorDevice, readApkPackage, getLimits, checkCapacity, acquireSlot, releaseSlot, ensureDevice, listSystemImages, ensureDeviceBooted, resolveMetro, 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 } = resolveRunAndroidOptions(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);
+	const slot = validateDeviceSlot(options.slot);
 	const started = now();
 	const startedAt = new Date(started).toISOString();
 	const projectProblem = appProjectProblem(root);
@@ -1388,8 +1495,11 @@ async function runAndroid(options = {}) {
 		};
 	}
 	const logsDir = workspaceLogsDir(root);
-	const buildLog = join(logsDir, "build-android.ndjson");
-	const writer = createWriter(buildLog, { truncate: true });
+	const buildLog = join(logsDir, `build-${deviceSlotKey("android", slot)}.ndjson`);
+	const writer = createWriter(buildLog, {
+		truncate: true,
+		fields: { slot }
+	});
 	const record = {
 		fingerprint: null,
 		cacheKey: null,
@@ -1514,7 +1624,7 @@ async function runAndroid(options = {}) {
 	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 = resolveVariant(variantFlag, settings);
+	const variant = easProfile !== void 0 ? "debug" : resolveVariant(variantFlag, settings);
 	const flavorRefusal = productFlavorRefusal({
 		flavors: readProductFlavors(root),
 		variant
@@ -1524,7 +1634,7 @@ async function runAndroid(options = {}) {
 	const cachePolicy = artifactCachePolicy(optimizations, requestedBuildCache, release);
 	const useBuildCache = cachePolicy.read;
 	const isExpo = detectIsExpo(root);
-	const physical = deviceFlag !== null && deviceFlag !== void 0 && deviceFlag !== false;
+	const physical = isPhysicalDeviceRequest(deviceFlag);
 	if (physical && deviceFlag === "") return fail("STIM_BAD_ARG", "--device was given an empty serial.", "Pass `--device` on its own to take the first connected device this workspace can lease, or `--device <serial>` to name one.");
 	if (physical && commandRemoteBackend) return fail("STIM_BAD_ARG", "--device installs on a device connected to this machine, and --remote installs on a remote one.", "Pass only one of --device and --remote.");
 	const noWait = waitFlag === false;
@@ -1536,6 +1646,7 @@ async function runAndroid(options = {}) {
 	const waitSeconds = waitParsed.seconds;
 	const remoteBackend = physical ? null : commandRemoteBackend ?? remoteAndroidSetting(settings);
 	const imageRefusal = systemImageRefusal({
+		slot,
 		flag: systemImageFlag,
 		resolved: systemImage,
 		physical,
@@ -1543,6 +1654,17 @@ async function runAndroid(options = {}) {
 		listImages: listSystemImages
 	});
 	if (imageRefusal) return fail(imageRefusal.code, imageRefusal.message, imageRefusal.remedy);
+	const easBuild = await resolveEasBuild({
+		root,
+		platform: PLATFORM,
+		profile: easProfile,
+		note: out,
+		isExpo,
+		physical,
+		selectors: [variantFlag],
+		buildCache: requestedBuildCache
+	});
+	if (isEasBuildFailure(easBuild)) return fail(easBuild.code, easBuild.message, easBuild.remedy);
 	const requestedSerial = typeof deviceFlag === "string" ? deviceFlag : null;
 	let androidPackage = detectAndroidPackage(root);
 	record.bundleId = androidPackage;
@@ -1673,7 +1795,8 @@ async function runAndroid(options = {}) {
 			const diag = noDeviceDiagnostic({
 				reason: `Could not ensure an owned Android emulator: ${err?.message || err}`,
 				logFile: emuLog,
-				remedy: "Check that JAVA_HOME and ANDROID_HOME are set correctly, and that an arm64 system image is installed (`sdkmanager \"system-images;android-36;google_apis;arm64-v8a\"`)."
+				localEmulator: !(err instanceof AvdRecoveryError),
+				remedy: err instanceof AvdRecoveryError ? err.remedy : "Check that JAVA_HOME and ANDROID_HOME are set correctly, and that an arm64 system image is installed (`sdkmanager \"system-images;android-36;google_apis;arm64-v8a\"`)."
 			});
 			return fail(NO_DEVICE, diag.message, diag.remedy, {
 				lines: diag.lines,
@@ -1753,6 +1876,18 @@ async function runAndroid(options = {}) {
 	let storeSources = [];
 	let apkPath = null;
 	async function resolveInitialFingerprint() {
+		if (easBuild?.ok) {
+			hash = storeHash = easBuild.fingerprint;
+			cacheKey = storeKey = easBuild.cacheKey;
+			apkPath = easBuild.path;
+			record.fingerprint = hash;
+			record.cacheKey = cacheKey;
+			record.cacheHit = easBuild.cacheHit;
+			record.cacheSkipped = !useBuildCache;
+			providerName = "eas";
+			stats.setCacheKey(cacheKey);
+			return true;
+		}
 		const fingerprintTimer = stepTimer(now);
 		try {
 			const computed = await fingerprint(root, { platform: PLATFORM });
@@ -1825,6 +1960,13 @@ async function runAndroid(options = {}) {
 		return true;
 	}
 	const runFromFingerprint = async () => {
+		if (metroCheck && metroPort !== null && optimizations.metroWarmup) prewarmMetro({
+			port: metroPort,
+			platform: "android",
+			isExpo,
+			appId: androidPackage,
+			bundleUrl: metroWarmupUrlSetting(settings, "android")
+		});
 		if (!await resolveInitialFingerprint()) return phaseFailure;
 		let remote = null;
 		let abandonedRemote = false;
@@ -1877,7 +2019,7 @@ async function runAndroid(options = {}) {
 				} else phase("cache", `remote miss (${remote.name}) ${remoteTimer()}`);
 			}
 		}
-		await resolveRemoteArtifact();
+		if (!easBuild) await resolveRemoteArtifact();
 		let waitedForBuild = null;
 		let releasedWait = null;
 		async function waitForSharedBuild() {
@@ -1910,7 +2052,7 @@ async function runAndroid(options = {}) {
 					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}` : ""}`);
+					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);
@@ -1942,7 +2084,7 @@ async function runAndroid(options = {}) {
 							pid: holder.pid,
 							ms: waited.waitedMs
 						};
-						phase("build", `waited ${formatDuration(waited.waitedMs)} for ${who}'s build -> installed from cache`);
+						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 = {
@@ -1961,7 +2103,7 @@ async function runAndroid(options = {}) {
 			}
 			return true;
 		}
-		if (!await waitForSharedBuild()) return phaseFailure;
+		if (!easBuild && !await waitForSharedBuild()) return phaseFailure;
 		let swapDir = null;
 		let swapFellBack = false;
 		const installableCachedApk = async (key, cachedPath) => {
@@ -2049,7 +2191,7 @@ async function runAndroid(options = {}) {
 								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`);
+									phase("build", `waited ${formatDuration(waitedForBuild.ms)} for ${releasedWait.who}'s build -> installed from cache -- stim guide lifecycle concurrency`);
 								}
 							}
 						}
@@ -2161,8 +2303,10 @@ async function runAndroid(options = {}) {
 			}
 			return true;
 		}
-		await prepareCachedArtifact();
-		if (!await buildArtifact()) return phaseFailure;
+		if (!easBuild) {
+			await prepareCachedArtifact();
+			if (!await buildArtifact()) return phaseFailure;
+		}
 		record.appPath = apkPath;
 		let leaseHandle = null;
 		let stopLeaseSignals = null;
@@ -2207,6 +2351,7 @@ async function runAndroid(options = {}) {
 		}
 		try {
 			return await finishAndroidRun({
+				slot,
 				lease: leaseHandle,
 				releaseLease,
 				root,
@@ -2223,6 +2368,8 @@ async function runAndroid(options = {}) {
 				physical,
 				remoteDevice,
 				bootPromise,
+				resolveAvdSerial,
+				waitForDeviceBoot,
 				bootDuration: () => bootDuration,
 				apkPath,
 				androidPackage,

package/dist/{android-cas-DGlTStWu.mjs → android-cas-BR5YJBYv.mjs}

@@ -1,11 +1,11 @@
-import { t as getExecutor } from "./exec-bsN9MJXb.mjs";
-import { k as withDirLock, u as getConfigDir } from "./config-D7uu8Gbq.mjs";
-import { r as register } from "./cache-manifest-oeH18ERr.mjs";
-import { D as workspaceLogsDir, x as sharedCcache, y as ensureWorkspaceStorage } from "./state-IYEY-zi8.mjs";
+import { t as getExecutor } from "./exec-CyylIdq9.mjs";
+import { k as withDirLock, u as getConfigDir } from "./config-CcefMY2Q.mjs";
+import { r as register } from "./cache-manifest-CXR-Y8pH.mjs";
+import { D as workspaceLogsDir, x as sharedCcache, y as ensureWorkspaceStorage } from "./state-B3XA2wp2.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-C7IlIzd7.mjs";
 import { l as phaseLine } from "./command-output-8wHMEde0.mjs";
-import { n as androidHome } from "./android-xmyGBNy5.mjs";
-import { f as startBuildHeartbeat, r as HEARTBEAT_INTERVAL_MS } from "./xcode-CDB6fytw.mjs";
+import { n as androidHome } from "./android-BqVIJoG7.mjs";
+import { f as startBuildHeartbeat, r as HEARTBEAT_INTERVAL_MS } from "./xcode-D7sAp-Zy.mjs";
 import { accessSync, constants, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, symlinkSync, writeFileSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { dirname, isAbsolute, join, relative } from "node:path";