@dev.fast/whiteboard 0.3.3 → 0.3.4-preview.20261019.125

package/dist/sharing/index.js

@@ -1,2 +1,2 @@
-import { a as sharedReviewId, c as verifyShareRepository, i as SharedReviewStore, l as exportShare, n as ShareClient, o as validateShareBundle } from "../client-BN_FDxFr.js";
+import { a as sharedReviewId, c as verifyShareRepository, i as SharedReviewStore, l as exportShare, n as ShareClient, o as validateShareBundle } from "../client-lKVF_Elo.js";
 export { ShareClient, SharedReviewStore, exportShare, sharedReviewId, validateShareBundle, verifyShareRepository };

package/dist/{src-DsM3jO8G.js → src-BiWNbcF_.js}

@@ -177,6 +177,12 @@ z.union([StructuralDiffEventSchema, ReviewStructuralDiffErrorSchema]);
 const REVIEW_CLIENT_HEADER = "x-review-client";
 const REVIEW_CLIENT_REMOTE = "remote";
 const REVIEW_HOST_HEADER = "x-review-host";
+const PULL_REQUEST_STATES = [
+	"open",
+	"draft",
+	"merged",
+	"closed"
+];
 const requiredString$1 = z.string({ error: "must be a string" }).refine((value) => value.trim().length > 0, "must be a string");
 const stringAllowEmpty = z.string({ error: "must be a string" });
 const positiveInteger = z.number({ error: "must be a positive integer" }).int("must be a positive integer").positive("must be a positive integer");
@@ -405,9 +411,38 @@ const ReviewStackLayerSchema = z.strictObject({
 		"earlier",
 		"current",
 		"later"
-	])
+	]),
+	/** The layer's PR state, as last read from GitHub. */
+	pullRequestState: z.enum(PULL_REQUEST_STATES).optional()
+});
+z.strictObject({
+	/** Bottom first. */
+	layers: z.array(ReviewStackLayerSchema),
+	/** The branch the stack sits on, as `main`. */
+	base: requiredString$1.optional()
+});
+const ReviewPlaceBoardSchema = z.strictObject({
+	reviewId: requiredString$1,
+	title: stringAllowEmpty,
+	icon: z.enum(["board", "code"])
+});
+const ReviewPlaceSiblingSchema = ReviewPlaceBoardSchema.extend({
+	pullRequestNumber: positiveInteger.optional(),
+	pullRequestState: z.enum(PULL_REQUEST_STATES).optional()
+});
+z.strictObject({
+	/** The board's PR state and branches, as last read from GitHub. */
+	pullRequestState: z.enum(PULL_REQUEST_STATES).optional(),
+	baseBranch: requiredString$1.optional(),
+	headBranch: requiredString$1.optional(),
+	/** The board itself. */
+	board: ReviewPlaceBoardSchema.optional(),
+	parent: ReviewPlaceBoardSchema.optional(),
+	/** Empty for a top-level board. */
+	siblings: z.array(ReviewPlaceSiblingSchema),
+	/** A top-level board's children in sibling order; absent for a child. */
+	children: z.array(ReviewPlaceSiblingSchema).optional()
 });
-z.strictObject({ layers: z.array(ReviewStackLayerSchema) });
 const ReviewCliInstallTargetSchema = z.enum([
 	"claude",
 	"codex",
@@ -673,13 +708,7 @@ const revealArgsSchema = z.strictObject({
 		path: ["endLine"]
 	});
 });
