stim 1.8.0 → 1.9.0

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

@@ -1,10 +1,10 @@
-import { B as validateDeviceSlot } from "./config-B7iyKWkL.mjs";
-import { a as findProjectRoot } from "./project-DDZWf_16.mjs";
-import { E as memoizeEmulatorProbe, L as resolvePhysicalDevice, M as physicalDeviceModel, P as probeEmulatorSerial, S as listAdbDevices, a as androidPoolNoCandidatesRefusal, i as androidPoolCandidates } from "./android-DWssqHQ8.mjs";
-import { r as clockTime } from "./command-output-B3ycpsYv.mjs";
-import { f as takeLease, l as releaseWorkspaceLeases, n as fileLeaseIo, o as parseLeaseDuration } from "./device-lease-Ffz_M5t0.mjs";
-import { d as waitForDevice, s as parseDeviceWait, t as selectFromPool } from "./device-pool-BxRwdufO.mjs";
-import { c as listIosDevices, o as iosPoolCandidates, s as iosPoolNoCandidatesRefusal, u as resolveIosPhysicalDevice } from "./ios-device-CauFJiYx.mjs";
+import { G as parseDeviceSlotOption } from "./config-Cp9lM3wX.mjs";
+import { o as findProjectRoot, t as NO_PROJECT_REFUSAL } from "./project-DS112DYB.mjs";
+import { C as listAdbDevices, D as memoizeEmulatorProbe, I as probeEmulatorSerial, P as physicalDeviceModel, a as androidPoolNoCandidatesRefusal, i as androidPoolCandidates, z as resolvePhysicalDevice } from "./android-_y4Ohi5z.mjs";
+import { r as clockTime } from "./command-output-gByVmIjy.mjs";
+import { f as takeLease, l as releaseWorkspaceLeases, n as fileLeaseIo, o as parseLeaseDuration } from "./device-lease-Crs-HkJY.mjs";
+import { d as waitForDevice, s as parseDeviceWait, t as selectFromPool } from "./device-pool-CnTAz8X1.mjs";
+import { a as iosPoolCandidates, c as listIosDevices, o as iosPoolNoCandidatesRefusal, s as isWirelessIosDevice, u as resolveIosPhysicalDevice } from "./ios-device-D972i9wf.mjs";
 import chalk from "chalk";
 //#region src/commands/device.ts
 const DEFAULT_FOR = "5m";
