stim 1.13.0 → 1.15.0

package/dist/{worktree-D4Do_XiQ.mjs → worktree-qXKzADSC.mjs}

@@ -1,29 +1,37 @@
-import { A as ownership_claim_exports, O as process_identity_exports, T as upsertProject, U as projectDeviceSlots, _ as loadConfig, a as clearDevice, d as getConfigDir, g as isPathPrefix, k as acquireAvdClaim, p as getProject, x as removeProject } from "./config-0jCcMM0E.mjs";
-import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
-import { a as pidExists, c as resolveProjectMetro, g as recordWorkspaceUse, h as readWorkspaceState, k as workspaceDir, l as signalProcessTree, n as killMetroTree } from "./metro-BPeY1YMh.mjs";
-import { C as sourceCheckoutOf, S as restoreFile, T as warmWorktreePaths, _ as readWorktreeExclude, b as resolveFullRef, d as hasUncommittedWork, f as isPodInstallChurn, g as podsOutOfSync, h as locallyKnownUpstream, i as depsOutOfSync, l as hasPopulatedSubmodules, m as listWorktrees, n as cloneIgnoredEntries, o as dirtyPaths, r as deleteBranch, s as gitCommonDir, t as branchExists, u as hasRemote, v as removeWorktree, w as unpushedCommits } from "./worktree-DeBQSVtR.mjs";
-import { a as findProjectRoot } from "./project-DGeclhvO.mjs";
-import { a as clearRemoteSession, c as readMetroTunnel, d as readRemoteSessionId, i as clearManagedMetroTunnel, u as readRemoteSession } from "./state-DwAU2_-D.mjs";
-import { t as clearNamedPorts } from "./named-ports-n7tnJsI8.mjs";
-import { a as formatElapsed, h as shortUdid, i as formatDuration, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-BIL7rlX7.mjs";
-import { u as releaseWorkspaceLeases } from "./device-lease-CL9dZf73.mjs";
-import { ct as parkedMaxSetting, rt as POOL_SETTING_REMEDY } from "./android-qx_31wJo.mjs";
-import { L as unknownSettingKeys, P as settingShapeErrors, a as SETTING_SHAPE_REMEDY, j as resolveSettings } from "./settings-xB0Frkg6.mjs";
-import { f as teardownOwnedAvd, i as stopTunnel, l as withManagedTunnelRemovalLock, m as teardownOwnedIosSim, p as teardownOwnedBrowser, s as withManagedRemoteWorktreeRemovalLock, t as resolveSupervisorTarget } from "./ownership-PUP4Dwai.mjs";
-import { a as readWebRecord } from "./state-l1pYwOre.mjs";
-import { n as withIdleWorkspace, t as emptyWorkspaceDir } from "./in-use-wYEaKQM9.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-Bz2kETAS.mjs";
-import { f as resolveEasCliBin } from "./remote-cache--aehr4Pr.mjs";
-import { i as endRecordedSession } from "./device-remote-DT9ngZiD.mjs";
-import { h as podInstallCommand, n as HEARTBEAT_INTERVAL_MS } from "./xcode-LM6A8cNZ.mjs";
-import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-DNN0yfx6.mjs";
-import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-2Wo81np9.mjs";
+import { t as getExecutor } from "./exec-CaErVv7t.mjs";
+import { E as upsertProject, H as projectDeviceSlots, S as removeProject, _ as loadConfig$1, a as clearDevice, d as getConfigDir, g as isPathPrefix, k as acquireAvdClaim, p as getProject } from "./config-D0DbpZtM.mjs";
+import { n as ownership_claim_exports, t as process_identity_exports } from "./process-identity-BmRm1qV0.mjs";
+import { a as pullRequestLookup, r as endedPullRequest } from "./pull-request-pxnDCQzn.mjs";
+import { b as workspaceDir, i as recordWorkspaceUse, r as readWorkspaceState$1 } from "./workspace-state-CL2V2Ons.mjs";
+import { C as sourceCheckoutOf, S as restoreFile, T as warmWorktreePaths, _ as readWorktreeExclude, b as resolveFullRef, d as hasUncommittedWork, f as isPodInstallChurn, g as podsOutOfSync, h as locallyKnownUpstream, i as depsOutOfSync, l as hasPopulatedSubmodules, m as listWorktrees, n as cloneIgnoredEntries, o as dirtyPaths, r as deleteBranch, s as gitCommonDir, t as branchExists, u as hasRemote, v as removeWorktree, w as unpushedCommits } from "./worktree-C0c5Udwa.mjs";
+import { a as findProjectRoot$1, n as appProjectProblem } from "./project-CV3tDFHl.mjs";
+import { a as clearRemoteSession, c as readMetroTunnel, d as readRemoteSessionId, i as clearManagedMetroTunnel, u as readRemoteSession } from "./state-CaeaHbDA.mjs";
+import { a as formatElapsed, h as shortUdid, i as formatDuration, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-CliHHn7a.mjs";
+import { u as releaseWorkspaceLeases } from "./device-lease-W5Pi1q38.mjs";
+import { a as workspaceLinks, i as workspaceLinkLine } from "./stim-desktop-Cnz8CPnl.mjs";
+import { at as POOL_SETTING_REMEDY, dt as parkedMaxSetting } from "./android-Db2eEMaf.mjs";
+import { l as resolveProjectMetro, o as pidExists, r as killMetroTree, u as signalProcessTree } from "./metro-Di8EN2Tb.mjs";
+import { B as unknownSettingKeys, L as settingShapeErrors, N as resolveSettings, a as SETTING_SHAPE_REMEDY } from "./settings-CduVcoxj.mjs";
+import { a as teardownOwnedBrowser, i as teardownOwnedAvd, o as teardownOwnedIosSim } from "./teardown-BYuQafiA.mjs";
+import { t as clearNamedPorts } from "./named-ports-Dj_XBNaL.mjs";
+import { o as readWebRecord } from "./state-DFm77wRn.mjs";
+import { n as withIdleWorkspace, t as emptyWorkspaceDir } from "./in-use-CndPMilN.mjs";
+import { g as withManagedRemoteWorktreeRemovalLock, l as withdrawDevServerStopRequest, p as stopTunnel, s as requestDevServerStop, u as resolveSupervisorTarget, v as withManagedTunnelRemovalLock } from "./stop-cause-CZ_Mr-v9.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-BkYxUtuj.mjs";
+import { C as podInstallCommand, u as HEARTBEAT_INTERVAL_MS } from "./toolchain-DmeYjXD9.mjs";
+import { t as stopMacosApp } from "./stop-Bvf1MflS.mjs";
+import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-BFlKbOIp.mjs";
+import { f as resolveEasCliBin } from "./remote-cache-CO2elm_b.mjs";
+import { i as endRecordedSession } from "./device-remote-9ulPsdhY.mjs";
+import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-BmsjKZ2H.mjs";
+import { a as forgetStatusMeasures, t as startWarmProgress } from "./warm-progress-DVHLN4uC.mjs";
+import { createHash, randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
-import { existsSync as existsSync$1, realpathSync as realpathSync$1 } from "fs";
-import { basename, dirname, isAbsolute, relative, resolve } from "path";
+import { join, relative } from "node:path";
+import { existsSync as existsSync$1, realpathSync as realpathSync$1, rmSync as rmSync$1 } from "fs";
+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 { workspaceName } from "@stim-cli/core";
-import { join as join$1, relative as relative$1 } from "node:path";
-import { createHash, randomUUID } from "node:crypto";
+import { LAST_BUILD_KEYS, readMacosRecord } from "@stim-cli/core/state";
 import chalk from "chalk";
 //#region src/devices/reclaim.ts
 async function reapCollectors(root, { verify = verifyCollectorOwnership, collectors }) {
@@ -166,14 +174,22 @@ function describeDereferenced(project) {
 	}
 	return devices;
 }
-function parkRequest(projectPath, slot, simslimManaged) {
+function lastBuildCacheKey(projectPath, platform) {
+	const build = readWorkspaceState$1(projectPath)?.[LAST_BUILD_KEYS[platform]];
+	if (build === null || typeof build !== "object" || Array.isArray(build)) return null;
+	const { cacheKey } = build;
+	return typeof cacheKey === "string" ? cacheKey : null;
+}
+function parkRequest(project, projectPath, slot, simslimManaged) {
 	const { max, error } = parkedMaxSetting("ios");
 	if (error || max <= 0) return void 0;
 	return {
 		projectPath,
 		max,
 		simslimManaged,
-		slot
+		slot,
+		appId: typeof project?.bundleId === "string" ? project.bundleId : null,
+		cacheKey: lastBuildCacheKey(projectPath, "ios")
 	};
 }
 function reclaimOwnedDevices(project, projectPath, { park = false } = {}) {
@@ -191,7 +207,7 @@ function reclaimOwnedDevices(project, projectPath, { park = false } = {}) {
 			const r = teardownOwnedIosSim(udid, {
 				del: true,
 				label,
-				...park ? { park: parkRequest(projectPath, slot, Boolean(ios.simslimManaged)) } : {}
+				...park ? { park: parkRequest(project, projectPath, slot, Boolean(ios.simslimManaged)) } : {}
 			});
 			if (r.parkFallback) poolNotes.push(`could not park ${label}: ${r.parkFallback} -- deleted it instead`);
 			for (const failure of r.evictionFailures ?? []) poolNotes.push(failure);
@@ -230,7 +246,9 @@ function reclaimOwnedDevices(project, projectPath, { park = false } = {}) {
 					projectPath,
 					slot,
 					max: bound.max,
-					configuration: typeof android.poolConfiguration === "string" ? android.poolConfiguration : void 0
+					configuration: typeof android.poolConfiguration === "string" ? android.poolConfiguration : void 0,
+					appId: typeof project?.androidPackage === "string" ? project.androidPackage : null,
+					cacheKey: lastBuildCacheKey(projectPath, "android")
 				} } : {}
 			});
 			if (r.parkFallback) poolNotes.push(`could not park ${android.avdName}: ${r.parkFallback} -- deleted it instead`);
@@ -298,12 +316,12 @@ async function reclaimProject(path, options = {}) {
 		failedWorkspaceDirs: []
 	};
 }
-async function reclaimIdleProject(path, workspaceExisted, { deleteOwnedDevices = false, parkOwnedDevices = false, preserveProjectRecord = false, stopSession = defaultStopSession, stopMetroTunnel = defaultStopMetroTunnel, releaseLeases = releaseWorkspaceLeases, verifyCollector = verifyCollectorOwnership, teardownBrowser = teardownOwnedBrowser }) {
+async function reclaimIdleProject(path, workspaceExisted, { deleteOwnedDevices = false, parkOwnedDevices = false, preserveProjectRecord = false, stopSession = defaultStopSession, stopMetroTunnel = defaultStopMetroTunnel, releaseLeases = releaseWorkspaceLeases, verifyCollector = verifyCollectorOwnership, teardownBrowser = teardownOwnedBrowser, stopRequester = { by: "stim gc --delete" } }) {
 	await clearNamedPorts(path, { stop: true });
 	const project = getProject(path);
 	for (const { platforms } of projectDeviceSlots(project)) if (platforms.android?.owned && platforms.android.avdName) (0, ownership_claim_exports.releaseClaim)(acquireAvdClaim(platforms.android.avdName));
 	const dereferenced = describeDereferenced(project);
-	const initialState = readWorkspaceState(path);
+	const initialState = readWorkspaceState$1(path);
 	let killedPid = null;
 	let skippedMetro = null;
 	let supervisorHeld = false;
@@ -318,7 +336,10 @@ async function reclaimIdleProject(path, workspaceExisted, { deleteOwnedDevices =
 	};
 	const orphanIdentity = supervisor.status === "stale" && typeof orphanServer.processToken === "string" ? (0, process_identity_exports.inspectProcessIdentity)(orphanServer) : null;
 	if (supervisor.status === "ours") {
-		if (killMetroTree(supervisor.pid, supervisor.processToken) && await (0, process_identity_exports.waitForProcessExit)(supervisor, 1e4)) killedPid = supervisor.pid;
+		requestDevServerStop(path, supervisor.processToken, stopRequester);
+		const signalled = killMetroTree(supervisor.pid, supervisor.processToken);
+		if (!signalled) withdrawDevServerStopRequest(path, supervisor.processToken);
+		if (signalled && await (0, process_identity_exports.waitForProcessExit)(supervisor, 1e4)) killedPid = supervisor.pid;
 		else {
 			skippedMetro = `could not confirm supervisor pid ${supervisor.pid} exited`;
 			supervisorHeld = true;
@@ -356,7 +377,7 @@ async function reclaimIdleProject(path, workspaceExisted, { deleteOwnedDevices =
 		failedCollectors.push(entry);
 	}
 	function retainReplacementProcesses() {
-		const currentState = readWorkspaceState(path);
+		const currentState = readWorkspaceState$1(path);
 		const currentProject = getProject(path);
 		if (Boolean(currentState?.supervisor && !(0, process_identity_exports.sameProcessRecord)(currentState.supervisor, initialState?.supervisor) || currentProject?.supervisor && !(0, process_identity_exports.sameProcessRecord)(currentProject.supervisor, project?.supervisor) || readWebRecord(path) !== null || Object.entries(currentState?.collectors ?? {}).some(([platform, record]) => !(0, process_identity_exports.sameProcessRecord)(record, initialState?.collectors?.[platform])))) {
 			supervisorHeld = true;
@@ -379,6 +400,17 @@ async function reclaimIdleProject(path, workspaceExisted, { deleteOwnedDevices =
 		skippedDevices.push(remote.failed);
 		failedDevices.push(remote.failed);
 	}
+	const hosted = readMacosRecord(path)?.host;
+	if (hosted) try {
+		await stopMacosApp(path);
+	} catch (error) {
+		const failed = {
+			name: `hosted macOS session ${hosted.session} on ${hosted.machine}`,
+			reason: String(error?.message ?? error)
+		};
+		skippedDevices.push(failed);
+		failedDevices.push(failed);
+	}
 	const tunnel = await reclaimMetroTunnel(path, { stopMetroTunnel });
 	if (tunnel.failed) {
 		skippedDevices.push(tunnel.failed);
@@ -425,192 +457,6 @@ async function reclaimIdleProject(path, workspaceExisted, { deleteOwnedDevices =
 	};
 }
 //#endregion
-//#region src/workspace/pull-request.ts
-const GH_TIMEOUT_MS = 2e4;
-const GH_ENV = {
-	GH_PROMPT_DISABLED: "1",
-	GH_NO_UPDATE_NOTIFIER: "1",
-	NO_COLOR: "1"
-};
-const GH_FIELDS = "number,state,url,headRefOid,mergedAt,closedAt,isCrossRepository";
-const SIGNED_OUT_EXIT = 4;
-function stateOf(state) {
-	if (state === "OPEN") return "open";
-	if (state === "MERGED") return "merged";
-	if (state === "CLOSED") return "closed";
-	return null;
-}
-function epoch(text) {
-	const at = text ? Date.parse(text) : NaN;
-	return Number.isFinite(at) ? at : null;
-}
-/**
-* Picks the pull request that describes `head` among those `gh pr list --head <branch>` returned. One whose head is
-* `head` wins, then one whose head contains `head`, then one whose head `head` contains. An open one wins a tier,
-* then the newest. A pull request unrelated to `head` is from an earlier use of the branch name, and one from a fork
-* only shares the branch name; both are ignored.
-* `isAncestor(a, b)` answers whether commit `a` is an ancestor of commit `b`, and false when git cannot tell.
-*/
-function selectPullRequest(pulls, head, isAncestor) {
-	const known = pulls.flatMap((pull) => {
-		const state = stateOf(pull.state);
-		return state && pull.headRefOid && !pull.isCrossRepository ? [{
-			pull,
-			state
-		}] : [];
-	});
-	const tiers = [
-		known.filter(({ pull }) => pull.headRefOid === head),
-		known.filter(({ pull }) => pull.headRefOid !== head && isAncestor(head, pull.headRefOid)),
-		known.filter(({ pull }) => pull.headRefOid !== head && isAncestor(pull.headRefOid, head))
-	];
-	const tier = tiers.findIndex((entries) => entries.length > 0);
-	if (tier < 0) return null;
-	const { pull, state } = tiers[tier].toSorted((a, b) => Number(b.state === "open") - Number(a.state === "open") || b.pull.number - a.pull.number)[0];
-	return {
-		number: pull.number,
-		state,
-		url: pull.url,
-		head: pull.headRefOid,
-		containsHead: tier < 2,
-		endedAt: state === "merged" ? epoch(pull.mergedAt) : state === "closed" ? epoch(pull.closedAt) : null
-	};
-}
-function firstLine(error) {
-	const { stderr, message } = error;
-	const text = String(stderr ?? "").trim() || String(message ?? error);
-	return text.split("\n")[0] ?? text;
-}
-function ghFailure(error, command) {
-	if (error.status === SIGNED_OUT_EXIT) return {
-		unavailable: "gh is not signed in; run `gh auth login`",
-		sticky: true
-	};
-	if (error.code === "ETIMEDOUT") return {
-		unavailable: `${command} did not answer within ${GH_TIMEOUT_MS / 1e3}s`,
-		sticky: true
-	};
-	return {
-		unavailable: `${command} failed: ${firstLine(error)}`,
-		sticky: false
-	};
-}
-function ancestry(cwd) {
-	const exec = getExecutor();
-	return (ancestor, descendant) => exec.runFileQuiet("git", [
-		"-C",
-		cwd,
-		"merge-base",
-		"--is-ancestor",
-		ancestor,
-		descendant
-	]) !== null;
-}
-/**
-* Asks GitHub, through `gh`, which pull requests have `branch` as their head, run from `cwd` so `gh` picks the
-* repository from its remotes. Each call is one fixed `gh pr list` invocation. Once `gh` is missing, signed out or
-* times out, every later lookup through the same function answers `unavailable` without running it again.
-*/
-function pullRequestLookup() {
-	let unavailable;
-	return (cwd, branch, head) => {
-		const exec = getExecutor();
-		if (unavailable === void 0) unavailable = exec.findExecutable("gh") ? null : "gh is not installed";
-		if (unavailable) return { unavailable };
-		let out;
-		try {
-			out = exec.runFile("gh", [
-				"pr",
-				"list",
-				"--head",
-				branch,
-				"--state",
-				"all",
-				"--limit",
-				"20",
-				"--json",
-				GH_FIELDS
-			], {
-				cwd,
-				timeoutMs: GH_TIMEOUT_MS,
-				env: GH_ENV
-			});
-		} catch (error) {
-			const failure = ghFailure(error, "gh pr list");
-			if (failure.sticky) unavailable = failure.unavailable;
-			return { unavailable: failure.unavailable };
-		}
-		let pulls;
-		try {
-			pulls = JSON.parse(out);
-		} catch {
-			return { unavailable: "gh pr list printed no JSON" };
-		}
-		return { pullRequest: Array.isArray(pulls) ? selectPullRequest(pulls, head, ancestry(cwd)) : null };
-	};
-}
-function branchesQuery(count) {
-	return `query($owner: String!, $repo: String!${Array.from({ length: count }, (_, i) => `, $b${i}: String!`).join("")}) { repository(owner: $owner, name: $repo) {${Array.from({ length: count }, (_, i) => ` b${i}: pullRequests(headRefName: $b${i}, states: [OPEN, CLOSED, MERGED], first: 20, orderBy: {field: CREATED_AT, direction: DESC}) { nodes { ${GH_FIELDS.replaceAll(",", " ")} } }`).join("")} } }`;
-}
-/**
-* {@link pullRequestLookup} for every branch of one repository in one fixed `gh api graphql` call run from `repo`,
-* which asks for the same 20 newest pull requests of each head branch that `gh pr list --head` returns. `gh` fills
-* `{owner}` and `{repo}` from the remotes of `repo`; branch names travel as variables. Once `gh` is missing, signed
-* out or times out, every later call through the same function answers `unavailable` without running it again.
-*/
-function pullRequestLookups() {
-	let unavailable;
-	return async (repo, queries) => {
-		const exec = getExecutor();
-		if (unavailable === void 0) unavailable = exec.findExecutable("gh") ? null : "gh is not installed";
-		const all = (lookup) => queries.map(() => lookup);
-		if (unavailable) return all({ unavailable });
-		if (!queries.length) return [];
-		const args = [
-			"api",
-			"graphql",
-			"-F",
-			"owner={owner}",
-			"-F",
-			"repo={repo}"
-		];
-		queries.forEach(({ branch }, i) => args.push("-f", `b${i}=${branch}`));
-		args.push("-f", `query=${branchesQuery(queries.length)}`);
-		let out;
-		try {
-			out = await exec.runFileAsync("gh", args, {
-				cwd: repo,
-				timeoutMs: GH_TIMEOUT_MS,
-				env: GH_ENV
-			});
-		} catch (error) {
-			const failure = ghFailure(error, "gh api graphql");
-			if (failure.sticky) unavailable = failure.unavailable;
-			return all({ unavailable: failure.unavailable });
-		}
-		let found;
-		try {
-			found = JSON.parse(out).data?.repository;
-		} catch {
-			return all({ unavailable: "gh api graphql printed no JSON" });
-		}
-		if (!found) return all({ unavailable: "gh api graphql printed no repository" });
-		return queries.map(({ cwd, head }, i) => {
-			const pulls = found[`b${i}`]?.nodes;
-			return { pullRequest: Array.isArray(pulls) ? selectPullRequest(pulls, head, ancestry(cwd)) : null };
-		});
-	};
-}
-/** The merged or closed pull request whose commits include HEAD, which makes the worktree removable. */
-function endedPullRequest(lookup) {
-	const pr = lookup && "pullRequest" in lookup ? lookup.pullRequest : null;
-	return pr && pr.state !== "open" && pr.containsHead ? pr : null;
-}
-/** "PR #123 merged", for reports. */
-function describePullRequest(pr) {
-	return `PR #${pr.number} ${pr.state}`;
-}
-//#endregion
 //#region src/engine/warm-claim.ts
 const WARM_CLAIM_LABEL = "worktree warm";
 const WARM_CLAIM_POLL_MS = 250;
@@ -631,10 +477,10 @@ function defaultSleep(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
 function warmClaimsDir() {
-	return join$1(getConfigDir(), "warm-locks");
+	return join(getConfigDir(), "warm-locks");
 }
 function warmClaimPath(repositoryRoot) {
-	return join$1(warmClaimsDir(), `${workspaceName(repositoryRoot)}.lock`);
+	return join(warmClaimsDir(), `${workspaceName(repositoryRoot)}.lock`);
 }
 function warmCommand(phase) {
 	return phase === "refresh" ? "stim worktree warm --refresh" : "stim worktree warm";
@@ -961,11 +807,11 @@ function stepLine(label, reason, action) {
 	return phaseLine(label, `${reason} -> ${action}`);
 }
 function installRecordFile(depsRoot) {
-	return join$1(getConfigDir(), "warm-installs", `${workspaceName(depsRoot)}.json`);
+	return join(getConfigDir(), "warm-installs", `${workspaceName(depsRoot)}.json`);
 }
 function lockfileHash(depsRoot, lockfile) {
 	try {
-		return createHash("sha256").update(readFileSync(join$1(depsRoot, lockfile))).digest("hex");
+		return createHash("sha256").update(readFileSync(join(depsRoot, lockfile))).digest("hex");
 	} catch {
 		return null;
 	}
@@ -987,7 +833,7 @@ function readInstallEvidence(depsRoot) {
 function writeInstallEvidence(depsRoot, lockfile, hash, completed) {
 	const file = installRecordFile(depsRoot);
 	const tmp = `${file}.${process.pid}.${randomUUID()}.tmp`;
-	mkdirSync(join$1(getConfigDir(), "warm-installs"), { recursive: true });
+	mkdirSync(join(getConfigDir(), "warm-installs"), { recursive: true });
 	writeFileSync(tmp, JSON.stringify({
 		lock: lockfile,
 		hash: hash ?? "",
@@ -1005,9 +851,9 @@ function restoreInstallEvidence(depsRoot, prior) {
 	else rmSync(installRecordFile(depsRoot), { force: true });
 }
 function inProgressOperation(gitDir) {
-	if (existsSync(join$1(gitDir, "rebase-merge"))) return "rebase";
-	if (existsSync(join$1(gitDir, "rebase-apply"))) return existsSync(join$1(gitDir, "rebase-apply", "applying")) ? "am" : "rebase";
-	return existsSync(join$1(gitDir, "MERGE_HEAD")) ? "merge" : null;
+	if (existsSync(join(gitDir, "rebase-merge"))) return "rebase";
+	if (existsSync(join(gitDir, "rebase-apply"))) return existsSync(join(gitDir, "rebase-apply", "applying")) ? "am" : "rebase";
+	return existsSync(join(gitDir, "MERGE_HEAD")) ? "merge" : null;
 }
 function readMainCheckoutState(root) {
 	const exec = getExecutor();
@@ -1261,7 +1107,7 @@ async function refreshMainCheckout({ root, appDir, settings, emit, spawnFn = nul
 	const consumed = dependencies ? lockfileHash(dependencies.root, dependencies.lock) : null;
 	const deps = depsPlan({
 		lockfile: dependencies?.lock ?? null,
-		lockfileChanged: dependencies ? pathChangedBetween(root, before, head, gitPath(relative$1(root, dependencies.root), dependencies.lock)) : false,
+		lockfileChanged: dependencies ? pathChangedBetween(root, before, head, gitPath(relative(root, dependencies.root), dependencies.lock)) : false,
 		installed,
 		treeValid: dependencies?.lock === "package-lock.json" && installed ? installedNpmTreeIsValid(dependencies.root) : null,
 		lastInstall: priorInstall,
@@ -1293,11 +1139,11 @@ async function refreshMainCheckout({ root, appDir, settings, emit, spawnFn = nul
 		if (marked) restoreInstallEvidence(marked.root, priorInstall);
 		emit(stepLine("deps", depsSubject, "skipped"));
 	}
-	const app = relative$1(root, appDir) || ".";
+	const app = relative(root, appDir) || ".";
 	const where = `source ${appDir}: `;
 	const podState = readPodState(appDir);
 	const pods = podsPlan({
-		hasIos: existsSync(join$1(appDir, "ios")),
+		hasIos: existsSync(join(appDir, "ios")),
 		hasPodfile: podState.hasPodfile,
 		podfileLockChanged: pathChangedBetween(root, before, head, gitPath(app, "ios", "Podfile.lock")),
 		stale: podsAreStale(podState.lockText, podState.manifestText)
@@ -1328,12 +1174,12 @@ async function refreshMainCheckout({ root, appDir, settings, emit, spawnFn = nul
 //#endregion
 //#region src/commands/worktree.ts
 function dependencyInstallCommand(target, dir = ".") {
-	const installRoot = resolve(target, dir);
+	const installRoot = resolve$1(target, dir);
 	let command = "npm install";
-	if (existsSync$1(resolve(installRoot, "pnpm-lock.yaml"))) command = "pnpm install";
-	else if (existsSync$1(resolve(installRoot, "yarn.lock"))) command = "yarn install";
-	else if (existsSync$1(resolve(installRoot, "bun.lock")) || existsSync$1(resolve(installRoot, "bun.lockb"))) command = "bun install";
-	else if (existsSync$1(resolve(installRoot, "package-lock.json"))) command = "npm ci";
+	if (existsSync$1(resolve$1(installRoot, "pnpm-lock.yaml"))) command = "pnpm install";
+	else if (existsSync$1(resolve$1(installRoot, "yarn.lock"))) command = "yarn install";
+	else if (existsSync$1(resolve$1(installRoot, "bun.lock")) || existsSync$1(resolve$1(installRoot, "bun.lockb"))) command = "bun install";
+	else if (existsSync$1(resolve$1(installRoot, "package-lock.json"))) command = "npm ci";
 	return `cd '${installRoot.replaceAll("'", "'\\''")}' && ${command}`;
 }
 function reportCarriedStateHealth(root, target, copied) {
@@ -1351,7 +1197,7 @@ function reportCarriedStateHealth(root, target, copied) {
 	}
 	for (const p of podsOutOfSync(target, copied)) {
 		const where = p.dir === "." ? "Podfile.lock" : `${p.dir}/Podfile.lock`;
-		const pod = podInstallCommand(p.dir === "." ? target : resolve(target, p.dir, ".."));
+		const pod = podInstallCommand(p.dir === "." ? target : resolve$1(target, p.dir, ".."));
 		console.error(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.`)));
 	}
 }
@@ -1363,18 +1209,51 @@ function reportRefreshFailure(failure) {
 	process.exitCode = 1;
 }
 function mainCheckoutAppDir(root, target) {
-	const app = findProjectRoot(process.cwd());
+	const app = findProjectRoot$1(process.cwd());
 	if (!app) return root;
-	const rel = relative(target, app);
-	if (!rel || rel.startsWith("..") || isAbsolute(rel)) return root;
-	return resolve(root, rel);
+	const rel = relative$1(target, app);
+	if (!rel || rel.startsWith("..") || isAbsolute$1(rel)) return root;
+	return resolve$1(root, rel);
+}
+/**
+* The app workspace a warm prepares: the nearest app below the worktree root, or else the one app registered in
+* the source checkout, at the same place in this worktree, or else the worktree root when it is the app. A monorepo
+* root can declare react-native without being the app.
+*/
+function warmedWorkspace(root, target, cwd) {
+	const nearest = findProjectRoot$1(cwd);
+	const app = nearest && isPathPrefix(target, nearest) && appProjectProblem(nearest) === null ? nearest : null;
+	if (app && app !== target) return app;
+	const apps = /* @__PURE__ */ new Set();
+	for (const path of Object.keys(loadConfig$1()?.projects ?? {})) {
+		const rel = relative$1(root, path);
+		if (rel.startsWith("..") || isAbsolute$1(rel)) continue;
+		const mapped = resolve$1(target, rel);
+		if (appProjectProblem(mapped) === null) apps.add(mapped);
+	}
+	return apps.size === 1 ? [...apps][0] : app;
+}
+function registerWarmedWorkspace(workspace) {
+	try {
+		if (!getProject(workspace)) upsertProject(workspace, {});
+	} catch (error) {
+		console.error(chalk.yellow(`Could not register ${workspace} for status: ${error?.message || String(error)}`));
+	}
 }
 function registerWarm(worktree) {
 	worktree.command("warm").description("Copy missing ignored paths from the source checkout into the current linked worktree.").option("--refresh", "Before copying, fast-forward the source checkout to its upstream and install what the new commits moved.").action(async (opts) => {
+		let progress = null;
+		let workspace = null;
 		try {
 			const { root, target, common } = warmWorktreePaths(process.cwd());
-			const app = findProjectRoot(process.cwd());
+			const app = findProjectRoot$1(process.cwd());
 			if (app) recordWorkspaceUse(app);
+			workspace = warmedWorkspace(root, target, process.cwd());
+			if (!workspace) console.error(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);
+				progress = startWarmProgress(workspace, opts.refresh ? "refresh" : "copy", { note: (line) => console.error(chalk.yellow(line)) });
+			}
 			const readSettings = () => {
 				const settings = resolveSettings({
 					gitCommonDir: common,
@@ -1390,6 +1269,7 @@ function registerWarm(worktree) {
 				return settings;
 			};
 			const copy = (wait) => {
+				progress?.step("copy");
 				if (wait?.holder) console.error(warmClaimAcquiredLine(wait));
 				const incomplete = incompleteInstallRefusal(root, mainCheckoutAppDir(root, target));
 				if (incomplete) {
@@ -1487,6 +1367,10 @@ function registerWarm(worktree) {
 			if (claim) console.error(chalk.dim(claim.remedy));
 			if (typeof code === "string" && code.startsWith("STIM_")) console.error(chalk.red(`failed: ${code}`));
 			process.exitCode = 1;
+		} finally {
+			progress?.finish(!process.exitCode);
+			const links = workspace && !process.exitCode ? workspaceLinks(workspace) : void 0;
+			if (links) console.error(chalk.dim(workspaceLinkLine(links)));
 		}
 	});
 }
@@ -1501,6 +1385,20 @@ function porcelainPath(line) {
 }
 const SAFE_DIFF_PATH = /^[A-Za-z0-9._/-]+$/;
 const POD_CHURN_PATH = /(?:^|\/)ios\/(?:Podfile\.lock|[^/]+\.xcodeproj\/project\.pbxproj)$/;
+const WATCHMAN_COOKIE_PATH = /(?:^|\/)\.watchman-cookie-[A-Za-z0-9._-]+$/;
+function excludeWatchmanCookies(lines) {
+	const kept = [];
+	const cookies = [];
+	for (const line of lines || []) {
+		const path = String(line).startsWith("?? ") ? porcelainPath(line) : null;
+		if (path && SAFE_DIFF_PATH.test(path) && WATCHMAN_COOKIE_PATH.test(path)) cookies.push(path);
+		else kept.push(line);
+	}
+	return {
+		lines: kept,
+		cookies
+	};
+}
 function excludePodChurn(lines) {
 	const kept = [];
 	const restore = [];
@@ -1523,11 +1421,11 @@ function excludePodChurn(lines) {
 }
 function nativeCanonicalPath(path) {
 	const missing = [];
-	for (let existing = resolve(path);; existing = dirname(existing)) try {
-		return resolve(realpathSync$1.native(existing), ...missing);
+	for (let existing = resolve$1(path);; existing = dirname$1(existing)) try {
+		return resolve$1(realpathSync$1.native(existing), ...missing);
 	} catch {
-		if (dirname(existing) === existing) return resolve(path);
-		missing.unshift(basename(existing));
+		if (dirname$1(existing) === existing) return resolve$1(path);
+		missing.unshift(basename$1(existing));
 	}
 }
 function matchWorktreeEntry(entries, path) {
@@ -1581,7 +1479,7 @@ function describeKeptDevice(s) {
 	return s.udid && s.udid !== s.name ? `${s.name} (${s.udid})` : s.name;
 }
 function reclaimKeys(rootPath) {
-	const cfg = loadConfig();
+	const cfg = loadConfig$1();
 	const keys = /* @__PURE__ */ new Set([rootPath]);
 	const root = nativeCanonicalPath(rootPath);
 	if (cfg?.projects) {
@@ -1615,7 +1513,8 @@ async function reclaimAll(rootPath, keys = reclaimKeys(rootPath), { preserveRoot
 			r = await reclaimProject(key, {
 				deleteOwnedDevices: true,
 				parkOwnedDevices: true,
-				preserveProjectRecord: preserveRootProject && key === rootPath
+				preserveProjectRecord: preserveRootProject && key === rootPath,
+				stopRequester: { by: "stim worktree remove" }
 			});
 		} catch (error) {
 			keptEntries.push(key);
@@ -1712,7 +1611,7 @@ function reportRetainedResources(root, result) {
 	process.exitCode = 1;
 }
 function hasRegisteredProjectUnder(rootPath) {
-	const cfg = loadConfig();
+	const cfg = loadConfig$1();
 	return Object.keys(cfg?.projects ?? {}).some((key) => isPathPrefix(rootPath, key));
 }
 async function reclaimEnvironment(root, why) {
@@ -1739,20 +1638,21 @@ function removalPath(target) {
 	return canonicalExistingPath(target ?? process.cwd());
 }
 function canonicalExistingPath(target) {
-	const resolved = resolve(target);
+	const resolved = resolve$1(target);
 	let existing = resolved;
 	const missing = [];
 	while (!existsSync$1(existing)) {
-		const parent = dirname(existing);
+		const parent = dirname$1(existing);
 		if (parent === existing) return resolved;
-		missing.unshift(basename(existing));
+		missing.unshift(basename$1(existing));
 		existing = parent;
 	}
-	return resolve(realpathSync$1(existing), ...missing);
+	return resolve$1(realpathSync$1(existing), ...missing);
 }
 function inspectRemoval(path, mergedHead) {
 	const gitAnswered = hasUncommittedWork(path);
-	const { lines: dirtyLines, restore: podChurn } = excludePodChurn(gitAnswered ? dirtyPaths(path, { limit: Infinity }) : []);
+	const { lines: withoutCookies, cookies } = excludeWatchmanCookies(gitAnswered ? dirtyPaths(path, { limit: Infinity }) : []);
+	const { lines: dirtyLines, restore: podChurn } = excludePodChurn(withoutCookies);
 	const dirty = gitAnswered === null ? null : dirtyLines.length > 0;
 	const unpushed = unpushedCommits(path);
 	const blockers = removalBlockers({
@@ -1763,6 +1663,7 @@ function inspectRemoval(path, mergedHead) {
 	return {
 		dirtyLines,
 		podChurn,
+		cookies,
 		unpushed,
 		blockers
 	};
@@ -1781,6 +1682,9 @@ function printRemovalRefusal(path, inspection) {
 	console.error(chalk.dim("work stays on the branch."));
 	process.exitCode = 1;
 }
+function deleteWatchmanCookies(path, cookies) {
+	for (const cookie of cookies) rmSync$1(join$1(path, cookie), { force: true });
+}
 function restorePodChurn(path, files) {
 	for (const file of files) if (restoreFile(path, file)) console.error(chalk.dim(`  restored ${file} (pod install churn; the worktree is being removed)`));
 	else console.error(chalk.yellow(`  could not restore ${file}; git may refuse to remove the worktree`));
@@ -1828,7 +1732,7 @@ async function runRemove(target, opts, onRemoved) {
 				console.error(chalk.dim(phaseLine("branch", `${branch} is already absent; cleared its pending cleanup record`)));
 				return;
 			}
-			const checkedOutAt = listWorktrees(mainRoot).find((candidate) => candidate.branch === branch && resolve(candidate.path) !== resolve(path))?.path;
+			const checkedOutAt = listWorktrees(mainRoot).find((candidate) => candidate.branch === branch && resolve$1(candidate.path) !== resolve$1(path))?.path;
 			if (checkedOutAt) {
 				console.error(chalk.red(`Refusing pending cleanup for ${branch}: it is checked out at ${checkedOutAt}.`));
 				console.error(chalk.dim("Switch that worktree to another branch, then retry this command."));
@@ -1944,6 +1848,7 @@ async function runRemove(target, opts, onRemoved) {
 			return;
 		}
 		restorePodChurn(path, current.podChurn);
+		deleteWatchmanCookies(path, current.cookies);
 		try {
 			removeWorktree(path, {
 				from: source.path,
@@ -1959,6 +1864,7 @@ async function runRemove(target, opts, onRemoved) {
 			return;
 		}
 		onRemoved();
+		forgetStatusMeasures(path, result.reclaimedKeys);
 		const finish = () => {
 			printRemovalCleanup(result, false);
 			console.error(chalk.dim(phaseLine("removed", path)));
@@ -1974,7 +1880,7 @@ async function runRemove(target, opts, onRemoved) {
 				worktreeRemovalComplete: true,
 				worktreePendingBranchSha: approvedBranchSha
 			});
-			const checkedOutAt = listWorktrees(branchDeleteCwd).find((candidate) => candidate.branch === branch && resolve(candidate.path) !== resolve(path))?.path;
+			const checkedOutAt = listWorktrees(branchDeleteCwd).find((candidate) => candidate.branch === branch && resolve$1(candidate.path) !== resolve$1(path))?.path;
 			if (checkedOutAt) {
 				console.error(chalk.yellow(phaseLine("branch", `kept ${branch} (it is checked out at ${checkedOutAt})`)));
 				console.error(chalk.dim(`  Switch that worktree to another branch, then retry: stim worktree remove ${path}`));
@@ -2008,4 +1914,4 @@ function worktreeCommand(program) {
 	registerRemove(worktree);
 }
 //#endregion
-export { reclaimProject as _, reclaimKeys as a, removalBlockers as c, removeWorktreeTarget as d, worktreeCommand as f, describeDereferenced as g, pullRequestLookups as h, porcelainPath as i, removalPath as l, endedPullRequest as m, excludePodChurn as n, registerRemove as o, describePullRequest as p, matchWorktreeEntry as r, registerWarm as s, dependencyInstallCommand as t, removalRemedy as u };
+export { porcelainPath as a, registerWarm as c, removalRemedy as d, removeWorktreeTarget as f, reclaimProject as g, describeDereferenced as h, matchWorktreeEntry as i, removalBlockers as l, worktreeCommand as m, excludePodChurn as n, reclaimKeys as o, warmedWorkspace as p, excludeWatchmanCookies as r, registerRemove as s, dependencyInstallCommand as t, removalPath as u };