Skip to content

docs(adr): correct merge-mode field-rewind gap in CRDT-RECONCILE-0035 - #20678

Merged
christian-byrne merged 1 commit into
mainfrom
claude/adr-crdt-reconcile-0035-round10-corrections
Oct 9, 2026
Merged

christian-byrne merged 1 commit into
mainfrom
claude/adr-crdt-reconcile-0035-round10-corrections

Conversation

@claude

@claude claude Bot commented Oct 9, 2026

Copy link
Copy Markdown
Contributor

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 with pnpm adr:check, oxfmt and git diff --check.

🤖 Generated with Claude Code

https://claude.ai/code/session_01NQVcfKhCKjLstqo3mJS7fc


Generated by Claude Code

@claude
claude Bot requested review from a team, christian-byrne and dante01yoon October 9, 2026 20:33
@claude claude Bot added agent Comfy Agent product, integration, tests or product documentation agent-crdt Agent document synchronization, graph projection or CRDT operations agent-docs Agent product architecture, contracts or documentation labels Oct 9, 2026
@coderabbitai

coderabbitai Bot commented Oct 9, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration
  • Configuration used: Repository: Comfy-Org/ComfyUI_frontend/.coderabbit.yaml
  • Review profile: ASSERTIVE
  • Plan: Advanced
  • Run ID: 9c770025-dedb-4191-8a9a-1ee1632c00d2

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added the risk:high PR risk grade (advisory shadow check; grader-owned) label Oct 9, 2026
@github-actions

github-actions Bot commented Oct 9, 2026 •

Copy link
Copy Markdown
Contributor

🌾 Fallow: ✅ Passed

Fallow 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 measure

Executes the frontend JS of every registry pack that ships any, against this change, in both renderers. The eight ecosystem-matrix shard checks are a harness self-test; the pack verdict is matrix-verdict.

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

@christian-byrne
christian-byrne added this pull request to the merge queue Oct 9, 2026
Merged via the queue into main with commit b49d123 Oct 9, 2026
113 of 115 checks passed
@christian-byrne
christian-byrne deleted the claude/adr-crdt-reconcile-0035-round10-corrections branch October 9, 2026 21:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent Comfy Agent product, integration, tests or product documentation agent-crdt Agent document synchronization, graph projection or CRDT operations agent-docs Agent product architecture, contracts or documentation risk:high PR risk grade (advisory shadow check; grader-owned)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants