stim 1.21.0 → 1.22.0

package/dist/{settings-CsJDEXgK.mjs → settings-C7O8A6ZI.mjs}

@@ -1,36 +1,14 @@
-import { n as isTimeoutError, t as getExecutor } from "./exec-_UbtCQcG.mjs";
-import { _ as loadConfig$1, d as getConfigDir, f as getConfigPath$1, h as getRepoSettings, m as getProjectSettings } from "./config-CYcBF478.mjs";
-import { i as gitQuietAsync, n as gitAsync, r as gitQuiet, t as git } from "./git-C3iTsJaZ.mjs";
+import { n as isTimeoutError, r as WorkspaceProcessCleanupError, t as getExecutor } from "./exec-DEoAhcze.mjs";
+import { _ as loadConfig$1, d as getConfigDir, f as getConfigPath$1, h as getRepoSettings, m as getProjectSettings } from "./config-DlrsduwG.mjs";
+import { c as gitQuiet, f as throwIfCancelled, l as gitQuietAsync, o as git, r as childEnvironment, s as gitAsync } from "./operation-exec-BW0em61G.mjs";
 import { accessSync, chmodSync, constants, lstatSync, mkdirSync, mkdtempSync, readdirSync, realpathSync, rmSync, statSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { ambientEnv, buildCacheRoot } from "@stim-cli/core";
 import { REMOTE_DEVICE_BACKENDS, SETTINGS, SETTING_GROUPS, TUNNEL_MODES, WEB_VIEWPORTS, acceptsShape, coerceSettingText, expectedShape, isLayeredSetting, settingDefinition, settingValueError } from "@stim-cli/core/state";
 import { dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, normalize, relative as relative$1, resolve as resolve$1, sep as sep$1 } from "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 as utimesSync$1 } from "fs";
-//#region src/cancellation.ts
-function cancelledError(what, cause) {
-	return Object.assign(new Error(`The ${what} was cancelled.`, cause === void 0 ? void 0 : { cause }), { code: "STIM_CANCELLED" });
-}
-function throwIfCancelled(signal, what) {
-	if (signal?.aborted) throw cancelledError(what);
-}
-function cancellableSleep(ms, { signal, what = "wait", ref = true } = {}) {
-	return new Promise((resolve, reject) => {
-		if (signal?.aborted) return reject(cancelledError(what));
-		const onAbort = () => {
-			clearTimeout(timer);
-			reject(cancelledError(what));
-		};
-		const timer = setTimeout(() => {
-			signal?.removeEventListener("abort", onAbort);
-			resolve();
-		}, ms);
-		if (!ref) timer.unref();
-		signal?.addEventListener("abort", onAbort, { once: true });
-	});
-}
-//#endregion
+import { existsSync as existsSync$1, lstatSync as lstatSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, realpathSync as realpathSync$1, statSync as statSync$1 } from "fs";
+import { chmod, lstat, mkdir, readdir, rm, utimes } from "node:fs/promises";
 //#region src/temporary.ts
 function existingPath(path) {
 	const missing = [];
@@ -111,33 +89,22 @@ function removeTemporaryEntry(path) {
 		force: true
 	});
 }
