fix: honor config when detecting managed worktrees

Author: satococoa

cmd/wtp/cd.go

@@ -20,45 +20,7 @@ import (
 
 // isWorktreeManagedCd determines if a worktree is managed by wtp (for cd command)
 func isWorktreeManagedCd(worktreePath string, cfg *config.Config, mainRepoPath string, isMain bool) bool {
-	// Main worktree is always managed
-	if isMain {
-		return true
-	}
-
-	// Get base directory - use default config if config is not available
-	if cfg == nil {
-		// Create default config when none is available
-		defaultCfg := &config.Config{
-			Defaults: config.Defaults{
-				BaseDir: "../worktrees",
-			},
-		}
-		cfg = defaultCfg
-	}
-
-	baseDir := cfg.ResolveWorktreePath(mainRepoPath, "")
-	// Remove trailing slash if it exists
-	baseDir = strings.TrimSuffix(baseDir, "/")
-
-	// Check if worktree path is under base directory
-	absWorktreePath, err := filepath.Abs(worktreePath)
-	if err != nil {
-		return false
-	}
-
-	absBaseDir, err := filepath.Abs(baseDir)
-	if err != nil {
-		return false
-	}
-
-	// Check if worktree is within base directory
-	relPath, err := filepath.Rel(absBaseDir, absWorktreePath)
-	if err != nil {
-		return false
-	}
-
-	// If relative path starts with "..", it's outside base directory
-	return !strings.HasPrefix(relPath, "..")
+	return isWorktreeManagedCommon(worktreePath, cfg, mainRepoPath, isMain)
 }
 
 // NewCdCommand creates the cd command definition

cmd/wtp/list.go

@@ -162,45 +162,7 @@ func parseWorktreesFromOutput(output string) []git.Worktree {
 
 // isWorktreeManagedList determines if a worktree is managed by wtp (for list command)
 func isWorktreeManagedList(worktreePath string, cfg *config.Config, mainRepoPath string, isMain bool) bool {
-	// Main worktree is always managed
-	if isMain {
-		return true
-	}
-
-	// Get base directory - use default config if config is not available
-	if cfg == nil {
-		// Create default config when none is available
-		defaultCfg := &config.Config{
-			Defaults: config.Defaults{
-				BaseDir: "../worktrees",
-			},
-		}
-		cfg = defaultCfg
-	}
-
-	baseDir := cfg.ResolveWorktreePath(mainRepoPath, "")
-	// Remove trailing slash if it exists
-	baseDir = strings.TrimSuffix(baseDir, "/")
-
-	// Check if worktree path is under base directory
-	absWorktreePath, err := filepath.Abs(worktreePath)
-	if err != nil {
-		return false
-	}
-
-	absBaseDir, err := filepath.Abs(baseDir)
-	if err != nil {
-		return false
-	}
-
-	// Check if worktree is within base directory
-	relPath, err := filepath.Rel(absBaseDir, absWorktreePath)
-	if err != nil {
-		return false
-	}
-
-	// If relative path starts with "..", it's outside base directory
-	return !strings.HasPrefix(relPath, "..")
+	return isWorktreeManagedCommon(worktreePath, cfg, mainRepoPath, isMain)
 }
 
 // formatBranchDisplay formats branch name for display, following Git conventions

cmd/wtp/remove.go

@@ -23,45 +23,7 @@ var removeGetwd = os.Getwd
 
 // isWorktreeManaged determines if a worktree is managed by wtp
 func isWorktreeManaged(worktreePath string, cfg *config.Config, mainRepoPath string, isMain bool) bool {
-	// Main worktree is always managed
-	if isMain {
-		return true
-	}
-
-	// Get base directory - use default config if config is not available
-	if cfg == nil {
-		// Create default config when none is available
-		defaultCfg := &config.Config{
-			Defaults: config.Defaults{
-				BaseDir: "../worktrees",
-			},
-		}
-		cfg = defaultCfg
-	}
-
-	baseDir := cfg.ResolveWorktreePath(mainRepoPath, "")
-	// Remove trailing slash if it exists
-	baseDir = strings.TrimSuffix(baseDir, "/")
-
-	// Check if worktree path is under base directory
-	absWorktreePath, err := filepath.Abs(worktreePath)
-	if err != nil {
-		return false
-	}
-
-	absBaseDir, err := filepath.Abs(baseDir)
-	if err != nil {
-		return false
-	}
-
-	// Check if worktree is within base directory
-	relPath, err := filepath.Rel(absBaseDir, absWorktreePath)
-	if err != nil {
-		return false
-	}
-
-	// If relative path starts with "..", it's outside base directory
-	return !strings.HasPrefix(relPath, "..")
+	return isWorktreeManagedCommon(worktreePath, cfg, mainRepoPath, isMain)
 }
 
 // NewRemoveCommand creates the remove command definition
@@ -163,7 +125,7 @@ func removeCommandWithCommandExecutor(
 		return errors.DirectoryAccessFailed("access current", cwd, err)
 	}
 
-	if isPathWithin(absCwd, absTargetPath) {
+	if isPathWithin(absTargetPath, absCwd) {
 		return errors.CannotRemoveCurrentWorktree(worktreeName, absTargetPath)
 	}
 

cmd/wtp/remove_test.go

@@ -391,7 +391,7 @@ func TestRemoveCommand_WorktreeNotFound_ShowsConsistentNames(t *testing.T) {
 }
 
 func TestRemoveCommand_FailsWhenRemovingCurrentWorktree(t *testing.T) {
-	targetPath := "/repo/worktrees/feature/foo"
+	targetPath := "/worktrees/feature/foo"
 	mockWorktreeList := fmt.Sprintf(
 		"worktree /repo\nHEAD abc123\nbranch refs/heads/main\n\n"+
 			"worktree %s\nHEAD def456\nbranch refs/heads/feature/foo\n\n",

cmd/wtp/worktree_managed.go

@@ -0,0 +1,53 @@
+package main
+
+import (
+	"path/filepath"
+	"strings"
+
+	"github.com/satococoa/wtp/internal/config"
+)
+
+// isWorktreeManagedCommon determines whether a worktree path is considered managed by wtp.
+// The logic is shared across multiple commands so that we consistently classify worktrees.
+func isWorktreeManagedCommon(worktreePath string, cfg *config.Config, mainRepoPath string, isMain bool) bool {
+	if isMain {
+		return true
+	}
+
+	// Fallback to default configuration if none is provided
+	if cfg == nil {
+		cfg = &config.Config{
+			Defaults: config.Defaults{
+				BaseDir: config.DefaultBaseDir,
+			},
+		}
+	}
+
+	baseDir := cfg.ResolveWorktreePath(mainRepoPath, "")
+	baseDir = strings.TrimSuffix(baseDir, string(filepath.Separator))
+
+	absWorktreePath, err := filepath.Abs(worktreePath)
+	if err != nil {
+		return false
+	}
+
+	absBaseDir, err := filepath.Abs(baseDir)
+	if err != nil {
+		return false
+	}
+
+	relPath, err := filepath.Rel(absBaseDir, absWorktreePath)
+	if err != nil {
+		return false
+	}
+
+	if relPath == "." || relPath == "" {
+		return true
+	}
+
+	if relPath == ".." || strings.HasPrefix(relPath, ".."+string(filepath.Separator)) {
+		return false
+	}
+
+	return true
+}