claude-coder 1.7.0 → 1.8.0

package/src/{init.js → core/init.js}

@@ -1,144 +1,163 @@
-'use strict';
-
-const fs = require('fs');
-const net = require('net');
-const http = require('http');
-const { spawn, execSync } = require('child_process');
-const { paths, log, getProjectRoot } = require('./config');
-
-function loadProfile() {
-  const p = paths();
-  if (!fs.existsSync(p.profile)) {
-    log('error', '未找到 project_profile.json，请先运行 claude-coder run 完成项目扫描');
-    process.exit(1);
-  }
-  return JSON.parse(fs.readFileSync(p.profile, 'utf8'));
-}
-
-function isPortFree(port) {
-  return new Promise(resolve => {
-    const server = net.createServer();
-    server.once('error', () => resolve(false));
-    server.once('listening', () => { server.close(); resolve(true); });
-    server.listen(port, '127.0.0.1');
-  });
-}
-
-function waitForHealth(url, timeoutMs = 15000) {
-  const start = Date.now();
-  return new Promise(resolve => {
-    const check = () => {
-      if (Date.now() - start > timeoutMs) { resolve(false); return; }
-      const req = http.get(url, res => {
-        resolve(res.statusCode < 500);
-      });
-      req.on('error', () => setTimeout(check, 1000));
-      req.setTimeout(3000, () => { req.destroy(); setTimeout(check, 1000); });
-    };
-    check();
-  });
-}
-
-function runCmd(cmd, cwd) {
-  try {
-    execSync(cmd, { cwd: cwd || getProjectRoot(), stdio: 'inherit', shell: true });
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-async function init() {
-  const profile = loadProfile();
-  const projectRoot = getProjectRoot();
-  let stepCount = 0;
-
-  // 1. Environment activation
-  const envSetup = profile.env_setup || {};
-  if (envSetup.python_env && envSetup.python_env !== 'system' && envSetup.python_env !== 'none') {
-    stepCount++;
-    if (envSetup.python_env.startsWith('conda:')) {
-      const envName = envSetup.python_env.slice(6);
-      log('info', `[${stepCount}] Python 环境: conda activate ${envName}`);
-      runCmd(`conda activate ${envName}`);
-    } else if (envSetup.python_env === 'venv') {
-      log('info', `[${stepCount}] Python 环境: venv`);
-      runCmd('source .venv/bin/activate || .venv\\Scripts\\activate');
-    }
-  }
-  if (envSetup.node_version && envSetup.node_version !== 'none') {
-    stepCount++;
-    log('info', `[${stepCount}] Node.js: v${envSetup.node_version}`);
-    runCmd(`nvm use ${envSetup.node_version}`);
-  }
-
-  // 2. Dependencies
-  const pkgManagers = (profile.tech_stack && profile.tech_stack.package_managers) || [];
-  for (const pm of pkgManagers) {
-    stepCount++;
-    if (pm === 'npm' || pm === 'yarn' || pm === 'pnpm') {
-      if (fs.existsSync(`${projectRoot}/node_modules`)) {
-        log('ok', `[${stepCount}] ${pm} 依赖已安装，跳过`);
-      } else {
-        log('info', `[${stepCount}] 安装依赖: ${pm} install`);
-        runCmd(`${pm} install`, projectRoot);
-      }
-    } else if (pm === 'pip') {
-      const reqFile = fs.existsSync(`${projectRoot}/requirements.txt`);
-      if (reqFile) {
-        log('info', `[${stepCount}] 安装依赖: pip install -r requirements.txt`);
-        runCmd('pip install -r requirements.txt', projectRoot);
-      }
-    }
-  }
-
-  // 3. Custom init commands
-  const customInit = profile.custom_init || [];
-  for (const cmd of customInit) {
-    stepCount++;
-    log('info', `[${stepCount}] 自定义: ${cmd}`);
-    runCmd(cmd, projectRoot);
-  }
-
-  // 4. Services
-  const services = profile.services || [];
-  for (const svc of services) {
-    stepCount++;
-    const free = await isPortFree(svc.port);
-    if (!free) {
-      log('ok', `[${stepCount}] ${svc.name} 已在端口 ${svc.port} 运行，跳过`);
-      continue;
-    }
-
-    log('info', `[${stepCount}] 启动 ${svc.name} (端口 ${svc.port})...`);
-    const cwd = svc.cwd ? `${projectRoot}/${svc.cwd}` : projectRoot;
-    const child = spawn(svc.command, { cwd, shell: true, detached: true, stdio: 'ignore' });
-    child.unref();
-
-    if (svc.health_check) {
-      const healthy = await waitForHealth(svc.health_check);
-      if (healthy) {
-        log('ok', `${svc.name} 就绪: ${svc.health_check}`);
-      } else {
-        log('warn', `${svc.name} 健康检查超时 (${svc.health_check})，继续执行`);
-      }
-    }
-  }
-
-  // Summary
-  if (stepCount === 0) {
-    log('info', '无需初始化操作');
-  } else {
-    log('ok', `初始化完成 (${stepCount} 步)`);
-  }
-
-  if (services.length > 0) {
-    console.log('');
-    for (const svc of services) {
-      console.log(`  ${svc.name}: http://localhost:${svc.port}`);
-    }
-    console.log('');
-  }
-}
-
-module.exports = { init };
+'use strict';
+
+const fs = require('fs');
+const net = require('net');
+const http = require('http');
+const { spawn, execSync } = require('child_process');
+const { log } = require('../common/config');
+const { assets } = require('../common/assets');
+const { scan } = require('./scan');
+
+function loadProfile() {
+  const data = assets.readJson('profile', null);
+  if (!data) {
+    log('error', 'project_profile.json 读取失败或已损坏');
+    process.exit(1);
+  }
+  return data;
+}
+
+function isPortFree(port) {
+  return new Promise(resolve => {
+    const server = net.createServer();
+    server.once('error', () => resolve(false));
+    server.once('listening', () => { server.close(); resolve(true); });
+    server.listen(port, '127.0.0.1');
+  });
+}
+
+function waitForHealth(url, timeoutMs = 15000) {
+  const start = Date.now();
+  return new Promise(resolve => {
+    const check = () => {
+      if (Date.now() - start > timeoutMs) { resolve(false); return; }
+      const req = http.get(url, res => {
+        resolve(res.statusCode < 500);
+      });
+      req.on('error', () => setTimeout(check, 1000));
+      req.setTimeout(3000, () => { req.destroy(); setTimeout(check, 1000); });
+    };
+    check();
+  });
+}
+
+function runCmd(cmd, cwd) {
+  try {
+    execSync(cmd, { cwd: cwd || assets.projectRoot, stdio: 'inherit', shell: true });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function deployAssets() {
+  const deployed = assets.deployAll();
+  if (deployed.length > 0) {
+    for (const file of deployed) {
+      log('ok', `已部署 → .claude-coder/assets/${file}`);
+    }
+  }
+}
+
+async function init() {
+  assets.ensureDirs();
+  const projectRoot = assets.projectRoot;
+
+  if (!assets.exists('profile')) {
+    log('info', 'profile 不存在，正在执行项目扫描...');
+    const scanResult = await scan('', { projectRoot });
+    if (!scanResult.success) {
+      log('error', '项目扫描失败');
+      process.exit(1);
+    }
+  }
+
+  const profile = loadProfile();
+  let stepCount = 0;
+
+  deployAssets();
+
+  const envSetup = profile.env_setup || {};
+  if (envSetup.python_env && envSetup.python_env !== 'system' && envSetup.python_env !== 'none') {
+    stepCount++;
+    if (envSetup.python_env.startsWith('conda:')) {
+      const envName = envSetup.python_env.slice(6);
+      log('info', `[${stepCount}] Python 环境: conda activate ${envName}`);
+      runCmd(`conda activate ${envName}`);
+    } else if (envSetup.python_env === 'venv') {
+      log('info', `[${stepCount}] Python 环境: venv`);
+      runCmd('source .venv/bin/activate || .venv\\Scripts\\activate');
+    }
+  }
+  if (envSetup.node_version && envSetup.node_version !== 'none') {
+    stepCount++;
+    log('info', `[${stepCount}] Node.js: v${envSetup.node_version}`);
+    runCmd(`nvm use ${envSetup.node_version}`);
+  }
+
+  const pkgManagers = (profile.tech_stack && profile.tech_stack.package_managers) || [];
+  for (const pm of pkgManagers) {
+    stepCount++;
+    if (pm === 'npm' || pm === 'yarn' || pm === 'pnpm') {
+      if (fs.existsSync(`${projectRoot}/node_modules`)) {
+        log('ok', `[${stepCount}] ${pm} 依赖已安装，跳过`);
+      } else {
+        log('info', `[${stepCount}] 安装依赖: ${pm} install`);
+        runCmd(`${pm} install`, projectRoot);
+      }
+    } else if (pm === 'pip') {
+      const reqFile = fs.existsSync(`${projectRoot}/requirements.txt`);
+      if (reqFile) {
+        log('info', `[${stepCount}] 安装依赖: pip install -r requirements.txt`);
+        runCmd('pip install -r requirements.txt', projectRoot);
+      }
+    }
+  }
+
+  const customInit = profile.custom_init || [];
+  for (const cmd of customInit) {
+    stepCount++;
+    log('info', `[${stepCount}] 自定义: ${cmd}`);
+    runCmd(cmd, projectRoot);
+  }
+
+  const services = profile.services || [];
+  for (const svc of services) {
+    stepCount++;
+    const free = await isPortFree(svc.port);
+    if (!free) {
+      log('ok', `[${stepCount}] ${svc.name} 已在端口 ${svc.port} 运行，跳过`);
+      continue;
+    }
+
+    log('info', `[${stepCount}] 启动 ${svc.name} (端口 ${svc.port})...`);
+    const cwd = svc.cwd ? `${projectRoot}/${svc.cwd}` : projectRoot;
+    const child = spawn(svc.command, { cwd, shell: true, detached: true, stdio: 'ignore' });
+    child.unref();
+
+    if (svc.health_check) {
+      const healthy = await waitForHealth(svc.health_check);
+      if (healthy) {
+        log('ok', `${svc.name} 就绪: ${svc.health_check}`);
+      } else {
+        log('warn', `${svc.name} 健康检查超时 (${svc.health_check})，继续执行`);
+      }
+    }
+  }
+
+  if (stepCount === 0) {
+    log('info', '无需初始化操作');
+  } else {
+    log('ok', `初始化完成 (${stepCount} 步)`);
+  }
+
+  if (services.length > 0) {
+    console.log('');
+    for (const svc of services) {
+      console.log(`  ${svc.name}: http://localhost:${svc.port}`);
+    }
+    console.log('');
+  }
+}
+
+module.exports = { init };

package/src/core/plan.js

@@ -0,0 +1,318 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const readline = require('readline');
+const { runSession } = require('./base');
+const { buildQueryOptions } = require('./query');
+const { buildPlanSystemPrompt, buildPlanPrompt } = require('./prompts');
+const { log, loadConfig } = require('../common/config');
+const { assets } = require('../common/assets');
+const { extractResultText } = require('../common/logging');
+const { printStats } = require('../common/tasks');
+
+const EXIT_TIMEOUT_MS = 300000;
+const PLANS_DIR = path.join(os.homedir(), '.claude', 'plans');
+
+function buildPlanOnlyPrompt(userInput, interactive = false) {
+  return `${userInput}
+
+【工作流程】
+1. 探索项目代码库，理解结构和技术栈
+2. ${interactive ? '【约束】如果有不确定的关键决策点，请使用 AskUserQuestion 工具向用户提问。' : '【约束】不要提问，默认使用最佳推荐方案。'}
+3. 使用 Write 工具将完整计划写入 ~/.claude/plans/ 目录（.md 格式）
+4. 写入计划文件后，输出以下标记（独占一行）：
+   PLAN_FILE_PATH: <计划文件绝对路径>
+5. 简要总结计划要点
+`;
+}
+
+/**
+ * 从文本中提取计划文件路径
+ * 优先级：PLAN_FILE_PATH 标记 > .claude/plans/*.md > 反引号包裹 .md > 任意绝对 .md
+ */
+function extractPlanPath(text) {
+  if (!text) return null;
+
+  const tagMatch = text.match(/PLAN_FILE_PATH:\s*(\S+\.md)/);
+  if (tagMatch) return tagMatch[1];
+
+  const plansMatch = text.match(/([^\s`'"(]*\.claude\/plans\/[^\s`'"()]+\.md)/);
+  if (plansMatch) return plansMatch[1];
+
+  const backtickMatch = text.match(/`([^`]+\.md)`/);
+  if (backtickMatch) return backtickMatch[1];
+
+  const absMatch = text.match(/(\/[^\s`'"]+\.md)/);
+  if (absMatch) return absMatch[1];
+
+  return null;
+}
+
+/**
+ * 多源提取计划路径（按可靠性从高到低）
+ * 1. Write 工具调用参数（最可靠）
+ * 2. assistant 消息流文本
+ * 3. result.result 文本
+ * 4. plans 目录最新文件（兜底）
+ */
+function extractPlanPathFromCollected(collected, startTime) {
+  // 第一层：从 Write 工具调用参数中直接获取
+  for (const msg of collected) {
+    if (msg.type !== 'assistant' || !msg.message?.content) continue;
+    for (const block of msg.message.content) {
+      if (block.type === 'tool_use' && block.name === 'Write') {
+        const target = block.input?.file_path || block.input?.path || '';
+        if (target.includes('.claude/plans/') && target.endsWith('.md')) {
+          if (fs.existsSync(target)) return target;
+        }
+      }
+    }
+  }
+
+  // 第二层：从所有 assistant 文本中提取
+  let fullText = '';
+  for (const msg of collected) {
+    if (msg.type === 'assistant' && msg.message?.content) {
+      for (const block of msg.message.content) {
+        if (block.type === 'text' && block.text) fullText += block.text;
+      }
+    }
+  }
+  if (fullText) {
+    const p = extractPlanPath(fullText);
+    if (p && fs.existsSync(p)) return p;
+  }
+
+  // 第三层：从 result.result 中提取
+  const resultText = extractResultText(collected);
+  if (resultText) {
+    const p = extractPlanPath(resultText);
+    if (p && fs.existsSync(p)) return p;
+  }
+
+  // 第四层：扫描 plans 目录，找 session 期间新建的文件
+  if (fs.existsSync(PLANS_DIR)) {
+    try {
+      const files = fs.readdirSync(PLANS_DIR)
+        .filter(f => f.endsWith('.md'))
+        .map(f => {
+          const fp = path.join(PLANS_DIR, f);
+          return { path: fp, mtime: fs.statSync(fp).mtimeMs };
+        })
+        .filter(f => f.mtime >= startTime)
+        .sort((a, b) => b.mtime - a.mtime);
+      if (files.length > 0) {
+        log('info', `从 plans 目录发现新文件: ${path.basename(files[0].path)}`);
+        return files[0].path;
+      }
+    } catch { /* ignore */ }
+  }
+
+  return null;
+}
+
+function copyPlanToProject(generatedPath) {
+  const filename = path.basename(generatedPath);
+  const targetDir = path.join(assets.projectRoot, '.claude-coder', 'plan');
+  const targetPath = path.join(targetDir, filename);
+
+  try {
+    if (!fs.existsSync(targetDir)) {
+      fs.mkdirSync(targetDir, { recursive: true });
+    }
+    fs.copyFileSync(generatedPath, targetPath);
+    return targetPath;
+  } catch {
+    return generatedPath;
+  }
+}
+
+async function _executePlanGen(sdk, ctx, userInput, opts = {}) {
+  const interactive = opts.interactive || false;
+  const prompt = buildPlanOnlyPrompt(userInput, interactive);
+  const queryOpts = {
+    permissionMode: 'plan',
+    cwd: opts.projectRoot || assets.projectRoot,
+    hooks: ctx.hooks,
+  };
+  if (!interactive) {
+    queryOpts.disallowedTools = ['askUserQuestion'];
+  }
+  if (opts.model) queryOpts.model = opts.model;
+
+  const startTime = Date.now();
+  let exitPlanModeDetected = false;
+  let exitPlanModeTime = null;
+
+  const collected = [];
+  const session = sdk.query({ prompt, options: queryOpts });
+
+  for await (const msg of session) {
+    if (ctx._isStalled && ctx._isStalled()) {
+      log('warn', '停顿超时，中断 plan 生成');
+      break;
+    }
+
+    if (exitPlanModeDetected && exitPlanModeTime) {
+      const elapsed = Date.now() - exitPlanModeTime;
+      if (elapsed > EXIT_TIMEOUT_MS && msg.type !== 'result') {
+        log('warn', '检测到 ExitPlanMode，等待审批超时，尝试从已收集消息中提取路径');
+        break;
+      }
+    }
+
+    collected.push(msg);
+    ctx._logMessage(msg);
+
+    if (msg.type === 'assistant' && msg.message?.content) {
+      for (const block of msg.message.content) {
+        if (block.type === 'tool_use' && block.name === 'ExitPlanMode') {
+          exitPlanModeDetected = true;
+          exitPlanModeTime = Date.now();
+        }
+      }
+    }
+  }
+
+  const planPath = extractPlanPathFromCollected(collected, startTime);
+
+  if (planPath) {
+    const targetPath = copyPlanToProject(planPath);
+    return { success: true, targetPath, generatedPath: planPath };
+  }
+
+  log('warn', '无法从输出中提取计划路径');
+  log('info', `请手动查看: ${PLANS_DIR}`);
+  return { success: false, reason: 'no_path', targetPath: null };
+}
+
+async function runPlanSession(instruction, opts = {}) {
+  const planOnly = opts.planOnly || false;
+  const interactive = opts.interactive || false;
+  const ts = new Date().toISOString().replace(/[-:T]/g, '').slice(0, 12);
+  const label = planOnly ? 'plan only' : 'plan tasks';
+  const hookType = interactive ? 'plan_interactive' : 'plan';
+
+  return runSession(hookType, {
+    opts,
+    sessionNum: 0,
+    logFileName: `plan_${ts}.log`,
+    label,
+
+    async execute(sdk, ctx) {
+      log('info', '正在生成计划方案...');
+
+      const planResult = await _executePlanGen(sdk, ctx, instruction, opts);
+
+      if (!planResult.success) {
+        log('error', `\n计划生成失败: ${planResult.reason || planResult.error}`);
+        return { success: false, reason: planResult.reason };
+      }
+
+      log('ok', `\n计划已生成: ${planResult.targetPath}`);
+
+      if (planOnly) {
+        return { success: true, planPath: planResult.targetPath };
+      }
+
+      log('info', '正在生成任务列表...');
+
+      const tasksPrompt = buildPlanPrompt(planResult.targetPath);
+      const queryOpts = buildQueryOptions(ctx.config, opts);
+      queryOpts.systemPrompt = buildPlanSystemPrompt();
+      queryOpts.hooks = ctx.hooks;
+      queryOpts.abortController = ctx.abortController;
+
+      await ctx.runQuery(sdk, tasksPrompt, queryOpts);
+
+      log('ok', '任务追加完成');
+      return { success: true, planPath: planResult.targetPath };
+    },
+  });
+}
+
+async function promptAutoRun() {
+  if (!process.stdin.isTTY) return false;
+  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(input, opts = {}) {
+  let instruction = input || '';
+
+  let reqPath = null;
+  if (opts.readFile) {
+    reqPath = path.resolve(assets.projectRoot || process.cwd(), opts.readFile);
+    if (!fs.existsSync(reqPath)) {
+      log('error', `文件不存在: ${reqPath}`);
+      process.exit(1);
+    }
+    instruction = fs.readFileSync(reqPath, 'utf8');
+    log('ok', `已读取需求文件: ${reqPath}`);
+  }
+
+  if (!instruction) {
+    log('error', '用法: claude-coder plan "需求内容"  或  claude-coder plan -r [requirements.md]');
+    process.exit(1);
+  }
+
+  assets.ensureDirs();
+  const projectRoot = assets.projectRoot;
+
+  const config = loadConfig();
+  if (!opts.model) {
+    if (config.defaultOpus) {
+      opts.model = config.defaultOpus;
+    } else if (config.model) {
+      opts.model = config.model;
+    }
+  }
+
+  const displayModel = opts.model || config.model || '(default)';
+  log('ok', `模型配置已加载: ${config.provider || 'claude'} (plan 使用: ${displayModel})`);
+  if (opts.interactive) {
+    log('info', '交互模式已启用，模型可能会向您提问');
+  }
+
+  if (!assets.exists('profile')) {
+    log('error', 'profile 不存在，请先运行 claude-coder init 初始化项目');
+    process.exit(1);
+  }
+
+  const result = await runPlanSession(instruction, { projectRoot, ...opts });
+
+  if (result.success) {
+    if (reqPath && result.planPath) {
+      try {
+        const planName = path.basename(result.planPath, '.md');
+        const backupDir = path.dirname(result.planPath);
+        const backupPath = path.join(backupDir, `${planName}-requirements.md`);
+        fs.copyFileSync(reqPath, backupPath);
+        log('ok', `需求文档已备份: ${path.basename(backupPath)}`);
+      } catch { /* ignore */ }
+    }
+
+    printStats();
+
+    let shouldAutoRun = false;
+    if (!opts.planOnly) {
+      shouldAutoRun = await promptAutoRun();
+    }
+
+    if (shouldAutoRun) {
+      console.log('');
+      log('info', '开始自动执行任务...');
+      const { run: runCoding } = require('./runner');
+      await runCoding(opts);
+    }
+  }
+}
+
+module.exports = { runPlanSession, run };