ai-git-tools 2.0.77 → 2.0.79

package/package.json

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

package/src/commands/commit-all.js

@@ -9,7 +9,7 @@ import { readFileSync, writeFileSync, unlinkSync } from 'fs';
 import { loadCommitConfig } from '../core/config-loader.js';
 import { AIClient } from '../core/ai-client.js';
 import { Logger } from '../utils/logger.js';
-import { handleError } from '../utils/helpers.js';
+import { handleError, isCopilotSubscriptionError } from '../utils/helpers.js';
 
 /**
  * 獲取檔案的變更內容
@@ -54,7 +54,7 @@ function getAllChanges() {
     }
 
     const changes = [];
-    const lines = status.split('\n').filter((line) => line.trim());
+    const lines = status.split('\n').filter(line => line.trim());
 
     for (const line of lines) {
       const statusCode = line.substring(0, 2);
@@ -184,8 +184,19 @@ ${changeSummary}
   try {
     return AIClient.parseJSON(response);
   } catch (error) {
-    console.error('❌ 無法解析 AI 回應:', error.message);
-    console.log('原始回應:', response);
+    // 區分不同類型的錯誤
+    if (isCopilotSubscriptionError(error)) {
+      console.error('\n🔑 看起來是 GitHub Copilot 授權問題');
+      console.error('\n解決方案:');
+      console.error('  1. 確認你的 GitHub 帳號已訂閱 GitHub Copilot');
+      console.error('  2. 驗證 VS Code 中使用的 GitHub 帳號是否有 Copilot 存取權限');
+      console.error('  3. 嘗試重新登入:');
+      console.error('     gh auth logout');
+      console.error('     gh auth login');
+    } else {
+      console.error('❌ 無法解析 AI 回應:', error.message);
+      console.log('原始回應:', response);
+    }
     return null;
   }
 }
@@ -197,7 +208,7 @@ async function generateCommitMessage(group, files, config) {
   // 每個檔案最多 2000 字元，避免單一群組內大量 diff 超出限制
   const MAX_DIFF_PER_FILE = 2000;
   const filesList = files
-    .map((file) => {
+    .map(file => {
       const diff = getFileDiff(file.filePath, file.isNew, file.isDeleted);
       const truncatedDiff =
         diff.length > MAX_DIFF_PER_FILE
@@ -295,7 +306,7 @@ async function commitGroup(group, files, config) {
 
       console.log(`\n   📝 Commit Message:`);
       console.log(`   ${'─'.repeat(50)}`);
-      commitMessage.split('\n').forEach((line) => {
+      commitMessage.split('\n').forEach(line => {
         console.log(`   ${line}`);
       });
       console.log(`   ${'─'.repeat(50)}`);
@@ -386,8 +397,8 @@ export async function commitAllCommand() {
 
     // 驗證所有檔案都被包含在分組中
     const groupedIndices = new Set();
-    groups.forEach((group) => {
-      group.file_indices.forEach((index) => {
+    groups.forEach(group => {
+      group.file_indices.forEach(index => {
         groupedIndices.add(index);
       });
     });
@@ -402,7 +413,7 @@ export async function commitAllCommand() {
     // 如果有檔案未被分組，創建一個 "其他變更" 群組
     if (ungroupedIndices.length > 0) {
       console.log(`\n⚠️  發現 ${ungroupedIndices.length} 個未分組的檔案，將自動歸類：`);
-      ungroupedIndices.forEach((index) => {
+      ungroupedIndices.forEach(index => {
         console.log(`   - ${changes[index].filePath}`);
       });
 
@@ -420,7 +431,7 @@ export async function commitAllCommand() {
       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) => {
+        group.file_indices.forEach(fileIndex => {
           console.log(`      - [${fileIndex}] ${changes[fileIndex].filePath}`);
         });
       }
@@ -434,10 +445,10 @@ export async function commitAllCommand() {
     let successCount = 0;
     for (let i = 0; i < groups.length; i++) {
       const group = groups[i];
-      const groupFiles = group.file_indices.map((index) => changes[index]);
+      const groupFiles = group.file_indices.map(index => changes[index]);
 
       // 驗證檔案索引是否有效
-      const invalidIndices = group.file_indices.filter((idx) => idx >= changes.length);
+      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}`);

package/src/commands/commit.js

@@ -9,7 +9,13 @@ import { loadCommitConfig } from '../core/config-loader.js';
 import { GitOperations } from '../core/git-operations.js';
 import { AIClient } from '../core/ai-client.js';
 import { Logger } from '../utils/logger.js';
-import { cleanCommitMessage, validateCommitMessage, handleError, getProjectTypePrompt } from '../utils/helpers.js';
+import {
+  cleanCommitMessage,
+  validateCommitMessage,
+  handleError,
+  getProjectTypePrompt,
+  isCopilotSubscriptionError,
+} from '../utils/helpers.js';
 
 export async function commitCommand() {
   const logger = new Logger();
@@ -108,13 +114,27 @@ ${truncatedDiff}`;
     // 所有重試都失敗
     if (!commitMessage) {
       logger.error('無法產生有效的 commit message');
-      if (lastError && config.output.verbose) {
-        console.log(`   最後錯誤: ${lastError.message}`);
+
+      // 區分不同類型的錯誤
+      if (isCopilotSubscriptionError(lastError)) {
+        console.log('\n🔑 看起來是 GitHub Copilot 授權問題\n');
+        console.log('解決方案:');
+        console.log('  1. 確認你的 GitHub 帳號已訂閱 GitHub Copilot');
+        console.log('  2. 驗證 VS Code 中使用的 GitHub 帳號是否有 Copilot 存取權限');
+        console.log('  3. 嘗試重新登入:');
+        console.log('     gh auth logout');
+        console.log('     gh auth login');
+        console.log('  4. 若是公司帳號，確保使用公司的 GitHub 帳號登入');
+      } else {
+        if (config.output.verbose && lastError) {
+          console.log(`   最後錯誤: ${lastError.message}`);
+        }
+        console.log('\n💡 建議：');
+        console.log('   1. 檢查網路連線');
+        console.log('   2. 嘗試更換 AI 模型（使用 --model 參數）');
+        console.log('   3. 確認變更內容不會太複雜或太大');
       }
-      console.log('\n💡 建議：');
-      console.log('   1. 檢查網路連線');
-      console.log('   2. 嘗試更換 AI 模型（使用 --model 參數）');
-      console.log('   3. 確認變更內容不會太複雜或太大');
+
       throw new Error('無法產生有效的 commit message');
     }
 

package/src/core/ai-client.js

@@ -6,6 +6,26 @@
 import { CopilotClient, approveAll } from '@github/copilot-sdk';
 
 export class AIClient {
+  /**
+   * 檢測是否為 Copilot 授權相關的錯誤
+   */
+  static isCopilotAuthError(error) {
+    const message = error?.message || error?.toString() || '';
+    const lowerMessage = message.toLowerCase();
+
+    return (
+      lowerMessage.includes('permission') ||
+      lowerMessage.includes('unauthorized') ||
+      lowerMessage.includes('forbidden') ||
+      lowerMessage.includes('not authorized') ||
+      lowerMessage.includes('authentication failed') ||
+      lowerMessage.includes('access denied') ||
+      lowerMessage.includes('you do not have access') ||
+      lowerMessage.includes('copilot') ||
+      message.includes('EACCES')
+    );
+  }
+
   /**
    * 發送 prompt 並等待回應（帶重試機制和超時保護）
    */
