feat: add --from-current flag and fix zsh completions (#25)

Author: helizaga

CHANGELOG.md

@@ -8,6 +8,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
 ### Added
 
+- `--from-current` flag for `git gtr new` command to create worktrees from the current branch instead of the default branch (useful for creating parallel variant worktrees)
+- `run` command to execute commands in worktrees without navigation (e.g., `git gtr run <branch> npm test`)
+- Directory copying support via `gtr.copy.includeDirs` and `gtr.copy.excludeDirs` to copy entire directories (e.g., `node_modules`, `.venv`, `vendor`) when creating worktrees, avoiding dependency reinstallation
+- OpenCode AI adapter for AI tool integration
+
 ### Changed
 
 ### Deprecated
@@ -16,6 +21,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
 ### Fixed
 
+- Zsh completion: Fixed word array normalization to correctly handle `gtr` and `git-gtr` direct invocations (not just `git gtr`)
+- Zsh completion: Fixed `new` command options to complete at any position, not just after the first argument
+- Zsh completion: Added `--editor` completion for `editor` command with list of available editors
+- Zsh completion: Added `--ai` completion for `ai` command with list of available AI tools
+- Zsh completion: Added `--porcelain` completion for `list`/`ls` commands
+- Zsh completion: Added `--global` completion for `config` command
+
 ### Security
 
 ## [1.0.0] - 2025-11-14

CLAUDE.md

@@ -72,6 +72,11 @@ Test changes using this comprehensive checklist (from CONTRIBUTING.md):
 ./bin/gtr new brand-new-feature
 # Expected: Creates new branch and worktree
 
+# Test --from-current flag
+git checkout -b test-from-current-base
+./bin/gtr new variant-1 --from-current
+# Expected: Creates variant-1 from test-from-current-base (not main)
+
 # Test --force and --name flags together
 ./bin/gtr new test-feature --force --name backend
 # Expected: Creates folder "test-feature-backend" on same branch

README.md

@@ -152,8 +152,13 @@ cat >> ~/.zshrc <<'EOF'
 # Enable completions
 fpath=(~/.zsh/completions $fpath)
 autoload -Uz compinit && compinit
+
+# Load git-gtr completions (REQUIRED - must be sourced after compinit)
+source ~/.zsh/completions/_git-gtr
 EOF
 
+# Clear completion cache and reload
+rm -f ~/.zcompdump*
 source ~/.zshrc
 ```
 
@@ -175,6 +180,7 @@ Create a new git worktree. Folder is named after the branch.
 ```bash
 git gtr new my-feature                              # Creates folder: my-feature
 git gtr new hotfix --from v1.2.3                    # Create from specific ref
+git gtr new variant-1 --from-current                # Create from current branch
 git gtr new feature/auth                            # Creates folder: feature-auth
 git gtr new feature-auth --name backend --force     # Same branch, custom name
 git gtr new my-feature --name descriptive-variant   # Optional: custom name without --force
@@ -183,6 +189,7 @@ git gtr new my-feature --name descriptive-variant   # Optional: custom name with
 **Options:**
 
 - `--from <ref>`: Create from specific ref
+- `--from-current`: Create from current branch (useful for parallel variant work)
 - `--track <mode>`: Tracking mode (auto|remote|local|none)
 - `--no-copy`: Skip file copying
 - `--no-fetch`: Skip git fetch

bin/gtr

@@ -111,6 +111,7 @@ main() {
 cmd_create() {
   local branch_name=""
   local from_ref=""
+  local from_current=0
   local track_mode="auto"
   local skip_copy=0
   local skip_fetch=0
@@ -125,6 +126,10 @@ cmd_create() {
         from_ref="$2"
         shift 2
         ;;
+      --from-current)
+        from_current=1
+        shift
+        ;;
       --track)
         track_mode="$2"
         shift 2
@@ -195,9 +200,25 @@ cmd_create() {
     fi
   fi
 
-  # Determine from_ref
+  # Determine from_ref with precedence: --from > --from-current > default
   if [ -z "$from_ref" ]; then
-    from_ref=$(resolve_default_branch "$repo_root")
+    if [ "$from_current" -eq 1 ]; then
+      # Get current branch (try modern git first, then fallback)
+      from_ref=$(git branch --show-current 2>/dev/null)
+      if [ -z "$from_ref" ]; then
+        from_ref=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
+      fi
+
+      # Handle detached HEAD state
+      if [ -z "$from_ref" ] || [ "$from_ref" = "HEAD" ]; then
+        log_warn "Currently in detached HEAD state - falling back to default branch"
+        from_ref=$(resolve_default_branch "$repo_root")
+      else
+        log_info "Creating from current branch: $from_ref"
+      fi
+    else
+      from_ref=$(resolve_default_branch "$repo_root")
+    fi
   fi
 
   # Construct folder name for display
@@ -988,6 +1009,7 @@ CORE COMMANDS (daily workflow):
   new <branch> [options]
          Create a new worktree (folder named after branch)
          --from <ref>: create from specific ref
+         --from-current: create from current branch (for parallel variants)
          --track <mode>: tracking mode (auto|remote|local|none)
          --no-copy: skip file copying
          --no-fetch: skip git fetch
@@ -1078,6 +1100,11 @@ WORKFLOW EXAMPLES:
   # Chain commands together
   git gtr new hotfix && git gtr editor hotfix && git gtr ai hotfix
 
+  # Create variant worktrees from current branch (for parallel work)
+  git checkout feature/user-auth
+  git gtr new variant-1 --from-current        # Creates variant-1 from feature/user-auth
+  git gtr new variant-2 --from-current        # Creates variant-2 from feature/user-auth
+
   # When finished
   git gtr rm feature/user-auth --delete-branch
 

completions/_git-gtr

@@ -1,9 +1,18 @@
-#compdef git-gtr
+#compdef _git-gtr git-gtr gtr
+
+# Register gtr as a git subcommand for completion
+zstyle ':completion:*:*:git:*' user-commands gtr:'Git worktree management'
+
 # Zsh completion for git gtr
 
-_git_gtr() {
-  # Note: When called via 'git gtr', the words array is [git-gtr, <command>, ...]
-  # Git's completion system invokes this function automatically
+_git-gtr() {
+  # Normalize invocation so we always see: [git, gtr, <command>, ...]
+  # Handles: `git gtr`, `gtr`, and `git-gtr` invocations
+  if [[ $words[1] != git ]]; then
+    # Handle both `gtr ...` and `git-gtr ...`
+    words=(git gtr "${words[@]:1}")
+    (( CURRENT += 1 ))
+  fi
 
   local -a commands
   commands=(
@@ -29,58 +38,72 @@ _git_gtr() {
   # Add special ID '1' for main repo
   all_options=("1" "${branches[@]}")
 
+  # Early handler for `new` command - handle all positions
+  if (( CURRENT >= 4 )) && [[ $words[3] == new ]]; then
+    _arguments \
+      '1:branch name:' \
+      '--from[Base ref]:ref:' \
+      '--from-current[Create from current branch]' \
+      '--track[Track mode]:mode:(auto remote local none)' \
+      '--no-copy[Skip file copying]' \
+      '--no-fetch[Skip git fetch]' \
+      '--force[Allow same branch in multiple worktrees]' \
+      '--name[Custom folder name suffix]:name:' \
+      '--yes[Non-interactive mode]'
+    return
+  fi
+
+  # Early handler for `list/ls` command - add --porcelain
+  if (( CURRENT >= 4 )) && [[ $words[3] == (list|ls) ]]; then
+    _arguments '--porcelain[Machine-readable output]'
+    return
+  fi
+
   # Complete the gtr subcommand (new, go, editor, etc.)
-  if (( CURRENT == 2 )); then
+  if (( CURRENT == 3 )); then
     _describe 'commands' commands
   # Complete arguments to the subcommand
-  elif (( CURRENT == 3 )); then
-    case "$words[2]" in
-      go|run|editor|ai|rm)
+  elif (( CURRENT == 4 )); then
+    case "$words[3]" in
+      go|run|rm)
         _describe 'branch names' all_options
         ;;
-      new)
-        _arguments \
-          '--from[Base ref]:ref:' \
-          '--track[Track mode]:mode:(auto remote local none)' \
-          '--no-copy[Skip file copying]' \
-          '--no-fetch[Skip git fetch]' \
-          '--force[Allow same branch in multiple worktrees]' \
-          '--name[Custom folder name suffix]:name:' \
-          '--yes[Non-interactive mode]'
+      editor)
+        _describe 'branch names' all_options
+        ;;
+      ai)
+        _describe 'branch names' all_options
         ;;
       config)
         _values 'config action' get set add unset
         ;;
     esac
   # Complete subsequent arguments
-  elif (( CURRENT >= 4 )); then
-    case "$words[2]" in
+  elif (( CURRENT >= 5 )); then
+    case "$words[3]" in
+      editor)
+        _arguments '--editor[Editor to use]:editor:(cursor vscode zed idea pycharm webstorm vim nvim emacs sublime nano atom none)'
+        ;;
+      ai)
+        _arguments '--ai[AI tool to use]:tool:(aider claude codex cursor continue opencode none)'
+        ;;
       rm)
         _arguments \
           '--delete-branch[Delete branch]' \
           '--force[Force removal even if dirty]' \
           '--yes[Non-interactive mode]'
         ;;
       config)
