claude-coder 1.7.0 → 1.8.0

package/src/common/logging.js

@@ -0,0 +1,77 @@
+'use strict';
+
+const { localTimestamp } = require('./utils');
+
+/**
+ * 处理 SDK 消息并写入日志流
+ * @param {object} message - SDK 消息对象
+ * @param {import('fs').WriteStream} logStream - 日志写入流
+ * @param {object} indicator - Indicator 实例（可选）
+ */
+function logMessage(message, logStream, indicator) {
+  if (message.type === 'assistant' && message.message?.content) {
+    for (const block of message.message.content) {
+      if (block.type === 'text' && block.text) {
+        if (indicator) indicator.updateActivity();
+        process.stdout.write(block.text);
+        if (logStream) logStream.write(block.text);
+      }
+      if (block.type === 'tool_use' && logStream) {
+        logStream.write(`[TOOL_USE] ${block.name}: ${JSON.stringify(block.input).slice(0, 300)}\n`);
+      }
+    }
+  }
+
+  if (message.type === 'tool_result') {
+    if (indicator) indicator.updateActivity();
+    if (logStream) {
+      const isErr = message.is_error || false;
+      const content = typeof message.content === 'string'
+        ? message.content.slice(0, 500)
+        : JSON.stringify(message.content).slice(0, 500);
+      if (isErr) {
+        logStream.write(`[TOOL_ERROR] ${content}\n`);
+      }
+    }
+  }
+}
+
+/**
+ * 从消息列表中提取结果消息
+ * @param {Array} messages - 消息列表
+ * @returns {object|null} 结果消息
+ */
+function extractResult(messages) {
+  for (let i = messages.length - 1; i >= 0; i--) {
+    if (messages[i].type === 'result') return messages[i];
+  }
+  return null;
+}
+
+/**
+ * 从消息列表中提取结果文本
+ * @param {Array} messages - 消息列表
+ * @returns {string} 结果文本
+ */
+function extractResultText(messages) {
+  const result = extractResult(messages);
+  return result?.result || '';
+}
+
+/**
+ * 写入 session 分隔符到日志
+ * @param {import('fs').WriteStream} logStream - 日志写入流
+ * @param {number} sessionNum - session 编号
+ * @param {string} label - 标签
+ */
+function writeSessionSeparator(logStream, sessionNum, label) {
+  const sep = '='.repeat(60);
+  logStream.write(`\n${sep}\n[Session ${sessionNum}] ${label} ${localTimestamp()}\n${sep}\n`);
+}
+
+module.exports = {
+  logMessage,
+  extractResult,
+  extractResultText,
+  writeSessionSeparator,
+};

package/src/common/sdk.js

@@ -0,0 +1,51 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const { log } = require('./config');
+
+let _sdkModule = null;
+
+/**
+ * 加载 Claude Agent SDK
+ */
+async function loadSDK() {
+  if (_sdkModule) return _sdkModule;
+
+  const pkgName = '@anthropic-ai/claude-agent-sdk';
+  const attempts = [
+    () => import(pkgName),
+    () => {
+      const { createRequire } = require('module');
+      const resolved = createRequire(__filename).resolve(pkgName);
+      return import(resolved);
+    },
+    () => {
+      const { createRequire } = require('module');
+      const resolved = createRequire(path.join(process.cwd(), 'noop.js')).resolve(pkgName);
+      return import(resolved);
+    },
+    () => {
+      const { execSync } = require('child_process');
+      const globalRoot = execSync('npm root -g', { encoding: 'utf8' }).trim();
+      const sdkDir = path.join(globalRoot, pkgName);
+      const pkgJson = JSON.parse(fs.readFileSync(path.join(sdkDir, 'package.json'), 'utf8'));
+      const entry = pkgJson.exports?.['.'] || pkgJson.main || 'index.js';
+      const entryFile = typeof entry === 'object' ? (entry.import || entry.default || entry.node) : entry;
+      return import(path.join(sdkDir, entryFile));
+    },
+  ];
+
+  for (const attempt of attempts) {
+    try {
+      _sdkModule = await attempt();
+      return _sdkModule;
+    } catch { /* try next */ }
+  }
+
+  log('error', `未找到 ${pkgName}`);
+  log('error', `请先安装：npm install -g ${pkgName}`);
+  process.exit(1);
+}
+
+module.exports = { loadSDK };

