vde-worktree 0.0.14 → 0.0.16

package/README.ja.md

@@ -427,9 +427,14 @@ vw completion zsh --install
 
 `overall` ポリシー:
 
-- `byPR === true` -> `overall = true`
-- `byPR === false` -> `overall = false`
-- `byPR === null` -> `byAncestry` にフォールバック
+- `byPR === true` -> `overall = true`（squash/rebase merge を含む）
+- `byAncestry === false` -> `overall = false`
+- `byAncestry === true` の場合は、分岐の証跡があるときだけ merged 扱い
+  - `.vde/worktree/state/branches/*.json` の lifecycle 記録
+  - lifecycle がない場合の `git reflog` フォールバック
+- 分岐証跡が `baseBranch` に取り込まれていれば `overall = true`
+- `byPR === false` または lifecycle が明示的に未取り込みなら `overall = false`
+- それ以外は `overall = null`
 
 `byPR` が `null` になる例:
 

package/README.md

@@ -427,9 +427,14 @@ Each worktree reports:
 
 Overall policy:
 
-- `byPR === true` => `overall = true`
-- `byPR === false` => `overall = false`
-- `byPR === null` => fallback to `byAncestry`
+- `byPR === true` => `overall = true` (includes squash/rebase merges)
+- `byAncestry === false` => `overall = false`
+- when `byAncestry === true`, require divergence evidence before treating as merged
+  - lifecycle evidence from `.vde/worktree/state/branches/*.json`
+  - reflog fallback (`git reflog`) when lifecycle evidence is missing
+- if divergence evidence is contained in `baseBranch`, `overall = true`
+- `byPR === false` or explicit lifecycle "not merged" evidence => `overall = false`
+- otherwise `overall = null`
 
 `byPR` becomes `null` when PR lookup is unavailable (for example: `gh` missing, auth missing, API error, `vde-worktree.enableGh=false`, or `--no-gh`).
 

package/dist/index.mjs

