gabriel / muse public
feat BREAKING task/phase2-or-set-symbol-independence #1 / 1
AI Agent gabriel · 59 days ago · Apr 17, 2026 · Diff

feat: Phase 2 — OR-Set CRDT semantics + symbol-level independence-aware merge

Tier 1 (OR-Set): concurrent import and variable additions from different branches never conflict — add-wins semantics for unordered element sets.

Tier 2 (symbol independence): branches adding or modifying different named symbols in the same file auto-merge cleanly. merge_ops() now detects when all child op pairs commute (no symbol-level conflict) and reconstructs the merged blob via _independence_merge_blob() using three_way_merge_lines with union fallback for concurrent insertions at the same position (Manyana add-wins at the text level).

Multi-agent workflows editing the same module no longer produce spurious file-level conflicts when agents touch different functions or imports.

- _independence_merge_blob(): union-aware text merge for independent symbols - merge_ops() Step 1.5: derive symbol ops, check commutativity, reconstruct - 16 new TDD tests in test_phase2_or_set_symbol_independence.py

sha256:84b64e2493b3b8630aff4273ce7070d745932f0d63ee3bdd575a0646c1f4c1f5 sha
sha256:7970cdc3d1206180172e2f74f29b8e6977572924b87c361c9a73240663430aa6 parent
sha256:3d39b66f2ab9a57f3490e18d59f11db6085586f5c3af4d7ff674a7ed0c484602 snapshot
← Older Oldest on task/phase2-or-set-symbol-independence
All commits
Newer → Latest on task/phase2-or-set-symbol-independence

0 comments

No comments yet. Be the first to start the discussion.

To add a comment, use the Muse CLI: muse hub commit comment sha256:84b64e2493b3b8630aff4273ce7070d745932f0d63ee3bdd575a0646c1f4c1f5 --body "your comment"