@jojonax/codex-copilot 1.4.0 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jojonax/codex-copilot",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "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.
+  // Branches and checkpoint steps are PRESERVED — the task resumes from where
+  // it left off, keeping all previously developed code.
   const blockedTasks = tasks.tasks.filter(t => t.status === 'blocked');
   if (blockedTasks.length > 0) {
     log.blank();

package/src/utils/git.js

@@ -52,24 +52,41 @@ export function getRepoInfo(cwd) {
   return { owner: match[1], repo: match[2] };
 }
 
-/**
- * Switch to target branch (create if not exists)
- */
 export function checkoutBranch(cwd, branch, baseBranch = 'main') {
   validateBranch(branch);
   validateBranch(baseBranch);
   const current = currentBranch(cwd);
   if (current === branch) return;
 
-  // Switch to base and pull latest
-  execSafe(`git checkout ${baseBranch}`, cwd);
-  execSafe(`git pull origin ${baseBranch}`, cwd);
+  // Stash any uncommitted changes to allow safe branch switching
+  const hasChanges = !isClean(cwd);
+  if (hasChanges) {
+    execSafe('git stash --include-untracked', cwd);
+  }
 
-  // Try to switch, create if not exists
-  const result = execSafe(`git checkout ${branch}`, cwd);
-  if (!result.ok) {
+  // Check if the branch already exists locally
+  const branchExists = execSafe(`git rev-parse --verify ${branch}`, cwd).ok;
+
+  if (branchExists) {
+    // Branch exists — just switch to it (preserving all previous work)
+    exec(`git checkout ${branch}`, cwd);
+
+    // Try to rebase onto latest base to pick up any new changes
+    execSafe(`git fetch origin ${baseBranch}`, cwd);
+    execSafe(`git rebase origin/${baseBranch}`, cwd);
+    // If rebase fails (conflicts), abort and continue with existing state
+    execSafe('git rebase --abort', cwd);
+  } else {
+    // Branch doesn't exist — create from latest base
+    execSafe(`git checkout ${baseBranch}`, cwd);
+    execSafe(`git pull origin ${baseBranch}`, cwd);
     exec(`git checkout -b ${branch}`, cwd);
   }
+
+  // Restore stashed changes if we stashed earlier
+  if (hasChanges) {
+    execSafe('git stash pop', cwd);
+  }
 }
 
 /**