stim 1.11.0 → 1.13.0

package/README.md

@@ -27,7 +27,7 @@ npx stim <command>
 ```bash
 stim doctor
 stim start
-stim ios                  # or: stim android
+stim ios                  # or: stim android, or: stim web
 stim logs --errors
 stim stop
 ```
@@ -43,6 +43,8 @@ reference:
 
 - [Getting started](https://stim.appandflow.com/docs/getting-started): terms,
   the first run, parallel worktrees, and what to do when a run fails.
+- [Web in an owned Chrome](https://stim.appandflow.com/docs/web): `stim web`
+  for Expo web and other web servers, page logs, and attaching browser tools.
 - [Worktrees](https://stim.appandflow.com/docs/worktrees): `worktree warm`,
   `--refresh`, `worktree remove`, and `gc --worktrees` to remove finished
   worktrees in bulk.

package/dist/{activity-BtG4Va9l.mjs → activity-DfVKZTEB.mjs}

@@ -1,7 +1,7 @@
-import { D as process_identity_exports } from "./config-BEq0Qw_a.mjs";
+import { O as process_identity_exports } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { j as workspaceLogsDir, m as readWorkspaceState } from "./metro-BWLOJ_Wr.mjs";
-import { i as listLeaseFiles, r as leaseIsExpired } from "./device-lease-D83nqeMX.mjs";
+import { M as workspaceLogsDir, h as readWorkspaceState } from "./metro-BPeY1YMh.mjs";
+import { i as listLeaseFiles, r as leaseIsExpired } from "./device-lease-CL9dZf73.mjs";
 import { closeSync, fstatSync, openSync, readFileSync, readSync, readdirSync } from "node:fs";
 import { basename, join, resolve } from "node:path";
 import { homedir } from "node:os";
@@ -67,6 +67,7 @@ function parseAgentDeviceRecord(kind, path, raw) {
 		kind,
 		deviceId,
 		session: kind === "claim" && typeof entry?.session === "string" && entry.session ? entry.session : null,
+		workspace: kind === "claim" && typeof entry?.workspace === "string" && entry.workspace ? entry.workspace : null,
 		deviceName: kind === "claim" && typeof device?.name === "string" ? device.name : null,
 		readable: Boolean(entry && deviceId),
 		owner: entry ? field(entry, "ownerPid", "ownerStartTime") : null,
@@ -88,16 +89,20 @@ function agentDeviceLiveness(record, startOf) {
 	if (!record.readable || results.includes("unknown")) return "unknown";
 	return "live";
 }
+const HOST_PROCESS_COLUMNS = "pid=,ppid=,rss=,%cpu=,lstart=,command=";
 function parseProcessTable(output) {
 	const rows = [];
 	for (const line of output.split("\n")) {
-		const match = /^\s*(\d+)\s+(\w{3}\s+\w{3}\s+\d+\s+\d{1,2}:\d{2}:\d{2}\s+\d{4})\s+(.*)$/.exec(line);
+		const match = /^\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+(?:[.,]\d+)?)\s+(\w{3}\s+\w{3}\s+\d+\s+\d{1,2}:\d{2}:\d{2}\s+\d{4})\s+(.*)$/.exec(line);
 		if (!match) continue;
-		const at = Date.parse(match[2]);
+		const at = Date.parse(match[5]);
 		rows.push({
 			pid: Number(match[1]),
+			ppid: Number(match[2]),
+			rssKb: Number(match[3]),
+			cpuPercent: Number(match[4].replace(",", ".")),
 			startedAt: Number.isFinite(at) ? new Date(at).toISOString() : null,
-			command: match[3]
+			command: match[6]
 		});
 	}
 	return rows;
@@ -203,11 +208,39 @@ function readAgentDeviceRecords(home) {
 		});
 	});
 }
