 HAL9000
|
7279ce64dd
|
feat(plans): implement configurable merge strategy (prefer-parent, prefer-subplan, manual)
Implemented a configurable merge strategy framework for three-way merges.
- New module: src/cleveragents/domain/models/core/merge_strategy.py
- MergeStrategy StrEnum with options: prefer-parent, prefer-subplan, manual
- Helper methods: is_auto_resolve(), is_manual(), from_string()
- New module: src/cleveragents/domain/models/core/merge_strategy_service.py
- MergeConflict class with __eq__ for value equality comparison
- MergeStrategyService to apply strategies and resolve conflicts
- Proper type annotations (dict, Any) with no unused imports
- BDD test suite: features/plan_merge_strategy.feature (8 scenarios)
- Step definitions: features/steps/plan_merge_strategy_steps.py
- Robot Framework integration tests: robot/merge_strategy.robot
- Helper script: robot/helper_merge_strategy.py
- Updated src/cleveragents/domain/models/core/__init__.py exports
ISSUES CLOSED: #9559
|
2026-06-03 12:16:30 -04:00 |
|