vde-worktree 0.0.16 → 0.0.17

package/README.ja.md

@@ -22,7 +22,7 @@
 - Node.js 22+
 - pnpm 10+
 - `fzf`（`cd` に必須）
-- `gh`（PR merged 判定に任意）
+- `gh`（PR 状態判定に任意）
 
 ## インストール / ビルド
 
@@ -111,7 +111,7 @@ autoload -Uz compinit && compinit
 - `--verbose`: 詳細ログ
 - `--no-hooks`: 今回のみ hook 無効化（`--allow-unsafe` 必須）
 - `--allow-unsafe`: unsafe 操作の明示同意
-- `--no-gh`: 今回の実行で `gh` による PR merged 判定を無効化
+- `--no-gh`: 今回の実行で `gh` による PR 状態判定を無効化
 - `--hook-timeout-ms <ms>`: hook timeout 上書き
 - `--lock-timeout-ms <ms>`: repo lock timeout 上書き
 
@@ -140,8 +140,8 @@ vw list --no-gh
 機能:
 
 - Git の porcelain 情報から worktree 一覧を取得
-- branch/path/dirty/lock/merged/upstream を表示
-- `--no-gh` 指定時は PR merged 判定をスキップ（`merged.byPR` は `null`）
+- branch/path/dirty/lock/merged/PR/upstream を表示
+- `--no-gh` 指定時は PR 状態判定をスキップ（`pr.status` は `unknown`、`merged.byPR` は `null`）
 - 対話ターミナルでは Catppuccin 風の ANSI 色で表示
 
 ### `status`
@@ -424,6 +424,7 @@ vw completion zsh --install
 - `merged.byAncestry`: ローカル履歴判定（`git merge-base --is-ancestor`）
 - `merged.byPR`: GitHub PR merged 判定（`gh`）
 - `merged.overall`: 最終判定
+- `pr.status`: PR 状態（`none` / `open` / `merged` / `closed_unmerged` / `unknown`）
 
 `overall` ポリシー:
 
@@ -436,7 +437,7 @@ vw completion zsh --install
 - `byPR === false` または lifecycle が明示的に未取り込みなら `overall = false`
 - それ以外は `overall = null`
 
-`byPR` が `null` になる例:
+`byPR` が `null` かつ `pr.status` が `unknown` になる例:
 
 - `gh` 未導入
 - `gh auth` 未設定

package/README.md

@@ -111,7 +111,7 @@ After `vw init`, the tool manages:
 - `--verbose`: verbose logging
 - `--no-hooks`: disable hooks for this run (requires `--allow-unsafe`)
 - `--allow-unsafe`: explicit unsafe override
-- `--no-gh`: disable GitHub CLI based PR merge checks for this run
+- `--no-gh`: disable GitHub CLI based PR status checks for this run
 - `--hook-timeout-ms <ms>`: hook timeout override
 - `--lock-timeout-ms <ms>`: repository lock timeout override
 
@@ -140,8 +140,8 @@ vw list --no-gh
 What it does:
 
 - Lists all worktrees from Git porcelain output
-- Includes metadata such as branch, path, dirty, lock, merged, and upstream status
-- With `--no-gh`, skips PR-based merge checks (`merged.byPR` becomes `null`)
+- Includes metadata such as branch, path, dirty, lock, merged, PR status, and upstream status
+- With `--no-gh`, skips PR status checks (`pr.status` becomes `unknown`, `merged.byPR` becomes `null`)
 - In interactive terminal, uses Catppuccin-style ANSI colors
 
 ### `status`
@@ -424,6 +424,7 @@ Each worktree reports:
 - `merged.byAncestry`: local ancestry check (`git merge-base --is-ancestor <branch> <baseBranch>`)
 - `merged.byPR`: PR-based merged check via GitHub CLI
 - `merged.overall`: final decision
+- `pr.status`: PR state (`none` / `open` / `merged` / `closed_unmerged` / `unknown`)
 
 Overall policy:
 
@@ -436,7 +437,7 @@ Overall policy:
 - `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`).
