claude-coder 1.8.0 → 1.8.2

package/src/core/repair.js

@@ -1,58 +1,46 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const { runSession } = require('./base');
-const { buildQueryOptions } = require('./query');
-const { log } = require('../common/config');
-
-/**
- * 通用 AI 文件修复/维护工具
- * 可嵌入 runner.js、plan.js 及任何需要 AI 修复文件的场景
- *
- * @param {string} filePath - 待修复文件的绝对路径
- * @param {object} [opts] - 选项
- * @param {string} [opts.prompt] - 自定义 prompt（省略则使用默认 JSON 修复 prompt）
- * @param {string} [opts.model] - 模型覆盖
- * @returns {Promise<{success: boolean}>}
- */
-async function repairFile(filePath, opts = {}) {
-  if (!fs.existsSync(filePath)) {
-    log('error', `修复目标不存在: ${filePath}`);
-    return { success: false };
-  }
-
-  const content = fs.readFileSync(filePath, 'utf8');
-  const filename = path.basename(filePath);
-
-  const defaultPrompt = `以下文件出现格式错误，请修复并用 Write 工具写回原路径。
-只修复格式问题（JSON 语法、截断、尾逗号等），不改变数据内容。
-
-文件路径: ${filePath}
-当前内容:
-\`\`\`
-${content.slice(0, 30000)}
-\`\`\`
-
-修复后用 Write 写回 ${filePath}`;
-
-  const prompt = opts.prompt || defaultPrompt;
-  const ts = Date.now();
-
-  return runSession('repair', {
-    opts,
-    sessionNum: 0,
-    logFileName: `repair_${filename}_${ts}.log`,
-    label: `repair ${filename}`,
-
-    async execute(sdk, ctx) {
-      const queryOpts = buildQueryOptions(ctx.config, opts);
-      queryOpts.hooks = ctx.hooks;
-      queryOpts.abortController = ctx.abortController;
-      await ctx.runQuery(sdk, prompt, queryOpts);
-      return { success: true };
-    },
-  });
-}
-
-module.exports = { repairFile };
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const { runSession } = require('./session');
+const { buildQueryOptions } = require('./query');
+const { log } = require('../common/config');
+
+/**
+ * 使用 AI 修复损坏的 JSON 文件
+ * @param {string} filePath - 文件绝对路径
+ * @param {object} [opts] - 透传给 runSession 的选项
+ */
+async function repairJsonFile(filePath, opts = {}) {
+  if (!fs.existsSync(filePath)) return;
+
+  const rawContent = fs.readFileSync(filePath, 'utf8');
+  if (!rawContent || !rawContent.trim()) return;
+
+  const fileName = path.basename(filePath);
+  log('info', `正在使用 AI 修复 ${fileName}...`);
+
+  const prompt = `文件 ${filePath} 的 JSON 格式已损坏，请修复并用 Write 工具写入原路径。\n\n当前损坏内容：\n${rawContent}`;
+
+  try {
+    await runSession('repair', {
+      opts,
+      sessionNum: 0,
+      logFileName: `repair_${fileName.replace('.json', '')}.log`,
+      label: `repair:${fileName}`,
+
+      async execute(sdk, ctx) {
+        const queryOpts = buildQueryOptions(ctx.config, opts);
+        queryOpts.hooks = ctx.hooks;
+        queryOpts.abortController = ctx.abortController;
+        await ctx.runQuery(sdk, prompt, queryOpts);
+        log('ok', `AI 修复 ${fileName} 完成`);
+        return {};
+      },
+    });
+  } catch (err) {
+    log('warn', `AI 修复 ${fileName} 失败: ${err.message}`);
+  }
+}
+
+module.exports = { repairJsonFile };

package/src/core/runner.js