@@ -69,7 +69,8 @@ async function poolDevice(platform, idLabel, waitSeconds, deadline, root, d, slo
 		idLabel,
 		list: () => platform === "ios" ? iosPoolCandidates(d.listIosDevices()).map((entry) => ({
 			id: entry.udid,
-			name: entry.name
+			name: entry.name,
+			fallback: isWirelessIosDevice(entry)
 		})) : androidPoolCandidates(d.listAdbDevices(), isEmulator).map((entry) => ({ id: entry.serial })),
 		noCandidates: () => {
 			const resolved = platform === "ios" ? iosPoolNoCandidatesRefusal(d.listIosDevices()) : androidPoolNoCandidatesRefusal(d.listAdbDevices(), isEmulator);
@@ -121,11 +122,7 @@ async function runLock(platformArg, idArg, opts = {}, overrides = {}) {
 		remedy: "Run `stim device lock ios` or `stim device lock android`."
 	});
 	const root = d.findProjectRoot(process.cwd());
-	if (!root) return report({
-		code: "STIM_NO_PROJECT",
-		message: "Not in a React Native project (no package.json found).",
-		remedy: "Run this from the app directory -- the one holding package.json."
-	});
+	if (!root) return report(NO_PROJECT_REFUSAL);
 	const durationText = String(opts.for ?? DEFAULT_FOR).trim();
 	const duration = parseLeaseDuration(durationText);
 	if ("error" in duration) return report({
@@ -224,11 +221,7 @@ async function runUnlock(platformArg, opts = {}, overrides = {}) {
 		remedy: "Run `stim device unlock` for every lease this workspace holds, or name one platform."
 	});
 	const root = d.findProjectRoot(process.cwd());
-	if (!root) return report({
-		code: "STIM_NO_PROJECT",
-		message: "Not in a React Native project (no package.json found).",
-		remedy: "Run this from the app directory -- the one holding package.json."
-	});
+	if (!root) return report(NO_PROJECT_REFUSAL);
 	const released = d.releaseLeases(root, {
 		platform,
 		...opts.slot ? { slot: opts.slot } : {}
@@ -243,10 +236,10 @@ async function runUnlock(platformArg, opts = {}, overrides = {}) {
 }
 function registerDevice(program, deps = {}) {
 	const device = program.command("device").description("Lease a connected physical device to this workspace, and give it back");
-	device.command("lock").argument("<platform>", "ios or android").argument("[id]", "the UDID or serial to lease; without one, the first free connected device is used").description("Lease a connected physical device to this workspace for a declared time, so another workspace's `--device` run waits instead of installing over it. Nothing but this command and a `--device` run moves the expiry.").option("--for <duration>", `How long to hold it: a whole number of seconds or minutes from 10s to 30m (default ${DEFAULT_FOR})`).option("--wait <seconds>", "How long to wait for a device another workspace holds, before refusing with STIM_DEVICE_BUSY (default 60, 0 refuses at once)").option("--slot <name>", "Use this workspace device slot", validateDeviceSlot).option("--json", "print the lease as JSON on stdout").action(async (platform, id, opts) => {
+	device.command("lock").argument("<platform>", "ios or android").argument("[id]", "the UDID or serial to lease; without one, the first free connected device is used").description("Lease a connected physical device to this workspace for a declared time, so another workspace's `--device` run waits instead of installing over it. Nothing but this command and a `--device` run moves the expiry.").option("--for <duration>", `How long to hold it: a whole number of seconds or minutes from 10s to 30m (default ${DEFAULT_FOR})`).option("--wait <seconds>", "How long to wait for a device another workspace holds, before refusing with STIM_DEVICE_BUSY (default 60, 0 refuses at once)").option("--slot <name>", "Use this workspace device slot", parseDeviceSlotOption).option("--json", "print the lease as JSON on stdout").action(async (platform, id, opts) => {
 		if ("code" in await runLock(platform, id, opts, deps)) process.exit(1);
 	});
-	device.command("unlock").argument("[platform]", "ios or android; without one, every lease this workspace holds is released").description("Release the device lease or leases this workspace holds. Releasing nothing is not an error.").option("--slot <name>", "Use this workspace device slot", validateDeviceSlot).option("--json", "print the released leases as JSON on stdout").action(async (platform, opts) => {
+	device.command("unlock").argument("[platform]", "ios or android; without one, every lease this workspace holds is released").description("Release the device lease or leases this workspace holds. Releasing nothing is not an error.").option("--slot <name>", "Use this workspace device slot", parseDeviceSlotOption).option("--json", "print the released leases as JSON on stdout").action(async (platform, opts) => {
 		const result = await runUnlock(platform, opts, deps);
 		if (!Array.isArray(result)) process.exit(1);
 	});

package/dist/{device-lease-Ffz_M5t0.mjs → device-lease-Crs-HkJY.mjs}

@@ -1,9 +1,9 @@
-import { B as validateDeviceSlot, D as withDirLock, F as deviceSlotKey, L as parseDeviceSlotKey, u as getConfigDir } from "./config-B7iyKWkL.mjs";
-import { a as withWorkspaceStateLock, n as clearWorkspaceStateKeys, o as writeWorkspaceState, r as readWorkspaceState } from "./workspace-state-BT5E3SA2.mjs";
-import { a as segment } from "./build-lock-CgtsB6TV.mjs";
+import { A as withDirLock, H as deviceSlotKey, J as validateDeviceSlot, W as parseDeviceSlotKey, u as getConfigDir } from "./config-Cp9lM3wX.mjs";
+import { c as writeWorkspaceState, n as clearWorkspaceStateKeys, o as withWorkspaceStateLock, r as readWorkspaceState } from "./workspace-state-DF2gCFhx.mjs";
+import { i as segment } from "./build-lock-DPXPLgTc.mjs";
 import { mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
-import { randomBytes } from "node:crypto";
 import { join } from "node:path";
+import { randomBytes } from "node:crypto";
 const DEFAULT_LEASE_MS = 3e5;
 const LEASE_SUFFIX = ".json";
 const LOCK_SUFFIX = ".lock";
@@ -332,15 +332,21 @@ function selectPoolDevice({ candidates, leases, held = null, now }) {
 			id: held
 		};
 	}
-	if (ordered.length === 0) return { status: "none" };
+	const preferred = ordered.filter((candidate) => !candidate.fallback);
+	const pool = preferred.length > 0 ? preferred : ordered;
+	if (pool.length === 0) return { status: "none" };
 	const byId = new Map(leases.map((lease) => [lease.id, lease]));
-	const holders = [];
-	for (const candidate of ordered) {
+	const free = (candidate) => {
 		const lease = byId.get(candidate.id);
-		if (!lease || leaseIsExpired(lease, now)) return {
+		return !lease || leaseIsExpired(lease, now);
+	};
+	const holders = [];
+	for (const candidate of pool) {
+		if (free(candidate)) return {
 			status: "selected",
 			candidate
 		};
+		const lease = byId.get(candidate.id);
 		holders.push({
 			id: lease.id,
 			holder: lease.holder,
@@ -349,7 +355,8 @@ function selectPoolDevice({ candidates, leases, held = null, now }) {
 	}
 	return {
 		status: "busy",
-		holders
+		holders,
+		spare: ordered.filter((candidate) => candidate.fallback && free(candidate)).map((candidate) => candidate.id)
 	};
 }
 function withHolderLock(io, root, fn) {

package/dist/{device-pool-BxRwdufO.mjs → device-pool-CnTAz8X1.mjs}

@@ -1,7 +1,7 @@
-import { F as deviceSlotKey } from "./config-B7iyKWkL.mjs";
-import { a as formatElapsed, r as clockTime } from "./command-output-B3ycpsYv.mjs";
-import { A as APP_READINESS_TIMEOUT_MS, l as VERIFY_TIMEOUT_MS } from "./app-install-BDbsSgCl.mjs";
-import { a as parseLease, c as releaseRunLease, d as selectPoolDevice, f as takeLease, n as fileLeaseIo, r as leaseIsExpired, s as raiseLease, t as deviceLeasePath } from "./device-lease-Ffz_M5t0.mjs";
+import { H as deviceSlotKey } from "./config-Cp9lM3wX.mjs";
+import { a as formatElapsed, r as clockTime } from "./command-output-gByVmIjy.mjs";
+import { a as VERIFY_TIMEOUT_MS, p as APP_READINESS_TIMEOUT_MS } from "./launch-verify-Q_OtW1Rf.mjs";
+import { a as parseLease, c as releaseRunLease, d as selectPoolDevice, f as takeLease, n as fileLeaseIo, r as leaseIsExpired, s as raiseLease, t as deviceLeasePath } from "./device-lease-Crs-HkJY.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;
@@ -335,7 +335,7 @@ const NO_LEASE_FACTS = {
 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) {
+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;
@@ -348,7 +348,7 @@ function poolBusyRefusal(holders, leases, unreadable, now, waitSeconds) {
 	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: "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.",
+		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,
@@ -401,7 +401,7 @@ async function selectFromPool({ root, platform, slot = "default", idLabel, list,
 		}
 		if (now() >= until) return {
 			status: "refused",
-			refusal: poolBusyRefusal(selection.holders, leases, unreadable, now(), waitSeconds)
+			refusal: poolBusyRefusal(selection.holders, leases, unreadable, now(), waitSeconds, selection.spare, idLabel)
 		};
 		if (lastLine === null || now() - lastLine >= 3e4) {
 			lastLine = now();