ai-git-tools 2.0.6 → 2.0.7

package/package.json

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

package/src/commands/pr.js

@@ -5,12 +5,12 @@
  */
 
 import { execSync } from 'child_process';
-import * as readline from 'readline/promises';
-import { stdin as input, stdout as output } from 'process';
 import { loadPRConfig } from '../core/config-loader.js';
 import { GitOperations } from '../core/git-operations.js';
 import { AIClient } from '../core/ai-client.js';
+import { GitHubAPI } from '../core/github-api.js';
 import { Logger } from '../utils/logger.js';
+import { InteractiveSelect } from '../utils/interactive-select.js';
 import { handleError, getProjectTypePrompt } from '../utils/helpers.js';
 
 /**
@@ -78,65 +78,139 @@ function getCurrentUser() {
 }
 
 /**
- * 互動式選擇 Reviewers
+ * 互動式選擇 Reviewers（使用鍵盤上下選擇）
  */
-async function selectReviewers(suggestedReviewers, currentUser) {
+async function selectReviewers(suggestedReviewers, currentUser, config) {
   const logger = new Logger();
   
   console.log('\n' + '═'.repeat(80));
   console.log('🎯 選擇 Reviewers');
   console.log('═'.repeat(80) + '\n');
 
-  // 過濾掉當前使用者
-  const validReviewers = suggestedReviewers.filter(
-    (r) => !currentUser || r.email.toLowerCase() !== currentUser.email.toLowerCase()
-  );
-
-  if (validReviewers.length === 0) {
-    logger.warning('沒有找到建議的 reviewers');
-    console.log('💡 您可以在創建 PR 後手動添加 reviewers\n');
-    return [];
+  // 先嘗試從 GitHub 抓取團隊和成員
+  let githubTeams = {};
+  let githubMembers = [];
+  
+  if (config.orgName) {
+    const githubAPI = new GitHubAPI({ orgName: config.orgName });
+    const githubData = await githubAPI.fetchTeams(config.orgName);
+    githubTeams = githubData.teams || {};
+    githubMembers = githubData.members || [];
   }
 
-  // 顯示建議的 Reviewers
+  // 準備選項列表
+  const options = [];
+
+  // 添加團隊選項
+  Object.entries(githubTeams).forEach(([slug, team]) => {
+    const memberCount = team.members.length;
+    options.push({
+      type: 'team',
+      slug,
+      name: team.name,
+      label: `${team.name}`,
+      extra: ` (${memberCount} 位成員)`,
+      members: team.members,
+    });
+  });
+
+  // 添加個人選項（優先使用 Git 歷史建議）
+  const individualOptions = new Map();
+
+  // 先加入建議的 reviewers（基於 Git 歷史）
   console.log('💡 建議的 Reviewers（基於 Git 歷史）:\n');
-  validReviewers.forEach((reviewer, idx) => {
+  let suggestionDisplayed = false;
+  
+  suggestedReviewers.forEach((reviewer) => {
+    // 自動排除當前使用者（在顯示時就排除）
+    if (currentUser && reviewer.email.toLowerCase() === currentUser.email.toLowerCase()) {
+      return; // 跳過當前使用者
+    }
+
+    suggestionDisplayed = true;
     console.log(
-      `   ${idx + 1}. ${reviewer.name} (@${reviewer.username}) - ${reviewer.commits} commits`
+      `   • ${reviewer.name} (@${reviewer.username}) - ${reviewer.commits} commits`
     );
+
+    individualOptions.set(reviewer.username, {
+      type: 'individual',
+      login: reviewer.username,
+      name: reviewer.name,
+      label: `${reviewer.name} (@${reviewer.username})`,
+      extra: ` 💡 ${reviewer.commits} commits`,
+      suggested: true,
+    });
   });
-  console.log('');
 
-  const rl = readline.createInterface({ input, output });
+  if (suggestionDisplayed) {
+    console.log('');
+  }
 
-  try {
-    const answer = await rl.question(
-      '請輸入要選擇的 reviewer 編號（用逗號分隔，例如: 1,2,3），或直接按 Enter 跳過: '
-    );
-    rl.close();
+  // 再加入其他 GitHub 組織成員
+  githubMembers.forEach((member) => {
+    if (!individualOptions.has(member.login)) {
+      // 同樣自動排除當前使用者
+      if (currentUser && member.login.toLowerCase() === currentUser.username?.toLowerCase()) {
+        return;
+      }
 
-    if (!answer.trim()) {
-      logger.info('已跳過 reviewer 選擇\n');
-      return [];
+      individualOptions.set(member.login, {
+        type: 'individual',
+        login: member.login,
+        name: member.name,
+        label: `${member.name} (@${member.login})`,
+        extra: '',
+        suggested: false,
+      });
     }
+  });
 
-    const selectedIndices = answer
-      .split(',')
-      .map((s) => parseInt(s.trim()) - 1)
-      .filter((i) => i >= 0 && i < validReviewers.length);
+  // 將個人選項加入列表（建議的排在前面）
+  const sortedIndividuals = Array.from(individualOptions.values()).sort((a, b) => {
+    if (a.suggested && !b.suggested) return -1;
+    if (!a.suggested && b.suggested) return 1;
+    return 0;
+  });
 
-    const selectedReviewers = selectedIndices.map((i) => validReviewers[i].username);
+  options.push(...sortedIndividuals);
 
-    if (selectedReviewers.length > 0) {
-      logger.success(`已選擇: ${selectedReviewers.map((u) => `@${u}`).join(', ')}\n`);
-    }
+  // 如果完全沒有選項
+  if (options.length === 0) {
+    logger.warning('沒有找到可用的 reviewers');
+    console.log('💡 您可以在創建 PR 後手動添加 reviewers\n');
+    return [];
+  }
 
-    return selectedReviewers;
-  } catch (error) {
-    rl.close();
-    logger.warning('選擇過程發生錯誤，將跳過 reviewer 選擇\n');
+  // 使用互動式選擇器
+  const selector = new InteractiveSelect();
+  const result = await selector.select(options, '🎯 選擇 Reviewers (可多選)');
+
+  if (result.cancelled) {
+    logger.info('已跳過 reviewer 選擇\n');
     return [];
   }
+
+  // 處理選擇結果
+  const selectedReviewers = [];
+  const selectedTeams = [];
+
+  result.selected.forEach((item) => {
+    if (item.type === 'team') {
+      selectedTeams.push(item.slug);
+    } else {
+      selectedReviewers.push(item.login);
+    }
+  });
+
+  if (selectedReviewers.length > 0 || selectedTeams.length > 0) {
+    const reviewerList = selectedReviewers.map((u) => `@${u}`).join(', ');
+    const teamList = selectedTeams.map((t) => `@${config.orgName}/${t}`).join(', ');
+    const allSelected = [reviewerList, teamList].filter(Boolean).join(', ');
+
+    logger.success(`已選擇: ${allSelected}\n`);
+  }
+
+  return { individuals: selectedReviewers, teams: selectedTeams };
 }
 
 /**
@@ -624,13 +698,13 @@ export async function prCommand() {
     }
 
     // 5. Reviewer 選擇（如果啟用）
-    let selectedReviewers = [];
+    let selectedReviewers = { individuals: [], teams: [] };
     if (config.reviewers.autoSelect) {
       const currentUser = getCurrentUser();
       const suggestedReviewers = getReviewersByGitHistory(changedFiles, config);
       
-      if (suggestedReviewers.length > 0) {
-        selectedReviewers = await selectReviewers(suggestedReviewers, currentUser);
+      if (suggestedReviewers.length > 0 || config.orgName) {
+        selectedReviewers = await selectReviewers(suggestedReviewers, currentUser, config);
       } else {
         logger.info('未找到建議的 reviewers（可能是新專案或檔案無歷史記錄）\n');
       }
@@ -655,9 +729,19 @@ export async function prCommand() {
       ghCommand += ' --draft';
     }
 
-    // 添加 reviewers
-    if (selectedReviewers.length > 0) {
-      ghCommand += ` --reviewer ${selectedReviewers.join(',')}`;
+    // 添加 individual reviewers
+    if (selectedReviewers.individuals && selectedReviewers.individuals.length > 0) {
+      ghCommand += ` --reviewer ${selectedReviewers.individuals.join(',')}`;
+    }
+
+    // 添加 team reviewers（需要加上組織名稱前綴）
+    if (selectedReviewers.teams && selectedReviewers.teams.length > 0) {
+      const teamReviewers = selectedReviewers.teams.map((team) => `${config.orgName}/${team}`);
+      if (selectedReviewers.individuals && selectedReviewers.individuals.length > 0) {
+        ghCommand += `,${teamReviewers.join(',')}`;
+      } else {
+        ghCommand += ` --reviewer ${teamReviewers.join(',')}`;
+      }
     }
 
     try {

package/src/core/github-api.js

@@ -0,0 +1,161 @@
+/**
+ * GitHub API 操作封裝
+ * 基於 scripts/ai-pr-modules/core/github-api.mjs
+ */
+
+import { execSync } from 'child_process';
+import { Logger } from '../utils/logger.js';
+
+/**
+ * GitHub API 操作類
+ */
+export class GitHubAPI {
+  constructor(config = {}) {
+    this.orgName = config.orgName || 'kingsinfo-project';
+  }
+
+  /**
+   * 檢查 GitHub CLI 認證狀態
+   */
+  checkAuth() {
+    try {
+      const authStatus = execSync('gh auth status 2>&1', {
+        encoding: 'utf-8',
+        stdio: ['pipe', 'pipe', 'pipe'],
+      });
+
+      return {
+        authenticated: authStatus.includes('Logged in'),
+        details: authStatus,
+      };
+    } catch (error) {
+      return {
+        authenticated: false,
+        details: error.message,
+      };
+    }
+  }
+
+  /**
+   * 從 GitHub 抓取組織的成員列表
+   */
+  async fetchOrgMembers(orgName = this.orgName) {
+    const logger = new Logger();
+    
+    try {
+      logger.step(`正在嘗試抓取 ${orgName} 組織的成員列表...`);
+
+      const membersJson = execSync(`gh api orgs/${orgName}/members --jq '.'`, {
+        encoding: 'utf-8',
+        stdio: ['pipe', 'pipe', 'pipe'],
+      });
+
+      const membersData = JSON.parse(membersJson);
+      const members = membersData.map((member) => ({
+        login: member.login,
+        name: member.name || member.login,
+      }));
+
+      if (members.length > 0) {
+        logger.success(`成功抓取 ${members.length} 位組織成員\n`);
+        return members;
+      }
+
+      return [];
+    } catch (error) {
+      return [];
+    }
+  }
+
+  /**
+   * 從 GitHub 抓取組織的團隊列表
+   */
+  async fetchTeams(orgName = this.orgName) {
+    const logger = new Logger();
+    
+    try {
+      // 先檢查認證狀態
+      const authStatus = this.checkAuth();
+      if (!authStatus.authenticated) {
+        logger.warning('GitHub CLI 未認證');
+        logger.info('請執行: gh auth login\n');
+        return { teams: {}, members: [] };
+      }
+
+      logger.step(`正在從 GitHub 抓取 ${orgName} 的團隊資訊...`);
+
+      let teamsJson;
+      try {
+        teamsJson = execSync(`gh api orgs/${orgName}/teams --jq '.'`, {
+          encoding: 'utf-8',
+          stdio: ['pipe', 'pipe', 'pipe'],
+        });
+      } catch (error) {
+        // 無法存取團隊 API，使用替代方案
+        logger.warning('未找到任何團隊，嘗試直接抓取組織成員...');
+
+        const members = await this.fetchOrgMembers(orgName);
+        if (members.length > 0) {
+          return { teams: {}, members };
+        }
+
+        throw error;
+      }
+
+      const teams = JSON.parse(teamsJson);
+
+      if (!teams || teams.length === 0) {
+        logger.warning('未找到任何團隊，嘗試直接抓取組織成員...');
+        const members = await this.fetchOrgMembers(orgName);
+        return { teams: {}, members };
+      }
+
+      const teamData = {};
+
+      for (const team of teams) {
+        try {
+          const membersJson = execSync(
+            `gh api orgs/${orgName}/teams/${team.slug}/members --jq '.'`,
+            {
+              encoding: 'utf-8',
+              stdio: ['pipe', 'pipe', 'pipe'],
+            }
+          );
+
+          const members = JSON.parse(membersJson);
+          teamData[team.slug] = {
+            name: team.name,
+            slug: team.slug,
+            description: team.description || '',
+            members: members.map((m) => ({
+              login: m.login,
+              name: m.name || m.login,
+            })),
+          };
+        } catch (error) {
+          logger.warning(`無法抓取團隊 ${team.slug} 的成員: ${error.message}`);
+        }
+      }
+
+      // 同時取得所有成員作為備選
+      const allMembers = await this.fetchOrgMembers(orgName);
+
+      logger.success(
+        `成功抓取 ${Object.keys(teamData).length} 個團隊和 ${allMembers.length} 位成員\n`
+      );
+      return { teams: teamData, members: allMembers };
+    } catch (error) {
+      logger.warning('無法從 GitHub 抓取資訊');
+      logger.info('請確認：');
+      console.log('  1. 已安裝 GitHub CLI: brew install gh');
+      console.log('  2. 已執行認證: gh auth login');
+      console.log('  3. 選擇正確的認證範圍（需要 read:org 權限）');
+      console.log(`  4. 有權限存取 ${orgName} 組織`);
+      console.log('  5. 組織名稱正確（可用 --org 參數指定）\n');
+
+      logger.info('提示: 你仍可以在創建 PR 後手動添加 reviewers\n');
+
+      return { teams: {}, members: [] };
+    }
+  }
+}

package/src/utils/interactive-select.js

@@ -0,0 +1,154 @@
+/**
+ * 互動式選擇工具（使用方向鍵和空白鍵）
+ * 基於 scripts/ai-pr-modules/ui/interactive-select.mjs
+ */
+
+import { emitKeypressEvents } from 'readline';
+
+// ANSI 顏色碼
+const colors = {
+  reset: '\x1b[0m',
+  bright: '\x1b[1m',
+  cyan: '\x1b[36m',
+  green: '\x1b[32m',
+  yellow: '\x1b[33m',
+  magenta: '\x1b[35m',
+  blue: '\x1b[34m',
+};
+
+// 游標控制
+const cursor = {
+  hide: '\x1b[?25l',
+  show: '\x1b[?25h',
+  up: (n = 1) => `\x1b[${n}A`,
+  clearLine: '\x1b[2K',
+};
+
+/**
+ * 互動式選擇器
+ */
+export class InteractiveSelect {
+  /**
+   * @param {Array} options - 選項陣列
+   * @param {string} title - 標題
+   * @returns {Promise<{cancelled: boolean, selected: Array}>}
+   */
+  async select(options, title = '選擇項目') {
+    return new Promise((resolve) => {
+      let currentIndex = 0;
+      const selected = new Set();
+
+      // 準備選項列表
+      const items = options.map((opt, idx) => ({
+        ...opt,
+        index: idx,
+      }));
+
+      const render = () => {
+        // 清除整個選擇區域
+        if (items.length > 0) {
+          // 向上移動到開始位置
+          for (let i = 0; i < items.length + 3; i++) {
+            process.stdout.write(cursor.up(1));
+          }
+        }
+
+        // 清除並重新繪製每一行
+        process.stdout.write(cursor.clearLine);
+        console.log(`${colors.bright}${title}${colors.reset}`);
+
+        process.stdout.write(cursor.clearLine);
+        console.log(
+          `${colors.yellow}↑/↓: 移動  Space: 選擇/取消  Enter: 確認  q: 跳過${colors.reset}`
+        );
+
+        process.stdout.write(cursor.clearLine);
+        console.log('');
+
+        items.forEach((item, idx) => {
+          const isSelected = selected.has(idx);
+          const isCurrent = idx === currentIndex;
+
+          const checkbox = isSelected ? `${colors.green}[✓]${colors.reset}` : '[ ]';
+          const cursorMarker = isCurrent ? `${colors.cyan}▶${colors.reset}` : ' ';
+          const label = item.label || item.name || item.login;
+          const extra = item.extra || '';
+
+          process.stdout.write(cursor.clearLine);
+          console.log(`${cursorMarker} ${checkbox} ${label}${extra}`);
+        });
+      };
+
+      const cleanup = () => {
+        process.stdin.setRawMode(false);
+        process.stdin.removeAllListeners('keypress');
+        process.stdout.write(cursor.show);
+        console.log('');
+      };
+
+      const handleKeypress = (str, key) => {
+        if (!key) return;
+
+        // q or Ctrl+C to quit
+        if (key.name === 'q' || (key.ctrl && key.name === 'c')) {
+          cleanup();
+          resolve({ cancelled: true, selected: [] });
+          return;
+        }
+
+        // Arrow up
+        if (key.name === 'up') {
+          currentIndex = Math.max(0, currentIndex - 1);
+          render();
+        }
+
+        // Arrow down
+        else if (key.name === 'down') {
+          currentIndex = Math.min(items.length - 1, currentIndex + 1);
+          render();
+        }
+
+        // Space to toggle selection
+        else if (key.name === 'space') {
+          if (selected.has(currentIndex)) {
+            selected.delete(currentIndex);
+          } else {
+            selected.add(currentIndex);
+          }
+          render();
+        }
+
+        // Enter to confirm
+        else if (key.name === 'return') {
+          cleanup();
+          const selectedItems = Array.from(selected).map((idx) => items[idx]);
+          resolve({ cancelled: false, selected: selectedItems });
+        }
+      };
+
+      // 初始化
+      process.stdout.write(cursor.hide);
+
+      // 先印出佔位用的空行
+      for (let i = 0; i < items.length + 3; i++) {
+        console.log('');
+      }
+
+      render();
+
+      // 啟用 raw mode 和 keypress
+      if (process.stdin.isTTY) {
+        process.stdin.setRawMode(true);
+        process.stdin.resume();
+
+        // 需要監聽 keypress 事件
+        emitKeypressEvents(process.stdin);
+
+        process.stdin.on('keypress', handleKeypress);
+      } else {
+        cleanup();
+        resolve({ cancelled: true, selected: [] });
+      }
+    });
+  }
+}