vde-worktree 0.0.12 → 0.0.14

package/README.ja.md

@@ -111,6 +111,7 @@ autoload -Uz compinit && compinit
 - `--verbose`: 詳細ログ
 - `--no-hooks`: 今回のみ hook 無効化（`--allow-unsafe` 必須）
 - `--allow-unsafe`: unsafe 操作の明示同意
+- `--no-gh`: 今回の実行で `gh` による PR merged 判定を無効化
 - `--hook-timeout-ms <ms>`: hook timeout 上書き
 - `--lock-timeout-ms <ms>`: repo lock timeout 上書き
 
@@ -133,12 +134,14 @@ vw init
 ```bash
 vw list
 vw list --json
+vw list --no-gh
 ```
 
 機能:
 
 - Git の porcelain 情報から worktree 一覧を取得
 - branch/path/dirty/lock/merged/upstream を表示
+- `--no-gh` 指定時は PR merged 判定をスキップ（`merged.byPR` は `null`）
 - 対話ターミナルでは Catppuccin 風の ANSI 色で表示
 
 ### `status`
@@ -434,6 +437,7 @@ vw completion zsh --install
 - `gh auth` 未設定
 - API 失敗
 - `git config vde-worktree.enableGh false`
+- `--no-gh` を指定して実行
 
 ## JSON 契約
 

package/README.md

@@ -111,6 +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
 - `--hook-timeout-ms <ms>`: hook timeout override
 - `--lock-timeout-ms <ms>`: repository lock timeout override
 
@@ -133,12 +134,14 @@ What it does:
 ```bash
 vw list
 vw list --json
+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`)
 - In interactive terminal, uses Catppuccin-style ANSI colors
 
 ### `status`
@@ -428,7 +431,7 @@ Overall policy:
 - `byPR === false` => `overall = false`
 - `byPR === null` => fallback to `byAncestry`
 
-`byPR` becomes `null` when PR lookup is unavailable (for example: `gh` missing, auth missing, API error, or `vde-worktree.enableGh=false`).
+`byPR` becomes `null` when PR lookup is unavailable (for example: `gh` missing, auth missing, API error, `vde-worktree.enableGh=false`, or `--no-gh`).
 
 ## JSON Contract
 

package/dist/index.mjs

@@ -833,21 +833,45 @@ const defaultRunGh = async ({ cwd, args }) => {
 		stderr: result.stderr
 	};
 };
-const parseMergedResult = (raw) => {
+const toTargetBranches = ({ branches, baseBranch }) => {
+	const uniqueBranches = /* @__PURE__ */ new Set();
+	for (const branch of branches) {
+		if (typeof branch !== "string" || branch.length === 0) continue;
+		if (branch === baseBranch) continue;
+		uniqueBranches.add(branch);
+	}
+	return [...uniqueBranches];
+};
+const buildUnknownBranchMap = (branches) => {
+	return new Map(branches.map((branch) => [branch, null]));
+};
+const parseMergedBranches = ({ raw, targetBranches }) => {
 	try {
 		const parsed = JSON.parse(raw);
 		if (Array.isArray(parsed) !== true) return null;
 		const records = parsed;
-		if (records.length === 0) return false;
-		return records.some((record) => typeof record?.mergedAt === "string" && record.mergedAt.length > 0);
+		const mergedBranches = /* @__PURE__ */ new Set();
+		for (const record of records) {
+			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);
+		}
+		return mergedBranches;
 	} catch {
 		return null;
 	}
 };
