vde-worktree 0.0.17 → 0.0.19

package/README.ja.md

@@ -135,12 +135,16 @@ vw init
 vw list
 vw list --json
 vw list --no-gh
+vw list --full-path
 ```
 
 機能:
 
 - Git の porcelain 情報から worktree 一覧を取得
 - branch/path/dirty/lock/merged/PR/upstream を表示
+- JSON メタデータには non-base branch ごとに `pr.status` と `pr.url` を含む
+- テーブル表示では長い `path` は端末幅に合わせて `…` で省略
+- `--full-path` でテーブル表示の path 省略を無効化
 - `--no-gh` 指定時は PR 状態判定をスキップ（`pr.status` は `unknown`、`merged.byPR` は `null`）
 - 対話ターミナルでは Catppuccin 風の ANSI 色で表示
 
@@ -425,6 +429,7 @@ vw completion zsh --install
 - `merged.byPR`: GitHub PR merged 判定（`gh`）
 - `merged.overall`: 最終判定
 - `pr.status`: PR 状態（`none` / `open` / `merged` / `closed_unmerged` / `unknown`）
+- `pr.url`: branch の最新 PR URL（取得不可時は `null`）
 
 `overall` ポリシー:
 

package/README.md

@@ -135,12 +135,16 @@ What it does:
 vw list
 vw list --json
 vw list --no-gh
+vw list --full-path
 ```
 
 What it does:
 
 - Lists all worktrees from Git porcelain output
 - Includes metadata such as branch, path, dirty, lock, merged, PR status, and upstream status
+- JSON metadata includes `pr.status` and `pr.url` for each non-base branch
+- In table output, long `path` values are truncated with `…` to fit terminal width by default
+- Use `--full-path` to disable path truncation in table output
 - With `--no-gh`, skips PR status checks (`pr.status` becomes `unknown`, `merged.byPR` becomes `null`)
 - In interactive terminal, uses Catppuccin-style ANSI colors
 
@@ -425,6 +429,7 @@ Each worktree reports:
 - `merged.byPR`: PR-based merged check via GitHub CLI
 - `merged.overall`: final decision
 - `pr.status`: PR state (`none` / `open` / `merged` / `closed_unmerged` / `unknown`)
+- `pr.url`: latest PR URL for the branch (`null` when unavailable)
 
 Overall policy:
 

package/completions/fish/vw.fish

@@ -189,6 +189,8 @@ for __vw_bin in vw vde-worktree
   complete -c $__vw_bin -l json -d "Output machine-readable JSON"
   complete -c $__vw_bin -l verbose -d "Enable verbose logs"
   complete -c $__vw_bin -l no-hooks -d "Disable hooks for this run (requires --allow-unsafe)"
+  complete -c $__vw_bin -l no-gh -d "Disable GitHub CLI based PR status checks for this run"
+  complete -c $__vw_bin -l full-path -d "Disable list table path truncation"
   complete -c $__vw_bin -l allow-unsafe -d "Explicit unsafe override in non-TTY mode"
   complete -c $__vw_bin -l strict-post-hooks -d "Fail when post hooks fail"
   complete -c $__vw_bin -l hook-timeout-ms -r -d "Override hook timeout"
@@ -200,6 +202,7 @@ for __vw_bin in vw vde-worktree
   complete -c $__vw_bin -n "__fish_seen_subcommand_from path" -a "(__vw_worktree_candidates_with_meta)"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from switch" -a "(__vw_worktree_candidates_with_meta)"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from del" -a "(__vw_worktree_candidates_with_meta)"
+  complete -c $__vw_bin -n "__fish_seen_subcommand_from list" -l full-path -d "Disable list table path truncation"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from get" -a "(__vw_remote_branches)"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from absorb" -a "(__vw_worktree_candidates_with_meta)"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from unabsorb" -a "(__vw_worktree_candidates_with_meta)"

package/completions/zsh/_vw

@@ -263,6 +263,8 @@ _vw() {
     "--json[Output machine-readable JSON]"
     "--verbose[Enable verbose logs]"
     "--no-hooks[Disable hooks for this run]"
+    "--no-gh[Disable GitHub CLI based PR status checks for this run]"
+    "--full-path[Disable list table path truncation]"
     "--allow-unsafe[Allow unsafe behavior in non-TTY mode]"
     "--strict-post-hooks[Fail when post hooks fail]"
     "--hook-timeout-ms[Override hook timeout]:ms:"
@@ -284,6 +286,10 @@ _vw() {
     arguments)
       local current_command="${line[1]:-${words[2]}}"
       case "${current_command}" in
+        list)
+          _arguments \
+            "--full-path[Disable list table path truncation]"
+          ;;
         status)
           _arguments \
             "1:branch:_vw_complete_worktree_branches_with_meta"