@@ -617,7 +617,8 @@ const hasStateDirectory = async (repoRoot) => {
 const parseLifecycle = (content) => {
 	try {
 		const parsed = JSON.parse(content);
-		if (parsed.schemaVersion !== 1 || typeof parsed.branch !== "string" || typeof parsed.worktreeId !== "string" || typeof parsed.baseBranch !== "string" || typeof parsed.createdHead !== "string" || parsed.createdHead.length === 0 || typeof parsed.createdAt !== "string" || typeof parsed.updatedAt !== "string") return {
+		const isLastDivergedHeadValid = parsed.lastDivergedHead === null || typeof parsed.lastDivergedHead === "string" && parsed.lastDivergedHead.length > 0;
+		if (parsed.schemaVersion !== 2 || typeof parsed.branch !== "string" || typeof parsed.worktreeId !== "string" || typeof parsed.baseBranch !== "string" || typeof parsed.everDiverged !== "boolean" || isLastDivergedHeadValid !== true || typeof parsed.createdAt !== "string" || typeof parsed.updatedAt !== "string") return {
 			valid: false,
 			record: null
 		};
@@ -665,15 +666,17 @@ const readWorktreeMergeLifecycle = async ({ repoRoot, branch }) => {
 		};
 	}
 };
-const upsertWorktreeMergeLifecycle = async ({ repoRoot, branch, baseBranch, createdHead }) => {
+const upsertWorktreeMergeLifecycle = async ({ repoRoot, branch, baseBranch, observedDivergedHead }) => {
+	const normalizedObservedHead = typeof observedDivergedHead === "string" && observedDivergedHead.length > 0 ? observedDivergedHead : null;
 	if (await hasStateDirectory(repoRoot) !== true) {
 		const now = (/* @__PURE__ */ new Date()).toISOString();
 		return {
-			schemaVersion: 1,
+			schemaVersion: 2,
 			branch,
 			worktreeId: branchToWorktreeId(branch),
 			baseBranch,
-			createdHead,
+			everDiverged: normalizedObservedHead !== null,
+			lastDivergedHead: normalizedObservedHead,
 			createdAt: now,
 			updatedAt: now
 		};
@@ -682,14 +685,17 @@ const upsertWorktreeMergeLifecycle = async ({ repoRoot, branch, baseBranch, crea
 		repoRoot,
 		branch
 	});
-	if (current.valid && current.record !== null && current.record.baseBranch === baseBranch) return current.record;
+	if (current.valid && current.record !== null && current.record.baseBranch === baseBranch && normalizedObservedHead === null) return current.record;
 	const now = (/* @__PURE__ */ new Date()).toISOString();
+	const everDiverged = current.record?.everDiverged === true || normalizedObservedHead !== null;
+	const lastDivergedHead = normalizedObservedHead ?? current.record?.lastDivergedHead ?? null;
 	const next = {
-		schemaVersion: 1,
+		schemaVersion: 2,
 		branch,
 		worktreeId: branchToWorktreeId(branch),
 		baseBranch,
-		createdHead: current.record?.createdHead ?? createdHead,
+		everDiverged,
+		lastDivergedHead,
 		createdAt: current.record?.createdAt ?? now,
 		updatedAt: now
 	};
@@ -699,15 +705,17 @@ const upsertWorktreeMergeLifecycle = async ({ repoRoot, branch, baseBranch, crea
 	});
 	return next;
 };
-const moveWorktreeMergeLifecycle = async ({ repoRoot, fromBranch, toBranch, baseBranch, createdHead }) => {
+const moveWorktreeMergeLifecycle = async ({ repoRoot, fromBranch, toBranch, baseBranch, observedDivergedHead }) => {
+	const normalizedObservedHead = typeof observedDivergedHead === "string" && observedDivergedHead.length > 0 ? observedDivergedHead : null;
 	if (await hasStateDirectory(repoRoot) !== true) {
 		const now = (/* @__PURE__ */ new Date()).toISOString();
 		return {
-			schemaVersion: 1,
+			schemaVersion: 2,
 			branch: toBranch,
 			worktreeId: branchToWorktreeId(toBranch),
 			baseBranch,
-			createdHead,
+			everDiverged: normalizedObservedHead !== null,
+			lastDivergedHead: normalizedObservedHead,
 			createdAt: now,
 			updatedAt: now
 		};
@@ -718,12 +726,15 @@ const moveWorktreeMergeLifecycle = async ({ repoRoot, fromBranch, toBranch, base
 	});
 	const targetPath = lifecycleFilePath(repoRoot, toBranch);
 	const now = (/* @__PURE__ */ new Date()).toISOString();
+	const everDiverged = source.record?.everDiverged === true || normalizedObservedHead !== null;
+	const lastDivergedHead = normalizedObservedHead ?? source.record?.lastDivergedHead ?? null;
 	const next = {
-		schemaVersion: 1,
+		schemaVersion: 2,
 		branch: toBranch,
 		worktreeId: branchToWorktreeId(toBranch),
 		baseBranch,
-		createdHead: source.record?.createdHead ?? createdHead,
+		everDiverged,
+		lastDivergedHead,
 		createdAt: source.record?.createdAt ?? now,
 		updatedAt: now
 	};
@@ -1049,6 +1060,56 @@ const resolveLockState = async ({ repoRoot, branch }) => {
 		};
 	}
 };
+const WORK_REFLOG_MESSAGE_PATTERN = /^(commit(?: \([^)]*\))?|cherry-pick|revert|rebase \(pick\)|merge):/;
+const resolveLifecycleFromReflog = async ({ repoRoot, branch, baseBranch }) => {
+	const reflog = await runGitCommand({
+		cwd: repoRoot,
+		args: [
+			"reflog",
+			"show",
+			"--format=%H%x09%gs",
+			branch
+		],
+		reject: false
+	});
+	if (reflog.exitCode !== 0) return {
+		merged: null,
+		divergedHead: null
+	};
+	let latestWorkHead = null;
+	for (const line of reflog.stdout.split("\n")) {
+		const trimmed = line.trim();
+		if (trimmed.length === 0) continue;
+		const separatorIndex = trimmed.indexOf("	");
+		if (separatorIndex <= 0) continue;
+		const head = trimmed.slice(0, separatorIndex).trim();
+		const message = trimmed.slice(separatorIndex + 1).trim();
+		if (head.length === 0 || WORK_REFLOG_MESSAGE_PATTERN.test(message) !== true) continue;
+		if (latestWorkHead === null) latestWorkHead = head;
+		const result = await runGitCommand({
+			cwd: repoRoot,
+			args: [
+				"merge-base",
+				"--is-ancestor",
+				head,
+				baseBranch
+			],
+			reject: false
+		});
+		if (result.exitCode === 0) return {
+			merged: true,
+			divergedHead: head
+		};
+		if (result.exitCode !== 1) return {
+			merged: null,
+			divergedHead: latestWorkHead
+		};
+	}
+	return {
+		merged: false,
+		divergedHead: latestWorkHead
+	};
+};
 const resolveMergedState = async ({ repoRoot, branch, head, baseBranch, mergedByPrByBranch }) => {
 	if (branch === null) return {
 		byAncestry: null,
@@ -1077,10 +1138,39 @@ const resolveMergedState = async ({ repoRoot, branch, head, baseBranch, mergedBy
 			repoRoot,
 			branch,
 			baseBranch,
-			createdHead: head
+			observedDivergedHead: byAncestry === false ? head : null
 		});
-		if (byAncestry === true) byLifecycle = lifecycle.createdHead !== head;
-		else if (byAncestry === false) byLifecycle = false;
+		if (byAncestry === false) byLifecycle = false;
+		else if (byAncestry === true) if (lifecycle.everDiverged !== true || lifecycle.lastDivergedHead === null) if (byPR === true) byLifecycle = null;
+		else {
+			const probe = await resolveLifecycleFromReflog({
+				repoRoot,
+				branch,
+				baseBranch
+			});
+			byLifecycle = probe.merged;
+			if (probe.divergedHead !== null) await upsertWorktreeMergeLifecycle({
+				repoRoot,
+				branch,
+				baseBranch,
+				observedDivergedHead: probe.divergedHead
+			});
+		}
+		else {
+			const lifecycleResult = await runGitCommand({
+				cwd: repoRoot,
+				args: [
+					"merge-base",
+					"--is-ancestor",
+					lifecycle.lastDivergedHead,
+					baseBranch
+				],
+				reject: false
+			});
+			if (lifecycleResult.exitCode === 0) byLifecycle = true;
+			else if (lifecycleResult.exitCode === 1) byLifecycle = false;
+			else byLifecycle = null;
+		}
 	}
 	return {
 		byAncestry,
@@ -1440,9 +1530,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
@@ -1457,13 +1547,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,
@@ -1481,6 +1579,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
@@ -1509,7 +1615,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",
@@ -1881,22 +1987,6 @@ const resolveBaseBranch = async (repoRoot) => {
 	for (const candidate of ["main", "master"]) if (await doesGitRefExist(repoRoot, `refs/heads/${candidate}`)) return candidate;
 	throw createCliError("INVALID_ARGUMENT", { message: "Unable to resolve base branch. Configure vde-worktree.baseBranch." });
 };
-const resolveBranchHead = async ({ repoRoot, branch }) => {
-	const resolved = await runGitCommand({
-		cwd: repoRoot,
-		args: [
-			"rev-parse",
-			"--verify",
-			branch
-		],
-		reject: false
-	});
-	if (resolved.exitCode !== 0 || resolved.stdout.trim().length === 0) throw createCliError("INVALID_ARGUMENT", {
-		message: `Failed to resolve branch head: ${branch}`,
-		details: { branch }
-	});
-	return resolved.stdout.trim();
-};
 const ensureTargetPathWritable = async (targetPath) => {
 	try {
 		await access(targetPath, constants.F_OK);
@@ -2342,6 +2432,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;
@@ -2910,17 +3031,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;
@@ -3039,10 +3169,7 @@ const createCli = (options = {}) => {
 						repoRoot,
 						branch,
 						baseBranch,
-						createdHead: await resolveBranchHead({
-							repoRoot,
-							branch
-						})
+						observedDivergedHead: null
 					});
 					await runPostHook({
 						name: "new",
@@ -3077,18 +3204,12 @@ const createCli = (options = {}) => {
 					const snapshot = await collectWorktreeSnapshot$1(repoRoot);
 					const existing = snapshot.worktrees.find((worktree) => worktree.branch === branch);
 					if (existing !== void 0) {
-						if (snapshot.baseBranch !== null) {
-							const branchHead = await resolveBranchHead({
-								repoRoot,
-								branch
-							});
-							await upsertWorktreeMergeLifecycle({
-								repoRoot,
-								branch,
-								baseBranch: snapshot.baseBranch,
-								createdHead: branchHead
-							});
-						}
+						if (snapshot.baseBranch !== null) await upsertWorktreeMergeLifecycle({
+							repoRoot,
+							branch,
+							baseBranch: snapshot.baseBranch,
+							observedDivergedHead: null
+						});
 						return {
 							status: "existing",
 							branch,
@@ -3134,18 +3255,12 @@ const createCli = (options = {}) => {
 							]
 						});
 					}
-					if (lifecycleBaseBranch !== null) {
-						const branchHead = await resolveBranchHead({
-							repoRoot,
-							branch
-						});
-						await upsertWorktreeMergeLifecycle({
-							repoRoot,
-							branch,
-							baseBranch: lifecycleBaseBranch,
-							createdHead: branchHead
-						});
-					}
+					if (lifecycleBaseBranch !== null) await upsertWorktreeMergeLifecycle({
+						repoRoot,
+						branch,
+						baseBranch: lifecycleBaseBranch,
+						observedDivergedHead: null
+					});
 					await runPostHook({
 						name: "switch",
 						context: hookContext
@@ -3245,19 +3360,13 @@ const createCli = (options = {}) => {
 							newPath
 						]
 					});
-					if (snapshot.baseBranch !== null) {
-						const branchHead = await resolveBranchHead({
-							repoRoot,
-							branch: newBranch
-						});
-						await moveWorktreeMergeLifecycle({
-							repoRoot,
-							fromBranch: oldBranch,
-							toBranch: newBranch,
-							baseBranch: snapshot.baseBranch,
-							createdHead: branchHead
-						});
-					}
+					if (snapshot.baseBranch !== null) await moveWorktreeMergeLifecycle({
+						repoRoot,
+						fromBranch: oldBranch,
+						toBranch: newBranch,
+						baseBranch: snapshot.baseBranch,
+						observedDivergedHead: null
+					});
 					await runPostHook({
 						name: "mv",
 						context: hookContext
@@ -3526,10 +3635,7 @@ const createCli = (options = {}) => {
 							repoRoot,
 							branch,
 							baseBranch: lifecycleBaseBranch,
-							createdHead: await resolveBranchHead({
-								repoRoot,
-								branch
-							})
+							observedDivergedHead: null
 						});
 						await runPostHook({
 							name: "get",
@@ -3556,10 +3662,7 @@ const createCli = (options = {}) => {
 						repoRoot,
 						branch,
 						baseBranch: lifecycleBaseBranch,
-						createdHead: await resolveBranchHead({
-							repoRoot,
-							branch
-						})
+						observedDivergedHead: null
 					});
 					await runPostHook({
 						name: "get",
@@ -3671,10 +3774,7 @@ const createCli = (options = {}) => {
 						repoRoot,
 						branch,
 						baseBranch,
-						createdHead: await resolveBranchHead({
-							repoRoot,
-							branch
-						})
+						observedDivergedHead: null
 					});
 					if (stashOid !== null) {
 						if ((await runGitCommand({