Fix Forgejo PR merge settle loop #1277

Merged

coilyco-ops merged 1 commit from issue-1168 into main

2026-07-14 11:08:40 +00:00

coilyco-ops commented

2026-07-14 11:06:59 +00:00

Member

This change adds a bounded settle loop around the native Forgejo merge POST in ward agent pr merge. When Forgejo answers 405 with "Please try again later", ward now re-reads the PR and required status before retrying so it can either land once the queue clears or report the missing condition.

Added transient 405 retry handling and preserved the settled head SHA.
Added coverage for retry-then-success and status-regression diagnosis.
Validated with ward exec test and pre-commit run --all-files.

closes #1168

ward.workflow: pull-request-and-merge

This change adds a bounded settle loop around the native Forgejo merge POST in `ward agent pr merge`. When Forgejo answers 405 with "Please try again later", ward now re-reads the PR and required status before retrying so it can either land once the queue clears or report the missing condition. - Added transient 405 retry handling and preserved the settled head SHA. - Added coverage for retry-then-success and status-regression diagnosis. - Validated with `ward exec test` and `pre-commit run --all-files`. closes #1168 ward.workflow: pull-request-and-merge

coilyco-ops added 1 commit

2026-07-14 11:06:59 +00:00