vde-worktree 0.0.8 → 0.0.10

package/README.ja.md

@@ -263,6 +263,46 @@ vw extract --current --stash
 
 - 実装は primary worktree の抽出フローが中心
 
+### `absorb`
+
+```bash
+vw absorb feature/foo --allow-agent --allow-unsafe
+vw absorb feature/foo --from feature/foo --keep-stash --allow-agent --allow-unsafe
+```
+
+機能:
+
+- 非 primary worktree の変更（未コミット含む）を primary worktree に移す
+- source worktree を stash し、primary で checkout 後に stash を apply する
+- `--from` は vw 管理 worktree 名のみ指定可能（`.worktree/` プレフィックスは不可）
+
+安全条件:
+
+- primary が dirty なら拒否
+- 非TTYでは `--allow-agent` と `--allow-unsafe` の両方が必要
+- `--keep-stash` を付けると apply 後も stash を残す
+
+### `unabsorb`
+
+```bash
+vw unabsorb feature/foo --allow-agent --allow-unsafe
+vw unabsorb feature/foo --to feature/foo --keep-stash --allow-agent --allow-unsafe
+```
+
+機能:
+
+- primary worktree の変更（未コミット含む）を非 primary worktree に戻す
+- primary の変更を stash し、target worktree に stash を apply する
+- `--to` は vw 管理 worktree 名のみ指定可能（`.worktree/` プレフィックスは不可）
+
+安全条件:
+
+- primary worktree が対象 branch 上である必要がある
+- primary が clean なら拒否
+- target worktree が dirty なら拒否
+- 非TTYでは `--allow-agent` と `--allow-unsafe` の両方が必要
+- `--keep-stash` を付けると apply 後も stash を残す
+
 ### `use`
 
 ```bash

package/README.md

@@ -263,6 +263,46 @@ Current limitation:
 
 - Implementation currently supports primary worktree extraction flow.
 
+### `absorb`
+
+```bash
+vw absorb feature/foo --allow-agent --allow-unsafe
+vw absorb feature/foo --from feature/foo --keep-stash --allow-agent --allow-unsafe
+```
+
+What it does:
+
+- Moves changes from non-primary worktree to primary worktree, including uncommitted files
+- Stashes source worktree changes, checks out branch in primary, then applies stash
+- `--from` accepts vw-managed worktree name only (`.worktree/` prefix is rejected)
+
+Safety:
+
+- Rejects dirty primary worktree
+- In non-TTY mode, requires `--allow-agent` and `--allow-unsafe`
+- `--keep-stash` keeps the stash entry after apply for rollback/debugging
+
+### `unabsorb`
+
+```bash
+vw unabsorb feature/foo --allow-agent --allow-unsafe
+vw unabsorb feature/foo --to feature/foo --keep-stash --allow-agent --allow-unsafe
+```
+
+What it does:
+
+- Pushes changes from primary worktree to non-primary worktree, including uncommitted files
+- Stashes primary worktree changes, applies stash in target worktree
+- `--to` accepts vw-managed worktree name only (`.worktree/` prefix is rejected)
+
+Safety:
+
+- Requires primary worktree to be on target branch
+- Rejects clean primary worktree
+- Rejects dirty target worktree
+- In non-TTY mode, requires `--allow-agent` and `--allow-unsafe`
+- `--keep-stash` keeps the stash entry after apply for rollback/debugging
+
 ### `use`
 
 ```bash

package/completions/fish/vw.fish

@@ -88,6 +88,45 @@ for (const worktree of worktrees) {
 ' 2>/dev/null
 end
 
+function __vw_managed_worktree_names_with_meta
+  command git rev-parse --is-inside-work-tree >/dev/null 2>/dev/null; or return 0
+  set -l vw_bin (__vw_current_bin)
+  test -n "$vw_bin"; or return 0
+
+  command $vw_bin list --json 2>/dev/null | command node -e '
+const fs = require("fs")
+const path = require("path")
+const toFlag = (value) => {
+  if (value === true) return "yes"
+  if (value === false) return "no"
+  return "unknown"
+}
+let payload
+try {
+  payload = JSON.parse(fs.readFileSync(0, "utf8"))
+} catch {
+  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 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)
+  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)"
+  const merged = toFlag(worktree?.merged?.overall)
+  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 sanitized = summary.replace(/[\t\r\n]+/g, " ").trim()
+  process.stdout.write(`${name}\t${sanitized}\n`)
+}
+' 2>/dev/null
+end
+
 function __vw_use_candidates_with_meta
   begin
     __vw_worktree_branches
@@ -95,16 +134,6 @@ function __vw_use_candidates_with_meta
   end | sort -u
 end
 
