chore(agents): add pre-PR rebase step to issue worker to prevent stale conflicts #1407

Merged
freemo merged 1 commits from improvement/issue-worker-rebase-before-pr into master 2026-04-03 04:10:47 +00:00

1 Commits

Author SHA1 Message Date
freemo f6ba8fee56 chore(agents): add pre-PR rebase step to issue worker
CI / benchmark-publish (pull_request) Has been skipped
CI / lint (pull_request) Successful in 3m20s
CI / quality (pull_request) Successful in 3m46s
CI / typecheck (pull_request) Successful in 4m1s
CI / build (pull_request) Successful in 14s
CI / security (pull_request) Successful in 4m12s
CI / helm (pull_request) Successful in 29s
CI / unit_tests (pull_request) Failing after 6m40s
CI / docker (pull_request) Has been skipped
CI / coverage (pull_request) Successful in 13m36s
CI / e2e_tests (pull_request) Failing after 15m43s
CI / integration_tests (pull_request) Failing after 22m0s
CI / status-check (pull_request) Failing after 1s
CI / benchmark-regression (pull_request) Successful in 55m5s
Agent evolver identified a systematic pattern:
- Pattern: PR stale/conflict cascade
- Evidence: 11+ PRs were approved but closed without merge due to
  conflicts. PRs #1248, #1247, #1237, #1236, #1220, #1219, #1238,
  #1246, #1269 were all bulk-closed as stale. Reviewer notes on
  #1248, #1220, #1219, #1252 explicitly mention 'merge blocked by
  conflicts'. With 16 parallel workers, master moves fast and branches
  created minutes earlier are already behind by the time PRs are created.
- Fix: Add a rebase-onto-latest-master step (Phase 3, Step 3.0) in
  ca-issue-worker before committing and creating the PR. This ensures
  the branch is current when the PR is opened, dramatically reducing
  the chance of merge conflicts when the reviewer processes it.

This change requires human approval before taking effect.
2026-04-03 03:57:52 +00:00