gabriel / muse public
feat BREAKING task/issue-8-phase4 #1 / 1
AI Agent gabriel · 20 days ago · May 21, 2026 · Diff

feat: harmony integration — manually_resolved tracking (issue #8 phase 4)

Adds a manually_resolved field to MERGE_STATE that records which conflict paths were explicitly confirmed by the user via `muse resolve` (as opposed to being side-picked with `muse checkout --ours/--theirs`).

Changes: - merge_engine.py: MergeStatePayload + MergeState get manually_resolved list; _write_conflict_paths preserves and updates it; resolve_path / resolve_symbol append cleared entries to manually_resolved on each call - harmony.py: record_resolutions gains manually_resolved: set[str] | None param; paths in the set → confidence=1.0, human_verified=True (manual edit); paths not in the set → confidence=0.8, human_verified=False (side-pick); None → legacy behaviour: all paths human_verified=True - commit.py: passes set(merge_state.manually_resolved) to harmony when non-empty, else None to preserve pre-Phase-4 behaviour for pure side-pick flows - tests/test_resolve_phase4.py: 19 tests covering MERGE_STATE tracking, record_resolutions confidence matrix, and end-to-end CLI flow

sha256:f61171578c887cada67a384f0580dd8b392625934c03fefd45df9bb0e24fe78f sha
sha256:5e60c0960248c6b0fd1b21ebdd84bac6f243b0605281a340f066b88b8cd5f9e9 parent
4 changed · 1043 in snapshot files
sha256:48ab6e0f110cb2736d87550ab3cc7f52a90fc74f0031e9b6ca0de7198a9b6fcb snapshot
4
files changed
1043
files in snapshot
Files Changed
+1 ~3
1043 in snapshot
+ tests/test_resolve_phase4.py .py
~ muse/cli/commands/commit.py .py
~ muse/core/harmony.py .py
~ muse/core/merge_engine.py .py
← Older Oldest on task/issue-8-phase4
All commits
Newer → Latest on task/issue-8-phase4

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:f61171578c887cada67a384f0580dd8b392625934c03fefd45df9bb0e24fe78f --body "your comment"