stim 1.10.1 → 1.12.0

package/dist/build-progress-h60GPV27.mjs

@@ -0,0 +1,179 @@
+import { A as ownership_claim_exports } from "./config-0jCcMM0E.mjs";
+import { f as clearWorkspaceStateKey, g as updateWorkspaceState } from "./metro-Dzo30hvJ.mjs";
+import { a as formatElapsed, u as plural } from "./command-output-BWCj5Vh-.mjs";
+import { BUILD_PHASES } from "@stim-cli/core/state";
+//#region src/engine/build-progress.ts
+const ACTIVE_BUILD_KEY = "activeBuild";
+const NO_BUILD_PROGRESS = {
+	step: () => {},
+	durations: () => ({}),
+	clear: () => {}
+};
+const COLD_PHASES = [
+	"prebuild",
+	"pods",
+	"compile"
+];
+const DEVICE_PHASES = ["install", "launch"];
+function startBuildProgress({ root, platform, slot, claim, now = Date.now, note = () => {} }) {
+	const startedAt = new Date(now()).toISOString();
+	const record = {
+		platform,
+		slot,
+		startedAt,
+		phase: "prepare",
+		phaseStartedAt: startedAt,
+		phases: [{
+			phase: "prepare",
+			startedAt
+		}],
+		claim: {
+			root: claim.root,
+			path: claim.path,
+			claimId: claim.claimId,
+			pid: claim.owner.pid
+		}
+	};
+	let warned = false;
+	const guard = (fn) => {
+		try {
+			fn();
+		} catch (error) {
+			if (warned) return;
+			warned = true;
+			note(`Build progress could not be recorded in the workspace state: ${error?.message || error}`);
+		}
+	};
+	const write = () => guard(() => updateWorkspaceState(root, (state) => ({
+		...state,
+		[ACTIVE_BUILD_KEY]: record
+	})));
+	write();
+	return {
+		step(phase) {
+			if (phase === record.phase) return;
+			const at = new Date(now()).toISOString();
+			record.phase = phase;
+			record.phaseStartedAt = at;
+			record.phases.push({
+				phase,
+				startedAt: at
+			});
+			write();
+		},
+		durations() {
+			return phaseDurations(record.phases, now());
+		},
+		clear() {
+			guard(() => {
+				clearWorkspaceStateKey(root, ACTIVE_BUILD_KEY, (value) => parseActiveBuild(value)?.claim.claimId === record.claim.claimId);
+			});
+		}
+	};
+}
+function phaseDurations(phases, now) {
+	const out = {};
+	phases.forEach(({ phase, startedAt }, index) => {
+		const start = Date.parse(startedAt);
+		const next = phases[index + 1];
+		const end = next ? Date.parse(next.startedAt) : now;
+		if (!Number.isFinite(start) || !Number.isFinite(end)) return;
+		out[phase] = (out[phase] ?? 0) + Math.max(0, end - start);
+	});
+	return out;
+}
+function parseActiveBuild(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+	const record = value;
+	const claim = record.claim;
+	if (record.platform !== "ios" && record.platform !== "android") return null;
+	if (!isPhase(record.phase)) return null;
+	if (typeof record.startedAt !== "string" || typeof record.phaseStartedAt !== "string") return null;
+	if (!claim || typeof claim.root !== "string" || typeof claim.claimId !== "string") return null;
+	const phases = Array.isArray(record.phases) ? record.phases.filter((entry) => isPhase(entry?.phase) && typeof entry?.startedAt === "string") : [];
+	return {
+		platform: record.platform,
+		slot: typeof record.slot === "string" ? record.slot : "default",
+		startedAt: record.startedAt,
+		phase: record.phase,
+		phaseStartedAt: record.phaseStartedAt,
+		phases,
+		claim: {
+			root: claim.root,
+			path: typeof claim.path === "string" ? claim.path : "",
+			claimId: claim.claimId,
+			pid: typeof claim.pid === "number" ? claim.pid : 0
+		}
+	};
+}
+function isPhase(value) {
+	return BUILD_PHASES.includes(value);
+}
+function activeBuildState(claim, survey = (0, ownership_claim_exports.readClaimSet)(claim.root)) {
+	if (survey.live.some((holder) => holder.claimId === claim.claimId)) return "running";
+	if (survey.dead.some((holder) => holder.claimId === claim.claimId)) return "stale";
+	return survey.unresolved.length ? "unknown" : "stale";
+}
+function liveOutcome(record) {
+	const seen = new Set(record.phases.map((entry) => entry.phase));
+	if (COLD_PHASES.some((phase) => seen.has(phase))) return "cold";
+	if (DEVICE_PHASES.some((phase) => seen.has(phase))) return "hit";
+	return null;
+}
+function median(values) {
+	if (!values.length) return null;
+	const sorted = values.toSorted((a, b) => a - b);
+	const mid = Math.floor(sorted.length / 2);
+	return sorted.length % 2 ? sorted[mid] : Math.round((sorted[mid - 1] + sorted[mid]) / 2);
+}
+function estimateBuild(history, platform, known, phase) {
+	const lists = history?.[platform];
+	const outcome = known ?? latestOutcome(lists);
+	const samples = outcome && lists?.[outcome] || [];
+	const phaseSamples = samples.flatMap((sample) => phase in sample.phases ? [sample.phases[phase]] : []);
+	return {
+		outcome,
+		expectedMs: median(samples.map((sample) => sample.durationMs)),
+		expectedPhaseMs: median(phaseSamples),
+		basis: samples.length
+	};
+}
+function latestOutcome(lists) {
+	let latest = null;
+	for (const outcome of ["hit", "cold"]) {
+		const last = lists?.[outcome]?.at(-1);
+		const at = last ? Date.parse(last.at) : NaN;
+		if (Number.isFinite(at) && (!latest || at > latest.at)) latest = {
+			outcome,
+			at
+		};
+	}
+	return latest?.outcome ?? null;
+}
+function buildReport(record, { state, history }) {
+	return {
+		platform: record.platform,
+		slot: record.slot,
+		state,
+		phase: record.phase,
+		startedAt: record.startedAt,
+		phaseStartedAt: record.phaseStartedAt,
+		...estimateBuild(history, record.platform, liveOutcome(record), record.phase)
+	};
+}
+function remainingText(remainingMs) {
+	return remainingMs < 6e4 ? "under a minute left" : `about ${Math.ceil(remainingMs / 6e4)} min left`;
+}
+function buildStatusLine(report, now) {
+	const slot = report.slot === "default" ? "" : ` [${report.slot}]`;
+	if (report.state === "stale") return `build: stale ${report.platform}${slot} record from ${report.startedAt} (its run is gone; the next run replaces it)`;
+	const elapsedMs = Math.max(0, now - Date.parse(report.startedAt));
+	const head = `build: ${report.platform}${slot} ${report.phase}, ${formatElapsed(elapsedMs)} elapsed`;
+	if (report.state === "unknown") return `${head} (its native-run claim cannot be resolved, so it may not be running)`;
+	if (report.expectedMs === null) return head;
+	const basis = `median of ${plural(report.basis, `${report.outcome} run`)}`;
+	const remainingMs = report.expectedMs - elapsedMs;
+	return remainingMs > 0 ? `${head} -- ${remainingText(remainingMs)} (${basis})` : `${head} (usually ~${formatElapsed(report.expectedMs)}, ${basis})`;
+}
+//#endregion
+export { buildStatusLine as a, startBuildProgress as c, buildReport as i, NO_BUILD_PROGRESS as n, estimateBuild as o, activeBuildState as r, parseActiveBuild as s, ACTIVE_BUILD_KEY as t };

