vde-worktree 0.0.19 → 0.0.21

package/README.ja.md

@@ -447,7 +447,7 @@ vw completion zsh --install
 - `gh` 未導入
 - `gh auth` 未設定
 - API 失敗
-- `git config vde-worktree.enableGh false`
+- `config.yml` の `github.enabled: false`
 - `--no-gh` を指定して実行
 
 ## JSON 契約
@@ -468,15 +468,39 @@ vw completion zsh --install
 - `message`
 - `details`
 
-## 設定キー（git config）
-
-- `vde-worktree.baseBranch`
-- `vde-worktree.baseRemote`
-- `vde-worktree.enableGh`
-- `vde-worktree.hooksEnabled`
-- `vde-worktree.hookTimeoutMs`
-- `vde-worktree.lockTimeoutMs`
-- `vde-worktree.staleLockTTLSeconds`
+## 設定（config.yml）
+
+設定ファイルは次の順で読み込みます:
+
+- `$XDG_CONFIG_HOME/vde/worktree/config.yml`（fallback: `~/.config/vde/worktree/config.yml`）
+- `cwd` から Git 境界（`.git`）まで探索した `.vde/worktree/config.yml`
+- `<repoRoot>/.vde/worktree/config.yml`（linked worktree 実行時も参照）
+
+主な設定キー:
+
+```yaml
+paths:
+  worktreeRoot: .worktree
+git:
+  baseBranch: null
+  baseRemote: origin
+github:
+  enabled: true
+hooks:
+  enabled: true
+  timeoutMs: 30000
+locks:
+  timeoutMs: 15000
+  staleLockTTLSeconds: 1800
+list:
+  table:
+    columns: [branch, dirty, merged, pr, locked, ahead, behind, path]
+selector:
+  cd:
+    prompt: "worktree> "
+    surface: auto # auto | inline | tmux-popup
+    tmuxPopupOpts: "80%,70%"
+```
 
 ## 現在のスコープ
 

package/README.md

@@ -442,7 +442,7 @@ Overall policy:
 - `byPR === false` or explicit lifecycle "not merged" evidence => `overall = false`
 - otherwise `overall = null`
 
-`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`).
+`byPR` becomes `null` and `pr.status` becomes `unknown` when PR lookup is unavailable (for example: `gh` missing, auth missing, API error, `github.enabled=false` in config.yml, or `--no-gh`).
 
 ## JSON Contract
 
@@ -462,17 +462,39 @@ Error shape:
 - `message`
 - `details`
 
-## Configuration Keys
-
-Configured via `git config`:
-
-- `vde-worktree.baseBranch`
-- `vde-worktree.baseRemote`
-- `vde-worktree.enableGh`
-- `vde-worktree.hooksEnabled`
-- `vde-worktree.hookTimeoutMs`
-- `vde-worktree.lockTimeoutMs`
-- `vde-worktree.staleLockTTLSeconds`
+## Configuration (`config.yml`)
+
+Configuration is loaded from:
+
+- `$XDG_CONFIG_HOME/vde/worktree/config.yml` (fallback: `~/.config/vde/worktree/config.yml`)
+- `.vde/worktree/config.yml` discovered from `cwd` to the local Git boundary (`.git`)
+- `<repoRoot>/.vde/worktree/config.yml` (always considered, including linked worktree execution)
+
+Supported keys (examples):
+
+```yaml
+paths:
+  worktreeRoot: .worktree
+git:
+  baseBranch: null
+  baseRemote: origin
+github:
+  enabled: true
+hooks:
+  enabled: true
+  timeoutMs: 30000
+locks:
+  timeoutMs: 15000
+  staleLockTTLSeconds: 1800
+list:
+  table:
+    columns: [branch, dirty, merged, pr, locked, ahead, behind, path]
+selector:
+  cd:
+    prompt: "worktree> "
+    surface: auto # auto | inline | tmux-popup
+    tmuxPopupOpts: "80%,70%"
+```
 
 ## Current Scope
 

package/completions/fish/vw.fish

@@ -9,10 +9,24 @@ end
 function __vw_default_branch
   command git rev-parse --is-inside-work-tree >/dev/null 2>/dev/null; or return 0
 
