vde-worktree 0.0.13 → 0.0.15

package/dist/index.mjs

@@ -1200,7 +1200,11 @@ const RESERVED_FZF_ARGS = new Set([
 	"height",
 	"border"
 ]);
+const ANSI_ESCAPE_SEQUENCE_PATTERN = String.raw`\u001B\[[0-?]*[ -/]*[@-~]`;
+const ANSI_ESCAPE_SEQUENCE_REGEX = new RegExp(ANSI_ESCAPE_SEQUENCE_PATTERN, "g");
 const sanitizeCandidate = (value) => value.replace(/[\r\n]+/g, " ").trim();
+const stripAnsi = (value) => value.replace(ANSI_ESCAPE_SEQUENCE_REGEX, "");
+const stripTrailingNewlines = (value) => value.replace(/[\r\n]+$/g, "");
 const buildFzfInput = (candidates) => {
 	return candidates.map((candidate) => sanitizeCandidate(candidate)).filter((candidate) => candidate.length > 0).join("\n");
 };
@@ -1256,14 +1260,14 @@ const selectPathWithFzf = async ({ candidates, prompt = "worktree> ", fzfExtraAr
 	});
 	const input = buildFzfInput(candidates);
 	if (input.length === 0) throw new Error("All candidates are empty after sanitization");
