stim 1.25.0 → 1.27.0

package/dist/{device-ios-DkHBrmvH.mjs → device-ios-534c14fz.mjs}

@@ -1,17 +1,161 @@
-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, 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-BBvS1H6v.mjs";
-import { E as iosSimSlimProfileSetting, T as iosSimSlimDefaultSetting } from "./settings-B5tCoq9N.mjs";
-import { mt as dropParked, pt as adoptParked, vt as parkedMaxSetting, xt as selectParked, yt as readParked } from "./android-Cjcj8MCw.mjs";
-import { M as teardownParkedIosSim } from "./workspaces-C9w4aeXF.mjs";
-import { A as waitForSpringBoard, C as resetIosKeychain, E as resolveOwnedIosSim, I as readHostMemoryPressure, N as hostMemoryPressureAdvice, R as reportMemoryCulprits, S as renameIosSim, T as resolveIosCreation, _ as ownedSimName, a as createOwnedIosSim, d as listAllIosSims, f as listAllIosSimsAsync, h as listIosRuntimesAsync, j as configuredIosSimulatorViewer, n as bootIosSim, p as listIosDeviceTypesAsync, u as iosSimulatorFailureAdvice, w as resetIosPrivacy, y as parseRuntimeVersion } from "./ios-BQzvJlzw.mjs";
-import { l as runtimeMismatch, m as withDeviceBootAdmission, n as DeviceAdmissionRefusal, o as deviceTypeMismatch } from "./device-capacity-ZYaRALv5.mjs";
-import { ambientContext } from "@stim-cli/core";
+import { D as ownership_claim_exports, o as cancellableSleep, t as getExecutor, u as withWorkspaceProcessLock } from "./exec-aULwtNly.mjs";
+import { D as workspaceId$1, k as workspaceLogsDir$1 } from "./workspace-state-BjqdjnJR.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-Cn94Jc0g.mjs";
+import { l as phaseLine } from "./command-output-Dj-WT4BP.mjs";
+import { D as iosSimSlimProfileSetting, E as iosSimSlimDefaultSetting } from "./settings-BDVI8Ivc.mjs";
+import { mt as dropParked, pt as adoptParked, vt as parkedMaxSetting, xt as selectParked, yt as readParked } from "./android-DriNoAVy.mjs";
+import { i as createNdjsonWriter } from "./ndjson-Dy2W4vRa.mjs";
+import { ft as teardownOwnedIosSim, mt as teardownParkedIosSim } from "./workspaces-DFbj07jp.mjs";
+import { A as springBoardRunning, B as reportMemoryCulprits, C as renameIosSim, D as resolveOwnedIosSim, E as resolveIosCreation, F as hostMemoryPressureAdvice, M as waitForSpringBoard, N as configuredIosSimulatorViewer, R as readHostMemoryPressure, S as readSpringBoardPid, T as resetIosPrivacy, _ 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 resetIosKeychain, y as parseRuntimeVersion } from "./ios-E26qSpkb.mjs";
+import { h as withDeviceBootAdmission, n as DeviceAdmissionRefusal, s as deviceTypeMismatch, u as runtimeMismatch } from "./device-capacity-6LP7QsaA.mjs";
+import { createHash } from "node:crypto";
+import { readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { LOG_ROTATE_BYTES, ambientContext } from "@stim-cli/core";
 import { isJsonObject } from "@stim-cli/core/state";
 import chalk from "chalk";
+import { mkdir, readFile, readdir, rm, stat, writeFile } from "node:fs/promises";
+//#region src/devices/springboard-crash-reports.ts
+const REPORT_WINDOW_MS = 6e5;
+const MAX_CANDIDATES = 100;
+const MAX_STORED = 40;
+const MAX_REPORT_BYTES = 1048576;
+const MAX_COPIED_BYTES = 8388608;
+function selectSpringBoardReports(entries, udid, sinceMs) {
+	const owner = `.${udid}`.toLowerCase();
+	return entries.flatMap(({ name, text }) => {
+		if (!/^SpringBoard-.+\.ips$/.test(name)) return [];
+		try {
+			const report = JSON.parse(text.slice(text.indexOf("\n") + 1));
+			if (!isJsonObject(report)) return [];
+			const { coalitionName, captureTime } = report;
+			const capturedAt = Date.parse(typeof captureTime === "string" ? captureTime : "");
+			return typeof coalitionName === "string" && coalitionName.toLowerCase().endsWith(owner) && capturedAt >= sinceMs ? [name] : [];
+		} catch {
+			return [];
+		}
+	});
+}
+/**
+* Copies this simulator's recent SpringBoard crash reports from DiagnosticReports and its Retired folder into
+* `destDir`, which keeps at most 40 of them. The source folders are only read; macOS deletes their reports after
+* about two days. Returns the matching reports now in `destDir`, how many matched but did not fit its limits, and
+* the message of a write that failed.
+*/
+async function copySpringBoardCrashReports({ udid, destDir, now = Date.now(), home = homedir() }) {
+	const since = now - REPORT_WINDOW_MS;
+	const reportsDir = join(home, "Library/Logs/DiagnosticReports");
+	const candidates = /* @__PURE__ */ new Map();
+	for (const directory of [reportsDir, join(reportsDir, "Retired")]) {
+		let names;
+		try {
+			names = await readdir(directory);
+		} catch (error) {
+			if (error instanceof Error && "code" in error && error.code === "ENOENT") continue;
+			throw error;
+		}
+		for (const name of names) {
+			if (!/^SpringBoard-.+\.ips$/.test(name) || candidates.has(name)) continue;
+			try {
+				const path = join(directory, name);
+				const { mtimeMs, size } = await stat(path);
+				if (mtimeMs >= since && size <= MAX_REPORT_BYTES) candidates.set(name, {
+					path,
+					mtimeMs
+				});
+			} catch {}
+		}
+	}
+	const newest = [...candidates].toSorted((a, b) => b[1].mtimeMs - a[1].mtimeMs).slice(0, MAX_CANDIDATES);
+	const entries = [];
+	for (const [name, { path }] of newest) try {
+		entries.push({
+			name,
+			text: await readFile(path, "utf8")
+		});
+	} catch {}
+	const matching = selectSpringBoardReports(entries, udid, since);
+	if (matching.length === 0) return {
+		files: [],
+		dropped: 0
+	};
+	await mkdir(destDir, {
+		recursive: true,
+		mode: 448
+	});
+	const present = new Set(await readdir(destDir));
+	let stored = [...present].filter((name) => /^SpringBoard-.+\.ips$/.test(name)).length;
+	let copiedBytes = 0;
+	const files = [];
+	for (const { name, text } of entries) {
+		if (!matching.includes(name)) continue;
+		if (present.has(name)) {
+			files.push(name);
+			continue;
+		}
+		const bytes = Buffer.byteLength(text);
+		if (stored >= MAX_STORED || copiedBytes + bytes > MAX_COPIED_BYTES) continue;
+		try {
+			await writeFile(join(destDir, name), text, {
+				flag: "wx",
+				mode: 384
+			});
+		} catch (error) {
+			if (error instanceof Error && "code" in error && error.code === "EEXIST") {
+				files.push(name);
+				continue;
+			}
+			await rm(join(destDir, name), { force: true }).catch(() => {});
+			return {
+				files,
+				dropped: 0,
+				failure: error instanceof Error ? error.message : String(error)
+			};
+		}
+		stored++;
+		copiedBytes += bytes;
+		files.push(name);
+	}
+	return {
+		files,
+		dropped: matching.length - files.length
+	};
+}
+//#endregion
+//#region src/engine/ios-boot-log.ts
+function iosBootRecorder(root, slot, udid) {
+	return (event, { level = "info", ...fields }) => {
+		try {
+			const writer = createNdjsonWriter(join(workspaceLogsDir$1(root), "device.ndjson"), { maxBytes: LOG_ROTATE_BYTES });
+			writer.write({
+				src: "device",
+				platform: "ios",
+				level,
+				event,
+				deviceId: udid,
+				...slot && slot !== "default" ? { slot } : {},
+				...fields
+			});
+			writer.close();
+		} catch {}
+	};
+}
+//#endregion
 //#region src/engine/device-ios.ts
-function startIosBoot(udid, configure, label, out, simulatorApp, root, deviceSlotWait) {
+function recordBootPhase(record, udid, origin) {
+	return (event) => {
+		const pid = "pid" in event ? event.pid : void 0;
+		const boot = event.phase === "boot_requested" ? origin : void 0;
+		record("ios_boot", {
+			phase: event.phase,
+			...pid === void 0 ? {} : { pid },
+			...boot === void 0 ? {} : { boot },
+			msg: `ios boot ${udid}: ${event.phase}${pid === void 0 ? "" : ` pid ${pid}`}${boot === void 0 ? "" : ` (${boot})`}`
+		});
+	};
+}
+function startIosBoot(udid, configure, label, out, simulatorApp, root, slot, origin, deviceSlotWait) {
 	const done = withDeviceBootAdmission({
 		platform: "ios",
 		key: udid
@@ -21,7 +165,8 @@ function startIosBoot(udid, configure, label, out, simulatorApp, root, deviceSlo
 			label,
 			out,
 			simulatorApp,
-			env: ambientContext()?.env
+			env: ambientContext()?.env,
+			onPhase: recordBootPhase(iosBootRecorder(root, slot, udid), udid, origin)
 		});
 		await configure();
 		await muteBootedSimulator(udid, out);
@@ -93,12 +238,13 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 					owned: true,
 					deviceName: name,
 					...record.simslimManaged ? { simslimManaged: true } : {},
+					...record.simslimApplied ? { simslimApplied: record.simslimApplied } : {},
 					...record.adopted ? { adopted: true } : {},
 					...record.adoptionPending ? { adoptionPending: true } : {},
 					...record.parkedCacheKey ? { parkedCacheKey: record.parkedCacheKey } : {},
 					...record.schemeApprovals ? { schemeApprovals: record.schemeApprovals } : {}
 				};
-				const configure = async () => {
+				const configure = async (freshBoot) => {
 					if (record.adoptionPending) await resetAdoptedSim(sim.udid, out);
 					return configureOwnedIosSim({
 						record: updated,
@@ -106,6 +252,7 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 						slot,
 						profile: simslimProfile,
 						slimByDefault: simslimDefault,
+						freshBoot,
 						out,
 						reconcileIosSimulator
 					});
@@ -116,11 +263,13 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 				};
 				if (sim.state !== "Booted") return {
 					...updated,
-					booting: startIosBoot(sim.udid, configure, name, out, flags.simulatorApp, projectPath, flags.deviceSlotWait),
+					booting: startIosBoot(sim.udid, () => configure(true), name, out, flags.simulatorApp, projectPath, slot, record.adoptionPending ? "adopted" : "existing", flags.deviceSlotWait),
 					...facts
 				};
+				const { record: configured, rebooted } = await configure(false);
+				if (rebooted) await muteBootedSimulator(sim.udid, out);
 				return {
-					...await configure(),
+					...configured,
 					...facts,
 					booted: sim.udid
 				};
@@ -162,10 +311,11 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 				slot,
 				profile: simslimProfile,
 				slimByDefault: simslimDefault,
+				freshBoot: true,
 				out,
 				reconcileIosSimulator
 			});
-		}, adopted.deviceName, out, flags.simulatorApp, projectPath, flags.deviceSlotWait);
+		}, adopted.deviceName, out, flags.simulatorApp, projectPath, slot, "adopted", flags.deviceSlotWait);
 		return {
 			...adopted,
 			booting,
@@ -197,9 +347,10 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 		slot,
 		profile: simslimProfile,
 		slimByDefault: simslimDefault,
+		freshBoot: true,
 		out,
 		reconcileIosSimulator
-	}), created.name, out, flags.simulatorApp, projectPath, flags.deviceSlotWait);
+	}), created.name, out, flags.simulatorApp, projectPath, slot, "created", flags.deviceSlotWait);
 	return {
 		...newRecord,
 		created: true,
@@ -302,16 +453,36 @@ function clearIosAdoptionPending(projectPath, slot = "default") {
 		saveConfig(cfg);
 	});
 }
