Files
beads/cmd/bd/worktree.go
matt wilkie e01b7412d9 feat: add Git worktree compatibility (PR #478)
Adds comprehensive Git worktree support for beads issue tracking:

Core changes:
- New internal/git/gitdir.go package for worktree detection
- GetGitDir() returns proper .git location (main repo, not worktree)
- Updated all hooks to use git.GetGitDir() instead of local helper
- BeadsDir() now prioritizes main repository's .beads directory

Features:
- Hooks auto-install in main repo when run from worktree
- Shared .beads directory across all worktrees
- Config option no-install-hooks to disable auto-install
- New bd worktree subcommand for diagnostics

Documentation:
- New docs/WORKTREES.md with setup instructions
- Updated CHANGELOG.md and AGENT_INSTRUCTIONS.md

Testing:
- Updated tests to use exported git.GetGitDir()
- Added worktree detection tests

Co-authored-by: Claude <noreply@anthropic.com>
Closes: #478
2025-12-13 12:50:33 -08:00

133 lines
6.2 KiB
Go

package main
import (
"fmt"
"os"
"os/exec"
"path/filepath"
"strings"
"github.com/steveyegge/beads/internal/beads"
"github.com/steveyegge/beads/internal/git"
)
// isGitWorktree detects if the current directory is in a git worktree.
// This is a wrapper around git.IsWorktree() for CLI-layer compatibility.
func isGitWorktree() bool {
return git.IsWorktree()
}
// gitRevParse runs git rev-parse with the given flag and returns the trimmed output.
// This is a helper for CLI utilities that need git command execution.
func gitRevParse(flag string) string {
out, err := exec.Command("git", "rev-parse", flag).Output()
if err != nil {
return ""
}
return strings.TrimSpace(string(out))
}
// getWorktreeGitDir returns the .git directory path for a worktree
// Returns empty string if not in a git repo or not a worktree
func getWorktreeGitDir() string {
gitDir, err := git.GetGitDir()
if err != nil {
return ""
}
return gitDir
}
// warnWorktreeDaemon prints a warning if using daemon with worktrees
// Call this only when daemon mode is actually active (connected)
func warnWorktreeDaemon(dbPathForWarning string) {
if !isGitWorktree() {
return
}
gitDir := getWorktreeGitDir()
beadsDir := filepath.Dir(dbPathForWarning)
if beadsDir == "." || beadsDir == "" {
beadsDir = dbPathForWarning
}
fmt.Fprintln(os.Stderr)
fmt.Fprintln(os.Stderr, "╔══════════════════════════════════════════════════════════════════════════╗")
fmt.Fprintln(os.Stderr, "║ WARNING: Git worktree detected with daemon mode ║")
fmt.Fprintln(os.Stderr, "╠══════════════════════════════════════════════════════════════════════════╣")
fmt.Fprintln(os.Stderr, "║ Git worktrees share the same .beads directory, which can cause the ║")
fmt.Fprintln(os.Stderr, "║ daemon to commit/push to the wrong branch. ║")
fmt.Fprintln(os.Stderr, "║ ║")
fmt.Fprintf(os.Stderr, "║ Shared database: %-55s ║\n", truncateForBox(beadsDir, 55))
fmt.Fprintf(os.Stderr, "║ Worktree git dir: %-54s ║\n", truncateForBox(gitDir, 54))
fmt.Fprintln(os.Stderr, "║ ║")
fmt.Fprintln(os.Stderr, "║ RECOMMENDED SOLUTIONS: ║")
fmt.Fprintln(os.Stderr, "║ 1. Use --no-daemon flag: bd --no-daemon <command> ║")
fmt.Fprintln(os.Stderr, "║ 2. Disable daemon mode: export BEADS_NO_DAEMON=1 ║")
fmt.Fprintln(os.Stderr, "║ ║")
fmt.Fprintln(os.Stderr, "║ Note: BEADS_AUTO_START_DAEMON=false only prevents auto-start; ║")
fmt.Fprintln(os.Stderr, "║ you can still connect to a running daemon. ║")
fmt.Fprintln(os.Stderr, "╚══════════════════════════════════════════════════════════════════════════╝")
fmt.Fprintln(os.Stderr)
}
// truncateForBox truncates a path to fit in the warning box
func truncateForBox(path string, maxLen int) string {
if len(path) <= maxLen {
return path
}
// Truncate with ellipsis
return "..." + path[len(path)-(maxLen-3):]
}
// warnMultipleDatabases prints a warning if multiple .beads databases exist
// in the directory hierarchy, to prevent confusion and database pollution
func warnMultipleDatabases(currentDB string) {
databases := beads.FindAllDatabases()
if len(databases) <= 1 {
return // Only one database found, no warning needed
}
// Find which database is active
activeIdx := -1
for i, db := range databases {
if db.Path == currentDB {
activeIdx = i
break
}
}
fmt.Fprintln(os.Stderr)
fmt.Fprintln(os.Stderr, "╔══════════════════════════════════════════════════════════════════════════╗")
fmt.Fprintf(os.Stderr, "║ WARNING: %d beads databases detected in directory hierarchy ║\n", len(databases))
fmt.Fprintln(os.Stderr, "╠══════════════════════════════════════════════════════════════════════════╣")
fmt.Fprintln(os.Stderr, "║ Multiple databases can cause confusion and database pollution. ║")
fmt.Fprintln(os.Stderr, "║ ║")
for i, db := range databases {
isActive := (i == activeIdx)
issueInfo := ""
if db.IssueCount >= 0 {
issueInfo = fmt.Sprintf(" (%d issues)", db.IssueCount)
}
marker := " "
if isActive {
marker = "▶"
}
line := fmt.Sprintf("%s %s%s", marker, db.BeadsDir, issueInfo)
fmt.Fprintf(os.Stderr, "║ %-72s ║\n", truncateForBox(line, 72))
}
fmt.Fprintln(os.Stderr, "║ ║")
if activeIdx == 0 {
fmt.Fprintln(os.Stderr, "║ Currently using the closest database (▶). This is usually correct. ║")
} else {
fmt.Fprintln(os.Stderr, "║ WARNING: Not using the closest database! Check your BEADS_DB setting. ║")
}
fmt.Fprintln(os.Stderr, "║ ║")
fmt.Fprintln(os.Stderr, "║ RECOMMENDED: Consolidate or remove unused databases to avoid confusion. ║")
fmt.Fprintln(os.Stderr, "╚══════════════════════════════════════════════════════════════════════════╝")
fmt.Fprintln(os.Stderr)
}