package/dist/{cache-manifest-Pubfp8wV.mjs → cache-manifest-DWPF4RKJ.mjs}

@@ -1,4 +1,4 @@
-import { u as getConfigDir } from "./config-BEq0Qw_a.mjs";
+import { d as getConfigDir } from "./config-0jCcMM0E.mjs";
 import { existsSync } from "fs";
 import { isAbsolute, join, resolve } from "path";
 import { readCacheManifest, updateCacheManifest } from "@stim-cli/core";

package/dist/cache-manifest.mjs

@@ -1,2 +1,2 @@
-import { a as unregister, i as registeredCaches, n as readManifest, r as register, t as manifestPath } from "./cache-manifest-Pubfp8wV.mjs";
+import { a as unregister, i as registeredCaches, n as readManifest, r as register, t as manifestPath } from "./cache-manifest-DWPF4RKJ.mjs";
 export { manifestPath, readManifest, register, registeredCaches, unregister };

package/dist/cli.mjs

@@ -1,24 +1,24 @@
 #!/usr/bin/env node
-import { _ as refuseRelativeStimPaths } from "./config-BEq0Qw_a.mjs";
+import { v as refuseRelativeStimPaths } from "./config-0jCcMM0E.mjs";
 import { readFileSync } from "node:fs";
 import { Command } from "commander";
 //#region bin/cli.ts
 const commands = /* @__PURE__ */ new Map([
-	["doctor", () => import("./doctor-CmqK1LcQ.mjs")],
-	["worktree", () => import("./worktree-DEG2o9F8.mjs")],
-	["start", () => import("./start-qWapeB4W.mjs")],
-	["ports", () => import("./ports-CLSSFOuz.mjs")],
-	["stop", () => import("./stop-DI4BG4Os.mjs")],
-	["ios", () => import("./ios-CbdqTqOc.mjs")],
-	["android", () => import("./android-Bu4mbDzc.mjs")],
-	["reload", () => import("./reload-CymyF6Kk.mjs")],
-	["device", () => import("./device-Czh5kO8A.mjs")],
-	["logs", () => import("./logs-MARIy6m9.mjs")],
-	["settings", () => import("./settings-EWYNwe72.mjs")],
-	["status", () => import("./status-Zp8kvexe.mjs")],
-	["stats", () => import("./stats-DBYJ5bxL.mjs")],
-	["gc", () => import("./gc-zCDpmdHU.mjs")],
-	["guide", () => import("./guide-DwmaD_Wa.mjs")]
+	["doctor", () => import("./doctor-LfDlbR-N.mjs")],
+	["worktree", () => import("./worktree-B5sTRskL.mjs")],
+	["start", () => import("./start-BFstVBlx.mjs")],
+	["ports", () => import("./ports-Dp_QTwTC.mjs")],
+	["stop", () => import("./stop-BI7QY76M.mjs")],
+	["ios", () => import("./ios-CDzWL1mj.mjs")],
+	["android", () => import("./android-B7X-8H7h.mjs")],
+	["reload", () => import("./reload-nocmx8KB.mjs")],
+	["device", () => import("./device-9r9xRYDa.mjs")],
+	["logs", () => import("./logs-SzuYudOj.mjs")],
+	["settings", () => import("./settings-bE-Gu3Ti.mjs")],
+	["status", () => import("./status-DI9Tjo7T.mjs")],
+	["stats", () => import("./stats-DiCtmluY.mjs")],
+	["gc", () => import("./gc-C4nQFcTX.mjs")],
+	["guide", () => import("./guide-BPBlh9ML.mjs")]
 ]);
 const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
 const program = new Command();

