ai-git-tools 2.0.66 → 2.0.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-git-tools",
-  "version": "2.0.66",
+  "version": "2.0.67",
   "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,72 @@ 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);
 
-  // 若仍無 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, issueNumber, maxFixes, fromState, fromGit, options, logger });
+    allResults.push(result);
+  }
+
+  return allResults.length === 1 ? allResults[0] : allResults;
+}
+
+async function processOneFile({ filePath, issueNumber, maxFixes, fromState, fromGit, options, logger }) {
   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),
   }));
 
-  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 +187,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) {
@@ -366,16 +368,16 @@ export function deriveTestFilePath(sourceFilePath, testType = 'unit') {
 }
 
 /**
- * 透過 git 偵測最近異動的原始碼檔案
- * 優先順序：git staged → git unstaged → git 最新一筆 commit
+ * 透過 git 偵測所有異動的原始碼檔案（回傳陣列）
+ * 優先順序：staged → unstaged → untracked → 最新 commit
  * 排除測試檔、設定檔、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)/;
 
-  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)));
@@ -387,39 +389,34 @@ async function detectChangedSourceFile(logger) {
       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];
+      logger.info(`偵測到 staged 異動 ${staged.length} 個檔案`);
+      return staged;
     }
 
-    // 2. unstaged 工作區異動
+    // 2. unstaged 工作區異動（含 untracked 合併）
     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];
-    }
-
-    // 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];
+    const working = [...new Set([...unstaged, ...untracked])];
+    if (working.length > 0) {
+      logger.info(`偵測到工作區異動 ${working.length} 個檔案`);
+      return working;
     }
 
-    // 4. 最新 commit 的異動
+    // 3. 最新 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];
+      logger.info(`偵測到最後 commit 異動 ${lastCommit.length} 個檔案`);
+      return lastCommit;
     }
   } catch {
-    // git 取得失敗（非 git 專案等），直接回傳 null
+    // git 取得失敗，直接回傳空陣列
   }
 
-  return null;
+  return [];
 }