stim 1.13.0 → 1.15.0

package/dist/{worktree-DeBQSVtR.mjs → worktree-C0c5Udwa.mjs}

@@ -1,23 +1,23 @@
-import { _ as loadConfig, d as getConfigDir } from "./config-0jCcMM0E.mjs";
-import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
+import { t as getExecutor } from "./exec-CaErVv7t.mjs";
+import { _ as loadConfig, d as getConfigDir } from "./config-D0DbpZtM.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, statSync as statSync$1, utimesSync } from "fs";
-import { dirname, isAbsolute, join, relative, resolve, sep } from "path";
+import { 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 "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";
 import { tmpdir } from "node:os";
 //#region src/temporary.ts
 function existingPath(path) {
 	const missing = [];
-	let current = resolve$1(path);
+	let current = resolve(path);
 	while (!lstatSync(current, { throwIfNoEntry: false })) {
-		missing.unshift(basename$1(current));
-		current = dirname$1(current);
+		missing.unshift(basename(current));
+		current = dirname(current);
 	}
 	const existing = realpathSync(current);
 	return {
 		existing,
-		resolved: join$1(existing, ...missing)
+		resolved: join(existing, ...missing)
 	};
 }
 function filesystemDevice(path) {
@@ -26,22 +26,22 @@ function filesystemDevice(path) {
 function outsideWorkingTree(path) {
 	let current = path;
 	while (true) {
-		if (lstatSync(join$1(current, ".git"), { throwIfNoEntry: false })) return false;
-		const parent = dirname$1(current);
+		if (lstatSync(join(current, ".git"), { throwIfNoEntry: false })) return false;
+		const parent = dirname(current);
 		if (parent === current) return true;
 		current = parent;
 	}
 }
 function inside(parent, path) {
-	const rel = relative$1(parent, path);
-	return rel === "" || rel !== ".." && !rel.startsWith(`..${sep$1}`) && !isAbsolute$1(rel);
+	const rel = relative(parent, path);
+	return rel === "" || rel !== ".." && !rel.startsWith(`..${sep}`) && !isAbsolute(rel);
 }
 function temporaryRoot(near) {
 	const reference = existingPath(near);
 	const insideReference = (path) => inside(reference.resolved, path);
 	const override = process.env.STIM_TMPDIR ?? loadConfig()?.tempDir;
 	if (override !== void 0) {
-		if (typeof override !== "string" || !isAbsolute$1(override)) throw new Error("STIM_TMPDIR / tempDir must be an absolute directory path.");
+		if (typeof override !== "string" || !isAbsolute(override)) throw new Error("STIM_TMPDIR / tempDir must be an absolute directory path.");
 		const { existing, resolved } = existingPath(override);
 		if (!statSync(existing).isDirectory() || !outsideWorkingTree(existing)) throw new Error(`Temporary directory ${override} must be outside Git working trees.`);
 		if (insideReference(resolved)) throw new Error(`Temporary directory ${override} must not be inside ${near}.`);
@@ -52,10 +52,10 @@ function temporaryRoot(near) {
 	const cache = existingPath(buildCacheRoot()).resolved;
 	const device = statSync(existing).dev;
 	const candidates = [tmpdir()];
-	let current = existing === reference.resolved || !statSync(existing).isDirectory() ? dirname$1(existing) : existing;
+	let current = existing === reference.resolved || !statSync(existing).isDirectory() ? dirname(existing) : existing;
 	while (statSync(current).dev === device) {
 		candidates.push(current);
-		const parent = dirname$1(current);
+		const parent = dirname(current);
 		if (parent === current) break;
 		current = parent;
 	}
@@ -65,7 +65,7 @@ function temporaryRoot(near) {
 		accessSync(path, constants.W_OK);
 		return path;
 	} catch {}
-	throw new Error(`No writable temporary directory on the filesystem containing ${near}. Set STIM_TMPDIR or tempDir in ${join$1(getConfigDir(), "config.json")} to a directory outside Git working trees.`);
+	throw new Error(`No writable temporary directory on the filesystem containing ${near}. Set STIM_TMPDIR or tempDir in ${join(getConfigDir(), "config.json")} to a directory outside Git working trees.`);
 }
 function makeTemporaryDirectory(near, prefix) {
 	const root = temporaryRoot(near);
@@ -73,13 +73,13 @@ function makeTemporaryDirectory(near, prefix) {
 		recursive: true,
 		mode: 448
 	});
-	return mkdtempSync(join$1(root, prefix));
+	return mkdtempSync(join(root, prefix));
 }
 function removeTemporaryEntry(path) {
 	const stat = lstatSync(path, { throwIfNoEntry: false });
 	if (stat?.isDirectory()) {
 		chmodSync(path, stat.mode | 448);
-		for (const entry of readdirSync(path, { withFileTypes: true })) if (entry.isDirectory()) removeTemporaryEntry(join$1(path, entry.name));
+		for (const entry of readdirSync(path, { withFileTypes: true })) if (entry.isDirectory()) removeTemporaryEntry(join(path, entry.name));
 	}
 	rmSync(path, {
 		recursive: true,
@@ -91,13 +91,14 @@ function removeTemporaryEntry(path) {
 const CARRY_SKIP_BASENAMES = /* @__PURE__ */ new Set([
 	".DerivedData",
 	".DS_Store",
-	".idea"
+	".idea",
+	".jj"
 ]);
 function isCarrySkipped(rel) {
 	return /(^|\/)android\/build\/generated\/autolinking(\/|$)/.test(rel) || String(rel).split("/").some((seg) => CARRY_SKIP_BASENAMES.has(seg));
 }
 function nativePath(path) {
-	return sep === "/" ? path : path.replaceAll("/", sep);
+	return sep$1 === "/" ? path : path.replaceAll("/", sep$1);
 }
 function gitCommonDir(cwd) {
 	const out = getExecutor().runFileQuiet("git", [
@@ -176,7 +177,7 @@ function matchesInclude(path, patterns) {
 	return false;
 }
 function readWorktreeExclude(root) {
-	return readPatternFile(join(root, ".worktreeexclude"));
+	return readPatternFile(join$1(root, ".worktreeexclude"));
 }
 function readPatternFile(p) {
 	if (!existsSync$1(p)) return null;
@@ -186,7 +187,7 @@ function canonicalPath(path) {
 	try {
 		return realpathSync$1(path);
 	} catch {
-		return resolve(path);
+		return resolve$1(path);
 	}
 }
 function nestedWorktreePaths(root) {
@@ -201,9 +202,9 @@ function nestedWorktreePaths(root) {
 	]);
 	if (out === null) throw new Error("Could not list Git worktrees. Refusing to carry ignored files.");
 	for (const entry of parseWorktrees(out)) {
-		const rel = relative(source, canonicalPath(entry.path));
-		if (!rel || rel === ".." || rel.startsWith(`..${sep}`) || isAbsolute(rel)) continue;
-		paths.add(rel.split(sep).join("/"));
+		const rel = relative$1(source, canonicalPath(entry.path));
+		if (!rel || rel === ".." || rel.startsWith(`..${sep$1}`) || isAbsolute$1(rel)) continue;
+		paths.add(rel.split(sep$1).join("/"));
 	}
 	return [...paths];
 }
@@ -263,11 +264,11 @@ function missingDestinationReason(target, rel) {
 	const parts = rel.split("/");
 	for (let i = 1; i < parts.length; i++) {
 		const parent = parts.slice(0, i).join("/");
-		const stat = lstatSync$1(join(target, parent), { throwIfNoEntry: false });
+		const stat = lstatSync$1(join$1(target, parent), { throwIfNoEntry: false });
 		if (stat?.isSymbolicLink()) return `symlink ancestor: ${parent}`;
 		if (stat && !stat.isDirectory()) return `non-directory ancestor: ${parent}`;
 	}
-	return lstatSync$1(join(target, rel), { throwIfNoEntry: false }) ? "exists" : null;
+	return lstatSync$1(join$1(target, rel), { throwIfNoEntry: false }) ? "exists" : null;
 }
 function removeCopiedExclusions(path, rel) {
 	const entries = readdirSync$1(path, { withFileTypes: true });
@@ -276,7 +277,7 @@ function removeCopiedExclusions(path, rel) {
 		const stat = lstatSync$1(path);
 		chmodSync$1(path, stat.mode | 448);
 		try {
-			for (const entry of excluded) removeTemporaryEntry(join(path, entry.name));
+			for (const entry of excluded) removeTemporaryEntry(join$1(path, entry.name));
 		} finally {
 			utimesSync(path, stat.atime, stat.mtime);
 			chmodSync$1(path, stat.mode);
@@ -284,7 +285,7 @@ function removeCopiedExclusions(path, rel) {
 	}
 	for (const entry of entries) {
 		const child = `${rel}/${entry.name}`;
-		if (entry.isDirectory() && !isCarrySkipped(child)) removeCopiedExclusions(join(path, entry.name), child);
+		if (entry.isDirectory() && !isCarrySkipped(child)) removeCopiedExclusions(join$1(path, entry.name), child);
 	}
 }
 function cloneIgnoredEntries({ root, target, patterns }) {
@@ -296,8 +297,8 @@ function cloneIgnoredEntries({ root, target, patterns }) {
 	if (!guard.known) throw new Error("Could not list the destination's tracked files.");
 	const nested = nestedWorktreePaths(target);
 	for (const rel of listCarryableIgnoredEntries(root, patterns)) {
-		const from = join(root, rel);
-		const to = join(target, rel);
+		const from = join$1(root, rel);
+		const to = join$1(target, rel);
 		try {
 			const reason = guard.covers(rel) ? "tracked" : overlapsNestedWorktree(rel, nested) ? "nested worktree" : missingDestinationReason(target, rel);
 			if (reason) {
@@ -307,7 +308,7 @@ function cloneIgnoredEntries({ root, target, patterns }) {
 				});
 				continue;
 			}
-			mkdirSync$1(dirname(to), { recursive: true });
+			mkdirSync$1(dirname$1(to), { recursive: true });
 			try {
 				getExecutor().runFile("cp", [
 					"-Rc",
@@ -344,8 +345,8 @@ function podsOutOfSync(target, copiedEntries, { read = readFileSync$1 } = {}) {
 	for (const rel of copiedEntries || []) {
 		if (rel !== "Pods" && !rel.endsWith("/Pods")) continue;
 		const iosDir = rel === "Pods" ? "" : rel.slice(0, -5);
-		const manifest = join(target, rel, "Manifest.lock");
-		const podfileLock = join(target, iosDir, "Podfile.lock");
+		const manifest = join$1(target, rel, "Manifest.lock");
+		const podfileLock = join$1(target, iosDir, "Podfile.lock");
 		if (!existsSync$1(manifest)) continue;
 		if (!existsSync$1(podfileLock)) {
 			problems.push({
@@ -405,7 +406,7 @@ function yarnBerryInstallMatches(lockfile, state) {
 function installedMatchesLockfile(dir, lockfile, { read = readFileSync$1 } = {}) {
 	const text = (rel) => {
 		try {
-			return read(join(dir, rel), "utf-8").replaceAll("\r\n", "\n");
+			return read(join$1(dir, rel), "utf-8").replaceAll("\r\n", "\n");
 		} catch {
 			return null;
 		}
@@ -437,9 +438,9 @@ function depsOutOfSync(root, target, copiedEntries, { read = readFileSync$1 } =
 	for (const rel of copiedEntries || []) {
 		if (rel !== "node_modules" && !rel.endsWith("/node_modules")) continue;
 		const dir = rel === "node_modules" ? "" : rel.slice(0, -13);
-		const name = LOCKFILE_NAMES.find((candidate) => existsSync$1(join(target, dir, candidate)));
+		const name = LOCKFILE_NAMES.find((candidate) => existsSync$1(join$1(target, dir, candidate)));
 		if (!name) continue;
-		const installed = installedMatchesLockfile(join(target, dir), name, { read });
+		const installed = installedMatchesLockfile(join$1(target, dir), name, { read });
 		if (installed === false) {
 			problems.push({
 				dir: dir || ".",
@@ -448,10 +449,10 @@ function depsOutOfSync(root, target, copiedEntries, { read = readFileSync$1 } =
 			});
 			continue;
 		}
-		const source = join(root, dir, name);
+		const source = join$1(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({
+			if (read(source, "utf-8") !== read(join$1(target, dir, name), "utf-8")) problems.push({
 				dir: dir || ".",
 				lockfile: name,
 				reason: "lockfile"
@@ -634,14 +635,14 @@ function hasPopulatedSubmodules(worktree) {
 		"--git-path",
 		"modules"
 	]);
-	if (modules && existsSync$1(resolve(worktree, nativePath(modules)))) return true;
+	if (modules && existsSync$1(resolve$1(worktree, nativePath(modules)))) return true;
 	return (getExecutor().runFileQuiet("git", [
 		"-C",
 		worktree,
 		"ls-files",
 		"--stage",
 		"-z"
-	]) ?? "").split("\0").some((line) => line.startsWith("160000 ") && existsSync$1(join(worktree, line.slice(line.indexOf("	") + 1), ".git")));
+	]) ?? "").split("\0").some((line) => line.startsWith("160000 ") && existsSync$1(join$1(worktree, line.slice(line.indexOf("	") + 1), ".git")));
 }
 function listWorktrees(cwd) {
 	const out = getExecutor().runFileQuiet("git", [
@@ -662,21 +663,21 @@ function branchOf(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");
+	const admin = join$1(commonDir, "worktrees");
 	let ids;
 	let sourceBranch;
 	try {
 		ids = readdirSync$1(admin);
-		sourceBranch = branchOf(readFileSync$1(join(commonDir, "HEAD"), "utf-8").trim());
+		sourceBranch = branchOf(readFileSync$1(join$1(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());
+			const gitdir = readFileSync$1(join$1(admin, id, "gitdir"), "utf-8").trim();
+			const branch = branchOf(readFileSync$1(join$1(admin, id, "HEAD"), "utf-8").trim());
 			if (branch && branch === sourceBranch) return [];
-			const path = dirname(resolve(admin, id, nativePath(gitdir)));
+			const path = dirname$1(resolve$1(admin, id, nativePath(gitdir)));
 			return [branch ? {
 				path,
 				branch
@@ -692,17 +693,17 @@ function linkedWorktreesOnDisk(commonDir) {
 */
 function gitCommonDirOnDisk(start) {
 	try {
-		for (let dir = realpathSync$1.native(start);; dir = dirname(dir)) {
-			const dotGit = join(dir, ".git");
+		for (let dir = realpathSync$1.native(start);; dir = dirname$1(dir)) {
+			const dotGit = join$1(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);
+				const linked = resolve$1(dir, gitdir);
+				const commondir = join$1(linked, "commondir");
+				return realpathSync$1.native(existsSync$1(commondir) ? resolve$1(linked, readFileSync$1(commondir, "utf-8").trim()) : linked);
 			}
-			if (dirname(dir) === dir) return null;
+			if (dirname$1(dir) === dir) return null;
 		}
 	} catch {
 		return null;
@@ -722,8 +723,8 @@ function selectSourceCheckout(entries, bareHead) {
 	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(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(beside, bareHead)} ${bareHead}\n`}Or point HEAD at a branch that is checked out (${listed}):\n${pointHead}` };
+		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}` };
 }