stim 1.11.0 → 1.12.0

package/dist/{doctor-D8QdMRMf.mjs → doctor-LfDlbR-N.mjs}

@@ -1,23 +1,24 @@
-import { g as loadConfig$1, l as getConcurrencyLimits, o as configCorruptRepair } from "./config-BEq0Qw_a.mjs";
+import { _ as loadConfig$1, s as configCorruptRepair, u as getConcurrencyLimits } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { D as workspaceDerivedData, S as sharedBuildCache } from "./metro-BWLOJ_Wr.mjs";
-import { D as makeTemporaryDirectory, E as filesystemDevice, a as dirtyFingerprintFiles, h as locallyKnownUpstream, k as temporaryRoot, m as listWorktrees, s as gitCommonDir, x as resolveSourceCheckout, y as repoRoot } from "./worktree-BlizKDpZ.mjs";
-import { a as detectIsExpo, n as appProjectProblem, o as findProjectRoot } from "./project-BXZzOABt.mjs";
-import { d as quotedPath, f as refuseNoProject, l as phaseLine, u as plural } from "./command-output-D5z2_bcF.mjs";
-import { T as fingerprintProject, h as listBuildLocks, x as diffFingerprintSources } from "./device-lease-D83nqeMX.mjs";
-import { C as hostSystemImageArch, T as listAdbDevices } from "./android-C4zG2Tuc.mjs";
-import { F as settingsLayers, H as compilerCacheFallbackMessage, L as unknownSettingKeys, N as settingOrigin, O as remoteAndroidSetting, P as settingShapeErrors, T as projectOptimizations, W as resolveOptimizations, a as SETTING_SHAPE_REMEDY, i as SETTINGS_WITH_RESOLVE_TIME_FALLBACK, j as resolveSettings, k as remoteIosSetting, n as PATH_SETTINGS, v as iosSimSlimProfileSetting, y as mergeSettingsLayers } from "./settings-B5oFZEri.mjs";
-import { h as POOL_SETTING_REMEDY, y as parkedMaxSetting } from "./ownership-BiojdtAp.mjs";
-import { O as hostMemoryPressureAdvice, k as readHostMemoryPressure, l as listAllIosSims } from "./ios-DArbmwer.mjs";
-import { o as listBuildSlots } from "./in-use-DVhlSoyn.mjs";
-import { L as ownerFromConfig, M as checkEasAuth$1, R as providerFromConfig, _ as easCliSupport, g as MIN_EAS_CLI_SIMULATOR_VERSION, s as readInstalledEasCliVersion, v as easCliUpgradeRemedy, z as resolveEasCliBin } from "./device-remote-BQZSnnmE.mjs";
+import { D as workspaceDerivedData, S as sharedBuildCache } from "./metro-Dzo30hvJ.mjs";
+import { D as makeTemporaryDirectory, E as filesystemDevice, a as dirtyFingerprintFiles, h as locallyKnownUpstream, k as temporaryRoot, m as listWorktrees, s as gitCommonDir, x as resolveSourceCheckout, y as repoRoot } from "./worktree-DeBQSVtR.mjs";
+import { i as findProjectRoot, n as appProjectProblem, r as detectIsExpo } from "./project-B8rbutVC.mjs";
+import { d as quotedPath, f as refuseNoProject, l as phaseLine, u as plural } from "./command-output-BWCj5Vh-.mjs";
+import { T as fingerprintProject, h as listBuildLocks, x as diffFingerprintSources } from "./device-lease-B9LAXIUH.mjs";
+import { E as listAdbDevices, w as hostSystemImageArch } from "./android-75Sk2rIR.mjs";
+import { F as settingsLayers, H as compilerCacheFallbackMessage, L as unknownSettingKeys, N as settingOrigin, O as remoteAndroidSetting, P as settingShapeErrors, T as projectOptimizations, W as resolveOptimizations, a as SETTING_SHAPE_REMEDY, i as SETTINGS_WITH_RESOLVE_TIME_FALLBACK, j as resolveSettings, k as remoteIosSetting, n as PATH_SETTINGS, v as iosSimSlimProfileSetting, y as mergeSettingsLayers } from "./settings-BlyDn2Oz.mjs";
+import { h as POOL_SETTING_REMEDY, y as parkedMaxSetting } from "./ownership-B8d4kXBx.mjs";
+import { O as hostMemoryPressureAdvice, k as readHostMemoryPressure, l as listAllIosSims } from "./ios-CZWOHTTc.mjs";
+import { o as listBuildSlots } from "./in-use-D9XYEgFD.mjs";
+import { f as resolveEasCliBin, i as checkEasAuth$1, l as ownerFromConfig, u as providerFromConfig } from "./remote-cache-BRsRZru5.mjs";
+import { D as MIN_EAS_CLI_SIMULATOR_VERSION, O as easCliSupport, k as easCliUpgradeRemedy, s as readInstalledEasCliVersion } from "./device-remote-C0_o-tJH.mjs";
 import { n as inspectStimVersions, t as compareStimVersions } from "./stim-installations-CINXy_su.mjs";
