Repository navigation
docs(adr): correct merge-mode field-rewind gap in CRDT-RECONCILE-0035 - #20678
Conversation
|
Important Review skippedBot user detected. To trigger a single review, invoke the ⚙️ Run configuration
You can disable this status message by setting the Use the checkbox below for a quick retry:
Comment |
🌾 Fallow: ✅ PassedFallow audits the diff for duplication, complexity and dead code. It gates on new findings only, so when the audit completes, a red is something this PR introduced or moved — never inherited backlog. A red can also mean the audit itself did not finish; the details below say which happened. No new findings in the changed files. Reproduce locally# the base the gate compared against
npx fallow audit --root . --quiet --format json \
--changed-since b23c0d71f1735be9d7a9ebb2f60a82b15a634cb9
Full docs: ADR-DEVEX-LINT-0015 🧩 Custom Nodes Ecosystem Matrix: 🟡 Withheld — could not measureExecutes the frontend JS of every registry pack that ships any, against this change, in both renderers. The eight This candidate changes nothing the matrix measures, so every expensive stage was skipped. Reproduce locally# build one shard's fixture, then run it
python3 scripts/registry-census/build_matrix.py --shard 1/4
MATRIX_RENDERER=vue MATRIX_VUE=1 \
npx vitest run --config vitest.matrix.config.mts
Full docs: scripts/registry-census/README.md |
Requested by Christian Byrne · Slack thread
Summary
Follow-up to #18106. Corrects an accuracy gap found after that PR was approved and tightens wording.
Before: The ADR states that merge mode never rewinds unconfirmed local edits. It also leaves the replace-mode exception, the hold scope, and the rejection-revert scope loosely worded.
After: The ADR records that a synced or rejected node-field write resyncs the whole node in merge mode, rewinding that node's unconfirmed sibling fields with no hold, and names this as an accepted, tracked gap. The hold bullet, replace exception, rejection-path scope, requirements table, follow-up 5 and consequences are tightened to match the code on main.
Verification
Docs only. Edits
docs/adr/CRDT-RECONCILE-0035-local-only-state-survives-authoritative-reconcile.md; no code changes. Validated withpnpm adr:check, oxfmt andgit diff --check.🤖 Generated with Claude Code
https://claude.ai/code/session_01NQVcfKhCKjLstqo3mJS7fc
Generated by Claude Code