coilyco-flight-deck/ward
2
0
Fork 0
Code Issues 105 Pull requests Projects Releases 737 Packages Wiki Activity Actions

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
Conversation 0 Commits 1 Files changed 2 +140 -4
coilyco-ops commented 2026-07-14 11:06:59 +00:00
Member
Copy link

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
Fix Forgejo PR merge settle loop
All checks were successful
test / test (pull_request) Successful in 36s
Details
5d02245370
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
burndown-2026-06
Backlog burndown June 2026

  
pressure-test
Cold-read release pressure-test findings and coordination

  
sunday-sprint
Burn-down by Sunday 2026-06-07

  
coherence-core
Core review set for the warded control plane coherence milestone. These issues form the release spine; adjacent milestone issues are stretch or supporting work.

  
consult
A human decision, design, or external action must happen first. Fail-closed default for unlabeled/low-confidence.

  
headless
Agent can take it from open issue to merged change with no human in the loop. The auto-burndown queue.

  
interactive
Agent does the work but pauses at a human checkpoint mid-flight (design choice, destructive step, human-only verification).

  
P0
now / blocking / urgent

  
P1
next / important

  
P2
backlog / will do

  
P3
someday / low

  
P4
icebox / frozen / reopen if it becomes real

No labels
burndown-2026-06
pressure-test
sunday-sprint
coherence-core
consult
headless
interactive
P0
P1
P2
P3
P4
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
coilyco-flight-deck/ward!1277
No description provided.