stim 1.29.0 → 1.31.0

package/dist/device-DuNLOlR6.mjs

@@ -0,0 +1,175 @@
+import { U as deviceSlotPlatforms } from "./config-D5qNWJEP.mjs";
+import { s as ownedDeviceLabel } from "./project-DCLkDM8C.mjs";
+import { x as configureNewOwnedAvd } from "./android-DsEj2CCs.mjs";
+import { c as pidExists } from "./metro-mKHEMO-a.mjs";
+import { pt as teardownOwnedAvd } from "./workspaces-BNEyJ1B_.mjs";
+import { h as tailLines } from "./activity-Dw4N_RFe.mjs";
+import "./ios-CdAV4-1E.mjs";
+import { t as clearDeviceIdleShutdown } from "./idle-shutdown-BWHQ7mQG.mjs";
+import { i as ensureOwnedIosDevice, r as ensureIosBooted } from "./device-ios-CUYUhSYO.mjs";
+import { t as reconcileSimSlim } from "./simslim-93xmPh-d.mjs";
+import { n as ensureAndroidBooted, r as ensureOwnedAndroidDevice, t as ANDROID_BOOT_TIMEOUT_MS } from "./device-android-BjhH0Ru3.mjs";
+import { existsSync } from "node:fs";
+import { dirname, join, resolve, sep } from "node:path";
+import { rotatedLogPath } from "@stim-cli/core";
+import { acceptsShape, settingDefinition } from "@stim-cli/core/state";
+import { request } from "node:http";
+//#region src/engine/metro-warmup.ts
+const WARMUP_TIMEOUT_MS = 6e4;
+async function requestLocal(url, platform, prefetch) {
+	return new Promise((resolve) => {
+		const req = request(url, { headers: {
+			accept: "application/json",
+			"expo-platform": platform,
+			"x-stim-metro-warmup": "1"
+		} });
+		const timer = setTimeout(() => req.destroy(), WARMUP_TIMEOUT_MS);
+		timer.unref();
+		req.on("socket", (socket) => socket.unref());
+		req.on("error", () => resolve(null));
+		req.on("close", () => {
+			clearTimeout(timer);
+			resolve(null);
+		});
+		req.on("response", (res) => {
+			let body = "";
+			res.setEncoding("utf8");
+			res.on("data", (chunk) => {
+				if (!prefetch) body += chunk;
+			});
+			res.on("error", () => resolve(null));
+			res.on("end", () => resolve(res.statusCode === 200 ? body : null));
+		});
+		req.end();
+	});
+}
+const ENTRY_EXTENSIONS = [
+	"",
+	".js",
+	".jsx",
+	".ts",
+	".tsx"
+];
+function entryExists(bundlePath, root) {
+	const entry = decodeURIComponent(bundlePath.replace(/\.bundle\/*$/, ""));
+	if (entry.startsWith("/.expo/")) return true;
+	for (let dir = resolve(root);; dir = dirname(dir)) {
+		const file = resolve(dir, `.${entry}`);
+		if (file.startsWith(dir + sep) && ENTRY_EXTENSIONS.some((ext) => existsSync(file + ext))) return true;
+		if (dirname(dir) === dir) return false;
+	}
+}
+function recordedBundleUrl(logsDir, root, platform) {
+	const setting = settingDefinition(`metro.warmupUrl.${platform}`);
+	if (!logsDir || !root || !setting) return null;
+	const log = join(logsDir, "metro.ndjson");
+	for (const file of [log, rotatedLogPath(log)]) for (const line of (tailLines(file) ?? []).toReversed()) try {
+		const record = JSON.parse(line);
+		if (record?.event === "bundle_response_started" && record.platform === platform && acceptsShape(setting, record.url) && entryExists(new URL(record.url, "http://localhost").pathname, root)) return record.url;
+	} catch {}
+	return null;
+}
+async function warmMetro({ port, platform, isExpo, appId, bundleUrl, logsDir, root }) {
+	try {
+		const origin = `http://127.0.0.1:${port}`;
+		if (await requestLocal(new URL("/_stim/metro-warmup", origin), platform, false) !== "ready") return;
+		const url = new URL("/index.bundle", origin);
+		url.search = new URLSearchParams({
+			platform,
+			dev: "true",
+			lazy: "true",
+			minify: "false",
+			...platform === "ios" ? { inlineSourceMap: "false" } : {},
+			modulesOnly: "false",
+			runModule: "true",
+			excludeSource: "true",
+			sourcePaths: "url-server",
+			...appId ? { app: appId } : {}
+		}).toString();
+		bundleUrl ||= recordedBundleUrl(logsDir, root, platform);
+		if (!bundleUrl && isExpo) {
+			const body = await requestLocal(new URL(origin), platform, false);
+			if (body === null) return;
+			const manifest = JSON.parse(body);
+			bundleUrl = manifest.launchAsset?.url ?? manifest.bundleUrl;
+			if (typeof bundleUrl !== "string") return;
+		}
+		if (bundleUrl) {
+			const bundle = new URL(bundleUrl, origin);
+			url.pathname = bundle.pathname;
+			url.search = bundle.search;
+		}
+		await requestLocal(url, platform, true);
+	} catch {}
+}
+//#endregion
+//#region src/engine/device.ts
+/**
+* Whether `ensureOwnedDevice` created, adopted or started booting the device, rather than finding it booted.
+* Undefined for a remote device, which those functions do not describe.
+*/
+function didSetUpDevice(device, remote) {
+	return remote ? void 0 : Boolean(device.setup || device.booting);
+}
+async function ensureOwnedDevice({ platform, project, projectPath, slot, settingsRoot = projectPath, label = ownedDeviceLabel(projectPath), settings, flags = {}, note = () => {}, out = () => {}, logFile = null, alive = pidExists, configureAvd = configureNewOwnedAvd, teardownAvd = teardownOwnedAvd, reconcileIosSimulator = reconcileSimSlim, simSnapshot }) {
+	await clearDeviceIdleShutdown(projectPath, platform, slot);
+	if (slot && slot !== "default") label = `${label}-${slot}`;
+	const record = deviceSlotPlatforms(project, slot)?.[platform] ?? null;
+	if (platform === "ios") return ensureOwnedIosDevice({
+		record,
+		projectPath,
+		slot,
+		settingsRoot,
+		label,
+		settings,
+		flags,
+		note,
+		out,
+		reconcileIosSimulator,
+		simSnapshot
+	});
+	return ensureOwnedAndroidDevice({
+		record,
+		projectPath,
+		slot,
+		settingsRoot,
+		label,
+		settings,
+		flags,
+		note,
+		out,
+		logFile,
+		alive,
+		configureAvd,
+		teardownAvd
+	});
+}
+const BOOT_POLL_MS = 500;
+async function ensureBooted({ platform, device, simulatorApp, timeoutMs, pollMs = BOOT_POLL_MS, out = () => {}, logFile = null, alive = pidExists, projectPath, slot, deviceSlotWait }) {
+	if (platform === "ios") return ensureIosBooted({
+		device,
+		projectPath,
+		slot,
+		deviceSlotWait,
+		simulatorApp,
+		timeoutMs: timeoutMs ?? 6e5,
+		pollMs,
+		out
+	});
+	if (platform === "android") return ensureAndroidBooted({
+		device,
+		deviceSlotWait,
+		projectPath,
+		slot,
+		timeoutMs: timeoutMs ?? ANDROID_BOOT_TIMEOUT_MS,
+		out,
+		logFile,
+		alive
+	});
+	return {
+		failed: true,
+		reason: `Unknown platform "${platform}".`
+	};
+}
+//#endregion
+export { warmMetro as i, ensureBooted as n, ensureOwnedDevice as r, didSetUpDevice as t };

package/dist/{device-Bmm5qjM-.mjs → device-android-BjhH0Ru3.mjs}

@@ -1,117 +1,19 @@
 import { D as ownership_claim_exports, t as getExecutor } from "./exec-aULwtNly.mjs";
-import { D as withConfigLock$1, G as projectDeviceSlots, H as deviceSlotPlatforms, O as withConfigLockAsync$1, _ as loadConfig$1, a as clearDevice, b as releaseAndroidConsolePort, i as clearAndroidBootPending, j as acquireAvdClaim, t as allConsolePortsAndSerials, w as setDevice } from "./config-AbUjIBOQ.mjs";
-import { l as phaseLine } from "./command-output-DjCsmzLZ.mjs";
-import { l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting } from "./settings-D776ygML.mjs";
-import { s as ownedDeviceLabel } from "./project-D1n0K4yg.mjs";
-import { B as ownedAvdDeviceProfile, F as listAvdsAsync, H as ownedAvdMatchesConfiguration, I as listInstalledSystemImages, K as ownedAvdSystemImage, O as getAvdNameForSerialAsync, U as ownedAvdName, X as pickDefaultSystemImage, _ as avdPoolConfiguration, b as configureNewOwnedAvd, ct as waitForBoot, gt as isLegacyDeletionClaim, j as listAdbDevicesAsync, n as OWNED_AVD_CONFIG_DEFAULTS, nt as resolveOwnedAvdSerialAsync, p as assertOwnedAvdStoppedAsync, pt as adoptParked, t as DEFAULT_AVD_DEVICE_PROFILE, vt as parkedMaxSetting, x as createOwnedAvd, y as bootAndroidEmulator, yt as readParked, z as nextConsolePort } from "./android-BHKgeOuq.mjs";
-import { c as pidExists } from "./metro-BMQHczcf.mjs";
-import { gt as teardownParkedAvd, pt as teardownOwnedAvd } from "./workspaces-CvSYD_78.mjs";
-import { h as tailLines } from "./activity-BR5oHSO5.mjs";
-import { B as reportMemoryCulprits, L as memoryCulpritsUnderAsync, R as readHostMemoryPressure, V as memoryCulpritAdvice, f as listAllIosSimsAsync } from "./ios-CoMCWfub.mjs";
-import { g as withDeviceBootAdmission, n as DeviceAdmissionRefusal, o as countLiveOwnedDevicesFrom } from "./device-capacity-B2ChA-bz.mjs";
-import { t as clearDeviceIdleShutdown } from "./idle-shutdown-BM37gMfU.mjs";
-import { i as ensureOwnedIosDevice, r as ensureIosBooted } from "./device-ios-CYzivd31.mjs";
-import { t as reconcileSimSlim } from "./simslim-CbpHERcv.mjs";
+import { K as projectDeviceSlots, M as acquireAvdClaim, O as withConfigLock, T as setDevice, U as deviceSlotPlatforms, a as clearDevice, i as clearAndroidBootPending, k as withConfigLockAsync, t as allConsolePortsAndSerials, v as loadConfig, x as releaseAndroidConsolePort } from "./config-D5qNWJEP.mjs";
+import { l as phaseLine } from "./command-output-VrXd6qPX.mjs";
+import { l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting } from "./settings-C6UTYW2K.mjs";
+import { A as getAvdNameForSerialAsync, G as ownedAvdName, H as ownedAvdDeviceProfile, J as ownedAvdSystemImage, P as listAdbDevicesAsync, Q as pickDefaultSystemImage, R as listAvdsAsync, S as createOwnedAvd, V as nextConsolePort, W as ownedAvdMatchesConfiguration, _ as avdPoolConfiguration, b as bootAndroidEmulator, bt as parkedMaxSetting, ht as adoptParked, it as resolveOwnedAvdSerialAsync, n as OWNED_AVD_CONFIG_DEFAULTS, p as assertOwnedAvdStoppedAsync, t as DEFAULT_AVD_DEVICE_PROFILE, ut as waitForBoot, vt as isLegacyDeletionClaim, xt as readParked, z as listInstalledSystemImages } from "./android-DsEj2CCs.mjs";
+import { c as pidExists } from "./metro-mKHEMO-a.mjs";
+import { gt as teardownParkedAvd, pt as teardownOwnedAvd } from "./workspaces-BNEyJ1B_.mjs";
+import { B as reportMemoryCulprits, L as memoryCulpritsUnderAsync, R as readHostMemoryPressure, V as memoryCulpritAdvice, f as listAllIosSimsAsync } from "./ios-CdAV4-1E.mjs";
+import { _ as withDeviceBootAdmission, n as DeviceAdmissionRefusal, s as countLiveOwnedDevicesFrom } from "./device-capacity-Du5wBTNJ.mjs";
 import { claimRemoveCommand, clearClaimChild, markClaimChildPending, processGroupAlive, releaseClaim, setClaimChild } from "@stim-cli/core/ownership-claim";
 import { randomUUID } from "node:crypto";
 import { existsSync } from "node:fs";
 import { isDeepStrictEqual } from "node:util";
-import { dirname, join, resolve, sep } from "node:path";
-import { rotatedLogPath } from "@stim-cli/core";
-import { acceptsShape, settingDefinition } from "@stim-cli/core/state";
-import { request } from "node:http";
 import { fileURLToPath } from "node:url";
 import { captureProcessIdentity } from "@stim-cli/core/process-identity";
 import chalk from "chalk";
-//#region src/engine/metro-warmup.ts
-const WARMUP_TIMEOUT_MS = 6e4;
-async function requestLocal(url, platform, prefetch) {
-	return new Promise((resolve) => {
-		const req = request(url, { headers: {
-			accept: "application/json",
-			"expo-platform": platform,
-			"x-stim-metro-warmup": "1"
-		} });
-		const timer = setTimeout(() => req.destroy(), WARMUP_TIMEOUT_MS);
-		timer.unref();
-		req.on("socket", (socket) => socket.unref());
-		req.on("error", () => resolve(null));
-		req.on("close", () => {
-			clearTimeout(timer);
-			resolve(null);
-		});
-		req.on("response", (res) => {
-			let body = "";
-			res.setEncoding("utf8");
-			res.on("data", (chunk) => {
-				if (!prefetch) body += chunk;
-			});
-			res.on("error", () => resolve(null));
-			res.on("end", () => resolve(res.statusCode === 200 ? body : null));
-		});
-		req.end();
-	});
-}
-const ENTRY_EXTENSIONS = [
-	"",
-	".js",
-	".jsx",
-	".ts",
-	".tsx"
-];
-function entryExists(bundlePath, root) {
-	const entry = decodeURIComponent(bundlePath.replace(/\.bundle\/*$/, ""));
-	if (entry.startsWith("/.expo/")) return true;
-	for (let dir = resolve(root);; dir = dirname(dir)) {
-		const file = resolve(dir, `.${entry}`);
-		if (file.startsWith(dir + sep) && ENTRY_EXTENSIONS.some((ext) => existsSync(file + ext))) return true;
-		if (dirname(dir) === dir) return false;
-	}
-}
-function recordedBundleUrl(logsDir, root, platform) {
-	const setting = settingDefinition(`metro.warmupUrl.${platform}`);
-	if (!logsDir || !root || !setting) return null;
-	const log = join(logsDir, "metro.ndjson");
-	for (const file of [log, rotatedLogPath(log)]) for (const line of (tailLines(file) ?? []).toReversed()) try {
-		const record = JSON.parse(line);
-		if (record?.event === "bundle_response_started" && record.platform === platform && acceptsShape(setting, record.url) && entryExists(new URL(record.url, "http://localhost").pathname, root)) return record.url;
-	} catch {}
-	return null;
-}
-async function warmMetro({ port, platform, isExpo, appId, bundleUrl, logsDir, root }) {
-	try {
-		const origin = `http://127.0.0.1:${port}`;
-		if (await requestLocal(new URL("/_stim/metro-warmup", origin), platform, false) !== "ready") return;
-		const url = new URL("/index.bundle", origin);
-		url.search = new URLSearchParams({
-			platform,
-			dev: "true",
-			lazy: "true",
-			minify: "false",
-			...platform === "ios" ? { inlineSourceMap: "false" } : {},
-			modulesOnly: "false",
-			runModule: "true",
-			excludeSource: "true",
-			sourcePaths: "url-server",
-			...appId ? { app: appId } : {}
-		}).toString();
-		bundleUrl ||= recordedBundleUrl(logsDir, root, platform);
-		if (!bundleUrl && isExpo) {
-			const body = await requestLocal(new URL(origin), platform, false);
-			if (body === null) return;
-			const manifest = JSON.parse(body);
-			bundleUrl = manifest.launchAsset?.url ?? manifest.bundleUrl;
-			if (typeof bundleUrl !== "string") return;
-		}
-		if (bundleUrl) {
-			const bundle = new URL(bundleUrl, origin);
-			url.pathname = bundle.pathname;
-			url.search = bundle.search;
-		}
-		await requestLocal(url, platform, true);
-	} catch {}
-}
-//#endregion
 //#region src/engine/android-avd-setup.ts
 var AvdBootError = class extends Error {
 	remedy;
@@ -122,12 +24,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$1()?.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()?.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, deviceProfile, configuration, configure, teardown = teardownOwnedAvd }) {
-	const { claim, reservation, previous, avdName } = await withConfigLockAsync$1(() => {
-		const previous = deviceSlotPlatforms(loadConfig$1()?.projects?.[projectPath], slot)?.android;
+	const { claim, reservation, previous, avdName } = await withConfigLockAsync(() => {
+		const previous = deviceSlotPlatforms(loadConfig()?.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);
@@ -152,7 +54,7 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 			throw error;
 		}
 	});
-	const currentRecord = () => deviceSlotPlatforms(loadConfig$1()?.projects?.[projectPath], slot)?.android;
+	const currentRecord = () => deviceSlotPlatforms(loadConfig()?.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);
@@ -163,8 +65,14 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 			throw new Error(`AVD ${current?.avdName ?? avdName} ${state} by another concurrent Stim run. Retry after that run finishes so the recorded device is resolved safely.`);
 		}
 	};
+	const releaseReservation = () => withConfigLockAsync(() => {
+		if (!isDeepStrictEqual(currentRecord(), reservation)) return;
+		if (previous) setDevice(projectPath, "android", previous, slot);
+		else clearDevice(projectPath, "android", slot, avdName);
+	});
 	let prepared;
 	let child;
+	let spawnAttempted = false;
 	const creationRunning = () => child?.pid !== void 0 && processGroupAlive(child.pid);
 	let configurationFailure;
 	try {
@@ -173,6 +81,7 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 				systemImage,
 				deviceProfile,
 				spawn: (...args) => {
+					spawnAttempted = true;
 					markClaimChildPending(claim);
 					child = getExecutor().spawn(...args);
 					if (child.pid !== void 0) {
@@ -196,10 +105,13 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 			};
 		} catch (error) {
 			const message = String(error?.message || error);
-			if (!message.includes("already exists")) throw error;
+			if (!message.includes("already exists")) {
+				if (!spawnAttempted) await releaseReservation();
+				throw error;
+			}
 			try {
 				if (!(await listAvdsAsync()).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);
-				await withConfigLockAsync$1(assertReservation);
+				await withConfigLockAsync(assertReservation);
 				const resolved = await resolveOwnedAvdSerialAsync(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) await assertOwnedAvdStoppedAsync(avdName);
@@ -214,11 +126,7 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 					} : {}
 				};
 			} catch (recoveryError) {
-				await withConfigLockAsync$1(() => {
-					if (!isDeepStrictEqual(currentRecord(), reservation)) return;
-					if (previous) setDevice(projectPath, "android", previous, slot);
-					else clearDevice(projectPath, "android", slot, avdName);
-				});
+				await releaseReservation();
 				if (recoveryError instanceof AvdRecoveryError) throw recoveryError;
 				throw new AvdRecoveryError(`Could not recover owned AVD ${avdName}: ${String(recoveryError?.message || recoveryError)}`, "Inspect `npx stim status` and `adb devices`. Wait for any other Stim run using this AVD to finish, then retry `stim android`. Keep the AVD and its process locks while its state is unverified.", recoveryError);
 			}
@@ -228,7 +136,7 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 		} catch (error) {
 			configurationFailure = { error };
 		}
-		if (!configurationFailure) await withConfigLockAsync$1(() => {
+		if (!configurationFailure) await withConfigLockAsync(() => {
 			assertReservation();
 			setDevice(projectPath, "android", {
 				avdName,
@@ -258,7 +166,7 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 				slot,
 				expectedRecord: reservation
 			},
-			onRemoved: () => withConfigLockAsync$1(() => clearDevice(projectPath, "android", slot, avdName))
+			onRemoved: () => withConfigLockAsync(() => clearDevice(projectPath, "android", slot, avdName))
 		});
 		const orphan = cleanup.status === "failed" || cleanup.status === "skipped" ? ` The owned AVD remains tracked for cleanup (${cleanup.reason || cleanup.status}); fix the cause, then retry or run \`stim gc --delete\`.` : "";
 		throw new Error(`Created owned AVD ${avdName}, but could not configure its AVD settings: ${String(error?.message || error)}${orphan}`, { cause: error });
@@ -286,7 +194,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 				slot,
 				expectedRecord: record
 			},
-			onRemoved: () => withConfigLockAsync$1(() => clearDevice(projectPath, "android", slot, avdName))
+			onRemoved: () => withConfigLockAsync(() => clearDevice(projectPath, "android", slot, avdName))
 		});
 		if (cleanup.status === "failed" || cleanup.status === "skipped") throw new AvdRecoveryError(`Owned AVD ${record.avdName} has incomplete setup and could not be deleted (${cleanup.reason || cleanup.status}). Fix the cause, then retry; Stim kept the device record for cleanup.`, "Wait for any active AVD operation to finish. If the refusal names an unresolved claim, inspect its creator and native processes before removing only that claim. Retry `stim android` to reconcile the incomplete device.");
 		record = null;
@@ -304,7 +212,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 				slot,
 				expectedRecord: record
 			},
-			onRemoved: () => withConfigLockAsync$1(() => clearDevice(projectPath, "android", slot, avdName))
+			onRemoved: () => withConfigLockAsync(() => clearDevice(projectPath, "android", slot, avdName))
 		});
 		if (cleanup.status === "failed" || cleanup.status === "skipped") throw new AvdRecoveryError(`Owned AVD ${avdName} never finished a boot, but could not be deleted to create one on ${requestedImage} (${cleanup.reason || cleanup.status}). Stim kept the device record.`, "Fix the cause, then retry, or pass `--slot <name>` to create the requested emulator beside it.");
 		out(phaseLine("device", `deleted ${avdName}, which never finished a boot, to create one on ${requestedImage}`));
@@ -329,7 +237,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 					owned: true,
 					deviceName: record.deviceName ?? record.avdName
 				};
-				await withConfigLockAsync$1(() => setDevice(projectPath, "android", updated, slot));
+				await withConfigLockAsync(() => setDevice(projectPath, "android", updated, slot));
 				return {
 					...updated,
 					systemImage: ownedAvdSystemImage(record.avdName),
@@ -469,7 +377,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 		deviceProfile: created.deviceProfile
 	};
 }
-function claimAndroidConsolePort({ projectPath, slot, avdName, deviceName, livePorts = [], metadata }, { lock = withConfigLock$1, recordedPorts = () => allConsolePortsAndSerials().androidConsolePorts, record = setDevice } = {}) {
+function claimAndroidConsolePort({ projectPath, slot, avdName, deviceName, livePorts = [], metadata }, { lock = withConfigLock, recordedPorts = () => allConsolePortsAndSerials().androidConsolePorts, record = setDevice } = {}) {
 	return lock(() => {
 		const consolePort = nextConsolePort([...recordedPorts(), ...livePorts]);
 		const claim = {
@@ -495,7 +403,7 @@ async function bootOwnedAvdOnFreshPort({ avdName, deviceSlotWait, metadata, proj
 		key: avdName
 	}, async () => {
 		const livePorts = await liveAndroidConsolePorts();
-		const claim = await withConfigLockAsync$1(() => claimAndroidConsolePort({
+		const claim = await withConfigLockAsync(() => claimAndroidConsolePort({
 			projectPath,
 			slot,
 			avdName,
@@ -518,7 +426,7 @@ async function bootOwnedAvdOnFreshPort({ avdName, deviceSlotWait, metadata, proj
 			if (result.failed) throw new AvdBootError(result.reason, result.remedy);
 			const running = await getAvdNameForSerialAsync(serial);
 			if (running && running !== avdName) throw new Error(`${serial} is running AVD ${running}, not this workspace's owned AVD ${avdName}; refusing to use it.`);
-			await withConfigLockAsync$1(() => clearAndroidBootPending(projectPath, avdName, slot));
+			await withConfigLockAsync(() => clearAndroidBootPending(projectPath, avdName, slot));
 			await muteBootedEmulator(serial, avdName, out);
 			const { bootPending: _booted, ...booted } = claim;
 			return {
@@ -527,7 +435,7 @@ async function bootOwnedAvdOnFreshPort({ avdName, deviceSlotWait, metadata, proj
 				setup: true
 			};
 		} catch (error) {
-			await withConfigLockAsync$1(() => releaseAndroidConsolePort(projectPath, claim.consolePort, slot));
+			await withConfigLockAsync(() => releaseAndroidConsolePort(projectPath, claim.consolePort, slot));
 			throw error;
 		}
 	}, {
@@ -670,7 +578,7 @@ async function ensureAndroidBooted({ device, deviceSlotWait, projectPath, slot,
 	};
 	const avdName = device.avdName;
 	const booted = async (result) => {
-		if (!result.failed) await withConfigLockAsync$1(() => clearAndroidBootPending(projectPath, avdName, slot));
+		if (!result.failed) await withConfigLockAsync(() => clearAndroidBootPending(projectPath, avdName, slot));
 		return result;
 	};
 	if (resolved.serial) return booted(await waitForAndroidBoot({
@@ -686,7 +594,7 @@ async function ensureAndroidBooted({ device, deviceSlotWait, projectPath, slot,
 	}));
 	const boot = async () => {
 		const livePorts = await liveAndroidConsolePorts();
-		const claim = await withConfigLockAsync$1(() => claimAndroidConsolePort({
+		const claim = await withConfigLockAsync(() => claimAndroidConsolePort({
 			projectPath,
 			slot,
 			avdName,
@@ -701,7 +609,7 @@ async function ensureAndroidBooted({ device, deviceSlotWait, projectPath, slot,
 		try {
 			pid = await bootAndroidEmulator(avdName, claim.consolePort, { logFile });
 		} catch (e) {
-			await withConfigLockAsync$1(() => releaseAndroidConsolePort(projectPath, claim.consolePort, slot));
+			await withConfigLockAsync(() => releaseAndroidConsolePort(projectPath, claim.consolePort, slot));
 			return {
 				failed: true,
 				reason: `Could not start emulator for AVD ${avdName}: ${e?.message || e}`
@@ -714,7 +622,7 @@ async function ensureAndroidBooted({ device, deviceSlotWait, projectPath, slot,
 			alive,
 			out
 		});
-		if (result.failed) await withConfigLockAsync$1(() => releaseAndroidConsolePort(projectPath, claim.consolePort, slot));
+		if (result.failed) await withConfigLockAsync(() => releaseAndroidConsolePort(projectPath, claim.consolePort, slot));
 		else await muteBootedEmulator(serial, avdName, out);
 		return booted(result);
 	};
@@ -739,73 +647,4 @@ async function ensureAndroidBooted({ device, deviceSlotWait, projectPath, slot,
 	}
 }
 //#endregion
-//#region src/engine/device.ts
-/**
-* Whether `ensureOwnedDevice` created, adopted or started booting the device, rather than finding it booted.
-* Undefined for a remote device, which those functions do not describe.
-*/
-function didSetUpDevice(device, remote) {
-	return remote ? void 0 : Boolean(device.setup || device.booting);
-}
-async function ensureOwnedDevice({ platform, project, projectPath, slot, settingsRoot = projectPath, label = ownedDeviceLabel(projectPath), settings, flags = {}, note = () => {}, out = () => {}, logFile = null, alive = pidExists, configureAvd = configureNewOwnedAvd, teardownAvd = teardownOwnedAvd, reconcileIosSimulator = reconcileSimSlim, simSnapshot }) {
-	await clearDeviceIdleShutdown(projectPath, platform, slot);
-	if (slot && slot !== "default") label = `${label}-${slot}`;
-	const record = deviceSlotPlatforms(project, slot)?.[platform] ?? null;
-	if (platform === "ios") return ensureOwnedIosDevice({
-		record,
-		projectPath,
-		slot,
-		settingsRoot,
-		label,
-		settings,
-		flags,
-		note,
-		out,
-		reconcileIosSimulator,
-		simSnapshot
-	});
-	return ensureOwnedAndroidDevice({
-		record,
-		projectPath,
-		slot,
-		settingsRoot,
-		label,
-		settings,
-		flags,
-		note,
-		out,
-		logFile,
-		alive,
-		configureAvd,
-		teardownAvd
-	});
-}
-const BOOT_POLL_MS = 500;
-async function ensureBooted({ platform, device, simulatorApp, timeoutMs, pollMs = BOOT_POLL_MS, out = () => {}, logFile = null, alive = pidExists, projectPath, slot, deviceSlotWait }) {
-	if (platform === "ios") return ensureIosBooted({
-		device,
-		projectPath,
-		slot,
-		deviceSlotWait,
-		simulatorApp,
-		timeoutMs: timeoutMs ?? 6e5,
-		pollMs,
-		out
-	});
-	if (platform === "android") return ensureAndroidBooted({
-		device,
-		deviceSlotWait,
-		projectPath,
-		slot,
-		timeoutMs: timeoutMs ?? ANDROID_BOOT_TIMEOUT_MS,
-		out,
-		logFile,
-		alive
-	});
-	return {
-		failed: true,
-		reason: `Unknown platform "${platform}".`
-	};
-}
-//#endregion
-export { AvdRecoveryError as a, AvdBootError as i, ensureBooted as n, warmMetro as o, ensureOwnedDevice as r, didSetUpDevice as t };
+export { AvdBootError as a, muteBootedEmulator as i, ensureAndroidBooted as n, AvdRecoveryError as o, ensureOwnedAndroidDevice as r, ANDROID_BOOT_TIMEOUT_MS as t };