ai-git-tools 2.0.32 → 2.0.34

package/package.json

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

package/src/commands/pr.js

@@ -6,9 +6,11 @@
  */
 
 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';
 
 /**
  * PR 命令主函數（完全照抄 scripts/ai-auto-pr.mjs）
@@ -28,6 +30,19 @@ 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,19 +63,27 @@ export class GitHubAPI {
    */
   checkAuth() {
     try {
-      const authStatus = execSync('gh auth status 2>&1', {
+      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: authStatus.includes('Logged in'),
+        authenticated: Boolean(token),
         details: authStatus,
       };
     } catch (error) {
       return {
         authenticated: false,
-        details: error.message,
+        details:
+          error.stderr?.toString?.() ||
+          error.stdout?.toString?.() ||
+          error.message,
       };
     }
   }
@@ -114,18 +122,6 @@ export class GitHubAPI {
    */
   async fetchTeams(orgName = this.orgName) {
     try {
-      // 先檢查認證狀態
-      const authStatus = this.checkAuth();
-      if (!authStatus.authenticated) {
-        log.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');
-      }
-
       log.step(`正在從 GitHub 抓取 ${orgName} 的團隊資訊...`);
 
       let teamsJson;

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

@@ -32,6 +32,20 @@ export class PRWorkflow {
    * 執行完整工作流程
    */
   async execute() {
+    // 0. 檢查 GitHub 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');
+      }
+    }
+
     // 1. 驗證環境和分支
     const { baseBranch, headBranch } = await this.detectAndValidateBranches();