vde-worktree 0.0.15 → 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,14 +424,20 @@ 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` ポリシー:
 
-- `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` になる例:
+`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,14 +424,20 @@ 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:
 
-- `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`).
+`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`)
 }