stim 1.2.0 → 1.3.0

package/dist/{ios-D1h1Di39.mjs → ios-Deh5js5V.mjs}

@@ -87,25 +87,22 @@ const BOOT_STATE_LIST_TIMEOUT_MS = 3e4;
 function iosSimulatorFailureAdvice(exec = getExecutor()) {
 	return hostMemoryPressureAdvice(readHostMemoryPressure(exec)) ?? "The simulator may be unresponsive. Check Activity Monitor for memory pressure and free host memory before retrying.";
 }
-function bootstatusTimeout(udid) {
-	const e = /* @__PURE__ */ new Error(`xcrun simctl bootstatus ${udid} -b timed out`);
+function bootstatusTimeout(command) {
+	const e = /* @__PURE__ */ new Error(`${command} timed out`);
 	e.code = "ETIMEDOUT";
 	return e;
 }
-async function awaitBootstatus(udid, attemptMs) {
+async function awaitBootCommand(args, attemptMs, onLine) {
+	const command = `xcrun ${args.join(" ")}`;
 	const lines = [];
 	const reader = createLineReader((raw) => {
 		const line = stripAnsi(raw).trim();
 		if (!line) return;
+		onLine(line);
 		lines.push(line);
 		if (lines.length > 10) lines.shift();
 	});
-	const child = getExecutor().spawn("xcrun", [
-		"simctl",
-		"bootstatus",
-		udid,
-		"-b"
-	], { stdio: [
+	const child = getExecutor().spawn("xcrun", args, { stdio: [
 		"ignore",
 		"pipe",
 		"pipe"
@@ -132,48 +129,89 @@ async function awaitBootstatus(udid, attemptMs) {
 			child.stdout?.destroy?.();
 			child.stderr?.destroy?.();
 			child.unref();
-			throw new Error(`Timed out waiting for simctl bootstatus ${udid}; its process could not be confirmed stopped. Inspect pid ${child.pid ?? "unknown"} before retrying.`);
+			throw new Error(`Timed out waiting for ${command}; its process could not be confirmed stopped. Inspect pid ${child.pid ?? "unknown"} before retrying.`);
 		}
-		throw bootstatusTimeout(udid);
+		throw bootstatusTimeout(command);
 	}
 	if (result.error) throw result.error;
 	if (result.code === 0) return;
 	const detail = lines.length ? `: ${lines.join(" | ")}` : "";
-	throw new Error(`xcrun simctl bootstatus ${udid} -b failed with exit code ${result.code ?? "unknown"}${detail}`);
+	throw new Error(`${command} failed with exit code ${result.code ?? "unknown"}${detail}`);
 }
-async function bootIosSim(udid, { timeoutMs = IOS_BOOT_TIMEOUT_MS, attemptMs = BOOTSTATUS_ATTEMPT_MS } = {}) {
+async function bootIosSim(udid, { timeoutMs = IOS_BOOT_TIMEOUT_MS, attemptMs = BOOTSTATUS_ATTEMPT_MS, label = udid, out = () => {} } = {}) {
 	const exec = getExecutor();
-	const deadline = Date.now() + timeoutMs;
+	const started = Date.now();
+	const deadline = started + timeoutMs;
+	let worst = null;
+	let unknown = 0;
+	let sampledAt = started;
+	let longestGapMs = 0;
+	let phase = "requesting boot";
+	const ranks = {
+		normal: 0,
+		warning: 1,
+		critical: 2
+	};
+	const sample = () => {
+		const now = Date.now();
+		longestGapMs = Math.max(longestGapMs, now - sampledAt);
+		sampledAt = now;
+		const pressure = readHostMemoryPressure(exec);
+		if (pressure === null) unknown++;
+		else if (worst === null || ranks[pressure] > ranks[worst]) worst = pressure;
+		return pressure;
+	};
+	const recovery = "Stop unused slots in workspaces you own with `stim stop --slot <name>`, reduce concurrent builds, and retry after pressure falls. Ask before closing other agents' devices or apps. Repeated reboots under unchanged pressure may stall again.";
+	const coverage = () => longestGapMs > 3e4 ? ` Observations were delayed: longest gap ${Math.round(longestGapMs / 1e3)}s. Pressure during gaps is unobserved; blocking CLI work can also delay progress and timeout handling.` : "";
+	const report = () => {
+		const pressure = sample();
+		out(`Simulator ${label} is still booting after ${Math.round((Date.now() - started) / 1e3)}s. Last boot output: ${phase}. Memory pressure: ${pressure ?? "unknown"}; highest observed: ${worst ?? "unknown"}. Boot deadline: ${Math.round(timeoutMs / 1e3)}s.${coverage()}${pressure === "warning" || pressure === "critical" ? ` Boot may be delayed or stalled. ${recovery}` : ""}`);
+	};
+	const onLine = (line) => {
+		phase = line.slice(0, 240);
+	};
+	sample();
+	const monitor = setInterval(report, 15e3);
+	monitor.unref();
 	try {
-		exec.runFile("xcrun", [
-			"simctl",
-			"boot",
-			udid
-		], {
-			timeoutMs,
-			killSignal: "SIGKILL"
-		});
-	} catch (e) {
-		if (!String(e?.message || e).includes("Booted")) throw e;
-	}
-	for (;;) {
-		const remaining = deadline - Date.now();
-		if (remaining > 0) try {
-			await awaitBootstatus(udid, Math.min(Math.max(remaining, BOOTSTATUS_ATTEMPT_FLOOR_MS), attemptMs));
-			break;
+		try {
+			await awaitBootCommand([
+				"simctl",
+				"boot",
+				udid
+			], Math.max(1, deadline - Date.now()), onLine);
+			phase = "waiting for boot completion";
 		} catch (e) {
-			if (e?.code !== "ETIMEDOUT") throw e;
+			if (!String(e?.message || e).includes("Booted")) throw e;
 		}
-		let state;
-		try {
-			state = listAllIosSims({ timeoutMs: BOOT_STATE_LIST_TIMEOUT_MS }).find((s) => s.udid === udid)?.state ?? null;
-		} catch {
-			state = void 0;
+		for (;;) {
+			const remaining = deadline - Date.now();
+			if (remaining > 0) try {
+				await awaitBootCommand([
+					"simctl",
+					"bootstatus",
+					udid,
+					"-b"
+				], Math.min(Math.max(remaining, BOOTSTATUS_ATTEMPT_FLOOR_MS), attemptMs), onLine);
+				break;
+			} catch (e) {
+				if (e?.code !== "ETIMEDOUT") throw e;
+			}
+			let state;
+			try {
+				state = listAllIosSims({ timeoutMs: BOOT_STATE_LIST_TIMEOUT_MS }).find((s) => s.udid === udid)?.state ?? null;
+			} catch {
+				state = void 0;
+			}
+			const waited = Math.round((timeoutMs - Math.max(0, deadline - Date.now())) / 1e3);
+			if (state !== "Booting" && state !== "Booted" && state !== void 0) throw new Error(`Simulator ${udid} reports "${state ?? "missing"}" after ${waited}s of boot wait.`);
+			if (deadline - Date.now() <= 0) throw new Error(`Simulator ${udid} did not finish booting within ${Math.round(timeoutMs / 1e3)}s.`);
 		}
-		if (state === "Booted") break;
-		const waited = Math.round((timeoutMs - Math.max(0, deadline - Date.now())) / 1e3);
-		if (state !== "Booting" && state !== void 0) throw new Error(`Simulator ${udid} reports "${state ?? "missing"}" after ${waited}s of boot wait.`);
-		if (deadline - Date.now() <= 0) throw new Error(`Simulator ${udid} did not finish booting within ${Math.round(timeoutMs / 1e3)}s.`);
+	} catch (error) {
+		sample();
+		throw new Error(`${error?.message || error} Last boot output: ${phase}. Highest observed memory pressure: ${worst ?? "unknown"}; unavailable samples: ${unknown}.${coverage()} ${recovery} These observations do not establish an OOM crash.`, { cause: error });
+	} finally {
+		clearInterval(monitor);
 	}
 	exec.runFileQuiet("open", ["-a", "Simulator"], {
 		timeoutMs: 5e3,

package/dist/{ios-device-xNt0Lg6v.mjs → ios-device-CWOM_S44.mjs}

@@ -1,5 +1,5 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { r as INSTALL_ERROR } from "./app-install-NFxUahnH.mjs";
+import { r as INSTALL_ERROR } from "./app-install-DIp9riNx.mjs";
 import { mkdtempSync, readFileSync, rmSync } from "node:fs";
 import { join } from "node:path";
 import { tmpdir } from "node:os";

package/dist/{logs-DcX9AvRF.mjs → logs-DPNF4C9s.mjs}

@@ -1,9 +1,10 @@
-import { n as SOURCES, t as LEVELS } from "./ndjson-DcAtEx_K.mjs";
-import { D as workspaceLogsDir, p as readWorkspaceState } from "./state-CZ-ER-8d.mjs";
-import { a as findProjectRoot } from "./project-BBTVABUz.mjs";
+import { V as validateDeviceSlot } from "./config-CcefMY2Q.mjs";
+import { n as SOURCES, t as LEVELS } from "./ndjson-BZwI1NBv.mjs";
+import { D as workspaceLogsDir, p as readWorkspaceState } from "./state-B3XA2wp2.mjs";
+import { a as findProjectRoot } from "./project-fKmuIaMI.mjs";
 import { _ as launchErrorPreview } from "./command-output-8wHMEde0.mjs";
-import { i as captureWorkspaceCrashes, t as errorDiagnostics } from "./error-diagnostics-Dw8Gn3yw.mjs";
-import { a as followLogs, i as fileSizes, n as buildCriteria, o as parseSince, r as compileGrep, s as queryLogs } from "./logs-query-oqn47Ffx.mjs";
+import { i as captureWorkspaceCrashes, t as errorDiagnostics } from "./error-diagnostics-DHC31rXA.mjs";
+import { a as followLogs, i as fileSizes, n as buildCriteria, o as parseSince, r as compileGrep, s as queryLogs } from "./logs-query-R-Cqc6Qv.mjs";
 import chalk from "chalk";
 //#region src/commands/logs.ts
 const LEVEL_WIDTH = 5;
@@ -68,7 +69,7 @@ const LEVEL_COLOURS = {
 	fatal: chalk.bgRed
 };
 function logsCommand(program) {
-	program.command("logs").description("Query this workspace's merged NDJSON log timeline (bundler, client, device, build). Prints and exits; nothing matching is a successful, empty result. Use --follow to stream.").option("--source <s...>", "Only these sources: metro, client, device, build, or all").option("--level <l>", `Minimum level: ${LEVELS.join(", ")}`).option("--since <d>", "Only records newer than this, e.g. 30s, 5m, 2h").option("--grep <re>", "Only records whose message matches this regular expression").option("--tail <n>", "Only the last n matching records").option("--errors", "Errors and fatals since the last marker, from metro, client and build, plus confirmed native app-crash reports. Add --source device or --source all for general device errors.").option("--follow", "Keep streaming new records until interrupted").option("--json", "Emit the raw records, one per line (valid NDJSON; zero matches is zero bytes, exit 0)").action(async (opts) => {
+	program.command("logs").description("Query this workspace's merged NDJSON log timeline (bundler, client, device, build). Prints and exits; nothing matching is a successful, empty result. Use --follow to stream.").option("--slot <name>", "Only records attributed to this device slot", validateDeviceSlot).option("--source <s...>", "Only these sources: metro, client, device, build, or all").option("--level <l>", `Minimum level: ${LEVELS.join(", ")}`).option("--since <d>", "Only records newer than this, e.g. 30s, 5m, 2h").option("--grep <re>", "Only records whose message matches this regular expression").option("--tail <n>", "Only the last n matching records").option("--errors", "Errors and fatals since the last marker, from metro, client and build, plus confirmed native app-crash reports. Add --source device or --source all for general device errors.").option("--follow", "Keep streaming new records until interrupted").option("--json", "Emit the raw records, one per line (valid NDJSON; zero matches is zero bytes, exit 0)").action(async (opts) => {
 		const root = findProjectRoot(process.cwd());
 		if (!root) {
 			console.error(chalk.red("Not in a React Native project (no package.json found)."));
@@ -102,6 +103,7 @@ function logsCommand(program) {
 			if (compiled.error) fail(compiled.error);
 		}
 		const query = {
+			slot: opts.slot,
 			dir,
 			sources,
 			minLevel,
@@ -148,6 +150,7 @@ function logsCommand(program) {
 			return;
 		}
 		const criteria = buildCriteria({
+			slot: opts.slot,
 			sources,
 			minLevel,
 			since: opts.since,

package/dist/{logs-query-oqn47Ffx.mjs → logs-query-R-Cqc6Qv.mjs}

@@ -1,4 +1,4 @@
-import { a as parseNdjsonLine, i as levelRank, o as parseNdjsonText } from "./ndjson-DcAtEx_K.mjs";
+import { a as parseNdjsonLine, i as levelRank, o as parseNdjsonText } from "./ndjson-BZwI1NBv.mjs";
 import { closeSync, openSync, readFileSync, readSync, readdirSync, statSync } from "fs";
 import { join } from "path";
 import { StringDecoder } from "string_decoder";
@@ -47,6 +47,7 @@ function markerWindow(records) {
 }
 function recordMatches(record, criteria = {}) {
 	if (!record) return false;
+	if (criteria.slot !== void 0 && (record.slot ?? "default") !== criteria.slot) return false;
 	const { sources, minLevel, grep, sinceTs, errorsOnly, markerTs, bundleMarkerTs } = criteria;
 	if (sources && sources.length > 0 && !sources.includes(record.src) && !(criteria.includeNativeCrashes && record.src === "device" && record.event === "native_crash")) return false;
 	if (minLevel && levelRank(record.level) < levelRank(minLevel)) return false;
@@ -71,8 +72,9 @@ function recordMatches(record, criteria = {}) {
 	}
 	return true;
 }
-function buildCriteria({ sources, minLevel, since, grep, errorsOnly, markerTs, bundleMarkerTs, now } = {}) {
+function buildCriteria({ slot, sources, minLevel, since, grep, errorsOnly, markerTs, bundleMarkerTs, now } = {}) {
 	const criteria = {
+		...slot === void 0 ? {} : { slot },
 		errorsOnly: Boolean(errorsOnly),
 		includeNativeCrashes: Boolean(errorsOnly && !sources?.length)
 	};
@@ -160,14 +162,25 @@ function includeBareErrorContext(all, matched, launchTs, sinceTs) {
 	}
 	return sortByTs([...matched, ...renderedContext]);
 }
-function queryLogs({ dir, sources, minLevel, since, grep, tail, errorsOnly, errorContext, now } = {}) {
-	const all = readLogRecords(dir);
+function launchMarkersBySlot(records) {
+	const markers = /* @__PURE__ */ new Map();
+	for (const record of records) {
+		if (record.marker !== true || record.src === "metro") continue;
+		const ts = tsOf(record);
+		const slot = record.slot ?? "default";
+		if (ts !== null && ts > (markers.get(slot) ?? -Infinity)) markers.set(slot, ts);
+	}
+	return markers;
+}
+function queryLogs({ slot, dir, sources, minLevel, since, grep, tail, errorsOnly, errorContext, now } = {}) {
+	const all = readLogRecords(dir).filter((record) => slot === void 0 || (record.slot ?? "default") === slot);
 	if (all.length === 0) return [];
 	const { launchTs, bundleTs } = errorsOnly ? markerWindow(all) : {
 		launchTs: null,
 		bundleTs: null
 	};
 	const criteria = buildCriteria({
+		slot,
 		sources,
 		minLevel,
 		since,
@@ -177,7 +190,11 @@ function queryLogs({ dir, sources, minLevel, since, grep, tail, errorsOnly, erro
 		markerTs: launchTs === null ? void 0 : launchTs,
 		bundleMarkerTs: bundleTs === null ? void 0 : bundleTs
 	});
-	let matched = all.filter((r) => recordMatches(r, criteria));
+	const slotMarkers = launchMarkersBySlot(all);
+	let matched = all.filter((record) => recordMatches(record, {
+		...criteria,
+		markerTs: record.src === "metro" || record.src === "client" ? criteria.markerTs : slotMarkers.get(record.slot ?? "default")
+	}));
 	if (typeof tail === "number" && tail >= 0 && matched.length > tail) matched = matched.slice(matched.length - tail);
 	return errorContext ? includeBareErrorContext(all, attachExpoErrorContext(all, matched), launchTs, criteria.sinceTs) : matched;
 }

package/dist/{metro-COslRK_F.mjs → metro-CORqXyTL.mjs}

@@ -1,6 +1,6 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { E as inspectProcessIdentity, M as isOnMountedVolume, N as listMountedVolumes, g as loadConfig, n as allMetroPorts, r as claimMetroPort, v as removeProject } from "./config-CMtIaTk9.mjs";
-import { p as readWorkspaceState } from "./state-CZ-ER-8d.mjs";
+import { E as inspectProcessIdentity, M as isOnMountedVolume, N as listMountedVolumes, g as loadConfig, n as allMetroPorts, r as claimMetroPort, v as removeProject } from "./config-CcefMY2Q.mjs";
+import { p as readWorkspaceState } from "./state-B3XA2wp2.mjs";
 import { existsSync, readlinkSync, realpathSync } from "fs";
 import { sep } from "path";
 import { request } from "http";

package/dist/{ndjson-DcAtEx_K.mjs → ndjson-BZwI1NBv.mjs}

@@ -49,7 +49,7 @@ function formatNdjsonLine(record) {
 		return null;
 	}
 }
-function createNdjsonWriter(file, { truncate = false } = {}) {
+function createNdjsonWriter(file, { truncate = false, fields = {} } = {}) {
 	let fd = null;
 	let freshFile = truncate;
 	let written = 0;
@@ -66,7 +66,10 @@ function createNdjsonWriter(file, { truncate = false } = {}) {
 			dropped += 1;
 			return false;
 		}
-		const line = formatNdjsonLine(stamp(record));
+		const line = formatNdjsonLine({
+			...stamp(record),
+			...fields
+		});
 		if (line === null) {
 			dropped += 1;
 			lastError = /* @__PURE__ */ new TypeError("record could not be serialized to JSON");

package/dist/{ownership-CGPart6T.mjs → ownership-8O073GIC.mjs}

@@ -1,6 +1,6 @@
-import { D as sameProcessRecord, E as inspectProcessIdentity } from "./config-CMtIaTk9.mjs";
-import { _ as writeWorkspaceState, m as withWorkspaceStateLock, p as readWorkspaceState } from "./state-CZ-ER-8d.mjs";
-import { r as pidExists } from "./metro-COslRK_F.mjs";
+import { D as sameProcessRecord, E as inspectProcessIdentity } from "./config-CcefMY2Q.mjs";
+import { _ as writeWorkspaceState, m as withWorkspaceStateLock, p as readWorkspaceState } from "./state-B3XA2wp2.mjs";
+import { r as pidExists } from "./metro-CORqXyTL.mjs";
 import { realpathSync } from "node:fs";
 //#region src/collector/state.ts
 function collectorRoot(root) {

package/dist/{ownership-CYOyqxUo.mjs → ownership-BpCKiRlQ.mjs}

@@ -1,8 +1,8 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { E as inspectProcessIdentity, T as captureProcessToken, u as getConfigDir } from "./config-CMtIaTk9.mjs";
+import { E as inspectProcessIdentity, T as captureProcessToken, u as getConfigDir } from "./config-CcefMY2Q.mjs";
 import { t as createLineReader } from "./process-output-C7IlIzd7.mjs";
-import { r as pidExists } from "./metro-COslRK_F.mjs";
-import { t as withWorkspaceProcessLock } from "./workspace-process-lock-BKfdys1q.mjs";
+import { r as pidExists } from "./metro-CORqXyTL.mjs";
+import { t as withWorkspaceProcessLock } from "./workspace-process-lock-3NcQnZ0X.mjs";
 import { closeSync, mkdirSync, openSync, readFileSync, unlinkSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { basename, join, resolve, sep } from "node:path";

package/dist/{ownership-claim-7zRxxTfZ.mjs → ownership-claim-Bf2CAfw3.mjs}

@@ -1,4 +1,4 @@
-import { E as inspectProcessIdentity, w as captureProcessIdentity } from "./config-CMtIaTk9.mjs";
+import { E as inspectProcessIdentity, w as captureProcessIdentity } from "./config-CcefMY2Q.mjs";
 import { d as quotedPath } from "./command-output-8wHMEde0.mjs";
 import { lstatSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, rmdirSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { randomUUID } from "node:crypto";
@@ -60,15 +60,16 @@ function isClaimUnavailable(err) {
 * competing run no protection at all.
 */
 function claimFailure(err, retryCommand) {
+	const retry = retryCommand === null ? "retry the same Stim command" : `run \`${retryCommand}\` again`;
 	if (isClaimRefusal(err)) return {
 		code: CLAIM_REFUSED,
 		message: err.message,
-		remedy: `Run \`${err.removeCommand}\`, then run \`${retryCommand}\` again.`
+		remedy: `Run \`${err.removeCommand}\`, then ${retry}.`
 	};
 	if (isClaimUnavailable(err)) return {
 		code: CLAIM_UNAVAILABLE,
 		message: err.message,
-		remedy: `Reinstall Stim so the unique-pid native module for this platform is present, then run \`${retryCommand}\` again.`
+		remedy: `Reinstall Stim so the unique-pid native module for this platform is present, then ${retry}.`
 	};
 	return null;
 }

package/dist/{project-BBTVABUz.mjs → project-fKmuIaMI.mjs}

@@ -1,5 +1,5 @@
-import { c as findEnclosingWorktreeRoot, f as getProject } from "./config-CMtIaTk9.mjs";
-import { g as repoRoot } from "./worktree-C79xx_kM.mjs";
+import { c as findEnclosingWorktreeRoot, f as getProject } from "./config-CcefMY2Q.mjs";
+import { g as repoRoot } from "./worktree-Eq6TLH8N.mjs";
 import { existsSync, readFileSync, readdirSync, realpathSync } from "fs";
 import { basename, dirname, join, resolve } from "path";
 import { createRequire } from "module";

package/dist/{reclaim-C5Jmuahx.mjs → reclaim-iW9Cad7k.mjs}

@@ -1,11 +1,11 @@
-import { D as sameProcessRecord, O as waitForProcessExit, f as getProject, v as removeProject } from "./config-CMtIaTk9.mjs";
-import { T as workspaceDir, a as clearRemoteSession, c as readMetroTunnel, d as readRemoteSessionId, i as clearManagedMetroTunnel, p as readWorkspaceState } from "./state-CZ-ER-8d.mjs";
-import { i as resolveProjectMetro, n as killMetroTree, r as pidExists } from "./metro-COslRK_F.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-CGPart6T.mjs";
-import { d as resolveEasCliBin, h as teardownOwnedIosSim, m as teardownOwnedAvd, x as parkedMaxSetting } from "./remote-cache-DDmJ1Roq.mjs";
-import { l as releaseWorkspaceLeases } from "./device-lease-Dpik41RY.mjs";
-import { i as endRecordedSession } from "./device-remote-E81KAdXf.mjs";
-import { r as stopTunnel, t as resolveSupervisorTarget } from "./ownership-CYOyqxUo.mjs";
+import { D as sameProcessRecord, O as waitForProcessExit, f as getProject, v as removeProject, z as projectDeviceSlots } from "./config-CcefMY2Q.mjs";
+import { T as workspaceDir, a as clearRemoteSession, c as readMetroTunnel, d as readRemoteSessionId, i as clearManagedMetroTunnel, p as readWorkspaceState } from "./state-B3XA2wp2.mjs";
+import { i as resolveProjectMetro, n as killMetroTree, r as pidExists } from "./metro-CORqXyTL.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-8O073GIC.mjs";
+import { c as parkedMaxSetting, n as teardownOwnedIosSim, t as teardownOwnedAvd, x as resolveEasCliBin } from "./teardown-ClFp1Aax.mjs";
+import { l as releaseWorkspaceLeases } from "./device-lease-BJYybF-2.mjs";
+import { i as endRecordedSession } from "./device-remote-AkYCKS8U.mjs";
+import { r as stopTunnel, t as resolveSupervisorTarget } from "./ownership-BpCKiRlQ.mjs";
 import { existsSync, rmSync } from "node:fs";
 //#region src/reclaim.ts
 async function reapCollectors(root, { verify = verifyCollectorOwnership, collectors }) {
@@ -25,7 +25,7 @@ async function reapCollectors(root, { verify = verifyCollectorOwnership, collect
 		if (ownership.status === "unverified") {
 			const name = `${platform} log collector (pid ${pid})`;
 			const entry = {
-				platform: platform === "android" ? "android" : "ios",
+				platform: platform.split(":")[0] === "android" ? "android" : "ios",
 				name,
 				reason: `${ownership.reason}; keeping the record without signalling the process`
 			};
@@ -40,7 +40,7 @@ async function reapCollectors(root, { verify = verifyCollectorOwnership, collect
 			if (error.code === "ESRCH") continue;
 		}
 		const entry = {
-			platform: platform === "android" ? "android" : "ios",
+			platform: platform.split(":")[0] === "android" ? "android" : "ios",
 			name: `${platform} log collector (pid ${pid})`,
 			reason: "Collector exit could not be confirmed; keeping its ownership record."
 		};
@@ -139,11 +139,13 @@ async function reclaimMetroTunnel(root, { stopMetroTunnel = defaultStopMetroTunn
 }
 function describeDereferenced(project) {
 	const devices = [];
-	const ios = project?.platforms?.ios;
-	if (ios?.deviceUdid) devices.push(`ios sim ${ios.deviceUdid}`);
-	const android = project?.platforms?.android;
-	if (android?.avdName) devices.push(`android avd ${android.avdName}`);
-	else if (android?.serial) devices.push(`android device ${android.serial}`);
+	for (const { platforms } of projectDeviceSlots(project)) {
+		const ios = platforms.ios;
+		if (ios?.deviceUdid) devices.push(`ios sim ${ios.deviceUdid}`);
+		const android = platforms.android;
+		if (android?.avdName) devices.push(`android avd ${android.avdName}`);
+		else if (android?.serial) devices.push(`android device ${android.serial}`);
+	}
 	return devices;
 }
 function parkedIosCacheKey(lastBuild) {
@@ -151,7 +153,7 @@ function parkedIosCacheKey(lastBuild) {
 	const build = lastBuild;
 	return build.platform === "ios" && typeof build.cacheKey === "string" ? build.cacheKey : null;
 }
-function parkRequest(project, projectPath) {
+function parkRequest(project, projectPath, slot, simslimManaged) {
 	const { max, error } = parkedMaxSetting("ios");
 	if (error || max <= 0) return void 0;
 	const cacheKey = parkedIosCacheKey(readWorkspaceState(projectPath)?.lastBuild);
@@ -160,7 +162,8 @@ function parkRequest(project, projectPath) {
 		max,
 		bundleId: typeof project?.bundleId === "string" ? project.bundleId : null,
 		cacheKey,
-		simslimManaged: Boolean(project?.platforms?.ios?.simslimManaged)
+		simslimManaged,
+		slot
 	};
 }
 function reclaimOwnedDevices(project, projectPath, { park = false } = {}) {
@@ -170,69 +173,72 @@ function reclaimOwnedDevices(project, projectPath, { park = false } = {}) {
 	const poolNotes = [];
 	const skippedDevices = [];
 	const failedDevices = [];
-	const ios = project?.platforms?.ios;
-	if (ios?.owned && ios.deviceUdid) {
-		const udid = ios.deviceUdid;
-		const label = ios.deviceName || udid;
-		const r = teardownOwnedIosSim(udid, {
-			del: true,
-			label,
-			...park ? { park: parkRequest(project, projectPath) } : {}
-		});
-		if (r.parkFallback) poolNotes.push(`could not park ${label}: ${r.parkFallback} -- deleted it instead`);
-		for (const failure of r.evictionFailures ?? []) poolNotes.push(failure);
-		if (r.parked) {
-			parkedDevices.push(r.parked);
-			evictedDevices.push(...r.evicted ?? []);
-		} else if (r.status === "torn-down") deletedDevices.push(r.label);
-		if (r.status === "skipped") skippedDevices.push({
-			platform: "ios",
-			name: label,
-			udid,
-			reason: `${r.reason} -- not touched`
-		});
-		else if (r.status === "failed") {
-			const entry = {
+	for (const { slot, platforms } of projectDeviceSlots(project)) {
+		const ios = platforms.ios;
+		if (ios?.owned && ios.deviceUdid) {
+			const udid = ios.deviceUdid;
+			const label = ios.deviceName || udid;
+			const r = teardownOwnedIosSim(udid, {
+				del: true,
+				label,
+				...park ? { park: parkRequest(project, projectPath, slot, Boolean(ios.simslimManaged)) } : {}
+			});
+			if (r.parkFallback) poolNotes.push(`could not park ${label}: ${r.parkFallback} -- deleted it instead`);
+			for (const failure of r.evictionFailures ?? []) poolNotes.push(failure);
+			if (r.parked) {
+				parkedDevices.push(r.parked);
+				evictedDevices.push(...r.evicted ?? []);
+			} else if (r.status === "torn-down") deletedDevices.push(r.label);
+			if (r.status === "skipped") skippedDevices.push({
 				platform: "ios",
 				name: label,
 				udid,
-				reason: `teardown failed: ${r.reason}`
-			};
-			skippedDevices.push(entry);
-			failedDevices.push(entry);
+				reason: `${r.reason} -- not touched`
+			});
+			else if (r.status === "failed") {
+				const entry = {
+					platform: "ios",
+					name: label,
+					udid,
+					reason: `teardown failed: ${r.reason}`
+				};
+				skippedDevices.push(entry);
+				failedDevices.push(entry);
+			}
 		}
-	}
-	const android = project?.platforms?.android;
-	if (android?.owned && android.avdName) {
-		const bound = parkedMaxSetting("android");
-		const r = teardownOwnedAvd(android.avdName, {
-			del: true,
-			owner: { projectPath },
-			...park && !bound.error && bound.max > 0 ? { park: {
-				projectPath,
-				max: bound.max,
-				configuration: typeof android.poolConfiguration === "string" ? android.poolConfiguration : void 0
-			} } : {}
-		});
-		if (r.parkFallback) poolNotes.push(`could not park ${android.avdName}: ${r.parkFallback} -- deleted it instead`);
-		for (const failure of r.evictionFailures ?? []) poolNotes.push(failure);
-		if (r.parked) {
-			parkedDevices.push(r.parked);
-			evictedDevices.push(...r.evicted ?? []);
-		} else if (r.status === "torn-down") deletedDevices.push(android.avdName);
-		else if (r.status === "skipped") skippedDevices.push({
-			platform: "android",
-			name: android.avdName,
-			reason: `${r.reason} -- not touched`
-		});
-		else if (r.status === "failed") {
-			const entry = {
+		const android = platforms.android;
+		if (android?.owned && android.avdName) {
+			const bound = parkedMaxSetting("android");
+			const r = teardownOwnedAvd(android.avdName, {
+				del: true,
+				owner: { projectPath },
+				...park && !bound.error && bound.max > 0 ? { park: {
+					projectPath,
+					slot,
+					max: bound.max,
+					configuration: typeof android.poolConfiguration === "string" ? android.poolConfiguration : void 0
+				} } : {}
+			});
+			if (r.parkFallback) poolNotes.push(`could not park ${android.avdName}: ${r.parkFallback} -- deleted it instead`);
+			for (const failure of r.evictionFailures ?? []) poolNotes.push(failure);
+			if (r.parked) {
+				parkedDevices.push(r.parked);
+				evictedDevices.push(...r.evicted ?? []);
+			} else if (r.status === "torn-down") deletedDevices.push(android.avdName);
+			else if (r.status === "skipped") skippedDevices.push({
 				platform: "android",
 				name: android.avdName,
-				reason: `teardown failed: ${r.reason}`
-			};
-			skippedDevices.push(entry);
-			failedDevices.push(entry);
+				reason: `${r.reason} -- not touched`
+			});
+			else if (r.status === "failed") {
+				const entry = {
+					platform: "android",
+					name: android.avdName,
+					reason: `teardown failed: ${r.reason}`
+				};
+				skippedDevices.push(entry);
+				failedDevices.push(entry);
+			}
 		}
 	}
 	return {