@jojonax/codex-copilot 1.5.2 → 1.5.3

package/package.json

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

package/src/commands/run.js

@@ -206,6 +206,24 @@ export async function run(projectDir) {
       }
     }
 
+    // ===== Ensure task has all required fields =====
+    // Auto-generate branch name if missing (common after corruption recovery)
+    if (!task.branch) {
+      // Try to recover from checkpoint state
+      if (state.current_task === task.id && state.branch) {
+        task.branch = state.branch;
+        log.dim(`  ↳ Recovered branch name from checkpoint: ${task.branch}`);
+      } else {
+        const slug = (task.title || `task-${task.id}`)
+          .toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '').substring(0, 40);
+        task.branch = `feature/${String(task.id).padStart(3, '0')}-${slug}`;
+        log.dim(`  ↳ Generated branch name: ${task.branch}`);
+      }
+    }
+    if (!task.depends_on) task.depends_on = [];
+    if (!task.acceptance) task.acceptance = [];
+    if (!task.description) task.description = task.title;
+
     // Mark task as in_progress
     task.status = 'in_progress';
     const isRetry = (task.retry_count || 0) > 0;

package/src/utils/json.js

@@ -43,8 +43,15 @@ export function readJSON(filePath) {
  * @returns {any|null} Parsed data or null if all strategies fail
  */
 function tryRepair(raw) {
+  // Strategy 0: Strip git conflict markers (<<<<<<, ======, >>>>>>)
+  // Keep the "ours" side (before =======) and discard "theirs" (after =======)
+  let cleaned = raw.replace(
+    /^<{4,}[^\n]*\n((?:(?!^={4,})[\s\S])*?)^={4,}[^\n]*\n(?:(?:(?!^>{4,})[\s\S])*?)^>{4,}[^\n]*/gm,
+    '$1'
+  );
+
   // Strategy 1: Basic cleanup (trailing commas, control chars)
-  let cleaned = raw
+  cleaned = cleaned
     .replace(/,\s*([}\]])/g, '$1')
     .replace(/[\x00-\x08\x0E-\x1F]/g, '')
     .trim();