[5PK]

Changes how the sync treats an entity that was changed on the target since the last sync while the source wasn't. 1.3.0-beta.0 made that a conflict. It's now skipped with a warning.

Why

Testing 1.3.0-beta.0 on a clone pair synced by an older CLI found 120 conflicts on items nobody had changed. 115 of the 119 checked had identical fields on both sides, and the other 4 differed only in an asset URL. The target simply had a newer version number than the mapping recorded. Older CLI versions often left the mapping's target version behind the target's real one, and 1.2.x never noticed, because it treated a target-only change as up to date. For anyone upgrading:

• without --overwrite, the sync exits 1;
• with --overwrite, every one of those items is re-saved for nothing.

The rule now

For content, pages, models, containers, assets and galleries:

Since the last sync	Without --overwrite	With --overwrite
Only the source changed	update	update
Only the target changed	kept, with a warning (was: conflict)	replaced with the source
Both changed	conflict	replaced with the source

The mapping isn't refreshed for a kept change, so a later source change to it is reported as a conflict instead of silently overwriting the target.

Unchanged:

• A page missing from the target pull (file_missing) is still a conflict.
• A mapped target item that no longer exists is still a conflict.
• The --syncDeletes "deleted in the source, edited on the target" case is still a conflict.
• Templates, URL redirections and list order can't tell which side changed yet; that's PROD-3078, now reworded to this rule.

Tracking kept changes

There's a new per-run collector, keptTargetChanges (src/lib/pushers/kept-target-changes.ts), modelled on the foreign CDN report:

• a warning line for each entity as it's skipped;
• a "Target changes kept" section at the end of the run, with a CMS link for content and pages;
• a line in the preflight's warnings ("Target changes kept: 117 content items");
• one targetChangeKept entry per entity in the --jsonSummary warnings, with sourceID, targetID and targetUrl.

None of it affects the counts, success or the exit code. The README's --overwrite entry describes the rule.

CI harness (ci/permutation/)

• drift passes when the receiving side's edit is kept with a target-changed warning. It fails if the edit is silently kept, or if it's reported as a conflict when only the target changed.
• Two picks broke the first run of this branch:
  • model.field-rename renamed a linked field's companion ID field (PermCycleNode.NextID). The link's LinkeContentDropdownValueField then pointed at a missing field, and the server dropped every value saved to it. The rename now skips fields that another field names in its settings.
  • The conflict edit and the drift edit landed on the same item in rounds 3 and 4. The conflict edit now avoids the drift item.

Tests

• New tests for each of the six types cover three cases:
  • target-only change: skip, with one recorded entry;
  • both sides changed: conflict, nothing recorded;
  • target-only change with --overwrite: update.
• Tests for the collector cover deduplication, headline plurals (including "galleries"), summary lines and the JSON details.
• The full suite passes (142 suites, 2,730 tests), as do tsc, ESLint (no errors) and the build.
• Clone pair:
  • the preflight went from 120 content conflicts to 3, with 117 items kept with a warning. The 3 left are real: stale mappings to target items that were deleted, whose source items have since changed;
  • the real sync exits 0 with nothing failed;
  • verify shows only differences that were already there before this run.
• Live sync permutation test, beta tier on fresh dev instances, seed 610455120: every check passes in all 5 rounds, with drift kept with a warning each round.

Release

Bumps the version to 1.3.0-beta.1, because 1.3.0-beta.0 is already published with the strict conflict behaviour. After merging, push the v1.3.0-beta.1 tag on main. The publish workflow runs the sync permutation test on it and, if it passes, publishes it under beta.

🤖 Generated with Claude Code