ai-git-tools 2.0.65 → 2.0.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-git-tools",
-  "version": "2.0.65",
+  "version": "2.0.66",
   "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

@@ -108,13 +108,20 @@ export async function writeAndTestCommand(options = {}) {
 
   // 自動從 state 檔讀取 file / issue（指令列將覆蓋）
   const state = loadDevState();
-  const filePath = options.file || state?.filePath;
+  let filePath = options.file || state?.filePath;
   const issueNumber = options.issue || state?.issueNumber;
-  const fromState = !options.file && state?.filePath;
+  const fromState = !options.file && Boolean(state?.filePath);
   const maxFixes = parseInt(options.maxFixes || '2', 10);
 
+  // 若仍無 filePath，改用 git 偵測最近異動的原始碼檔案
+  let fromGit = false;
   if (!filePath) {
-    logger.error('請提供原始碼路徑（--file <path>）或先執行 dev-from-issue');
+    filePath = await detectChangedSourceFile(logger);
+    fromGit = Boolean(filePath);
+  }
+
+  if (!filePath) {
+    logger.error('偵測不到異動的原始碼，請用 --file 指定目標檔案。');
     throw new Error('缺少原始碼路徑');
   }
 
@@ -124,8 +131,8 @@ export async function writeAndTestCommand(options = {}) {
     throw new Error(`找不到原始碼：${absoluteSourcePath}`);
   }
 
-  // 自動從 state 讀取時，測試類型預設為 both
-  const resolvedTestTypes = resolveRequestedTestTypes(absoluteSourcePath, options.testType || (fromState ? 'both' : 'auto'));
+  // 自動從 state 或 git 讀取時，測試類型預設為 both
+  const resolvedTestTypes = resolveRequestedTestTypes(absoluteSourcePath, options.testType || (fromState || fromGit ? 'both' : 'auto'));
   const testTargets = resolvedTestTypes.map((testType) => ({
     testType,
     testFilePath: deriveTestFilePath(absoluteSourcePath, testType),
@@ -134,6 +141,8 @@ export async function writeAndTestCommand(options = {}) {
   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)}`);
@@ -355,3 +364,62 @@ export function deriveTestFilePath(sourceFilePath, testType = 'unit') {
   const suffix = testType === 'component' ? 'component' : 'unit';
   return join(dir, '__tests__', `${name}.${suffix}.test${ext}`);
 }
+
+/**
+ * 透過 git 偵測最近異動的原始碼檔案
+ * 優先順序：git staged → git unstaged → git 最新一筆 commit
+ * 排除測試檔、設定檔、lock 檔
+ */
+async function detectChangedSourceFile(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
+      .split('\n')
+      .map((f) => f.trim().replace(/^[MADRCU?!\s]+/, ''))
+      .filter((f) => f && SOURCE_EXTENSIONS.test(f) && !EXCLUDED.test(f) && existsSync(resolve(process.cwd(), f)));
+  }
+
+  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];
+    }
+
+    // 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];
+    }
+
+    // 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];
+    }
+  } catch {
+    // git 取得失敗（非 git 專案等），直接回傳 null
+  }
+
+  return null;
+}