fix(doctor): use effective beads dir for shared-server checks (beads-9f74-385)

Author: osamu2001

cmd/bd/doctor/bare_parent_fallback_test.go

@@ -0,0 +1,91 @@
+package doctor
+
+import (
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/steveyegge/beads/internal/utils"
+)
+
+func TestResolveBeadsDirForRepo_BareParentWorktreeFallback(t *testing.T) {
+	bareDir, featureWorktreeDir := setupBareParentWorktreeForDoctorTest(t)
+	bareBeadsDir := filepath.Join(bareDir, ".beads")
+	if err := os.MkdirAll(bareBeadsDir, 0o750); err != nil {
+		t.Fatal(err)
+	}
+
+	resolved := ResolveBeadsDirForRepo(featureWorktreeDir)
+	if resolved != utils.CanonicalizePath(bareBeadsDir) {
+		t.Fatalf("ResolveBeadsDirForRepo() = %q, want %q", resolved, utils.CanonicalizePath(bareBeadsDir))
+	}
+}
+
+func TestCheckMetadataVersionTracking_BareParentWorktreeFallback(t *testing.T) {
+	bareDir, featureWorktreeDir := setupBareParentWorktreeForDoctorTest(t)
+	bareBeadsDir := filepath.Join(bareDir, ".beads")
+	if err := os.MkdirAll(bareBeadsDir, 0o750); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(bareBeadsDir, ".local_version"), []byte("0.60.0\n"), 0o600); err != nil {
+		t.Fatal(err)
+	}
+
+	check := CheckMetadataVersionTracking(featureWorktreeDir, "0.60.0")
+	if check.Status != StatusOK {
+		t.Fatalf("expected ok, got %s: %s", check.Status, check.Message)
+	}
+}
+
+func TestCheckLockHealth_BareParentWorktreeFallback(t *testing.T) {
+	bareDir, featureWorktreeDir := setupBareParentWorktreeForDoctorTest(t)
+	bareBeadsDir := filepath.Join(bareDir, ".beads")
+	if err := os.MkdirAll(filepath.Join(bareBeadsDir, "dolt"), 0o750); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(bareBeadsDir, "metadata.json"), []byte(`{"backend":"dolt"}`), 0o600); err != nil {
+		t.Fatal(err)
+	}
+
+	check := CheckLockHealth(featureWorktreeDir)
+	if check.Status != StatusOK {
+		t.Fatalf("expected ok, got %s: %s", check.Status, check.Message)
+	}
+}
+
+func setupBareParentWorktreeForDoctorTest(t *testing.T) (string, string) {
+	t.Helper()
+
+	tmpDir := t.TempDir()
+	bareDir := filepath.Join(tmpDir, "repo.git")
+	mainWorktreeDir := filepath.Join(tmpDir, "main")
+	featureWorktreeDir := filepath.Join(tmpDir, "feature")
+
+	runGitInDirForDoctorTest(t, tmpDir, "init", "--bare", bareDir)
+	runGitInDirForDoctorTest(t, tmpDir, "--git-dir", bareDir, "symbolic-ref", "HEAD", "refs/heads/main")
+	runGitInDirForDoctorTest(t, tmpDir, "--git-dir", bareDir, "config", "user.email", "test@example.com")
+	runGitInDirForDoctorTest(t, tmpDir, "--git-dir", bareDir, "config", "user.name", "Test User")
+	emptyTree := runGitInDirForDoctorTest(t, tmpDir, "--git-dir", bareDir, "hash-object", "-t", "tree", "/dev/null")
+	initCommit := runGitInDirForDoctorTest(t, tmpDir, "--git-dir", bareDir, "commit-tree", "-m", "Initial commit", emptyTree)
+	runGitInDirForDoctorTest(t, tmpDir, "--git-dir", bareDir, "update-ref", "HEAD", initCommit)
+	runGitInDirForDoctorTest(t, tmpDir, "--git-dir", bareDir, "worktree", "add", mainWorktreeDir, "main")
+	runGitInDirForDoctorTest(t, mainWorktreeDir, "branch", "feature")
+	runGitInDirForDoctorTest(t, tmpDir, "--git-dir", bareDir, "worktree", "add", featureWorktreeDir, "feature")
+
+	return bareDir, featureWorktreeDir
+}
+
+func runGitInDirForDoctorTest(t *testing.T, dir string, args ...string) string {
+	t.Helper()
+
+	cmd := exec.Command("git", args...)
+	cmd.Dir = dir
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		t.Fatalf("git %v failed in %s: %v\n%s", args, dir, err, output)
+	}
+
+	return strings.TrimSpace(string(output))
+}

cmd/bd/doctor/dolt.go

@@ -126,7 +126,7 @@ func RunDoltHealthChecks(path string) []DoctorCheck {
 // CheckLockHealth before any checks that open embedded Dolt databases,
 // avoiding false positives from doctor's own noms LOCK files (GH#1981).
 func RunDoltHealthChecksWithLock(path string, lockCheck DoctorCheck) []DoctorCheck {
-	beadsDir := resolveBeadsDir(filepath.Join(path, ".beads"))
+	beadsDir := ResolveBeadsDirForRepo(path)
 
 	if !IsDoltBackend(beadsDir) {
 		return []DoctorCheck{
@@ -199,7 +199,7 @@ func checkConnectionWithDB(conn *doltConn) DoctorCheck {
 // This is the standalone entry point; RunDoltHealthChecks is preferred
 // for coordinated access.
 func CheckDoltConnection(path string) DoctorCheck {
-	beadsDir := resolveBeadsDir(filepath.Join(path, ".beads"))
+	beadsDir := ResolveBeadsDirForRepo(path)
 
 	// Only run this check for Dolt backend
 	if !IsDoltBackend(beadsDir) {
@@ -463,7 +463,7 @@ func checkStatusWithDB(conn *doltConn) DoctorCheck {
 // This is the standalone entry point; RunDoltHealthChecks is preferred
 // for coordinated access.
 func CheckDoltStatus(path string) DoctorCheck {
-	beadsDir := resolveBeadsDir(filepath.Join(path, ".beads"))
+	beadsDir := ResolveBeadsDirForRepo(path)
 
 	// Only run for Dolt backend
 	if !IsDoltBackend(beadsDir) {
@@ -494,7 +494,7 @@ func CheckDoltStatus(path string) DoctorCheck {
 // It probes for stale noms LOCK files and checks whether the advisory lock
 // is currently held, providing actionable guidance when issues are found.
 func CheckLockHealth(path string) DoctorCheck {
-	beadsDir := resolveBeadsDir(filepath.Join(path, ".beads"))
+	beadsDir := ResolveBeadsDirForRepo(path)
 
 	if !IsDoltBackend(beadsDir) {
 		return DoctorCheck{

cmd/bd/doctor/version.go

@@ -97,8 +97,7 @@ const localVersionFile = ".local_version"
 // GH#662: This was updated to check .local_version instead of metadata.json:LastBdVersion,
 // which is now deprecated.
 func CheckMetadataVersionTracking(path string, currentVersion string) DoctorCheck {
-	// Follow redirect to resolve actual beads directory (bd-tvus fix)
-	beadsDir := resolveBeadsDir(filepath.Join(path, ".beads"))
+	beadsDir := ResolveBeadsDirForRepo(path)
 	localVersionPath := filepath.Join(beadsDir, localVersionFile)
 
 	// Read .local_version file