@jojonax/codex-copilot 1.4.2 → 1.4.3

package/package.json

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

package/src/commands/run.js

@@ -156,6 +156,8 @@ export async function run(projectDir) {
 
     // Mark task as in_progress
     task.status = 'in_progress';
+    const isRetry = (task.retry_count || 0) > 0;
+    const retryStartedAt = isRetry ? new Date().toISOString() : null;
     writeJSON(tasksPath, tasks);
 
     // ===== Phase 1: Develop =====
@@ -185,10 +187,19 @@ export async function run(projectDir) {
 
     // ===== Phase 3: Review loop =====
     if (!checkpoint.isStepDone(task.id, 'merge', 'merged')) {
+      // On retry: request fresh re-review since old reviews may be stale
+      if (isRetry && prInfo?.number) {
+        log.info('🔄 Retry: requesting fresh re-review on existing PR...');
+        try {
+          github.requestReReview(projectDir, prInfo.number);
+        } catch { /* ignore — review bots may not be configured */ }
+      }
+
       await reviewLoop(projectDir, task, prInfo, {
         maxRounds: maxReviewRounds,
         pollInterval,
         waitTimeout,
+        retryStartedAt, // Only count reviews after this timestamp
       }, checkpoint, providerId, isPrivate);
     } else {
       log.dim('⏩ Skipping review phase (already completed)');
@@ -198,7 +209,18 @@ export async function run(projectDir) {
     if (!checkpoint.isStepDone(task.id, 'merge', 'merged')) {
       await mergePhase(projectDir, task, prInfo, baseBranch, checkpoint);
     } else {
-      log.dim('⏩ Skipping merge phase (already merged)');
+      // Checkpoint says merged — verify against GitHub
+      if (prInfo?.number) {
+        const prState = github.getPRState(projectDir, prInfo.number);
+        if (prState !== 'merged') {
+          log.warn(`⚠ Checkpoint says merged but PR #${prInfo.number} is ${prState} — re-entering merge`);
+          await mergePhase(projectDir, task, prInfo, baseBranch, checkpoint);
+        } else {
+          log.dim('⏩ Skipping merge phase (PR confirmed merged on GitHub)');
+        }
+      } else {
+        log.dim('⏩ Skipping merge phase (already merged)');
+      }
     }
 
     // Check if task was blocked during review/merge
@@ -357,7 +379,7 @@ async function prPhase(projectDir, task, baseBranch, checkpoint, isPrivate) {
 // ──────────────────────────────────────────────
 // Phase 3: Review loop
 // ──────────────────────────────────────────────
-async function reviewLoop(projectDir, task, prInfo, { maxRounds: _maxRounds, pollInterval, waitTimeout }, checkpoint, providerId, isPrivate) {
+async function reviewLoop(projectDir, task, prInfo, { maxRounds: _maxRounds, pollInterval, waitTimeout, retryStartedAt }, checkpoint, providerId, isPrivate) {
   const HARD_MAX_ROUNDS = 5;
   const MAX_POLL_RETRIES = 3;
   let maxRounds = Math.min(_maxRounds, HARD_MAX_ROUNDS);
@@ -388,8 +410,19 @@ async function reviewLoop(projectDir, task, prInfo, { maxRounds: _maxRounds, pol
     // and fast bot responses after fix pushes.
     const existingReviews = github.getReviews(projectDir, prInfo.number);
     const existingComments = github.getIssueComments(projectDir, prInfo.number);
-    const hasReview = existingReviews.some(r => r.state !== 'PENDING');
-    const hasBotComment = existingComments.some(c =>
+
+    // On retry: only count reviews posted AFTER the retry started
+    const isReviewFresh = (item) => {
+      if (!retryStartedAt) return true; // Not a retry — all reviews are valid
+      const itemDate = item.submitted_at || item.created_at || item.updated_at;
+      return itemDate && new Date(itemDate) > new Date(retryStartedAt);
+    };
+
+    const freshReviews = existingReviews.filter(isReviewFresh);
+    const freshComments = existingComments.filter(isReviewFresh);
+
+    const hasReview = freshReviews.some(r => r.state !== 'PENDING');
+    const hasBotComment = freshComments.some(c =>
       c.user?.type === 'Bot' || c.user?.login?.includes('bot')
     );
 

package/src/utils/github.js

@@ -383,7 +383,7 @@ export const github = {
   ensureRemoteBranch, hasCommitsBetween,
   getReviews, getReviewComments, getIssueComments,
   getLatestReviewState, mergePR, collectReviewFeedback,
-  isPrivateRepo, requestReReview, closePR, deleteBranch,
+  isPrivateRepo, requestReReview, closePR, deleteBranch, getPRState,
 };
 
 /**
@@ -412,3 +412,18 @@ export function deleteBranch(cwd, branch) {
     return false;
   }
 }
+
+/**
+ * Get the state of a PR: 'open', 'closed', or 'merged'
+ */
+export function getPRState(cwd, prNumber) {
+  try {
+    const num = validatePRNumber(prNumber);
+    const output = gh(`pr view ${num} --json state,mergedAt`, cwd);
+    const data = JSON.parse(output);
+    if (data.mergedAt) return 'merged';
+    return (data.state || 'OPEN').toLowerCase();
+  } catch {
+    return 'unknown';
+  }
+}