-function __vw_local_branches
-  command git rev-parse --is-inside-work-tree >/dev/null 2>/dev/null; or return 0
-  command git for-each-ref --format='%(refname:short)' refs/heads 2>/dev/null | sort -u
-end
-
-function __vw_switch_branches
-  __vw_worktree_branches
-  __vw_local_branches
-end
-
 function __vw_remote_branches
   command git rev-parse --is-inside-work-tree >/dev/null 2>/dev/null; or return 0
   command git for-each-ref --format='%(refname:short)' refs/remotes 2>/dev/null \
@@ -120,7 +149,7 @@ function __vw_hook_names
   end
 end
 
-set -l __vw_commands init list status path new switch mv del gone get extract use exec invoke copy link lock unlock cd completion help
+set -l __vw_commands init list status path new switch mv del gone get extract absorb unabsorb use exec invoke copy link lock unlock cd completion help
 
 for __vw_bin in vw vde-worktree
   complete -c $__vw_bin -f -n "not __fish_seen_subcommand_from $__vw_commands" -a init -d "Initialize directories, hooks, and managed exclude entries"
@@ -134,6 +163,8 @@ for __vw_bin in vw vde-worktree
   complete -c $__vw_bin -f -n "not __fish_seen_subcommand_from $__vw_commands" -a gone -d "Bulk cleanup by safety-filtered candidate selection"
   complete -c $__vw_bin -f -n "not __fish_seen_subcommand_from $__vw_commands" -a get -d "Fetch remote branch and attach worktree"
   complete -c $__vw_bin -f -n "not __fish_seen_subcommand_from $__vw_commands" -a extract -d "Extract current primary branch into .worktree"
+  complete -c $__vw_bin -f -n "not __fish_seen_subcommand_from $__vw_commands" -a absorb -d "Bring non-primary worktree changes into primary worktree"
+  complete -c $__vw_bin -f -n "not __fish_seen_subcommand_from $__vw_commands" -a unabsorb -d "Push primary worktree changes into non-primary worktree"
   complete -c $__vw_bin -f -n "not __fish_seen_subcommand_from $__vw_commands" -a use -d "Checkout target branch in primary worktree"
   complete -c $__vw_bin -f -n "not __fish_seen_subcommand_from $__vw_commands" -a exec -d "Run command in target branch worktree"
   complete -c $__vw_bin -f -n "not __fish_seen_subcommand_from $__vw_commands" -a invoke -d "Manually run hook script"
@@ -157,10 +188,11 @@ for __vw_bin in vw vde-worktree
 
   complete -c $__vw_bin -n "__fish_seen_subcommand_from status" -a "(__vw_worktree_candidates_with_meta)"
   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_switch_branches)"
-  complete -c $__vw_bin -n "__fish_seen_subcommand_from mv" -a "(__vw_local_branches)"
+  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 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)"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from use" -a "(__vw_use_candidates_with_meta)"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from exec" -a "(__vw_worktree_candidates_with_meta)"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from invoke" -a "(__vw_hook_names)"
@@ -181,6 +213,16 @@ for __vw_bin in vw vde-worktree
   complete -c $__vw_bin -n "__fish_seen_subcommand_from extract" -l from -r -d "Path used by extract --from"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from extract" -l stash -d "Allow stash when dirty"
 
+  complete -c $__vw_bin -n "__fish_seen_subcommand_from absorb" -l from -r -a "(__vw_managed_worktree_names_with_meta)" -d "Source managed worktree name"
+  complete -c $__vw_bin -n "__fish_seen_subcommand_from absorb" -l keep-stash -d "Keep stash entry after absorb"
+  complete -c $__vw_bin -n "__fish_seen_subcommand_from absorb" -l allow-agent -d "Allow non-TTY execution for absorb"
+  complete -c $__vw_bin -n "__fish_seen_subcommand_from absorb" -l allow-unsafe -d "Allow unsafe behavior in non-TTY mode"
+
+  complete -c $__vw_bin -n "__fish_seen_subcommand_from unabsorb" -l to -r -a "(__vw_managed_worktree_names_with_meta)" -d "Target managed worktree name"
+  complete -c $__vw_bin -n "__fish_seen_subcommand_from unabsorb" -l keep-stash -d "Keep stash entry after unabsorb"
+  complete -c $__vw_bin -n "__fish_seen_subcommand_from unabsorb" -l allow-agent -d "Allow non-TTY execution for unabsorb"
+  complete -c $__vw_bin -n "__fish_seen_subcommand_from unabsorb" -l allow-unsafe -d "Allow unsafe behavior in non-TTY mode"
+
   complete -c $__vw_bin -n "__fish_seen_subcommand_from use" -l allow-agent -d "Allow non-TTY execution for use"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from use" -l allow-shared -d "Allow checkout when branch is attached by another worktree"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from use" -l allow-unsafe -d "Allow unsafe behavior in non-TTY mode"