-const resolveMergedByPr = async ({ repoRoot, branch, baseBranch, enabled = true, runGh = defaultRunGh }) => {
-	if (enabled !== true) return null;
-	if (baseBranch === null) return null;
+const resolveMergedByPrBatch = async ({ repoRoot, baseBranch, branches, enabled = true, runGh = defaultRunGh }) => {
+	if (enabled !== true) return /* @__PURE__ */ new Map();
+	if (baseBranch === null) return /* @__PURE__ */ new Map();
+	const targetBranches = toTargetBranches({
+		branches,
+		baseBranch
+	});
+	if (targetBranches.length === 0) return /* @__PURE__ */ new Map();
 	try {
+		const targetBranchSet = new Set(targetBranches);
 		const result = await runGh({
 			cwd: repoRoot,
 			args: [
@@ -855,21 +879,28 @@ const resolveMergedByPr = async ({ repoRoot, branch, baseBranch, enabled = true,
 				"list",
 				"--state",
 				"merged",
-				"--head",
-				branch,
 				"--base",
 				baseBranch,
+				"--search",
+				targetBranches.map((branch) => `head:${branch}`).join(" OR "),
 				"--limit",
-				"1",
+				"1000",
 				"--json",
-				"mergedAt"
+				"headRefName,mergedAt"
 			]
 		});
-		if (result.exitCode !== 0) return null;
-		return parseMergedResult(result.stdout);
+		if (result.exitCode !== 0) return buildUnknownBranchMap(targetBranches);
+		const mergedBranches = parseMergedBranches({
+			raw: result.stdout,
+			targetBranches: targetBranchSet
+		});
+		if (mergedBranches === null) return buildUnknownBranchMap(targetBranches);
+		return new Map(targetBranches.map((branch) => {
+			return [branch, mergedBranches.has(branch)];
+		}));
 	} catch (error) {
-		if (error.code === "ENOENT") return null;
-		return null;
+		if (error.code === "ENOENT") return buildUnknownBranchMap(targetBranches);
+		return buildUnknownBranchMap(targetBranches);
 	}
 };
 
@@ -1018,7 +1049,7 @@ const resolveLockState = async ({ repoRoot, branch }) => {
 		};
 	}
 };
-const resolveMergedState = async ({ repoRoot, branch, head, baseBranch, enableGh }) => {
+const resolveMergedState = async ({ repoRoot, branch, head, baseBranch, mergedByPrByBranch }) => {
 	if (branch === null) return {
 		byAncestry: null,
 		byPR: null,
@@ -1039,12 +1070,7 @@ const resolveMergedState = async ({ repoRoot, branch, head, baseBranch, enableGh
 		if (result.exitCode === 0) byAncestry = true;
 		else if (result.exitCode === 1) byAncestry = false;
 	}
-	const byPR = await resolveMergedByPr({
-		repoRoot,
-		branch,
-		baseBranch,
-		enabled: enableGh
-	});
+	const byPR = branch === baseBranch ? null : mergedByPrByBranch.get(branch) ?? null;
 	let byLifecycle = null;
 	if (baseBranch !== null) {
 		const lifecycle = await upsertWorktreeMergeLifecycle({
@@ -1112,7 +1138,7 @@ const resolveUpstreamState = async (worktreePath) => {
 		remote: upstreamRef.stdout.trim()
 	};
 };
-const enrichWorktree = async ({ repoRoot, worktree, baseBranch, enableGh }) => {
+const enrichWorktree = async ({ repoRoot, worktree, baseBranch, mergedByPrByBranch }) => {
 	const [dirty, locked, merged, upstream] = await Promise.all([
 		resolveDirty(worktree.path),
 		resolveLockState({
@@ -1124,7 +1150,7 @@ const enrichWorktree = async ({ repoRoot, worktree, baseBranch, enableGh }) => {
 			branch: worktree.branch,
 			head: worktree.head,
 			baseBranch,
-			enableGh
+			mergedByPrByBranch
 		}),
 		resolveUpstreamState(worktree.path)
 	]);
@@ -1138,12 +1164,18 @@ const enrichWorktree = async ({ repoRoot, worktree, baseBranch, enableGh }) => {
 		upstream
 	};
 };
-const collectWorktreeSnapshot = async (repoRoot) => {
+const collectWorktreeSnapshot = async (repoRoot, { noGh = false } = {}) => {
 	const [baseBranch, worktrees, enableGh] = await Promise.all([
 		resolveBaseBranch$1(repoRoot),
 		listGitWorktrees(repoRoot),
 		resolveEnableGh(repoRoot)
 	]);
+	const mergedByPrByBranch = await resolveMergedByPrBatch({
+		repoRoot,
+		baseBranch,
+		branches: worktrees.map((worktree) => worktree.branch),
+		enabled: enableGh && noGh !== true
+	});
 	return {
 		repoRoot,
 		baseBranch,
@@ -1152,7 +1184,7 @@ const collectWorktreeSnapshot = async (repoRoot) => {
 				repoRoot,
 				worktree,
 				baseBranch,
-				enableGh
+				mergedByPrByBranch
 			});
 		}))
 	};
@@ -1168,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");
 };
@@ -1224,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 {
@@ -2436,6 +2472,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.",
 		"  --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.",
@@ -2536,6 +2573,11 @@ const createCli = (options = {}) => {
 			description: "Enable hooks (disable with --no-hooks)",
 			default: true
 		},
+		gh: {
+			type: "boolean",
+			description: "Enable GitHub CLI based PR merge checks (disable with --no-gh)",
+			default: true
+		},
 		allowUnsafe: {
 			type: "boolean",
 			description: "Allow unsafe operations"
@@ -2764,6 +2806,7 @@ const createCli = (options = {}) => {
 				command,
 				json: jsonEnabled,
 				hooksEnabled: parsedArgs.hooks !== false && configuredHooksEnabled !== false,
+				ghEnabled: parsedArgs.gh !== false,
 				strictPostHooks: parsedArgs.strictPostHooks === true,
 				hookTimeoutMs: readNumberFromEnvOrDefault({
 					rawValue: toNumberOption({
@@ -2786,6 +2829,9 @@ const createCli = (options = {}) => {
 				rawValue: configuredStaleTTL,
 				defaultValue: DEFAULT_STALE_LOCK_TTL_SECONDS
 			});
+			const collectWorktreeSnapshot$1 = async (_ignoredRepoRoot) => {
+				return collectWorktreeSnapshot(repoRoot, { noGh: runtime.ghEnabled !== true });
+			};
 			const runWriteOperation = async (task) => {
 				if (WRITE_COMMANDS.has(command) !== true) return task();
 				if (command !== "init") await validateInitializedForWrite(repoRoot);
@@ -2844,7 +2890,7 @@ const createCli = (options = {}) => {
 					min: 0,
 					max: 0
 				});
-				const snapshot = await collectWorktreeSnapshot(repoRoot);
+				const snapshot = await collectWorktreeSnapshot$1(repoRoot);
 				if (runtime.json) {
 					stdout(JSON.stringify(buildJsonSuccess({
 						command,
@@ -2892,7 +2938,7 @@ const createCli = (options = {}) => {
 					min: 0,
 					max: 1
 				});
-				const snapshot = await collectWorktreeSnapshot(repoRoot);
+				const snapshot = await collectWorktreeSnapshot$1(repoRoot);
 				const targetBranch = commandArgs[0];
 				const targetWorktree = typeof targetBranch === "string" && targetBranch.length > 0 ? resolveTargetWorktreeByBranch({
 					branch: targetBranch,
@@ -2926,7 +2972,7 @@ const createCli = (options = {}) => {
 				const branch = commandArgs[0];
 				const target = resolveTargetWorktreeByBranch({
 					branch,
-					worktrees: (await collectWorktreeSnapshot(repoRoot)).worktrees
+					worktrees: (await collectWorktreeSnapshot$1(repoRoot)).worktrees
 				});
 				if (runtime.json) {
 					stdout(JSON.stringify(buildJsonSuccess({
@@ -2954,7 +3000,7 @@ const createCli = (options = {}) => {
 				const result = await runWriteOperation(async () => {
 					if (containsBranch({
 						branch,
-						worktrees: (await collectWorktreeSnapshot(repoRoot)).worktrees
+						worktrees: (await collectWorktreeSnapshot$1(repoRoot)).worktrees
 					})) throw createCliError("BRANCH_ALREADY_ATTACHED", {
 						message: `Branch is already attached to a worktree: ${branch}`,
 						details: { branch }
@@ -3028,7 +3074,7 @@ const createCli = (options = {}) => {
 				});
 				const branch = commandArgs[0];
 				const result = await runWriteOperation(async () => {
-					const snapshot = await collectWorktreeSnapshot(repoRoot);
+					const snapshot = await collectWorktreeSnapshot$1(repoRoot);
 					const existing = snapshot.worktrees.find((worktree) => worktree.branch === branch);
 					if (existing !== void 0) {
 						if (snapshot.baseBranch !== null) {
@@ -3134,7 +3180,7 @@ const createCli = (options = {}) => {
 				});
 				const newBranch = commandArgs[0];
 				const result = await runWriteOperation(async () => {
-					const snapshot = await collectWorktreeSnapshot(repoRoot);
+					const snapshot = await collectWorktreeSnapshot$1(repoRoot);
 					const current = resolveCurrentWorktree({
 						snapshot,
 						currentWorktreeRoot: repoContext.currentWorktreeRoot
@@ -3247,7 +3293,7 @@ const createCli = (options = {}) => {
 				});
 				const branchArg = commandArgs[0];
 				const result = await runWriteOperation(async () => {
-					const snapshot = await collectWorktreeSnapshot(repoRoot);
+					const snapshot = await collectWorktreeSnapshot$1(repoRoot);
 					const target = typeof branchArg === "string" && branchArg.length > 0 ? resolveTargetWorktreeByBranch({
 						branch: branchArg,
 						worktrees: snapshot.worktrees
@@ -3336,7 +3382,7 @@ const createCli = (options = {}) => {
 				if (parsedArgs.apply === true && parsedArgs.dryRun === true) throw createCliError("INVALID_ARGUMENT", { message: "Cannot use --apply and --dry-run together" });
 				const dryRun = parsedArgs.apply !== true;
 				const execute = async () => {
-					const candidates = (await collectWorktreeSnapshot(repoRoot)).worktrees.filter((worktree) => worktree.branch !== null).filter((worktree) => worktree.path !== repoRoot).filter((worktree) => worktree.dirty === false).filter((worktree) => worktree.locked.value === false).filter((worktree) => worktree.merged.overall === true).map((worktree) => worktree.branch);
+					const candidates = (await collectWorktreeSnapshot$1(repoRoot)).worktrees.filter((worktree) => worktree.branch !== null).filter((worktree) => worktree.path !== repoRoot).filter((worktree) => worktree.dirty === false).filter((worktree) => worktree.locked.value === false).filter((worktree) => worktree.merged.overall === true).map((worktree) => worktree.branch);
 					if (dryRun) return {
 						deleted: [],
 						candidates,
@@ -3363,7 +3409,7 @@ const createCli = (options = {}) => {
 								"remove",
 								resolveTargetWorktreeByBranch({
 									branch,
-									worktrees: (await collectWorktreeSnapshot(repoRoot)).worktrees
+									worktrees: (await collectWorktreeSnapshot$1(repoRoot)).worktrees
 								}).path
 							]
 						});
@@ -3472,7 +3518,7 @@ const createCli = (options = {}) => {
 							`${remote}/${branch}`
 						]
 					});
-					const snapshot = await collectWorktreeSnapshot(repoRoot);
+					const snapshot = await collectWorktreeSnapshot$1(repoRoot);
 					const lifecycleBaseBranch = snapshot.baseBranch;
 					const existing = snapshot.worktrees.find((worktree) => worktree.branch === branch);
 					if (existing !== void 0) {
@@ -3550,7 +3596,7 @@ const createCli = (options = {}) => {
 				const fromPath = typeof parsedArgs.from === "string" ? parsedArgs.from : void 0;
 				if (fromPath !== void 0 && parsedArgs.current === true) throw createCliError("INVALID_ARGUMENT", { message: "extract cannot use --current and --from together" });
 				const result = await runWriteOperation(async () => {
-					const snapshot = await collectWorktreeSnapshot(repoRoot);
+					const snapshot = await collectWorktreeSnapshot$1(repoRoot);
 					const resolvedSourcePath = ensurePathInsideRepo({
 						repoRoot,
 						path: fromPath !== void 0 ? resolvePathFromCwd({
@@ -3702,7 +3748,7 @@ const createCli = (options = {}) => {
 					const sourceWorktree = resolveManagedNonPrimaryWorktreeByBranch({
 						repoRoot,
 						branch,
-						worktrees: (await collectWorktreeSnapshot(repoRoot)).worktrees,
+						worktrees: (await collectWorktreeSnapshot$1(repoRoot)).worktrees,
 						optionName: "--from",
 						worktreeName: fromWorktreeName,
 						role: "source"
@@ -3836,7 +3882,7 @@ const createCli = (options = {}) => {
 					const targetWorktree = resolveManagedNonPrimaryWorktreeByBranch({
 						repoRoot,
 						branch,
-						worktrees: (await collectWorktreeSnapshot(repoRoot)).worktrees,
+						worktrees: (await collectWorktreeSnapshot$1(repoRoot)).worktrees,
 						optionName: "--to",
 						worktreeName: targetWorktreeName,
 						role: "target"
@@ -3952,7 +3998,7 @@ const createCli = (options = {}) => {
 						message: "use requires clean primary worktree",
 						details: { repoRoot }
 					});
-					const branchCheckedOutInOtherWorktree = (await collectWorktreeSnapshot(repoRoot)).worktrees.find((worktree) => {
+					const branchCheckedOutInOtherWorktree = (await collectWorktreeSnapshot$1(repoRoot)).worktrees.find((worktree) => {
 						return worktree.branch === branch && worktree.path !== repoRoot;
 					});
 					if (branchCheckedOutInOtherWorktree !== void 0 && allowShared !== true) throw createCliError("BRANCH_IN_USE", {
@@ -4035,7 +4081,7 @@ const createCli = (options = {}) => {
 				const branch = commandArgs[0];
 				const target = resolveTargetWorktreeByBranch({
 					branch,
-					worktrees: (await collectWorktreeSnapshot(repoRoot)).worktrees
+					worktrees: (await collectWorktreeSnapshot$1(repoRoot)).worktrees
 				});
 				const executable = afterDoubleDash[0];
 				if (typeof executable !== "string" || executable.length === 0) throw createCliError("INVALID_ARGUMENT", { message: "exec requires executable after --" });
@@ -4086,7 +4132,7 @@ const createCli = (options = {}) => {
 				});
 				const hookName = normalizeHookName(commandArgs[0]);
 				const current = resolveCurrentWorktree({
-					snapshot: await collectWorktreeSnapshot(repoRoot),
+					snapshot: await collectWorktreeSnapshot$1(repoRoot),
 					currentWorktreeRoot: repoContext.currentWorktreeRoot
 				});
 				await invokeHook({
@@ -4237,7 +4283,7 @@ const createCli = (options = {}) => {
 				const result = await runWriteOperation(async () => {
 					resolveTargetWorktreeByBranch({
 						branch,
-						worktrees: (await collectWorktreeSnapshot(repoRoot)).worktrees
+						worktrees: (await collectWorktreeSnapshot$1(repoRoot)).worktrees
 					});
 					const existing = await readWorktreeLock({
 						repoRoot,
@@ -4351,7 +4397,7 @@ const createCli = (options = {}) => {
 					min: 0,
 					max: 0
 				});
-				const snapshot = await collectWorktreeSnapshot(repoRoot);
+				const snapshot = await collectWorktreeSnapshot$1(repoRoot);
 				const theme = createCatppuccinTheme({ enabled: shouldUseAnsiColors({ interactive: runtime.isInteractive || process.stderr.isTTY === true }) });
 				const branchColumnWidth = snapshot.worktrees.reduce((maxWidth, worktree) => {
 					const label = buildCdBranchLabel({