ai-git-tools 2.0.47 → 2.0.49

package/bin/cli.js

@@ -15,7 +15,6 @@ import { commitCommand } from '../src/commands/commit.js';
 import { commitAllCommand } from '../src/commands/commit-all.js';
 import { prCommand } from '../src/commands/pr.js';
 import { initCommand } from '../src/commands/init.js';
-import { autodevCommand } from '../src/commands/autodev.js';
 
 // 讀取 package.json 獲取版本號
 const __filename = fileURLToPath(import.meta.url);
@@ -97,25 +96,4 @@ program
     }
   });
 
-// AutoDev 命令
-program
-  .command('autodev <issue>')
-  .description('全自動開發流程：Issue → 測試 → commit-all → PR')
-  .option('--dry-run', '乾運行：顯示計劃但不執行')
-  .option('-v, --verbose', '詳細輸出')
-  .option('--framework <name>', '強制指定測試框架（jest / vitest / mocha）')
-  .option('--skip-commit', '跳過自動 commit')
-  .option('--skip-pr', '跳過自動 PR 建立')
-  .option('--skip-all', '只執行測試並發佈評論')
-  .option('--commit-only', '執行測試 + commit，不建立 PR')
-  .option('--skip-tests', '無測試可執行時仍繼續 commit/PR（不強制停止）')
-  .action(async (issue, options) => {
-    try {
-      await autodevCommand(issue, options);
-      process.exit(0);
-    } catch (error) {
-      process.exit(1);
-    }
-  });
-
 program.parse();

package/package.json

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

package/src/commands/commit-all.js

@@ -459,82 +459,3 @@ export async function commitAllCommand() {
     throw error;
   }
 }
-
-// ─────────────────────────────────────────────────────────────
-// 程序化 API（供 ai autodev 呼叫，不影響 CLI 行為）
-// ─────────────────────────────────────────────────────────────
-
-/**
- * 程序化執行 commit-all 邏輯，供其他模組呼叫
- * 不會呼叫 process.exit()，而是回傳結果物件
- *
- * @param {Object} [options]
- * @param {boolean} [options.verbose]
- * @returns {Promise<{ success: boolean, commitCount: number, message: string }>}
- */
-export async function commitAllProgrammatic(options = {}) {
-  const logger = new Logger();
-
-  try {
-    const config = await loadCommitConfig();
-    if (options.verbose) {
-      config.output.verbose = true;
-    }
-
-    const changes = getAllChanges();
-    if (changes.length === 0) {
-      return { success: true, commitCount: 0, message: '沒有需要提交的變更' };
-    }
-
-    const groups = await analyzeAndGroupChanges(changes, config);
-    if (!groups || groups.length === 0) {
-      return { success: false, commitCount: 0, message: 'AI 分析失敗，無法產生分組' };
-    }
-
-    // 補入未分組的檔案
-    const groupedIndices = new Set(groups.flatMap((g) => g.file_indices));
-    const ungrouped = [...Array(changes.length).keys()].filter((i) => !groupedIndices.has(i));
-    if (ungrouped.length > 0) {
-      groups.push({
-        group_name: '其他變更',
-        commit_type: 'chore',
-        commit_scope: 'misc',
-        file_indices: ungrouped,
-        description: '未能自動分類的其他變更',
-      });
-    }
-
-    let successCount = 0;
-    for (let i = 0; i < groups.length; i++) {
-      const group = groups[i];
-      const groupFiles = group.file_indices.map((index) => changes[index]);
-      const ok = await commitGroup(group, groupFiles, config);
-      if (ok) successCount++;
-    }
-
-    // 清理 staged
-    try {
-      execSync('git reset HEAD -- .', { stdio: 'ignore' });
-    } catch (_) { /* 忽略 */ }
-
-    if (successCount === 0) {
-      return { success: false, commitCount: 0, message: '所有群組提交失敗' };
-    }
-
-    // 取得最新 commit hash
-    let commitHash = '';
-    try {
-      commitHash = execSync('git rev-parse --short HEAD', { encoding: 'utf-8' }).trim();
-    } catch (_) { /* 忽略 */ }
-
-    return {
-      success: true,
-      commitCount: successCount,
-      commitHash,
-      message: `成功提交 ${successCount}/${groups.length} 個群組`,
-    };
-  } catch (error) {
-    logger.error(`commitAllProgrammatic 失敗：${error.message}`);
-    return { success: false, commitCount: 0, message: error.message };
-  }
-}

