stim 1.23.1 → 1.24.0

package/dist/{device-CiNYxqp6.mjs → device-BktRGdjS.mjs}

@@ -1,16 +1,16 @@
-import { t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
-import { D as withConfigLock, G as projectDeviceSlots, H as deviceSlotPlatforms, O as withConfigLockAsync, _ as loadConfig, a as clearDevice, b as releaseAndroidConsolePort, i as clearAndroidBootPending, j as acquireAvdClaim, t as allConsolePortsAndSerials, w as setDevice } from "./config-DlrsduwG.mjs";
-import { l as phaseLine } from "./command-output-YKGWivpG.mjs";
-import { l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting } from "./settings-C7O8A6ZI.mjs";
-import { s as ownedDeviceLabel } from "./project-DhCtQWWU.mjs";
-import { c as pidExists } from "./metro-DiXtA3Ty.mjs";
-import { A as teardownParkedAvd, D as teardownOwnedAvd } from "./workspaces-e41xsjKr.mjs";
-import { A as listAdbDevices, 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, _t as parkedMaxSetting, b as configureNewOwnedAvd, et as resolveOwnedAvdSerialAsync, f as assertOwnedAvdStopped, ft as adoptParked, ht as isLegacyDeletionClaim, j as listAdbDevicesAsync, n as OWNED_AVD_CONFIG_DEFAULTS, ot as waitForBoot, t as DEFAULT_AVD_DEVICE_PROFILE, vt as readParked, x as createOwnedAvd, y as bootAndroidEmulator, z as nextConsolePort } from "./android-C7sVmyI9.mjs";
-import { I as memoryCulpritAdvice, N as memoryCulpritsUnder, P as readHostMemoryPressure, d as listAllIosSims } from "./ios-hcBpnEGk.mjs";
-import { t as clearDeviceIdleShutdown } from "./idle-shutdown-CJmUOV5x.mjs";
-import { i as countLiveOwnedDevices, m as withDeviceBootAdmission, n as DeviceAdmissionRefusal } from "./device-capacity-DH0QsZYZ.mjs";
-import { i as ensureOwnedIosDevice, r as ensureIosBooted } from "./device-ios-CbVDtDIy.mjs";
-import { t as reconcileSimSlim } from "./simslim-BNckWpXi.mjs";
+import { D as ownership_claim_exports, t as getExecutor } from "./exec-VFRpu1iA.mjs";
+import { D as withConfigLock, G as projectDeviceSlots, H as deviceSlotPlatforms, O as withConfigLockAsync, _ as loadConfig, a as clearDevice, b as releaseAndroidConsolePort, i as clearAndroidBootPending, j as acquireAvdClaim, t as allConsolePortsAndSerials, w as setDevice } from "./config-BZhXY15H.mjs";
+import { l as phaseLine } from "./command-output-DxC0k2rk.mjs";
+import { l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting } from "./settings-RKwY33wv.mjs";
+import { s as ownedDeviceLabel } from "./project-Dz-hWkb-.mjs";
+import { A as listAdbDevices, 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, f as assertOwnedAvdStopped, gt as isLegacyDeletionClaim, j as listAdbDevicesAsync, n as OWNED_AVD_CONFIG_DEFAULTS, nt as resolveOwnedAvdSerialAsync, 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-882m4hxX.mjs";
+import { c as pidExists } from "./metro-Bu8LBfzS.mjs";
+import { O as teardownOwnedAvd, j as teardownParkedAvd } from "./workspaces-CSV2Orf4.mjs";
+import { F as readHostMemoryPressure, L as reportMemoryCulprits, P as memoryCulpritsUnderAsync, R as memoryCulpritAdvice, d as listAllIosSims } from "./ios-CVUFFZ6C.mjs";
+import { t as clearDeviceIdleShutdown } from "./idle-shutdown-BInjLKqm.mjs";
+import { i as countLiveOwnedDevices, m as withDeviceBootAdmission, n as DeviceAdmissionRefusal } from "./device-capacity-Ic-kdmEV.mjs";
+import { i as ensureOwnedIosDevice, r as ensureIosBooted } from "./device-ios-DzpSlZyd.mjs";
+import { t as reconcileSimSlim } from "./simslim-CdWKT3vA.mjs";
 import { claimRemoveCommand, clearClaimChild, markClaimChildPending, processGroupAlive, releaseClaim, setClaimChild } from "@stim-cli/core/ownership-claim";
 import { randomUUID } from "node:crypto";
 import { existsSync } from "node:fs";
@@ -227,9 +227,7 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 				slot,
 				expectedRecord: reservation
 			},
-			onRemoved: () => {
-				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 });
@@ -257,9 +255,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 				slot,
 				expectedRecord: record
 			},
-			onRemoved: () => {
-				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;
@@ -277,9 +273,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 				slot,
 				expectedRecord: record
 			},