package/src/{tasks.js → common/tasks.js}

@@ -1,172 +1,157 @@
-'use strict';
-
-const fs = require('fs');
-const { paths, log, COLOR } = require('./config');
-
-const VALID_STATUSES = ['pending', 'in_progress', 'testing', 'done', 'failed'];
-
-const TRANSITIONS = {
-  pending:     ['in_progress'],
-  in_progress: ['testing'],
-  testing:     ['done', 'failed'],
-  failed:      ['in_progress'],
-  done:        [],
-};
-
-function loadTasks() {
-  const p = paths();
-  if (!fs.existsSync(p.tasksFile)) return null;
-  try {
-    return JSON.parse(fs.readFileSync(p.tasksFile, 'utf8'));
-  } catch (err) {
-    log('error', `tasks.json 解析失败: ${err.message}`);
-    return null;
-  }
-}
-
-function saveTasks(data) {
-  const p = paths();
-  fs.writeFileSync(p.tasksFile, JSON.stringify(data, null, 2) + '\n', 'utf8');
-}
-
-function getFeatures(data) {
-  return data?.features || [];
-}
-
-function findNextTask(data) {
-  const features = getFeatures(data);
-  const failed = features.filter(f => f.status === 'failed')
-    .sort((a, b) => (a.priority || 999) - (b.priority || 999));
-  if (failed.length > 0) return failed[0];
-
-  const pending = features.filter(f => f.status === 'pending')
-    .filter(f => {
-      const deps = f.depends_on || [];
-      return deps.every(depId => {
-        const dep = features.find(x => x.id === depId);
-        return dep && dep.status === 'done';
-      });
-    })
-    .sort((a, b) => (a.priority || 999) - (b.priority || 999));
-  if (pending.length > 0) return pending[0];
-
-  const inProgress = features.filter(f => f.status === 'in_progress')
-    .sort((a, b) => (a.priority || 999) - (b.priority || 999));
-  return inProgress[0] || null;
-}
-
-function setStatus(data, taskId, newStatus) {
-  const features = getFeatures(data);
-  const task = features.find(f => f.id === taskId);
-  if (!task) throw new Error(`任务不存在: ${taskId}`);
-  if (!VALID_STATUSES.includes(newStatus)) throw new Error(`无效状态: ${newStatus}`);
-
-  const allowed = TRANSITIONS[task.status];
-  if (!allowed || !allowed.includes(newStatus)) {
-    throw new Error(`非法状态迁移: ${task.status} → ${newStatus}`);
-  }
-
-  task.status = newStatus;
-  saveTasks(data);
-  return task;
-}
-
-/**
- * Harness-level forced status change (bypasses TRANSITIONS validation).
- * Used when harness needs to mark tasks failed after max retries.
- */
-function forceStatus(data, status) {
-  const features = getFeatures(data);
-  for (const f of features) {
-    if (f.status === 'in_progress') {
-      f.status = status;
-      saveTasks(data);
-      return f;
-    }
-  }
-  return null;
-}
-
-function addTask(data, task) {
-  if (!data) {
-    data = { project: '', created_at: new Date().toISOString().slice(0, 10), features: [] };
-  }
-  data.features.push(task);
-  saveTasks(data);
-  return data;
-}
-
-function getStats(data) {
-  const features = getFeatures(data);
-  return {
-    total:       features.length,
-    done:        features.filter(f => f.status === 'done').length,
-    failed:      features.filter(f => f.status === 'failed').length,
-    in_progress: features.filter(f => f.status === 'in_progress').length,
-    testing:     features.filter(f => f.status === 'testing').length,
-    pending:     features.filter(f => f.status === 'pending').length,
-  };
-}
-
-function showStatus() {
-  const p = paths();
-  const data = loadTasks();
-  if (!data) {
-    log('warn', '未找到 .claude-coder/tasks.json，请先运行 claude-coder run');
-    return;
-  }
-
-  const stats = getStats(data);
-  const features = getFeatures(data);
-
-  console.log(`\n${COLOR.blue}═══════════════════════════════════════════════${COLOR.reset}`);
-  console.log(`  ${COLOR.blue}📋 任务状态${COLOR.reset}   项目: ${data.project || '(未命名)'}`);
-  console.log(`${COLOR.blue}═══════════════════════════════════════════════${COLOR.reset}`);
-
-  const bar = stats.total > 0
-    ? `[${'█'.repeat(Math.floor(stats.done / stats.total * 30))}${'░'.repeat(30 - Math.floor(stats.done / stats.total * 30))}]`
-    : '[░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░]';
-  console.log(`  进度: ${bar} ${stats.done}/${stats.total}`);
-
-  console.log(`\n  ${COLOR.green}✔ done: ${stats.done}${COLOR.reset}  ${COLOR.yellow}⏳ pending: ${stats.pending}${COLOR.reset}  ${COLOR.red}✘ failed: ${stats.failed}${COLOR.reset}`);
-
-  if (stats.in_progress > 0 || stats.testing > 0) {
-    console.log(`  ▸ in_progress: ${stats.in_progress}  ▸ testing: ${stats.testing}`);
-  }
-
-  // Cost summary from progress.json (harness records SDK cost per session)
-  if (fs.existsSync(p.progressFile)) {
-    try {
-      const progress = JSON.parse(fs.readFileSync(p.progressFile, 'utf8'));
-      const sessions = (progress.sessions || []).filter(s => typeof s.cost === 'number');
-      if (sessions.length > 0) {
-        const totalCost = sessions.reduce((sum, s) => sum + s.cost, 0);
-        console.log(`\n  ${COLOR.blue}💰 累计成本${COLOR.reset}: $${totalCost.toFixed(4)} (${sessions.length} sessions)`);
-      }
-    } catch { /* ignore parse errors */ }
-  }
-
-  // Task list
-  console.log(`\n  ${'─'.repeat(45)}`);
-  for (const f of features) {
-    const icon = { done: '✔', pending: '○', in_progress: '▸', testing: '⟳', failed: '✘' }[f.status] || '?';
-    const color = { done: COLOR.green, failed: COLOR.red, in_progress: COLOR.blue, testing: COLOR.yellow }[f.status] || '';
-    console.log(`  ${color}${icon}${COLOR.reset} [${f.id}] ${f.description} (${f.status})`);
-  }
-
-  console.log(`${COLOR.blue}═══════════════════════════════════════════════${COLOR.reset}\n`);
-}
-
-module.exports = {
-  VALID_STATUSES,
-  TRANSITIONS,
-  loadTasks,
-  saveTasks,
-  getFeatures,
-  findNextTask,
-  setStatus,
-  forceStatus,
-  addTask,
-  getStats,
-  showStatus,
-};
+'use strict';
+
+const { log, COLOR } = require('./config');
+const { assets } = require('./assets');
+const { TASK_STATUSES, STATUS_TRANSITIONS } = require('./constants');
+
+const VALID_STATUSES = TASK_STATUSES;
+const TRANSITIONS = STATUS_TRANSITIONS;
+
+function loadTasks() {
+  return assets.readJson('tasks', null);
+}
+
+function saveTasks(data) {
+  assets.writeJson('tasks', data);
+}
+
+function getFeatures(data) {
+  return data?.features || [];
+}
+
+function findNextTask(data) {
+  const features = getFeatures(data);
+  const failed = features.filter(f => f.status === 'failed')
+    .sort((a, b) => (a.priority || 999) - (b.priority || 999));
+  if (failed.length > 0) return failed[0];
+
+  const pending = features.filter(f => f.status === 'pending')
+    .filter(f => {
+      const deps = f.depends_on || [];
+      return deps.every(depId => {
+        const dep = features.find(x => x.id === depId);
+        return dep && dep.status === 'done';
+      });
+    })
+    .sort((a, b) => (a.priority || 999) - (b.priority || 999));
+  if (pending.length > 0) return pending[0];
+
+  const inProgress = features.filter(f => f.status === 'in_progress')
+    .sort((a, b) => (a.priority || 999) - (b.priority || 999));
+  return inProgress[0] || null;
+}
+
+function setStatus(data, taskId, newStatus) {
+  const features = getFeatures(data);
+  const task = features.find(f => f.id === taskId);
+  if (!task) throw new Error(`任务不存在: ${taskId}`);
+  if (!VALID_STATUSES.includes(newStatus)) throw new Error(`无效状态: ${newStatus}`);
+
+  const allowed = TRANSITIONS[task.status];
+  if (!allowed || !allowed.includes(newStatus)) {
+    throw new Error(`非法状态迁移: ${task.status} → ${newStatus}`);
+  }
+
+  task.status = newStatus;
+  saveTasks(data);
+  return task;
+}
+
+function forceStatus(data, status) {
+  const features = getFeatures(data);
+  for (const f of features) {
+    if (f.status === 'in_progress') {
+      f.status = status;
+      saveTasks(data);
+      return f;
+    }
+  }
+  return null;
+}
+
+function addTask(data, task) {
+  if (!data) {
+    data = { project: '', created_at: new Date().toISOString().slice(0, 10), features: [] };
+  }
+  data.features.push(task);
+  saveTasks(data);
+  return data;
+}
+
+function getStats(data) {
+  const features = getFeatures(data);
+  return {
+    total:       features.length,
+    done:        features.filter(f => f.status === 'done').length,
+    failed:      features.filter(f => f.status === 'failed').length,
+    in_progress: features.filter(f => f.status === 'in_progress').length,
+    testing:     features.filter(f => f.status === 'testing').length,
+    pending:     features.filter(f => f.status === 'pending').length,
+  };
+}
+
+function printStats() {
+  const data = loadTasks();
+  if (!data) return;
+  const stats = getStats(data);
+  log('info', `进度: ${stats.done}/${stats.total} done, ${stats.in_progress} in_progress, ${stats.testing} testing, ${stats.failed} failed, ${stats.pending} pending`);
+}
+
+function showStatus() {
+  const data = loadTasks();
+  if (!data) {
+    log('warn', '未找到 .claude-coder/tasks.json，请先运行 claude-coder run');
+    return;
+  }
+
+  const stats = getStats(data);
+  const features = getFeatures(data);
+
+  console.log(`\n${COLOR.blue}═══════════════════════════════════════════════${COLOR.reset}`);
+  console.log(`  ${COLOR.blue}📋 任务状态${COLOR.reset}   项目: ${data.project || '(未命名)'}`);
+  console.log(`${COLOR.blue}═══════════════════════════════════════════════${COLOR.reset}`);
+
+  const bar = stats.total > 0
+    ? `[${'█'.repeat(Math.floor(stats.done / stats.total * 30))}${'░'.repeat(30 - Math.floor(stats.done / stats.total * 30))}]`
+    : '[░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░]';
+  console.log(`  进度: ${bar} ${stats.done}/${stats.total}`);
+
+  console.log(`\n  ${COLOR.green}✔ done: ${stats.done}${COLOR.reset}  ${COLOR.yellow}⏳ pending: ${stats.pending}${COLOR.reset}  ${COLOR.red}✘ failed: ${stats.failed}${COLOR.reset}`);
+
+  if (stats.in_progress > 0 || stats.testing > 0) {
+    console.log(`  ▸ in_progress: ${stats.in_progress}  ▸ testing: ${stats.testing}`);
+  }
+
+  const progress = assets.readJson('progress', null);
+  if (progress) {
+    const sessions = (progress.sessions || []).filter(s => typeof s.cost === 'number');
+    if (sessions.length > 0) {
+      const totalCost = sessions.reduce((sum, s) => sum + s.cost, 0);
+      console.log(`\n  ${COLOR.blue}💰 累计成本${COLOR.reset}: $${totalCost.toFixed(4)} (${sessions.length} sessions)`);
+    }
+  }
+
+  console.log(`\n  ${'─'.repeat(45)}`);
+  for (const f of features) {
+    const icon = { done: '✔', pending: '○', in_progress: '▸', testing: '⟳', failed: '✘' }[f.status] || '?';
+    const color = { done: COLOR.green, failed: COLOR.red, in_progress: COLOR.blue, testing: COLOR.yellow }[f.status] || '';
+    console.log(`  ${color}${icon}${COLOR.reset} [${f.id}] ${f.description} (${f.status})`);
+  }
+
+  console.log(`${COLOR.blue}═══════════════════════════════════════════════${COLOR.reset}\n`);
+}
+
+module.exports = {
+  VALID_STATUSES,
+  TRANSITIONS,
+  loadTasks,
+  saveTasks,
+  getFeatures,
+  findNextTask,
+  setStatus,
+  forceStatus,
+  addTask,
+  getStats,
+  printStats,
+  showStatus,
+};

