@jojonax/codex-copilot 1.5.3 → 1.6.0

package/src/commands/reset.js

@@ -1,61 +1,61 @@
-/**
- * codex-copilot reset - Reset state
- */
-
-import { existsSync, unlinkSync } from 'fs';
-import { resolve } from 'path';
-import { log } from '../utils/logger.js';
-import { confirm, closePrompt } from '../utils/prompt.js';
-import { createCheckpoint } from '../utils/checkpoint.js';
-import { readJSON, writeJSON } from '../utils/json.js';
-
-export async function reset(projectDir) {
-  const statePath = resolve(projectDir, '.codex-copilot/state.json');
-  const tasksPath = resolve(projectDir, '.codex-copilot/tasks.json');
-
-  if (!existsSync(statePath)) {
-    log.warn('Project not initialized, nothing to reset');
-    closePrompt();
-    return;
-  }
-
-  log.title('🔄 Resetting Codex-Copilot state');
-  log.blank();
-
-  const checkpoint = createCheckpoint(projectDir);
-  const state = checkpoint.load();
-
-  // Show current checkpoint before reset
-  if (state.phase) {
-    log.info(`Current checkpoint: Task #${state.current_task} — ${state.phase} → ${state.phase_step}`);
-    log.blank();
-  }
-
-  const resetTasks = await confirm('Also reset all task statuses to pending?', false);
-
-  // Reset state using checkpoint manager
-  checkpoint.reset();
-  log.info('Execution state reset');
-
-  // Reset task statuses
-  if (resetTasks && existsSync(tasksPath)) {
-    const tasks = readJSON(tasksPath);
-    for (const task of tasks.tasks) {
-      task.status = 'pending';
-    }
-    writeJSON(tasksPath, tasks);
-    log.info('Task statuses reset');
-  }
-
-  // Clean up temp files
-  const promptPath = resolve(projectDir, '.codex-copilot/_current_prompt.md');
-  if (existsSync(promptPath)) unlinkSync(promptPath);
-
-  // Clean up temp state file if exists
-  const tempPath = resolve(projectDir, '.codex-copilot/state.json.tmp');
-  if (existsSync(tempPath)) unlinkSync(tempPath);
-
-  log.blank();
-  log.info('✅ Reset complete. You can now run: codex-copilot run');
-  closePrompt();
-}
+/**
+ * codex-copilot reset - Reset state
+ */
+
+import { existsSync, unlinkSync } from 'fs';
+import { resolve } from 'path';
+import { log } from '../utils/logger.js';
+import { confirm, closePrompt } from '../utils/prompt.js';
+import { createCheckpoint } from '../utils/checkpoint.js';
+import { readJSON, writeJSON } from '../utils/json.js';
+
+export async function reset(projectDir) {
+  const statePath = resolve(projectDir, '.codex-copilot/state.json');
+  const tasksPath = resolve(projectDir, '.codex-copilot/tasks.json');
+
+  if (!existsSync(statePath)) {
+    log.warn('Project not initialized, nothing to reset');
+    closePrompt();
+    return;
+  }
+
+  log.title('🔄 Resetting Codex-Copilot state');
+  log.blank();
+
+  const checkpoint = createCheckpoint(projectDir);
+  const state = checkpoint.load();
+
+  // Show current checkpoint before reset
+  if (state.phase) {
+    log.info(`Current checkpoint: Task #${state.current_task} — ${state.phase} → ${state.phase_step}`);
+    log.blank();
+  }
+
+  const resetTasks = await confirm('Also reset all task statuses to pending?', false);
+
+  // Reset state using checkpoint manager
+  checkpoint.reset();
+  log.info('Execution state reset');
+
+  // Reset task statuses
+  if (resetTasks && existsSync(tasksPath)) {
+    const tasks = readJSON(tasksPath);
+    for (const task of tasks.tasks) {
+      task.status = 'pending';
+    }
+    writeJSON(tasksPath, tasks);
+    log.info('Task statuses reset');
+  }
+
+  // Clean up temp files
+  const promptPath = resolve(projectDir, '.codex-copilot/_current_prompt.md');
+  if (existsSync(promptPath)) unlinkSync(promptPath);
+
+  // Clean up temp state file if exists
+  const tempPath = resolve(projectDir, '.codex-copilot/state.json.tmp');
+  if (existsSync(tempPath)) unlinkSync(tempPath);
+
+  log.blank();
+  log.info('✅ Reset complete. You can now run: codex-copilot run');
+  closePrompt();
+}

