beads/internal
Steve Yegge 144876baab feat(conflicts): bd conflicts list|show|resolve — issue-oriented merge conflicts (wy-jpd3.5)
Federation ask #3. Resolving a halted merge meant dropping into the raw dolt
CLI inside .beads/dolt/<db> — dolt conflicts cat issues, dolt conflicts resolve
--ours|--theirs issues, dolt add -A && dolt commit — dolt arcana whose flag
surface differs from git's just enough to bite. This wraps it in bd, presented
per issue FIELD rather than as raw conflict rows.

  bd conflicts list                     tables + conflicted issue IDs
  bd conflicts show [<id>]              base/ours/theirs per diverged field
  bd conflicts resolve <id> --ours      one issue, leaving the rest conflicted
  bd conflicts resolve --all --theirs   whole tables (dolt's own resolution)

Storage: storage.ConflictInspector is a new optional interface (GetConflictRows
/ ResolveConflictRows) implemented by both Dolt-backed stores over
versioncontrolops/conflicts.go, which folds dolt_conflicts_<table>'s
base_/our_/their_ columns into one row per conflict — generically, from the
result-set column names, so it does not rot on the next migration.

Per-row resolution follows dolt's manual-resolution protocol, the one
resolveIssuesLWWConflicts already proves: --ours deletes the conflict row (the
working set already holds our values), --theirs writes their values first and
then deletes it. It is restricted to modify/modify rows — when one side deleted
the row, "ours"/"theirs" do not describe what the operator wants, so it is
refused by name instead of guessed at.

Safety rails, several from the adversarial review of this diff:
- The CLI reaches the store through storage.UnwrapStore: store is always
  decorated (telemetry + hooks), and a decorator embedding the DoltStorage
  interface promotes only that interface's methods, so asserting on the wrapper
  would silently report "No merge conflicts" over a wedged merge.
- The merge is committed only when this invocation actually resolved something
  AND no conflict remains, via CommitMergeResolution (plain Commit excludes
  config, GH#2455/GH#2474). A partial resolution leaves the merge open.
- Server-mode resolution pins a connection and resets
  @@dolt_allow_commit_conflicts/@@dolt_force_transaction_commit before
  returning it to the pool, discarding the connection if the reset fails.
- A --theirs UPDATE that matches no row (concurrent delete on a shared server)
  aborts instead of clearing the conflict and dropping their side.
- Interpolated identifiers — table AND column — are validated; values are bound.

Follow-ups filed as wy-36ilm: a dolt-backed integration test (every test here
is a pure unit test, which is why the review's blocker was invisible to the
suite), a first-class way to conclude an already-resolved merge, and
schema-conflict/constraint-violation visibility in the commit gate.
2026-07-24 19:47:16 -07:00
..
ado fix(ado): preserve unmanaged links on push instead of clobbering them (#4523) 2026-07-05 10:53:05 -07:00
atomicfile /internal/atomicfile/atomicfile.go: use io.Copy 2026-05-01 17:03:30 -07:00
audit fix(audit): make JSONL sidecar opt-in (#4688) 2026-07-11 00:09:17 -07:00
beads feat(storage): refuse test DBs on production dolt servers (AD-01) (#3632) 2026-07-24 01:28:51 -07:00
compact fix(compact): archive content before destructive compaction; make restore work (#4464) 2026-06-20 14:12:07 -07:00
config fix(worktree): repair permissive .beads/ after worktree create (GH#3593) (#3640) 2026-07-14 13:14:14 -07:00
configfile refactor(storage)!: remove the SQLite backend and dialect 2026-07-18 02:43:56 +00:00
creds fix(backends): address red-team review findings before merge 2026-07-10 18:58:00 +00:00
debug feat(verbosity): wire --quiet into create/close/update (bd-au0.10) (#4058) 2026-07-06 22:35:42 -07:00
doltremote fix(doltremote): fold host case, strip creds, recognize user-less SCP in CanonicalForComparison (#4576) 2026-07-07 12:59:18 -07:00
doltserver fix(windows): detect exited processes in liveness helpers (#4980) (#4981) 2026-07-23 18:24:49 -07:00
formula feat(formula): make primitives discoverable to coding agents (GH#3621) (#3781) 2026-07-06 22:26:41 -07:00
git test(git): restore cwd before temp cleanup (#4935) (#4936) 2026-07-23 18:40:44 -07:00
github fix(github) bd github sync (GitHub issues integration) (#3929) 2026-05-15 08:47:39 -07:00
gitlab feat(gitlab): sync issue dependency links on push (#4294) 2026-07-08 08:00:41 -07:00
hooks test: port Windows hardening fixes (#4600) 2026-07-07 12:59:50 -07:00
idgen fix(idgen): correct test vectors in hash_test.go 2025-12-19 18:13:56 -08:00
jira feat(storage): keyset reads — comments page, issue-list cursor, IsBlocked filter (#4922) 2026-07-21 22:29:09 -07:00
linear fix(windows): detect exited processes in liveness helpers (#4980) (#4981) 2026-07-23 18:24:49 -07:00
lockfile Triage and clean up an unreviewed automated commit stream on main (#4418) 2026-06-15 20:24:57 -07:00
metrics feat: honor DO_NOT_TRACK as a metrics opt-out (#4938) 2026-07-21 08:35:20 -07:00
molecules feat(storage): refuse test DBs on production dolt servers (AD-01) (#3632) 2026-07-24 01:28:51 -07:00
notion fix(notion): drop in_trash from data-source query body (Notion 400) (#4543) 2026-07-05 10:53:01 -07:00
query fix(query): make slash and mixed-case metadata keys queryable (#4896) 2026-07-24 17:52:22 -07:00
recipes docs: fix integration-page fact errors; restore three lost source edits 2026-07-12 10:37:18 -07:00
remotecache fix: pass remote auth user during clone (#4484) 2026-07-05 11:28:24 -07:00
routing fix: anchor jj-secondary role resolution at repoPath, not cwd 2026-06-04 15:00:30 -07:00
storage feat(conflicts): bd conflicts list|show|resolve — issue-oriented merge conflicts (wy-jpd3.5) 2026-07-24 19:47:16 -07:00
telemetry feat(storage): keyset reads — comments page, issue-list cursor, IsBlocked filter (#4922) 2026-07-21 22:29:09 -07:00
templates fix(cli): printed doc paths point at the new docs locations 2026-07-12 10:37:17 -07:00
testutil /{.github,docs,engdocs,go,internal,scripts}: bump dolt 2026-07-15 13:14:34 -07:00
timeparsing chore: unexport 14 dead symbols across 8 packages 2026-02-07 09:24:22 -08:00
tracker feat(storage): refuse test DBs on production dolt servers (AD-01) (#3632) 2026-07-24 01:28:51 -07:00
types Merge pull request #4877 from anisoptera/feat/json-import-all-native-fields 2026-07-24 09:52:27 -07:00
ui test(cli): cover --no-color flag handling and ui.DisableColors 2026-07-07 23:32:22 -04:00
uimd fix(cli): render markdown with terminal capability gates (#3881) 2026-06-25 13:55:28 -07:00
utils feat(storage): refuse test DBs on production dolt servers (AD-01) (#3632) 2026-07-24 01:28:51 -07:00
validation feat(lint): accept Acceptance Criteria heading for epics (#3834) 2026-07-07 23:00:30 -04:00