stim 1.26.0 → 1.27.0

package/dist/{gc-ldgr-hXU.mjs → gc-CGZ1Yg88.mjs}

@@ -1,22 +1,23 @@
-import { D as ownership_claim_exports, S as process_identity_exports, c as throwIfCancelled, l as WorkspaceProcessCleanupError, m as declareSpawnsOn, t as getExecutor, v as stopDeclaringSpawnsOn, x as withDrainingCancellation } from "./exec-VFRpu1iA.mjs";
-import { E as workspaceDir, u as workspaceLastUsed } from "./workspace-state-pUg3_RRA.mjs";
-import { F as isOnMountedVolume, G as projectDeviceSlots, I as listMountedVolumes, L as measuredDirectorySizeAsync, N as directorySizeAsync, O as withConfigLockAsync$1, P as formatBytes, R as volumeRootFor, S as removeProject, _ as loadConfig$1, d as getConfigDir, j as acquireAvdClaim } from "./config-BktkY_zC.mjs";
-import { d as quotedPath$1, h as shortUdid, o as formatLongDuration, u as plural } from "./command-output-BF5AR2dL.mjs";
-import { t as runOperationFile } from "./operation-exec-CUZifp6Z.mjs";
-import { Dt as listWorktreesAsync, Lt as resolveSourceCheckoutAsync } from "./settings-CosW5X-S.mjs";
-import { i as findProjectRoot$1, v as detectIsExpo } from "./project-BUu6Is4k.mjs";
-import { Ct as forgetCreatedDeviceAsync, F as listAvdsAsync, L as listOrphanedAvdDirectories, V as ownedAvdDirectory, ft as POOL_SETTING_REMEDY, h as avdNameAbsent, vt as parkedMaxSetting, wt as readCreatedDevices$1 } from "./android-DTAcRwBC.mjs";
-import { n as easMachineStateRoot$1, o as removeEasSessionClaimAsync, r as readEasSessionLedger$1 } from "./eas-session-ledger-B5vygTiD.mjs";
-import { At as describeUnverifiableDevices, Bt as describeError, C as gcOptionsOf, Ct as collectDeviceLeases, D as collectIdleDevices, Dr as discoverCaches, Dt as deleteParkedSims, Et as deleteParkedAvds, Ft as findStaleProjectDevices, It as unverifiedDeviceCommand, Lt as withAndroidAvdSizes, M as parseIdleDuration, Mt as eraseParkedDevices, N as shutDownIdleDevices, Nt as findOrphanedDevices, O as collectIdleDevicesAsync, Ot as deleteProjectDevices, Pt as findStaleDeviceRecords, Qt as withEasProjectLock, Rt as collectEasSessionSweep, Sr as scopedMemoryReport, St as DEVICE_LIST_TIMEOUT_MS, T as openGcLog, Tt as collectParkedSims, Un as runProcessOperation, Vt as withRemoteSessionGcLocks, _r as memoryLines, _t as gradleVersionsPending, at as includesRecordings, br as memoryWorkPending, bt as getMachineCacheReport, ct as planCacheEmptying, dr as parseArchiveSelector, dt as selectsBeyondCaches, ft as trimCaches, gr as memoryCacheKind, gt as gradleVersionLines, ht as deleteGradleVersions, it as includesParkedDevices, j as idleDeviceLines, jt as deviceSweepIsScoped, kr as sizeCaches, lt as previewScopedEmptying, mr as collectMemoryReport, nt as emptyCaches, ot as includesWorkspaceOutputs, pt as collectGradleVersions, rt as includesArchives, st as isWorkspacesScope, ut as selectCaches, vr as memoryScope, vt as includesGradleVersions, wr as phase, wt as collectParkedAvds, xr as reclaimMemory, xt as collectInventory, yr as memorySweepIsScoped, zt as deleteEasSessions } from "./budget-k2mZGvvk.mjs";
+import { D as ownership_claim_exports, S as process_identity_exports, c as throwIfCancelled, l as WorkspaceProcessCleanupError, m as declareSpawnsOn, t as getExecutor, v as stopDeclaringSpawnsOn, x as withDrainingCancellation } from "./exec-aULwtNly.mjs";
+import { E as workspaceDir, u as workspaceLastUsed } from "./workspace-state-BjqdjnJR.mjs";
+import { F as isOnMountedVolume, G as projectDeviceSlots, I as listMountedVolumes, L as measuredDirectorySizeAsync, N as directorySizeAsync, O as withConfigLockAsync$1, P as formatBytes, R as volumeRootFor, S as removeProject, _ as loadConfig$1, d as getConfigDir, j as acquireAvdClaim } from "./config-Cn94Jc0g.mjs";
+import { d as quotedPath$1, h as shortUdid, o as formatLongDuration, u as plural } from "./command-output-Dj-WT4BP.mjs";
+import { t as runOperationFile } from "./operation-exec-Dp4FuIGR.mjs";
+import { At as listWorktreesAsync, Bt as resolveSourceCheckoutAsync, Gt as TRASH_CLAIMS, Jt as deleteTrashEntry, qt as TRASH_MANIFEST } from "./settings-BDVI8Ivc.mjs";
+import { i as findProjectRoot$1, v as detectIsExpo } from "./project-DYj-HVx6.mjs";
+import { Ct as forgetCreatedDeviceAsync, F as listAvdsAsync, L as listOrphanedAvdDirectories, V as ownedAvdDirectory, ft as POOL_SETTING_REMEDY, h as avdNameAbsent, vt as parkedMaxSetting, wt as readCreatedDevices$1 } from "./android-DriNoAVy.mjs";
+import { $ as gradleVersionLines, $n as memoryCacheKind, B as includesArchives, Ct as describeError, En as runProcessOperation, F as gcOptionsOf, Ft as withEasProjectLock, G as planCacheEmptying, H as includesRecordings, J as selectsBeyondCaches, Jn as parseArchiveSelector, K as previewScopedEmptying, L as openGcLog, Q as deleteGradleVersions, St as deleteEasSessions, U as includesWorkspaceOutputs, V as includesParkedDevices, W as isWorkspacesScope, X as collectGradleVersions, Y as trimCaches, Zn as collectMemoryReport, _t as findStaleDeviceRecords, ar as scopedMemoryReport, at as DEVICE_LIST_TIMEOUT_MS, bt as withAndroidAvdSizes, ct as collectParkedSims, dt as deleteProjectDevices, er as memoryLines, et as gradleVersionsPending, fr as sizeCaches, gt as findOrphanedDevices, ht as eraseParkedDevices, ir as reclaimMemory, it as collectInventory, lt as deleteParkedAvds, mt as deviceSweepIsScoped, nr as memorySweepIsScoped, ot as collectDeviceLeases, pt as describeUnverifiableDevices, q as selectCaches, rr as memoryWorkPending, rt as getMachineCacheReport, sr as phase, st as collectParkedAvds, tr as memoryScope, tt as includesGradleVersions, ur as discoverCaches, ut as deleteParkedSims, vt as findStaleProjectDevices, wt as withRemoteSessionGcLocks, xt as collectEasSessionSweep, yt as unverifiedDeviceCommand, z as emptyCaches } from "./ccache-BWTze1Ls.mjs";
+import { n as easMachineStateRoot$1, o as removeEasSessionClaimAsync, r as readEasSessionLedger$1 } from "./eas-session-ledger-DrP4OuuM.mjs";
+import { A as collectIdleDevicesAsync, Ct as createGcResults, Dt as readConcurrency, Et as mapLimited, F as parseIdleDuration, I as shutDownIdleDevices, N as idleDeviceLines, Ot as sizeConcurrency, St as GC_OUTPUT, Tt as eachLimited, _ as withIdleWorkspace, a as collectOrphanedWorkspaces, bt as listBuildSlots, c as isInsideWorkspaces, d as rootPresence, f as sizeText, h as ARTIFACT_DIRS, i as clearWorkspaceOutputs, k as collectIdleDevices, l as listWorkspaceDirs, n as REBUILD_COST, o as collectWorkspaceOutputs, r as WORKSPACE_OUTPUT_DIRS, s as deleteOrphanedWorkspaces, t as LIGHTEN_AFTER_MS, y as workspaceInUseAsync } from "./workspaces-DFbj07jp.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { B as GC_OUTPUT, R as listBuildSlots, V as createGcResults, a as collectWorkspaceOutputs, c as listWorkspaceDirs, h as workspaceInUseAsync, i as collectOrphanedWorkspaces, l as rootPresence, n as WORKSPACE_OUTPUT_DIRS, o as deleteOrphanedWorkspaces, p as withIdleWorkspace, r as clearWorkspaceOutputs, s as isInsideWorkspaces, t as REBUILD_COST, u as sizeText } from "./workspaces-g2lhdBXF.mjs";
-import { N as listBuildLocks, k as removeExpiredLease } from "./activity-Lnb_EoRY.mjs";
-import { d as listAllIosSims, f as listAllIosSimsAsync } from "./ios-WxpDJ5T1.mjs";
-import { r as readCollectors } from "./ownership-BjYvMNX_.mjs";
-import { C as reclaimProject, S as describeDereferenced, T as sweepArchiveStaging, a as matchWorktreeEntry, b as TRASH_MANIFEST, v as TRASH_CLAIMS, w as deleteSelectedArchives, x as deleteTrashEntry } from "./worktree-BKuklFh_.mjs";
-import { s as writeCacheFile } from "./warm-progress-DvhTX_eu.mjs";
-import { S as readConcurrency, _ as collectWorktreeSweep, a as previewMaintenance, b as worktreeRemovalReason, c as deleteTempLeftovers, d as ARTIFACT_DIRS, f as appRoots, g as candidateRootsAsync, h as ownedDeviceUsage, l as tempLeftoverLines, o as triggeringRoot, p as finishedWorkspaces, s as collectTempLeftovers, t as deleteIdleWorkspaceDevices, u as tempLeftoverSection, v as removeWorktrees, x as eachLimited, y as worktreePullRequestNote } from "./act-C-BqJEpu.mjs";
-import { i as getSwiftpmCacheUsage, n as swiftpmCacheLines, r as getAgentDeviceUsage, t as agentDeviceLines } from "./agent-device-usage-output-DbXy5tg8.mjs";
+import { N as listBuildLocks, k as removeExpiredLease } from "./activity-Cd-ysFes.mjs";
+import { d as listAllIosSims, f as listAllIosSimsAsync } from "./ios-E26qSpkb.mjs";
+import { r as readCollectors } from "./ownership-Bx-0cku-.mjs";
+import { A as reclaimProject, M as sweepArchiveStaging, a as matchWorktreeEntry, j as deleteSelectedArchives, k as describeDereferenced } from "./worktree-COAJ3-OD.mjs";
+import { p as writeCacheFile } from "./warm-progress-C0RsbngN.mjs";
+import { a as restoreProblem, o as workspaceKeys } from "./lightened-BCsdAGj_.mjs";
+import { C as worktreeRemovalReason, S as worktreePullRequestNote, _ as ownedDeviceUsage, a as previewMaintenance, b as collectWorktreeSweep, c as deleteTempLeftovers, d as appRoots, f as artifactWorktrees, h as finishedWorkspaces, l as tempLeftoverLines, m as collectArtifactsAsync, o as triggeringRoot, p as clearArtifact, s as collectTempLeftovers, t as deleteIdleWorkspaceDevices, u as tempLeftoverSection, v as maintenancePinned, x as removeWorktrees, y as candidateRootsAsync } from "./act-ROviTF_t.mjs";
+import { i as getSwiftpmCacheUsage, n as swiftpmCacheLines, r as getAgentDeviceUsage, t as agentDeviceLines } from "./agent-device-usage-output-C5nCKWp9.mjs";
 import { claimRemoveCommand, isClaimRefusal, isClaimUnavailable, readClaimSet, releaseClaim, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
 import { existsSync, lstatSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
@@ -571,10 +572,15 @@ async function readManifest(dir) {
 		const parsed = JSON.parse(await readFile(join(dir, TRASH_MANIFEST), "utf8"));
 		if (!parsed || typeof parsed !== "object" || !("worktree" in parsed) || !("createdAt" in parsed)) return null;
 		const { worktree, createdAt } = parsed;
-		return typeof worktree === "string" && typeof createdAt === "string" ? {
+		if (typeof worktree !== "string" || typeof createdAt !== "string") return null;
+		return "kind" in parsed && parsed.kind === "warm" ? {
+			worktree,
+			createdAt,
+			kind: "warm"
+		} : {
 			worktree,
 			createdAt
-		} : null;
+		};
 	} catch {
 		return null;
 	}
@@ -598,7 +604,7 @@ async function collectTrash({ signal, operation } = {}) {
 			live: false
 		};
 		const live = claim.live;
-		const kept = claim.kept ?? (manifest ? await worktreeKept(manifest.worktree) : null);
+		const kept = claim.kept ?? (manifest && manifest.kind !== "warm" ? await worktreeKept(manifest.worktree) : null);
 		entries.push({
 			path,
 			worktree: manifest?.worktree ?? null,
@@ -796,7 +802,7 @@ function formatGcReport({ maintenance, archives, skipped = [], deadProjects = []
 	orphaned: [],
 	notices: [],
 	deletionSafe: true
-}, agentDeviceUsage = null, swiftpmCacheUsage, machineCaches, tempLeftovers, trash, gradleVersions, caches = [], workspaceOutputs = null, workspaceLogs = [], recordings = [], worktreeSweep = null, memory, cacheScope = null, olderThan = null }, { now = Date.now() } = {}) {
+}, agentDeviceUsage = null, swiftpmCacheUsage, machineCaches, tempLeftovers, trash, gradleVersions, caches = [], workspaceOutputs = null, worktreeDependencies, workspaceLogs = [], recordings = [], worktreeSweep = null, memory, cacheScope = null, olderThan = null }, { now = Date.now() } = {}) {
 	const lines = archiveLines(archives);
 	const parkedHostedLines = formatParkedHostedDeviceReport(parkedHostedDevices, now);
 	const easLedgerLines = staleEasLedgerLines(staleEasLedgerEntries);
@@ -825,6 +831,7 @@ function formatGcReport({ maintenance, archives, skipped = [], deadProjects = []
 		expiredLeases,
 		easSessionSweep.orphaned,
 		workspaceOutputs?.workspaces.filter((entry) => entry.willClear) ?? [],
+		dependencyCandidates(worktreeDependencies),
 		workspaceLogs.filter((entry) => entry.willTrim),
 		worktreeSweep?.worktrees.filter((entry) => !entry.skipped) ?? []
 	].every((found) => found.length === 0)) {
@@ -924,6 +931,7 @@ function formatGcReport({ maintenance, archives, skipped = [], deadProjects = []
 		lines.push(`Skipped (${skipped.length}) - not classified as dead:`);
 		for (const entry of skipped) lines.push(`  ${entry.dir}: ${entry.reason}`);
 	}
+	lines.push(...worktreeDependencyLines(worktreeDependencies));
 	lines.push(...workspaceLogLines(workspaceLogs));
 	lines.push(...recordingLines(recordings));
 	lines.push(...cacheLines(caches, workspaceOutputs));
@@ -937,6 +945,16 @@ function formatGcReport({ maintenance, archives, skipped = [], deadProjects = []
 	lines.push(...maintenanceReportLines(maintenance));
 	return lines;
 }
+function dependencyCandidates(found) {
+	return found?.candidates.map(({ path }) => path) ?? [];
+}
+function worktreeDependencyLines(found) {
+	if (!found || !found.candidates.length && !found.skips.length) return [];
+	const lines = [`Worktree dependencies (${found.candidates.length} of ${found.candidates.length + found.skips.length} would be LIGHTENED; the next start, ios or android restores them with worktree warm):`];
+	for (const { path } of found.candidates) lines.push(`  ${path}`, "              would be LIGHTENED");
+	for (const { target, reason } of found.skips) lines.push(`  ${target}`, `              kept: ${reason}`);
+	return lines;
+}
 function workspaceLogLines(workspaceLogs) {
 	const over = workspaceLogs.filter((w) => w.trimBytes > 0);
 	if (!over.length) return [];
@@ -990,13 +1008,14 @@ function workspaceOutputLines(outputs, bytes) {
 	const lines = [
 		`  ${formatBytes(bytes).padStart(10)}  Workspace build outputs (detected)`,
 		`              ${outputs.root}`,
-		`              ${WORKSPACE_OUTPUT_DIRS.join(", ")}, macOS Swift scratch and staged app bundles of each workspace; workspace.json, state.json, logs and device records stay`,
+		`              ${WORKSPACE_OUTPUT_DIRS.join(", ")}, macOS Swift scratch and staged app bundles of each workspace, and the git-ignored in-tree build directories of its project; workspace.json, state.json, logs and device records stay`,
 		`              ${REBUILD_COST}`
 	];
 	for (const w of outputs.workspaces) {
 		const idle = w.idleDays === null ? "last use unknown" : `idle ${w.idleDays}d`;
 		lines.push(`    ${sizeText(w.bytes).padStart(8)}  ${w.projectRoot ?? w.dir} (${idle})`);
-		lines.push(w.willClear ? "                would be CLEARED" : `                kept: ${w.keptReason}`);
+		if (w.inTreeDirs.length) lines.push(`                with ${w.inTreeDirs.join(", ")}`);
+		lines.push(w.willClear ? "                would be LIGHTENED" : `                kept: ${w.keptReason}`);
 	}
 	return lines;
 }
@@ -1028,7 +1047,7 @@ function cacheLines(caches, workspaceOutputs) {
 		const clearing = outputs?.workspaces.filter((w) => w.willClear) ?? [];
 		if (clearing.length) {
 			const clearBytes = clearing.reduce((n, w) => n + (w.bytes ?? 0), 0);
-			lines.push(`  would clear the build outputs of ${clearing.length} workspace${clearing.length === 1 ? "" : "s"} (${formatBytes(clearBytes)})`);
+			lines.push(`  would lighten ${clearing.length} workspace${clearing.length === 1 ? "" : "s"}, freeing ${formatBytes(clearBytes)} of build outputs`);
 		}
 	}
 	return lines;
@@ -1123,7 +1142,7 @@ function gcReportSections({ archives, skipped = [], deadProjects = [], orphanedP
 	orphaned: [],
 	notices: [],
 	deletionSafe: true
-}, workspaceOutputs = null, workspaceLogs = [], recordings = [], agentDeviceUsage = null, swiftpmCacheUsage = null, machineCaches = null, tempLeftovers = null, trash = null, gradleVersions = null, caches = [], memory = null }) {
+}, workspaceOutputs = null, workspaceLogs = [], worktreeDependencies = null, recordings = [], agentDeviceUsage = null, swiftpmCacheUsage = null, machineCaches = null, tempLeftovers = null, trash = null, gradleVersions = null, caches = [], memory = null }) {
 	return {
 		...archives ? {
 			archived: archives.records,
@@ -1280,6 +1299,15 @@ function gcReportSections({ archives, skipped = [], deadProjects = [], orphanedP
 			reason: w.keptCode,
 			detail: w.keptReason
 		})),
+		worktreeDependencies: [...(worktreeDependencies?.candidates ?? []).map(({ path }) => ({
+			path,
+			willDelete: true,
+			detail: null
+		})), ...(worktreeDependencies?.skips ?? []).map(({ target, reason }) => ({
+			path: target,
+			willDelete: false,
+			detail: reason
+		}))],
 		recordings: recordings.map((r) => ({
 			dir: r.dir,
 			projectRoot: r.projectRoot,
@@ -1293,6 +1321,7 @@ function gcReportSections({ archives, skipped = [], deadProjects = [], orphanedP
 		workspaceBuildOutputs: (workspaceOutputs?.workspaces ?? []).map((w) => ({
 			dir: w.dir,
 			projectRoot: w.projectRoot,
+			inTreeDirs: w.inTreeDirs,
 			bytes: w.bytes,
 			idleDays: w.idleDays,
 			willClear: w.willClear,
@@ -1321,11 +1350,85 @@ function gcReportSections({ archives, skipped = [], deadProjects = [], orphanedP
 	};
 }
 //#endregion
+//#region src/commands/gc/dependencies.ts
+const NO_RESTORE = "Stim has no workspace in its worktree, so no start, ios or android run would restore it";
+/**
+* node_modules and ios/Pods of linked worktrees `gc --delete` lightens: idle for LIGHTEN_AFTER_MS, holding a Stim
+* workspace that restores them, and with nothing running from them.
+*/
+async function collectWorktreeDependencies({ now, operation }) {
+	const found = await collectArtifactsAsync("dependencies", {
+		now,
+		windowMs: LIGHTEN_AFTER_MS,
+		protectedRoot: canonicalPath(operation?.cwd ?? process.cwd()),
+		pinned: maintenancePinned
+	}, operation?.signal ?? new AbortController().signal, operation);
+	const sources = /* @__PURE__ */ new Map();
+	const candidates = [];
+	const skips = [...found.skips];
+	for (const candidate of found.candidates) {
+		const reason = workspaceKeys(candidate.keys).length ? await restoreProblem(candidate, sources, operation) : NO_RESTORE;
+		if (reason) skips.push({
+			target: candidate.path,
+			reason
+		});
+		else candidates.push(candidate);
+	}
+	return {
+		candidates,
+		skips
+	};
+}
+async function lightenWorktreeDependencies(found, { log, record } = GC_OUTPUT, operation) {
+	if (!found?.candidates.length) return 0;
+	const worktrees = artifactWorktrees();
+	const protectedRoot = canonicalPath(operation?.cwd ?? process.cwd());
+	const restoreCache = /* @__PURE__ */ new Map();
+	let failures = 0;
+	for (const { worktree, path } of found.candidates) {
+		operation?.signal.throwIfAborted();
+		try {
+			const outcome = await clearArtifact({
+				kind: "would-delete-dependencies",
+				target: path,
+				bytes: 0,
+				reason: "gc --delete"
+			}, "dependencies", {
+				windowMs: LIGHTEN_AFTER_MS,
+				protectedRoot,
+				pinned: maintenancePinned,
+				worktrees,
+				requireRestorable: true,
+				restoreCache
+			});
+			if (outcome.status === "done") {
+				log(chalk.green(`Lightened ${worktree}: deleted ${path}, freeing ${formatBytes(outcome.bytes)}; the next start, ios or android restores it with worktree warm`));
+				record("worktreeDependencies", "done", path, { bytes: outcome.bytes });
+			} else {
+				log(chalk.yellow(`Kept ${path}: ${outcome.detail}`));
+				record("worktreeDependencies", "kept", path, {
+					bytes: null,
+					detail: outcome.detail
+				});
+			}
+		} catch (error) {
+			operation?.signal.throwIfAborted();
+			failures++;
+			const detail = error instanceof Error ? error.message : String(error);
+			log(chalk.red(`Could not delete ${path}: ${detail}`));
+			record("worktreeDependencies", "failed", path, {
+				bytes: null,
+				detail
+			});
+		}
+	}
+	return failures;
+}
+//#endregion
 //#region src/commands/gc/worktree-sizes.ts
 const SIZE_TIMEOUT_MS = 3e4;
 const BUILD_STATE_MAX_AGE_MS = 36e5;
 const BUILD_STATE_TIMEOUT_MS = 1e4;
-const BUILD_STATE_CONCURRENCY = 4;
 const PNPM_STORE = ".pnpm-store";
 const WORKTREES_DIR = ".worktrees";
 function isDirectory(path) {
@@ -1394,8 +1497,8 @@ async function duSize(dir, operation) {
 /**
 * Sizes the regenerable directories maintenance clears and a project-local `.pnpm-store` in each worktree of the
 * sweep, from the disk-usage cache while an entry is under an hour old and no entry was added to or removed from the
-* directory since. Stale directories are measured with one `du` each, sequentially with an operation and at most
-* 4 at once otherwise, with 10 seconds each, so a
+* directory since. Stale directories are measured with one `du` each, at most 4 at once, one at a time while the
+* operation declares its children on a claim, with 10 seconds each, so a
 * slow tree delays only itself; a directory du could not measure in time is reported unmeasured (null). Without
 * `measure`, stale directories are reported unmeasured without a `du`. Also lists
 * the directories directly under a repository's `.worktrees/` that are no git worktree at all.
@@ -1421,7 +1524,7 @@ async function measureWorktreeSweep(sweep, operation, measure = true) {
 	}] : [])) : [];
 	const worktrees = new Set(due.map(({ sizes }) => sizes)).size;
 	if (due.length) phase("worktrees", `measuring the build state of ${plural(worktrees, "worktree")}`, operation);
-	await eachLimited(due, operation ? 1 : BUILD_STATE_CONCURRENCY, async ({ dir, sizes }) => {
+	await eachLimited(due, sizeConcurrency(operation), async ({ dir, sizes }) => {
 		operation?.signal.throwIfAborted();
 		const measuredAt = (/* @__PURE__ */ new Date()).toISOString();
 		const bytes = await duSize(dir, operation);
@@ -1477,7 +1580,7 @@ async function unlistedWorktreeDirs(operation) {
 		if ("refusal" in source || repositories.has(source.path)) continue;
 		repositories.set(source.path, entries.map((entry) => canonicalPath(entry.path)));
 	}
-	const found = [];
+	const unlisted = [];
 	for (const [repository, listed] of repositories) {
 		operation?.signal.throwIfAborted();
 		const parent = join(repository, WORKTREES_DIR);
@@ -1493,18 +1596,21 @@ async function unlistedWorktreeDirs(operation) {
 			if (!isDirectory(path) || hasLiveGitDir(path)) continue;
 			const real = canonicalPath(path);
 			if (listed.some((entry) => entry === real || entry.startsWith(`${real}${sep}`))) continue;
-			found.push({
+			unlisted.push({
 				path,
-				repository,
-				bytes: await measuredDirectorySizeAsync(path, {
-					timeoutMs: SIZE_TIMEOUT_MS,
-					operation,
-					signal: operation?.signal
-				})
+				repository
 			});
 		}
 	}
-	return found;
+	return await mapLimited(unlisted, sizeConcurrency(operation), async ({ path, repository }) => ({
+		path,
+		repository,
+		bytes: await measuredDirectorySizeAsync(path, {
+			timeoutMs: SIZE_TIMEOUT_MS,
+			operation,
+			signal: operation?.signal
+		})
+	}));
 }
 //#endregion
 //#region src/commands/gc/ledger.ts
@@ -2211,7 +2317,8 @@ async function collectGcReport({ olderThan = null, cache = null, worktrees = fal
 			now,
 			exclude: isWorkspacesScope(scope) ? await removedWholeWorkspaceDirs(operation) : [],
 			signal: operation?.signal,
-			operation
+			operation,
+			lighten: true
 		}) : null,
 		workspaceLogs: [],
 		recordings: includesRecordings(scope) ? await collectRecordings({
@@ -2483,6 +2590,11 @@ async function collectGcReport({ olderThan = null, cache = null, worktrees = fal
 			now,
 			exclude: goneWorkspaceDirs,
 			signal: operation?.signal,
+			operation,
+			lighten: true
+		}),
+		worktreeDependencies: await collectWorktreeDependencies({
+			now,
 			operation
 		}),
 		workspaceLogs: await collectWorkspaceLogs({
@@ -2821,7 +2933,7 @@ async function reclaimParkedDevices(report, deps, output) {
 }
 function reportActionable(report) {
 	const { deadProjects, invalidProjects, orphanedDevices, staleDevices, staleDeviceRecords, buildLocks, buildSlots, deviceLeases, easSessionSweep, caches, olderThan, all, cacheScope: cache } = report;
-	return archiveWorkPending(report.archives, deadProjects.length + invalidProjects.length > 0 || report.orphanedWorkspaces.length > 0 || Boolean(report.workspaceOutputs?.workspaces.some((entry) => entry.willClear)) || report.workspaceLogs.some((entry) => entry.willTrim) || report.recordings.some((entry) => entry.willDelete && !entry.withWorkspace) || Boolean(report.tempLeftovers?.entries.some((entry) => entry.willDelete)) || Boolean(report.trash?.entries.some((entry) => entry.willDelete)) || Boolean(report.worktreeSweep?.worktrees.some((entry) => !entry.skipped)) || report.parkedSims.length > 0 || report.parkedAvds.length + report.parkedHostedDevices.filter((device) => device.listed !== false).length > 0 || orphanedDevices.length > 0 || staleDevices.length + report.finishedDevices.length > 0 || staleDeviceRecords.length > 0 || report.staleLedgerEntries.length + report.staleEasLedgerEntries.length > 0 || report.staleStatusCaches.length > 0 || buildLocks.stale.length > 0 || buildSlots.stale.length > 0 || deviceLeases.expired.length > 0 || easSessionSweep.orphaned.length > 0 || (olderThan !== null || all) && caches.length > 0 || scopedWorkPending(cache, report));
+	return archiveWorkPending(report.archives, deadProjects.length + invalidProjects.length > 0 || report.orphanedWorkspaces.length > 0 || Boolean(report.workspaceOutputs?.workspaces.some((entry) => entry.willClear)) || Boolean(report.worktreeDependencies?.candidates.length) || report.workspaceLogs.some((entry) => entry.willTrim) || report.recordings.some((entry) => entry.willDelete && !entry.withWorkspace) || Boolean(report.tempLeftovers?.entries.some((entry) => entry.willDelete)) || Boolean(report.trash?.entries.some((entry) => entry.willDelete)) || Boolean(report.worktreeSweep?.worktrees.some((entry) => !entry.skipped)) || report.parkedSims.length > 0 || report.parkedAvds.length + report.parkedHostedDevices.filter((device) => device.listed !== false).length > 0 || orphanedDevices.length > 0 || staleDevices.length + report.finishedDevices.length > 0 || staleDeviceRecords.length > 0 || report.staleLedgerEntries.length + report.staleEasLedgerEntries.length > 0 || report.staleStatusCaches.length > 0 || buildLocks.stale.length > 0 || buildSlots.stale.length > 0 || deviceLeases.expired.length > 0 || easSessionSweep.orphaned.length > 0 || (olderThan !== null || all) && caches.length > 0 || scopedWorkPending(cache, report));
 }
 async function runGcCore(opts, deps, execution, reportOnly = false) {
 	const { output, takeResults } = execution;
@@ -2901,9 +3013,12 @@ async function runGcCore(opts, deps, execution, reportOnly = false) {
 	deleteFailures += report.workspaceOutputs ? (await clearWorkspaceOutputs(report.workspaceOutputs, {
 		olderThan,
 		signal,
-		operation: deps.operation
+		operation: deps.operation,
+		lighten: true
 	}, output)).failures : 0;
 	throwIfCancelled(signal, "GC");
+	deleteFailures += await lightenWorktreeDependencies(report.worktreeDependencies, output, deps.operation);
+	throwIfCancelled(signal, "GC");
 	deleteFailures += await trimWorkspaceLogs(report.workspaceLogs, output, deps.operation);
 	throwIfCancelled(signal, "GC");
 	deleteFailures += await deleteRecordings(report.recordings, {
@@ -3020,14 +3135,14 @@ async function runGcCore(opts, deps, execution, reportOnly = false) {
 		output.fail();
 	}
 	throwIfCancelled(signal, "GC");
-	if (all) await emptyCaches(caches, output, signal, deps.operation);
+	if (all) deleteFailures += await emptyCaches(caches, output, signal, deps.operation);
 	else if (olderThan === null) {
 		if (caches.length) output.log(chalk.dim("Shared caches left alone: pass --cache all to empty them, or --older-than <days> to trim them."));
-	} else await trimCaches(caches, olderThan, output, signal, deps.operation);
+	} else deleteFailures += (await trimCaches(caches, olderThan, output, signal, deps.operation)).failures;
 	return payload(deleteFailures);
 }
 function gcCommand(program) {
-	program.command("gc").description("Report what Stim has left behind: dead project entries, orphaned workspace directories, clean Stim-managed linked worktrees whose branch is merged or whose pull request was merged or closed, orphaned owned devices and EAS sessions, records of devices that no longer exist, build locks whose builder is gone, expired physical-device leases, the shared build caches, the build outputs and logs of each workspace, the memory of watchman and of the Gradle and Kotlin daemons, and recognized leftovers in TMPDIR. Reports by default; pass --delete to act.").option("--worktrees", "also remove clean, idle Stim-managed linked worktrees, not only merged ones: with --delete run `stim worktree remove` (never --force) on each; idle means unused for --older-than days, 7 without it").option("--delete", "actually prune the reported entries, reap the reported devices, clear the build outputs of every workspace not in use, and trim its Metro, client and device logs to their newest 8 MiB").option("--older-than <days>", "also reap owned devices whose workspace has not been used this long, trim shared cache entries nothing has used in that time and device recordings made before it, and clear workspace build outputs only for workspaces idle this long and parked devices only once parked this long", (v) => {
+	program.command("gc").description("Report what Stim has left behind: dead project entries, orphaned workspace directories, clean Stim-managed linked worktrees whose branch is merged or whose pull request was merged or closed, orphaned owned devices and EAS sessions, records of devices that no longer exist, build locks whose builder is gone, expired physical-device leases, the shared build caches, the build outputs and logs of each workspace, the memory of watchman and of the Gradle and Kotlin daemons, and recognized leftovers in TMPDIR. Reports by default; pass --delete to act.").option("--worktrees", "also remove clean, idle Stim-managed linked worktrees, not only merged ones: with --delete run `stim worktree remove` (never --force) on each; idle means unused for --older-than days, 7 without it").option("--delete", "actually prune the reported entries, reap the reported devices, lighten every workspace that is not building and ran no ios, android or macos command in the last 15 minutes by clearing its build outputs, a running dev server or booted device included, and trim its Metro, client and device logs to their newest 8 MiB").option("--older-than <days>", "also reap owned devices whose workspace has not been used this long, trim shared cache entries nothing has used in that time and device recordings made before it, and clear workspace build outputs only for workspaces idle this long and parked devices only once parked this long", (v) => {
 		const n = parseInt(v, 10);
 		if (!Number.isFinite(n) || String(n) !== String(v).trim()) throw new InvalidArgumentError("must be a whole number of days, e.g. --older-than 30");
 		return n;