Files
cleveragents-core/features
HAL9000 08b647260c fix(merge): resolve 10 blocking issues from pr-review #8483
Address all remaining review blockers for ThreeWayMergeEngine PR:

Core engine fixes:
- Populate MergeConflict in _merge_subplan_status conflict branch so
  ThreeWayMergeError is properly raised when allow_conflicts=False.
- Remove continue statement in _merge_cost_metadata that silently
  dropped provider_costs accumulation for subplans with budget_remaining.

Test scaffolding fixes:
- Split three_way_merge_given_steps.py (988→419 lines) and create new
  three_way_merge_cost_skeleton_steps.py (329 lines) to satisfy the
  500-line limit per CONTRIBUTING.md.
- Remove duplicate import block (from datetime + from behave) in given
  steps file.
- Remove duplicate @given('subplan {id} contributes...') decorator that
  caused AmbiguousStep aborting unit test suite.

Feature file fixes:
- Fix ERRORED (highest priority) → ERRORED at line 57 to prevent
  invalid ProcessingState ValueError.
- Add 'subplan' word in for subplab pattern matching at lines 87-89.
- Fix 'the subplan _S1 has error' → 'subplan _S1 has error' for step
  decorator compatibility (line 90).
- Remove extra 'state' word: conflicting state changes → conflicting
  changes from both sides (line 206).

Step definition fixes:
- Add step_base_cost_full_split matching Gherkin text at lines 131.
- Add step_current_cost_full_split matching Gherkin text at line 132.

Robot integration test fixes:
- Remove [ ] wrapper around _mk_status() calls in skeleton_preserved_ok
  and multi_subplan_ok to fix [[SubplanStatus]] nested list bug.
- Fix empty_subplans_error to use _mk_status without extra brackets.

ISSUES CLOSED: #9557
2026-06-03 17:45:04 -04:00
..