autopilot-code 0.0.17 → 0.0.19

package/dist/cli.js

@@ -158,6 +158,8 @@ function generateSystemdUnit(logPath, intervalSeconds, useSystem) {
     ];
     const user = process.env.USER || "root";
     const home = process.env.HOME || "/root";
+    // Include current PATH so systemd can find nvm-installed binaries like opencode
+    const currentPath = process.env.PATH || "/usr/bin:/bin";
     return `[Unit]
 Description=Autopilot automated issue runner
 After=network.target
@@ -173,6 +175,8 @@ StandardError=journal
 SyslogIdentifier=autopilot
 ${useSystem ? `User=${user}` : ""}
 Environment="NODE_ENV=production"
+Environment="PATH=${currentPath}"
+Environment="HOME=${home}"
 
 [Install]
 WantedBy=${useSystem ? "multi-user.target" : "default.target"}

package/package.json

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

package/scripts/run_autopilot.py

@@ -24,6 +24,7 @@ import time
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any
+import shutil
 
 STATE_DIR = ".autopilot"
 STATE_FILE = "state.json"
@@ -341,17 +342,51 @@ def check_pr_for_issue(cfg: RepoConfig, issue_number: int) -> dict[str, Any] | N
         return None
 
 
+def find_opencode() -> str | None:
+    """Find opencode binary in PATH or common locations."""
+    # 1. Check PATH first
+    opencode = shutil.which("opencode")
+    if opencode:
+        return opencode
+    
+    # 2. Check common nvm locations
+    home = Path.home()
+    nvm_dir = home / ".nvm" / "versions" / "node"
+    if nvm_dir.exists():
+        for node_version in sorted(nvm_dir.iterdir(), reverse=True):
+            candidate = node_version / "bin" / "opencode"
+            if candidate.exists() and candidate.is_file():
+                return str(candidate)
+    
+    # 3. Other common locations
+    for path in [
+        home / ".local" / "bin" / "opencode",
+        Path("/usr/local/bin/opencode"),
+        home / ".npm-global" / "bin" / "opencode",
+    ]:
+        if path.exists() and path.is_file():
+            return str(path)
+    
+    return None
+
+
 def resolve_merge_conflicts(cfg: RepoConfig, issue_number: int, pr: dict[str, Any], attempt: int) -> bool:
     """Attempt to resolve merge conflicts using the coding agent. Returns True if resolved."""
     if cfg.agent != "opencode":
         print(f"[{cfg.repo}] Cannot resolve conflicts: agent '{cfg.agent}' not supported (only 'opencode')", flush=True)
         return False
     
+    opencode_bin = find_opencode()
+    if not opencode_bin:
+        print(f"[{cfg.repo}] Cannot resolve conflicts: opencode not found", flush=True)
+        return False
+    
     pr_number = pr["number"]
     branch = pr.get("headRefName", f"autopilot/issue-{issue_number}")
     worktree = Path(f"/tmp/autopilot-issue-{issue_number}")
     
     print(f"[{cfg.repo}] Attempting to resolve merge conflicts for PR #{pr_number} (attempt {attempt}/{cfg.conflict_resolution_max_attempts})", flush=True)
+    print(f"[{cfg.repo}] Using opencode: {opencode_bin}", flush=True)
     
     # Ensure worktree exists and is up to date
     if not worktree.exists():
@@ -414,7 +449,7 @@ Work rules:
         
         # Run opencode in the worktree
         agent_result = subprocess.run(
-            ["opencode", "run", conflict_prompt],
+            [opencode_bin, "run", conflict_prompt],
             cwd=str(worktree),
             capture_output=True,
             text=True,

package/scripts/run_opencode_issue.sh

@@ -21,6 +21,7 @@ if command -v jq >/dev/null 2>&1; then
   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)
 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))')
@@ -30,8 +31,49 @@ else
   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)
 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"
 
@@ -73,7 +115,7 @@ Work rules:
 - If the issue is a simple file-addition, just do it directly (no extra refactors)."
 # 4. Run opencode inside worktree
 cd "$WORKTREE"
-opencode run "$PROMPT"
+"$OPENCODE_BIN" run "$PROMPT"
 
 # 5. Commit any changes OpenCode made
 if [[ -n "$(git status --porcelain)" ]]; then
@@ -190,7 +232,7 @@ if [[ "$AUTO_RESOLVE_CONFLICTS" == "true" ]] && [[ -n "$PR_URL" ]]; then
 
 After resolving all conflicts, report the files that were resolved."
           
-          if opencode run "$CONFLICT_PROMPT"; then
+          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."
@@ -316,7 +358,7 @@ if [[ "$AUTO_MERGE" == "true" ]] && [[ -n "$PR_URL" ]]; then
           
           # Run opencode to fix the issue
           cd "$WORKTREE"
-          if opencode run "$REPAIR_PROMPT"; then
+          if "$OPENCODE_BIN" run "$REPAIR_PROMPT"; then
             # Commit any changes
             if [[ -n "$(git status --porcelain)" ]]; then
               git add -A