cleveragents-core

Author	SHA1	Message	Date
HAL9000	6d4134938d	feat(plans): implement configurable merge strategy for three-way merge CI / lint (pull_request) Successful in 1m14s Details CI / typecheck (pull_request) Successful in 1m29s Details CI / security (pull_request) Successful in 1m30s Details CI / quality (pull_request) Successful in 48s Details CI / build (pull_request) Successful in 36s Details CI / helm (pull_request) Successful in 41s Details CI / push-validation (pull_request) Successful in 26s Details CI / unit_tests (pull_request) Successful in 4m57s Details CI / integration_tests (pull_request) Successful in 8m39s Details CI / docker (pull_request) Successful in 1m45s Details CI / coverage (pull_request) Successful in 9m4s Details CI / status-check (pull_request) Successful in 3s Details ISSUES CLOSED: #9559	2026-06-03 12:16:30 -04:00
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

2 Commits