@jojonax/codex-copilot 1.4.0 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jojonax/codex-copilot",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "PRD-driven automated development orchestrator for CodeX / Cursor",
   "bin": {
     "codex-copilot": "./bin/cli.js"

package/src/commands/run.js

@@ -95,7 +95,8 @@ export async function run(projectDir) {
 
   // ===== Auto-retry blocked tasks =====
   // On each run, reset blocked tasks to pending so they're retried in order.
-  // Checkpoint is NOT cleared — it stays at the last position for non-blocked tasks.
+  // Per-task checkpoint steps are cleared so the task starts fresh.
+  // The main checkpoint position (current_task) is preserved.
   const blockedTasks = tasks.tasks.filter(t => t.status === 'blocked');
   if (blockedTasks.length > 0) {
     log.blank();
@@ -104,8 +105,30 @@ export async function run(projectDir) {
       bt.status = 'pending';
       bt.retry_count = (bt.retry_count || 0) + 1;
       bt._retrying = true; // Flag: don't skip even if below checkpoint
-      log.dim(`   ↳ Task #${bt.id}: ${bt.title.substring(0, 50)} (attempt ${bt.retry_count + 1})`);
+
+      // Clear per-task checkpoint steps — the task needs a fresh start
+      // (The main checkpoint.current_task is NOT affected)
+      checkpoint.clearTask(bt.id);
+
+      // Clean up old branch to avoid "branch already exists" errors
+      try {
+        git.resetBranch(projectDir, bt.branch, baseBranch);
+        log.dim(`   ↳ Task #${bt.id}: ${bt.title.substring(0, 50)} (attempt ${bt.retry_count + 1}, branch reset)`);
+      } catch {
+        // If branch cleanup fails, still let the task try
+        log.dim(`   ↳ Task #${bt.id}: ${bt.title.substring(0, 50)} (attempt ${bt.retry_count + 1})`);
+      }
+
+      // Close any existing PR for this task (stale from previous attempt)
+      if (bt.pr_number) {
+        try {
+          github.closePR(projectDir, bt.pr_number);
+          delete bt.pr_number;
+        } catch { /* ignore */ }
+      }
     }
+    // Switch back to base branch after all resets
+    git.checkoutMain(projectDir, baseBranch);
     writeJSON(tasksPath, tasks);
   }
 

package/src/utils/git.js

@@ -65,13 +65,37 @@ export function checkoutBranch(cwd, branch, baseBranch = 'main') {
   execSafe(`git checkout ${baseBranch}`, cwd);
   execSafe(`git pull origin ${baseBranch}`, cwd);
 
-  // Try to switch, create if not exists
+  // Try to switch to existing branch
   const result = execSafe(`git checkout ${branch}`, cwd);
   if (!result.ok) {
+    // Branch doesn't exist or checkout failed — clean up and create fresh
+    execSafe(`git branch -D ${branch}`, cwd); // Delete if exists but broken
     exec(`git checkout -b ${branch}`, cwd);
   }
 }
 
+/**
+ * Delete a branch (local + remote) and recreate fresh from base.
+ * Used when retrying blocked tasks to ensure a clean slate.
+ */
+export function resetBranch(cwd, branch, baseBranch = 'main') {
+  validateBranch(branch);
+  validateBranch(baseBranch);
+
+  // Switch to base first (can't delete current branch)
+  execSafe(`git checkout ${baseBranch}`, cwd);
+  execSafe(`git pull origin ${baseBranch}`, cwd);
+
+  // Delete local branch (force, ignore errors if doesn't exist)
+  execSafe(`git branch -D ${branch}`, cwd);
+
+  // Delete remote branch (ignore errors if doesn't exist)
+  execSafe(`git push origin --delete ${branch}`, cwd);
+
+  // Create fresh branch from base
+  exec(`git checkout -b ${branch}`, cwd);
+}
+
 /**
  * Commit all changes
  */
@@ -111,6 +135,6 @@ export function checkoutMain(cwd, baseBranch = 'main') {
 }
 
 export const git = {
-  isClean, currentBranch, getRepoInfo, checkoutBranch,
+  isClean, currentBranch, getRepoInfo, checkoutBranch, resetBranch,
   commitAll, pushBranch, checkoutMain, exec, execSafe,
 };