johno/beads
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
52c505956f9c683cf0c001db34eee4ee4d343c98
beads/cmd/bd
History
Steve Yegge 52c505956f feat: Add bd merge command for git 3-way JSONL merging (bd-omx1) 
- Implemented bd merge command with dual-mode operation:
  1. Git 3-way merge: bd merge <output> <base> <left> <right>
  2. Duplicate issue merge: bd merge <sources...> --into <target> (placeholder)
- Added MergeFiles wrapper to internal/merge package
- Command works without database when used as git merge driver
- Supports --debug flag for verbose output
- Exit code 0 for clean merge, 1 for conflicts
- Handles deletions intelligently (delete-modify conflicts)
- Added proper MIT license attribution for @neongreen's beads-merge code
- Tests pass for git merge functionality

This enables git merge driver setup for .beads/beads.jsonl files.
2025-11-05 19:16:50 -08:00
..
templates
Add template support for issue creation (bd-164b)
2025-11-03 20:31:11 -08:00
testdata
fix: Update dep_add test to match current show output format
2025-11-04 00:23:25 -08:00
autoflush_version_test.go
Improve test coverage for cmd/bd
2025-10-31 18:40:32 -07:00
autoflush.go
Fix gosec warnings: tighten file permissions and add exclusions (bd-b47c034e)
2025-11-02 15:39:00 -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
Fix failing tests
2025-10-27 20:08:50 -07:00
cli_fast_test.go
Merge branch 'main' of github.com:steveyegge/beads
2025-11-05 10:27:12 -08: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
Improve cmd/bd test coverage to 42.9%
2025-11-01 11:11:20 -07:00
compact.go
bd sync: 2025-10-31 22:39:53
2025-10-31 22:39:53 -07:00
config_test.go
Fix bd-166: Prevent duplicate issues with wrong prefix
2025-10-26 21:55:01 -07:00
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
Merge branch 'main' of github.com:steveyegge/beads
2025-11-05 13:56:39 -08:00
daemon_autoimport_test.go
Optimize test suite performance (15-18x speedup)
2025-11-05 10:26:58 -08:00
daemon_autostart.go
fix: Suppress gosec warnings with nolint comments
2025-11-02 08:09:58 -08:00
daemon_config.go
Refactor daemon.go for testability and maintainability (bd-2b34)
2025-11-01 19:20:01 -07:00
daemon_debouncer_test.go
Optimize test suite performance (15-18x speedup)
2025-11-05 10:26:58 -08:00
daemon_debouncer.go
Fix FileWatcher robustness issues (bd-71)
2025-10-29 22:55:13 -07:00
daemon_event_loop.go
fix: Address all errcheck and misspell linter errors
2025-11-01 23:56:03 -07:00
daemon_lifecycle.go
Fix bd-36870264: Prevent nested .beads directories with path canonicalization
2025-11-01 19:50:34 -07:00
daemon_lock_test.go
fix: Resolve Windows test failures and lint warnings
2025-11-02 08:30:31 -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
Address gosec security warnings (bd-102)
2025-10-26 22:48:19 -07:00
daemon_logger.go
Refactor daemon.go for testability and maintainability (bd-2b34)
2025-11-01 19:20:01 -07:00
daemon_rotation_test.go
…
daemon_server.go
Refactor daemon.go for testability and maintainability (bd-2b34)
2025-11-01 19:20:01 -07:00
daemon_sync_branch_test.go
fix: increase Windows filesystem delays in flaky tests
2025-11-04 10:20:12 -08:00
daemon_sync_branch.go
Fix all remaining linter errors - golangci-lint passes
2025-11-02 20:16:40 -08:00
daemon_sync_test.go
Add test coverage for daemon lifecycle and config modules
2025-11-01 21:27:09 -07:00
daemon_sync.go
Add multi-repo CLI commands and integrate with daemon sync
2025-11-04 23:12:41 -08:00
daemon_test.go
fix: resolve test failures from speedup changes
2025-11-04 01:08:21 -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
fix: resolve test failures from speedup changes
2025-11-04 01:08:21 -08:00
daemon_watcher_test.go
fix: resolve test failures from speedup changes
2025-11-04 01:08:21 -08:00
daemon_watcher.go
fix: Address all errcheck and misspell linter errors
2025-11-01 23:56:03 -07:00
daemon_windows.go
…
daemon.go
Add remaining multi-repo files from bd-307
2025-11-04 23:12:41 -08:00
daemons_test.go
Improve test coverage for cmd/bd
2025-10-31 18:40:32 -07:00
daemons.go
Fix --json flag shadowing issue causing test failures
2025-11-02 18:52:44 -08:00
delete_test.go
…
delete.go
Fix --json flag shadowing issue causing test failures
2025-11-02 18:52:44 -08:00
dep_test.go
feat: add Mermaid.js format for dependency tree visualization (#191)
2025-10-31 15:11:29 -07:00
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
fix: Suppress gosec warnings with nolint comments
2025-11-02 08:09:58 -08:00
direct_mode_test.go
Fix all test failures from bd-166 (missing issue_prefix)
2025-10-26 22:31:24 -07:00
direct_mode.go
…
doctor_test.go
Doctor sync issues (#231)
2025-11-05 14:25:48 -08:00
doctor.go
Doctor sync issues (#231)
2025-11-05 14:25:48 -08: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
Improve cmd/bd test coverage to 42.9%
2025-11-01 11:11:20 -07:00
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
Fix bd-c6cf: Force full export when export_hashes is cleared
2025-11-01 20:29:13 -07:00
export_test.go
Implement bd-zbq2: Export JSONL line count verification
2025-11-05 14:31:41 -08:00
export.go
Implement bd-zbq2: Export JSONL line count verification
2025-11-05 14:31:41 -08:00
git_sync_test.go
Fix CI test failures (bd-1231)
2025-11-02 08:55:34 -08:00
helpers_test.go
Resolve merge conflicts: use importer package
2025-10-27 22:44:40 -07:00
import_bug_test.go
Remove vestigial --resolve-collisions flag
2025-10-31 01:07:42 -07:00
import_idempotent_test.go
Fix remaining test database initialization errors (bd-207)
2025-10-27 20:00:49 -07:00
import_profile_test.go
Remove sequential ID generation and SyncAllCounters (bd-c7af, bd-8e05, bd-4c74)
2025-10-30 22:24:42 -07:00
import_shared.go
Fix import to respect import.missing_parents config
2025-11-05 00:41:14 -08:00
import.go
feat(import): add import.orphan_handling config with 4 modes
2025-11-04 23:59:50 -08:00
info_test.go
…
info.go
Add migration inspection tools for AI agents (bd-627d Phase 2)
2025-11-02 14:03:14 -08:00
init_test.go
Fix: bd init --no-db now sets no-db: true in config.yaml
2025-11-03 15:01:46 -08:00
init.go
Add remaining multi-repo files from bd-307
2025-11-04 23:12:41 -08:00
integrity_test.go
Fix daemon race condition: prevent stale exports
2025-11-01 22:01:41 -07:00
integrity.go
Fix bd-9bsx: Add sync validation to prevent infinite dirty loop
2025-11-05 18:10:06 -08:00
jsonl_integrity_test.go
Fix bd-c6cf: Force full export when export_hashes is cleared
2025-11-01 20:29:13 -07:00
label_test.go
Fix all test failures from bd-166 (missing issue_prefix)
2025-10-26 22:31:24 -07:00
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
feat: Add ancestor_id field and implement epic/child filtering
2025-11-05 00:44:41 -08:00
list.go
feat: Add ancestor_id field and implement epic/child filtering
2025-11-05 00:44:41 -08:00
main_test.go
Add unit tests for autoimport, importer, and main CLI
2025-10-31 17:17:33 -07:00
main.go
Add support for bd --version flag
2025-11-05 17:37:53 -08:00
markdown_test.go
…
markdown.go
bd sync: 2025-11-05 13:56:12
2025-11-05 13:56:12 -08:00
merge_test.go
feat: Add bd merge command for git 3-way JSONL merging (bd-omx1)
2025-11-05 19:16:50 -08:00
merge.go
feat: Add bd merge command for git 3-way JSONL merging (bd-omx1)
2025-11-05 19:16:50 -08:00
migrate_hash_ids_test.go
Implement hash ID migration tool (bd-173)
2025-10-30 16:28:13 -07:00
migrate_hash_ids.go
fix: Suppress gosec warnings with nolint comments
2025-11-02 08:09:58 -08:00
migrate_issues.go
Add multi-repo migration guide and bd migrate-issues command
2025-11-05 18:44:02 -08: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
Add bd migrate --to-separate-branch command
2025-11-04 12:39:38 -08:00
nodb_test.go
Fix hyphenated issue prefix detection (#199)
2025-11-01 19:57:37 -07:00
nodb.go
Refactor: Extract path canonicalization into utils.CanonicalizePath()
2025-11-02 19:11:08 -08:00
onboard_test.go
Enhance bd onboard with AI planning docs management guidance
2025-11-02 17:10:41 -08:00
onboard.go
Fix all gosec, misspell, and unparam linter errors
2025-11-02 20:06:05 -08:00
output_test.go
…
priority_test.go
bd sync: 2025-11-05 13:56:12
2025-11-05 13:56:12 -08:00
quickstart.go
…
ready_test.go
Fix failing tests
2025-10-27 20:08:50 -07:00
ready.go
Add template support for issue creation (bd-164b)
2025-11-03 20:31:11 -08:00
reinit_test.go
Skip TestDatabaseReinitialization on Windows
2025-11-02 11:02:58 -08:00
rename_prefix_repair_test.go
Fix TestRepairMultiplePrefixes to bypass prefix validation
2025-10-27 22:59:19 -07:00
rename_prefix_test.go
…
rename_prefix.go
Add rename-prefix --repair flag and consolidate issue ID parsing
2025-10-27 18:31:01 +00:00
reopen_test.go
Fix all test failures from bd-166 (missing issue_prefix)
2025-10-26 22:31:24 -07:00
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
Add bd repair-deps command (bd-58)
2025-10-29 12:56:51 -07:00
repair_deps.go
fix: Address all errcheck and misspell linter errors
2025-11-01 23:56:03 -07:00
repo.go
Add multi-repo CLI commands and integrate with daemon sync
2025-11-04 23:12:41 -08:00
restore_test.go
Improve cmd/bd test coverage from 21% to 23.1% (bd-27ea)
2025-10-31 19:44:43 -07:00
restore.go
bd sync: 2025-10-31 22:39:53
2025-10-31 22:39:53 -07:00
scripttest_test.go
Optimize test suite performance - 45% reduction in integration tests
2025-11-04 11:25:36 -08:00
show_test.go
Fix config system: rename config.json → metadata.json, fix config.yaml loading
2025-11-02 14:31:22 -08:00
show.go
bd sync: 2025-11-05 13:56:12
2025-11-05 13:56:12 -08:00
simple_helpers_test.go
bd-211: Remove deprecated rename functions from import_shared.go
2025-10-27 20:38:13 -07:00
stale_test.go
Implement bd stale command (bd-c01f, closes #184)
2025-10-31 23:03:56 -07:00
stale.go
Add --json flag to stale command
2025-11-02 21:25:40 -08:00
status_test.go
Add 'bd status' command for issue database overview (bd-28db)
2025-11-02 17:57:59 -08:00
status.go
Fix --json flag shadowing issue causing test failures
2025-11-02 18:52:44 -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-9bsx: Add sync validation to prevent infinite dirty loop
2025-11-05 18:10:06 -08: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
Fix failing tests
2025-10-27 20:08:50 -07:00
test_wait_helper.go
test: add waitFor helper for event-driven testing
2025-11-04 01:10:18 -08:00
validate_test.go
Improve cmd/bd test coverage from 21% to 23.1% (bd-27ea)
2025-10-31 19:44:43 -07:00
validate.go
Fix --json flag shadowing issue causing test failures
2025-11-02 18:52:44 -08:00
version_test.go
Add support for bd --version flag
2025-11-05 17:37:53 -08:00
version.go
chore: Bump version to 0.21.9
2025-11-05 01:16:45 -08:00
worktree_test.go
…
worktree.go
…