johno/beads
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
d4f9a05bb2273691583a4a6f9d7347bb91801bb5
beads/cmd/bd
History
Steve Yegge d4f9a05bb2 Fix bd-pq5k: merge conflicts now prefer closed>open and deletion>modification 
CHANGES:
1. Merge logic (internal/merge/merge.go):
   - Added mergeStatus() enforcing closed ALWAYS wins over open
   - Fixed closed_at handling: only set when status='closed'
   - Changed deletion handling: deletion ALWAYS wins over modification

2. Deletion tracking (cmd/bd/snapshot_manager.go):
   - Updated ComputeAcceptedDeletions to accept all merge deletions
   - Removed "unchanged locally" check (deletion wins regardless)

3. FK constraint helper (internal/storage/sqlite/util.go):
   - Added IsForeignKeyConstraintError() for bd-koab
   - Detects FK violations for graceful import handling

TESTS UPDATED:
- TestMergeStatus: comprehensive status merge tests
- TestIsForeignKeyConstraintError: FK constraint detection
- bd-pq5k test: validates no invalid state (status=open with closed_at)
- Deletion tests: reflect new deletion-wins behavior
- All tests pass ✓

This ensures issues never get stuck in invalid states and prevents
the insane situation where issues never die!

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-23 21:42:43 -08:00
..
doctor
Add security tests for WriteFile permissions in doctor command
2025-11-23 21:19:14 -08:00
setup
Fix: Change file permissions from 0644 to 0600 for security
2025-11-23 20:11:52 -08:00
templates
Improve pre-push hook: suggest bd sync with auto-sync option
2025-11-23 16:10:02 -08:00
testdata
…
autoflush.go
refactor: Delete 7 redundant tests from main_test.go (3x speedup)
2025-11-21 21:29:43 -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
Fix: Change default JSONL filename from beads.jsonl to issues.jsonl
2025-11-21 23:34:22 -08:00
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
feat: Complete command set standardization (bd-au0)
2025-11-23 20:33:31 -08:00
cleanup.go
feat: Complete command set standardization (bd-au0)
2025-11-23 20:33:31 -08:00
cli_fast_test.go
feat: Add label operations to bd update command
2025-11-21 22:17:26 -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
Fix unvalidated dependency parsing in create.go
2025-11-23 20:51:09 -08: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
feat: Respect BEADS_SYNC_BRANCH environment variable
2025-11-22 18:17:19 -08:00
daemon_sync_branch.go
feat: Respect BEADS_SYNC_BRANCH environment variable
2025-11-22 18:17:19 -08:00
daemon_sync_test.go
Fix Windows and Nix test failures
2025-11-22 10:59:40 -08:00
daemon_sync.go
Fix Windows and Nix test failures
2025-11-22 10:59:40 -08: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
Fix: Daemon respects auto-commit/auto-push DB config (#360)
2025-11-22 16:57:23 -08: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
Fix bd-pq5k: merge conflicts now prefer closed>open and deletion>modification
2025-11-23 21:42:43 -08:00
deletion_tracking.go
Fix lint errors: handle error return values
2025-11-15 12:52:34 -08:00
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
feat: Complete command set standardization (bd-au0)
2025-11-23 20:33:31 -08:00
direct_mode_test.go
fix(test): Complete rootCtx initialization fix for all hanging tests (issue #355)
2025-11-21 23:09:47 -08:00
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
Add bd doctor check and fix for missing sync.branch config (bd-rsua)
2025-11-23 21:09:55 -08:00
doctor.go
Add bd doctor check and fix for missing sync.branch config (bd-rsua)
2025-11-23 21:09:55 -08: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
feat: Complete command set standardization (bd-au0)
2025-11-23 20:33:31 -08:00
flags.go
feat: Add --body flag as alias for --description
2025-11-21 20:08:55 -05:00
flush_manager_test.go
Fix linter issues and test failures
2025-11-22 00:11:45 -08:00
flush_manager.go
Fix linter issues and test failures
2025-11-22 00:11:45 -08:00
git_sync_test.go
…
helpers_test.go
bd sync: 2025-11-09 14:53:59
2025-11-09 14:53:59 -08:00
hooks_test.go
Add tests and documentation for --shared hooks feature
2025-11-23 12:39:11 -08:00
hooks.go
Add --shared flag to bd hooks install for versioned hooks
2025-11-23 12:36:38 -08:00
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
fix(test): Complete rootCtx initialization fix for all hanging tests (issue #355)
2025-11-21 23:09:47 -08:00
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
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
Fix GH#367: bd import defaulting to stdin is confusing
2025-11-23 11:15:34 -08: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
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
fix: Auto-configure sync.branch during bd init (bd-flil)
2025-11-23 19:42:21 -08:00
init_test.go
fix: Support both canonical and legacy JSONL filenames in merge driver check
2025-11-23 20:07:26 -08:00
init.go
Implement auto-resolution of JSONL merge conflicts during bd sync
2025-11-23 20:41:35 -08: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
feat: Add built-in version tracking to bd (bd-loka)
2025-11-23 17:09:17 -08:00
main_test.go
Fix: Change default JSONL filename from beads.jsonl to issues.jsonl
2025-11-21 23:34:22 -08:00
main.go
feat: Complete command set standardization (bd-au0)
2025-11-23 20:33:31 -08: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
fix: skip /etc/passwd check on Windows in security test (#363)
2025-11-22 16:49:29 -08:00
merge.go
Fix: Change default JSONL filename from beads.jsonl to issues.jsonl
2025-11-21 23:34:22 -08:00
message.go
Fix lint errors: handle error return values
2025-11-15 12:52:34 -08:00
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
feat: Complete command set standardization (bd-au0)
2025-11-23 20:33:31 -08: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
bd sync: 2025-11-09 14:53:59
2025-11-09 14:53:59 -08:00
nodb.go
Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)
2025-11-20 21:57:23 -05:00
onboard_test.go
Implement BD_GUIDE.md generation for version-stamped documentation (bd-woro)
2025-11-23 21:16:09 -08:00
onboard.go
Implement BD_GUIDE.md generation for version-stamped documentation (bd-woro)
2025-11-23 21:16:09 -08:00
output_test.go
…
prime.go
Annotate gosec-safe file accesses
2025-11-17 10:12:46 -07:00
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
feat: Add built-in version tracking to bd (bd-loka)
2025-11-23 17:09:17 -08:00
reinit_test.go
Fix: Change default JSONL filename from beads.jsonl to issues.jsonl
2025-11-21 23:34:22 -08: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
feat: Complete command set standardization (bd-au0)
2025-11-23 20:33:31 -08: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
feat: Add date and priority filters to bd search (bd-au0.5)
2025-11-21 22:46:12 -05:00
search.go
Fix linter issues and test failures
2025-11-22 00:11:45 -08:00
setup.go
Add Aider integration for beads issue tracking
2025-11-23 15:13:54 -08:00
show.go
feat: Add label operations to bd update command
2025-11-21 22:17:26 -05:00
simple_helpers_test.go
…
snapshot_manager.go
Fix bd-pq5k: merge conflicts now prefer closed>open and deletion>modification
2025-11-23 21:42:43 -08:00
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
Fix: Improve staleness check error handling (bd-2q6d, bd-o4qy, bd-n4td)
2025-11-23 20:54:18 -08:00
status_test.go
Fix: TestGetAssignedStatus - Missing rootCtx initialization
2025-11-21 23:22:12 -08: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
Fix: Change default JSONL filename from beads.jsonl to issues.jsonl
2025-11-21 23:34:22 -08:00
sync_test.go
Implement auto-resolution of JSONL merge conflicts during bd sync
2025-11-23 20:41:35 -08:00
sync.go
Implement auto-resolution of JSONL merge conflicts during bd sync
2025-11-23 20:41:35 -08: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_wait_helper.go
…
upgrade.go
fix: Code review fixes for bd-loka
2025-11-23 17:16:27 -08:00
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_tracking_test.go
fix: Code review fixes for auto-migration (bd-jgxi)
2025-11-23 18:28:01 -08:00
version_tracking.go
Implement BD_GUIDE.md generation for version-stamped documentation (bd-woro)
2025-11-23 21:16:09 -08:00
version.go
fix: Auto-configure sync.branch during bd init (bd-flil)
2025-11-23 19:42:21 -08: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
…