@jojonax/codex-copilot 1.0.2 → 1.1.0

package/src/commands/run.js

@@ -1,16 +1,18 @@
 /**
- * codex-copilot run - 主编排循环
+ * codex-copilot run - Main orchestration loop
  * 
- * 逐个任务执行: 开发 → PR → Review → 修复 → 合并 → 下一个
+ * Executes tasks one by one: Develop → PR → Review → Fix → Merge → Next
+ * Features fine-grained checkpoint/resume at every sub-step.
  */
 
 import { readFileSync, writeFileSync, existsSync } from 'fs';
 import { resolve } from 'path';
-import { execSync } from 'child_process';
 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 { createCheckpoint } from '../utils/checkpoint.js';
+import { provider } from '../utils/provider.js';
 
 function readJSON(path) {
   return JSON.parse(readFileSync(path, 'utf-8'));
@@ -22,214 +24,287 @@ function writeJSON(path, data) {
 
 export async function run(projectDir) {
   const tasksPath = resolve(projectDir, '.codex-copilot/tasks.json');
-  const statePath = resolve(projectDir, '.codex-copilot/state.json');
   const configPath = resolve(projectDir, '.codex-copilot/config.json');
+  const checkpoint = createCheckpoint(projectDir);
 
   let tasks;
   let state;
   try {
     tasks = readJSON(tasksPath);
-    state = readJSON(statePath);
+    state = checkpoint.load();
   } catch (err) {
-    log.error(`读取任务/状态文件失败: ${err.message}`);
-    log.warn('文件可能已损坏，请运行 codex-copilot reset');
+    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) : {};
 
-  // 校验 tasks.json 结构
+  // Validate tasks.json structure
   if (!tasks.tasks || !Array.isArray(tasks.tasks) || !tasks.total) {
-    log.error('tasks.json 格式无效: 缺少 tasks 数组或 total 字段');
-    log.warn('请重新运行 codex-copilot init 并让 CodeX 重新生成 tasks.json');
+    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 providerId = config.provider || 'codex-cli';
   const maxReviewRounds = config.max_review_rounds || 2;
   const pollInterval = config.review_poll_interval || 60;
   const waitTimeout = config.review_wait_timeout || 600;
 
-  log.title('🚀 开始自动化开发循环');
+  const providerInfo = provider.getProvider(providerId);
+  log.info(`AI Provider: ${providerInfo ? providerInfo.name : providerId}`);
+
+  // ===== Graceful shutdown handler =====
+  let shuttingDown = false;
+  const gracefulShutdown = () => {
+    if (shuttingDown) {
+      log.warn('Force exit');
+      process.exit(1);
+    }
+    shuttingDown = true;
+    log.blank();
+    log.warn('Interrupt received — saving checkpoint...');
+    // State is already saved at each step, just need to save tasks.json
+    writeJSON(tasksPath, tasks);
+    log.info('✅ Checkpoint saved. Run `codex-copilot run` to resume.');
+    log.blank();
+    closePrompt();
+    process.exit(0);
+  };
+  process.on('SIGINT', gracefulShutdown);
+  process.on('SIGTERM', gracefulShutdown);
+
+  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(`Base branch: ${baseBranch}`);
+
+  // ===== Pre-flight: ensure base branch is committed & pushed =====
+  await ensureBaseReady(projectDir, baseBranch);
+
+  // Show resume info if resuming mid-task
+  if (state.phase && state.current_task > 0) {
+    log.blank();
+    log.info(`⏩ Resuming task #${state.current_task} from: ${state.phase} → ${state.phase_step}`);
+  }
+
+  const completedCount = tasks.tasks.filter(t => t.status === 'completed').length;
   log.blank();
-  progressBar(state.current_task, tasks.total, `${state.current_task}/${tasks.total} 任务完成`);
+  progressBar(completedCount, tasks.total, `${completedCount}/${tasks.total} tasks done`);
   log.blank();
 
-  // 逐个任务执行
+  // Execute tasks one by one
   for (const task of tasks.tasks) {
-    if (task.id <= state.current_task) continue; // 跳过已完成的
+    // Skip fully completed tasks
     if (task.status === 'completed' || task.status === 'skipped') continue;
 
+    // Skip tasks whose ID is below the completed threshold (and not the resuming task)
+    const isResumingTask = state.current_task === task.id && state.phase;
+    if (task.id < state.current_task && !isResumingTask) 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: 开发 =====
-    await developPhase(projectDir, task, baseBranch);
+    // Mark task as in_progress
+    task.status = 'in_progress';
+    writeJSON(tasksPath, tasks);
 
-    // ===== 阶段 2: 创建 PR =====
-    const prInfo = await prPhase(projectDir, task, baseBranch);
+    // ===== Phase 1: Develop =====
+    if (!checkpoint.isStepDone(task.id, 'develop', 'codex_complete')) {
+      await developPhase(projectDir, task, baseBranch, checkpoint, providerId);
+    } else {
+      log.dim('⏩ Skipping develop phase (already completed)');
+    }
 
-    // ===== 阶段 3: Review 循环 =====
-    await reviewLoop(projectDir, task, prInfo, {
-      maxRounds: maxReviewRounds,
-      pollInterval,
-      waitTimeout,
-    });
+    // ===== Phase 2: Create PR =====
+    let prInfo;
+    if (!checkpoint.isStepDone(task.id, 'pr', 'pr_created')) {
+      prInfo = await prPhase(projectDir, task, baseBranch, checkpoint);
+    } else {
+      // PR already created, load from state
+      state = checkpoint.load();
+      prInfo = { number: state.current_pr, url: '' };
+      log.dim(`⏩ Skipping PR phase (PR #${prInfo.number} already created)`);
+    }
+
+    // ===== Phase 3: Review loop =====
+    if (!checkpoint.isStepDone(task.id, 'merge', 'merged')) {
+      await reviewLoop(projectDir, task, prInfo, {
+        maxRounds: maxReviewRounds,
+        pollInterval,
+        waitTimeout,
+      }, checkpoint, providerId);
+    } else {
+      log.dim('⏩ Skipping review phase (already completed)');
+    }
 
-    // ===== 阶段 4: 合并 =====
-    await mergePhase(projectDir, task, prInfo, baseBranch);
+    // ===== Phase 4: Merge =====
+    if (!checkpoint.isStepDone(task.id, 'merge', 'merged')) {
+      await mergePhase(projectDir, task, prInfo, baseBranch, checkpoint);
+    } else {
+      log.dim('⏩ Skipping merge phase (already merged)');
+    }
 
-    // 更新任务状态
+    // Mark task complete
     task.status = 'completed';
-    state.current_task = task.id;
-    state.current_pr = null;
-    state.review_round = 0;
     writeJSON(tasksPath, tasks);
-    writeJSON(statePath, state);
+    checkpoint.completeTask(task.id);
 
     log.blank();
-    progressBar(task.id, tasks.total, `${task.id}/${tasks.total} 任务完成`);
-    log.info(`✅ 任务 #${task.id} 完成！`);
+    const done = tasks.tasks.filter(t => t.status === 'completed').length;
+    progressBar(done, tasks.total, `${done}/${tasks.total} tasks done`);
+    log.info(`✅ Task #${task.id} complete!`);
   }
 
   log.blank();
-  log.title('🎉 所有任务已完成！');
+  log.title('🎉 All tasks complete!');
   log.blank();
+  process.removeListener('SIGINT', gracefulShutdown);
+  process.removeListener('SIGTERM', gracefulShutdown);
   closePrompt();
 }
 
 // ──────────────────────────────────────────────
-// 阶段 1: 开发
+// Phase 1: Develop
 // ──────────────────────────────────────────────
-async function developPhase(projectDir, task, baseBranch) {
-  log.step('阶段 1/4: 开发');
-
-  // 切换到 feature 分支
-  git.checkoutBranch(projectDir, task.branch, baseBranch);
-  log.info(`已切换到分支: ${task.branch}`);
-
-  // 构建开发 Prompt
-  const devPrompt = buildDevPrompt(task);
-
-  // 检查是否有 CodeX CLI
-  const codexAvailable = isCodexAvailable();
-
-  if (codexAvailable) {
-    log.info('检测到 CodeX CLI，自动执行...');
-    const autoRun = await confirm('自动调用 CodeX 开发？');
-    if (autoRun) {
-      try {
-        const promptPath = resolve(projectDir, '.codex-copilot/_current_prompt.md');
-        writeFileSync(promptPath, devPrompt);
-        execSync(`codex -q --file .codex-copilot/_current_prompt.md`, {
-          cwd: projectDir,
-          stdio: 'inherit',
-        });
-        log.info('CodeX 开发完成');
-        return;
-      } catch (err) {
-        log.warn(`CodeX CLI 调用失败: ${err.message}`);
-        log.warn('回退到手动模式');
-      }
+async function developPhase(projectDir, task, baseBranch, checkpoint, providerId) {
+  log.step('Phase 1/4: Develop');
+
+  // Step 1: Switch to feature branch
+  if (!checkpoint.isStepDone(task.id, 'develop', 'branch_created')) {
+    git.checkoutBranch(projectDir, task.branch, baseBranch);
+    log.info(`Switched to branch: ${task.branch}`);
+    checkpoint.saveStep(task.id, 'develop', 'branch_created', { branch: task.branch });
+  } else {
+    // Ensure we're on the right branch
+    const current = git.currentBranch(projectDir);
+    if (current !== task.branch) {
+      git.checkoutBranch(projectDir, task.branch, baseBranch);
     }
+    log.dim('⏩ Branch already created');
   }
 
-  // 手动模式：显示 Prompt，等待用户确认
-  log.blank();
-  console.log('  ┌─── 请将以下内容粘贴到 CodeX 桌面版中执行 ───┐');
-  log.blank();
-  console.log(devPrompt.split('\n').map(l => `  │ ${l}`).join('\n'));
-  log.blank();
-  console.log('  └──────────────────────────────────────────────┘');
-  log.blank();
-
-  // 同时将 Prompt 保存到文件，方便复制
-  const promptPath = resolve(projectDir, '.codex-copilot/_current_prompt.md');
-  writeFileSync(promptPath, devPrompt);
-  log.dim(`Prompt 已保存到 .codex-copilot/_current_prompt.md (可直接复制文件内容)`);
-  log.blank();
-
-  // 尝试复制到剪贴板（通过 stdin 传入，避免 shell 注入）
-  copyToClipboard(devPrompt);
+  // Step 2: Build development prompt
+  if (!checkpoint.isStepDone(task.id, 'develop', 'prompt_ready')) {
+    const devPrompt = buildDevPrompt(task);
+    const promptPath = resolve(projectDir, '.codex-copilot/_current_prompt.md');
+    writeFileSync(promptPath, devPrompt);
+    checkpoint.saveStep(task.id, 'develop', 'prompt_ready', { branch: task.branch });
+    log.info('Development prompt generated');
+  } else {
+    log.dim('⏩ Prompt already generated');
+  }
 
-  await ask('CodeX 开发完成后按 Enter 继续...');
+  // Step 3: Execute via AI Provider
+  if (!checkpoint.isStepDone(task.id, 'develop', 'codex_complete')) {
+    const promptPath = resolve(projectDir, '.codex-copilot/_current_prompt.md');
+    const ok = await provider.executePrompt(providerId, promptPath, projectDir);
+    if (ok) {
+      log.info('Development complete');
+      checkpoint.saveStep(task.id, 'develop', 'codex_complete', { branch: task.branch });
+    }
+  }
 }
 
 // ──────────────────────────────────────────────
-// 阶段 2: 创建 PR
+// Phase 2: Create PR
 // ──────────────────────────────────────────────
-async function prPhase(projectDir, task, baseBranch) {
-  log.step('阶段 2/4: 提交 PR');
+async function prPhase(projectDir, task, baseBranch, checkpoint) {
+  log.step('Phase 2/4: Submit PR');
 
-  // 确保变更已提交
-  if (!git.isClean(projectDir)) {
-    log.info('检测到未提交的变更，自动提交...');
-    git.commitAll(projectDir, `feat(task-${task.id}): ${task.title}`);
+  // Step 1: Commit changes
+  if (!checkpoint.isStepDone(task.id, 'pr', 'committed')) {
+    if (!git.isClean(projectDir)) {
+      log.info('Uncommitted changes detected, auto-committing...');
+      git.commitAll(projectDir, `feat(task-${task.id}): ${task.title}`);
+    }
+    checkpoint.saveStep(task.id, 'pr', 'committed', { branch: task.branch });
+    log.info('Changes committed');
+  } else {
+    log.dim('⏩ Changes already committed');
   }
 
-  // 推送
-  git.pushBranch(projectDir, task.branch);
-  log.info('代码已推送');
+  // Step 2: Push
+  if (!checkpoint.isStepDone(task.id, 'pr', 'pushed')) {
+    git.pushBranch(projectDir, task.branch);
+    checkpoint.saveStep(task.id, 'pr', 'pushed', { branch: task.branch });
+    log.info('Code pushed');
+  } else {
+    log.dim('⏩ Code already 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 自动创建*`;
+  // Step 3: Create PR
+  if (!checkpoint.isStepDone(task.id, 'pr', 'pr_created')) {
+    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, {
+    // Use auto-recovery: create → find existing → fix remote → retry
+    const prInfo = github.createPRWithRecovery(projectDir, {
       title: `feat(task-${task.id}): ${task.title}`,
       body: prBody,
       base: baseBranch,
       head: task.branch,
     });
-    log.info(`PR 已创建: ${prInfo.url}`);
+    log.info(`PR ready: #${prInfo.number} ${prInfo.url}`);
+
+    checkpoint.saveStep(task.id, 'pr', 'pr_created', {
+      branch: task.branch,
+      current_pr: prInfo.number,
+    });
     return prInfo;
-  } catch (err) {
-    // PR 可能已存在
-    log.warn(`创建 PR 异常: ${err.message}`);
-    const prNumber = await ask('请输入已存在的 PR 编号:');
-    const parsed = parseInt(prNumber, 10);
-    if (isNaN(parsed) || parsed <= 0) {
-      log.error('无效的 PR 编号');
-      throw new Error('无效的 PR 编号');
-    }
-    return { number: parsed, url: '' };
   }
+
+  // If we get here, PR was already created — load from state
+  const state = checkpoint.load();
+  return { number: state.current_pr, url: '' };
 }
 
 // ──────────────────────────────────────────────
-// 阶段 3: Review 循环
+// Phase 3: Review loop
 // ──────────────────────────────────────────────
-async function reviewLoop(projectDir, task, prInfo, { maxRounds: _maxRounds, pollInterval, waitTimeout }) {
+async function reviewLoop(projectDir, task, prInfo, { maxRounds: _maxRounds, pollInterval, waitTimeout }, checkpoint, providerId) {
   let maxRounds = _maxRounds;
-  log.step('阶段 3/4: 等待 Review');
+  log.step('Phase 3/4: Waiting for review');
+
+  // Resume from saved review round
+  const state = checkpoint.load();
+  const startRound = (state.current_task === task.id && state.review_round > 0)
+    ? state.review_round
+    : 1;
+
+  for (let round = startRound; round <= maxRounds; round++) {
+    // Step: Waiting for review
+    checkpoint.saveStep(task.id, 'review', 'waiting_review', {
+      branch: task.branch,
+      current_pr: prInfo.number,
+      review_round: round,
+    });
 
-  for (let round = 1; round <= maxRounds; round++) {
-    // 等待 Review
-    log.info(`等待 Review 意见... (超时: ${waitTimeout}s)`);
+    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;
@@ -237,28 +312,35 @@ async function reviewLoop(projectDir, task, prInfo, { maxRounds: _maxRounds, pol
       break;
     }
 
-    // 检查 Review 状态
-    const state = github.getLatestReviewState(projectDir, prInfo.number);
-    log.info(`Review 状态: ${state}`);
+    // Step: Feedback received
+    checkpoint.saveStep(task.id, 'review', 'feedback_received', {
+      branch: task.branch,
+      current_pr: prInfo.number,
+      review_round: round,
+    });
+
+    // Check review status
+    const reviewState = github.getLatestReviewState(projectDir, prInfo.number);
+    log.info(`Review status: ${reviewState}`);
 
-    if (state === 'APPROVED') {
-      log.info('✅ Review 已通过！');
+    if (reviewState === 'APPROVED') {
+      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') {
@@ -268,17 +350,24 @@ async function reviewLoop(projectDir, task, prInfo, { maxRounds: _maxRounds, pol
       }
     }
 
-    // 让 CodeX 修复
-    await fixPhase(projectDir, task, feedback, round);
+    // Let AI fix
+    await fixPhase(projectDir, task, feedback, round, providerId);
+
+    // Step: Fix applied
+    checkpoint.saveStep(task.id, 'review', 'fix_applied', {
+      branch: task.branch,
+      current_pr: prInfo.number,
+      review_round: 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);
   }
 }
@@ -294,7 +383,7 @@ 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')) &&
@@ -312,95 +401,121 @@ async function waitForReview(projectDir, prNumber, pollInterval, timeout) {
 }
 
 // ──────────────────────────────────────────────
-// 修复阶段
+// Fix phase
 // ──────────────────────────────────────────────
-async function fixPhase(projectDir, task, feedback, round) {
-  log.step(`修复 Review 意见 (第 ${round} 轮)`);
+async function fixPhase(projectDir, task, feedback, round, providerId) {
+  log.step(`Fixing review comments (round ${round})`);
 
-  const fixPrompt = `以下是 PR Review 的意见，请逐一修复：
+  const fixPrompt = `Please fix the following review comments on Task #${task.id}: ${task.title}
 
-## Review 意见
+## Review Feedback
 ${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 execute via provider
   const promptPath = resolve(projectDir, '.codex-copilot/_current_prompt.md');
   writeFileSync(promptPath, fixPrompt);
 
-  // 尝试 CodeX CLI
-  const codexAvailable = isCodexAvailable();
-
-  if (codexAvailable) {
-    const autoFix = await confirm('自动调用 CodeX 修复？');
-    if (autoFix) {
-      try {
-        execSync(`codex -q --file .codex-copilot/_current_prompt.md`, {
-          cwd: projectDir,
-          stdio: 'inherit',
-        });
-        log.info('CodeX 修复完成');
-        return;
-      } catch {
-        log.warn('CodeX CLI 调用失败，回退到手动模式');
-      }
-    }
-  }
-
-  // 手动模式
-  log.blank();
-  log.dim(`Review 修复 Prompt 已保存到 .codex-copilot/_current_prompt.md`);
-  log.dim('请将文件内容粘贴到 CodeX 执行');
-
-  copyToClipboard(fixPrompt);
-
-  await ask('CodeX 修复完成后按 Enter 继续...');
+  await provider.executePrompt(providerId, promptPath, projectDir);
+  log.info('Fix complete');
 }
 
 // ──────────────────────────────────────────────
-// 阶段 4: 合并
+// Phase 4: Merge
 // ──────────────────────────────────────────────
-async function mergePhase(projectDir, task, prInfo, baseBranch) {
-  log.step('阶段 4/4: 合并 PR');
+async function mergePhase(projectDir, task, prInfo, baseBranch, checkpoint) {
+  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...');
   }
 
-  // 切回主分支
+  checkpoint.saveStep(task.id, 'merge', 'merged', {
+    branch: task.branch,
+    current_pr: prInfo.number,
+  });
+
+  // Switch back to main branch
   git.checkoutMain(projectDir, baseBranch);
 }
 
+// ──────────────────────────────────────────────
+// Pre-flight: ensure base branch has commits & is pushed
+// ──────────────────────────────────────────────
+async function ensureBaseReady(projectDir, baseBranch) {
+  // Check if the repo has any commits at all
+  const hasCommits = git.execSafe('git rev-parse HEAD', projectDir);
+  if (!hasCommits.ok) {
+    // No commits yet — brand new repo
+    log.warn('No commits found in repository');
+    if (!git.isClean(projectDir)) {
+      log.info('Creating initial commit from existing code...');
+      git.commitAll(projectDir, 'chore: initial commit');
+      log.info('✅ Initial commit created');
+    } else {
+      log.warn('Repository is empty — no files to commit');
+      return;
+    }
+  } else {
+    // Has commits, but base branch might have uncommitted changes
+    const currentBranch = git.currentBranch(projectDir);
+    if (currentBranch === baseBranch && !git.isClean(projectDir)) {
+      log.info('Uncommitted changes on base branch, committing first...');
+      git.commitAll(projectDir, 'chore: save current progress before automation');
+      log.info('✅ Base branch changes committed');
+    }
+  }
+
+  // Ensure we're on the base branch
+  const currentBranch = git.currentBranch(projectDir);
+  if (currentBranch !== baseBranch) {
+    // If base branch doesn't exist locally, create it from current
+    const branchExists = git.execSafe(`git rev-parse --verify ${baseBranch}`, projectDir);
+    if (!branchExists.ok) {
+      log.info(`Creating base branch '${baseBranch}' from current branch...`);
+      git.execSafe(`git branch ${baseBranch}`, projectDir);
+    }
+  }
+
+  // Ensure base branch is pushed to remote
+  github.ensureRemoteBranch(projectDir, baseBranch);
+  log.info(`Base branch '${baseBranch}' ready ✓`);
+}
+
 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}"
 `;
@@ -410,19 +525,5 @@ function sleep(ms) {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
 
-function isCodexAvailable() {
-  try {
-    const cmd = process.platform === 'win32' ? 'where codex' : 'which codex';
-    execSync(cmd, { stdio: 'pipe' });
-    return true;
-  } catch {
-    return false;
-  }
-}
 
-function copyToClipboard(text) {
-  try {
-    execSync('pbcopy', { input: text, stdio: ['pipe', 'pipe', 'pipe'] });
-    log.info('📋 已复制到剪贴板');
-  } catch {}
-}
+