package/src/commands/retry.js

@@ -1,153 +1,190 @@
-/**
- * codex-copilot retry - Reset blocked tasks for re-execution
- *
- * Recovery strategy per block scenario:
- *   Dev-blocked:    Save partial context, reset to pending
- *   Review-blocked: Close PR, delete branch, save review feedback, reset to pending
- *   Merge-blocked:  Reset only the merge step
- */
-
-import { readFileSync, writeFileSync, mkdirSync, existsSync } from 'fs';
-import { resolve } from 'path';
-import { log, progressBar } from '../utils/logger.js';
-import { git } from '../utils/git.js';
-import { github } from '../utils/github.js';
-import { createCheckpoint } from '../utils/checkpoint.js';
-import { readJSON, writeJSON } from '../utils/json.js';
-
-
-
-export async function retry(projectDir) {
-  const tasksPath = resolve(projectDir, '.codex-copilot/tasks.json');
-  const checkpoint = createCheckpoint(projectDir);
-  const retryDir = resolve(projectDir, '.codex-copilot/retry_context');
-
-  let tasks;
-  try {
-    tasks = readJSON(tasksPath);
-  } catch (err) {
-    log.error(`Failed to read tasks: ${err.message}`);
-    process.exit(1);
-  }
-
-  const blocked = tasks.tasks.filter(t => t.status === 'blocked');
-
-  if (blocked.length === 0) {
-    log.info('No blocked tasks found \u2014 nothing to retry.');
-    return;
-  }
-
-  log.title('\ud83d\udd04 Blocked Task Recovery');
-  log.blank();
-  log.info(`Found ${blocked.length} blocked task(s):`);
-  log.blank();
-
-  // Ensure retry context directory exists
-  mkdirSync(retryDir, { recursive: true });
-
-  for (const task of blocked) {
-    const reason = task.block_reason || 'unknown';
-    log.info(`  #${task.id}: ${task.title}`);
-    log.dim(`       Reason: ${reason}`);
-
-    if (reason === 'review_failed') {
-      await recoverReviewBlocked(projectDir, task, checkpoint, retryDir);
-    } else if (reason === 'merge_failed') {
-      recoverMergeBlocked(task, checkpoint);
-    } else {
-      // dev_failed or unknown
-      recoverDevBlocked(projectDir, task, checkpoint, retryDir);
-    }
-
-    task.status = 'pending';
-    task.retry_count = (task.retry_count || 0) + 1;
-    log.info(`  \u2705 Task #${task.id} reset to pending (retry #${task.retry_count})`);
-    log.blank();
-  }
-
-  writeJSON(tasksPath, tasks);
-
-  log.blank();
-  const done = tasks.tasks.filter(t => t.status === 'completed').length;
-  const pending = tasks.tasks.filter(t => t.status === 'pending').length;
-  progressBar(done, tasks.total, `${done}/${tasks.total} done, ${pending} pending`);
-  log.blank();
-  log.info('Run `codex-copilot run` to resume with enhanced prompts.');
-}
-
-/**
- * Dev-blocked: save any partial work context, clear checkpoints
- */
-function recoverDevBlocked(projectDir, task, checkpoint, retryDir) {
-  // Try to capture any partial diff from the branch
-  const diffResult = git.execSafe(`git diff HEAD`, projectDir);
-  if (diffResult.ok && diffResult.output.trim()) {
-    const contextPath = resolve(retryDir, `${task.id}.md`);
-    writeFileSync(contextPath, [
-      `# Retry Context for Task #${task.id}`,
-      '',
-      '## Previous Attempt',
-      'The AI attempted this task but failed to produce working code.',
-      'Try a simpler, more incremental approach.',
-      '',
-      '## Partial Changes (from failed attempt)',
-      '```diff',
-      diffResult.output.substring(0, 5000), // Cap at 5KB
-      '```',
-    ].join('\n'));
-    log.dim('       Saved partial diff as retry context');
-  }
-
-  // Clear all checkpoints for this task
-  checkpoint.clearTask(task.id);
-}
-
-/**
- * Review-blocked: close PR, delete branch, save review feedback
- */
-async function recoverReviewBlocked(projectDir, task, checkpoint, retryDir) {
-  const state = checkpoint.load();
-  const prNumber = state.current_pr;
-
-  // Save review feedback as retry context
-  if (prNumber) {
-    const feedback = github.collectReviewFeedback(projectDir, prNumber);
-    if (feedback) {
-      const contextPath = resolve(retryDir, `${task.id}.md`);
-      writeFileSync(contextPath, [
-        `# Retry Context for Task #${task.id}`,
-        '',
-        '## Known Issues from Previous Review',
-        'The previous implementation was rejected. Avoid making the same mistakes.',
-        '',
-        feedback,
-      ].join('\n'));
-      log.dim('       Saved review feedback as retry context');
-    }
-
-    // Close the stale PR
-    if (github.closePR(projectDir, prNumber)) {
-      log.dim(`       Closed stale PR #${prNumber}`);
-    }
-  }
-
-  // Delete the remote feature branch
-  if (task.branch) {
-    if (github.deleteBranch(projectDir, task.branch)) {
-      log.dim(`       Deleted remote branch ${task.branch}`);
-    }
-    // Delete local branch too
-    git.execSafe(`git branch -D ${task.branch}`, projectDir);
-  }
-
-  // Clear all checkpoints for this task
-  checkpoint.clearTask(task.id);
-}
-
-/**
- * Merge-blocked: only reset the merge step
- */
-function recoverMergeBlocked(task, checkpoint) {
-  checkpoint.clearStep(task.id, 'merge', 'merged');
-  log.dim('       Reset merge step \u2014 will retry merge on next run');
-}
+/**
+ * codex-copilot retry - Reset blocked tasks for re-execution
+ *
+ * Recovery strategy per block scenario:
+ *   Dev-blocked:    Save partial context, reset to pending
+ *   Review-blocked: Close PR, delete branch, save review feedback, reset to pending
+ *   Merge-blocked:  Reset only the merge step
+ */
+
+import { readFileSync, writeFileSync, mkdirSync, existsSync } from 'fs';
+import { resolve } from 'path';
+import { log, progressBar } from '../utils/logger.js';
+import { git } from '../utils/git.js';
+import { github } from '../utils/github.js';
+import { createCheckpoint } from '../utils/checkpoint.js';
+import { readJSON, writeJSON } from '../utils/json.js';
+import { preFlightCheck } from '../utils/self-heal.js';
+
+
+
+export async function retry(projectDir) {
+  const tasksPath = resolve(projectDir, '.codex-copilot/tasks.json');
+  const checkpoint = createCheckpoint(projectDir);
+  const retryDir = resolve(projectDir, '.codex-copilot/retry_context');
+
+  let tasks;
+  try {
+    tasks = readJSON(tasksPath);
+  } catch (err) {
+    log.error(`Failed to read tasks: ${err.message}`);
+    process.exit(1);
+  }
+
+  const blocked = tasks.tasks.filter(t => t.status === 'blocked');
+
+  if (blocked.length === 0) {
+    log.info('No blocked tasks found \u2014 nothing to retry.');
+    return;
+  }
+
+  log.title('\ud83d\udd04 Blocked Task Recovery');
+  log.blank();
+  log.info(`Found ${blocked.length} blocked task(s):`);
+  log.blank();
+
+  // Ensure retry context directory exists
+  mkdirSync(retryDir, { recursive: true });
+
+  // Pre-flight: resolve any git/environment issues before retrying
+  log.blank();
+  preFlightCheck(projectDir, 'main', {});
+  log.blank();
+
+  for (const task of blocked) {
+    const reason = task.block_reason || 'unknown';
+    log.info(`  #${task.id}: ${task.title}`);
+    log.dim(`       Reason: ${reason}`);
+
+    if (reason === 'review_failed') {
+      await recoverReviewBlocked(projectDir, task, checkpoint, retryDir);
+    } else if (reason === 'merge_failed') {
+      recoverMergeBlocked(task, checkpoint);
+    } else if (reason === 'git_checkout_failed') {
+      recoverGitBlocked(projectDir, task, checkpoint, retryDir);
+    } else if (reason === 'ai_timeout') {
+      // AI provider timed out — clear checkpoint so it retries from prompt step
+      checkpoint.clearTask(task.id);
+      log.dim('       Cleared checkpoint — will retry AI execution');
+    } else {
+      // dev_failed, rate_limited, or unknown
+      recoverDevBlocked(projectDir, task, checkpoint, retryDir);
+    }
+
+    task.status = 'pending';
+    task.retry_count = (task.retry_count || 0) + 1;
+    log.info(`  \u2705 Task #${task.id} reset to pending (retry #${task.retry_count})`);
+    log.blank();
+  }
+
+  writeJSON(tasksPath, tasks);
+
+  log.blank();
+  const done = tasks.tasks.filter(t => t.status === 'completed').length;
+  const pending = tasks.tasks.filter(t => t.status === 'pending').length;
+  progressBar(done, tasks.total, `${done}/${tasks.total} done, ${pending} pending`);
+  log.blank();
+  log.info('Run `codex-copilot run` to resume with enhanced prompts.');
+}
+
+/**
+ * Dev-blocked: save any partial work context, clear checkpoints
+ */
+function recoverDevBlocked(projectDir, task, checkpoint, retryDir) {
+  // Try to capture any partial diff from the branch
+  const diffResult = git.execSafe(`git diff HEAD`, projectDir);
+  if (diffResult.ok && diffResult.output.trim()) {
+    const contextPath = resolve(retryDir, `${task.id}.md`);
+    writeFileSync(contextPath, [
+      `# Retry Context for Task #${task.id}`,
+      '',
+      '## Previous Attempt',
+      'The AI attempted this task but failed to produce working code.',
+      'Try a simpler, more incremental approach.',
+      '',
+      '## Partial Changes (from failed attempt)',
+      '```diff',
+      diffResult.output.substring(0, 5000), // Cap at 5KB
+      '```',
+    ].join('\n'));
+    log.dim('       Saved partial diff as retry context');
+  }
+
+  // Clear all checkpoints for this task
+  checkpoint.clearTask(task.id);
+}
+
+/**
+ * Review-blocked: close PR, delete branch, save review feedback
+ */
+async function recoverReviewBlocked(projectDir, task, checkpoint, retryDir) {
+  const state = checkpoint.load();
+  const prNumber = state.current_pr;
+
+  // Save review feedback as retry context
+  if (prNumber) {
+    const feedback = github.collectReviewFeedback(projectDir, prNumber);
+    if (feedback) {
+      const contextPath = resolve(retryDir, `${task.id}.md`);
+      writeFileSync(contextPath, [
+        `# Retry Context for Task #${task.id}`,
+        '',
+        '## Known Issues from Previous Review',
+        'The previous implementation was rejected. Avoid making the same mistakes.',
+        '',
+        feedback,
+      ].join('\n'));
+      log.dim('       Saved review feedback as retry context');
+    }
+
+    // Close the stale PR
+    if (github.closePR(projectDir, prNumber)) {
+      log.dim(`       Closed stale PR #${prNumber}`);
+    }
+  }
+
+  // Delete the remote feature branch
+  if (task.branch) {
+    if (github.deleteBranch(projectDir, task.branch)) {
+      log.dim(`       Deleted remote branch ${task.branch}`);
+    }
+    // Delete local branch too
+    git.execSafe(`git branch -D ${task.branch}`, projectDir);
+  }
+
+  // Clear all checkpoints for this task
+  checkpoint.clearTask(task.id);
+}
+
+/**
+ * Merge-blocked: only reset the merge step
+ */
+function recoverMergeBlocked(task, checkpoint) {
+  checkpoint.clearStep(task.id, 'merge', 'merged');
+  log.dim('       Reset merge step \u2014 will retry merge on next run');
+}
+
+/**
+ * Git-checkout-blocked: resolve index issues and clear develop checkpoint.
+ * The pre-flight check already resolved most git issues;
+ * here we just reset the checkpoint so the task retries from branch creation.
+ */
+function recoverGitBlocked(projectDir, task, checkpoint, retryDir) {
+  // Resolve any lingering index issues
+  git.resolveIndex(projectDir);
+  git.clearStaleLocks(projectDir);
+
+  // Save context for retry prompt
+  const contextPath = resolve(retryDir, `${task.id}.md`);
+  writeFileSync(contextPath, [
+    `# Retry Context for Task #${task.id}`,
+    '',
+    '## Previous Attempt',
+    'The task failed due to a git checkout error (corrupted index, stuck merge/rebase, or lock file).',
+    'The git state has been automatically repaired. Try again with the same approach.',
+  ].join('\n'));
+  log.dim('       Resolved git state and saved retry context');
+
+  // Clear all checkpoints — restart from scratch
+  checkpoint.clearTask(task.id);
+}