autopilot-code 0.1.0 → 0.2.1

package/.autopilot/autopilot.json

@@ -31,5 +31,6 @@
   "conflictResolutionMaxAttempts": 3,
   "autoFixChecks": true,
   "autoFixChecksMaxAttempts": 3,
-  "autoUpdate": true
+  "autoUpdate": true,
+  "enablePlanningStep": true
 }

package/package.json

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

package/scripts/run_autopilot.py

@@ -792,17 +792,24 @@ def run_cycle(
             continue
 
         for issue in issues[:max_to_claim]:
-            msg = (
-                f"Autopilot claimed this issue at {time.strftime('%Y-%m-%d %H:%M:%S %Z')}.\n\n"
-                "Next: implement fix and open PR.\n\n"
-            )
             print(f"[{cfg.repo}] next issue: #{issue['number']} {issue['title']}", flush=True)
             if dry_run:
                 claimed_count += 1
                 continue
-            claim_issue(cfg, issue, msg)
+            
+            # Post initial claim comment
+            claim_msg = (
+                f"Autopilot claimed this issue at {time.strftime('%Y-%m-%d %H:%M:%S %Z')}.\n\n"
+                f"I'm now analyzing the issue and will begin implementation shortly.\n\n"
+                f"**Issue:** {issue['title']}"
+            )
+            claim_issue(cfg, issue, claim_msg)
             claimed_count += 1
 
+            # Post comment indicating agent is about to start
+            start_msg = f"🚀 Autopilot is now starting work on issue #{issue['number']}.\n\nI'll post regular progress updates as I work through the implementation."
+            sh(["gh", "issue", "comment", str(issue["number"]), "--repo", cfg.repo, "--body", start_msg])
+
             # If agent==opencode, delegate to bash script
             if cfg.agent == "opencode":
                 # Script is in the same directory as this Python file

package/scripts/run_opencode_issue.sh

@@ -22,6 +22,7 @@ if command -v jq >/dev/null 2>&1; then
   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))')
@@ -32,6 +33,7 @@ else
   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
@@ -122,30 +124,99 @@ Work rules:
 - 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"
+  PLAN_OUTPUT=$("$OPENCODE_BIN" run "$PLANNING_PROMPT" 2>&1 || echo "Planning failed")
+  
+  # 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 "Autopilot opened PR: $PR_URL" || true
+  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
@@ -322,6 +393,11 @@ if [[ "$AUTO_MERGE" == "true" ]] && [[ -n "$PR_URL" ]]; then
   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
     
@@ -333,10 +409,45 @@ if [[ "$AUTO_MERGE" == "true" ]] && [[ -n "$PR_URL" ]]; then
     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..."

package/templates/autopilot.json

@@ -19,5 +19,6 @@
   "conflictResolutionMaxAttempts": 3,
   "autoFixChecks": true,
   "autoFixChecksMaxAttempts": 3,
-  "autoUpdate": true
+  "autoUpdate": true,
+  "enablePlanningStep": true
 }