Merge pull request 'fix: fix: dev-poll pre-lock should merge chore/gardener PRs without issue numbers (#539)' (#540) from fix/issue-539 into main

dev/dev-poll.sh

@@ -187,6 +187,7 @@ try_direct_merge() {
 
   if [ "${merge_http:-0}" = "200" ] || [ "${merge_http:-0}" = "204" ]; then
     log "PR #${pr_num} merged successfully"
+    if [ "$issue_num" -gt 0 ]; then
       # Close the issue (may already be closed by Codeberg auto-close)
       curl -sf -X PATCH \
         -H "Authorization: token ${CODEBERG_TOKEN}" \
@@ -197,12 +198,15 @@ try_direct_merge() {
       curl -sf -X DELETE \
         -H "Authorization: token ${CODEBERG_TOKEN}" \
         "${API}/issues/${issue_num}/labels/in-progress" >/dev/null 2>&1 || true
-    # Clean up CI fix tracker
-    ci_fix_reset "$pr_num"
       # Clean up phase/session artifacts
       rm -f "/tmp/dev-session-${PROJECT_NAME}-${issue_num}.phase" \
             "/tmp/dev-impl-summary-${PROJECT_NAME}-${issue_num}.txt"
       matrix_send "dev" "✅ PR #${pr_num} (issue #${issue_num}) merged directly by dev-poll" 2>/dev/null || true
+    else
+      matrix_send "dev" "✅ PR #${pr_num} merged directly by dev-poll (chore)" 2>/dev/null || true
+    fi
+    # Clean up CI fix tracker
+    ci_fix_reset "$pr_num"
     return 0
   fi
 
@@ -248,8 +252,13 @@ for i in $(seq 0 $(($(echo "$PL_PRS" | jq 'length') - 1))); do
     PL_ISSUE=$(echo "$PL_PR_BODY" | grep -oiP '(?:closes|fixes|resolves)\s*#\K\d+' | head -1 || true)
   fi
   if [ -z "$PL_ISSUE" ]; then
+    # Allow chore PRs from gardener/planner/predictor to merge without issue number
+    if [[ "$PL_PR_BRANCH" =~ ^chore/(gardener|planner|predictor)- ]]; then
+      PL_ISSUE=0
+    else
       continue
     fi
+  fi
 
   PL_CI_STATE=$(curl -sf -H "Authorization: token ${CODEBERG_TOKEN}" \
     "${API}/commits/${PL_PR_SHA}/status" | jq -r '.state // "unknown"') || true
@@ -491,9 +500,14 @@ for i in $(seq 0 $(($(echo "$OPEN_PRS" | jq 'length') - 1))); do
     STUCK_ISSUE=$(echo "$PR_BODY" | grep -oiP '(?:closes|fixes|resolves)\s*#\K\d+' | head -1 || true)
   fi
   if [ -z "$STUCK_ISSUE" ]; then
+    # Allow chore PRs from gardener/planner/predictor to merge without issue number
+    if [[ "$PR_BRANCH" =~ ^chore/(gardener|planner|predictor)- ]]; then
+      STUCK_ISSUE=0
+    else
       log "PR #${PR_NUM} has no issue ref — cannot spawn dev-agent, skipping"
       continue
     fi
+  fi
 
   CI_STATE=$(curl -sf -H "Authorization: token ${CODEBERG_TOKEN}" \
     "${API}/commits/${PR_SHA}/status" | jq -r '.state // "unknown"') || true
@@ -517,6 +531,11 @@ for i in $(seq 0 $(($(echo "$OPEN_PRS" | jq 'length') - 1))); do
     if try_direct_merge "$PR_NUM" "$STUCK_ISSUE"; then
       exit 0
     fi
+    # Direct merge failed — dev-agent fallback requires a real issue number
+    if [ "$STUCK_ISSUE" -eq 0 ]; then
+      log "PR #${PR_NUM} direct merge failed — no issue ref for dev-agent, skipping"
+      continue
+    fi
     # Direct merge failed (conflicts?) — fall back to dev-agent
     SESSION_NAME="dev-${PROJECT_NAME}-${STUCK_ISSUE}"
     if tmux has-session -t "$SESSION_NAME" 2>/dev/null; then
@@ -529,6 +548,11 @@ for i in $(seq 0 $(($(echo "$OPEN_PRS" | jq 'length') - 1))); do
     exit 0
   fi
 
+  # Chore PRs without issue ref can only be direct-merged — skip dev-agent paths
+  if [ "$STUCK_ISSUE" -eq 0 ]; then
+    continue
+  fi
+
   # Stuck: REQUEST_CHANGES or CI failure → spawn agent
   # Do NOT gate REQUEST_CHANGES on ci_passed: if a reviewer leaves REQUEST_CHANGES
   # while CI is still pending/unknown, we must act immediately rather than wait for