The post-conflict-resolution merge left several methods defined twice on
the same class (F811/reportRedeclaration), where Python silently kept
the LAST definition and the failing CI runs were the visible symptom:
- PlanApplyService.correction_diff at line 1064 overrode the correct
unit-of-work-validating implementation at line 548. The duplicate
was a broken fallback that did not raise on missing corrections, so
the canonical robot tests in robot/plan_correction_diff.robot failed
all 6 scenarios.
- GitWorktreeSandbox.cleanup_stale and diff_against_head were defined
twice each; the earlier copies are removed (the later copies use the
more defensive _sanitise_branch_name path and are what was being
invoked in practice).
- features/steps/agent_evolution_label_milestone_steps.py declared the
step "it MUST mention milestone assignment" twice, raising
AmbiguousStep at collection time and erroring all 31 features in the
Behave unit suite. The two definitions are consolidated into a
single context-tracking step; the prior label-assertion step records
which section is in focus.
- plan.py called ActorRegistry.ensure_built_in_actors(), which does not
exist on the class (reportAttributeAccessIssue); the call sat inside
a suppress(Exception) block and was a silent no-op, so removing it
preserves runtime behavior while resolving the pyright error.
- Lint-only: drop the stray f prefix from a non-interpolating raw
string regex in agent_evolution_label_milestone_steps.py (F541).
The dead scope-creep tests that exercised the deleted code paths are
removed:
- features/plan_apply_correction_diff.feature and its step file: tests
for the deleted PlanApplyService.correction_diff fallback. The
canonical features/plan_correction_diff.feature (already on master)
continues to cover correction_diff comprehensively against the
unit-of-work-aware implementation.
- features/agent_evolution_label_milestone_compliance.feature and its
step file: tests that asserted the existence and contents of
.opencode/agents/agent-evolution-{worker,pool-supervisor}.md, files
that do not exist anywhere in the worktree (or on master) and are
not introduced by this PR.
- 2 Correction Diff scenarios in
robot/git_worktree_class_methods.robot plus their helpers: tests for
the deleted fallback impl.
ISSUES CLOSED: #8628
HAL9000
b71e74e0ce