package/dist/collector-run.mjs

@@ -1,11 +1,11 @@
-import { D as process_identity_exports, R as deviceSlotKey, W as validateDeviceSlot } from "./config-BEq0Qw_a.mjs";
+import { G as validateDeviceSlot, O as process_identity_exports, z as deviceSlotKey } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
 import { r as createNdjsonWriter } from "./ndjson-CDY9IkVC.mjs";
-import { j as workspaceLogsDir } from "./metro-BWLOJ_Wr.mjs";
+import { j as workspaceLogsDir } from "./metro-Dzo30hvJ.mjs";
 import { t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
 import { a as startIosDeviceConsole, i as parseDeviceConsoleLine } from "./ios-device-BiOsSVzd.mjs";
-import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-D2xbLVoz.mjs";
-import { a as watchAppPid, i as waitForAppPid, n as parseLogcatLine, r as startAndroidLogcat, t as androidClockOffset } from "./android-DPov-fv2.mjs";
+import { a as unregisterCollector, i as registerCollector, r as readCollectors, t as collectorProcessTitle } from "./ownership-Dqnrjrio.mjs";
+import { a as watchAppPid, i as waitForAppPid, n as parseLogcatLine, r as startAndroidLogcat, t as androidClockOffset } from "./android-BQiKJYK0.mjs";
 import { existsSync } from "node:fs";
 import { LOG_ROTATE_BYTES } from "@stim-cli/core";
 import { isAbsolute, join, resolve } from "node:path";

package/dist/{command-output-D5z2_bcF.mjs → command-output-BWCj5Vh-.mjs}

@@ -1,4 +1,4 @@
-import { t as NO_PROJECT_REFUSAL } from "./project-BXZzOABt.mjs";
+import { t as NO_PROJECT_REFUSAL } from "./project-B8rbutVC.mjs";
 import { n as stripAnsi } from "./process-output-Fpl8PYi8.mjs";
 import { quotedPath } from "@stim-cli/core";
 import chalk from "chalk";

package/dist/{config-BEq0Qw_a.mjs → config-0jCcMM0E.mjs}

@@ -379,6 +379,15 @@ function releaseAndroidConsolePort(projectPath, consolePort, slot = "default") {
 		return true;
 	});
 }