-	const candidateSet = new Set(input.split("\n"));
+	const candidateSet = new Set(input.split("\n").map((candidate) => stripAnsi(candidate)));
 	try {
-		const selectedPath = (await runFzf({
+		const selectedPath = stripAnsi(stripTrailingNewlines((await runFzf({
 			args,
 			input,
 			cwd,
 			env
-		})).stdout.trim();
+		})).stdout));
 		if (selectedPath.length === 0) return { status: "cancelled" };
 		if (!candidateSet.has(selectedPath)) throw new Error("fzf returned a value that is not in the candidate list");
 		return {
@@ -1436,9 +1440,9 @@ const colorizeListTableLine = ({ line, theme }) => {
 	const segments = line.split("│");
 	if (segments.length < 3) return line;
 	const cells = segments.slice(1, -1);
-	if (cells.length !== 5) return line;
+	if (cells.length !== 7) return line;
 	const headers = cells.map((cell) => cell.trim());
-	if (headers[0] === "branch" && headers[1] === "dirty" && headers[2] === "merged" && headers[3] === "locked" && headers[4] === "path") {
+	if (headers[0] === "branch" && headers[1] === "dirty" && headers[2] === "merged" && headers[3] === "locked" && headers[4] === "ahead" && headers[5] === "behind" && headers[6] === "path") {
 		const nextCells = cells.map((cell) => colorizeCellContent({
 			cell,
 			color: theme.header
@@ -1453,13 +1457,21 @@ const colorizeListTableLine = ({ line, theme }) => {
 	const dirtyCell = cells[1];
 	const mergedCell = cells[2];
 	const lockedCell = cells[3];
-	const pathCell = cells[4];
+	const aheadCell = cells[4];
+	const behindCell = cells[5];
+	const pathCell = cells[6];
 	const branchColor = branchCell.includes("(detached)") === true ? theme.branchDetached : branchCell.trimStart().startsWith("*") ? theme.branchCurrent : theme.branch;
 	const dirtyTrimmed = dirtyCell.trim();
 	const dirtyColor = dirtyTrimmed === "dirty" ? theme.dirty : dirtyTrimmed === "clean" ? theme.clean : theme.value;
 	const mergedTrimmed = mergedCell.trim();
 	const mergedColor = mergedTrimmed === "merged" ? theme.merged : mergedTrimmed === "unmerged" ? theme.unmerged : mergedTrimmed === "-" ? theme.base : theme.unknown;
 	const lockedColor = lockedCell.trim() === "locked" ? theme.locked : theme.muted;
+	const aheadTrimmed = aheadCell.trim();
+	const aheadValue = Number.parseInt(aheadTrimmed, 10);
+	const aheadColor = aheadTrimmed === "-" ? theme.muted : Number.isNaN(aheadValue) ? theme.value : aheadValue > 0 ? theme.unmerged : aheadValue === 0 ? theme.merged : theme.unknown;
+	const behindTrimmed = behindCell.trim();
+	const behindValue = Number.parseInt(behindTrimmed, 10);
+	const behindColor = behindTrimmed === "-" ? theme.muted : Number.isNaN(behindValue) ? theme.value : behindValue > 0 ? theme.unknown : behindValue === 0 ? theme.merged : theme.unknown;
 	const nextCells = [
 		colorizeCellContent({
 			cell: branchCell,
@@ -1477,6 +1489,14 @@ const colorizeListTableLine = ({ line, theme }) => {
 			cell: lockedCell,
 			color: lockedColor
 		}),
+		colorizeCellContent({
+			cell: aheadCell,
+			color: aheadColor
+		}),
+		colorizeCellContent({
+			cell: behindCell,
+			color: behindColor
+		}),
 		colorizeCellContent({
 			cell: pathCell,
 			color: theme.path
@@ -1505,7 +1525,7 @@ const commandHelpEntries = [
 		name: "list",
 		usage: "vw list [--json]",
 		summary: "List worktrees with status metadata.",
-		details: ["Includes branch, path, dirty, lock, merged, and upstream fields."]
+		details: ["Table output includes branch, path, dirty, lock, merged, and ahead/behind vs base branch.", "JSON output includes upstream metadata fields."]
 	},
 	{
 		name: "status",
@@ -2338,6 +2358,37 @@ const formatMergedColor = ({ mergedState, theme }) => {
 	if (normalized === "base") return theme.base(mergedState);
 	return theme.unknown(mergedState);
 };
+const formatListUpstreamCount = (value) => {
+	if (value === null) return "-";
+	return String(value);
+};
+const resolveAheadBehindAgainstBaseBranch = async ({ repoRoot, baseBranch, worktree }) => {
+	if (baseBranch === null) return {
+		ahead: null,
+		behind: null
+	};
+	const distance = await runGitCommand({
+		cwd: repoRoot,
+		args: [
+			"rev-list",
+			"--left-right",
+			"--count",
+			`${baseBranch}...${worktree.branch ?? worktree.head}`
+		],
+		reject: false
+	});
+	if (distance.exitCode !== 0) return {
+		ahead: null,
+		behind: null
+	};
+	const [behindRaw, aheadRaw] = distance.stdout.trim().split(/\s+/);
+	const behind = Number.parseInt(behindRaw ?? "", 10);
+	const ahead = Number.parseInt(aheadRaw ?? "", 10);
+	return {
+		ahead: Number.isNaN(ahead) ? null : ahead,
+		behind: Number.isNaN(behind) ? null : behind
+	};
+};
 const padToDisplayWidth = ({ value, width }) => {
 	const visibleLength = stringWidth(value);
 	if (visibleLength >= width) return value;
@@ -2906,17 +2957,26 @@ const createCli = (options = {}) => {
 						"dirty",
 						"merged",
 						"locked",
+						"ahead",
+						"behind",
 						"path"
-					], ...snapshot.worktrees.map((worktree) => {
+					], ...await Promise.all(snapshot.worktrees.map(async (worktree) => {
+						const distanceFromBase = await resolveAheadBehindAgainstBaseBranch({
+							repoRoot,
+							baseBranch: snapshot.baseBranch,
+							worktree
+						});
 						const mergedState = (worktree.branch !== null && snapshot.baseBranch !== null && worktree.branch === snapshot.baseBranch) === true ? "-" : worktree.merged.overall === true ? "merged" : worktree.merged.overall === false ? "unmerged" : "unknown";
 						return [
 							`${worktree.path === repoContext.currentWorktreeRoot ? "*" : " "} ${worktree.branch ?? "(detached)"}`,
 							worktree.dirty ? "dirty" : "clean",
 							mergedState,
 							worktree.locked.value ? "locked" : "-",
+							formatListUpstreamCount(distanceFromBase.ahead),
+							formatListUpstreamCount(distanceFromBase.behind),
 							formatDisplayPath(worktree.path)
 						];
-					})], {
+					}))], {
 						border: getBorderCharacters("norc"),
 						drawHorizontalLine: (lineIndex, rowCount) => {
 							return lineIndex === 0 || lineIndex === 1 || lineIndex === rowCount;