stim 1.9.0 → 1.10.0

package/dist/{worktree-DKhSF0UX.mjs → worktree-4aZg2NnI.mjs}

@@ -1,2 +1,2 @@
-import { a as reclaimKeys, c as removalBlockers, d as removeWorktreeTarget, f as worktreeCommand, i as porcelainPath, l as removalPath, n as excludePodChurn, o as registerRemove, r as matchWorktreeEntry, s as registerWarm, t as dependencyInstallCommand, u as removalRemedy } from "./worktree-LGB-UwgG.mjs";
+import { a as reclaimKeys, c as removalBlockers, d as removeWorktreeTarget, f as worktreeCommand, i as porcelainPath, l as removalPath, n as excludePodChurn, o as registerRemove, r as matchWorktreeEntry, s as registerWarm, t as dependencyInstallCommand, u as removalRemedy } from "./worktree-BMS7GeqB.mjs";
 export { worktreeCommand as default, dependencyInstallCommand, excludePodChurn, matchWorktreeEntry, porcelainPath, reclaimKeys, registerRemove, registerWarm, removalBlockers, removalPath, removalRemedy, removeWorktreeTarget };

package/dist/{worktree-LGB-UwgG.mjs → worktree-BMS7GeqB.mjs}

@@ -1,115 +1,27 @@
-import { D as process_identity_exports, K as projectDeviceSlots, O as acquireAvdClaim, b as removeProject, f as getProject, g as loadConfig, h as isPathPrefix, i as clearDevice, k as ownership_claim_exports, u as getConfigDir, w as upsertProject } from "./config-Cp9lM3wX.mjs";
-import { t as getExecutor } from "./exec-jIAlgilk.mjs";
-import { _ as workspaceDir, i as recordWorkspaceUse, r as readWorkspaceState } from "./workspace-state-DF2gCFhx.mjs";
-import { C as warmWorktreePaths, S as unpushedCommits, b as restoreFile, c as hasPopulatedSubmodules, d as isPodInstallChurn, f as listWorktrees, g as removeWorktree, h as readWorktreeExclude, i as depsOutOfSync, l as hasRemote, m as podsOutOfSync, n as cloneIgnoredEntries, o as dirtyPaths, p as locallyKnownUpstream, r as deleteBranch, s as gitCommonDir, t as branchExists, u as hasUncommittedWork, v as resolveFullRef, x as sourceCheckoutOf } from "./worktree-R_cUlE7s.mjs";
-import { o as findProjectRoot } from "./project-DS112DYB.mjs";
-import { a as clearRemoteSession, i as clearManagedMetroTunnel, l as readRemoteSession, s as readMetroTunnel, u as readRemoteSessionId } from "./state-NcJzMEBF.mjs";
-import { a as pidExists, c as resolveProjectMetro, l as signalProcessTree, n as killMetroTree } from "./metro-DrLHaMn2.mjs";
-import { n as verifyCollectorOwnership } from "./ownership-D15Op8vN.mjs";
-import { F as unknownSettingKeys, M as settingShapeErrors, i as SETTING_SHAPE_REMEDY, k as resolveSettings } from "./settings-D030k0t4.mjs";
-import { a as formatElapsed, h as shortUdid, i as formatDuration, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-gByVmIjy.mjs";
-import { n as listBuildLocks } from "./build-lock-DPXPLgTc.mjs";
-import { b as resolveEasCliBin, o as parkedMaxSetting, t as POOL_SETTING_REMEDY } from "./sim-pool-KaIsp2Ft.mjs";
-import { n as workspaceProcessLockError, r as workspaceProcessLockPath, t as withWorkspaceProcessLock } from "./workspace-process-lock-DWaiRD0e.mjs";
-import { l as releaseWorkspaceLeases } from "./device-lease-Crs-HkJY.mjs";
-import { _ as listBuildSlots, h as podInstallCommand, n as HEARTBEAT_INTERVAL_MS } from "./xcode-BZqyxh3e.mjs";
-import { E as teardownOwnedIosSim, T as teardownOwnedAvd, i as endRecordedSession } from "./device-remote-AQ5rQPqr.mjs";
-import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-Bq5DcLGn.mjs";
-import { t as clearNamedPorts } from "./named-ports-CmLQSIRj.mjs";
-import { i as stopTunnel, l as withManagedTunnelRemovalLock, n as managedLockHolders, s as withManagedRemoteWorktreeRemovalLock, t as resolveSupervisorTarget } from "./ownership-DCQPuWEc.mjs";
-import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-Cip5vUm1.mjs";
-import { existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, rmdirSync, unlinkSync, writeFileSync } from "node:fs";
+import { D as process_identity_exports, H as projectDeviceSlots, O as acquireAvdClaim, b as removeProject, f as getProject, g as loadConfig, h as isPathPrefix, i as clearDevice, k as ownership_claim_exports, u as getConfigDir, w as upsertProject } from "./config-BEq0Qw_a.mjs";
+import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
+import { O as workspaceDir, c as signalProcessTree, h as recordWorkspaceUse, i as pidExists, m as readWorkspaceState, s as resolveProjectMetro, t as killMetroTree } from "./metro-BWLOJ_Wr.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-BlizKDpZ.mjs";
+import { o as findProjectRoot } from "./project-BXZzOABt.mjs";
+import { a as clearRemoteSession, i as clearManagedMetroTunnel, l as readRemoteSession, s as readMetroTunnel, u as readRemoteSessionId } from "./state-WGdIbi_d.mjs";
+import { a as formatElapsed, h as shortUdid, i as formatDuration, l as phaseLine, p as releasedLeaseFact, u as plural } from "./command-output-D5z2_bcF.mjs";
+import { u as releaseWorkspaceLeases } from "./device-lease-CbEaIk7b.mjs";
+import { L as unknownSettingKeys, P as settingShapeErrors, a as SETTING_SHAPE_REMEDY, j as resolveSettings } from "./settings-DOugPlPz.mjs";
+import { d as teardownOwnedAvd, f as teardownOwnedIosSim, h as POOL_SETTING_REMEDY, i as stopTunnel, l as withManagedTunnelRemovalLock, s as withManagedRemoteWorktreeRemovalLock, t as resolveSupervisorTarget, y as parkedMaxSetting } from "./ownership-DZjdx8Gq.mjs";
+import { n as withIdleWorkspace, t as emptyWorkspaceDir } from "./in-use-CjUluqIX.mjs";
+import { n as verifyCollectorOwnership } from "./ownership-D2xbLVoz.mjs";
+import { i as endRecordedSession, z as resolveEasCliBin } from "./device-remote-Dy1jGj3U.mjs";
+import { h as podInstallCommand, n as HEARTBEAT_INTERVAL_MS } from "./xcode-B2tBkf0m.mjs";
+import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-r9UesA9a.mjs";
+import { t as clearNamedPorts } from "./named-ports-DiTfSz6p.mjs";
+import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-DP4eWqea.mjs";
+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 { workspaceName } from "@stim-cli/core";
 import { join as join$1, relative as relative$1 } from "node:path";
 import { createHash, randomUUID } from "node:crypto";
 import chalk from "chalk";
-//#region src/commands/gc/paths.ts
-function canonicalPath(p) {
-	try {
-		return realpathSync$1(p);
-	} catch {
-		return resolve(p);
-	}
-}
-//#endregion
-//#region src/workspace/in-use.ts
-const NATIVE_RUN = "native-run";
-const NATIVE_RUN_HELD = "a stim ios, android or stop run holds its native-run.lock";
-function workspaceInUse(root, { supervisor = true, managedLocks = true, nativeRun = true } = {}) {
-	const reasons = [];
-	if (supervisor) {
-		const project = getProject(root);
-		const target = resolveSupervisorTarget({
-			state: readWorkspaceState(root)?.supervisor,
-			record: project?.supervisor,
-			reservedPort: project?.metroPort
-		});
-		if (target.status === "ours") reasons.push(`its dev server supervisor (pid ${target.pid}) is running`);
-		else if (target.status === "unverified") reasons.push(`its dev server supervisor cannot be verified: ${target.reason ?? "unknown identity"}`);
-	}
-	if (nativeRun) {
-		const claims = (0, ownership_claim_exports.readClaimSet)(workspaceProcessLockPath(workspaceDir(root), NATIVE_RUN, true));
-		if (claims.live.length) reasons.push(NATIVE_RUN_HELD);
-		else if (claims.unresolved[0]) reasons.push(`its native-run.lock cannot be resolved: ${claims.unresolved[0].reason}`);
-	}
-	const self = canonicalPath(root);
-	for (const [kind, entries] of [["build lock", listBuildLocks()], ["build slot", listBuildSlots()]]) for (const entry of entries) {
-		if (!entry.alive && !entry.unresolved) continue;
-		if (entry.projectRoot !== null && canonicalPath(entry.projectRoot) === self) reasons.push(`a ${entry.alive ? "live" : "unresolvable"} ${kind} at ${entry.path} names it`);
-	}
-	if (managedLocks) reasons.push(...managedLockHolders(root));
-	return reasons;
-}
-function emptyWorkspaceDir(dir) {
-	if (lstatSync(dir).isSymbolicLink()) {
-		unlinkSync(dir);
-		return;
-	}
-	for (const name of readdirSync(dir)) if (name !== `${NATIVE_RUN}.lock`) rmSync(join$1(dir, name), {
-		recursive: true,
-		force: true
-	});
-}
-async function withIdleWorkspace(root, fn, { purpose, ...checks }) {
-	try {
-		return await withWorkspaceProcessLock(workspaceDir(root), NATIVE_RUN, async () => {
-			const reasons = workspaceInUse(root, {
-				...checks,
-				nativeRun: false
-			});
-			if (reasons.length) return {
-				ran: false,
-				reasons
-			};
-			return {
-				ran: true,
-				value: await fn()
-			};
-		}, {
-			external: true,
-			waitMs: 0,
-			ownerPurpose: purpose
-		});
-	} catch (error) {
-		if (workspaceProcessLockError(error)) return {
-			ran: false,
-			reasons: [NATIVE_RUN_HELD]
-		};
-		if ((0, ownership_claim_exports.isClaimRefusal)(error) || (0, ownership_claim_exports.isClaimUnavailable)(error)) return {
-			ran: false,
-			reasons: [`its native-run.lock cannot be taken: ${error.reason}`]
-		};
-		throw error;
-	} finally {
-		try {
-			const dir = workspaceDir(root);
-			if (!lstatSync(dir).isSymbolicLink()) rmdirSync(dir);
-		} catch {}
-	}
-}
-//#endregion
 //#region src/devices/reclaim.ts
 async function reapCollectors(root, { verify = verifyCollectorOwnership, collectors }) {
 	const skippedDevices = [];
@@ -251,20 +163,12 @@ function describeDereferenced(project) {
 	}
 	return devices;
 }
-function parkedIosCacheKey(lastBuild) {
-	if (lastBuild === null || typeof lastBuild !== "object" || Array.isArray(lastBuild)) return null;
-	const build = lastBuild;
-	return build.platform === "ios" && typeof build.cacheKey === "string" ? build.cacheKey : null;
-}
-function parkRequest(project, projectPath, slot, simslimManaged) {
+function parkRequest(projectPath, slot, simslimManaged) {
 	const { max, error } = parkedMaxSetting("ios");
 	if (error || max <= 0) return void 0;
-	const cacheKey = parkedIosCacheKey(readWorkspaceState(projectPath)?.lastBuild);
 	return {
 		projectPath,
 		max,
-		bundleId: typeof project?.bundleId === "string" ? project.bundleId : null,
-		cacheKey,
 		simslimManaged,
 		slot
 	};
@@ -284,7 +188,7 @@ function reclaimOwnedDevices(project, projectPath, { park = false } = {}) {
 			const r = teardownOwnedIosSim(udid, {
 				del: true,
 				label,
-				...park ? { park: parkRequest(project, projectPath, slot, Boolean(ios.simslimManaged)) } : {}
+				...park ? { park: parkRequest(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);
@@ -1235,7 +1139,13 @@ function dependencyInstallCommand(target, dir = ".") {
 	return `cd '${installRoot.replaceAll("'", "'\\''")}' && ${command}`;
 }
 function reportCarriedStateHealth(root, target, copied) {
-	const staleDeps = depsOutOfSync(root, target, copied);
+	const outOfSync = depsOutOfSync(root, target, copied);
+	for (const d of outOfSync.filter((dependency) => dependency.reason === "installed")) {
+		const where = d.dir === "." ? d.lockfile : `${d.dir}/${d.lockfile}`;
+		const modules = d.dir === "." ? "node_modules" : `${d.dir}/node_modules`;
+		console.error(chalk.yellow(phaseLine("carry", `carried ${modules} was installed from a different ${d.lockfile} than the ${where} on disk here. node_modules is gitignored and cloned from the source checkout; ${d.lockfile} is tracked, so the two can disagree. Run \`${dependencyInstallCommand(target, d.dir)}\` before building, or pod install and native builds see the wrong package versions.`)));
+	}
+	const staleDeps = outOfSync.filter((dependency) => dependency.reason === "lockfile");
 	if (staleDeps.length) {
 		const manifests = staleDeps.map((d) => d.dir === "." ? d.lockfile : `${d.dir}/${d.lockfile}`).join(", ");
 		const remedies = [...new Set(staleDeps.map((dependency) => dependencyInstallCommand(target, dependency.dir)))];
@@ -1642,14 +1552,14 @@ function canonicalExistingPath(target) {
 	}
 	return resolve(realpathSync$1(existing), ...missing);
 }
-function inspectRemoval(path) {
+function inspectRemoval(path, mergedHead) {
 	const gitAnswered = hasUncommittedWork(path);
 	const { lines: dirtyLines, restore: podChurn } = excludePodChurn(gitAnswered ? dirtyPaths(path, { limit: Infinity }) : []);
 	const dirty = gitAnswered === null ? null : dirtyLines.length > 0;
 	const unpushed = unpushedCommits(path);
 	const blockers = removalBlockers({
 		dirty,
-		unpushed
+		unpushed: Boolean(mergedHead) && resolveFullRef(path, "HEAD") === mergedHead && unpushed ? [] : unpushed
 	});
 	if (hasPopulatedSubmodules(path)) blockers.push("initialized submodules, which git removes only with --force");
 	return {
@@ -1797,7 +1707,7 @@ async function runRemove(target, opts, onRemoved) {
 	const branch = entry.branch;
 	const ownsBranch = Boolean(branch && project?.worktreeBranchOwned === true && project.worktreeBranch === branch);
 	const approvedBranchSha = ownsBranch ? resolveFullRef(path, "HEAD") : null;
-	const inspection = inspectRemoval(path);
+	const inspection = inspectRemoval(path, opts.mergedHead);
 	if (inspection.blockers.length && !opts.force) {
 		printRemovalRefusal(path, inspection);
 		return;
@@ -1807,7 +1717,8 @@ async function runRemove(target, opts, onRemoved) {
 	const branchDeleteCwd = source.path;
 	await withManagedRemoteWorktreeRemovalLock(path, () => withReclaimLocks(path, async (lockedKeys) => {
 		if (opts.guard?.(lockedKeys).length) return;
-		const current = inspectRemoval(path);
+		const inspectedHead = resolveFullRef(path, "HEAD");
+		const current = inspectRemoval(path, opts.mergedHead);
 		if (current.blockers.length && !opts.force) {
 			printRemovalRefusal(path, current);
 			return;
@@ -1817,6 +1728,13 @@ async function runRemove(target, opts, onRemoved) {
 			reportRetainedResources(path, result);
 			return;
 		}
+		if (!opts.force && resolveFullRef(path, "HEAD") !== inspectedHead) {
+			console.error(chalk.red(`Refusing to remove ${path}: its HEAD moved while its environment was reclaimed.`));
+			console.error(chalk.dim(`The directory and Stim ownership record for ${path} were kept.`));
+			printRemovalCleanup(result, true);
+			process.exitCode = 1;
+			return;
+		}
 		restorePodChurn(path, current.podChurn);
 		try {
 			removeWorktree(path, {
@@ -1882,4 +1800,4 @@ function worktreeCommand(program) {
 	registerRemove(worktree);
 }
 //#endregion
-export { workspaceInUse as _, reclaimKeys as a, removalBlockers as c, removeWorktreeTarget as d, worktreeCommand as f, withIdleWorkspace as g, emptyWorkspaceDir as h, porcelainPath as i, removalPath as l, reclaimProject as m, excludePodChurn as n, registerRemove as o, describeDereferenced as p, matchWorktreeEntry as r, registerWarm as s, dependencyInstallCommand as t, removalRemedy as u, canonicalPath as v };
+export { reclaimKeys as a, removalBlockers as c, removeWorktreeTarget as d, worktreeCommand as f, porcelainPath as i, removalPath as l, reclaimProject as m, excludePodChurn as n, registerRemove as o, describeDereferenced as p, matchWorktreeEntry as r, registerWarm as s, dependencyInstallCommand as t, removalRemedy as u };

package/dist/{worktree-R_cUlE7s.mjs → worktree-BlizKDpZ.mjs}

@@ -1,7 +1,7 @@
-import { g as loadConfig, u as getConfigDir } from "./config-Cp9lM3wX.mjs";
-import { t as getExecutor } from "./exec-jIAlgilk.mjs";
+import { g as loadConfig, u as getConfigDir } from "./config-BEq0Qw_a.mjs";
+import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
 import { accessSync, chmodSync, constants, lstatSync, mkdirSync, mkdtempSync, readdirSync, realpathSync, rmSync, statSync } from "node:fs";
-import { chmodSync as chmodSync$1, existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, utimesSync } from "fs";
+import { chmodSync as chmodSync$1, existsSync as existsSync$1, lstatSync as lstatSync$1, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, statSync as statSync$1, utimesSync } from "fs";
 import { dirname, isAbsolute, join, relative, resolve, sep } from "path";
 import { buildCacheRoot } from "@stim-cli/core";
 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, sep as sep$1 } from "node:path";
@@ -364,29 +364,99 @@ function podsOutOfSync(target, copiedEntries, { read = readFileSync$1 } = {}) {
 	return problems;
 }
 const LOCKFILE_NAMES = [
-	"package-lock.json",
-	"yarn.lock",
 	"pnpm-lock.yaml",
+	"yarn.lock",
 	"bun.lock",
-	"bun.lockb"
+	"bun.lockb",
+	"package-lock.json"
 ];
+function npmInstallMatches(wanted, installed) {
+	if (!wanted.packages || !installed.packages) return null;
+	for (const [key, entry] of Object.entries(wanted.packages)) {
+		if (!key.includes("node_modules/") || entry.link) continue;
+		const present = installed.packages[key];
+		if (!present && (entry.optional || entry.devOptional)) continue;
+		if (present?.version !== entry.version) return false;
+	}
+	return true;
+}
+function lastYamlDocument(text) {
+	return (text.split(/^---$/m).at(-1) ?? "").trim();
+}
+function yarnClassicInstallMatches(lockfile, integrity) {
+	if (!integrity.lockfileEntries) return null;
+	const wanted = [...lockfile.matchAll(/^ {2}resolved "([^"]+)"$/gm)].flatMap((m) => m[1] ?? []);
+	if (wanted.length === 0) return null;
+	const installed = new Set(Object.values(integrity.lockfileEntries));
+	return wanted.every((url) => installed.has(url));
+}
+function yarnBerryInstallMatches(lockfile, state) {
+	const installed = new Set([...state.matchAll(/^"?([^\s"#][^"]*?)"?:$/gm)].flatMap((m) => m[1]?.replace(/@virtual:[^#]+#/, "@") ?? []));
+	let entries = 0;
+	for (const entry of lockfile.split(/\n(?=\S)/)) {
+		const resolution = /^ {2}resolution: "([^"]+)"$/m.exec(entry)?.[1];
+		if (!resolution) continue;
+		entries += 1;
+		if (installed.has(resolution) || /^ {2}conditions: /m.test(entry)) continue;
+		return false;
+	}
+	return entries === 0 ? null : true;
+}
+function installedMatchesLockfile(dir, lockfile, { read = readFileSync$1 } = {}) {
+	const text = (rel) => {
+		try {
+			return read(join(dir, rel), "utf-8").replaceAll("\r\n", "\n");
+		} catch {
+			return null;
+		}
+	};
+	const wanted = text(lockfile);
+	if (wanted === null) return null;
+	try {
+		if (lockfile === "package-lock.json") {
+			const installed = text("node_modules/.package-lock.json");
+			return installed === null ? null : npmInstallMatches(JSON.parse(wanted), JSON.parse(installed));
+		}
+		if (lockfile === "pnpm-lock.yaml") {
+			const installed = text("node_modules/.pnpm/lock.yaml");
+			return installed === null ? null : lastYamlDocument(wanted) === lastYamlDocument(installed);
+		}
+		if (lockfile === "yarn.lock") {
+			if (/^__metadata:$/m.test(wanted)) {
+				const berry = text("node_modules/.yarn-state.yml");
+				return berry === null ? null : yarnBerryInstallMatches(wanted, berry);
+			}
+			const classic = text("node_modules/.yarn-integrity");
+			return classic === null ? null : yarnClassicInstallMatches(wanted, JSON.parse(classic));
+		}
+	} catch {}
+	return null;
+}
 function depsOutOfSync(root, target, copiedEntries, { read = readFileSync$1 } = {}) {
 	const problems = [];
 	for (const rel of copiedEntries || []) {
 		if (rel !== "node_modules" && !rel.endsWith("/node_modules")) continue;
 		const dir = rel === "node_modules" ? "" : rel.slice(0, -13);
-		for (const name of LOCKFILE_NAMES) {
-			const source = join(root, dir, name);
-			const branch = join(target, dir, name);
-			if (!existsSync$1(source) || !existsSync$1(branch)) continue;
-			try {
-				if (read(source, "utf-8") !== read(branch, "utf-8")) problems.push({
-					dir: dir || ".",
-					lockfile: name
-				});
-			} catch {}
-			break;
+		const name = LOCKFILE_NAMES.find((candidate) => existsSync$1(join(target, dir, candidate)));
+		if (!name) continue;
+		const installed = installedMatchesLockfile(join(target, dir), name, { read });
+		if (installed === false) {
+			problems.push({
+				dir: dir || ".",
+				lockfile: name,
+				reason: "installed"
+			});
+			continue;
 		}
+		const source = join(root, dir, name);
+		if (installed === true || !existsSync$1(source)) continue;
+		try {
+			if (read(source, "utf-8") !== read(join(target, dir, name), "utf-8")) problems.push({
+				dir: dir || ".",
+				lockfile: name,
+				reason: "lockfile"
+			});
+		} catch {}
 	}
 	return problems;
 }
@@ -581,6 +651,61 @@ function listWorktrees(cwd) {
 	]);
 	return out ? parseWorktrees(out) : [];
 }
+function branchOf(head) {
+	return head.startsWith("ref: refs/heads/") ? head.slice(16) : void 0;
+}
+/**
+* The linked worktrees recorded under a git common dir, read from `worktrees/<id>/gitdir` and `HEAD` without running
+* git or touching the worktree directories, sorted by path. The worktree with the branch the common dir's own `HEAD`
+* names (the main checkout's branch, or a bare repository's source checkout) is left out.
+*/
+function linkedWorktreesOnDisk(commonDir) {
+	const admin = join(commonDir, "worktrees");
+	let ids;
+	let sourceBranch;
+	try {
+		ids = readdirSync$1(admin);
+		sourceBranch = branchOf(readFileSync$1(join(commonDir, "HEAD"), "utf-8").trim());
+	} catch {
+		return [];
+	}
+	return ids.flatMap((id) => {
+		try {
+			const gitdir = readFileSync$1(join(admin, id, "gitdir"), "utf-8").trim();
+			const branch = branchOf(readFileSync$1(join(admin, id, "HEAD"), "utf-8").trim());
+			if (branch && branch === sourceBranch) return [];
+			const path = dirname(resolve(admin, id, nativePath(gitdir)));
+			return [branch ? {
+				path,
+				branch
+			} : { path }];
+		} catch {
+			return [];
+		}
+	}).toSorted((a, b) => a.path < b.path ? -1 : a.path > b.path ? 1 : 0);
+}
+/**
+* The git common dir of the repository containing `start`, read from `.git` and `commondir` files without running
+* git. Returns null when `start` is missing, unreadable, or not inside a repository.
+*/
+function gitCommonDirOnDisk(start) {
+	try {
+		for (let dir = realpathSync$1.native(start);; dir = dirname(dir)) {
+			const dotGit = join(dir, ".git");
+			if (existsSync$1(dotGit)) {
+				if (statSync$1(dotGit).isDirectory()) return realpathSync$1.native(dotGit);
+				const gitdir = /^gitdir: (.+)$/m.exec(readFileSync$1(dotGit, "utf-8"))?.[1]?.trim();
+				if (!gitdir) return null;
+				const linked = resolve(dir, gitdir);
+				const commondir = join(linked, "commondir");
+				return realpathSync$1.native(existsSync$1(commondir) ? resolve(linked, readFileSync$1(commondir, "utf-8").trim()) : linked);
+			}
+			if (dirname(dir) === dir) return null;
+		}
+	} catch {
+		return null;
+	}
+}
 function selectSourceCheckout(entries, bareHead) {
 	const first = entries[0];
 	if (!first) return { refusal: "Git lists no worktrees for this repository." };
@@ -622,4 +747,4 @@ function resolveSourceCheckout(cwd) {
 	};
 }
 //#endregion
-export { warmWorktreePaths as C, temporaryRoot as D, removeTemporaryEntry as E, unpushedCommits as S, makeTemporaryDirectory as T, repoRoot as _, dirtyFingerprintFiles as a, restoreFile as b, hasPopulatedSubmodules as c, isPodInstallChurn as d, listWorktrees as f, removeWorktree as g, readWorktreeExclude as h, depsOutOfSync as i, hasRemote as l, podsOutOfSync as m, cloneIgnoredEntries as n, dirtyPaths as o, locallyKnownUpstream as p, deleteBranch as r, gitCommonDir as s, branchExists as t, hasUncommittedWork as u, resolveFullRef as v, filesystemDevice as w, sourceCheckoutOf as x, resolveSourceCheckout as y };
+export { sourceCheckoutOf as C, makeTemporaryDirectory as D, filesystemDevice as E, removeTemporaryEntry as O, restoreFile as S, warmWorktreePaths as T, readWorktreeExclude as _, dirtyFingerprintFiles as a, resolveFullRef as b, gitCommonDirOnDisk as c, hasUncommittedWork as d, isPodInstallChurn as f, podsOutOfSync as g, locallyKnownUpstream as h, depsOutOfSync as i, temporaryRoot as k, hasPopulatedSubmodules as l, listWorktrees as m, cloneIgnoredEntries as n, dirtyPaths as o, linkedWorktreesOnDisk as p, deleteBranch as r, gitCommonDir as s, branchExists as t, hasRemote as u, removeWorktree as v, unpushedCommits as w, resolveSourceCheckout as x, repoRoot as y };

package/dist/{xcode-BZqyxh3e.mjs → xcode-B2tBkf0m.mjs}

@@ -1,165 +1,16 @@
-import { k as ownership_claim_exports, u as getConfigDir } from "./config-Cp9lM3wX.mjs";
-import { t as getExecutor } from "./exec-jIAlgilk.mjs";
-import { r as register } from "./cache-manifest-Dg7OnMrp.mjs";
-import { g as workspaceDerivedData, p as sharedCompilationCache } from "./workspace-state-DF2gCFhx.mjs";
-import { u as resolvePackageJson } from "./project-DS112DYB.mjs";
+import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
+import { r as register } from "./cache-manifest-Pubfp8wV.mjs";
+import { D as workspaceDerivedData, w as sharedCompilationCache } from "./metro-BWLOJ_Wr.mjs";
+import { u as resolvePackageJson } from "./project-BXZzOABt.mjs";
+import { n as spawnDeclared } from "./spawn-claims-CUleC2cM.mjs";
 import { t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { Y as resolveOptimizations } from "./settings-D030k0t4.mjs";
-import { a as formatElapsed, l as phaseLine } from "./command-output-gByVmIjy.mjs";
-import { n as spawnDeclared, r as stopDeclaringSpawnsOn, t as declareSpawnsOn } from "./spawn-claims-Dn3C_N6w.mjs";
-import { t as cleanLine } from "./server-expo-B_lctBR3.mjs";
+import { a as formatElapsed, l as phaseLine } from "./command-output-D5z2_bcF.mjs";
+import { W as resolveOptimizations } from "./settings-DOugPlPz.mjs";
+import { t as cleanLine } from "./server-expo-BvOCeakp.mjs";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { basename, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { createHash } from "node:crypto";
 import chalk from "chalk";
-//#region src/engine/build-slots.ts
-const SLOT_PREFIX = "slot-";
-const SLOT_LABEL = "build slot";
-const SLOT_POLL_MS = 1e3;
-const SLOT_PROGRESS_MS = 3e4;
-const SLOT_CEILING_MS = 54e5;
-function sleepAsync(ms) {
-	return new Promise((resolve) => setTimeout(resolve, ms));
-}
-function buildSlotsDir() {
-	return join(getConfigDir(), "build-slots");
-}
-function buildSlotPath(index) {
-	return join(buildSlotsDir(), `${SLOT_PREFIX}${index}`);
-}
-function toRecord(holder) {
-	const details = holder.details;
-	return {
-		pid: holder.owner.pid,
-		index: typeof details.index === "number" ? details.index : null,
-		projectRoot: typeof details.projectRoot === "string" ? details.projectRoot : null,
-		startedAt: holder.startedAt || null,
-		logFile: typeof details.logFile === "string" ? details.logFile : null
-	};
-}
-function tryAcquireBuildSlot({ max, root = null, logFile = null }) {
-	if (!max || max <= 0) return {
-		acquired: true,
-		unlimited: true
-	};
-	let refusal = null;
-	let busy = false;
-	for (let index = 0; index < max; index++) {
-		const path = buildSlotPath(index);
-		let attempt;
-		try {
-			attempt = (0, ownership_claim_exports.tryAcquireClaim)({
-				root: path,
-				mode: "exclusive",
-				label: SLOT_LABEL,
-				details: {
-					index,
-					projectRoot: root,
-					logFile
-				}
-			});
-		} catch (err) {
-			if (!(0, ownership_claim_exports.isClaimRefusal)(err)) throw err;
-			refusal ??= err;
-			continue;
-		}
-		if (attempt.pending) (0, ownership_claim_exports.releaseClaim)(attempt.pending);
-		if (!attempt.acquired) {
-			busy = true;
-			continue;
-		}
-		declareSpawnsOn(attempt.acquired);
-		return {
-			acquired: true,
-			path,
-			index,
-			slot: {
-				pid: attempt.acquired.owner.pid,
-				index,
-				projectRoot: root,
-				startedAt: attempt.acquired.startedAt,
-				logFile
-			},
-			claim: attempt.acquired
-		};
-	}
-	if (refusal && !busy) throw refusal;
-	return null;
-}
-function slotWaitingLine({ max, elapsedMs }) {
-	return `${"build".padEnd(11)} waiting for a build slot (all ${max} in use, ${formatElapsed(elapsedMs)} elapsed) -- stim guide lifecycle concurrency`;
-}
-async function acquireBuildSlot({ max, root = null, logFile = null, now = Date.now, out = () => {}, sleep = sleepAsync, intervalMs = SLOT_POLL_MS, progressMs = SLOT_PROGRESS_MS, ceilingMs = SLOT_CEILING_MS }) {
-	if (!max || max <= 0) return {
-		acquired: true,
-		unlimited: true
-	};
-	const started = now();
-	let lastProgress = started;
-	for (;;) {
-		const got = tryAcquireBuildSlot({
-			max,
-			root,
-			logFile
-		});
-		if (got) return got;
-		const elapsed = now() - started;
-		if (elapsed >= ceilingMs) {
-			const err = /* @__PURE__ */ new Error(`Waited ${formatElapsed(elapsed)} for one of ${max} build slots, and every slot is held by a process that is still running, or by a holder Stim cannot identify. Slots live under ` + buildSlotsDir() + "; remove a slot directory whose builder is not really building, or raise concurrency.maxBuilds.");
-			err.code = "STIM_BUILD_SLOT_TIMEOUT";
-			throw err;
-		}
-		if (now() - lastProgress >= progressMs) {
-			lastProgress = now();
-			out(slotWaitingLine({
-				max,
-				elapsedMs: elapsed
-			}));
-		}
-		await sleep(intervalMs);
-	}
-}
-function releaseBuildSlot(handle) {
-	if (!handle || handle.unlimited) return false;
-	stopDeclaringSpawnsOn(handle.claim);
-	return (0, ownership_claim_exports.releaseClaim)(handle.claim);
-}
-function listBuildSlots() {
-	const dir = buildSlotsDir();
-	let names;
-	try {
-		names = readdirSync(dir);
-	} catch {
-		return [];
-	}
-	const slots = [];
-	for (const name of names) {
-		if (!name.startsWith(SLOT_PREFIX)) continue;
-		const path = join(dir, name);
-		try {
-			if (!statSync(path).isDirectory()) continue;
-		} catch {
-			continue;
-		}
-		const survey = (0, ownership_claim_exports.readClaimSet)(path);
-		const holder = survey.live[0] ?? survey.dead[0];
-		const info = holder ? toRecord(holder) : null;
-		const index = Number(name.slice(5));
-		slots.push({
-			path,
-			name,
-			index: Number.isFinite(index) ? index : null,
-			pid: info?.pid ?? null,
-			projectRoot: info?.projectRoot ?? null,
-			startedAt: info?.startedAt ?? null,
-			logFile: info?.logFile ?? null,
-			alive: survey.live.length > 0,
-			unresolved: survey.unresolved.length > 0
-		});
-	}
-	return slots;
-}
-//#endregion
 //#region src/engine/bundler.ts
 const COCOAPODS_SPEC = /^ {4}cocoapods \(/m;
 function bundlerPin(root) {
@@ -1090,4 +941,4 @@ async function buildIos({ root, udid = null, logWriter, project = null, scheme =
 	};
 }
 //#endregion
-export { listBuildSlots as _, compilationCacheActivityLine as a, readBundleExecutable as c, startBuildHeartbeat as d, tailLines as f, acquireBuildSlot as g, podInstallCommand as h, ccacheEnabled as i, readBundleId as l, bundlerPin as m, HEARTBEAT_INTERVAL_MS as n, detectXcodeMajor as o, describeDiagnostic as p, buildIos as r, discoverXcodeProject as s, COMPILATION_CACHE_NOT_RUN as t, resolveScheme as u, releaseBuildSlot as v };
+export { compilationCacheActivityLine as a, readBundleExecutable as c, startBuildHeartbeat as d, tailLines as f, podInstallCommand as h, ccacheEnabled as i, readBundleId as l, bundlerPin as m, HEARTBEAT_INTERVAL_MS as n, detectXcodeMajor as o, describeDiagnostic as p, buildIos as r, discoverXcodeProject as s, COMPILATION_CACHE_NOT_RUN as t, resolveScheme as u };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stim",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "Stim: fast, isolated React Native environments for coding agents",
   "keywords": [
     "agent",
@@ -34,6 +34,7 @@
   ],
   "type": "module",
   "exports": {
+    "./package.json": "./package.json",
     "./cache-manifest": {
       "types": "./dist/cache-manifest.d.mts",
       "module-sync": "./dist/cache-manifest.mjs",
@@ -42,9 +43,9 @@
   },
   "dependencies": {
     "@expo/fingerprint": "^0.20.10",
-    "@stim-cli/cache": "^1.9.0",
-    "@stim-cli/core": "^1.9.0",
-    "@stim-cli/metro": "^1.9.0",
+    "@stim-cli/cache": "^1.10.0",
+    "@stim-cli/core": "^1.10.0",
+    "@stim-cli/metro": "^1.10.0",
     "chalk": "^6.0.0",
     "commander": "^15.0.0",
     "cross-spawn": "^7.0.6",
@@ -52,7 +53,7 @@
     "ws": "^8.21.3"
   },
   "devDependencies": {
-    "@stim-cli/expo-build-cache": "1.9.0",
+    "@stim-cli/expo-build-cache": "1.10.0",
     "@types/cross-spawn": "^6.0.6",
     "@types/which": "^3.0.4",
     "@types/ws": "^8.18.1",