stim 1.15.0 → 1.17.0

package/dist/{device-ios-DMQBUPus.mjs → device-ios-Bc7vbGwl.mjs}

@@ -1,24 +1,33 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { C as saveConfig, D as withConfigLock, H as projectDeviceSlots, _ as loadConfig, a as clearDevice, d as getConfigDir, w as setDevice, z as deviceSlotPlatforms } from "./config-D0DbpZtM.mjs";
-import { x as workspaceId } from "./workspace-state-CL2V2Ons.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BL7Q0HCO.mjs";
-import { l as phaseLine } from "./command-output-CliHHn7a.mjs";
-import { dt as parkedMaxSetting, ft as readParked, mt as selectParked, ot as adoptParked, st as dropParked } from "./android-Db2eEMaf.mjs";
-import { y as iosSimSlimProfileSetting } from "./settings-CduVcoxj.mjs";
-import { c as teardownParkedIosSim } from "./teardown-BYuQafiA.mjs";
-import { A as hostMemoryPressureAdvice, C as resolveIosCreation, O as configuredIosSimulatorViewer, S as resetIosPrivacy, _ as parseRuntimeVersion, b as renameIosSim, f as listIosDeviceTypes, h as ownedSimName, i as createOwnedIosSim, j as readHostMemoryPressure, l as iosSimulatorFailureAdvice, n as bootIosSim, p as listIosRuntimes, u as listAllIosSims, w as resolveOwnedIosSim, x as resetIosKeychain } from "./ios-3CtCRhwr.mjs";
-import { a as runtimeMismatch, n as deviceTypeMismatch } from "./device-capacity-DMuKC7nx.mjs";
+import { n as ownership_claim_exports } from "./process-identity-BmRm1qV0.mjs";
+import { l as phaseLine } from "./command-output-CDAIFD-8.mjs";
+import { v as iosSimSlimProfileSetting } from "./settings-Cfd-0r2d.mjs";
+import { y as workspaceId } from "./workspace-state-DqcCbpE7.mjs";
+import { ct as dropParked, ft as parkedMaxSetting, ht as selectParked, pt as readParked, st as adoptParked } from "./android-B_YNZy61.mjs";
+import { A as hostMemoryPressureAdvice, C as resolveIosCreation, O as configuredIosSimulatorViewer, S as resetIosPrivacy, _ as parseRuntimeVersion, b as renameIosSim, f as listIosDeviceTypes, h as ownedSimName, i as createOwnedIosSim, j as readHostMemoryPressure, l as iosSimulatorFailureAdvice, n as bootIosSim, p as listIosRuntimes, u as listAllIosSims, w as resolveOwnedIosSim, x as resetIosKeychain } from "./ios-DSfnPfse.mjs";
+import { v as teardownParkedIosSim } from "./ownership-BMLqyBgJ.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-2mNzOlaB.mjs";
+import { a as deviceTypeMismatch, c as runtimeMismatch, n as DeviceAdmissionRefusal, p as withDeviceBootAdmission } from "./device-capacity-D0GWHnTM.mjs";
 import chalk from "chalk";
 //#region src/engine/device-ios.ts
