Merge pull request #27 from satococoa/fix-completion-bug

fix: repair shell completion flag handling

Author: satococoa

README.md

@@ -67,7 +67,7 @@ worktree. No more terminal tab confusion.
   - Linux (x86_64 or ARM64)
   - macOS (Apple Silicon M1/M2/M3)
 - One of the following shells (for completion support):
-  - Bash
+  - Bash (4+/5.x) with bash-completion v2
   - Zsh
   - Fish
 
@@ -252,13 +252,18 @@ or any other worktree).
 
 #### If installed via Homebrew
 
-No manual setup required. Homebrew installs a tiny bootstrapper that runs `wtp shell-init <shell>` the first time you press `TAB` after typing `wtp`. That lazy call gives you both tab completion and the `wtp cd` integration for the rest of the session—no rc edits needed.
+No manual setup required. Homebrew installs a tiny bootstrapper that runs
+`wtp shell-init <shell>` the first time you press `TAB` after typing `wtp`. That
+lazy call gives you both tab completion and the `wtp cd` integration for the
+rest of the session—no rc edits needed.
 
-Need to refresh inside an existing shell? Just run `wtp shell-init <shell>` yourself.
+Need to refresh inside an existing shell? Just run `wtp shell-init <shell>`
+yourself.
 
 #### If installed via go install
 
-Add a single line to your shell configuration file to enable both completion and shell integration:
+Add a single line to your shell configuration file to enable both completion and
+shell integration:
 
 ```bash
 # Bash: Add to ~/.bashrc or ~/.bash_profile
@@ -271,13 +276,20 @@ eval "$(wtp shell-init zsh)"
 wtp shell-init fish | source
 ```
 
+> **Note:** Bash completion requires bash-completion v2. On macOS, install
+> Homebrew’s Bash 5.x and `bash-completion@2`, then
+> `source /opt/homebrew/etc/profile.d/bash_completion.sh` (or the path shown
+> after installation) before enabling the one-liner above.
+
 After reloading your shell you get the same experience as Homebrew users.
 
 ### Navigation with wtp cd
 
-The `wtp cd` command outputs the absolute path to a worktree. You can use it in two ways:
+The `wtp cd` command outputs the absolute path to a worktree. You can use it in
+two ways:
 
 #### Direct Usage
+
 ```bash
 # Change to a worktree using command substitution
 cd "$(wtp cd feature/auth)"
@@ -288,8 +300,10 @@ cd "$(wtp cd @)"
 
 #### With Shell Hook (Recommended)
 
-For a more seamless experience, enable the shell hook. `wtp shell-init <shell>` already bundles it, so Homebrew users get the hook automatically and go install users get it from the one-liner above. If you only want the hook without completions, you can still run `wtp hook <shell>` manually.
-
+For a more seamless experience, enable the shell hook. `wtp shell-init <shell>`
+already bundles it, so Homebrew users get the hook automatically and go install
+users get it from the one-liner above. If you only want the hook without
+completions, you can still run `wtp hook <shell>` manually.
 
 Then use the simplified syntax:
 
@@ -306,7 +320,9 @@ wtp cd <TAB>
 
 #### Complete Setup (Lazy Loading for Homebrew Users)
 
-Homebrew ships a lightweight bootstrapper. Press `TAB` after typing `wtp` and it evaluates `wtp shell-init <shell>` once for your session—tab completion and `wtp cd` just work.
+Homebrew ships a lightweight bootstrapper. Press `TAB` after typing `wtp` and it
+evaluates `wtp shell-init <shell>` once for your session—tab completion and
+`wtp cd` just work.
 
 ## Worktree Structure
 
@@ -372,6 +388,7 @@ go tool task build
 # Run locally
 ./wtp --help
 ```
+
 ## License
 
 MIT License - see [LICENSE](LICENSE) file for details.

cmd/wtp/add.go

@@ -171,6 +171,13 @@ func analyzeGitWorktreeError(workTreePath, branchName string, gitError error, gi
 		}
 	}
 
