vde-worktree 0.0.7 → 0.0.8

package/completions/fish/vw.fish

@@ -6,6 +6,28 @@ function __vw_worktree_branches
     | sort -u
 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
+  end
+
+  command git show-ref --verify --quiet refs/heads/main >/dev/null 2>/dev/null
+  and begin
+    echo main
+    return
+  end
+
+  command git show-ref --verify --quiet refs/heads/master >/dev/null 2>/dev/null
+  and begin
+    echo master
+    return
+  end
+end
+
 function __vw_current_bin
   set -l tokens (commandline -opc)
   if test (count $tokens) -ge 1
@@ -66,6 +88,13 @@ for (const worktree of worktrees) {
 ' 2>/dev/null
 end
 
+function __vw_use_candidates_with_meta
+  begin
+    __vw_worktree_branches
+    __vw_default_branch
+  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
@@ -132,7 +161,7 @@ for __vw_bin in vw vde-worktree
   complete -c $__vw_bin -n "__fish_seen_subcommand_from mv" -a "(__vw_local_branches)"
   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 use" -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)"
   complete -c $__vw_bin -n "__fish_seen_subcommand_from lock" -a "(__vw_worktree_candidates_with_meta)"

package/completions/zsh/_vw

@@ -7,6 +7,24 @@ _vw_worktree_branches_raw() {
     | command sort -u
 }
 
+_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
+  fi
+  if command git show-ref --verify --quiet refs/heads/main 2>/dev/null; then
+    print -r -- "main"
+    return 0
+  fi
+  if command git show-ref --verify --quiet refs/heads/master 2>/dev/null; then
+    print -r -- "master"
+    return 0
+  fi
+}
+
 _vw_worktree_candidate_rows_raw() {
   command git rev-parse --is-inside-work-tree >/dev/null 2>&1 || return 0
   local vw_bin="${words[1]:-vw}"
@@ -110,6 +128,25 @@ _vw_complete_worktree_branches_with_meta() {
   _vw_complete_worktree_branches
 }
 
+_vw_complete_use_branches() {
+  local -a branches
+  local default_branch
+  branches=("${(@f)$(_vw_worktree_branches_raw)}")
+  default_branch="$(_vw_default_branch_raw | command head -n 1)"
+  if [[ -n "${default_branch}" ]]; then
+    branches+=("${default_branch}")
+  fi
+
+  branches=("${(@u)branches}")
+
+  if (( ${#branches} > 0 )); then
+    _vw_describe_values "branch" "${branches[@]}"
+    return 0
+  fi
+
+  _vw_complete_worktree_branches
+}
+
 _vw_complete_local_branches() {
   local -a values
   values=("${(@f)$(_vw_local_branches_raw)}")
@@ -235,7 +272,7 @@ _vw() {
           ;;
         use)
           _arguments \
-            "1:branch:_vw_complete_worktree_branches_with_meta" \
+            "1:branch:_vw_complete_use_branches" \
             "--allow-shared[Allow checkout when branch is attached by another worktree]" \
             "--allow-agent[Allow non-TTY execution for use]" \
             "--allow-unsafe[Allow unsafe behavior in non-TTY mode]"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vde-worktree",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Git worktree manager with safe defaults for humans and coding agents",
   "type": "module",
   "packageManager": "pnpm@10.28.2",