-//#endregion
-//#region src/workspace/git-read.ts
-function childEnvironment(env) {
-	return {
-		env: Object.fromEntries(Object.entries(env).flatMap(([name, value]) => value === void 0 ? [] : [[name, value]])),
-		omitEnv: Object.keys(process.env).filter((name) => env[name] === void 0)
-	};
-}
-function killOnAbort(signal) {
-	return (child) => {
-		if (!signal || getExecutor().reportSignal?.()) return;
-		if (signal.aborted) return void child.kill("SIGKILL");
-		const kill = () => child.kill("SIGKILL");
-		signal.addEventListener("abort", kill, { once: true });
-		child.once("close", () => signal.removeEventListener("abort", kill));
-	};
-}
-/** `git rev-parse <args>` in `cwd` as a native path, or null; Git runs with exactly `env` and dies when `signal` aborts. */
-function gitPath(cwd, args, env, signal) {
-	return gitAsync(cwd, ["rev-parse", ...args], {
-		...childEnvironment(env),
-		signal
-	}).then((out) => {
-		const path = out.trim();
-		if (!path) return null;
-		return sep === "/" ? path : path.replaceAll("/", sep);
-	}, () => null);
+async function removeTemporaryEntryAsync(path, signal) {
+	signal?.throwIfAborted();
+	const info = await lstat(path).catch((error) => {
+		if (error instanceof Error && "code" in error && error.code === "ENOENT") return null;
+		throw error;
+	});
+	if (info?.isDirectory()) {
+		await chmod(path, info.mode | 448);
+		for (const entry of await readdir(path, { withFileTypes: true })) if (entry.isDirectory()) await removeTemporaryEntryAsync(join(path, entry.name), signal);
+	}
+	signal?.throwIfAborted();
+	await rm(path, {
+		recursive: true,
+		force: true
+	});
+	signal?.throwIfAborted();
 }
 //#endregion
 //#region src/workspace/worktree.ts
@@ -154,6 +121,24 @@ function isCarrySkipped(rel) {
 function nativePath(path) {
 	return sep$1 === "/" ? path : path.replaceAll("/", sep$1);
 }
+async function gitReadAsync(dir, args, { removal, env, signal, declareFor, untrimmed }) {
+	signal ??= getExecutor().reportSignal?.();
+	try {
+		return await gitAsync(dir, args, {
+			...env ? childEnvironment(env) : {},
+			signal,
+			...removal ? { timeoutMs: REMOVAL_CHECK_TIMEOUT_MS } : {},
+			killSignal: "SIGKILL",
+			declareFor,
+			untrimmed
+		});
+	} catch (error) {
+		if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
+		signal?.throwIfAborted();
+		if (removal && isTimeoutError(error)) throw error;
+		return null;
+	}
+}
 function gitRead(dir, args, { removal }) {
 	return removal ? removalCheck(dir, args) : gitQuiet(dir, args);
 }
@@ -165,27 +150,20 @@ function gitCommonDir(cwd, opts = {}) {
 	], opts);
 	return out ? nativePath(out.trim()) : null;
 }