package/src/commands/pr.js

@@ -62,66 +62,3 @@ export async function prCommand() {
     throw error;
   }
 }
-
-// ─────────────────────────────────────────────────────────────
-// 程序化 API（供 ai autodev 呼叫，不影響 CLI 行為）
-// ─────────────────────────────────────────────────────────────
-
-/**
- * 程序化執行 PR 建立流程，供其他模組呼叫
- * 不互動（noConfirm = true），直接建立 PR 並回傳結果
- *
- * @param {Object} [options]
- * @param {string} [options.base]       - 目標分支
- * @param {string} [options.head]       - 來源分支
- * @param {boolean} [options.verbose]
- * @param {Object} [options.testResults] - 注入測試結果到 PR 描述（保留供未來擴充）
- * @returns {Promise<{ success: boolean, prUrl: string|null, prNumber: number|null, message: string }>}
- */
-export async function prProgrammatic(options = {}) {
-  const logger = new Logger();
-
-  if (!checkGHAuth(logger)) {
-    return { success: false, prUrl: null, prNumber: null, message: 'GitHub CLI 未登入' };
-  }
-
-  try {
-    const config = await loadConfig();
-
-    // 程序化呼叫：跳過互動確認
-    config.noConfirm = true;
-    if (options.base) config.baseBranch = options.base;
-    if (options.head) config.headBranch = options.head;
-    if (options.verbose) config.output.verbose = true;
-
-    const workflow = new PRWorkflow(config);
-
-    // 攔截 PRWorkflow 建立的 PR URL
-    let prUrl = null;
-    let prNumber = null;
-    const originalCreatePR = workflow.createPR?.bind(workflow);
-    if (originalCreatePR) {
-      workflow.createPR = async (...args) => {
-        const url = await originalCreatePR(...args);
-        prUrl = url;
-        if (url) {
-          const match = url.match(/\/pull\/(\d+)/);
-          if (match) prNumber = parseInt(match[1], 10);
-        }
-        return url;
-      };
-    }
-
-    await workflow.execute();
-
-    return {
-      success: true,
-      prUrl,
-      prNumber,
-      message: prUrl ? `PR 已建立：${prUrl}` : 'PR 執行完成',
-    };
-  } catch (error) {
-    logger.error(`prProgrammatic 失敗：${error.message}`);
-    return { success: false, prUrl: null, prNumber: null, message: error.message };
-  }
-}

package/src/core/ai-client.js

