Stable & Syncing — a graph of Dark instances that reconcile#5676

Draft

StachuDotNet wants to merge 25 commits into

darklang:mainfrom

StachuDotNet:syncing-and-stable

Commits on Jun 10, 2026

Commits on Jun 12, 2026

Harden and finalize stable + syncing
StachuDotNet
committed
conflicts: separate sync conflicts from runtime conflicts (model + policy seam)
StachuDotNet
committed
conflicts: remove the speculative runtime conflict seam (RTE owns runtime "can't proceed")
StachuDotNet
committed
conflicts: binary serializer for SyncConflict + DivergenceResolution
StachuDotNet
committed
conflicts: reshape sync_conflicts to store the structured conflict + resolution
StachuDotNet
committed
conflicts: structured display — render from chosen_hash + resolved_by, no prose parsing
StachuDotNet
committed
conflicts: resolution overlay foundation (replaces OverrideName, step 5a-i)
StachuDotNet
committed
conflicts: resolution sync channel — wire + cursor + apply (step 5b-i)
StachuDotNet
committed
conflicts: pull a peer's resolutions over the file sync (step 5b-ii)
StachuDotNet
committed
conflicts: overrides become synced Resolutions, not OverrideName ops (step 5a-ii)
StachuDotNet
committed
conflicts: delete the now-dead OverrideName op (step 5c)
StachuDotNet
committed
conflicts: resolution sync over HTTP (the tailnet/daemon path)
StachuDotNet
committed
conflicts: more resolution coverage — newer-op supersede + refold safety
StachuDotNet
committed
conflicts: tightening — tree-shake dead code + consolidate location parsing
StachuDotNet
committed
conflicts: tightening — one home for the timestamp-LWW comparison
StachuDotNet
committed
conflicts: tree-shake the orphan DivergenceResolution + ResolvedBy types
StachuDotNet
committed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Stable & Syncing — a graph of Dark instances that reconcile#5676

Stable & Syncing — a graph of Dark instances that reconcile#5676
StachuDotNet wants to merge 25 commits into
darklang:mainfrom
StachuDotNet:syncing-and-stable

Commits on Jun 10, 2026

Separate the op log from its projections

Add the conflict-dispatch seam

Sync the op log between Darklang instances

Keep the op log across a schema change

Record branch-merge collisions in the conflict store

Add the Release migrator and version coordinate

Make content hashing meaning-stable

Tighten sync internals (readability, no behavior change)

Run sync as an observable managed app

Commits on Jun 12, 2026

Harden and finalize stable + syncing

conflicts: separate sync conflicts from runtime conflicts (model + policy seam)

conflicts: remove the speculative runtime conflict seam (RTE owns runtime "can't proceed")

conflicts: binary serializer for SyncConflict + DivergenceResolution

conflicts: reshape sync_conflicts to store the structured conflict + resolution

conflicts: structured display — render from chosen_hash + resolved_by, no prose parsing

conflicts: resolution overlay foundation (replaces OverrideName, step 5a-i)

conflicts: resolution sync channel — wire + cursor + apply (step 5b-i)

conflicts: pull a peer's resolutions over the file sync (step 5b-ii)

conflicts: overrides become synced Resolutions, not OverrideName ops (step 5a-ii)

conflicts: delete the now-dead OverrideName op (step 5c)

conflicts: resolution sync over HTTP (the tailnet/daemon path)

conflicts: more resolution coverage — newer-op supersede + refold safety

conflicts: tightening — tree-shake dead code + consolidate location parsing

conflicts: tightening — one home for the timestamp-LWW comparison

conflicts: tree-shake the orphan DivergenceResolution + ResolvedBy types