ai-git-tools 2.0.35 → 2.0.37

package/package.json

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

package/src/commands/pr.js

@@ -13,14 +13,14 @@ import { Logger } from '../pr-modules/ui/logger.js';
 import { colors } from '../pr-modules/utils/constants.js';
 
 /**
- * 檢查 gh CLI 是否已登入，未登入則印出提示並回傳 false
+ * 檢查 gh CLI 是否已登入且 token 有效，未登入則印出提示並回傳 false
  */
 function checkGHAuth(logger) {
   try {
-    execSync('gh auth token', { stdio: 'pipe' });
+    execSync('gh api user --jq .login', { stdio: 'pipe' });
     return true;
   } catch (_) {
-    logger.error('GitHub CLI 未登入，無法執行 PR 相關操作');
+    logger.error('GitHub CLI 未登入或 token 已失效，無法執行 PR 相關操作');
     console.log('');
     console.log('請先執行認證：');
     console.log(`  ${colors.green}gh auth login${colors.reset}`);

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

@@ -11,9 +11,13 @@ export class GitOperations {
    */
   detectReleaseBranches() {
     try {
-      execSync('git fetch origin', { stdio: 'ignore' });
-      const branches = execSync('git branch -r')
-        .toString()
+      // 嘗試同步遠端，失敗就用本機已知的遠端資訊
+      try {
+        execSync('git fetch origin', { stdio: 'ignore', timeout: 15000 });
+      } catch (_) {
+        // fetch 失敗，繼續使用已經 cache 的遠端分支
+      }
+      const branches = execSync('git branch -r', { encoding: 'utf-8' })
         .split('\n')
         .map((b) => b.trim())
         .filter((b) => b.startsWith('origin/release-'))
@@ -31,12 +35,18 @@ export class GitOperations {
     const branches = this.detectReleaseBranches();
     if (branches.length === 0) return null;
 
+    // 優先選月分支（-m），其次週分支（-w），最後 fallback 到全部 release 分支
     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;
   }
 
   /**

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

@@ -63,7 +63,7 @@ export class GitHubAPI {
    */
   checkAuth() {
     try {
-      execSync('gh auth token', { stdio: 'pipe' });
+      execSync('gh api user --jq .login', { stdio: 'pipe' });
       return { authenticated: true };
     } catch (error) {
       return { authenticated: false };