autopilot-code 0.2.1 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autopilot-code",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "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

@@ -431,16 +431,65 @@ I'm monitoring the CI checks and will auto-merge once they pass. This may take a
       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')
+          # Debug: log the statusCheckRollup value
+          SCR_VALUE=$(echo "$PR_STATUS_JSON" | jq -r '.statusCheckRollup')
+          echo "[run_opencode_issue.sh] Debug: statusCheckRollup value = $SCR_VALUE"
+          
+          # Check if statusCheckRollup is null or empty array
+          SCR_IS_NULL=$(echo "$PR_STATUS_JSON" | jq -r '.statusCheckRollup == null')
+          SCR_LENGTH=$(echo "$PR_STATUS_JSON" | jq -r '.statusCheckRollup | length // 0')
+          echo "[run_opencode_issue.sh] Debug: statusCheckRollup is_null=$SCR_IS_NULL, length=$SCR_LENGTH"
+          
+          if [[ "$SCR_IS_NULL" == "true" ]] || [[ "$SCR_LENGTH" == "0" ]]; then
+            CHECK_STATUS="PASSED"
+            echo "[run_opencode_issue.sh] No CI checks configured (statusCheckRollup is null/empty)"
+          else
+            # Has checks - determine status
+            CHECK_STATUS=$(echo "$PR_STATUS_JSON" | jq -r '.statusCheckRollup | map(.conclusion) | if any(. == "FAILURE") then "FAILED" elif any(. == "PENDING") or any(. == "QUEUED") then "PENDING" else "PASSED" end')
+            echo "[run_opencode_issue.sh] CI checks found, status = $CHECK_STATUS"
+          fi
         else
+          # Python fallback
+          SCR_VALUE=$(python3 -c 'import json,sys; data=json.load(sys.stdin); print(data.get("statusCheckRollup", "null"))' <<<"$PR_STATUS_JSON")
+          echo "[run_opencode_issue.sh] Debug: statusCheckRollup value = $SCR_VALUE"
+          
           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")
+          
+          if [[ "$SCR_VALUE" == "null" ]] || [[ "$SCR_VALUE" == "[]" ]]; then
+            echo "[run_opencode_issue.sh] No CI checks configured (statusCheckRollup is null/empty)"
+          fi
         fi
       elif [[ "$MERGE_STATE_STATUS" == "BLOCKED" ]]; then
         # If mergeStateStatus is BLOCKED, check if it's due to failed checks
+        echo "[run_opencode_issue.sh] mergeStateStatus is BLOCKED, checking if 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')
+          # Debug: log the statusCheckRollup value
+          SCR_VALUE=$(echo "$PR_STATUS_JSON" | jq -r '.statusCheckRollup')
+          echo "[run_opencode_issue.sh] Debug: statusCheckRollup value = $SCR_VALUE"
+          
+          # Check if statusCheckRollup is null or empty array
+          SCR_IS_NULL=$(echo "$PR_STATUS_JSON" | jq -r '.statusCheckRollup == null')
+          SCR_LENGTH=$(echo "$PR_STATUS_JSON" | jq -r '.statusCheckRollup | length // 0')
+          echo "[run_opencode_issue.sh] Debug: statusCheckRollup is_null=$SCR_IS_NULL, length=$SCR_LENGTH"
+          
+          if [[ "$SCR_IS_NULL" == "true" ]] || [[ "$SCR_LENGTH" == "0" ]]; then
+            CHECK_STATUS="FAILED"
+            echo "[run_opencode_issue.sh] No CI checks but mergeStateStatus is BLOCKED - other blocking issue"
+          else
+            # Has checks - determine status
+            CHECK_STATUS=$(echo "$PR_STATUS_JSON" | jq -r '.statusCheckRollup | map(.conclusion) | if any(. == "FAILURE") then "FAILED" elif any(. == "PENDING") or any(. == "QUEUED") then "PENDING" else "PASSED" end')
+            echo "[run_opencode_issue.sh] CI checks found, status = $CHECK_STATUS"
+          fi
         else
+          # Python fallback
+          SCR_VALUE=$(python3 -c 'import json,sys; data=json.load(sys.stdin); print(data.get("statusCheckRollup", "null"))' <<<"$PR_STATUS_JSON")
+          echo "[run_opencode_issue.sh] Debug: statusCheckRollup value = $SCR_VALUE"
+          
           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")
+          
+          if [[ "$SCR_VALUE" == "null" ]] || [[ "$SCR_VALUE" == "[]" ]]; then
+            echo "[run_opencode_issue.sh] No CI checks but mergeStateStatus is BLOCKED - other blocking issue"
+          fi
         fi
       else
         # Other states (DRAFT, DIRTY, BEHIND) - mark as FAILED to exit