stim 1.9.0 → 1.10.1

package/dist/{dev-client-HyqISM0h.mjs → dev-client-DExzPiOa.mjs}

@@ -1,201 +1,30 @@
-import { K as projectDeviceSlots, N as readJsonObject, O as acquireAvdClaim, S as setDevice, T as withConfigLock, U as deviceSlotPlatforms, g as loadConfig, i as clearDevice, j as isJsonObject, k as ownership_claim_exports, t as allConsolePortsAndSerials, u as getConfigDir, v as releaseAndroidConsolePort, x as saveConfig } from "./config-Cp9lM3wX.mjs";
-import { t as getExecutor } from "./exec-jIAlgilk.mjs";
-import { u as ensureWorkspaceStorage, v as workspaceId } from "./workspace-state-DF2gCFhx.mjs";
-import { E as removeTemporaryEntry, T as makeTemporaryDirectory } from "./worktree-R_cUlE7s.mjs";
-import { a as detectIsExpo, c as ownedDeviceLabel, s as isPackageResolvable } from "./project-DS112DYB.mjs";
+import { H as projectDeviceSlots, O as acquireAvdClaim, S as setDevice, T as withConfigLock$1, g as loadConfig$1, i as clearDevice, t as allConsolePortsAndSerials, u as getConfigDir, v as releaseAndroidConsolePort, x as saveConfig, z as deviceSlotPlatforms } from "./config-BEq0Qw_a.mjs";
+import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
+import { g as updateWorkspaceState, i as pidExists, k as workspaceId, m as readWorkspaceState$1, s as resolveProjectMetro, x as ensureWorkspaceStorage } from "./metro-BWLOJ_Wr.mjs";
+import { D as makeTemporaryDirectory, O as removeTemporaryEntry } from "./worktree-BlizKDpZ.mjs";
+import { a as detectIsExpo, c as ownedDeviceLabel, s as isPackageResolvable } from "./project-BXZzOABt.mjs";
+import { n as spawnDeclared } from "./spawn-claims-CUleC2cM.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BXA96myD.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { a as pidExists, t as NOT_OURS_FOREIGN_CWD } from "./metro-DrLHaMn2.mjs";
-import { _ as iosSimSlimProfileSetting, a as androidAvdConfigSetting, c as androidDataPartitionSizeGbSetting } from "./settings-D030k0t4.mjs";
-import { A as ownedAvdMatchesConfiguration, C as listAdbDevices, F as pickDefaultSystemImage, H as waitForBoot, N as ownedAvdSystemImage, O as nextConsolePort, R as resolveOwnedAvdSerial, T as listInstalledSystemImages, d as avdPoolConfiguration, h as createOwnedAvd, j as ownedAvdName, l as assertOwnedAvdStopped, m as configureNewOwnedAvd, p as bootAndroidEmulator, w as listAvds, x as getAvdNameForSerial } from "./android-_y4Ohi5z.mjs";
-import { l as phaseLine } from "./command-output-gByVmIjy.mjs";
-import { r as releaseBuildLock, t as acquireBuildLock } from "./build-lock-DPXPLgTc.mjs";
-import { n as spawnDeclared } from "./spawn-claims-Dn3C_N6w.mjs";
-import { i as expoBinRefusal, r as expoBinPath, t as cleanLine } from "./server-expo-B_lctBR3.mjs";
-import { b as resolveEasCliBin, i as isLegacyDeletionClaim, l as selectParked, n as adoptParked, o as parkedMaxSetting, r as dropParked, s as readParked } from "./sim-pool-KaIsp2Ft.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-DWaiRD0e.mjs";
-import { r as LAUNCH_UNVERIFIED, t as LAUNCH_BUNDLING } from "./launch-verify-Q_OtW1Rf.mjs";
-import { A as readHostMemoryPressure, C as resolveOwnedIosSim, D as configuredIosSimulatorViewer, S as resolveIosCreation, _ as parseRuntimeVersion, b as resetIosKeychain, f as listIosDeviceTypes, h as ownedSimName, i as createOwnedIosSim, k as hostMemoryPressureAdvice, l as iosSimulatorFailureAdvice, n as bootIosSim, u as listAllIosSims, x as resetIosPrivacy, y as renameIosSim } from "./ios-BL2NFckr.mjs";
-import { d as startBuildHeartbeat, f as tailLines, n as HEARTBEAT_INTERVAL_MS } from "./xcode-BZqyxh3e.mjs";
-import { a as liveOwnedDeviceCount, i as deviceTypeMismatch, t as reconcileSimSlim } from "./simslim-B_LsGLuJ.mjs";
-import { D as teardownParkedAvd, O as teardownParkedIosSim, T as teardownOwnedAvd } from "./device-remote-AQ5rQPqr.mjs";
-import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
+import { l as phaseLine } from "./command-output-D5z2_bcF.mjs";
+import { E as listInstalledSystemImages, I as pickDefaultSystemImage, M as ownedAvdName, P as ownedAvdSystemImage, T as listAvds, W as waitForBoot, d as avdPoolConfiguration, h as createOwnedAvd, j as ownedAvdMatchesConfiguration, k as nextConsolePort, l as assertOwnedAvdStopped, m as configureNewOwnedAvd, p as bootAndroidEmulator, w as listAdbDevices, x as getAvdNameForSerial, z as resolveOwnedAvdSerial } from "./android-787HhP5w.mjs";
+import { l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting, v as iosSimSlimProfileSetting } from "./settings-DOugPlPz.mjs";
+import { _ as dropParked, b as readParked, d as teardownOwnedAvd, g as adoptParked, m as teardownParkedIosSim, p as teardownParkedAvd, v as isLegacyDeletionClaim, x as selectParked, y as parkedMaxSetting } from "./ownership-BfPNRf3-.mjs";
+import { E as configuredIosSimulatorViewer, O as hostMemoryPressureAdvice, S as resolveOwnedIosSim, b as resetIosPrivacy, c as iosSimulatorFailureAdvice, d as listIosDeviceTypes, g as parseRuntimeVersion, k as readHostMemoryPressure, l as listAllIosSims, m as ownedSimName, n as bootIosSim, r as createOwnedIosSim, v as renameIosSim, x as resolveIosCreation, y as resetIosKeychain } from "./ios-COGcGEcN.mjs";
+import { i as expoBinRefusal, r as expoBinPath, t as cleanLine } from "./server-expo-BvOCeakp.mjs";
+import { r as LAUNCH_UNVERIFIED, t as LAUNCH_BUNDLING } from "./launch-verify-BhgkYAws.mjs";
+import { a as liveOwnedDeviceCount, i as deviceTypeMismatch, t as reconcileSimSlim } from "./simslim-DZUxzsjq.mjs";
+import { s as startDevServer } from "./start-RbmFPeZ7.mjs";
+import { d as startBuildHeartbeat, f as tailLines, n as HEARTBEAT_INTERVAL_MS } from "./xcode-B2tBkf0m.mjs";
+import { existsSync, mkdirSync, readFileSync, readdirSync } from "node:fs";
+import { isJsonObject, readIdleStop, readJsonObject } from "@stim-cli/core/state";
 import { basename, join } from "node:path";
 import { claimRemoveCommand, clearClaimChild, markClaimChildPending, processGroupAlive, releaseClaim, setClaimChild } from "@stim-cli/core/ownership-claim";
 import { captureProcessIdentity } from "@stim-cli/core/process-identity";