+function clearAndroidBootPending(projectPath, avdName, slot = "default") {
+	withConfigLock(() => {
+		const cfg = loadConfig();
+		const android = deviceSlotPlatforms(cfg?.projects?.[projectPath], slot)?.android;
+		if (!cfg || android?.avdName !== avdName || !android.bootPending) return;
+		delete android.bootPending;
+		saveConfig(cfg);
+	});
+}
 function clearDevice(projectPath, platform, slot = "default", expectedId) {
 	return withConfigLock(() => {
 		const cfg = loadConfig();
@@ -512,4 +521,4 @@ function allConsolePortsAndSerials({ isMounted = isOnMountedVolume } = {}) {
 	return result;
 }
 //#endregion
-export { directorySize as A, parseDeviceSlotKey as B, setSupervisor as C, process_identity_exports as D, writeConfigSetting as E, volumeRootFor as F, projectDeviceSlots as H, assignSlotDevice as I, deviceSlotFileKey as L, isOnMountedVolume as M, listMountedVolumes as N, acquireAvdClaim as O, measuredDirectorySize as P, deviceSlotKey as R, setDevice as S, withConfigLock$1 as T, removeSlotDevice as U, parseDeviceSlotOption as V, validateDeviceSlot as W, refuseRelativeStimPaths as _, clearSupervisor as a, removeProject as b, findEnclosingWorktreeRoot as c, getConfigPath$1 as d, getProject as f, loadConfig$1 as g, isPathPrefix as h, clearDevice as i, formatBytes as j, ownership_claim_exports as k, getConcurrencyLimits as l, getRepoSettings as m, allMetroPorts as n, configCorruptRepair as o, getProjectSettings as p, claimMetroPort as r, ensureConfig as s, allConsolePortsAndSerials as t, getConfigDir as u, releaseAndroidConsolePort as v, upsertProject as w, saveConfig as x, releaseMetroPort as y, deviceSlotPlatforms as z };
+export { ownership_claim_exports as A, deviceSlotPlatforms as B, setDevice as C, writeConfigSetting as D, withConfigLock$1 as E, measuredDirectorySize as F, validateDeviceSlot as G, parseDeviceSlotOption as H, volumeRootFor as I, assignSlotDevice as L, formatBytes as M, isOnMountedVolume as N, process_identity_exports as O, listMountedVolumes as P, deviceSlotFileKey as R, saveConfig as S, upsertProject as T, projectDeviceSlots as U, parseDeviceSlotKey as V, removeSlotDevice as W, loadConfig$1 as _, clearDevice as a, releaseMetroPort as b, ensureConfig as c, getConfigDir as d, getConfigPath$1 as f, isPathPrefix as g, getRepoSettings as h, clearAndroidBootPending as i, directorySize as j, acquireAvdClaim as k, findEnclosingWorktreeRoot as l, getProjectSettings as m, allMetroPorts as n, clearSupervisor as o, getProject as p, claimMetroPort as r, configCorruptRepair as s, allConsolePortsAndSerials as t, getConcurrencyLimits as u, refuseRelativeStimPaths as v, setSupervisor as w, removeProject as x, releaseAndroidConsolePort as y, deviceSlotKey as z };

package/dist/{dependency-state-r9UesA9a.mjs → dependency-state-DNN0yfx6.mjs}

@@ -1,5 +1,5 @@
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { y as repoRoot } from "./worktree-BlizKDpZ.mjs";
+import { y as repoRoot } from "./worktree-DeBQSVtR.mjs";
 import { existsSync } from "node:fs";
 import { dirname, join, relative } from "node:path";
 //#region src/dependency-state.ts

package/dist/{deps-DP4eWqea.mjs → deps-CO-_7UOm.mjs}

@@ -1,7 +1,7 @@
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { n as spawnDeclared } from "./spawn-claims-CUleC2cM.mjs";
+import { a as spawnDeclared } from "./spawn-claims-PT8aQpCa.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { d as startBuildHeartbeat, m as bundlerPin, n as HEARTBEAT_INTERVAL_MS } from "./xcode-B2tBkf0m.mjs";
+import { d as startBuildHeartbeat, m as bundlerPin, n as HEARTBEAT_INTERVAL_MS } from "./xcode-BzplpQzc.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import { delimiter, dirname, join, relative, resolve, sep } from "node:path";
 import { homedir } from "node:os";

package/dist/{device-Czh5kO8A.mjs → device-9r9xRYDa.mjs}

@@ -1,15 +1,17 @@
-import { V as parseDeviceSlotOption } from "./config-BEq0Qw_a.mjs";
-import { o as findProjectRoot, t as NO_PROJECT_REFUSAL } from "./project-BXZzOABt.mjs";
-import { r as clockTime } from "./command-output-D5z2_bcF.mjs";
-import { n as fileLeaseIo, o as parseLeaseDuration, p as takeLease, u as releaseWorkspaceLeases } from "./device-lease-CbEaIk7b.mjs";
-import { B as resolvePhysicalDevice, F as physicalDeviceModel, L as probeEmulatorSerial, O as memoizeEmulatorProbe, a as androidPoolNoCandidatesRefusal, i as androidPoolCandidates, w as listAdbDevices } from "./android-787HhP5w.mjs";
-import { d as waitForDevice, s as parseDeviceWait, t as selectFromPool } from "./device-pool-BBWLAr55.mjs";
-import { a as iosPoolCandidates, c as listIosDevices, o as iosPoolNoCandidatesRefusal, s as isWirelessIosDevice, u as resolveIosPhysicalDevice } from "./ios-device-DNjPXBnb.mjs";
+import { H as parseDeviceSlotOption, U as projectDeviceSlots, p as getProject, z as deviceSlotKey } from "./config-0jCcMM0E.mjs";
+import { i as findProjectRoot, t as NO_PROJECT_REFUSAL } from "./project-B8rbutVC.mjs";
+import { r as clockTime } from "./command-output-BWCj5Vh-.mjs";
+import { n as fileLeaseIo, o as parseLeaseDuration, p as takeLease, u as releaseWorkspaceLeases } from "./device-lease-B9LAXIUH.mjs";
+import { C as getAvdNameForSerial, E as listAdbDevices, G as resolvePhysicalDevice, V as probeEmulatorSerial, j as memoizeEmulatorProbe, o as androidPoolCandidates, s as androidPoolNoCandidatesRefusal, z as physicalDeviceModel } from "./android-75Sk2rIR.mjs";
+import { d as waitForDevice, s as parseDeviceWait, t as selectFromPool } from "./device-pool-BoezJd-c.mjs";
+import { a as iosPoolCandidates, c as listIosDevices, o as iosPoolNoCandidatesRefusal, s as isWirelessIosDevice, u as resolveIosPhysicalDevice } from "./ios-device-D9cLxVr5.mjs";
 import chalk from "chalk";
 //#region src/commands/device.ts
 const DEFAULT_FOR = "5m";
 const DEFAULT_DEPS = {
 	findProjectRoot,
+	getProject,
+	avdNameOf: getAvdNameForSerial,
 	listIosDevices,
 	listAdbDevices,
 	physicalDeviceModel,
@@ -57,6 +59,29 @@ function resolveDevice(platform, requested, d) {
 		deviceName: d.physicalDeviceModel(resolved.serial) ?? resolved.serial
 	};
 }
+function findOwnedVirtualDevice(project, platform, id, avdNameOf) {
+	let running;
+	for (const { slot, platforms } of projectDeviceSlots(project)) {
+		if (platform === "ios") {
+			const sim = platforms.ios;
+			if (sim?.owned && sim.deviceUdid && sim.deviceUdid.toLowerCase() === id.toLowerCase()) return {
+				id: sim.deviceUdid,
+				deviceName: sim.deviceName ?? null,
+				slot
+			};
+			continue;
+		}
+		const emulator = platforms.android;
+		if (!emulator?.owned || !emulator.avdName || !/^emulator-\d+$/.test(id)) continue;
+		running ??= { name: avdNameOf(id) };
+		if (running.name === emulator.avdName) return {
+			id,
+			deviceName: emulator.deviceName ?? emulator.avdName,
+			slot
+		};
+	}
+	return null;
+}
 function isFailure(value) {
 	return "code" in value;
 }
@@ -139,11 +164,24 @@ async function runLock(platformArg, idArg, opts = {}, overrides = {}) {
 	const idLabel = platform === "ios" ? "udid" : "serial";
 	const deadline = d.now() + wait.seconds * 1e3;
 	const lastLine = { at: null };
-	const device = idArg ? resolveDevice(platform, idArg, d) : await poolDevice(platform, idLabel, wait.seconds, deadline, root, d, opts.slot);
+	const owned = idArg ? findOwnedVirtualDevice(d.getProject(root), platform, idArg, d.avdNameOf) : null;
+	if (owned && opts.slot && opts.slot !== owned.slot) return report({
+		code: "STIM_BAD_ARG",
+		message: `${owned.id} is this workspace's ${platform} device in slot ${owned.slot}, not ${opts.slot}.`,
+		remedy: `Run \`stim device lock ${platform} ${owned.id}\` without --slot, or with --slot ${owned.slot}.`
+	});
+	const held = owned ? d.io.readHolder(root)[deviceSlotKey(platform, owned.slot)] : void 0;
+	if (owned && held && held.id !== owned.id) return report({
+		code: "STIM_DEVICE_BUSY",
+		message: `This workspace already leases ${held.id} for ${platform} in slot ${owned.slot}, and a workspace holds one lease per platform and slot.`,
+		remedy: `Release it with \`stim device unlock ${platform}${owned.slot === "default" ? "" : ` --slot ${owned.slot}`}\` once nothing depends on it, then lock ${owned.id}.`
+	});
+	const slot = owned ? owned.slot === "default" ? void 0 : owned.slot : opts.slot;
+	const device = owned ? owned : idArg ? resolveDevice(platform, idArg, d) : await poolDevice(platform, idLabel, wait.seconds, deadline, root, d, opts.slot);
 	if (isFailure(device)) return report(device);
 	for (;;) {
 		const outcome = await d.waitForDevice({
-			...opts.slot ? { slot: opts.slot } : {},
+			...slot ? { slot } : {},
 			root,
 			platform,
 			id: device.id,
@@ -161,7 +199,7 @@ async function runLock(platformArg, idArg, opts = {}, overrides = {}) {
 			lease: outcome.refusal.lease
 		});
 		const taken = d.takeLease({
-			...opts.slot ? { slot: opts.slot } : {},
+			...slot ? { slot } : {},
 			root,
 			platform,
 			id: device.id,
@@ -236,7 +274,7 @@ 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", parseDeviceSlotOption).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, a connected device or this workspace's own simulator or emulator; without one, the first free connected device is used").description("Lease a connected physical device, or this workspace's own simulator or emulator, to this workspace for a declared time, so another workspace's `--device` run waits and agents see the device as driven. 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", parseDeviceSlotOption).option("--json", "print the released leases as JSON on stdout").action(async (platform, opts) => {

package/dist/{device-lease-CbEaIk7b.mjs → device-lease-B9LAXIUH.mjs}

@@ -1,13 +1,13 @@
-import { B as parseDeviceSlotKey, R as deviceSlotKey, W as validateDeviceSlot, k as ownership_claim_exports, u as getConfigDir } from "./config-BEq0Qw_a.mjs";
+import { A as ownership_claim_exports, G as validateDeviceSlot, V as parseDeviceSlotKey, d as getConfigDir, z as deviceSlotKey } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { r as register } from "./cache-manifest-Pubfp8wV.mjs";
-import { P as withDirLock, S as sharedBuildCache, _ as withWorkspaceStateLock, m as readWorkspaceState, p as clearWorkspaceStateKeys, y as writeWorkspaceState } from "./metro-BWLOJ_Wr.mjs";
-import { r as stopDeclaringSpawnsOn, t as declareSpawnsOn } from "./spawn-claims-CUleC2cM.mjs";
-import { a as formatElapsed, i as formatDuration, m as shortHash } from "./command-output-D5z2_bcF.mjs";
+import { r as register } from "./cache-manifest-DWPF4RKJ.mjs";
+import { P as withDirLock, S as sharedBuildCache, _ as withWorkspaceStateLock, m as readWorkspaceState, p as clearWorkspaceStateKeys, y as writeWorkspaceState } from "./metro-Dzo30hvJ.mjs";
+import { n as declareSpawnsOn, o as stopDeclaringSpawnsOn } from "./spawn-claims-PT8aQpCa.mjs";
+import { a as formatElapsed, i as formatDuration, m as shortHash } from "./command-output-BWCj5Vh-.mjs";
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { existsSync as existsSync$1, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, rmSync as rmSync$1, writeFileSync as writeFileSync$1 } from "fs";
 import { join } from "path";
-import { buildCacheKey, resolveArtifact, storeArtifact } from "@stim-cli/core";
+import { artifactIn, buildCacheKey, resolveArtifact, storeArtifact } from "@stim-cli/core";
 import { join as join$1 } from "node:path";
 import { createHash, randomBytes } from "node:crypto";
 import * as expoFingerprint from "@expo/fingerprint";
@@ -210,7 +210,7 @@ function storeBuild(platform, key, buildPath, rootOrOptions = {}) {
 		overwrite: Boolean(options.overwrite),
 		writeMetadata: (staging) => {
 			if (Array.isArray(options.sources)) try {
-				writeFileSync$1(join(staging, SOURCES_FILE), JSON.stringify(options.sources));
+				writeFileSync$1(join(staging, SOURCES_FILE), JSON.stringify(options.sources.map(withoutContents)));
 			} catch {}
 			if (options.assetManifest) try {
 				writeFileSync$1(join(staging, ASSET_MANIFEST_FILE), JSON.stringify(options.assetManifest));
@@ -274,6 +274,12 @@ function providerUploadOutcome(result, name) {
 	};
 }
 const SOURCES_FILE = "fingerprint-sources.json";
+function withoutContents(source) {
+	return source.type === "contents" ? {
+		...source,
+		contents: ""
+	} : source;
+}
 function storedSources(platform, key, root = sharedBuildCache()) {
 	try {
 		const parsed = JSON.parse(readFileSync$1(join(entryDir(platform, key, root), SOURCES_FILE), "utf-8"));
@@ -295,37 +301,54 @@ function sourceName(source) {
 	if (typeof s?.id === "string" && s.id !== "") return s.id;
 	return null;
 }
-function diffItemName(item) {
+function sourceReasons(source) {
+	const reasons = source?.reasons;
+	return Array.isArray(reasons) ? reasons.filter((reason) => typeof reason === "string") : [];
+}
+function diffItemChange(item) {
 	const o = item;
-	for (const candidate of [
-		o,
-		o?.addedSource,
-		o?.removedSource,
-		o?.afterSource,
-		o?.beforeSource
-	]) {
-		const name = sourceName(candidate);
-		if (name) return name;
-	}
-	return null;
+	const [change, source] = o?.op === "added" ? ["added", o.addedSource] : o?.op === "removed" ? ["removed", o.removedSource] : ["changed", o?.afterSource ?? o?.beforeSource];
+	const name = sourceName(source);
+	return name === null ? null : {
+		name,
+		change,
+		reasons: sourceReasons(source)
+	};
 }
 function compareSourceLists(previous, current) {
 	const previousByName = /* @__PURE__ */ new Map();
 	for (const source of previous) {
 		const name = sourceName(source);
-		if (name !== null) previousByName.set(name, source.hash ?? null);
+		if (name !== null) previousByName.set(name, {
+			hash: source.hash ?? null,
+			reasons: sourceReasons(source)
+		});
 	}
-	const changed = [];
+	const changes = [];
 	const seen = /* @__PURE__ */ new Set();
 	for (const source of current) {
 		const name = sourceName(source);
 		if (name === null || seen.has(name)) continue;
 		seen.add(name);
-		const hash = source.hash;
-		if (!previousByName.has(name) || previousByName.get(name) !== (hash ?? null)) changed.push(name);
+		const hash = source.hash ?? null;
+		const before = previousByName.get(name);
+		if (!before) changes.push({
+			name,
+			change: "added",
+			reasons: sourceReasons(source)
+		});
+		else if (before.hash !== hash) changes.push({
+			name,
+			change: "changed",
+			reasons: sourceReasons(source)
+		});
 	}
-	for (const [name] of previousByName) if (!seen.has(name)) changed.push(name);
-	return changed;
+	for (const [name, before] of previousByName) if (!seen.has(name)) changes.push({
+		name,
+		change: "removed",
+		reasons: before.reasons
+	});
+	return changes;
 }
 function diffFingerprintSources({ previous, previousHash = null, current, differ = null }) {
 	if (typeof differ === "function") try {
@@ -337,43 +360,20 @@ function diffFingerprintSources({ previous, previousHash = null, current, differ
 			hash: current.hash
 		});
 		if (Array.isArray(items)) {
-			const names = [];
+			const changes = [];
 			const seen = /* @__PURE__ */ new Set();
 			for (const item of items) {
-				const name = diffItemName(item);
-				if (name !== null && !seen.has(name)) {
-					seen.add(name);
-					names.push(name);
+				const change = diffItemChange(item);
+				if (change !== null && !seen.has(change.name)) {
+					seen.add(change.name);
+					changes.push(change);
 				}
 			}
-			return names;
+			return changes;
 		}
 	} catch {}
 	return compareSourceLists(previous, current.sources);
 }
-function fingerprintDiffSuffix(changed) {
-	if (!changed.length) return "";
-	const shown = changed.slice(0, 3).join(", ");
-	return ` -- ${changed.length} source${changed.length === 1 ? "" : "s"} changed: ${shown}`;
-}
-function describeFingerprintMiss({ platform, current, lastBuild, root = sharedBuildCache(), differ = expoFingerprint.diffFingerprints }) {
-	if (!lastBuild || lastBuild.platform !== platform) return null;
-	const previousHash = typeof lastBuild.fingerprint === "string" ? lastBuild.fingerprint : null;
-	const previousKey = typeof lastBuild.cacheKey === "string" ? lastBuild.cacheKey : null;
-	if (!previousHash || !previousKey || previousHash === current.hash) return null;
-	const previous = storedSources(platform, previousKey, root);
-	if (!previous) return null;
-	const changed = diffFingerprintSources({
-		previous,
-		previousHash,
-		current,
-		differ
-	});
-	return changed.length ? {
-		changed,
-		previousHash
-	} : null;
-}
 async function refingerprintAfterMutation({ projectRoot, platform, previousHash, fingerprint = fingerprintProject }) {
 	let computed = null;
 	try {
@@ -1055,4 +1055,4 @@ function withHolderLock(io, root, fn) {
 	return io.withHolderLock ? io.withHolderLock(root, fn) : fn();
 }
 //#endregion
-export { resolveBuild as A, fingerprintDiffRecord as C, providerDownloadPath as D, prepareProviderDownloadDir as E, assetDiffReason as F, captureAssetManifest as I, compareAssetManifests as L, storedAssetManifest as M, untrackedMissLine as N, providerUploadOutcome as O, untrackedNativeFiles as P, readAssetManifest as R, filesystemBuildCapability as S, fingerprintProject as T, waitForBuild as _, parseLease as a, describeFingerprintMiss as b, raiseLease as c, removeExpiredLease as d, selectPoolDevice as f, releaseBuildLock as g, listBuildLocks as h, listLeaseFiles as i, storeBuild as j, refingerprintAfterMutation as k, releaseRunLease as l, acquireBuildLock as m, fileLeaseIo as n, parseLeaseDuration as o, takeLease as p, leaseIsExpired as r, parseWorkspaceLeases as s, deviceLeasePath as t, releaseWorkspaceLeases as u, waitForSharedBuild as v, fingerprintDiffSuffix as w, diffFingerprintSources as x, buildCacheKey as y };
+export { resolveBuild as A, filesystemBuildCapability as C, providerDownloadPath as D, prepareProviderDownloadDir as E, untrackedNativeFiles as F, assetDiffReason as I, captureAssetManifest as L, storedAssetManifest as M, storedSources as N, providerUploadOutcome as O, untrackedMissLine as P, compareAssetManifests as R, entryDir as S, fingerprintProject as T, waitForBuild as _, parseLease as a, buildCacheKey as b, raiseLease as c, removeExpiredLease as d, selectPoolDevice as f, releaseBuildLock as g, listBuildLocks as h, listLeaseFiles as i, storeBuild as j, refingerprintAfterMutation as k, releaseRunLease as l, acquireBuildLock as m, fileLeaseIo as n, parseLeaseDuration as o, takeLease as p, leaseIsExpired as r, parseWorkspaceLeases as s, deviceLeasePath as t, releaseWorkspaceLeases as u, waitForSharedBuild as v, fingerprintDiffRecord as w, diffFingerprintSources as x, artifactIn as y, readAssetManifest as z };

package/dist/{device-pool-BBWLAr55.mjs → device-pool-BoezJd-c.mjs}

@@ -1,7 +1,7 @@
-import { R as deviceSlotKey } from "./config-BEq0Qw_a.mjs";
-import { a as formatElapsed, r as clockTime } from "./command-output-D5z2_bcF.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-CbEaIk7b.mjs";
-import { a as VERIFY_TIMEOUT_MS, p as APP_READINESS_TIMEOUT_MS } from "./launch-verify-BhgkYAws.mjs";
+import { z as deviceSlotKey } from "./config-0jCcMM0E.mjs";
+import { a as formatElapsed, r as clockTime } from "./command-output-BWCj5Vh-.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-B9LAXIUH.mjs";
+import { a as VERIFY_TIMEOUT_MS, p as APP_READINESS_TIMEOUT_MS } from "./launch-verify-B2oR_kFN.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;