ai-git-tools 2.0.66 → 2.0.68

package/bin/cli.js

@@ -164,8 +164,8 @@ program
   .option('--file <path>', '原始碼路徑（對沒特別指定則自動從上次 dev-from-issue 讀取）')
   .option('--issue <number>', '完成後發佈報告到此 Issue（對沒特別指定則自動從上次 dev-from-issue 讀取）')
   .option('--test-type <type>', '測試類型：auto、unit、component 或 both（可用逗號指定多個）', 'auto')
-  .option('--max-fixes <number>', '最大自動修復次數（預設 2）', '2')
-  .option('--no-confirm', '跳過確認直接生成並執行測試')
+  .option('--test-dir <path>', '測試輸出目錄（預設 __tests__；指定 tests 則放在專案根目錄）', '__tests__')
+  .option('--max-fixes <number>', '最大自動修復次數（預設 3）', '3')
   .option('--model <model>', '指定 AI 模型')
   .action(async (options) => {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-git-tools",
-  "version": "2.0.66",
+  "version": "2.0.68",
   "description": "AI-powered Git automation tools for commit messages and PR generation",
   "main": "src/index.js",
   "type": "module",

package/src/commands/write-and-test.js

@@ -7,7 +7,6 @@ import { resolve, basename, dirname, join } from 'path';
 import { existsSync, readFileSync, writeFileSync, unlinkSync } from 'fs';
 import { execSync } from 'child_process';
 import { tmpdir } from 'os';
-import inquirer from 'inquirer';
 import { TestGenerator } from '../core/test-generator.js';
 import { TestRunner } from '../core/test-runner.js';
 import { AIClient } from '../core/ai-client.js';
@@ -108,69 +107,78 @@ export async function writeAndTestCommand(options = {}) {
 
   // 自動從 state 檔讀取 file / issue（指令列將覆蓋）
   const state = loadDevState();
-  let filePath = options.file || state?.filePath;
   const issueNumber = options.issue || state?.issueNumber;
-  const fromState = !options.file && Boolean(state?.filePath);
-  const maxFixes = parseInt(options.maxFixes || '2', 10);
+  const maxFixes = parseInt(options.maxFixes || '3', 10);
 
-  // 若仍無 filePath，改用 git 偵測最近異動的原始碼檔案
+  // 決定要處理的檔案清單
+  let sourceFiles = [];
+  let fromState = false;
   let fromGit = false;
-  if (!filePath) {
-    filePath = await detectChangedSourceFile(logger);
-    fromGit = Boolean(filePath);
+
+  if (options.file) {
+    // 明確指定單一檔案
+    sourceFiles = [options.file];
+  } else if (state?.filePath) {
+    // 從上一步 dev-from-issue 讀取
+    sourceFiles = [state.filePath];
+    fromState = true;
+  } else {
+    // 從 git 偵測所有異動的原始碼檔案
+    sourceFiles = await detectChangedSourceFiles(logger);
+    fromGit = sourceFiles.length > 0;
   }
 
-  if (!filePath) {
+  if (sourceFiles.length === 0) {
     logger.error('偵測不到異動的原始碼，請用 --file 指定目標檔案。');
     throw new Error('缺少原始碼路徑');
   }
 
+  logger.header('write-and-test');
+  if (fromState) {
+    logger.info('從上一步 dev-from-issue 自動讀取');
+  } else if (fromGit) {
+    logger.info(`從 git 異動記錄偵測到 ${sourceFiles.length} 個檔案`);
+  }
+  console.log('');
+
+  const allResults = [];
+  for (const filePath of sourceFiles) {
+    const result = await processOneFile({ filePath, maxFixes, fromState, fromGit, options, logger });
+    allResults.push({ filePath, ...result });
+  }
+
+  // 所有檔案處理完成後，才發射一則聚合報告
+  if (issueNumber) {
+    await postAggregatedReport(issueNumber, allResults, options.model, logger);
+  }
+
+  return allResults.length === 1 ? allResults[0] : allResults;
+}
+
+async function processOneFile({ filePath, maxFixes, fromState, fromGit, options, logger }) {
+  const testDir = options.testDir || '__tests__';
   const absoluteSourcePath = resolve(process.cwd(), filePath);
   if (!existsSync(absoluteSourcePath)) {
     logger.error(`原始碼不存在：${absoluteSourcePath}`);
     throw new Error(`找不到原始碼：${absoluteSourcePath}`);
   }
 
-  // 自動從 state 或 git 讀取時，測試類型預設為 both
+  // 自動偵測時預設 both，手動指定時依 --test-type
   const resolvedTestTypes = resolveRequestedTestTypes(absoluteSourcePath, options.testType || (fromState || fromGit ? 'both' : 'auto'));
   const testTargets = resolvedTestTypes.map((testType) => ({
     testType,
-    testFilePath: deriveTestFilePath(absoluteSourcePath, testType),
+    testFilePath: deriveTestFilePath(absoluteSourcePath, testType, testDir),
   }));
 
-  logger.header('write-and-test');
-  if (fromState) {
-    logger.info('從上一步 dev-from-issue 自動讀取');
-  } else if (fromGit) {
-    logger.info('從 git 異動記錄自動偵測');
-  }
-  console.log(`原始碼  ：${absoluteSourcePath}`);
-  console.log(`測試類型：${formatTestTypes(resolvedTestTypes)}`);
+  console.log(`── ${filePath}`);
+  console.log(`   測試類型：${formatTestTypes(resolvedTestTypes)}`);
   testTargets.forEach(({ testType, testFilePath }) => {
-    console.log(`${testType === 'component' ? '元件測試' : '單元測試'}：${testFilePath}`);
+    console.log(`   ${testType === 'component' ? '元件測試' : '單元測試'}：${testFilePath}`);
   });
-  console.log(`最大修復：${maxFixes} 次`);
-  if (issueNumber) {
-    console.log(`報告 Issue：#${issueNumber}`);
-  }
   console.log('');
 
-  // 1. 詢問是否繼續（自動從 state 讀取時跳過）
-  if (!options.noConfirm && !fromState) {
-    const { confirmed } = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'confirmed',
-      message: `確認為 ${filePath} 生成 ${formatTestTypes(resolvedTestTypes)} 並執行？`,
-      default: true,
-    }]);
-
-    if (!confirmed) {
-      logger.info('已取消。');
-      return;
-    }
-  }
 
-  // 2. 生成測試
+  // 1. 生成測試
   logger.step('正在生成測試代碼...');
   const generatedTests = [];
   for (const { testType, testFilePath } of testTargets) {
@@ -185,7 +193,7 @@ export async function writeAndTestCommand(options = {}) {
   }
   logger.info(`實際測試類型：${formatTestTypes(generatedTests.map(({ testType }) => testType))}`);
 
-  // 3. 執行測試 + 自動修復循環
+  // 2. 執行測試 + 自動修復循環
   let lastErrors = [];
   for (let attempt = 0; attempt <= maxFixes; attempt++) {
     if (attempt > 0) {
@@ -199,18 +207,12 @@ export async function writeAndTestCommand(options = {}) {
 
     if (result.success) {
       logger.success('所有測試通過！ 🎉');
-      const testResult = {
+      return {
         success: true,
         testFilePaths: generatedTests.map(({ testFilePath }) => testFilePath),
         testTypes: generatedTests.map(({ testType }) => testType),
         attempts: attempt,
       };
-      if (options.issue) {
-        await postTestReportToIssue(options.issue, absoluteSourcePath, testResult, options.model, logger);
-      } else if (issueNumber) {
-        await postTestReportToIssue(issueNumber, absoluteSourcePath, testResult, options.model, logger);
-      }
-      return testResult;
     }
 
     lastErrors = result.errors;
@@ -242,11 +244,6 @@ export async function writeAndTestCommand(options = {}) {
         testTypes: generatedTests.map(({ testType }) => testType),
         attempts: maxFixes,
       };
-      if (options.issue) {
-        await postTestReportToIssue(options.issue, absoluteSourcePath, failedResult, options.model, logger);
-      } else if (issueNumber) {
-        await postTestReportToIssue(issueNumber, absoluteSourcePath, failedResult, options.model, logger);
-      }
       return failedResult;
     }
   }
@@ -292,59 +289,84 @@ ${sourceCode}
 }
 
 /**
- * 將測試報告與 mermaid 流程圖發佈到 GitHub Issue 留言
+ * 將所有檔案的測試結果彙整為一則 Issue 留言，並為通過的檔案附上 mermaid 流程圖
+ * @param {Array<{filePath,success,testFilePaths,testTypes,attempts,errors?}>} allResults
  */
-async function postTestReportToIssue(issueNumber, sourceFilePath, testResult, model, logger) {
+async function postAggregatedReport(issueNumber, allResults, model, logger) {
+  if (!allResults || allResults.length === 0) return;
+
   logger.step(`正在將測試報告發佈到 Issue #${issueNumber}...`);
 
+  const cwd = process.cwd();
+  const total = allResults.length;
+  const passed = allResults.filter((r) => r.success).length;
+  const failed = total - passed;
   const typeLabels = { unit: 'Jest 單元測試', component: '元件測試', auto: '自動判斷' };
-  const testTypesStr = testResult.testTypes.map((t) => typeLabels[t] || t).join('、');
-  const statusEmoji = testResult.success ? '✅' : '❌';
-  const statusText = testResult.success
-    ? `通過（${testResult.attempts > 0 ? `經過 ${testResult.attempts} 次自動修復` : '一次通過'}）`
-    : `失敗（已嘗試自動修復 ${testResult.attempts} 次）`;
-
-  const relativeSourcePath = sourceFilePath.replace(process.cwd() + '/', '');
-  const relativeTestPaths = testResult.testFilePaths
-    .map((p) => p.replace(process.cwd() + '/', ''))
-    .map((p) => `- \`${p}\``)
-    .join('\n');
-
-  let errorSection = '';
-  if (!testResult.success && testResult.errors?.length) {
-    const errorSummary = testResult.errors
-      .slice(0, 3)
-      .map((e, i) => `**錯誤 ${i + 1}**\n\`\`\`\n${e.split('\n').slice(0, 15).join('\n')}\n\`\`\``)  
-      .join('\n\n');
-    errorSection = `\n### 錯誤摘要\n\n${errorSummary}\n`;
-  }
 
-  // 生成 mermaid
-  const mermaidSection = testResult.success
-    ? await (async () => {
-      const diagram = await generateMermaidDiagram(sourceFilePath, model);
-      return diagram ? `\n---\n\n## 📊 邏輯流程圖\n\n${diagram}\n` : '';
-    })()
-    : '';
+  // 摘要表格
+  const summaryEmoji = failed === 0 ? '✅' : '⚠️';
+  const header =
+    `## ${summaryEmoji} 測試報告總覽\n\n` +
+    `**異動檔案**：${total} 個｜**通過**：${passed}｜**失敗**：${failed}\n\n` +
+    `| 狀態 | 檔案 | 測試類型 | 結果 |\n` +
+    `| :---: | --- | --- | --- |\n`;
+
+  const tableRows = allResults.map((r) => {
+    const relPath = r.filePath.replace(cwd + '/', '');
+    const testTypesStr = (r.testTypes || []).map((t) => typeLabels[t] || t).join('、');
+    const statusEmoji = r.success ? '✅' : '❌';
+    const resultStr = r.success
+      ? r.attempts > 0 ? `通過（修復 ${r.attempts} 次）` : '一次通過'
+      : `失敗（已嘗試修復 ${r.attempts} 次）`;
+    return `| ${statusEmoji} | \`${relPath}\` | ${testTypesStr} | ${resultStr} |`;
+  });
 
-  const body = `## ${statusEmoji} 測試報告
+  // 個別檔案詳情
+  const fileDetails = allResults.map((r) => {
+    const relPath = r.filePath.replace(cwd + '/', '');
+    const statusEmoji = r.success ? '✅' : '❌';
+    const relTestPaths = (r.testFilePaths || [])
+      .map((p) => `- \`${p.replace(cwd + '/', '')}\``)
+      .join('\n');
+
+    let section = `\n---\n\n### ${statusEmoji} \`${relPath}\`\n\n**測試檔案**：\n${relTestPaths}\n`;
+
+    if (!r.success && r.errors?.length) {
+      const errorSummary = r.errors
+        .slice(0, 2)
+        .map((e, i) => `**錯誤 ${i + 1}**\n\`\`\`\n${e.split('\n').slice(0, 12).join('\n')}\n\`\`\``)
+        .join('\n\n');
+      section += `\n**錯誤摘要**：\n\n${errorSummary}\n`;
+    }
 
-**原始碼**：\`${relativeSourcePath}\`
-**測試類型**：${testTypesStr}
-**結果**：${statusText}
+    return section;
+  });
+
+  // 為通過的檔案生成 mermaid 流程圖
+  const mermaidSections = [];
+  for (const r of allResults.filter((r) => r.success)) {
+    const absPath = resolve(cwd, r.filePath);
+    const diagram = await generateMermaidDiagram(absPath, model);
+    if (diagram) {
+      const relPath = r.filePath.replace(cwd + '/', '');
+      mermaidSections.push(`\n### \`${relPath}\`\n\n${diagram}`);
+    }
+  }
 
-### 測試檔案
+  const mermaidBlock =
+    mermaidSections.length > 0
+      ? `\n---\n\n## 📊 邏輯流程圖\n${mermaidSections.join('\n')}\n`
+      : '';
 
-${relativeTestPaths}
-${errorSection}${mermaidSection}`;
+  const body = header + tableRows.join('\n') + fileDetails.join('') + mermaidBlock;
 
-  const tmpFile = join(tmpdir(), `ai-git-tools-comment-${Date.now()}.md`);
+  const tmpFile = join(tmpdir(), `ai-git-tools-report-${Date.now()}.md`);
   try {
     writeFileSync(tmpFile, body, 'utf-8');
     execSync(`gh issue comment ${issueNumber} --body-file "${tmpFile}"`, {
       encoding: 'utf-8',
       stdio: 'pipe',
-      cwd: process.cwd(),
+      cwd,
     });
     logger.success(`測試報告已發佈到 Issue #${issueNumber}`);
   } catch (error) {
@@ -356,70 +378,92 @@ ${errorSection}${mermaidSection}`;
 
 /**
  * 依據原始檔案路徑推導測試檔案路徑
+ * @param {string} testDir - 測試輸出目錄：'__tests__'（預設） 或 相對專案根的路徑（如 'tests'）
  */
-export function deriveTestFilePath(sourceFilePath, testType = 'unit') {
-  const dir = dirname(sourceFilePath);
+export function deriveTestFilePath(sourceFilePath, testType = 'unit', testDir = '__tests__') {
+  const cwd = process.cwd();
   const name = basename(sourceFilePath).replace(/\.(js|jsx|ts|tsx|mjs|cjs)$/, '');
   const ext = /\.(ts|tsx)$/.test(sourceFilePath) ? '.ts' : '.js';
   const suffix = testType === 'component' ? 'component' : 'unit';
-  return join(dir, '__tests__', `${name}.${suffix}.test${ext}`);
+
+  if (testDir === '__tests__') {
+    // 預設：放在原始檔旁的 __tests__ 子目錄
+    return join(dirname(sourceFilePath), '__tests__', `${name}.${suffix}.test${ext}`);
+  }
+
+  // 自訂目錄：放在專案根 testDir 底下，保留原始檔的相對路徑結構
+  const relDir = dirname(sourceFilePath).replace(cwd, '').replace(/^\//, '');
+  return join(cwd, testDir, relDir, `${name}.${suffix}.test${ext}`);
 }
 
 /**
- * 透過 git 偵測最近異動的原始碼檔案
- * 優先順序：git staged → git unstaged → git 最新一筆 commit
+ * 透過 git 偵測所有異動的原始碼檔案（回傳陣列）
+ * 優先順序：staged → 工作區（unstaged+untracked） → 整個 branch（vs main/master） → 最近 10 commits
  * 排除測試檔、設定檔、lock 檔
  */
-async function detectChangedSourceFile(logger) {
+async function detectChangedSourceFiles(logger) {
   const SOURCE_EXTENSIONS = /\.(js|jsx|ts|tsx|mjs|cjs)$/;
   const EXCLUDED = /(__tests__|\.test\.|\.spec\.|\.config\.|node_modules|dist\/|\.lock$|package\.json)/;
+  const cwd = process.cwd();
 
-  function filterSourceFiles(files) {
-    return files
+  function filterSourceFiles(raw) {
+    return raw
       .split('\n')
-      .map((f) => f.trim().replace(/^[MADRCU?!\s]+/, ''))
-      .filter((f) => f && SOURCE_EXTENSIONS.test(f) && !EXCLUDED.test(f) && existsSync(resolve(process.cwd(), f)));
+      .map((f) => f.trim().replace(/^[MADRCU?!\s]+/, '').replace(/^"(.*)"$/, '$1'))
+      .filter((f) => f && SOURCE_EXTENSIONS.test(f) && !EXCLUDED.test(f) && existsSync(resolve(cwd, f)));
+  }
+
+  function run(cmd) {
+    return execSync(cmd, { encoding: 'utf-8', stdio: 'pipe', cwd });
   }
 
   try {
     // 1. staged 檔案
-    const staged = filterSourceFiles(
-      execSync('git diff --cached --name-only', { encoding: 'utf-8', stdio: 'pipe', cwd: process.cwd() })
-    );
-    if (staged.length > 0) {
-      logger.info(`偵測到 staged 異動：${staged[0]}`);
-      return staged[0];
-    }
-
-    // 2. unstaged 工作區異動
-    const unstaged = filterSourceFiles(
-      execSync('git diff --name-only', { encoding: 'utf-8', stdio: 'pipe', cwd: process.cwd() })
-    );
-    if (unstaged.length > 0) {
-      logger.info(`偵測到工作區異動：${unstaged[0]}`);
-      return unstaged[0];
+    const staged = filterSourceFiles(run('git diff --cached --name-only'));
+
+    // 2. unstaged + untracked
+    const unstaged = filterSourceFiles(run('git diff --name-only'));
+    const untracked = filterSourceFiles(run('git ls-files --others --exclude-standard'));
+    const working = [...new Set([...unstaged, ...untracked])];
+
+    // 3. 整個 branch 相對於 upstream / main / master 的變更
+    const branchFiles = getBranchChangedFiles(filterSourceFiles, run);
+
+    // 合併全部（去重）；staged > working > branch
+    const all = [...new Set([...staged, ...working, ...branchFiles])];
+
+    if (all.length > 0) {
+      const breakdown = [
+        staged.length && `staged ${staged.length}`,
+        working.length && `工作區 ${working.length}`,
+        branchFiles.length && `branch ${branchFiles.length}`,
+      ].filter(Boolean).join('、');
+      logger.info(`偵測到 ${all.length} 個異動檔案（${breakdown}）`);
+      return all;
     }
+  } catch {
+    // git 取得失敗，直接回傳空陣列
+  }
 
-    // 3. untracked 新增檔案
-    const untracked = filterSourceFiles(
-      execSync('git ls-files --others --exclude-standard', { encoding: 'utf-8', stdio: 'pipe', cwd: process.cwd() })
-    );
-    if (untracked.length > 0) {
-      logger.info(`偵測到新增檔案：${untracked[0]}`);
-      return untracked[0];
-    }
+  return [];
+}
 
-    // 4. 最新 commit 的異動
-    const lastCommit = filterSourceFiles(
-      execSync('git diff-tree --no-commit-id -r --name-only HEAD', { encoding: 'utf-8', stdio: 'pipe', cwd: process.cwd() })
-    );
-    if (lastCommit.length > 0) {
-      logger.info(`偵測到最後 commit 異動：${lastCommit[0]}`);
-      return lastCommit[0];
+function getBranchChangedFiles(filterSourceFiles, run) {
+  // 依序嘗試找到 merge-base，再比較 HEAD
+  const baseCandidates = ['@{u}', 'origin/main', 'origin/master', 'main', 'master'];
+  for (const base of baseCandidates) {
+    try {
+      const mergeBase = run(`git merge-base HEAD ${base}`).trim();
+      const files = filterSourceFiles(run(`git diff --name-only ${mergeBase}...HEAD`));
+      if (files.length > 0) return files;
+    } catch {
+      continue;
     }
+  }
+  // 最後 fallback：最近 10 commits
+  try {
+    return filterSourceFiles(run('git diff --name-only HEAD~10...HEAD'));
   } catch {
-    // git 取得失敗（非 git 專案等），直接回傳 null
+    return [];
   }
-
-  return null;
 }