ai-git-tools 2.0.78 → 2.0.80

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/core/config-loader.js

@@ -1,12 +1,38 @@
 /**
  * 配置載入器
- * 基於 scripts/commit-modules/config-loader.mjs 和 scripts/ai-pr-modules/core/config-loader.mjs
- * 支援從任何目錄下的 .ai-git-config.mjs 載入配置
+ * 統一 commit 與 PR 命令的配置載入
+ * 支援從目前工作目錄下的 .ai-git-config.mjs 載入配置
  */
 
 import { existsSync } from 'fs';
 import { resolve } from 'path';
 
+/**
+ * 內建預設配置
+ */
+const DEFAULT_CONFIG = {
+  ai: {
+    model: 'gpt-4.1',
+    maxDiffLength: 8000,
+    maxRetries: 3,
+  },
+  github: {
+    defaultBase: 'release',
+    autoLabels: true,
+    includeImpactAnalysis: false,
+  },
+  reviewers: {
+    interactiveReviewers: true,
+    maxSuggested: 5,
+    gitHistoryDepth: 20,
+    excludeAuthors: [],
+  },
+  output: {
+    verbose: false,
+    saveHistory: false,
+  },
+};
+
 /**
  * 解析命令行參數
  */
@@ -17,6 +43,13 @@ export function parseCliArgs() {
     verbose: false,
     maxDiffLength: null,
     maxRetries: null,
+    baseBranch: null,
+    headBranch: null,
+    preview: false,
+    noConfirm: false,
+    interactiveReviewers: undefined,
+    autoLabels: null,
+    includeImpactAnalysis: null,
   };
 
   for (let i = 0; i < args.length; i++) {
@@ -34,91 +67,11 @@ export function parseCliArgs() {
       case '--max-retries':
         config.maxRetries = parseInt(args[++i], 10);
         break;
-      default:
-        break;
-    }
-  }
-
-  return config;
-}
-
-/**
- * 載入配置（commit 工具使用）
- * 支援從目前工作目錄或使用者專案目錄載入 .ai-git-config.mjs
- */
-export async function loadCommitConfig() {
-  // 內建預設值
-  const defaults = {
-    ai: {
-      model: 'gpt-4.1',
-      maxDiffLength: 8000,
-      maxRetries: 3,
-    },
-    output: {
-      verbose: false,
-      saveHistory: false,
-    },
-  };
-
-  // 嘗試從目前工作目錄載入配置檔案
-  const configPath = resolve(process.cwd(), '.ai-git-config.mjs');
-  let userConfig = {};
-
-  if (existsSync(configPath)) {
-    try {
-      const imported = await import(`file://${configPath}`);
-      userConfig = imported.default || {};
-    } catch (error) {
-      console.warn(`⚠️  載入配置檔案失敗: ${error.message}`);
-    }
-  }
-
-  // 合併配置
-  const config = {
-    ai: {
-      model: userConfig.ai?.model ?? defaults.ai.model,
-      maxDiffLength: userConfig.ai?.maxDiffLength ?? defaults.ai.maxDiffLength,
-      maxRetries: userConfig.ai?.maxRetries ?? defaults.ai.maxRetries,
-    },
-    output: {
-      verbose: userConfig.output?.verbose ?? defaults.output.verbose,
-      saveHistory: userConfig.output?.saveHistory ?? defaults.output.saveHistory,
-    },
-  };
-
-  // 命令行參數優先
-  const cliConfig = parseCliArgs();
-  if (cliConfig.model) config.ai.model = cliConfig.model;
-  if (cliConfig.verbose) config.output.verbose = cliConfig.verbose;
-  if (cliConfig.maxDiffLength) config.ai.maxDiffLength = cliConfig.maxDiffLength;
-  if (cliConfig.maxRetries) config.ai.maxRetries = cliConfig.maxRetries;
-
-  return config;
-}
-
-/**
- * 解析 PR 命令行參數
- */
-export function parsePRCliArgs() {
-  const args = process.argv.slice(2);
-  const config = {
-    baseBranch: null,
-    headBranch: null,
-    model: null,
-    draft: false,
-    preview: false,
-    noConfirm: false,
-    autoReviewers: false,
-    autoLabels: null,
-  };
-
-  for (let i = 0; i < args.length; i++) {
-    switch (args[i]) {
       case '--base':
         config.baseBranch = args[++i];
         break;
-      case '--model':
-        config.model = args[++i];
+      case '--head':
+        config.headBranch = args[++i];
         break;
       case '--preview':
         config.preview = true;
@@ -126,9 +79,19 @@ export function parsePRCliArgs() {
       case '--no-confirm':
         config.noConfirm = true;
         break;
+      case '--interactive-reviewers':
+        config.interactiveReviewers = true;
+        break;
       case '--auto-labels':
         config.autoLabels = true;
         break;
+      case '--include-impact':
+        config.includeImpactAnalysis = true;
+        break;
+      case '--help':
+        showHelp();
+        process.exit(0);
+        break;
       default:
         break;
     }
@@ -138,44 +101,119 @@ export function parsePRCliArgs() {
 }
 
 /**
- * 載入 PR 配置
+ * 深度合併物件（簡易版）
  */
-export async function loadPRConfig() {
-  // 嘗試從目前工作目錄載入配置檔案
-  const configPath = resolve(process.cwd(), '.ai-git-config.mjs');
-  let config = null;
-
-  if (existsSync(configPath)) {
-    try {
-      const userConfig = await import(`file://${configPath}`);
-      config = userConfig.default;
-    } catch (error) {
-      console.warn(`⚠️  載入配置檔案失敗: ${error.message}`);
+function mergeDeep(target, source) {
+  const result = { ...target };
+  for (const key of Object.keys(source)) {
+    if (source[key] && typeof source[key] === 'object' && !Array.isArray(source[key])) {
+      result[key] = mergeDeep(result[key] || {}, source[key]);
+    } else {
+      result[key] = source[key];
     }
   }
+  return result;
+}
+
+/**
+ * 載入使用者配置檔案
+ */
+export async function loadUserConfig() {
+  const configPath = resolve(process.cwd(), '.ai-git-config.mjs');
 
-  // 使用預設配置
-  if (!config) {
-    config = {
-      ai: { model: 'gpt-4.1', maxDiffLength: 8000, maxRetries: 3 },
-      github: { defaultBase: 'release', autoLabels: true },
-      reviewers: { autoSelect: true, maxSuggested: 5, gitHistoryDepth: 20, excludeAuthors: [] },
-      output: { verbose: false, saveHistory: false },
-    };
+  if (!existsSync(configPath)) {
+    return DEFAULT_CONFIG;
   }
 
-  // 確保 github 物件存在
-  if (!config.github) {
-    config.github = {};
+  try {
+    const imported = await import(`file://${configPath}`);
+    const userConfig = imported.default || {};
+    return mergeDeep(DEFAULT_CONFIG, userConfig);
+  } catch (error) {
+    console.warn(`⚠️  載入配置檔案失敗: ${error.message}`);
+    return DEFAULT_CONFIG;
   }
+}
+
+/**
+ * 載入統一配置（commit 與 PR 共用）
+ * 已廢棄：保留給舊 import 路徑向後相容，請改用 loadConfig
+ */
+export async function loadCommitConfig() {
+  return loadConfig();
+}
+
+/**
+ * 載入統一配置（PR 使用）
+ */
+export async function loadPRConfig() {
+  return loadConfig();
+}
+
+/**
+ * 載入統一配置
+ */
+export async function loadConfig() {
+  const config = await loadUserConfig();
+  const cliConfig = parseCliArgs();
+
+  // 確保各區塊存在
+  config.ai = config.ai || {};
+  config.github = config.github || {};
+  config.reviewers = config.reviewers || {};
+  config.output = config.output || {};
 
-  // 合併命令行參數
-  const cliConfig = parsePRCliArgs();
+  // 合併命令行參數（CLI 優先）
   if (cliConfig.model) config.ai.model = cliConfig.model;
-  config.headBranch = cliConfig.headBranch;
-  config.draft = cliConfig.draft;
-  config.preview = cliConfig.preview;
-  config.noConfirm = cliConfig.noConfirm;
+  if (cliConfig.verbose) config.output.verbose = cliConfig.verbose;
+  if (cliConfig.maxDiffLength) config.ai.maxDiffLength = cliConfig.maxDiffLength;
+  if (cliConfig.maxRetries) config.ai.maxRetries = cliConfig.maxRetries;
+  if (cliConfig.baseBranch) config.baseBranch = cliConfig.baseBranch;
+  if (cliConfig.headBranch) config.headBranch = cliConfig.headBranch;
+  if (cliConfig.preview) config.preview = cliConfig.preview;
+  if (cliConfig.noConfirm) config.noConfirm = cliConfig.noConfirm;
+  if (cliConfig.interactiveReviewers !== undefined) {
+    config.reviewers.interactiveReviewers = cliConfig.interactiveReviewers;
+  }
+  if (cliConfig.autoLabels !== null) config.github.autoLabels = cliConfig.autoLabels;
+  if (cliConfig.includeImpactAnalysis !== null) {
+    config.github.includeImpactAnalysis = cliConfig.includeImpactAnalysis;
+  }
 
   return config;
 }
+
+/**
+ * 顯示 PR 幫助訊息
+ */
+function showHelp() {
+  console.log(`
+使用方式：
+  npx ai-git-tools pr [選項]
+
+選項：
+  --base <branch>      指定目標分支 (預設: 使用配置檔的 defaultBase 或自動偵測)
+  --model <model>      指定 AI 模型 (預設: gpt-4.1)
+  --preview            僅預覽 PR 內容，不實際創建
+  --no-confirm         跳過確認直接創建
+  --auto-labels        自動添加 Labels (預設啟用)
+  --help               顯示此說明
+
+範例：
+  npx ai-git-tools pr
+  npx ai-git-tools pr --base release-2025-m12.1
+  npx ai-git-tools pr --preview
+  npx ai-git-tools pr --no-confirm
+
+配置檔範例 (.ai-git-config.mjs)：
+  export default {
+    github: {
+      defaultBase: 'release-2025-m12.1',
+      autoLabels: true,
+    },
+    reviewers: {
+      interactiveReviewers: true,
+    },
+  };
+  `);
+}

package/src/core/git-operations.js

@@ -1,12 +1,14 @@
 /**
  * Git 操作封裝
- * 基於 scripts/ai-pr-modules/core/git-operations.mjs
+ * 統一 commit 與 PR 命令的 Git 操作
  */
 
 import { execSync } from 'child_process';
+import { CONSTANTS } from '../utils/constants.js';
+import { PRError } from '../utils/helpers.js';
 
-const MAX_BUFFER_SIZE = 10 * 1024 * 1024; // 10MB
-const DIFF_CONTEXT_LINES = 50;
+const MAX_BUFFER_SIZE = CONSTANTS.MAX_BUFFER_SIZE;
+const DIFF_CONTEXT_LINES = CONSTANTS.DIFF_CONTEXT_LINES;
 
 export class GitOperations {
   /**
@@ -60,7 +62,11 @@ export class GitOperations {
    */
   static detectReleaseBranches() {
     try {
-      execSync('git fetch origin', { stdio: 'ignore' });
+      try {
+        execSync('git fetch --prune origin', { stdio: 'ignore', timeout: 15000 });
+      } catch (_) {
+        // fetch 失敗，繼續使用已經 cache 的遠端分支
+      }
       const branches = execSync('git branch -r', { encoding: 'utf-8' })
         .toString()
         .split('\n')
@@ -82,18 +88,24 @@ export class GitOperations {
 
     const monthlyBranches = branches.filter((b) => b.includes('-m'));
     const weeklyBranches = branches.filter((b) => b.includes('-w'));
-    const priorityBranches = monthlyBranches.length > 0 ? monthlyBranches : weeklyBranches;
+    const priorityBranches =
+      monthlyBranches.length > 0
+        ? monthlyBranches
+        : weeklyBranches.length > 0
+          ? weeklyBranches
+          : branches;
 
     priorityBranches.sort().reverse();
-    return priorityBranches[0];
+    return priorityBranches[0] || null;
   }
 
   /**
    * 獲取變更的檔案列表
    */
-  static getChangedFiles(baseBranch, headBranch) {
+  static getChangedFiles(baseBranch, headBranch, useRemoteHead = false) {
     try {
-      const files = execSync(`git diff --name-only origin/${baseBranch}...${headBranch}`, {
+      const headRef = useRemoteHead ? `origin/${headBranch}` : headBranch;
+      const files = execSync(`git diff --name-only origin/${baseBranch}...${headRef}`, {
         encoding: 'utf-8',
       })
         .split('\n')
@@ -107,35 +119,41 @@ export class GitOperations {
   /**
    * 獲取 commit 列表
    */
-  static getCommits(baseBranch, headBranch) {
+  static getCommits(baseBranch, headBranch, options = {}) {
+    const { oneline = true, noDecorate = true, useRemoteHead = false } = options;
     try {
-      return execSync(`git log origin/${baseBranch}..origin/${headBranch} --oneline`, {
-        encoding: 'utf-8',
-      });
+      const headRef = useRemoteHead ? `origin/${headBranch}` : headBranch;
+      let cmd = `git log origin/${baseBranch}..${headRef}`;
+      if (oneline) cmd += ' --oneline';
+      if (noDecorate) cmd += ' --no-decorate';
+
+      return execSync(cmd, { encoding: 'utf-8' });
     } catch (error) {
-      throw new Error(`無法比較分支差異: ${error.message}`);
+      throw new PRError(
+        '無法比較分支差異',
+        'GIT_COMPARE_FAILED',
+        ['檢查遠端分支是否存在: git branch -r', '執行診斷: npm run diagnose:pr'],
+        `git log origin/${baseBranch}..${headBranch}`
+      );
     }
   }
 
   /**
    * 獲取 diff
    */
-  static getDiff(baseBranch, headBranch) {
+  static getDiff(baseBranch, headBranch, useRemoteHead = false, maxBuffer = MAX_BUFFER_SIZE) {
     try {
-      return execSync(`git diff origin/${baseBranch}...${headBranch}`, {
+      const headRef = useRemoteHead ? `origin/${headBranch}` : headBranch;
+      return execSync(`git diff origin/${baseBranch}...${headRef}`, {
         encoding: 'utf-8',
-        maxBuffer: MAX_BUFFER_SIZE,
+        maxBuffer,
       });
     } catch (error) {
-      // 嘗試替代方案
-      try {
-        return execSync(`git diff origin/${baseBranch}..${headBranch}`, {
-          encoding: 'utf-8',
-          maxBuffer: MAX_BUFFER_SIZE,
-        });
-      } catch (fallbackError) {
-        throw new Error(`無法獲取分支差異: ${error.message}`);
-      }
+      const headRef = useRemoteHead ? `origin/${headBranch}` : headBranch;
+      return execSync(`git diff origin/${baseBranch}..${headRef}`, {
+        encoding: 'utf-8',
+        maxBuffer,
+      });
     }
   }
 
@@ -143,39 +161,60 @@ export class GitOperations {
    * 智能截斷 diff
    * 保留前後各 50 行，中間用省略標記
    */
-  static truncateDiff(diff, maxLength = 8000) {
+  static truncateDiff(diff, maxLength = CONSTANTS.MAX_DIFF_LENGTH) {
     if (diff.length <= maxLength) return diff;
 
     const lines = diff.split('\n');
-    const contextLines = DIFF_CONTEXT_LINES;
 
-    if (lines.length <= contextLines * 2) {
+    if (lines.length <= DIFF_CONTEXT_LINES * 2) {
       return diff;
     }
 
-    const header = lines.slice(0, contextLines).join('\n');
-    const footer = lines.slice(-contextLines).join('\n');
-    const omittedLines = lines.length - contextLines * 2;
+    const header = lines.slice(0, DIFF_CONTEXT_LINES).join('\n');
+    const footer = lines.slice(-DIFF_CONTEXT_LINES).join('\n');
 
-    return `${header}\n\n... [已省略 ${omittedLines} 行變更] ...\n\n${footer}`;
+    return `${header}\n\n... [已省略 ${lines.length - DIFF_CONTEXT_LINES * 2} 行變更] ...\n\n${footer}`;
   }
 
   /**
    * 推送到遠端
    */
-  static push(branch) {
+  static async push(branch) {
     try {
-      execSync(`git push -u origin ${branch}`, { stdio: 'inherit' });
+      execSync(`git push -u origin ${branch}`, {
+        stdio: ['ignore', 'inherit', 'pipe'],
+        encoding: 'utf-8',
+      });
       return true;
     } catch (error) {
-      throw new Error(`推送失敗: ${error.message}`);
+      const errMsg = (error.stderr || error.message || '').toString();
+      const is403 = errMsg.includes('403') || errMsg.includes('Write access') || errMsg.includes('write access');
+      if (is403) {
+        throw new PRError(
+          '推送失敗：git 沒有寫入權限',
+          'GIT_PUSH_FORBIDDEN',
+          [
+            '建議執行以下指令讓 git 使用 gh 的認證:',
+            '  gh auth setup-git',
+            '或者改用 SSH 權限:',
+            '  git remote set-url origin git@github.com:<org>/<repo>.git',
+          ],
+          `git push -u origin ${branch}`
+        );
+      }
+      throw new PRError(
+        '推送失敗',
+        'GIT_PUSH_FAILED',
+        ['檢查是否有推送權限', '檢查遠端分支是否有衝突', '檢查網路連接'],
+        `git push -u origin ${branch}`
+      );
     }
   }
 
   /**
    * 同步遠端資訊
    */
-  static fetch() {
+  static async fetch() {
     try {
       execSync('git fetch origin', { stdio: 'ignore' });
       return true;
@@ -187,14 +226,15 @@ export class GitOperations {
   /**
    * 獲取變更統計
    */
-  static getChangeStats(baseBranch, headBranch) {
+  static getChangeStats(baseBranch, headBranch, useRemoteHead = false) {
     try {
-      const stats = execSync(`git diff --shortstat origin/${baseBranch}...${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();
 
@@ -203,4 +243,47 @@ export class GitOperations {
       return { stats: '無法獲取統計', filesChanged: 0 };
     }
   }
+
+  /**
+   * 獲取當前用戶資訊
+   */
+  static getCurrentUser() {
+    try {
+      const email = execSync('git config user.email', { encoding: 'utf-8' }).trim();
+      const name = execSync('git config user.name', { encoding: 'utf-8' }).trim();
+      let githubUser = null;
+
+      try {
+        githubUser = execSync('gh api user --jq .login', {
+          encoding: 'utf-8',
+          stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+      } catch {
+        // GitHub CLI 未認證或未安裝
+      }
+
+      return { email, name, githubUser };
+    } catch (error) {
+      return null;
+    }
+  }
+
+  /**
+   * 獲取 repository owner
+   */
+  static getRepoOwner() {
+    try {
+      const remoteUrl = execSync('git config --get remote.origin.url', {
+        encoding: 'utf-8',
+      }).trim();
+
+      const httpsMatch = remoteUrl.match(/github\.com[/:]([^/]+)\//);
+      const sshMatch = remoteUrl.match(/github\.com:([^/]+)\//);
+
+      const owner = httpsMatch?.[1] || sshMatch?.[1];
+      return owner || null;
+    } catch (error) {
+      return null;
+    }
+  }
 }