Steve Yegge 1ab040390a Merge conflict resolution: sync-branch in config.yaml ...

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

Co-Authored-By: Claude <noreply@anthropic.com>

2025-11-30 11:16:50 -08:00

..

doctor

fix: support git worktrees in hooks installation

2025-11-29 23:19:57 -08:00

setup

fix(docs): correct bd dep add syntax and semantics

2025-11-29 22:07:00 -08:00

templates

feat(config): move sync-branch to config.yaml as source of truth

2025-11-30 11:15:49 -08:00

testdata

…

autoflush.go

refactor: rename last_import_hash to jsonl_content_hash (bd-39o)

2025-11-28 23:14:12 -08:00

autoimport_test.go

fix: Add defense-in-depth check for --no-auto-import flag (bd-4t7)

2025-11-27 00:54:29 -08:00

autoimport.go

Fix auto-import git history backfill bug (bd-4pv)

2025-11-27 22:51:39 -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

bd-6xd: Standardize on issues.jsonl as canonical filename

2025-11-26 22:02:59 -08:00

cleanup.go

bd-6xd: Standardize on issues.jsonl as canonical filename

2025-11-26 22:02:59 -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

feat(deletions): complete deletions manifest epic with integration tests

2025-11-25 16:36:46 -08: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

feat(bd-1pj6): Add custom status states via config

2025-11-28 23:19:21 -08: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: extract error handling helpers FatalError/WarnError (bd-s0z)

2025-11-28 23:28:30 -08:00

daemon_autoimport_test.go

…

daemon_autostart.go

refactor: remove deprecated global daemon support

2025-11-24 23:39:54 -08:00

daemon_config.go

refactor: remove deprecated global daemon support

2025-11-24 23:39:54 -08:00

daemon_crash_test.go

…

daemon_debouncer_test.go

fix: CI test failures on Windows

2025-11-26 20:59:07 -08:00

daemon_debouncer.go

…

daemon_event_loop.go

refactor: rename last_import_hash to jsonl_content_hash (bd-39o)

2025-11-28 23:14:12 -08:00

daemon_health_unix.go