-function startIosBoot(udid, configure, label, out, simulatorApp) {
-	const done = (async () => {
+function startIosBoot(udid, configure, label, out, simulatorApp, root, deviceSlotWait) {
+	const done = withDeviceBootAdmission({
+		platform: "ios",
+		key: udid
+	}, async () => {
+		out(chalk.dim(phaseLine("device", `booting ${label} (${udid})`)));
 		await bootIosSim(udid, {
 			label,
 			out,
 			simulatorApp
 		});
 		await configure();
-	})();
+	}, {
+		...deviceSlotWait,
+		root,
+		out
+	});
 	done.catch(() => {});
 	return {
 		udid,
@@ -34,7 +43,8 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 	const simslimProfile = iosSimSlimProfileSetting(settings, settingsRoot);
 	if (record?.deviceUdid) {
 		if (record.owned) {
-			const resolved = resolveOwnedIosSim(record.deviceUdid);
+			const listed = listAllIosSims({ includeUnavailable: true });
+			const resolved = resolveOwnedIosSim(record.deviceUdid, listed);
 			if (resolved.notOwned) note(chalk.yellow(`Note: recorded sim is now named "${resolved.notOwned}", not Stim-owned -- creating a fresh owned sim instead of booting it.`));
 			else if (resolved.missing) {} else {
 				const sim = resolved.sim;
@@ -48,7 +58,7 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 					model: deviceTypes.find((d) => d.identifier === sim.deviceTypeIdentifier)?.name ?? null,
 					runtime: parseRuntimeVersion(sim.runtime)
 				};
-				const name = await withIosDeviceNameLock(() => renameToOwnedName(sim, label, model, projectPath));
+				const name = ownedIosName(sim, label, model, projectPath, listed) === sim.name ? sim.name : await withIosDeviceNameLock(() => renameToOwnedName(sim, label, model, projectPath));
 				const updated = {
 					deviceUdid: sim.udid,
 					owned: true,
@@ -74,17 +84,15 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 					deviceType: model.model,
 					runtime: model.runtime
 				};
-				if (sim.state !== "Booted") {
-					out(chalk.dim(phaseLine("device", `booting ${name} (${sim.udid})`)));
-					return {
-						...updated,
-						booting: startIosBoot(sim.udid, configure, name, out, flags.simulatorApp),
-						...facts
-					};
-				}
+				if (sim.state !== "Booted") return {
+					...updated,
+					booting: startIosBoot(sim.udid, configure, name, out, flags.simulatorApp, projectPath, flags.deviceSlotWait),
+					...facts
+				};
 				return {
 					...await configure(),
-					...facts
+					...facts,
+					booted: sim.udid
 				};
 			}
 		} else {
@@ -116,7 +124,6 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 		out
 	})) : null;
 	if (adopted) {
-		out(chalk.dim(phaseLine("device", `booting ${adopted.deviceName} (${adopted.deviceUdid})`)));
 		const booting = startIosBoot(adopted.deviceUdid, async () => {
 			resetAdoptedSim(adopted.deviceUdid, out);
 			await configureOwnedIosSim({
@@ -127,7 +134,7 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 				out,
 				reconcileIosSimulator
 			});
-		}, adopted.deviceName, out, flags.simulatorApp);
+		}, adopted.deviceName, out, flags.simulatorApp, projectPath, flags.deviceSlotWait);
 		return {
 			...adopted,
 			booting,
@@ -160,7 +167,7 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 		profile: simslimProfile,
 		out,
 		reconcileIosSimulator
-	}), created.name, out, flags.simulatorApp);
+	}), created.name, out, flags.simulatorApp, projectPath, flags.deviceSlotWait);
 	return {
 		...newRecord,
 		created: true,
@@ -172,8 +179,8 @@ async function ensureOwnedIosDevice({ record, projectPath, slot, settingsRoot, l
 function withIosDeviceNameLock(fn) {
 	return withWorkspaceProcessLock(getConfigDir(), "ios-device-names", async () => fn(), { external: true });
 }
-function ownedIosNameSuffix(label, model, projectPath, udid) {
-	const names = new Set(listAllIosSims({ includeUnavailable: true }).filter((sim) => sim.udid !== udid).map((sim) => sim.name));
+function ownedIosNameSuffix(label, model, projectPath, udid, listed = listAllIosSims({ includeUnavailable: true })) {
+	const names = new Set(listed.filter((sim) => sim.udid !== udid).map((sim) => sim.name));
 	for (const project of Object.values(loadConfig()?.projects ?? {})) for (const { platforms } of projectDeviceSlots(project)) {
 		const record = platforms.ios;
 		if (record?.deviceUdid !== udid && record?.deviceName) names.add(record.deviceName);
@@ -183,8 +190,11 @@ function ownedIosNameSuffix(label, model, projectPath, udid) {
 	for (let attempt = 0; names.has(ownedSimName(label, model, suffix)); attempt++) suffix = ` ${workspaceId(projectPath)}${attempt ? `-${attempt}` : ""}`;
 	return suffix;
 }
+function ownedIosName(sim, label, model, projectPath, listed) {
+	return ownedSimName(label, model, ownedIosNameSuffix(label, model, projectPath, sim.udid, listed));
+}
 function renameToOwnedName(sim, label, model, projectPath) {
-	const wanted = ownedSimName(label, model, ownedIosNameSuffix(label, model, projectPath, sim.udid));
+	const wanted = ownedIosName(sim, label, model, projectPath);
 	if (sim.name === wanted) return wanted;
 	try {
 		renameIosSim(sim.udid, wanted);
@@ -284,7 +294,7 @@ async function configureOwnedIosSim({ record, projectPath, slot, profile, out, r
 	setDevice(projectPath, "ios", updated, slot);
 	return updated;
 }
-async function ensureIosBooted({ device, simulatorApp, timeoutMs, pollMs, out }) {
+async function ensureIosBooted({ device, projectPath, deviceSlotWait, simulatorApp, timeoutMs, pollMs, out }) {
 	const udid = device?.deviceUdid;
 	if (!udid) return {
 		failed: true,
@@ -315,13 +325,15 @@ async function ensureIosBooted({ device, simulatorApp, timeoutMs, pollMs, out })
 		try {
 			await booting.done;
 		} catch (e) {
-			return {
-				failed: true,
-				reason: `Could not boot simulator ${udid}: ${e?.message || e}`
-			};
+			return bootFailure(udid, e);
 		}
 		return ready();
 	}
+	const readiness = device?.booted === udid ? ready() : null;
+	if (readiness?.ok) {
+		if (simulatorApp !== void 0) configuredIosSimulatorViewer(simulatorApp).open(udid);
+		return readiness;
+	}
 	let resolved;
 	try {
 		resolved = resolveOwnedIosSim(udid);
@@ -341,24 +353,30 @@ async function ensureIosBooted({ device, simulatorApp, timeoutMs, pollMs, out })
 	};
 	const sim = resolved.sim;
 	if (sim.state === "Booted") {
-		const result = ready();
+		const result = readiness ?? ready();
 		if (result.ok && simulatorApp !== void 0) configuredIosSimulatorViewer(simulatorApp).open(udid);
 		return result;
 	}
-	out(chalk.dim(phaseLine("device", `booting ${sim.name} (${udid})`)));
 	const bootDeadline = Date.now() + timeoutMs;
 	try {
-		await bootIosSim(udid, {
-			timeoutMs,
-			label: sim.name,
-			out,
-			simulatorApp
+		await withDeviceBootAdmission({
+			platform: "ios",
+			key: udid
+		}, () => {
+			out(chalk.dim(phaseLine("device", `booting ${sim.name} (${udid})`)));
+			return bootIosSim(udid, {
+				timeoutMs,
+				label: sim.name,
+				out,
+				simulatorApp
+			});
+		}, {
+			...deviceSlotWait,
+			root: projectPath,
+			out
 		});
 	} catch (e) {
-		return {
-			failed: true,
-			reason: `Could not boot simulator ${udid}: ${e?.message || e}`
-		};
+		return bootFailure(udid, e);
 	}
 	const deadline = Math.max(bootDeadline, Date.now() + 2 * pollMs);
 	while (Date.now() < deadline) {
@@ -374,6 +392,19 @@ async function ensureIosBooted({ device, simulatorApp, timeoutMs, pollMs, out })
 		reason: `Simulator ${udid} did not reach the Booted state within ${Math.round(timeoutMs / 1e3)}s.`
 	};
 }
+function bootFailure(udid, error) {
+	const refusal = error instanceof DeviceAdmissionRefusal ? error : (0, ownership_claim_exports.claimFailure)(error, "stim ios");
+	if (refusal) return {
+		failed: true,
+		code: refusal.code,
+		reason: refusal.message,
+		remedy: refusal.remedy
+	};
+	return {
+		failed: true,
+		reason: `Could not boot simulator ${udid}: ${error?.message || error}`
+	};
+}
 function sleep(ms) {
 	return new Promise((r) => setTimeout(r, ms));
 }

package/dist/{device-lease-W5Pi1q38.mjs → device-lease-DpoS36_u.mjs}

@@ -2,9 +2,9 @@ import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { B as parseDeviceSlotKey, R as deviceSlotKey, W as validateDeviceSlot, d as getConfigDir } from "./config-D0DbpZtM.mjs";
 import { n as ownership_claim_exports } from "./process-identity-BmRm1qV0.mjs";
 import { r as register } from "./cache-manifest-DnUHBJaU.mjs";
-import { E as withDirLock$1, c as writeWorkspaceState, m as sharedBuildCache, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState } from "./workspace-state-CL2V2Ons.mjs";
+import { a as formatElapsed, i as formatDuration, m as shortHash } from "./command-output-CDAIFD-8.mjs";
+import { c as writeWorkspaceState, d as sharedBuildCache, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState, w as withDirLock$1 } from "./workspace-state-DqcCbpE7.mjs";
 import { n as declareSpawnsOn, o as stopDeclaringSpawnsOn } from "./spawn-claims-D0XfSe8u.mjs";
-import { a as formatElapsed, i as formatDuration, m as shortHash } from "./command-output-CliHHn7a.mjs";
 import { createHash, randomBytes } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { join } from "node:path";

package/dist/{device-pool-B2r38YjS.mjs → device-lease-run-B8YltIH_.mjs}

@@ -1,11 +1,12 @@
 import { R as deviceSlotKey } from "./config-D0DbpZtM.mjs";
-import { a as formatElapsed, r as clockTime } from "./command-output-CliHHn7a.mjs";
-import { a as parseLease, c as raiseLease, f as selectPoolDevice, l as releaseRunLease, n as fileLeaseIo, p as takeLease, r as leaseIsExpired, t as deviceLeasePath } from "./device-lease-W5Pi1q38.mjs";
-import { a as VERIFY_TIMEOUT_MS, m as APP_READINESS_TIMEOUT_MS } from "./launch-verify-CLlofxRt.mjs";
+import { a as formatElapsed, r as clockTime } from "./command-output-CDAIFD-8.mjs";
+import { a as parseLease, c as raiseLease, l as releaseRunLease, n as fileLeaseIo, p as takeLease, r as leaseIsExpired, t as deviceLeasePath } from "./device-lease-DpoS36_u.mjs";
+import { a as VERIFY_TIMEOUT_MS, m as APP_READINESS_TIMEOUT_MS } from "./launch-verify-lTnWZikR.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;
 const DEVICE_WAIT_POLL_MS = 2e3;
+const DEVICE_WAIT_LINE_MS = 3e4;
 const DEVICE_BUSY = "STIM_DEVICE_BUSY";
 const DEVICE_LOST = "STIM_DEVICE_LOST";
 function leaseStepMs(boundMs = 0) {
@@ -290,125 +291,4 @@ async function acquireRunLease({ root, platform, slot = "default", id, deviceNam
 	}
 }
 //#endregion
-//#region src/engine/device-pool.ts
-function heldPoolId(root, platform, now, io = fileLeaseIo, slot = "default") {
-	const record = io.readHolder(root)[deviceSlotKey(platform, slot)];
-	if (!record) return null;
-	const lease = parseLease(io.readLease(deviceLeasePath(platform, record.id)));
-	if (!lease || lease.token !== record.token || leaseIsExpired(lease, now)) return null;
-	return record.id;
-}
-function readPool(platform, candidates, io) {
-	const reading = {
-		usable: [],
-		leases: [],
-		unreadable: []
-	};
-	for (const candidate of candidates) {
-		const path = deviceLeasePath(platform, candidate.id);
-		const raw = io.readLease(path);
-		const lease = parseLease(raw);
-		if (raw !== null && !lease) {
-			reading.unreadable.push(path);
-			continue;
-		}
-		reading.usable.push(candidate);
-		if (lease) reading.leases.push(lease);
-	}
-	return reading;
-}
-function disconnectedHeldRefusal(id, idLabel) {
-	return {
-		code: "STIM_NO_DEVICE",
-		message: `This workspace leases ${id}, and it is not connected.`,
-		remedy: `Run \`stim device unlock\` to give it up, then run this command again. Naming another \`--device <${idLabel}>\` refuses the same way while this lease is held.`,
-		lease: null
-	};
-}
-const NO_LEASE_FACTS = {
-	platform: null,
-	id: null,
-	deviceName: null,
-	holder: null,
-	expiresAt: null
-};
-function unreadableSentence(unreadable) {
-	return unreadable.length ? ` Unreadable lease file, so no run may take that device around it: ${unreadable.join("; ")}.` : "";
-}
-function poolBusyRefusal(holders, leases, unreadable, now, waitSeconds, spare = [], idLabel = "id") {
-	const named = holders.map((holder) => `${holder.id} (${holder.holder}, until ${leaseExpiryText(holder.expiresAt, now)})`);
-	const first = holders[0];
-	const lease = first ? leases.find((entry) => entry.id === first.id) : void 0;
-	if (!first) return {
-		code: DEVICE_BUSY,
-		message: `Every connected device has an unreadable lease file, so Stim cannot tell who holds them: ${unreadable.join("; ")}.`,
-		remedy: "Read each file and, once you know no run depends on it, delete it. `stim gc` reports them on every run.",
-		lease: NO_LEASE_FACTS
-	};
-	return {
-		code: DEVICE_BUSY,
-		message: `Every connected device is leased by another workspace${waitSeconds > 0 ? `, and this run waited ${waitSeconds}s for one` : ""}: ${named.join("; ")}.${unreadableSentence(unreadable)}`,
-		remedy: (spare.length ? `Also connected and free: ${spare.join(", ")}. Name one with \`--device <${idLabel}>\` to use it now. ` : "") + "Wait longer with `--wait <seconds>`, connect another device, or pass `--no-wait` to install anyway -- which takes no lease and, when both workspaces build the same app id, terminates the holder's running app.",
-		lease: {
-			platform: lease?.platform ?? null,
-			id: first.id,
-			deviceName: lease?.deviceName ?? null,
-			holder: first.holder,
-			expiresAt: first.expiresAt
-		}
-	};
-}
-async function selectFromPool({ root, platform, slot = "default", idLabel, list, noCandidates, waitSeconds, deadline, noWait = false, now = Date.now, sleep = (ms) => new Promise((r) => setTimeout(r, ms)), warn = () => {}, io = fileLeaseIo }) {
-	const held = heldPoolId(root, platform, now(), io, slot);
-	const until = deadline ?? now() + waitSeconds * 1e3;
-	let lastLine = null;
-	for (;;) {
-		const { usable, leases, unreadable } = readPool(platform, list(), io);
-		const selection = selectPoolDevice({
-			candidates: usable,
-			leases,
-			held,
-			now: now()
-		});
-		if (selection.status === "selected") return selection;
-		if (selection.status === "held-disconnected") return {
-			status: "refused",
-			refusal: disconnectedHeldRefusal(selection.id, idLabel)
-		};
-		if (selection.status === "none") {
-			if (unreadable.length) return {
-				status: "refused",
-				refusal: poolBusyRefusal([], leases, unreadable, now(), waitSeconds)
-			};
-			const { message, remedy } = noCandidates();
-			return {
-				status: "refused",
-				refusal: {
-					code: "STIM_NO_DEVICE",
-					message,
-					remedy,
-					lease: null
-				}
-			};
-		}
-		const first = selection.holders[0];
-		if (noWait && first) {
-			const candidate = usable.find((entry) => entry.id === first.id);
-			if (candidate) return {
-				status: "selected",
-				candidate
-			};
-		}
-		if (now() >= until) return {
-			status: "refused",
-			refusal: poolBusyRefusal(selection.holders, leases, unreadable, now(), waitSeconds, selection.spare, idLabel)
-		};
-		if (lastLine === null || now() - lastLine >= 3e4) {
-			lastLine = now();
-			warn(`waiting for a free device; every connected one is leased: ${selection.holders.map((holder) => `${holder.id} (${holder.holder}, until ${leaseExpiryText(holder.expiresAt, now())})`).join("; ")}`);
-		}
-		await sleep(DEVICE_WAIT_POLL_MS);
-	}
-}
-//#endregion
-export { lostLine as a, releaseLeaseOnSignal as c, waitForDevice as d, leaseExpiryText as i, runLease as l, DEBUG_VERIFY_STEP_MS as n, lostRefusal as o, acquireRunLease as r, parseDeviceWait as s, selectFromPool as t, waitFlagConflict as u };
+export { acquireRunLease as a, lostRefusal as c, runLease as d, waitFlagConflict as f, DEVICE_WAIT_POLL_MS as i, parseDeviceWait as l, DEVICE_BUSY as n, leaseExpiryText as o, waitForDevice as p, DEVICE_WAIT_LINE_MS as r, lostLine as s, DEBUG_VERIFY_STEP_MS as t, releaseLeaseOnSignal as u };

package/dist/device-pool-3o7s5lo4.mjs

@@ -0,0 +1,125 @@
+import { R as deviceSlotKey } from "./config-D0DbpZtM.mjs";
+import { a as parseLease, f as selectPoolDevice, n as fileLeaseIo, r as leaseIsExpired, t as deviceLeasePath } from "./device-lease-DpoS36_u.mjs";
+import { i as DEVICE_WAIT_POLL_MS, n as DEVICE_BUSY, o as leaseExpiryText } from "./device-lease-run-B8YltIH_.mjs";
+//#region src/engine/device-pool.ts
+function heldPoolId(root, platform, now, io = fileLeaseIo, slot = "default") {
+	const record = io.readHolder(root)[deviceSlotKey(platform, slot)];
+	if (!record) return null;
+	const lease = parseLease(io.readLease(deviceLeasePath(platform, record.id)));
+	if (!lease || lease.token !== record.token || leaseIsExpired(lease, now)) return null;
+	return record.id;
+}
+function readPool(platform, candidates, io) {
+	const reading = {
+		usable: [],
+		leases: [],
+		unreadable: []
+	};
+	for (const candidate of candidates) {
+		const path = deviceLeasePath(platform, candidate.id);
+		const raw = io.readLease(path);
+		const lease = parseLease(raw);
+		if (raw !== null && !lease) {
+			reading.unreadable.push(path);
+			continue;
+		}
+		reading.usable.push(candidate);
+		if (lease) reading.leases.push(lease);
+	}
+	return reading;
+}
+function disconnectedHeldRefusal(id, idLabel) {
+	return {
+		code: "STIM_NO_DEVICE",
+		message: `This workspace leases ${id}, and it is not connected.`,
+		remedy: `Run \`stim device unlock\` to give it up, then run this command again. Naming another \`--device <${idLabel}>\` refuses the same way while this lease is held.`,
+		lease: null
+	};
+}
+const NO_LEASE_FACTS = {
+	platform: null,
+	id: null,
+	deviceName: null,
+	holder: null,
+	expiresAt: null
+};
+function unreadableSentence(unreadable) {
+	return unreadable.length ? ` Unreadable lease file, so no run may take that device around it: ${unreadable.join("; ")}.` : "";
+}
+function poolBusyRefusal(holders, leases, unreadable, now, waitSeconds, spare = [], idLabel = "id") {
+	const named = holders.map((holder) => `${holder.id} (${holder.holder}, until ${leaseExpiryText(holder.expiresAt, now)})`);
+	const first = holders[0];
+	const lease = first ? leases.find((entry) => entry.id === first.id) : void 0;
+	if (!first) return {
+		code: DEVICE_BUSY,
+		message: `Every connected device has an unreadable lease file, so Stim cannot tell who holds them: ${unreadable.join("; ")}.`,
+		remedy: "Read each file and, once you know no run depends on it, delete it. `stim gc` reports them on every run.",
+		lease: NO_LEASE_FACTS
+	};
+	return {
+		code: DEVICE_BUSY,
+		message: `Every connected device is leased by another workspace${waitSeconds > 0 ? `, and this run waited ${waitSeconds}s for one` : ""}: ${named.join("; ")}.${unreadableSentence(unreadable)}`,
+		remedy: (spare.length ? `Also connected and free: ${spare.join(", ")}. Name one with \`--device <${idLabel}>\` to use it now. ` : "") + "Wait longer with `--wait <seconds>`, connect another device, or pass `--no-wait` to install anyway -- which takes no lease and, when both workspaces build the same app id, terminates the holder's running app.",
+		lease: {
+			platform: lease?.platform ?? null,
+			id: first.id,
+			deviceName: lease?.deviceName ?? null,
+			holder: first.holder,
+			expiresAt: first.expiresAt
+		}
+	};
+}
+async function selectFromPool({ root, platform, slot = "default", idLabel, list, noCandidates, waitSeconds, deadline, noWait = false, now = Date.now, sleep = (ms) => new Promise((r) => setTimeout(r, ms)), warn = () => {}, io = fileLeaseIo }) {
+	const held = heldPoolId(root, platform, now(), io, slot);
+	const until = deadline ?? now() + waitSeconds * 1e3;
+	let lastLine = null;
+	for (;;) {
+		const { usable, leases, unreadable } = readPool(platform, list(), io);
+		const selection = selectPoolDevice({
+			candidates: usable,
+			leases,
+			held,
+			now: now()
+		});
+		if (selection.status === "selected") return selection;
+		if (selection.status === "held-disconnected") return {
+			status: "refused",
+			refusal: disconnectedHeldRefusal(selection.id, idLabel)
+		};
+		if (selection.status === "none") {
+			if (unreadable.length) return {
+				status: "refused",
+				refusal: poolBusyRefusal([], leases, unreadable, now(), waitSeconds)
+			};
+			const { message, remedy } = noCandidates();
+			return {
+				status: "refused",
+				refusal: {
+					code: "STIM_NO_DEVICE",
+					message,
+					remedy,
+					lease: null
+				}
+			};
+		}
+		const first = selection.holders[0];
+		if (noWait && first) {
+			const candidate = usable.find((entry) => entry.id === first.id);
+			if (candidate) return {
+				status: "selected",
+				candidate
+			};
+		}
+		if (now() >= until) return {
+			status: "refused",
+			refusal: poolBusyRefusal(selection.holders, leases, unreadable, now(), waitSeconds, selection.spare, idLabel)
+		};
+		if (lastLine === null || now() - lastLine >= 3e4) {
+			lastLine = now();
+			warn(`waiting for a free device; every connected one is leased: ${selection.holders.map((holder) => `${holder.id} (${holder.holder}, until ${leaseExpiryText(holder.expiresAt, now())})`).join("; ")}`);
+		}
+		await sleep(DEVICE_WAIT_POLL_MS);
+	}
+}
+//#endregion
+export { selectFromPool as t };

package/dist/{device-remote-9ulPsdhY.mjs → device-remote-hFSkpfQu.mjs}

@@ -1,18 +1,18 @@
 import { t as getExecutor } from "./exec-CaErVv7t.mjs";
 import { d as getConfigDir } from "./config-D0DbpZtM.mjs";
-import { C as workspaceLogsDir, E as withDirLock, T as workspaceStateFile, b as workspaceDir, x as workspaceId } from "./workspace-state-CL2V2Ons.mjs";
-import { c as ownedDeviceLabel } from "./project-CV3tDFHl.mjs";
-import { a as clearRemoteSession, c as readMetroTunnel, u as readRemoteSession } from "./state-CaeaHbDA.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BL7Q0HCO.mjs";
-import { a as formatElapsed } from "./command-output-CliHHn7a.mjs";
-import { o as pidExists } from "./metro-Di8EN2Tb.mjs";
-import { W as planMetroReach } from "./settings-CduVcoxj.mjs";
-import { T as sanitizeDeviceLabel } from "./ios-3CtCRhwr.mjs";
-import { y as probePublicHttp } from "./stop-cause-CZ_Mr-v9.mjs";
-import { i as INSTALL_ERROR, o as LAUNCH_ERROR, u as devClientDeepLink } from "./app-install-CAAplXAt.mjs";
-import { c as readMetroRecords, o as isBundleProof } from "./launch-verify-CLlofxRt.mjs";
+import { a as formatElapsed } from "./command-output-CDAIFD-8.mjs";
+import { K as planMetroReach } from "./settings-Cfd-0r2d.mjs";
+import { u as ownedDeviceLabel } from "./project-D47Rh0ly.mjs";
+import { o as pidExists } from "./metro-g8NqiJp-.mjs";
+import { C as workspaceStateFile, v as workspaceDir, w as withDirLock, x as workspaceLogsDir$1, y as workspaceId } from "./workspace-state-DqcCbpE7.mjs";
+import { a as clearRemoteSession, c as readMetroTunnel, u as readRemoteSession } from "./state-BKa8wNN5.mjs";
+import { T as sanitizeDeviceLabel } from "./ios-DSfnPfse.mjs";
+import { u as probePublicHttp } from "./ownership-BMLqyBgJ.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-2mNzOlaB.mjs";
+import { i as INSTALL_ERROR, o as LAUNCH_ERROR, u as devClientDeepLink } from "./app-install-VPkI5WEg.mjs";
+import { c as readMetroRecords, o as isBundleProof } from "./launch-verify-lTnWZikR.mjs";
 import { t as compareStimVersions } from "./stim-installations-QMEI32v1.mjs";
-import { c as nativeRunWaitNotice } from "./native-run-DFDoIRbY.mjs";
+import { c as nativeRunWaitNotice } from "./native-run-D1Q56rAD.mjs";
 import { existsSync, mkdirSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { easMachineStateRoot, easMachineStateRoot as easMachineStateRoot$1, easSessionLedgerFile, easSessionLedgerLock, readEasSessionLedger, readEasSessionLedger as readEasSessionLedger$1, readJsonObject, validEasSessionClaim } from "@stim-cli/core/state";
@@ -1293,7 +1293,7 @@ async function ensureMetroReachable({ ctx, metroPort, isExpo, tunnelMode = "auto
 		gate = recorded.provider !== "tailscale";
 	}
 	if (gate && resolvedUrl) {
-		const logsDir = workspaceLogsDir(root);
+		const logsDir = workspaceLogsDir$1(root);
 		const result = await gateOrigin({
 			origin: resolvedUrl,
 			metroPort,