From bf09f0c6ea6cd9fb264670f9b21e155edcdc26d3 Mon Sep 17 00:00:00 2001
From: emma <steve.yegge@gmail.com>
Date: Wed, 7 Jan 2026 21:35:07 -0800
Subject: [PATCH] fix(doctor): recognize bd shims when external manager config
 exists (GH#946)

When an external hook manager config file (like .pre-commit-config.yaml) exists
but the actual hooks are bd shims, doctor now correctly reports OK instead of
warning that the manager doesn't call bd.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 cmd/bd/doctor/git.go | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/cmd/bd/doctor/git.go b/cmd/bd/doctor/git.go
index 0f61a3e1..faeb4324 100644
--- a/cmd/bd/doctor/git.go
+++ b/cmd/bd/doctor/git.go
@@ -21,6 +21,12 @@ const (
 	hooksUpgradeURL  = "https://github.com/steveyegge/beads/issues/615"
 )
 
+// bdShimMarker identifies bd shim hooks (GH#946)
+const bdShimMarker = "# bd-shim"
+
+// bdHooksRunPattern matches hooks that call bd hooks run
+var bdHooksRunPattern = regexp.MustCompile(`\bbd\s+hooks\s+run\b`)
+
 // CheckGitHooks verifies that recommended git hooks are installed.
 func CheckGitHooks() DoctorCheck {
 	// Check if we're in a git repository using worktree-aware detection
@@ -65,6 +71,18 @@ func CheckGitHooks() DoctorCheck {
 	// Check for external hook managers (lefthook, husky, etc.)
 	externalManagers := fix.DetectExternalHookManagers(repoRoot)
 	if len(externalManagers) > 0 {
+		// First, check if bd shims are installed (GH#946)
+		// If the actual hooks are bd shims, they're calling bd regardless of what
+		// the external manager config says (user may have leftover config files)
+		if hasBdShims, bdHooks := areBdShimsInstalled(hooksDir); hasBdShims {
+			return DoctorCheck{
+				Name:    "Git Hooks",
+				Status:  StatusOK,
+				Message: "bd shims installed (ignoring external manager config)",
+				Detail:  fmt.Sprintf("bd hooks run: %s", strings.Join(bdHooks, ", ")),
+			}
+		}
+
 		// External manager detected - check if it's configured to call bd
 		integration := fix.CheckExternalHookManagerIntegration(repoRoot)
 		if integration != nil {
@@ -140,6 +158,30 @@ func CheckGitHooks() DoctorCheck {
 	}
 }
 
+// areBdShimsInstalled checks if the installed hooks are bd shims or call bd hooks run.
+// This helps detect when bd hooks are installed directly but an external manager config exists.
+// Returns (true, installedHooks) if bd shims are detected, (false, nil) otherwise.
+// (GH#946)
+func areBdShimsInstalled(hooksDir string) (bool, []string) {
+	hooks := []string{"pre-commit", "post-merge", "pre-push"}
+	var bdHooks []string
+
+	for _, hookName := range hooks {
+		hookPath := filepath.Join(hooksDir, hookName)
+		content, err := os.ReadFile(hookPath)
+		if err != nil {
+			continue
+		}
+		contentStr := string(content)
+		// Check for bd-shim marker or bd hooks run call
+		if strings.Contains(contentStr, bdShimMarker) || bdHooksRunPattern.MatchString(contentStr) {
+			bdHooks = append(bdHooks, hookName)
+		}
+	}
+
+	return len(bdHooks) > 0, bdHooks
+}
+
 // CheckGitWorkingTree checks if the git working tree is clean.
 // This helps prevent leaving work stranded (AGENTS.md: keep git state clean).
 func CheckGitWorkingTree(path string) DoctorCheck {