autopilot-code 0.0.28 → 0.2.0

package/.autopilot/autopilot.json

@@ -30,5 +30,7 @@
   "autoResolveConflicts": true,
   "conflictResolutionMaxAttempts": 3,
   "autoFixChecks": true,
-  "autoFixChecksMaxAttempts": 3
+  "autoFixChecksMaxAttempts": 3,
+  "autoUpdate": true,
+  "enablePlanningStep": true
 }

package/dist/cli.js

@@ -347,7 +347,8 @@ async function initCommand() {
                     priorityLabels: ["p0", "p1", "p2"],
                     maxParallel: 1,
                     branchPrefix: "autopilot/",
-                    allowedBaseBranch: "main"
+                    allowedBaseBranch: "main",
+                    autoUpdate: true
                 };
             }
             template.repo = repoName;

package/package.json

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

package/scripts/run_autopilot.py

@@ -84,6 +84,7 @@ class RepoConfig:
     conflict_resolution_max_attempts: int
     auto_fix_checks: bool
     auto_fix_checks_max_attempts: int
+    auto_update: bool
 
 
 def load_config(repo_root: Path) -> RepoConfig | None:
@@ -132,6 +133,7 @@ def load_config(repo_root: Path) -> RepoConfig | None:
         conflict_resolution_max_attempts=conflict_resolution_max_attempts,
         auto_fix_checks=auto_fix_checks,
         auto_fix_checks_max_attempts=auto_fix_checks_max_attempts,
+        auto_update=data.get("autoUpdate", False),
     )
 
 
@@ -245,6 +247,68 @@ def write_state(repo_root: Path, state: dict[str, Any]) -> None:
     p.write_text(json.dumps(state, indent=2, sort_keys=True) + "\n", encoding="utf-8")
 
 
+def load_global_state() -> dict[str, Any]:
+    p = GLOBAL_STATE_FILE
+    if not p.exists():
+        GLOBAL_CONFIG_DIR.mkdir(parents=True, exist_ok=True)
+        return {}
+    try:
+        return json.loads(p.read_text(encoding="utf-8"))
+    except Exception:
+        return {}
+
+
+def write_global_state(state: dict[str, Any]) -> None:
+    GLOBAL_CONFIG_DIR.mkdir(parents=True, exist_ok=True)
+    GLOBAL_STATE_FILE.write_text(json.dumps(state, indent=2, sort_keys=True) + "\n", encoding="utf-8")
+
+
+def flag_autopilot_needs_update() -> None:
+    """Flag that autopilot needs to update itself."""
+    state = load_global_state()
+    state["needsUpdate"] = True
+    write_global_state(state)
+
+
+def check_autopilot_needs_update() -> bool:
+    """Check if autopilot is flagged for update."""
+    state = load_global_state()
+    return state.get("needsUpdate", False)
+
+
+def clear_autopilot_update_flag() -> None:
+    """Clear the update flag."""
+    state = load_global_state()
+    if "needsUpdate" in state:
+        del state["needsUpdate"]
+    write_global_state(state)
+
+
+def is_autopilot_repo(repo: str) -> bool:
+    """Check if the repo is the autopilot repository."""
+    return repo in ("bakkensoftware/autopilot", "anomalyco/autopilot")
+
+
+def update_autopilot() -> bool:
+    """Update autopilot globally and restart service."""
+    print("[autopilot] Updating autopilot-code...", flush=True)
+    
+    try:
+        sh(["npm", "install", "-g", "autopilot-code"], check=True)
+        print("[autopilot] Successfully installed updated autopilot-code", flush=True)
+    except Exception as e:
+        print(f"[autopilot] Failed to install autopilot-code: {e}", flush=True)
+        return False
+    
+    try:
+        sh(["systemctl", "--user", "restart", "autopilot"], check=True)
+        print("[autopilot] Restarted autopilot service", flush=True)
+        return True
+    except Exception as e:
+        print(f"[autopilot] Failed to restart service: {e}", flush=True)
+        return False
+
+
 def touch_heartbeat(cfg: RepoConfig, issue_number: int) -> None:
     """Update durable local heartbeat state for the repo.
 
@@ -585,6 +649,11 @@ def try_merge_pr(cfg: RepoConfig, issue_number: int, pr: dict[str, Any]) -> bool
                 "--add-label", cfg.label_done, "--remove-label", cfg.label_in_progress])
             sh(["gh", "issue", "close", str(issue_number), "--repo", cfg.repo])
             
+            # Flag autopilot for update if we merged our own repo
+            if is_autopilot_repo(cfg.repo):
+                print(f"[{cfg.repo}] Merged PR to autopilot repo, flagging for self-update", flush=True)
+                flag_autopilot_needs_update()
+            
             return True
         except Exception as e:
             print(f"[{cfg.repo}] Failed to merge PR #{pr_number}: {e}", flush=True)
@@ -723,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
@@ -747,6 +823,24 @@ def run_cycle(
                     ]
                 )
 
+    # Check if autopilot needs to update
+    if not dry_run and check_autopilot_needs_update():
+        print("[autopilot] Detected need for self-update", flush=True)
+        
+        # Check if any repo has auto_update enabled
+        any_auto_update = any(cfg.auto_update for cfg in all_configs)
+        
+        if any_auto_update:
+            print("[autopilot] Performing self-update...", flush=True)
+            if update_autopilot():
+                clear_autopilot_update_flag()
+                print("[autopilot] Self-update completed, service restarted", flush=True)
+            else:
+                print("[autopilot] Self-update failed, flag preserved for next cycle", flush=True)
+        else:
+            print("[autopilot] auto_update is disabled for all repos, skipping self-update", flush=True)
+            clear_autopilot_update_flag()
+
     return claimed_count
 
 

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,96 @@ 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")
 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 +390,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
     

package/templates/autopilot.json

@@ -18,5 +18,7 @@
   "autoResolveConflicts": true,
   "conflictResolutionMaxAttempts": 3,
   "autoFixChecks": true,
-  "autoFixChecksMaxAttempts": 3
+  "autoFixChecksMaxAttempts": 3,
+  "autoUpdate": true,
+  "enablePlanningStep": true
 }