-async function configureOwnedIosSim({ record, projectPath, slot, profile, slimByDefault, out, reconcileIosSimulator }) {
+function simslimProfileIdentity(profile, slimByDefault) {
+	if (profile) return `profile:${createHash("sha256").update(readFileSync(profile)).digest("hex")}`;
+	return slimByDefault ? "default" : null;
+}
+async function startedSpringBoardPid(udid) {
+	const springBoard = await waitForSpringBoard(udid, Date.now() + SPRINGBOARD_MUTE_WAIT_MS);
+	return springBoard.state === "started" ? springBoard.pid : null;
+}
+async function configureOwnedIosSim({ record, projectPath, slot, profile, slimByDefault, freshBoot, out, reconcileIosSimulator }) {
+	const identity = simslimProfileIdentity(profile, slimByDefault);
+	const slimConfigured = identity !== null || Boolean(record.simslimManaged);
+	const applied = record.simslimApplied;
+	const springBoardBefore = slimConfigured ? await readSpringBoardPid(record.deviceUdid) : null;
+	if (identity !== null && record.simslimManaged && !freshBoot && applied?.profile === identity && springBoardBefore !== null && springBoardBefore === applied.springBoardPid) {
+		await withConfigLockAsync$1(() => setDevice(projectPath, "ios", { ...record }, slot));
+		return {
+			record,
+			rebooted: false
+		};
+	}
 	if (profile) out(chalk.dim(phaseLine("device", `applying the SimSlim profile to ${record.deviceUdid}`)));
 	else if (slimByDefault) out(chalk.dim(phaseLine("device", `applying SimSlim's default services to ${record.deviceUdid}`)));
 	else if (record.simslimManaged) out(chalk.dim(phaseLine("device", `restoring stock simulator services on ${record.deviceUdid}`)));
 	const previouslyManaged = Boolean(record.simslimManaged);
-	if ((profile || slimByDefault) && !record.simslimManaged) {
-		const pending = {
-			...record,
+	if (identity !== null && !record.simslimManaged || applied) {
+		const { simslimApplied: _applied, ...rest } = record;
+		const pending = identity !== null ? {
+			...rest,
 			simslimManaged: true
-		};
+		} : rest;
 		await withConfigLockAsync$1(() => setDevice(projectPath, "ios", pending, slot));
 		record = pending;
 	}
@@ -326,24 +497,112 @@ async function configureOwnedIosSim({ record, projectPath, slot, profile, slimBy
 	const updated = { ...record };
 	if (result.managed) updated.simslimManaged = true;
 	else delete updated.simslimManaged;
+	const springBoardAfter = slimConfigured ? await startedSpringBoardPid(record.deviceUdid) : null;
+	if (result.managed && !result.notInstalled && identity !== null && springBoardAfter !== null) updated.simslimApplied = {
+		profile: identity,
+		springBoardPid: springBoardAfter
+	};
 	await withConfigLockAsync$1(() => setDevice(projectPath, "ios", updated, slot));
-	return updated;
+	const rebooted = slimConfigured && springBoardAfter !== springBoardBefore;
+	if (rebooted && !result.notInstalled) iosBootRecorder(projectPath, slot, record.deviceUdid)("ios_boot", {
+		phase: "simslim_reboot",
+		pidBefore: springBoardBefore,
+		pidAfter: springBoardAfter,
+		msg: `ios boot ${record.deviceUdid}: simslim_reboot (SpringBoard pid ${springBoardBefore ?? "unknown"} to ${springBoardAfter ?? "unknown"})`
+	});
+	return {
+		record: updated,
+		rebooted
+	};
 }
-async function ensureIosBooted({ device, projectPath, deviceSlotWait, simulatorApp, timeoutMs, pollMs, out }) {
+const SPRINGBOARD_RESPAWN_POLLS = 20;
+async function ensureIosBooted(args) {
+	const { springBoardDown, ...first } = await bootOwnedIosSim(args);
+	const { device, projectPath, out } = args;
+	const udid = device?.deviceUdid;
+	if (!springBoardDown || !device || !udid) return first;
+	out(chalk.yellow(phaseLine("device", `SpringBoard is not running on ${udid}; restarting the simulator once`)));
+	const record = iosBootRecorder(projectPath, args.slot, udid);
+	await preserveSpringBoardReports(record, udid, projectPath);
+	const stopped = await teardownOwnedIosSim(udid, { workspace: projectPath });
+	if (stopped.status !== "torn-down") return {
+		...first,
+		reason: `${first.reason} The restart did not run: ${stopped.reason ?? stopped.status}.`
+	};
+	record("ios_boot", {
+		phase: "restart",
+		level: "warn",
+		msg: `ios boot ${udid}: restart (SpringBoard is not running after boot; restarting once)`
+	});
+	const { booted: _booted, booting: _booting, ...unbooted } = device;
+	const { springBoardDown: stillDown, ...second } = await bootOwnedIosSim({
+		...args,
+		device: unbooted,
+		origin: "restart"
+	});
+	if (stillDown) await preserveSpringBoardReports(record, udid, projectPath);
+	return stillDown ? {
+		...second,
+		reason: `${second.reason} Stim already restarted the simulator once, so it did not restart it again.`
+	} : second;
+}
+async function preserveSpringBoardReports(record, udid, root) {
+	const dir = workspaceLogsDir$1(root);
+	try {
+		const { files, dropped, failure } = await copySpringBoardCrashReports({
+			udid,
+			destDir: dir
+		});
+		const limit = dropped ? `; ${dropped} more matched but exceeded the copy limits` : "";
+		record("springboard_crash_reports", {
+			level: files.length || dropped || failure ? "warn" : "info",
+			files,
+			dropped,
+			...failure ? { failure } : {},
+			dir,
+			msg: failure ? `could not copy a SpringBoard crash report for ${udid} (${files.length} copied before it): ${failure}` : files.length ? `copied ${files.length} SpringBoard crash report(s) for ${udid} to ${dir}: ${files.join(", ")}${limit}` : dropped ? `${dropped} SpringBoard crash report(s) for ${udid} matched but exceeded the copy limits` : `no SpringBoard crash report for ${udid} from the last 10 minutes`
+		});
+	} catch (error) {
+		record("springboard_crash_reports", {
+			level: "warn",
+			files: [],
+			dropped: 0,
+			failure: error instanceof Error ? error.message : String(error),
+			dir,
+			msg: `could not copy SpringBoard crash reports for ${udid}: ${error instanceof Error ? error.message : String(error)}`
+		});
+	}
+}
+async function bootOwnedIosSim({ device, projectPath, slot, origin, deviceSlotWait, simulatorApp, timeoutMs, pollMs, out }) {
 	const udid = device?.deviceUdid;
 	if (!udid) return {
 		failed: true,
 		reason: "No iOS simulator is recorded for this project."
 	};
+	const onPhase = recordBootPhase(iosBootRecorder(projectPath, slot, udid), udid, origin ?? (device.adoptionPending ? "adopted" : "existing"));
+	const openViewer = async () => {
+		await configuredIosSimulatorViewer(simulatorApp, ambientContext()?.env).open(udid);
+		onPhase({ phase: "viewer_opened" });
+	};
 	const ready = async () => {
 		try {
-			await getExecutor().runFileAsync("xcrun", [
+			const listSpringBoard = () => getExecutor().runFileAsync("xcrun", [
 				"simctl",
 				"spawn",
 				udid,
 				"launchctl",
 				"list"
 			], { timeoutMs: 3e4 });
+			let listing = await listSpringBoard();
+			for (let poll = 0; !springBoardRunning(listing) && poll < SPRINGBOARD_RESPAWN_POLLS; poll++) {
+				await cancellableSleep(pollMs);
+				listing = await listSpringBoard();
+			}
+			if (!springBoardRunning(listing)) return {
+				failed: true,
+				springBoardDown: true,
+				reason: `Simulator ${udid} reports Booted, but SpringBoard (the system shell) is not running, so apps cannot launch. Run \`stim stop\`, then \`stim ios\` again. If it repeats, look for SpringBoard crash reports in ~/Library/Logs/DiagnosticReports.`
+			};
 			return {
 				ok: true,
 				udid
@@ -366,7 +625,7 @@ async function ensureIosBooted({ device, projectPath, deviceSlotWait, simulatorA
 	}
 	const readiness = device?.booted === udid ? await ready() : null;
 	if (readiness?.ok) {
-		if (simulatorApp !== void 0) await configuredIosSimulatorViewer(simulatorApp, ambientContext()?.env).open(udid);
+		if (simulatorApp !== void 0) await openViewer();
 		return readiness;
 	}
 	let resolved;
@@ -389,7 +648,7 @@ async function ensureIosBooted({ device, projectPath, deviceSlotWait, simulatorA
 	const sim = resolved.sim;
 	if (sim.state === "Booted") {
 		const result = readiness ?? await ready();
-		if (result.ok && simulatorApp !== void 0) await configuredIosSimulatorViewer(simulatorApp, ambientContext()?.env).open(udid);
+		if (result.ok && simulatorApp !== void 0) await openViewer();
 		return result;
 	}
 	const bootDeadline = Date.now() + timeoutMs;
@@ -404,7 +663,8 @@ async function ensureIosBooted({ device, projectPath, deviceSlotWait, simulatorA
 				label: sim.name,
 				out,
 				simulatorApp,
-				env: ambientContext()?.env
+				env: ambientContext()?.env,
+				onPhase
 			});
 			await muteBootedSimulator(udid, out);
 		}, {

package/dist/{device-lease-run-ogEeJ62K.mjs → device-lease-run-DwsGfjUN.mjs}

@@ -1,8 +1,8 @@
-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-BBvS1H6v.mjs";
-import { Qt as MANIFEST_VERIFY_TIMEOUT_MS, ln as APP_READINESS_TIMEOUT_MS } from "./budget-HyShrIpL.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-BpjwrQXU.mjs";
+import { b as operationState } from "./exec-aULwtNly.mjs";
+import { V as deviceSlotKey } from "./config-Cn94Jc0g.mjs";
+import { a as formatElapsed, r as clockTime } from "./command-output-Dj-WT4BP.mjs";
+import { Xt as APP_READINESS_TIMEOUT_MS, zt as MANIFEST_VERIFY_TIMEOUT_MS } from "./ccache-BWTze1Ls.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-Cd-ysFes.mjs";
 //#region src/engine/device-lease-run.ts
 const LEASE_STEP_FLOOR_MS = 6e4;
 const DEBUG_VERIFY_STEP_MS = MANIFEST_VERIFY_TIMEOUT_MS + APP_READINESS_TIMEOUT_MS;

package/dist/{device-pool-BIg8MU8l.mjs → device-pool-BnQqvs6o.mjs}

@@ -1,6 +1,6 @@
-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-BpjwrQXU.mjs";
-import { i as DEVICE_WAIT_POLL_MS, n as DEVICE_BUSY, o as leaseExpiryText } from "./device-lease-run-ogEeJ62K.mjs";
+import { V as deviceSlotKey } from "./config-Cn94Jc0g.mjs";
+import { A as selectPoolDevice, S as parseLease, b as leaseIsExpired, v as deviceLeasePath, y as fileLeaseIo } from "./activity-Cd-ysFes.mjs";
+import { i as DEVICE_WAIT_POLL_MS, n as DEVICE_BUSY, o as leaseExpiryText } from "./device-lease-run-DwsGfjUN.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/{device-B9FqTBYW.mjs → device-tM41-TUq.mjs}

@@ -1,17 +1,17 @@
-import { D as ownership_claim_exports, t as getExecutor } from "./exec-VFRpu1iA.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-BZhXY15H.mjs";
-import { l as phaseLine } from "./command-output-BBvS1H6v.mjs";
-import { l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting } from "./settings-B5tCoq9N.mjs";
-import { s as ownedDeviceLabel } from "./project-BiC68mIp.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-Cjcj8MCw.mjs";
-import { c as pidExists } from "./metro-1pJgCX4U.mjs";
-import { O as teardownOwnedAvd, j as teardownParkedAvd } from "./workspaces-C9w4aeXF.mjs";
-import { h as tailLines } from "./activity-BpjwrQXU.mjs";
-import { F as memoryCulpritsUnderAsync, I as readHostMemoryPressure, R as reportMemoryCulprits, d as listAllIosSims, z as memoryCulpritAdvice } from "./ios-BQzvJlzw.mjs";
-import { t as clearDeviceIdleShutdown } from "./idle-shutdown-BIyfl0Zj.mjs";
-import { i as countLiveOwnedDevices, m as withDeviceBootAdmission, n as DeviceAdmissionRefusal } from "./device-capacity-ZYaRALv5.mjs";
-import { i as ensureOwnedIosDevice, r as ensureIosBooted } from "./device-ios-DkHBrmvH.mjs";
-import { t as reconcileSimSlim } from "./simslim-BjxszUAb.mjs";
+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-Cn94Jc0g.mjs";
+import { l as phaseLine } from "./command-output-Dj-WT4BP.mjs";
+import { l as androidDataPartitionSizeGbSetting, o as androidAvdConfigSetting } from "./settings-BDVI8Ivc.mjs";
+import { s as ownedDeviceLabel } from "./project-DYj-HVx6.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-DriNoAVy.mjs";
+import { c as pidExists } from "./metro-CvyD-xwe.mjs";
+import { pt as teardownParkedAvd, ut as teardownOwnedAvd } from "./workspaces-DFbj07jp.mjs";
+import { h as tailLines } from "./activity-Cd-ysFes.mjs";
+import { B as reportMemoryCulprits, L as memoryCulpritsUnderAsync, R as readHostMemoryPressure, V as memoryCulpritAdvice, f as listAllIosSimsAsync } from "./ios-E26qSpkb.mjs";
+import { h as withDeviceBootAdmission, n as DeviceAdmissionRefusal, o as countLiveOwnedDevicesFrom } from "./device-capacity-6LP7QsaA.mjs";
+import { t as clearDeviceIdleShutdown } from "./idle-shutdown-Cbvo5KEh.mjs";
+import { i as ensureOwnedIosDevice, r as ensureIosBooted } from "./device-ios-534c14fz.mjs";
+import { t as reconcileSimSlim } from "./simslim-DCQwzoPy.mjs";
 import { claimRemoveCommand, clearClaimChild, markClaimChildPending, processGroupAlive, releaseClaim, setClaimChild } from "@stim-cli/core/ownership-claim";
 import { randomUUID } from "node:crypto";
 import { existsSync } from "node:fs";
@@ -202,7 +202,7 @@ async function prepareOwnedAvd({ projectPath, slot, label, previousAvdName, syst
 				await withConfigLockAsync$1(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) assertOwnedAvdStopped(avdName);
+				if (!resolved.serial) await assertOwnedAvdStoppedAsync(avdName);
 				prepared = {
 					avdName,
 					created: false,
@@ -377,7 +377,7 @@ async function ensureOwnedAndroidDevice({ record, projectPath, slot, settingsRoo
 			}
 			if (resolved.notOwned || resolved.serial) continue;
 			try {
-				assertOwnedAvdStopped(parked.name);
+				await assertOwnedAvdStoppedAsync(parked.name);
 			} catch (error) {
 				out(phaseLine("device", `kept parked ${parked.name}: ${String(error?.message || error)}`));
 				continue;
@@ -485,8 +485,8 @@ function claimAndroidConsolePort({ projectPath, slot, avdName, deviceName, liveP
 		return claim;
 	});
 }
-function liveAndroidConsolePorts() {
-	const adbLive = listAdbDevices();
+async function liveAndroidConsolePorts() {
+	const adbLive = await listAdbDevicesAsync();
 	return [...adbLive.emulators.map((e) => e.consolePort), ...adbLive.unhealthy.map((u) => u.consolePort).filter((p) => p != null)];
 }
 async function bootOwnedAvdOnFreshPort({ avdName, deviceSlotWait, metadata, projectPath, slot, deviceName, out, logFile = null, alive = pidExists }) {
@@ -494,7 +494,7 @@ async function bootOwnedAvdOnFreshPort({ avdName, deviceSlotWait, metadata, proj
 		platform: "android",
 		key: avdName
 	}, async () => {
-		const livePorts = liveAndroidConsolePorts();
+		const livePorts = await liveAndroidConsolePorts();
 		const claim = await withConfigLockAsync$1(() => claimAndroidConsolePort({
 			projectPath,
 			slot,
@@ -599,10 +599,10 @@ function reportAndroidMemoryPressure(out) {
 async function androidBootRemedy(pressure) {
 	let count = null;
 	try {
-		const live = countLiveOwnedDevices({
-			sims: () => process.platform === "darwin" ? listAllIosSims({ timeoutMs: 2e3 }) : [],
-			adb: () => ({
-				...listAdbDevices({ timeoutMs: 2e3 }),
+		const live = await countLiveOwnedDevicesFrom({
+			sims: () => process.platform === "darwin" ? listAllIosSimsAsync({ timeoutMs: 2e3 }) : [],
+			adb: async () => ({
+				...await listAdbDevicesAsync({ timeoutMs: 2e3 }),
 				unhealthy: []
 			}),
 			booting: []
@@ -685,7 +685,7 @@ async function ensureAndroidBooted({ device, deviceSlotWait, projectPath, slot,
 		out
 	}));
 	const boot = async () => {
-		const livePorts = liveAndroidConsolePorts();
+		const livePorts = await liveAndroidConsolePorts();
 		const claim = await withConfigLockAsync$1(() => claimAndroidConsolePort({
 			projectPath,
 			slot,
@@ -785,6 +785,7 @@ async function ensureBooted({ platform, device, simulatorApp, timeoutMs, pollMs
 	if (platform === "ios") return ensureIosBooted({
 		device,
 		projectPath,
+		slot,
 		deviceSlotWait,
 		simulatorApp,
 		timeoutMs: timeoutMs ?? 6e5,

package/dist/{doctor-A_Nr_fDe.mjs → doctor-Dbx1ZpD2.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-k3P3PizH.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-DyqE9n1J.mjs";
 export { applySandboxFix, doctorCommand as default, doctorSuccessLines, parseDoctorPlatform, readDoctorReport, shadowedStimFinding, toolchainReport };

package/dist/{doctor-k3P3PizH.mjs → doctor-DyqE9n1J.mjs}

@@ -1,17 +1,17 @@
-import { Y as doctorIo, _ as loadConfig$1, p as getProject } from "./config-BZhXY15H.mjs";
-import { f as refuseNoProject, l as phaseLine } from "./command-output-BBvS1H6v.mjs";
-import { Nt as repoRoot, R as projectSettingsContextAsync } from "./settings-B5tCoq9N.mjs";
-import { f as projectRegistry, t as NO_PROJECT_REFUSAL } from "./project-BiC68mIp.mjs";
-import { c as inspectStimVersions, s as compareStimVersions } from "./eas-session-ledger-BMCA1gdO.mjs";
-import { a as inspectBudget, dr as inspectWatchmanMemory, hr as memorySweepIsScoped, n as budgetLine } from "./budget-HyShrIpL.mjs";
-import { B as memoryCulpritFindings, V as readMemoryCulpritsAsync, f as listAllIosSimsAsync, h as listIosRuntimesAsync, l as iosRuntimeMatches, x as pickDefaultIosCreation } from "./ios-BQzvJlzw.mjs";
-import { c as detectXcodeMajorAsync } from "./xcode-CiIIDnuD.mjs";
-import { s as offloadCheck } from "./client-BQsmyp_-.mjs";
-import { l as inspectBuildMachines, p as inspectDeviceHostMachines } from "./selection-D5cxEl3t.mjs";
-import { r as maintenanceStatus, t as maintenanceLine } from "./status-Fect2w9R.mjs";
-import { a as writeIgnoreDirs, c as recordDoctorRun, i as watchedCheckouts, n as inspectNestedWorktrees, r as nestedWorktreeFinding } from "./doctor-watchman-BovI1y3-.mjs";
-import { c as checkWorktreeStorageLayout, l as readMachineSettings, o as runDoctor } from "./doctor-Bm8TVpGn.mjs";
-import { h as resolveDeviceType, v as resolveRuntime } from "./support-qKcbgmI5.mjs";
+import { Q as doctorIo, _ as loadConfig$1, p as getProject } from "./config-Cn94Jc0g.mjs";
+import { f as refuseNoProject, l as phaseLine } from "./command-output-Dj-WT4BP.mjs";
+import { It as repoRoot, z as projectSettingsContextAsync } from "./settings-BDVI8Ivc.mjs";
+import { f as projectRegistry, t as NO_PROJECT_REFUSAL } from "./project-DYj-HVx6.mjs";
+import { Qn as inspectWatchmanMemory, f as inspectBudget, l as budgetLine, nr as memorySweepIsScoped } from "./ccache-BWTze1Ls.mjs";
+import { c as inspectStimVersions, s as compareStimVersions } from "./eas-session-ledger-DrP4OuuM.mjs";
+import { I as detectXcodeMajorAsync } from "./toolchain-CbCG6C5Z.mjs";
+import { H as memoryCulpritFindings, U as readMemoryCulpritsAsync, f as listAllIosSimsAsync, h as listIosRuntimesAsync, l as iosRuntimeMatches, x as pickDefaultIosCreation } from "./ios-E26qSpkb.mjs";
+import { s as offloadCheck } from "./client-xsdxrhWA.mjs";
+import { g as configuredMachines, p as inspectBuildMachines, v as inspectDeviceHostMachines } from "./selection-Bs8phwhN.mjs";
+import { r as maintenanceStatus, t as maintenanceLine } from "./status-7ULDEJ1e.mjs";
+import { a as writeIgnoreDirs, c as recordDoctorRun, i as watchedCheckouts, n as inspectNestedWorktrees, r as nestedWorktreeFinding } from "./doctor-watchman-CxDbyrrt.mjs";
+import { c as checkWorktreeStorageLayout, l as readMachineSettings, o as runDoctor } from "./doctor-F-3VUUyN.mjs";
+import { h as resolveDeviceType, v as resolveRuntime } from "./support-Be0UeVZU.mjs";
 import { isJsonObject, maintenanceNdjsonFile, readHostedAppMetadata, readHostedSessions } from "@stim-cli/core/state";
 import { dirname, join, sep } from "path";
 import chalk from "chalk";
@@ -419,6 +419,16 @@ async function prepareDoctor(root, platform, registry, operation) {
 		doctors: await selected.load()
 	};
 }
+function withPriority(machines) {
+	const order = configuredMachines() ?? [];
+	return machines.map((each) => {
+		const at = order.indexOf(each.machine);
+		return at < 0 ? each : {
+			...each,
+			priority: at + 1
+		};
+	});
+}
 async function readDoctorReport(operation, platform, version, requestAccess = false) {
 	const found = projectRegistry.findProjectRoot(operation.projectRoot);
 	if (!found) throw Object.assign(new Error(NO_PROJECT_REFUSAL.message), NO_PROJECT_REFUSAL);
@@ -515,8 +525,8 @@ async function assembleDoctorReport(root, opts, version, prepared, inspectVersio
 			...maintenance,
 			logPath: maintenanceNdjsonFile()
 		},
-		remoteMachines: remoteMachines.machines,
-		deviceHosts: deviceHostMachines.machines,
+		remoteMachines: withPriority(remoteMachines.machines),
+		deviceHosts: withPriority(deviceHostMachines.machines),
 		toolchain,
 		findings
 	};
@@ -568,7 +578,9 @@ function doctorCommand(program, version, inspectVersions = inspectStimVersions,
 		const report = await assembleDoctorReport(root, opts, version, prepared, inspectVersions, host);
 		const { findings, stim, toolchain, maintenance } = report;
 		const budget = { report: report.budget };
+		const order = (configuredMachines() ?? []).map((machine, at) => `${at + 1} ${machine}`);
 		const maintenanceLines = [
+			...order.length ? [phaseLine("placement order", `${order.join(", ")} (first with room and load under its limit)`)] : [],
 			phaseLine("maintenance.mode", maintenance.mode),
 			phaseLine("maintenance log", maintenanceNdjsonFile()),
 			phaseLine("last pass", maintenanceLine(maintenance, false) ?? "no pass has run yet")