stim 1.16.0 → 1.17.1

package/dist/{idle-DYVymG92.mjs → build-progress-D0WkjCPd.mjs}

@@ -1,62 +1,10 @@
-import { t as getExecutor } from "./exec-CaErVv7t.mjs";
-import { D as withConfigLock$1, H as projectDeviceSlots } from "./config-D0DbpZtM.mjs";
+import { D as withConfigLock$1 } from "./config-D0DbpZtM.mjs";
 import { n as ownership_claim_exports } from "./process-identity-BmRm1qV0.mjs";
-import { a as formatElapsed, o as formatLongDuration, u as plural } from "./command-output-DnJMdEY-.mjs";
-import { a as updateWorkspaceState, r as readWorkspaceState$1, t as clearWorkspaceStateKey } from "./workspace-state-B8-aJ1_5.mjs";
-import { i as recordGcResult } from "./in-use-DvBw0Kxo.mjs";
-import { o as idleForMs, r as createActivityReader } from "./activity-BxwdD81S.mjs";
-import { z as ownedAvdSerialResolver } from "./android-B_NumVyQ.mjs";
-import { i as teardownOwnedAvd, o as teardownOwnedIosSim } from "./teardown-CL6vDs2Y.mjs";
+import { a as formatElapsed, u as plural } from "./command-output-CDAIFD-8.mjs";
+import { a as updateWorkspaceState, t as clearWorkspaceStateKey } from "./workspace-state-DqcCbpE7.mjs";
 import { mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
-import { BUILD_HISTORY_KEY, BUILD_HISTORY_LIMIT, BUILD_PHASES, LAST_BUILD_KEYS, STATS_VERSION, decodeStats, parseMissReason, readRunEstimates, readStats as readStats$1, statsFile, statsProjectKey as statsProjectKey$1, trimSamples, wholePhases, workspaceBuildDetailFile } from "@stim-cli/core/state";
-import chalk from "chalk";
-//#region src/watchman.ts
-/** Runs one watchman command with `--no-spawn`, so Stim never starts a daemon, and parses its JSON answer. */
-const runWatchman = async (args, timeoutMs) => JSON.parse(await getExecutor().runFileAsync("watchman", ["--no-spawn", ...args], { timeoutMs }));
-function parseWatchRoots(payload) {
-	const roots = payload?.roots;
-	if (!Array.isArray(roots)) return null;
-	return roots.filter((root) => typeof root === "string");
-}
-function parseSubscriberNames(payload) {
-	if (!payload || typeof payload !== "object" || "error" in payload) return null;
-	const subscribers = payload.subscribers;
-	if (subscribers === void 0) return [];
-	if (!Array.isArray(subscribers)) return null;
-	const names = [];
-	for (const subscriber of subscribers) {
-		const name = subscriber?.info?.name;
-		if (typeof name !== "string") return null;
-		names.push(name);
-	}
-	return names;
-}
-function parseTriggerCount(payload) {
-	const triggers = payload?.triggers;
-	return Array.isArray(triggers) ? triggers.length : null;
-}
-function parseWatchmanPid(payload) {
-	const pid = payload?.pid;
-	return typeof pid === "number" && Number.isInteger(pid) && pid > 0 ? pid : null;
-}
-/** The connected clients in a `debug-status` answer, or null when the answer does not list them. */
-function parseWatchmanClients(payload) {
-	if (!payload || typeof payload !== "object" || "error" in payload) return null;
-	const clients = payload.clients;
-	if (!Array.isArray(clients)) return null;
-	const parsed = [];
-	for (const client of clients) {
-		const peer = client?.peer;
-		if (typeof peer?.pid !== "number") return null;
-		parsed.push({
-			pid: peer.pid,
-			name: typeof peer.name === "string" ? peer.name : null
-		});
-	}
-	return parsed;
-}
-//#endregion
+import { BUILD_HISTORY_KEY, BUILD_HISTORY_LIMIT, BUILD_PHASES, LAST_BUILD_KEYS, STATS_VERSION, decodeStats, isJsonObject, parseMissReason, readRunEstimates, readStats as readStats$1, statsFile, statsProjectKey as statsProjectKey$1, trimCapacityRefusals, trimCapacityWaits, trimSamples, wholePhases, workspaceBuildDetailFile } from "@stim-cli/core/state";
 //#region src/engine/stats.ts
 const PLACEMENT_MAX_AGE_MS = 6048e5;
 function emptyStats() {
@@ -116,12 +64,16 @@ function updateStats(record, run, now) {
 			[placement.machine]: applyPlacement(buildMachines?.[placement.machine], placement)
 		};
 	}
+	const capacityRefusals = trimCapacityRefusals(record.capacityRefusals ?? [], now);
+	const capacityWaits = trimCapacityWaits(record.capacityWaits ?? [], now);
 	return {
 		version: STATS_VERSION,
 		machine,
 		projects,
 		...Object.keys(history).length ? { history } : {},
 		...placements?.length ? { placements } : {},
+		...capacityRefusals.length ? { capacityRefusals } : {},
+		...capacityWaits.length ? { capacityWaits } : {},
 		...buildMachines && Object.keys(buildMachines).length ? { buildMachines } : {}
 	};
 }
