stim 1.23.0 → 1.24.0

package/dist/{gc-CDoogxAI.mjs → gc-yVKpAOKM.mjs}

@@ -1,35 +1,36 @@
-import { c as declareSpawnsOn, f as stopDeclaringSpawnsOn, g as process_identity_exports, h as withDrainingCancellation, r as WorkspaceProcessCleanupError, t as getExecutor, x as ownership_claim_exports } from "./exec-DEoAhcze.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-VFRpu1iA.mjs";
 import { d as workspaceDir } from "./paths-DQtTgsBf.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-DlrsduwG.mjs";
-import { h as shortUdid, o as formatLongDuration, u as plural } from "./command-output-Db8BqzxH.mjs";
-import { f as throwIfCancelled, t as runOperationFile } from "./operation-exec-BW0em61G.mjs";
-import { u as workspaceLastUsed } from "./workspace-state-U08dEzhG.mjs";
-import { Et as listWorktreesAsync, It as resolveSourceCheckoutAsync } from "./settings-C7O8A6ZI.mjs";
-import { i as findProjectRoot$1, v as detectIsExpo } from "./project-CTLNHCfE.mjs";
-import { n as easMachineStateRoot$1, o as removeEasSessionClaimAsync, r as readEasSessionLedger$1 } from "./eas-session-ledger-BzzsX97d.mjs";
-import { $ as includesRecordings, At as unverifiedDeviceCommand, C as collectIdleDevices, D as idleDeviceLines, Dt as findOrphanedDevices, Et as eraseParkedDevices, Ft as withRemoteSessionGcLocks, In as runProcessOperation, Kt as withEasProjectLock, Mt as collectEasSessionSweep, Nt as deleteEasSessions, O as parseIdleDuration, Ot as findStaleDeviceRecords, Pt as describeError, Q as includesParkedDevices, Sr as sizeCaches, St as deleteProjectDevices, Tt as deviceSweepIsScoped, X as emptyCaches, Z as includesArchives, _r as phase, _t as collectDeviceLeases, at as selectsBeyondCaches, br as discoverCaches, bt as deleteParkedAvds, dr as memoryScope, dt as gradleVersionsPending, et as includesWorkspaceOutputs, fr as memorySweepIsScoped, ft as includesGradleVersions, gt as DEVICE_LIST_TIMEOUT_MS, hr as scopedMemoryReport, ht as collectInventory, ir as parseArchiveSelector, it as selectCaches, jt as withAndroidAvdSizes, k as shutDownIdleDevices, kt as findStaleProjectDevices, lr as memoryCacheKind, lt as deleteGradleVersions, mr as reclaimMemory, mt as getMachineCacheReport, nt as planCacheEmptying, ot as trimCaches, pr as memoryWorkPending, rt as previewScopedEmptying, sr as collectMemoryReport, st as collectGradleVersions, tt as isWorkspacesScope, ur as memoryLines, ut as gradleVersionLines, vt as collectParkedAvds, w as collectIdleDevicesAsync, wt as describeUnverifiableDevices, xt as deleteParkedSims, yt as collectParkedSims } from "./budget-DnPX3DXj.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-BZhXY15H.mjs";
+import { d as quotedPath$1, h as shortUdid, o as formatLongDuration, u as plural } from "./command-output-DxC0k2rk.mjs";
+import { t as runOperationFile } from "./operation-exec-CUZifp6Z.mjs";
+import { u as workspaceLastUsed } from "./workspace-state-CeBpIZgr.mjs";
+import { Et as listWorktreesAsync, It as resolveSourceCheckoutAsync } from "./settings-RKwY33wv.mjs";
+import { i as findProjectRoot$1, v as detectIsExpo } from "./project-Dz-hWkb-.mjs";
+import { F as listAvdsAsync, L as listOrphanedAvdDirectories, V as ownedAvdDirectory, ft as POOL_SETTING_REMEDY, h as avdNameAbsent, vt as parkedMaxSetting } from "./android-882m4hxX.mjs";
+import { n as forgetCreatedDeviceAsync, r as readCreatedDevices$1 } from "./created-devices-D2Aca-xu.mjs";
+import { n as easMachineStateRoot$1, o as removeEasSessionClaimAsync, r as readEasSessionLedger$1 } from "./eas-session-ledger-Ck6YXPAO.mjs";
+import { $ as includesArchives, At as findStaleDeviceRecords, C as collectIdleDevices, Ct as deleteParkedSims, D as idleDeviceLines, Dt as deviceSweepIsScoped, Et as describeUnverifiableDevices, Ft as deleteEasSessions, It as describeError, Jt as withEasProjectLock, Lt as withRemoteSessionGcLocks, Mt as unverifiedDeviceCommand, Nt as withAndroidAvdSizes, O as parseIdleDuration, Ot as eraseParkedDevices, Pt as collectEasSessionSweep, Q as emptyCaches, Rn as runProcessOperation, Sr as discoverCaches, St as deleteParkedAvds, _r as scopedMemoryReport, _t as collectInventory, at as previewScopedEmptying, bt as collectParkedAvds, ct as trimCaches, dr as memoryCacheKind, dt as deleteGradleVersions, et as includesParkedDevices, fr as memoryLines, ft as gradleVersionLines, gr as reclaimMemory, gt as getMachineCacheReport, hr as memoryWorkPending, it as planCacheEmptying, jt as findStaleProjectDevices, k as shutDownIdleDevices, kt as findOrphanedDevices, lr as collectMemoryReport, lt as collectGradleVersions, mr as memorySweepIsScoped, mt as includesGradleVersions, nt as includesWorkspaceOutputs, or as parseArchiveSelector, ot as selectCaches, pr as memoryScope, pt as gradleVersionsPending, rt as isWorkspacesScope, st as selectsBeyondCaches, tt as includesRecordings, vt as DEVICE_LIST_TIMEOUT_MS, w as collectIdleDevicesAsync, wr as sizeCaches, wt as deleteProjectDevices, xt as collectParkedSims, yr as phase, yt as collectDeviceLeases } from "./budget-dPGuhNai.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { B as createGcResults, L as listBuildSlots, a as collectWorkspaceOutputs, c as listWorkspaceDirs, f as withIdleWorkspace, i as collectOrphanedWorkspaces, l as rootPresence, m as workspaceInUseAsync, n as WORKSPACE_OUTPUT_DIRS, o as deleteOrphanedWorkspaces, r as clearWorkspaceOutputs, s as isInsideWorkspaces, t as REBUILD_COST, u as sizeText, z as GC_OUTPUT } from "./workspaces-BxzYlo3P.mjs";
-import { N as listBuildLocks, k as removeExpiredLease } from "./activity-B5RtpFda.mjs";
-import { n as forgetCreatedDeviceAsync, r as readCreatedDevices$1 } from "./created-devices-x9rN6bhs.mjs";
-import { F as listAvdsAsync, L as listOrphanedAvdDirectories, V as ownedAvdDirectory, _t as parkedMaxSetting, dt as POOL_SETTING_REMEDY, h as avdNameAbsent } from "./android-C7sVmyI9.mjs";
-import { d as listAllIosSims, f as listAllIosSimsAsync } from "./ios-hcBpnEGk.mjs";
-import { r as readCollectors } from "./ownership-C5fo5Edb.mjs";
-import { a as matchWorktreeEntry, b as deleteSelectedArchives, v as describeDereferenced, x as sweepArchiveStaging, y as reclaimProject } from "./worktree-8lqn_lBp.mjs";
-import { s as writeCacheFile } from "./warm-progress-CA3TgT3-.mjs";
-import { _ 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, y as worktreePullRequestNote } from "./act-DG54PWtJ.mjs";
-import { i as getSwiftpmCacheUsage, n as swiftpmCacheLines, r as getAgentDeviceUsage, t as agentDeviceLines } from "./agent-device-usage-output-UJ5gC80l.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-CSV2Orf4.mjs";
+import { N as listBuildLocks, k as removeExpiredLease } from "./activity-Dq3ZcdD8.mjs";
+import { d as listAllIosSims, f as listAllIosSimsAsync } from "./ios-CVUFFZ6C.mjs";
+import { r as readCollectors } from "./ownership-DxlZGDcV.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-Dw8kfacb.mjs";
+import { s as writeCacheFile } from "./warm-progress-ol0ZypEu.mjs";
+import { _ 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, y as worktreePullRequestNote } from "./act-Cyvm8xYc.mjs";
+import { i as getSwiftpmCacheUsage, n as swiftpmCacheLines, r as getAgentDeviceUsage, t as agentDeviceLines } from "./agent-device-usage-output-CccomeE0.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";
 import { LOG_ROTATE_BYTES, ensurePrivateDir, rotatedLogPath, withDirLock, withDirLockTransaction } from "@stim-cli/core";
