Add bd doctor check that warns if .beads/last-touched is tracked by git. This file is local runtime state that should never be committed, as it causes spurious diffs in other clones. - CheckLastTouchedNotTracked() detects if file is git-tracked - FixLastTouchedTracking() untracks with git rm --cached - Comprehensive tests for all scenarios Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
686 lines
20 KiB
Go
686 lines
20 KiB
Go
package doctor
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/steveyegge/beads/cmd/bd/doctor/fix"
|
|
"github.com/steveyegge/beads/internal/syncbranch"
|
|
)
|
|
|
|
// GitignoreTemplate is the canonical .beads/.gitignore content
|
|
const GitignoreTemplate = `# SQLite databases
|
|
*.db
|
|
*.db?*
|
|
*.db-journal
|
|
*.db-wal
|
|
*.db-shm
|
|
|
|
# Daemon runtime files
|
|
daemon.lock
|
|
daemon.log
|
|
daemon.pid
|
|
bd.sock
|
|
sync-state.json
|
|
last-touched
|
|
|
|
# Local version tracking (prevents upgrade notification spam after git ops)
|
|
.local_version
|
|
|
|
# Legacy database files
|
|
db.sqlite
|
|
bd.db
|
|
|
|
# Worktree redirect file (contains relative path to main repo's .beads/)
|
|
# Must not be committed as paths would be wrong in other clones
|
|
redirect
|
|
|
|
# Merge artifacts (temporary files from 3-way merge)
|
|
beads.base.jsonl
|
|
beads.base.meta.json
|
|
beads.left.jsonl
|
|
beads.left.meta.json
|
|
beads.right.jsonl
|
|
beads.right.meta.json
|
|
|
|
# Sync state (local-only, per-machine)
|
|
# These files are machine-specific and should not be shared across clones
|
|
.sync.lock
|
|
sync_base.jsonl
|
|
|
|
# NOTE: Do NOT add negation patterns (e.g., !issues.jsonl) here.
|
|
# They would override fork protection in .git/info/exclude, allowing
|
|
# contributors to accidentally commit upstream issue databases.
|
|
# The JSONL files (issues.jsonl, interactions.jsonl) and config files
|
|
# are tracked by git by default since no pattern above ignores them.
|
|
`
|
|
|
|
// requiredPatterns are patterns that MUST be in .beads/.gitignore
|
|
var requiredPatterns = []string{
|
|
"beads.base.jsonl",
|
|
"beads.left.jsonl",
|
|
"beads.right.jsonl",
|
|
"beads.base.meta.json",
|
|
"beads.left.meta.json",
|
|
"beads.right.meta.json",
|
|
"*.db?*",
|
|
"redirect",
|
|
"last-touched",
|
|
".sync.lock",
|
|
"sync_base.jsonl",
|
|
}
|
|
|
|
// CheckGitignore checks if .beads/.gitignore is up to date
|
|
func CheckGitignore() DoctorCheck {
|
|
gitignorePath := filepath.Join(".beads", ".gitignore")
|
|
|
|
// Check if file exists
|
|
content, err := os.ReadFile(gitignorePath) // #nosec G304 -- path is hardcoded
|
|
if err != nil {
|
|
return DoctorCheck{
|
|
Name: "Gitignore",
|
|
Status: "warning",
|
|
Message: ".beads/.gitignore not found",
|
|
Fix: "Run: bd init (safe to re-run) or bd doctor --fix",
|
|
}
|
|
}
|
|
|
|
// Check for required patterns
|
|
contentStr := string(content)
|
|
var missing []string
|
|
for _, pattern := range requiredPatterns {
|
|
if !strings.Contains(contentStr, pattern) {
|
|
missing = append(missing, pattern)
|
|
}
|
|
}
|
|
|
|
if len(missing) > 0 {
|
|
return DoctorCheck{
|
|
Name: "Gitignore",
|
|
Status: "warning",
|
|
Message: "Outdated .beads/.gitignore (missing merge artifact patterns)",
|
|
Detail: "Missing: " + strings.Join(missing, ", "),
|
|
Fix: "Run: bd doctor --fix or bd init (safe to re-run)",
|
|
}
|
|
}
|
|
|
|
return DoctorCheck{
|
|
Name: "Gitignore",
|
|
Status: "ok",
|
|
Message: "Up to date",
|
|
}
|
|
}
|
|
|
|
// FixGitignore updates .beads/.gitignore to the current template
|
|
func FixGitignore() error {
|
|
gitignorePath := filepath.Join(".beads", ".gitignore")
|
|
|
|
// If file exists and is read-only, fix permissions first
|
|
if info, err := os.Stat(gitignorePath); err == nil {
|
|
if info.Mode().Perm()&0200 == 0 { // No write permission for owner
|
|
if err := os.Chmod(gitignorePath, 0600); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
|
|
// Write canonical template with secure file permissions
|
|
if err := os.WriteFile(gitignorePath, []byte(GitignoreTemplate), 0600); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Ensure permissions are set correctly (some systems respect umask)
|
|
if err := os.Chmod(gitignorePath, 0600); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// CheckIssuesTracking verifies that issues.jsonl is tracked by git.
|
|
// This catches cases where global gitignore patterns (e.g., *.jsonl) would
|
|
// cause issues.jsonl to be ignored, breaking bd sync.
|
|
// In sync-branch mode, the file may be intentionally ignored in working branches (GH#858).
|
|
func CheckIssuesTracking() DoctorCheck {
|
|
issuesPath := filepath.Join(".beads", "issues.jsonl")
|
|
|
|
// First check if the file exists
|
|
if _, err := os.Stat(issuesPath); os.IsNotExist(err) {
|
|
// File doesn't exist yet - not an error, bd init may not have been run
|
|
return DoctorCheck{
|
|
Name: "Issues Tracking",
|
|
Status: "ok",
|
|
Message: "No issues.jsonl yet (will be created on first issue)",
|
|
}
|
|
}
|
|
|
|
// In sync-branch mode, JSONL files may be intentionally ignored in working branches.
|
|
// They are tracked only in the dedicated sync branch.
|
|
if branch := syncbranch.GetFromYAML(); branch != "" {
|
|
return DoctorCheck{
|
|
Name: "Issues Tracking",
|
|
Status: StatusOK,
|
|
Message: "N/A (sync-branch mode)",
|
|
Detail: fmt.Sprintf("JSONL files tracked in '%s' branch only", branch),
|
|
}
|
|
}
|
|
|
|
// Check if git considers this file ignored
|
|
// git check-ignore exits 0 if ignored, 1 if not ignored, 128 if error
|
|
cmd := exec.Command("git", "check-ignore", "-q", issuesPath) // #nosec G204 - args are hardcoded paths
|
|
err := cmd.Run()
|
|
|
|
if err == nil {
|
|
// Exit code 0 means the file IS ignored - this is bad
|
|
// Get details about what's ignoring it
|
|
detailCmd := exec.Command("git", "check-ignore", "-v", issuesPath) // #nosec G204 - args are hardcoded paths
|
|
output, _ := detailCmd.Output()
|
|
detail := strings.TrimSpace(string(output))
|
|
|
|
return DoctorCheck{
|
|
Name: "Issues Tracking",
|
|
Status: "warning",
|
|
Message: "issues.jsonl is ignored by git (bd sync will fail)",
|
|
Detail: detail,
|
|
Fix: "Check global gitignore: git config --global core.excludesfile",
|
|
}
|
|
}
|
|
|
|
// Exit code 1 means not ignored (good), any other error we ignore
|
|
return DoctorCheck{
|
|
Name: "Issues Tracking",
|
|
Status: "ok",
|
|
Message: "issues.jsonl is tracked by git",
|
|
}
|
|
}
|
|
|
|
// CheckRedirectNotTracked verifies that .beads/redirect is NOT tracked by git.
|
|
// Redirect files contain relative paths that only work in the original worktree.
|
|
// If committed, they cause warnings in other clones where the path is invalid.
|
|
func CheckRedirectNotTracked() DoctorCheck {
|
|
redirectPath := filepath.Join(".beads", "redirect")
|
|
|
|
// First check if the file exists
|
|
if _, err := os.Stat(redirectPath); os.IsNotExist(err) {
|
|
// File doesn't exist - nothing to check
|
|
return DoctorCheck{
|
|
Name: "Redirect Tracking",
|
|
Status: StatusOK,
|
|
Message: "No redirect file present",
|
|
}
|
|
}
|
|
|
|
// Check if git considers this file tracked
|
|
// git ls-files exits 0 and outputs the filename if tracked, empty if untracked
|
|
cmd := exec.Command("git", "ls-files", redirectPath) // #nosec G204 - args are hardcoded paths
|
|
output, err := cmd.Output()
|
|
if err != nil {
|
|
// Not in a git repo or git error - skip check
|
|
return DoctorCheck{
|
|
Name: "Redirect Tracking",
|
|
Status: StatusOK,
|
|
Message: "N/A (not a git repository)",
|
|
}
|
|
}
|
|
|
|
trackedPath := strings.TrimSpace(string(output))
|
|
if trackedPath == "" {
|
|
// File exists but is not tracked - this is correct
|
|
return DoctorCheck{
|
|
Name: "Redirect Tracking",
|
|
Status: StatusOK,
|
|
Message: "redirect file not tracked (correct)",
|
|
}
|
|
}
|
|
|
|
// File is tracked - this is a problem
|
|
return DoctorCheck{
|
|
Name: "Redirect Tracking",
|
|
Status: StatusWarning,
|
|
Message: "redirect file is tracked by git",
|
|
Detail: "The .beads/redirect file contains a relative path that only works in this worktree. When committed, it causes warnings in other clones.",
|
|
Fix: "Run 'bd doctor --fix' to untrack, or manually: git rm --cached .beads/redirect",
|
|
}
|
|
}
|
|
|
|
// FixRedirectTracking untracks the .beads/redirect file from git
|
|
func FixRedirectTracking() error {
|
|
redirectPath := filepath.Join(".beads", "redirect")
|
|
|
|
// Check if file is actually tracked first
|
|
cmd := exec.Command("git", "ls-files", redirectPath) // #nosec G204 - args are hardcoded paths
|
|
output, err := cmd.Output()
|
|
if err != nil {
|
|
return nil // Not a git repo, nothing to do
|
|
}
|
|
|
|
trackedPath := strings.TrimSpace(string(output))
|
|
if trackedPath == "" {
|
|
return nil // Not tracked, nothing to do
|
|
}
|
|
|
|
// Untrack the file (keeps the local copy)
|
|
cmd = exec.Command("git", "rm", "--cached", redirectPath) // #nosec G204 - args are hardcoded paths
|
|
if err := cmd.Run(); err != nil {
|
|
return fmt.Errorf("failed to untrack redirect file: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// CheckRedirectTargetValid verifies that the redirect target exists and has a valid beads database.
|
|
// This catches cases where the redirect points to a non-existent directory or one without a database.
|
|
func CheckRedirectTargetValid() DoctorCheck {
|
|
redirectPath := filepath.Join(".beads", "redirect")
|
|
|
|
// Check if redirect file exists
|
|
data, err := os.ReadFile(redirectPath) // #nosec G304 - path is hardcoded
|
|
if os.IsNotExist(err) {
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Valid",
|
|
Status: StatusOK,
|
|
Message: "No redirect configured",
|
|
}
|
|
}
|
|
if err != nil {
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Valid",
|
|
Status: StatusWarning,
|
|
Message: "Cannot read redirect file",
|
|
Detail: err.Error(),
|
|
}
|
|
}
|
|
|
|
// Parse redirect target
|
|
target := strings.TrimSpace(string(data))
|
|
if target == "" {
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Valid",
|
|
Status: StatusWarning,
|
|
Message: "Redirect file is empty",
|
|
Fix: "Remove the empty redirect file or add a valid path",
|
|
}
|
|
}
|
|
|
|
// Resolve the redirect path relative to the parent of .beads
|
|
cwd, err := os.Getwd()
|
|
if err != nil {
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Valid",
|
|
Status: StatusWarning,
|
|
Message: "Cannot determine current directory",
|
|
}
|
|
}
|
|
|
|
resolvedTarget := filepath.Clean(filepath.Join(cwd, target))
|
|
|
|
// Check if target directory exists
|
|
info, err := os.Stat(resolvedTarget)
|
|
if os.IsNotExist(err) {
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Valid",
|
|
Status: StatusError,
|
|
Message: "Redirect target does not exist",
|
|
Detail: fmt.Sprintf("Target: %s", resolvedTarget),
|
|
Fix: "Fix the redirect path or create the target directory",
|
|
}
|
|
}
|
|
if err != nil {
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Valid",
|
|
Status: StatusWarning,
|
|
Message: "Cannot access redirect target",
|
|
Detail: err.Error(),
|
|
}
|
|
}
|
|
if !info.IsDir() {
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Valid",
|
|
Status: StatusError,
|
|
Message: "Redirect target is not a directory",
|
|
Detail: fmt.Sprintf("Target: %s", resolvedTarget),
|
|
}
|
|
}
|
|
|
|
// Check for valid beads database in target
|
|
dbPath := filepath.Join(resolvedTarget, "beads.db")
|
|
if _, err := os.Stat(dbPath); os.IsNotExist(err) {
|
|
// Also check for any .db file
|
|
matches, _ := filepath.Glob(filepath.Join(resolvedTarget, "*.db"))
|
|
if len(matches) == 0 {
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Valid",
|
|
Status: StatusWarning,
|
|
Message: "Redirect target has no beads database",
|
|
Detail: fmt.Sprintf("Target: %s", resolvedTarget),
|
|
Fix: "Run 'bd init' in the target directory or check redirect path",
|
|
}
|
|
}
|
|
}
|
|
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Valid",
|
|
Status: StatusOK,
|
|
Message: fmt.Sprintf("Redirect target valid: %s", resolvedTarget),
|
|
}
|
|
}
|
|
|
|
// CheckRedirectTargetSyncWorktree verifies that the redirect target has a working beads-sync worktree.
|
|
// This is important for repos using sync-branch mode with redirects.
|
|
func CheckRedirectTargetSyncWorktree() DoctorCheck {
|
|
redirectPath := filepath.Join(".beads", "redirect")
|
|
|
|
// Check if redirect file exists
|
|
data, err := os.ReadFile(redirectPath) // #nosec G304 - path is hardcoded
|
|
if os.IsNotExist(err) {
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Sync",
|
|
Status: StatusOK,
|
|
Message: "No redirect configured",
|
|
}
|
|
}
|
|
if err != nil {
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Sync",
|
|
Status: StatusOK, // Don't warn if we can't read - other check handles that
|
|
Message: "N/A (cannot read redirect)",
|
|
}
|
|
}
|
|
|
|
target := strings.TrimSpace(string(data))
|
|
if target == "" {
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Sync",
|
|
Status: StatusOK,
|
|
Message: "N/A (empty redirect)",
|
|
}
|
|
}
|
|
|
|
// Resolve the target path
|
|
cwd, err := os.Getwd()
|
|
if err != nil {
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Sync",
|
|
Status: StatusOK,
|
|
Message: "N/A (cannot determine cwd)",
|
|
}
|
|
}
|
|
|
|
resolvedTarget := filepath.Clean(filepath.Join(cwd, target))
|
|
|
|
// Check if the target has a sync-branch configured in config.yaml
|
|
configPath := filepath.Join(resolvedTarget, "config.yaml")
|
|
configData, err := os.ReadFile(configPath) // #nosec G304 - constructed from known path
|
|
if err != nil {
|
|
// No config.yaml means no sync-branch, which is fine
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Sync",
|
|
Status: StatusOK,
|
|
Message: "N/A (target not using sync-branch mode)",
|
|
}
|
|
}
|
|
|
|
// Simple check for sync-branch in config
|
|
if !strings.Contains(string(configData), "sync-branch:") {
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Sync",
|
|
Status: StatusOK,
|
|
Message: "N/A (target not using sync-branch mode)",
|
|
}
|
|
}
|
|
|
|
// Target uses sync-branch - check for beads-sync worktree in the repo containing the target
|
|
// The target is inside a .beads dir, so the repo is the parent of .beads
|
|
targetRepoRoot := filepath.Dir(resolvedTarget)
|
|
|
|
// Check for beads-sync worktree
|
|
worktreePath := filepath.Join(targetRepoRoot, ".beads-sync")
|
|
if _, err := os.Stat(worktreePath); os.IsNotExist(err) {
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Sync",
|
|
Status: StatusWarning,
|
|
Message: "Redirect target missing beads-sync worktree",
|
|
Detail: fmt.Sprintf("Expected worktree at: %s", worktreePath),
|
|
Fix: fmt.Sprintf("Run 'bd sync' in %s to create the worktree", targetRepoRoot),
|
|
}
|
|
}
|
|
|
|
return DoctorCheck{
|
|
Name: "Redirect Target Sync",
|
|
Status: StatusOK,
|
|
Message: "Redirect target has beads-sync worktree",
|
|
}
|
|
}
|
|
|
|
// CheckNoVestigialSyncWorktrees detects beads-sync worktrees in redirected repos that are unused.
|
|
// When a repo uses .beads/redirect, it doesn't need its own beads-sync worktree since
|
|
// sync operations happen in the redirect target. These vestigial worktrees waste space.
|
|
func CheckNoVestigialSyncWorktrees() DoctorCheck {
|
|
redirectPath := filepath.Join(".beads", "redirect")
|
|
|
|
// Check if redirect file exists
|
|
if _, err := os.Stat(redirectPath); os.IsNotExist(err) {
|
|
// No redirect - this check doesn't apply
|
|
return DoctorCheck{
|
|
Name: "Vestigial Sync Worktrees",
|
|
Status: StatusOK,
|
|
Message: "N/A (no redirect configured)",
|
|
}
|
|
}
|
|
|
|
// Check for local .beads-sync worktree
|
|
cwd, err := os.Getwd()
|
|
if err != nil {
|
|
return DoctorCheck{
|
|
Name: "Vestigial Sync Worktrees",
|
|
Status: StatusOK,
|
|
Message: "N/A (cannot determine cwd)",
|
|
}
|
|
}
|
|
|
|
// Walk up to find git root
|
|
gitRoot := cwd
|
|
for {
|
|
if _, err := os.Stat(filepath.Join(gitRoot, ".git")); err == nil {
|
|
break
|
|
}
|
|
parent := filepath.Dir(gitRoot)
|
|
if parent == gitRoot {
|
|
// Reached filesystem root, not in a git repo
|
|
return DoctorCheck{
|
|
Name: "Vestigial Sync Worktrees",
|
|
Status: StatusOK,
|
|
Message: "N/A (not in git repository)",
|
|
}
|
|
}
|
|
gitRoot = parent
|
|
}
|
|
|
|
// Check for .beads-sync worktree
|
|
syncWorktreePath := filepath.Join(gitRoot, ".beads-sync")
|
|
if _, err := os.Stat(syncWorktreePath); os.IsNotExist(err) {
|
|
// No local worktree - good
|
|
return DoctorCheck{
|
|
Name: "Vestigial Sync Worktrees",
|
|
Status: StatusOK,
|
|
Message: "No vestigial sync worktrees found",
|
|
}
|
|
}
|
|
|
|
// Found a local .beads-sync but we have a redirect - this is vestigial
|
|
return DoctorCheck{
|
|
Name: "Vestigial Sync Worktrees",
|
|
Status: StatusWarning,
|
|
Message: "Vestigial .beads-sync worktree found",
|
|
Detail: fmt.Sprintf("This repo uses redirect but has unused worktree at: %s", syncWorktreePath),
|
|
Fix: fmt.Sprintf("Remove with: rm -rf %s", syncWorktreePath),
|
|
}
|
|
}
|
|
|
|
// CheckLastTouchedNotTracked verifies that .beads/last-touched is NOT tracked by git.
|
|
// The last-touched file is local runtime state that should never be committed.
|
|
// If committed, it causes spurious diffs in other clones.
|
|
func CheckLastTouchedNotTracked() DoctorCheck {
|
|
lastTouchedPath := filepath.Join(".beads", "last-touched")
|
|
|
|
// First check if the file exists
|
|
if _, err := os.Stat(lastTouchedPath); os.IsNotExist(err) {
|
|
// File doesn't exist - nothing to check
|
|
return DoctorCheck{
|
|
Name: "Last-Touched Tracking",
|
|
Status: StatusOK,
|
|
Message: "No last-touched file present",
|
|
}
|
|
}
|
|
|
|
// Check if git considers this file tracked
|
|
// git ls-files exits 0 and outputs the filename if tracked, empty if untracked
|
|
cmd := exec.Command("git", "ls-files", lastTouchedPath) // #nosec G204 - args are hardcoded paths
|
|
output, err := cmd.Output()
|
|
if err != nil {
|
|
// Not in a git repo or git error - skip check
|
|
return DoctorCheck{
|
|
Name: "Last-Touched Tracking",
|
|
Status: StatusOK,
|
|
Message: "N/A (not a git repository)",
|
|
}
|
|
}
|
|
|
|
trackedPath := strings.TrimSpace(string(output))
|
|
if trackedPath == "" {
|
|
// File exists but is not tracked - this is correct
|
|
return DoctorCheck{
|
|
Name: "Last-Touched Tracking",
|
|
Status: StatusOK,
|
|
Message: "last-touched file not tracked (correct)",
|
|
}
|
|
}
|
|
|
|
// File is tracked - this is a problem
|
|
return DoctorCheck{
|
|
Name: "Last-Touched Tracking",
|
|
Status: StatusWarning,
|
|
Message: "last-touched file is tracked by git",
|
|
Detail: "The .beads/last-touched file is local runtime state that should never be committed.",
|
|
Fix: "Run 'bd doctor --fix' to untrack, or manually: git rm --cached .beads/last-touched",
|
|
}
|
|
}
|
|
|
|
// FixLastTouchedTracking untracks the .beads/last-touched file from git
|
|
func FixLastTouchedTracking() error {
|
|
lastTouchedPath := filepath.Join(".beads", "last-touched")
|
|
|
|
// Check if file is actually tracked first
|
|
cmd := exec.Command("git", "ls-files", lastTouchedPath) // #nosec G204 - args are hardcoded paths
|
|
output, err := cmd.Output()
|
|
if err != nil {
|
|
return nil // Not a git repo, nothing to do
|
|
}
|
|
|
|
trackedPath := strings.TrimSpace(string(output))
|
|
if trackedPath == "" {
|
|
return nil // Not tracked, nothing to do
|
|
}
|
|
|
|
// Untrack the file (keeps the local copy)
|
|
cmd = exec.Command("git", "rm", "--cached", lastTouchedPath) // #nosec G204 - args are hardcoded paths
|
|
if err := cmd.Run(); err != nil {
|
|
return fmt.Errorf("failed to untrack last-touched file: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// CheckSyncBranchGitignore checks if git index flags are set on issues.jsonl when sync.branch is configured.
|
|
// Without these flags, the file appears modified in git status even though changes go to the sync branch.
|
|
// GH#797, GH#801, GH#870.
|
|
func CheckSyncBranchGitignore() DoctorCheck {
|
|
// Only relevant when sync.branch is configured
|
|
branch := syncbranch.GetFromYAML()
|
|
if branch == "" {
|
|
return DoctorCheck{
|
|
Name: "Sync Branch Gitignore",
|
|
Status: StatusOK,
|
|
Message: "N/A (sync.branch not configured)",
|
|
}
|
|
}
|
|
|
|
issuesPath := filepath.Join(".beads", "issues.jsonl")
|
|
|
|
// Check if file exists
|
|
if _, err := os.Stat(issuesPath); os.IsNotExist(err) {
|
|
return DoctorCheck{
|
|
Name: "Sync Branch Gitignore",
|
|
Status: StatusOK,
|
|
Message: "No issues.jsonl yet",
|
|
}
|
|
}
|
|
|
|
// Check if file is tracked by git
|
|
cmd := exec.Command("git", "ls-files", "--error-unmatch", issuesPath) // #nosec G204 - args are hardcoded paths
|
|
if err := cmd.Run(); err != nil {
|
|
// File is not tracked - check if it's excluded
|
|
return DoctorCheck{
|
|
Name: "Sync Branch Gitignore",
|
|
Status: StatusOK,
|
|
Message: "issues.jsonl is not tracked (via .gitignore or exclude)",
|
|
}
|
|
}
|
|
|
|
// File is tracked - check for git index flags
|
|
cwd, err := os.Getwd()
|
|
if err != nil {
|
|
return DoctorCheck{
|
|
Name: "Sync Branch Gitignore",
|
|
Status: StatusWarning,
|
|
Message: "Cannot determine current directory",
|
|
}
|
|
}
|
|
|
|
hasAnyFlag, _, err := fix.HasSyncBranchGitignoreFlags(cwd)
|
|
if err != nil {
|
|
return DoctorCheck{
|
|
Name: "Sync Branch Gitignore",
|
|
Status: StatusWarning,
|
|
Message: "Cannot check git index flags",
|
|
Detail: err.Error(),
|
|
}
|
|
}
|
|
|
|
if hasAnyFlag {
|
|
return DoctorCheck{
|
|
Name: "Sync Branch Gitignore",
|
|
Status: StatusOK,
|
|
Message: "Git index flags set (issues.jsonl hidden from git status)",
|
|
}
|
|
}
|
|
|
|
// No flags set - this is the problem case
|
|
return DoctorCheck{
|
|
Name: "Sync Branch Gitignore",
|
|
Status: StatusWarning,
|
|
Message: "issues.jsonl shows as modified (missing git index flags)",
|
|
Detail: fmt.Sprintf("sync.branch='%s' configured but issues.jsonl appears in git status", branch),
|
|
Fix: "Run 'bd doctor --fix' or 'bd sync' to set git index flags",
|
|
}
|
|
}
|
|
|
|
// FixSyncBranchGitignore sets git index flags on issues.jsonl when sync.branch is configured.
|
|
func FixSyncBranchGitignore() error {
|
|
// Only relevant when sync.branch is configured
|
|
branch := syncbranch.GetFromYAML()
|
|
if branch == "" {
|
|
return nil // Not in sync-branch mode, nothing to do
|
|
}
|
|
|
|
cwd, err := os.Getwd()
|
|
if err != nil {
|
|
return fmt.Errorf("cannot determine current directory: %w", err)
|
|
}
|
|
|
|
return fix.SyncBranchGitignore(cwd)
|
|
}
|