cleveragents/cleveragents-core
4
0
Fork 3
Code Issues 6.0k Pull Requests 115 Actions Packages Projects Releases Wiki Activity

feat(plans): implement conflict detection and structured conflict report for three-way merge - Closes #9558 #9613

Open
HAL9000 wants to merge 7 commits from feat/v3.3.0-merge-conflict-detection into master
pull from: feat/v3.3.0-merge-conflict-detection
merge into: cleveragents:master
Conversation 21 Commits 7 Files Changed 6
+1262 -96

7 Commits

Author SHA1 Message Date
drew 23fd5425f7 fix(cli-tests): read audit CLI output in shared assertions
CI / push-validation (pull_request) Has been cancelled
Details
CI / load-versions (pull_request) Successful in 32s
Details
CI / lint (pull_request) Successful in 45s
Details
CI / build (pull_request) Successful in 42s
Details
CI / helm (pull_request) Successful in 44s
Details
CI / typecheck (pull_request) Successful in 1m9s
Details
CI / quality (pull_request) Successful in 1m32s
Details
CI / security (pull_request) Successful in 1m53s
Details
CI / unit_tests (pull_request) Successful in 5m32s
Details
CI / docker (pull_request) Successful in 1m41s
Details
CI / integration_tests (pull_request) Successful in 9m9s
Details
CI / coverage (pull_request) Failing after 14m35s
Details
CI / status-check (pull_request) Has been cancelled
Details
2026-06-18 11:20:00 -04:00
CleverAgents Bot b265adf13d fix(planconfig): cover merge conflict edge cases
CI / load-versions (pull_request) Successful in 30s
Details
CI / push-validation (pull_request) Successful in 28s
Details
CI / lint (pull_request) Successful in 48s
Details
CI / typecheck (pull_request) Successful in 1m3s
Details
CI / quality (pull_request) Successful in 43s
Details
CI / security (pull_request) Successful in 1m17s
Details
CI / build (pull_request) Successful in 44s
Details
CI / helm (pull_request) Successful in 50s
Details
CI / integration_tests (pull_request) Failing after 16m31s
Details
CI / unit_tests (pull_request) Failing after 16m33s
Details
CI / coverage (pull_request) Has been cancelled
Details
CI / docker (pull_request) Has been cancelled
Details
CI / status-check (pull_request) Has been cancelled
Details
2026-06-18 08:00:30 -04:00
controller-ci-rerun e0a1a2615f chore: re-trigger CI [controller]
CI / load-versions (pull_request) Successful in 15s
Details
CI / push-validation (pull_request) Successful in 25s
Details
CI / lint (pull_request) Successful in 42s
Details
CI / build (pull_request) Successful in 44s
Details
CI / quality (pull_request) Successful in 47s
Details
CI / typecheck (pull_request) Successful in 1m10s
Details
CI / security (pull_request) Successful in 1m21s
Details
CI / helm (pull_request) Successful in 40s
Details
CI / unit_tests (pull_request) Successful in 5m11s
Details
CI / docker (pull_request) Successful in 1m50s
Details
CI / integration_tests (pull_request) Successful in 8m40s
Details
CI / coverage (pull_request) Failing after 17m16s
Details
CI / status-check (pull_request) Has been cancelled
Details
2026-06-17 15:40:39 -04:00
HAL9000 194291706e test(plans): cover uncovered branches in merge_conflict with BDD scenarios and pragmas
CI / load-versions (pull_request) Successful in 16s
Details
CI / push-validation (pull_request) Successful in 23s
Details
CI / lint (pull_request) Successful in 46s
Details
CI / typecheck (pull_request) Successful in 1m1s
Details
CI / quality (pull_request) Successful in 59s
Details
CI / security (pull_request) Successful in 1m9s
Details
CI / build (pull_request) Successful in 36s
Details
CI / helm (pull_request) Successful in 41s
Details
CI / unit_tests (pull_request) Successful in 4m44s
Details
CI / docker (pull_request) Successful in 1m32s
Details
CI / integration_tests (pull_request) Successful in 8m27s
Details
CI / coverage (pull_request) Failing after 17m29s
Details
CI / status-check (pull_request) Has been cancelled
Details 
Add 4 BDD scenarios to features/plan_merge_conflict_detection.feature:
- No conflict when all three versions have identical values (covers line 269
  in _detect_field_conflict: neither-side-changed early return)
- Cannot add conflict with empty field path (covers line 121 ValueError)
- Resolve conflict using merged version (covers lines 148-149 MERGED branch
  in get_resolved_value)
- Get resolved value with manual resolution raises error (covers line 150
  MANUAL -> ValueError in get_resolved_value)

Add corresponding step 'I try to add a conflict with empty field path' to
the step definitions.

Mark genuinely dead-code branches with # pragma: no cover:
- Line 74: resolved_value guard (context/conflict_type None) -- unreachable
  through detect() since _analyse_field always sets both
- Line 141: get_resolved_value conflict-not-found guard -- unreachable
  through public API since resolve_conflict() pre-checks existence
- Lines 280-281: DELETE_DELETE in _detect_field_conflict -- unreachable
  because None==None is caught by the prior parent_val==subplan_val guard
- Line 304: auto_resolve_conflicts DELETE_DELETE continue -- unreachable
  since detect_conflicts() can never produce DELETE_DELETE conflicts
- Line 331: detect_diff_text context-is-None guard -- unreachable since
  _analyse_field always sets context
- Lines 405-410: _analyse_field not-changed/not-changed branch -- unreachable
  because detect() fast-paths the all-equal case before calling _analyse_field

Also expand test_merge_conflict_legacy_contract.py with 7 pytest-style tests
covering the same edge cases (useful for developer pytest runs).
 2026-06-17 13:10:23 -04:00
drew 163141aea5 fix(planconfig): stringify clean legacy merge values 2026-06-17 13:10:23 -04:00
drew d54028fa6d fix(planconfig): preserve legacy merge conflict serialization 2026-06-17 13:10:23 -04:00
HAL9000 77ba5091d1 feat(plans): implement conflict detection and structured conflict report for three-way merge 
- Add ConflictType enum for categorizing conflict types
- Add ConflictContext dataclass for storing conflict information
- Add ConflictReport dataclass for structured conflict reporting
- Add ConflictResolution enum for resolution strategies
- Implement ThreeWayMergeConflictDetector with standard three-way merge algorithm
- Add automatic conflict resolution heuristics
- Add comprehensive BDD test suite with 20+ test scenarios
- Update CHANGELOG.md with new feature documentation
 2026-06-17 13:10:23 -04:00