From 86d6ffe57da58944e66a3e7ae903df070cf122c2 Mon Sep 17 00:00:00 2001 From: Steve Yegge Date: Fri, 28 Nov 2025 17:42:23 -0800 Subject: [PATCH] fix(doctor): exclude merge artifacts from multiple JSONL warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add .base.jsonl, .left.jsonl, and .right.jsonl patterns to the skip list in CheckLegacyJSONLFilename. These are legitimate git merge conflict artifacts that should not trigger a warning about multiple JSONL files. Fixes: bd-nsb 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- cmd/bd/doctor/legacy.go | 6 +++++- cmd/bd/doctor/legacy_test.go | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/cmd/bd/doctor/legacy.go b/cmd/bd/doctor/legacy.go index 74fe64a7..36c7e4c9 100644 --- a/cmd/bd/doctor/legacy.go +++ b/cmd/bd/doctor/legacy.go @@ -139,7 +139,11 @@ func CheckLegacyJSONLFilename(repoPath string) DoctorCheck { strings.Contains(lowerName, ".bak") || strings.Contains(lowerName, "~") || strings.HasPrefix(lowerName, "backup_") || - name == "deletions.jsonl" { + name == "deletions.jsonl" || + // Git merge conflict artifacts (e.g., issues.base.jsonl, issues.left.jsonl) + strings.Contains(lowerName, ".base.jsonl") || + strings.Contains(lowerName, ".left.jsonl") || + strings.Contains(lowerName, ".right.jsonl") { continue } diff --git a/cmd/bd/doctor/legacy_test.go b/cmd/bd/doctor/legacy_test.go index fd429475..d1154c2d 100644 --- a/cmd/bd/doctor/legacy_test.go +++ b/cmd/bd/doctor/legacy_test.go @@ -231,6 +231,18 @@ func TestCheckLegacyJSONLFilename(t *testing.T) { expectedStatus: "ok", expectWarning: false, }, + { + name: "merge artifacts ignored", + files: []string{"issues.jsonl", "issues.base.jsonl", "issues.left.jsonl"}, + expectedStatus: "ok", + expectWarning: false, + }, + { + name: "merge artifacts with right variant ignored", + files: []string{"issues.jsonl", "issues.right.jsonl"}, + expectedStatus: "ok", + expectWarning: false, + }, } for _, tt := range tests {