-/** The one scratchpad's fixed review id. */
-const SCRATCHPAD_REVIEW_ID = "scratchpad";
-const apiReviewIdSchema = z.union([
-	z.uuid(),
-	z.string().regex(/^shared-[a-f0-9]{64}$/),
-	z.literal(SCRATCHPAD_REVIEW_ID)
-]);
+const apiReviewIdSchema = z.union([z.uuid(), z.string().regex(/^shared-[a-f0-9]{64}$/)]);
 const ReviewVerbRequestSchema = z.discriminatedUnion("name", [
 	z.strictObject({
 		name: z.literal("authoringCapabilities"),
@@ -727,7 +756,9 @@ const ReviewVerbRequestSchema = z.discriminatedUnion("name", [
 		name: z.literal("openReview"),
 		args: z.strictObject({
 			reviewUuid: apiReviewIdSchema,
-			active: z.boolean()
+			active: z.boolean(),
+			/** Block to scroll to after opening. */
+			blockId: requiredString$1.optional()
 		})
 	}),
 	z.strictObject({
@@ -797,7 +828,38 @@ z.discriminatedUnion("event", [
 	}),
 	z.strictObject({
 		event: z.literal("showReviewView"),
-		view: reviewViewSchema
+		view: reviewViewSchema,
+		/** The board to switch, from its sidebar; else the one asking. */
+		reviewId: requiredString$1.optional()
+	}),
+	z.strictObject({
+		event: z.literal("revealBlock"),
+		reviewId: requiredString$1,
+		blockId: requiredString$1
+	}),
+	z.strictObject({
+		event: z.literal("selectLens"),
+		reviewId: requiredString$1,
+		lensId: requiredString$1.nullable()
+	}),
+	z.strictObject({
+		event: z.literal("markLens"),
+		reviewId: requiredString$1,
+		lensId: requiredString$1
+	}),
+	z.strictObject({
+		event: z.literal("pickCommit"),
+		reviewId: requiredString$1,
+		commit: requiredString$1.nullable()
+	}),
+	z.strictObject({
+		event: z.literal("openAskThread"),
+		reviewId: requiredString$1,
+		threadId: requiredString$1
+	}),
+	z.strictObject({
+		event: z.literal("toggleAskColumn"),
+		reviewId: requiredString$1
 	})
 ]);
 z.discriminatedUnion("ok", [z.strictObject({
@@ -1005,6 +1067,21 @@ function parseReviewBugReportResponse(value) {
 	return ReviewBugReportResponseSchema.parse(value);
 }
 //#endregion
+//#region ../review-protocol/src/board-icons.ts
+/** A board has code attached when its target is commits, a PR or a working
+* tree, even one with nothing to compare. A plan's target is its project. */
+const boardIconKind = (target) => target && target.kind !== "project" ? "code" : "board";
+/** What a board with no title is called wherever its title shows. */
+const UNTITLED_BOARD = "Untitled";
+/**
+* A board's title as every surface shows it. A person's new board keeps an
+* empty title until they name it; it reads "Untitled" everywhere. A title
+* someone typed, "Untitled" included, shows as typed.
+*/
+function boardTitle(title) {
+	return title?.trim() ? title : UNTITLED_BOARD;
+}
+//#endregion
 //#region ../review-protocol/src/index.ts
 function parseReviewDesktopDiscovery(value) {
 	return parseZod(ReviewDesktopDiscoverySchema, value);
@@ -1039,4 +1116,4 @@ function formatIssuePath(path) {
 	return output;
 }
 //#endregion
-export { ReviewSelectedDiffSchema as A, ReviewApiSelectionSourceSchema as C, ReviewFeedbackSchema as D, ReviewFeedbackContactSchema as E, reviewDiffrSummarizerInputSchema as M, decodeStructuralDiffEvent as N, ReviewGatewayHostSchema as O, structuralChangeCounts as P, REVIEW_THEME_CHOICES as S, ReviewConnectRequestSchema as T, REVIEW_REMOTE_AGENT_IDS as _, parseReviewVerbRequest as a, REVIEW_REMOTE_INSTALL_LOCK as b, ReviewBugReportMetaV2Schema as c, REVIEW_CLIENT_HEADER as d, REVIEW_CLIENT_REMOTE as f, REVIEW_HOST_HEADER as g, REVIEW_DIFF_LAYOUT_SCOPES as h, parseReviewDesktopVerbResult as i, SCRATCHPAD_REVIEW_ID as j, ReviewOnboardingRunRequestSchema as k, ReviewBugReportRequestSchema as l, REVIEW_DIFF_LAYOUTS as m, parseReviewDesktopDiscovery as n, parseReviewVerbResponse as o, REVIEW_CLI_INSTALL_TARGET_LABELS as p, parseReviewDesktopVerbFrame as r, parseZod as s, parseReviewCliInstallApplyRequest as t, parseReviewBugReportResponse as u, REVIEW_REMOTE_ATTACH_BEGIN as v, ReviewCliInstallStampSchema as w, REVIEW_REMOTE_WRAPPER_MARK as x, REVIEW_REMOTE_ATTACH_END as y };
+export { ReviewGatewayHostSchema as A, REVIEW_REMOTE_WRAPPER_MARK as C, ReviewConnectRequestSchema as D, ReviewCliInstallStampSchema as E, structuralChangeCounts as F, ReviewSelectedDiffSchema as M, reviewDiffrSummarizerInputSchema as N, ReviewFeedbackContactSchema as O, decodeStructuralDiffEvent as P, REVIEW_REMOTE_INSTALL_LOCK as S, ReviewApiSelectionSourceSchema as T, REVIEW_DIFF_LAYOUT_SCOPES as _, parseReviewVerbRequest as a, REVIEW_REMOTE_ATTACH_BEGIN as b, boardIconKind as c, ReviewBugReportRequestSchema as d, parseReviewBugReportResponse as f, REVIEW_DIFF_LAYOUTS as g, REVIEW_CLI_INSTALL_TARGET_LABELS as h, parseReviewDesktopVerbResult as i, ReviewOnboardingRunRequestSchema as j, ReviewFeedbackSchema as k, boardTitle as l, REVIEW_CLIENT_REMOTE as m, parseReviewDesktopDiscovery as n, parseReviewVerbResponse as o, REVIEW_CLIENT_HEADER as p, parseReviewDesktopVerbFrame as r, parseZod as s, parseReviewCliInstallApplyRequest as t, ReviewBugReportMetaV2Schema as u, REVIEW_HOST_HEADER as v, REVIEW_THEME_CHOICES as w, REVIEW_REMOTE_ATTACH_END as x, REVIEW_REMOTE_AGENT_IDS as y };

package/dist/{src-BMPuxWv4.js → src-WPaQn75m.js}

@@ -684,22 +684,179 @@ var import_lib = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((export
 	}
 	module.exports = gitUrlParse;
 })))(), 1);
+/** A quick query: a ref, a config value, a status. */
+const QUICK_TIMEOUT_MS = 3e4;
+/** A read that grows with the repository or a file in it, or a jj call. */
+const LARGE_READ_TIMEOUT_MS = 3e5;
+/** Talking to a remote. */
+const NETWORK_TIMEOUT_MS = 6e5;
+const NETWORK_COMMANDS = /* @__PURE__ */ new Set([
+	"fetch",
+	"clone",
+	"pull",
+	"push"
+]);
+const LARGE_READS = /* @__PURE__ */ new Set([
+	"archive",
+	"blame",
+	"cat-file",
+	"diff",
+	"diff-tree",
+	"format-patch",
+	"grep",
+	"log",
+	"ls-files",
+	"ls-tree",
+	"rev-list",
+	"show"
+]);
+/** The subcommand, past git's global options and their values. */
+function subcommand(args) {
+	for (let i = 0; i < args.length; i++) {
+		const arg = args[i];
+		if ([
+			"-C",
+			"-c",
+			"--git-dir",
+			"--work-tree",
+			"-R"
+		].includes(arg)) i++;
+		else if (!arg.startsWith("-")) return arg;
+	}
+}
+/** How long a call may run when its caller doesn't say. */
+function defaultVcsTimeout(tool, args) {
+	const command = subcommand(args);
+	if (command && NETWORK_COMMANDS.has(command)) return NETWORK_TIMEOUT_MS;
+	if (tool === "jj" || command && LARGE_READS.has(command)) return LARGE_READ_TIMEOUT_MS;
+	return QUICK_TIMEOUT_MS;
+}
+const COMMIT_ID = /^(?:[a-f0-9]{40}|[a-f0-9]{64})$/;
+/** Thrown before anything runs when an operand could be misread. */
+var VcsOperandError = class extends Error {};
+function refused(kind, value) {
+	throw new VcsOperandError(`Refusing ${kind} ${JSON.stringify(value)}.`);
+}
+/** Whether a value could be read as an option, or carries a control
+* character or a line break. */
+const unsafe = (value) => !value || value.startsWith("-") || /[\0-\x1f\x7f]/.test(value);
+const unsafeRef = (value) => unsafe(value) || /[\s:~^?*[\\]|\.\.|@\{/.test(value);
+function checkRefSide(value) {
+	if (!COMMIT_ID.test(value) && unsafeRef(value)) refused("ref", value);
+}
+/** Operands are objects; flags written in the code are strings. */
+const isOperand = (arg) => Object(arg) === arg;
+/** The arguments as the process gets them: operands checked, so none can
+* be read as an option, and paths after `--`. (`--end-of-options` would say
+* the same to git, but older gits refuse it in some commands.) */
+function renderVcsArgs(args) {
+	const out = [];
+	let paths = false;
+	for (const arg of args) {
+		if (!isOperand(arg)) {
+			if (arg === "--") paths = true;
+			out.push(arg);
+			continue;
+		}
+		if ("path" in arg) {
+			if (!arg.path || /\0/.test(arg.path)) refused("path", arg.path);
+			if (!paths) {
+				out.push("--");
+				paths = true;
+			}
+			out.push(arg.path);
+			continue;
+		}
+		let rendered;
+		if ("commit" in arg) {
+			if (!COMMIT_ID.test(arg.commit)) refused("commit", arg.commit);
+			rendered = arg.commit;
+		} else if ("rev" in arg) {
+			if (unsafe(arg.rev)) refused("revision", arg.rev);
+			rendered = arg.rev;
+		} else if ("ref" in arg) {
+			if (unsafeRef(arg.ref)) refused("ref", arg.ref);
+			rendered = arg.ref;
+		} else if ("refspec" in arg) {
+			checkRefSide(arg.refspec.from);
+			checkRefSide(arg.refspec.to);
+			rendered = `${arg.refspec.force ? "+" : ""}${arg.refspec.from}:${arg.refspec.to}`;
+		} else if ("remote" in arg) {
+			if (unsafe(arg.remote) || /\s/.test(arg.remote)) refused("remote", arg.remote);
+			rendered = arg.remote;
+		} else {
+			if (unsafe(arg.value)) refused("value", arg.value);
+			rendered = arg.value;
+		}
+		out.push(rendered);
+	}
+	return out;
+}
+const LOCAL_GIT_ENV_KEYS = [
+	"GIT_ALTERNATE_OBJECT_DIRECTORIES",
+	"GIT_COMMON_DIR",
+	"GIT_CONFIG",
+	"GIT_CONFIG_COUNT",
+	"GIT_CONFIG_PARAMETERS",
+	"GIT_DIR",
+	"GIT_GRAFT_FILE",
+	"GIT_IMPLICIT_WORK_TREE",
+	"GIT_INDEX_FILE",
+	"GIT_INTERNAL_SUPER_PREFIX",
+	"GIT_NO_REPLACE_OBJECTS",
+	"GIT_OBJECT_DIRECTORY",
+	"GIT_PREFIX",
+	"GIT_QUARANTINE_PATH",
+	"GIT_REPLACE_REF_BASE",
+	"GIT_SHALLOW_FILE",
+	"GIT_WORK_TREE"
+];
+/** The process environment without the variables that would redirect git
+* to another repository's objects, index or work tree. */
+function localGitEnvironment() {
+	const env = { ...process.env };
+	for (const key of LOCAL_GIT_ENV_KEYS) delete env[key];
+	return env;
+}
+/** The environment a version-control process runs with. A git call that
+* names its repository (`-C`, `--git-dir`) and brings no environment of its
+* own drops the variables that would redirect it to another. */
+function vcsEnvironment(tool, args, env) {
+	const next = { ...env ?? (tool === "git" && (args[0] === "-C" || args[0] === "--git-dir") ? localGitEnvironment() : process.env) };
+	if (!args.some((arg) => [
+		"fetch",
+		"clone",
+		"pull",
+		"push"
+	].includes(arg))) next.GIT_NO_LAZY_FETCH = "1";
+	next.GIT_TERMINAL_PROMPT = "0";
+	next.GH_PROMPT_DISABLED = "1";
+	return next;
+}
 let observer = null;
 function setLocalVcsCommandObserver(next) {
 	observer = next;
 }
 const execFilePromise = promisify(execFile);
-async function execFileAsync(file, args, options = {}) {
+async function runVcs(tool, vcsArgs, { input, ...options } = {}) {
+	const args = renderVcsArgs(vcsArgs);
 	const finish = observer?.start({
-		file,
+		tool,
 		args,
 		cwd: options.cwd === void 0 ? void 0 : String(options.cwd)
 	});
 	try {
-		const result = await execFilePromise(file, args, {
+		const running = execFilePromise(tool, args, {
 			...options,
+			env: vcsEnvironment(tool, args, options.env),
+			timeout: options.timeout ?? defaultVcsTimeout(tool, args),
 			encoding: options.encoding ?? "utf8"
 		});
+		if (input !== void 0) {
+			running.child.stdin?.on("error", () => {});
+			running.child.stdin?.end(input);
+		}
+		const result = await running;
 		finish?.({ ok: true });
 		return {
 			stdout: String(result.stdout),
@@ -710,14 +867,19 @@ async function execFileAsync(file, args, options = {}) {
 		throw error;
 	}
 }
-function execFileSyncObserved(file, args, options) {
+function runVcsSync(tool, vcsArgs, options) {
+	const args = renderVcsArgs(vcsArgs);
 	const finish = observer?.start({
-		file,
+		tool,
 		args,
 		cwd: options.cwd === void 0 ? void 0 : String(options.cwd)
 	});
 	try {
-		const output = execFileSync(file, args, options);
+		const output = execFileSync(tool, args, {
+			...options,
+			env: vcsEnvironment(tool, args, options.env),
+			timeout: options.timeout ?? defaultVcsTimeout(tool, args)
+		});
 		finish?.({ ok: true });
 		return String(output);
 	} catch (error) {
@@ -726,14 +888,18 @@ function execFileSyncObserved(file, args, options) {
 	}
 }
 /** Long-lived child; the observer sees one spawn, completed once the process is up. */
-function spawnObserved(file, args, options) {
+function spawnObserved(tool, vcsArgs, options) {
+	const args = renderVcsArgs(vcsArgs);
 	const finish = observer?.start({
-		file,
+		tool,
 		args,
 		cwd: options.cwd === void 0 ? void 0 : String(options.cwd)
 	});
 	try {
-		const child = spawn(file, args, options);
+		const child = spawn(tool, args, {
+			...options,
+			env: vcsEnvironment(tool, args, options.env)
+		});
 		let finished = false;
 		const complete = (ok) => {
 			if (finished) return;
@@ -1013,25 +1179,6 @@ function normalizeEntry(entry) {
 }
 //#endregion
 //#region ../local-vcs/src/vcs.ts
-const LOCAL_GIT_ENV_KEYS = [
-	"GIT_ALTERNATE_OBJECT_DIRECTORIES",
-	"GIT_COMMON_DIR",
-	"GIT_CONFIG",
-	"GIT_CONFIG_COUNT",
-	"GIT_CONFIG_PARAMETERS",
-	"GIT_DIR",
-	"GIT_GRAFT_FILE",
-	"GIT_IMPLICIT_WORK_TREE",
-	"GIT_INDEX_FILE",
-	"GIT_INTERNAL_SUPER_PREFIX",
-	"GIT_NO_REPLACE_OBJECTS",
-	"GIT_OBJECT_DIRECTORY",
-	"GIT_PREFIX",
-	"GIT_QUARANTINE_PATH",
-	"GIT_REPLACE_REF_BASE",
-	"GIT_SHALLOW_FILE",
-	"GIT_WORK_TREE"
-];
 /** Neither git nor jj could be started, so no folder can be recognized as a repository. */
 var LocalVcsToolsMissingError = class extends Error {
 	constructor() {
@@ -1188,7 +1335,7 @@ async function gitArgs(rootPath, args) {
 /** Run git against the repo's shared git dir, optionally tolerating failure. */
 async function git(rootPath, args, options = {}) {
 	try {
-		const { stdout, stderr } = await execFileAsync("git", await gitArgs(rootPath, args), {
+		const { stdout, stderr } = await runVcs("git", await gitArgs(rootPath, args), {
 			maxBuffer: 67108864,
 			signal: options.signal
 		});
@@ -1216,7 +1363,7 @@ async function git(rootPath, args, options = {}) {
 */
 async function gitAt(cwd, args, options = {}) {
 	try {
-		const { stdout, stderr } = await execFileAsync("git", [
+		const { stdout, stderr } = await runVcs("git", [
 			"-C",
 			cwd,
 			...args
@@ -1302,10 +1449,10 @@ function createLocalVcs(kind, rootPath) {
 async function jjRevisionIsConflicted(rootPath, revision) {
 	if ((await detectLocalVcs(rootPath))?.kind !== "jj") return null;
 	try {
-		const { stdout } = await execFileAsync("jj", [
+		const { stdout } = await runVcs("jj", [
 			"log",
 			"-r",
-			revision,
+			{ rev: revision },
 			"--no-graph",
 			"-T",
 			"if(conflict, \"true\", \"false\")",
@@ -1364,7 +1511,7 @@ async function listTrackedFilesAtCommit(input) {
 			"list",
 			"--ignore-working-copy",
 			"-r",
-			input.commit
+			{ rev: input.commit }
 		], { cwd: input.rootPath }).catch(() => null);
 		if (output !== null) return splitLines(output);
 		if (!await canUseGitFallback(input.rootPath, input.kind)) return [];
@@ -1376,7 +1523,7 @@ async function listTrackedFilesAtCommit(input) {
 		"-r",
 		"-z",
 		"--name-only",
-		input.commit
+		{ rev: input.commit }
 	], { cwd: input.rootPath }).catch(() => null);
 	return output === null ? [] : output.split("\0").filter(Boolean);
 }
@@ -1401,7 +1548,7 @@ function listTrackedFilesForKind(input) {
 		"-r",
 		"-z",
 		"--name-only",
-		input.ref
+		{ rev: input.ref }
 	], { cwd: input.rootPath }) : commandOutputSync("git", [
 		"-C",
 		input.rootPath,
@@ -1442,7 +1589,7 @@ async function readJjFileAtCommit(input) {
 		"file",
 		"show",
 		"-r",
-		input.commit,
+		{ rev: input.commit },
 		"--ignore-working-copy",
 		"--",
 		toJjRootFilePattern(input.relativePath)
@@ -1518,7 +1665,7 @@ async function withWorkingTreeIndex(input, read) {
 			env.GIT_WORK_TREE = input.rootPath;
 		}
 		await fs.promises.mkdir(path.join(scratch, "objects"));
-		const git = (args) => execFileAsync("git", [
+		const git = (args) => runVcs("git", [
 			"-c",
 			"core.splitIndex=false",
 			"-C",
@@ -1530,7 +1677,7 @@ async function withWorkingTreeIndex(input, read) {
 			maxBuffer: 33554432
 		});
 		if (input.kind === "git") {
-			const index = (await execFileAsync("git", [
+			const index = (await runVcs("git", [
 				"-C",
 				input.rootPath,
 				"rev-parse",
@@ -1600,7 +1747,7 @@ async function listCommitRange(input) {
 	const vcs = await knownOrDetectedVcs(input.rootPath, input.kind);
 	if (!vcs) throw new Error(`No Git or jj repository found for ${input.rootPath}.`);
 	try {
-		const { stdout } = await execFileAsync("git", [
+		const { stdout } = await runVcs("git", [
 			"-C",
 			vcs.rootPath,
 			"log",
@@ -1608,7 +1755,7 @@ async function listCommitRange(input) {
 			"--format=%H%x00%P%x00%an%x00%aI%x00%s%x00",
 			"--numstat",
 			"-z",
-			`${input.baseRef}..${input.headRef}`
+			{ rev: `${input.baseRef}..${input.headRef}` }
 		], {
 			cwd: vcs.rootPath,
 			maxBuffer: 26214400
@@ -1668,7 +1815,7 @@ async function readJjCommitRange(rootPath, baseRef, headRef) {
 		"log",
 		"--no-graph",
 		"-r",
-		`::${headRef} ~ ::${baseRef}`,
+		{ rev: `::${headRef} ~ ::${baseRef}` },
 		"-T",
 		"commit_id ++ \"\\0\" ++ parents.map(|p| p.commit_id()).join(\" \") ++ \"\\0\" ++ author.name() ++ \"\\0\" ++ author.timestamp().format(\"%+\") ++ \"\\0\" ++ description.first_line() ++ \"\\0\"",
 		"--ignore-working-copy"
@@ -1841,7 +1988,7 @@ function toNameStatusEntries(summary) {
 	}))].sort((left, right) => left.path.localeCompare(right.path));
 }
 async function readGitDiffNameStatus(input) {
-	const refRange = input.mergeBase === false ? [input.baseRef, input.headRef] : [`${input.baseRef}...${input.headRef}`];
+	const refRange = input.mergeBase === false ? [{ rev: input.baseRef }, { rev: input.headRef }] : [{ rev: `${input.baseRef}...${input.headRef}` }];
 	return parseGitDiffNameStatus(await commandOutput("git", [
 		"-C",
 		input.rootPath,
@@ -1862,9 +2009,9 @@ async function readJjDiffNameStatus(input) {
 		"diff",
 		"--summary",
 		"--from",
-		input.baseRef,
+		{ rev: input.baseRef },
 		"--to",
-		input.headRef,
+		{ rev: input.headRef },
 		"--ignore-working-copy"
 	], {
 		cwd: input.rootPath,
@@ -1906,7 +2053,7 @@ async function resolveGitRevisionCommit(rootPath, revision) {
 		rootPath,
 		"rev-parse",
 		"--verify",
-		`${revision}^{commit}`
+		{ rev: `${revision}^{commit}` }
 	]);
 }
 function resolveGitRevisionCommitSync(rootPath, revision) {
@@ -1915,7 +2062,7 @@ function resolveGitRevisionCommitSync(rootPath, revision) {
 		rootPath,
 		"rev-parse",
 		"--verify",
-		`${revision}^{commit}`
+		{ rev: `${revision}^{commit}` }
 	]);
 }
 async function resolveJjRevisionCommit(rootPath, revision) {
@@ -1925,7 +2072,7 @@ async function resolveJjRevisionCommit(rootPath, revision) {
 		"log",
 		"--no-graph",
 		"-r",
-		revision,
+		{ rev: revision },
 		"-T",
 		"commit_id ++ \"\\n\"",
 		"--ignore-working-copy"
@@ -1938,7 +2085,7 @@ function resolveJjRevisionCommitSync(rootPath, revision) {
 		"log",
 		"--no-graph",
 		"-r",
-		revision,
+		{ rev: revision },
 		"-T",
 		"commit_id ++ \"\\n\"",
 		"--ignore-working-copy"
@@ -1955,8 +2102,8 @@ async function resolveGitMergeBase(rootPath, baseRef, headRef) {
 		"-C",
 		rootPath,
 		"merge-base",
-		baseRef,
-		headRef
+		{ rev: baseRef },
+		{ rev: headRef }
 	]);
 }
 async function resolveJjMergeBase(rootPath, baseRef, headRef) {
@@ -1966,7 +2113,7 @@ async function resolveJjMergeBase(rootPath, baseRef, headRef) {
 		"log",
 		"--no-graph",
 		"-r",
-		`heads(::${baseRef} & ::${headRef})`,
+		{ rev: `heads(::${baseRef} & ::${headRef})` },
 		"-T",
 		"commit_id ++ \"\n\"",
 		"--ignore-working-copy"
@@ -1979,7 +2126,7 @@ function readGitFileAtRevisionSync(input) {
 		"-C",
 		input.rootPath,
 		"show",
-		`${commit}:${input.relativePath}`
+		{ rev: `${commit}:${input.relativePath}` }
 	], {
 		maxBuffer: 10485760,
 		trim: false
@@ -1998,7 +2145,7 @@ function readJjFileAtRevisionSync(input) {
 		"file",
 		"show",
 		"-r",
-		input.ref,
+		{ rev: input.ref },
 		"--ignore-working-copy",
 		"--",
 		toJjRootFilePattern(input.relativePath)
@@ -2014,8 +2161,8 @@ function readJjFileAtRevisionSync(input) {
 }
 async function readGitDiff(input) {
 	const paths = input.literalPaths ? input.paths ?? [] : normalizeDiffPaths(input.paths);
-	const diffRefs = input.headRef ? input.mergeBase === false ? [input.baseRef, input.headRef] : [`${input.baseRef}...${input.headRef}`] : [input.baseRef];
-	const { stdout } = await execFileAsync("git", [
+	const diffRefs = input.headRef ? input.mergeBase === false ? [{ rev: input.baseRef }, { rev: input.headRef }] : [{ rev: `${input.baseRef}...${input.headRef}` }] : [{ rev: input.baseRef }];
+	const { stdout } = await runVcs("git", [
 		...input.literalPaths ? ["--literal-pathspecs"] : [],
 		"-C",
 		input.rootPath,
@@ -2038,8 +2185,8 @@ async function readGitDiff(input) {
 }
 async function readGitDiffFileSummaries(input) {
 	const paths = normalizeDiffPaths(input.paths);
-	const diffRefs = input.headRef ? input.mergeBase === false ? [input.baseRef, input.headRef] : [`${input.baseRef}...${input.headRef}`] : [input.baseRef];
-	const { stdout } = await execFileAsync("git", [
+	const diffRefs = input.headRef ? input.mergeBase === false ? [{ rev: input.baseRef }, { rev: input.headRef }] : [{ rev: `${input.baseRef}...${input.headRef}` }] : [{ rev: input.baseRef }];
+	const { stdout } = await runVcs("git", [
 		"-C",
 		input.rootPath,
 		"diff",
@@ -2062,7 +2209,7 @@ async function readGitDiffFileSummaries(input) {
 }
 async function readJjDiff(input) {
 	const paths = input.literalPaths ? input.paths ?? [] : normalizeDiffPaths(input.paths);
-	const { stdout } = await execFileAsync("jj", [
+	const { stdout } = await runVcs("jj", [
 		"-R",
 		input.rootPath,
 		"--color",
@@ -2294,18 +2441,16 @@ function commandOutputSync(command, args, options = {}) {
 	return runCommandOutputSync(command, args, options);
 }
 function runCommandOutput(command, args, options) {
-	return execFileAsync(command, args, {
+	return runVcs(command, args, {
 		cwd: options.cwd,
-		env: commandEnvironment(command, args),
 		maxBuffer: options.maxBuffer
 	}).then(({ stdout }) => options.trim === false ? stdout : stdout.trim());
 }
 function runCommandOutputSync(command, args, options) {
 	try {
-		const output = execFileSyncObserved(command, args, {
+		const output = runVcsSync(command, args, {
 			cwd: options.cwd,
 			encoding: "utf8",
-			env: commandEnvironment(command, args),
 			maxBuffer: options.maxBuffer,
 			stdio: [
 				"ignore",
@@ -2318,16 +2463,6 @@ function runCommandOutputSync(command, args, options) {
 		return null;
 	}
 }
-function commandEnvironment(command, args) {
-	if (command !== "git" || args[0] !== "-C" && args[0] !== "--git-dir") return;
-	return localGitEnvironment();
-}
-/** Drop per-repository git env vars that would redirect an explicit object store. */
-function localGitEnvironment() {
-	const env = { ...process.env };
-	for (const key of LOCAL_GIT_ENV_KEYS) delete env[key];
-	return env;
-}
 //#endregion
 //#region ../../node_modules/graceful-fs/polyfills.js
 var require_polyfills = /* @__PURE__ */ __commonJSMin(((exports, module) => {
@@ -3678,4 +3813,4 @@ var require_adapter = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports.checkSync = checkSync;
 })))();
 //#endregion
-export { setLocalVcsCommandObserver as C, __toESM as E, splitGitPatchFiles as S, __require as T, parseGitRemote as _, diff as a, resolveRepoContextSync as b, diffFileSummariesWorkingTree as c, git as d, gitAt as f, listTrackedFilesAtCommit as g, listCommitRange as h, detectLocalVcs as i, diffTrees as l, jjRevisionIsConflicted as m, createBlobBatchReader as n, diffFileSummaries as o, gitCommonDir as p, defaultBranch as r, diffFileSummariesTrees as s, LocalVcsToolsMissingError as t, diffWorkingTree as u, readFileAtCommit as v, __commonJSMin as w, resolveRevision as x, resolveRepoContext as y };
+export { __require as A, resolveRevision as C, runVcsSync as D, runVcs as E, setLocalVcsCommandObserver as O, resolveRepoContextSync as S, renderVcsArgs as T, listTrackedFilesAtCommit as _, diff as a, readFileAtCommit as b, diffFileSummariesWorkingTree as c, git as d, gitAt as f, listCommitRange as g, jjRevisionIsConflicted as h, detectLocalVcs as i, __toESM as j, __commonJSMin as k, diffTrees as l, gitCommonDirSync as m, createBlobBatchReader as n, diffFileSummaries as o, gitCommonDir as p, defaultBranch as r, diffFileSummariesTrees as s, LocalVcsToolsMissingError as t, diffWorkingTree as u, parseGitRemote as v, splitGitPatchFiles as w, resolveRepoContext as x, parseGitRemoteSlug as y };