stim 1.1.0 → 1.3.0

package/dist/{gc-DhXdgSdt.mjs → gc-GGu-8ULN.mjs}

@@ -1,20 +1,19 @@
-import { t as getExecutor } from "./exec-bsN9MJXb.mjs";
-import { A as directorySize, M as isOnMountedVolume, N as listMountedVolumes, P as volumeRootFor, g as loadConfig, i as clearDevice, j as formatBytes, u as getConfigDir, v as removeProject } from "./config-D7uu8Gbq.mjs";
-import { i as registeredCaches } from "./cache-manifest-oeH18ERr.mjs";
-import { T as workspaceDir, k as workspaceStateFile } from "./state-IYEY-zi8.mjs";
-import { g as repoRoot, s as gitCommonDir } from "./worktree-Dx3ZC5lS.mjs";
-import { a as findProjectRoot, i as detectIsExpo } from "./project-COj6nzzh.mjs";
-import { S as readParked, _ as teardownParkedIosSim, b as dropParked, d as resolveEasCliBin, g as teardownParkedAvd, h as teardownOwnedIosSim, m as teardownOwnedAvd, v as POOL_SETTING_REMEDY, x as parkedMaxSetting } from "./remote-cache-DOi5-zLj.mjs";
-import { M as settingShapeErrors, a as SETTING_SHAPE_REMEDY, k as resolveSettings } from "./settings-BSwrY4FZ.mjs";
+import { t as getExecutor } from "./exec-CyylIdq9.mjs";
+import { A as directorySize, M as isOnMountedVolume, N as listMountedVolumes, P as volumeRootFor, g as loadConfig, i as clearDevice, j as formatBytes, u as getConfigDir, v as removeProject, z as projectDeviceSlots } from "./config-CcefMY2Q.mjs";
+import { i as registeredCaches } from "./cache-manifest-CXR-Y8pH.mjs";
+import { T as workspaceDir, k as workspaceStateFile } from "./state-B3XA2wp2.mjs";
+import { g as repoRoot, s as gitCommonDir } from "./worktree-Eq6TLH8N.mjs";
+import { a as findProjectRoot, i as detectIsExpo } from "./project-fKmuIaMI.mjs";
 import { m as shortUdid, o as formatLongDuration, u as plural } from "./command-output-8wHMEde0.mjs";
