jane c99bd00ca7 feat(sync): implement interactive conflict resolution for manual strategy ...

Adds interactive manual conflict resolution for `bd sync --resolve --manual`:
- Shows field-by-field diff between local and remote versions
- Prompts user to choose: local (l), remote (r), merge (m), skip (s)
- Supports viewing full JSON diff with 'd' option
- Skipped conflicts remain in conflict state for later resolution
- Integrates with existing 3-way merge infrastructure

New files:
- cmd/bd/sync_manual.go: Interactive conflict resolution logic
- cmd/bd/sync_manual_test.go: Unit tests for helper functions

Closes hq-ew1mbr.28

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

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

..

doctor

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

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

setup

feat: add Junie agent integration

2026-01-13 08:41:25 -06:00

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

test: add git helper and guard annotations

2025-12-28 20:48:37 -08:00

activity.go

…

actor_test.go

feat: add git user.name to actor fallback chain (#994)

2026-01-10 12:43:46 -08:00

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

…

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

fix(autoflush): preserve comments during full re-export triggered by hash mismatch (#1039)

2026-01-12 16:39:06 -08:00

autoflush.go

fix(sync): write to worktree JSONL only when sync-branch configured (#1133)

2026-01-17 00:04:09 -08:00

autoimport_test.go

feat(daemon): unify auto-sync config for simpler agent workflows (#904)

2026-01-06 12:52:19 -08:00

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

cleanup.go

…

cli_coverage_show_test.go

…

cli_fast_test.go

test: add failing tests for short ID support in comments (#1070)

2026-01-13 13:22:19 +00:00

close.go

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

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

comments_test.go

…

comments.go

fix: resolve short IDs in comments add/list daemon mode (#1070)

2026-01-13 13:28:30 +00:00

compact_rpc.go

…

compact_test.go

feat(compact): Add --prune mode for standalone tombstone pruning (bd-c7y5)

2025-12-24 00:08:10 -08:00

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

feat(config): add validate command for sync config

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

context_test.go

…

context.go

fix: prevent nil context panic in multi-repo hydration (#840)

2026-01-01 10:46:56 -08:00

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

…

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

feat: add --notes flag to bd create command (GH#830)

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

create_test.go

…

create.go

fix(create): use agent-aware prefix extraction for agent beads

2026-01-17 00:42:06 -08:00

daemon_autoimport_test.go

…

daemon_autopull_yaml_test.go

…

daemon_autostart_unit_test.go

chore: remove placeholder comment in test

2026-01-17 02:51:06 -08:00

daemon_autostart.go

fix(cli): suppress no-git-repo note with --quiet flag

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

daemon_basics_test.go

fix: update tests for getCurrentBranchOrHEAD and getPIDFileForSocket

2026-01-12 23:51:56 -08:00

daemon_config.go

fix(daemon): complete socket path shortening for long workspace paths (GH#1001) (#1008)

2026-01-10 22:50:16 -08:00

daemon_crash_test.go

…

daemon_debouncer_test.go

…

daemon_debouncer.go

…

daemon_event_loop.go

…

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

chore: remove issue ID references from comments and changelogs

2025-12-28 10:05:16 -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

Fix bd-54: Prevent multiple daemon instances via file locking

2025-10-22 13:59:58 -07:00

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

…

daemon_socket_test.go

fix(daemon): complete socket path shortening for long workspace paths (GH#1001) (#1008)

2026-01-10 22:50:16 -08:00

daemon_start.go

refactor(daemon): consolidate CLI to subcommands with semantic styling (#1006)

2026-01-10 16:28:52 -08:00

daemon_status.go

fix(daemon): silence deprecation warnings in --json mode

2026-01-10 16:31:16 -08:00

daemon_sync_branch_test.go

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

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

daemon_sync_branch.go

fix(daemon): apply git.author config to sync branch commits

2026-01-17 03:40:28 -08:00

daemon_sync_state.go

…

daemon_sync_test.go

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

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

daemon_sync.go

fix: finalize metadata after commit, not after push (GH#885)

2026-01-04 16:16:53 -08:00

daemon_test.go

…

daemon_unix_test.go

…

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

…

daemon_watcher_test.go

…

daemon_watcher.go

fix: prevent event storm when gitRefsPath is empty (#883)

2026-01-04 11:14:36 -08:00

daemon_windows.go

…

daemon.go

feat(storage): add --backend flag for Dolt backend selection

2026-01-14 21:42:31 -08:00

daemons_test.go

…

daemons.go

…

defer.go

…

delete_rpc_test.go

…

delete_test.go

…

delete.go

feat: add git user.name to actor fallback chain (#994)

2026-01-10 12:43:46 -08:00

deletion_tracking_test.go

…

deletion_tracking.go

…

dep_test.go

…

dep.go

fix(dep): prevent nil pointer panic in --json mode (GH#998)

2026-01-10 12:08:48 -08:00

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

fix: sync --import-only fails with "no database store available" when daemon was connected

2026-01-09 12:02:02 +01:00

direct_mode.go

…

docs.md

…

doctor_fix.go

feat(doctor): add check for stale .beads/mq/ files (bd-dx2dc)

2026-01-12 19:42:51 -08:00

doctor_health.go

…

doctor_pollution.go

fix: Add nolint comments for gosec/errcheck/unparam warnings

2025-12-29 14:39:43 -08:00

doctor_repair_chaos_test.go

…

doctor_repair_test.go

…

doctor_test.go

…

doctor.go

fix(sync): handle redirect + sync-branch incompatibility (bd-wayc3)

2026-01-14 20:36:30 -08:00

dual_mode_test.go

feat(daemon): unify auto-sync config for simpler agent workflows (#904)

2026-01-06 12:52:19 -08:00

duplicate.go

feat(completion): optimize ID prefix filtering and add completions to more commands

2026-01-06 19:05:34 -08:00

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

fix: bd edit now parses EDITOR with args (GH#987)

2026-01-09 22:53:53 -08:00

epic_test.go

…

epic.go

…

errors.go

fix(json): standardize JSON output for errors and empty arrays (bd-au0.7)

2025-12-24 00:07:52 -08:00

export_import_test.go

…

export_integrity_integration_test.go

fix: replace string(rune()) with strconv.Itoa in tests (bd-fmc)

2025-12-02 22:41:07 -08:00

export_mtime_test.go

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

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

export_obsidian_test.go

…

export_obsidian.go

feat: extract Gas Town types from beads core (bd-i54l)

2026-01-06 22:18:37 -08:00

export_staleness_test.go

…

export_test.go

…

export.go

…

external_ref_test.go

…

flags.go

…

flush_manager_test.go

refactor: remove legacy autoflush code paths (bd-xsl9)

2025-12-23 01:56:19 -08:00

flush_manager.go

…

fork_protection_test.go

…

fork_protection.go

…

formula.go

…

gate_discover.go

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

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

gate_test.go

refactor(gate): consolidate numeric ID check and improve workflow matching

2026-01-06 23:40:37 -08:00

gate.go

Fix bd gate list: Separate closed gates into own section

2026-01-13 00:46:50 -08:00

git_sync_test.go

…

git_test_helpers.go

…

graph_test.go

…

graph.go

feat(ux): visual improvements for list tree, graph, and show commands

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

helpers_test.go

…

history.go

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

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

hook.go

feat(hook): implement per-worktree export state tracking (Design Part 21)

2026-01-17 10:46:44 -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

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

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

human.go

…

import_bug_test.go

…

import_cancellation_test.go

…

import_helpers_test.go

…

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

…

import_shared.go

fix(sync): make snapshot protection timestamp-aware (GH#865)

2026-01-03 13:27:36 -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(context): complete RepoContext migration for remaining sync files (#1114)

2026-01-15 19:23:07 -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

Fix git hooks not working in worktrees (#1126)

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

init_hooks_test.go

feat: add prek support as pre-commit alternative (#1040)

2026-01-12 17:29:57 -08:00

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(test): fix TestInitNoDbMode for no-db mode config persistence

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

init.go

feat(hooks): Add git hook infrastructure for Dolt backend

2026-01-16 12:24:48 -08:00

integrity_content_test.go

…

integrity_test.go

refactor: remove all deletions.jsonl code (bd-fom)

2025-12-16 14:20:49 -08:00

integrity.go

…

jira_test.go

…

jira.go

…

jsonl_integrity_test.go

fix: resolve P2 sync noise and cleanup issues

2025-12-16 00:56:06 -08:00

label_test.go

…

label.go

feat(completion): optimize ID prefix filtering and add completions to more commands

2026-01-06 19:05:34 -08:00

last_touched_test.go

…

last_touched.go

…

linear_conflict.go

refactor: Split large cmd/bd files to meet 800-line limit (bd-xtf5)

2025-12-28 18:43:09 -08:00

linear_sync.go

refactor: Split large cmd/bd files to meet 800-line limit (bd-xtf5)

2025-12-28 18:43:09 -08:00

linear_test.go

…

linear.go

feat(linear): add project_id filter for sync (#938)

2026-01-07 20:45:00 -08:00

lint.go

…

list_helpers_test.go

feat(ux): visual improvements for list tree, graph, and show commands

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

list_test.go

feat(dates): add --due and --defer timestamp options with natural language parsing (#847)

2026-01-01 20:06:13 -08:00

list.go

feat(list): add --ready flag to show only available work (bd-ihu31)

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

mail.go

…

main_daemon.go

feat: add git user.name to actor fallback chain (#994)

2026-01-10 12:43:46 -08:00

main_errors.go

fix: rename wisp prefix from 'eph' to 'wisp' (bd-ucj8)

2026-01-01 23:55:40 -08:00

main_help.go

…

main_test.go

…

main.go

fix(main): move noDbCommands check before expensive git operations

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

markdown_test.go

Add native Windows support (#91)

2025-10-20 21:08:49 -07:00

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_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

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

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

migrate_test.go

Context propagation with graceful cancellation (bd-rtp, bd-yb8, bd-2o2)

2025-11-20 21:57:23 -05:00

migrate_tombstones.go

…

migrate.go

fix: validate sync.branch in team wizard and migrate commands (GH#923)

2026-01-10 23:42:49 -08:00

mol_bond.go

…

mol_burn.go

feat(mol): add batch burn support for multiple molecules

2026-01-10 11:55:33 -08:00

mol_current.go

…

mol_distill.go

…

mol_progress.go

…

mol_ready_gated_test.go

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

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

mol_ready_gated.go

feat(mol): add bd ready --gated for gate-resume discovery (bd-lhalq)

2026-01-08 21:22:17 -08:00

mol_show.go

…

mol_squash.go

…

mol_stale.go

…

mol_test.go

…

mol.go

…

move_test.go

feat: add bd move command for cross-rig issue relocation (bd-v43g)

2026-01-02 01:31:19 -08:00

move.go

…

nodb_test.go

…

nodb.go

…

onboard_test.go

…

onboard.go

…

orphans_test.go

test: improve nodb and orphans coverage

2025-12-29 14:17:44 -08:00

orphans.go

test: improve nodb and orphans coverage

2025-12-29 14:17:44 -08:00

output_test.go

…

periodic_remote_sync_test.go

…

pour.go

…

preflight_test.go

…

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

feat(mol): add bd ready --gated for gate-resume discovery (bd-lhalq)

2026-01-08 21:22:17 -08:00

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

…

relate.go

…

rename_prefix_jsonl_update_test.go

fix(rename-prefix): sync JSONL before and after prefix rename (#893)

2026-01-04 10:53:31 -08:00

rename_prefix_repair_test.go

…

rename_prefix_test.go

…

rename_prefix.go

…

reopen_test.go

feat: add session_id field to issue close/update mutations (bd-tksk)

2025-12-31 13:14:15 -08:00

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

Optimize test suite performance - 45% reduction in integration tests

2025-11-04 11:25:36 -08:00

search_test.go

…

search.go

…

setup.go

feat: add Junie agent integration

2026-01-13 08:41:25 -06:00

ship.go

…

show_test.go

feat(ux): visual improvements for list tree, graph, and show commands

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

show_thread.go

…

show_unit_helpers_test.go

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

2026-01-17 05:07:11 -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

fix(sync): make snapshot protection timestamp-aware (GH#865)

2026-01-03 13:27:36 -08:00

stale_test.go

…

stale.go

…

staleness_test.go

fix(staleness): auto-import on stale DB for read-only commands (bd-9dao) (#982)

2026-01-09 13:40:52 -08:00

staleness.go

fix(staleness): auto-import on stale DB for read-only commands (bd-9dao) (#982)

2026-01-09 13:40:52 -08:00

state_test.go

…

state.go

…

status_test.go

…

status.go

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

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

swarm.go

…

sync_branch_priority_test.go

fix: bypass gitHasBeadsChanges when using sync-branch (#812)

2025-12-30 18:04:26 -08:00

sync_branch.go

fix(sync): write to worktree JSONL only when sync-branch configured (#1133)

2026-01-17 00:04:09 -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.go

fix(sync): Update jsonl_file_hash in finalizeExport to prevent spurious warnings (#1113)

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

sync_external_test.go

…

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

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

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

sync_local_only_test.go

…

sync_manual_test.go

feat(sync): implement interactive conflict resolution for manual strategy

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

sync_manual.go

feat(sync): implement interactive conflict resolution for manual strategy

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

sync_merge_test.go

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

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

sync_merge.go

…

sync_modes_test.go

fix(test): remove pre-existing issues.jsonl in TestExportOnlySync

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

sync_test.go

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

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

sync_validation_test.go

…

sync.go

feat(sync): implement interactive conflict resolution for manual strategy

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

template_test.go

fix: mol run loads all hierarchical children + supports title lookup (bd-c8d5, bd-drcx)

2025-12-24 23:33:34 -08:00

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

…

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

…

types.go

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

2026-01-17 05:07:11 -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

Add unit tests to improve cmd/bd CLI coverage (bd-llfl)

2025-12-30 17:14:55 -08:00

vc.go

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

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

version_test.go

Refactor: Introduce CommandContext to consolidate global variables (bd-qobn)

2025-12-30 16:29:28 -08:00

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

fix: Windows infinite loop in findLocalBeadsDir and findOriginalBeadsDir (GH#996)

2026-01-10 13:34:53 -08:00

wisp.go

fix(mol): prevent nil pointer dereference in wisp create

2026-01-12 01:35:22 -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

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

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

worktree_daemon_test.go

fix: make tests resilient to project .beads/redirect

2026-01-10 22:38:04 -08:00

worktree_test.go

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

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

worktree.go

…