-import { createHash, randomUUID } from "node:crypto";
-import { isDeepStrictEqual } from "node:util";
+import { randomUUID } from "node:crypto";
 import chalk from "chalk";
+import { isDeepStrictEqual } from "node:util";
 import { request } from "node:http";
-//#region src/engine/eas-build.ts
-function isEasBuildFailure(result) {
-	return result?.ok === false;
-}
-function easOptionRefusal({ profile, isExpo, buildSelector, buildCache }) {
-	if (profile === void 0) return null;
-	if (profile.trim() && isExpo && buildSelector === void 0 && buildCache !== false) return null;
-	return {
-		code: "STIM_BAD_ARG",
-		message: "--eas-profile requires an Expo project and a non-empty development profile.",
-		remedy: "Use --eas-profile <name> without --scheme, --configuration, --variant, or --no-build-cache."
-	};
-}
-function object(value) {
-	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
-}
-function shellArg(value) {
-	return /^[a-zA-Z0-9_.-]+$/.test(value) ? value : `'${value.replaceAll("'", "'\\''")}'`;
-}
-function easDeviceBuildRemedy(profile) {
-	return `If the device is not registered, run npx eas-cli device:create. With approval for cloud build costs and signing changes, run npx eas-cli build --platform ios --profile ${shellArg(profile)} to produce a build with a valid profile for this device, then retry the same Stim command.`;
-}
-var EasFailure = class extends Error {
-	code;
-	remedy;
-	constructor(code, message, remedy) {
-		super(message);
-		this.code = code;
-		this.remedy = remedy;
-	}
-};
-function selectEasBuild(builds, { platform, profile, fingerprint, projectId, physical = false }) {
-	if (!Array.isArray(builds)) throw new Error("EAS build:list did not return an array.");
-	for (const value of builds) {
-		const build = object(value);
-		if (typeof build.id === "string" && build.id.length > 0 && build.status === "FINISHED" && build.platform === platform.toUpperCase() && build.buildProfile === profile && object(build.fingerprint).hash === fingerprint && (object(build.app).id ?? object(build.project).id) === projectId && (platform !== "ios" || build.isForIosSimulator === !physical) && build.distribution === "INTERNAL" && typeof object(build.artifacts).applicationArchiveUrl === "string") return build.id;
-	}
-	return null;
-}
-async function resolveEasDevelopmentBuild({ root, platform, profile, note, isExpo = true, physical = false, selectors = [], buildCache }) {
-	if (profile === void 0) return null;
-	const refusal = easOptionRefusal({
-		profile,
-		isExpo,
-		buildSelector: selectors.find((value) => value != null) ?? void 0,
-		buildCache
-	});
-	if (refusal) return {
-		ok: false,
-		...refusal
-	};
-	const retry = "the same Stim command";
-	const buildCommand = `npx eas-cli build --platform ${platform} --profile ${shellArg(profile)}`;
-	let lock = null;
-	try {
-		const cli = resolveEasCliBin(root);
-		if (!cli) throw new EasFailure("STIM_EAS_UNAVAILABLE", "EAS CLI is not installed.", "Install eas-cli, run eas login, then retry.");
-		let profileEnv = {};
-		const run = (args, timeoutMs = 12e4) => {
-			try {
-				return JSON.parse(getExecutor().runFile(cli.file, [
-					...args,
-					"--json",
-					"--non-interactive"
-				], {
-					cwd: root,
-					timeoutMs,
-					env: profileEnv
-				}));
-			} catch {
-				throw new EasFailure("STIM_EAS_UNAVAILABLE", `EAS ${args[0]} failed or returned invalid JSON.`, `Run npx eas-cli ${args.map(shellArg).join(" ")} to inspect the error, then retry ${retry}.`);
-			}
-		};
-		note(`eas   resolving profile ${profile}`);
-		const config = object(run([
-			"config",
-			"--platform",
-			platform,
-			"--profile",
-			profile
-		]));
-		const buildProfile = object(config.buildProfile);
-		profileEnv = object(buildProfile.env);
-		const projectId = object(object(object(config.appConfig).extra).eas).projectId;
-		if (buildProfile.developmentClient !== true || buildProfile.distribution !== "internal" || platform === "ios" && buildProfile.simulator === true !== !physical) throw new EasFailure("STIM_BAD_ARG", `EAS profile ${profile} is not an internal development build for this ${platform} target.`, `Set developmentClient: true and distribution: internal${platform === "ios" ? `, with ios.simulator: ${!physical}` : ""} in that eas.json profile.`);
-		if (typeof projectId !== "string" || !projectId) throw new EasFailure("STIM_BAD_ARG", "The Expo app is not linked to an EAS project.", "Link the intended EAS project with eas init, then retry.");
-		if (platform === "ios" ? buildProfile.buildConfiguration !== void 0 && buildProfile.buildConfiguration !== "Debug" : buildProfile.gradleCommand !== void 0 && (typeof buildProfile.gradleCommand !== "string" || !/^:app:assemble\w*Debug$/.test(buildProfile.gradleCommand))) throw new EasFailure("STIM_BAD_ARG", `EAS profile ${profile} overrides the development build configuration.`, "Use ios.buildConfiguration: Debug or an android.gradleCommand that assembles a single Debug APK, or remove the override.");
-		note(`eas   fingerprinting ${platform} with profile ${profile}`);
-		const fingerprint = object(run([
-			"fingerprint:generate",
-			"--platform",
-			platform,
-			"--build-profile",
-			profile
-		])).hash;
-		if (typeof fingerprint !== "string" || !/^[a-f0-9]{40,64}$/.test(fingerprint)) throw new EasFailure("STIM_EAS_UNAVAILABLE", "EAS returned no valid native fingerprint.", `Run npx eas-cli fingerprint:generate --platform ${platform} --build-profile ${shellArg(profile)} to inspect the result.`);
-		note(`eas   looking for ${fingerprint.slice(0, 8)}`);
-		const buildId = selectEasBuild(run([
-			"build:list",
-			"--platform",
-			platform,
-			"--build-profile",
-			profile,
-			"--fingerprint-hash",
-			fingerprint,
-			"--status",
-			"finished",
-			...platform === "ios" && !physical ? ["--simulator"] : ["--distribution", "internal"],
-			"--limit",
-			"1"
-		]), {
-			platform,
-			profile,
-			fingerprint,
-			projectId,
-			physical
-		});
-		if (!buildId) throw new EasFailure("STIM_EAS_BUILD_MISSING", `No compatible EAS ${platform} build exists for profile ${profile} and fingerprint ${fingerprint}.`, `A cloud build may incur charges. With approval to run it, use ${buildCommand}, then retry ${retry}.`);
-		const cacheKey = `eas-${createHash("sha256").update(JSON.stringify({
-			projectId,
-			buildId
-		})).digest("hex")}-debug-${physical && platform === "ios" ? "device" : "sim"}`;
-		lock = acquireBuildLock({
-			platform,
-			key: cacheKey,
-			root
-		});
-		if (!lock.acquired) throw new EasFailure("STIM_EAS_UNAVAILABLE", `Another run holds the EAS artifact claim at ${lock.path}.`, `Wait for that run to finish, then retry ${retry}.`);
-		note(`eas   resolving artifact for build ${buildId}`);
-		const result = object(run([
-			"build:download",
-			"--build-id",
-			buildId
-		], 6e5));
-		if (typeof result.path !== "string" || !existsSync(result.path)) throw new Error("EAS returned no downloaded artifact.");
-		const path = realpathSync(result.path);
-		if (platform === "ios" ? !path.endsWith(".app") || !statSync(path).isDirectory() : !path.endsWith(".apk") || !statSync(path).isFile()) throw new Error("EAS returned an unexpected artifact path or type.");
-		note(`eas   artifact ready ${fingerprint.slice(0, 8)}`);
-		return {
-			ok: true,
-			path,
-			fingerprint,
-			cacheKey,
-			cacheHit: "remote"
-		};
-	} catch (error) {
-		const claim = (0, ownership_claim_exports.claimFailure)(error, null);
-		if (claim) return {
-			ok: false,
-			code: claim.code,
-			message: claim.message,
-			remedy: claim.remedy
-		};
-		if (error instanceof EasFailure) return {
-			ok: false,
-			code: error.code,
-			message: error.message,
-			remedy: error.remedy
-		};
-		return {
-			ok: false,
-			code: "STIM_EAS_UNAVAILABLE",
-			message: `Could not resolve the EAS development build: ${error.message}`,
-			remedy: `Retry ${retry}. No cloud build was started.`
-		};
-	} finally {
-		releaseBuildLock(lock);
-	}
-}
-//#endregion
 //#region src/engine/metro-warmup.ts
 const WARMUP_TIMEOUT_MS = 6e4;
 async function requestLocal(url, platform, prefetch) {
@@ -260,42 +89,43 @@ async function warmMetro({ port, platform, isExpo, appId, bundleUrl }) {
 //#endregion
 //#region src/commands/native-runtime.ts
 const sleep$1 = (ms) => new Promise((r) => setTimeout(r, ms));
-const GATE_RETRY_DELAYS_MS = [
-	3e3,
-	7e3,
-	1e4
-];
-function gateShouldRetry(resolution) {
-	if (resolution?.metro) return false;
-	return resolution?.kind !== NOT_OURS_FOREIGN_CWD;
-}
-async function resolveMetroWithRetry(resolve, port, root, { delays = GATE_RETRY_DELAYS_MS, sleep: wait = sleep$1, onRetry = (_info) => {} } = {}) {
-	let resolution = await resolve(port, root);
-	for (let i = 0; i < delays.length && gateShouldRetry(resolution); i++) {
-		const delayMs = delays[i];
-		if (delayMs === void 0) break;
-		onRetry({
-			attempt: i + 1,
-			delayMs,
-			resolution
-		});
-		await wait(delayMs);
-		resolution = await resolve(port, root);
-	}
-	return resolution;
-}
-function noMetroMessage({ port, resolution, supervisor, supervisorAlive }) {
-	const foreign = resolution?.notOurs;
-	if (supervisor && supervisor.port === port && supervisorAlive) {
-		const mode = supervisor.mode ? `${supervisor.mode} ` : "";
-		return `A supervisor record exists for port ${port} (pid ${supervisor.pid}, ${mode}dev server) but it did not verify as this workspace's Metro${foreign ? `: ${foreign}` : " -- nothing answered /status"}. Metro may still be indexing this project (a monorepo file-map crawl blocks its event loop for ~20s after the port opens).`;
-	}
-	if (foreign) return `Port ${port} is in use but is NOT this workspace's dev server: ${foreign}.`;
-	return `Nothing is serving this workspace's dev server on port ${port}.`;
-}
-function noMetroRemedy({ port, supervisor, supervisorAlive }) {
-	if (supervisor && supervisor.port === port && supervisorAlive) return "Re-run `stim ios` in a few seconds, or give the dev server longer to verify with `stim start --wait <seconds>`.";
-	return "Run `stim start` first, or pass --no-metro-check.";
+async function ensureDevServer({ root, port, settings, remote, note, resolve = resolveProjectMetro, start = startDevServer, readState = readWorkspaceState$1 }) {
+	const held = port === null ? null : (await resolve(port, root)).metro;
+	if (port !== null && held) return {
+		ok: true,
+		port,
+		pid: held.pid ?? null,
+		devServer: null,
+		reclaimed: []
+	};
+	const reason = readIdleStop(readState(root)) ? "stopped (idle)" : "not running";
+	note(chalk.dim(phaseLine("metro", `dev server ${reason}; starting it${remote ? " for a remote device" : ""}`)));
+	const result = await start({
+		root,
+		settings,
+		remote,
+		out: note,
+		note
+	});
+	if (!result.ok) return {
+		ok: false,
+		code: result.error.code,
+		message: `Could not start this workspace's dev server: ${result.error.message}`,
+		remedy: result.error.remedy,
+		lines: result.lines,
+		reclaimed: result.reclaimed
+	};
+	const { facts } = result;
+	return {
+		ok: true,
+		port: facts.port,
+		pid: facts.supervisorPid,
+		devServer: facts.alreadyRunning ? null : {
+			started: true,
+			reason
+		},
+		reclaimed: result.reclaimed
+	};
 }
 async function ensureWorkspaceStorageSafely(root, { note = (_line) => {} } = {}) {
 	try {
@@ -406,8 +236,8 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 				return record;
 			}
 		}
-		withConfigLock(() => {
-			const current = deviceSlotPlatforms(loadConfig()?.projects?.[projectPath], slot)?.ios;
+		withConfigLock$1(() => {
+			const current = deviceSlotPlatforms(loadConfig$1()?.projects?.[projectPath], slot)?.ios;
 			if (!current) return;
 			if (current.deviceUdid !== record.deviceUdid || current.owned !== record.owned) throw new Error("The simulator assignment changed during recovery. Run `stim ios` again.");
 			clearDevice(projectPath, "ios", slot);
@@ -483,7 +313,7 @@ function withIosDeviceNameLock(fn) {
 }
 function ownedIosNameSuffix(label, model, projectPath, udid) {
 	const names = new Set(listAllIosSims({ includeUnavailable: true }).filter((sim) => sim.udid !== udid).map((sim) => sim.name));
-	for (const project of Object.values(loadConfig()?.projects ?? {})) for (const { platforms } of projectDeviceSlots(project)) {
+	for (const project of Object.values(loadConfig$1()?.projects ?? {})) for (const { platforms } of projectDeviceSlots(project)) {
 		const record = platforms.ios;
 		if (record?.deviceUdid !== udid && record?.deviceName) names.add(record.deviceName);
 	}
@@ -555,8 +385,8 @@ function takeParkedIosSim({ projectPath, slot, label, choice, out }) {
 	return null;
 }
 function clearIosAdoptionPending(projectPath, slot = "default") {
-	withConfigLock(() => {
-		const cfg = loadConfig();
+	withConfigLock$1(() => {
+		const cfg = loadConfig$1();
 		const ios = deviceSlotPlatforms(cfg?.projects?.[projectPath], slot)?.ios;
 		if (!cfg || !ios?.adoptionPending) return;
 		delete ios.adopted;
@@ -693,12 +523,12 @@ var AvdBootError = class extends Error {
 };
 var AvdRecoveryError = class extends AvdBootError {};
 function findOtherOwner(avdName, projectPath, selectedSlot = "default") {
-	for (const [path, project] of Object.entries(loadConfig()?.projects ?? {})) if (projectDeviceSlots(project).some(({ slot, platforms }) => (path !== projectPath || slot !== selectedSlot) && platforms.android?.avdName?.toLowerCase() === avdName.toLowerCase())) return path;
+	for (const [path, project] of Object.entries(loadConfig$1()?.projects ?? {})) if (projectDeviceSlots(project).some(({ slot, platforms }) => (path !== projectPath || slot !== selectedSlot) && platforms.android?.avdName?.toLowerCase() === avdName.toLowerCase())) return path;
 	return null;
 }
 async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, systemImage, configuration, configure, teardown = teardownOwnedAvd }) {
-	const { claim, reservation, previous, avdName } = withConfigLock(() => {
-		const previous = deviceSlotPlatforms(loadConfig()?.projects?.[projectPath], slot)?.android;
+	const { claim, reservation, previous, avdName } = withConfigLock$1(() => {
+		const previous = deviceSlotPlatforms(loadConfig$1()?.projects?.[projectPath], slot)?.android;
 		if (previous?.avdName && previous.avdName !== previousAvdName) throw new Error(`Another Stim run assigned AVD ${previous.avdName} to this workspace. Retry to use it.`);
 		if (readParked("android").some((entry) => entry.name === ownedAvdName(label)) || findOtherOwner(ownedAvdName(label), projectPath, slot)) label = `${label}-${randomUUID().slice(0, 8)}`;
 		const avdName = ownedAvdName(label);
@@ -723,7 +553,7 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 			throw error;
 		}
 	});
-	const currentRecord = () => deviceSlotPlatforms(loadConfig()?.projects?.[projectPath], slot)?.android;
+	const currentRecord = () => deviceSlotPlatforms(loadConfig$1()?.projects?.[projectPath], slot)?.android;
 	const assertReservation = () => {
 		if (readParked("android").some((entry) => entry.name === avdName)) throw new Error(`AVD ${avdName} was parked by another Stim run. Retry to adopt it safely.`);
 		const owner = findOtherOwner(avdName, projectPath, slot);
@@ -769,7 +599,7 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 			if (!message.includes("already exists")) throw error;
 			try {
 				if (!listAvds().includes(avdName)) throw new AvdRecoveryError(`AVD ${avdName} already exists on disk but is not listed by the emulator. ${message}`, "Run `npx stim gc` to inspect orphaned owned AVDs, then `npx stim gc --delete` to reclaim those safe to delete. Retry `stim android` after cleanup; keep any AVD that GC cannot verify.", error);
-				withConfigLock(assertReservation);
+				withConfigLock$1(assertReservation);
 				const resolved = resolveOwnedAvdSerial(avdName);
 				if (resolved.missing || resolved.notOwned) throw new Error(`AVD ${avdName} could not be verified for recovery. Retry after checking its registration.`, { cause: error });
 				if (!resolved.serial) assertOwnedAvdStopped(avdName);
@@ -783,7 +613,7 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 					} : {}
 				};
 			} catch (recoveryError) {
-				withConfigLock(() => {
+				withConfigLock$1(() => {
 					if (!isDeepStrictEqual(currentRecord(), reservation)) return;
 					if (previous) setDevice(projectPath, "android", previous, slot);
 					else clearDevice(projectPath, "android", slot, avdName);
@@ -797,7 +627,7 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 		} catch (error) {
 			configurationFailure = { error };
 		}
-		if (!configurationFailure) withConfigLock(() => {
+		if (!configurationFailure) withConfigLock$1(() => {
 			assertReservation();
 			setDevice(projectPath, "android", {
 				avdName,
@@ -990,7 +820,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 		systemImage: created.systemImage
 	};
 }
-function claimAndroidConsolePort({ projectPath, slot, avdName, deviceName, livePorts = [], metadata }, { lock = withConfigLock, recordedPorts = () => allConsolePortsAndSerials().androidConsolePorts, record = setDevice } = {}) {
+function claimAndroidConsolePort({ projectPath, slot, avdName, deviceName, livePorts = [], metadata }, { lock = withConfigLock$1, recordedPorts = () => allConsolePortsAndSerials().androidConsolePorts, record = setDevice } = {}) {
 	return lock(() => {
 		const consolePort = nextConsolePort([...recordedPorts(), ...livePorts]);
 		const claim = {
@@ -1052,7 +882,7 @@ function androidBootRemedy(pressure) {
 		count = liveOwnedDeviceCount({
 			sims: process.platform === "darwin" ? listAllIosSims({ timeoutMs: 2e3 }) : [],
 			adbEmulators: listAdbDevices({ timeoutMs: 2e3 }).emulators,
-			config: loadConfig()
+			config: loadConfig$1()
 		});
 	} catch {}
 	const observation = pressure === "warning" || pressure === "critical" ? `macOS reports ${pressure} host memory pressure. ` : "";
@@ -1221,15 +1051,71 @@ function nativeDirName(platform) {
 function nativeDir(root, platform) {
 	return join(root, nativeDirName(platform));
 }
-function shouldPrebuild({ isExpo, nativeDirExists }) {
-	return Boolean(isExpo) && !nativeDirExists;
+function nativeDirInFingerprint(sources, platform) {
+	const dir = nativeDirName(platform);
+	return sources.some((source) => source.type === "dir" && source.filePath === dir && source.hash != null);
+}
+/**
+* @expo/fingerprint leaves a native directory out of the hash when git ignores it (CNG), so the cache
+* key only covers that directory when this workspace's recorded prebuild ran on the same fingerprint.
+*/
+function prebuildAction({ isExpo, nativeDirExists, nativeDirFingerprinted, nativeDirTracked, generatedFrom, fingerprint }) {
+	if (!isExpo) return "none";
+	if (!nativeDirExists) return "generate";
+	if (nativeDirFingerprinted || generatedFrom === fingerprint) return "none";
+	return nativeDirTracked ? "refuse" : "regenerate";
+}
+function prebuildRecord(state) {
+	const record = state?.prebuild;
+	return record && typeof record === "object" ? record : {};
 }
-function needsPrebuild(root, platform, isExpo) {
-	return shouldPrebuild({
+function gitTracksNativeDir(root, platform) {
+	try {
+		return getExecutor().runFile("git", [
+			"-C",
+			root,
+			"ls-files",
+			"--",
+			nativeDirName(platform)
+		], { env: {
+			LC_ALL: "C",
+			LANGUAGE: "C"
+		} }).trim() !== "";
+	} catch (error) {
+		if (error?.code === "ENOENT") return false;
+		return !/not a git repository \(or any (of the parent directories|parent up to mount point)/.test(String(error?.message));
+	}
+}
+function planPrebuild(root, platform, { isExpo, fingerprint, sources }) {
+	const nativeDirExists = existsSync(nativeDir(root, platform));
+	const fingerprinted = nativeDirInFingerprint(sources, platform);
+	const generatedFrom = prebuildRecord(readWorkspaceState$1(root))[platform];
+	return prebuildAction({
 		isExpo,
-		nativeDirExists: existsSync(nativeDir(root, platform))
+		nativeDirExists,
+		nativeDirFingerprinted: fingerprinted,
+		nativeDirTracked: nativeDirExists && !fingerprinted && gitTracksNativeDir(root, platform),
+		generatedFrom: typeof generatedFrom === "string" ? generatedFrom : null,
+		fingerprint
 	});
 }
+function recordPrebuild(root, platform, fingerprint) {
+	updateWorkspaceState(root, (state) => ({
+		...state,
+		prebuild: {
+			...prebuildRecord(state),
+			[platform]: fingerprint
+		}
+	}));
+}
+function staleNativeDirRefusal(platform) {
+	const dir = nativeDirName(platform);
+	return {
+		code: PREBUILD_ERROR,
+		message: `The fingerprint leaves ${dir}/ out of the cache key, and Stim cannot show that ${dir}/ was generated from the current app config. Git tracks files in it, or could not say whether it does, so Stim will not regenerate it with \`expo prebuild --clean\`.`,
+		remedy: `Stop excluding ${dir}/ from the fingerprint (check .fingerprintignore) so the cache key covers its files, or add ${dir}/ to .gitignore and untrack it so Stim regenerates it from the app config.`
+	};
+}
 function prebuildRefusal({ isExpo, platform, nativeDirExists }) {
 	if (nativeDirExists || isExpo) return null;
 	const dir = nativeDirName(platform);
@@ -1248,7 +1134,7 @@ function prebuildFailure(logWriter, result) {
 	});
 	return result;
 }
-async function runPrebuild(root, platform, logWriter, { spawnFn = null, now = Date.now, isExpo = null } = {}) {
+async function runPrebuild(root, platform, logWriter, { spawnFn = null, now = Date.now, isExpo = null, clean = false } = {}) {
 	const dirExists = existsSync(nativeDir(root, platform));
 	const refusal = prebuildRefusal({
 		isExpo: isExpo === null ? detectIsExpo(root) : isExpo,
@@ -1296,7 +1182,8 @@ async function runPrebuild(root, platform, logWriter, { spawnFn = null, now = Da
 			"prebuild",
 			"-p",
 			platform,
-			"--no-install"
+			"--no-install",
+			...clean ? ["--clean"] : []
 		], {
 			cwd: root,
 			stdio: [
@@ -1685,4 +1572,4 @@ function hasDevClient(root) {
 	return isPackageResolvable(root, "expo-dev-client");
 }
 //#endregion
-export { isEasBuildFailure as C, easDeviceBuildRemedy as S, noMetroMessage as _, swapJsBundle as a, sleep$1 as b, ensureBooted as c, AvdRecoveryError as d, clearIosAdoptionPending as f, launchOutcomeRecord as g, isPhysicalDeviceRequest as h, detectEntryFile as i, ensureOwnedDevice as l, gateShouldRetry as m, pickDevClientScheme as n, needsPrebuild as o, ensureWorkspaceStorageSafely as p, schemesFromInfoPlist as r, runPrebuild as s, devClientScheme as t, AvdBootError as u, noMetroRemedy as v, resolveEasDevelopmentBuild as w, warmMetro as x, resolveMetroWithRetry as y };
+export { isPhysicalDeviceRequest as _, swapJsBundle as a, warmMetro as b, runPrebuild as c, ensureOwnedDevice as d, AvdBootError as f, ensureWorkspaceStorageSafely as g, ensureDevServer as h, detectEntryFile as i, staleNativeDirRefusal as l, clearIosAdoptionPending as m, pickDevClientScheme as n, planPrebuild as o, AvdRecoveryError as p, schemesFromInfoPlist as r, recordPrebuild as s, devClientScheme as t, ensureBooted as u, launchOutcomeRecord as v, sleep$1 as y };

package/dist/{device-D4U-xLty.mjs → device-Czh5kO8A.mjs}

@@ -1,10 +1,10 @@
-import { G as parseDeviceSlotOption } from "./config-Cp9lM3wX.mjs";
-import { o as findProjectRoot, t as NO_PROJECT_REFUSAL } from "./project-DS112DYB.mjs";
-import { C as listAdbDevices, D as memoizeEmulatorProbe, I as probeEmulatorSerial, P as physicalDeviceModel, a as androidPoolNoCandidatesRefusal, i as androidPoolCandidates, z as resolvePhysicalDevice } from "./android-_y4Ohi5z.mjs";
-import { r as clockTime } from "./command-output-gByVmIjy.mjs";
-import { f as takeLease, l as releaseWorkspaceLeases, n as fileLeaseIo, o as parseLeaseDuration } from "./device-lease-Crs-HkJY.mjs";
-import { d as waitForDevice, s as parseDeviceWait, t as selectFromPool } from "./device-pool-CnTAz8X1.mjs";
-import { a as iosPoolCandidates, c as listIosDevices, o as iosPoolNoCandidatesRefusal, s as isWirelessIosDevice, u as resolveIosPhysicalDevice } from "./ios-device-D972i9wf.mjs";
+import { V as parseDeviceSlotOption } from "./config-BEq0Qw_a.mjs";
+import { o as findProjectRoot, t as NO_PROJECT_REFUSAL } from "./project-BXZzOABt.mjs";
+import { r as clockTime } from "./command-output-D5z2_bcF.mjs";
+import { n as fileLeaseIo, o as parseLeaseDuration, p as takeLease, u as releaseWorkspaceLeases } from "./device-lease-CbEaIk7b.mjs";
+import { B as resolvePhysicalDevice, F as physicalDeviceModel, L as probeEmulatorSerial, O as memoizeEmulatorProbe, a as androidPoolNoCandidatesRefusal, i as androidPoolCandidates, w as listAdbDevices } from "./android-787HhP5w.mjs";
+import { d as waitForDevice, s as parseDeviceWait, t as selectFromPool } from "./device-pool-BBWLAr55.mjs";
+import { a as iosPoolCandidates, c as listIosDevices, o as iosPoolNoCandidatesRefusal, s as isWirelessIosDevice, u as resolveIosPhysicalDevice } from "./ios-device-DNjPXBnb.mjs";
 import chalk from "chalk";
 //#region src/commands/device.ts
 const DEFAULT_FOR = "5m";