gabriel / musehub public
feat patch phase6 task/phase1-merge-engine #2 / 4
AI Agent gabriel · 1 day ago · Jun 11, 2026 · Diff

feat(phase6): route canonical strategies through run_merge() in execute_merge_strategy()

- Import run_merge from muse.core.merge_engine - Add _to_local_result() conversion helper: muse.domain.MergeResult → local MergeResult (computes files_added/modified/removed, converts str conflicts to ConflictEntry) - Replace canonical strategy routing block with run_merge() call + _to_local_result(); non-canonical strategies (weave, selective, phased, cherry_pick) unchanged - Fallback to merge_overlay when ancestor is required but missing (same as before)

sha256:0c088142e487b1154ae4e867abda064d4a52242ece13787372bc4c663a192699 sha
sha256:d110dd71fb7c1f5e064162de1262b2976841a00d7549bc4f441045f5c13ef33f parent
+2 ~2 symbols
sha256:2585ec6d877cd8d8ba749b6fb5257aa8da54eee1e37e1db6d46d98c45184ffe8 snapshot
+2
symbols added
~2
symbols modified
0
dead code introduced
Semantic Changes 4 symbols
~ musehub/services/proposal_merge_strategies.py .py 2 symbols added, 2 symbols modified
+ _to_local_result function function _to_local_result L600–632
+ run_merge import import run_merge L27–27
~ execute_merge_strategy
~ STRATEGY_MAP
Older feat: add MergeResultEmbed to ProposalResponse (deliverable 5) sha256:d110dd71fb7c1f5e064162de1262b2976841a00d7549bc4f441045f5c13ef33f All commits Newer more passing tests from full test suite fun sha256:77fc45e703f90c0d603ecb1a0ce21ff21095728ca7dd0e146eb5e966c8f9fcc9

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