ai-git-tools 2.0.24 → 2.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-git-tools",
-  "version": "2.0.24",
+  "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,
       });
@@ -95,12 +100,13 @@ async function analyzeAndGroupChanges(changes, config) {
   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');
 
@@ -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');
 
@@ -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();