Merge pull request #17 from timvw/beads-oss-tasks-z1n

fix: handle missing WORKTREE_ROOT

Author: timvw

main.go

@@ -152,6 +152,26 @@ func branchExists(branch string) bool {
 	return cmd.Run() == nil
 }
 
+func ensureWorktreePath(repo, branch string) (string, error) {
+	targetRoot := filepath.Join(worktreeRoot, repo)
+
+	info, err := os.Stat(targetRoot)
+	switch {
+	case err == nil:
+		if !info.IsDir() {
+			return "", fmt.Errorf("WORKTREE_ROOT path %s is not a directory", targetRoot)
+		}
+	case os.IsNotExist(err):
+		if err := os.MkdirAll(targetRoot, 0o755); err != nil {
+			return "", fmt.Errorf("failed to create WORKTREE_ROOT directory %s: %w", targetRoot, err)
+		}
+	default:
+		return "", fmt.Errorf("failed to access WORKTREE_ROOT directory %s: %w", targetRoot, err)
+	}
+
+	return filepath.Join(targetRoot, branch), nil
+}
+
 func printCDMarker(path string) {
 	fmt.Printf("TREE_ME_CD:%s\n", path)
 }
@@ -309,8 +329,6 @@ var checkoutCmd = &cobra.Command{
 			return err
 		}
 
-		path := filepath.Join(worktreeRoot, repo, branch)
-
 		// Check if worktree already exists
 		if existingPath, exists := worktreeExists(branch); exists {
 			fmt.Printf("✓ Worktree already exists: %s\n", existingPath)
@@ -323,6 +341,11 @@ var checkoutCmd = &cobra.Command{
 			return fmt.Errorf("branch '%s' does not exist\nUse 'wt create %s' to create a new branch", branch, branch)
 		}
 
+		path, err := ensureWorktreePath(repo, branch)
+		if err != nil {
+			return err
+		}
+
 		// Create worktree
 		gitCmd := exec.Command("git", "worktree", "add", path, branch)
 		gitCmd.Stdout = os.Stdout
@@ -353,15 +376,18 @@ var createCmd = &cobra.Command{
 			return err
 		}
 
-		path := filepath.Join(worktreeRoot, repo, branch)
-
 		// Check if worktree already exists
 		if existingPath, exists := worktreeExists(branch); exists {
 			fmt.Printf("✓ Worktree already exists: %s\n", existingPath)
 			printCDMarker(existingPath)
 			return nil
 		}
 
+		path, err := ensureWorktreePath(repo, branch)
+		if err != nil {
+			return err
+		}
+
 		// Create new branch and worktree
 		gitCmd := exec.Command("git", "worktree", "add", path, "-b", branch, base)
 		gitCmd.Stdout = os.Stdout
@@ -493,7 +519,6 @@ func checkoutPROrMR(input string, remoteType RemoteType) error {
 	}
 
 	branch := fmt.Sprintf("%s-%s", prefix, prNumber)
-	path := filepath.Join(worktreeRoot, repo, branch)
 
 	// Check if worktree already exists
 	if existingPath, exists := worktreeExists(branch); exists {
@@ -502,6 +527,11 @@ func checkoutPROrMR(input string, remoteType RemoteType) error {
 		return nil
 	}
 
+	path, err := ensureWorktreePath(repo, branch)
+	if err != nil {
+		return err
+	}
+
 	// Fetch the PR/MR
 	fetchCmd := exec.Command("git", "fetch", "origin", fmt.Sprintf("%s:%s", refSpec, branch))
 	fetchCmd.Stderr = os.Stderr

main_test.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"os"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -620,3 +621,55 @@ invalid line without proper format
 		})
 	}
 }
+
+func TestEnsureWorktreePathCreatesMissingRoot(t *testing.T) {
+	originalRoot := worktreeRoot
+	t.Cleanup(func() {
+		worktreeRoot = originalRoot
+	})
+
+	tmpDir := t.TempDir()
+	worktreeRoot = filepath.Join(tmpDir, "missing-root")
+
+	repo := "example-repo"
+	branch := "feature/foo"
+
+	path, err := ensureWorktreePath(repo, branch)
+	if err != nil {
+		t.Fatalf("ensureWorktreePath() unexpected error: %v", err)
+	}
+
+	expectedPath := filepath.Join(worktreeRoot, repo, branch)
+	if path != expectedPath {
+		t.Fatalf("ensureWorktreePath() = %s, want %s", path, expectedPath)
+	}
+
+	repoDir := filepath.Join(worktreeRoot, repo)
+	info, statErr := os.Stat(repoDir)
+	if statErr != nil {
+		t.Fatalf("expected repo directory to be created at %s: %v", repoDir, statErr)
+	}
+	if !info.IsDir() {
+		t.Fatalf("expected %s to be a directory", repoDir)
+	}
+}
+
+func TestEnsureWorktreePathFailsWhenRootIsFile(t *testing.T) {
+	originalRoot := worktreeRoot
+	t.Cleanup(func() {
+		worktreeRoot = originalRoot
+	})
+
+	tmpDir := t.TempDir()
+	fileRoot := filepath.Join(tmpDir, "file-root")
+
+	if err := os.WriteFile(fileRoot, []byte("not a directory"), 0o644); err != nil {
+		t.Fatalf("failed to create file root: %v", err)
+	}
+
+	worktreeRoot = fileRoot
+
+	if _, err := ensureWorktreePath("repo", "branch"); err == nil {
+		t.Fatal("expected ensureWorktreePath() to fail when WORKTREE_ROOT is a file")
+	}
+}