-import { a as liveOwnedDeviceCount, n as simslimIsOnPath, u as MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION } from "./simslim-CIR3IYJO.mjs";
-import { n as budgetLine, r as inspectBudget } from "./budget-De3P2rq_.mjs";
-import { d as projectCmakeLauncher, g as androidPathRoomRemedy, h as androidPathRoomMessage, i as apkOutputsDir, m as androidPathRoom, r as resolveAndroidCompilerCache, t as readAndroidCasToolchain } from "./android-cas-DfJkwCXW.mjs";
-import { h as podInstallCommand, i as ccacheEnabled, o as detectXcodeMajor } from "./xcode-B5SPD--o.mjs";
-import { n as recordDoctorRun } from "./guide-status-CWvti2Lg.mjs";
-import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-r9UesA9a.mjs";
+import { a as liveOwnedDeviceCount, n as simslimIsOnPath, u as MIN_EAS_CLI_BUILD_DOWNLOAD_VERSION } from "./simslim-COtEEP7x.mjs";
+import { n as budgetLine, r as inspectBudget } from "./budget-DbzW5VTD.mjs";
+import { d as projectCmakeLauncher, g as androidPathRoomRemedy, h as androidPathRoomMessage, i as apkOutputsDir, m as androidPathRoom, r as resolveAndroidCompilerCache, t as readAndroidCasToolchain } from "./android-cas-DzLPXiEn.mjs";
+import { h as podInstallCommand, i as ccacheEnabled, o as detectXcodeMajor } from "./xcode-BzplpQzc.mjs";
+import { n as recordDoctorRun } from "./guide-status-i9ogHt4v.mjs";
+import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-DNN0yfx6.mjs";
 import { existsSync, lstatSync, readFileSync, readdirSync, realpathSync, rmSync } from "node:fs";
 import { InvalidArgumentError } from "commander";
 import { existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, renameSync as renameSync$1, rmSync as rmSync$1, writeFileSync as writeFileSync$1 } from "fs";

package/dist/{error-diagnostics-UYFSQwRy.mjs → error-diagnostics-CCxjn31V.mjs}

@@ -1,12 +1,12 @@
-import { R as deviceSlotKey, f as getProject, z as deviceSlotPlatforms } from "./config-BEq0Qw_a.mjs";
+import { B as deviceSlotPlatforms, p as getProject, z as deviceSlotKey } from "./config-0jCcMM0E.mjs";
 import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { P as withDirLock, m as readWorkspaceState$1, s as resolveProjectMetro } from "./metro-BWLOJ_Wr.mjs";
-import { d as readWorkspaceLaunches } from "./state-WGdIbi_d.mjs";
-import { v as launchErrorPreview } from "./command-output-D5z2_bcF.mjs";
-import { a as parseLease, n as fileLeaseIo, t as deviceLeasePath } from "./device-lease-D83nqeMX.mjs";
-import { c as androidToolCwd, i as androidHome } from "./android-C4zG2Tuc.mjs";
+import { P as withDirLock, m as readWorkspaceState$1, s as resolveProjectMetro } from "./metro-Dzo30hvJ.mjs";
+import { f as readWorkspaceLaunches } from "./state-DcDgzfu3.mjs";
+import { v as launchErrorPreview } from "./command-output-BWCj5Vh-.mjs";
+import { a as parseLease, n as fileLeaseIo, t as deviceLeasePath } from "./device-lease-B9LAXIUH.mjs";
+import { a as androidHome, l as androidToolCwd } from "./android-75Sk2rIR.mjs";
 import { r as deviceConsoleLevel } from "./ios-device-BiOsSVzd.mjs";
-import { n as parseLogcatLine, t as androidClockOffset } from "./android-BA2i_KAV.mjs";
+import { n as parseLogcatLine, t as androidClockOffset } from "./android-BQiKJYK0.mjs";
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { attachExpoErrorContext, readLogRecords, sortByTs } from "@stim-cli/core/state";
 import { basename, dirname, join, resolve, sep } from "node:path";

package/dist/{gc-COZteyiq.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-D83nqeMX.mjs";
-import { D as listAvds, N as ownedAvdDirectory, Y as isStimOwnedSim, k as listOrphanedAvdDirectories, w as isStimOwnedAvdName } from "./android-C4zG2Tuc.mjs";
-import { h as POOL_SETTING_REMEDY, y as parkedMaxSetting } from "./ownership-BiojdtAp.mjs";
-import { l as listAllIosSims } from "./ios-DArbmwer.mjs";
-import { a as parseIdleDuration, o as shutDownIdleDevices, r as idleDeviceLines, t as collectIdleDevices } from "./idle-NETbeNiQ.mjs";
-import { i as canonicalPath, o as listBuildSlots, r as workspaceInUse } from "./in-use-DVhlSoyn.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-BQZSnnmE.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-COD2xCz-.mjs";
-import { a as reclaimKeys, d as removeWorktreeTarget, m as reclaimProject, n as excludePodChurn, p as describeDereferenced, r as matchWorktreeEntry } from "./worktree-KOjMX3zA.mjs";
-import { n as mergeState, t as fetchDefaultBranch } from "./merge-state-DDxS-XIZ.mjs";
+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, 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;
@@ -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,
@@ -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";
@@ -402,6 +404,8 @@ async function deleteEasSessions(easSessionSweep, deps) {
 //#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",
@@ -414,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");
@@ -447,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;
@@ -456,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(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,
@@ -474,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
 			});
 		}
 	}
@@ -489,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()) {
@@ -500,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;
 		}
@@ -515,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",
@@ -525,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,
@@ -543,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
 	};
 }
@@ -568,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;
 		};
@@ -909,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,
@@ -1085,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);
@@ -1341,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",
@@ -1385,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",