stim 1.23.1 → 1.24.0

package/dist/{worktree-B4Nj3EGS.mjs → worktree-Dw8kfacb.mjs}

@@ -1,47 +1,49 @@
-import { c as declareSpawnsOn, f as stopDeclaringSpawnsOn, g as process_identity_exports, m as operationState, n as isTimeoutError, 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, b as operationState, l as WorkspaceProcessCleanupError, m as declareSpawnsOn, n as isTimeoutError, t as getExecutor, v as stopDeclaringSpawnsOn } from "./exec-VFRpu1iA.mjs";
 import { d as workspaceDir, l as workspaceAgentDeviceDir } from "./paths-DQtTgsBf.mjs";
-import { E as upsertProject, G as projectDeviceSlots, L as measuredDirectorySizeAsync, S as removeProject, _ as loadConfig$1, a as clearDevice, d as getConfigDir, g as isPathPrefix, j as acquireAvdClaim, p as getProject } from "./config-DlrsduwG.mjs";
-import { a as formatElapsed, h as shortUdid, i as formatDuration, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-YKGWivpG.mjs";
-import { c as gitQuiet, o as git, r as childEnvironment, s as gitAsync, t as runOperationFile } from "./operation-exec-BW0em61G.mjs";
-import { i as recordWorkspaceUse, r as readWorkspaceState$1 } from "./workspace-state-U08dEzhG.mjs";
-import { At as readWorktreeExclude, Bt as warmWorktreePaths, Ct as isPodInstallChurn, Dt as locallyKnownUpstream, Et as listWorktreesAsync, Ft as resolveFullRefAsync, K as resolveIosProjectDir, Lt as restoreFileAsync, Pt as resolveFullRef, Rt as sourceCheckoutOf, St as hasUncommittedWorkAsync, Y as resolveSettings, a as SETTING_SHAPE_REMEDY, bt as hasPopulatedSubmodulesAsync, dt as branchExistsAsync, et as settingShapeErrors, ft as cloneIgnoredEntries, gt as dirtyPathsAsync, it as unknownSettingKeys, jt as removeWorktreeAsync, kt as podsOutOfSync, mt as depsOutOfSync, pt as deleteBranchAsync, q as resolveProjectSettings, vt as gitCommonDirAsync, xt as hasRemoteAsync, yt as gitCommonDirOnDisk, z as readCommittedSettings, zt as unpushedCommitsAsync } from "./settings-C7O8A6ZI.mjs";
-import { F as readRemoteSessionId, M as readMetroTunnel, O as clearManagedMetroTunnel, P as readRemoteSession, T as MODE_COMMAND, i as findProjectRoot$1, k as clearRemoteSession, o as isMobileProject } from "./project-DhCtQWWU.mjs";
-import { t as macosAppPresent } from "./state-08I3hw3_.mjs";
-import { c as pidExists, d as resolveProjectMetro, p as signalProcessTreeAsync, r as killMetroTreeAsync } from "./metro-DiXtA3Ty.mjs";
-import { o as readWebRecord } from "./state--smjFSTL.mjs";
-import { In as runProcessOperation, S as withdrawDevServerStopRequest, b as requestDevServerStop, br as discoverCaches, c as readVolumeSpace, l as readVolumeSpaceAsync, nt as planCacheEmptying, o as machineNumber, qn as resolveEasCliBin, u as resolveBudget, zt as endRecordedSession } from "./budget-3ivAK99e.mjs";
+import { E as upsertProject, G as projectDeviceSlots, L as measuredDirectorySizeAsync, O as withConfigLockAsync$1, S as removeProject, _ as loadConfig$1, a as clearDevice, d as getConfigDir, g as isPathPrefix, j as acquireAvdClaim, p as getProject } from "./config-BZhXY15H.mjs";
+import { a as formatElapsed, h as shortUdid, i as formatDuration, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-DxC0k2rk.mjs";
+import { c as gitQuiet, o as git, r as childEnvironment, s as gitAsync, t as runOperationFile } from "./operation-exec-CUZifp6Z.mjs";
+import { a as recordWorkspaceUseAsync, l as withWorkspaceStateLockAsync, r as readWorkspaceState$1 } from "./workspace-state-CeBpIZgr.mjs";
+import { At as readWorktreeExclude, Bt as warmWorktreePaths, Ct as isPodInstallChurn, Dt as locallyKnownUpstream, Et as listWorktreesAsync, Ft as resolveFullRefAsync, K as resolveIosProjectDir, Lt as restoreFileAsync, Pt as resolveFullRef, Rt as sourceCheckoutOf, St as hasUncommittedWorkAsync, Vt as filesystemDevice, Wt as removeTemporaryEntryAsync, Y as resolveSettings, a as SETTING_SHAPE_REMEDY, bt as hasPopulatedSubmodulesAsync, dt as branchExistsAsync, et as settingShapeErrors, ft as cloneIgnoredEntries, gt as dirtyPathsAsync, it as unknownSettingKeys, jt as removeWorktreeAsync, kt as podsOutOfSync, mt as depsOutOfSync, pt as deleteBranchAsync, q as resolveProjectSettings, vt as gitCommonDirAsync, xt as hasRemoteAsync, yt as gitCommonDirOnDisk, z as readCommittedSettings, zt as unpushedCommitsAsync } from "./settings-RKwY33wv.mjs";
+import { F as readRemoteSessionId, M as readMetroTunnel, O as clearManagedMetroTunnel, P as readRemoteSession, T as MODE_COMMAND, i as findProjectRoot$1, k as clearRemoteSession, o as isMobileProject } from "./project-Dz-hWkb-.mjs";
+import { t as macosAppPresent } from "./state-BfAltYJP.mjs";
+import { a as workspaceLinkLine, o as workspaceLinks } from "./stim-desktop-DS0mzR8U.mjs";
+import { ft as POOL_SETTING_REMEDY, vt as parkedMaxSetting } from "./android-882m4hxX.mjs";
+import { c as pidExists, d as resolveProjectMetro, p as signalProcessTreeAsync, r as killMetroTreeAsync } from "./metro-Bu8LBfzS.mjs";
+import { o as readWebRecord } from "./state-B1ig0Kqy.mjs";
+import { Rn as runProcessOperation, S as withdrawDevServerStopRequest, Sr as discoverCaches, Vt as endRecordedSession, Yn as resolveEasCliBin, b as requestDevServerStop, c as readVolumeSpace, it as planCacheEmptying, l as readVolumeSpaceAsync, o as machineNumber, u as resolveBudget } from "./budget-dPGuhNai.mjs";
 import { t as canonicalPath } from "./paths-BsJMoPP2.mjs";
-import { p as cacheUser } from "./native-run-Dv88i0aU.mjs";
-import { D as teardownOwnedAvd, O as teardownOwnedBrowser, S as withManagedTunnelRemovalLock, _ as stopTunnel, a as collectWorkspaceOutputs, b as withManagedRemoteWorktreeRemovalLock, d as emptyWorkspaceDir, f as withIdleWorkspace, h as resolveSupervisorTarget, k as teardownOwnedIosSim } from "./workspaces-e41xsjKr.mjs";
-import { D as releaseWorkspaceLeases, t as agentDeviceDaemon } from "./activity-BpWUPgUm.mjs";
-import { _t as parkedMaxSetting, dt as POOL_SETTING_REMEDY } from "./android-C7sVmyI9.mjs";
-import { F as readHostMemoryPressureAsync, P as readHostMemoryPressure } from "./ios-hcBpnEGk.mjs";
-import { a as workspaceLinkLine, o as workspaceLinks } from "./stim-desktop-D5OGpYZM.mjs";
-import { t as clearNamedPorts } from "./named-ports-DkEzOfzO.mjs";
-import { r as HEARTBEAT_INTERVAL_MS, x as podInstallCommand } from "./xcode-Rq744mBF.mjs";
+import { p as cacheUser } from "./native-run-BmH7U8pr.mjs";
+import { A as teardownOwnedIosSim, C as withManagedTunnelRemovalLock, O as teardownOwnedAvd, a as collectWorkspaceOutputs, f as emptyWorkspaceDir, g as resolveSupervisorTarget, k as teardownOwnedBrowser, p as withIdleWorkspace, v as stopTunnel, x as withManagedRemoteWorktreeRemovalLock } from "./workspaces-CSV2Orf4.mjs";
+import { D as releaseWorkspaceLeases, t as agentDeviceDaemon } from "./activity-Dq3ZcdD8.mjs";
+import { F as readHostMemoryPressure, I as readHostMemoryPressureAsync } from "./ios-CVUFFZ6C.mjs";
+import { t as clearNamedPorts } from "./named-ports-BWDuU5oQ.mjs";
+import { r as HEARTBEAT_INTERVAL_MS, x as podInstallCommand } from "./xcode-DHu41qQ4.mjs";
 import { t as resolveMaintenanceSettings } from "./settings-Djl-mpjX.mjs";
-import { _ as runCaptured, h as readPodState, m as podsAreStale, p as DEPS_ERROR, v as runPodInstall } from "./toolchain-B9hCFCQw.mjs";
-import { i as stopHostedAndroid } from "./hosted-android-xcfgCgSF.mjs";
-import { r as stopHostedIos } from "./hosted-ios-y19jCYFF.mjs";
-import { n as stopMacosApp } from "./stop-CR5689oB.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-C5fo5Edb.mjs";
-import { a as discoverXcodeProject } from "./react-native-build-CelbTO_y.mjs";
-import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-1I9KZT1Y.mjs";
-import { a as forgetStatusMeasures, p as mergeStateAsync, t as startWarmProgress } from "./warm-progress-CA3TgT3-.mjs";
-import { o as pullRequestLookupAsync, r as endedPullRequest } from "./pull-request-W1IuLXDt.mjs";
-import { r as workspaceRecordingEnabled } from "./recordings-CQmfzAh7.mjs";
+import { _ as runCaptured, h as readPodState, m as podsAreStale, p as DEPS_ERROR, v as runPodInstall } from "./toolchain-D3bmRMia.mjs";
+import { i as stopHostedAndroid } from "./hosted-android-D4dweBof.mjs";
+import { r as stopHostedIos } from "./hosted-ios-Sn0djzg8.mjs";
+import { n as stopMacosApp } from "./stop-DhclRwOO.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-DxlZGDcV.mjs";
+import { n as removePhoneReverses } from "./phone-reverses-BdsdesVF.mjs";
+import { a as discoverXcodeProject } from "./react-native-build-AuCu-aAP.mjs";
+import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-C56ll9hY.mjs";
+import { a as forgetStatusMeasures, p as mergeStateAsync, t as startWarmProgress } from "./warm-progress-ol0ZypEu.mjs";
+import { o as pullRequestLookupAsync, r as endedPullRequest } from "./pull-request-CbNlkFok.mjs";
+import { r as workspaceRecordingEnabled } from "./recordings-CdPwYwvs.mjs";
 import { claimRemoveCommand, clearFreeClaimSet, readClaimSet, releaseClaim, tryAcquireClaim } from "@stim-cli/core/ownership-claim";
 import { createHash, randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { cpus, freemem, homedir, loadavg, totalmem } from "node:os";
 import { basename, dirname, join, relative } from "node:path";
 import { buildCacheRoot, configDir, metroCacheRoot, unitLines, unitWords, withDirLockTransaction, workspaceName } from "@stim-cli/core";
-import { LAST_BUILD_KEYS, archiveDir, archiveEnabled, archiveLock, archiveRoot, archivedUsage, buildWorkerRoot, countErrorEntries, endedAgentSessionOf, isJsonObject, listRecordedDevicesAsync, loadConfig, queryLogs, readArchivesAsync, readBuildHistory, readJsonObject, readLastBuilds, readMacosRecord, readPullRequestCache, readWorkspaceState, recordingEnabled, sharedCcache, sharedCompilationCache, sortByTs } from "@stim-cli/core/state";
+import { LAST_BUILD_KEYS, archiveDir, archiveEnabled, archiveLock, archiveRoot, archivedUsage, buildWorkerRoot, countErrorEntries, endedAgentSessionOf, isJsonObject, listRecordedDevicesAsync, loadConfig, queryLogs, readArchivesAsync, readBuildHistory, readJsonObject, readLastBuilds, readMacosRecord, readPullRequestCache, readWorkspaceState, recordingEnabled, sharedCcache, sharedCompilationCache, sortByTs, trashRoot } from "@stim-cli/core/state";
 import { basename as basename$1, dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, relative as relative$1, resolve as resolve$1 } from "path";
 import { setTimeout as setTimeout$1 } from "node:timers/promises";
+import { captureProcessIdentity } from "@stim-cli/core/process-identity";
 import chalk from "chalk";
 import { existsSync as existsSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, readlinkSync as readlinkSync$1, realpathSync as realpathSync$1, renameSync as renameSync$1, rmSync as rmSync$1, symlinkSync as symlinkSync$1, unlinkSync as unlinkSync$1, writeFileSync as writeFileSync$1 } from "fs";
-import { chmod, lstat, mkdir, readdir, rename, rm, stat, utimes, writeFile } from "node:fs/promises";
+import { chmod, lstat, mkdir, mkdtemp, readdir, rename, rm, rmdir, stat, utimes, writeFile } from "node:fs/promises";
 import { createHash as createHash$1 } from "crypto";
 //#region src/maintenance/pressure.ts
 /**
@@ -291,7 +293,7 @@ function findPath(dir, text, bytes) {
 		if (entry.isDirectory()) {
 			const found = findPath(path, text, bytes);
 			if (found) return found;
-		} else if (entry.isFile() && bytes(readFileSync$1(path).toString("latin1"))) return path;
+		} else if (entry.isFile() && bytes(readFileSync$1(path))) return path;
 	}
 	return null;
 }
@@ -319,7 +321,9 @@ function relocatePods({ podsDir, podfileLockPath, sourceRoot, targetRoot, canRel
 	const manifest = readFileSync$1(manifestPath, "utf-8");
 	const pattern = pathPattern(sourceRoot);
 	const textNamesSource = sourceNamer(sourceRoot, targetRoot, "utf-8");
-	const bytesNameSource = sourceNamer(sourceRoot, targetRoot, "latin1");
+	const latin1NamesSource = sourceNamer(sourceRoot, targetRoot, "latin1");
+	const sourceBytes = Buffer.from(sourceRoot, "utf-8");
+	const bytesNameSource = (buffer) => buffer.includes(sourceBytes) && latin1NamesSource(buffer.toString("latin1"));
 	let pods = [];
 	if (normalize$1(podfileLock) === normalize$1(manifest)) {
 		let names;
@@ -357,7 +361,7 @@ function relocatePods({ podsDir, podfileLockPath, sourceRoot, targetRoot, canRel
 		if (!existsSync$1(dir)) continue;
 		walkTextFiles(dir, (file) => {
 			const buffer = readFileSync$1(file);
-			if (buffer.includes(0)) return;
+			if (!buffer.includes(sourceBytes) || buffer.includes(0)) return;
 			const text = buffer.toString("utf-8");
 			if (!pattern.test(text)) return;
 			writeFileSync$1(file, relocatePath(text, sourceRoot, targetRoot));
@@ -994,7 +998,7 @@ async function reclaimRemoteSession(root, { stopSession = defaultStopSession, op
 				reason: `${result.reason} The session is stopped. Re-run cleanup to reconcile its retained ownership claim.`
 			}
 		};
-		clearRemoteSession(root, sessionId);
+		await withWorkspaceStateLockAsync(root, () => clearRemoteSession(root, sessionId));
 		return {
 			stopped: sessionId,
 			failed: null
@@ -1045,7 +1049,7 @@ async function reclaimMetroTunnel(root, { stopMetroTunnel = defaultStopMetroTunn
 			reason: `${result.reason ?? "stop failed"} The process identity could not be verified or the stop could not be confirmed. The ownership record is kept. Inspect the process and retry \`stim worktree remove\`.`
 		}
 	};
-	if (!clearManagedMetroTunnel(root, record)) return {
+	if (!await withWorkspaceStateLockAsync(root, () => clearManagedMetroTunnel(root, record))) return {
 		stopped: null,
 		failed: {
 			platform: "ios",
@@ -1112,7 +1116,7 @@ async function reclaimOwnedDevices(project, projectPath, { park = false, operati
 				parkedDevices.push(r.parked);
 				evictedDevices.push(...r.evicted ?? []);
 			} else if (r.status === "torn-down") deletedDevices.push(r.label);
-			if (!r.parked && (r.status === "torn-down" || r.status === "missing")) clearDevice(projectPath, "ios", slot, udid);
+			if (!r.parked && (r.status === "torn-down" || r.status === "missing")) await withConfigLockAsync$1(() => clearDevice(projectPath, "ios", slot, udid));
 			if (r.status === "skipped") skippedDevices.push({
 				platform: "ios",
 				name: label,
@@ -1152,7 +1156,10 @@ async function reclaimOwnedDevices(project, projectPath, { park = false, operati
 			});
 			if (r.parkFallback) poolNotes.push(`could not park ${android.avdName}: ${r.parkFallback} -- deleted it instead`);
 			for (const failure of r.evictionFailures ?? []) poolNotes.push(failure);
-			if (!r.parked && (r.status === "torn-down" || r.status === "missing")) clearDevice(projectPath, "android", slot, android.avdName);
+			if (!r.parked && (r.status === "torn-down" || r.status === "missing")) {
+				const avdName = android.avdName;
+				await withConfigLockAsync$1(() => clearDevice(projectPath, "android", slot, avdName));
+			}
 			if (r.parked) {
 				parkedDevices.push(r.parked);
 				evictedDevices.push(...r.evicted ?? []);
@@ -1265,6 +1272,7 @@ async function reclaimIdleProject(path, workspaceExisted, { archive, deleteOwned
 	verifyAvdClaims(project, operation);
 	const dereferenced = describeDereferenced(project);
 	const initialState = readWorkspaceState$1(path);
+	await removePhoneReverses(path, { operation });
 	let killedPid = null;
 	let skippedMetro = null;
 	let supervisorHeld = false;
@@ -1279,9 +1287,10 @@ async function reclaimIdleProject(path, workspaceExisted, { archive, deleteOwned
 	};
 	const orphanIdentity = supervisor.status === "stale" && typeof orphanServer.processToken === "string" ? (0, process_identity_exports.inspectProcessIdentity)(orphanServer) : null;
 	if (supervisor.status === "ours") {
-		requestDevServerStop(path, supervisor.processToken, stopRequester);
+		const processToken = supervisor.processToken;
+		await withWorkspaceStateLockAsync(path, () => requestDevServerStop(path, processToken, stopRequester)).catch(() => {});
 		const signalled = await killMetroTreeAsync(supervisor.pid, supervisor.processToken, operation);
-		if (!signalled) withdrawDevServerStopRequest(path, supervisor.processToken);
+		if (!signalled) await withWorkspaceStateLockAsync(path, () => withdrawDevServerStopRequest(path, processToken)).catch(() => {});
 		if (signalled && await (0, process_identity_exports.waitForProcessExit)(supervisor, 1e4, signal)) killedPid = supervisor.pid;
 		else {
 			skippedMetro = `could not confirm supervisor pid ${supervisor.pid} exited`;
@@ -1424,7 +1433,7 @@ async function reclaimIdleProject(path, workspaceExisted, { archive, deleteOwned
 	}
 	const keptEntry = supervisorHeld || failedDevices.length > 0 || failedWorkspaceDirs.length > 0;
 	signal?.throwIfAborted();
-	if (project && !keptEntry && !preserveProjectRecord) removeProject(path);
+	if (project && !keptEntry && !preserveProjectRecord) await withConfigLockAsync$1(() => removeProject(path));
 	return {
 		path,
 		dereferenced,
@@ -2265,6 +2274,205 @@ async function refreshMainCheckout({ root, appDir, settings, iosProject, emit, s
 	return podsRunning;
 }
 //#endregion
+//#region src/workspace/worktree-trash.ts
+const TRASH_MANIFEST = "trash.json";
+const TRASH_ENTRY_PREFIX = "remove-";
+const TRASH_ENTRIES = "entries";
+const TRASH_CLAIMS = "claims";
+const LIST_TIMEOUT_MS = 3e4;
+const DELETE_NICENESS = "10";
+function rethrowCancellation(error, signal) {
+	if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
+	signal?.throwIfAborted();
+}
+async function isPlainDirectory(path) {
+	const stat = await lstat(path).catch(() => null);
+	return Boolean(stat?.isDirectory());
+}
+async function ignoredDirectories(worktree, options) {
+	const out = await gitAsync(worktree, [
+		"ls-files",
+		"--others",
+		"--ignored",
+		"--exclude-standard",
+		"--directory",
+		"--no-empty-directory",
+		"-z"
+	], {
+		...options.env ? childEnvironment(options.env) : {},
+		signal: options.signal,
+		declareFor: options.declareFor,
+		timeoutMs: LIST_TIMEOUT_MS,
+		untrimmed: true
+	});
+	const found = [];
+	for (const entry of out.split("\0")) {
+		if (!entry.endsWith("/")) continue;
+		const rel = entry.slice(0, -1);
+		const parts = rel.split("/");
+		let plain = true;
+		for (let depth = 1; depth <= parts.length && plain; depth++) plain = await isPlainDirectory(join(worktree, ...parts.slice(0, depth)));
+		if (plain) found.push(rel);
+	}
+	return found;
+}
+/**
+* Moves the worktree's ignored directories, which `git worktree remove` would delete, into a new entry under
+* `$STIM_HOME/trash` held by an exclusive ownership claim. Null, with nothing moved, when the trash is on another
+* filesystem, the platform is Windows, git cannot list the entries, or the claim cannot be taken. A directory that
+* does not rename stays in the worktree for git to delete.
+*/
+async function moveIgnoredTreesToTrash(worktree, options = {}) {
+	if ((options.platform ?? process.platform) === "win32") return null;
+	let listed;
+	try {
+		listed = await ignoredDirectories(worktree, options);
+	} catch (error) {
+		rethrowCancellation(error, options.signal);
+		return null;
+	}
+	if (!listed.length) return null;
+	const root = trashRoot();
+	let dir = null;
+	let claim = null;
+	const entries = listed.map((from, index) => ({
+		from,
+		to: String(index)
+	}));
+	try {
+		await mkdir(root, { recursive: true });
+		if (filesystemDevice(root) !== filesystemDevice(worktree)) return null;
+		dir = await mkdtemp(join(root, TRASH_ENTRY_PREFIX));
+		claim = (0, ownership_claim_exports.tryAcquireClaim)({
+			root: join(dir, "claims"),
+			mode: "exclusive",
+			label: "worktree trash"
+		}).acquired ?? null;
+		if (!claim) throw new Error("the trash entry claim was not acquired");
+		const manifest = {
+			worktree,
+			createdAt: (/* @__PURE__ */ new Date()).toISOString()
+		};
+		await writeFile(join(dir, TRASH_MANIFEST), `${JSON.stringify(manifest)}\n`);
+		await mkdir(join(dir, TRASH_ENTRIES));
+	} catch (error) {
+		if (claim) (0, ownership_claim_exports.releaseClaim)(claim);
+		if (dir) await rm(dir, {
+			recursive: true,
+			force: true
+		}).catch(() => {});
+		rethrowCancellation(error, options.signal);
+		return null;
+	}
+	const moved = [];
+	for (const entry of entries) try {
+		await rename(join(worktree, entry.from), join(dir, TRASH_ENTRIES, entry.to));
+		moved.push(entry);
+	} catch {}
+	const trash = {
+		dir,
+		worktree,
+		moved,
+		claim
+	};
+	if (moved.length) return trash;
+	await discardTrash(trash);
+	return null;
+}
+async function discardTrash(trash) {
+	await rmdir(join(trash.dir, TRASH_ENTRIES)).catch(() => {});
+	await rm(join(trash.dir, TRASH_MANIFEST), { force: true }).catch(() => {});
+	(0, ownership_claim_exports.releaseClaim)(trash.claim);
+	await rmdir(trash.dir).catch(() => {});
+}
+/** Moves every tree back into the worktree. Returns the relative paths that stay in the trash for gc. */
+async function restoreTrashedTrees(trash) {
+	const kept = [];
+	for (const entry of trash.moved.toReversed()) {
+		const target = join(trash.worktree, entry.from);
+		try {
+			if (await lstat(target).catch(() => null) || !await isPlainDirectory(dirname(target))) {
+				kept.push(entry.from);
+				continue;
+			}
+			await rename(join(trash.dir, TRASH_ENTRIES, entry.to), target);
+		} catch {
+			kept.push(entry.from);
+		}
+	}
+	if (kept.length) (0, ownership_claim_exports.releaseClaim)(trash.claim);
+	else await discardTrash(trash);
+	return kept;
+}
+/** Deletes one trash entry: `rm -rf` for the bulk, then a walk that also clears read-only directories. */
+async function deleteTrashEntry(dir, operation) {
+	if (process.platform !== "win32") try {
+		await runOperationFile(operation, getExecutor(), "rm", [
+			"-rf",
+			"--",
+			join(dir, TRASH_ENTRIES)
+		], {
+			timeoutMs: "unbounded",
+			signal: operation?.signal,
+			cwd: dirname(dir)
+		});
+	} catch (error) {
+		rethrowCancellation(error, operation?.signal);
+	}
+	await removeTemporaryEntryAsync(dir, operation?.signal);
+}
+function deleteInBackground(trash) {
+	try {
+		(0, ownership_claim_exports.markClaimChildPending)(trash.claim);
+		const child = getExecutor().spawn("nice", [
+			"-n",
+			DELETE_NICENESS,
+			"rm",
+			"-rf",
+			"--",
+			join(trash.dir, TRASH_ENTRIES),
+			trash.dir
+		], {
+			cwd: dirname(trash.dir),
+			detached: true,
+			stdio: "ignore"
+		});
+		child.on?.("error", () => {});
+		child.unref?.();
+		const captured = child.pid === void 0 ? null : captureProcessIdentity(child.pid);
+		if (!captured?.ok || child.pid === void 0) throw new Error("the trash deletion process was not recorded");
+		(0, ownership_claim_exports.setClaimChild)(trash.claim, {
+			pid: child.pid,
+			processToken: captured.token
+		});
+		return true;
+	} catch {
+		try {
+			(0, ownership_claim_exports.clearClaimChild)(trash.claim);
+		} catch {}
+		(0, ownership_claim_exports.releaseClaim)(trash.claim);
+		return false;
+	}
+}
+/**
+* Deletes the trash entry once git removed the worktree. A CLI command starts a detached, low-priority `rm` recorded
+* as the claim's child, so gc reports the entry as in use until `rm` exits. Inside a bounded report, such as the
+* programmatic API, every child is stopped when the report settles, so the entry is deleted before returning.
+* `left` means the entry waits for gc with its claim released.
+*/
+async function disposeTrash(trash, operation) {
+	if (!getExecutor().reportSignal?.()) return deleteInBackground(trash) ? "background" : "left";
+	try {
+		await deleteTrashEntry(trash.dir, operation);
+		return "deleted";
+	} catch (error) {
+		rethrowCancellation(error, operation?.signal);
+		return "left";
+	} finally {
+		(0, ownership_claim_exports.releaseClaim)(trash.claim);
+	}
+}
+//#endregion
 //#region src/commands/worktree.ts
 function dependencyInstallCommand(target, dir = ".") {
 	const installRoot = resolve$1(target, dir);
@@ -2310,7 +2518,7 @@ function reportCarriedStateHealth(root, target, copied, out) {
 	}
 	for (const p of podsOutOfSync(target, copied)) {
 		const where = p.dir === "." ? "Podfile.lock" : `${p.dir}/Podfile.lock`;
-		const pod = podInstallCommand(p.dir === "." ? target : resolve$1(target, p.dir, ".."));
+		const pod = podInstallCommand(p.dir === "." ? target : resolve$1(target, p.dir, ".."), resolve$1(target, p.dir));
 		out(chalk.yellow(phaseLine("carry", p.reason === "missing" ? `carried ${p.dir === "." ? "Pods" : `${p.dir}/Pods`} but there is no ${where}. Run \`${pod}\` before building.` : `carried ${p.dir === "." ? "Pods" : `${p.dir}/Pods`} does not match the ${where} on disk here. Pods are gitignored and cloned; Podfile.lock is tracked, so the two can disagree. Run \`${pod}\` before building, or xcodebuild fails with "sandbox is not in sync" only after every pod has compiled.`)));
 	}
 }
@@ -2345,9 +2553,11 @@ function warmedWorkspace(root, target, cwd) {
 	}
 	return apps.size === 1 ? [...apps][0] : app;
 }
-function registerWarmedWorkspace(workspace, out) {
+async function registerWarmedWorkspace(workspace, out) {
 	try {
-		if (!getProject(workspace)) upsertProject(workspace, {});
+		await withConfigLockAsync$1(() => {
+			if (!getProject(workspace)) upsertProject(workspace, {});
+		});
 	} catch (error) {
 		out(chalk.yellow(`Could not register ${workspace} for status: ${error?.message || String(error)}`));
 	}
@@ -2393,11 +2603,11 @@ async function warmWorktreeTarget(opts) {
 			...workspace ? [workspace] : []
 		]);
 		for (const key of scope) opts.beforeWarm?.(nativeCanonicalPath(key));
-		if (app) recordWorkspaceUse(app, /* @__PURE__ */ new Date(), operation.env, opts.cwd);
-		if (workspace && workspace !== app) recordWorkspaceUse(workspace, /* @__PURE__ */ new Date(), operation.env, opts.cwd);
+		if (app) await recordWorkspaceUseAsync(app, /* @__PURE__ */ new Date(), operation.env, opts.cwd, operation.signal);
+		if (workspace && workspace !== app) await recordWorkspaceUseAsync(workspace, /* @__PURE__ */ new Date(), operation.env, opts.cwd, operation.signal);
 		if (!workspace) out(chalk.dim(phaseLine("project", "no single app to register here; run warm from the app directory to list it in status while it warms")));
 		else {
-			registerWarmedWorkspace(workspace, out);
+			await registerWarmedWorkspace(workspace, out);
 			progress = startWarmProgress(workspace, opts.refresh ? "refresh" : "copy", { note: (line) => out(chalk.yellow(line)) });
 		}
 		const readSettings = () => {
@@ -3021,7 +3231,7 @@ async function removeOrRefuse(target, opts, onRemoved, output) {
 			}
 			opts.beforeRemove?.(removalPath(mainRoot));
 			if (!await branchExistsAsync(mainRoot, branch, options)) {
-				removeProject(path);
+				await withConfigLockAsync$1(() => removeProject(path));
 				output.error(chalk.dim(phaseLine("branch", `${branch} is already absent; cleared its pending cleanup record`)));
 				return;
 			}
@@ -3041,7 +3251,7 @@ async function removeOrRefuse(target, opts, onRemoved, output) {
 			}
 			try {
 				await deleteBranchAsync(mainRoot, branch, pending.worktreePendingBranchSha, options);
-				removeProject(path);
+				await withConfigLockAsync$1(() => removeProject(path));
 				output.error(chalk.dim(phaseLine("branch", `deleted ${branch}; cleared its pending cleanup record`)));
 			} catch (error) {
 				if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
@@ -3192,6 +3402,11 @@ async function removeOrRefuse(target, opts, onRemoved, output) {
 		await restorePodChurn(path, current.podChurn, output, opts.operation);
 		options.signal?.throwIfAborted();
 		deleteWatchmanCookies(path, current.cookies);
+		const trash = await moveIgnoredTreesToTrash(path, {
+			env: options.env,
+			signal: options.signal,
+			declareFor: opts.operation
+		});
 		try {
 			await removeWorktreeAsync(path, {
 				from: source.path,
@@ -3201,6 +3416,8 @@ async function removeOrRefuse(target, opts, onRemoved, output) {
 				declareFor: opts.operation
 			});
 		} catch (error) {
+			const unrestored = trash ? await restoreTrashedTrees(trash) : [];
+			if (trash && unrestored.length) output.error(chalk.yellow(`Could not move ${unrestored.join(", ")} back into ${path}; ${unrestored.length === 1 ? "it stays" : "they stay"} in ${trash.dir}, which stim gc keeps while ${path} exists.`));
 			if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
 			const message = String(error?.message || error);
 			output.error(chalk.red(`git worktree remove failed: ${message}`));
@@ -3211,56 +3428,64 @@ async function removeOrRefuse(target, opts, onRemoved, output) {
 			return;
 		}
 		onRemoved();
-		forgetStatusMeasures(path, result.reclaimedKeys);
-		const finish = () => {
-			printRemovalCleanup(result, false, output);
-			output.error(chalk.dim(phaseLine("removed", path)));
-		};
-		if (deleteOwnedBranch && branch) {
-			if (!approvedBranchSha) {
-				output.error(chalk.yellow(phaseLine("branch", `kept ${branch} (Stim could not record its commit before removal)`)));
-				output.fail();
-				finish();
-				return;
-			}
-			upsertProject(path, {
-				worktreeRemovalComplete: true,
-				worktreePendingBranchSha: approvedBranchSha
-			});
-			let checkedOutAt;
-			try {
-				checkedOutAt = (await listWorktreesAsync(branchDeleteCwd, options)).find((candidate) => candidate.branch === branch && resolve$1(candidate.path) !== resolve$1(path))?.path;
-			} catch (error) {
-				if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
-				opts.operation?.signal.throwIfAborted();
-				if (!isTimeoutError(error)) throw error;
-				output.error(chalk.yellow(phaseLine("branch", `kept ${branch} (git did not list the worktrees in time to check it)`)));
-				output.error(chalk.dim(`  Retry: stim worktree remove ${path}`));
-				output.fail();
-				finish();
-				return;
-			}
-			if (checkedOutAt) {
-				output.error(chalk.yellow(phaseLine("branch", `kept ${branch} (it is checked out at ${checkedOutAt})`)));
-				output.error(chalk.dim(`  Switch that worktree to another branch, then retry: stim worktree remove ${path}`));
-				output.fail();
-				finish();
-				return;
-			}
-			try {
-				await deleteBranchAsync(branchDeleteCwd, branch, approvedBranchSha, options);
-				output.error(chalk.dim(phaseLine("branch", `deleted ${branch}`)));
-			} catch (error) {
-				if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
-				output.error(chalk.yellow(phaseLine("branch", `kept ${branch} (${String(error?.message || error)})`)));
-				output.error(chalk.dim(`  Retry with: git -C ${branchDeleteCwd} branch -D -- ${branch}`));
-				output.fail();
-				finish();
-				return;
+		try {
+			forgetStatusMeasures(path, result.reclaimedKeys);
+			const finish = () => {
+				printRemovalCleanup(result, false, output);
+				output.error(chalk.dim(phaseLine("removed", path)));
+			};
+			if (deleteOwnedBranch && branch) {
+				if (!approvedBranchSha) {
+					output.error(chalk.yellow(phaseLine("branch", `kept ${branch} (Stim could not record its commit before removal)`)));
+					output.fail();
+					finish();
+					return;
+				}
+				await withConfigLockAsync$1(() => upsertProject(path, {
+					worktreeRemovalComplete: true,
+					worktreePendingBranchSha: approvedBranchSha
+				}));
+				let checkedOutAt;
+				try {
+					checkedOutAt = (await listWorktreesAsync(branchDeleteCwd, options)).find((candidate) => candidate.branch === branch && resolve$1(candidate.path) !== resolve$1(path))?.path;
+				} catch (error) {
+					if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
+					opts.operation?.signal.throwIfAborted();
+					if (!isTimeoutError(error)) throw error;
+					output.error(chalk.yellow(phaseLine("branch", `kept ${branch} (git did not list the worktrees in time to check it)`)));
+					output.error(chalk.dim(`  Retry: stim worktree remove ${path}`));
+					output.fail();
+					finish();
+					return;
+				}
+				if (checkedOutAt) {
+					output.error(chalk.yellow(phaseLine("branch", `kept ${branch} (it is checked out at ${checkedOutAt})`)));
+					output.error(chalk.dim(`  Switch that worktree to another branch, then retry: stim worktree remove ${path}`));
+					output.fail();
+					finish();
+					return;
+				}
+				try {
+					await deleteBranchAsync(branchDeleteCwd, branch, approvedBranchSha, options);
+					output.error(chalk.dim(phaseLine("branch", `deleted ${branch}`)));
+				} catch (error) {
+					if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
+					output.error(chalk.yellow(phaseLine("branch", `kept ${branch} (${String(error?.message || error)})`)));
+					output.error(chalk.dim(`  Retry with: git -C ${branchDeleteCwd} branch -D -- ${branch}`));
+					output.fail();
+					finish();
+					return;
+				}
+			} else if (branch && retainedBranchReason) output.error(chalk.dim(phaseLine("branch", `kept ${branch} (${retainedBranchReason})`)));
+			await withConfigLockAsync$1(() => removeProject(path));
+			finish();
+		} finally {
+			if (trash) {
+				const moved = plural(trash.moved.length, "ignored directory", "ignored directories");
+				const disposed = await disposeTrash(trash, opts.operation);
+				output.error(chalk.dim(phaseLine("trash", disposed === "background" ? `deleting ${moved} in the background from ${trash.dir}` : disposed === "deleted" ? `deleted ${moved}` : `left ${moved} in ${trash.dir}; stim gc --delete deletes them`)));
 			}
-		} else if (branch && retainedBranchReason) output.error(chalk.dim(phaseLine("branch", `kept ${branch} (${retainedBranchReason})`)));
-		removeProject(path);
-		finish();
+		}
 	}, opts.operation, opts.beforeRemove), {
 		signal: opts.operation?.signal,
 		declareSpawnsFor: opts.operation
@@ -3277,4 +3502,4 @@ function worktreeCommand(program) {
 	registerRemove(worktree);
 }
 //#endregion
-export { levelFloors as A, measureDisk as C, measureSizes as D, measurePressureAsync as E, lowestFree as M, protectWindowMs as N, sizeScanDeferred as O, cacheBlocked as S, measurePressure as T, worktreeCommand as _, matchWorktreeEntry as a, deleteSelectedArchives as b, reclaimKeys as c, removalBlockers as d, removalPath as f, warmedWorkspace as g, warmWorktreeTarget as h, excludeWatchmanCookies as i, levelStillShort as j, diskPressureLevel as k, registerRemove as l, removeWorktreeTarget as m, dependencyInstallCommand as n, nestedWorktrees as o, removalRemedy as p, excludePodChurn as r, porcelainPath as s, customIosDirs as t, registerWarm as u, describeDereferenced as v, measureDiskAsync as w, sweepArchiveStaging as x, reclaimProject as y };
+export { measurePressureAsync as A, reclaimProject as C, measureDisk as D, cacheBlocked as E, levelStillShort as F, lowestFree as I, protectWindowMs as L, sizeScanDeferred as M, diskPressureLevel as N, measureDiskAsync as O, levelFloors as P, describeDereferenced as S, sweepArchiveStaging as T, worktreeCommand as _, matchWorktreeEntry as a, TRASH_MANIFEST as b, reclaimKeys as c, removalBlockers as d, removalPath as f, warmedWorkspace as g, warmWorktreeTarget as h, excludeWatchmanCookies as i, measureSizes as j, measurePressure as k, registerRemove as l, removeWorktreeTarget as m, dependencyInstallCommand as n, nestedWorktrees as o, removalRemedy as p, excludePodChurn as r, porcelainPath as s, customIosDirs as t, registerWarm as u, TRASH_CLAIMS as v, deleteSelectedArchives as w, deleteTrashEntry as x, TRASH_ENTRY_PREFIX as y };