ai-git-tools 2.0.34 → 2.0.35

package/package.json

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

package/src/commands/pr.js

@@ -5,19 +5,43 @@
  * 確保功能與 scripts 版本完全相同
  */
 
+import { execSync } from 'child_process';
 import { PRWorkflow } from '../pr-modules/core/workflow.js';
-import { GitHubAPI } from '../pr-modules/core/github-api.js';
 import { loadConfig } from '../pr-modules/core/config-loader.js';
 import { handleError } from '../pr-modules/utils/helpers.js';
 import { Logger } from '../pr-modules/ui/logger.js';
 import { colors } from '../pr-modules/utils/constants.js';
 
+/**
+ * 檢查 gh CLI 是否已登入，未登入則印出提示並回傳 false
+ */
+function checkGHAuth(logger) {
+  try {
+    execSync('gh auth token', { stdio: 'pipe' });
+    return true;
+  } catch (_) {
+    logger.error('GitHub CLI 未登入，無法執行 PR 相關操作');
+    console.log('');
+    console.log('請先執行認證：');
+    console.log(`  ${colors.green}gh auth login${colors.reset}`);
+    console.log('');
+    console.log('登入時請確保選取以下範圍：');
+    console.log('  - repo（必需）');
+    console.log('  - read:org（如需 reviewer 功能）');
+    console.log('');
+    return false;
+  }
+}
+
 /**
  * PR 命令主函數（完全照抄 scripts/ai-auto-pr.mjs）
  */
 export async function prCommand() {
   const logger = new Logger();
 
+  // ── 第一步：確認 gh CLI 已登入 ──────────────────────────
+  if (!checkGHAuth(logger)) return;
+
   try {
     logger.header('AI Auto PR Generator (v2.0 Enhanced)');
 
@@ -30,19 +54,6 @@ export async function prCommand() {
       console.log(`   Max Diff Length: ${config.ai.maxDiffLength}`);
     }
 
-    // 在進入 workflow 前先檢查 GitHub CLI 認證
-    if (!config.preview) {
-      const github = new GitHubAPI();
-      const authStatus = github.checkAuth();
-      if (!authStatus.authenticated) {
-        logger.error('\n❌ GitHub CLI 未認證\n');
-        console.log('請先執行認證：');
-        console.log(`  ${colors.green}gh auth login${colors.reset}\n`);
-        console.log('完成登入後再執行: npx ai-git-tools pr\n');
-        return;
-      }
-    }
-
     // 執行工作流程（使用 scripts/ 的完整工作流）
     const workflow = new PRWorkflow(config);
     await workflow.execute();

package/src/pr-modules/core/github-api.js

@@ -63,28 +63,10 @@ export class GitHubAPI {
    */
   checkAuth() {
     try {
-      const authStatus = execSync('gh auth status --hostname github.com', {
-        encoding: 'utf-8',
-        stdio: ['pipe', 'pipe', 'pipe'],
-      });
-
-      const token = execSync('gh auth token', {
-        encoding: 'utf-8',
-        stdio: ['pipe', 'pipe', 'pipe'],
-      }).trim();
-
-      return {
-        authenticated: Boolean(token),
-        details: authStatus,
-      };
+      execSync('gh auth token', { stdio: 'pipe' });
+      return { authenticated: true };
     } catch (error) {
-      return {
-        authenticated: false,
-        details:
-          error.stderr?.toString?.() ||
-          error.stdout?.toString?.() ||
-          error.message,
-      };
+      return { authenticated: false };
     }
   }
 
@@ -122,6 +104,14 @@ export class GitHubAPI {
    */
   async fetchTeams(orgName = this.orgName) {
     try {
+      // 先檢查認證狀態
+      const authStatus = this.checkAuth();
+      if (!authStatus.authenticated) {
+        log.warning('GitHub CLI 未認證');
+        log.info('請執行: gh auth login\n');
+        return { teams: {}, members: [] };
+      }
+
       log.step(`正在從 GitHub 抓取 ${orgName} 的團隊資訊...`);
 
       let teamsJson;

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

@@ -32,17 +32,12 @@ export class PRWorkflow {
    * 執行完整工作流程
    */
   async execute() {
-    // 0. 檢查 GitHub CLI 認證狀態（預覽模式不需要）
+    // 0. 確認 gh CLI 已登入（預覽模式可跳過）
     if (!this.config.preview) {
-      const authStatus = this.github.checkAuth();
-      if (!authStatus.authenticated) {
-        this.logger.error('\n❌ GitHub CLI 未認證\n');
-        console.log('請先執行認證：');
-        console.log(`  ${colors.green}gh auth login${colors.reset}\n`);
-        console.log('選擇認證範圍時，請確保包含：');
-        console.log('  - repo (必需)');
-        console.log('  - read:org (如需使用 reviewer 功能)\n');
-        throw new Error('GitHub CLI 未認證，無法創建 PR');
+      const auth = this.github.checkAuth();
+      if (!auth.authenticated) {
+        log.error('GitHub CLI 未登入，請先執行: gh auth login');
+        throw new Error('GitHub CLI 未登入');
       }
     }