mirror of
https://github.com/Corfirean/coa-server-manager.git
synced 2026-11-11 03:51:01 +00:00
merge3(target, base, ours) applies only the base->ours delta; session reconcile is (C0, B0, B1, lenient), in-place update is (realm now, synced snapshot, new canonical, strict). Item/pet mappings gain presence (present/filtered/realm_local) so realm-filtered state is told from player deletion. Updates are journaled like imports (marker + alloc row) and recovered from the realm. Live tests cover filtered vs deleted items, checkpoints, pets, conflicts, lost answers, atomic rollback and the A->B->A->B round trip without a server. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>