-async function gitCommonDirAsync(cwd, { env, signal } = {}) {
-	const out = await gitQuietAsync(cwd, [
+async function gitCommonDirAsync(cwd, options = {}) {
+	const out = await gitReadAsync(cwd, [
 		"rev-parse",
 		"--path-format=absolute",
 		"--git-common-dir"
-	], {
-		...env ? childEnvironment(env) : {},
-		signal
-	});
+	], options);
 	return out ? nativePath(out.trim()) : null;
 }
 function repoRoot(cwd) {
 	const out = gitQuiet(cwd, ["rev-parse", "--show-toplevel"]);
 	return out ? nativePath(out.trim()) : null;
 }
-async function repoRootAsync(cwd, { env, signal } = {}) {
-	const out = await gitQuietAsync(cwd, ["rev-parse", "--show-toplevel"], {
-		...env ? childEnvironment(env) : {},
-		signal,
-		killSignal: "SIGKILL"
-	});
+async function repoRootAsync(cwd, options = {}) {
+	const out = await gitReadAsync(cwd, ["rev-parse", "--show-toplevel"], options);
 	return out ? nativePath(out.trim()) : null;
 }
 function upstreamState(name, counts) {
@@ -231,18 +209,23 @@ async function locallyKnownUpstreamAsync(projectRoot) {
 		return null;
 	}
 }
-function warmWorktreePaths(cwd) {
-	const currentRoot = repoRoot(cwd);
+async function warmWorktreePaths(cwd, operation) {
+	const options = {
+		env: operation?.env,
+		signal: operation?.signal,
+		declareFor: operation
+	};
+	const currentRoot = await repoRootAsync(cwd, options);
 	if (!currentRoot) throw new Error("Not a git repository.");
 	const target = realpathSync$1(currentRoot);
-	const source = resolveSourceCheckout(target);
+	const source = await resolveSourceCheckoutAsync(target, options);
 	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.");
+	if (!source.entries.some((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);
+	const sourceRoot = await repoRootAsync(root, options);
+	const sourceCommon = await gitCommonDirAsync(root, options);
+	const targetCommon = await gitCommonDirAsync(target, options);
 	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,
@@ -272,16 +255,19 @@ function canonicalPath(path) {
 		return resolve$1(path);
 	}
 }
-function nestedWorktreePaths(root) {
-	const source = canonicalPath(root);
-	const paths = /* @__PURE__ */ new Set();
-	const out = gitQuiet(root, [
+async function nestedWorktreePaths(root, options = {}) {
+	const out = await gitReadAsync(root, [
 		"worktree",
 		"list",
 		"--porcelain"
-	]);
+	], options);
 	if (out === null) throw new Error("Could not list Git worktrees. Refusing to carry ignored files.");
-	for (const entry of parseWorktrees(out)) {
+	return relativeWorktreePaths(root, parseWorktrees(out));
+}
+function relativeWorktreePaths(root, entries) {
+	const source = canonicalPath(root);
+	const paths = /* @__PURE__ */ new Set();
+	for (const entry of entries) {
 		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("/"));
@@ -292,13 +278,15 @@ function overlapsNestedWorktree(rel, nestedPaths) {
 	const path = String(rel).replaceAll("\\", "/").replace(/^\.\//, "").replace(/\/$/, "");
 	return nestedPaths.some((nested) => path === nested || path.startsWith(`${nested}/`) || nested.startsWith(`${path}/`));
 }
-function listTrackedPaths(dir) {
-	const out = gitQuiet(dir, ["ls-files", "-z"]);
+async function listTrackedPaths(dir, options = {}) {
+	const out = await gitReadAsync(dir, ["ls-files", "-z"], {
+		...options,
+		untrimmed: true
+	});
 	if (out === null) return null;
 	return out.split("\0").filter(Boolean);
 }
-function trackedGuard(dir) {
-	const paths = listTrackedPaths(dir);
+function trackedPathsGuard(paths) {
 	if (paths === null) return {
 		known: false,
 		covers: () => false
@@ -315,8 +303,8 @@ function trackedGuard(dir) {
 		}
 	};
 }
-function listGitignoredEntries(root) {
-	const out = git(root, [
+async function listGitignoredEntries(root, options = {}) {
+	return (await gitAsync(root, [
 		"ls-files",
 		"--others",
 		"--ignored",
@@ -324,13 +312,17 @@ function listGitignoredEntries(root) {
 		"--directory",
 		"--no-empty-directory",
 		"-z"
-	], { timeoutMs: "unbounded" });
-	if (!out) return [];
-	return out.split("\0").filter(Boolean).map((e) => e.endsWith("/") ? e.slice(0, -1) : e);
+	], {
+		...options.env ? childEnvironment(options.env) : {},
+		signal: options.signal,
+		declareFor: options.declareFor,
+		timeoutMs: "unbounded",
+		untrimmed: true
+	})).split("\0").filter(Boolean).map((entry) => entry.endsWith("/") ? entry.slice(0, -1) : entry);
 }
-function listCarryableIgnoredEntries(root, patterns) {
-	const nested = nestedWorktreePaths(root);
-	return listGitignoredEntries(root).filter((rel) => !isCarrySkipped(rel) && !overlapsNestedWorktree(rel, nested) && !matchesInclude(rel, patterns));
+async function listCarryableIgnoredEntries(root, patterns, options = {}) {
+	const nested = await nestedWorktreePaths(root, options);
+	return (await listGitignoredEntries(root, options)).filter((rel) => !isCarrySkipped(rel) && !overlapsNestedWorktree(rel, nested) && !matchesInclude(rel, patterns));
 }
 function missingDestinationReason(target, rel) {
 	const parts = rel.split("/");
@@ -342,35 +334,54 @@ function missingDestinationReason(target, rel) {
 	}
 	return lstatSync$1(join$1(target, rel), { throwIfNoEntry: false }) ? "exists" : null;
 }
-function removeCopiedExclusions(path, rel) {
-	const entries = readdirSync$1(path, { withFileTypes: true });
+async function removeCopiedExclusionsAsync(path, rel, signal) {
+	signal.throwIfAborted();
+	const entries = await readdir(path, { withFileTypes: true });
 	const excluded = entries.filter((entry) => isCarrySkipped(`${rel}/${entry.name}`));
-	if (excluded.length > 0) {
-		const stat = lstatSync$1(path);
-		chmodSync$1(path, stat.mode | 448);
+	if (excluded.length) {
+		const stat = await lstat(path);
+		await chmod(path, stat.mode | 448);
 		try {
-			for (const entry of excluded) removeTemporaryEntry(join$1(path, entry.name));
+			for (const entry of excluded) {
+				signal.throwIfAborted();
+				await removeTemporaryEntryAsync(join$1(path, entry.name), signal);
+			}
 		} finally {
-			utimesSync$1(path, stat.atime, stat.mtime);
-			chmodSync$1(path, stat.mode);
+			await utimes(path, stat.atime, stat.mtime);
+			await chmod(path, stat.mode);
 		}
 	}
 	for (const entry of entries) {
 		const child = `${rel}/${entry.name}`;
-		if (entry.isDirectory() && !isCarrySkipped(child)) removeCopiedExclusions(join$1(path, entry.name), child);
+		if (entry.isDirectory() && !isCarrySkipped(child)) await removeCopiedExclusionsAsync(join$1(path, entry.name), child, signal);
 	}
 }
-function cloneIgnoredEntries({ root, target, patterns }) {
+async function cloneIgnoredEntries({ root, target, patterns, operation }) {
+	const options = {
+		...childEnvironment(operation.env),
+		signal: operation.signal,
+		declareFor: operation,
+		timeoutMs: "unbounded",
+		untrimmed: true
+	};
+	const reads = {
+		env: operation.env,
+		signal: operation.signal,
+		declareFor: operation
+	};
+	const guard = trackedPathsGuard(await listTrackedPaths(target, reads));
+	if (!guard.known) throw new Error("Could not list the destination's tracked files.");
+	const nested = await nestedWorktreePaths(target, reads);
+	const entries = await listCarryableIgnoredEntries(root, patterns, reads);
 	const copied = [];
 	const skipped = [];
 	const failed = [];
 	let cloned = true;
-	const guard = trackedGuard(target);
-	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)) {
+	for (const rel of entries) {
+		operation.signal.throwIfAborted();
 		const from = join$1(root, rel);
 		const to = join$1(target, rel);
+		let copying = false;
 		try {
 			const reason = guard.covers(rel) ? "tracked" : overlapsNestedWorktree(rel, nested) ? "nested worktree" : missingDestinationReason(target, rel);
 			if (reason) {
@@ -380,28 +391,34 @@ function cloneIgnoredEntries({ root, target, patterns }) {
 				});
 				continue;
 			}
-			mkdirSync$1(dirname$1(to), { recursive: true });
+			await mkdir(dirname$1(to), { recursive: true });
+			copying = true;
 			try {
-				getExecutor().runFile("cp", [
+				await getExecutor().runFileAsync("cp", [
 					"-Rc",
 					from,
 					to
-				], { timeoutMs: "unbounded" });
-			} catch {
-				removeTemporaryEntry(to);
-				getExecutor().runFile("cp", [
+				], options);
+			} catch (cause) {
+				if (cause instanceof WorkspaceProcessCleanupError || cause instanceof Error && "reportCleanup" in cause) throw cause;
+				operation.signal.throwIfAborted();
+				await removeTemporaryEntryAsync(to);
+				await getExecutor().runFileAsync("cp", [
 					"-R",
 					from,
 					to
-				], { timeoutMs: "unbounded" });
+				], options);
 				cloned = false;
 			}
-			if (lstatSync$1(to).isDirectory()) removeCopiedExclusions(to, rel);
+			if ((await lstat(to)).isDirectory()) await removeCopiedExclusionsAsync(to, rel, operation.signal);
 			copied.push(rel);
-		} catch (e) {
+		} catch (cause) {
+			if (cause instanceof WorkspaceProcessCleanupError || cause instanceof Error && "reportCleanup" in cause) throw cause;
+			if (copying) await removeTemporaryEntryAsync(to);
+			operation.signal.throwIfAborted();
 			failed.push({
 				file: rel,
-				error: String(e?.message || e)
+				error: String(cause?.message || cause)
 			});
 		}
 	}
@@ -563,35 +580,20 @@ function removalCheck(dir, args) {
 		return null;
 	}
 }
-async function removalCheckAsync(dir, args) {
-	try {
-		return await gitAsync(dir, args, {
-			timeoutMs: REMOVAL_CHECK_TIMEOUT_MS,
-			killSignal: "SIGKILL"
-		});
-	} catch (error) {
-		if (isTimeoutError(error)) throw error;
-		return null;
-	}
-}
-function hasUncommittedWork(dir) {
-	const out = removalCheck(dir, ["status", "--porcelain"]);
-	if (out === null) return null;
-	return out.trim().length > 0;
+function removalCheckAsync(dir, args, options = {}) {
+	return gitReadAsync(dir, args, {
+		...options,
+		removal: true
+	});
 }
-async function hasUncommittedWorkAsync(dir) {
-	const out = await removalCheckAsync(dir, ["status", "--porcelain"]);
+async function hasUncommittedWorkAsync(dir, options = {}) {
+	const out = await removalCheckAsync(dir, ["status", "--porcelain"], options);
 	if (out === null) return null;
 	return out.trim().length > 0;
 }
 /** The porcelain status lines, or null when git cannot answer; throws when git times out. */
-function dirtyPaths(dir, { limit = 10 } = {}) {
-	const out = removalCheck(dir, ["status", "--porcelain"]);
-	if (out === null) return null;
-	return out.split("\n").map((l) => normalizePorcelainLine(l.trimEnd())).filter(Boolean).slice(0, limit);
-}
-async function dirtyPathsAsync(dir, { limit = 10 } = {}) {
-	const out = await removalCheckAsync(dir, ["status", "--porcelain"]);
+async function dirtyPathsAsync(dir, { limit = 10 } = {}, options = {}) {
+	const out = await removalCheckAsync(dir, ["status", "--porcelain"], options);
 	if (out === null) return null;
 	return out.split("\n").map((line) => normalizePorcelainLine(line.trimEnd())).filter(Boolean).slice(0, limit);
 }
@@ -599,53 +601,18 @@ function normalizePorcelainLine(line) {
 	if (line === "" || line[2] === " ") return line;
 	return ` ${line}`;
 }
-function restoreFile(dir, file) {
-	return gitQuiet(dir, [
-		"checkout",
-		"--",
-		file
-	], { write: true }) !== null;
-}
 function isPodInstallChurn(paths) {
 	if (!paths || paths.length === 0) return false;
 	return paths.every((line) => /(?:^|\/)(?:Podfile\.lock|project\.pbxproj)$/.test(line.slice(3).trim()));
 }
 const SAFE_BRANCH_NAME = /^[A-Za-z0-9@._/-]+$/;
-function unpushedCommits(dir) {
-	const branch = removalCheck(dir, [
-		"symbolic-ref",
-		"--quiet",
-		"--short",
-		"HEAD"
-	]);
-	const own = branch === null ? "" : branch.trim();
-	const protection = own && SAFE_BRANCH_NAME.test(own) ? [
-		"--remotes",
-		`--exclude=${own}`,
-		"--branches"
-	] : ["--remotes"];
-	if (!own && removalCheck(dir, [
-		"rev-parse",
-		"--abbrev-ref",
-		"HEAD"
-	]) === "HEAD") protection.push("--branches");
-	const out = removalCheck(dir, [
-		"log",
-		"--oneline",
-		"HEAD",
-		"--not",
-		...protection
-	]);
-	if (out === null) return null;
-	return out.split("\n").map((l) => l.trim()).filter(Boolean);
-}
-async function unpushedCommitsAsync(dir) {
+async function unpushedCommitsAsync(dir, options = {}) {
 	const branch = await removalCheckAsync(dir, [
 		"symbolic-ref",
 		"--quiet",
 		"--short",
 		"HEAD"
-	]);
+	], options);
 	const own = branch === null ? "" : branch.trim();
 	const protection = own && SAFE_BRANCH_NAME.test(own) ? [
 		"--remotes",
@@ -656,30 +623,17 @@ async function unpushedCommitsAsync(dir) {
 		"rev-parse",
 		"--abbrev-ref",
 		"HEAD"
-	]) === "HEAD") protection.push("--branches");
+	], options) === "HEAD") protection.push("--branches");
 	const out = await removalCheckAsync(dir, [
 		"log",
 		"--oneline",
 		"HEAD",
 		"--not",
 		...protection
-	]);
+	], options);
 	if (out === null) return null;
 	return out.split("\n").map((line) => line.trim()).filter(Boolean);
 }
-function hasRemote(dir) {
-	const out = gitQuiet(dir, ["remote"]);
-	return Boolean(out && out.trim().length > 0);
-}
-function branchExists(cwd, branch, opts = {}) {
-	const out = gitRead(cwd, [
-		"rev-parse",
-		"--verify",
-		"--quiet",
-		`refs/heads/${branch}`
-	], opts);
-	return Boolean(out);
-}
 function resolveFullRef(cwd, ref, opts = {}) {
 	const out = gitRead(cwd, [
 		"rev-parse",
@@ -690,18 +644,49 @@ function resolveFullRef(cwd, ref, opts = {}) {
 	], opts);
 	return out && out.trim() ? out.trim() : null;
 }
-async function resolveFullRefAsync(cwd, ref) {
-	const out = await gitQuietAsync(cwd, [
+async function resolveFullRefAsync(cwd, ref, options = {}) {
+	const out = await gitReadAsync(cwd, [
 		"rev-parse",
 		"--verify",
 		"--quiet",
 		"--end-of-options",
 		`${ref}^{commit}`
-	], { killSignal: "SIGKILL" });
+	], options);
 	return out && out.trim() ? out.trim() : null;
 }
-function removeWorktree(path, { from, force = false, platform = process.platform }) {
-	const args = [
+async function hasRemoteAsync(dir, options = {}) {
+	const out = await gitReadAsync(dir, ["remote"], options);
+	return Boolean(out && out.trim().length > 0);
+}
+async function branchExistsAsync(cwd, branch, options = {}) {
+	return Boolean(await gitReadAsync(cwd, [
+		"rev-parse",
+		"--verify",
+		"--quiet",
+		`refs/heads/${branch}`
+	], options));
+}
+async function restoreFileAsync(dir, file, options = {}) {
+	try {
+		await gitAsync(dir, [
+			"checkout",
+			"--",
+			file
+		], {
+			...options.env ? childEnvironment(options.env) : {},
+			signal: options.signal,
+			declareFor: options.declareFor,
+			write: true
+		});
+		return true;
+	} catch (error) {
+		if (error instanceof WorkspaceProcessCleanupError || error instanceof Error && "reportCleanup" in error) throw error;
+		options.signal?.throwIfAborted();
+		return false;
+	}
+}
+function worktreeRemoveArgs(path, force, platform) {
+	return [
 		...platform === "win32" ? ["-c", "core.longpaths=true"] : [],
 		"worktree",
 		"remove",
@@ -709,19 +694,32 @@ function removeWorktree(path, { from, force = false, platform = process.platform
 		"--",
 		path
 	];
-	git(from, args, {
+}
+async function removeWorktreeAsync(path, { from, force = false, platform = process.platform, env, signal, declareFor }) {
+	await gitAsync(from, worktreeRemoveArgs(path, force, platform), {
+		...env ? childEnvironment(env) : {},
+		signal,
+		declareFor,
 		write: true,
 		timeoutMs: "unbounded"
 	});
 }
-function deleteBranch(cwd, branch, expectedSha) {
+function branchDeleteArgs(branch, expectedSha) {
 	if (!SAFE_BRANCH_NAME.test(branch) || branch.startsWith("-")) throw new Error(`Refusing branch ${JSON.stringify(branch)}: it is not a safe local branch name.`);
-	git(cwd, [
+	return [
 		"update-ref",
 		"-d",
 		`refs/heads/${branch}`,
 		expectedSha
-	], { write: true });
+	];
+}
+async function deleteBranchAsync(cwd, branch, expectedSha, options = {}) {
+	await gitAsync(cwd, branchDeleteArgs(branch, expectedSha), {
+		...options.env ? childEnvironment(options.env) : {},
+		signal: options.signal,
+		declareFor: options.declareFor,
+		write: true
+	});
 }
 function parseWorktrees(out) {
 	const entries = [];
@@ -737,33 +735,18 @@ function parseWorktrees(out) {
 	return entries;
 }
 /** Null when git cannot list the index, so the answer is unknown; throws when git times out. */
-function hasPopulatedSubmodules(worktree) {
-	const modules = removalCheck(worktree, [
-		"rev-parse",
-		"--git-path",
-		"modules"
-	]);
-	if (modules && existsSync$1(resolve$1(worktree, nativePath(modules)))) return true;
-	const staged = removalCheck(worktree, [
-		"ls-files",
-		"--stage",
-		"-z"
-	]);
-	if (staged === null) return null;
-	return staged.split("\0").some((line) => line.startsWith("160000 ") && existsSync$1(join$1(worktree, line.slice(line.indexOf("	") + 1), ".git")));
-}
-async function hasPopulatedSubmodulesAsync(worktree) {
+async function hasPopulatedSubmodulesAsync(worktree, options = {}) {
 	const modules = await removalCheckAsync(worktree, [
 		"rev-parse",
 		"--git-path",
 		"modules"
-	]);
+	], options);
 	if (modules && existsSync$1(resolve$1(worktree, nativePath(modules)))) return true;
 	const staged = await removalCheckAsync(worktree, [
 		"ls-files",
 		"--stage",
 		"-z"
-	]);
+	], options);
 	if (staged === null) return null;
 	return staged.split("\0").some((line) => line.startsWith("160000 ") && existsSync$1(join$1(worktree, line.slice(line.indexOf("	") + 1), ".git")));
 }
@@ -775,12 +758,12 @@ function listWorktrees(cwd, opts = {}) {
 	], opts);
 	return out ? parseWorktrees(out) : [];
 }
-async function listWorktreesAsync(cwd) {
-	const out = await gitQuietAsync(cwd, [
+async function listWorktreesAsync(cwd, options = {}) {
+	const out = await gitReadAsync(cwd, [
 		"worktree",
 		"list",
 		"--porcelain"
-	], { killSignal: "SIGKILL" });
+	], options);
 	return out ? parseWorktrees(out) : [];
 }
 function branchOf(head) {
@@ -869,21 +852,14 @@ 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)
-	};
-}
-async function resolveSourceCheckoutAsync(cwd) {
-	const entries = await listWorktreesAsync(cwd);
+async function resolveSourceCheckoutAsync(cwd, options = {}) {
+	const entries = await listWorktreesAsync(cwd, options);
 	const first = entries[0];
-	const head = first?.bare ? (await gitQuietAsync(first.path, [
+	const head = first?.bare ? (await gitReadAsync(first.path, [
 		"symbolic-ref",
 		"--quiet",
 		"HEAD"
-	], { killSignal: "SIGKILL" }))?.trim() : null;
+	], options))?.trim() : null;
 	return {
 		entries,
 		...selectSourceCheckout(entries, head?.startsWith("refs/heads/") ? head.slice(11) : null)
@@ -1469,24 +1445,28 @@ function resolveProjectSettings(root) {
 		settings: resolveSettings(context)
 	};
 }
-/** Resolves repository paths without blocking; cancellation rejects instead of using non-Git settings. */
+/** Resolves repository paths asynchronously; declared probes run sequentially and cancellation rejects. */
 async function projectSettingsContextAsync(root, git = {
 	gitCommonDir: gitCommonDirAsync,
 	repoRoot: repoRootAsync
-}, { env = process.env, signal } = {}) {
+}, { env = process.env, signal, declareFor } = {}) {
 	throwIfCancelled(signal, "settings resolution");
-	const [gitCommonDir, repoRoot] = await Promise.all([git.gitCommonDir(root, {
-		env,
-		signal
-	}), git.repoRoot(root, {
+	const options = {
 		env,
-		signal
-	})]);
+		signal,
+		declareFor
+	};
+	const common = Promise.resolve(git.gitCommonDir(root, options));
+	const repo = declareFor ? common.then(() => git.repoRoot(root, options)) : git.repoRoot(root, options);
+	const [commonResult, repoResult] = await Promise.allSettled([common, repo]);
+	for (const result of [commonResult, repoResult]) if (result.status === "rejected" && (result.reason instanceof WorkspaceProcessCleanupError || result.reason instanceof Error && "reportCleanup" in result.reason)) throw result.reason;
 	throwIfCancelled(signal, "settings resolution");
+	if (commonResult.status === "rejected") throw commonResult.reason;
+	if (repoResult.status === "rejected") throw repoResult.reason;
 	return {
 		projectPath: root,
-		gitCommonDir,
-		repoRoot
+		gitCommonDir: commonResult.value,
+		repoRoot: repoResult.value
 	};
 }
 async function resolveProjectSettingsAsync(root, options) {
@@ -1669,4 +1649,4 @@ function webSettings(settings) {
 	};
 }
 //#endregion
-export { settingOriginScope as $, cancelledError as $t, metroIdleStopMinutesSetting as A, locallyKnownUpstream as At, realpathInside as B, restoreFile as Bt, iosSigningIdentitySha1Setting as C, hasRemote as Ct, mergeSettingsLayers as D, linkedWorktreesOnDisk as Dt, maintenanceKeepSetting as E, isPodInstallChurn as Et, parseIosRemote as F, repoRoot as Ft, resolveCacheProviderConfig as G, childEnvironment as Gt, remoteEasFallbackSetting as H, unpushedCommits as Ht, projectSettingsContext as I, repoRootAsync as It, resolveProjectSettingsAsync as J, filesystemDevice as Jt, resolveIosProjectDir as K, gitPath as Kt, projectSettingsContextAsync as L, resolveFullRef as Lt, metroTunnelSettingError as M, podsOutOfSync as Mt, metroWarmupUrlSetting as N, readWorktreeExclude as Nt, metroCommandSetting as O, listWorktrees as Ot, ngrokUrlSetting as P, removeWorktree as Pt, settingOrigin as Q, cancellableSleep as Qt, publicUrlSetting as R, resolveFullRefAsync as Rt, iosSigningIdentitySettingError as S, hasPopulatedSubmodulesAsync as St, iosSimSlimProfileSetting as T, hasUncommittedWorkAsync as Tt, remoteIosSetting as U, unpushedCommitsAsync as Ut, remoteAndroidSetting as V, sourceCheckoutOf as Vt, resolveAndroidLayout as W, warmWorktreePaths as Wt, runnableMetroCommand as X, removeTemporaryEntry as Xt, resolveSettings as Y, makeTemporaryDirectory as Yt, settingFile as Z, temporaryRoot as Zt, iosLanHostSetting as _, dirtyPathsAsync as _t, SETTING_SHAPE_REMEDY as a, webSettings as at, iosProjectDirSettingError as b, gitCommonDirOnDisk as bt, androidDataPartitionSizeBytes as c, detectProviders as ct, androidLayoutSetting as d, branchExists as dt, throwIfCancelled as en, settingShapeErrors as et, androidLayoutSettingError as f, cloneIgnoredEntries as ft, deviceReclaimIdleMinutesSetting as g, dirtyPaths as gt, deviceIdleShutdownMinutesSetting as h, dirtyFingerprintFiles as ht, SETTINGS_WITH_RESOLVE_TIME_FALLBACK as i, unknownSettingKeys as it, metroPortSetting as j, locallyKnownUpstreamAsync as jt, metroCommandSettingError as k, listWorktreesAsync as kt, androidDataPartitionSizeGbSetting as l, planMetroReach as lt, defaultAndroidLayout as m, depsOutOfSync as mt, METRO_COMMAND_PORT as n, settingsLayers as nt, androidAvdConfigSetting as o, workspaceHiddenSetting as ot, cacheProviderSettingError as p, deleteBranch as pt, resolveProjectSettings as q, killOnAbort as qt, PATH_SETTINGS as r, tunnelModeSetting as rt, androidAvdConfigSettingError as s, PUBLIC_METRO_ENV as st, ANDROID_AVD_CONFIG_HELP as t, settingValueAt as tt, androidDataPartitionSizeGbSettingError as u, resolveTailscaleBinary as ut, iosLanHostSettingError as v, gitCommonDir as vt, iosSigningIdentitySha1SettingError as w, hasUncommittedWork as wt, iosSigningIdentitySetting as x, hasPopulatedSubmodules as xt, iosProjectDirSetting as y, gitCommonDirAsync as yt, readCommittedSettings as z, resolveSourceCheckoutAsync as zt };
+export { settingOriginScope as $, metroIdleStopMinutesSetting as A, readWorktreeExclude as At, realpathInside as B, warmWorktreePaths as Bt, iosSigningIdentitySha1Setting as C, isPodInstallChurn as Ct, mergeSettingsLayers as D, locallyKnownUpstream as Dt, maintenanceKeepSetting as E, listWorktreesAsync as Et, parseIosRemote as F, resolveFullRefAsync as Ft, resolveCacheProviderConfig as G, temporaryRoot as Gt, remoteEasFallbackSetting as H, makeTemporaryDirectory as Ht, projectSettingsContext as I, resolveSourceCheckoutAsync as It, resolveProjectSettingsAsync as J, resolveIosProjectDir as K, projectSettingsContextAsync as L, restoreFileAsync as Lt, metroTunnelSettingError as M, repoRoot as Mt, metroWarmupUrlSetting as N, repoRootAsync as Nt, metroCommandSetting as O, locallyKnownUpstreamAsync as Ot, ngrokUrlSetting as P, resolveFullRef as Pt, settingOrigin as Q, publicUrlSetting as R, sourceCheckoutOf as Rt, iosSigningIdentitySettingError as S, hasUncommittedWorkAsync as St, iosSimSlimProfileSetting as T, listWorktrees as Tt, remoteIosSetting as U, removeTemporaryEntry as Ut, remoteAndroidSetting as V, filesystemDevice as Vt, resolveAndroidLayout as W, removeTemporaryEntryAsync as Wt, runnableMetroCommand as X, resolveSettings as Y, settingFile as Z, iosLanHostSetting as _, gitCommonDir as _t, SETTING_SHAPE_REMEDY as a, webSettings as at, iosProjectDirSettingError as b, hasPopulatedSubmodulesAsync as bt, androidDataPartitionSizeBytes as c, detectProviders as ct, androidLayoutSetting as d, branchExistsAsync as dt, settingShapeErrors as et, androidLayoutSettingError as f, cloneIgnoredEntries as ft, deviceReclaimIdleMinutesSetting as g, dirtyPathsAsync as gt, deviceIdleShutdownMinutesSetting as h, dirtyFingerprintFiles as ht, SETTINGS_WITH_RESOLVE_TIME_FALLBACK as i, unknownSettingKeys as it, metroPortSetting as j, removeWorktreeAsync as jt, metroCommandSettingError as k, podsOutOfSync as kt, androidDataPartitionSizeGbSetting as l, planMetroReach as lt, defaultAndroidLayout as m, depsOutOfSync as mt, METRO_COMMAND_PORT as n, settingsLayers as nt, androidAvdConfigSetting as o, workspaceHiddenSetting as ot, cacheProviderSettingError as p, deleteBranchAsync as pt, resolveProjectSettings as q, PATH_SETTINGS as r, tunnelModeSetting as rt, androidAvdConfigSettingError as s, PUBLIC_METRO_ENV as st, ANDROID_AVD_CONFIG_HELP as t, settingValueAt as tt, androidDataPartitionSizeGbSettingError as u, resolveTailscaleBinary as ut, iosLanHostSettingError as v, gitCommonDirAsync as vt, iosSigningIdentitySha1SettingError as w, linkedWorktreesOnDisk as wt, iosSigningIdentitySetting as x, hasRemoteAsync as xt, iosProjectDirSetting as y, gitCommonDirOnDisk as yt, readCommittedSettings as z, unpushedCommitsAsync as zt };