ai-git-tools 2.0.23 → 2.0.25

package/package.json

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

package/src/commands/commit-all.js

@@ -14,8 +14,16 @@ import { handleError } from '../utils/helpers.js';
 /**
  * 獲取檔案的變更內容
  */
-function getFileDiff(filePath, isNew) {
+function getFileDiff(filePath, isNew, isDeleted) {
   try {
+    if (isDeleted) {
+      // 刪除的檔案：顯示刪除前的內容（前 50 行）
+      const diff = execSync(`git show HEAD:"${filePath}"`, {
+        encoding: 'utf-8',
+      }).toString();
+      const lines = diff.split('\n').slice(0, 50);
+      return `[已刪除]\n${lines.join('\n')}${lines.length >= 50 ? '\n...' : ''}`;
+    }
     if (isNew) {
       // 新檔案：讀取完整內容（前 100 行）
       const content = readFileSync(filePath, 'utf-8');
@@ -52,11 +60,6 @@ function getAllChanges() {
       const statusCode = line.substring(0, 2);
       const filePath = line.substring(3).trim();
 
-      // 跳過已刪除的檔案
-      if (statusCode.includes('D')) {
-        continue;
-      }
-
       // 跳過某些不需要提交的檔案
       if (
         filePath.includes('node_modules/') ||
@@ -68,11 +71,13 @@ function getAllChanges() {
       }
 
       const isNew = statusCode.includes('?') || statusCode.includes('A');
+      const isDeleted = statusCode.includes('D');
       const isStaged = statusCode[0] !== ' ' && statusCode[0] !== '?';
 
       changes.push({
         filePath,
         isNew,
+        isDeleted,
         isStaged,
         statusCode,
       });
@@ -91,16 +96,17 @@ function getAllChanges() {
 async function analyzeAndGroupChanges(changes, config) {
   console.log('🤖 正在使用 AI 分析變更並分組...\n');
 
-  // 準備變更摘要
+  // 準備變更摘要（限制每個檔案的 diff 長度）
   const maxDiffPerFile = Math.floor(config.ai.maxDiffLength / Math.max(changes.length, 1));
   const changeSummary = changes
     .map((change, index) => {
-      const diff = getFileDiff(change.filePath, change.isNew);
+      const diff = getFileDiff(change.filePath, change.isNew, change.isDeleted);
       const lines = diff.split('\n');
       const truncatedDiff = lines.slice(0, Math.min(50, maxDiffPerFile / 100)).join('\n');
-      return `[檔案 ${index}] ${change.filePath}\n${
-        change.isNew ? '（新檔案）' : '（已修改）'
-      }\n${truncatedDiff}\n`;
+      let status = '（已修改）';
+      if (change.isNew) status = '（新檔案）';
+      if (change.isDeleted) status = '（已刪除）';
+      return `[檔案 ${index}] ${change.filePath}\n${status}\n${truncatedDiff}\n`;
     })
     .join('\n---\n\n');
 
@@ -159,7 +165,7 @@ ${changeSummary}
 
 請只輸出 JSON，不要其他文字。`;
 
-  const response = await AIClient.sendAndWait(prompt, config.ai.model);
+  const response = await AIClient.sendAndWait(prompt, config.ai.model, config.ai.maxRetries);
 
   try {
     return AIClient.parseJSON(response);
@@ -176,8 +182,11 @@ ${changeSummary}
 async function generateCommitMessage(group, files, config) {
   const filesList = files
     .map((file) => {
-      const diff = getFileDiff(file.filePath, file.isNew);
-      return `檔案: ${file.filePath}\n${diff}`;
+      const diff = getFileDiff(file.filePath, file.isNew, file.isDeleted);
+      let status = '修改';
+      if (file.isNew) status = '新增';
+      if (file.isDeleted) status = '刪除';
+      return `檔案: ${file.filePath} [${status}]\n${diff}`;
     })
     .join('\n\n---\n\n');
 
@@ -208,7 +217,7 @@ feat(auth): 新增使用者登入功能
 - 新增登入頁面 UI
 - 整合 JWT 認證機制`;
 
-  const response = await AIClient.sendAndWait(prompt, config.ai.model);
+  const response = await AIClient.sendAndWait(prompt, config.ai.model, config.ai.maxRetries);
 
   // 清理可能的 markdown code block 標記
   let commitMessage = response.trim();
@@ -240,9 +249,11 @@ async function commitGroup(group, files, config) {
 
     // Add 這組的檔案
     for (const file of files) {
-      console.log(`   ├─ ${file.filePath}`);
+      const fileStatus = file.isNew ? '新增' : file.isDeleted ? '刪除' : '修改';
+      console.log(`   ├─ [${fileStatus}] ${file.filePath}`);
       try {
         // 使用 JSON.stringify 來正確處理包含空格或特殊字符的檔案路徑
+        // git add 對於刪除的檔案也能正確處理
         execSync(`git add ${JSON.stringify(file.filePath)}`, { encoding: 'utf-8' });
       } catch (addError) {
         console.error(`   ⚠️  無法加入檔案: ${file.filePath}`, addError.message);
@@ -323,7 +334,9 @@ export async function commitAllCommand() {
 
     console.log(`📊 找到 ${changes.length} 個變更的檔案:\n`);
     changes.forEach((change, index) => {
-      const status = change.isNew ? '新增' : '修改';
+      let status = '修改';
+      if (change.isNew) status = '新增';
+      if (change.isDeleted) status = '刪除';
       console.log(`   [${index}] ${status} - ${change.filePath}`);
     });
     console.log();
@@ -336,10 +349,46 @@ export async function commitAllCommand() {
       process.exit(1);
     }
 
+    // 驗證所有檔案都被包含在分組中
+    const groupedIndices = new Set();
+    groups.forEach((group) => {
+      group.file_indices.forEach((index) => {
+        groupedIndices.add(index);
+      });
+    });
+
+    const ungroupedIndices = [];
+    for (let i = 0; i < changes.length; i++) {
+      if (!groupedIndices.has(i)) {
+        ungroupedIndices.push(i);
+      }
+    }
+
+    // 如果有檔案未被分組，創建一個 "其他變更" 群組
+    if (ungroupedIndices.length > 0) {
+      console.log(`\n⚠️  發現 ${ungroupedIndices.length} 個未分組的檔案，將自動歸類：`);
+      ungroupedIndices.forEach((index) => {
+        console.log(`   - ${changes[index].filePath}`);
+      });
+
+      groups.push({
+        group_name: '其他變更',
+        commit_type: 'chore',
+        commit_scope: 'misc',
+        file_indices: ungroupedIndices,
+        description: '未能自動分類的其他變更',
+      });
+    }
+
     logger.success(`AI 分析完成，共分為 ${groups.length} 個群組:\n`);
     groups.forEach((group, index) => {
       console.log(`   群組 ${index + 1}: ${group.group_name} (${group.commit_type})`);
       console.log(`   └─ 包含 ${group.file_indices.length} 個檔案`);
+      if (config.output.verbose) {
+        group.file_indices.forEach((fileIndex) => {
+          console.log(`      - [${fileIndex}] ${changes[fileIndex].filePath}`);
+        });
+      }
     });
 
     // 3. 依序提交每個群組
@@ -352,6 +401,14 @@ export async function commitAllCommand() {
       const group = groups[i];
       const groupFiles = group.file_indices.map((index) => changes[index]);
 
+      // 驗證檔案索引是否有效
+      const invalidIndices = group.file_indices.filter((idx) => idx >= changes.length);
+      if (invalidIndices.length > 0) {
+        console.error(`\n❌ 群組 ${i + 1} 包含無效的檔案索引:`, invalidIndices);
+        console.log(`   跳過此群組: ${group.group_name}`);
+        continue;
+      }
+
       const success = await commitGroup(group, groupFiles, config);
       if (success) {
         successCount++;
@@ -363,9 +420,18 @@ export async function commitAllCommand() {
     logger.success(`完成！成功提交 ${successCount}/${groups.length} 個群組`);
     logger.separator('=', 60);
 
+    if (successCount < groups.length) {
+      const failedCount = groups.length - successCount;
+      console.log(`\n⚠️  有 ${failedCount} 個群組提交失敗`);
+    }
+
     // 顯示最近的幾個 commits
-    console.log('\n📋 最近的 commits:');
-    execSync(`git log -${successCount} --oneline`, { stdio: 'inherit' });
+    if (successCount > 0) {
+      console.log('\n📋 最近的 commits:');
+      execSync(`git log -${successCount} --oneline`, { stdio: 'inherit' });
+    } else {
+      console.log('\n⚠️  沒有成功的提交');
+    }
 
     // Reset 任何剩餘的 staged 檔案
     try {