-			onRemoved: () => {
-				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}`));
@@ -290,7 +284,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 	const configurationBeforeDefaults = avdPoolConfiguration(androidDataPartitionSizeGbSetting(settings), projectAvdConfig, deviceProfile);
 	if (record?.avdName) {
 		if (record.owned) {
-			const resolved = await resolveOwnedAvdSerialAsync(record.avdName);
+			const resolved = await resolveOwnedAvdSerialAsync(record.avdName, { preferredSerial: record.consolePort ? `emulator-${record.consolePort}` : void 0 });
 			const currentProfile = resolved.notOwned || resolved.missing ? null : ownedAvdDeviceProfile(record.avdName);
 			if (requestedProfile && currentProfile && currentProfile !== requestedProfile) throw new AvdRecoveryError(`this project's emulator uses device profile ${currentProfile}, but ${requestedProfile} was requested. Stim will not silently boot a different model.`, "Run `stim worktree remove` (or `stim gc --delete`) to reap the current emulator, then `stim android` again to create the requested one, or pass `--slot <name>` to create it beside the current one.");
 			if (resolved.notOwned) note(chalk.yellow(`Note: recorded AVD ${record.avdName} is not Stim-owned -- creating a fresh owned AVD instead of reusing it.`));
@@ -304,7 +298,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 					owned: true,
 					deviceName: record.deviceName ?? record.avdName
 				};
-				setDevice(projectPath, "android", updated, slot);
+				await withConfigLockAsync(() => setDevice(projectPath, "android", updated, slot));
 				return {
 					...updated,
 					systemImage: ownedAvdSystemImage(record.avdName),
@@ -369,7 +363,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 				poolConfiguration: parked.configuration,
 				adoptionPending: true
 			};
