feat
BREAKING
task/phase1-cohen-action-labels
#1 / 1
feat: Phase 1 — Cohen action labels in ConflictRecord and merge JSON output
Every conflict record now carries ours_action and theirs_action fields (inserted/deleted/modified) so agents see what each side did, not just that they conflicted. Labels appear in ConflictRecord.to_dict() and in the muse merge --json conflict_records list.
- ConflictDict and ConflictRecord: add ours_action, theirs_action fields - CodePlugin.merge(): populate conflict_records with _file_action() labels - merge.py: include conflict_records in conflict-status JSON output - 14 new TDD tests in test_phase1_cohen_action_labels.py
sha256:7970cdc3d1206180172e2f74f29b8e6977572924b87c361c9a73240663430aa6
sha
sha256:402d26be34d5d65f46b440d52cc040131e22250c5ca37fc1697614b05e4f34fd
snapshot
← Older
Oldest on task/phase1-cohen-action-labels
All commits
Newer →
Latest on task/phase1-cohen-action-labels
0 comments
To add a comment, use the Muse CLI:
muse hub commit comment sha256:7970cdc3d1206180172e2f74f29b8e6977572924b87c361c9a73240663430aa6 --body "your comment"
No comments yet. Be the first to start the discussion.