-function createActivityReader({ now = Date.now(), home = homedir(), startOf = process_identity_exports.inspectProcessStart, leaseFiles = listLeaseFiles } = {}) {
+function createDeviceProcessTables() {
 	const exec = getExecutor();
+	let host;
+	const android = /* @__PURE__ */ new Map();
+	return {
+		host() {
+			if (host === void 0) {
+				const output = exec.runFileQuiet("ps", [
+					"-axww",
+					"-o",
+					HOST_PROCESS_COLUMNS
+				], { timeoutMs: 5e3 });
+				host = output === null ? null : parseProcessTable(output);
+			}
+			return host;
+		},
+		android(serial) {
+			if (!android.has(serial)) android.set(serial, exec.runFileQuiet("adb", [
+				"-s",
+				serial,
+				"shell",
+				"ps",
+				"-A",
+				"-o",
+				"PID,ARGS"
+			], { timeoutMs: 5e3 }));
+			return android.get(serial) ?? null;
+		}
+	};
+}
+function createActivityReader({ now = Date.now(), home = homedir(), startOf = process_identity_exports.inspectProcessStart, leaseFiles = listLeaseFiles, tables = createDeviceProcessTables() } = {}) {
 	let agentDevice;
 	let stimLeases;
-	let processes;
 	const logs = /* @__PURE__ */ new Map();
 	const log = (path) => {
 		if (!logs.has(path)) logs.set(path, tailLines(path));
@@ -250,14 +283,7 @@ function createActivityReader({ now = Date.now(), home = homedir(), startOf = pr
 				since: entry.lease.grantedAt
 			});
 		}
-		if (processes === void 0) {
-			const output = exec.runFileQuiet("ps", [
-				"-axww",
-				"-o",
-				"pid=,lstart=,command="
-			], { timeoutMs: 5e3 });
-			processes = output === null ? null : parseProcessTable(output);
-		}
+		const processes = tables.host();
 		if (processes === null) evidence.unknown.push("driver-process");
 		for (const row of processes ?? []) {
 			const tool = driverTool(row.command, target.id);
@@ -269,15 +295,7 @@ function createActivityReader({ now = Date.now(), home = homedir(), startOf = pr
 			});
 		}
 		if (target.platform === "android") {
-			const output = exec.runFileQuiet("adb", [
-				"-s",
-				target.id,
-				"shell",
-				"ps",
-				"-A",
-				"-o",
-				"PID,ARGS"
-			], { timeoutMs: 5e3 });
+			const output = tables.android(target.id);
 			if (output === null) evidence.unknown.push("instrumentation");
 			for (const { pid, tool } of parseAndroidInstrumentation(output ?? "")) evidence.drivers.push({
 				basis: "instrumentation",
@@ -335,4 +353,4 @@ function workspaceActivity(workspace, now = Date.now()) {
 	}, now);
 }
 //#endregion
-export { workspaceActivity as a, readAgentDeviceRecords as i, createActivityReader as n, idleForMs as r, agentDeviceLiveness as t };
+export { readAgentDeviceRecords as a, idleForMs as i, createActivityReader as n, workspaceActivity as o, createDeviceProcessTables as r, agentDeviceLiveness as t };

package/dist/{android-BA2i_KAV.mjs → android-BHfAu2mf.mjs}

@@ -1,5 +1,5 @@
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { c as androidToolCwd } from "./android-C4zG2Tuc.mjs";
+import { l as androidToolCwd } from "./android-qx_31wJo.mjs";
 //#region src/collector/android.ts
 const LEVEL_BY_LETTER = {
 	V: "debug",

package/dist/{android-C1q4l523.mjs → android-CD8pr8Q2.mjs}

@@ -1,37 +1,37 @@
-import { L as deviceSlotFileKey, R as deviceSlotKey, S as setDevice, T as withConfigLock$1, V as parseDeviceSlotOption, W as validateDeviceSlot, f as getProject, g as loadConfig$1, k as ownership_claim_exports, l as getConcurrencyLimits, w as upsertProject, x as saveConfig, z as deviceSlotPlatforms } from "./config-BEq0Qw_a.mjs";
+import { A as ownership_claim_exports, B as deviceSlotPlatforms, C as setDevice, E as withConfigLock$1, G as validateDeviceSlot, H as parseDeviceSlotOption, R as deviceSlotFileKey, S as saveConfig, T as upsertProject, _ as loadConfig$1, p as getProject, u as getConcurrencyLimits, z as deviceSlotKey } from "./config-0jCcMM0E.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$1, 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, t as NO_PROJECT_REFUSAL } from "./project-BXZzOABt.mjs";
-import { n as MODE_EXPO, p as writeWorkspaceLaunch, t as MODE_BARE } from "./state-WGdIbi_d.mjs";
+import { M as workspaceLogsDir, a as pidExists, b as writeWorkspaceState, c as resolveProjectMetro, g as recordWorkspaceUse, h as readWorkspaceState$1, k as workspaceDir, l as signalProcessTree, x as emulatorLogFile } from "./metro-BPeY1YMh.mjs";
+import { D as makeTemporaryDirectory, O as removeTemporaryEntry, s as gitCommonDir, y as repoRoot } from "./worktree-DeBQSVtR.mjs";
+import { a as findProjectRoot, l as projectShortcut, n as appProjectProblem, r as detectIsExpo, t as NO_PROJECT_REFUSAL } from "./project-DGeclhvO.mjs";
+import { m as writeWorkspaceLaunch, n as MODE_EXPO, t as MODE_BARE } from "./state-DwAU2_-D.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 filesystemBuildCapability, D as providerDownloadPath, E as prepareProviderDownloadDir, F as untrackedNativeFiles, I as assetDiffReason, L as captureAssetManifest, M as storedAssetManifest, O as providerUploadOutcome, P as untrackedMissLine, R as compareAssetManifests, T as fingerprintProject, _ as waitForBuild, b as buildCacheKey, g as releaseBuildLock, j as storeBuild, k as refingerprintAfterMutation, m as acquireBuildLock, v as waitForSharedBuild, w as fingerprintDiffRecord, z as readAssetManifest } from "./device-lease-D83nqeMX.mjs";
-import { A as memoizeEmulatorProbe, B as probeEmulatorSerial, C as hostSystemImageArch, D as listAvds, E as listAvdDeviceProfiles, H as resolveOwnedAvdSerial, L as ownedAvdSystemImage, N as ownedAvdDirectory, O as listInstalledSystemImages, Q as configuredAndroidEmulatorApp, R as physicalDeviceModel, T as listAdbDevices, U as resolvePhysicalDevice, V as resetAdoptedAvd, a as androidPoolCandidates, b as extractEmulatorFailure, c as androidToolCwd, i as androidHome, n as androidBuildToolName, o as androidPoolNoCandidatesRefusal, q as waitForBoot, r as androidDeviceAbi, s as androidSystemImageAbi, v as emulatorDiskSpaceRemedy, x as findBuildTool, y as emulatorFailureRemedy, z as pickDefaultSystemImage } from "./android-C4zG2Tuc.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-B5oFZEri.mjs";
-import { y as parkedMaxSetting } from "./ownership-BiojdtAp.mjs";
-import { c as startBuildProgress, n as NO_BUILD_PROGRESS } from "./build-progress-CDwogz6R.mjs";
-import { a as acquireBuildSlot, s as releaseBuildSlot } from "./in-use-DVhlSoyn.mjs";
-import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-D2xbLVoz.mjs";
-import { t as cleanLine } from "./server-expo-o6H5gcBc.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-BQZSnnmE.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-DHut6JnV.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-CuPDGXdr.mjs";
-import { f as isEasBuildFailure, m as resolveEasDevelopmentBuild, o as unknownAndroidDeviceProfileRefusal, p as planEasDevelopmentBuild, r as checkDeviceCapacity, s as unknownAndroidSystemImageRefusal } from "./simslim-CIR3IYJO.mjs";
-import { d as withNativeBuildRun, r as cancelledFailure, u as runCancellation } from "./native-run-D7yB_AsB.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-DHj7cdPy.mjs";
-import { C as ensureDevServer, E as launchOutcomeRecord, O as warmMetro, T as isPhysicalDeviceRequest, _ as staleNativeDirRefusal, a as refusePlan, b as AvdBootError, c as skippedMissReason, f as detectEntryFile, g as runPrebuild, h as recordPrebuild, i as printPlan, l as devClientScheme, m as planPrebuild, n as planFlagRefusal, o as explainBuildMiss, r as planPayload, s as fingerprintErrorMissReason, t as planCachedBuild, u as pickDevClientScheme, v as ensureBooted, w as ensureWorkspaceStorageSafely, x as AvdRecoveryError, y as ensureOwnedDevice } from "./build-plan-CeAYgKAx.mjs";
-import { t as budgetGate } from "./budget-De3P2rq_.mjs";
-import { f as spawnEntry, s as startDevServer } from "./start-BSsf2tUs.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-DfJkwCXW.mjs";
-import { d as startBuildHeartbeat, f as tailLines, n as HEARTBEAT_INTERVAL_MS } from "./xcode-B5SPD--o.mjs";
-import { n as nativeRunCommand, t as launchSlotScope } from "./slot-launch-rggO1Esw.mjs";
-import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-UYFSQwRy.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-BIL7rlX7.mjs";
+import { A as providerDownloadPath, B as captureAssetManifest, D as fingerprintProject, E as fingerprintDiffRecord, F as storedAssetManifest, H as readAssetManifest, L as untrackedMissLine, M as refingerprintAfterMutation, N as resolveBuild, O as inputsChangedDuringBuild, P as storeBuild, R as untrackedNativeFiles, S as configInputsChanged, T as filesystemBuildCapability, V as compareAssetManifests, _ as waitForBuild, b as buildCacheKey, g as releaseBuildLock, j as providerUploadOutcome, k as prepareProviderDownloadDir, m as acquireBuildLock, v as waitForSharedBuild, x as changedDuringBuildLine, z as assetDiffReason } from "./device-lease-CL9dZf73.mjs";
+import { $ as waitForBoot, A as listInstalledSystemImages, C as extractEmulatorFailure, D as listAdbDevices, E as hostSystemImageArch, F as ownedAvdDirectory, G as profileNeedsFoldFeature, H as physicalDeviceModel, J as resolvePhysicalDevice, K as resetAdoptedAvd, M as memoizeEmulatorProbe, O as listAvdDeviceProfiles, P as ownedAvdDeviceProfile, S as emulatorFailureRemedy, U as pickDefaultSystemImage, W as probeEmulatorSerial, Z as systemImageSupportsFold, a as androidHome, c as androidSystemImageAbi, ct as parkedMaxSetting, ft as configuredAndroidEmulatorApp, i as androidDeviceAbi, k as listAvds, l as androidToolCwd, o as androidPoolCandidates, q as resolveOwnedAvdSerial, r as androidBuildToolName, s as androidPoolNoCandidatesRefusal, t as DEFAULT_AVD_DEVICE_PROFILE, w as findBuildTool, x as emulatorDiskSpaceRemedy, z as ownedAvdSystemImage } from "./android-qx_31wJo.mjs";
+import { A as resolveCacheProviderConfig, B as detectProviders, E as publicUrlSetting, G as resolveOptimizations, H as artifactCachePolicy, I as tunnelModeSetting, L as unknownSettingKeys, M as settingFile, O as remoteAndroidSetting, P as settingShapeErrors, S as metroWarmupUrlSetting, U as compilerCacheFallbackMessage, W as optimizationBuildProfile, a as SETTING_SHAPE_REMEDY, d as cacheProviderSettingError, j as resolveSettings, r as REMOTE_DEVICE_BACKENDS, s as androidAvdConfigSettingError, u as androidDataPartitionSizeGbSettingError } from "./settings-xB0Frkg6.mjs";
+import { c as recordFinishedBuild, l as startBuildProgress, n as NO_BUILD_PROGRESS } from "./build-progress-l7d-X-ZP.mjs";
+import { a as acquireBuildSlot, s as releaseBuildSlot } from "./in-use-wYEaKQM9.mjs";
+import { n as verifyCollectorOwnership, r as readCollectors } from "./ownership-Bz2kETAS.mjs";
+import { t as cleanLine } from "./server-expo-DUCg52-K.mjs";
+import { a as easAuthNote, c as loadProjectProvider, f as resolveEasCliBin, i as checkEasAuth, m as uploadRemote, n as UPLOAD_TIMEOUT_MS, o as exitAfterFlush, p as resolveRemote, r as cacheLevel, s as isEasAuthFailureText, t as RESOLVE_TIMEOUT_MS } from "./remote-cache--aehr4Pr.mjs";
+import { F as ownedSessionName, S as withNativeBuildRun, a as ensureMetroReachable, c as remoteAndroidDeps, m as cancelledFailure, n as binOnPath, o as ensureRemoteBootOwned, u as resolveRemoteContext, x as runCancellation } from "./device-remote-DT9ngZiD.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-CDFY2nUL.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-CuJaBpEa.mjs";
+import { c as unknownAndroidSystemImageRefusal, h as resolveEasDevelopmentBuild, m as planEasDevelopmentBuild, p as isEasBuildFailure, r as checkDeviceCapacity, s as unknownAndroidDeviceProfileRefusal } from "./simslim-Bbg9UWrt.mjs";
+import { f as spawnEntry, m as detectAppIds, p as detectAndroidPackage, s as startDevServer } from "./start-BZhItkiL.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-MuoiyRcu.mjs";
+import { C as warmMetro, _ as staleNativeDirRefusal, a as refusePlan, b as AvdBootError, c as skippedMissReason, f as detectEntryFile, g as runPrebuild, h as recordPrebuild, i as printPlan, l as devClientScheme, m as planPrebuild, n as planFlagRefusal, o as explainBuildMiss, r as planPayload, s as fingerprintErrorMissReason, t as planCachedBuild, u as pickDevClientScheme, v as ensureBooted, x as AvdRecoveryError, y as ensureOwnedDevice } from "./build-plan-BTa93o_r.mjs";
+import { t as budgetGate } from "./budget-E5o91NR1.mjs";
+import { i as launchOutcomeRecord, n as ensureWorkspaceStorageSafely, r as isPhysicalDeviceRequest, t as ensureDevServer } from "./native-runtime-CiiFHt0e.mjs";
+import { a as statsProjectKey, i as recordRunStats, n as readRunEstimates, t as createRunRecorder } from "./stats-D8rUTPHd.mjs";
+import { c as readProductFlavors, d as ccacheActivityLine, l as CCACHE_NOT_RUN, m as formatDiagnostic, n as resolveAndroidCas, o as buildAndroid, p as resolveCcache, r as resolveAndroidCompilerCache, s as productFlavorRefusal, u as CCACHE_UNAVAILABLE } from "./android-cas-B9Kv9aIy.mjs";
+import { d as startBuildHeartbeat, f as tailLines, n as HEARTBEAT_INTERVAL_MS } from "./xcode-LM6A8cNZ.mjs";
+import { n as nativeRunCommand, t as launchSlotScope } from "./slot-launch-BIWEW-wI.mjs";
+import { a as printNativeCrashReport, r as captureNativeCrashes, t as errorDiagnostics } from "./error-diagnostics-BoiOhck8.mjs";
 import { constants, copyFileSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync, renameSync, rmSync } from "node:fs";
 import { InvalidArgumentError } from "commander";
-import { LAST_BUILD_KEYS } from "@stim-cli/core/state";
+import { buildDiagnostics } from "@stim-cli/core/state";
 import { basename, dirname, isAbsolute, join, relative } from "node:path";
 import chalk from "chalk";
 import { createWarnOnce, loadCacheProvider, resolveTieredBuild, storeTieredBuild } from "@stim-cli/cache";
@@ -467,6 +467,21 @@ function deviceProfileRefusal({ flag, resolved, physical, remoteBackend, listPro
 		remedy: refusal.remedy
 	} : null;
 }
+function foldableImageRefusal({ profile, image, avdName, images, supportsFold }) {
+	if (!profileNeedsFoldFeature(profile) || !image || supportsFold(image)) return null;
+	const compatible = pickDefaultSystemImage(images().filter((candidate) => supportsFold(candidate.pkg)))?.pkg;
+	const message = `${avdName ? `This workspace's emulator ${avdName} uses device profile ${profile} on ${image}` : `Device profile ${profile} with system image ${image}`}, which the emulator refuses to boot: ${profile} needs a system image with foldable support (SupportPixelFold in its advancedFeatures.ini).`;
+	if (!compatible) return {
+		code: "STIM_BAD_ARG",
+		message,
+		remedy: `Install an image with foldable support, e.g. \`sdkmanager "system-images;android-36;google_apis;${hostSystemImageArch()}"\`, then pass it with \`--system-image\`, or pick another \`--device-profile\`.`
+	};
+	return {
+		code: "STIM_BAD_ARG",
+		message,
+		remedy: avdName ? `Pass \`--system-image "${compatible}"\`: it replaces ${avdName} if that emulator never finished a boot. Otherwise add \`--slot <name>\` to create the foldable beside it.` : `Pass \`--system-image "${compatible}"\` (or set android.systemImage to it), or pick another \`--device-profile\`.`
+	};
+}
 function isReleaseVariant(variant) {
 	return typeof variant === "string" && /release$/i.test(variant.trim());
 }
@@ -969,17 +984,19 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 				phase("build", chalk.yellow(`could not take a build slot: ${err?.message || err}; building anyway`));
 			}
 			const rekeyedBy = [];
+			let editedConfig = [];
 			const prebuildPlan = planPrebuildFor(root, PLATFORM, {
 				isExpo,
 				fingerprint: hash,
 				sources: fingerprintSources
 			});
+			const prebuildRan = prebuildPlan === "generate" || prebuildPlan === "regenerate";
 			if (prebuildPlan === "refuse") {
 				const refusal = staleNativeDirRefusal(PLATFORM);
 				phaseFailure = fail$1(refusal.code, refusal.message, refusal.remedy, { lastBuildStatus: true });
 				return false;
 			}
-			if (prebuildPlan === "generate" || prebuildPlan === "regenerate") {
+			if (prebuildRan) {
 				step("prebuild");
 				recordPrebuild(root, PLATFORM, null);
 				const pre = await prebuild(root, PLATFORM, writer, {
@@ -1003,8 +1020,9 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 					previousHash: hash,
 					fingerprint
 				});
-				if (after) recordPrebuild(root, PLATFORM, after.hash);
-				if (after?.moved) {
+				editedConfig = after ? configInputsChanged(fingerprintSources, after.sources, { prebuildRan }) : [];
+				if (after && !editedConfig.length) recordPrebuild(root, PLATFORM, after.hash);
+				if (after?.moved && !editedConfig.length) {
 					rekeyedBy.push("prebuild");
 					storeHash = after.hash;
 					storeSources = after.sources;
@@ -1063,6 +1081,7 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 					phaseFailure = fail$1(built.code, built.reason, diagnostics.find((d) => d.remedy)?.remedy || built.remedy || null, {
 						lastBuildStatus: true,
 						diagnostics: extracted,
+						buildDiagnostics: diagnostics,
 						lines: extracted.length ? [] : tail(built.lastLines),
 						logPath: displayPath(root, buildLog)
 					});
@@ -1073,16 +1092,23 @@ async function acquireAndroidArtifact({ root, buildLog, writer, settings, isExpo
 				phase("build", `ok (${formatDuration(built.durationMs)})`);
 				if (built.apkNote) phase("build", chalk.yellow(built.apkNote));
 				const beforeBuildHash = storeHash;
-				const afterBuild = await refingerprintAfterMutation({
+				const afterBuild = editedConfig.length ? null : await refingerprintAfterMutation({
 					projectRoot: root,
 					platform: PLATFORM,
 					previousHash: beforeBuildHash,
 					fingerprint
 				});
-				if (!afterBuild) {
+				const changedDuringBuild = afterBuild ? inputsChangedDuringBuild({
+					platform: PLATFORM,
+					lookup: fingerprintSources,
+					prebuildRan,
+					compiled: storeSources,
+					current: afterBuild.sources
+				}) : editedConfig;
+				if (!afterBuild || changedDuringBuild.length) {
 					record.fingerprint = null;
 					record.cacheKey = null;
-					phase("fingerprint", chalk.yellow("unavailable after Gradle; the build will be installed but not cached"));
+					phase("fingerprint", chalk.yellow(changedDuringBuild.length ? changedDuringBuildLine(changedDuringBuild) : "unavailable after Gradle; the build will be installed but not cached"));
 				} else {
 					if (afterBuild.moved) {
 						storeHash = afterBuild.hash;
@@ -1193,7 +1219,7 @@ function androidFacts({ slot, serial, avdName = null, deviceName = null, systemI
 		...devServer ? { devServer } : {}
 	};
 }
-function lastBuildRecord({ fingerprint, cacheKey, cacheHit, cacheSkipped = false, durationMs, appPath, bundleId, startedAt, status, errorCode = null, avdName = null, deviceName = null, missReason = null }) {
+function lastBuildRecord({ fingerprint, cacheKey, cacheHit, cacheSkipped = false, durationMs, appPath, bundleId, startedAt, status, errorCode = null, avdName = null, deviceName = null, missReason = null, diagnostics = null, configuration = null }) {
 	const record = {
 		platform: PLATFORM,
 		avdName: avdName ?? null,
@@ -1206,10 +1232,13 @@ function lastBuildRecord({ fingerprint, cacheKey, cacheHit, cacheSkipped = false
 		appPath: appPath ?? null,
 		bundleId: bundleId ?? null,
 		startedAt,
-		status
+		status,
+		configuration: configuration ?? null
 	};
 	if (errorCode) record.errorCode = errorCode;
 	if (missReason && !cacheLevel(cacheHit)) record.missReason = missReason;
+	const recorded = status === "failed" ? buildDiagnostics(diagnostics) : [];
+	if (recorded.length) record.diagnostics = recorded;
 	return record;
 }
 async function finishAndroidUpload(uploadPending, remote, phase) {
@@ -1291,19 +1320,17 @@ function cacheOutcome(cacheHit, providerName = null) {
 	if (cacheHit === "local") return "cache hit";
 	return "built";
 }
-function persistLastBuild({ writeState, root, record, startedAt, durationMs, status, errorCode = null, out }) {
+function persistLastBuild({ recordBuild = recordFinishedBuild, root, record, startedAt, durationMs, status, errorCode = null, diagnostics = null, out }) {
 	const lastBuild = lastBuildRecord({
 		...record,
 		startedAt,
 		durationMs,
 		status,
-		errorCode
+		errorCode,
+		diagnostics
 	});
 	try {
-		writeState(root, {
-			lastBuild,
-			[LAST_BUILD_KEYS[PLATFORM]]: lastBuild
-		});
+		recordBuild(root, lastBuild);
 	} catch (err) {
 		out(phaseLine("state", chalk.yellow(`could not record lastBuild: ${err?.message || err}`)));
 	}
@@ -1532,7 +1559,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, reclaimed, devServer, enterPhase }) {
+async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCheck, useBuildCache, variant, release, isExpo, metroPort, logsDir, emuLog, device, physical, remoteDevice, bootPromise, resolveAvdSerial, waitForDeviceBoot, bootDuration, apkPath, androidPackage: initialPackage, swapDir, record, waitedForBuild, ccache, uploadPending, providerUpload, providerName, remote, abandonedRemote: remoteWasAbandoned, started, startedAt, writer, phase, fail, readApkPackage, install, launch, launchRelease, resolveDevClientScheme, verifyLaunched, verifyReleaseLaunched, spawn, kill, pidAlive, verifyCollector, writeLaunch, recordBuild, now, out, emit, recordRun, reclaimed, devServer, enterPhase }) {
 	let androidPackage = initialPackage;
 	let leaseWarned = false;
 	const raiseLeaseFor = (boundMs, beforeInstall) => {
@@ -1722,7 +1749,7 @@ async function finishAndroidRun({ lease, releaseLease, root, slot, json, metroCh
 	const providerOutcome = providerUploadOutcome(providerUpload ? await providerUpload : null, providerName);
 	if (providerOutcome) phase("cache", providerOutcome.warn ? chalk.yellow(providerOutcome.line) : providerOutcome.line);
 	persistLastBuild({
-		writeState,
+		recordBuild,
 		root,
 		record,
 		startedAt,
@@ -1868,6 +1895,16 @@ function diagnoseBootFailure(booted, logFile, runCommand, physical) {
 }
 //#endregion
 //#region src/commands/android/plan.ts
+function slotOwnedAvd(projectPath, slot) {
+	const android = deviceSlotPlatforms(getProject(projectPath), slot)?.android;
+	if (!android?.owned || !android.avdName || android.setupIncomplete) return null;
+	const systemImage = ownedAvdSystemImage(android.avdName);
+	return systemImage ? {
+		avdName: android.avdName,
+		systemImage,
+		deviceProfile: ownedAvdDeviceProfile(android.avdName)
+	} : null;
+}
 function fail(code, message, remedy, { lines = [] } = {}) {
 	return {
 		ok: false,
@@ -1901,7 +1938,7 @@ function androidCompilerCache({ root, optimizations, settingsContext }) {
 		})}`
 	};
 }
-function resolveAndroidRunPlan({ settings, settingsContext, slot, easProfile, variant: variantFlag, systemImage: systemImageFlag, deviceProfile: deviceProfileFlag, device: deviceFlag, wait: waitFlag, waitConflict, remote: commandRemoteBackend, buildCache: requestedBuildCache }, { warn, resolveCompilerCache = androidCompilerCache, resolveCacheProvider = resolveCacheProviderConfig, validateAvdConfig = androidAvdConfigSettingError, readFlavors = readProductFlavors, detectExpo = detectIsExpo, listSystemImages = listInstalledSystemImages, listDeviceProfiles = listAvdDeviceProfiles, parkedLimit = parkedMaxSetting }) {
+function resolveAndroidRunPlan({ settings, settingsContext, slot, easProfile, variant: variantFlag, systemImage: systemImageFlag, deviceProfile: deviceProfileFlag, device: deviceFlag, wait: waitFlag, waitConflict, remote: commandRemoteBackend, buildCache: requestedBuildCache }, { warn, resolveCompilerCache = androidCompilerCache, resolveCacheProvider = resolveCacheProviderConfig, validateAvdConfig = androidAvdConfigSettingError, readFlavors = readProductFlavors, detectExpo = detectIsExpo, listSystemImages = listInstalledSystemImages, listDeviceProfiles = listAvdDeviceProfiles, parkedLimit = parkedMaxSetting, supportsFold = systemImageSupportsFold, ownedAvd = slotOwnedAvd }) {
 	const root = settingsContext.projectPath;
 	const [shapeError, ...moreShapeErrors] = [parkedLimit("android").error, ...settingShapeErrors(settings)].filter((error) => Boolean(error));
 	if (shapeError) return fail("STIM_BAD_ARG", shapeError, SETTING_SHAPE_REMEDY, { lines: moreShapeErrors });
@@ -1967,6 +2004,21 @@ function resolveAndroidRunPlan({ settings, settingsContext, slot, easProfile, va
 		listProfiles: listDeviceProfiles
 	});
 	if (profileRefusal) return fail(profileRefusal.code, profileRefusal.message, profileRefusal.remedy);
+	if (!physical && !remoteBackend) {
+		const flagImage = typeof systemImageFlag === "string" && systemImageFlag.trim() ? systemImageFlag.trim() : null;
+		const existing = ownedAvd(root, slot);
+		const profile = deviceProfile ?? existing?.deviceProfile ?? DEFAULT_AVD_DEVICE_PROFILE;
+		const image = () => flagImage ?? existing?.systemImage ?? systemImage ?? pickDefaultSystemImage(listSystemImages())?.pkg ?? null;
+		const checked = profileNeedsFoldFeature(profile) ? image() : null;
+		const foldRefusal = checked !== null && foldableImageRefusal({
+			profile,
+			image: checked,
+			avdName: existing && existing.systemImage === checked && existing.deviceProfile === profile ? existing.avdName : null,
+			images: listSystemImages,
+			supportsFold
+		});
+		if (foldRefusal) return fail(foldRefusal.code, foldRefusal.message, foldRefusal.remedy);
+	}
 	const target = physical ? {
 		kind: "physical",
 		serial: typeof deviceFlag === "string" ? deviceFlag : null,
@@ -2244,7 +2296,7 @@ function registerAndroid(program) {
 		}, { write: (line) => console.error(chalk.dim(phaseLine("lock", line))) })).ok) process.exit(runCancellation() ? 130 : 1);
 	});
 }
-function resolveRunAndroidOptions({ root, json = false, remoteDevice: commandRemoteBackend = null, resolveSettingsFor = resolveSettings, resolveRemoteDeviceContext = resolveRemoteContext, remoteDeviceDeps: makeRemoteDeviceDeps = remoteAndroidDeps, resolveEasBin = resolveEasCliBin, ensureMetroReachable: ensureRemoteMetro = ensureMetroReachable, ensureRemoteBootOwned: ensureRemoteOwned = ensureRemoteBootOwned, detectRemoteProviders = detectProviders, metroCheck = true, useBuildCache = true, easProfile, resolveEasDevelopmentBuild: resolveEasBuild = resolveEasDevelopmentBuild, variant: variantFlag = null, systemImage: systemImageFlag = null, deviceProfile: deviceProfileFlag, device: deviceFlag = null, wait: waitFlag = void 0, waitConflict = false, acquireLease = acquireRunLease, makeRunLease = runLease, selectPool = selectFromPool, onLeaseSignal = releaseLeaseOnSignal, listDevices = listAdbDevices, deviceModel = physicalDeviceModel, deviceAbi = androidDeviceAbi, isEmulatorDevice = probeEmulatorSerial, readApkPackage = (apkPath) => apkPackage(dumpApkManifest(apkPath)), getLimits = getConcurrencyLimits, checkCapacity = checkDeviceCapacity, acquireSlot = acquireBuildSlot, releaseSlot = releaseBuildSlot, ensureDevice = ensureOwnedDevice, listSystemImages = listInstalledSystemImages, listDeviceProfiles, ensureDeviceBooted = ensureBooted, resolveAvdSerial = resolveOwnedAvdSerial, waitForDeviceBoot = waitForBoot, resolveMetro = resolveProjectMetro, warmMetro: prewarmMetro = warmMetro, startServer = startDevServer, readState = readWorkspaceState$1, pidAlive = pidExists, verifyCollector = verifyCollectorOwnership, verifyLaunched = verifyLaunch, ensureStorage = ensureWorkspaceStorageSafely, fingerprint = fingerprintProject, untracked = untrackedNativeFiles, resolveCached = resolveBuild, storeCached = storeBuild, storedAssets = storedAssetManifest, captureAssets = captureAssetManifest, acquireLock = acquireBuildLock, releaseLock = releaseBuildLock, waitForBuild: waitForBuild$1 = waitForBuild, loadProvider = loadProjectProvider, easAuth = checkEasAuth, resolveRemoteBuild = resolveRemote, uploadRemoteBuild = uploadRemote, resolveCacheProvider = resolveCacheProviderConfig, loadCacheProviderModule = loadCacheProvider, planPrebuildFor = planPrebuild, prebuild = runPrebuild, build = buildAndroid, ccacheFor = resolveCcache, install = installAndroidApp, launch = launchAndroidApp, launchRelease = launchAndroidReleaseApp, verifyReleaseLaunched = verifyAndroidReleaseLaunch, swapApk = swapApkBundle, resolveDevClientScheme = androidDevClientScheme, spawn = (cmd, args, opts) => getExecutor().spawn(cmd, args, opts), kill = (pid, signal) => process.kill(pid, signal), createWriter = createNdjsonWriter, writeLaunch = writeWorkspaceLaunch, writeState = writeWorkspaceState, recordStats = recordRunStats, readEstimates = readRunEstimates, now = Date.now, out = (line) => console.error(line), emit = (line) => console.log(line) } = {}) {
+function resolveRunAndroidOptions({ root, json = false, remoteDevice: commandRemoteBackend = null, resolveSettingsFor = resolveSettings, resolveRemoteDeviceContext = resolveRemoteContext, remoteDeviceDeps: makeRemoteDeviceDeps = remoteAndroidDeps, resolveEasBin = resolveEasCliBin, ensureMetroReachable: ensureRemoteMetro = ensureMetroReachable, ensureRemoteBootOwned: ensureRemoteOwned = ensureRemoteBootOwned, detectRemoteProviders = detectProviders, metroCheck = true, useBuildCache = true, easProfile, resolveEasDevelopmentBuild: resolveEasBuild = resolveEasDevelopmentBuild, variant: variantFlag = null, systemImage: systemImageFlag = null, deviceProfile: deviceProfileFlag, device: deviceFlag = null, wait: waitFlag = void 0, waitConflict = false, acquireLease = acquireRunLease, makeRunLease = runLease, selectPool = selectFromPool, onLeaseSignal = releaseLeaseOnSignal, listDevices = listAdbDevices, deviceModel = physicalDeviceModel, deviceAbi = androidDeviceAbi, isEmulatorDevice = probeEmulatorSerial, readApkPackage = (apkPath) => apkPackage(dumpApkManifest(apkPath)), getLimits = getConcurrencyLimits, checkCapacity = checkDeviceCapacity, acquireSlot = acquireBuildSlot, releaseSlot = releaseBuildSlot, ensureDevice = ensureOwnedDevice, listSystemImages = listInstalledSystemImages, listDeviceProfiles, ensureDeviceBooted = ensureBooted, resolveAvdSerial = resolveOwnedAvdSerial, waitForDeviceBoot = waitForBoot, resolveMetro = resolveProjectMetro, warmMetro: prewarmMetro = warmMetro, startServer = startDevServer, readState = readWorkspaceState$1, pidAlive = pidExists, verifyCollector = verifyCollectorOwnership, verifyLaunched = verifyLaunch, ensureStorage = ensureWorkspaceStorageSafely, fingerprint = fingerprintProject, untracked = untrackedNativeFiles, resolveCached = resolveBuild, storeCached = storeBuild, storedAssets = storedAssetManifest, captureAssets = captureAssetManifest, acquireLock = acquireBuildLock, releaseLock = releaseBuildLock, waitForBuild: waitForBuild$1 = waitForBuild, loadProvider = loadProjectProvider, easAuth = checkEasAuth, resolveRemoteBuild = resolveRemote, uploadRemoteBuild = uploadRemote, resolveCacheProvider = resolveCacheProviderConfig, loadCacheProviderModule = loadCacheProvider, planPrebuildFor = planPrebuild, prebuild = runPrebuild, build = buildAndroid, ccacheFor = resolveCcache, install = installAndroidApp, launch = launchAndroidApp, launchRelease = launchAndroidReleaseApp, verifyReleaseLaunched = verifyAndroidReleaseLaunch, swapApk = swapApkBundle, resolveDevClientScheme = androidDevClientScheme, spawn = (cmd, args, opts) => getExecutor().spawn(cmd, args, opts), kill = (pid, signal) => process.kill(pid, signal), createWriter = createNdjsonWriter, writeLaunch = writeWorkspaceLaunch, writeState = writeWorkspaceState, recordBuild, recordStats = recordRunStats, readEstimates = readRunEstimates, now = Date.now, out = (line) => console.error(line), emit = (line) => console.log(line) } = {}) {
 	return {
 		root,
 		json,
@@ -2323,6 +2375,7 @@ function resolveRunAndroidOptions({ root, json = false, remoteDevice: commandRem
 		createWriter,
 		writeLaunch,
 		writeState,
+		recordBuild,
 		recordStats,
 		readEstimates,
 		now,
@@ -2383,7 +2436,7 @@ function avdSetupFailure(error, root, logFile) {
 	};
 }
 async function runAndroid(options = {}) {
-	let { root, json, commandRemoteBackend, resolveSettingsFor, resolveRemoteDeviceContext, makeRemoteDeviceDeps, resolveEasBin, ensureRemoteMetro, ensureRemoteOwned, detectRemoteProviders, metroCheck, useBuildCache: requestedBuildCache, easProfile, resolveEasBuild, variantFlag, systemImageFlag, deviceProfileFlag, deviceFlag, waitFlag, waitConflict, acquireLease, makeRunLease, selectPool, onLeaseSignal, listDevices, deviceModel, deviceAbi, isEmulatorDevice, readApkPackage, getLimits, checkCapacity, acquireSlot, releaseSlot, ensureDevice, listSystemImages, listDeviceProfiles, ensureDeviceBooted, resolveAvdSerial, waitForDeviceBoot, resolveMetro, prewarmMetro, startServer, readState, pidAlive, verifyCollector, verifyLaunched, ensureStorage, fingerprint, untracked, resolveCached, storeCached, storedAssets, captureAssets, acquireLock, releaseLock, waitForBuild, loadProvider, easAuth, resolveRemoteBuild, uploadRemoteBuild, resolveCacheProvider, loadCacheProviderModule, planPrebuildFor, prebuild, build, ccacheFor, install, launch, launchRelease, verifyReleaseLaunched, swapApk, resolveDevClientScheme, spawn, kill, createWriter, writeLaunch, writeState, recordStats, readEstimates, now, out, emit } = androidSlotOptions(options);
+	let { root, json, commandRemoteBackend, resolveSettingsFor, resolveRemoteDeviceContext, makeRemoteDeviceDeps, resolveEasBin, ensureRemoteMetro, ensureRemoteOwned, detectRemoteProviders, metroCheck, useBuildCache: requestedBuildCache, easProfile, resolveEasBuild, variantFlag, systemImageFlag, deviceProfileFlag, deviceFlag, waitFlag, waitConflict, acquireLease, makeRunLease, selectPool, onLeaseSignal, listDevices, deviceModel, deviceAbi, isEmulatorDevice, readApkPackage, getLimits, checkCapacity, acquireSlot, releaseSlot, ensureDevice, listSystemImages, listDeviceProfiles, ensureDeviceBooted, resolveAvdSerial, waitForDeviceBoot, resolveMetro, prewarmMetro, startServer, readState, pidAlive, verifyCollector, verifyLaunched, ensureStorage, fingerprint, untracked, resolveCached, storeCached, storedAssets, captureAssets, acquireLock, releaseLock, waitForBuild, loadProvider, easAuth, resolveRemoteBuild, uploadRemoteBuild, resolveCacheProvider, loadCacheProviderModule, planPrebuildFor, prebuild, build, ccacheFor, install, launch, launchRelease, verifyReleaseLaunched, swapApk, resolveDevClientScheme, spawn, kill, createWriter, writeLaunch, writeState, recordBuild, recordStats, readEstimates, now, out, emit } = androidSlotOptions(options);
 	const progress = options.progress ?? NO_BUILD_PROGRESS;
 	const slot = validateDeviceSlot(options.slot);
 	const started = now();
@@ -2455,20 +2508,21 @@ async function runAndroid(options = {}) {
 	const recordRun = stats.record;
 	let ccacheActivity = CCACHE_NOT_RUN;
 	let reclaimed = [];
-	const fail = (code, message, remedy, { lastBuildStatus = false, diagnostics = [], lines = [], logPath = null, lease } = {}) => {
+	const fail = (code, message, remedy, { lastBuildStatus = false, diagnostics = [], buildDiagnostics: rawDiagnostics = [], lines = [], logPath = null, lease } = {}) => {
 		const cancellation = cancelledFailure(PLATFORM, {
 			code,
 			message
 		});
 		if (cancellation) ({code, message, remedy, lines} = cancellation);
 		if (lastBuildStatus) persistLastBuild({
-			writeState,
+			recordBuild,
 			root,
 			record,
 			startedAt,
 			durationMs: now() - started,
 			status: "failed",
 			errorCode: code,
+			diagnostics: rawDiagnostics,
 			out
 		});
 		out(phaseLine("error", chalk.red(`${code}: ${message}`)));
@@ -2540,6 +2594,7 @@ async function runAndroid(options = {}) {
 	const { plan } = planned;
 	const { build: buildPlan, target, isExpo, cacheProviderConfig } = plan;
 	const { variant, release, cache: cachePolicy } = buildPlan;
+	record.configuration = variant ?? "debug";
 	const useBuildCache = cachePolicy.read;
 	const physical = target.kind === "physical";
 	const remoteBackend = target.kind === "remote" ? target.backend : null;
@@ -2567,10 +2622,11 @@ async function runAndroid(options = {}) {
 		buildCache: requestedBuildCache
 	});
 	if (isEasBuildFailure(easBuild)) return fail(easBuild.code, easBuild.message, easBuild.remedy);
-	let androidPackage = detectAndroidPackage(root);
+	const appIds = detectAppIds(root);
+	let androidPackage = appIds.androidPackage;
 	record.bundleId = androidPackage;
 	const registerProject = () => upsertProject(root, {
-		bundleId: detectBundleId(root) ?? void 0,
+		bundleId: appIds.bundleId ?? void 0,
 		androidPackage: androidPackage ?? void 0,
 		isExpo
 	});
@@ -2686,6 +2742,7 @@ async function runAndroid(options = {}) {
 				settings,
 				flags: {
 					systemImage: target.systemImage,
+					systemImageFlag: systemImageFlag?.trim() || null,
 					deviceProfile: target.deviceProfile
 				},
 				note: out,
@@ -2721,7 +2778,8 @@ async function runAndroid(options = {}) {
 				abandonCreatedSession: remoteDevice.abandonCreatedSession,
 				webPreviewUrl: remoteDevice.webPreviewUrl,
 				writeState,
-				register: registerProject
+				register: registerProject,
+				notice: (line) => out(chalk.dim(phaseLine("lock", line)))
 			}) : boot()).then((result) => {
 				bootDuration = bootTimer();
 				return result;
@@ -2910,7 +2968,7 @@ async function runAndroid(options = {}) {
 				pidAlive,
 				verifyCollector,
 				writeLaunch,
-				writeState,
+				recordBuild,
 				now,
 				out,
 				emit,

package/dist/{android-cas-DfJkwCXW.mjs → android-cas-B9Kv9aIy.mjs}

@@ -1,12 +1,12 @@
-import { u as getConfigDir } from "./config-BEq0Qw_a.mjs";
+import { d as getConfigDir } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { r as register } from "./cache-manifest-Pubfp8wV.mjs";
-import { C as sharedCcache, P as withDirLock, j as workspaceLogsDir, x as ensureWorkspaceStorage } from "./metro-BWLOJ_Wr.mjs";
-import { a as spawnDeclared } from "./spawn-claims-BJwXTMPt.mjs";
+import { r as register } from "./cache-manifest-DWPF4RKJ.mjs";
+import { F as withDirLock, M as workspaceLogsDir, S as ensureWorkspaceStorage, w as sharedCcache } from "./metro-BPeY1YMh.mjs";
+import { a as spawnDeclared } from "./spawn-claims-PT8aQpCa.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { l as phaseLine } from "./command-output-D5z2_bcF.mjs";
-import { i as androidHome } from "./android-C4zG2Tuc.mjs";
-import { d as startBuildHeartbeat, n as HEARTBEAT_INTERVAL_MS } from "./xcode-B5SPD--o.mjs";
+import { l as phaseLine } from "./command-output-BIL7rlX7.mjs";
+import { a as androidHome } from "./android-qx_31wJo.mjs";
+import { d as startBuildHeartbeat, n as HEARTBEAT_INTERVAL_MS } from "./xcode-LM6A8cNZ.mjs";
 import { accessSync, constants, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, symlinkSync, writeFileSync } from "node:fs";
 import { isJsonObject, readJsonFile } from "@stim-cli/core/state";
 import { dirname, isAbsolute, join, relative, sep } from "node:path";
@@ -749,10 +749,11 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 		lastLines: [],
 		durationMs: 0
 	};
-	const sdk = androidHome();
+	const sdk = androidHome(env);
+	const sdkExists = existsSync(sdk);
 	const refusal = androidSdkRefusal({
 		sdkPath: sdk,
-		sdkExists: existsSync(sdk),
+		sdkExists,
 		hasLocalProperties: existsSync(join(project.androidDir, "local.properties"))
 	});
 	if (refusal) return {
@@ -844,6 +845,7 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 			],
 			env: {
 				...env,
+				...sdkExists && !env.ANDROID_HOME && !env.ANDROID_SDK_ROOT ? { ANDROID_HOME: sdk } : {},
 				...ccache?.env,
 				...cas?.env,
 				...nativeEnv,
@@ -1122,4 +1124,4 @@ function resolveAndroidCas(root, env = process.env) {
 	};
 }
 //#endregion
-export { buildAndroid as a, CCACHE_NOT_RUN as c, projectCmakeLauncher as d, resolveCcache as f, androidPathRoomRemedy as g, androidPathRoomMessage as h, apkOutputsDir as i, CCACHE_UNAVAILABLE as l, androidPathRoom as m, resolveAndroidCas as n, productFlavorRefusal as o, formatDiagnostic as p, resolveAndroidCompilerCache as r, readProductFlavors as s, readAndroidCasToolchain as t, ccacheActivityLine as u };
+export { androidPathRoomRemedy as _, apkOutputsDir as a, readProductFlavors as c, ccacheActivityLine as d, projectCmakeLauncher as f, androidPathRoomMessage as g, androidPathRoom as h, androidSdkRefusal as i, CCACHE_NOT_RUN as l, formatDiagnostic as m, resolveAndroidCas as n, buildAndroid as o, resolveCcache as p, resolveAndroidCompilerCache as r, productFlavorRefusal as s, readAndroidCasToolchain as t, CCACHE_UNAVAILABLE as u };