-			if (!adoptParked({
+			if (!await adoptParked({
 				platform: "android",
 				projectPath,
 				slot,
@@ -469,14 +463,15 @@ async function bootOwnedAvdOnFreshPort({ avdName, deviceSlotWait, metadata, proj
 		platform: "android",
 		key: avdName
 	}, async () => {
-		const claim = claimAndroidConsolePort({
+		const livePorts = liveAndroidConsolePorts();
+		const claim = await withConfigLockAsync(() => claimAndroidConsolePort({
 			projectPath,
 			slot,
 			avdName,
 			deviceName,
-			livePorts: liveAndroidConsolePorts(),
+			livePorts,
 			metadata
-		});
+		}));
 		const serial = `emulator-${claim.consolePort}`;
 		try {
 			reportAndroidMemoryPressure(out);
@@ -492,7 +487,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.`);
-			clearAndroidBootPending(projectPath, avdName, slot);
+			await withConfigLockAsync(() => clearAndroidBootPending(projectPath, avdName, slot));
 			await muteBootedEmulator(serial, avdName, out);
 			const { bootPending: _booted, ...booted } = claim;
 			return {
@@ -501,7 +496,7 @@ async function bootOwnedAvdOnFreshPort({ avdName, deviceSlotWait, metadata, proj
 				setup: true
 			};
 		} catch (error) {
-			releaseAndroidConsolePort(projectPath, claim.consolePort, slot);
+			await withConfigLockAsync(() => releaseAndroidConsolePort(projectPath, claim.consolePort, slot));
 			throw error;
 		}
 	}, {
@@ -566,11 +561,11 @@ async function muteBootedEmulator(serial, avdName, out) {
 function reportAndroidMemoryPressure(out) {
 	const pressure = readHostMemoryPressure();
 	if (pressure === "warning" || pressure === "critical") {
-		const named = memoryCulpritAdvice(memoryCulpritsUnder(pressure));
-		out(chalk.dim(phaseLine("memory", `macOS reports ${pressure} host memory pressure; emulator boot may be slow.${named ? ` ${named}` : ""} Free memory with \`stim stop\` only in workspaces you own; ask before closing other apps or devices.`)));
+		out(chalk.dim(phaseLine("memory", `macOS reports ${pressure} host memory pressure; emulator boot may be slow. Free memory with \`stim stop\` only in workspaces you own; ask before closing other apps or devices.`)));
+		reportMemoryCulprits(pressure, (named) => out(chalk.dim(phaseLine("memory", named))));
 	}
 }
-function androidBootRemedy(pressure) {
+async function androidBootRemedy(pressure) {
 	let count = null;
 	try {
 		const live = countLiveOwnedDevices({
@@ -583,7 +578,7 @@ function androidBootRemedy(pressure) {
 		});
 		count = typeof live === "number" ? live : null;
 	} catch {}
-	const named = memoryCulpritAdvice(memoryCulpritsUnder(pressure));
+	const named = memoryCulpritAdvice(await memoryCulpritsUnderAsync(pressure));
 	const observation = pressure === "warning" || pressure === "critical" ? `macOS reports ${pressure} host memory pressure. ${named ? `${named} ` : ""}` : "";
 	const devices = count ? `${count} Stim-owned ${count === 1 ? "device is" : "devices are"} running. ` : "";
 	if (observation || devices) return `${observation}${devices}Stop an unneeded device with \`stim stop\` only in a workspace you own, then run \`stim android\` again; ask before closing other apps or devices. These observations do not establish the cause of the timeout or an OOM crash.`;
@@ -617,7 +612,7 @@ async function waitForAndroidBoot({ serial, timeoutMs, pid = null, alive = pidEx
 	return {
 		failed: true,
 		reason: `${exited ? `The emulator process for ${serial} exited before the device finished booting.` : `Emulator ${serial} did not finish booting within ${Math.round(elapsedMs / 1e3)}s.`} Diagnostic: ${JSON.stringify(result.diagnostic)}`,
-		remedy: exited ? "Inspect the emulator log for the process exit, fix what it reports, then run `stim android` again." : androidBootRemedy(pressure)
+		remedy: exited ? "Inspect the emulator log for the process exit, fix what it reports, then run `stim android` again." : await androidBootRemedy(pressure)
 	};
 }
 async function ensureAndroidBooted({ device, deviceSlotWait, projectPath, slot, timeoutMs, out, logFile = null, alive = pidExists }) {
@@ -627,7 +622,7 @@ async function ensureAndroidBooted({ device, deviceSlotWait, projectPath, slot,
 	};
 	let resolved;
 	try {
-		resolved = await resolveOwnedAvdSerialAsync(device.avdName);
+		resolved = await resolveOwnedAvdSerialAsync(device.avdName, { preferredSerial: device.consolePort ? `emulator-${device.consolePort}` : void 0 });
 	} catch (e) {
 		return {
 			failed: true,
@@ -643,8 +638,8 @@ async function ensureAndroidBooted({ device, deviceSlotWait, projectPath, slot,
 		reason: `AVD ${device.avdName} is not Stim-owned; refusing to boot it.`
 	};
 	const avdName = device.avdName;
-	const booted = (result) => {
-		if (!result.failed) clearAndroidBootPending(projectPath, avdName, slot);
+	const booted = async (result) => {
+		if (!result.failed) await withConfigLockAsync(() => clearAndroidBootPending(projectPath, avdName, slot));
 		return result;
 	};
 	if (resolved.serial) return booted(await waitForAndroidBoot({
@@ -659,14 +654,15 @@ async function ensureAndroidBooted({ device, deviceSlotWait, projectPath, slot,
 		out
 	}));
 	const boot = async () => {
-		const claim = claimAndroidConsolePort({
+		const livePorts = liveAndroidConsolePorts();
+		const claim = await withConfigLockAsync(() => claimAndroidConsolePort({
 			projectPath,
 			slot,
 			avdName,
 			deviceName: device.deviceName,
-			livePorts: liveAndroidConsolePorts(),
+			livePorts,
 			metadata: device
-		});
+		}));
 		const serial = `emulator-${claim.consolePort}`;
 		reportAndroidMemoryPressure(out);
 		out(chalk.dim(phaseLine("device", `booting ${avdName} as ${serial}`)));
@@ -674,7 +670,7 @@ async function ensureAndroidBooted({ device, deviceSlotWait, projectPath, slot,
 		try {
 			pid = await bootAndroidEmulator(avdName, claim.consolePort, { logFile });
 		} catch (e) {
-			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}`
@@ -687,7 +683,7 @@ async function ensureAndroidBooted({ device, deviceSlotWait, projectPath, slot,
 			alive,
 			out
 		});
-		if (result.failed) releaseAndroidConsolePort(projectPath, claim.consolePort, slot);
+		if (result.failed) await withConfigLockAsync(() => releaseAndroidConsolePort(projectPath, claim.consolePort, slot));
 		else await muteBootedEmulator(serial, avdName, out);
 		return booted(result);
 	};
@@ -721,7 +717,7 @@ 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 }) {
-	clearDeviceIdleShutdown(projectPath, platform, slot);
+	await clearDeviceIdleShutdown(projectPath, platform, slot);
 	if (slot && slot !== "default") label = `${label}-${slot}`;
 	const record = deviceSlotPlatforms(project, slot)?.[platform] ?? null;
 	if (platform === "ios") return ensureOwnedIosDevice({

package/dist/{device-capacity-DH0QsZYZ.mjs → device-capacity-Ic-kdmEV.mjs}

@@ -1,15 +1,15 @@
-import { a as workspaceProcessLockError, i as withWorkspaceProcessLock, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
+import { D as ownership_claim_exports, d as workspaceProcessLockError, u as withWorkspaceProcessLock } from "./exec-VFRpu1iA.mjs";
 import { m as workspaceLogsDir$1 } from "./paths-DQtTgsBf.mjs";
-import { G as projectDeviceSlots, H as deviceSlotPlatforms, _ as loadConfig$1, d as getConfigDir, u as getConcurrencyLimits } from "./config-DlrsduwG.mjs";
-import { a as formatElapsed, l as phaseLine } from "./command-output-YKGWivpG.mjs";
-import { g as deviceReclaimIdleMinutesSetting } from "./settings-C7O8A6ZI.mjs";
+import { G as projectDeviceSlots, H as deviceSlotPlatforms, O as withConfigLockAsync$1, _ as loadConfig$1, d as getConfigDir, u as getConcurrencyLimits } from "./config-BZhXY15H.mjs";
+import { a as formatElapsed, l as phaseLine } from "./command-output-DxC0k2rk.mjs";
+import { g as deviceReclaimIdleMinutesSetting } from "./settings-RKwY33wv.mjs";
+import { A as listAdbDevices, j as listAdbDevicesAsync } from "./android-882m4hxX.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { K as recordCapacityRefusal, q as recordCapacityWait } from "./budget-3ivAK99e.mjs";
+import { J as recordCapacityRefusal, Y as recordCapacityWait } from "./budget-dPGuhNai.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { f as withIdleWorkspace } from "./workspaces-e41xsjKr.mjs";
-import { A as listAdbDevices, j as listAdbDevicesAsync } from "./android-C7sVmyI9.mjs";
-import { d as listAllIosSims, f as listAllIosSimsAsync, l as iosRuntimeMatches, y as parseRuntimeVersion } from "./ios-hcBpnEGk.mjs";
-import { n as dueIdleDevices, r as shutDownIdleDevices } from "./idle-shutdown-CJmUOV5x.mjs";
+import { p as withIdleWorkspace } from "./workspaces-CSV2Orf4.mjs";
+import { d as listAllIosSims, f as listAllIosSimsAsync, l as iosRuntimeMatches, y as parseRuntimeVersion } from "./ios-CVUFFZ6C.mjs";
+import { n as dueIdleDevices, r as shutDownIdleDevices } from "./idle-shutdown-BInjLKqm.mjs";
 import { realpathSync } from "node:fs";
 import { basename, join } from "node:path";
 import { LOG_ROTATE_BYTES, workspaceId } from "@stim-cli/core";
@@ -524,24 +524,28 @@ async function withDeviceBootAdmission(device, boot, { root, max = getConcurrenc
 				await sleep(Math.min(2e3, Math.max(0, waitMs - elapsedMs)));
 			}
 		} catch (error) {
-			if (error instanceof DeviceAdmissionRefusal && error.code === "STIM_AT_CAPACITY") recordCapacityRefusal({
-				platform: device.platform,
-				max,
-				workspace
-			}, now());
+			if (error instanceof DeviceAdmissionRefusal && error.code === "STIM_AT_CAPACITY") {
+				const at = now();
+				await withConfigLockAsync$1(() => recordCapacityRefusal({
+					platform: device.platform,
+					max,
+					workspace
+				}, at)).catch(() => {});
+			}
 			throw error;
 		} finally {
 			(0, ownership_claim_exports.releaseClaim)(ticket);
 			if (visibleWait) waitingFor(null);
 			if (started !== void 0) {
 				const ms = Math.max(0, Math.round(now() - started));
-				recordCapacityWait({
+				const at = now();
+				await withConfigLockAsync$1(() => recordCapacityWait({
 					platform: device.platform,
 					ms,
 					max,
 					workspace,
 					...reclaimed ? { reclaimed } : {}
-				}, now());
+				}, at)).catch(() => {});
 				onWait(ms);
 			}
 		}

package/dist/device-host-worker.mjs

@@ -1,21 +1,21 @@
-import { t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { t as getExecutor } from "./exec-VFRpu1iA.mjs";
 import { n as ensureWorkspaceStorage } from "./paths-DQtTgsBf.mjs";
-import { O as withConfigLockAsync$1, _ as loadConfig$1, c as ensureConfig } from "./config-DlrsduwG.mjs";
-import { d as writeWorkspaceState } from "./workspace-state-U08dEzhG.mjs";
-import { i as macosProcess, o as requiredMacosRecord } from "./state-08I3hw3_.mjs";
+import { O as withConfigLockAsync$1, _ as loadConfig$1, c as ensureConfig } from "./config-BZhXY15H.mjs";
+import { d as writeWorkspaceState } from "./workspace-state-CeBpIZgr.mjs";
+import { i as macosProcess, o as requiredMacosRecord } from "./state-BfAltYJP.mjs";
+import { A as listAdbDevices, D as getAvdNameForSerial, F as listAvdsAsync, I as listInstalledSystemImages, K as ownedAvdSystemImage, M as listAvdDeviceProfiles, O as getAvdNameForSerialAsync, U as ownedAvdName, X as pickDefaultSystemImage, a as androidDeviceAbi, ct as waitForBoot, d as androidToolPath, f as assertOwnedAvdStopped, g as avdPathExists, k as hostSystemImageArch, nt as resolveOwnedAvdSerialAsync, t as DEFAULT_AVD_DEVICE_PROFILE, tt as resetAdoptedAvd, v as avdStorageRoots, x as createOwnedAvd, y as bootAndroidEmulator } from "./android-882m4hxX.mjs";
+import { n as forgetCreatedDeviceAsync } from "./created-devices-D2Aca-xu.mjs";
+import { a as parsePidof, i as parseLogcatLine, t as androidClockOffset } from "./android-CX5IcRuf.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CgE_o3Dl.mjs";
-import { Cn as launchAndroidApp, Dn as reverseMetroPorts, On as writeDebugHttpHost, Sn as iosAppProcess, Tn as launchIosApp, dn as androidAppProcess, wn as launchAndroidReleaseApp, xn as installIosApp, yn as installAndroidApp } from "./budget-3ivAK99e.mjs";
-import { D as teardownOwnedAvd, k as teardownOwnedIosSim } from "./workspaces-e41xsjKr.mjs";
-import { t as forgetCreatedDevice } from "./created-devices-x9rN6bhs.mjs";
-import { $ as resetAdoptedAvd, A as listAdbDevices, D as getAvdNameForSerial, F as listAvdsAsync, I as listInstalledSystemImages, K as ownedAvdSystemImage, M as listAvdDeviceProfiles, O as getAvdNameForSerialAsync, U as ownedAvdName, X as pickDefaultSystemImage, a as androidDeviceAbi, d as androidToolPath, et as resolveOwnedAvdSerialAsync, f as assertOwnedAvdStopped, g as avdPathExists, k as hostSystemImageArch, ot as waitForBoot, t as DEFAULT_AVD_DEVICE_PROFILE, v as avdStorageRoots, x as createOwnedAvd, y as bootAndroidEmulator } from "./android-C7sVmyI9.mjs";
-import { C as resetIosKeychain, P as readHostMemoryPressure, T as resolveIosCreation, a as createOwnedIosSim, d as listAllIosSims, g as listUserApps, k as uninstallIosApp, n as bootIosSim, w as resetIosPrivacy } from "./ios-hcBpnEGk.mjs";
-import { r as stopMacosAppHeld } from "./stop-CR5689oB.mjs";
+import { An as writeDebugHttpHost, Cn as installIosApp, Dn as launchIosApp, En as launchAndroidReleaseApp, Tn as launchAndroidApp, kn as reverseMetroPorts, pn as androidAppProcess, wn as iosAppProcess, xn as installAndroidApp } from "./budget-dPGuhNai.mjs";
+import { A as teardownOwnedIosSim, O as teardownOwnedAvd } from "./workspaces-CSV2Orf4.mjs";
+import { C as resetIosKeychain, F as readHostMemoryPressure, T as resolveIosCreation, a as createOwnedIosSim, d as listAllIosSims, g as listUserApps, k as uninstallIosApp, n as bootIosSim, w as resetIosPrivacy } from "./ios-CVUFFZ6C.mjs";
+import { r as stopMacosAppHeld } from "./stop-DhclRwOO.mjs";
 import { t as spawnEntry } from "./spawn-entry-jw19m8Nl.mjs";
-import { i as countLiveOwnedDevices } from "./device-capacity-DH0QsZYZ.mjs";
-import { n as parseLogcatLine, r as parsePidof, t as androidClockOffset } from "./android-DR5lZ2Az.mjs";
-import { _ as findAapt } from "./support-CbXPbUMJ.mjs";
-import { t as waitForMacosRegistration } from "./registration-BcRgF6Ox.mjs";
-import { n as parseLogStreamLine } from "./ios-xtlRHaeB.mjs";
+import { i as countLiveOwnedDevices } from "./device-capacity-Ic-kdmEV.mjs";
+import { _ as findAapt } from "./support-B3tzVhKn.mjs";
+import { t as waitForMacosRegistration } from "./registration-CN6nlhcD.mjs";
+import { n as parseLogStreamLine } from "./ios-ENC4sRPA.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { chmodSync, closeSync, copyFileSync, createReadStream, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statfsSync, symlinkSync, writeFileSync } from "node:fs";
 import { availableParallelism, freemem, homedir, loadavg } from "node:os";
@@ -652,7 +652,7 @@ async function runHostedDevice(mode, selectors, app) {
 		if (outcome.status !== "torn-down" && outcome.status !== "missing") throw new Error(outcome.reason ?? "Hosted simulator teardown was not established.");
 		const after = inventory().find((sim) => sim.udid === device.udid);
 		if (after) throw new Error(`Hosted simulator ${device.udid} is still listed (${after.state}); deletion could not be verified. If its runtime is unavailable, delete it with xcrun simctl delete and stop the session again.`);
-		forgetCreatedDevice("ios", device.udid);
+		await forgetCreatedDeviceAsync("ios", device.udid);
 		removeHostedAppData(home);
 		return {
 			state: "stopped",
@@ -851,7 +851,7 @@ async function runHostedAndroidDevice(mode, request, app) {
 		const name = device.avdName;
 		if ((await listAvdsAsync({ timeoutMs: 5e3 })).includes(name) || avdStorageRoots().some((root) => avdPathExists(join(root, `${name}.ini`)) || avdPathExists(join(root, `${name}.avd`)))) throw new Error("The hosted AVD or its data still exists; deletion could not be verified.");
 		if (await getAvdNameForSerialAsync(device.serial) === device.avdName) throw new Error("The hosted Android emulator is still running.");
-		if (ledger === "listed") forgetCreatedDevice("android", device.avdName);
+		if (ledger === "listed") await forgetCreatedDeviceAsync("android", device.avdName);
 		removeHostedAppData(home);
 		return {
 			state: "stopped",

package/dist/{device-ios-CbVDtDIy.mjs → device-ios-DzpSlZyd.mjs}

@@ -1,13 +1,12 @@
-import { i as withWorkspaceProcessLock, n as isTimeoutError, t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.mjs";
+import { D as ownership_claim_exports, o as cancellableSleep, t as getExecutor, u as withWorkspaceProcessLock } from "./exec-VFRpu1iA.mjs";
 import { f as workspaceId$1 } from "./paths-DQtTgsBf.mjs";
-import { C as saveConfig, D as withConfigLock$1, G as projectDeviceSlots, H as deviceSlotPlatforms, O as withConfigLockAsync$1, _ as loadConfig$1, a as clearDevice, d as getConfigDir, w as setDevice } from "./config-DlrsduwG.mjs";
-import { l as phaseLine } from "./command-output-YKGWivpG.mjs";
-import { u as cancellableSleep } from "./operation-exec-BW0em61G.mjs";
-import { T as iosSimSlimProfileSetting } from "./settings-C7O8A6ZI.mjs";
-import { j as teardownParkedIosSim } from "./workspaces-e41xsjKr.mjs";
-import { _t as parkedMaxSetting, bt as selectParked, ft as adoptParked, pt as dropParked, vt as readParked } from "./android-C7sVmyI9.mjs";
-import { A as configuredIosSimulatorViewer, C as resetIosKeychain, E as resolveOwnedIosSim, M as hostMemoryPressureAdvice, N as memoryCulpritsUnder, P as readHostMemoryPressure, S as renameIosSim, T as resolveIosCreation, _ as ownedSimName, a as createOwnedIosSim, d as listAllIosSims, f as listAllIosSimsAsync, h as listIosRuntimesAsync, n as bootIosSim, p as listIosDeviceTypesAsync, u as iosSimulatorFailureAdvice, w as resetIosPrivacy, y as parseRuntimeVersion } from "./ios-hcBpnEGk.mjs";
-import { l as runtimeMismatch, m as withDeviceBootAdmission, n as DeviceAdmissionRefusal, o as deviceTypeMismatch } from "./device-capacity-DH0QsZYZ.mjs";
+import { C as saveConfig, G as projectDeviceSlots, H as deviceSlotPlatforms, O as withConfigLockAsync$1, _ as loadConfig$1, a as clearDevice, d as getConfigDir, w as setDevice } from "./config-BZhXY15H.mjs";
+import { l as phaseLine } from "./command-output-DxC0k2rk.mjs";
+import { T as iosSimSlimProfileSetting } from "./settings-RKwY33wv.mjs";
+import { mt as dropParked, pt as adoptParked, vt as parkedMaxSetting, xt as selectParked, yt as readParked } from "./android-882m4hxX.mjs";
+import { M as teardownParkedIosSim } from "./workspaces-CSV2Orf4.mjs";
+import { A as configuredIosSimulatorViewer, C as resetIosKeychain, E as resolveOwnedIosSim, F as readHostMemoryPressure, L as reportMemoryCulprits, M as hostMemoryPressureAdvice, S as renameIosSim, T as resolveIosCreation, _ as ownedSimName, a as createOwnedIosSim, d as listAllIosSims, f as listAllIosSimsAsync, h as listIosRuntimesAsync, n as bootIosSim, p as listIosDeviceTypesAsync, u as iosSimulatorFailureAdvice, w as resetIosPrivacy, y as parseRuntimeVersion } from "./ios-CVUFFZ6C.mjs";
+import { l as runtimeMismatch, m as withDeviceBootAdmission, n as DeviceAdmissionRefusal, o as deviceTypeMismatch } from "./device-capacity-Ic-kdmEV.mjs";
 import { ambientContext } from "@stim-cli/core";
 import { isJsonObject } from "@stim-cli/core/state";
 import chalk from "chalk";
@@ -18,13 +17,12 @@ function startIosBoot(udid, configure, label, out, simulatorApp, root, deviceSlo
 		key: udid
 	}, async () => {
 		out(chalk.dim(phaseLine("device", `booting ${label} (${udid})`)));
-		await bootIosSim(udid, {
+		await muteBootedSimulator(udid, await bootIosSim(udid, {
 			label,
 			out,
 			simulatorApp,
 			env: ambientContext()?.env
-		});
-		await muteBootedSimulator(udid, out);
+		}), out);
 		await configure();
 	}, {
 		...deviceSlotWait,
@@ -37,36 +35,9 @@ function startIosBoot(udid, configure, label, out, simulatorApp, root, deviceSlo
 		done
 	};
 }
-const SPRINGBOARD_STARTUP_TIMEOUT_MS = 3e4;
-const SPRINGBOARD_STARTUP_POLL_MS = 250;
-async function waitForSpringBoard(udid) {
-	const deadline = Date.now() + SPRINGBOARD_STARTUP_TIMEOUT_MS;
-	for (;;) {
-		let output = null;
-		try {
-			output = await getExecutor().runFileAsync("xcrun", [
-				"simctl",
-				"spawn",
-				udid,
-				"notifyutil",
-				"-g",
-				"com.apple.springboard.finishedstartup"
-			], { timeoutMs: 1e4 });
-		} catch (error) {
-			if (!isTimeoutError(error)) throw error;
-		}
-		if (output !== null) {
-			const state = /^com\.apple\.springboard\.finishedstartup (\d+)$/m.exec(output);
-			if (!state) throw new Error(`Could not read SpringBoard's startup state: ${output.trim() || "no output"}.`);
-			if (Number(state[1]) > 0) return;
-		}
-		if (Date.now() >= deadline) throw new Error(`SpringBoard did not finish starting within ${SPRINGBOARD_STARTUP_TIMEOUT_MS / 1e3}s.`);
-		await cancellableSleep(SPRINGBOARD_STARTUP_POLL_MS);
-	}
-}
-async function muteBootedSimulator(udid, out) {
+async function muteBootedSimulator(udid, { springBoardUnreadable }, out) {
 	try {
-		await waitForSpringBoard(udid);
+		if (springBoardUnreadable) throw new Error(springBoardUnreadable);
 		const response = JSON.parse(await getExecutor().runFileAsync("xcrun", [
 			"devicectl",
 			"device",
@@ -90,8 +61,9 @@ var IosDeviceMismatchError = class extends Error {
 };
 async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, label, settings, flags, note, out, reconcileIosSimulator, simSnapshot }) {
 	const pressure = readHostMemoryPressure();
-	const memoryAdvice = hostMemoryPressureAdvice(pressure, memoryCulpritsUnder(pressure));
+	const memoryAdvice = hostMemoryPressureAdvice(pressure);
 	if (memoryAdvice) out(chalk.yellow(phaseLine("memory", memoryAdvice)));
+	reportMemoryCulprits(pressure, (named) => out(chalk.yellow(phaseLine("memory", named))));
 	const simslimProfile = iosSimSlimProfileSetting(settings, settingsRoot);
 	if (record?.deviceUdid) {
 		if (record.owned) {
@@ -200,11 +172,11 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 			runtime: choice.runtime
 		}, projectPath, void 0, await listAllIosSimsAsync({ includeUnavailable: true }));
 		const result = await createOwnedIosSim(label, { suffix }, choice);
-		setDevice(projectPath, "ios", {
+		await withConfigLockAsync$1(() => setDevice(projectPath, "ios", {
 			deviceUdid: result.udid,
 			owned: true,
 			deviceName: result.name
-		}, slot);
+		}, slot));
 		return result;
 	});
 	const newRecord = {
@@ -293,7 +265,7 @@ async function takeParkedIosSim({ projectPath, slot, label, choice, out }) {
 			...parked.simslimManaged ? { simslimManaged: true } : {},
 			...parked.cacheKey ? { parkedCacheKey: parked.cacheKey } : {}
 		};
-		const adopted = adoptParked({
+		const adopted = await adoptParked({
 			platform: "ios",
 			projectPath,
 			slot,
@@ -312,7 +284,7 @@ async function takeParkedIosSim({ projectPath, slot, label, choice, out }) {
 	return null;
 }
 function clearIosAdoptionPending(projectPath, slot = "default") {
-	withConfigLock$1(() => {
+	return withConfigLockAsync$1(() => {
 		const cfg = loadConfig$1();
 		const ios = deviceSlotPlatforms(cfg?.projects?.[projectPath], slot)?.ios;
 		if (!cfg || !ios?.adoptionPending) return;
@@ -331,7 +303,7 @@ async function configureOwnedIosSim({ record, projectPath, slot, profile, out, r
 			...record,
 			simslimManaged: true
 		};
-		setDevice(projectPath, "ios", pending, slot);
+		await withConfigLockAsync$1(() => setDevice(projectPath, "ios", pending, slot));
 		record = pending;
 	}
 	const result = await reconcileIosSimulator({
@@ -344,7 +316,7 @@ async function configureOwnedIosSim({ record, projectPath, slot, profile, out, r
 	const updated = { ...record };
 	if (result.managed) updated.simslimManaged = true;
 	else delete updated.simslimManaged;
-	setDevice(projectPath, "ios", updated, slot);
+	await withConfigLockAsync$1(() => setDevice(projectPath, "ios", updated, slot));
 	return updated;
 }
 async function ensureIosBooted({ device, projectPath, deviceSlotWait, simulatorApp, timeoutMs, pollMs, out }) {
@@ -369,7 +341,7 @@ async function ensureIosBooted({ device, projectPath, deviceSlotWait, simulatorA
 		} catch (error) {
 			return {
 				failed: true,
-				reason: `Simulator ${udid} failed its process-spawn readiness check: ${error?.message || error}. ${iosSimulatorFailureAdvice()}`
+				reason: `Simulator ${udid} failed its process-spawn readiness check: ${error?.message || error}. ${await iosSimulatorFailureAdvice()}`
 			};
 		}
 	};
@@ -417,14 +389,13 @@ async function ensureIosBooted({ device, projectPath, deviceSlotWait, simulatorA
 			key: udid
 		}, async () => {
 			out(chalk.dim(phaseLine("device", `booting ${sim.name} (${udid})`)));
-			await bootIosSim(udid, {
+			await muteBootedSimulator(udid, await bootIosSim(udid, {
 				timeoutMs,
 				label: sim.name,
 				out,
 				simulatorApp,
 				env: ambientContext()?.env
-			});
-			await muteBootedSimulator(udid, out);
+			}), out);
 		}, {
 			...deviceSlotWait,
 			root: projectPath,

package/dist/{device-lease-run-DXPSwdbb.mjs → device-lease-run-DUtkbqBQ.mjs}

@@ -1,8 +1,8 @@
-import { m as operationState } from "./exec-DEoAhcze.mjs";
-import { V as deviceSlotKey } from "./config-DlrsduwG.mjs";
-import { a as formatElapsed, r as clockTime } from "./command-output-YKGWivpG.mjs";
-import { Zt as VERIFY_TIMEOUT_MS, on as APP_READINESS_TIMEOUT_MS } from "./budget-3ivAK99e.mjs";
-import { E as releaseRunLease, S as parseLease, T as raiseLease, b as leaseIsExpired, j as takeLease, v as deviceLeasePath, y as fileLeaseIo } from "./activity-BpWUPgUm.mjs";
+import { b as operationState } from "./exec-VFRpu1iA.mjs";
+import { V as deviceSlotKey } from "./config-BZhXY15H.mjs";
+import { a as formatElapsed, r as clockTime } from "./command-output-DxC0k2rk.mjs";
+import { $t as VERIFY_TIMEOUT_MS, cn as APP_READINESS_TIMEOUT_MS } from "./budget-dPGuhNai.mjs";
+import { E as releaseRunLease, S as parseLease, T as raiseLease, b as leaseIsExpired, j as takeLease, v as deviceLeasePath, y as fileLeaseIo } from "./activity-Dq3ZcdD8.mjs";
 //#region src/engine/device-lease-run.ts
 const LEASE_STEP_FLOOR_MS = 6e4;
 const DEBUG_VERIFY_STEP_MS = VERIFY_TIMEOUT_MS + APP_READINESS_TIMEOUT_MS;

package/dist/{device-pool-B4iOXIrD.mjs → device-pool-CgBHk401.mjs}

@@ -1,6 +1,6 @@
-import { V as deviceSlotKey } from "./config-DlrsduwG.mjs";
-import { A as selectPoolDevice, S as parseLease, b as leaseIsExpired, v as deviceLeasePath, y as fileLeaseIo } from "./activity-BpWUPgUm.mjs";
-import { i as DEVICE_WAIT_POLL_MS, n as DEVICE_BUSY, o as leaseExpiryText } from "./device-lease-run-DXPSwdbb.mjs";
+import { V as deviceSlotKey } from "./config-BZhXY15H.mjs";
+import { A as selectPoolDevice, S as parseLease, b as leaseIsExpired, v as deviceLeasePath, y as fileLeaseIo } from "./activity-Dq3ZcdD8.mjs";
+import { i as DEVICE_WAIT_POLL_MS, n as DEVICE_BUSY, o as leaseExpiryText } from "./device-lease-run-DUtkbqBQ.mjs";
 //#region src/engine/device-pool.ts
 function heldPoolId(root, platform, now, io = fileLeaseIo, slot = "default") {
 	const record = io.readHolder(root)[deviceSlotKey(platform, slot)];

package/dist/{doctor-DRu-8ld6.mjs → doctor-BZ6oxNum.mjs}

@@ -1,2 +1,2 @@
-import { a as readDoctorReport, i as parseDoctorPlatform, n as doctorCommand, o as shadowedStimFinding, r as doctorSuccessLines, s as toolchainReport, t as applySandboxFix } from "./doctor-C6t4Maue.mjs";
+import { a as readDoctorReport, i as parseDoctorPlatform, n as doctorCommand, o as shadowedStimFinding, r as doctorSuccessLines, s as toolchainReport, t as applySandboxFix } from "./doctor-DZgpqR6J.mjs";
 export { applySandboxFix, doctorCommand as default, doctorSuccessLines, parseDoctorPlatform, readDoctorReport, shadowedStimFinding, toolchainReport };