fix(ci): more changes to fix failing CI (#415)

2025-11-29 22:24:29 -08:00

daemon_health_wasm.go

feat: implement health checks in daemon event loop (bd-gqo)

2025-11-28 23:10:44 -08:00

daemon_health_windows.go

feat: implement health checks in daemon event loop (bd-gqo)

2025-11-28 23:10:44 -08:00

daemon_lifecycle.go

refactor: remove deprecated global daemon support

2025-11-24 23:39:54 -08:00

daemon_lock_test.go

…

daemon_lock_unix.go

…

daemon_lock_wasm.go

…

daemon_lock_windows.go

…

daemon_lock.go

…

daemon_logger.go

Increase daemon log rotation limits for production use

2025-11-23 21:33:00 -08:00

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

Increase daemon log rotation limits for production use

2025-11-23 21:33:00 -08:00

daemon_server.go

refactor: remove deprecated global daemon support

2025-11-24 23:39:54 -08: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

refactor: rename last_import_hash to jsonl_content_hash (bd-39o)

2025-11-28 23:14:12 -08:00

daemon_sync.go

fix(bd-53c): Add reverse ZFC check to prevent stale DB from corrupting JSONL

2025-11-29 17:01:36 -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

refactor: remove deprecated global daemon support

2025-11-24 23:39:54 -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_recording_test.go

bd sync: 2025-11-25 11:46:06

2025-11-25 11:46: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

bd sync: 2025-11-25 11:46:06

2025-11-25 11:46:06 -08:00

deleted.go

feat(deletions): complete deletions manifest epic with integration tests

2025-11-25 16:36:46 -08:00

deletion_propagation_test.go

bd sync: 2025-11-25 12:03:21

2025-11-25 12:03:21 -08: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

…

dep_test.go

bd sync: 2025-11-25 19:32:04

2025-11-25 19:32:05 -08:00

dep.go

bd sync: 2025-11-25 19:32:04

2025-11-25 19:32:05 -08: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

Fix fresh clone UX with friendly error messages (bd-dmb)

2025-11-27 22:40:57 -08:00

doctor_test.go

feat(config): move sync-branch to config.yaml as source of truth

2025-11-30 11:15:49 -08:00

doctor.go

feat(config): move sync-branch to config.yaml as source of truth

2025-11-30 11:15:49 -08:00

duplicates_test.go

Implement auto-merge functionality for duplicates command

2025-11-27 22:39:13 -08:00

duplicates.go

Implement auto-merge functionality for duplicates command

2025-11-27 22:39:13 -08: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

errors.go

feat: extract error handling helpers FatalError/WarnError (bd-s0z)

2025-11-28 23:28:30 -08: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

fix: support multi-part prefixes in issue ID extraction (#398)

2025-11-26 17:42:14 -08:00

hooks_test.go

fix: support git worktrees in hooks installation

2025-11-29 23:19:57 -08:00

hooks.go

fix: support git worktrees in hooks installation

2025-11-29 23:19:57 -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

…

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

feat(import,sync): add --no-git-history flag to prevent spurious deletions

2025-11-26 23:10:43 -08:00

import_uncommitted_test.go

test: Tag 16 slow integration tests with build tags

2025-11-21 14:40:22 -05:00

import.go

fix: prevent bd sync corruption from stale daemon SQLite connection

2025-11-29 20:54:28 -08:00

info_test.go

…

info.go

feat(hooks): make template hooks sync.branch aware (bd-8ib)

2025-11-30 10:52:07 -08:00

init_contributor.go

feat: configure sync.remote for contributor fork workflows

2025-11-29 23:22:52 -08:00

init_hooks_test.go

fix: support git worktrees in hooks installation

2025-11-29 23:19:57 -08: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(init): add safety guard to prevent overwriting existing data

2025-11-28 22:15:13 -08:00

init.go

feat(sync): read sync-branch from config.yaml (bd-io0)

2025-11-30 10:55:41 -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

refactor: rename last_import_hash to jsonl_content_hash (bd-39o)

2025-11-28 23:14:12 -08:00

integrity.go

fix(bd-53c): Add reverse ZFC check to prevent stale DB from corrupting JSONL

2025-11-29 17:01:36 -08: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

Add --sort and --reverse flags to bd list command

2025-11-24 20:16:07 -08:00

main_test.go

fix(ci): more changes to fix failing CI (#415)

2025-11-29 22:24:29 -08:00

main.go

fix(ci): more changes to fix failing CI (#415)

2025-11-29 22:24:29 -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

docs(UX): improve daemon and merge documentation (bd-bt6y)

2025-11-28 23:11:24 -08: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

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

fix: support multi-part prefixes in issue ID extraction (#398)

2025-11-26 17:42:14 -08:00

nodb.go

fix: support multi-part prefixes in issue ID extraction (#398)

2025-11-26 17:42:14 -08: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

fix: doctor deletions check and onboard docs improvements

2025-11-27 13:23:14 -08:00

output_test.go

…

prime.go

fix(docs): correct bd dep add syntax and semantics

2025-11-29 22:07:00 -08:00

quickstart.go

…

ready_test.go

feat(ready): add --unassigned filter for bd ready

2025-11-30 00:38:57 -08:00

ready.go

feat(ready): add --unassigned filter for bd ready

2025-11-30 00:38:57 -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

Support --reason flag in daemon mode for reopen command (bd-r46)

2025-11-24 01:12:33 -08: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

bd sync: 2025-11-24 21:16:44

2025-11-24 21:16:44 -08:00

setup.go

Add Aider integration for beads issue tracking

2025-11-23 15:13:54 -08:00

show.go

Add close reason display for closed issues

2025-11-28 17:36:01 -08: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

bd-6xd: Standardize on issues.jsonl as canonical filename

2025-11-26 22:02:59 -08:00

status_test.go

Fix: TestGetAssignedStatus - Missing rootCtx initialization

2025-11-21 23:22:12 -08:00

status.go

bd-6xd: Standardize on issues.jsonl as canonical filename

2025-11-26 22:02:59 -08: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

fix(sync): default noGitHistory=true for --from-main mode (#418)

2025-11-29 22:29:10 -08:00

sync.go

feat(sync): use worktree for sync.branch commits (bd-e3w)

2025-11-30 00:42:26 -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

fix: CI test failures and lint errors

2025-11-24 00:21:01 -08:00

tips_example_test.go

Add tip system infrastructure (bd-d4i)

2025-11-24 10:56:14 -08:00

tips_test.go

bd sync: 2025-11-24 11:28:32

2025-11-24 11:28:32 -08:00

tips.go

fix: resolve golangci-lint errors

2025-11-24 22:21:55 -08:00

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(tests): resolve short test performance regression (bd-0v4)

2025-11-27 01:36:57 -08:00

version_tracking.go

bd-6xd: Standardize on issues.jsonl as canonical filename

2025-11-26 22:02:59 -08:00

version.go

feat(hooks): make template hooks sync.branch aware (bd-8ib)

2025-11-30 10:52:07 -08:00

worktree_test.go

…

worktree.go

…