Commit graph

6 commits

Author SHA1 Message Date
seanmartinsmith
3fa0e23032
fix(setup): prevent doubled BEGIN/END markers from CRLF embedded template (#3553)
When bd is built from a Windows checkout (default core.autocrlf=true),
//go:embed reads CRLF bytes from the working tree for
internal/templates/agents/defaults/beads-section.md. templateBody()'s
LF-only TrimPrefix/TrimSuffix then failed to strip the legacy markers
inside the embedded body, so RenderSection wrapped them with fresh
markers — producing two nested BEGIN/END pairs in any AGENTS.md
written by bd setup mux/claude/etc.

bd setup mux --remove only stripped the outer pair (find-first
semantics), leaving a stray <!-- END BEADS INTEGRATION --> in the
user's file. TestRemoveMuxProjectRemovesBothLayers caught this on
Windows.

Two complementary fixes:

1. Pin internal/templates/agents/defaults/*.md to eol=lf in
   .gitattributes. Embedded templates are shipped data, not
   user-edited text, and should never carry CRLF.
2. Normalize CRLF→LF in templateBody() before stripping markers.
   Defensive against future templates added without a gitattributes
   pin.

Adds TestRenderSectionFullSingleMarkers as a direct regression guard
(asserts exactly one BEGIN and one END in RenderSection output).

Fixes #3552
2026-04-27 13:41:45 -07:00
beads/crew/elinor
9dfac4f405 fix: remove JSONL gitignore rules, merge driver, and issues tracking check (bd-9ni.6)
Remove JSONL merge driver from .gitattributes, JSONL artifact patterns
from .gitignore files, deprecated SyncMode constants (git-portable,
belt-and-suspenders), CheckIssuesTracking doctor check, and JSONL lock/
sync_base patterns from GitignoreTemplate and requiredPatterns.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-22 21:50:17 -08:00
Marco Del Pin
718a5e2c25
fix: normalize CRLF line endings in git hook files (#1917)
On Windows and WSL with NTFS-mounted repos, `bd hooks install` can
write hook files with CRLF line endings. This causes git to fail with:
    /usr/bin/env: 'sh\r': No such file or directory
Two sources of CRLF contamination:
1. Embedded hook templates may have CRLF when built on Windows/NTFS
   (go:embed captures files as-is from disk)
2. The prepare-commit-msg template already contained CRLF
Fix:
- Normalize embedded hook content with strings.ReplaceAll("\r\n", "\n")
  before writing to disk in both hooks.go and init_git_hooks.go
- Add .gitattributes rules to enforce LF for shell scripts and hook
  templates regardless of platform
2026-02-20 09:22:21 -08:00
matt wilkie
1f8a6bf84e
fix(autoimport): auto-correct deleted status to tombstone for JSONL compatibility (#1231)
* fix(autoimport): auto-correct deleted status to tombstone for JSONL compatibility (GH#1223)

This fix addresses the 'Stuck in sync diversion loop' issue where v0.48.0
encountered validation errors during JSONL import. The issue occurs when
JSONL files from older versions have issues with status='deleted' but the
current code expects status='tombstone' for deleted issues.

Changes:
- Add migration logic in parseJSONL to auto-correct 'deleted' status to 'tombstone'
- Ensure tombstones always have deleted_at timestamp set
- Add debug logging for both migration operations
- Prevents users from being stuck in sync divergence when upgrading

Fixes GH#1223: Stuck in sync diversion loop

* fix(autoimport): comprehensively fix corrupted deleted_at on non-tombstone issues (GH#1223)

The initial fix for GH#1223 only caught issues with status='deleted', but the real
data in the wild had issues with status='closed' (or other statuses) but also
had deleted_at set, which violates the validation rule.

Changes:
- Add broader migration logic: any non-tombstone issue with deleted_at should become tombstone
- Apply fix in all three JSONL parsing locations:
  - internal/autoimport/autoimport.go (parseJSONL for auto-import)
  - cmd/bd/import.go (import command)
  - cmd/bd/daemon_sync.go (daemon sync helper)
- Add comprehensive test case for corrupted closed issues with deleted_at
- Fixes the 'non-tombstone issues cannot have deleted_at timestamp' validation error
  during fresh bd init or import

Fixes GH#1223: Stuck in sync diversion loop

* Add merge driver comment to .gitattributes

* fix: properly clean up .gitattributes during bd admin reset

Fixes GH#1223 - Stuck in sync diversion loop

The removeGitattributesEntry() function was not properly cleaning up
beads-related entries from .gitattributes. It only removed lines
containing "merge=beads" but left behind:
- The comment line "# Use bd merge for beads JSONL files"
- Empty lines following removed entries

This caused .gitattributes to remain in a modified state after
bd admin reset --force, triggering sync divergence warning loop.

The fix now:
- Skips lines containing "merge=beads" (existing behavior)
- Skips beads-related comment lines
- Skips empty lines that follow removed beads entries
- Properly cleans up file so it's either empty (and gets deleted)
  or contains only non-beads content

---------

Co-authored-by: Amp <amp@example.com>
2026-01-21 21:50:38 -08:00
Steve Yegge
ff3352ab23 bd-6xd: Standardize on issues.jsonl as canonical filename
- Change default JSONL filename from beads.jsonl to issues.jsonl
- Add bd doctor check and fix to auto-migrate legacy beads.jsonl configs
- Update FindJSONLPath to prefer issues.jsonl over beads.jsonl
- Add CheckLegacyJSONLConfig and CheckLegacyJSONLFilename checks
- Add LegacyJSONLConfig fix to rename files and update config
- Update .gitattributes to reference issues.jsonl
- Fix tests to expect new canonical filename
- Add bd-6xd to v0.25.1 release notes

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 22:02:59 -08:00
Steve Yegge
eb30e94220 Configure beads merge driver for intelligent JSONL merging 2025-11-06 19:42:32 -08:00