+	if isBranchAlreadyExistsError(errorOutput) {
+		return &BranchAlreadyExistsError{
+			BranchName: branchName,
+			GitError:   gitError,
+		}
+	}
+
 	if isPathAlreadyExistsError(errorOutput) {
 		return &PathAlreadyExistsError{
 			Path:     workTreePath,
@@ -227,6 +234,11 @@ func isWorktreeAlreadyExistsError(errorOutput string) bool {
 		strings.Contains(errorOutput, "already used by worktree")
 }
 
+func isBranchAlreadyExistsError(errorOutput string) bool {
+	return strings.Contains(errorOutput, "branch") &&
+		strings.Contains(errorOutput, "already exists")
+}
+
 func isPathAlreadyExistsError(errorOutput string) bool {
 	return strings.Contains(errorOutput, "already exists")
 }
@@ -264,6 +276,24 @@ Solutions:
 Original error: %v`, e.BranchName, e.BranchName, e.GitError)
 }
 
+type BranchAlreadyExistsError struct {
+	BranchName string
+	GitError   error
+}
+
+func (e *BranchAlreadyExistsError) Error() string {
+	return fmt.Sprintf(`branch '%s' already exists
+
+The branch '%s' already exists in this repository.
+
+Solutions:
+  • Run 'wtp add %s' to create a worktree for the existing branch
+  • Choose a different branch name with '--branch'
+  • Delete the existing branch if it's no longer needed
+
+Original error: %v`, e.BranchName, e.BranchName, e.BranchName, e.GitError)
+}
+
 type PathAlreadyExistsError struct {
 	Path     string
 	GitError error
@@ -395,7 +425,12 @@ func getBranches(w io.Writer) error {
 }
 
 // completeBranches provides branch name completion for urfave/cli (wrapper for getBranches)
-func completeBranches(_ context.Context, _ *cli.Command) {
+func completeBranches(_ context.Context, cmd *cli.Command) {
+	current, previous := completionArgsFromCommand(cmd)
+	if maybeCompleteFlagSuggestions(cmd, current, previous) {
+		return
+	}
+
 	var buf bytes.Buffer
 	if err := getBranches(&buf); err != nil {
 		return

cmd/wtp/add_test.go

@@ -79,6 +79,42 @@ func TestWorkTreeAlreadyExistsError(t *testing.T) {
 	})
 }
 
+func TestBranchAlreadyExistsError(t *testing.T) {
+	t.Run("should format error message with branch name and guidance", func(t *testing.T) {
+		// Given: a BranchAlreadyExistsError with branch name and git error
+		originalErr := &MockGitError{msg: "A branch named 'feature/auth' already exists."}
+		err := &BranchAlreadyExistsError{
+			BranchName: "feature/auth",
+			GitError:   originalErr,
+		}
+
+		// When: getting error message
+		message := err.Error()
+
+		// Then: should contain branch name, guidance, and original error
+		assert.Contains(t, message, "branch 'feature/auth' already exists")
+		assert.Contains(t, message, "wtp add feature/auth")
+		assert.Contains(t, message, "Choose a different branch name")
+		assert.Contains(t, message, "Delete the existing branch")
+		assert.Contains(t, message, "A branch named 'feature/auth' already exists.")
+	})
+
+	t.Run("should handle empty branch name", func(t *testing.T) {
+		// Given: error with empty branch name
+		err := &BranchAlreadyExistsError{
+			BranchName: "",
+			GitError:   &MockGitError{msg: "test error"},
+		}
+
+		// When: getting error message
+		message := err.Error()
+
+		// Then: should still provide valid message
+		assert.Contains(t, message, "branch '' already exists")
+		assert.Contains(t, message, "test error")
+	})
+}
+
 func TestPathAlreadyExistsError(t *testing.T) {
 	t.Run("should format error message with path and solutions", func(t *testing.T) {
 		// Given: a PathAlreadyExistsError with path and git error
@@ -875,6 +911,14 @@ func TestAnalyzeGitWorktreeError(t *testing.T) {
 			expectedError: "",
 			expectedType:  &PathAlreadyExistsError{},
 		},
+		{
+			name:          "branch already exists error",
+			workTreePath:  "/path/to/worktree",
+			branchName:    "existing-branch",
+			gitOutput:     "fatal: A branch named 'existing-branch' already exists.",
+			expectedError: "",
+			expectedType:  &BranchAlreadyExistsError{},
+		},
 		{
 			name:          "multiple branches error",
 			workTreePath:  "/path/to/worktree",

cmd/wtp/app.go

@@ -0,0 +1,31 @@
+package main
+
+import "github.com/urfave/cli/v3"
+
+func newApp() *cli.Command {
+	return &cli.Command{
+		Name:  "wtp",
+		Usage: "Enhanced Git worktree management",
+		Description: "wtp (Worktree Plus) simplifies Git worktree creation with automatic branch tracking, " +
+			"project-specific setup hooks, and convenient defaults.",
+		Version:                         version,
+		EnableShellCompletion:           true,
+		ConfigureShellCompletionCommand: configureCompletionCommand,
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:  "version",
+				Usage: "Show version information",
+			},
+		},
+		Commands: []*cli.Command{
+			NewAddCommand(),
+			NewListCommand(),
+			NewRemoveCommand(),
+			NewInitCommand(),
+			NewCdCommand(),
+			// Built-in completion is automatically provided by urfave/cli
+			NewHookCommand(),
+			NewShellInitCommand(),
+		},
+	}
+}

cmd/wtp/cd.go

@@ -355,15 +355,51 @@ func getWorktreesForCd(w io.Writer) error {
 }
 
 // completeWorktreesForCd provides worktree name completion for cd command (wrapper for getWorktreesForCd)
-func completeWorktreesForCd(_ context.Context, _ *cli.Command) {
+func completeWorktreesForCd(_ context.Context, cmd *cli.Command) {
+	current, previous := completionArgsFromCommand(cmd)
+
+	if maybeCompleteFlagSuggestions(cmd, current, previous) {
+		return
+	}
+
+	currentNormalized := strings.TrimSuffix(current, "*")
+
+	if currentNormalized == "" && len(previous) > 0 {
+		return
+	}
+
 	var buf bytes.Buffer
 	if err := getWorktreesForCd(&buf); err != nil {
 		return
 	}
 
+	used := make(map[string]struct{}, len(previous))
+	for _, arg := range previous {
+		if arg == "" || strings.HasPrefix(arg, "-") {
+			continue
+		}
+		key := strings.TrimSuffix(arg, "*")
+		used[key] = struct{}{}
+	}
+
 	// Output each line using fmt.Println for urfave/cli compatibility
 	scanner := bufio.NewScanner(&buf)
 	for scanner.Scan() {
-		fmt.Println(scanner.Text())
+		raw := scanner.Text()
+		candidate := strings.TrimSuffix(raw, "*")
+
+		if candidate == "" {
+			continue
+		}
+
+		if _, exists := used[candidate]; exists {
+			continue
+		}
+
+		if currentNormalized != "" && candidate == currentNormalized {
+			continue
+		}
+
+		fmt.Println(candidate)
 	}
 }