@jojonax/codex-copilot 1.1.0 → 1.2.1

package/bin/cli.js

@@ -79,6 +79,11 @@ async function main() {
         console.log('    2. codex-copilot init    (auto-detect PRD and decompose tasks)');
         console.log('    3. codex-copilot run     (start automated dev loop)');
         console.log('');
+        console.log('  Update:');
+        console.log('    npm install -g @jojonax/codex-copilot@latest');
+        console.log('');
+        console.log('  \x1b[36mⓘ  This is a help page. Exit and run the commands above directly in your terminal.\x1b[0m');
+        console.log('');
         break;
     }
   } catch (err) {

package/package.json

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

package/src/commands/run.js

@@ -10,7 +10,7 @@ import { resolve } from 'path';
 import { log, progressBar } from '../utils/logger.js';
 import { git } from '../utils/git.js';
 import { github } from '../utils/github.js';
-import { ask, confirm, closePrompt } from '../utils/prompt.js';
+import { ask, closePrompt } from '../utils/prompt.js';
 import { createCheckpoint } from '../utils/checkpoint.js';
 import { provider } from '../utils/provider.js';
 
@@ -300,7 +300,29 @@ async function reviewLoop(projectDir, task, prInfo, { maxRounds: _maxRounds, pol
     });
 
     log.info(`Waiting for review feedback... (timeout: ${waitTimeout}s)`);
-    const gotReview = await waitForReview(projectDir, prInfo.number, pollInterval, waitTimeout);
+
+    // When resuming from waiting_review, the review may have already arrived
+    // before the restart. Check for existing reviews first before polling.
+    const isResuming = (state.current_task === task.id && state.phase === 'review'
+      && state.phase_step === 'waiting_review' && round === startRound);
+
+    let gotReview;
+    if (isResuming) {
+      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 =>
+        c.user?.type === 'Bot' || c.user?.login?.includes('bot')
+      );
+      if (hasReview || hasBotComment) {
+        log.info('Found existing review — processing immediately');
+        gotReview = true;
+      } else {
+        gotReview = await waitForReview(projectDir, prInfo.number, pollInterval, waitTimeout);
+      }
+    } else {
+      gotReview = await waitForReview(projectDir, prInfo.number, pollInterval, waitTimeout);
+    }
 
     if (!gotReview) {
       log.warn('Review wait timed out');
@@ -328,13 +350,47 @@ async function reviewLoop(projectDir, task, prInfo, { maxRounds: _maxRounds, pol
       return;
     }
 
-    // Collect review feedback
+    // Collect review feedback (raw — classification done by AI)
     const feedback = github.collectReviewFeedback(projectDir, prInfo.number);
     if (!feedback) {
-      log.info('No specific change requests found, proceeding');
+      log.info('No review feedback found — proceeding ✅');
       return;
     }
 
+    // Use AI to classify the review feedback
+    log.info('Classifying review feedback via AI...');
+    const classification = await provider.classifyReview(providerId, feedback, projectDir);
+
+    if (classification === 'pass') {
+      log.info('AI determined no actionable issues — proceeding ✅');
+      return;
+    }
+
+    if (classification === null) {
+      // AI classification failed — fall back to structural GitHub API signals
+      log.dim('AI classification unavailable, using structural fallback');
+      const inlineComments = github.getReviewComments(projectDir, prInfo.number);
+      const hasInlineComments = inlineComments && inlineComments.length > 0;
+
+      if (reviewState === 'CHANGES_REQUESTED') {
+        // Explicit change request — always treat as needing fixes
+        log.info('Review state: CHANGES_REQUESTED — entering fix phase');
+      } else if (reviewState === 'COMMENTED' && !hasInlineComments) {
+        // General comment with no code-level feedback — treat as passing
+        log.info('COMMENTED with no inline code comments — treating as passed ✅');
+        return;
+      } else if (!hasInlineComments) {
+        // Any other state (PENDING, null, etc.) with no inline comments — treat as passing
+        log.info('No inline code comments found — treating as passed ✅');
+        return;
+      } else {
+        // Has inline comments — treat as needing fixes
+        log.info(`Found ${inlineComments.length} inline code comment(s) — entering fix phase`);
+      }
+    }
+
+    // AI says FIX, or structural fallback indicates issues
+
     log.blank();
     log.warn(`Received review feedback (round ${round}/${maxRounds})`);
 
@@ -360,15 +416,18 @@ async function reviewLoop(projectDir, task, prInfo, { maxRounds: _maxRounds, pol
       review_round: round,
     });
 
-    // Push fix
+    // Push fix — only if there are actual changes
     if (!git.isClean(projectDir)) {
       git.commitAll(projectDir, `fix(task-${task.id}): address review comments (round ${round})`);
+      git.pushBranch(projectDir, task.branch);
+      log.info('Fix pushed, waiting for next review round...');
+      // Brief wait for review bot to react
+      await sleep(10000);
+    } else {
+      // No actual changes were made by the fix — the AI determined nothing needed fixing
+      log.info('No changes needed after review — proceeding to merge ✅');
+      return;
     }
-    git.pushBranch(projectDir, task.branch);
-    log.info('Fix pushed, waiting for next review round...');
-
-    // Brief wait for review bot to react
-    await sleep(10000);
   }
 }
 