@@ -15,11 +35,11 @@ export class AIClient {
     for (let attempt = 1; attempt <= maxRetries; attempt++) {
       const client = new CopilotClient();
       try {
-        const session = await client.createSession({ 
+        const session = await client.createSession({
           model,
-          onPermissionRequest: approveAll
+          onPermissionRequest: approveAll,
         });
-        
+
         // 使用 Promise.race 實現超時控制
         const responsePromise = session.sendAndWait({ prompt });
         const timeoutPromise = new Promise((_, reject) => {
@@ -34,7 +54,7 @@ export class AIClient {
         lastError = error;
         if (attempt < maxRetries) {
           console.log(`⚠️  AI 請求失敗，重試第 ${attempt}/${maxRetries} 次...`);
-          await new Promise((resolve) => setTimeout(resolve, 1000 * attempt));
+          await new Promise(resolve => setTimeout(resolve, 1000 * attempt));
         }
       } finally {
         // 確保每次都關閉 client，無論成功或失敗
@@ -46,7 +66,11 @@ export class AIClient {
       }
     }
 
-    throw new Error(`AI 請求失敗: ${lastError?.message || '未知錯誤'}`);
+    // 區分不同類型的錯誤
+    const errorObj = new Error(`AI 請求失敗: ${lastError?.message || '未知錯誤'}`);
+    errorObj.originalError = lastError;
+    errorObj.isCopilotAuth = AIClient.isCopilotAuthError(lastError);
+    throw errorObj;
   }
 
   /**
@@ -54,7 +78,10 @@ export class AIClient {
    */
   static parseJSON(content) {
     // 移除可能的 markdown code block 標記
-    const jsonContent = content.replace(/```json\n?/g, '').replace(/```\n?/g, '').trim();
+    const jsonContent = content
+      .replace(/```json\n?/g, '')
+      .replace(/```\n?/g, '')
+      .trim();
 
     try {
       return JSON.parse(jsonContent);

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

@@ -1,6 +1,6 @@
 import { CopilotClient, approveAll } from '@github/copilot-sdk';
 import { CONSTANTS, PROJECT_SKILLS_CONTEXT } from '../utils/constants.js';
-import { getSkillsSummaryForPrompt, log } from '../utils/helpers.js';
+import { getSkillsSummaryForPrompt, log, isCopilotAuthError } from '../utils/helpers.js';
 
 // 讓 CopilotClient 啟動的 Node 子程序繼承此設定，靜音 SQLite ExperimentalWarning
 process.env.NODE_NO_WARNINGS = '1';
@@ -106,6 +106,16 @@ export class AIAnalyzer {
           log.info(`  建議改用更快的模型：ai-git-tools pr --model gpt-5.4\n`);
           throw new Error(`AI 生成超時：模型 ${this.model} 回應過慢，請加 --model gpt-5.4 重試`);
         }
+
+        // 檢測 Copilot 授權錯誤
+        if (isCopilotAuthError(error)) {
+          log.error('看起來是 GitHub Copilot 授權問題');
+          log.error('  1. 確認你的 GitHub 帳號已訂閱 GitHub Copilot');
+          log.error('  2. 驗證 VS Code 中使用的 GitHub 帳號是否有 Copilot 存取權限');
+          log.error('  3. 嘗試重新登入: gh auth logout && gh auth login');
+          throw error;
+        }
+
         throw error;
       }
     }

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

@@ -11,9 +11,9 @@ export class GitOperations {
    */
   detectReleaseBranches() {
     try {
-      // 嘗試同步遠端，失敗就用本機已知的遠端資訊
+      // 嘗試同步遠端（含 --prune 以清除已刪除的遠端分支），失敗就用本機已知的遠端資訊
       try {
-        execSync('git fetch origin', { stdio: 'ignore', timeout: 15000 });
+        execSync('git fetch --prune origin', { stdio: 'ignore', timeout: 15000 });
       } catch (_) {
         // fetch 失敗，繼續使用已經 cache 的遠端分支
       }

package/src/pr-modules/utils/helpers.js

@@ -4,11 +4,11 @@ import { colors } from './constants.js';
  * 日誌工具
  */
 export const log = {
-  info: (msg) => console.log(`${colors.blue}ℹ${colors.reset} ${msg}`),
-  success: (msg) => console.log(`${colors.green}✅${colors.reset} ${msg}`),
-  warning: (msg) => console.log(`${colors.yellow}⚠️${colors.reset} ${msg}`),
-  error: (msg) => console.log(`${colors.red}❌${colors.reset} ${msg}`),
-  step: (msg) => console.log(`${colors.cyan}▶${colors.reset} ${msg}`),
+  info: msg => console.log(`${colors.blue}ℹ${colors.reset} ${msg}`),
+  success: msg => console.log(`${colors.green}✅${colors.reset} ${msg}`),
+  warning: msg => console.log(`${colors.yellow}⚠️${colors.reset} ${msg}`),
+  error: msg => console.log(`${colors.red}❌${colors.reset} ${msg}`),
+  step: msg => console.log(`${colors.cyan}▶${colors.reset} ${msg}`),
 };
 
 /**
@@ -24,10 +24,44 @@ export class PRError extends Error {
   }
 }
 
+/**
+ * 檢測 Copilot 授權錯誤
+ */
+export function isCopilotAuthError(error) {
+  const message = (error?.message || error?.toString() || '').toLowerCase();
+  const originalMessage = (error?.originalError?.message || '').toLowerCase();
+
+  return (
+    message.includes('permission') ||
+    message.includes('unauthorized') ||
+    message.includes('forbidden') ||
+    message.includes('not authorized') ||
+    message.includes('authentication failed') ||
+    message.includes('access denied') ||
+    message.includes('you do not have access') ||
+    message.includes('copilot') ||
+    originalMessage.includes('permission') ||
+    originalMessage.includes('unauthorized')
+  );
+}
+
 /**
  * 錯誤處理器
  */
 export function handleError(error) {
+  // 先檢查是否為 Copilot 授權相關的錯誤
+  if (isCopilotAuthError(error)) {
+    log.error('看起來是 GitHub Copilot 授權問題\n');
+    console.log(`${colors.cyan}解決方案:${colors.reset}`);
+    console.log('  1. 確認你的 GitHub 帳號已訂閱 GitHub Copilot');
+    console.log('  2. 驗證 VS Code 中使用的 GitHub 帳號是否有 Copilot 存取權限');
+    console.log('  3. 嘗試重新登入:');
+    console.log('     gh auth logout');
+    console.log('     gh auth login');
+    console.log('  4. 若是公司帳號，確保使用公司的 GitHub 帳號登入\n');
+    return;
+  }
+
   if (error instanceof PRError) {
     log.error(error.message);
 
@@ -55,7 +89,7 @@ export function handleError(error) {
  */
 export function getSkillsSummaryForPrompt(PROJECT_SKILLS_CONTEXT) {
   const rbp = PROJECT_SKILLS_CONTEXT.reactBestPractices
-    .map((r) => `  - [${r.id}] ${r.category}: ${r.desc}`)
+    .map(r => `  - [${r.id}] ${r.category}: ${r.desc}`)
     .join('\n');
   const fg = PROJECT_SKILLS_CONTEXT.frontendGuidelines;
   return `

package/src/utils/helpers.js

@@ -43,19 +43,53 @@ export function validateCommitMessage(message) {
   return { valid: true };
 }
 
+/**
+ * 檢測 Copilot 授權錯誤
+ */
+export function isCopilotSubscriptionError(error) {
+  if (!error) return false;
+
+  const message = (error.message || error.toString() || '').toLowerCase();
+  const originalError = (error.originalError?.message || '').toLowerCase();
+
+  return (
+    error.isCopilotAuth === true ||
+    message.includes('permission') ||
+    message.includes('unauthorized') ||
+    message.includes('forbidden') ||
+    message.includes('not authorized') ||
+    originalError.includes('permission') ||
+    originalError.includes('unauthorized')
+  );
+}
+
 /**
  * 錯誤處理
  */
 export function handleError(error) {
   console.error('\n❌ 錯誤:', error.message);
-  
+
+  // 檢查是否為 Copilot 授權相關的錯誤
+  if (isCopilotSubscriptionError(error)) {
+    console.log('\n🔐 看起來是 GitHub Copilot 授權問題\n');
+    console.log('解決方案:');
+    console.log('  1. 確認你的 GitHub 帳號已訂閱 GitHub Copilot');
+    console.log('  2. 驗證 VS Code 中使用的 GitHub 帳號是否有 Copilot 訪問權限');
+    console.log('  3. 嘗試重新登入:');
+    console.log('     gh auth logout');
+    console.log('     gh auth login');
+    console.log('  4. 若是公司帳號，確保使用公司的 GitHub 帳號登入');
+    console.log('');
+    return;
+  }
+
   if (error.suggestions && error.suggestions.length > 0) {
     console.log('\n💡 建議解決方案:');
     error.suggestions.forEach((suggestion, index) => {
       console.log(`  ${index + 1}. ${suggestion}`);
     });
   }
-  
+
   if (error.stack && process.env.VERBOSE) {
     console.error('\n堆疊追蹤:');
     console.error(error.stack);