stim 1.10.1 → 1.12.0

package/dist/{gc-zCDpmdHU.mjs → gc-C4nQFcTX.mjs}

@@ -1,22 +1,24 @@
-import { A as directorySize, F as volumeRootFor, M as isOnMountedVolume, N as listMountedVolumes, b as removeProject, g as loadConfig, j as formatBytes, k as ownership_claim_exports } from "./config-BEq0Qw_a.mjs";
+import { A as ownership_claim_exports, I as volumeRootFor, M as formatBytes, N as isOnMountedVolume, P as listMountedVolumes, U as projectDeviceSlots, _ as loadConfig$1, j as directorySize, p as getProject, x as removeProject } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { N as workspaceStateFile, O as workspaceDir, v as workspaceLastUsed } from "./metro-BWLOJ_Wr.mjs";
-import { C as sourceCheckoutOf, b as resolveFullRef, d as hasUncommittedWork, l as hasPopulatedSubmodules, m as listWorktrees, o as dirtyPaths, w as unpushedCommits } from "./worktree-BlizKDpZ.mjs";
-import { a as detectIsExpo, o as findProjectRoot } from "./project-BXZzOABt.mjs";
-import { h as shortUdid, o as formatLongDuration, u as plural } from "./command-output-D5z2_bcF.mjs";
-import { d as removeExpiredLease, h as listBuildLocks } from "./device-lease-CbEaIk7b.mjs";
-import { A as ownedAvdDirectory, C as isStimOwnedAvdName, D as listOrphanedAvdDirectories, K as isStimOwnedSim, T as listAvds } from "./android-787HhP5w.mjs";
-import { h as POOL_SETTING_REMEDY, y as parkedMaxSetting } from "./ownership-BfPNRf3-.mjs";
-import { l as listAllIosSims } from "./ios-COGcGEcN.mjs";
-import { a as parseIdleDuration, o as shutDownIdleDevices, r as idleDeviceLines, t as collectIdleDevices } from "./idle--jn7pBNe.mjs";
-import { i as canonicalPath, o as listBuildSlots, r as workspaceInUse } from "./in-use-CNIWU-r-.mjs";
-import { C as listOwnedSessionsArgs, D as verifyStoppedSession, E as stopSessionArgs, S as isDefinitiveMissingSessionError, T as parseSessionListPage, b as getSessionArgs, d as withRemoteSessionLock, f as withEasProjectLock, h as removeEasSessionClaim, m as readEasSessionLedger, p as easMachineStateRoot, x as inspectSessionForTeardown, y as findOrphanedOwnedSessions, z as resolveEasCliBin } from "./device-remote-powUHdbK.mjs";
-import { A as discoverCaches, C as unverifiedDeviceCommand, D as planCacheEmptying, E as includesWorkspaceOutputs, O as selectCaches, S as findStaleProjectDevices, T as emptyCaches, _ as describeParkedSims, a as collectWorkspaceOutputs, b as findOrphanedDevices, c as listWorkspaceDirs, d as collectDeviceLeases, f as collectParkedAvds, g as deleteProjectDevices, h as deleteParkedSims, i as collectOrphanedWorkspaces, j as sizeCaches, k as trimCaches, l as sizeText, m as deleteParkedAvds, n as WORKSPACE_OUTPUT_DIRS, o as deleteOrphanedWorkspaces, p as collectParkedSims, r as clearWorkspaceOutputs, s as isInsideWorkspaces, t as REBUILD_COST, u as DEVICE_LIST_TIMEOUT_MS, v as describeUnverifiableDevices, w as withAndroidAvdSizes, x as findStaleDeviceRecords, y as deviceSweepIsScoped } from "./workspaces-wrH6dXfu.mjs";
-import { a as reclaimKeys, d as removeWorktreeTarget, m as reclaimProject, n as excludePodChurn, p as describeDereferenced, r as matchWorktreeEntry } from "./worktree-Bd4dRvx7.mjs";
-import { statSync } from "node:fs";
+import { N as workspaceStateFile, O as workspaceDir, j as workspaceLogsDir, v as workspaceLastUsed } from "./metro-Dzo30hvJ.mjs";
+import { C as sourceCheckoutOf, b as resolveFullRef, d as hasUncommittedWork, l as hasPopulatedSubmodules, m as listWorktrees, o as dirtyPaths, w as unpushedCommits } from "./worktree-DeBQSVtR.mjs";
+import { i as findProjectRoot, r as detectIsExpo } from "./project-B8rbutVC.mjs";
+import { h as shortUdid, o as formatLongDuration, u as plural } from "./command-output-BWCj5Vh-.mjs";
+import { d as removeExpiredLease, h as listBuildLocks, i as listLeaseFiles, r as leaseIsExpired } from "./device-lease-B9LAXIUH.mjs";
+import { A as listOrphanedAvdDirectories, L as ownedAvdSerialResolver, O as listAvds, P as ownedAvdDirectory, Q as isStimOwnedSim, T as isStimOwnedAvdName } from "./android-75Sk2rIR.mjs";
+import { h as POOL_SETTING_REMEDY, y as parkedMaxSetting } from "./ownership-B8d4kXBx.mjs";
+import { l as listAllIosSims } from "./ios-CZWOHTTc.mjs";
+import { a as parseIdleDuration, o as shutDownIdleDevices, r as idleDeviceLines, t as collectIdleDevices } from "./idle-S3tFZ53_.mjs";
+import { i as canonicalPath, o as listBuildSlots, r as workspaceInUse } from "./in-use-D9XYEgFD.mjs";
+import { f as resolveEasCliBin } from "./remote-cache-BRsRZru5.mjs";
+import { A as findOrphanedOwnedSessions, C as withEasProjectLock, E as removeEasSessionClaim, I as parseSessionListPage, L as stopSessionArgs, M as inspectSessionForTeardown, N as isDefinitiveMissingSessionError, P as listOwnedSessionsArgs, R as verifyStoppedSession, T as readEasSessionLedger$1, d as withRemoteSessionLock, j as getSessionArgs, w as easMachineStateRoot$1 } from "./device-remote-C0_o-tJH.mjs";
+import { A as includesWorkspaceOutputs, C as deviceSweepIsScoped, D as unverifiedDeviceCommand, E as findStaleProjectDevices, F as sizeCaches, M as selectCaches, N as trimCaches, O as withAndroidAvdSizes, P as discoverCaches, S as describeUnverifiableDevices, T as findStaleDeviceRecords, _ as collectParkedSims, a as REBUILD_COST, b as deleteProjectDevices, c as collectOrphanedWorkspaces, d as isInsideWorkspaces, f as listWorkspaceDirs, g as collectParkedAvds, h as collectDeviceLeases, i as machineNumber, j as planCacheEmptying, k as emptyCaches, l as collectWorkspaceOutputs, m as DEVICE_LIST_TIMEOUT_MS, o as WORKSPACE_OUTPUT_DIRS, p as sizeText, s as clearWorkspaceOutputs, u as deleteOrphanedWorkspaces, v as deleteParkedAvds, w as findOrphanedDevices, x as describeParkedSims, y as deleteParkedSims } from "./budget-DbzW5VTD.mjs";
+import { a as reclaimKeys, d as removeWorktreeTarget, m as reclaimProject, n as excludePodChurn, p as describeDereferenced, r as matchWorktreeEntry } from "./worktree-ChDL5fO1.mjs";
+import { n as mergeState, t as fetchDefaultBranch } from "./merge-state-ytFQCeh4.mjs";
 import { InvalidArgumentError } from "commander";