@@ -1,352 +1,195 @@
-'use strict';
-
-const fs = require('fs');
-const readline = require('readline');
-const { execSync } = require('child_process');
-const { log, loadConfig } = require('../common/config');
-const { assets } = require('../common/assets');
-const { getGitHead, isGitRepo, sleep } = require('../common/utils');
-const { RETRY } = require('../common/constants');
-const { loadTasks, getFeatures, getStats, findNextTask, forceStatus, printStats } = require('../common/tasks');
-const { validate } = require('./validator');
-const { runCodingSession } = require('./coding');
-const { simplify } = require('./simplify');
-const { repairFile } = require('./repair');
-const { buildArchivePrompt } = require('./prompts');
-const { loadSDK } = require('../common/sdk');
-
-const MAX_RETRY = RETRY.MAX_ATTEMPTS;
-
-function getHead() {
-  return getGitHead(assets.projectRoot);
-}
-
-function killServicesByProfile() {
-  const profile = assets.readJson('profile', null);
-  if (!profile) return;
-  try {
-    const services = profile.services || [];
-    const ports = services.map(s => s.port).filter(Boolean);
-    if (ports.length === 0) return;
-
-    const isWin = process.platform === 'win32';
-    for (const port of ports) {
-      try {
-        if (isWin) {
-          const out = execSync(`netstat -ano | findstr :${port} | findstr LISTENING`, { encoding: 'utf8', stdio: 'pipe' }).trim();
-          const pids = [...new Set(out.split('\n').map(l => l.trim().split(/\s+/).pop()).filter(Boolean))];
-          for (const pid of pids) { try { execSync(`taskkill /F /PID ${pid}`, { stdio: 'pipe' }); } catch { /* ignore */ } }
-        } else {
-          execSync(`lsof -ti :${port} | xargs kill -9 2>/dev/null`, { stdio: 'pipe' });
-        }
-      } catch { /* no process on port */ }
-    }
-    log('info', `已停止端口 ${ports.join(', ')} 上的服务`);
-  } catch { /* ignore profile read errors */ }
-}
-
-async function rollback(headBefore, reason) {
-  if (!headBefore || headBefore === 'none') return;
-
-  killServicesByProfile();
-
-  if (process.platform === 'win32') await sleep(1500);
-
-  const cwd = assets.projectRoot;
-  const gitEnv = { ...process.env, GIT_TERMINAL_PROMPT: '0' };
-
-  log('warn', `回滚到 ${headBefore} ...`);
-
-  let success = false;
-  for (let attempt = 1; attempt <= 2; attempt++) {
-    try {
-      execSync(`git reset --hard ${headBefore}`, { cwd, stdio: 'pipe', env: gitEnv });
-      log('ok', '回滚完成');
-      success = true;
-      break;
-    } catch (err) {
-      if (attempt === 1) {
-        log('warn', `回滚首次失败，等待后重试: ${err.message}`);
-        await sleep(2000);
-      } else {
-        log('error', `回滚失败: ${err.message}`);
-      }
-    }
-  }
-
-  appendProgress({
-    type: 'rollback',
-    timestamp: new Date().toISOString(),
-    reason: reason || 'harness 校验失败',
-    rollbackTo: headBefore,
-    success,
-  });
-}
-
-function markTaskFailed() {
-  const data = loadTasks();
-  if (!data) return;
-  const result = forceStatus(data, 'failed');
-  if (result) {
-    log('warn', `已将任务 ${result.id} 强制标记为 failed`);
-  }
-}
-
-function tryPush() {
-  try {
-    const cwd = assets.projectRoot;
-    const remotes = execSync('git remote', { cwd, encoding: 'utf8' }).trim();
-    if (!remotes) return;
-    log('info', '正在推送代码...');
-    execSync('git push', { cwd, stdio: 'inherit' });
-    log('ok', '推送成功');
-  } catch {
-    log('warn', '推送失败 (请检查网络或权限)，继续执行...');
-  }
-}
-
-function appendProgress(entry) {
-  let progress = assets.readJson('progress', { sessions: [] });
-  if (!Array.isArray(progress.sessions)) progress.sessions = [];
-  progress.sessions.push(entry);
-  assets.writeJson('progress', progress);
-}
-
-async function archiveDoneTasks() {
-  const data = loadTasks();
-  if (!data) return;
-  const features = data.features || [];
-  const done = features.filter(f => f.status === 'done');
-  if (done.length < 3) return;
-
-  const tasksPath = assets.path('tasks');
-  const prompt = buildArchivePrompt(done, data.completed_milestones, tasksPath);
-
-  log('info', `归档 ${done.length} 个完成任务...`);
-  await repairFile(tasksPath, { prompt });
-  log('ok', '任务归档完成');
-}
-
-async function promptContinue() {
-  if (!process.stdin.isTTY) return true;
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  return new Promise(resolve => {
-    rl.question('是否继续？(y/n) ', answer => {
-      rl.close();
-      resolve(/^[Yy]/.test(answer.trim()));
-    });
-  });
-}
-
-async function run(opts = {}) {
-  assets.ensureDirs();
-  const projectRoot = assets.projectRoot;
-
-  const maxSessions = opts.max || 50;
-  const pauseEvery = opts.pause ?? 0;
-  const dryRun = opts.dryRun || false;
-
-  console.log('');
-  console.log('============================================');
-  console.log(`  Claude Coder${dryRun ? ' (预览模式)' : ''}`);
-  console.log('============================================');
-  console.log('');
-
-  const config = loadConfig();
-  if (config.provider !== 'claude' && config.baseUrl) {
-    log('ok', `模型配置已加载: ${config.provider}${config.model ? ` (${config.model})` : ''}`);
-  }
-
-  if (!isGitRepo(projectRoot)) {
-    log('info', '初始化 git 仓库...');
-    execSync('git init', { cwd: projectRoot, stdio: 'inherit' });
-    execSync('git add -A && git commit -m "init: 项目初始化" --allow-empty', {
-      cwd: projectRoot,
-      stdio: 'inherit',
-    });
-  }
-
-  if (!assets.exists('profile')) {
-    log('error', 'profile 不存在，请先运行 claude-coder init 初始化项目');
-    process.exit(1);
-  }
-
-  if (!assets.exists('tasks')) {
-    log('error', 'tasks.json 不存在，请先运行 claude-coder plan 生成任务');
-    process.exit(1);
-  }
-
-  printStats();
-
-  if (!dryRun) {
-    await loadSDK();
-  }
-  log('info', `开始编码循环 (最多 ${maxSessions} 个会话) ...`);
-  console.log('');
-
-  let consecutiveFailures = 0;
-
-  for (let session = 1; session <= maxSessions; session++) {
-    console.log('');
-    console.log('--------------------------------------------');
-    log('info', `Session ${session} / ${maxSessions}`);
-    console.log('--------------------------------------------');
-
-    let taskData = loadTasks();
-    if (!taskData) {
-      log('warn', 'tasks.json 读取异常，尝试 AI 修复...');
-      await repairFile(assets.path('tasks'));
-      taskData = loadTasks();
-      if (!taskData) {
-        log('error', 'tasks.json 无法修复，终止循环');
-        break;
-      }
-      log('ok', 'tasks.json AI 修复成功');
-      await archiveDoneTasks();
-    }
-
-    const features = getFeatures(taskData);
-    if (features.length > 0 && features.every(f => f.status === 'done')) {
-      console.log('');
-      log('ok', '所有任务已完成！');
-      printStats();
-      break;
-    }
-
-    const stats = getStats(taskData);
-    log('info', `进度: ${stats.done}/${stats.total} done, ${stats.in_progress} in_progress, ${stats.testing} testing, ${stats.failed} failed, ${stats.pending} pending`);
-
-    if (dryRun) {
-      const next = findNextTask(taskData);
-      log('info', `[DRY-RUN] 下一个任务: ${next ? `${next.id} - ${next.description}` : '无待处理任务'}`);
-      if (!next) {
-        log('ok', '[DRY-RUN] 无可执行任务，预览结束');
-      } else {
-        console.log('');
-        log('info', '[DRY-RUN] 任务队列:');
-        const allFeatures = getFeatures(taskData);
-        for (const f of allFeatures) {
-          const st = f.status || 'unknown';
-          const statusTag = { done: '✓', in_progress: '▸', pending: '○', failed: '✗', testing: '◇' }[st] || '?';
-          log('info', `  ${statusTag} [${st.padEnd(11)}] ${f.id} - ${f.description || ''}`);
-        }
-      }
-      break;
-    }
-
-    const headBefore = getHead();
-    const nextTask = findNextTask(taskData);
-    const taskId = nextTask?.id || 'unknown';
-
-    const sessionResult = await runCodingSession(session, {
-      projectRoot,
-      taskId,
-      consecutiveFailures,
-      maxSessions,
-      lastValidateLog: consecutiveFailures > 0 ? '上次校验失败' : '',
-    });
-
-    if (sessionResult.stalled) {
-      log('warn', `Session ${session} 因停顿超时中断，跳过校验直接重试`);
-      consecutiveFailures++;
-      await rollback(headBefore, '停顿超时');
-      if (consecutiveFailures >= MAX_RETRY) {
-        log('error', `连续失败 ${MAX_RETRY} 次，跳过当前任务`);
-        markTaskFailed();
-        consecutiveFailures = 0;
-      }
-      appendProgress({
-        session,
-        timestamp: new Date().toISOString(),
-        result: 'stalled',
-        cost: sessionResult.cost,
-        taskId,
-      });
-      continue;
-    }
-
-    log('info', '开始 harness 校验 ...');
-    const validateResult = await validate(headBefore, taskId);
-
-    if (!validateResult.fatal) {
-      if (validateResult.hasWarnings) {
-        log('warn', `Session ${session} 校验通过 (有自动修复或警告)`);
-      } else {
-        log('ok', `Session ${session} 校验通过`);
-      }
-
-      // 定期归档 + 代码审查
-      const simplifyInterval = config.simplifyInterval;
-      if (simplifyInterval > 0 && session % simplifyInterval === 0) {
-        await archiveDoneTasks();
-        log('info', `每 ${simplifyInterval} 个 session 运行代码审查...`);
-        await simplify(null, { n: config.simplifyCommits });
-
-        // 检查是否有代码变更
-        try {
-          execSync('git diff --quiet HEAD', { cwd: projectRoot, stdio: 'pipe' });
-        } catch {
-          // 有变更，自动提交
-          execSync('git add -A && git commit -m "style: simplify optimization"', { cwd: projectRoot, stdio: 'pipe' });
-          log('ok', '代码优化已提交');
-        }
-      }
-
-      tryPush();
-      consecutiveFailures = 0;
-
-      appendProgress({
-        session,
-        timestamp: new Date().toISOString(),
-        result: 'success',
-        cost: sessionResult.cost,
-        taskId,
-        statusAfter: validateResult.sessionData?.status_after || null,
-        notes: validateResult.sessionData?.notes || null,
-      });
-
-    } else {
-      consecutiveFailures++;
-      log('error', `Session ${session} 校验失败 (连续失败: ${consecutiveFailures}/${MAX_RETRY})`);
-
-      appendProgress({
-        session,
-        timestamp: new Date().toISOString(),
-        result: 'fatal',
-        cost: sessionResult.cost,
-        taskId,
-        reason: validateResult.sessionData?.reason || '校验失败',
-      });
-
-      await rollback(headBefore, '校验失败');
-
-      if (consecutiveFailures >= MAX_RETRY) {
-        log('error', `连续失败 ${MAX_RETRY} 次，跳过当前任务`);
-        markTaskFailed();
-        consecutiveFailures = 0;
-        log('warn', '已将任务标记为 failed，继续下一个任务');
-      }
-    }
-
-    if (pauseEvery > 0 && session % pauseEvery === 0) {
-      console.log('');
-      printStats();
-      const shouldContinue = await promptContinue();
-      if (!shouldContinue) {
-        log('info', '手动停止');
-        break;
-      }
-    }
-  }
-
-  killServicesByProfile();
-
-  console.log('');
-  console.log('============================================');
-  console.log('  运行结束');
-  console.log('============================================');
-  console.log('');
-  printStats();
-}
-
-module.exports = { run };
+'use strict';
+
+const readline = require('readline');
+const { log, loadConfig } = require('../common/config');
+const { assets } = require('../common/assets');
+const { loadTasks, getFeatures, getStats, printStats } = require('../common/tasks');
+const { runCodingSession } = require('./coding');
+const { Harness, selectNextTask } = require('./harness');
+const { simplify } = require('./simplify');
+const { repairJsonFile } = require('./repair');
+
+// ─── Display Helpers ──────────────────────────────────────────
+
+function printBanner(dryRun) {
+  console.log('');
+  console.log('============================================');
+  console.log(`  Claude Coder${dryRun ? ' (预览模式)' : ''}`);
+  console.log('============================================');
+  console.log('');
+}
+
+function printSessionHeader(session, maxSessions) {
+  console.log('');
+  console.log('--------------------------------------------');
+  log('info', `Session ${session} / ${maxSessions}`);
+  console.log('--------------------------------------------');
+}
+
+function printProgress(taskData) {
+  const stats = getStats(taskData);
+  log('info', `进度: ${stats.done}/${stats.total} done, ${stats.in_progress} in_progress, ${stats.testing} testing, ${stats.failed} failed, ${stats.pending} pending`);
+}
+
+function printDryRun(taskData) {
+  const next = selectNextTask(taskData);
+  log('info', `[DRY-RUN] 下一个任务: ${next ? `${next.id} - ${next.description}` : '无待处理任务'}`);
+
+  if (!next) {
+    log('ok', '[DRY-RUN] 无可执行任务，预览结束');
+    return;
+  }
+
+  console.log('');
+  log('info', '[DRY-RUN] 任务队列:');
+  const features = getFeatures(taskData);
+  for (const f of features) {
+    const st = f.status || 'unknown';
+    const icon = { done: '✓', in_progress: '▸', pending: '○', failed: '✗', testing: '◇' }[st] || '?';
+    log('info', `  ${icon} [${st.padEnd(11)}] ${f.id} - ${f.description || ''}`);
+  }
+}
+
+function printEndBanner() {
+  console.log('');
+  console.log('============================================');
+  console.log('  运行结束');
+  console.log('============================================');
+  console.log('');
+}
+
+async function promptContinue() {
+  if (!process.stdin.isTTY) return true;
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  return new Promise(resolve => {
+    rl.question('是否继续？(y/n) ', answer => {
+      rl.close();
+      resolve(/^[Yy]/.test(answer.trim()));
+    });
+  });
+}
+
+// ─── Simplify Helper ─────────────────────────────────────────
+
+async function tryRunSimplify(harness, config, msg, commitMsg) {
+  log('info', msg || `每 ${config.simplifyInterval} 个成功 session 运行代码审查...`);
+  try {
+    await simplify(null, { n: config.simplifyCommits });
+    harness.afterSimplify(commitMsg);
+  } catch (err) {
+    log('warn', `代码审查失败，跳过: ${err.message}`);
+  }
+}
+
+// ─── Main Orchestration Loop ──────────────────────────────────
+
+async function run(opts = {}) {
+  const config = loadConfig();
+  const harness = new Harness(config);
+
+  harness.ensureEnvironment();
+
+  const dryRun = opts.dryRun || false;
+  const maxSessions = opts.max || 50;
+  const pauseEvery = opts.pause ?? 0;
+
+  printBanner(dryRun);
+
+  if (config.provider !== 'claude' && config.baseUrl) {
+    log('ok', `模型配置已加载: ${config.provider}${config.model ? ` (${config.model})` : ''}`);
+  }
+
+  const prereq = harness.checkPrerequisites();
+  if (!prereq.ok) {
+    log('error', prereq.msg);
+    process.exit(1);
+  }
+
+  printStats();
+
+  log('info', `开始编码循环 (最多 ${maxSessions} 个会话) ...`);
+  console.log('');
+
+  let state = { consecutiveFailures: 0, lastFailReason: '' };
+
+  for (let session = 1; session <= maxSessions; session++) {
+    printSessionHeader(session, maxSessions);
+
+    let taskData = loadTasks();
+    if (!taskData) {
+      const tasksPath = assets.path('tasks');
+      if (tasksPath) await repairJsonFile(tasksPath);
+      taskData = loadTasks();
+      if (!taskData) {
+        log('error', 'tasks.json 无法读取且修复失败，终止循环');
+        break;
+      }
+    }
+
+    if (harness.isAllDone(taskData)) {
+      if (!dryRun) {
+        if (harness.needsFinalSimplify()) {
+          await tryRunSimplify(harness, config, '所有任务完成，运行最终代码审查...', 'style: final simplify');
+        }
+        harness.tryPush();
+      }
+      console.log('');
+      log('ok', '所有任务已完成！');
+      printStats();
+      break;
+    }
+
+    printProgress(taskData);
+
+    if (dryRun) {
+      printDryRun(taskData);
+      break;
+    }
+
+    const { headBefore, taskId } = harness.snapshot(taskData);
+
+    const sessionResult = await runCodingSession(session, {
+      projectRoot: harness.projectRoot,
+      taskId,
+      consecutiveFailures: state.consecutiveFailures,
+      maxSessions,
+      lastValidateLog: state.lastFailReason,
+    });
+
+    if (sessionResult.stalled) {
+      state = await harness.onStall(session, { headBefore, taskId, sessionResult, ...state });
+      continue;
+    }
+
+    log('info', '开始 harness 校验 ...');
+    const validateResult = await harness.validate(headBefore, taskId);
+
+    if (!validateResult.fatal) {
+      const level = validateResult.hasWarnings ? 'warn' : 'ok';
+      log(level, `Session ${session} 校验通过${validateResult.hasWarnings ? ' (有警告)' : ''}`);
+      state = await harness.onSuccess(session, { taskId, sessionResult, validateResult });
+
+      if (harness.shouldSimplify()) {
+        await tryRunSimplify(harness, config);
+      }
+      harness.tryPush();
+    } else {
+      state = await harness.onFailure(session, { headBefore, taskId, sessionResult, validateResult, ...state });
+    }
+
+    if (pauseEvery > 0 && session % pauseEvery === 0) {
+      console.log('');
+      printStats();
+      if (!await promptContinue()) {
+        log('info', '手动停止');
+        break;
+      }
+    }
+  }
+
+  harness.cleanup();
+  printEndBanner();
+  printStats();
+}
+
+module.exports = { run };