stim 1.3.0 → 1.4.0

package/dist/{error-diagnostics-DHC31rXA.mjs → error-diagnostics-_VmkqRZo.mjs}

@@ -1,13 +1,14 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { I as deviceSlotKey, L as deviceSlotPlatforms, f as getProject, k as withDirLock } from "./config-CcefMY2Q.mjs";
-import { f as readWorkspaceLaunches, p as readWorkspaceState } from "./state-B3XA2wp2.mjs";
+import { D as withDirLock, F as deviceSlotPlatforms, P as deviceSlotKey, f as getProject } from "./config-6vdGngKa.mjs";
+import { r as readWorkspaceState } from "./workspace-state-Do1e2mOH.mjs";
+import { d as readWorkspaceLaunches } from "./state-CDbvmZdt.mjs";
 import { n as deviceConsoleLevel } from "./ios-device-D3pzTKQE.mjs";
-import { i as resolveProjectMetro } from "./metro-CORqXyTL.mjs";
+import { i as resolveProjectMetro } from "./metro-DFLmaVz8.mjs";
 import { n as parseLogcatLine, t as androidClockOffset } from "./android-BW8i_YxU.mjs";
-import { _ as launchErrorPreview } from "./command-output-8wHMEde0.mjs";
-import { n as androidHome } from "./android-BqVIJoG7.mjs";
-import { a as parseLease, n as fileLeaseIo, t as deviceLeasePath } from "./device-lease-BJYybF-2.mjs";
-import { c as readLogRecords, t as attachExpoErrorContext } from "./logs-query-R-Cqc6Qv.mjs";
+import { _ as launchErrorPreview } from "./command-output-BuIb_ZOI.mjs";
+import { n as androidHome } from "./android-BkM4qTaN.mjs";
+import { a as parseLease, n as fileLeaseIo, t as deviceLeasePath } from "./device-lease-DDJr85OK.mjs";
+import { l as readLogRecords, t as attachExpoErrorContext } from "./logs-query-Cdp5aaCH.mjs";
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { basename, dirname, join, resolve, sep } from "node:path";

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