-import { existsSync as existsSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, statSync as statSync$1 } from "fs";
+import { existsSync, readFileSync, readdirSync, statSync } from "fs";
 import { basename, dirname, isAbsolute, join } from "path";
+import { settingDefinition } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/commands/gc/eas-sessions.ts
 const EAS_OPERATION_TIMEOUT_MS = 3e4;
@@ -37,18 +39,18 @@ function readRecordedRemoteSessionIds(roots) {
 	let safe = true;
 	for (const root of new Set(roots)) {
 		try {
-			if (!statSync$1(root).isDirectory()) throw new Error("path is not a directory");
-			readdirSync$1(root);
+			if (!statSync(root).isDirectory()) throw new Error("path is not a directory");
+			readdirSync(root);
 		} catch (error) {
 			safe = false;
 			notices.push(`${root} is not available as a readable workspace directory: ${describeError(error)}`);
 			continue;
 		}
 		const path = workspaceStateFile(root);
-		if (!existsSync$1(path)) continue;
+		if (!existsSync(path)) continue;
 		let state;
 		try {
-			state = JSON.parse(readFileSync$1(path, "utf-8"));
+			state = JSON.parse(readFileSync(path, "utf-8"));
 		} catch (error) {
 			safe = false;
 			notices.push(`${path} could not be read as valid JSON: ${describeError(error)}`);
@@ -84,8 +86,8 @@ function claimStateAbsence(claim) {
 	const stateDir = dirname(claim.stateFile);
 	let entries;
 	try {
-		if (!statSync$1(stateDir).isDirectory()) throw new Error("path is not a directory");
-		entries = readdirSync$1(stateDir);
+		if (!statSync(stateDir).isDirectory()) throw new Error("path is not a directory");
+		entries = readdirSync(stateDir);
 	} catch (error) {
 		return {
 			absent: false,
@@ -98,7 +100,7 @@ function claimStateAbsence(claim) {
 	};
 	let state;
 	try {
-		state = JSON.parse(readFileSync$1(claim.stateFile, "utf-8"));
+		state = JSON.parse(readFileSync(claim.stateFile, "utf-8"));
 	} catch (error) {
 		return {
 			absent: false,
@@ -141,8 +143,8 @@ function collectEasSessionSweep(config, deps) {
 	const eas = (deps.resolveEasCliBin ?? resolveEasCliBin)(projectRoot);
 	if (!eas) return empty(["EAS session sweep skipped: eas-cli is not available for the current Expo project."]);
 	const recorded = readRecordedRemoteSessionIds([...Object.keys(config?.projects ?? {}), projectRoot]);
-	const ledgerRoot = deps.easLedgerRoot ?? easMachineStateRoot();
-	const ledger = readEasSessionLedger(ledgerRoot);
+	const ledgerRoot = deps.easLedgerRoot ?? easMachineStateRoot$1();
+	const ledger = readEasSessionLedger$1(ledgerRoot);
 	const run = deps.runEasFile ?? ((file, args, options) => getExecutor().runFile(file, args, options));
 	const sessions = [];
 	const seenCursors = /* @__PURE__ */ new Set();
@@ -180,7 +182,7 @@ function collectEasSessionSweep(config, deps) {
 	}
 	const lockedRoots = deps.easLockedRoots;
 	if (lockedRoots) {
-		if (easLockRoots(projectRoot, loadConfig()).some((root) => !lockedRoots.includes(root))) return empty([...recorded.notices, "EAS session sweep skipped: registered workspace roots changed after remote-session locks were acquired."]);
+		if (easLockRoots(projectRoot, loadConfig$1()).some((root) => !lockedRoots.includes(root))) return empty([...recorded.notices, "EAS session sweep skipped: registered workspace roots changed after remote-session locks were acquired."]);
 	}
 	const compared = findOrphanedOwnedSessions({
 		sessions,
@@ -215,8 +217,8 @@ function easLockRoots(projectRoot, config) {
 }
 function unavailableLockRootNotice(roots) {
 	for (const root of roots) try {
-		if (!statSync$1(root).isDirectory()) throw new Error("path is not a directory");
-		readdirSync$1(root);
+		if (!statSync(root).isDirectory()) throw new Error("path is not a directory");
+		readdirSync(root);
 	} catch (error) {
 		return `EAS session sweep skipped: ${root} is not available for remote-session lock inspection: ${describeError(error)}`;
 	}
@@ -225,7 +227,7 @@ function unavailableLockRootNotice(roots) {
 function malformedRemoteSessionLockNotice(roots) {
 	for (const root of roots) {
 		const lockPath = join(workspaceDir(root), "remote-session.lock");
-		if (!existsSync$1(lockPath)) continue;
+		if (!existsSync(lockPath)) 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.`;
 	}
@@ -236,7 +238,7 @@ async function withRemoteSessionGcLocks(projectRoot, deps, fn) {
 	const waitMs = deps.easLockWaitMs ?? EAS_LOCK_WAIT_MS;
 	const maxSnapshots = deps.easLockSnapshotRetries ?? EAS_LOCK_SNAPSHOT_RETRIES;
 	for (let attempt = 0; attempt < maxSnapshots; attempt++) {
-		const roots = easLockRoots(projectRoot, loadConfig());
+		const roots = easLockRoots(projectRoot, loadConfig$1());
 		const unavailable = unavailableLockRootNotice(roots);
 		if (unavailable) return fn({
 			...deps,
@@ -250,7 +252,7 @@ async function withRemoteSessionGcLocks(projectRoot, deps, fn) {
 		let expanded = false;
 		let coreStarted = false;
 		const acquire = (index) => index === roots.length ? (async () => {
-			if (easLockRoots(projectRoot, loadConfig()).some((root) => !roots.includes(root))) {
+			if (easLockRoots(projectRoot, loadConfig$1()).some((root) => !roots.includes(root))) {
 				expanded = true;
 				return null;
 			}
@@ -293,12 +295,12 @@ async function deleteEasSessions(easSessionSweep, deps) {
 						return;
 					}
 					const coordinatedDeps = lockedDeps;
-					const currentConfig = loadConfig();
+					const currentConfig = loadConfig$1();
 					const currentRoots = easLockRoots(projectScope, currentConfig);
 					const registryExpanded = coordinatedDeps.easLockedRoots && currentRoots.some((root) => !coordinatedDeps.easLockedRoots.includes(root));
 					const currentRecords = registryExpanded ? null : readRecordedRemoteSessionIds([...Object.keys(currentConfig?.projects ?? {}), projectScope]);
-					const ledgerRoot = coordinatedDeps.easLedgerRoot ?? easMachineStateRoot();
-					const ledger = readEasSessionLedger(ledgerRoot);
+					const ledgerRoot = coordinatedDeps.easLedgerRoot ?? easMachineStateRoot$1();
+					const ledger = readEasSessionLedger$1(ledgerRoot);
 					const removeClaim = coordinatedDeps.removeEasSessionClaim ?? removeEasSessionClaim;
 					const reconcileClaim = (sessionId) => {
 						let detail = "the claim store did not remove it";
@@ -399,236 +401,11 @@ async function deleteEasSessions(easSessionSweep, deps) {
 	return deleteFailures;
 }
 //#endregion
-//#region src/workspace/merge-state.ts
-const FETCH_TIMEOUT_MS = 3e4;
-const FETCH_FRESH_MS = 6e5;
-const GIT_TIMEOUT_MS = 6e4;
-const REMOTE_PREFIX = "refs/remotes/origin/";
-function failure(error) {
-	const { stderr, message } = error;
-	const text = String(stderr ?? "").trim() || String(message ?? error);
-	return text.split("\n")[0] ?? text;
-}
-function fetchedRecently(repo, now) {
-	const path = getExecutor().runFileQuiet("git", [
-		"-C",
-		repo,
-		"rev-parse",
-		"--path-format=absolute",
-		"--git-path",
-		"FETCH_HEAD"
-	])?.trim();
-	try {
-		return Boolean(path) && now - statSync(path).mtimeMs < FETCH_FRESH_MS;
-	} catch {
-		return false;
-	}
-}
-/**
-* Fetches the default branch that `origin/HEAD` names into its remote-tracking ref, bounded by a timeout and never
-* prompting for credentials. It skips the fetch when the checkout fetched anything in the last 10 minutes.
-*/
-function fetchDefaultBranch(repo, now = Date.now()) {
-	const exec = getExecutor();
-	const ref = exec.runFileQuiet("git", [
-		"-C",
-		repo,
-		"symbolic-ref",
-		"--quiet",
-		"refs/remotes/origin/HEAD"
-	])?.trim();
-	if (!ref?.startsWith(REMOTE_PREFIX)) return { error: `origin/HEAD is not set; run \`git -C ${repo} remote set-head origin --auto\`` };
-	const branch = ref.slice(20);
-	if (fetchedRecently(repo, now)) return {
-		ref,
-		name: `origin/${branch}`
-	};
-	try {
-		exec.runFile("git", [
-			"-C",
-			repo,
-			"fetch",
-			"--quiet",
-			"--no-tags",
-			"--no-recurse-submodules",
-			"origin",
-			`+refs/heads/${branch}:${ref}`
-		], {
-			timeoutMs: FETCH_TIMEOUT_MS,
-			env: { GIT_TERMINAL_PROMPT: "0" }
-		});
-	} catch (error) {
-		return { error: `git fetch origin ${branch} failed: ${failure(error)}` };
-	}
-	return {
-		ref,
-		name: `origin/${branch}`
-	};
-}
-function notMerged(detail) {
-	return {
-		merged: false,
-		unknown: false,
-		detail
-	};
-}
-function currentBranch(path) {
-	const ref = getExecutor().runFileQuiet("git", [
-		"-C",
-		path,
-		"symbolic-ref",
-		"--quiet",
-		"HEAD"
-	])?.trim();
-	return ref?.startsWith("refs/heads/") ? ref : null;
-}
-function upstreamGone(path, branch) {
-	if (!branch) return false;
-	const [upstream, state] = (getExecutor().runFileQuiet("git", [
-		"-C",
-		path,
-		"for-each-ref",
-		"--format=%(upstream)%00%(upstream:track)",
-		branch
-	]) ?? "").trim().split("\0");
-	return Boolean(upstream) && state === "[gone]";
-}
-function committedOn(path, branch, head) {
-	if (!branch) return false;
-	const exec = getExecutor();
-	return (exec.runFileQuiet("git", [
-		"-C",
-		path,
-		"reflog",
-		"show",
-		"--format=%H %gs",
-		branch
-	]) ?? "").split("\n").some((entry) => {
-		const [sha = "", ...subject] = entry.split(" ");
-		return /^(commit|cherry-pick|rebase|revert)\b/.test(subject.join(" ")) && exec.runFileQuiet("git", [
-			"-C",
-			path,
-			"merge-base",
-			"--is-ancestor",
-			sha,
-			head
-		]) !== null;
-	});
-}
-/**
-* Whether the worktree's HEAD is merged into `target`. The signals, all local git:
-* - HEAD is an ancestor of the default branch, off its first-parent line, and the branch's reflog shows a commit made
-*   on it that HEAD contains, so a merge commit brought the branch's own work in. A branch with no commit of its own
-*   is not merged.
-* - The branch changes the tree, has no merge commits, and every commit since the merge base has the same
-*   `git patch-id --verbatim` as a commit on the default branch (a rebase merge).
-* - The branch changes the tree and its whole diff since the merge base has the same verbatim patch id as a commit on
-*   the default branch, limited to the files the branch changes (a squash merge).
-* Anything git cannot answer is unknown, never merged. `coversUnpushed` is true for a patch-equivalent HEAD whose
-* upstream branch was deleted: its commits exist only locally, but their change is on the default branch.
-*/
-function mergeState(path, { ref, name }) {
-	const git = (args, input) => getExecutor().runFile("git", [
-		"--literal-pathspecs",
-		"-C",
-		path,
-		...args
-	], {
-		timeoutMs: GIT_TIMEOUT_MS,
-		input
-	});
-	const patch = (args) => getExecutor().runFile("git", [
-		"--literal-pathspecs",
-		"-C",
-		path,
-		...args
-	], {
-		timeoutMs: GIT_TIMEOUT_MS,
-		untrimmed: true
-	});
-	const patchIds = (text) => text ? git(["patch-id", "--verbatim"], text).split("\n").flatMap((line) => line.split(" ")[0] || []) : [];
-	const diffOptions = ["--no-color", "--no-ext-diff"];
-	const noOwnCommits = notMerged(`no commits of its own beyond ${name}`);
-	try {
-		const head = git([
-			"rev-parse",
-			"--verify",
-			"HEAD^{commit}"
-		]);
-		const base = git([
-			"merge-base",
-			head,
-			ref
-		]);
-		const branch = currentBranch(path);
-		if (base === head) {
-			if (git(["rev-parse", ref]) === head || git([
-				"rev-list",
-				"--first-parent",
-				"--parents",
-				`${head}..${ref}`
-			]).split("\n").some((line) => line.split(" ")[1] === head) || !committedOn(path, branch, head)) return noOwnCommits;
-			return {
-				merged: true,
-				into: name,
-				head,
-				coversUnpushed: false
-			};
-		}
-		const files = git([
-			"diff",
-			"--name-only",
-			"--no-renames",
-			"-z",
-			base,
-			head
-		]).split("\0").filter(Boolean);
-		if (!files.length) return notMerged(`no net change beyond ${name}`);
-		const log = (range, pathspec = []) => patch([
-			"log",
-			"-p",
-			"--no-merges",
-			...diffOptions,
-			"--format=commit %H",
-			range,
-			"--",
-			...pathspec
-		]);
-		const upstream = new Set(patchIds(log(`${base}..${ref}`, files)));
-		const patchEquivalent = () => ({
-			merged: true,
-			into: name,
-			head,
-			coversUnpushed: upstreamGone(path, branch)
-		});
-		const squash = patchIds(patch([
-			"diff",
-			...diffOptions,
-			base,
-			head
-		]));
-		if (squash.length === 1 && upstream.has(squash[0])) return patchEquivalent();
-		if (!git([
-			"rev-list",
-			"--merges",
-			`${base}..${head}`
-		])) {
-			const own = patchIds(log(`${base}..${head}`));
-			if (own.length && own.every((id) => upstream.has(id))) return patchEquivalent();
-		}
-		return notMerged(`not merged into ${name}`);
-	} catch (error) {
-		return {
-			merged: false,
-			unknown: true,
-			detail: `merge state unknown: ${failure(error)}`
-		};
-	}
-}
-//#endregion
 //#region src/commands/gc/worktrees.ts
 const DEFAULT_WORKTREE_IDLE_DAYS = 7;
 const DAY_MS = 864e5;
+const MINUTE_MS = 6e4;
+const GRACE_SETTING = "gc.worktreeGraceMinutes";
 const MERGE_DECIDES = /* @__PURE__ */ new Set([
 	"unpushed",
 	"not-merged",
@@ -641,7 +418,34 @@ function skip(code, text) {
 		text
 	};
 }
-function worktreeSkipReason(facts, olderThan) {
+/**
+* Why gc keeps a worktree, or null when it removes it. A worktree that would be removed is still kept while its last
+* activity, or its merge into the default branch, is less than `grace.ms` old, and kept when that activity is unknown.
+*/
+function worktreeSkipReason(facts, olderThan, grace = {
+	ms: 0,
+	now: 0
+}) {
+	return removalBlocker(facts, olderThan) ?? graceBlocker(facts, grace);
+}
+function graceBlocker(facts, grace) {
+	if (grace.ms <= 0) return null;
+	if (!facts.activity) return skip("activity-unknown", "its last activity could not be read");
+	const merged = facts.merge?.merged ? facts.merge : null;
+	const latest = merged && merged.mergedAt > facts.activity.at ? {
+		at: merged.mergedAt,
+		basis: `merged into ${merged.into}`
+	} : facts.activity;
+	const eligibleAt = latest.at + grace.ms;
+	if (grace.now >= eligibleAt) return null;
+	const ago = formatLongDuration(Math.max(0, grace.now - latest.at));
+	return {
+		code: "recent-activity",
+		text: `recent activity: ${latest.basis} ${ago} ago; removable after ${new Date(eligibleAt).toISOString()}`,
+		eligibleAt
+	};
+}
+function removalBlocker(facts, olderThan) {
 	if (facts.bare) return skip("bare-repository", "bare repository");
 	if (typeof facts.source === "object") return skip("source-checkout-unknown", `source checkout unknown: ${facts.source.refusal}`);
 	if (facts.source === "source") return skip("source-checkout", "source checkout");
@@ -674,7 +478,119 @@ function idleDaysOf(keys, now) {
 	return Number.isFinite(last) ? Math.max(0, Math.floor((now - last) / DAY_MS)) : null;
 }
 function inUseOf(keys, checks) {
-	return [...new Set(keys.flatMap((key) => workspaceInUse(key, checks)))];
+	return [.../* @__PURE__ */ new Set([...keys.flatMap((key) => workspaceInUse(key, checks)), ...deviceUseOf(keys)])];
+}
+function deviceUseOf(keys) {
+	const reasons = [];
+	let sims;
+	let avdSerial;
+	for (const key of keys) {
+		let slots;
+		try {
+			slots = projectDeviceSlots(getProject(key));
+		} catch (error) {
+			reasons.push(`its device records cannot be read: ${error.message}`);
+			continue;
+		}
+		for (const { platforms } of slots) {
+			const ios = platforms.ios;
+			if (ios?.owned && ios.deviceUdid) {
+				if (sims === void 0) try {
+					sims = listAllIosSims({ timeoutMs: DEVICE_LIST_TIMEOUT_MS });
+				} catch {
+					sims = null;
+				}
+				const sim = sims?.find((entry) => entry.udid === ios.deviceUdid);
+				if (sims === null) reasons.push(`the state of its owned simulator ${ios.deviceUdid} cannot be read`);
+				else if (sim && sim.state !== "Shutdown") reasons.push(`its owned simulator ${sim.name} is ${sim.state}; \`stim stop\` in ${key} shuts it down`);
+			}
+			const android = platforms.android;
+			if (android?.owned && android.avdName) {
+				avdSerial ??= ownedAvdSerialResolver({ timeoutMs: DEVICE_LIST_TIMEOUT_MS });
+				try {
+					if (avdSerial(android.avdName).serial) reasons.push(`its owned emulator ${android.avdName} is running; \`stim stop\` in ${key} shuts it down`);
+				} catch {
+					reasons.push(`the state of its owned emulator ${android.avdName} cannot be read`);
+				}
+			}
+		}
+	}
+	const holders = new Set(keys.map(canonicalPath));
+	const now = Date.now();
+	for (const { lease } of listLeaseFiles()) if (lease && !leaseIsExpired(lease, now) && holders.has(canonicalPath(lease.holder))) reasons.push(`it holds the ${lease.platform} device lease on ${lease.deviceName ?? lease.id}`);
+	return reasons;
+}
+function newestMtime(paths) {
+	let newest = null;
+	for (const { path, basis } of paths) {
+		let mtime;
+		try {
+			mtime = statSync(path).mtimeMs;
+		} catch (error) {
+			if (error.code === "ENOENT") continue;
+			return "unreadable";
+		}
+		if (!newest || mtime > newest.at) newest = {
+			at: mtime,
+			basis
+		};
+	}
+	return newest;
+}
+function logFiles$1(key) {
+	const dir = workspaceLogsDir(key);
+	try {
+		return readdirSync(dir).map((name) => ({
+			path: join(dir, name),
+			basis: "a Stim log write"
+		}));
+	} catch (error) {
+		return error.code === "ENOENT" ? [] : null;
+	}
+}
+function worktreeActivityOf(path, keys) {
+	const gitDir = getExecutor().runFileQuiet("git", [
+		"--no-optional-locks",
+		"-C",
+		path,
+		"rev-parse",
+		"--path-format=absolute",
+		"--git-dir"
+	])?.trim();
+	if (!gitDir) return null;
+	const paths = [
+		{
+			path: join(gitDir, "index"),
+			basis: "a git index write"
+		},
+		{
+			path: join(gitDir, "HEAD"),
+			basis: "a git HEAD change"
+		},
+		{
+			path: join(gitDir, "logs", "HEAD"),
+			basis: "a git reflog entry"
+		}
+	];
+	for (const key of keys) {
+		const logs = logFiles$1(key);
+		if (logs === null) return null;
+		paths.push({
+			path: workspaceStateFile(key),
+			basis: "a Stim workspace state write"
+		}, ...logs);
+	}
+	const newest = newestMtime(paths);
+	return newest === "unreadable" ? null : newest;
+}
+function graceMsSetting() {
+	const { value, error } = machineNumber(GRACE_SETTING, loadConfig$1(), process.env);
+	if (error) {
+		const fallback = Number(settingDefinition(GRACE_SETTING)?.default);
+		console.error(chalk.yellow(`${error} gc uses the default of ${fallback} minutes.`));
+		return fallback * MINUTE_MS;
+	}
+	return (value ?? 0) * MINUTE_MS;
 }
 function porcelainOf(path, gitAnswered) {
 	if (gitAnswered === null) return null;
@@ -683,15 +599,15 @@ function porcelainOf(path, gitAnswered) {
 	return lines.length ? lines : null;
 }
 function candidateRoots() {
-	const registered = Object.keys(loadConfig()?.projects ?? {}).filter(isAbsolute);
+	const registered = Object.keys(loadConfig$1()?.projects ?? {}).filter(isAbsolute);
 	const recorded = listWorkspaceDirs().flatMap((entry) => entry.projectRoot ? [entry.projectRoot] : []);
-	return [.../* @__PURE__ */ new Set([...registered, ...recorded])].filter((root) => existsSync$1(root)).toSorted();
+	return [.../* @__PURE__ */ new Set([...registered, ...recorded])].filter((root) => existsSync(root)).toSorted();
 }
-function checkMergeStates(pending, idle, now) {
+function checkMergeStates(pending, idle, grace) {
 	const repos = /* @__PURE__ */ new Map();
 	for (const entry of pending) repos.set(entry.repo, [...repos.get(entry.repo) ?? [], entry]);
 	for (const [repo, entries] of repos) {
-		const target = fetchDefaultBranch(repo, now);
+		const target = fetchDefaultBranch(repo, grace.now);
 		for (const { candidate, facts } of entries) {
 			const merge = "error" in target ? {
 				merged: false,
@@ -701,11 +617,12 @@ function checkMergeStates(pending, idle, now) {
 			const verdict = worktreeSkipReason({
 				...facts,
 				merge
-			}, idle);
+			}, idle, grace);
 			Object.assign(candidate, {
 				merge,
 				skipCode: verdict?.code ?? null,
-				skipped: verdict?.text ?? null
+				skipped: verdict?.text ?? null,
+				eligibleAt: verdict?.eligibleAt ?? null
 			});
 		}
 	}
@@ -716,6 +633,10 @@ function checkMergeStates(pending, idle, now) {
 */
 function collectWorktreeSweep({ idle, olderThan, now }) {
 	const days = idle ? olderThan ?? DEFAULT_WORKTREE_IDLE_DAYS : null;
+	const grace = {
+		ms: graceMsSetting(),
+		now
+	};
 	const groups = /* @__PURE__ */ new Map();
 	const outside = [];
 	for (const root of candidateRoots()) {
@@ -727,7 +648,8 @@ function collectWorktreeSweep({ idle, olderThan, now }) {
 				idleDays: null,
 				merge: null,
 				skipCode: "not-a-worktree",
-				skipped: "not inside a git worktree"
+				skipped: "not inside a git worktree",
+				eligibleAt: null
 			});
 			continue;
 		}
@@ -742,6 +664,7 @@ function collectWorktreeSweep({ idle, olderThan, now }) {
 		const keys = [.../* @__PURE__ */ new Set([...roots, ...reclaimKeys(path)])];
 		const idleDays = idleDaysOf(keys, now);
 		const linked = !("refusal" in source) && entry !== null && source.path !== entry.path;
+		const activity = linked && grace.ms > 0 ? worktreeActivityOf(path, keys) : null;
 		const gitAnswered = linked ? hasUncommittedWork(path) : null;
 		const facts = {
 			source: "refusal" in source ? source : linked ? "linked" : "source",
@@ -752,16 +675,18 @@ function collectWorktreeSweep({ idle, olderThan, now }) {
 			submodules: linked && hasPopulatedSubmodules(path),
 			inUse: linked ? inUseOf(keys, { managedLocks: true }) : [],
 			idleDays,
-			merge: null
+			merge: null,
+			activity
 		};
-		const verdict = worktreeSkipReason(facts, days);
+		const verdict = worktreeSkipReason(facts, days, grace);
 		const candidate = {
 			path,
 			keys,
 			idleDays,
 			merge: null,
 			skipCode: verdict?.code ?? null,
-			skipped: verdict?.text ?? null
+			skipped: verdict?.text ?? null,
+			eligibleAt: verdict?.eligibleAt ?? null
 		};
 		if (verdict && MERGE_DECIDES.has(verdict.code) && !("refusal" in source)) pending.push({
 			candidate,
@@ -770,13 +695,14 @@ function collectWorktreeSweep({ idle, olderThan, now }) {
 		});
 		worktrees.push(candidate);
 	}
-	checkMergeStates(pending, days, now);
+	checkMergeStates(pending, days, grace);
 	const listed = [...worktrees, ...outside].filter((w) => idle || w.skipCode !== "not-a-worktree" && w.skipCode !== "source-checkout");
 	return {
 		idle: days === null ? null : {
 			olderThan: days,
 			defaulted: olderThan === null
 		},
+		graceMs: grace.ms,
 		worktrees: listed
 	};
 }
@@ -795,6 +721,16 @@ async function removeWorktrees(sweep, { now = Date.now() } = {}) {
 				const idleDays = idleDaysOf(keys, now);
 				if (idleDays === null || !sweep.idle || idleDays < sweep.idle.olderThan) reasons.push(`used ${idleDays === null ? "at an unknown time" : `${idleDays}d ago`} since gc checked it`);
 			}
+			if (sweep.graceMs > 0) {
+				const recent = graceBlocker({
+					merge: candidate.merge,
+					activity: worktreeActivityOf(candidate.path, keys)
+				}, {
+					ms: sweep.graceMs,
+					now: Date.now()
+				});
+				if (recent) reasons.push(recent.text);
+			}
 			kept = reasons;
 			return reasons;
 		};
@@ -851,7 +787,7 @@ function formatParkedAvdReport(parkedAvds, now) {
 	lines.push(`Parked emulators (${parkedAvds.length}):`);
 	for (const avd of parkedAvds) {
 		const listed = avd.listed === false ? " - not on this machine" : avd.listed === null ? " - listing unavailable; kept" : "";
-		lines.push(`  android ${avd.name} ${avd.systemImage} ${parkedAge(avd.parkedAt, now)}${avd.bytes === null ? "" : ` ${formatBytes(avd.bytes)}`}${listed}`);
+		lines.push(`  android ${avd.name} ${avd.systemImage}${avd.deviceProfile ? ` ${avd.deviceProfile}` : ""} ${parkedAge(avd.parkedAt, now)}${avd.bytes === null ? "" : ` ${formatBytes(avd.bytes)}`}${listed}`);
 	}
 	lines.push("              --delete attempts verified deletions and keeps failures.");
 	return lines;
@@ -1136,7 +1072,8 @@ function gcReportSections({ skipped = [], deadProjects = [], orphanedPorts = [],
 			mergedInto: w.merge?.merged ? w.merge.into : null,
 			willRemove: w.skipCode === null,
 			reason: w.skipCode,
-			detail: w.skipped ?? worktreeRemovalReason(w)
+			detail: w.skipped ?? worktreeRemovalReason(w),
+			eligibleAt: w.eligibleAt === null ? null : new Date(w.eligibleAt).toISOString()
 		})),
 		parkedSimulators: parkedSims.map(({ udid, name, model, runtime, parkedAt, bytes, listed }) => ({
 			udid,
@@ -1147,9 +1084,10 @@ function gcReportSections({ skipped = [], deadProjects = [], orphanedPorts = [],
 			bytes,
 			listed
 		})),
-		parkedEmulators: parkedAvds.map(({ name, systemImage, parkedAt, bytes, listed }) => ({
+		parkedEmulators: parkedAvds.map(({ name, systemImage, deviceProfile, parkedAt, bytes, listed }) => ({
 			name,
 			systemImage,
+			deviceProfile,
 			parkedAt,
 			bytes,
 			listed
@@ -1311,7 +1249,7 @@ async function collectGcReport({ olderThan = null, cache = null, worktrees = fal
 		all
 	};
 	const mountedVolumes = listMountedVolumes();
-	const cfg = loadConfig();
+	const cfg = loadConfig$1();
 	let easSessionSweep = deps.precollectedEasSessionSweep;
 	if (!easSessionSweep) try {
 		easSessionSweep = collectEasSessionSweep(cfg, deps);
@@ -1344,7 +1282,7 @@ async function collectGcReport({ olderThan = null, cache = null, worktrees = fal
 			else invalidProjects.push(path);
 			continue;
 		}
-		if (existsSync$1(path)) continue;
+		if (existsSync(path)) continue;
 		if (!isOnMountedVolume(path, mountedVolumes)) {
 			const volume = volumeRootFor(path);
 			skipped.push({
@@ -1567,7 +1505,7 @@ async function sweep(opts, deps) {
 	try {
 		easSessionSweep = await withProjectLock(projectRoot, () => {
 			sweepStarted = true;
-			return withRemoteSessionGcLocks(projectRoot, deps, (coordinatedDeps) => Promise.resolve(collectEasSessionSweep(loadConfig(), coordinatedDeps)));
+			return withRemoteSessionGcLocks(projectRoot, deps, (coordinatedDeps) => Promise.resolve(collectEasSessionSweep(loadConfig$1(), coordinatedDeps)));
 		}, {
 			waitMs: 0,
 			ownerPurpose: "EAS orphan sweep",
@@ -1611,7 +1549,7 @@ async function runGcCore(opts, deps) {
 	const { deadProjects, invalidProjects, orphanedDevices, staleDevices, staleDeviceRecords, buildLocks, buildSlots, deviceLeases, easSessionSweep, caches } = report;
 	const actionable = deadProjects.length + invalidProjects.length > 0 || report.orphanedWorkspaces.length > 0 || Boolean(report.workspaceOutputs?.workspaces.some((entry) => entry.willClear)) || Boolean(report.worktreeSweep?.worktrees.some((entry) => !entry.skipped)) || report.parkedSims.length > 0 || report.parkedAvds.length > 0 || orphanedDevices.length > 0 || staleDevices.length > 0 || staleDeviceRecords.length > 0 || buildLocks.stale.length > 0 || buildSlots.stale.length > 0 || deviceLeases.expired.length > 0 || easSessionSweep.orphaned.length > 0 || (olderThan !== null || all) && caches.length > 0;
 	const idle = opts.idle ?? null;
-	const idleFailures = idle === null ? 0 : shutDownIdleDevices(report.idleDevices, idle, () => collectIdleDevices(loadConfig(), listAllIosSims({ timeoutMs: DEVICE_LIST_TIMEOUT_MS }), report.deadProjects)).failures;
+	const idleFailures = idle === null ? 0 : shutDownIdleDevices(report.idleDevices, idle, () => collectIdleDevices(loadConfig$1(), listAllIosSims({ timeoutMs: DEVICE_LIST_TIMEOUT_MS }), report.deadProjects)).failures;
 	if (idleFailures) process.exitCode = 1;
 	const payload = (failures) => ({
 		mode: opts.delete ? "delete" : "dry-run",
@@ -1634,7 +1572,7 @@ async function runGcCore(opts, deps) {
 	deleteFailures += deleteParkedSims(report.parkedSims, deps) + deleteParkedAvds(report.parkedAvds);
 	removeInvalidProjectEntries(invalidProjects);
 	for (const path of deadProjects) {
-		if (existsSync$1(path) || !isOnMountedVolume(path)) {
+		if (existsSync(path) || !isOnMountedVolume(path)) {
 			console.log(chalk.yellow(`Kept ${path}: its absence can no longer be confirmed.`));
 			continue;
 		}