package/dist/index.mjs

@@ -853,8 +853,11 @@ const toTargetBranches = ({ branches, baseBranch }) => {
 	}
 	return [...uniqueBranches];
 };
-const buildUnknownPrStatusMap = (branches) => {
-	return new Map(branches.map((branch) => [branch, "unknown"]));
+const buildUnknownPrStateMap = (branches) => {
+	return new Map(branches.map((branch) => [branch, {
+		status: "unknown",
+		url: null
+	}]));
 };
 const parseUpdatedAtMillis = (value) => {
 	if (typeof value !== "string" || value.length === 0) return Number.NEGATIVE_INFINITY;
@@ -870,7 +873,11 @@ const toPrStatus = (record) => {
 	if (state === "CLOSED") return "closed_unmerged";
 	return "unknown";
 };
-const parsePrStatusByBranch = ({ raw, targetBranches }) => {
+const toPrUrl = (record) => {
+	if (typeof record.url === "string" && record.url.length > 0) return record.url;
+	return null;
+};
+const parsePrStateByBranch = ({ raw, targetBranches }) => {
 	try {
 		const parsed = JSON.parse(raw);
 		if (Array.isArray(parsed) !== true) return null;
@@ -882,31 +889,43 @@ const parsePrStatusByBranch = ({ raw, targetBranches }) => {
 			if (targetBranchSet.has(record.headRefName) !== true) continue;
 			const updatedAtMillis = parseUpdatedAtMillis(record.updatedAt);
 			const status = toPrStatus(record);
+			const url = toPrUrl(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
+				status,
+				url
 			});
 		}
 		const result = /* @__PURE__ */ new Map();
 		for (const branch of targetBranches) {
 			const latest = latestByBranch.get(branch);
-			result.set(branch, latest?.status ?? "none");
+			if (latest === void 0) {
+				result.set(branch, {
+					status: "none",
+					url: null
+				});
+				continue;
+			}
+			result.set(branch, {
+				status: latest.status,
+				url: latest.url
+			});
 		}
 		return result;
 	} catch {
 		return null;
 	}
 };
-const resolvePrStatusByBranchBatch = async ({ repoRoot, baseBranch, branches, enabled = true, runGh = defaultRunGh }) => {
+const resolvePrStateByBranchBatch = 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);
+	if (enabled !== true) return buildUnknownPrStateMap(targetBranches);
 	try {
 		const result = await runGh({
 			cwd: repoRoot,
@@ -922,19 +941,19 @@ const resolvePrStatusByBranchBatch = async ({ repoRoot, baseBranch, branches, en
 				"--limit",
 				"1000",
 				"--json",
-				"headRefName,state,mergedAt,updatedAt"
+				"headRefName,state,mergedAt,updatedAt,url"
 			]
 		});
-		if (result.exitCode !== 0) return buildUnknownPrStatusMap(targetBranches);
-		const prStatusByBranch = parsePrStatusByBranch({
+		if (result.exitCode !== 0) return buildUnknownPrStateMap(targetBranches);
+		const prStatusByBranch = parsePrStateByBranch({
 			raw: result.stdout,
 			targetBranches
 		});
-		if (prStatusByBranch === null) return buildUnknownPrStatusMap(targetBranches);
+		if (prStatusByBranch === null) return buildUnknownPrStateMap(targetBranches);
 		return prStatusByBranch;
 	} catch (error) {
-		if (error.code === "ENOENT") return buildUnknownPrStatusMap(targetBranches);
-		return buildUnknownPrStatusMap(targetBranches);
+		if (error.code === "ENOENT") return buildUnknownPrStateMap(targetBranches);
+		return buildUnknownPrStateMap(targetBranches);
 	}
 };
 
@@ -1133,7 +1152,7 @@ const resolveLifecycleFromReflog = async ({ repoRoot, branch, baseBranch }) => {
 		divergedHead: latestWorkHead
 	};
 };
-const resolveMergedState = async ({ repoRoot, branch, head, baseBranch, prStatusByBranch }) => {
+const resolveMergedState = async ({ repoRoot, branch, head, baseBranch, prStateByBranch }) => {
 	if (branch === null) return {
 		byAncestry: null,
 		byPR: null,
@@ -1154,7 +1173,7 @@ const resolveMergedState = async ({ repoRoot, branch, head, baseBranch, prStatus
 		if (result.exitCode === 0) byAncestry = true;
 		else if (result.exitCode === 1) byAncestry = false;
 	}
-	const prStatus = branch === baseBranch ? null : prStatusByBranch.get(branch) ?? null;
+	const prStatus = branch === baseBranch ? null : prStateByBranch.get(branch)?.status ?? null;
 	let byPR = null;
 	if (prStatus === "merged") byPR = true;
 	else if (prStatus === "none" || prStatus === "open" || prStatus === "closed_unmerged") byPR = false;
@@ -1208,9 +1227,16 @@ const resolveMergedState = async ({ repoRoot, branch, head, baseBranch, prStatus
 		})
 	};
 };
-const resolvePrState = ({ branch, baseBranch, prStatusByBranch }) => {
-	if (branch === null || branch === baseBranch) return { status: null };
-	return { status: prStatusByBranch.get(branch) ?? null };
+const resolveWorktreePrState = ({ branch, baseBranch, prStateByBranch }) => {
+	if (branch === null || branch === baseBranch) return {
+		status: null,
+		url: null
+	};
+	const prState = prStateByBranch.get(branch);
+	return {
+		status: prState?.status ?? null,
+		url: prState?.url ?? null
+	};
 };
 const resolveMergedOverall = ({ byAncestry, byPR, byLifecycle }) => {
 	if (byPR === true || byLifecycle === true) return true;
@@ -1258,7 +1284,7 @@ const resolveUpstreamState = async (worktreePath) => {
 		remote: upstreamRef.stdout.trim()
 	};
 };
-const enrichWorktree = async ({ repoRoot, worktree, baseBranch, prStatusByBranch }) => {
+const enrichWorktree = async ({ repoRoot, worktree, baseBranch, prStateByBranch }) => {
 	const [dirty, locked, merged, upstream] = await Promise.all([
 		resolveDirty(worktree.path),
 		resolveLockState({
@@ -1270,14 +1296,14 @@ const enrichWorktree = async ({ repoRoot, worktree, baseBranch, prStatusByBranch
 			branch: worktree.branch,
 			head: worktree.head,
 			baseBranch,
-			prStatusByBranch
+			prStateByBranch
 		}),
 		resolveUpstreamState(worktree.path)
 	]);
-	const pr = resolvePrState({
+	const pr = resolveWorktreePrState({
 		branch: worktree.branch,
 		baseBranch,
-		prStatusByBranch
+		prStateByBranch
 	});
 	return {
 		branch: worktree.branch,
@@ -1296,7 +1322,7 @@ const collectWorktreeSnapshot = async (repoRoot, { noGh = false } = {}) => {
 		listGitWorktrees(repoRoot),
 		resolveEnableGh(repoRoot)
 	]);
-	const prStatusByBranch = await resolvePrStatusByBranchBatch({
+	const prStateByBranch = await resolvePrStateByBranchBatch({
 		repoRoot,
 		baseBranch,
 		branches: worktrees.map((worktree) => worktree.branch),
@@ -1310,7 +1336,7 @@ const collectWorktreeSnapshot = async (repoRoot, { noGh = false } = {}) => {
 				repoRoot,
 				worktree,
 				baseBranch,
-				prStatusByBranch
+				prStateByBranch
 			});
 		}))
 	};
@@ -1488,6 +1514,10 @@ const CD_FZF_EXTRA_ARGS = [
 	"--preview-window=right,60%,wrap",
 	"--ansi"
 ];
+const LIST_TABLE_COLUMN_COUNT = 8;
+const LIST_TABLE_PATH_COLUMN_INDEX = 7;
+const LIST_TABLE_PATH_MIN_WIDTH = 12;
+const LIST_TABLE_CELL_HORIZONTAL_PADDING = 2;
 const COMPLETION_SHELLS = ["zsh", "fish"];
 const COMPLETION_FILE_BY_SHELL = {
 	zsh: "zsh/_vw",
@@ -1656,9 +1686,14 @@ const commandHelpEntries = [
 	},
 	{
 		name: "list",
-		usage: "vw list [--json]",
+		usage: "vw list [--json] [--full-path]",
 		summary: "List worktrees with status metadata.",
-		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."]
+		details: [
+			"Table output includes branch, path, dirty, lock, merged, PR state, and ahead/behind vs base branch.",
+			"By default, long path values are truncated to fit terminal width.",
+			"JSON output includes PR status/url and upstream metadata fields."
+		],
+		options: ["--full-path"]
 	},
 	{
 		name: "status",
@@ -2484,6 +2519,26 @@ const formatListUpstreamCount = (value) => {
 	if (value === null) return "-";
 	return String(value);
 };
+const resolveListColumnContentWidth = ({ rows, columnIndex }) => {
+	return rows.reduce((width, row) => {
+		const cell = row[columnIndex] ?? "";
+		return Math.max(width, stringWidth(cell));
+	}, 0);
+};
+const resolveListPathColumnWidth = ({ rows, disablePathTruncation }) => {
+	if (disablePathTruncation) return null;
+	if (process.stdout.isTTY !== true) return null;
+	const terminalColumns = process.stdout.columns;
+	if (typeof terminalColumns !== "number" || Number.isFinite(terminalColumns) !== true || terminalColumns <= 0) return null;
+	const measuredNonPathWidth = Array.from({ length: LIST_TABLE_PATH_COLUMN_INDEX }).map((_, index) => resolveListColumnContentWidth({
+		rows,
+		columnIndex: index
+	})).reduce((sum, width) => sum + width, 0);
+	const borderWidth = LIST_TABLE_COLUMN_COUNT + 1;
+	const paddingWidth = LIST_TABLE_COLUMN_COUNT * LIST_TABLE_CELL_HORIZONTAL_PADDING;
+	const availablePathWidth = Math.floor(terminalColumns) - borderWidth - paddingWidth - measuredNonPathWidth;
+	return Math.max(LIST_TABLE_PATH_MIN_WIDTH, availablePathWidth);
+};
 const resolveAheadBehindAgainstBaseBranch = async ({ repoRoot, baseBranch, worktree }) => {
 	if (baseBranch === null) return {
 		ahead: null,
@@ -2642,6 +2697,7 @@ const renderGeneralHelpText = ({ version }) => {
 		"  --verbose               Enable verbose logs.",
 		"  --no-hooks              Disable hooks for this run (requires --allow-unsafe).",
 		"  --no-gh                 Disable GitHub CLI based PR status checks for this run.",
+		"  --full-path             Disable list table path truncation.",
 		"  --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.",
@@ -2747,6 +2803,10 @@ const createCli = (options = {}) => {
 			description: "Enable GitHub CLI based PR status checks (disable with --no-gh)",
 			default: true
 		},
+		fullPath: {
+			type: "boolean",
+			description: "Disable list table path truncation"
+		},
 		allowUnsafe: {
 			type: "boolean",
 			description: "Allow unsafe operations"
@@ -3073,43 +3133,53 @@ const createCli = (options = {}) => {
 					return EXIT_CODE.OK;
 				}
 				const theme = createCatppuccinTheme({ enabled: shouldUseAnsiColors({ interactive: runtime.isInteractive }) });
+				const rows = [[
+					"branch",
+					"dirty",
+					"merged",
+					"pr",
+					"locked",
+					"ahead",
+					"behind",
+					"path"
+				], ...await Promise.all(snapshot.worktrees.map(async (worktree) => {
+					const distanceFromBase = await resolveAheadBehindAgainstBaseBranch({
+						repoRoot,
+						baseBranch: snapshot.baseBranch,
+						worktree
+					});
+					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),
+						formatDisplayPath(worktree.path)
+					];
+				}))];
+				const pathColumnWidth = resolveListPathColumnWidth({
+					rows,
+					disablePathTruncation: parsedArgs.fullPath === true
+				});
+				const columnsConfig = pathColumnWidth === null ? void 0 : { [LIST_TABLE_PATH_COLUMN_INDEX]: {
+					width: pathColumnWidth,
+					truncate: pathColumnWidth
+				} };
 				const colorized = colorizeListTable({
-					rendered: table([[
-						"branch",
-						"dirty",
-						"merged",
-						"pr",
-						"locked",
-						"ahead",
-						"behind",
-						"path"
-					], ...await Promise.all(snapshot.worktrees.map(async (worktree) => {
-						const distanceFromBase = await resolveAheadBehindAgainstBaseBranch({
-							repoRoot,
-							baseBranch: snapshot.baseBranch,
-							worktree
-						});
-						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),
-							formatDisplayPath(worktree.path)
-						];
-					}))], {
+					rendered: table(rows, {
 						border: getBorderCharacters("norc"),
 						drawHorizontalLine: (lineIndex, rowCount) => {
 							return lineIndex === 0 || lineIndex === 1 || lineIndex === rowCount;
-						}
+						},
+						columns: columnsConfig
 					}),
 					theme
 				});