autopilot-code 0.2.0 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autopilot-code",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "private": false,
   "description": "Repo-issue–driven autopilot runner",
   "license": "MIT",

package/scripts/run_autopilot.py

@@ -28,6 +28,8 @@ import shutil
 
 STATE_DIR = ".autopilot"
 STATE_FILE = "state.json"
+GLOBAL_CONFIG_DIR = Path.home() / ".config" / "autopilot"
+GLOBAL_STATE_FILE = GLOBAL_CONFIG_DIR / "state.json"
 DEFAULT_HEARTBEAT_MAX_AGE_SECS = 60 * 60  # 1h
 DEFAULT_MAX_DEPTH = 3
 IGNORED_DIRS = {
@@ -621,9 +623,13 @@ def try_merge_pr(cfg: RepoConfig, issue_number: int, pr: dict[str, Any]) -> bool
             has_failure = any(c.get("conclusion") == "FAILURE" for c in checks)
             has_pending = any(c.get("conclusion") in ("PENDING", "QUEUED", None) for c in checks)
             
-            if has_failure:
+            # If all checks are pending/queued and there are more than 0, it's pending
+            # But we should also check the rollup state if available
+            rollup_state = pr_details.get("statusCheckRollup", {}).get("state") if isinstance(pr_details.get("statusCheckRollup"), dict) else None
+            
+            if has_failure or rollup_state == "FAILURE":
                 check_status = "FAILED"
-            elif has_pending:
+            elif has_pending or rollup_state == "PENDING":
                 check_status = "PENDING"
             else:
                 check_status = "PASSED"

package/scripts/run_opencode_issue.sh

@@ -207,6 +207,9 @@ if gh pr view --repo "$REPO" --head "$BRANCH" --json url --jq .url >/dev/null 2>
   gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "📋 PR already exists: $PR_URL" || true
 else
   PR_URL=$(gh pr create --repo "$REPO" --title "Autopilot: Issue #$ISSUE_NUMBER" --body "Closes #$ISSUE_NUMBER" --base main --head "$BRANCH")
+  
+  # Add short delay after PR creation to allow GitHub to calculate merge state
+  sleep 10
 fi
 
 # 8. Comment on issue with PR URL (best-effort)
@@ -406,10 +409,45 @@ I'm monitoring the CI checks and will auto-merge once they pass. This may take a
     while [[ $POLL_ATTEMPT -lt $MAX_POLL_ATTEMPTS ]]; do
       POLL_ATTEMPT=$((POLL_ATTEMPT + 1))
       
-      # Get PR check status (handle null/empty statusCheckRollup as PASSED - no checks configured)
-      CHECK_STATUS=$(gh pr view --repo "$REPO" --head "$BRANCH" --json mergeable,mergeStateStatus,statusCheckRollup --jq '.statusCheckRollup | if . == null or length == 0 then "PASSED" elif map(.conclusion) | any(. == "FAILURE") then "FAILED" elif map(.conclusion) | any(. == "PENDING") or any(. == "QUEUED") then "PENDING" else "PASSED" end' 2>/dev/null || echo "PENDING")
+      # Get full PR status for debugging and decision making
+      PR_STATUS_JSON=$(gh pr view --repo "$REPO" --head "$BRANCH" --json mergeable,mergeStateStatus,statusCheckRollup 2>/dev/null || echo '{"mergeable":"UNKNOWN","mergeStateStatus":"UNKNOWN","statusCheckRollup":null}')
+      
+      # Log raw API response for debugging
+      echo "[run_opencode_issue.sh] Debug: Raw PR status = $PR_STATUS_JSON"
+      
+      # Parse mergeStateStatus
+      if command -v jq >/dev/null 2>&1; then
+        MERGE_STATE_STATUS=$(echo "$PR_STATUS_JSON" | jq -r '.mergeStateStatus')
+      else
+        MERGE_STATE_STATUS=$(python3 -c 'import json,sys; print(json.load(sys.stdin).get("mergeStateStatus", "UNKNOWN"))' <<<"$PR_STATUS_JSON")
+      fi
+      
+      # Determine check status based on both statusCheckRollup and mergeStateStatus
+      # If mergeStateStatus is CLEAN or HAS_HOOKS and statusCheckRollup is null/empty → PASSED
+      # If mergeStateStatus is UNKNOWN → wait and retry
+      if [[ "$MERGE_STATE_STATUS" == "UNKNOWN" ]]; then
+        CHECK_STATUS="PENDING"
+        echo "[run_opencode_issue.sh] mergeStateStatus is UNKNOWN, waiting for GitHub to calculate..."
+      elif [[ "$MERGE_STATE_STATUS" == "CLEAN" || "$MERGE_STATE_STATUS" == "HAS_HOOKS" ]]; then
+        # Check statusCheckRollup - if null/empty, no checks configured, so PASSED
+        if command -v jq >/dev/null 2>&1; then
+          CHECK_STATUS=$(echo "$PR_STATUS_JSON" | jq -r '.statusCheckRollup | if . == null or length == 0 then "PASSED" elif map(.conclusion) | any(. == "FAILURE") then "FAILED" elif map(.conclusion) | any(. == "PENDING") or any(. == "QUEUED") then "PENDING" else "PASSED" end')
+        else
+          CHECK_STATUS=$(python3 -c 'import json,sys; data=json.load(sys.stdin); scr=data.get("statusCheckRollup"); print("PASSED" if not scr or len(scr)==0 else "FAILED" if any(c.get("conclusion")=="FAILURE" for c in scr) else "PENDING" if any(c.get("conclusion") in ["PENDING","QUEUED"] for c in scr) else "PASSED")' <<<"$PR_STATUS_JSON")
+        fi
+      elif [[ "$MERGE_STATE_STATUS" == "BLOCKED" ]]; then
+        # If mergeStateStatus is BLOCKED, check if it's due to failed checks
+        if command -v jq >/dev/null 2>&1; then
+          CHECK_STATUS=$(echo "$PR_STATUS_JSON" | jq -r '.statusCheckRollup | if . == null or length == 0 then "PASSED" elif map(.conclusion) | any(. == "FAILURE") then "FAILED" elif map(.conclusion) | any(. == "PENDING") or any(. == "QUEUED") then "PENDING" else "PASSED" end')
+        else
+          CHECK_STATUS=$(python3 -c 'import json,sys; data=json.load(sys.stdin); scr=data.get("statusCheckRollup"); print("PASSED" if not scr or len(scr)==0 else "FAILED" if any(c.get("conclusion")=="FAILURE" for c in scr) else "PENDING" if any(c.get("conclusion") in ["PENDING","QUEUED"] for c in scr) else "PASSED")' <<<"$PR_STATUS_JSON")
+        fi
+      else
+        # Other states (DRAFT, DIRTY, BEHIND) - mark as FAILED to exit
+        CHECK_STATUS="FAILED"
+      fi
       
-      echo "[run_opencode_issue.sh] Poll attempt $POLL_ATTEMPT/$MAX_POLL_ATTEMPTS: Check status = $CHECK_STATUS"
+      echo "[run_opencode_issue.sh] Poll attempt $POLL_ATTEMPT/$MAX_POLL_ATTEMPTS: Check status = $CHECK_STATUS, mergeStateStatus = $MERGE_STATE_STATUS"
       
       if [[ "$CHECK_STATUS" == "PASSED" ]]; then
         echo "[run_opencode_issue.sh] All checks passed. Proceeding with merge..."