-import { assertHostedDeviceLedger, configLockPath, deviceHostArea, deviceHostRoot, diskUsageCacheFile, hostedDeviceId, isJsonObject, listRecordedDevicesAsync, listStatusCacheEntries, maintenanceRunClaims, parseHostedPlatformDevice, readArchivesAsync, readDiskUsage, readHostedDevice, readHostedDeviceLedger, readHostedSessions, recordedBytes } from "@stim-cli/core/state";
+import { assertHostedDeviceLedger, configLockPath, deviceHostArea, deviceHostRoot, diskUsageCacheFile, hostedDeviceId, isJsonObject, listRecordedDevicesAsync, listStatusCacheEntries, maintenanceRunClaims, parseHostedPlatformDevice, readArchivesAsync, readDiskUsage, readHostedDevice, readHostedDeviceLedger, readHostedSessions, recordedBytes, trashRoot } from "@stim-cli/core/state";
 import { isAbsolute as isAbsolute$1, join as join$1 } from "path";
 import { fileURLToPath } from "node:url";
 import { setImmediate } from "node:timers/promises";
 import chalk from "chalk";
 import { existsSync as existsSync$1 } from "fs";
 import { InvalidArgumentError } from "commander";
-import { open, readdir, rename, rm, stat, utimes, writeFile } from "node:fs/promises";
+import { lstat, open, readFile, readdir, rename, rm, stat, utimes, writeFile } from "node:fs/promises";
 //#region src/commands/gc/archives.ts
 async function stagingOrNone(signal) {
 	try {
@@ -527,6 +528,160 @@ function recordingLines(recordings) {
 	return lines;
 }
 //#endregion
+//#region src/commands/gc/trash.ts
+const CLAIM_LABEL = "worktree trash";
+function claimKept(dir) {
+	const survey = readClaimSet(join(dir, TRASH_CLAIMS));
+	if (survey.live.length) return {
+		kept: "a worktree removal is still moving or deleting it",
+		live: true
+	};
+	const problem = survey.unresolved[0];
+	if (problem) return {
+		kept: `its ownership claim cannot be verified (${problem.reason}); run \`${claimRemoveCommand(problem.path)}\``,
+		live: false
+	};
+	return {
+		kept: null,
+		live: false
+	};
+}
+async function worktreeKept(worktree) {
+	try {
+		await lstat(worktree);
+	} catch (error) {
+		const code = error instanceof Error && "code" in error ? error.code : void 0;
+		if (code === "ENOENT" || code === "ENOTDIR") return null;
+		return `its worktree ${worktree} cannot be checked (${String(code ?? "unknown error")})`;
+	}
+	return `its worktree ${worktree} still exists; if it is the one this entry came from, run \`stim worktree remove\` on it to finish the removal, then gc deletes this entry`;
+}
+async function readManifest(dir) {
+	try {
+		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" ? {
+			worktree,
+			createdAt
+		} : null;
+	} catch {
+		return null;
+	}
+}
+/** The entries under `$STIM_HOME/trash`, each deletable only with a valid manifest, no live or unresolved ownership claim, and a worktree that is gone. */
+async function collectTrash({ signal, operation } = {}) {
+	const root = trashRoot();
+	let names;
+	try {
+		names = await readdir(root);
+	} catch {
+		return null;
+	}
+	const entries = [];
+	for (const name of names.toSorted()) {
+		const path = join(root, name);
+		if (!(await lstat(path).catch(() => null))?.isDirectory()) continue;
+		const manifest = name.startsWith("remove-") ? await readManifest(path) : null;
+		const claim = manifest ? claimKept(path) : {
+			kept: "it has no valid trash.json, so Stim did not create it",
+			live: false
+		};
+		const live = claim.live;
+		const kept = claim.kept ?? (manifest ? await worktreeKept(manifest.worktree) : null);
+		entries.push({
+			path,
+			worktree: manifest?.worktree ?? null,
+			removedAt: manifest?.createdAt ?? null,
+			bytes: live ? null : await directorySizeAsync(path, {
+				timeoutMs: "unbounded",
+				signal,
+				operation
+			}),
+			willDelete: kept === null,
+			kept
+		});
+	}
+	return entries.length ? {
+		root,
+		entries
+	} : null;
+}
+function trashLines(report) {
+	if (!report) return [];
+	const total = report.entries.reduce((sum, entry) => sum + (entry.bytes ?? 0), 0);
+	const lines = [`Worktree trash (${formatBytes(total)} in ${report.entries.length}) - ${report.root}:`];
+	for (const entry of report.entries) {
+		const from = entry.worktree ? ` from ${entry.worktree}` : "";
+		lines.push(`  ${(entry.bytes === null ? "deleting" : formatBytes(entry.bytes)).padStart(10)}  ${entry.path}${from}`);
+		lines.push(entry.kept ? `              kept: ${entry.kept}` : "              --delete would DELETE it");
+	}
+	return lines;
+}
+/** Deletes what a fresh `collectTrash` marks deletable, each entry under its own exclusive claim. */
+async function deleteTrash(operation, output = GC_OUTPUT) {
+	const report = await collectTrash({
+		signal: operation?.signal,
+		operation
+	});
+	const done = {
+		count: 0,
+		bytes: 0,
+		failures: 0
+	};
+	for (const entry of report?.entries ?? []) {
+		if (!entry.willDelete) continue;
+		let claim;
+		try {
+			claim = tryAcquireClaim({
+				root: join(entry.path, TRASH_CLAIMS),
+				mode: "exclusive",
+				label: CLAIM_LABEL
+			});
+		} catch (error) {
+			if (!isClaimRefusal(error) && !isClaimUnavailable(error)) throw error;
+			output.record("trash", "kept", entry.path, {
+				bytes: entry.bytes ?? 0,
+				detail: error.reason
+			});
+			continue;
+		}
+		if (!claim.acquired) {
+			if (claim.pending) releaseClaim(claim.pending);
+			output.record("trash", "kept", entry.path, {
+				bytes: entry.bytes ?? 0,
+				detail: "a worktree removal is still moving or deleting it"
+			});
+			continue;
+		}
+		try {
+			await deleteTrashEntry(entry.path, operation);
+			done.count++;
+			done.bytes += entry.bytes ?? 0;
+		} catch (error) {
+			if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
+			operation?.signal.throwIfAborted();
+			done.failures++;
+			const detail = error instanceof Error ? error.message : String(error);
+			output.log(chalk.red(`Could not delete ${entry.path}: ${detail}`));
+			output.record("trash", "failed", entry.path, {
+				bytes: entry.bytes ?? 0,
+				detail
+			});
+		} finally {
+			releaseClaim(claim.acquired);
+		}
+	}
+	if (done.count) {
+		output.log(chalk.green(`Deleted ${plural(done.count, "worktree trash entry", "worktree trash entries")} (${formatBytes(done.bytes)})`));
+		output.record("trash", "done", report?.root ?? trashRoot(), {
+			bytes: done.bytes,
+			detail: `${plural(done.count, "entry", "entries")} deleted`
+		});
+	}
+	return done;
+}
+//#endregion
 //#region src/commands/gc/report.ts
 function shortKey(key) {
 	const text = String(key ?? "");
@@ -631,7 +786,7 @@ function formatGcReport({ maintenance, archives, skipped = [], deadProjects = []
 	orphaned: [],
 	notices: [],
 	deletionSafe: true
-}, agentDeviceUsage = null, swiftpmCacheUsage, machineCaches, tempLeftovers, 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, 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);
@@ -766,6 +921,7 @@ function formatGcReport({ maintenance, archives, skipped = [], deadProjects = []
 	lines.push(...swiftpmCacheLines(swiftpmCacheUsage, now));
 	lines.push(...machineCacheLines(machineCaches, now));
 	lines.push(...tempLeftoverLines(tempLeftovers));
+	lines.push(...trashLines(trash));
 	lines.push(...gradleVersionLines(gradleVersions));
 	lines.push(...memoryLines(memory, memoryCacheKind(cacheScope), now));
 	lines.push(...maintenanceReportLines(maintenance));
@@ -957,7 +1113,7 @@ function gcReportSections({ archives, skipped = [], deadProjects = [], orphanedP
 	orphaned: [],
 	notices: [],
 	deletionSafe: true
-}, workspaceOutputs = null, workspaceLogs = [], recordings = [], agentDeviceUsage = null, swiftpmCacheUsage = null, machineCaches = null, tempLeftovers = null, gradleVersions = null, caches = [], memory = null }) {
+}, workspaceOutputs = null, workspaceLogs = [], recordings = [], agentDeviceUsage = null, swiftpmCacheUsage = null, machineCaches = null, tempLeftovers = null, trash = null, gradleVersions = null, caches = [], memory = null }) {
 	return {
 		...archives ? {
 			archived: archives.records,
@@ -1147,6 +1303,7 @@ function gcReportSections({ archives, skipped = [], deadProjects = [], orphanedP
 		swiftpmCache: swiftpmCacheUsage,
 		machineCaches,
 		tempLeftovers: tempLeftoverSection(tempLeftovers),
+		trash,
 		gradleVersions,
 		memory: memory?.processes ?? [],
 		watchmanRoots: memory?.watchmanRoots ?? [],
@@ -1920,10 +2077,10 @@ function readGcReport(options = {}, deps = {}) {
 		takeResults: () => []
 	}, true);
 }
-function removeInvalidProjectEntries(invalidProjects, output, signal) {
+async function removeInvalidProjectEntries(invalidProjects, output, signal) {
 	for (const path of invalidProjects) {
 		signal?.throwIfAborted();
-		removeProject(path);
+		await withConfigLockAsync$1(() => removeProject(path), signal);
 		output.log(chalk.green(`Removed the invalid registry entry ${path}`));
 		output.record("project", "done", path);
 	}
@@ -2047,6 +2204,7 @@ async function collectGcReport({ olderThan = null, cache = null, worktrees = fal
 		swiftpmCacheUsage: null,
 		machineCaches: null,
 		tempLeftovers: null,
+		trash: null,
 		gradleVersions: includesGradleVersions(scope) ? await collectGradleVersions({
 			olderThanDays: olderThan,
 			now,
@@ -2069,6 +2227,11 @@ async function collectGcReport({ olderThan = null, cache = null, worktrees = fal
 		signal: operation?.signal,
 		operation
 	});
+	phase("trash", "measuring worktree trash", operation);
+	const trash = await collectTrash({
+		signal: operation?.signal,
+		operation
+	});
 	const mountedVolumes = listMountedVolumes();
 	const cfg = loadConfig$1();
 	let easSessionSweep = deps.precollectedEasSessionSweep;
@@ -2326,11 +2489,24 @@ async function collectGcReport({ olderThan = null, cache = null, worktrees = fal
 		swiftpmCacheUsage,
 		machineCaches,
 		tempLeftovers,
+		trash,
 		cacheScope: null,
 		olderThan,
 		all
 	};
 }
+const shellWord = (value) => /^[\w.:-]+$/.test(value) ? value : quotedPath$1(value);
+function gcRetryCommand(opts) {
+	return [
+		"stim gc",
+		opts.delete && "--delete",
+		opts.worktrees && "--worktrees",
+		opts.olderThan !== void 0 && `--older-than ${opts.olderThan}`,
+		opts.cache !== void 0 && `--cache ${shellWord(opts.cache)}`,
+		opts.idle !== void 0 && `--idle ${opts.idle / 6e4}m`,
+		opts.json && "--json"
+	].filter(Boolean).join(" ");
+}
 async function runGc(opts = {}, deps = {}) {
 	let result;
 	try {
@@ -2339,7 +2515,7 @@ async function runGc(opts = {}, deps = {}) {
 			else console.log(line);
 		}, claim));
 	} catch (error) {
-		const failure = (0, ownership_claim_exports.claimFailure)(error, opts.delete ? "stim gc --delete" : "stim gc --idle <duration>") ?? (deps.operation?.signal.aborted ? {
+		const failure = (0, ownership_claim_exports.claimFailure)(error, gcRetryCommand(opts)) ?? (deps.operation?.signal.aborted ? {
 			code: "STIM_CANCELLED",
 			message: "GC was cancelled.",
 			remedy: "Retry the same GC command."
@@ -2615,7 +2791,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.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)) || 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;
@@ -2713,7 +2889,7 @@ async function runGcCore(opts, deps, execution, reportOnly = false) {
 	throwIfCancelled(signal, "GC");
 	deleteFailures += await deleteGradleVersions(report.gradleVersions, output, deps.operation);
 	throwIfCancelled(signal, "GC");
-	removeInvalidProjectEntries(invalidProjects, output, signal);
+	await removeInvalidProjectEntries(invalidProjects, output, signal);
 	throwIfCancelled(signal, "GC");
 	deleteFailures += await pruneDeadProjects(deadProjects, output, deps.operation);
 	throwIfCancelled(signal, "GC");
@@ -2733,6 +2909,7 @@ async function runGcCore(opts, deps, execution, reportOnly = false) {
 		signal: deps.operation?.signal,
 		operation: deps.operation
 	}, output)).failures;
+	if (report.trash) deleteFailures += (await deleteTrash(deps.operation, output)).failures;
 	for (const lock of buildLocks.stale) {
 		throwIfCancelled(signal, "GC");
 		const cleared = (0, ownership_claim_exports.clearFreeClaimSet)({