package/completions/zsh/_vw

@@ -65,9 +65,43 @@ for (const worktree of worktrees) {
 ' 2>/dev/null
 }
 
-_vw_local_branches_raw() {
+_vw_managed_worktree_name_rows_raw() {
   command git rev-parse --is-inside-work-tree >/dev/null 2>&1 || return 0
-  command git for-each-ref --format='%(refname:short)' refs/heads 2>/dev/null | command sort -u
+  local vw_bin="${words[1]:-vw}"
+  command -v "$vw_bin" >/dev/null 2>&1 || return 0
+
+  command "$vw_bin" list --json 2>/dev/null | command node -e '
+const fs = require("fs")
+const path = require("path")
+const toFlag = (value) => {
+  if (value === true) return "yes"
+  if (value === false) return "no"
+  return "unknown"
+}
+let payload
+try {
+  payload = JSON.parse(fs.readFileSync(0, "utf8"))
+} catch {
+  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 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)
+  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)"
+  const merged = toFlag(worktree?.merged?.overall)
+  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 sanitized = summary.replace(/[\t\r\n]+/g, " ").trim()
+  process.stdout.write(`${name}\t${sanitized}\n`)
+}
+' 2>/dev/null
 }
 
 _vw_remote_branches_raw() {
@@ -147,20 +181,28 @@ _vw_complete_use_branches() {
   _vw_complete_worktree_branches
 }
 
-_vw_complete_local_branches() {
-  local -a values
-  values=("${(@f)$(_vw_local_branches_raw)}")
-  _vw_describe_values "local-branch" "${values[@]}"
-}
+_vw_complete_managed_worktree_names() {
+  local -a rows names descriptions
+  local row name summary
+  rows=("${(@f)$(_vw_managed_worktree_name_rows_raw)}")
 
-_vw_complete_switch_branches() {
-  local -a values
-  values=(
-    "${(@f)$(_vw_worktree_branches_raw)}"
-    "${(@f)$(_vw_local_branches_raw)}"
-  )
-  values=("${(@u)values}")
-  _vw_describe_values "branch" "${values[@]}"
+  for row in "${rows[@]}"; do
+    name="${row%%$'\t'*}"
+    summary="${row#*$'\t'}"
+    if [[ -z "${name}" ]]; then
+      continue
+    fi
+
+    names+=("${name}")
+    descriptions+=("${summary}")
+  done
+
+  if (( ${#names} > 0 )); then
+    compadd -Ql -d descriptions -a names
+    return 0
+  fi
+
+  _message "no managed-worktree-name candidates"
 }
 
 _vw_complete_remote_branches() {
@@ -193,6 +235,8 @@ _vw() {
     "gone:Bulk cleanup by safety-filtered candidate selection"
     "get:Fetch remote branch and attach worktree"
     "extract:Extract current primary branch into .worktree"
+    "absorb:Bring non-primary worktree changes into primary worktree"
+    "unabsorb:Push primary worktree changes into non-primary worktree"
     "use:Checkout target branch in primary worktree"
     "exec:Run command in target branch worktree"
     "invoke:Manually run hook script"
@@ -240,11 +284,11 @@ _vw() {
           ;;
         switch)
           _arguments \
-            "1:branch:_vw_complete_switch_branches"
+            "1:branch:_vw_complete_worktree_branches_with_meta"
           ;;
         mv)
           _arguments \
-            "1:new-branch:_vw_complete_local_branches"
+            "1:new-branch:"
           ;;
         del)
           _arguments \
@@ -270,6 +314,22 @@ _vw() {
             "--from[Path used by extract --from]:path:_files" \
             "--stash[Allow stash when dirty]"
           ;;
+        absorb)
+          _arguments \
+            "1:branch:_vw_complete_worktree_branches_with_meta" \
+            "--from[Source managed worktree name]:worktree-name:_vw_complete_managed_worktree_names" \
+            "--keep-stash[Keep stash entry after absorb]" \
+            "--allow-agent[Allow non-TTY execution for absorb]" \
+            "--allow-unsafe[Allow unsafe behavior in non-TTY mode]"
+          ;;
+        unabsorb)
+          _arguments \
+            "1:branch:_vw_complete_worktree_branches_with_meta" \
+            "--to[Target managed worktree name]:worktree-name:_vw_complete_managed_worktree_names" \
+            "--keep-stash[Keep stash entry after unabsorb]" \
+            "--allow-agent[Allow non-TTY execution for unabsorb]" \
+            "--allow-unsafe[Allow unsafe behavior in non-TTY mode]"
+          ;;
         use)
           _arguments \
             "1:branch:_vw_complete_use_branches" \