-import { h as parseRuntimeVersion, l as listAllIosSims, u as listIosDeviceTypes } from "./ios-BZxKPuqP.mjs";
-import { r as listBuildLocks } from "./build-lock-vE45ZzJZ.mjs";
-import { d as readClaimSet, o as clearFreeClaimSet } from "./ownership-claim-CeJLEpjD.mjs";
-import { i as listLeaseFiles, r as leaseIsExpired, u as removeExpiredLease } from "./device-lease-D-G3SgVe.mjs";
-import { n as listBuildSlots } from "./build-slots-CgacA9zQ.mjs";
-import { S as ownedAvdDirectory, v as listAvds } from "./android-xmyGBNy5.mjs";
-import { C as verifyStoppedSession, S as stopSessionArgs, _ as inspectSessionForTeardown, d as withEasProjectLock, f as easMachineStateRoot, g as getSessionArgs, h as findOrphanedOwnedSessions, m as removeEasSessionClaim, p as readEasSessionLedger, u as withRemoteSessionLock, v as isDefinitiveMissingSessionError, x as parseSessionListPage, y as listOwnedSessionsArgs } from "./device-remote-CCgkG82J.mjs";
-import { n as reclaimProject, t as describeDereferenced } from "./reclaim-BPvN2HlP.mjs";
+import { d as readClaimSet, o as clearFreeClaimSet } from "./ownership-claim-Bf2CAfw3.mjs";
+import { B as listBuildLocks, S as listOrphanedAvdDirectories, T as ownedAvdDirectory, b as listAvds } from "./android-BqVIJoG7.mjs";
+import { A as resolveSettings, N as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-DEJf6_kJ.mjs";
+import { a as POOL_SETTING_REMEDY, c as parkedMaxSetting, i as teardownParkedIosSim, l as readParked, n as teardownOwnedIosSim, r as teardownParkedAvd, s as dropParked, t as teardownOwnedAvd, x as resolveEasCliBin } from "./teardown-ClFp1Aax.mjs";
+import { d as listIosDeviceTypes, g as parseRuntimeVersion, u as listAllIosSims } from "./ios-Deh5js5V.mjs";
+import { i as listLeaseFiles, r as leaseIsExpired, u as removeExpiredLease } from "./device-lease-BJYybF-2.mjs";
+import { n as listBuildSlots } from "./build-slots-C3-R4XQr.mjs";
+import { C as verifyStoppedSession, S as stopSessionArgs, _ as inspectSessionForTeardown, d as withEasProjectLock, f as easMachineStateRoot, g as getSessionArgs, h as findOrphanedOwnedSessions, m as removeEasSessionClaim, p as readEasSessionLedger, u as withRemoteSessionLock, v as isDefinitiveMissingSessionError, x as parseSessionListPage, y as listOwnedSessionsArgs } from "./device-remote-AkYCKS8U.mjs";
+import { n as reclaimProject, t as describeDereferenced } from "./reclaim-iW9Cad7k.mjs";
 import { InvalidArgumentError } from "commander";
 import { existsSync, readFileSync, readdirSync, realpathSync, rmSync, statSync } from "fs";
 import { homedir, tmpdir } from "os";
@@ -413,16 +412,18 @@ function findOrphanedDevices({ sims = [], avds = [], config, isMounted, deadProj
 	for (const [path, proj] of Object.entries(config?.projects || {})) {
 		if (dead.has(path)) continue;
 		const mounted = isMounted ? isMounted(path) : true;
-		const ios = proj?.platforms?.ios;
-		if (ios?.deviceUdid) referenced.set(ios.deviceUdid, {
-			path,
-			mounted
-		});
-		const android = proj?.platforms?.android;
-		if (android?.avdName) referenced.set(android.avdName, {
-			path,
-			mounted
-		});
+		for (const { platforms } of projectDeviceSlots(proj)) {
+			const ios = platforms.ios;
+			if (ios?.deviceUdid) referenced.set(ios.deviceUdid, {
+				path,
+				mounted
+			});
+			const android = platforms.android;
+			if (android?.avdName) referenced.set(android.avdName, {
+				path,
+				mounted
+			});
+		}
 	}
 	for (const sim of readParked("ios", { config })) referenced.set(sim.udid, {
 		path: "the simulator pool",
@@ -481,22 +482,26 @@ function findStaleProjectDevices({ config, sims = [], avds = [], olderThanDays,
 		const touched = lastTouched(path);
 		if (!Number.isFinite(touched) || touched >= cutoff) continue;
 		const idleDays = Math.floor((now - touched) / DAY_MS);
-		const ios = proj?.platforms?.ios;
-		if (ios?.owned && ios.deviceUdid && liveSims.has(ios.deviceUdid)) stale.push({
-			kind: "ios",
-			id: ios.deviceUdid,
-			name: liveSims.get(ios.deviceUdid),
-			project: path,
-			idleDays
-		});
-		const android = proj?.platforms?.android;
-		if (android?.owned && android.avdName && liveAvds.has(android.avdName)) stale.push({
-			kind: "android",
-			id: android.avdName,
-			name: android.avdName,
-			project: path,
-			idleDays
-		});
+		for (const { slot, platforms } of projectDeviceSlots(proj)) {
+			const ios = platforms.ios;
+			if (ios?.owned && ios.deviceUdid && liveSims.has(ios.deviceUdid)) stale.push({
+				kind: "ios",
+				id: ios.deviceUdid,
+				name: liveSims.get(ios.deviceUdid),
+				project: path,
+				...slot === "default" ? {} : { slot },
+				idleDays
+			});
+			const android = platforms.android;
+			if (android?.owned && android.avdName && liveAvds.has(android.avdName)) stale.push({
+				kind: "android",
+				id: android.avdName,
+				name: android.avdName,
+				project: path,
+				idleDays,
+				...slot === "default" ? {} : { slot }
+			});
+		}
 	}
 	return stale;
 }
@@ -507,20 +512,24 @@ function findStaleDeviceRecords({ config, sims = [], avds = [], deadProjects = [
 	const stale = [];
 	for (const [path, proj] of Object.entries(config?.projects || {})) {
 		if (dead.has(path)) continue;
-		const ios = proj?.platforms?.ios;
-		if (simsChecked && ios?.deviceUdid && !liveSims.has(ios.deviceUdid)) stale.push({
-			kind: "ios",
-			id: ios.deviceUdid,
-			project: path,
-			owned: Boolean(ios.owned)
-		});
-		const android = proj?.platforms?.android;
-		if (avdsChecked && android?.avdName && !liveAvds.has(android.avdName)) stale.push({
-			kind: "android",
-			id: android.avdName,
-			project: path,
-			owned: Boolean(android.owned)
-		});
+		for (const { slot, platforms } of projectDeviceSlots(proj)) {
+			const ios = platforms.ios;
+			if (simsChecked && ios?.deviceUdid && !liveSims.has(ios.deviceUdid)) stale.push({
+				kind: "ios",
+				id: ios.deviceUdid,
+				project: path,
+				...slot === "default" ? {} : { slot },
+				owned: Boolean(ios.owned)
+			});
+			const android = platforms.android;
+			if (avdsChecked && android?.avdName && !liveAvds.has(android.avdName)) stale.push({
+				kind: "android",
+				id: android.avdName,
+				project: path,
+				...slot === "default" ? {} : { slot },
+				owned: Boolean(android.owned)
+			});
+		}
 	}
 	return stale;
 }
@@ -532,7 +541,7 @@ function describeUnverifiableDevices(simNames = [], avdNames = [], { reason = "n
 function withAndroidAvdSizes(devices, { avdDirectory = ownedAvdDirectory, size = directorySize } = {}) {
 	return devices.map((device) => {
 		if (device.kind !== "android") return device;
-		const dir = avdDirectory(device.id);
+		const dir = device.orphanedDirectory?.directory ?? avdDirectory(device.id);
 		if (!dir) return device;
 		try {
 			const bytes = size(dir, { timeoutMs: AVD_SIZE_TIMEOUT_MS });
@@ -648,8 +657,8 @@ function deleteParkedSims(parkedSims, deps = {}) {
 	if (emptied) console.log(chalk.dim(`  emptied ${plural(emptied, "parked simulator")} from the pool`));
 	return failures;
 }
-function deviceSweepIsScoped(unsafeAllowScopedDeviceSweep) {
-	return Boolean(process.env.STIM_HOME) && !unsafeAllowScopedDeviceSweep;
+function deviceSweepIsScoped() {
+	return Boolean(process.env.STIM_HOME);
 }
 function collectDeviceLeases(now) {
 	const expired = [];
@@ -685,7 +694,11 @@ function deleteProjectDevices(orphanedDevices, staleDevices, staleDeviceRecords)
 		const r = d.kind === "ios" ? teardownOwnedIosSim(d.id, {
 			del: true,
 			label: d.name
-		}) : teardownOwnedAvd(d.name, { del: true });
+		}) : teardownOwnedAvd(d.name, {
+			del: true,
+			..."project" in d ? { owner: { projectPath: d.project } } : {},
+			..."orphanedDirectory" in d ? { orphanedDirectory: d.orphanedDirectory } : {}
+		});
 		const what = d.kind === "ios" ? `ios sim ${d.name} (${d.id})` : `android avd ${d.name}`;
 		if (r.status === "torn-down") console.log(chalk.green(`Deleted ${what}`));
 		else if (r.status === "missing") console.log(chalk.dim(`${what} is already gone; nothing to delete.`));
@@ -700,12 +713,12 @@ function deleteProjectDevices(orphanedDevices, staleDevices, staleDeviceRecords)
 	for (const d of staleDevices) {
 		const status = reap(d);
 		if (status === "torn-down" || status === "missing") {
-			clearDevice(d.project, d.kind);
+			clearDevice(d.project, d.kind, d.slot);
 			console.log(chalk.dim(`  cleared the ${d.kind} record for ${d.project}`));
 		}
 	}
 	for (const r of staleDeviceRecords) {
-		clearDevice(r.project, r.kind);
+		clearDevice(r.project, r.kind, r.slot);
 		console.log(chalk.green(`Cleared the ${r.kind} record for ${r.project} (${r.id} is not on this machine)`));
 	}
 	return deleteFailures;
@@ -1294,7 +1307,7 @@ function projectLastTouched(path) {
 		return NaN;
 	}
 }
-async function collectGcReport({ olderThan = null, cache = null, now = Date.now(), lastTouched = projectLastTouched, unsafeAllowScopedDeviceSweep = false } = {}, deps = {}) {
+async function collectGcReport({ olderThan = null, cache = null, now = Date.now(), lastTouched = projectLastTouched } = {}, deps = {}) {
 	const scope = typeof cache === "string" && cache.trim() ? cache : null;
 	const all = scope !== null && olderThan === null;
 	const caches = planCacheEmptying(sizeCaches(selectCaches(discoverCaches({ declared: declaredCachePaths() }), scope)), all);
@@ -1374,7 +1387,7 @@ async function collectGcReport({ olderThan = null, cache = null, now = Date.now(
 	let orphanedDevices = [];
 	let staleDevices = [];
 	let staleDeviceRecords = [];
-	const unsweepableReason = cfg === null ? "no Stim config found" : deviceSweepIsScoped(unsafeAllowScopedDeviceSweep) ? "STIM_HOME scopes this config, but simulators and AVDs are machine-global" : null;
+	const unsweepableReason = cfg === null ? "no Stim config found" : deviceSweepIsScoped() ? "STIM_HOME scopes this config, but simulators and AVDs are machine-global" : null;
 	if (unsweepableReason) {
 		let simNames = [];
 		let avdNames = [];
@@ -1402,6 +1415,14 @@ async function collectGcReport({ olderThan = null, cache = null, now = Date.now(
 			avdsChecked = false;
 			deviceSweepNotices.push(`android device sweep skipped: emulator tooling did not answer within ${DEVICE_LIST_TIMEOUT_MS / 1e3}s`);
 		}
+		let orphanedAvdDirectories = [];
+		if (avdsChecked) try {
+			orphanedAvdDirectories = listOrphanedAvdDirectories();
+		} catch (error) {
+			avdsChecked = false;
+			deviceSweepNotices.push(`android data sweep skipped: ${error.message}`);
+		}
+		avds = [.../* @__PURE__ */ new Set([...avds, ...orphanedAvdDirectories.map((entry) => entry.name)])];
 		const isMounted = (path) => isOnMountedVolume(path, mountedVolumes);
 		orphanedDevices = withAndroidAvdSizes(findOrphanedDevices({
 			sims,
@@ -1409,7 +1430,10 @@ async function collectGcReport({ olderThan = null, cache = null, now = Date.now(
 			config: cfg,
 			isMounted,
 			deadProjects
-		}).orphaned, {
+		}).orphaned.flatMap((device) => {
+			const directories = device.kind === "android" ? orphanedAvdDirectories.filter((entry) => entry.name === device.name) : [];
+			return directories.length ? directories.map((orphanedDirectory) => Object.assign({}, device, { orphanedDirectory })) : [device];
+		}), {
 			avdDirectory: deps.avdDirectory ?? ownedAvdDirectory,
 			size: deps.directorySize ?? directorySize
 		});
@@ -1546,8 +1570,7 @@ async function runGcCore(opts, deps) {
 	const cache = typeof opts.cache === "string" && opts.cache.trim() ? opts.cache : null;
 	const report = await collectGcReport({
 		olderThan,
-		cache,
-		unsafeAllowScopedDeviceSweep: opts.unsafeAllowScopedDeviceSweep
+		cache
 	}, deps);
 	if (cache && report.caches.length === 0) {
 		const names = [...new Set(discoverCaches({ declared: declaredCachePaths() }).map((c) => c.name))];