stim 1.3.1 → 1.5.0

package/dist/{worktree-DtQGO9-s.mjs → worktree-CeUKDAQw.mjs}

@@ -1,17 +1,16 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { S as upsertProject, f as getProject, g as loadConfig, h as isPathPrefix, u as getConfigDir, v as removeProject, w as captureProcessIdentity } from "./config-CcefMY2Q.mjs";
-import { c as readMetroTunnel, u as readRemoteSession } from "./state-B3XA2wp2.mjs";
-import { _ as resolveFullRef, b as warmWorktreePaths, c as hasRemote, d as isPodInstallChurn, f as listWorktrees, h as removeWorktree, i as depsOutOfSync, l as hasUncommittedWork, m as readWorktreeExclude, n as cloneIgnoredEntries, o as dirtyPaths, p as podsOutOfSync, r as deleteBranch, s as gitCommonDir, t as branchExists, u as isMainWorkingTree, v as restoreFile, y as unpushedCommits } from "./worktree-Eq6TLH8N.mjs";
-import { a as findProjectRoot } from "./project-fKmuIaMI.mjs";
-import { a as formatElapsed, f as releasedLeaseFact, i as formatDuration, l as phaseLine, m as shortUdid, u as plural } from "./command-output-8wHMEde0.mjs";
-import { a as clearClaimChild, c as markClaimChildPending, d as releaseClaim, f as setClaimChild, i as claimRemoveCommand, l as processGroupAlive, m as tryAcquireClaim, n as ClaimUnavailableError, p as settleClaim, r as claimFailure } from "./ownership-claim-BtPtJVmq.mjs";
-import { A as resolveSettings, I as unknownSettingKeys, N as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-DEJf6_kJ.mjs";
-import { a as POOL_SETTING_REMEDY, c as parkedMaxSetting } from "./teardown--gESs9ck.mjs";
-import { g as podInstallCommand, r as HEARTBEAT_INTERVAL_MS } from "./xcode-xnxyvJkD.mjs";
-import { a as installedNpmTreeIsValid, i as hasInstalledDependencies, o as locallyKnownUpstream, t as dependencyState } from "./doctor-B4EITgQB.mjs";
-import { c as withManagedTunnelRemovalLock, o as withManagedRemoteWorktreeRemovalLock } from "./ownership-DXcol4oU.mjs";
-import { n as reclaimProject } from "./reclaim-CUmwucWG.mjs";
-import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-0Yt0Inly.mjs";
+import { E as ownership_claim_exports, S as upsertProject, f as getProject, g as loadConfig, h as isPathPrefix, u as getConfigDir, v as removeProject, w as process_identity_exports } from "./config-DMP7L7H6.mjs";
+import { S as warmWorktreePaths, _ as resolveFullRef, b as sourceCheckoutOf, c as hasRemote, d as listWorktrees, f as locallyKnownUpstream, h as removeWorktree, i as depsOutOfSync, l as hasUncommittedWork, m as readWorktreeExclude, n as cloneIgnoredEntries, o as dirtyPaths, p as podsOutOfSync, r as deleteBranch, s as gitCommonDir, t as branchExists, u as isPodInstallChurn, x as unpushedCommits, y as restoreFile } from "./worktree-DJnBbQZ9.mjs";
+import { a as findProjectRoot } from "./project-B_SDt4ip.mjs";
+import { l as readRemoteSession, s as readMetroTunnel } from "./state-CnWzvCWP.mjs";
+import { a as formatElapsed, f as releasedLeaseFact, i as formatDuration, l as phaseLine, m as shortUdid, u as plural } from "./command-output-BuIb_ZOI.mjs";
+import { A as resolveSettings, I as unknownSettingKeys, N as settingShapeErrors, a as SETTING_SHAPE_REMEDY } from "./settings-kO2ZqIKy.mjs";
+import { a as POOL_SETTING_REMEDY, l as parkedMaxSetting } from "./teardown-CAVcWeRD.mjs";
+import { h as podInstallCommand, n as HEARTBEAT_INTERVAL_MS } from "./xcode-BqDeRkpT.mjs";
+import { n as hasInstalledDependencies, r as installedNpmTreeIsValid, t as dependencyState } from "./dependency-state-CTL8A9p3.mjs";
+import { c as withManagedTunnelRemovalLock, o as withManagedRemoteWorktreeRemovalLock } from "./ownership-CVY9cqCr.mjs";
+import { n as reclaimProject } from "./reclaim-C_rB25f4.mjs";
+import { a as runPodInstall, i as runCaptured, n as podsAreStale, r as readPodState, t as DEPS_ERROR } from "./deps-BAGOnrc7.mjs";
 import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { createHash, randomUUID } from "node:crypto";
 import { join, relative } from "node:path";
@@ -72,22 +71,22 @@ function installerClaim(claim, { now, progressMs, out }) {
 	const forget = () => {
 		groups = [];
 		try {
-			clearClaimChild(claim);
+			(0, ownership_claim_exports.clearClaimChild)(claim);
 		} catch {}
 	};
-	const alive = () => groups.find((pid) => processGroupAlive(pid)) ?? null;
+	const alive = () => groups.find((pid) => (0, ownership_claim_exports.processGroupAlive)(pid)) ?? null;
 	return {
-		declare: () => markClaimChildPending(claim),
+		declare: () => (0, ownership_claim_exports.markClaimChildPending)(claim),
 		record: (pid) => {
 			if (pid === null) {
 				forget();
 				return;
 			}
 			groups.push(pid);
-			const captured = captureProcessIdentity(pid);
+			const captured = (0, process_identity_exports.captureProcessIdentity)(pid);
 			let failure = captured.ok ? null : captured.reason;
 			if (captured.ok) try {
-				setClaimChild(claim, {
+				(0, ownership_claim_exports.setClaimChild)(claim, {
 					pid,
 					processToken: captured.token
 				});
@@ -95,7 +94,7 @@ function installerClaim(claim, { now, progressMs, out }) {
 			} catch (error) {
 				failure = error?.message ?? String(error);
 			}
-			if (!processGroupAlive(pid)) {
+			if (!(0, ownership_claim_exports.processGroupAlive)(pid)) {
 				forget();
 				return;
 			}
@@ -132,7 +131,7 @@ function installerClaim(claim, { now, progressMs, out }) {
 }
 function timeoutError(holder, elapsedMs, root) {
 	const who = holder ? `${warmCommand(holder.phase)} (pid ${holder.pid})` : "another stim worktree warm";
-	const error = /* @__PURE__ */ new Error(`Waited ${formatElapsed(elapsedMs)} for ${who} to release the warm lock on this repository. The lock is ${root}; remove it if nothing is really warming:\n  ${claimRemoveCommand(root)}`);
+	const error = /* @__PURE__ */ new Error(`Waited ${formatElapsed(elapsedMs)} for ${who} to release the warm lock on this repository. The lock is ${root}; remove it if nothing is really warming:\n  ${(0, ownership_claim_exports.claimRemoveCommand)(root)}`);
 	error.code = "STIM_LOCK_TIMEOUT";
 	return error;
 }
@@ -144,7 +143,7 @@ async function acquireWarmClaim({ repositoryRoot, phase, mode = phase === "refre
 	let pending = null;
 	try {
 		for (;;) {
-			const attempt = pending ? settleClaim(pending) : tryAcquireClaim({
+			const attempt = pending ? (0, ownership_claim_exports.settleClaim)(pending) : (0, ownership_claim_exports.tryAcquireClaim)({
 				root,
 				mode,
 				label: WARM_CLAIM_LABEL
@@ -164,7 +163,7 @@ async function acquireWarmClaim({ repositoryRoot, phase, mode = phase === "refre
 					installer,
 					release: () => {
 						if (installer.holding()) return;
-						releaseClaim(acquired);
+						(0, ownership_claim_exports.releaseClaim)(acquired);
 					}
 				};
 			}
@@ -180,13 +179,13 @@ async function acquireWarmClaim({ repositoryRoot, phase, mode = phase === "refre
 			await sleep(pollMs);
 		}
 	} catch (error) {
-		releaseClaim(pending);
+		(0, ownership_claim_exports.releaseClaim)(pending);
 		if ([
 			"EACCES",
 			"EPERM",
 			"EROFS",
 			"ENOENT"
-		].includes(error?.code ?? "")) throw new ClaimUnavailableError(error.message, { claimPath: root });
+		].includes(error?.code ?? "")) throw new ownership_claim_exports.ClaimUnavailableError(error.message, { claimPath: root });
 		throw error;
 	}
 }
@@ -883,7 +882,7 @@ function registerWarm(worktree) {
 		} catch (error) {
 			const code = error?.code;
 			console.error(chalk.red(`Could not warm this worktree: ${error.message}`));
-			const claim = claimFailure(error, `stim worktree warm${opts.refresh ? " --refresh" : ""}`);
+			const claim = (0, ownership_claim_exports.claimFailure)(error, `stim worktree warm${opts.refresh ? " --refresh" : ""}`);
 			if (claim) console.error(chalk.dim(claim.remedy));
 			if (typeof code === "string" && code.startsWith("STIM_")) console.error(chalk.red(`failed: ${code}`));
 			process.exitCode = 1;
@@ -1238,7 +1237,19 @@ async function runRemove(target, opts = {}) {
 		process.exitCode = 1;
 		return;
 	}
-	if (isMainWorkingTree(entry.path)) {
+	if (entry.bare) {
+		console.error(chalk.red(`Refusing to remove ${path}: ${entry.path} is the bare repository, not a worktree.`));
+		console.error(chalk.dim("  Pass a worktree path, e.g. as printed by `git worktree list`."));
+		process.exitCode = 1;
+		return;
+	}
+	const source = sourceCheckoutOf(worktrees);
+	if ("refusal" in source) {
+		console.error(chalk.red(`Refusing to remove ${path}: ${source.refusal}`));
+		process.exitCode = 1;
+		return;
+	}
+	if (entry.path === source.path) {
 		if (entry.path !== path) console.error(chalk.dim(`${path} is inside the source checkout ${entry.path}; reclaiming its environment.`));
 		await reclaimEnvironment(entry.path, "it is the source checkout");
 		return;
@@ -1258,7 +1269,7 @@ async function runRemove(target, opts = {}) {
 	}
 	const deleteOwnedBranch = Boolean(ownsBranch && approvedBranchSha && inspection.unpushed?.length === 0);
 	const retainedBranchReason = !branch ? null : !ownsBranch ? "Stim did not create it" : inspection.unpushed === null ? "Stim could not verify whether it has unique commits" : inspection.unpushed.length > 0 ? `it has ${plural(inspection.unpushed.length, "unique commit")}` : null;
-	const branchDeleteCwd = worktrees.find((candidate) => isMainWorkingTree(candidate.path))?.path;
+	const branchDeleteCwd = source.path;
 	await withManagedRemoteWorktreeRemovalLock(path, () => withReclaimLocks(path, async (lockedKeys) => {
 		const result = await reclaimAll(path, lockedKeys, { preserveRootProject: true });
 		if (result.keptEntries.length) {
@@ -1290,13 +1301,6 @@ async function runRemove(target, opts = {}) {
 				worktreeRemovalComplete: true,
 				worktreePendingBranchSha: approvedBranchSha
 			});
-			if (!branchDeleteCwd) {
-				console.error(chalk.yellow(phaseLine("branch", `kept ${branch} (Stim could not find the source checkout)`)));
-				console.error(chalk.dim(`  Retry with: stim worktree remove ${path}`));
-				process.exitCode = 1;
-				finish();
-				return;
-			}
 			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})`)));

package/dist/{worktree-Eq6TLH8N.mjs → worktree-DJnBbQZ9.mjs}

@@ -1,5 +1,5 @@
 import { t as getExecutor } from "./exec-CyylIdq9.mjs";
-import { g as loadConfig, u as getConfigDir } from "./config-CcefMY2Q.mjs";
+import { g as loadConfig, u as getConfigDir } from "./config-DMP7L7H6.mjs";
 import { accessSync, chmodSync, constants, lstatSync, mkdirSync, mkdtempSync, readdirSync, realpathSync, rmSync, statSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 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";
@@ -103,19 +103,6 @@ function gitCommonDir(cwd) {
 	]);
 	return out ? out.trim() : null;
 }
-function isMainWorkingTree(path) {
-	const out = getExecutor().runFileQuiet("git", [
-		"-C",
-		path,
-		"rev-parse",
-		"--path-format=absolute",
-		"--git-dir",
-		"--git-common-dir"
-	]);
-	if (!out) return false;
-	const [gitDir, commonDir] = out.trim().split("\n").map((line) => line.trim());
-	return Boolean(gitDir) && gitDir === commonDir;
-}
 function repoRoot(cwd) {
 	const out = getExecutor().runFileQuiet("git", [
 		"-C",
@@ -125,20 +112,49 @@ function repoRoot(cwd) {
 	]);
 	return out ? out.trim() : null;
 }
+function locallyKnownUpstream(projectRoot) {
+	try {
+		const name = getExecutor().runFile("git", [
+			"-C",
+			projectRoot,
+			"rev-parse",
+			"--abbrev-ref",
+			"--symbolic-full-name",
+			"@{upstream}"
+		], { timeoutMs: 5e3 });
+		const counts = getExecutor().runFile("git", [
+			"-C",
+			projectRoot,
+			"rev-list",
+			"--left-right",
+			"--count",
+			"HEAD...@{upstream}"
+		], { timeoutMs: 5e3 }).trim().split(/\s+/).map(Number);
+		const ahead = counts[0] ?? NaN;
+		const behind = counts[1] ?? NaN;
+		if (!name || !Number.isInteger(ahead) || !Number.isInteger(behind)) return null;
+		return {
+			name,
+			ahead,
+			behind
+		};
+	} catch {
+		return null;
+	}
+}
 function warmWorktreePaths(cwd) {
 	const currentRoot = repoRoot(cwd);
 	if (!currentRoot) throw new Error("Not a git repository.");
 	const target = realpathSync$1(currentRoot);
-	if (isMainWorkingTree(target)) throw new Error("Run stim worktree warm from a linked worktree, not the source checkout.");
-	const entries = listWorktrees(target);
-	const current = entries.find((entry) => canonicalPath(entry.path) === target);
-	const main = entries.find((entry) => isMainWorkingTree(entry.path));
-	if (!current || !main) throw new Error("Could not identify the linked worktree and its source checkout.");
-	const root = realpathSync$1(main.path);
+	const source = resolveSourceCheckout(target);
+	if ("refusal" in source) throw new Error(source.refusal);
+	if (!source.entries.find((entry) => canonicalPath(entry.path) === target)) throw new Error("Could not identify the linked worktree and its source checkout.");
+	const root = realpathSync$1(source.path);
+	if (root === target) throw new Error("Run stim worktree warm from a linked worktree, not the source checkout.");
 	const sourceRoot = repoRoot(root);
 	const sourceCommon = gitCommonDir(root);
 	const targetCommon = gitCommonDir(target);
-	if (root === target || !sourceRoot || realpathSync$1(sourceRoot) !== root || !sourceCommon || !targetCommon || realpathSync$1(sourceCommon) !== realpathSync$1(targetCommon)) throw new Error("Could not verify that the source checkout belongs to this linked worktree.");
+	if (!sourceRoot || realpathSync$1(sourceRoot) !== root || !sourceCommon || !targetCommon || realpathSync$1(sourceCommon) !== realpathSync$1(targetCommon)) throw new Error("Could not verify that the source checkout belongs to this linked worktree.");
 	return {
 		root,
 		target,
@@ -526,6 +542,7 @@ function parseWorktrees(out) {
 		current = { path: line.slice(9) };
 	} else if (line.startsWith("branch ")) current.branch = line.slice(7).replace("refs/heads/", "");
 	else if (line === "prunable" || line.startsWith("prunable ")) current.prunable = true;
+	else if (line === "bare") current.bare = true;
 	if (current.path) entries.push(current);
 	return entries;
 }
@@ -539,5 +556,45 @@ function listWorktrees(cwd) {
 	]);
 	return out ? parseWorktrees(out) : [];
 }
+function selectSourceCheckout(entries, bareHead) {
+	const first = entries[0];
+	if (!first) return { refusal: "Git lists no worktrees for this repository." };
+	if (!first.bare) return { path: first.path };
+	const bare = first.path;
+	const checkouts = entries.filter((entry) => !entry.bare && !entry.prunable);
+	const listed = checkouts.map((entry) => `${entry.branch ?? "detached"} (${entry.path})`).join(", ") || "none";
+	const pointHead = `  git -C ${bare} symbolic-ref HEAD refs/heads/<branch>`;
+	if (!bareHead) return { refusal: `The bare repository at ${bare} has a detached HEAD, so Stim cannot tell which worktree is the source checkout. Point HEAD at the source branch, then retry:\n${pointHead}\nChecked-out branches: ${listed}` };
+	const matches = checkouts.filter((entry) => entry.branch === bareHead);
+	const [only] = matches;
+	if (only && matches.length === 1) return { path: only.path };
+	if (!only) {
+		const stale = entries.find((entry) => entry.prunable && entry.branch === bareHead);
+		const beside = checkouts[0] ? dirname$1(checkouts[0].path) : bare;
+		return { refusal: `The bare repository at ${bare} points HEAD at ${bareHead}, but no worktree has ${bareHead} checked out, so Stim has no source checkout to copy from. ${stale ? `Its worktree at ${stale.path} is missing. Recreate it, then retry:\n  git -C ${bare} worktree prune\n  git -C ${bare} worktree add ${stale.path} ${bareHead}\n` : `Create one, then retry:\n  git -C ${bare} worktree add ${join$1(beside, bareHead)} ${bareHead}\n`}Or point HEAD at a branch that is checked out (${listed}):\n${pointHead}` };
+	}
+	return { refusal: `The bare repository at ${bare} points HEAD at ${bareHead}, which is checked out in more than one worktree: ${matches.map((entry) => entry.path).join(", ")}. Remove the extra worktrees, or point HEAD at a branch checked out once, then retry:\n${pointHead}` };
+}
+function bareHeadBranch(bare) {
+	const out = getExecutor().runFileQuiet("git", [
+		"-C",
+		bare,
+		"symbolic-ref",
+		"--quiet",
+		"HEAD"
+	])?.trim();
+	return out?.startsWith("refs/heads/") ? out.slice(11) : null;
+}
+function sourceCheckoutOf(entries) {
+	const first = entries[0];
+	return selectSourceCheckout(entries, first?.bare ? bareHeadBranch(first.path) : null);
+}
+function resolveSourceCheckout(cwd) {
+	const entries = listWorktrees(cwd);
+	return {
+		entries,
+		...sourceCheckoutOf(entries)
+	};
+}
 //#endregion
-export { removeTemporaryEntry as C, makeTemporaryDirectory as S, resolveFullRef as _, dirtyFingerprintFiles as a, warmWorktreePaths as b, hasRemote as c, isPodInstallChurn as d, listWorktrees as f, repoRoot as g, removeWorktree as h, depsOutOfSync as i, hasUncommittedWork as l, readWorktreeExclude as m, cloneIgnoredEntries as n, dirtyPaths as o, podsOutOfSync as p, deleteBranch as r, gitCommonDir as s, branchExists as t, isMainWorkingTree as u, restoreFile as v, temporaryRoot as w, filesystemDevice as x, unpushedCommits as y };
+export { filesystemDevice as C, temporaryRoot as E, warmWorktreePaths as S, removeTemporaryEntry as T, resolveFullRef as _, dirtyFingerprintFiles as a, sourceCheckoutOf as b, hasRemote as c, listWorktrees as d, locallyKnownUpstream as f, repoRoot as g, removeWorktree as h, depsOutOfSync as i, hasUncommittedWork as l, readWorktreeExclude as m, cloneIgnoredEntries as n, dirtyPaths as o, podsOutOfSync as p, deleteBranch as r, gitCommonDir as s, branchExists as t, isPodInstallChurn as u, resolveSourceCheckout as v, makeTemporaryDirectory as w, unpushedCommits as x, restoreFile as y };