-        case "$words[3]" in
+        case "$words[4]" in
           get|set|add|unset)
-            _values 'config key' \
-              'gtr.worktrees.dir' \
-              'gtr.worktrees.prefix' \
-              'gtr.defaultBranch' \
-              'gtr.editor.default' \
-              'gtr.ai.default' \
-              'gtr.copy.include' \
-              'gtr.copy.exclude' \
-              'gtr.copy.includeDirs' \
-              'gtr.copy.excludeDirs' \
-              'gtr.hook.postCreate' \
-              'gtr.hook.postRemove'
+            _arguments \
+              '--global[Use global git config]' \
+              '*:config key:(gtr.worktrees.dir gtr.worktrees.prefix gtr.defaultBranch gtr.editor.default gtr.ai.default gtr.copy.include gtr.copy.exclude gtr.copy.includeDirs gtr.copy.excludeDirs gtr.hook.postCreate gtr.hook.postRemove)'
             ;;
         esac
         ;;
     esac
   fi
 }
 
-# Function is auto-discovered by git's completion system - do not call it here
+_git-gtr "$@"

completions/gtr.bash

@@ -48,7 +48,7 @@ _git_gtr() {
     new)
       # Complete flags
       if [[ "$cur" == -* ]]; then
-        COMPREPLY=($(compgen -W "--id --from --track --no-copy --no-fetch --force --name --yes" -- "$cur"))
+        COMPREPLY=($(compgen -W "--id --from --from-current --track --no-copy --no-fetch --force --name --yes" -- "$cur"))
       elif [ "$prev" = "--track" ]; then
         COMPREPLY=($(compgen -W "auto remote local none" -- "$cur"))
       fi

completions/gtr.fish

@@ -48,6 +48,7 @@ complete -f -c git -n '__fish_git_gtr_needs_command' -a help -d 'Show help'
 
 # New command options
 complete -c git -n '__fish_git_gtr_using_command new' -l from -d 'Base ref' -r
+complete -c git -n '__fish_git_gtr_using_command new' -l from-current -d 'Create from current branch'
 complete -c git -n '__fish_git_gtr_using_command new' -l track -d 'Track mode' -r -a 'auto remote local none'
 complete -c git -n '__fish_git_gtr_using_command new' -l no-copy -d 'Skip file copying'
 complete -c git -n '__fish_git_gtr_using_command new' -l no-fetch -d 'Skip git fetch'