From 374fe2b2b478c7f27d8b622c2cd8291ee1f962d9 Mon Sep 17 00:00:00 2001
From: openhands <openhands@all-hands.dev>
Date: Wed, 18 Mar 2026 19:45:13 +0000
Subject: [PATCH] fix: fix: dev-agent merge failure on "not enough approvals"
 should escalate immediately (#171)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 dev/phase-handler.sh | 52 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/dev/phase-handler.sh b/dev/phase-handler.sh
index b1480d8..17b9331 100644
--- a/dev/phase-handler.sh
+++ b/dev/phase-handler.sh
@@ -19,6 +19,42 @@
 # shellcheck disable=SC2154  # globals are set in dev-agent.sh before calling
 # shellcheck disable=SC2034  # CLAIMED is read by cleanup() in dev-agent.sh
 
+# --- Merge helper ---
+# do_merge — attempt to merge PR via Codeberg API.
+# Args: pr_num
+# Returns:
+#   0 = merged successfully
+#   1 = other failure (conflict, network error, etc.)
+#   2 = not enough approvals (HTTP 405) — PHASE:needs_human already written
+do_merge() {
+  local pr_num="$1"
+  local merge_response merge_http_code merge_body
+  merge_response=$(curl -s -w "\n%{http_code}" -X POST \
+    -H "Authorization: token ${CODEBERG_TOKEN}" \
+    -H 'Content-Type: application/json' \
+    "${API}/pulls/${pr_num}/merge" \
+    -d '{"Do":"merge","delete_branch_after_merge":true}') || true
+  merge_http_code=$(echo "$merge_response" | tail -1)
+  merge_body=$(echo "$merge_response" | sed '$d')
+
+  if [ "$merge_http_code" = "200" ] || [ "$merge_http_code" = "204" ]; then
+    log "do_merge: PR #${pr_num} merged (HTTP ${merge_http_code})"
+    return 0
+  fi
+
+  # HTTP 405 "not enough approvals" — structural, not transient — escalate immediately
+  if [ "$merge_http_code" = "405" ] && echo "$merge_body" | grep -qi "not enough"; then
+    log "do_merge: PR #${pr_num} blocked — not enough approvals (HTTP 405): ${merge_body:0:200}"
+    printf 'PHASE:needs_human\nReason: %s\n' \
+      "PR #${pr_num} merge blocked — not enough approvals (HTTP 405): ${merge_body:0:200}" \
+      > "$PHASE_FILE"
+    return 2
+  fi
+
+  log "do_merge: PR #${pr_num} merge failed (HTTP ${merge_http_code}): ${merge_body:0:200}"
+  return 1
+}
+
 # --- Refusal comment helper ---
 post_refusal_comment() {
   local emoji="$1" title="$2" body="$3"
@@ -341,7 +377,19 @@ Instructions:
 
         if [ "$VERDICT" = "APPROVE" ]; then
           REVIEW_FOUND=true
-          agent_inject_into_session "$SESSION_NAME" "Approved! PR #${PR_NUMBER} has been approved.
+          do_merge "$PR_NUMBER"
+          _merge_rc=$?
+          if [ "$_merge_rc" -eq 0 ]; then
+            # Merge succeeded — close issue and signal done
+            curl -sf -X PATCH \
+              -H "Authorization: token ${CODEBERG_TOKEN}" \
+              -H 'Content-Type: application/json' \
+              "${API}/issues/${ISSUE}" \
+              -d '{"state":"closed"}' >/dev/null 2>&1 || true
+            printf 'PHASE:done\n' > "$PHASE_FILE"
+          elif [ "$_merge_rc" -ne 2 ]; then
+            # Other merge failure (conflict, etc.) — delegate to Claude for rebase + retry
+            agent_inject_into_session "$SESSION_NAME" "Approved! PR #${PR_NUMBER} has been approved.
 
 Merge the PR and close the issue directly — do NOT wait for the orchestrator:
 
@@ -368,6 +416,8 @@ After a successful merge write PHASE:done:
   echo \"PHASE:done\" > \"${PHASE_FILE}\"
 
 If merge repeatedly fails, write PHASE:needs_human with a reason."
+          fi
+          # _merge_rc=2: PHASE:needs_human already written by do_merge()
           break
 
         elif [ "$VERDICT" = "REQUEST_CHANGES" ] || [ "$VERDICT" = "DISCUSS" ]; then