@@ -432,11 +491,7 @@ ${feedback}
 async function mergePhase(projectDir, task, prInfo, baseBranch, checkpoint) {
   log.step('Phase 4/4: Merge PR');
 
-  const doMerge = await confirm(`Merge PR #${prInfo.number}?`);
-  if (!doMerge) {
-    log.warn('User skipped merge');
-    return;
-  }
+  log.info(`Auto-merging PR #${prInfo.number}...`);
 
   try {
     github.mergePR(projectDir, prInfo.number);

package/src/utils/github.js

@@ -260,7 +260,8 @@ function validatePRNumber(prNumber) {
 }
 
 /**
- * Collect all review feedback as structured text
+ * Collect all review feedback as structured text.
+ * Returns raw feedback — classification is done by AI provider.
  */
 export function collectReviewFeedback(cwd, prNumber) {
   const reviews = getReviews(cwd, prNumber);
@@ -269,19 +270,19 @@ export function collectReviewFeedback(cwd, prNumber) {
 
   let feedback = '';
 
-  // Review summary
+  // Review body text (skip APPROVED — already handled by state check)
   for (const r of reviews) {
-    if (r.body && r.body.trim()) {
+    if (r.body && r.body.trim() && r.state !== 'APPROVED') {
       feedback += `### Review (${r.state})\n${r.body}\n\n`;
     }
   }
 
-  // Inline comments
+  // Inline code comments (comments on specific diff lines)
   for (const c of comments) {
     feedback += `### ${c.path}:L${c.line || c.original_line}\n${c.body}\n\n`;
   }
 
-  // Bot comments (Gemini Code Assist, etc.)
+  // Bot comments
   for (const c of issueComments) {
     if (c.user?.type === 'Bot' || c.user?.login?.includes('bot')) {
       feedback += `### Bot Review (${c.user.login})\n${c.body}\n\n`;

package/src/utils/provider.js

@@ -10,7 +10,8 @@
  */
 
 import { execSync } from 'child_process';
-import { readFileSync } from 'fs';
+import { readFileSync, writeFileSync } from 'fs';
+import { resolve } from 'path';
 import { log } from './logger.js';
 import { ask } from './prompt.js';
 import { automator } from './automator.js';
@@ -326,7 +327,89 @@ function shellEscape(str) {
   return `'${str.replace(/'/g, "'\\''")}'`;
 }
 
+/**
+ * Lightweight AI query — capture output rather than inherit stdio.
+ * Only works for CLI providers. Returns null for IDE providers.
+ * 
+ * @param {string} providerId - Provider ID
+ * @param {string} question - The question/prompt text
+ * @param {string} cwd - Working directory
+ * @returns {Promise<string|null>} AI response text, or null if unsupported/failed
+ */
+export async function queryAI(providerId, question, cwd) {
+  const prov = PROVIDERS[providerId];
+  if (!prov || prov.type !== 'cli') return null;
+
+  // Verify CLI is available
+  if (prov.detect) {
+    try {
+      const cmd = process.platform === 'win32'
+        ? `where ${prov.detect}`
+        : `which ${prov.detect}`;
+      execSync(cmd, { stdio: 'pipe' });
+    } catch {
+      return null;
+    }
+  }
+
+  // Write question to temp file
+  const tmpPath = resolve(cwd, '.codex-copilot/_query_prompt.md');
+  writeFileSync(tmpPath, question);
+
+  const command = prov.buildCommand(tmpPath, cwd);
+
+  try {
+    const output = execSync(command, {
+      cwd,
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+      timeout: 60000, // 60s timeout for classification
+    });
+    return output.trim();
+  } catch (err) {
+    log.dim(`AI query failed: ${(err.message || '').substring(0, 80)}`);
+    return null;
+  }
+}
+
+/**
+ * Use AI to classify code review feedback.
+ * 
+ * Returns 'pass' if AI determines no actionable issues,
+ * 'fix' if there are issues to address, or null if classification failed.
+ * 
+ * @param {string} providerId - Provider ID
+ * @param {string} feedbackText - The collected review feedback
+ * @param {string} cwd - Working directory
+ * @returns {Promise<'pass'|'fix'|null>}
+ */
+export async function classifyReview(providerId, feedbackText, cwd) {
+  const classificationPrompt = `You are a code review classifier. Your ONLY job is to determine if the following code review feedback contains actionable issues that require code changes.
+
+## Code Review Feedback
+${feedbackText}
+
+## Instructions
+- If the review says the code looks good, has no issues, is purely informational, or explicitly states no changes are needed: output exactly PASS
+- If the review requests specific code changes, points out bugs, security issues, or improvements that need action: output exactly FIX
+
+IMPORTANT: Output ONLY a single word on the first line: either PASS or FIX. No other text.`;
+
+  const response = await queryAI(providerId, classificationPrompt, cwd);
+  if (!response) return null;
+
+  // Parse the first meaningful line
+  const firstLine = response.split('\n').map(l => l.trim()).find(l => l.length > 0);
+  if (!firstLine) return null;
+
+  const upper = firstLine.toUpperCase();
+  if (upper.includes('PASS')) return 'pass';
+  if (upper.includes('FIX')) return 'fix';
+
+  return null; // Ambiguous — caller decides fallback
+}
+
 export const provider = {
   getProvider, getAllProviderIds, detectAvailable,
-  buildProviderChoices, executePrompt,
+  buildProviderChoices, executePrompt, queryAI, classifyReview,
 };