@@ -1,19 +1,18 @@
 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 { 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 { A as isOnMountedVolume, C as withConfigLock, E as ownership_claim_exports, F as deviceSlotPlatforms, L as projectDeviceSlots, M as volumeRootFor, O as directorySize, f as getProject, g as loadConfig, i as clearDevice, j as listMountedVolumes, k as formatBytes, u as getConfigDir, v as removeProject } from "./config-6vdGngKa.mjs";
+import { i as registeredCaches } from "./cache-manifest-D02TpYjA.mjs";
+import { h as workspaceDir, y as workspaceStateFile } from "./workspace-state-Do1e2mOH.mjs";
+import { _ as repoRoot, s as gitCommonDir } from "./worktree-DWNx4tUg.mjs";
+import { a as findProjectRoot, i as detectIsExpo } from "./project-CBFCwnN5.mjs";
+import { m as shortUdid, o as formatLongDuration, u as plural } from "./command-output-BuIb_ZOI.mjs";
+import { B as listBuildLocks, S as listOrphanedAvdDirectories, T as ownedAvdDirectory, b as listAvds } from "./android-BkM4qTaN.mjs";
+import { A as resolveSettings, N as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-DwfltIXQ.mjs";
+import { S as resolveEasCliBin, a as POOL_SETTING_REMEDY, i as teardownParkedIosSim, l as parkedMaxSetting, n as teardownOwnedIosSim, r as teardownParkedAvd, s as dropParked, t as teardownOwnedAvd, u as readParked } from "./teardown-KsPpvldq.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 { i as listLeaseFiles, r as leaseIsExpired, u as removeExpiredLease } from "./device-lease-DDJr85OK.mjs";
+import { n as listBuildSlots } from "./build-slots-D6sDzOe-.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-CMfHhoc8.mjs";
+import { n as reclaimProject, t as describeDereferenced } from "./reclaim-DpDVo-AP.mjs";
 import { InvalidArgumentError } from "commander";
 import { existsSync, readFileSync, readdirSync, realpathSync, rmSync, statSync } from "fs";
 import { homedir, tmpdir } from "os";
@@ -690,13 +689,20 @@ function collectDeviceLeases(now) {
 }
 function deleteProjectDevices(orphanedDevices, staleDevices, staleDeviceRecords) {
 	let deleteFailures = 0;
-	function reap(d) {
+	function reap(d, onlyIfMissing = false) {
 		const r = d.kind === "ios" ? teardownOwnedIosSim(d.id, {
 			del: true,
 			label: d.name
 		}) : teardownOwnedAvd(d.name, {
 			del: true,
-			..."project" in d ? { owner: { projectPath: d.project } } : {},
+			onlyIfMissing,
+			..."project" in d ? { owner: {
+				projectPath: d.project,
+				slot: d.slot
+			} } : {},
+			..."project" in d ? { onRemoved: () => {
+				if (clearDevice(d.project, d.kind, d.slot, d.id)) console.log(chalk.dim(`  cleared the ${d.kind} record for ${d.project}`));
+			} } : {},
 			..."orphanedDirectory" in d ? { orphanedDirectory: d.orphanedDirectory } : {}
 		});
 		const what = d.kind === "ios" ? `ios sim ${d.name} (${d.id})` : `android avd ${d.name}`;
@@ -712,15 +718,20 @@ function deleteProjectDevices(orphanedDevices, staleDevices, staleDeviceRecords)
 	for (const d of orphanedDevices) reap(d);
 	for (const d of staleDevices) {
 		const status = reap(d);
-		if (status === "torn-down" || status === "missing") {
-			clearDevice(d.project, d.kind, d.slot);
+		if (d.kind === "ios" && (status === "torn-down" || status === "missing")) {
+			clearDevice(d.project, d.kind, d.slot, d.id);
 			console.log(chalk.dim(`  cleared the ${d.kind} record for ${d.project}`));
 		}
 	}
-	for (const r of staleDeviceRecords) {
-		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)`));
-	}
+	for (const r of staleDeviceRecords) if (r.kind === "android" && r.owned) reap({
+		...r,
+		name: r.id,
+		idleDays: 0
+	}, true);
+	else if (withConfigLock(() => {
+		if (r.kind === "android" && deviceSlotPlatforms(getProject(r.project), r.slot)?.android?.owned) return false;
+		return clearDevice(r.project, r.kind, r.slot, r.id);
+	})) console.log(chalk.green(`Cleared the ${r.kind} record for ${r.project} (${r.id} is not on this machine)`));
 	return deleteFailures;
 }
 //#endregion
@@ -932,7 +943,7 @@ function malformedRemoteSessionLockNotice(roots) {
 	for (const root of roots) {
 		const lockPath = join(workspaceDir(root), "remote-session.lock");
 		if (!existsSync(lockPath)) continue;
-		if (readClaimSet(lockPath).unresolved.length === 0) continue;
+		if ((0, ownership_claim_exports.readClaimSet)(lockPath).unresolved.length === 0) continue;
 		return `EAS session sweep skipped: the remote-session lock at ${lockPath} has a malformed owner record.`;
 	}
 	return null;
@@ -1154,7 +1165,7 @@ function unresolvedLockLines(locks, slots) {
 		"              remove one yourself once you know nothing is building with it"
 	];
 }
-function formatGcReport({ skipped = [], deadProjects = [], invalidProjects = [], parkedSims = [], parkedAvds = [], orphanedDevices = [], staleDevices = [], staleDeviceRecords = [], buildLocks = {
+function formatGcReport({ skipped = [], deadProjects = [], orphanedPorts, invalidProjects = [], parkedSims = [], parkedAvds = [], orphanedDevices = [], staleDevices = [], staleDeviceRecords = [], buildLocks = {
 	stale: [],
 	live: [],
 	unresolved: []
@@ -1187,6 +1198,7 @@ function formatGcReport({ skipped = [], deadProjects = [], invalidProjects = [],
 	}
 	lines.push(...projectEntryLines(`Dead project entries (${deadProjects.length}):`, deadProjects));
 	lines.push(...projectEntryLines(`Invalid project entries (${invalidProjects.length}) - the key is not an absolute path:`, invalidProjects));
+	lines.push(...namedPortLines(orphanedPorts));
 	lines.push(...formatParkedSimReport(parkedSims, now));
 	lines.push(...formatParkedAvdReport(parkedAvds, now));
 	if (orphanedDevices.length) {
@@ -1292,6 +1304,14 @@ function leaseGarbageLines({ expired, kept }) {
 function deviceSizeSuffix(device) {
 	return device.kind === "android" && device.bytes !== void 0 ? ` - ${formatBytes(device.bytes)} on disk` : "";
 }
+function namedPortLines(ports = []) {
+	if (!ports.length) return [];
+	return [
+		`Orphaned named ports (${ports.length}):`,
+		...ports.map(({ project, label, port }) => `  ${project}: ${label} (${port})`),
+		"              --delete stops TCP listeners and releases these allocations."
+	];
+}
 //#endregion
 //#region src/commands/gc.ts
 function removeInvalidProjectEntries(invalidProjects) {
@@ -1464,6 +1484,11 @@ async function collectGcReport({ olderThan = null, cache = null, now = Date.now(
 	return {
 		skipped,
 		deadProjects,
+		orphanedPorts: deadProjects.flatMap((project) => Object.entries(cfg?.projects[project]?.ports ?? {}).map(([label, port]) => ({
+			project,
+			label,
+			port
+		}))),
 		invalidProjects,
 		parkedSims,
 		parkedAvds,
@@ -1591,7 +1616,16 @@ async function runGcCore(opts, deps) {
 	let deleteFailures = deleteParkedSims(report.parkedSims, deps) + deleteParkedAvds(report.parkedAvds);
 	removeInvalidProjectEntries(invalidProjects);
 	for (const path of deadProjects) {
-		const result = await reclaimProject(path);
+		if (existsSync(path) || !isOnMountedVolume(path)) {
+			console.log(chalk.yellow(`Kept ${path}: its absence can no longer be confirmed.`));
+			continue;
+		}
+		const result = await reclaimProject(path).catch((error) => {
+			deleteFailures++;
+			console.log(chalk.red(`Could not prune ${path}; its registry entry was kept: ${error.message}`));
+			return null;
+		});
+		if (!result) continue;
 		if (result.keptEntry) console.log(chalk.yellow(`Could not fully prune ${path}; its registry entry was kept.`));
 		else console.log(chalk.green(`Pruned ${path}`));
 		for (const dir of result.removedWorkspaceDirs) console.log(chalk.dim(`  removed workspace output ${dir}`));
@@ -1606,7 +1640,7 @@ async function runGcCore(opts, deps) {
 	}
 	deleteFailures += deleteProjectDevices(orphanedDevices, staleDevices, staleDeviceRecords);
 	for (const lock of buildLocks.stale) {
-		const cleared = clearFreeClaimSet({
+		const cleared = (0, ownership_claim_exports.clearFreeClaimSet)({
 			root: lock.path,
 			label: `${lock.platform} build`
 		});
@@ -1623,7 +1657,7 @@ async function runGcCore(opts, deps) {
 		console.log(chalk.green(`Cleared the ${lock.platform} build lock left by pid ${lock.pid ?? "?"} (${lock.projectRoot || "unrecorded workspace"})`));
 	}
 	for (const slot of buildSlots.stale) {
-		const cleared = clearFreeClaimSet({
+		const cleared = (0, ownership_claim_exports.clearFreeClaimSet)({
 			root: slot.path,
 			label: "build slot"
 		});