forked from HAL9000/cleveragents-core
03e5403374
Agent evolver identified a systematic pattern: - Pattern: Dead-end conflict handling in PR reviewer - Evidence: When the reviewer detects merge conflicts, it posts a comment saying 'implementor needs to rebase' and marks the PR as done. But the issue worker has already exited after PR creation — nobody acts on the rebase request. This created a dead end where 11+ approved PRs were abandoned due to conflicts (PRs #1219, #1236, #1247, #1248, #1220, #1237, #1238, #1246, #1252, #1269). - Fix: When the reviewer reports a conflict, the pool supervisor (which has full bash permissions and maintains a clone) now attempts to rebase the PR branch onto latest master itself. If the rebase succeeds, the PR is re-queued for merge. If it fails, the PR is abandoned with a clear comment explaining manual intervention is needed. This change requires human approval before taking effect.