claude-coder 1.5.6 → 1.6.2

package/src/auth.js

@@ -1,9 +1,10 @@
 'use strict';
 
 const fs = require('fs');
+const os = require('os');
 const path = require('path');
 const { execSync } = require('child_process');
-const { paths, log, getProjectRoot, ensureLoopDir } = require('./config');
+const { paths, loadConfig, log, getProjectRoot, ensureLoopDir } = require('./config');
 
 function updateGitignore(entry) {
   const gitignorePath = path.join(getProjectRoot(), '.gitignore');
@@ -18,30 +19,35 @@ function updateGitignore(entry) {
   log('ok', `.gitignore 已添加: ${entry}`);
 }
 
-function updateMcpConfig(browserProfileDir) {
-  const p = paths();
+function updateMcpConfig(p, mode) {
   let mcpConfig = {};
   if (fs.existsSync(p.mcpConfig)) {
-    try {
-      mcpConfig = JSON.parse(fs.readFileSync(p.mcpConfig, 'utf8'));
-    } catch {
-      log('warn', '.mcp.json 解析失败，将覆盖');
-    }
+    try { mcpConfig = JSON.parse(fs.readFileSync(p.mcpConfig, 'utf8')); } catch {}
   }
 
   if (!mcpConfig.mcpServers) mcpConfig.mcpServers = {};
 
-  const relProfileDir = path.relative(getProjectRoot(), browserProfileDir);
-  mcpConfig.mcpServers.playwright = {
-    command: 'npx',
-    args: [
-      '@playwright/mcp@latest',
-      `--user-data-dir=${relProfileDir}`,
-    ],
-  };
+  const args = ['@playwright/mcp@latest'];
 
+  switch (mode) {
+    case 'persistent': {
+      const relProfile = path.relative(getProjectRoot(), p.browserProfile).split(path.sep).join('/');
+      args.push(`--user-data-dir=${relProfile}`);
+      break;
+    }
+    case 'isolated': {
+      const relAuth = path.relative(getProjectRoot(), p.playwrightAuth).split(path.sep).join('/');
+      args.push('--isolated', `--storage-state=${relAuth}`);
+      break;
+    }
+    case 'extension':
+      args.push('--extension');
+      break;
+  }
+
+  mcpConfig.mcpServers.playwright = { command: 'npx', args };
   fs.writeFileSync(p.mcpConfig, JSON.stringify(mcpConfig, null, 2) + '\n', 'utf8');
-  log('ok', `.mcp.json 已配置 Playwright MCP (user-data-dir: ${relProfileDir})`);
+  log('ok', `.mcp.json 已配置 Playwright MCP (${mode} 模式)`);
 }
 
 function enableMcpPlaywrightEnv() {
@@ -59,33 +65,108 @@ function enableMcpPlaywrightEnv() {
   log('ok', '.claude-coder/.env 已设置 MCP_PLAYWRIGHT=true');
 }
 
-async function auth(url) {
-  ensureLoopDir();
-  const p = paths();
-  const targetUrl = url || 'http://localhost:3000';
+// ── persistent 模式：启动持久化浏览器让用户登录 ──
 
-  if (!fs.existsSync(p.browserProfile))
-    fs.mkdirSync(p.browserProfile, { recursive: true });
+async function authPersistent(url, p) {
+  const profileDir = p.browserProfile;
+  if (!fs.existsSync(profileDir)) fs.mkdirSync(profileDir, { recursive: true });
 
-  log('info', '启动 Playwright 浏览器，请手动登录...');
-  log('info', `目标 URL: ${targetUrl}`);
-  log('info', `浏览器配置将持久化到: ${p.browserProfile}`);
+  const lockFile = path.join(profileDir, 'SingletonLock');
+  if (fs.existsSync(lockFile)) {
+    fs.unlinkSync(lockFile);
+    log('warn', '已清理残留的 SingletonLock（上次浏览器未正常关闭）');
+  }
+
+  console.log('操作步骤:');
+  console.log('  1. 浏览器将自动打开，请手动完成登录');
+  console.log('  2. 登录成功后关闭浏览器窗口');
+  console.log('  3. 登录状态将保存在持久化配置中');
+  console.log('  4. MCP 后续会话自动复用此登录状态');
   console.log('');
+
+  const scriptContent = [
+    `let chromium;`,
+    `try { chromium = require('playwright').chromium; } catch {`,
+    `  try { chromium = require('@playwright/test').chromium; } catch {`,
+    `    console.error('错误: 未找到 playwright 模块');`,
+    `    console.error('请安装: npx playwright install chromium');`,
+    `    process.exit(1);`,
+    `  }`,
+    `}`,
+    `(async () => {`,
+    `  const ctx = await chromium.launchPersistentContext(${JSON.stringify(profileDir)}, { headless: false });`,
+    `  const page = ctx.pages()[0] || await ctx.newPage();`,
+    `  try { await page.goto(${JSON.stringify(url)}); } catch {}`,
+    `  console.log('请在浏览器中完成登录后关闭窗口...');`,
+    `  await new Promise(r => {`,
+    `    ctx.on('close', r);`,
+    `    const t = setInterval(() => { try { if (!ctx.pages().length) { clearInterval(t); r(); } } catch { clearInterval(t); r(); } }, 2000);`,
+    `  });`,
+    `  try { await ctx.close(); } catch {}`,
+    `})().then(() => process.exit(0)).catch(() => process.exit(0));`,
+  ].join('\n');
+
+  const tmpScript = path.join(os.tmpdir(), `pw-auth-${Date.now()}.js`);
+  fs.writeFileSync(tmpScript, scriptContent);
+
+  const helperModules = path.join(__dirname, '..', 'node_modules');
+  const existingNodePath = process.env.NODE_PATH || '';
+  const nodePath = existingNodePath ? `${helperModules}:${existingNodePath}` : helperModules;
+
+  let scriptOk = false;
+  try {
+    execSync(`node "${tmpScript}"`, {
+      stdio: 'inherit',
+      cwd: getProjectRoot(),
+      env: { ...process.env, NODE_PATH: nodePath },
+    });
+    scriptOk = true;
+  } catch {
+    // 浏览器关闭时可能返回非零退出码，只要 profile 目录有内容就认为成功
+    const profileFiles = fs.readdirSync(profileDir);
+    scriptOk = profileFiles.length > 2;
+    if (!scriptOk) {
+      log('error', 'Playwright 启动失败，且未检测到有效的浏览器配置');
+      log('info', '请确保已安装 Chromium: npx playwright install chromium');
+      try { fs.unlinkSync(tmpScript); } catch {}
+      return;
+    }
+    log('warn', '浏览器退出码非零，但已检测到有效配置，继续...');
+  }
+
+  try { fs.unlinkSync(tmpScript); } catch {}
+
+  log('ok', '登录状态已保存到持久化配置');
+  updateMcpConfig(p, 'persistent');
+  updateGitignore('.claude-coder/.runtime/browser-profile');
+  enableMcpPlaywrightEnv();
+
+  console.log('');
+  log('ok', '配置完成！');
+  const relProfile = path.relative(getProjectRoot(), profileDir);
+  log('info', `MCP 使用 persistent 模式 (user-data-dir: ${relProfile})`);
+  log('info', '如需更新登录状态，重新运行 claude-coder auth');
+}
+
+// ── isolated 模式：使用 codegen 录制 storage-state ──
+
+async function authIsolated(url, p) {
   console.log('操作步骤:');
   console.log('  1. 浏览器将自动打开，请手动完成登录');
   console.log('  2. 登录成功后关闭浏览器窗口');
-  console.log('  3. 登录状态（cookies + localStorage）将保存为快照备份');
+  console.log('  3. 登录状态（cookies + localStorage）将保存到 playwright-auth.json');
+  console.log('  4. MCP 每次会话自动从此文件加载初始状态');
   console.log('');
 
   try {
     execSync(
-      `npx playwright codegen --save-storage="${p.playwrightAuth}" "${targetUrl}"`,
+      `npx playwright codegen --save-storage="${p.playwrightAuth}" "${url}"`,
       { stdio: 'inherit', cwd: getProjectRoot() }
     );
   } catch (err) {
     if (!fs.existsSync(p.playwrightAuth)) {
       log('error', `Playwright 登录状态导出失败: ${err.message}`);
-      log('info', '请确保已安装 playwright: npx playwright install');
+      log('info', '请确保已安装: npx playwright install chromium');
       return;
     }
   }
@@ -95,18 +176,70 @@ async function auth(url) {
     return;
   }
 
-  log('ok', '登录状态快照已保存（备份参考）');
-
-  updateMcpConfig(p.browserProfile);
+  log('ok', '登录状态已保存到 playwright-auth.json');
+  updateMcpConfig(p, 'isolated');
   updateGitignore('.claude-coder/playwright-auth.json');
-  updateGitignore('.claude-coder/browser-profile/');
   enableMcpPlaywrightEnv();
 
   console.log('');
-  log('ok', '持久化浏览器配置完成！');
-  log('info', 'MCP 使用 --user-data-dir 持久化模式，登录状态跨会话保持');
-  log('info', '首次 MCP 会话时需在浏览器窗口中登录一次，之后永久保持');
-  log('info', 'cookies 自动续期，无需手动重新运行 claude-coder auth');
+  log('ok', '配置完成！');
+  log('info', 'MCP 使用 isolated 模式 (storage-state)');
+  log('info', 'cookies 和 localStorage 每次会话自动从 playwright-auth.json 加载');
+  log('info', '如需更新登录状态，重新运行 claude-coder auth');
+}
+
+// ── extension 模式：连接真实浏览器 ──
+
+function authExtension(p) {
+  console.log('Extension 模式说明:');
+  console.log('');
+  console.log('  此模式通过 Chrome 扩展连接到您正在运行的浏览器。');
+  console.log('  MCP 将直接使用浏览器中已有的登录态和扩展。');
+  console.log('');
+  console.log('  前置条件:');
+  console.log('  1. 安装 "Playwright MCP Bridge" Chrome/Edge 扩展');
+  console.log('     https://chromewebstore.google.com/detail/playwright-mcp-bridge/mmlmfjhmonkocbjadbfplnigmagldckm');
+  console.log('  2. 确保浏览器已启动且扩展已启用');
+  console.log('  3. 无需额外认证操作，您的浏览器登录态将自动可用');
+  console.log('');
+
+  updateMcpConfig(p, 'extension');
+  enableMcpPlaywrightEnv();
+
+  console.log('');
+  log('ok', '配置完成！');
+  log('info', 'MCP 使用 extension 模式（连接真实浏览器）');
+  log('info', '确保 Chrome/Edge 已运行且 Playwright MCP Bridge 扩展已启用');
+}
+
+// ── 主入口 ──
+
+async function auth(url) {
+  ensureLoopDir();
+  const config = loadConfig();
+  const p = paths();
+  const mode = config.playwrightMode;
+  const targetUrl = url || 'http://localhost:3000';
+
+  log('info', `Playwright 模式: ${mode}`);
+  log('info', `目标 URL: ${targetUrl}`);
+  console.log('');
+
+  switch (mode) {
+    case 'persistent':
+      await authPersistent(targetUrl, p);
+      break;
+    case 'isolated':
+      await authIsolated(targetUrl, p);
+      break;
+    case 'extension':
+      authExtension(p);
+      break;
+    default:
+      log('error', `未知的 Playwright 模式: ${mode}`);
+      log('info', '请运行 claude-coder setup 重新配置');
+      return;
+  }
 }
 
-module.exports = { auth };
+module.exports = { auth, updateMcpConfig };

package/src/config.js

@@ -57,13 +57,12 @@ function paths() {
     testsFile:        path.join(loopDir, 'tests.json'),
     testEnvFile:      path.join(loopDir, 'test.env'),
     playwrightAuth:   path.join(loopDir, 'playwright-auth.json'),
-    browserProfile:   path.join(loopDir, 'browser-profile'),
+    browserProfile:   path.join(runtime, 'browser-profile'),
     mcpConfig:        path.join(getProjectRoot(), '.mcp.json'),
     claudeMd:         getTemplatePath('CLAUDE.md'),
     scanProtocol:     getTemplatePath('SCAN_PROTOCOL.md'),
+    testRuleTemplate: getTemplatePath('test_rule.md'),
     runtime,
-    phaseFile:        path.join(runtime, 'phase'),
-    stepFile:         path.join(runtime, 'step'),
     logsDir:          path.join(runtime, 'logs'),
   };
 }
@@ -99,7 +98,7 @@ function loadConfig() {
     timeoutMs: parseInt(env.API_TIMEOUT_MS, 10) || 3000000,
     mcpToolTimeout: parseInt(env.MCP_TOOL_TIMEOUT, 10) || 30000,
     mcpPlaywright: env.MCP_PLAYWRIGHT === 'true',
-    debug: env.CLAUDE_DEBUG || '',
+    playwrightMode: env.MCP_PLAYWRIGHT_MODE || 'persistent',
     disableNonessential: env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC || '',
     effortLevel: env.CLAUDE_CODE_EFFORT_LEVEL || '',
     smallFastModel: env.ANTHROPIC_SMALL_FAST_MODEL || '',
@@ -108,6 +107,7 @@ function loadConfig() {
     defaultHaiku: env.ANTHROPIC_DEFAULT_HAIKU_MODEL || '',
     thinkingBudget: env.ANTHROPIC_THINKING_BUDGET || '',
     stallTimeout: parseInt(env.SESSION_STALL_TIMEOUT, 10) || 1800,
+    editThreshold: parseInt(env.EDIT_THRESHOLD, 10) || 15,
     raw: env,
   };
 
@@ -191,6 +191,21 @@ function syncToGlobal() {
   log('ok', `已同步配置到 ${settingsPath}`);
 }
 
+function updateEnvVar(key, value) {
+  const p = paths();
+  if (!fs.existsSync(p.envFile)) return false;
+  let content = fs.readFileSync(p.envFile, 'utf8');
+  const regex = new RegExp(`^${key}=.*$`, 'm');
+  if (regex.test(content)) {
+    content = content.replace(regex, `${key}=${value}`);
+  } else {
+    const suffix = content.endsWith('\n') ? '' : '\n';
+    content += `${suffix}${key}=${value}\n`;
+  }
+  fs.writeFileSync(p.envFile, content, 'utf8');
+  return true;
+}
+
 module.exports = {
   COLOR,
   log,
@@ -204,4 +219,5 @@ module.exports = {
   buildEnvVars,
   getAllowedTools,
   syncToGlobal,
+  updateEnvVar,
 };

package/src/hooks.js

@@ -3,7 +3,7 @@
 const { inferPhaseStep } = require('./indicator');
 const { log } = require('./config');
 
-const EDIT_THRESHOLD = 5;
+const DEFAULT_EDIT_THRESHOLD = 30;
 
 function logToolCall(logStream, input) {
   if (!logStream) return;
@@ -31,6 +31,7 @@ function createSessionHooks(indicator, logStream, options = {}) {
     enableStallDetection = false,
     stallTimeoutMs = 1800000,
     enableEditGuard = false,
+    editThreshold = DEFAULT_EDIT_THRESHOLD,
   } = options;
 
   const editCounts = {};
@@ -62,7 +63,7 @@ function createSessionHooks(indicator, logStream, options = {}) {
           const target = input.tool_input?.file_path || input.tool_input?.path || '';
           if (['Write', 'Edit', 'MultiEdit'].includes(input.tool_name) && target) {
             editCounts[target] = (editCounts[target] || 0) + 1;
-            if (editCounts[target] > EDIT_THRESHOLD) {
+            if (editCounts[target] > editThreshold) {
               return {
                 decision: 'block',
                 message: `已对 ${target} 编辑 ${editCounts[target]} 次，疑似死循环。请重新审视方案后再继续。`,
@@ -73,7 +74,16 @@ function createSessionHooks(indicator, logStream, options = {}) {
 
         return {};
       }]
-    }]
+    }],
+    PostToolUse: [{
+      matcher: '*',
+      hooks: [async () => {
+        indicator.updatePhase('thinking');
+        indicator.updateStep('');
+        indicator.toolTarget = '';
+        return {};
+      }]
+    }],
   };
 
   return {

package/src/indicator.js

@@ -1,9 +1,8 @@
 'use strict';
 
-const fs = require('fs');
-const { paths, COLOR } = require('./config');
+const { COLOR } = require('./config');
 
-const SPINNERS = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+const SPINNERS = ['⠋', '⠙', '⠸', '⠴', '⠦', '⠇'];
 
 class Indicator {
   constructor() {
@@ -16,15 +15,14 @@ class Indicator {
     this.lastToolTime = Date.now();
     this.sessionNum = 0;
     this.startTime = Date.now();
-    this._lastContentKey = '';
-    this._lastRenderTime = 0;
+    this.stallTimeoutMin = 30;
   }
 
-  start(sessionNum) {
+  start(sessionNum, stallTimeoutMin) {
     this.sessionNum = sessionNum;
     this.startTime = Date.now();
-    this._lastRenderTime = Date.now();
-    this.timer = setInterval(() => this._render(), 500);
+    if (stallTimeoutMin > 0) this.stallTimeoutMin = stallTimeoutMin;
+    this.timer = setInterval(() => this._render(), 1000);
   }
 
   stop() {
@@ -37,26 +35,16 @@ class Indicator {
 
   updatePhase(phase) {
     this.phase = phase;
-    this._writePhaseFile();
   }
 
   updateStep(step) {
     this.step = step;
-    this._writeStepFile();
   }
 
   appendActivity(toolName, summary) {
     this.lastActivity = `${toolName}: ${summary}`;
   }
 
-  _writePhaseFile() {
-    try { fs.writeFileSync(paths().phaseFile, this.phase, 'utf8'); } catch { /* ignore */ }
-  }
-
-  _writeStepFile() {
-    try { fs.writeFileSync(paths().stepFile, this.step, 'utf8'); } catch { /* ignore */ }
-  }
-
   getStatusLine() {
     const now = new Date();
     const hh = String(now.getHours()).padStart(2, '0');
@@ -78,32 +66,26 @@ class Indicator {
 
     let line = `${spinner} [Session ${this.sessionNum}] ${clock} ${phaseLabel} ${mm}:${ss}`;
     if (idleMin >= 2) {
-      line += ` | ${COLOR.red}${idleMin}分无工具调用${COLOR.reset}`;
+      line += ` | ${COLOR.red}${idleMin}分无工具调用（等待模型响应, ${this.stallTimeoutMin}分钟超时自动中断）${COLOR.reset}`;
     }
     if (this.step) {
       line += ` | ${this.step}`;
-      if (this.toolTarget) line += `: ${this.toolTarget}`;
+      if (this.toolTarget) {
+        const cols = process.stderr.columns || 80;
+        const usedWidth = line.replace(/\x1b\[[^m]*m/g, '').length;
+        const availWidth = Math.max(15, cols - usedWidth - 4);
+        const target = this.toolTarget.length > availWidth
+          ? '…' + this.toolTarget.slice(-(availWidth - 1))
+          : this.toolTarget;
+        line += `: ${target}`;
+      }
     }
     return line;
   }
 
   _render() {
     this.spinnerIndex++;
-    const contentKey = `${this.phase}|${this.step}|${this.toolTarget}`;
-    const now = Date.now();
-    const contentChanged = contentKey !== this._lastContentKey;
-
-    if (!contentChanged && now - this._lastRenderTime < 3000) {
-      return;
-    }
-    this._lastContentKey = contentKey;
-    this._lastRenderTime = now;
-
-    const line = this.getStatusLine();
-    const maxWidth = process.stderr.columns || 80;
-    const truncated = line.length > maxWidth + 20 ? line.slice(0, maxWidth + 20) : line;
-
-    process.stderr.write(`\r\x1b[K${truncated}`);
+    process.stderr.write(`\r\x1b[K${this.getStatusLine()}`);
   }
 }
 
@@ -112,7 +94,7 @@ function extractFileTarget(toolInput) {
     ? (toolInput.file_path || toolInput.path || '')
     : '';
   if (!raw) return '';
-  return raw.split('/').slice(-2).join('/').slice(0, 40);
+  return raw.split('/').slice(-2).join('/');
 }
 
 function extractBashLabel(cmd) {
@@ -126,7 +108,7 @@ function extractBashLabel(cmd) {
 function extractBashTarget(cmd) {
   let clean = cmd.replace(/^(?:cd\s+\S+\s*&&\s*)+/g, '').trim();
   clean = clean.split(/\s*(?:\|{1,2}|;|&&|2>&1|>\s*\/dev\/null)\s*/)[0].trim();
-  return clean.slice(0, 40);
+  return clean;
 }
 
 function inferPhaseStep(indicator, toolName, toolInput) {

package/src/prompts.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const fs = require('fs');
+const path = require('path');
 const { paths, loadConfig, getProjectRoot } = require('./config');
 const { loadTasks, findNextTask, getStats } = require('./tasks');
 
@@ -97,12 +98,23 @@ function buildCodingPrompt(sessionNum, opts = {}) {
     testEnvHint = `如需持久化测试凭证（API Key、测试账号密码等），写入 ${projectRoot}/.claude-coder/test.env（KEY=value 格式，每行一个）。后续 session 会自动感知。`;
   }
 
-  // Hint 6c: Playwright persistent browser profile
+  // Hint 6c: Playwright mode awareness
   let playwrightAuthHint = '';
-  if (fs.existsSync(p.browserProfile)) {
-    playwrightAuthHint = `已检测到持久化浏览器配置（${projectRoot}/.claude-coder/browser-profile/），MCP 使用 --user-data-dir 模式，登录状态跨会话自动保持。首次访问需登录的页面时，用户需在浏览器窗口中手动完成登录。`;
-  } else if (fs.existsSync(p.playwrightAuth)) {
-    playwrightAuthHint = `已检测到 Playwright 登录状态快照（${projectRoot}/.claude-coder/playwright-auth.json），建议运行 claude-coder auth 升级到持久化浏览器模式以获得更好的登录保持效果。`;
+  if (config.mcpPlaywright) {
+    const mode = config.playwrightMode;
+    switch (mode) {
+      case 'persistent':
+        playwrightAuthHint = 'Playwright MCP 使用 persistent 模式（user-data-dir），浏览器登录状态持久保存在本地配置中，无需额外登录操作。';
+        break;
+      case 'isolated':
+        playwrightAuthHint = fs.existsSync(p.playwrightAuth)
+          ? `Playwright MCP 使用 isolated 模式，已检测到登录状态文件（playwright-auth.json），每次会话自动加载 cookies 和 localStorage。`
+          : 'Playwright MCP 使用 isolated 模式，但未检测到登录状态文件。如目标页面需要登录，请先运行 claude-coder auth <URL>。';
+        break;
+      case 'extension':
+        playwrightAuthHint = 'Playwright MCP 使用 extension 模式，已连接用户真实浏览器，直接复用浏览器已有的登录态和扩展。注意：操作会影响用户正在使用的浏览器。';
+        break;
+    }
   }
 
   // Hint 7: Session memory (read flat session_result.json)
@@ -110,9 +122,9 @@ function buildCodingPrompt(sessionNum, opts = {}) {
   if (fs.existsSync(p.sessionResult)) {
     try {
       const sr = JSON.parse(fs.readFileSync(p.sessionResult, 'utf8'));
-      if (sr?.task_id) {
-        memoryHint = `上次会话: ${sr.task_id} → ${sr.status_after || sr.session_result}` +
-          (sr.notes ? `, 要点: ${sr.notes.slice(0, 100)}` : '') + '。';
+      if (sr?.session_result) {
+        memoryHint = `上次会话: ${sr.session_result}（${sr.status_before || '?'} → ${sr.status_after || '?'}）` +
+          (sr.notes ? `, 要点: ${sr.notes.slice(0, 150)}` : '') + '。';
       }
     } catch { /* ignore */ }
   }
@@ -200,7 +212,7 @@ function buildScanPrompt(projectType, requirement) {
     'profile 质量要求（必须遵守，harness 会校验）：',
     '- services 数组必须包含所有可启动服务（command、port、health_check），不得为空',
     '- existing_docs 必须列出所有实际存在的文档路径',
-    '- 前后端分离项目必须生成 docs/ARCHITECTURE.md（模块职责、数据流、API 路由），并加入 existing_docs',
+    '- 检查 .claude/CLAUDE.md 是否存在，若无则生成（WHAT/WHY/HOW 格式：技术栈、关键决策、开发命令、关键路径、编码规则），并加入 existing_docs',
     '- scan_files_checked 必须列出所有实际扫描过的文件',
     '',
     '步骤 3：根据以下指导分解任务到 tasks.json（格式见 CLAUDE.md）：',
@@ -265,6 +277,21 @@ function buildAddPrompt(instruction) {
     }
   } catch { /* ignore */ }
 
+  // --- Conditional: Playwright test rule hint ---
+  let testRuleHint = '';
+  const testRulePath = path.join(p.loopDir, 'test_rule.md');
+  const hasMcp = fs.existsSync(p.mcpConfig);
+  if (fs.existsSync(testRulePath) && hasMcp) {
+    testRuleHint = [
+      '【Playwright 测试规则】项目已配置 Playwright MCP（.mcp.json），' +
+      '`.claude-coder/test_rule.md` 中包含通用测试指导规则（Smart Snapshot、Token 预算控制、三步测试方法论、等待策略等）。',
+      '当任务涉及端到端测试时：',
+      '  - 在 steps 中第一步加入「阅读 .claude-coder/test_rule.md 了解测试规范和成本控制」',
+      '  - 测试步骤按 test_rule.md 中的 tasks.json 模板格式编写（含环境检查、优先级标注、预算控制）',
+      '  - 设定合理的 test_tier（unit/smoke/regression/full_e2e）',
+    ].join('\n');
+  }
+
   return [
     // --- Primacy zone: role + identity ---
     '你是资深需求分析师，擅长将模糊需求分解为可执行的原子任务。',
@@ -287,12 +314,13 @@ function buildAddPrompt(instruction) {
     '5. 分解任务：每个任务对应一个独立可测试的功能单元，description 简明（40字内），steps 具体可操作',
     '6. 追加到 tasks.json，id 和 priority 从已有最大值递增，status: pending',
     '7. git add -A && git commit -m "chore: add new tasks"',
-    '8. 写入 session_result.json（格式：{ "session_result": "success", "task_id": "add-tasks", "status_before": "N/A", "status_after": "N/A", "git_commit": "hash", "tests_passed": false, "notes": "追加了 N 个任务：简述" }）',
+    '8. 写入 session_result.json（格式：{ "session_result": "success", "status_before": "N/A", "status_after": "N/A", "notes": "追加了 N 个任务：简述" }）',
     '',
 
     // --- Quality constraints ---
     taskGuide,
     '',
+    testRuleHint,
     '不修改已有任务，不实现代码。',
     '',
 

package/src/runner.js

@@ -286,7 +286,7 @@ async function run(requirement, opts = {}) {
     }
 
     log('info', '开始 harness 校验 ...');
-    const validateResult = await validate(headBefore);
+    const validateResult = await validate(headBefore, taskId);
 
     if (!validateResult.fatal) {
       if (validateResult.hasWarnings) {
@@ -302,7 +302,7 @@ async function run(requirement, opts = {}) {
         timestamp: new Date().toISOString(),
         result: 'success',
         cost: sessionResult.cost,
-        taskId: validateResult.sessionData?.task_id || taskId,
+        taskId,
         statusAfter: validateResult.sessionData?.status_after || null,
         notes: validateResult.sessionData?.notes || null,
       });
@@ -375,8 +375,20 @@ async function add(instruction, opts = {}) {
     process.exit(1);
   }
 
+  deployTestRule(p);
+
   await runAddSession(instruction, { projectRoot, ...opts });
   printStats();
 }
 
+function deployTestRule(p) {
+  const dest = path.join(p.loopDir, 'test_rule.md');
+  if (fs.existsSync(dest)) return;
+  if (!fs.existsSync(p.testRuleTemplate)) return;
+  try {
+    fs.copyFileSync(p.testRuleTemplate, dest);
+    log('ok', '已部署测试指导规则 → .claude-coder/test_rule.md');
+  } catch { /* ignore */ }
+}
+
 module.exports = { run, add };

package/src/session.js

@@ -132,9 +132,11 @@ async function runCodingSession(sessionNum, opts = {}) {
     enableStallDetection: true,
     stallTimeoutMs,
     enableEditGuard: true,
+    editThreshold: config.editThreshold,
   });
 
-  indicator.start(sessionNum);
+  const stallTimeoutMin = Math.floor(stallTimeoutMs / 60000);
+  indicator.start(sessionNum, stallTimeoutMin);
 
   try {
     const queryOpts = buildQueryOptions(config, opts);
@@ -202,7 +204,7 @@ async function runScanSession(requirement, opts = {}) {
     stallTimeoutMs,
   });
 
-  indicator.start(0);
+  indicator.start(0, Math.floor(stallTimeoutMs / 60000));
   log('info', `正在调用 Claude Code 执行项目扫描（${projectType}项目）...`);
 
   try {
@@ -263,7 +265,7 @@ async function runAddSession(instruction, opts = {}) {
     stallTimeoutMs,
   });
 
-  indicator.start(0);
+  indicator.start(0, Math.floor(stallTimeoutMs / 60000));
   log('info', '正在追加任务...');
 
   try {