claude-coder 1.8.4 → 1.9.0

package/src/core/prompts.js

@@ -5,7 +5,7 @@ const path = require('path');
 const { loadConfig } = require('../common/config');
 const { assets } = require('../common/assets');
 const { loadTasks, getStats } = require('../common/tasks');
-const { loadState, selectNextTask } = require('./harness');
+const { loadState, selectNextTask } = require('./state');
 
 // --------------- System Prompt ---------------
 
@@ -36,8 +36,11 @@ function needsWebTools(task) {
 // --------------- Hint Builders ---------------
 
 function buildMcpHint(config, task) {
-  if (!config.mcpPlaywright) return '';
+  if (!config.webTestTool) return '';
   if (!needsWebTools(task)) return '';
+  if (config.webTestTool === 'chrome-devtools') {
+    return '前端/全栈任务可用 Chrome DevTools MCP（navigate、click、type_text、screenshot 等）做端到端测试和调试。';
+  }
   return '前端/全栈任务可用 Playwright MCP（browser_navigate、browser_snapshot、browser_click 等）做端到端测试。';
 }
 
@@ -77,21 +80,33 @@ function buildTaskContext(projectRoot, taskId) {
 
     if (!task) return '无待处理任务。';
 
-    const steps = (task.steps || [])
+    const { id, description, status, category, priority, depends_on, steps, ...rest } = task;
+
+    const stepLines = (steps || [])
       .map((s, i) => `  ${i + 1}. ${s}`)
       .join('\n');
 
-    const deps = (task.depends_on || []).length > 0
-      ? `depends_on: [${task.depends_on.join(', ')}]`
+    const deps = (depends_on || []).length > 0
+      ? `depends_on: [${depends_on.join(', ')}]`
       : '';
 
-    return [
-      `**${task.id}**: "${task.description}"`,
-      `状态: ${task.status}, category: ${task.category}, priority: ${task.priority || 'N/A'} ${deps}`,
-      `步骤:\n${steps}`,
+    const lines = [
+      `**${id}**: "${description}"`,
+      `状态: ${status}, category: ${category}, priority: ${priority || 'N/A'} ${deps}`,
+      `步骤:\n${stepLines}`,
       `进度: ${stats.done}/${stats.total} done, ${stats.failed} failed`,
       `项目路径: ${projectRoot}`,
-    ].join('\n');
+    ];
+
+    const extras = Object.entries(rest).filter(([, v]) => v != null && v !== '');
+    if (extras.length > 0) {
+      lines.push('补充信息:');
+      for (const [k, v] of extras) {
+        lines.push(`  ${k}: ${typeof v === 'object' ? JSON.stringify(v) : v}`);
+      }
+    }
+
+    return lines.join('\n');
   } catch {
     return '任务上下文加载失败，请读取 .claude-coder/tasks.json 自行确认。';
   }
@@ -104,10 +119,15 @@ function buildTestEnvHint(projectRoot) {
   return '';
 }
 
-function buildPlaywrightAuthHint(config, task) {
-  if (!config.mcpPlaywright) return '';
+function buildWebTestHint(config, task) {
+  if (!config.webTestTool) return '';
   if (!needsWebTools(task)) return '';
-  const mode = config.playwrightMode;
+
+  if (config.webTestTool === 'chrome-devtools') {
+    return 'Chrome DevTools MCP 已启用，通过 autoConnect 连接已打开的 Chrome 浏览器，直接复用已有登录态。';
+  }
+
+  const mode = config.webTestMode;
   switch (mode) {
     case 'persistent':
       return 'Playwright MCP 使用 persistent 模式，浏览器登录状态持久保存，无需额外登录操作。';
@@ -127,7 +147,7 @@ function buildMemoryHint() {
   if (!sr?.session_result) return '';
   const base = `上次会话 ${sr.session_result}（${sr.status_before || '?'} → ${sr.status_after || '?'}）。`;
   if (!sr.notes || !sr.notes.trim()) return base;
-  return `${base}遗留: ${sr.notes.slice(0, 200)}`;
+  return `${base}遗留: ${sr.notes}`;
 }
 
 function buildServiceHint(maxSessions) {
@@ -164,7 +184,7 @@ function buildCodingContext(sessionNum, opts = {}) {
     envHint: buildEnvHint(consecutiveFailures, sessionNum),
     docsHint: buildDocsHint(),
     testEnvHint: buildTestEnvHint(projectRoot),
-    playwrightAuthHint: buildPlaywrightAuthHint(config, task),
+    webTestHint: buildWebTestHint(config, task),
     memoryHint: buildMemoryHint(),
     serviceHint: buildServiceHint(opts.maxSessions || 50),
   });
@@ -203,7 +223,7 @@ function buildPlanPrompt(planPath) {
 
   let testRuleHint = '';
   if (assets.exists('testRule') && assets.exists('mcpConfig')) {
-    testRuleHint = '【Playwright 测试规则】项目已配置 Playwright MCP（.mcp.json），' +
+    testRuleHint = '【浏览器测试规则】项目已配置浏览器测试工具（.mcp.json），' +
       '`.claude-coder/assets/test_rule.md` 包含测试规范（Smart Snapshot、等待策略、步骤模板等）。' +
       '前端页面 test 类任务 steps 首步加入 `【规则】阅读 .claude-coder/assets/test_rule.md`。';
   }

package/src/core/repair.js

@@ -2,16 +2,10 @@
 
 const fs = require('fs');
 const path = require('path');
-const { runSession } = require('./session');
-const { buildQueryOptions } = require('./query');
 const { log } = require('../common/config');
+const { Session } = require('./session');
 
-/**
- * 使用 AI 修复损坏的 JSON 文件
- * @param {string} filePath - 文件绝对路径
- * @param {object} [opts] - 透传给 runSession 的选项
- */
-async function repairJsonFile(filePath, opts = {}) {
+async function executeRepair(config, filePath, opts = {}) {
   if (!fs.existsSync(filePath)) return;
 
   const rawContent = fs.readFileSync(filePath, 'utf8');
@@ -23,17 +17,13 @@ async function repairJsonFile(filePath, opts = {}) {
   const prompt = `文件 ${filePath} 的 JSON 格式已损坏，请修复并用 Write 工具写入原路径。\n\n当前损坏内容：\n${rawContent}`;
 
   try {
-    await runSession('repair', {
-      opts,
-      sessionNum: 0,
+    await Session.run('repair', config, {
       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);
+      async execute(session) {
+        const queryOpts = session.buildQueryOptions(opts);
+        await session.runQuery(prompt, queryOpts);
         log('ok', `AI 修复 ${fileName} 完成`);
         return {};
       },
@@ -43,4 +33,4 @@ async function repairJsonFile(filePath, opts = {}) {
   }
 }
 
-module.exports = { repairJsonFile };
+module.exports = { executeRepair };

package/src/core/runner.js

@@ -1,15 +1,20 @@
 'use strict';
 
+const { execSync } = require('child_process');
 const readline = require('readline');
-const { log, loadConfig } = require('../common/config');
+const { log } = 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');
+const { loadTasks, saveTasks, getFeatures, getStats, printStats } = require('../common/tasks');
+const { getGitHead, sleep, tryPush, killServices } = require('../common/utils');
+const { RETRY } = require('../common/constants');
+const {
+  loadState, saveState, selectNextTask, isAllDone,
+  appendProgress, incrementSession, markSimplifyDone,
+} = require('./state');
 
-// ─── Display Helpers ──────────────────────────────────────────
+const MAX_RETRY = RETRY.MAX_ATTEMPTS;
+
+// ─── Display Helpers ──────────────────────────────────────
 
 function printBanner(dryRun) {
   console.log('');
@@ -69,42 +74,296 @@ async function promptContinue() {
   });
 }
 
-// ─── Simplify Helper ─────────────────────────────────────────
+// ─── Lifecycle: Snapshot ──────────────────────────────────
+
+function snapshot(projectRoot, taskData) {
+  const nextTask = selectNextTask(taskData);
+  const taskId = nextTask?.id || 'unknown';
+
+  const state = loadState();
+  state.current_task_id = taskId;
+  saveState(state);
+
+  return {
+    headBefore: getGitHead(projectRoot),
+    taskId,
+  };
+}
+
+// ─── Lifecycle: Validation ────────────────────────────────
+
+function _validateSessionResult() {
+  if (!assets.exists('sessionResult')) {
+    log('error', 'Agent 未生成 session_result.json');
+    return { valid: false, reason: 'session_result.json 不存在' };
+  }
+
+  const raw = assets.readJson('sessionResult', null);
+  if (raw === null) {
+    log('warn', 'session_result.json 解析失败');
+    return { valid: false, reason: 'JSON 解析失败', rawContent: assets.read('sessionResult') };
+  }
+
+  const data = raw.current && typeof raw.current === 'object' ? raw.current : raw;
+  const { TASK_STATUSES } = require('../common/constants');
+
+  const required = ['session_result', 'status_after'];
+  const missing = required.filter(k => !(k in data));
+  if (missing.length > 0) {
+    log('warn', `session_result.json 缺少字段: ${missing.join(', ')}`);
+    return { valid: false, reason: `缺少字段: ${missing.join(', ')}`, data };
+  }
+
+  if (!['success', 'failed'].includes(data.session_result)) {
+    return { valid: false, reason: `无效 session_result: ${data.session_result}`, data };
+  }
+
+  if (!TASK_STATUSES.includes(data.status_after)) {
+    return { valid: false, reason: `无效 status_after: ${data.status_after}`, data };
+  }
+
+  const level = data.session_result === 'success' ? 'ok' : 'warn';
+  log(level, `session_result.json 合法 (${data.session_result})`);
+  return { valid: true, data };
+}
+
+function _checkGitProgress(headBefore, projectRoot) {
+  if (!headBefore) {
+    log('info', '未提供 head_before，跳过 git 检查');
+    return { hasCommit: false, warning: false };
+  }
+
+  const headAfter = getGitHead(projectRoot);
+
+  if (headBefore === headAfter) {
+    log('warn', '本次会话没有新的 git 提交');
+    return { hasCommit: false, warning: true };
+  }
+
+  try {
+    const msg = execSync('git log --oneline -1', { cwd: projectRoot, encoding: 'utf8' }).trim();
+    log('ok', `检测到新提交: ${msg}`);
+  } catch { /* ignore */ }
+
+  return { hasCommit: true, warning: false };
+}
+
+function _inferFromTasks(taskId) {
+  if (!taskId) return null;
+  const data = loadTasks();
+  if (!data) return null;
+  const task = getFeatures(data).find(f => f.id === taskId);
+  return task ? task.status : null;
+}
+
+async function validate(config, headBefore, taskId) {
+  const projectRoot = assets.projectRoot;
+  log('info', '========== 开始校验 ==========');
+
+  let srResult = _validateSessionResult();
+  const gitResult = _checkGitProgress(headBefore, projectRoot);
+
+  if (!srResult.valid && srResult.rawContent) {
+    const srPath = assets.path('sessionResult');
+    if (srPath) {
+      const { executeRepair } = require('./repair');
+      await executeRepair(config, srPath);
+      srResult = _validateSessionResult();
+    }
+  }
+
+  let fatal = false;
+  let hasWarnings = false;
+
+  if (srResult.valid) {
+    hasWarnings = gitResult.warning;
+  } else {
+    if (gitResult.hasCommit) {
+      const taskStatus = _inferFromTasks(taskId);
+      if (taskStatus === 'done' || taskStatus === 'testing') {
+        log('warn', `session_result.json 异常，但 tasks.json 显示 ${taskId} 已 ${taskStatus}，且有新提交，降级为警告`);
+      } else {
+        log('warn', 'session_result.json 异常，但有新提交，降级为警告（不回滚代码）');
+      }
+      hasWarnings = true;
+    } else {
+      log('error', '无新提交且 session_result.json 异常，视为致命');
+      fatal = true;
+    }
+  }
+
+  if (fatal) {
+    log('error', '========== 校验失败 (致命) ==========');
+  } else if (hasWarnings) {
+    log('warn', '========== 校验通过 (有警告) ==========');
+  } else {
+    log('ok', '========== 校验全部通过 ==========');
+  }
+
+  const reason = fatal ? (srResult.reason || '无新提交且 session_result.json 异常') : '';
+  return { fatal, hasWarnings, sessionData: srResult.data, reason };
+}
+
+// ─── Lifecycle: Rollback ──────────────────────────────────
+
+async function rollback(headBefore, reason) {
+  if (!headBefore || headBefore === 'none') return;
+
+  const projectRoot = assets.projectRoot;
+  killServices(projectRoot);
+  if (process.platform === 'win32') await sleep(1500);
+
+  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: projectRoot, stdio: 'pipe', env: gitEnv });
+      execSync('git clean -fd', { cwd: projectRoot, 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: _timestamp(),
+    reason: reason || 'harness 校验失败',
+    rollbackTo: headBefore,
+    success,
+  });
+}
+
+// ─── Lifecycle: Retry / Skip ──────────────────────────────
+
+function _markTaskFailed(taskId) {
+  if (!taskId) return;
+  const data = loadTasks();
+  if (!data) return;
+  const features = getFeatures(data);
+  const task = features.find(f => f.id === taskId);
+  if (task && task.status !== 'done') {
+    task.status = 'failed';
+    saveTasks(data);
+    log('warn', `已将任务 ${taskId} 强制标记为 failed`);
+  }
+}
+
+async function _handleRetryOrSkip(session, {
+  headBefore, taskId, sessionResult, consecutiveFailures, result, reason, lastFailMsg,
+}) {
+  const newFailures = consecutiveFailures + 1;
+  const exceeded = newFailures >= MAX_RETRY;
+
+  await rollback(headBefore, reason);
+
+  if (exceeded) {
+    log('error', `连续失败 ${MAX_RETRY} 次，跳过当前任务`);
+    _markTaskFailed(taskId);
+  }
+
+  const entry = { session, timestamp: _timestamp(), result, cost: sessionResult.cost, taskId };
+  if (result === 'fatal') entry.reason = reason;
+  appendProgress(entry);
+
+  if (exceeded) return { consecutiveFailures: 0, lastFailReason: '' };
+  return { consecutiveFailures: newFailures, lastFailReason: lastFailMsg };
+}
+
+// ─── Lifecycle: Session Outcome ───────────────────────────
+
+async function onSuccess(session, { taskId, sessionResult, validateResult }) {
+  incrementSession();
+
+  appendProgress({
+    session,
+    timestamp: _timestamp(),
+    result: 'success',
+    cost: sessionResult.cost,
+    taskId,
+    statusAfter: validateResult.sessionData?.status_after || null,
+    notes: validateResult.sessionData?.notes || null,
+  });
+
+  return { consecutiveFailures: 0, lastFailReason: '' };
+}
+
+async function onFailure(session, { headBefore, taskId, sessionResult, validateResult, consecutiveFailures }) {
+  const reason = validateResult.reason || '校验失败';
+  log('error', `Session ${session} 校验失败 (连续失败: ${consecutiveFailures + 1}/${MAX_RETRY})`);
+  return _handleRetryOrSkip(session, {
+    headBefore, taskId, sessionResult, consecutiveFailures,
+    result: 'fatal', reason,
+    lastFailMsg: `上次校验失败: ${reason}，代码已回滚`,
+  });
+}
+
+async function onStall(session, { headBefore, taskId, sessionResult, consecutiveFailures }) {
+  log('warn', `Session ${session} 因停顿超时中断，跳过校验直接重试`);
+  return _handleRetryOrSkip(session, {
+    headBefore, taskId, sessionResult, consecutiveFailures,
+    result: 'stalled', reason: '停顿超时',
+    lastFailMsg: '上次会话停顿超时，已回滚',
+  });
+}
+
+// ─── Lifecycle: Simplify Scheduling ───────────────────────
 
-async function tryRunSimplify(harness, config, msg, commitMsg) {
+function shouldSimplify(config) {
+  const { simplifyInterval } = config;
+  if (simplifyInterval <= 0) return false;
+  const state = loadState();
+  return state.session_count % simplifyInterval === 0;
+}
+
+function needsFinalSimplify(config) {
+  const { simplifyInterval } = config;
+  if (simplifyInterval <= 0) return false;
+  const state = loadState();
+  return state.last_simplify_session < state.session_count;
+}
+
+async function tryRunSimplify(config, msg) {
   log('info', msg || `每 ${config.simplifyInterval} 个成功 session 运行代码审查...`);
   try {
-    await simplify(null, { n: config.simplifyCommits });
-    harness.afterSimplify(commitMsg);
+    const { executeSimplify } = require('./simplify');
+    await executeSimplify(config, null, { n: config.simplifyCommits });
+    markSimplifyDone();
   } catch (err) {
     log('warn', `代码审查失败，跳过: ${err.message}`);
   }
 }
 
-// ─── Main Orchestration Loop ──────────────────────────────────
+// ─── Utilities ────────────────────────────────────────────
 
-async function run(opts = {}) {
-  const config = loadConfig();
-  const harness = new Harness(config);
+function _timestamp() {
+  return new Date().toISOString().replace(/[-:T]/g, '').slice(0, 12);
+}
+
+// ─── Main Orchestration Loop ──────────────────────────────
 
-  harness.ensureEnvironment();
+async function executeRun(config, opts = {}) {
+  if (!assets.exists('tasks')) {
+    throw new Error('tasks.json 不存在，请先运行 claude-coder plan 生成任务');
+  }
 
+  const projectRoot = assets.projectRoot;
   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} 个会话) ...`);
@@ -118,7 +377,10 @@ async function run(opts = {}) {
     let taskData = loadTasks();
     if (!taskData) {
       const tasksPath = assets.path('tasks');
-      if (tasksPath) await repairJsonFile(tasksPath);
+      if (tasksPath) {
+        const { executeRepair } = require('./repair');
+        await executeRepair(config, tasksPath);
+      }
       taskData = loadTasks();
       if (!taskData) {
         log('error', 'tasks.json 无法读取且修复失败，终止循环');
@@ -126,12 +388,12 @@ async function run(opts = {}) {
       }
     }
 
-    if (harness.isAllDone(taskData)) {
+    if (isAllDone(taskData)) {
       if (!dryRun) {
-        if (harness.needsFinalSimplify()) {
-          await tryRunSimplify(harness, config, '所有任务完成，运行最终代码审查...', 'style: final simplify');
+        if (needsFinalSimplify(config)) {
+          await tryRunSimplify(config, '所有任务完成，运行最终代码审查...');
         }
-        harness.tryPush();
+        tryPush(projectRoot);
       }
       console.log('');
       log('ok', '所有任务已完成！');
@@ -146,10 +408,11 @@ async function run(opts = {}) {
       break;
     }
 
-    const { headBefore, taskId } = harness.snapshot(taskData);
+    const { headBefore, taskId } = snapshot(projectRoot, taskData);
 
-    const sessionResult = await runCodingSession(session, {
-      projectRoot: harness.projectRoot,
+    const { executeCoding } = require('./coding');
+    const sessionResult = await executeCoding(config, session, {
+      projectRoot,
       taskId,
       consecutiveFailures: state.consecutiveFailures,
       maxSessions,
@@ -157,24 +420,24 @@ async function run(opts = {}) {
     });
 
     if (sessionResult.stalled) {
-      state = await harness.onStall(session, { headBefore, taskId, sessionResult, ...state });
+      state = await onStall(session, { headBefore, taskId, sessionResult, ...state });
       continue;
     }
 
     log('info', '开始 harness 校验 ...');
-    const validateResult = await harness.validate(headBefore, taskId);
+    const validateResult = await validate(config, 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 });
+      state = await onSuccess(session, { taskId, sessionResult, validateResult });
 
-      if (harness.shouldSimplify()) {
-        await tryRunSimplify(harness, config);
+      if (shouldSimplify(config)) {
+        await tryRunSimplify(config);
       }
-      harness.tryPush();
+      tryPush(projectRoot);
     } else {
-      state = await harness.onFailure(session, { headBefore, taskId, sessionResult, validateResult, ...state });
+      state = await onFailure(session, { headBefore, taskId, sessionResult, validateResult, ...state });
     }
 
     if (pauseEvery > 0 && session % pauseEvery === 0) {
@@ -187,9 +450,9 @@ async function run(opts = {}) {
     }
   }
 
-  harness.cleanup();
+  killServices(projectRoot);
   printEndBanner();
   printStats();
 }
 
-module.exports = { run };
+module.exports = { executeRun };