johno/beads
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
a1e507520c8df13a6add23b66602961288747b6f
beads/cmd/bd
History
Steve Yegge a1e507520c Fix bd-ca0b: bd sync now auto-resolves conflicts instead of failing 
Previously, bd sync would fail with "Pre-export validation failed:
refusing to export: JSONL is newer than database" when JSONL was
modified (e.g., after git pull).

Now bd sync intelligently handles this by:
- Detecting when JSONL is newer than the database
- Automatically importing before exporting
- Continuing with the normal sync flow

This makes the workflow much smoother - users can just run 'bd sync'
and it figures out what needs to be done.

Changes:
- Added isJSONLNewer() helper to check file timestamps
- Modified sync command to auto-import when JSONL is newer
- Extracted timestamp check logic for reusability

Resolves: bd-ca0b
🤖 Generated with Claude Code

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-20 20:33:52 -05:00
..
doctor
Merge branch 'main' of https://github.com/steveyegge/beads
2025-11-20 19:37:01 -05:00
setup
feat: add context optimization features for AI agents (#297)
2025-11-12 10:48:36 -08:00
templates
fix: add version marker to post-checkout hook and include in CheckGitHooks
2025-11-09 14:58:03 -08:00
testdata
fix: Update dep_add test to match current show output format
2025-11-04 00:23:25 -08:00
autoflush.go
Remove version field from metadata.json
2025-11-08 18:16:39 -08:00
autoimport_test.go
Fix remaining Windows test failures
2025-11-02 10:01:38 -08:00
autoimport.go
Improve Windows git path normalization
2025-11-02 10:38:24 -08:00
autostart_test.go
…
clean.go
Add 'bd clean' command to remove temporary merge artifacts
2025-11-20 20:21:37 -05:00
cleanup.go
Add bd cleanup command for bulk deletion of closed issues
2025-11-07 22:06:50 -08:00
cli_fast_test.go
Refactor: extract duplicated validation and flag logic (bd-g5p7)
2025-11-20 19:11:27 -05:00
comments_test.go
Implement bd comment alias for bd comments add (bd-d3f0)
2025-11-03 22:23:36 -08:00
comments.go
Implement bd comment alias for bd comments add (bd-d3f0)
2025-11-03 22:23:36 -08:00
compact_test.go
…
compact.go
Annotate gosec-safe file accesses
2025-11-17 10:12:46 -07:00
config_test.go
…
config.go
Add sync.branch configuration support (bd-b7d2)
2025-11-02 15:37:57 -08:00
create_test.go
Add routing integration tests and documentation
2025-11-04 23:12:42 -08:00
create.go
Refactor: extract duplicated validation and flag logic (bd-g5p7)
2025-11-20 19:11:27 -05:00
daemon_autoimport_test.go
Optimize test suite: split integration tests, add -short support
2025-11-05 20:39:47 -08:00
daemon_autostart.go
Centralize BD_DEBUG logging into internal/debug package
2025-11-06 20:14:34 -08:00
daemon_config.go
Reorganize project structure: move Go files to internal/beads, docs to docs/
2025-11-05 21:04:00 -08:00
daemon_crash_test.go
bd-vcg5: Add daemon crash recovery with panic handler + socket cleanup
2025-11-07 21:17:24 -08:00
daemon_debouncer_test.go
Optimize test suite performance (15-18x speedup)
2025-11-05 10:26:58 -08:00
daemon_debouncer.go
…
daemon_event_loop.go
Fix daemon orphaning: track parent PID and exit when parent dies
2025-11-07 18:57:43 -08:00
daemon_lifecycle.go
Add RPC diagnostics with BD_RPC_DEBUG env var
2025-11-07 21:29:22 -08:00
daemon_lock_test.go
Optimize test suite: split integration tests, add -short support
2025-11-05 20:39:47 -08:00
daemon_lock_unix.go
…
daemon_lock_wasm.go
WIP: WASM port - switch to ncruces/go-sqlite3, add WASM stubs
2025-11-02 22:17:08 -08:00
daemon_lock_windows.go
…
daemon_lock.go
Fix daemon orphaning: track parent PID and exit when parent dies
2025-11-07 18:57:43 -08:00
daemon_logger.go
…
daemon_parent_test.go
Fix daemon orphaning: track parent PID and exit when parent dies
2025-11-07 18:57:43 -08:00
daemon_rotation_test.go
…
daemon_server.go
Fix daemon exiting after 5s on macOS due to PID 1 parent monitoring (GH #278)
2025-11-10 10:22:03 -08:00
daemon_sync_branch_test.go
Optimize test suite: split integration tests, add -short support
2025-11-05 20:39:47 -08: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
…
daemon_sync.go
fix: Fix daemon export leaving JSONL newer than database (issues #301, #321)
2025-11-19 05:06:12 -05:00
daemon_test.go
Optimize test suite: split integration tests, add -short support
2025-11-05 20:39:47 -08:00
daemon_unix.go
…
daemon_wasm.go
WIP: WASM port - switch to ncruces/go-sqlite3, add WASM stubs
2025-11-02 22:17:08 -08:00
daemon_watcher_platform_test.go
Optimize test suite: split integration tests, add -short support
2025-11-05 20:39:47 -08:00
daemon_watcher_test.go
Optimize test suite: split integration tests, add -short support
2025-11-05 20:39:47 -08:00
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
fix: prevent daemon from exiting when launcher process exits (issue #278)
2025-11-19 05:07:16 -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
Fix bd-8kde: disable auto-import during delete operations
2025-11-08 03:10:12 -08:00
delete.go
Fix --json flag shadowing issue causing test failures
2025-11-02 18:52:44 -08:00
deletion_tracking_test.go
Refactor snapshot management into dedicated module (bd-urob)
2025-11-08 02:20:33 -08:00
deletion_tracking.go
Fix lint errors: handle error return values
2025-11-15 12:52:34 -08:00
dep_test.go
…
dep.go
Fix widespread double JSON encoding bug in daemon RPC calls (bd-1048, bd-4ec8)
2025-11-02 22:34:24 -08:00
detect_pollution.go
…
direct_mode_test.go
…
direct_mode.go
Remove version field from metadata.json
2025-11-08 18:16:39 -08:00
doctor_test.go
Fix doctor incorrectly diagnosing hash IDs as sequential (issue #322)
2025-11-18 05:20:11 -05:00
doctor.go
Merge branch 'main' of https://github.com/steveyegge/beads
2025-11-20 19:37:01 -05:00
duplicates_test.go
…
duplicates.go
feat: Add bd merge command for git 3-way JSONL merging (bd-omx1)
2025-11-05 19:16:50 -08:00
epic_test.go
…
epic.go
Fix --json flag shadowing issue causing test failures
2025-11-02 18:52:44 -08:00
export_import_test.go
Optimize test suite performance (15-18x speedup)
2025-11-05 10:26:58 -08:00
export_integrity_integration_test.go
…
export_mtime_test.go
fix: Fix daemon export leaving JSONL newer than database (issues #301, #321)
2025-11-19 05:06:12 -05:00
export_staleness_test.go
Fix bd-srwk: Add ID-based staleness detection to bd export
2025-11-07 20:07:59 -08:00
export_test.go
Implement bd-zbq2: Export JSONL line count verification
2025-11-05 14:31:41 -08:00
export.go
fix: Fix daemon export leaving JSONL newer than database (issues #301, #321)
2025-11-19 05:06:12 -05:00
flags.go
Refactor: extract duplicated validation and flag logic (bd-g5p7)
2025-11-20 19:11:27 -05:00
git_sync_test.go
Optimize test suite: split integration tests, add -short support
2025-11-05 20:39:47 -08:00
helpers_test.go
bd sync: 2025-11-09 14:53:59
2025-11-09 14:53:59 -08:00
hooks_test.go
Fix CI regressions and stabilize tests
2025-11-17 10:06:35 -07:00
hooks.go
Annotate gosec-safe file accesses
2025-11-17 10:12:46 -07:00
import_bug_test.go
…
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
bd sync: 2025-11-09 14:53:59
2025-11-09 14:53:59 -08:00
import_profile_test.go
…
import_shared.go
Add --clear-duplicate-external-refs flag to bd import
2025-11-06 13:01:44 -08:00
import_uncommitted_test.go
Fix bd-u4f5: Add warning when import syncs with working tree but not git HEAD
2025-11-08 00:00:43 -08:00
import.go
Remove legacy issues.jsonl and update defaults to beads.jsonl
2025-11-20 19:00:36 -05:00
info_test.go
feat: Add bd info --whats-new for agent version awareness (bd-eiz9)
2025-11-08 02:28:54 -08:00
info.go
Fix CI regressions and stabilize tests
2025-11-17 10:06:35 -07:00
init_contributor.go
Annotate gosec-safe file accesses
2025-11-17 10:12:46 -07:00
init_hooks_test.go
Fix CI regressions and stabilize tests
2025-11-17 10:06:35 -07:00
init_team.go
feat: Add bd init --contributor and --team wizards
2025-11-05 19:04:14 -08:00
init_test.go
bd sync: 2025-11-09 14:13:48
2025-11-09 14:13:48 -08:00
init.go
feat: Add .beads/README.md generation during bd init (bd-m7ge)
2025-11-20 19:24:26 -05:00
integrity_test.go
…
integrity.go
Fix bd-ca0b: bd sync now auto-resolves conflicts instead of failing
2025-11-20 20:33:52 -05:00
jsonl_integrity_test.go
…
label_test.go
…
label.go
Fix widespread double JSON encoding bug in daemon RPC calls (bd-1048, bd-4ec8)
2025-11-02 22:34:24 -08:00
list_test.go
Extract normalizeLabels to internal/util/strings.go
2025-11-06 20:00:08 -08:00
list.go
Optimize bd list: replace N+1 label queries with bulk fetch
2025-11-20 20:27:09 -05:00
main_test.go
Fix bd-17d5: conflict marker false positives on JSON-encoded content
2025-11-08 13:09:42 -08:00
main.go
Performance Improvements (#319)
2025-11-15 12:46:13 -08:00
markdown_test.go
…
markdown.go
Refactor: extract duplicated validation and flag logic (bd-g5p7)
2025-11-20 19:11:27 -05:00
merge.go
Add debug logging to bd merge for troubleshooting
2025-11-20 20:24:36 -05:00
message.go
Fix lint errors: handle error return values
2025-11-15 12:52:34 -08:00
migrate_hash_ids_test.go
fix: isHashID matches for hyphenated application names
2025-11-20 19:01:30 -05:00
migrate_hash_ids.go
fix: isHashID matches for hyphenated application names
2025-11-20 19:01:30 -05:00
migrate_issues.go
Annotate gosec-safe file accesses
2025-11-17 10:12:46 -07:00
migrate_test.go
Fix config system: rename config.json → metadata.json, fix config.yaml loading
2025-11-02 14:31:22 -08:00
migrate.go
Remove version field from metadata.json
2025-11-08 18:16:39 -08:00
nodb_test.go
bd sync: 2025-11-09 14:53:59
2025-11-09 14:53:59 -08:00
nodb.go
bd sync: 2025-11-09 14:53:59
2025-11-09 14:53:59 -08: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
Annotate gosec-safe file accesses
2025-11-17 10:12:46 -07:00
quickstart.go
…
ready_test.go
…
ready.go
Extract normalizeLabels to internal/util/strings.go
2025-11-06 20:00:08 -08:00
reinit_test.go
Skip TestDatabaseReinitialization on Windows
2025-11-02 11:02:58 -08:00
rename_prefix_repair_test.go
…
rename_prefix_test.go
…
rename_prefix.go
…
reopen_test.go
…
reopen.go
Fix widespread double JSON encoding bug in daemon RPC calls (bd-1048, bd-4ec8)
2025-11-02 22:34:24 -08:00
repair_deps_test.go
…
repair_deps.go
…
repo.go
Add multi-repo CLI commands and integrate with daemon sync
2025-11-04 23:12:41 -08:00
restore_test.go
…
restore.go
…
scripttest_test.go
Optimize test suite performance - 45% reduction in integration tests
2025-11-04 11:25:36 -08:00
setup.go
feat: add context optimization features for AI agents (#297)
2025-11-12 10:48:36 -08:00
show.go
Refactor: extract duplicated validation and flag logic (bd-g5p7)
2025-11-20 19:11:27 -05:00
simple_helpers_test.go
…
snapshot_manager.go
Annotate gosec-safe file accesses
2025-11-17 10:12:46 -07:00
stale_test.go
…
stale.go
Add --json flag to stale command
2025-11-02 21:25:40 -08:00
status_test.go
Fix bd-9v7l: bd status now uses git history for recent activity
2025-11-06 18:49:07 -08:00
status.go
Annotate gosec-safe file accesses
2025-11-17 10:12:46 -07:00
sync_local_only_test.go
Support local-only git repos without remote origin (bd-biwp)
2025-11-09 16:16:45 -08:00
sync_merge_test.go
Fix bd-9bsx: Add sync validation to prevent infinite dirty loop
2025-11-05 18:10:06 -08:00
sync_test.go
Add git hooks check to bd doctor
2025-11-02 17:09:39 -08:00
sync.go
Fix bd-ca0b: bd sync now auto-resolves conflicts instead of failing
2025-11-20 20:33:52 -05:00
template_security_test.go
Add template support for issue creation (bd-164b)
2025-11-03 20:31:11 -08:00
template_test.go
Add template support for issue creation (bd-164b)
2025-11-03 20:31:11 -08:00
template.go
fix: CI failures - performance thresholds, test eligibility, Nix hash, lint errors
2025-11-03 22:01:37 -08:00
test_helpers_test.go
Add test safeguards to prevent production database pollution (bd-2c5a)
2025-11-07 21:58:22 -08:00
test_wait_helper.go
test: add waitFor helper for event-driven testing
2025-11-04 01:10:18 -08:00
validate_test.go
…
validate.go
Fix bd-17d5: conflict marker false positives on JSON-encoded content
2025-11-08 13:09:42 -08:00
version_test.go
Add support for bd --version flag
2025-11-05 17:37:53 -08:00
version.go
also report branch in dev version
2025-11-16 18:10:46 -07:00
worktree_test.go
Improve cmd/bd test coverage from 20.2% to 23.3%
2025-11-08 18:22:28 -08:00
worktree.go
Reorganize project structure: move Go files to internal/beads, docs to docs/
2025-11-05 21:04:00 -08:00