johno/beads
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ddd209e26a29e1040d88512df4b56c6f7f611f99
beads/cmd/bd
History
Steve Yegge ddd209e26a fix: Correct git merge driver placeholders from %L/%R to %A/%B 
Git merge drivers only support three placeholders:
- %O (ancestor/base)
- %A (current version)
- %B (other branch's version)

The code was incorrectly using %L and %R, which don't exist in git,
causing them to be passed through literally and breaking JSONL merges.

Changes:
- Fixed merge driver config in init.go, merge.go, README.md, docs
- Added detection in bd doctor with clear error messages
- Added auto-fix in bd doctor --fix
- Added proactive warning in bd sync before git pull
- Added reactive error detection after merge failures
- Updated all tests to use correct placeholders

Now users get helpful guidance at every step:
1. bd doctor detects the issue
2. bd doctor --fix auto-corrects it
3. bd sync warns before pulling if misconfigured
4. Error messages suggest bd doctor --fix when merge fails

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-21 20:40:18 -05:00
..
doctor
fix: Correct git merge driver placeholders from %L/%R to %A/%B
2025-11-21 20:40:18 -05:00
setup
…
templates
chore: Bump version to 0.24.0
2025-11-20 22:15:04 -05:00
testdata
…
autoflush.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
autoimport_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
autoimport.go
…
autostart_test.go
…
clean_security_test.go
test: Add security and error handling tests for lint warnings
2025-11-21 19:30:48 -05:00
clean.go
test: Add security and error handling tests for lint warnings
2025-11-21 19:30:48 -05:00
cleanup.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
cli_fast_test.go
test: Tag 16 slow integration tests with build tags
2025-11-21 14:40:22 -05:00
comments_test.go
test: Refactor P1 test files to use shared DB pattern (bd-1rh)
2025-11-21 15:51:07 -05:00
comments.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
compact_test.go
test: Refactor compact_test.go to use shared DB pattern (bd-1rh)
2025-11-21 16:13:18 -05:00
compact.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
config_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
config.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
count.go
feat: Add 'bd count' command for counting and grouping issues
2025-11-21 19:21:05 -05:00
create_test.go
test: Refactor P1 test files to use shared DB pattern (bd-1rh)
2025-11-21 15:51:07 -05:00
create.go
feat: Add --body flag as alias for --description
2025-11-21 20:08:55 -05:00
daemon_autoimport_test.go
…
daemon_autostart.go
…
daemon_config.go
…
daemon_crash_test.go
…
daemon_debouncer_test.go
…
daemon_debouncer.go
…
daemon_event_loop.go
feat: Complete GH #353 follow-up phases (bd-9nw, bd-u3t, bd-e0o)
2025-11-21 19:32:45 -05:00
daemon_lifecycle.go
…
daemon_lock_test.go
…
daemon_lock_unix.go
…
daemon_lock_wasm.go
…
daemon_lock_windows.go
…
daemon_lock.go
…
daemon_logger.go
…
daemon_parent_test.go
test: Tag 16 slow integration tests with build tags
2025-11-21 14:40:22 -05:00
daemon_rotation_test.go
…
daemon_server.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
daemon_sync_branch_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
daemon_sync_branch.go
Remove legacy issues.jsonl and update defaults to beads.jsonl
2025-11-20 19:00:36 -05:00
daemon_sync_test.go
Close bd-ar2.8: Add edge case tests for export metadata updates
2025-11-21 14:57:01 -05:00
daemon_sync.go
Complete bd-ar2 P2 tasks: metadata, resurrection, and testing improvements
2025-11-21 11:40:37 -05:00
daemon_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
daemon_unix_test.go
feat: Complete GH #353 follow-up phases (bd-9nw, bd-u3t, bd-e0o)
2025-11-21 19:32:45 -05:00
daemon_unix.go
feat: Complete GH #353 follow-up phases (bd-9nw, bd-u3t, bd-e0o)
2025-11-21 19:32:45 -05:00
daemon_wasm.go
…
daemon_watcher_platform_test.go
…
daemon_watcher_test.go
…
daemon_watcher.go
fix: address critical resource leaks and error handling issues (#327)
2025-11-20 08:13:06 -08:00
daemon_windows.go
…
daemon.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
daemons_test.go
…
daemons.go
fix: address critical resource leaks and error handling issues (#327)
2025-11-20 08:13:06 -08:00
delete_test.go
test: Tag 16 slow integration tests with build tags
2025-11-21 14:40:22 -05:00
delete.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
deletion_tracking_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
deletion_tracking.go
…
dep_test.go
test: Refactor P1 test files to use shared DB pattern (bd-1rh)
2025-11-21 15:51:07 -05:00
dep.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
detect_pollution.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
direct_mode_test.go
…
direct_mode.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
doctor_test.go
Fix doctor incorrectly diagnosing hash IDs as sequential (issue #322)
2025-11-18 05:20:11 -05:00
doctor.go
fix: Correct git merge driver placeholders from %L/%R to %A/%B
2025-11-21 20:40:18 -05:00
duplicates_test.go
feat: Add sandbox escape hatches for daemon lock issues (GH #353 Phase 1)
2025-11-21 18:53:34 -05:00
duplicates.go
feat: Add issue IDs to TODO comments
2025-11-21 19:01:42 -05:00
epic_test.go
test: Refactor epic_test.go to use shared DB pattern (P2)
2025-11-21 16:14:30 -05:00
epic.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
export_import_test.go
…
export_integrity_integration_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
export_mtime_test.go
test: Tag 16 slow integration tests with build tags
2025-11-21 14:40:22 -05:00
export_staleness_test.go
…
export_test.go
Fix context propagation lifecycle bugs
2025-11-20 21:54:11 -05:00
export.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
flags.go
feat: Add --body flag as alias for --description
2025-11-21 20:08:55 -05:00
flush_manager_test.go
test: Add security and error handling tests for lint warnings
2025-11-21 19:30:48 -05:00
flush_manager.go
Improve FlushManager: constants, error logging, and functional tests
2025-11-20 21:38:31 -05:00
git_sync_test.go
…
helpers_test.go
…
hooks_test.go
…
hooks.go
…
import_bug_test.go
…
import_cancellation_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
import_idempotent_test.go
…
import_mtime_test.go
fix: Fix daemon export leaving JSONL newer than database (issues #301, #321)
2025-11-19 05:06:12 -05:00
import_multipart_id_test.go
…
import_profile_test.go
test: Tag 16 slow integration tests with build tags
2025-11-21 14:40:22 -05:00
import_shared.go
…
import_uncommitted_test.go
test: Tag 16 slow integration tests with build tags
2025-11-21 14:40:22 -05:00
import.go
feat: Add sandbox escape hatches for daemon lock issues (GH #353 Phase 1)
2025-11-21 18:53:34 -05:00
info_test.go
…
info.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
init_contributor.go
…
init_hooks_test.go
…
init_team.go
…
init_test.go
fix: Correct git merge driver placeholders from %L/%R to %A/%B
2025-11-21 20:40:18 -05:00
init.go
fix: Correct git merge driver placeholders from %L/%R to %A/%B
2025-11-21 20:40:18 -05:00
integrity_content_test.go
test: Tag 16 slow integration tests with build tags
2025-11-21 14:40:22 -05:00
integrity_test.go
test: Refactor integrity_test.go to use shared DB pattern (bd-1rh P2)
2025-11-21 16:11:56 -05:00
integrity.go
Complete bd-ar2 P2 tasks: metadata, resurrection, and testing improvements
2025-11-21 11:40:37 -05:00
jsonl_integrity_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
label_test.go
…
label.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
list_test.go
test: Refactor P1 test files to use shared DB pattern (bd-1rh)
2025-11-21 15:51:07 -05:00
list.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
MAIN_TEST_REFACTOR_NOTES.md
doc: Document main_test.go refactoring analysis (bd-1rh)
2025-11-21 18:00:23 -05:00
main_test.go
test: Mark TestAutoFlushDebounce as obsolete
2025-11-21 19:00:44 -05:00
main.go
feat: Complete GH #353 follow-up phases (bd-9nw, bd-u3t, bd-e0o)
2025-11-21 19:32:45 -05:00
markdown_test.go
…
markdown.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
merge_security_test.go
test: Add security and error handling tests for lint warnings
2025-11-21 19:30:48 -05:00
merge.go
fix: Correct git merge driver placeholders from %L/%R to %A/%B
2025-11-21 20:40:18 -05:00
message.go
…
migrate_hash_ids_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
migrate_hash_ids.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
migrate_issues.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
migrate_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
migrate.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
nodb_test.go
…
nodb.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
onboard_test.go
Handle formatting errors in onboard renderer
2025-11-17 11:32:37 -07:00
onboard.go
Handle formatting errors in onboard renderer
2025-11-17 11:32:37 -07:00
output_test.go
…
prime.go
…
quickstart.go
…
ready_test.go
test: Refactor P1 test files to use shared DB pattern (bd-1rh)
2025-11-21 15:51:07 -05:00
ready.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
reinit_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
rename_prefix_repair_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
rename_prefix_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
rename_prefix.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
reopen_test.go
…
reopen.go
feat: Add issue IDs to TODO comments
2025-11-21 19:01:42 -05:00
repair_deps_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
repair_deps.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
repo.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
restore_test.go
…
restore.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
sandbox_test.go
feat: Complete GH #353 follow-up phases (bd-9nw, bd-u3t, bd-e0o)
2025-11-21 19:32:45 -05:00
sandbox_unix.go
feat: Complete GH #353 follow-up phases (bd-9nw, bd-u3t, bd-e0o)
2025-11-21 19:32:45 -05:00
sandbox_windows.go
feat: Complete GH #353 follow-up phases (bd-9nw, bd-u3t, bd-e0o)
2025-11-21 19:32:45 -05:00
scripttest_test.go
…
search_test.go
test: Add security and error handling tests for lint warnings
2025-11-21 19:30:48 -05:00
search.go
test: Add security and error handling tests for lint warnings
2025-11-21 19:30:48 -05:00
setup.go
…
show.go
feat: Add --body flag as alias for --description
2025-11-21 20:08:55 -05:00
simple_helpers_test.go
…
snapshot_manager.go
…
stale_test.go
test: Refactor P1 test files to use shared DB pattern (bd-1rh)
2025-11-21 15:51:07 -05:00
stale.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
staleness.go
feat: Add sandbox escape hatches for daemon lock issues (GH #353 Phase 1)
2025-11-21 18:53:34 -05:00
status_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
status.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
sync_local_only_test.go
test: Tag 16 slow integration tests with build tags
2025-11-21 14:40:22 -05:00
sync_merge_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
sync_test.go
…
sync.go
fix: Correct git merge driver placeholders from %L/%R to %A/%B
2025-11-21 20:40:18 -05:00
template_security_test.go
…
template_test.go
…
template.go
…
test_helpers_test.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
TEST_SUITE_AUDIT.md
test: Refactor compact_test.go to use shared DB pattern (bd-1rh)
2025-11-21 16:13:18 -05:00
test_wait_helper.go
…
validate_test.go
test: Refactor validate_test.go - remove ALL DB setup (P2)
2025-11-21 16:14:30 -05:00
validate.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
version_test.go
…
version.go
chore: Bump version to 0.24.0
2025-11-20 22:15:04 -05:00
worktree_test.go
…
worktree.go
…