-  set -l configured (command git config --get vde-worktree.baseBranch 2>/dev/null)
-  if test -n "$configured"
-    echo $configured
-    return
+  set -l vw_bin (__vw_current_bin)
+  if test -n "$vw_bin"
+    set -l configured (command $vw_bin list --json 2>/dev/null | command node -e '
+const fs = require("fs")
+let payload
+try {
+  payload = JSON.parse(fs.readFileSync(0, "utf8"))
+} catch {
+  process.exit(0)
+}
+if (typeof payload?.baseBranch === "string" && payload.baseBranch.length > 0) {
+  process.stdout.write(payload.baseBranch)
+}
+' 2>/dev/null)
+    if test -n "$configured"
+      echo $configured
+      return
+    end
   end
 
   command git show-ref --verify --quiet refs/heads/main >/dev/null 2>/dev/null
@@ -117,12 +131,17 @@ try {
   process.exit(0)
 }
 const repoRoot = typeof payload?.repoRoot === "string" ? payload.repoRoot : ""
-if (repoRoot.length === 0) process.exit(0)
-const worktreeRoot = path.join(repoRoot, ".worktree")
+const managedWorktreeRoot =
+  typeof payload?.managedWorktreeRoot === "string" && payload.managedWorktreeRoot.length > 0
+    ? payload.managedWorktreeRoot
+    : repoRoot.length > 0
+      ? path.join(repoRoot, ".worktree")
+      : ""
+if (managedWorktreeRoot.length === 0) process.exit(0)
 const worktrees = Array.isArray(payload.worktrees) ? payload.worktrees : []
 for (const worktree of worktrees) {
   if (typeof worktree?.path !== "string" || worktree.path.length === 0) continue
-  const rel = path.relative(worktreeRoot, worktree.path)
+  const rel = path.relative(managedWorktreeRoot, worktree.path)
   if (!rel || rel === "." || rel === ".." || rel.startsWith(`..${path.sep}`)) continue
   const name = rel.split(path.sep).join("/")
   const branch = typeof worktree?.branch === "string" && worktree.branch.length > 0 ? worktree.branch : "(detached)"

package/completions/zsh/_vw

@@ -9,11 +9,27 @@ _vw_worktree_branches_raw() {
 
 _vw_default_branch_raw() {
   command git rev-parse --is-inside-work-tree >/dev/null 2>&1 || return 0
-  local configured
-  configured="$(command git config --get vde-worktree.baseBranch 2>/dev/null)"
-  if [[ -n "${configured}" ]]; then
-    print -r -- "${configured}"
-    return 0
+  local vw_bin="${words[1]:-vw}"
+  if command -v "$vw_bin" >/dev/null 2>&1; then
+    local configured
+    configured="$(
+      command "$vw_bin" list --json 2>/dev/null | command node -e '
+const fs = require("fs")
+let payload
+try {
+  payload = JSON.parse(fs.readFileSync(0, "utf8"))
+} catch {
+  process.exit(0)
+}
+if (typeof payload?.baseBranch === "string" && payload.baseBranch.length > 0) {
+  process.stdout.write(payload.baseBranch)
+}
+' 2>/dev/null
+    )"
+    if [[ -n "${configured}" ]]; then
+      print -r -- "${configured}"
+      return 0
+    fi
   fi
   if command git show-ref --verify --quiet refs/heads/main 2>/dev/null; then
     print -r -- "main"
@@ -94,12 +110,17 @@ try {
   process.exit(0)
 }
 const repoRoot = typeof payload?.repoRoot === "string" ? payload.repoRoot : ""
-if (repoRoot.length === 0) process.exit(0)
-const worktreeRoot = path.join(repoRoot, ".worktree")
+const managedWorktreeRoot =
+  typeof payload?.managedWorktreeRoot === "string" && payload.managedWorktreeRoot.length > 0
+    ? payload.managedWorktreeRoot
+    : repoRoot.length > 0
+      ? path.join(repoRoot, ".worktree")
+      : ""
+if (managedWorktreeRoot.length === 0) process.exit(0)
 const worktrees = Array.isArray(payload.worktrees) ? payload.worktrees : []
 for (const worktree of worktrees) {
   if (typeof worktree?.path !== "string" || worktree.path.length === 0) continue
-  const rel = path.relative(worktreeRoot, worktree.path)
+  const rel = path.relative(managedWorktreeRoot, worktree.path)
   if (!rel || rel === "." || rel === ".." || rel.startsWith(`..${path.sep}`)) continue
   const name = rel.split(path.sep).join("/")
   const branch = typeof worktree?.branch === "string" && worktree.branch.length > 0 ? worktree.branch : "(detached)"