@@ -130,6 +82,7 @@ function buildPlacement(run, before, at) {
 	const buildMs = wholeMs(placement.decision === "offloaded" ? placement.buildMs : run.coldBuildMs);
 	const localEstimateMs = wholeMs(before?.lastColdBuildMs);
 	const slotWaitMs = wholeMs(placement.slotWaitMs);
+	const deviceSlotWaitMs = wholeMs(placement.deviceSlotWaitMs);
 	return {
 		at,
 		project: run.projectKey,
@@ -139,6 +92,7 @@ function buildPlacement(run, before, at) {
 		...placement.machine ? { machine: placement.machine } : {},
 		...buildMs > 0 ? { buildMs } : {},
 		...slotWaitMs > 0 ? { slotWaitMs } : {},
+		...deviceSlotWaitMs > 0 ? { deviceSlotWaitMs } : {},
 		...localEstimateMs > 0 ? { localEstimateMs } : {},
 		...run.failed ? { failed: true } : {}
 	};
@@ -179,12 +133,53 @@ function recordRunStats(run, now) {
 		};
 	});
 }
+function recordCapacityRefusal(event, now) {
+	try {
+		withConfigLock$1(() => {
+			const path = statsFile();
+			const loaded = loadForUpdate(path, now, false);
+			if (!loaded.record || loaded.newerVersion !== null) return;
+			const capacityRefusals = trimCapacityRefusals([...loaded.record.capacityRefusals ?? [], {
+				...event,
+				at: new Date(now).toISOString(),
+				kind: "device"
+			}], now);
+			writeStats(path, {
+				...loaded.record,
+				capacityRefusals
+			});
+		});
+	} catch {}
+}
+function recordCapacityWait(event, now) {
+	try {
+		withConfigLock$1(() => {
+			const path = statsFile();
+			const loaded = loadForUpdate(path, now, false);
+			if (!loaded.record || loaded.newerVersion !== null) return;
+			const capacityWaits = trimCapacityWaits([...loaded.record.capacityWaits ?? [], {
+				platform: event.platform,
+				max: event.max,
+				workspace: event.workspace,
+				ms: wholeMs(event.ms),
+				...event.reclaimed && Number.isInteger(event.reclaimed) && event.reclaimed > 0 ? { reclaimed: event.reclaimed } : {},
+				at: new Date(now).toISOString(),
+				kind: "device-wait"
+			}], now);
+			writeStats(path, {
+				...loaded.record,
+				capacityWaits
+			});
+		});
+	} catch {}
+}
 function createRunRecorder({ platform, write, now, note, phases, deviceSetup }) {
 	let projectKey = null;
 	let cacheKey = null;
 	let coldBuildMs = 0;
 	let podsMs = 0;
 	let placement = null;
+	let deviceSlotWaitMs = 0;
 	let recorded = false;
 	return {
 		setProject(key) {
@@ -199,6 +194,12 @@ function createRunRecorder({ platform, write, now, note, phases, deviceSetup })
 		setPodsMs(ms) {
 			podsMs = wholeMs(ms);
 		},
+		addDeviceSlotWaitMs(ms) {
+			deviceSlotWaitMs += wholeMs(ms);
+		},
+		deviceSlotWaitMs() {
+			return deviceSlotWaitMs || void 0;
+		},
 		setPlacement(next) {
 			placement = next;
 		},
@@ -219,7 +220,10 @@ function createRunRecorder({ platform, write, now, note, phases, deviceSetup })
 					...podsMs > 0 ? { podsMs } : {},
 					...Object.keys(ran).length ? { phases: ran } : {},
 					...failed || deviceSetup?.() === void 0 ? {} : { deviceSetup: deviceSetup() },
-					...placement ? { placement } : {}
+					...placement ? { placement: {
+						...placement,
+						...deviceSlotWaitMs > 0 ? { deviceSlotWaitMs } : {}
+					} } : {}
 				}, now());
 				if (outcome?.note) note(outcome.note);
 			} catch (error) {
@@ -228,7 +232,7 @@ function createRunRecorder({ platform, write, now, note, phases, deviceSetup })
 		}
 	};
 }