@@ -7,52 +7,39 @@ import { CopilotClient } from '@github/copilot-sdk';
 
 export class AIClient {
   /**
-   * 發送 prompt 並等待回應（帶重試機制）
-   *
-   * @param {string} prompt
-   * @param {string} model
-   * @param {number} maxRetries
-   * @param {number} timeout - 毫秒，會直接傳給 SDK 的 sendAndWait
+   * 發送 prompt 並等待回應（帶重試機制和超時保護）
    */
-  static async sendAndWait(prompt, model = 'claude-sonnet-4.5', maxRetries = 3, timeout = 60000) {
+  static async sendAndWait(prompt, model = 'gpt-4.1', maxRetries = 3, timeout = 60000) {
     let lastError = null;
 
     for (let attempt = 1; attempt <= maxRetries; attempt++) {
       const client = new CopilotClient();
-      let session = null;
       try {
-        session = await client.createSession({ model });
-
-        // 收集 session.error 事件（讓 lastError 包含細節）
-        session.on('session.error', (event) => {
-          lastError = new Error(event.data?.message || JSON.stringify(event.data));
+        const session = await client.createSession({ model });
+        
+        // 使用 Promise.race 實現超時控制
+        const responsePromise = session.sendAndWait({ prompt });
+        const timeoutPromise = new Promise((_, reject) => {
+          setTimeout(() => reject(new Error(`AI 請求超時 (${timeout}ms)`)), timeout);
         });
 
-        // 把 timeout 直接傳給 SDK，讓 SDK 管理逾時
-        const response = await session.sendAndWait({ prompt }, timeout);
-
-        // response 為 undefined 表示 session 結束但沒有助理回訊（通常是錯誤）
-        if (!response) {
-          throw new Error(`AI 未回傳任何訊息（model: ${model}）`);
-        }
+        const response = await Promise.race([responsePromise, timeoutPromise]);
 
         const content = response?.data?.content || '';
-        if (!content) {
-          throw new Error('AI 回傳空內容');
-        }
         return content.trim();
-
       } catch (error) {
         lastError = error;
         if (attempt < maxRetries) {
-          console.log(`⚠️  AI 請求失敗，重試第 ${attempt}/${maxRetries} 次... (${error.message})`);
+          console.log(`⚠️  AI 請求失敗，重試第 ${attempt}/${maxRetries} 次...`);
           await new Promise((resolve) => setTimeout(resolve, 1000 * attempt));
         }
       } finally {
-        if (session) {
-          try { await session.destroy(); } catch (_e) { /* 忽略 */ }
+        // 確保每次都關閉 client，無論成功或失敗
+        try {
+          await client.stop();
+        } catch (e) {
+          // 忽略關閉錯誤
         }
-        try { await client.stop(); } catch (_e) { /* 忽略 */ }
       }
     }
 

package/src/core/config-loader.js

@@ -179,56 +179,3 @@ export async function loadPRConfig() {
 
   return config;
 }
-
-/**
- * 載入 AutoDev 配置
- * 讀取 .ai-git-config.js（或 .mjs）的 autodev 區塊
- * 所有欄位皆選填，未設定時使用合理預設值
- *
- * @returns {Promise<Object>}
- */
-export async function loadAutodevConfig() {
-  const defaults = {
-    framework: null,       // null = 自動偵測
-    testPaths: [],         // 空 = 自動發現
-    testTimeout: 300_000,  // 5 分鐘
-    skipCommit: false,
-    skipPr: false,
-    verbose: false,
-    projectRoot: process.cwd(),
-    // AI 設定（可被 autodev 子區塊或全域 ai 區塊覆蓋）
-    aiModel: 'claude-sonnet-4.5',
-    maxRetries: 3,
-  };
-
-  // 支援 .ai-git-config.js 和 .ai-git-config.mjs
-  const candidates = [
-    resolve(process.cwd(), '.ai-git-config.js'),
-    resolve(process.cwd(), '.ai-git-config.mjs'),
-  ];
-
-  let userAutodev = {};
-  let userAi = {};
-  for (const configPath of candidates) {
-    if (existsSync(configPath)) {
-      try {
-        const imported = await import(`file://${configPath}`);
-        const root = imported.default || {};
-        userAutodev = root.autodev || {};
-        userAi = root.ai || {};  // 讀取全域 ai 區塊
-        break;
-      } catch (error) {
-        console.warn(`⚠️  載入 autodev 配置失敗: ${error.message}`);
-      }
-    }
-  }
-
-  return {
-    ...defaults,
-    // 全域 ai 區塊優先度低於 autodev 子區塊
-    aiModel: userAutodev.aiModel ?? userAi.model ?? defaults.aiModel,
-    maxRetries: userAutodev.maxRetries ?? userAi.maxRetries ?? defaults.maxRetries,
-    // 其他 autodev 欄位
-    ...userAutodev,
-  };
-}

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

@@ -394,88 +394,4 @@ export class GitHubAPI {
       log.error('無法添加團隊 reviewers，請手動操作');
     }
   }
-
-  // ─────────────────────────────────────────────────────────────
-  // Issue 評論功能（供 ai autodev 使用）
-  // ─────────────────────────────────────────────────────────────
-
-  /**
-   * 在 Issue 上發佈評論
-   * @param {string} owner
-   * @param {string} repo
-   * @param {number} issueNumber
-   * @param {string} body - Markdown 內容
-   * @returns {{ id: number, url: string }}
-   */
-  postCommentOnIssue(owner, repo, issueNumber, body) {
-    const tmpFile = `/tmp/ai-autodev-comment-${Date.now()}.json`;
-    try {
-      const payload = JSON.stringify({ body });
-      writeFileSync(tmpFile, payload, 'utf-8');
-      const result = execSync(
-        `gh api repos/${owner}/${repo}/issues/${issueNumber}/comments --input "${tmpFile}"`,
-        { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }
-      );
-      const data = JSON.parse(result);
-      return { id: data.id, url: data.html_url };
-    } finally {
-      this.safeUnlink(tmpFile);
-    }
-  }
-
-  /**
-   * 更新已存在的 Issue 評論
-   * @param {string} owner
-   * @param {string} repo
-   * @param {number} commentId
-   * @param {string} body
-   * @returns {{ id: number, url: string }}
-   */
-  editIssueComment(owner, repo, commentId, body) {
-    const tmpFile = `/tmp/ai-autodev-edit-${Date.now()}.json`;
-    try {
-      const payload = JSON.stringify({ body });
-      writeFileSync(tmpFile, payload, 'utf-8');
-      const result = execSync(
-        `gh api repos/${owner}/${repo}/issues/comments/${commentId} --input "${tmpFile}" -X PATCH`,
-        { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }
-      );
-      const data = JSON.parse(result);
-      return { id: data.id, url: data.html_url };
-    } finally {
-      this.safeUnlink(tmpFile);
-    }
-  }
-
-  /**
-   * 尋找 Issue 上含有特定 marker 的評論（用於重複執行時更新而非重建）
-   * @param {string} owner
-   * @param {string} repo
-   * @param {number} issueNumber
-   * @param {string} marker - 識別字串
-   * @returns {{ id: number }|null}
-   */
-  findCommentWithMarker(owner, repo, issueNumber, marker) {
-    try {
-      const result = execSync(
-        `gh api repos/${owner}/${repo}/issues/${issueNumber}/comments --jq '.[] | {id, body}'`,
-        { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }
-      );
-      // 每行一個 JSON 物件
-      const lines = result.trim().split('\n').filter(Boolean);
-      for (const line of lines) {
-        try {
-          const obj = JSON.parse(line);
-          if (obj.body && obj.body.includes(marker)) {
-            return { id: obj.id };
-          }
-        } catch (_) {
-          // 忽略解析錯誤
-        }
-      }
-      return null;
-    } catch (_) {
-      return null;
-    }
-  }
 }

package/src/commands/autodev.js

@@ -1,62 +0,0 @@
-/**
- * AutoDev 命令
- * 完整自動化開發流程：Issue 解析 → 測試 → 發佈評論 → commit-all → PR
- *
- * 使用方式：
- *   ai autodev <issue>
- *   ai autodev 123
- *   ai autodev https://github.com/org/repo/issues/123
- *   ai autodev 123 --dry-run
- *   ai autodev 123 --skip-pr
- */
-
-import { AutodevWorkflow } from '../dev-modules/core/autodev-workflow.js';
-import { loadAutodevConfig } from '../core/config-loader.js';
-import { handleError } from '../utils/helpers.js';
-
-/**
- * AutoDev 命令主函數
- * @param {string|number} issueInput - Issue 編號或 URL
- * @param {Object} cliOptions - 來自 commander 的選項
- */
-export async function autodevCommand(issueInput, cliOptions = {}) {
-  if (!issueInput) {
-    console.error('❌ 請提供 Issue 編號或 URL');
-    console.error('   用法：ai autodev <issue>');
-    console.error('   範例：ai autodev 123');
-    process.exit(1);
-  }
-
-  try {
-    // 載入設定
-    const config = await loadAutodevConfig();
-
-    // 合併 CLI 選項（CLI 優先）
-    const options = {
-      dryRun:    cliOptions.dryRun    ?? false,
-      verbose:   cliOptions.verbose   ?? config.verbose ?? false,
-      framework: cliOptions.framework ?? config.framework ?? null,
-      skipCommit: cliOptions.skipCommit ?? config.skipCommit ?? false,
-      skipPr:    cliOptions.skipPr    ?? config.skipPr    ?? false,
-      skipAll:   cliOptions.skipAll   ?? false,
-      commitOnly: cliOptions.commitOnly ?? false,
-      skipTests: cliOptions.skipTests  ?? config.skipTests ?? false,
-    };
-
-    // 永遠顯示啟動設定，方便確認
-    console.log('📋 autodev 啟動設定：');
-    console.log(`   AI 模型   : ${config.aiModel}`);
-    console.log(`   重試次數  : ${config.maxRetries}`);
-    console.log(`   測試框架  : ${options.framework ?? '自動偵測'}`);
-    console.log(`   Commit    : ${options.skipAll || options.skipCommit ? '跳過' : '自動'}`);
-    console.log(`   PR        : ${options.skipAll || options.skipPr || options.commitOnly ? '跳過' : '自動'}`);
-    console.log(`   跳過測試  : ${options.skipTests ? '是（--skip-tests）' : '否（0 個測試時停止）'}`);
-    if (options.dryRun) console.log('   ⚠️  乾運行模式（不實際執行）');
-
-    const workflow = new AutodevWorkflow(config);
-    await workflow.execute(issueInput, options);
-  } catch (error) {
-    handleError(error);
-    throw error;
-  }
-}