package/src/common/utils.js

@@ -0,0 +1,147 @@
+'use strict';
+
+const fs = require('fs');
+const { execSync } = require('child_process');
+
+// ─────────────────────────────────────────────────────────────
+// 字符串工具
+// ─────────────────────────────────────────────────────────────
+
+/**
+ * 中间截断字符串，保留首尾
+ * @param {string} str - 原字符串
+ * @param {number} maxLen - 最大长度
+ * @returns {string}
+ */
+function truncateMiddle(str, maxLen) {
+  if (!str || str.length <= maxLen) return str || '';
+  const startLen = Math.ceil((maxLen - 1) / 2);
+  const endLen = Math.floor((maxLen - 1) / 2);
+  return str.slice(0, startLen) + '…' + str.slice(-endLen);
+}
+
+/**
+ * 路径感知截断：优先保留文件名，截断目录中间
+ * @param {string} path - 文件路径
+ * @param {number} maxLen - 最大长度
+ * @returns {string}
+ */
+function truncatePath(path, maxLen) {
+  if (!path || path.length <= maxLen) return path || '';
+
+  const lastSlash = path.lastIndexOf('/');
+  if (lastSlash === -1) {
+    return truncateMiddle(path, maxLen);
+  }
+
+  const fileName = path.slice(lastSlash + 1);
+  const dirPath = path.slice(0, lastSlash);
+
+  // 文件名本身超长，截断文件名
+  if (fileName.length >= maxLen - 2) {
+    return truncateMiddle(path, maxLen);
+  }
+
+  // 保留文件名，截断目录
+  const availableForDir = maxLen - fileName.length - 2; // -2 for '…/'
+  if (availableForDir <= 0) {
+    return '…/' + fileName.slice(0, maxLen - 2);
+  }
+
+  // 目录两端保留
+  const dirStart = Math.ceil(availableForDir / 2);
+  const dirEnd = Math.floor(availableForDir / 2);
+  const truncatedDir = dirPath.slice(0, dirStart) + '…' + (dirEnd > 0 ? dirPath.slice(-dirEnd) : '');
+
+  return truncatedDir + '/' + fileName;
+}
+
+// ─────────────────────────────────────────────────────────────
+// Git 工具
+// ─────────────────────────────────────────────────────────────
+
+/**
+ * 获取当前 git HEAD commit hash
+ * @param {string} cwd - 工作目录
+ * @returns {string} commit hash 或 'none'
+ */
+function getGitHead(cwd) {
+  try {
+    return execSync('git rev-parse HEAD', { cwd, encoding: 'utf8' }).trim();
+  } catch {
+    return 'none';
+  }
+}
+
+/**
+ * 检查是否在 git 仓库中
+ * @param {string} cwd - 工作目录
+ * @returns {boolean}
+ */
+function isGitRepo(cwd) {
+  try {
+    execSync('git rev-parse --is-inside-work-tree', { cwd, stdio: 'ignore' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// ─────────────────────────────────────────────────────────────
+// .gitignore 工具
+// ─────────────────────────────────────────────────────────────
+
+/**
+ * 向 .gitignore 追加条目（如果不存在）
+ * @param {string} projectRoot - 项目根目录
+ * @param {string} entry - 要添加的条目
+ * @returns {boolean} 是否有新增
+ */
+function appendGitignore(projectRoot, entry) {
+  const path = require('path');
+  const gitignorePath = path.join(projectRoot, '.gitignore');
+  let content = '';
+  if (fs.existsSync(gitignorePath)) {
+    content = fs.readFileSync(gitignorePath, 'utf8');
+  }
+  if (content.includes(entry)) return false;
+
+  const suffix = content.endsWith('\n') || content === '' ? '' : '\n';
+  fs.appendFileSync(gitignorePath, `${suffix}${entry}\n`, 'utf8');
+  return true;
+}
+
+// ─────────────────────────────────────────────────────────────
+// 进程工具
+// ─────────────────────────────────────────────────────────────
+
+/**
+ * 休眠
+ * @param {number} ms - 毫秒
+ * @returns {Promise<void>}
+ */
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+
+// ─────────────────────────────────────────────────────────────
+// 日志工具 - 统一的日志处理
+// ─────────────────────────────────────────────────────────────
+function localTimestamp() {
+  const d = new Date();
+  const hh = String(d.getHours()).padStart(2, '0');
+  const mm = String(d.getMinutes()).padStart(2, '0');
+  const ss = String(d.getSeconds()).padStart(2, '0');
+  return `${hh}:${mm}:${ss}`;
+}
+
+module.exports = {
+  truncateMiddle,
+  truncatePath,
+  getGitHead,
+  isGitRepo,
+  appendGitignore,
+  sleep,
+  localTimestamp,
+};

package/src/core/base.js

@@ -0,0 +1,54 @@
+'use strict';
+
+const { loadSDK } = require('../common/sdk');
+const { writeSessionSeparator } = require('../common/logging');
+const { SessionContext } = require('./context');
+
+/**
+ * 通用 Session 执行器
+ * @param {string} type - session 类型
+ * @param {object} config - 配置
+ * @param {object} [config.externalCtx] - 外部传入的 SessionContext（共享日志和 indicator）
+ */
+async function runSession(type, config) {
+  const sdk = await loadSDK();
+  const ctx = config.externalCtx || new SessionContext(type, config.opts);
+
+  if (!config.externalCtx) {
+    ctx.initLogging(config.logFileName, config.logStream);
+    writeSessionSeparator(ctx.logStream, config.sessionNum || 0, config.label);
+  }
+
+  const stallTimeoutMin = ctx.initHooks(type);
+  ctx.startIndicator(config.sessionNum || 0, stallTimeoutMin);
+
+  try {
+    const result = await config.execute(sdk, ctx);
+    if (config.onSuccess) {
+      await config.onSuccess(result, ctx);
+    }
+    // 只有非外部 ctx 才执行 finish
+    if (!config.externalCtx) {
+      ctx.finish();
+    }
+    return {
+      exitCode: ctx.isStalled() ? 2 : 0,
+      logFile: ctx.logFile,
+      stalled: ctx.isStalled(),
+      ...result,
+    };
+  } catch (err) {
+    if (!config.externalCtx) {
+      ctx.errorFinish(err);
+    }
+    return {
+      exitCode: 1,
+      error: err.message,
+      logFile: ctx.logFile,
+    };
+  }
+}
+
+module.exports = {
+  runSession,
+};