ai-git-tools 2.0.24 → 2.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-git-tools",
-  "version": "2.0.24",
+  "version": "2.0.26",
   "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');
 
@@ -238,54 +247,71 @@ async function commitGroup(group, files, config) {
       // 忽略錯誤（可能沒有 staged 的檔案）
     }
 
-    // Add 這組的檔案
-    for (const file of files) {
-      console.log(`   ├─ ${file.filePath}`);
-      try {
-        // 使用 JSON.stringify 來正確處理包含空格或特殊字符的檔案路徑
-        execSync(`git add ${JSON.stringify(file.filePath)}`, { encoding: 'utf-8' });
-      } catch (addError) {
-        console.error(`   ⚠️  無法加入檔案: ${file.filePath}`, addError.message);
-        throw addError;
+    // Add 這組的檔案（使用 try-finally 確保失敗時清理）
+    const addedFiles = [];
+    try {
+      for (const file of files) {
+        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' });
+          addedFiles.push(file.filePath);
+        } catch (addError) {
+          console.error(`   ⚠️  無法加入檔案: ${file.filePath}`, addError.message);
+          throw addError;
+        }
       }
-    }
 
-    // 生成 commit message
-    console.log(`   └─ 生成 commit message...`);
-    const commitMessage = await generateCommitMessage(group, files, config);
-
-    if (!commitMessage) {
-      console.log(`   ❌ 無法生成 commit message，跳過此群組`);
-      return false;
-    }
+      // 生成 commit message
+      console.log(`   └─ 生成 commit message...`);
+      const commitMessage = await generateCommitMessage(group, files, config);
 
-    console.log(`\n   📝 Commit Message:`);
-    console.log(`   ${'─'.repeat(50)}`);
-    commitMessage.split('\n').forEach((line) => {
-      console.log(`   ${line}`);
-    });
-    console.log(`   ${'─'.repeat(50)}`);
+      if (!commitMessage) {
+        console.log(`   ❌ 無法生成 commit message，跳過此群組`);
+        return false;
+      }
 
-    // 執行 commit
-    // 使用暫存檔案避免 commit message 中的特殊字元問題
-    const tmpFile = '.git/COMMIT_EDITMSG_TMP';
-    try {
-      writeFileSync(tmpFile, commitMessage, 'utf-8');
-      execSync(`git commit -F ${tmpFile}`, {
-        stdio: 'inherit',
+      console.log(`\n   📝 Commit Message:`);
+      console.log(`   ${'─'.repeat(50)}`);
+      commitMessage.split('\n').forEach((line) => {
+        console.log(`   ${line}`);
       });
-      unlinkSync(tmpFile);
-    } catch (commitError) {
+      console.log(`   ${'─'.repeat(50)}`);
+
+      // 執行 commit
+      // 使用暫存檔案避免 commit message 中的特殊字元問題
+      const tmpFile = '.git/COMMIT_EDITMSG_TMP';
       try {
+        writeFileSync(tmpFile, commitMessage, 'utf-8');
+        execSync(`git commit -F ${tmpFile}`, {
+          stdio: 'inherit',
+        });
         unlinkSync(tmpFile);
-      } catch (e) {
-        // 忽略刪除暫存檔案的錯誤
+      } catch (commitError) {
+        try {
+          unlinkSync(tmpFile);
+        } catch (e) {
+          // 忽略刪除暫存檔案的錯誤
+        }
+        throw commitError;
       }
-      throw commitError;
-    }
 
-    console.log(`   ✅ Commit 完成！`);
-    return true;
+      console.log(`   ✅ Commit 完成！`);
+      return true;
+    } catch (error) {
+      // 如果失敗，unstage 所有已經 add 的檔案
+      if (addedFiles.length > 0) {
+        console.log(`   🔄 清理已 staged 的檔案...`);
+        try {
+          execSync('git reset HEAD -- .', { stdio: 'ignore' });
+        } catch (e) {
+          // 忽略 reset 錯誤
+        }
+      }
+      throw error;
+    }
   } catch (error) {
     console.error(`   ❌ Commit 失敗:`, error.message);
     return false;
@@ -318,12 +344,14 @@ export async function commitAllCommand() {
 
     if (changes.length === 0) {
       logger.info('沒有需要提交的變更');
-      process.exit(0);
+      return;
     }
 
     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();
@@ -333,7 +361,7 @@ export async function commitAllCommand() {
 
     if (!groups || groups.length === 0) {
       logger.error('AI 分析失敗或沒有產生分組');
-      process.exit(1);
+      throw new Error('AI 分析失敗或沒有產生分組');
     }
 
     // 驗證所有檔案都被包含在分組中
@@ -428,6 +456,6 @@ export async function commitAllCommand() {
     }
   } catch (error) {
     handleError(error);
-    process.exit(1);
+    throw error;
   }
 }

package/src/commands/commit.js

@@ -31,7 +31,7 @@ export async function commitCommand() {
     if (!diff.trim()) {
       logger.error('沒有 staged 的變更');
       console.log('💡 請先使用 git add 來 stage 你的變更');
-      process.exit(1);
+      throw new Error('沒有 staged 的變更');
     }
 
     logger.step('正在分析變更內容...\n');
@@ -115,7 +115,7 @@ ${truncatedDiff}`;
       console.log('   1. 檢查網路連線');
       console.log('   2. 嘗試更換 AI 模型（使用 --model 參數）');
       console.log('   3. 確認變更內容不會太複雜或太大');
-      process.exit(1);
+      throw new Error('無法產生有效的 commit message');
     }
 
     logger.success('產生的 Commit Message:');
@@ -132,6 +132,6 @@ ${truncatedDiff}`;
     logger.success('Commit 完成！\n');
   } catch (error) {
     handleError(error);
-    process.exit(1);
+    throw error;
   }
 }

package/src/commands/pr.js

@@ -33,6 +33,6 @@ export async function prCommand() {
     await workflow.execute();
   } catch (error) {
     handleError(error);
-    process.exit(1);
+    throw error;
   }
 }

