@jojonax/codex-copilot 1.0.1 → 1.0.3

package/src/commands/run.js

@@ -1,7 +1,7 @@
 /**
- * codex-copilot run - 主编排循环
+ * codex-copilot run - Main orchestration loop
  * 
- * 逐个任务执行: 开发 → PR → Review → 修复 → 合并 → 下一个
+ * Executes tasks one by one: Develop → PR → Review → Fix → Merge → Next
  */
 
 import { readFileSync, writeFileSync, existsSync } from 'fs';
@@ -25,63 +25,80 @@ export async function run(projectDir) {
   const statePath = resolve(projectDir, '.codex-copilot/state.json');
   const configPath = resolve(projectDir, '.codex-copilot/config.json');
 
-  const tasks = readJSON(tasksPath);
-  let state = readJSON(statePath);
+  let tasks;
+  let state;
+  try {
+    tasks = readJSON(tasksPath);
+    state = readJSON(statePath);
+  } catch (err) {
+    log.error(`Failed to read task/state files: ${err.message}`);
+    log.warn('Files may be corrupted. Run: codex-copilot reset');
+    closePrompt();
+    process.exit(1);
+  }
   const config = existsSync(configPath) ? readJSON(configPath) : {};
 
+  // Validate tasks.json structure
+  if (!tasks.tasks || !Array.isArray(tasks.tasks) || !tasks.total) {
+    log.error('Invalid tasks.json format: missing tasks array or total field');
+    log.warn('Please re-run codex-copilot init and let CodeX regenerate tasks.json');
+    closePrompt();
+    process.exit(1);
+  }
+
   const baseBranch = config.base_branch || 'main';
   const maxReviewRounds = config.max_review_rounds || 2;
   const pollInterval = config.review_poll_interval || 60;
   const waitTimeout = config.review_wait_timeout || 600;
 
-  log.title('🚀 开始自动化开发循环');
+  log.title('🚀 Starting automated development loop');
   log.blank();
-  log.info(`项目: ${tasks.project}`);
-  log.info(`总任务数: ${tasks.total}`);
-  log.info(`已完成: ${state.current_task}`);
-  log.info(`基础分支: ${baseBranch}`);
+  log.info(`Project: ${tasks.project}`);
+  log.info(`Total tasks: ${tasks.total}`);
+  log.info(`Completed: ${state.current_task}`);
+  log.info(`Base branch: ${baseBranch}`);
   log.blank();
-  progressBar(state.current_task, tasks.total, `${state.current_task}/${tasks.total} 任务完成`);
+  progressBar(state.current_task, tasks.total, `${state.current_task}/${tasks.total} tasks done`);
   log.blank();
 
-  // 逐个任务执行
+  // Execute tasks one by one
   for (const task of tasks.tasks) {
-    if (task.id <= state.current_task) continue; // 跳过已完成的
+    if (task.id <= state.current_task) continue; // Skip completed
     if (task.status === 'completed' || task.status === 'skipped') continue;
 
     log.blank();
-    log.title(`━━━ 任务 ${task.id}/${tasks.total}: ${task.title} ━━━`);
+    log.title(`━━━ Task ${task.id}/${tasks.total}: ${task.title} ━━━`);
     log.blank();
 
-    // 检查依赖是否已完成
+    // Check dependencies
     if (task.depends_on && task.depends_on.length > 0) {
       const unfinished = task.depends_on.filter(dep => {
         const depTask = tasks.tasks.find(t => t.id === dep);
         return depTask && depTask.status !== 'completed';
       });
       if (unfinished.length > 0) {
-        log.warn(`依赖任务未完成: ${unfinished.join(', ')}，跳过`);
+        log.warn(`Unfinished dependencies: ${unfinished.join(', ')} — skipping`);
         continue;
       }
     }
 
-    // ===== 阶段 1: 开发 =====
+    // ===== Phase 1: Develop =====
     await developPhase(projectDir, task, baseBranch);
 
-    // ===== 阶段 2: 创建 PR =====
+    // ===== Phase 2: Create PR =====
     const prInfo = await prPhase(projectDir, task, baseBranch);
 
-    // ===== 阶段 3: Review 循环 =====
+    // ===== Phase 3: Review loop =====
     await reviewLoop(projectDir, task, prInfo, {
       maxRounds: maxReviewRounds,
       pollInterval,
       waitTimeout,
     });
 
-    // ===== 阶段 4: 合并 =====
-    await mergePhase(projectDir, task, prInfo);
+    // ===== Phase 4: Merge =====
+    await mergePhase(projectDir, task, prInfo, baseBranch);
 
-    // 更新任务状态
+    // Update task state
     task.status = 'completed';
     state.current_task = task.id;
     state.current_pr = null;
@@ -90,91 +107,94 @@ export async function run(projectDir) {
     writeJSON(statePath, state);
 
     log.blank();
-    progressBar(task.id, tasks.total, `${task.id}/${tasks.total} 任务完成`);
-    log.info(`✅ 任务 #${task.id} 完成！`);
+    progressBar(task.id, tasks.total, `${task.id}/${tasks.total} tasks done`);
+    log.info(`✅ Task #${task.id} complete!`);
   }
 
   log.blank();
-  log.title('🎉 所有任务已完成！');
+  log.title('🎉 All tasks complete!');
   log.blank();
   closePrompt();
 }
 
 // ──────────────────────────────────────────────
-// 阶段 1: 开发
+// Phase 1: Develop
 // ──────────────────────────────────────────────
 async function developPhase(projectDir, task, baseBranch) {
-  log.step('阶段 1/4: 开发');
+  log.step('Phase 1/4: Develop');
 
-  // 切换到 feature 分支
+  // Switch to feature branch
   git.checkoutBranch(projectDir, task.branch, baseBranch);
-  log.info(`已切换到分支: ${task.branch}`);
+  log.info(`Switched to branch: ${task.branch}`);
 
-  // 构建开发 Prompt
+  // Build development prompt
   const devPrompt = buildDevPrompt(task);
 
-  // 检查是否有 CodeX CLI
+  // Check if CodeX CLI is available
   const codexAvailable = isCodexAvailable();
 
   if (codexAvailable) {
-    log.info('检测到 CodeX CLI，自动执行...');
-    const autoRun = await confirm('自动调用 CodeX 开发？');
+    log.info('CodeX CLI detected, ready for auto-execution...');
+    const autoRun = await confirm('Auto-invoke CodeX for development?');
     if (autoRun) {
       try {
         const promptPath = resolve(projectDir, '.codex-copilot/_current_prompt.md');
         writeFileSync(promptPath, devPrompt);
-        execSync(`codex -q --file .codex-copilot/_current_prompt.md`, {
+        execSync(`cat .codex-copilot/_current_prompt.md | codex exec --full-auto -`, {
           cwd: projectDir,
           stdio: 'inherit',
         });
-        log.info('CodeX 开发完成');
+        log.info('CodeX development complete');
         return;
       } catch (err) {
-        log.warn(`CodeX CLI 调用失败: ${err.message}`);
-        log.warn('回退到手动模式');
+        log.warn(`CodeX CLI invocation failed: ${err.message}`);
+        log.warn('Falling back to manual mode');
       }
     }
   }
 
-  // 手动模式：显示 Prompt，等待用户确认
+  // Manual mode: display prompt, wait for user confirmation
   log.blank();
-  console.log('  ┌─── 请将以下内容粘贴到 CodeX 桌面版中执行 ───┐');
+  console.log('  ┌─── Paste the following into CodeX Desktop to execute ───┐');
   log.blank();
   console.log(devPrompt.split('\n').map(l => `  │ ${l}`).join('\n'));
   log.blank();
-  console.log('  └──────────────────────────────────────────────┘');
+  console.log('  └─────────────────────────────────────────────────────────┘');
   log.blank();
 
-  // 同时将 Prompt 保存到文件，方便复制
+  // Also save prompt to file for easy copying
   const promptPath = resolve(projectDir, '.codex-copilot/_current_prompt.md');
   writeFileSync(promptPath, devPrompt);
-  log.dim(`Prompt 已保存到 .codex-copilot/_current_prompt.md (可直接复制文件内容)`);
+  log.dim('Prompt saved to .codex-copilot/_current_prompt.md (you can copy the file directly)');
   log.blank();
 
-  // 尝试复制到剪贴板（通过 stdin 传入，避免 shell 注入）
+  // Try to copy to clipboard (via stdin to avoid shell injection)
   copyToClipboard(devPrompt);
 
-  await ask('CodeX 开发完成后按 Enter 继续...');
+  await ask('Press Enter after CodeX development is complete...');
 }
 
 // ──────────────────────────────────────────────
-// 阶段 2: 创建 PR
+// Phase 2: Create PR
 // ──────────────────────────────────────────────
 async function prPhase(projectDir, task, baseBranch) {
-  log.step('阶段 2/4: 提交 PR');
+  log.step('Phase 2/4: Submit PR');
 
-  // 确保变更已提交
+  // Ensure changes are committed
   if (!git.isClean(projectDir)) {
-    log.info('检测到未提交的变更，自动提交...');
+    log.info('Uncommitted changes detected, auto-committing...');
     git.commitAll(projectDir, `feat(task-${task.id}): ${task.title}`);
   }
 
-  // 推送
+  // Push
   git.pushBranch(projectDir, task.branch);
-  log.info('代码已推送');
+  log.info('Code pushed');
 
-  // 创建 PR
-  const prBody = `## 任务 #${task.id}: ${task.title}\n\n${task.description}\n\n### 验收标准\n${task.acceptance.map(a => `- [ ] ${a}`).join('\n')}\n\n---\n*由 Codex-Copilot 自动创建*`;
+  // Create PR
+  const acceptanceList = Array.isArray(task.acceptance) && task.acceptance.length > 0
+    ? task.acceptance.map(a => `- [ ] ${a}`).join('\n')
+    : '- [ ] Feature works correctly';
+  const prBody = `## Task #${task.id}: ${task.title}\n\n${task.description}\n\n### Acceptance Criteria\n${acceptanceList}\n\n---\n*Auto-created by Codex-Copilot*`;
 
   try {
     const prInfo = github.createPR(projectDir, {
@@ -183,31 +203,36 @@ async function prPhase(projectDir, task, baseBranch) {
       base: baseBranch,
       head: task.branch,
     });
-    log.info(`PR 已创建: ${prInfo.url}`);
+    log.info(`PR created: ${prInfo.url}`);
     return prInfo;
   } catch (err) {
-    // PR 可能已存在
-    log.warn(`创建 PR 异常: ${err.message}`);
-    const prNumber = await ask('请输入已存在的 PR 编号:');
-    return { number: parseInt(prNumber), url: '' };
+    // PR may already exist
+    log.warn(`PR creation error: ${err.message}`);
+    const prNumber = await ask('Enter existing PR number:');
+    const parsed = parseInt(prNumber, 10);
+    if (isNaN(parsed) || parsed <= 0) {
+      log.error('Invalid PR number');
+      throw new Error('Invalid PR number');
+    }
+    return { number: parsed, url: '' };
   }
 }
 
 // ──────────────────────────────────────────────
-// 阶段 3: Review 循环
+// Phase 3: Review loop
 // ──────────────────────────────────────────────
 async function reviewLoop(projectDir, task, prInfo, { maxRounds: _maxRounds, pollInterval, waitTimeout }) {
   let maxRounds = _maxRounds;
-  log.step('阶段 3/4: 等待 Review');
+  log.step('Phase 3/4: Waiting for review');
 
   for (let round = 1; round <= maxRounds; round++) {
-    // 等待 Review
-    log.info(`等待 Review 意见... (超时: ${waitTimeout}s)`);
+    // Wait for review
+    log.info(`Waiting for review feedback... (timeout: ${waitTimeout}s)`);
     const gotReview = await waitForReview(projectDir, prInfo.number, pollInterval, waitTimeout);
 
     if (!gotReview) {
-      log.warn('等待 Review 超时');
-      const action = await ask('输入 skip (跳过Review) 或 wait (继续等待):');
+      log.warn('Review wait timed out');
+      const action = await ask('Enter "skip" (skip review) or "wait" (keep waiting):');
       if (action === 'wait') {
         round--;
         continue;
@@ -215,28 +240,28 @@ async function reviewLoop(projectDir, task, prInfo, { maxRounds: _maxRounds, pol
       break;
     }
 
-    // 检查 Review 状态
+    // Check review status
     const state = github.getLatestReviewState(projectDir, prInfo.number);
-    log.info(`Review 状态: ${state}`);
+    log.info(`Review status: ${state}`);
 
     if (state === 'APPROVED') {
-      log.info('✅ Review 已通过！');
+      log.info('✅ Review approved!');
       return;
     }
 
-    // 收集 Review 反馈
+    // Collect review feedback
     const feedback = github.collectReviewFeedback(projectDir, prInfo.number);
     if (!feedback) {
-      log.info('未发现具体修改意见，继续');
+      log.info('No specific change requests found, proceeding');
       return;
     }
 
     log.blank();
-    log.warn(`收到 Review 意见 (第 ${round}/${maxRounds} 轮)`);
+    log.warn(`Received review feedback (round ${round}/${maxRounds})`);
 
     if (round >= maxRounds) {
-      log.warn(`已达最大修复轮次 (${maxRounds})`);
-      const choice = await ask('输入 merge (强制合并) / fix (再修一轮) / skip (跳过):');
+      log.warn(`Max fix rounds reached (${maxRounds})`);
+      const choice = await ask('Enter "merge" (force merge) / "fix" (one more round) / "skip" (skip):');
       if (choice === 'fix') {
         maxRounds++;
       } else if (choice === 'skip') {
@@ -246,17 +271,17 @@ async function reviewLoop(projectDir, task, prInfo, { maxRounds: _maxRounds, pol
       }
     }
 
-    // 让 CodeX 修复
+    // Let CodeX fix
     await fixPhase(projectDir, task, feedback, round);
 
-    // 推送修复
+    // Push fix
     if (!git.isClean(projectDir)) {
       git.commitAll(projectDir, `fix(task-${task.id}): address review comments (round ${round})`);
     }
     git.pushBranch(projectDir, task.branch);
-    log.info('修复已推送，等待新一轮 Review...');
+    log.info('Fix pushed, waiting for next review round...');
 
-    // 稍等一下让 Review bot 反应
+    // Brief wait for review bot to react
     await sleep(10000);
   }
 }
@@ -272,11 +297,11 @@ async function waitForReview(projectDir, prNumber, pollInterval, timeout) {
     const currentReviews = github.getReviews(projectDir, prNumber);
     const currentComments = github.getIssueComments(projectDir, prNumber);
 
-    // 检查是否有新的 Review 或 Bot 评论
+    // Check for new reviews or bot comments
     const hasNewReview = currentReviews.length > startReviewCount;
     const hasBotComment = currentComments.some(c =>
       (c.user?.type === 'Bot' || c.user?.login?.includes('bot')) &&
-      new Date(c.created_at) > new Date(Date.now() - elapsed * 1000)
+      new Date(c.created_at).getTime() > (Date.now() - elapsed * 1000)
     );
 
     if (hasNewReview || hasBotComment) {
@@ -290,97 +315,98 @@ async function waitForReview(projectDir, prNumber, pollInterval, timeout) {
 }
 
 // ──────────────────────────────────────────────
-// 修复阶段
+// Fix phase
 // ──────────────────────────────────────────────
 async function fixPhase(projectDir, task, feedback, round) {
-  log.step(`修复 Review 意见 (第 ${round} 轮)`);
+  log.step(`Fixing review comments (round ${round})`);
 
-  const fixPrompt = `以下是 PR Review 的意见，请逐一修复：
+  const fixPrompt = `The following are PR review comments. Please fix each one:
 
-## Review 意见
+## Review Comments
 ${feedback}
 
-## 要求
-1. 逐条修复上述问题
-2. 建议性意见可以不修复，但在 commit message 中说明原因
-3. 修复后确保不引入新问题
-4. 完成后执行: git add -A && git commit -m "fix(task-${task.id}): address review round ${round}"
+## Requirements
+1. Fix each issue listed above
+2. Suggestions (non-blocking) can be skipped — explain why in the commit message
+3. Ensure fixes don't introduce new issues
+4. When done, run: git add -A && git commit -m "fix(task-${task.id}): address review round ${round}"
 `;
 
-  // 保存到文件并提示用户
+  // Save to file and prompt user
   const promptPath = resolve(projectDir, '.codex-copilot/_current_prompt.md');
   writeFileSync(promptPath, fixPrompt);
 
-  // 尝试 CodeX CLI
+  // Try CodeX CLI
   const codexAvailable = isCodexAvailable();
 
   if (codexAvailable) {
-    const autoFix = await confirm('自动调用 CodeX 修复？');
+    const autoFix = await confirm('Auto-invoke CodeX to fix?');
     if (autoFix) {
       try {
-        execSync(`codex -q --file .codex-copilot/_current_prompt.md`, {
+        execSync(`cat .codex-copilot/_current_prompt.md | codex exec --full-auto -`, {
           cwd: projectDir,
           stdio: 'inherit',
         });
-        log.info('CodeX 修复完成');
+        log.info('CodeX fix complete');
         return;
       } catch {
-        log.warn('CodeX CLI 调用失败，回退到手动模式');
+        log.warn('CodeX CLI invocation failed, falling back to manual mode');
       }
     }
   }
 
-  // 手动模式
+  // Manual mode
   log.blank();
-  log.dim(`Review 修复 Prompt 已保存到 .codex-copilot/_current_prompt.md`);
-  log.dim('请将文件内容粘贴到 CodeX 执行');
+  log.dim('Review fix prompt saved to .codex-copilot/_current_prompt.md');
+  log.dim('Paste the file content into CodeX to execute');
 
   copyToClipboard(fixPrompt);
 
-  await ask('CodeX 修复完成后按 Enter 继续...');
+  await ask('Press Enter after CodeX fix is complete...');
 }
 
 // ──────────────────────────────────────────────
-// 阶段 4: 合并
+// Phase 4: Merge
 // ──────────────────────────────────────────────
-async function mergePhase(projectDir, task, prInfo) {
-  log.step('阶段 4/4: 合并 PR');
+async function mergePhase(projectDir, task, prInfo, baseBranch) {
+  log.step('Phase 4/4: Merge PR');
 
-  const doMerge = await confirm(`合并 PR #${prInfo.number}？`);
+  const doMerge = await confirm(`Merge PR #${prInfo.number}?`);
   if (!doMerge) {
-    log.warn('用户跳过合并');
+    log.warn('User skipped merge');
     return;
   }
 
   try {
     github.mergePR(projectDir, prInfo.number);
-    log.info(`PR #${prInfo.number} 已合并 ✅`);
+    log.info(`PR #${prInfo.number} merged ✅`);
   } catch (err) {
-    log.error(`合并失败: ${err.message}`);
-    log.warn('请手动合并后按 Enter 继续');
-    await ask('继续...');
+    log.error(`Merge failed: ${err.message}`);
+    log.warn('Please merge manually, then press Enter to continue');
+    await ask('Continue...');
   }
 
-  // 切回主分支
-  const configPath = resolve(projectDir, '.codex-copilot/config.json');
-  const config = JSON.parse(readFileSync(configPath, 'utf-8'));
-  git.checkoutMain(projectDir, config.base_branch || 'main');
+  // Switch back to main branch
+  git.checkoutMain(projectDir, baseBranch);
 }
 
 function buildDevPrompt(task) {
-  return `请完成以下开发任务：
+  const acceptanceList = Array.isArray(task.acceptance) && task.acceptance.length > 0
+    ? task.acceptance.map(a => `- ${a}`).join('\n')
+    : '- Feature works correctly';
+  return `Please complete the following development task:
 
-## 任务 #${task.id}: ${task.title}
+## Task #${task.id}: ${task.title}
 
 ${task.description}
 
-## 验收标准
-${task.acceptance.map(a => `- ${a}`).join('\n')}
+## Acceptance Criteria
+${acceptanceList}
 
-## 要求
-1. 严格按照项目现有的代码规范和技术栈
-2. 完成后确保代码可以正常编译/运行
-3. 完成后执行:
+## Requirements
+1. Strictly follow the project's existing code style and tech stack
+2. Ensure the code compiles/runs correctly when done
+3. When done, run:
    git add -A
    git commit -m "feat(task-${task.id}): ${task.title}"
 `;
@@ -392,7 +418,8 @@ function sleep(ms) {
 
 function isCodexAvailable() {
   try {
-    execSync('which codex', { stdio: 'pipe' });
+    const cmd = process.platform === 'win32' ? 'where codex' : 'which codex';
+    execSync(cmd, { stdio: 'pipe' });
     return true;
   } catch {
     return false;
@@ -402,6 +429,6 @@ function isCodexAvailable() {
 function copyToClipboard(text) {
   try {
     execSync('pbcopy', { input: text, stdio: ['pipe', 'pipe', 'pipe'] });
-    log.info('📋 已复制到剪贴板');
+    log.info('📋 Copied to clipboard');
   } catch {}
 }

package/src/commands/status.js

@@ -1,5 +1,5 @@
 /**
- * codex-copilot status - 显示当前进度
+ * codex-copilot status - Show current progress
  */
 
 import { readFileSync } from 'fs';
@@ -10,36 +10,43 @@ export async function status(projectDir) {
   const tasksPath = resolve(projectDir, '.codex-copilot/tasks.json');
   const statePath = resolve(projectDir, '.codex-copilot/state.json');
 
-  const tasks = JSON.parse(readFileSync(tasksPath, 'utf-8'));
-  const state = JSON.parse(readFileSync(statePath, 'utf-8'));
+  let tasks, state;
+  try {
+    tasks = JSON.parse(readFileSync(tasksPath, 'utf-8'));
+    state = JSON.parse(readFileSync(statePath, 'utf-8'));
+  } catch (err) {
+    log.error(`Failed to read files: ${err.message}`);
+    log.warn('Files may be corrupted. Run: codex-copilot reset');
+    return;
+  }
 
-  log.title(`📊 项目: ${tasks.project}`);
+  log.title(`📊 Project: ${tasks.project}`);
   log.blank();
 
-  // 进度条
+  // Progress bar
   const completed = tasks.tasks.filter(t => t.status === 'completed').length;
   const inProgress = tasks.tasks.filter(t => t.status === 'in_progress' || t.status === 'developed').length;
   const pending = tasks.tasks.filter(t => t.status === 'pending').length;
   const skipped = tasks.tasks.filter(t => t.status === 'skipped').length;
 
-  progressBar(completed, tasks.total, `${completed}/${tasks.total} 完成`);
+  progressBar(completed, tasks.total, `${completed}/${tasks.total} done`);
   log.blank();
 
-  // 统计
-  log.info(`✅ 已完成: ${completed}`);
-  if (inProgress > 0) log.info(`🔄 进行中: ${inProgress}`);
-  log.info(`⏳ 待开发: ${pending}`);
-  if (skipped > 0) log.warn(`⏭  已跳过: ${skipped}`);
+  // Stats
+  log.info(`✅ Completed: ${completed}`);
+  if (inProgress > 0) log.info(`🔄 In progress: ${inProgress}`);
+  log.info(`⏳ Pending: ${pending}`);
+  if (skipped > 0) log.warn(`⏭  Skipped: ${skipped}`);
   log.blank();
 
-  // 当前状态
+  // Current state
   if (state.current_pr) {
-    log.info(`当前 PR: #${state.current_pr} (Review 第 ${state.review_round} 轮)`);
+    log.info(`Current PR: #${state.current_pr} (review round ${state.review_round})`);
   }
   log.blank();
 
-  // 任务列表
-  log.title('任务列表:');
+  // Task list
+  log.title('Task list:');
   log.blank();
   for (const task of tasks.tasks) {
     const icon = task.status === 'completed' ? '✅' :