johba/disinto
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'fix: fix: dev-agent escalates when dev-poll races it to merge — should detect already-merged PR (#548)' (#553) from fix/issue-548 into main

Browse source
This commit is contained in:
johba 2026-03-22 13:29:02 +01:00
commit 8aa26b4d54
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dev/phase-handler.sh
View file

@ -195,8 +195,16 @@ do_merge() {
return 0 return 0
fi fi
# HTTP 405 — merge requirements not met (approvals, branch protection); structural, not transient # HTTP 405 — could be "merge requirements not met" OR "already merged" (race with dev-poll).
# Before escalating, check whether the PR was already merged by another agent.
if [ "$merge_http_code" = "405" ]; then if [ "$merge_http_code" = "405" ]; then
local pr_state
pr_state=$(curl -sf -H "Authorization: token ${CODEBERG_TOKEN}" \
"${API}/pulls/${pr_num}" | jq -r '.merged // false') || pr_state="false"
if [ "$pr_state" = "true" ]; then
log "do_merge: PR #${pr_num} already merged (detected after HTTP 405) — treating as success"
return 0
fi
log "do_merge: PR #${pr_num} blocked — merge requirements not met (HTTP 405): ${merge_body:0:200}" log "do_merge: PR #${pr_num} blocked — merge requirements not met (HTTP 405): ${merge_body:0:200}"
printf 'PHASE:escalate\nReason: %s\n' \ printf 'PHASE:escalate\nReason: %s\n' \
"PR #${pr_num} merge blocked — merge requirements not met (HTTP 405): ${merge_body:0:200}" \ "PR #${pr_num} merge blocked — merge requirements not met (HTTP 405): ${merge_body:0:200}" \