package/src/core/ai-client.js

@@ -7,17 +7,23 @@ import { CopilotClient } from '@github/copilot-sdk';
 
 export class AIClient {
   /**
-   * 發送 prompt 並等待回應（帶重試機制）
+   * 發送 prompt 並等待回應（帶重試機制和超時保護）
    */
-  static async sendAndWait(prompt, model = 'gpt-4.1', maxRetries = 3) {
-    const client = new CopilotClient();
+  static async sendAndWait(prompt, model = 'gpt-4.1', maxRetries = 3, timeout = 60000) {
     let lastError = null;
 
     for (let attempt = 1; attempt <= maxRetries; attempt++) {
+      const client = new CopilotClient();
       try {
         const session = await client.createSession({ model });
-        const response = await session.sendAndWait({ prompt });
-        await client.stop();
+        
+        // 使用 Promise.race 實現超時控制
+        const responsePromise = session.sendAndWait({ prompt });
+        const timeoutPromise = new Promise((_, reject) => {
+          setTimeout(() => reject(new Error(`AI 請求超時 (${timeout}ms)`)), timeout);
+        });
+
+        const response = await Promise.race([responsePromise, timeoutPromise]);
 
         const content = response?.data?.content || '';
         return content.trim();
@@ -26,7 +32,13 @@ export class AIClient {
         if (attempt < maxRetries) {
           console.log(`⚠️  AI 請求失敗，重試第 ${attempt}/${maxRetries} 次...`);
           await new Promise((resolve) => setTimeout(resolve, 1000 * attempt));
-          continue;
+        }
+      } finally {
+        // 確保每次都關閉 client，無論成功或失敗
+        try {
+          await client.stop();
+        } catch (e) {
+          // 忽略關閉錯誤
         }
       }
     }

package/src/pr-modules/ai/code-analyzer.js

@@ -29,19 +29,27 @@ export class AIAnalyzer {
     const { client, session } = await this.createClient();
 
     try {
-      const response = await session.sendAndWait({ prompt });
-      const prContent = response?.data.content?.trim() || '';
+      // 使用超時保護 (60 秒)
+      const responsePromise = session.sendAndWait({ prompt });
+      const timeoutPromise = new Promise((_, reject) => {
+        setTimeout(() => reject(new Error('AI 請求超時 (60 秒)')), 60000);
+      });
 
-      await client.stop();
+      const response = await Promise.race([responsePromise, timeoutPromise]);
+      const prContent = response?.data.content?.trim() || '';
 
       if (!prContent) {
         throw new Error('AI 未能生成 PR 內容');
       }
 
       return this.parsePRContent(prContent);
-    } catch (error) {
-      await client.stop();
-      throw error;
+    } finally {
+      // 確保 client 一定會被關閉
+      try {
+        await client.stop();
+      } catch (e) {
+        // 忽略關閉錯誤
+      }
     }
   }
 
@@ -56,10 +64,15 @@ export class AIAnalyzer {
 
     try {
       log.info('  正在使用 AI 深度分析程式碼變更...');
-      const response = await session.sendAndWait({ prompt });
-      const content = response?.data.content?.trim() || '';
+      
+      // 使用超時保護 (60 秒)
+      const responsePromise = session.sendAndWait({ prompt });
+      const timeoutPromise = new Promise((_, reject) => {
+        setTimeout(() => reject(new Error('AI 請求超時 (60 秒)')), 60000);
+      });
 
-      await client.stop();
+      const response = await Promise.race([responsePromise, timeoutPromise]);
+      const content = response?.data.content?.trim() || '';
 
       // 解析 JSON
       try {
@@ -85,9 +98,15 @@ export class AIAnalyzer {
         return this.getFallbackAnalysis(changedFiles);
       }
     } catch (error) {
-      await client.stop();
       log.warning(`  AI 分析失敗 (${error.message})，使用基礎分析...\n`);
       return this.getFallbackAnalysis(changedFiles);
+    } finally {
+      // 確保 client 一定會被關閉
+      try {
+        await client.stop();
+      } catch (e) {
+        // 忽略關閉錯誤
+      }
     }
   }
 

package/src/pr-modules/core/git-operations.js

@@ -49,14 +49,16 @@ export class GitOperations {
   /**
    * 獲取變更統計
    */
-  getChangeStats(baseBranch, headBranch) {
+  getChangeStats(baseBranch, headBranch, useRemoteHead = false) {
     try {
-      const stats = execSync(`git diff --shortstat origin/${baseBranch}...${headBranch}`, {
+      // 使用本地 headBranch 以確保能檢測到未推送的變更
+      const headRef = useRemoteHead ? `origin/${headBranch}` : headBranch;
+      const stats = execSync(`git diff --shortstat origin/${baseBranch}...${headRef}`, {
         encoding: 'utf-8',
       }).trim();
 
       const filesChanged = execSync(
-        `git diff --name-only origin/${baseBranch}...${headBranch} | wc -l`,
+        `git diff --name-only origin/${baseBranch}...${headRef} | wc -l`,
         { encoding: 'utf-8' }
       ).trim();
 
@@ -69,9 +71,11 @@ export class GitOperations {
   /**
    * 獲取變更的檔案列表
    */
-  getChangedFiles(baseBranch, headBranch) {
+  getChangedFiles(baseBranch, headBranch, useRemoteHead = false) {
     try {
-      const files = execSync(`git diff --name-only origin/${baseBranch}...${headBranch}`, {
+      // 使用本地 headBranch 以確保能檢測到未推送的變更
+      const headRef = useRemoteHead ? `origin/${headBranch}` : headBranch;
+      const files = execSync(`git diff --name-only origin/${baseBranch}...${headRef}`, {
         encoding: 'utf-8',
       })
         .split('\n')
@@ -86,9 +90,11 @@ export class GitOperations {
    * 獲取 commit 列表
    */
   getCommits(baseBranch, headBranch, options = {}) {
-    const { oneline = true, noDecorate = true } = options;
+    const { oneline = true, noDecorate = true, useRemoteHead = false } = options;
     try {
-      let cmd = `git log origin/${baseBranch}..origin/${headBranch}`;
+      // 使用本地 headBranch 以確保能檢測到未推送的 commit
+      const headRef = useRemoteHead ? `origin/${headBranch}` : headBranch;
+      let cmd = `git log origin/${baseBranch}..${headRef}`;
       if (oneline) cmd += ' --oneline';
       if (noDecorate) cmd += ' --no-decorate';
 
@@ -98,7 +104,7 @@ export class GitOperations {
         '無法比較分支差異',
         'GIT_COMPARE_FAILED',
         ['檢查遠端分支是否存在: git branch -r', '執行診斷: npm run diagnose:pr'],
-        `git log origin/${baseBranch}..origin/${headBranch}`
+        `git log origin/${baseBranch}..${headBranch}`
       );
     }
   }
@@ -106,15 +112,18 @@ export class GitOperations {
   /**
    * 獲取 diff
    */
-  getDiff(baseBranch, headBranch, maxBuffer = CONSTANTS.MAX_BUFFER_SIZE) {
+  getDiff(baseBranch, headBranch, useRemoteHead = false, maxBuffer = CONSTANTS.MAX_BUFFER_SIZE) {
     try {
-      return execSync(`git diff origin/${baseBranch}...${headBranch}`, {
+      // 使用本地 headBranch 以確保能檢測到未推送的變更
+      const headRef = useRemoteHead ? `origin/${headBranch}` : headBranch;
+      return execSync(`git diff origin/${baseBranch}...${headRef}`, {
         encoding: 'utf-8',
         maxBuffer,
       });
     } catch (error) {
       // 嘗試替代方案
-      return execSync(`git diff origin/${baseBranch}..${headBranch}`, {
+      const headRef = useRemoteHead ? `origin/${headBranch}` : headBranch;
+      return execSync(`git diff origin/${baseBranch}..${headRef}`, {
         encoding: 'utf-8',
         maxBuffer,
       });

package/src/pr-modules/core/workflow.js

@@ -1,4 +1,5 @@
 import { createInterface } from 'readline';
+import { execSync } from 'child_process';
 import { GitOperations } from './git-operations.js';
 import { GitHubAPI } from './github-api.js';
 import { AIAnalyzer } from '../ai/code-analyzer.js';
@@ -202,12 +203,35 @@ export class PRWorkflow {
     await this.git.fetch();
     log.success('同步完成\n');
 
-    // 檢查本地 commit 差異
+    // 顯示分支狀態診斷信息
+    if (this.config.output?.verbose) {
+      console.log(`${colors.cyan}🔍 分支診斷信息:${colors.reset}`);
+      try {
+        const currentBranch = this.git.getCurrentBranch();
+        console.log(`  當前分支: ${currentBranch}`);
+        console.log(`  Base 分支: origin/${baseBranch}`);
+        console.log(`  Head 分支: ${headBranch} (本地)`);
+        
+        // 檢查遠端分支是否存在
+        try {
+          execSync(`git rev-parse --verify origin/${headBranch}`, { stdio: 'pipe' });
+          console.log(`  遠端 ${headBranch}: ✓ 存在`);
+        } catch (e) {
+          console.log(`  遠端 ${headBranch}: ✗ 不存在（尚未推送）`);
+        }
+      } catch (e) {
+        // 忽略診斷錯誤
+      }
+      console.log('');
+    }
+
+    // 檢查本地 commit 差異（使用本地 headBranch）
     let localCommits;
     try {
       localCommits = this.git.getCommits(baseBranch, headBranch, {
         oneline: true,
         noDecorate: true,
+        useRemoteHead: false, // 使用本地分支以檢測未推送的commit
       });
     } catch (error) {
       throw new PRError(
@@ -261,10 +285,11 @@ export class PRWorkflow {
    * 收集變更資料
    */
   collectChangeData(baseBranch, headBranch) {
-    const stats = this.git.getChangeStats(baseBranch, headBranch);
-    const changedFiles = this.git.getChangedFiles(baseBranch, headBranch);
-    const commits = this.git.getCommits(baseBranch, headBranch);
-    const diff = this.git.getDiff(baseBranch, headBranch);
+    // 此時已經推送完成，使用本地分支即可（本地和遠端應該已同步）
+    const stats = this.git.getChangeStats(baseBranch, headBranch, false);
+    const changedFiles = this.git.getChangedFiles(baseBranch, headBranch, false);
+    const commits = this.git.getCommits(baseBranch, headBranch, { useRemoteHead: false });
+    const diff = this.git.getDiff(baseBranch, headBranch, false);
     const truncatedDiff = this.git.truncateDiff(diff);
 
     console.log(`📈 變更統計: ${stats.stats}`);

package/src/pr-modules/ui/interactive-select.js

@@ -59,6 +59,7 @@ export class InteractiveSelect {
       const cleanup = () => {
         process.stdin.setRawMode(false);
         process.stdin.removeAllListeners('keypress');
+        process.stdin.pause(); // 確保 stdin stream 被關閉
         process.stdout.write(cursor.show);
         console.log('');
       };