autopilot-code 1.0.0 → 2.0.0

package/scripts/run_opencode_issue.sh

@@ -1,690 +0,0 @@
-#!/usr/bin/env bash
-# =============================================================================
-# DEPRECATED: This script is deprecated and will be removed in a future version.
-#
-# The functionality has been replaced by Python IssueRunner module at:
-#   scripts/issue_runner/
-#
-# To use the new runner, ensure "useNewRunner" is not set to false in your
-# autopilot.json config (it defaults to true).
-#
-# This script is maintained only for backward compatibility.
-# =============================================================================
-set -euo pipefail
-
-REPO_DIR="$1"
-ISSUE_NUMBER="$2"
-
-if [[ -z "$REPO_DIR" || -z "$ISSUE_NUMBER" ]]; then
-  echo "Usage: $0 <repoDir> <issueNumber>" >&2
-  exit 1
-fi
-
-cd "$REPO_DIR"
-
-# Read config (prefer jq, fallback to python3)
-if command -v jq >/dev/null 2>&1; then
-  REPO=$(jq -r '.repo' < .autopilot/autopilot.json)
-  AUTO_MERGE=$(jq -r '.autoMerge // true' < .autopilot/autopilot.json)
-  MERGE_METHOD=$(jq -r '.mergeMethod // "squash"' < .autopilot/autopilot.json)
-  AUTO_RESOLVE_CONFLICTS=$(jq -r '.autoResolveConflicts // true' < .autopilot/autopilot.json)
-  CONFLICT_RESOLUTION_MAX_ATTEMPTS=$(jq -r '.conflictResolutionMaxAttempts // 3' < .autopilot/autopilot.json)
-  AUTO_FIX_CHECKS=$(jq -r '.autoFixChecks // true' < .autopilot/autopilot.json)
-  AUTO_FIX_CHECKS_MAX_ATTEMPTS=$(jq -r '.autoFixChecksMaxAttempts // 3' < .autopilot/autopilot.json)
-  ALLOWED_USERS=$(jq -r '.allowedMergeUsers[]' < .autopilot/autopilot.json 2>/dev/null || true)
-  AGENT_PATH=$(jq -r '.agentPath // ""' < .autopilot/autopilot.json)
-  ENABLE_PLANNING_STEP=$(jq -r '.enablePlanningStep // true' < .autopilot/autopilot.json)
-else
-  REPO=$(python3 -c 'import json; print(json.load(open(".autopilot/autopilot.json"))["repo"])')
-  AUTO_MERGE=$(python3 -c 'import json; print(json.load(open(".autopilot/autopilot.json")).get("autoMerge", True))')
-  MERGE_METHOD=$(python3 -c 'import json; print(json.load(open(".autopilot/autopilot.json")).get("mergeMethod", "squash"))')
-  AUTO_RESOLVE_CONFLICTS=$(python3 -c 'import json; print(json.load(open(".autopilot/autopilot.json")).get("autoResolveConflicts", True))')
-  CONFLICT_RESOLUTION_MAX_ATTEMPTS=$(python3 -c 'import json; print(json.load(open(".autopilot/autopilot.json")).get("conflictResolutionMaxAttempts", 3))')
-  AUTO_FIX_CHECKS=$(python3 -c 'import json; print(json.load(open(".autopilot/autopilot.json")).get("autoFixChecks", True))')
-  AUTO_FIX_CHECKS_MAX_ATTEMPTS=$(python3 -c 'import json; print(json.load(open(".autopilot/autopilot.json")).get("autoFixChecksMaxAttempts", 3))')
-  ALLOWED_USERS=$(python3 -c 'import json,sys; users=json.load(open(".autopilot/autopilot.json")).get("allowedMergeUsers", []); print("\n".join(users))' 2>/dev/null || true)
-  AGENT_PATH=$(python3 -c 'import json; print(json.load(open(".autopilot/autopilot.json")).get("agentPath", ""))' 2>/dev/null || true)
-  ENABLE_PLANNING_STEP=$(python3 -c 'import json; print(json.load(open(".autopilot/autopilot.json")).get("enablePlanningStep", True))' 2>/dev/null || echo "true")
-fi
-
-# Find opencode binary - check config, PATH, then common locations
-find_opencode() {
-  # 1. Config-specified path
-  if [[ -n "$AGENT_PATH" ]] && [[ -x "$AGENT_PATH" ]]; then
-    echo "$AGENT_PATH"
-    return
-  fi
-  
-  # 2. Already in PATH
-  if command -v opencode >/dev/null 2>&1; then
-    command -v opencode
-    return
-  fi
-  
-  # 3. Common nvm locations
-  for node_dir in "$HOME/.nvm/versions/node"/*/bin; do
-    if [[ -x "$node_dir/opencode" ]]; then
-      echo "$node_dir/opencode"
-      return
-    fi
-  done
-  
-  # 4. Other common locations
-  for path in "$HOME/.local/bin/opencode" "/usr/local/bin/opencode" "$HOME/.npm-global/bin/opencode"; do
-    if [[ -x "$path" ]]; then
-      echo "$path"
-      return
-    fi
-  done
-  
-  # Not found
-  return 1
-}
-
-OPENCODE_BIN=$(find_opencode) || {
-  echo "[run_opencode_issue.sh] ERROR: opencode not found. Set 'agentPath' in autopilot.json or ensure opencode is installed." >&2
-  exit 1
-}
-echo "[run_opencode_issue.sh] Using opencode: $OPENCODE_BIN"
-
-WORKTREE="/tmp/autopilot-issue-$ISSUE_NUMBER"
-BRANCH="autopilot/issue-$ISSUE_NUMBER"
-
-echo "[run_opencode_issue.sh] repo=$REPO issue=$ISSUE_NUMBER worktree=$WORKTREE"
-
-# 1. Create or reuse git worktree from main
-# First, prune any stale worktrees (e.g., if directory was deleted but still registered)
-git worktree prune 2>/dev/null || true
-
-if [[ -d "$WORKTREE" ]]; then
-  echo "[run_opencode_issue.sh] Reusing existing worktree: $WORKTREE"
-else
-  # If branch exists already, add worktree from that branch; otherwise create from main.
-  if git show-ref --verify --quiet "refs/heads/$BRANCH"; then
-    git worktree add "$WORKTREE" "$BRANCH"
-  else
-    git worktree add "$WORKTREE" -b "$BRANCH" main
-  fi
-fi
-
-# 1.5. Install dependencies if package.json exists (for Node.js projects)
-if [[ -f "$WORKTREE/package.json" ]]; then
-  echo "[run_opencode_issue.sh] Installing npm dependencies..."
-  (cd "$WORKTREE" && npm install --silent) || true
-fi
-
-# 2. Fetch issue title/body
-ISSUE_JSON=$(gh issue view "$ISSUE_NUMBER" --repo "$REPO" --json title,body)
-if command -v jq >/dev/null 2>&1; then
-  ISSUE_TITLE=$(echo "$ISSUE_JSON" | jq -r '.title')
-  ISSUE_BODY=$(echo "$ISSUE_JSON" | jq -r '.body')
-else
-  ISSUE_TITLE=$(python3 -c 'import json,sys; d=json.load(sys.stdin); print(d["title"])' <<<"$ISSUE_JSON")
-  ISSUE_BODY=$(python3 -c 'import json,sys; d=json.load(sys.stdin); print(d.get("body") or "")' <<<"$ISSUE_JSON")
-fi
-
-# 3. Build prompt
-PROMPT="Please implement the following GitHub issue.
-
-Issue #$ISSUE_NUMBER: $ISSUE_TITLE
-
-$ISSUE_BODY
-
-Work rules:
-- Make the necessary code changes.
-- Commit with message: \"autopilot: work for issue #$ISSUE_NUMBER\".
-- Push your changes to the remote branch $BRANCH.
-- If the issue is a simple file-addition, just do it directly (no extra refactors)."
-
-# 3.5. Planning step - analyze and plan before implementation
-if [[ "$ENABLE_PLANNING_STEP" == "true" ]]; then
-  echo "[run_opencode_issue.sh] Running planning/analysis step..."
-  
-  PLANNING_PROMPT="Please analyze the following GitHub issue and provide a detailed implementation plan. Do NOT make any code changes yet - only analyze and plan.
-
-Issue #$ISSUE_NUMBER: $ISSUE_TITLE
-
-$ISSUE_BODY
-
-Your task:
-1. Analyze the issue requirements thoroughly
-2. Explore the codebase to understand the relevant components
-3. Identify the files that need to be modified or created
-4. Outline the step-by-step approach for implementing this change
-5. Note any potential issues, dependencies, or risks
-6. List any assumptions you're making
-
-Provide your analysis and plan in a clear, structured format. Focus on WHAT needs to be done and HOW you'll approach it."
-
-  # Run opencode to generate the plan
-  cd "$WORKTREE"
-  RAW_OUTPUT=$("$OPENCODE_BIN" run "$PLANNING_PROMPT" 2>&1 || echo "Planning failed")
-  
-  # Filter out noise - keep only the final plan output
-  # Remove tool calls, internal logs, and system messages
-  PLAN_OUTPUT=$(echo "$RAW_OUTPUT" | grep -vE '^\s*(bash|read|write|edit|grep|glob|question|task|webfetch|google_search|morph-mcp|todowrite|todoread|skill|search)\s' | \
-                grep -vE '^\s*(Running|Executing|File:|Offset:|Limit:|parameters:|pattern:|path:|include:)' | \
-                grep -vE '^<[a-z_]+>|^<\/[a-z_]+>|^system:|^user:|^assistant:|^model:' | \
-                grep -vE '^\s*\$|^\s*\[.*\]|^Using|Called|Invoked' | \
-                grep -vE '^\s*$|^(command|description|filePath|oldString|newString|questions|header|options):' | \
-                tail -100)
-  
-  # If filtering removed everything, use a fallback
-  if [[ -z "$PLAN_OUTPUT" ]]; then
-    PLAN_OUTPUT="Unable to extract a clean plan. The raw output contained excessive tool logs."
-  fi
-  
-  # Post the plan as a comment on the issue
-  PLAN_COMMENT="## 📋 Implementation Plan
-
-I've analyzed the issue and codebase. Here's my planned approach:
-
-\`\`\`
-$PLAN_OUTPUT
-\`\`\`
-
-I will now proceed with implementation based on this plan. If you'd like me to adjust my approach, please add a comment with feedback."
-  
-  gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "$PLAN_COMMENT" || true
-  echo "[run_opencode_issue.sh] Planning step completed and posted to issue."
-fi
-
-# 4. Run opencode inside worktree
-cd "$WORKTREE"
-"$OPENCODE_BIN" run "$PROMPT"
-
-# 4.5. Comment that implementation is complete
-gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "✅ Implementation complete.
-
-I've finished implementing the solution. Now committing changes and creating PR..." || true
-
-# 5. Commit any changes OpenCode made
-if [[ -n "$(git status --porcelain)" ]]; then
-  git add -A
-  git commit -m "autopilot: work for issue #$ISSUE_NUMBER"
-  
-  # Comment with commit info
-  COMMIT_SHA=$(git rev-parse --short HEAD)
-  CHANGES_COUNT=$(git diff-tree --no-commit-id --name-only -r HEAD | wc -l | xargs)
-  gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "📝 Changes committed.
-
-- Commit: \`$COMMIT_SHA\`
-- Files changed: $CHANGES_COUNT
-- Branch: \`$BRANCH\`
-
-Next step: pushing to remote..." || true
-else
-  gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "ℹ️ No changes were made by the AI agent. This might indicate the issue is already resolved or requires manual intervention." || true
-fi
-
-# 6. Ensure branch is pushed (no-op if already up to date)
-git push -u origin "$BRANCH" || true
-
-# 6.5. Comment after push
-gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "📤 Changes pushed to remote branch \`$BRANCH\`.
-
-Now creating pull request..." || true
-
-# 7. Create PR if one doesn't already exist
-PR_URL=""
-if gh pr view --repo "$REPO" --head "$BRANCH" --json url --jq .url >/dev/null 2>&1; then
-  PR_URL=$(gh pr view --repo "$REPO" --head "$BRANCH" --json url --jq .url)
-  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)
-if [[ -n "$PR_URL" ]]; then
-  gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "🎉 PR created: $PR_URL
-
-Autopilot has completed the initial implementation. The PR is now open and ready for review." || true
-fi
-
-# 8.5. Handle merge conflicts if auto-resolve is enabled
-if [[ "$AUTO_RESOLVE_CONFLICTS" == "true" ]] && [[ -n "$PR_URL" ]]; then
-  echo "[run_opencode_issue.sh] Checking for merge conflicts..."
-  
-  # Get PR merge status
-  MERGE_STATUS=$(gh pr view --repo "$REPO" --head "$BRANCH" --json mergeable,mergeStateStatus --jq '{mergeable, mergeStateStatus}' 2>/dev/null || echo '{"mergeable":"UNKNOWN"}')
-  
-  if command -v jq >/dev/null 2>&1; then
-    IS_CONFLICTING=$(echo "$MERGE_STATUS" | jq -r 'if .mergeable == "CONFLICTING" or .mergeStateStatus == "DIRTY" then "true" else "false" end')
-  else
-    IS_CONFLICTING=$(python3 -c 'import json,sys; d=json.load(sys.stdin); print("true" if d.get("mergeable") == "CONFLICTING" or d.get("mergeStateStatus") == "DIRTY" else "false")' <<<"$MERGE_STATUS")
-  fi
-  
-  if [[ "$IS_CONFLICTING" == "true" ]]; then
-    echo "[run_opencode_issue.sh] PR has merge conflicts. Attempting auto-resolution..."
-    
-    RESOLVE_ATTEMPT=0
-    MAX_ATTEMPTS=$((CONFLICT_RESOLUTION_MAX_ATTEMPTS + 0))
-    
-    while [[ $RESOLVE_ATTEMPT -lt $MAX_ATTEMPTS ]]; do
-      RESOLVE_ATTEMPT=$((RESOLVE_ATTEMPT + 1))
-      echo "[run_opencode_issue.sh] Conflict resolution attempt $RESOLVE_ATTEMPT/$MAX_ATTEMPTS"
-      
-      # Fetch latest main
-      echo "[run_opencode_issue.sh] Fetching latest main..."
-      git fetch origin main || true
-      
-      # Checkout branch and try to rebase
-      echo "[run_opencode_issue.sh] Rebasing branch onto main..."
-      cd "$WORKTREE"
-      if git rebase origin/main; then
-        echo "[run_opencode_issue.sh] Rebase successful."
-        
-        # Push rebased changes
-        git push -f origin "$BRANCH" || true
-        
-        # Check if conflicts are resolved
-        MERGE_STATUS=$(gh pr view --repo "$REPO" --head "$BRANCH" --json mergeable,mergeStateStatus --jq '{mergeable, mergeStateStatus}' 2>/dev/null || echo '{"mergeable":"UNKNOWN"}')
-        
-        if command -v jq >/dev/null 2>&1; then
-          IS_CONFLICTING=$(echo "$MERGE_STATUS" | jq -r 'if .mergeable == "CONFLICTING" or .mergeStateStatus == "DIRTY" then "true" else "false" end')
-        else
-          IS_CONFLICTING=$(python3 -c 'import json,sys; d=json.load(sys.stdin); print("true" if d.get("mergeable") == "CONFLICTING" or d.get("mergeStateStatus") == "DIRTY" else "false")' <<<"$MERGE_STATUS")
-        fi
-        
-        if [[ "$IS_CONFLICTING" == "false" ]]; then
-          echo "[run_opencode_issue.sh] Conflicts resolved successfully."
-          gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "✅ Autopilot successfully resolved merge conflicts." || true
-          break
-        fi
-      else
-        # Rebase failed - there are conflicts to resolve
-        echo "[run_opencode_issue.sh] Rebase encountered conflicts. Attempting resolution with agent..."
-        
-        # Abort the rebase to get back to a clean state
-        git rebase --abort 2>/dev/null || true
-        
-        # Try merging main instead (may be easier to resolve)
-        if git merge origin/main; then
-          echo "[run_opencode_issue.sh] Merge successful."
-          git push -f origin "$BRANCH" || true
-          
-          # Check if conflicts are resolved
-          MERGE_STATUS=$(gh pr view --repo "$REPO" --head "$BRANCH" --json mergeable,mergeStateStatus --jq '{mergeable, mergeStateStatus}' 2>/dev/null || echo '{"mergeable":"UNKNOWN"}')
-          
-          if command -v jq >/dev/null 2>&1; then
-            IS_CONFLICTING=$(echo "$MERGE_STATUS" | jq -r 'if .mergeable == "CONFLICTING" or .mergeStateStatus == "DIRTY" then "true" else "false" end')
-          else
-            IS_CONFLICTING=$(python3 -c 'import json,sys; d=json.load(sys.stdin); print("true" if d.get("mergeable") == "CONFLICTING" or d.get("mergeStateStatus") == "DIRTY" else "false")' <<<"$MERGE_STATUS")
-          fi
-          
-          if [[ "$IS_CONFLICTING" == "false" ]]; then
-            echo "[run_opencode_issue.sh] Conflicts resolved successfully."
-            gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "✅ Autopilot successfully resolved merge conflicts." || true
-            break
-          fi
-        else
-          # Merge also has conflicts - abort and try to resolve with agent
-          git merge --abort 2>/dev/null || true
-          
-          echo "[run_opencode_issue.sh] Attempting to resolve conflicts with opencode agent..."
-          
-          # Use opencode to resolve conflicts
-          CONFLICT_PROMPT="This PR has merge conflicts. Please resolve them by examining the conflicted files and making the necessary edits to resolve the conflicts. Follow these steps:
-1. Run 'git status' to see all conflicted files
-2. For each conflicted file, examine the conflict markers (<<<<<<<, =======, >>>>>>>)
-3. Resolve the conflicts by choosing the appropriate code
-4. Stage the resolved files with 'git add <file>'
-5. Commit the resolved files if needed
-6. The goal is to make the branch mergeable with main
-
-After resolving all conflicts, report the files that were resolved."
-          
-          if "$OPENCODE_BIN" run "$CONFLICT_PROMPT"; then
-            # Check if there are still conflicts
-            if [[ -z "$(git diff --name-only --diff-filter=U)" ]]; then
-              echo "[run_opencode_issue.sh] Conflicts resolved by agent."
-              
-              # Complete the merge or rebase
-              git add -A
-              
-              # If we were in the middle of a merge, complete it
-              if [[ -f ".git/MERGE_HEAD" ]]; then
-                git commit --no-edit || true
-              fi
-              
-              # Push resolved changes
-              git push -f origin "$BRANCH" || true
-              
-              # Check if conflicts are resolved
-              MERGE_STATUS=$(gh pr view --repo "$REPO" --head "$BRANCH" --json mergeable,mergeStateStatus --jq '{mergeable, mergeStateStatus}' 2>/dev/null || echo '{"mergeable":"UNKNOWN"}')
-              
-              if command -v jq >/dev/null 2>&1; then
-                IS_CONFLICTING=$(echo "$MERGE_STATUS" | jq -r 'if .mergeable == "CONFLICTING" or .mergeStateStatus == "DIRTY" then "true" else "false" end')
-              else
-                IS_CONFLICTING=$(python3 -c 'import json,sys; d=json.load(sys.stdin); print("true" if d.get("mergeable") == "CONFLICTING" or d.get("mergeStateStatus") == "DIRTY" else "false")' <<<"$MERGE_STATUS")
-              fi
-              
-              if [[ "$IS_CONFLICTING" == "false" ]]; then
-                echo "[run_opencode_issue.sh] Conflicts resolved successfully."
-                gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "✅ Autopilot successfully resolved merge conflicts." || true
-                break
-              fi
-            fi
-          fi
-        fi
-      fi
-      
-      # If we're here, resolution failed and we should try again
-      echo "[run_opencode_issue.sh] Conflict resolution attempt $RESOLVE_ATTEMPT failed."
-      
-      if [[ $RESOLVE_ATTEMPT -ge $MAX_ATTEMPTS ]]; then
-        echo "[run_opencode_issue.sh] Failed to resolve conflicts after $MAX_ATTEMPTS attempts."
-        
-        # Mark issue as blocked
-        if command -v jq >/dev/null 2>&1; then
-          LABEL_BLOCKED=$(jq -r '.issueLabels.blocked' < .autopilot/autopilot.json)
-        else
-          LABEL_BLOCKED=$(python3 -c 'import json; print(json.load(open(".autopilot/autopilot.json"))["issueLabels"]["blocked"])')
-        fi
-        
-        BLOCKED_MSG="❌ Autopilot failed to resolve merge conflicts after $MAX_ATTEMPTS attempts.\n\nThe PR will remain open but autopilot has stopped attempting to resolve conflicts.\n\nTo resolve manually:\n1. Checkout the branch: \`git checkout $BRANCH\`\n2. Fetch and rebase main: \`git fetch origin main && git rebase origin/main\`\n3. Resolve conflicts as needed\n4. Push resolved changes: \`git push -f origin $BRANCH\`\n\nOnce resolved, autopilot can attempt to merge the PR."
-        
-        gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "$BLOCKED_MSG" || true
-        gh issue edit "$ISSUE_NUMBER" --repo "$REPO" --add-label "$LABEL_BLOCKED" || true
-        
-        exit 1
-      fi
-      
-      # Wait a bit before next attempt
-      sleep 5
-    done
-  fi
-fi
-
-# 9. Auto-merge if enabled and user is allowed
-if [[ "$AUTO_MERGE" == "true" ]] && [[ -n "$PR_URL" ]]; then
-  # Get authenticated GitHub user
-  AUTH_USER=$(gh api user --jq .login)
-
-  # Check if user is in allowed list
-  USER_ALLOWED=false
-  if [[ -n "$ALLOWED_USERS" ]]; then
-    while IFS= read -r user; do
-      if [[ "$AUTH_USER" == "$user" ]]; then
-        USER_ALLOWED=true
-        break
-      fi
-    done <<< "$ALLOWED_USERS"
-  fi
-
-  if [[ "$USER_ALLOWED" == "true" ]]; then
-    echo "[run_opencode_issue.sh] Auto-merge enabled. Waiting for PR checks to pass..."
-    
-    # Comment that we're waiting for checks
-    gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "⏳ Waiting for PR checks to complete...
-
-I'm monitoring the CI checks and will auto-merge once they pass. This may take a few minutes." || true
-    
-    # Initialize auto-fix attempt counter
-    FIX_ATTEMPT=0
-    
-    # Poll PR checks until they pass or fail
-    MAX_POLL_ATTEMPTS=60
-    POLL_INTERVAL=30
-    POLL_ATTEMPT=0
-    
-    while [[ $POLL_ATTEMPT -lt $MAX_POLL_ATTEMPTS ]]; do
-      POLL_ATTEMPT=$((POLL_ATTEMPT + 1))
-      
-      # 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 if there are any CI checks configured
-        if command -v jq >/dev/null 2>&1; then
-          SCR_IS_NULL=$(echo "$PR_STATUS_JSON" | jq -r '.statusCheckRollup == null')
-          SCR_LENGTH=$(echo "$PR_STATUS_JSON" | jq -r '.statusCheckRollup | length // 0')
-        else
-          SCR_VALUE=$(python3 -c 'import json,sys; data=json.load(sys.stdin); print(data.get("statusCheckRollup", "null"))' <<<"$PR_STATUS_JSON")
-          SCR_IS_NULL=$([[ "$SCR_VALUE" == "null" ]] && echo "true" || echo "false")
-          SCR_LENGTH=$(python3 -c 'import json,sys; data=json.load(sys.stdin); scr=data.get("statusCheckRollup"); print(len(scr) if scr else 0)' <<<"$PR_STATUS_JSON")
-        fi
-        
-        # If no checks configured, wait at most 20 seconds for them to appear
-        if [[ "$SCR_IS_NULL" == "true" ]] || [[ "$SCR_LENGTH" == "0" ]]; then
-          if [[ $POLL_ATTEMPT -lt 1 ]]; then
-            CHECK_STATUS="PENDING"
-            echo "[run_opencode_issue.sh] No CI checks configured, waiting up to 20 seconds for checks to appear..."
-            sleep 20
-            continue
-          else
-            CHECK_STATUS="PASSED"
-            echo "[run_opencode_issue.sh] No checks found after waiting 20 seconds, continuing to merge..."
-          fi
-        else
-          CHECK_STATUS="PENDING"
-          echo "[run_opencode_issue.sh] mergeStateStatus is UNKNOWN, waiting for GitHub to calculate..."
-        fi
-      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
-          # 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
-          # 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
-        CHECK_STATUS="FAILED"
-      fi
-      
-      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..."
-        break
-      elif [[ "$CHECK_STATUS" == "FAILED" ]]; then
-        echo "[run_opencode_issue.sh] PR checks failed."
-        
-        # Check if auto-fix is enabled
-        if [[ "$AUTO_FIX_CHECKS" == "true" ]] && [[ $FIX_ATTEMPT -lt $AUTO_FIX_CHECKS_MAX_ATTEMPTS ]]; then
-          FIX_ATTEMPT=$((FIX_ATTEMPT + 1))
-          echo "[run_opencode_issue.sh] Auto-fix enabled. Attempting to fix failing checks ($FIX_ATTEMPT/$AUTO_FIX_CHECKS_MAX_ATTEMPTS)..."
-          
-          # Fetch failed check details and logs
-          CHECK_RUNS_JSON=$(gh api "repos/$REPO/commits/$(git rev-parse HEAD)/check-runs" --jq '.check_runs[] | select(.conclusion == "FAILURE") | {name: .name, conclusion: .conclusion, details_url: .details_url, output: {title: .output.title, summary: .output.summary, text: .output.text}}' 2>/dev/null || echo "[]")
-          
-          # Build failure context
-          FAILURE_CONTEXT="The following CI checks failed:\n"
-          
-          # Add failure details to context
-          if [[ -n "$CHECK_RUNS_JSON" ]]; then
-            FAILURE_CONTEXT+="$CHECK_RUNS_JSON\n"
-          fi
-          
-          # Generate repair prompt
-          REPAIR_PROMPT="The PR checks have failed. Please analyze the CI failures and fix the issues.\n\n$FAILURE_CONTEXT\n\nWork rules:\n- Examine the failed checks and identify the root cause\n- Make the necessary code changes to fix the failures\n- Commit with message: \"autopilot: fix CI check failures (attempt $FIX_ATTEMPT/$AUTO_FIX_CHECKS_MAX_ATTEMPTS)\"\n- Push your changes to the branch $BRANCH\n- Focus only on fixing the CI failures, do not make unrelated changes"
-          
-          echo "[run_opencode_issue.sh] Running opencode agent to fix CI failures..."
-          
-          # Run opencode to fix the issue
-          cd "$WORKTREE"
-          if "$OPENCODE_BIN" run "$REPAIR_PROMPT"; then
-            # Commit any changes
-            if [[ -n "$(git status --porcelain)" ]]; then
-              git add -A
-              git commit -m "autopilot: fix CI check failures (attempt $FIX_ATTEMPT/$AUTO_FIX_CHECKS_MAX_ATTEMPTS)"
-              echo "[run_opencode_issue.sh] Committed fixes for CI failures."
-              
-              # Push changes
-              git push origin "$BRANCH"
-              echo "[run_opencode_issue.sh] Pushed fixes for CI failures."
-              
-              # Reset poll counter to re-check CI status
-              POLL_ATTEMPT=0
-              
-              # Wait a moment for checks to start
-              sleep 10
-              
-              # Continue polling
-              continue
-            else
-              echo "[run_opencode_issue.sh] No changes made by opencode agent."
-            fi
-          else
-            echo "[run_opencode_issue.sh] Opencode agent failed to fix CI issues."
-          fi
-          
-          # If we're here, auto-fix failed or made no changes
-          gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "⚠️ Autopilot attempted to fix CI failures (attempt $FIX_ATTEMPT/$AUTO_FIX_CHECKS_MAX_ATTEMPTS) but was unable to resolve all issues." || true
-        fi
-        
-        # If auto-fix is disabled or max attempts reached, fail
-        if [[ "$FIX_ATTEMPT" -ge "$AUTO_FIX_CHECKS_MAX_ATTEMPTS" ]]; then
-          FAILED_MSG="❌ Autopilot cannot auto-merge PR: checks failed after $AUTO_FIX_CHECKS_MAX_ATTEMPTS auto-fix attempts.\n\nPR will remain open for review."
-        else
-          FAILED_MSG="❌ Autopilot cannot auto-merge PR: checks failed (auto-fix disabled).\n\nPR will remain open for review."
-        fi
-        gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "$FAILED_MSG" || true
-        exit 1
-      fi
-      
-      # Wait before next poll
-      if [[ $POLL_ATTEMPT -lt $MAX_POLL_ATTEMPTS ]]; then
-        echo "[run_opencode_issue.sh] Waiting ${POLL_INTERVAL}s before next check..."
-        sleep "$POLL_INTERVAL"
-      fi
-    done
-    
-    # After polling loop: merge if checks passed
-    if [[ "$CHECK_STATUS" == "PASSED" ]]; then
-      echo "[run_opencode_issue.sh] Merging PR using method: $MERGE_METHOD"
-      
-      # Build merge command based on method
-      MERGE_CMD="gh pr merge $PR_URL --delete-branch"
-      case "$MERGE_METHOD" in
-        squash)
-          MERGE_CMD="$MERGE_CMD --squash"
-          ;;
-        merge)
-          MERGE_CMD="$MERGE_CMD --merge"
-          ;;
-        rebase)
-          MERGE_CMD="$MERGE_CMD --rebase"
-          ;;
-        *)
-          echo "[run_opencode_issue.sh] Unknown merge method '$MERGE_METHOD', defaulting to squash"
-          MERGE_CMD="$MERGE_CMD --squash"
-          ;;
-      esac
-      
-      # Attempt merge
-      if eval "$MERGE_CMD"; then
-        echo "[run_opencode_issue.sh] PR merged successfully!"
-        
-        # Update issue with success message and mark as done
-        SUCCESS_MSG="✅ Autopilot successfully merged PR #${PR_URL##*/} using $MERGE_METHOD method.\n\nThe fix has been merged to the main branch."
-        gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "$SUCCESS_MSG" || true
-        
-        # Get done label and mark issue as done
-        if command -v jq >/dev/null 2>&1; then
-          LABEL_DONE=$(jq -r '.issueLabels.done' < .autopilot/autopilot.json)
-          LABEL_IN_PROGRESS=$(jq -r '.issueLabels.inProgress' < .autopilot/autopilot.json)
-        else
-          LABEL_DONE=$(python3 -c 'import json; print(json.load(open(".autopilot/autopilot.json"))["issueLabels"]["done"])')
-          LABEL_IN_PROGRESS=$(python3 -c 'import json; print(json.load(open(".autopilot/autopilot.json"))["issueLabels"]["inProgress"])')
-        fi
-        
-        gh issue edit "$ISSUE_NUMBER" --repo "$REPO" --add-label "$LABEL_DONE" --remove-label "$LABEL_IN_PROGRESS" || true
-        gh issue close "$ISSUE_NUMBER" --repo "$REPO" || true
-      else
-        echo "[run_opencode_issue.sh] Failed to merge PR"
-        MERGE_FAIL_MSG="❌ Autopilot failed to merge PR automatically.\n\nThe PR is ready (checks passed) but the merge operation failed. You may need to merge manually."
-        gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "$MERGE_FAIL_MSG" || true
-      fi
-    elif [[ $POLL_ATTEMPT -ge $MAX_POLL_ATTEMPTS ]]; then
-      echo "[run_opencode_issue.sh] Timed out waiting for checks to pass"
-      TIMEOUT_MSG="⏱️ Autopilot timed out waiting for PR checks to complete.\n\nThe PR will remain open for manual review."
-      gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "$TIMEOUT_MSG" || true
-    fi
-  else
-    BLOCKED_MSG="❌ Autopilot cannot auto-merge PR: authenticated user '$AUTH_USER' is not in the allowedMergeUsers list."
-    gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "$BLOCKED_MSG" || true
-    
-    # Mark issue as blocked
-    if command -v jq >/dev/null 2>&1; then
-      LABEL_BLOCKED=$(jq -r '.issueLabels.blocked' < .autopilot/autopilot.json)
-    else
-      LABEL_BLOCKED=$(python3 -c 'import json; print(json.load(open(".autopilot/autopilot.json"))["issueLabels"]["blocked"])')
-    fi
-    gh issue edit "$ISSUE_NUMBER" --repo "$REPO" --add-label "$LABEL_BLOCKED" || true
-  fi
-fi
-
-echo "[run_opencode_issue.sh] Done: $PR_URL"