+`byPR` becomes `null` and `pr.status` becomes `unknown` when PR lookup is unavailable (for example: `gh` missing, auth missing, API error, `vde-worktree.enableGh=false`, or `--no-gh`).
 
 ## JSON Contract
 

package/completions/fish/vw.fish

@@ -68,6 +68,10 @@ const toFlag = (value) => {
   if (value === false) return "no"
   return "unknown"
 }
+const toPrStatus = (value) => {
+  if (typeof value !== "string" || value.length === 0) return "n/a"
+  return value
+}
 let payload
 try {
   payload = JSON.parse(fs.readFileSync(0, "utf8"))
@@ -78,10 +82,11 @@ const worktrees = Array.isArray(payload.worktrees) ? payload.worktrees : []
 for (const worktree of worktrees) {
   if (typeof worktree?.branch !== "string" || worktree.branch.length === 0) continue
   const merged = toFlag(worktree?.merged?.overall)
+  const pr = toPrStatus(worktree?.pr?.status)
   const dirty = worktree?.dirty === true ? "yes" : "no"
   const locked = worktree?.locked?.value === true ? "yes" : "no"
   const path = toDisplayPath(worktree?.path)
-  const summary = `merged=${merged} dirty=${dirty} locked=${locked}${path ? ` path=${path}` : ""}`
+  const summary = `merged=${merged} pr=${pr} dirty=${dirty} locked=${locked}${path ? ` path=${path}` : ""}`
   const sanitized = summary.replace(/[\t\r\n]+/g, " ").trim()
   process.stdout.write(`${worktree.branch}\t${sanitized}\n`)
 }
@@ -101,6 +106,10 @@ const toFlag = (value) => {
   if (value === false) return "no"
   return "unknown"
 }
+const toPrStatus = (value) => {
+  if (typeof value !== "string" || value.length === 0) return "n/a"
+  return value
+}
 let payload
 try {
   payload = JSON.parse(fs.readFileSync(0, "utf8"))
@@ -118,9 +127,10 @@ for (const worktree of worktrees) {
   const name = rel.split(path.sep).join("/")
   const branch = typeof worktree?.branch === "string" && worktree.branch.length > 0 ? worktree.branch : "(detached)"
   const merged = toFlag(worktree?.merged?.overall)
+  const pr = toPrStatus(worktree?.pr?.status)
   const dirty = worktree?.dirty === true ? "yes" : "no"
   const locked = worktree?.locked?.value === true ? "yes" : "no"
-  const summary = `branch=${branch} merged=${merged} dirty=${dirty} locked=${locked}`
+  const summary = `branch=${branch} merged=${merged} pr=${pr} dirty=${dirty} locked=${locked}`
   const sanitized = summary.replace(/[\t\r\n]+/g, " ").trim()
   process.stdout.write(`${name}\t${sanitized}\n`)
 }

package/completions/zsh/_vw

@@ -45,6 +45,10 @@ const toFlag = (value) => {
   if (value === false) return "no"
   return "unknown"
 }
+const toPrStatus = (value) => {
+  if (typeof value !== "string" || value.length === 0) return "n/a"
+  return value
+}
 let payload
 try {
   payload = JSON.parse(fs.readFileSync(0, "utf8"))
@@ -55,10 +59,11 @@ const worktrees = Array.isArray(payload.worktrees) ? payload.worktrees : []
 for (const worktree of worktrees) {
   if (typeof worktree?.branch !== "string" || worktree.branch.length === 0) continue
   const merged = toFlag(worktree?.merged?.overall)
+  const pr = toPrStatus(worktree?.pr?.status)
   const dirty = worktree?.dirty === true ? "yes" : "no"
   const locked = worktree?.locked?.value === true ? "yes" : "no"
   const path = toDisplayPath(worktree?.path)
-  const summary = `merged=${merged} dirty=${dirty} locked=${locked}${path ? ` path=${path}` : ""}`
+  const summary = `merged=${merged} pr=${pr} dirty=${dirty} locked=${locked}${path ? ` path=${path}` : ""}`
   const sanitized = summary.replace(/[\t\r\n]+/g, " ").trim()
   process.stdout.write(`${worktree.branch}\t${sanitized}\n`)
 }
@@ -78,6 +83,10 @@ const toFlag = (value) => {
   if (value === false) return "no"
   return "unknown"
 }
+const toPrStatus = (value) => {
+  if (typeof value !== "string" || value.length === 0) return "n/a"
+  return value
+}
 let payload
 try {
   payload = JSON.parse(fs.readFileSync(0, "utf8"))
@@ -95,9 +104,10 @@ for (const worktree of worktrees) {
   const name = rel.split(path.sep).join("/")
   const branch = typeof worktree?.branch === "string" && worktree.branch.length > 0 ? worktree.branch : "(detached)"
   const merged = toFlag(worktree?.merged?.overall)
+  const pr = toPrStatus(worktree?.pr?.status)
   const dirty = worktree?.dirty === true ? "yes" : "no"
   const locked = worktree?.locked?.value === true ? "yes" : "no"
-  const summary = `branch=${branch} merged=${merged} dirty=${dirty} locked=${locked}`
+  const summary = `branch=${branch} merged=${merged} pr=${pr} dirty=${dirty} locked=${locked}`
   const sanitized = summary.replace(/[\t\r\n]+/g, " ").trim()
   process.stdout.write(`${name}\t${sanitized}\n`)
 }

package/dist/index.mjs

@@ -853,43 +853,68 @@ const toTargetBranches = ({ branches, baseBranch }) => {
 	}
 	return [...uniqueBranches];
 };
-const buildUnknownBranchMap = (branches) => {
-	return new Map(branches.map((branch) => [branch, null]));
+const buildUnknownPrStatusMap = (branches) => {
+	return new Map(branches.map((branch) => [branch, "unknown"]));
 };
-const parseMergedBranches = ({ raw, targetBranches }) => {
+const parseUpdatedAtMillis = (value) => {
+	if (typeof value !== "string" || value.length === 0) return Number.NEGATIVE_INFINITY;
+	const parsed = Date.parse(value);
+	if (Number.isNaN(parsed)) return Number.NEGATIVE_INFINITY;
+	return parsed;
+};
+const toPrStatus = (record) => {
+	if (typeof record.mergedAt === "string" && record.mergedAt.length > 0) return "merged";
+	const state = typeof record.state === "string" ? record.state.toUpperCase() : "";
+	if (state === "MERGED") return "merged";
+	if (state === "OPEN") return "open";
+	if (state === "CLOSED") return "closed_unmerged";
+	return "unknown";
+};
+const parsePrStatusByBranch = ({ raw, targetBranches }) => {
 	try {
 		const parsed = JSON.parse(raw);
 		if (Array.isArray(parsed) !== true) return null;
+		const targetBranchSet = new Set(targetBranches);
 		const records = parsed;
-		const mergedBranches = /* @__PURE__ */ new Set();
-		for (const record of records) {
+		const latestByBranch = /* @__PURE__ */ new Map();
+		for (const [index, record] of records.entries()) {
 			if (typeof record?.headRefName !== "string" || record.headRefName.length === 0) continue;
-			if (targetBranches.has(record.headRefName) !== true) continue;
-			if (typeof record.mergedAt !== "string" || record.mergedAt.length === 0) continue;
-			mergedBranches.add(record.headRefName);
+			if (targetBranchSet.has(record.headRefName) !== true) continue;
+			const updatedAtMillis = parseUpdatedAtMillis(record.updatedAt);
+			const status = toPrStatus(record);
+			const current = latestByBranch.get(record.headRefName);
+			if (current === void 0 || updatedAtMillis > current.updatedAtMillis || updatedAtMillis === current.updatedAtMillis && index > current.index) latestByBranch.set(record.headRefName, {
+				updatedAtMillis,
+				index,
+				status
+			});
+		}
+		const result = /* @__PURE__ */ new Map();
+		for (const branch of targetBranches) {
+			const latest = latestByBranch.get(branch);
+			result.set(branch, latest?.status ?? "none");
 		}
-		return mergedBranches;
+		return result;
 	} catch {
 		return null;
 	}
 };
-const resolveMergedByPrBatch = async ({ repoRoot, baseBranch, branches, enabled = true, runGh = defaultRunGh }) => {
-	if (enabled !== true) return /* @__PURE__ */ new Map();
+const resolvePrStatusByBranchBatch = async ({ repoRoot, baseBranch, branches, enabled = true, runGh = defaultRunGh }) => {
 	if (baseBranch === null) return /* @__PURE__ */ new Map();
 	const targetBranches = toTargetBranches({
 		branches,
 		baseBranch
 	});
 	if (targetBranches.length === 0) return /* @__PURE__ */ new Map();
+	if (enabled !== true) return buildUnknownPrStatusMap(targetBranches);
 	try {
-		const targetBranchSet = new Set(targetBranches);
 		const result = await runGh({
 			cwd: repoRoot,
 			args: [
 				"pr",
 				"list",
 				"--state",
-				"merged",
+				"all",
 				"--base",
 				baseBranch,
 				"--search",
@@ -897,21 +922,19 @@ const resolveMergedByPrBatch = async ({ repoRoot, baseBranch, branches, enabled
 				"--limit",
 				"1000",
 				"--json",
-				"headRefName,mergedAt"
+				"headRefName,state,mergedAt,updatedAt"
 			]
 		});
-		if (result.exitCode !== 0) return buildUnknownBranchMap(targetBranches);
-		const mergedBranches = parseMergedBranches({
+		if (result.exitCode !== 0) return buildUnknownPrStatusMap(targetBranches);
+		const prStatusByBranch = parsePrStatusByBranch({
 			raw: result.stdout,
-			targetBranches: targetBranchSet
+			targetBranches
 		});
-		if (mergedBranches === null) return buildUnknownBranchMap(targetBranches);
-		return new Map(targetBranches.map((branch) => {
-			return [branch, mergedBranches.has(branch)];
-		}));
+		if (prStatusByBranch === null) return buildUnknownPrStatusMap(targetBranches);
+		return prStatusByBranch;
 	} catch (error) {
-		if (error.code === "ENOENT") return buildUnknownBranchMap(targetBranches);
-		return buildUnknownBranchMap(targetBranches);
+		if (error.code === "ENOENT") return buildUnknownPrStatusMap(targetBranches);
+		return buildUnknownPrStatusMap(targetBranches);
 	}
 };
 
@@ -1110,7 +1133,7 @@ const resolveLifecycleFromReflog = async ({ repoRoot, branch, baseBranch }) => {
 		divergedHead: latestWorkHead
 	};
 };
-const resolveMergedState = async ({ repoRoot, branch, head, baseBranch, mergedByPrByBranch }) => {
+const resolveMergedState = async ({ repoRoot, branch, head, baseBranch, prStatusByBranch }) => {
 	if (branch === null) return {
 		byAncestry: null,
 		byPR: null,
@@ -1131,7 +1154,10 @@ const resolveMergedState = async ({ repoRoot, branch, head, baseBranch, mergedBy
 		if (result.exitCode === 0) byAncestry = true;
 		else if (result.exitCode === 1) byAncestry = false;
 	}
-	const byPR = branch === baseBranch ? null : mergedByPrByBranch.get(branch) ?? null;
+	const prStatus = branch === baseBranch ? null : prStatusByBranch.get(branch) ?? null;
+	let byPR = null;
+	if (prStatus === "merged") byPR = true;
+	else if (prStatus === "none" || prStatus === "open" || prStatus === "closed_unmerged") byPR = false;
 	let byLifecycle = null;
 	if (baseBranch !== null) {
 		const lifecycle = await upsertWorktreeMergeLifecycle({
@@ -1182,6 +1208,10 @@ const resolveMergedState = async ({ repoRoot, branch, head, baseBranch, mergedBy
 		})
 	};
 };
+const resolvePrState = ({ branch, baseBranch, prStatusByBranch }) => {
+	if (branch === null || branch === baseBranch) return { status: null };
+	return { status: prStatusByBranch.get(branch) ?? null };
+};
 const resolveMergedOverall = ({ byAncestry, byPR, byLifecycle }) => {
 	if (byPR === true || byLifecycle === true) return true;
 	if (byAncestry === false) return false;
@@ -1228,7 +1258,7 @@ const resolveUpstreamState = async (worktreePath) => {
 		remote: upstreamRef.stdout.trim()
 	};
 };
-const enrichWorktree = async ({ repoRoot, worktree, baseBranch, mergedByPrByBranch }) => {
+const enrichWorktree = async ({ repoRoot, worktree, baseBranch, prStatusByBranch }) => {
 	const [dirty, locked, merged, upstream] = await Promise.all([
 		resolveDirty(worktree.path),
 		resolveLockState({
@@ -1240,10 +1270,15 @@ const enrichWorktree = async ({ repoRoot, worktree, baseBranch, mergedByPrByBran
 			branch: worktree.branch,
 			head: worktree.head,
 			baseBranch,
-			mergedByPrByBranch
+			prStatusByBranch
 		}),
 		resolveUpstreamState(worktree.path)
 	]);
+	const pr = resolvePrState({
+		branch: worktree.branch,
+		baseBranch,
+		prStatusByBranch
+	});
 	return {
 		branch: worktree.branch,
 		path: worktree.path,
@@ -1251,6 +1286,7 @@ const enrichWorktree = async ({ repoRoot, worktree, baseBranch, mergedByPrByBran
 		dirty,
 		locked,
 		merged,
+		pr,
 		upstream
 	};
 };
@@ -1260,7 +1296,7 @@ const collectWorktreeSnapshot = async (repoRoot, { noGh = false } = {}) => {
 		listGitWorktrees(repoRoot),
 		resolveEnableGh(repoRoot)
 	]);
-	const mergedByPrByBranch = await resolveMergedByPrBatch({
+	const prStatusByBranch = await resolvePrStatusByBranchBatch({
 		repoRoot,
 		baseBranch,
 		branches: worktrees.map((worktree) => worktree.branch),
@@ -1274,7 +1310,7 @@ const collectWorktreeSnapshot = async (repoRoot, { noGh = false } = {}) => {
 				repoRoot,
 				worktree,
 				baseBranch,
-				mergedByPrByBranch
+				prStatusByBranch
 			});
 		}))
 	};
@@ -1530,9 +1566,9 @@ const colorizeListTableLine = ({ line, theme }) => {
 	const segments = line.split("│");
 	if (segments.length < 3) return line;
 	const cells = segments.slice(1, -1);
-	if (cells.length !== 7) return line;
+	if (cells.length !== 8) return line;
 	const headers = cells.map((cell) => cell.trim());
-	if (headers[0] === "branch" && headers[1] === "dirty" && headers[2] === "merged" && headers[3] === "locked" && headers[4] === "ahead" && headers[5] === "behind" && headers[6] === "path") {
+	if (headers[0] === "branch" && headers[1] === "dirty" && headers[2] === "merged" && headers[3] === "pr" && headers[4] === "locked" && headers[5] === "ahead" && headers[6] === "behind" && headers[7] === "path") {
 		const nextCells = cells.map((cell) => colorizeCellContent({
 			cell,
 			color: theme.header
@@ -1546,15 +1582,18 @@ const colorizeListTableLine = ({ line, theme }) => {
 	const branchCell = cells[0];
 	const dirtyCell = cells[1];
 	const mergedCell = cells[2];
-	const lockedCell = cells[3];
-	const aheadCell = cells[4];
-	const behindCell = cells[5];
-	const pathCell = cells[6];
+	const prCell = cells[3];
+	const lockedCell = cells[4];
+	const aheadCell = cells[5];
+	const behindCell = cells[6];
+	const pathCell = cells[7];
 	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 prTrimmed = prCell.trim();
+	const prColor = prTrimmed === "merged" ? theme.merged : prTrimmed === "open" ? theme.value : prTrimmed === "closed_unmerged" ? theme.unmerged : prTrimmed === "none" ? theme.muted : prTrimmed === "-" ? theme.base : theme.unknown;
 	const lockedColor = lockedCell.trim() === "locked" ? theme.locked : theme.muted;
 	const aheadTrimmed = aheadCell.trim();
 	const aheadValue = Number.parseInt(aheadTrimmed, 10);
@@ -1575,6 +1614,10 @@ const colorizeListTableLine = ({ line, theme }) => {
 			cell: mergedCell,
 			color: mergedColor
 		}),
+		colorizeCellContent({
+			cell: prCell,
+			color: prColor
+		}),
 		colorizeCellContent({
 			cell: lockedCell,
 			color: lockedColor
@@ -1615,7 +1658,7 @@ const commandHelpEntries = [
 		name: "list",
 		usage: "vw list [--json]",
 		summary: "List worktrees with status metadata.",
-		details: ["Table output includes branch, path, dirty, lock, merged, and ahead/behind vs base branch.", "JSON output includes upstream metadata fields."]
+		details: ["Table output includes branch, path, dirty, lock, merged, PR state, and ahead/behind vs base branch.", "JSON output includes PR and upstream metadata fields."]
 	},
 	{
 		name: "status",
@@ -2432,6 +2475,11 @@ const formatMergedColor = ({ mergedState, theme }) => {
 	if (normalized === "base") return theme.base(mergedState);
 	return theme.unknown(mergedState);
 };
+const formatPrDisplayState = ({ prStatus, isBaseBranch }) => {
+	if (isBaseBranch || prStatus === null) return "-";
+	if (prStatus === "none" || prStatus === "open" || prStatus === "merged" || prStatus === "closed_unmerged" || prStatus === "unknown") return prStatus;
+	return "unknown";
+};
 const formatListUpstreamCount = (value) => {
 	if (value === null) return "-";
 	return String(value);
@@ -2593,7 +2641,7 @@ const renderGeneralHelpText = ({ version }) => {
 		"  --json                  Output machine-readable JSON.",
 		"  --verbose               Enable verbose logs.",
 		"  --no-hooks              Disable hooks for this run (requires --allow-unsafe).",
-		"  --no-gh                 Disable GitHub CLI based PR merge checks for this run.",
+		"  --no-gh                 Disable GitHub CLI based PR status checks for this run.",
 		"  --allow-unsafe          Explicitly allow unsafe behavior in non-TTY mode.",
 		"  --hook-timeout-ms <ms>  Override hook timeout.",
 		"  --lock-timeout-ms <ms>  Override repository lock timeout.",
@@ -2696,7 +2744,7 @@ const createCli = (options = {}) => {
 		},
 		gh: {
 			type: "boolean",
-			description: "Enable GitHub CLI based PR merge checks (disable with --no-gh)",
+			description: "Enable GitHub CLI based PR status checks (disable with --no-gh)",
 			default: true
 		},
 		allowUnsafe: {
@@ -3030,6 +3078,7 @@ const createCli = (options = {}) => {
 						"branch",
 						"dirty",
 						"merged",
+						"pr",
 						"locked",
 						"ahead",
 						"behind",
@@ -3040,11 +3089,17 @@ const createCli = (options = {}) => {
 							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";
+						const isBaseBranch = worktree.branch !== null && snapshot.baseBranch !== null && worktree.branch === snapshot.baseBranch;
+						const mergedState = isBaseBranch === true ? "-" : worktree.merged.overall === true ? "merged" : worktree.merged.overall === false ? "unmerged" : "unknown";
+						const prState = formatPrDisplayState({
+							prStatus: worktree.pr.status,
+							isBaseBranch
+						});
 						return [
 							`${worktree.path === repoContext.currentWorktreeRoot ? "*" : " "} ${worktree.branch ?? "(detached)"}`,
 							worktree.dirty ? "dirty" : "clean",
 							mergedState,
+							prState,
 							worktree.locked.value ? "locked" : "-",
 							formatListUpstreamCount(distanceFromBase.ahead),
 							formatListUpstreamCount(distanceFromBase.behind),