-function loadForUpdate(path, now) {
+function loadForUpdate(path, now, recoverCorrupt = true) {
 	let text;
 	try {
 		text = readFileSync(path, "utf-8");
@@ -241,6 +245,11 @@ function loadForUpdate(path, now) {
 	}
 	const parsed = decodeStats(text);
 	if (!parsed.record && parsed.newerVersion === null) {
+		if (!recoverCorrupt) return {
+			record: null,
+			note: null,
+			newerVersion: null
+		};
 		const aside = `${path}.corrupt-${now}`;
 		renameSync(path, aside);
 		return {
@@ -337,6 +346,13 @@ const GRADLE_TASK = /^> Task (:\S+)/;
 */
 const XCODE_TARGET_DONE = /^(Touch|RegisterExecutionPolicyException|CodeSign)$/;
 const GRADLE_CONFIGURE = /^> Configure project /;
+/**
+* SwiftPM prints `[done / total] name` once it plans the build (with U+2009 thin spaces around the slash in Swift 6.4
+* output), `[done/total] Compiling ...` in older toolchains; Swift 6.4 names the target being worked on, and
+* `<product>-product` is the link of a product.
+*/
+const SWIFTPM_PROGRESS = /^\[(\d+)\s*\/\s*(\d+)\](?:\s+(.*))?$/;
+const SWIFTPM_CONFIGURE = /^(Fetching|Fetched|Computing version|Computed|Creating working copy|Working copy of)\b|^\[(Pre-planning|Planning|Using on-disk description)/;
 const XCODE_STEPS = [
 	[/^(CpResource|CopyPNGFile|CopyStringsFile|CompileAssetCatalog\w*|CompileStoryboard|CompileXIB|LinkStoryboards|ProcessInfoPlistFile)$/, "resources"],
 	[/^(Compile\w*|Swift\w*|ScanDependencies|Precompile\w*)$/, "compile"],
@@ -374,8 +390,23 @@ function shortXcodeAction(action, args, target) {
 	const subject = action === "PhaseScriptExecution" ? unescape(tokens[0] ?? "") : baseName(unescape(tokens.findLast((token) => token.startsWith("/")) ?? ""));
 	return clip(`${action}${subject ? ` ${subject}` : ""} (${target})`);
 }
-/** What one line of xcodebuild or Gradle output says about the build's progress, or null for any other line. */
+function swiftpmStep(text) {
+	return /^Linking\b|-product$/.test(text) ? "link" : "compile";
+}
+/** What one line of xcodebuild, Gradle or SwiftPM output says about the build's progress, or null for any other line. */
 function parseBuildToolLine(msg) {
+	const counted = SWIFTPM_PROGRESS.exec(msg);
+	if (counted) {
+		const text = counted[3]?.trim() ?? "";
+		return {
+			kind: "count",
+			done: Number(counted[1]),
+			total: Number(counted[2]),
+			step: swiftpmStep(text),
+			line: text ? clip(text) : null
+		};
+	}
+	if (SWIFTPM_CONFIGURE.test(msg)) return { kind: "configure" };
 	const graph = TARGET_GRAPH.exec(msg);
 	if (graph) return {
 		kind: "total",
@@ -412,7 +443,8 @@ function parseBuildToolLine(msg) {
 }
 /**
 * Accumulates a build's tool output into its detail: xcodebuild counts the distinct targets it finished against the
-* total its dependency graph note gives; Gradle counts the task lines it printed and has no total.
+* total its dependency graph note gives; Gradle counts the task lines it printed and has no total; SwiftPM reports
+* its own `[done / total]` counts, which the parser passes through.
 */
 function createBuildDetailParser() {
 	let seen = false;
@@ -421,6 +453,7 @@ function createBuildDetailParser() {
 	let total = null;
 	let line = null;
 	let tasks = 0;
+	let counted = null;
 	const targets = /* @__PURE__ */ new Set();
 	return {
 		push(msg) {
@@ -436,6 +469,16 @@ function createBuildDetailParser() {
 				step = "configure";
 				return true;
 			}
+			if (parsed.kind === "count") {
+				unit = "steps";
+				counted = {
+					done: parsed.done,
+					total: parsed.total
+				};
+				step = parsed.step;
+				if (parsed.line) line = parsed.line;
+				return true;
+			}
 			unit = parsed.unit;
 			if (parsed.unit === "tasks") tasks += 1;
 			else if (parsed.finished) targets.add(parsed.id);
@@ -445,6 +488,14 @@ function createBuildDetailParser() {
 		},
 		detail(updatedAt) {
 			if (!seen) return null;
+			if (unit === "steps" && counted) return {
+				step,
+				unit,
+				done: Math.min(counted.done, counted.total),
+				total: counted.total,
+				line,
+				updatedAt
+			};
 			const done = unit === "tasks" ? tasks : unit === "targets" ? targets.size : null;
 			return {
 				step,
@@ -469,6 +520,7 @@ const NO_BUILD_PROGRESS = {
 	deviceSetupKnown: () => void 0,
 	place: () => {},
 	waitingOn: () => {},
+	waitingFor: () => {},
 	output: () => {},
 	durations: () => ({}),
 	clear: () => {}
@@ -576,8 +628,9 @@ function startBuildProgress({ root, platform, slot, claim, now = Date.now, note
 	};
 	const settle = (outcome) => {
 		record.outcome = outcome;
-		if (projectKey) record.estimate = estimateBuild(projectHistory(projectKey), platform, outcome, record.deviceSetup);
+		if (projectKey && platform !== "macos") record.estimate = estimateBuild(projectHistory(projectKey), platform, outcome, record.deviceSetup);
 	};
+	const waits = /* @__PURE__ */ new Map();
 	return {
 		step(phase) {
 			if (phase === record.phase) return;
@@ -589,11 +642,12 @@ function startBuildProgress({ root, platform, slot, claim, now = Date.now, note
 				startedAt: at
 			});
 			if (phase !== "wait") delete record.waitingOn;
-			const outcome = record.outcome ? null : settledOutcome(phase, record.phases);
+			const outcome = record.outcome || platform === "macos" ? null : settledOutcome(phase, record.phases);
 			if (outcome) settle(outcome);
 			write();
 		},
 		estimate(key) {
+			if (platform === "macos") return;
 			projectKey = key;
 			record.estimate = estimateBuild(projectHistory(key), platform, record.outcome ?? null, record.outcome ? record.deviceSetup : void 0);
 			write();
@@ -636,6 +690,15 @@ function startBuildProgress({ root, platform, slot, claim, now = Date.now, note
 			};
 			write();
 		},
+		waitingFor(info, kind) {
+			if (info) waits.set(info.kind, info);
+			else if (kind) waits.delete(kind);
+			else waits.clear();
+			const first = [...waits.values()].toSorted((a, b) => Date.parse(a.since) - Date.parse(b.since))[0];
+			if (first) record.waitingFor = first;
+			else delete record.waitingFor;
+			write();
+		},
 		waitingOn(holder) {
 			if (holder === null) {
 				if (!record.waitingOn) return;
@@ -684,6 +747,7 @@ function completedPhaseDurations(phases) {
 	return Object.keys(durations).length ? durations : void 0;
 }
 const HISTORY_FIELDS = [
+	"devicePlacement",
 	"platform",
 	"status",
 	"configuration",
@@ -728,6 +792,29 @@ function recordFinishedBuild(root, record, { update = updateWorkspaceState, now
 			slot: own?.slot ?? "default",
 			phases: own ? phaseDurations(own.phases, now()) : {}
 		};
+		const slot = own?.slot ?? "default";
+		const slots = isJsonObject(state.deviceSlots) ? state.deviceSlots : {};
+		const savedSlot = isJsonObject(slots[slot]) ? slots[slot] : {};
+		const savedDevice = slot === "default" ? state[platform] : savedSlot[platform];
+		if (platform !== "macos" && (record.devicePlacement || isJsonObject(savedDevice))) {
+			const device = isJsonObject(savedDevice) ? { ...savedDevice } : {};
+			if (record.devicePlacement) device.devicePlacement = record.devicePlacement;
+			else delete device.devicePlacement;
+			state = slot === "default" ? {
+				...state,
+				[platform]: device
+			} : {
+				...state,
+				deviceSlots: {
+					...slots,
+					[slot]: {
+						...savedSlot,
+						[platform]: device
+					}
+				}
+			};
+		}
+		if (platform === "macos") return withHistoryEntry(state, platform, entry);
 		return withHistoryEntry({
 			...state,
 			lastBuild: record,
@@ -738,7 +825,7 @@ function recordFinishedBuild(root, record, { update = updateWorkspaceState, now
 function withInterruptedBuild(state) {
 	const left = parseActiveBuild(state[ACTIVE_BUILD_KEY]);
 	if (!left) return state;
-	const last = state[LAST_BUILD_KEYS[left.platform]];
+	const last = left.platform === "macos" ? state[BUILD_HISTORY_KEY]?.macos?.[0] : state[LAST_BUILD_KEYS[left.platform]];
 	if (Date.parse(String(last?.startedAt)) >= Date.parse(left.startedAt)) return state;
 	return withHistoryEntry(state, left.platform, {
 		platform: left.platform,
@@ -762,7 +849,7 @@ 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 (record.platform !== "ios" && record.platform !== "android" && record.platform !== "macos") 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;
@@ -770,6 +857,7 @@ function parseActiveBuild(value) {
 	const missReason = parseMissReason(record.missReason);
 	const placement = parsePlacement(record.placement);
 	const waitingOn = parseWaitingOn(record.waitingOn);
+	const waitingFor = parseWaitingFor(record.waitingFor);
 	const estimate = parseEstimate(record.estimate);
 	return {
 		platform: record.platform,
@@ -782,6 +870,7 @@ function parseActiveBuild(value) {
 		...missReason && record.missProvisional === true ? { missProvisional: true } : {},
 		...placement ? { placement } : {},
 		...waitingOn ? { waitingOn } : {},
+		...waitingFor ? { waitingFor } : {},
 		...typeof record.deviceSetup === "boolean" ? { deviceSetup: record.deviceSetup } : {},
 		...record.outcome === "hit" || record.outcome === "cold" ? { outcome: record.outcome } : {},
 		...estimate ? { estimate } : {},
@@ -809,6 +898,19 @@ function parsePlacement(value) {
 		phaseStartedAt
 	};
 }
+function parseWaitingFor(value) {
+	if (!value || typeof value !== "object") return null;
+	const { kind, inUse, max, since } = value;
+	if (kind !== "build-slot" && kind !== "device-slot") return null;
+	if (!Number.isInteger(inUse) || inUse < 0 || !Number.isInteger(max) || max <= 0) return null;
+	if (typeof since !== "string" || !Number.isFinite(Date.parse(since))) return null;
+	return {
+		kind,
+		inUse,
+		max,
+		since
+	};
+}
 function parseWaitingOn(value) {
 	const path = value?.path;
 	return typeof path === "string" && path ? { path } : null;
@@ -843,7 +945,7 @@ function median(values) {
 	return sorted.length % 2 ? sorted[mid] : Math.round((sorted[mid - 1] + sorted[mid]) / 2);
 }
 function estimateBuild(history, platform, known, deviceSetup) {
-	const lists = history?.[platform];
+	const lists = platform === "macos" ? void 0 : history?.[platform];
 	const outcome = known ?? latestOutcome(lists);
 	const samples = matchDeviceSetup(outcome && lists?.[outcome] || [], deviceSetup);
 	const phaseMs = {};
@@ -910,7 +1012,8 @@ function buildReport(record, { state, history }) {
 		...record.missReason ? { missReason: record.missReason } : {},
 		...record.missReason && record.missProvisional ? { missProvisional: true } : {},
 		placement: record.placement ?? "local",
-		...record.waitingOn ? { waitingOn: record.waitingOn } : {}
+		...record.waitingOn ? { waitingOn: record.waitingOn } : {},
+		...record.waitingFor ? { waitingFor: record.waitingFor } : {}
 	};
 }
 function remainingText(remainingMs) {
@@ -930,170 +1033,4 @@ function buildStatusLine(report, now) {
 	return remainingMs > 0 ? `${head} -- ${remainingText(remainingMs)} (${basis})` : `${head} (usually ~${formatElapsed(report.expectedMs)}, ${basis})`;
 }
 //#endregion
-//#region src/commands/gc/idle.ts
-function findOwnedDeviceActivity({ config, sims, androidSerial, readActivity, deadProjects = [] }) {
-	const booted = new Map(sims.filter((sim) => sim.state === "Booted").map((sim) => [sim.udid, sim.name]));
-	const dead = new Set(deadProjects);
-	const found = [];
-	for (const [project, record] of Object.entries(config?.projects ?? {})) {
-		if (dead.has(project)) continue;
-		for (const { slot, platforms } of projectDeviceSlots(record)) {
-			const ios = platforms.ios;
-			if (ios?.owned && ios.deviceUdid && booted.has(ios.deviceUdid)) found.push({
-				kind: "ios",
-				id: ios.deviceUdid,
-				name: booted.get(ios.deviceUdid) ?? ios.deviceUdid,
-				project,
-				slot,
-				activity: readActivity({
-					platform: "ios",
-					id: ios.deviceUdid,
-					slot,
-					workspace: project
-				})
-			});
-			const android = platforms.android;
-			const serial = android?.owned && android.avdName ? androidSerial(android.avdName) : null;
-			if (android?.avdName && serial) found.push({
-				kind: "android",
-				id: android.avdName,
-				name: android.avdName,
-				project,
-				slot,
-				activity: readActivity({
-					platform: "android",
-					id: serial,
-					slot,
-					workspace: project
-				})
-			});
-		}
-	}
-	return found;
-}
-function findIdleDevices({ buildInProgress, now, ...inputs }) {
-	return findOwnedDeviceActivity(inputs).filter((device) => device.activity.state === "idle").map(({ kind, id, name, project, slot, activity }) => ({
-		kind,
-		id,
-		name,
-		project,
-		slot,
-		lastActivityAt: activity.lastActivityAt ?? null,
-		idleForMs: idleForMs(activity, now),
-		buildInProgress: buildInProgress(project)
-	}));
-}
-function idleShutdownCandidates(devices, idleMs) {
-	return devices.filter((d) => !d.buildInProgress && d.idleForMs !== null && d.idleForMs >= idleMs);
-}
-function parseIdleDuration(value) {
-	const match = /^([1-9][0-9]*)(m|h|d)$/.exec(value.trim());
-	if (!match) return null;
-	const unit = {
-		m: 6e4,
-		h: 36e5,
-		d: 864e5
-	}[match[2]];
-	return Number(match[1]) * unit;
-}
-function workspaceBuildInProgress(project) {
-	const record = parseActiveBuild(readWorkspaceState$1(project)?.[ACTIVE_BUILD_KEY]);
-	if (!record) return false;
-	try {
-		return activeBuildState(record.claim) !== "stale";
-	} catch {
-		return true;
-	}
-}
-function deviceActivityInputs(config, sims, now) {
-	const resolve = ownedAvdSerialResolver({ timeoutMs: 5e3 });
-	return {
-		config,
-		sims,
-		readActivity: createActivityReader({ now }),
-		androidSerial: (avdName) => {
-			try {
-				return resolve(avdName).serial ?? null;
-			} catch {
-				return null;
-			}
-		}
-	};
-}
-function collectOwnedDeviceActivity(config, sims, now = Date.now()) {
-	return findOwnedDeviceActivity(deviceActivityInputs(config, sims, now));
-}
-function collectIdleDevices(config, sims, deadProjects, now = Date.now()) {
-	return findIdleDevices({
-		...deviceActivityInputs(config, sims, now),
-		deadProjects,
-		now,
-		buildInProgress: workspaceBuildInProgress
-	});
-}
-function idleDeviceLines(devices) {
-	if (devices.length === 0) return [];
-	return [`Idle owned devices (${devices.length}) - booted with no driver, claim, or recent activity:`, ...devices.map((d) => {
-		const slot = d.slot === "default" ? "" : ` [${d.slot}]`;
-		const idle = d.idleForMs === null ? "idle for an unknown time" : `idle ${formatLongDuration(d.idleForMs)}`;
-		const build = d.buildInProgress ? ", build in progress" : "";
-		return `  ${d.kind}${slot} ${d.name} (${d.project}) -- ${idle}${build}`;
-	})];
-}
-function shutDownIdleDevices(devices, idleMs, recollect) {
-	const candidates = idleShutdownCandidates(devices, idleMs);
-	const shutDown = [];
-	if (candidates.length === 0) {
-		console.log(chalk.dim(`No owned device has been idle for ${formatLongDuration(idleMs)} or more.`));
-		return {
-			failures: 0,
-			shutDown
-		};
-	}
-	const fresh = idleShutdownCandidates(recollect(), idleMs);
-	let failures = 0;
-	for (const device of candidates) {
-		const what = `${device.kind} ${device.name}`;
-		const current = fresh.find((d) => d.kind === device.kind && d.id === device.id && d.project === device.project && d.slot === device.slot);
-		if (!current) {
-			console.log(chalk.dim(`Kept ${what}: it is no longer idle for ${formatLongDuration(idleMs)}.`));
-			recordGcResult("idleDevice", "kept", device.name, {
-				id: device.id,
-				detail: `it is no longer idle for ${formatLongDuration(idleMs)}`
-			});
-			continue;
-		}
-		const outcome = device.kind === "ios" ? teardownOwnedIosSim(device.id, { label: device.name }) : teardownOwnedAvd(device.id, { owner: {
-			projectPath: device.project,
-			slot: device.slot
-		} });
-		if (outcome.status === "torn-down") {
-			shutDown.push(device);
-			console.log(chalk.green(`Shut down ${what}, idle ${formatLongDuration(current.idleForMs)}`));
-			recordGcResult("idleDevice", "done", device.name, {
-				id: device.id,
-				detail: `idle ${formatLongDuration(current.idleForMs)}`
-			});
-		} else if (outcome.status === "missing") console.log(chalk.dim(`${what} is already gone; nothing to shut down.`));
-		else if (outcome.status === "skipped") {
-			console.log(chalk.yellow(`Skipped ${what}: ${outcome.reason}`));
-			recordGcResult("idleDevice", "kept", device.name, {
-				id: device.id,
-				detail: outcome.reason
-			});
-		} else {
-			failures++;
-			console.log(chalk.red(`Failed to shut down ${what}: ${outcome.reason}`));
-			recordGcResult("idleDevice", "failed", device.name, {
-				id: device.id,
-				detail: outcome.reason
-			});
-		}
-	}
-	return {
-		failures,
-		shutDown
-	};
-}
-//#endregion
-export { parseSubscriberNames as C, parseWatchmanPid as D, parseWatchmanClients as E, runWatchman as O, statsProjectKey$1 as S, parseWatchRoots as T, tapBuildLog as _, parseIdleDuration as a, readStats$1 as b, ACTIVE_BUILD_KEY as c, buildReport as d, buildStatusLine as f, startBuildProgress as g, recordFinishedBuild as h, idleShutdownCandidates as i, NO_BUILD_PROGRESS as l, parseActiveBuild as m, collectOwnedDeviceActivity as n, shutDownIdleDevices as o, estimateBuild as p, idleDeviceLines as r, workspaceBuildInProgress as s, collectIdleDevices as t, activeBuildState as u, createRunRecorder as v, parseTriggerCount as w, recordRunStats as x, readRunEstimates as y };
+export { statsProjectKey$1 as _, buildStatusLine as a, recordFinishedBuild as c, createRunRecorder as d, readRunEstimates as f, recordRunStats as g, recordCapacityWait as h, buildReport as i, startBuildProgress as l, recordCapacityRefusal as m, NO_BUILD_PROGRESS as n, estimateBuild as o, readStats$1 as p, activeBuildState as r, parseActiveBuild as s, ACTIVE_BUILD_KEY as t, tapBuildLog as u };

package/dist/{build-slots-rUk77xqh.mjs → build-slots-41v_d2x9.mjs}

@@ -1,5 +1,5 @@
 import { n as ownership_claim_exports } from "./process-identity-BmRm1qV0.mjs";
-import { a as formatElapsed } from "./command-output-DnJMdEY-.mjs";
+import { a as formatElapsed } from "./command-output-CDAIFD-8.mjs";
 import { n as declareSpawnsOn, o as stopDeclaringSpawnsOn } from "./spawn-claims-D0XfSe8u.mjs";
 import { readdirSync, statSync } from "node:fs";
 import { join } from "node:path";
@@ -53,7 +53,7 @@ function tryAcquireBuildSlot({ max, root = null, logFile = null }) {
 function slotWaitingLine({ max, elapsedMs }) {
 	return `${"build".padEnd(11)} waiting for a build slot (all ${max} in use, ${formatElapsed(elapsedMs)} elapsed) -- stim guide lifecycle concurrency`;
 }
-async function acquireBuildSlot({ max, root = null, logFile = null, now = Date.now, out = () => {}, sleep = sleepAsync, intervalMs = SLOT_POLL_MS, progressMs = SLOT_PROGRESS_MS, ceilingMs = SLOT_CEILING_MS }) {
+async function acquireBuildSlot({ max, root = null, logFile = null, now = Date.now, out = () => {}, waitingFor = () => {}, sleep = sleepAsync, intervalMs = SLOT_POLL_MS, progressMs = SLOT_PROGRESS_MS, ceilingMs = SLOT_CEILING_MS }) {
 	if (!max || max <= 0) return {
 		acquired: true,
 		unlimited: true
@@ -61,31 +61,41 @@ async function acquireBuildSlot({ max, root = null, logFile = null, now = Date.n
 	const started = now();
 	let lastProgress = started;
 	let waited = false;
-	for (;;) {
-		const got = tryAcquireBuildSlot({
-			max,
-			root,
-			logFile
-		});
-		if (got) return {
-			...got,
-			slotWaitMs: waited ? Math.max(0, Math.round(now() - started)) : 0
-		};
-		waited = true;
-		const elapsed = now() - started;
-		if (elapsed >= ceilingMs) {
-			const err = /* @__PURE__ */ new Error(`Waited ${formatElapsed(elapsed)} for one of ${max} build slots, and every slot is held by a process that is still running, or by a holder Stim cannot identify. Slots live under ` + buildSlotsDir() + "; remove a slot directory whose builder is not really building, or raise concurrency.maxBuilds.");
-			err.code = "STIM_BUILD_SLOT_TIMEOUT";
-			throw err;
-		}
-		if (now() - lastProgress >= progressMs) {
-			lastProgress = now();
-			out(slotWaitingLine({
+	try {
+		for (;;) {
+			const got = tryAcquireBuildSlot({
+				max,
+				root,
+				logFile
+			});
+			if (got) return {
+				...got,
+				slotWaitMs: waited ? Math.max(0, Math.round(now() - started)) : 0
+			};
+			waited = true;
+			waitingFor({
+				kind: "build-slot",
+				inUse: max,
 				max,
-				elapsedMs: elapsed
-			}));
+				since: new Date(started).toISOString()
+			});
+			const elapsed = now() - started;
+			if (elapsed >= ceilingMs) {
+				const err = /* @__PURE__ */ new Error(`Waited ${formatElapsed(elapsed)} for one of ${max} build slots, and every slot is held by a process that is still running, or by a holder Stim cannot identify. Slots live under ` + buildSlotsDir() + "; remove a slot directory whose builder is not really building, or raise concurrency.maxBuilds.");
+				err.code = "STIM_BUILD_SLOT_TIMEOUT";
+				throw err;
+			}
+			if (now() - lastProgress >= progressMs) {
+				lastProgress = now();
+				out(slotWaitingLine({
+					max,
+					elapsedMs: elapsed
+				}));
+			}
+			await sleep(intervalMs);
 		}
-		await sleep(intervalMs);
+	} finally {
+		waitingFor(null);
 	}
 }
 function releaseBuildSlot(handle) {