From 8e3b72d13f705c084670bc1da3ae68394e1e6983 Mon Sep 17 00:00:00 2001
From: openhands <openhands@all-hands.dev>
Date: Fri, 13 Mar 2026 19:56:12 +0000
Subject: [PATCH] feat: dev-agent auto-rebase before merge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When PR has merge conflicts (mergeable=false), attempt git rebase
before merge. If rebase fails, abort and escalate via notify.

Flow: approval → check mergeable → rebase if needed → wait CI → merge

Resolves the serial seed PR bottleneck where append-only files
(manifest.jsonl) create trivial conflicts that block the pipeline.
---
 dev/dev-agent.sh | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/dev/dev-agent.sh b/dev/dev-agent.sh
index 3a1a245..02e46ab 100755
--- a/dev/dev-agent.sh
+++ b/dev/dev-agent.sh
@@ -910,6 +910,34 @@ do_merge() {
     sleep 30
   done
 
+  # Check if PR is mergeable — rebase if not
+  local mergeable
+  mergeable=$(curl -sf -H "Authorization: token ${CODEBERG_TOKEN}" \
+    "${API}/pulls/${PR_NUMBER}" | jq -r '.mergeable // true')
+  if [ "$mergeable" = "false" ]; then
+    log "PR #${PR_NUMBER} has merge conflicts — attempting rebase"
+    local work_dir="${WORKTREE:-$REPO_ROOT}"
+    if (cd "$work_dir" && git fetch origin master && git rebase origin/master 2>&1); then
+      log "rebase succeeded — force pushing"
+      (cd "$work_dir" && git push origin "${BRANCH}" --force-with-lease 2>&1) || true
+      # Wait for CI on the new commit
+      sha=$(cd "$work_dir" && git rev-parse HEAD)
+      log "waiting for CI on rebased commit ${sha:0:7}"
+      for r in $(seq 1 20); do
+        ci=$(curl -sf -H "Authorization: token ${CODEBERG_TOKEN}" \
+          "${API}/commits/${sha}/status" | jq -r '.state // "unknown"')
+        [ "$ci" = "success" ] && break
+        [ "$ci" = "failure" ] || [ "$ci" = "error" ] && { log "CI failed after rebase"; notify "PR #${PR_NUMBER} CI failed after rebase. Needs manual fix."; exit 0; }
+        sleep 30
+      done
+    else
+      log "rebase failed — aborting and escalating"
+      (cd "$work_dir" && git rebase --abort 2>/dev/null) || true
+      notify "PR #${PR_NUMBER} has merge conflicts that need manual resolution."
+      exit 0
+    fi
+  fi
+
   local http_code
   http_code=$(curl -s -o /dev/null -w "%{http_code}" -X POST \
     -H "Authorization: token ${CODEBERG_TOKEN}" \