beads/crew/lydia 9a9704b451 feat(sync): add per-field merge strategies for conflict resolution ...

Implements configurable per-field merge strategies (hq-ew1mbr.11):

- Add FieldStrategy type with strategies: newest, max, union, manual
- Add conflict.fields config section for per-field overrides
- compaction_level defaults to "max" (highest value wins)
- estimated_minutes defaults to "manual" (flags for user resolution)
- labels defaults to "union" (set merge)

Manual conflicts are displayed during sync with resolution options:
  bd sync --ours / --theirs, or bd resolve <id> <field> <value>

Config example:
  conflict:
    strategy: newest
    fields:
      compaction_level: max
      estimated_minutes: manual
      labels: union

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

2026-01-21 19:40:39 -08:00

..

doctor

Fix CI failures (bd 1zo sandbox tests) (#1244)

2026-01-21 16:59:51 -08:00

setup

…

templates/hooks

fix(hooks): Fix infinite recursion and update templates for Dolt hooks

2026-01-16 14:33:08 -08:00

testdata

…

.gitattributes

…

@AGENTS.md

…

activity_test.go

…

activity_watcher.go

fix(ci): resolve lint errors and test failures

2026-01-20 20:50:59 -08:00

activity.go

fix(ci): resolve lint errors and test failures

2026-01-20 20:50:59 -08:00

actor_test.go

…

admin_aliases.go

feat(compact): add --dolt flag for Dolt garbage collection

2026-01-17 01:54:50 -08:00

admin.go

…

agent_routing_test.go

fix(ci): resolve lint errors and test failures

2026-01-20 20:50:59 -08:00

agent_test.go

…

agent.go

…

AGENTS.md

docs: Add agent warning about interactive bd edit command

2026-01-13 20:58:07 -08:00

audit.go

…

autoflush_test.go

…

autoflush.go

Fix issue-prefix config fallback to config.yaml (GH#1145) (#1146)

2026-01-19 10:11:19 -08:00

autoimport_test.go

…

autoimport.go

fix(context): complete RepoContext migration for remaining sync files (#1114)

2026-01-15 19:23:07 -08:00

autostart_test.go

…

branch.go

feat(storage): add VersionedStorage interface with history/diff/branch operations

2026-01-17 01:55:16 -08:00

children.go

fix(ci): resolve lint errors and test failures

2026-01-20 20:50:59 -08:00

cleanup.go

…

cli_coverage_show_test.go

refactor(types): remove Gas Town type constants from beads core (bd-w2zz4)

2026-01-21 10:36:59 -08:00

cli_fast_test.go

…

close.go

feat(close): add -m as alias for --reason

2026-01-17 03:48:51 -08:00

comments_test.go

…

comments.go

…

compact_rpc.go

…

compact_test.go

…

compact_tombstone.go

…

compact.go

feat(compact): add --dolt flag for Dolt garbage collection

2026-01-17 01:54:50 -08:00

completions_test.go

fix: allow shell completions to work without a database (#1118)

2026-01-15 19:22:55 -08:00

completions.go

…

config_test.go

feat(config): add validate command for sync config

2026-01-17 14:02:28 -08:00

config.go

fix(config): improve cross-platform path handling and regex efficiency

2026-01-19 11:42:09 -08:00

context_test.go

…

context.go

…

contributor_routing_e2e_test.go

fix(routing): complete bd init --contributor routing (bd-6x6g) (#1088)

2026-01-14 20:50:56 -08:00

cook_test.go

…

cook.go

refactor(types): remove Gas Town type constants from beads core (bd-w2zz4)

2026-01-21 10:36:59 -08:00

count.go

…

create_form_test.go

…

create_form.go

feat(types): add "enhancement" as alias for "feature" type

2026-01-16 15:44:33 -08:00

create_notes_test.go

…

create_test.go

…

create.go

fix(routing): close original store before replacing with target store (#1215)

2026-01-20 14:05:40 -08:00

cross_backend_jsonl_roundtrip_integration_test.go

/{cmd,docs,internal}: support import export for dolt backends

2026-01-21 13:13:24 -08:00

daemon_autoimport_test.go

…

daemon_autopull_yaml_test.go

…

daemon_autostart_unit_test.go

Fix CI failures (bd 1zo sandbox tests) (#1244)

2026-01-21 16:59:51 -08:00

daemon_autostart.go

fix(daemon): prevent stack overflow in handleStaleLock (#1238)

2026-01-21 16:51:56 -08:00

daemon_basics_test.go

…

daemon_config.go

…

daemon_crash_test.go

…

daemon_debouncer_test.go

…

daemon_debouncer.go

fix(daemon): Fix double-unlock risk in debouncer on action panic (#1140)

2026-01-19 10:08:53 -08:00

daemon_event_loop.go

…

daemon_guard.go

fix(daemon): allow read-only daemon commands with Dolt backend

2026-01-21 18:06:06 -08:00

daemon_health_freebsd.go

…

daemon_health_solaris.go

…

daemon_health_unix.go

…

daemon_health_wasm.go

…

daemon_health_windows.go

…

daemon_integration_test.go

…

daemon_lifecycle.go

fix(federation): add configurable ports, password support, fix log leak

2026-01-20 20:55:27 -08:00

daemon_local_test.go

…

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

…

daemon_lock_windows.go

…

daemon_lock.go

…

daemon_logger.go

…

daemon_parent_test.go

…

daemon_rotation_test.go

…

daemon_server.go

bd sync: 2025-12-23 23:38:57

2025-12-24 00:06:41 -08:00

daemon_socket_test.go

…

daemon_start.go

fix(daemon): allow read-only daemon commands with Dolt backend

2026-01-21 18:06:06 -08:00

daemon_status.go

…

daemon_sync_branch_test.go

…

daemon_sync_branch.go

fix(sync): add --sparse flag to git add for worktree compatibility (#1143)

2026-01-19 10:21:12 -08:00

daemon_sync_state.go

fix(daemon): Eliminate race condition in sync state load-modify-save (#1139)

2026-01-19 10:08:41 -08:00

daemon_sync_test.go

…

daemon_sync.go

Fix Dolt backend init/daemon/doctor; prevent accidental SQLite artifacts; add integration tests; clean up lint (#1218)

2026-01-20 17:34:00 -08:00

daemon_test.go

…

daemon_unix_test.go

…

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

…

daemon_windows.go

…

daemon.go

fix(daemon): allow read-only daemon commands with Dolt backend

2026-01-21 18:06:06 -08:00

daemons_test.go

…

daemons.go

fix(daemon): allow read-only daemon commands with Dolt backend

2026-01-21 18:06:06 -08:00

defer.go

…

delete_rpc_test.go

…

delete_test.go

…

delete.go

…

deletion_tracking_test.go

…

deletion_tracking.go

…

dep_test.go

…

dep.go

…

detect_pollution.go

…

diff.go

feat(storage): add VersionedStorage interface with history/diff/branch operations

2026-01-17 01:55:16 -08:00

direct_mode_test.go

/{cmd,docs,internal,website}: make dolt backend explicitly single process

2026-01-20 16:51:14 -08:00

direct_mode.go

…

docs.md

…

doctor_fix.go

feat(doctor): add patrol pollution detection and fix

2026-01-20 23:15:37 -08:00

doctor_health.go

…

doctor_pollution.go

…

doctor_repair_chaos_test.go

…

doctor_repair_test.go

…

doctor_test.go

…

doctor.go

feat(doctor): add patrol pollution detection and fix

2026-01-20 23:15:37 -08:00

dolt_daemon_autostart_integration_test.go

Fix Dolt backend init/daemon/doctor; prevent accidental SQLite artifacts; add integration tests; clean up lint (#1218)

2026-01-20 17:34:00 -08:00

dolt_doctor_integration_test.go

Fix Dolt backend init/daemon/doctor; prevent accidental SQLite artifacts; add integration tests; clean up lint (#1218)

2026-01-20 17:34:00 -08:00

dolt_jsonl_roundtrip_integration_test.go

/{cmd,docs,internal}: support import export for dolt backends

2026-01-21 13:13:24 -08:00

dolt_singleprocess_test.go

fix(daemon): allow read-only daemon commands with Dolt backend

2026-01-21 18:06:06 -08:00

dual_mode_test.go

…

duplicate.go

…

duplicates_test.go

fix(duplicates): use combined weight (dependents + dependencies) for merge target selection (GH#1022)

2026-01-17 03:44:13 -08:00

duplicates.go

fix(duplicates): use combined weight (dependents + dependencies) for merge target selection (GH#1022)

2026-01-17 03:44:13 -08:00

edit.go

…

epic_test.go

…

epic.go

…

errors.go

…

export_import_test.go

…

export_integrity_integration_test.go

…

export_mtime_test.go

…

export_obsidian_test.go

…

export_obsidian.go

refactor(types): remove Gas Town type constants from beads core (bd-w2zz4)

2026-01-21 10:36:59 -08:00

export_staleness_test.go

…

export_test.go

…

export.go

/{cmd,docs,internal}: support import export for dolt backends

2026-01-21 13:13:24 -08:00

external_ref_test.go

…

federation.go

/cmd/bd/federation.go: fix windows build issue again

2026-01-21 14:08:40 -08:00

flags.go

feat(create): add -m as alias for --description flag

2026-01-21 19:34:29 -08:00

flush_manager_test.go

…

flush_manager.go

…

fork_protection_test.go

…

fork_protection.go

…

formula.go

…

gate_discover.go

refactor(types): remove Gas Town type constants from beads core (bd-w2zz4)

2026-01-21 10:36:59 -08:00

gate_test.go

…

gate.go

refactor(types): remove Gas Town type constants from beads core (bd-w2zz4)

2026-01-21 10:36:59 -08:00

git_sync_test.go

…

git_test_helpers.go

…

graph_test.go

…

graph.go

…

helpers_test.go

…

history.go

feat(storage): add VersionedStorage interface with history/diff/branch operations

2026-01-17 01:55:16 -08:00

hook_test.go

refactor(hook): simplify export state logic, add tests

2026-01-19 11:44:08 -08:00

hook.go

/{cmd,docs,internal}: support import export for dolt backends

2026-01-21 13:13:24 -08:00

hooks_test.go

fix(hooks): prevent bd hooks install --chain from destroying user's original hook

2026-01-17 08:44:30 +01:00

hooks.go

refactor(hooks): consolidate duplicate JSONL file lists into shared constant

2026-01-20 19:15:18 -08:00

human.go

…

import_bug_test.go

…

import_cancellation_test.go

…

import_helpers_test.go

…

import_idempotent_test.go

…

import_mtime_test.go

…

import_multipart_id_test.go

…

import_profile_test.go

…

import_shared.go

…

import_uncommitted_test.go

…

import.go

/{cmd,docs,internal}: support import export for dolt backends

2026-01-21 13:13:24 -08:00

info_test.go

…

info.go

chore(release): bump version to 0.48.0

2026-01-17 04:36:41 -08:00

init_agent.go

…

init_contributor.go

fix(routing): complete bd init --contributor routing (bd-6x6g) (#1088)

2026-01-14 20:50:56 -08:00

init_git_hooks.go

feat(hooks): add jujutsu (jj) version control support

2026-01-20 19:13:02 -08:00

init_hooks_test.go

…

init_stealth_test.go

fix(init): use --git-common-dir for worktree exclude paths (GH#1053)

2026-01-17 02:29:01 -08:00

init_stealth.go

fix(init): use --git-common-dir for worktree exclude paths (GH#1053)

2026-01-17 02:29:01 -08:00

init_team.go

feat(context): centralize RepoContext API for git operations (#1102)

2026-01-15 07:55:08 -08:00

init_templates.go

fix(test): fix TestInitNoDbMode for no-db mode config persistence

2026-01-15 11:37:57 -08:00

init_test.go

fix(init): error when redirect target already has database

2026-01-20 20:03:28 -08:00

init.go

fix(init): error when redirect target already has database

2026-01-20 20:03:28 -08:00

integrity_content_test.go

…

integrity_test.go

…

integrity.go

…

jira_test.go

…

jira.go

…

jsonl_integrity_test.go

…

label_test.go

…

label.go

…

last_touched_test.go

…

last_touched.go

…

linear_conflict.go

…

linear_sync.go

feat(linear): add --type and --exclude-type flags for sync filtering (#1205)

2026-01-20 14:05:48 -08:00

linear_test.go

feat(linear): add --type and --exclude-type flags for sync filtering (#1205)

2026-01-20 14:05:48 -08:00

linear.go

feat(linear): add --type and --exclude-type flags for sync filtering (#1205)

2026-01-20 14:05:48 -08:00

lint.go

…

list_helpers_test.go

…

list_test.go

fix(list): stabilize tree ordering for consistent --tree output (#1228)

2026-01-21 19:11:25 -08:00

list.go

fix(list): stabilize tree ordering for consistent --tree output (#1228)

2026-01-21 19:11:25 -08:00

mail.go

…

main_daemon.go

/{cmd,docs,internal,website}: make dolt backend explicitly single process

2026-01-20 16:51:14 -08:00

main_errors.go

…

main_help.go

…

main_test.go

fix(routing): close original store before replacing with target store (#1215)

2026-01-20 14:05:40 -08:00

main.go

fix(redirect): follow redirect when creating database (GH#bd-0qel)

2026-01-20 20:02:56 -08:00

markdown_test.go

…

markdown.go

…

merge_security_test.go

…

merge_slot.go

fix(merge-slot): use daemon RPC to get issue_prefix in daemon mode

2026-01-17 03:44:02 -08:00

merge.go

feat(context): centralize RepoContext API for git operations (#1102)

2026-01-15 07:55:08 -08:00

migrate_dolt_nocgo.go

feat(migrate): add SQLite to Dolt migration tooling (hq-ew1mbr.6)

2026-01-21 17:46:15 -08:00

migrate_dolt.go

fix(migrate): address code review issues in Dolt migration

2026-01-21 19:27:01 -08:00

migrate_hash_ids_test.go

…

migrate_hash_ids.go

…

migrate_issues.go

feat: integrate migration detection into bd doctor (bd-7l27)

2025-12-30 00:06:42 -08:00

migrate_sync_test.go

feat(context): centralize RepoContext API for git operations (#1102)

2026-01-15 07:55:08 -08:00

migrate_sync.go

fix(sync): add --sparse flag to git add for worktree compatibility (#1143)

2026-01-19 10:21:12 -08:00

migrate_test.go

…

migrate_tombstones.go

…

migrate.go

feat(migrate): add SQLite to Dolt migration tooling (hq-ew1mbr.6)

2026-01-21 17:46:15 -08:00

mol_bond.go

…

mol_burn.go

…

mol_current.go

fix(ready): exclude molecule steps from bd ready by default (#1246)

2026-01-21 19:30:15 -08:00

mol_distill.go

…

mol_progress.go

…

mol_ready_gated_test.go

refactor(types): remove Gas Town type constants from beads core (bd-w2zz4)

2026-01-21 10:36:59 -08:00

mol_ready_gated.go

fix(ready): exclude molecule steps from bd ready by default (#1246)

2026-01-21 19:30:15 -08:00

mol_seed.go

feat(mol): add 'bd mol seed --patrol' command (#1149)

2026-01-20 14:06:57 -08:00

mol_show.go

…

mol_squash.go

…

mol_stale.go

…

mol_test.go

fix(ready): exclude molecule steps from bd ready by default (#1246)

2026-01-21 19:30:15 -08:00

mol.go

…

move_test.go

…

move.go

…

nodb_test.go

…

nodb.go

…

onboard_test.go

…

onboard.go

…

orphans_test.go

…

orphans.go

…

output_test.go

…

periodic_remote_sync_test.go

…

pour.go

fix(ready): exclude molecule steps from bd ready by default (#1246)

2026-01-21 19:30:15 -08:00

preflight_test.go

feat: add nix-hash staleness detection to bd preflight --check (bd-lfak.4)

2025-12-31 00:05:53 -08:00

preflight.go

…

prime_test.go

…

prime.go

docs(prime): warn agents about bd edit opening interactive editor

2026-01-17 00:24:34 -08:00

quick.go

feat(types): add "enhancement" as alias for "feature" type

2026-01-16 15:44:33 -08:00

quickstart.go

…

readonly_test.go

…

ready_test.go

…

ready.go

…

refile.go

…

reinit_test.go

fix(context): complete RepoContext migration for remaining sync files (#1114)

2026-01-15 19:23:07 -08:00

relate_test.go

refactor: remove unused bd pin/unpin/hook commands (bd-x0zl)

2025-12-27 16:02:15 -08:00

relate.go

…

rename_prefix_jsonl_update_test.go

…

rename_prefix_repair_test.go

…

rename_prefix_test.go

…

rename_prefix.go

…

rename.go

feat(rename): add bd rename command for renaming issue IDs

2026-01-20 18:49:44 -08:00

reopen_test.go

…

reopen.go

…

repair_deps_test.go

…

repair_orphans_test.go

…

repair.go

…

repo.go

…

reset_test.go

…

reset.go

Fix git hooks not working in worktrees (#1126)

2026-01-16 12:01:43 -08:00

resolve_conflicts_test.go

…

resolve_conflicts.go

…

restore_test.go

…

restore.go

…

routed.go

…

sandbox_test.go

…

sandbox_unix.go

…

sandbox_windows.go

…

scripttest_test.go

…

search_test.go

…

search.go

…

setup.go

…

ship.go

…

show_test.go

fix(config): remove duplicate declarations and fix test failures (#1160)

2026-01-19 10:11:14 -08:00

show_thread.go

…

show_unit_helpers_test.go

refactor(types): remove Gas Town type constants from beads core (bd-w2zz4)

2026-01-21 10:36:59 -08:00

show_unit_helpers.go

…

show.go

feat(storage): add VersionedStorage interface with history/diff/branch operations

2026-01-17 01:55:16 -08:00

simple_helpers_test.go

…

slot.go

…

snapshot_manager.go

…

stale_test.go

…

stale.go

…

staleness_test.go

…

staleness.go

fix(staleness): skip auto-import when store is read-only (GH#1089)

2026-01-18 18:25:50 -08:00

state_test.go

…

state.go

…

status_test.go

refactor(status): merge stats command into status (GH#644)

2025-12-20 13:14:39 -08:00

status.go

fix(context): complete RepoContext migration for remaining sync files (#1114)

2026-01-15 19:23:07 -08:00

swarm.go

refactor(types): remove Gas Town type constants from beads core (bd-w2zz4)

2026-01-21 10:36:59 -08:00

sync_branch_priority_test.go

…

sync_branch.go

fix(sync): add --sparse flag to git add for worktree compatibility (#1143)

2026-01-19 10:21:12 -08:00

sync_check.go

fix(context): complete RepoContext migration for remaining sync files (#1114)

2026-01-15 19:23:07 -08:00

sync_cwd_test.go

feat(context): centralize RepoContext API for git operations (#1102)

2026-01-15 07:55:08 -08:00

sync_export_incremental_test.go

feat(sync): add incremental export for large repos

2026-01-20 21:26:17 -08:00

sync_export.go

feat(sync): add incremental export for large repos

2026-01-20 21:26:17 -08:00

sync_external_test.go

feat(sync): pull-first sync with 3-way merge (#918)

2026-01-07 21:27:20 -08:00

sync_git_test.go

fix(sync): remove orphaned restoreBeadsDirFromBranch function (#1121)

2026-01-15 19:22:52 -08:00

sync_git.go

fix(sync): remove orphaned restoreBeadsDirFromBranch function (#1121)

2026-01-15 19:22:52 -08:00

sync_helpers_more_test.go

feat(context): centralize RepoContext API for git operations (#1102)

2026-01-15 07:55:08 -08:00

sync_import.go

/{cmd,docs,internal,website}: make dolt backend explicitly single process

2026-01-20 16:51:14 -08:00

sync_local_only_test.go

…

sync_manual_test.go

feat(sync): add per-field merge strategies for conflict resolution

2026-01-21 19:40:39 -08:00

sync_manual.go

feat(sync): add per-field merge strategies for conflict resolution

2026-01-21 19:40:39 -08:00

sync_merge_test.go

feat(sync): add per-field merge strategies for conflict resolution

2026-01-21 19:40:39 -08:00

sync_merge.go

feat(sync): add per-field merge strategies for conflict resolution

2026-01-21 19:40:39 -08:00

sync_mode_test.go

feat(sync): wire up sync.mode config to change sync behavior

2026-01-18 10:36:20 -08:00

sync_mode.go

refactor(config): improve sync config with warnings toggle and dedup

2026-01-19 11:49:44 -08:00

sync_modes_test.go

fix: Validate sync-branch at config-time and runtime (closes #1166) (#1168)

2026-01-19 10:11:06 -08:00

sync_test.go

…

sync_validation_test.go

test(sync): add tests for pre-sync validation hook (bd-nv4g)

2026-01-02 00:05:12 -08:00

sync.go

feat(sync): add per-field merge strategies for conflict resolution

2026-01-21 19:40:39 -08:00

template_test.go

…

template.go

…

test_guard_helpers.go

…

test_helpers_test.go

feat(types): remove Gas Town types from core built-in types

2026-01-17 05:07:11 -08:00

test_repo_beads_guard_test.go

fix(docs): update command syntax from '--' to single argument format for start, stop and status. (#1086)

2026-01-14 20:43:07 -08:00

test_wait_helper.go

feat(context): centralize RepoContext API for git operations (#1102)

2026-01-15 07:55:08 -08:00

thanks.go

…

thread_test.go

refactor(types): remove Gas Town type constants from beads core (bd-w2zz4)

2026-01-21 10:36:59 -08:00

tips_example_test.go

…

tips_test.go

…

tips.go

…

types.go

refactor(types): remove Gas Town type constants from beads core (bd-w2zz4)

2026-01-21 10:36:59 -08:00

undefer.go

…

update.go

fix(types): consolidate enhancement alias and fix update command

2026-01-16 16:02:51 -08:00

upgrade.go

…

utils_unit_test.go

…

vc.go

feat(storage): add VersionedStorage interface with history/diff/branch operations

2026-01-17 01:55:16 -08:00

version_test.go

…

version_tracking_test.go

…

version_tracking.go

…

version.go

chore(release): bump version to 0.48.0

2026-01-17 04:36:41 -08:00

where.go

…

wisp.go

fix(ready): exclude molecule steps from bd ready by default (#1246)

2026-01-21 19:30:15 -08:00

worktree_cmd_test.go

feat(context): centralize RepoContext API for git operations (#1102)

2026-01-15 07:55:08 -08:00

worktree_cmd.go

fix(worktree): correct redirect path computation in bd worktree create (#1217)

2026-01-20 14:04:51 -08:00

worktree_daemon_test.go

…

worktree_test.go

feat(context): centralize RepoContext API for git operations (#1102)

2026-01-15 07:55:08 -08:00

worktree.go

…