ai-git-tools 2.1.7 → 2.1.9

package/README.md

@@ -350,6 +350,10 @@ ai-git-tools redmine-update --apply --from redmine-update.json
 
 `--pr <number>` 是可選的補充 evidence，會加入 PR title、body、URL、merge state、commits 與 changed files；沒有 PR 仍可完整分析本機 Git diff。沒有 PR 時，工具不會自動推論已 merge、已部署或必須關閉 Issue。
 
+執行過程會顯示目前階段，例如 Redmine 設定、Git evidence、PR 搜尋、每個 Issue 讀取、Copilot 分析與草稿產生進度。未指定 `--pr` 時，工具會依目前 branch 自動尋找對應的 GitHub PR；找不到時只省略 PR 資訊，不會影響本機 Git 分析。
+
+notes 的 `### Git` 區塊會將 Branch 與 Base 連到對應的 GitHub branch；找到 PR 時也會顯示可點擊的 PR URL，找不到 PR 時不會顯示 PR 欄位。
+
 Preview 會以色彩分開顯示每個 Issue 的開發內容、程式修改重點、API 變更、重要技術細節、修改檔案與實際 note。工具會從 Redmine API 找到 `已解決` 狀態並直接套用，不顯示互動式狀態選單。
 
 原始 Issue description 會保留原始內容，供未來其它內容使用。AI 可產生多張流程圖，每張流程圖都有穩定的用途 ID，流程圖會放在 notes（公司 Redmine 已支援 notes Mermaid）。更新摘要會使用 Markdown 標題、項目符號與雙反引號標示程式路徑、API path、function 與 class。只有找到明確測試或驗證證據時才會加入驗證段落：

package/bin/cli.js

@@ -99,7 +99,7 @@ registerCommand(program, 'redmine-update', '分析並更新 Redmine Issue 的開
   { flags: '--output <file>', description: '保存 preview 草稿 JSON' },
   { flags: '--apply', description: '套用已審核的草稿' },
   { flags: '--from <file>', description: '指定要套用的 preview 草稿 JSON' },
-  { flags: '--force', description: '強制略過衝突與重複同步檢查' },
+  { flags: '--force', description: '強制略過 Issue 狀態或內容衝突檢查' },
 ], redmineUpdateCommand);
 
 program.parse();

package/package.json

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

package/src/commands/redmine-update.js

@@ -4,9 +4,14 @@
 
 import { readFileSync, writeFileSync } from 'fs';
 import { loadConfig } from '../core/config-loader.js';
-import { collectGitEvidence, collectPullRequestEvidence } from '../redmine/git-evidence.js';
+import {
+  collectGitEvidence,
+  collectPullRequestEvidence,
+  findCurrentPullRequestEvidence,
+} from '../redmine/git-evidence.js';
 import { buildRedmineConfig } from '../redmine/config.js';
 import { RedmineClient } from '../redmine/redmine-client.js';
+import { Logger } from '../utils/logger.js';
 import {
   applyRedmineDraft,
   generateRedmineDraft,
@@ -15,6 +20,37 @@ import {
 } from '../redmine/issue-sync.js';
 import { formatRedminePreview as renderPreview } from '../redmine/redmine-formatters.js';
 
+const logger = new Logger();
+
+function countLines(value) {
+  return String(value || '').split('\n').filter(Boolean).length;
+}
+
+function printProgress(progress) {
+  switch (progress.phase) {
+    case 'read-issue':
+      logger.step(`[${progress.index}/${progress.total}] 讀取 Redmine Issue #${progress.issueId}...`);
+      break;
+    case 'issue-read':
+      logger.success(`Issue #${progress.issueId} 已取得：${progress.subject || '無標題'}`);
+      break;
+    case 'analyze-issue':
+      logger.step(`[${progress.index}/${progress.total}] 使用 Copilot 分析 Issue #${progress.issueId}...`);
+      break;
+    case 'issue-analyzed':
+      logger.success(`Issue #${progress.issueId} AI 分析完成`);
+      break;
+    case 'issue-complete':
+      logger.success(`Issue #${progress.issueId} 更新草稿完成`);
+      break;
+    case 'apply-issue':
+      logger.step(`[${progress.index}/${progress.total}] 更新 Redmine Issue #${progress.issueId}...`);
+      break;
+    default:
+      break;
+  }
+}
+
 function printApplyResults(results) {
   for (const result of results) {
     if (result.applied) {
@@ -82,13 +118,23 @@ export function validateGeneratedDraft(draft = {}) {
  */
 export async function redmineUpdateCommand(options = {}) {
   validateRedmineOptions(options);
+  logger.header('Redmine Issue 更新分析');
   const config = await loadConfig();
+  logger.step('檢查 Redmine 設定...');
   const redmineConfig = buildRedmineConfig(config, process.env);
   const client = new RedmineClient(redmineConfig);
+  logger.success('Redmine 設定已載入');
 
   if (options.apply) {
+    logger.step(`讀取已審核草稿：${options.from}`);
     const draft = parseDraft(readFileSync(options.from, 'utf-8'));
-    const results = await applyRedmineDraft({ draft, client, force: options.force });
+    logger.success(`草稿已載入，共 ${draft.drafts.length} 個 Issue`);
+    const results = await applyRedmineDraft({
+      draft,
+      client,
+      force: options.force,
+      onProgress: printProgress,
+    });
     printApplyResults(results);
     if (hasApplyFailures(results)) {
       throw new Error('部分 Redmine Issue 更新失敗，請查看上方結果並重新處理失敗項目');
@@ -96,8 +142,31 @@ export async function redmineUpdateCommand(options = {}) {
     return results;
   }
 
+  logger.step('收集 Git branch、Base、commits、修改檔案與 diff...');
   const evidence = collectGitEvidence({ baseBranch: options.base });
-  const pullRequest = options.pr ? collectPullRequestEvidence(options.pr) : null;
+  logger.success(
+    `Git evidence 已取得：${countLines(evidence.commits)} 個 commits、${evidence.changedFiles.length} 個修改檔案；Base：${evidence.baseBranch}`
+  );
+
+  let pullRequest = null;
+  if (options.pr) {
+    logger.step(`讀取指定 GitHub PR #${options.pr}...`);
+    pullRequest = collectPullRequestEvidence(options.pr);
+  } else {
+    logger.step(`尋找 branch ${evidence.currentBranch} 對應的 GitHub PR...`);
+    try {
+      pullRequest = findCurrentPullRequestEvidence(evidence.currentBranch);
+    } catch {
+      pullRequest = null;
+    }
+  }
+  if (pullRequest) {
+    logger.success(`已找到 PR #${pullRequest.number}：${pullRequest.title || '無標題'}`);
+    console.log(`🔗 ${pullRequest.url}`);
+  } else {
+    logger.info('目前 branch 沒有找到對應的 GitHub PR，略過 PR 資訊');
+  }
+
   const draft = await generateRedmineDraft({
     issueIds: options.issue,
     client,
@@ -105,9 +174,11 @@ export async function redmineUpdateCommand(options = {}) {
     pullRequest,
     model: config.ai.model,
     maxRetries: config.ai.maxRetries,
+    onProgress: printProgress,
   });
 
   validateGeneratedDraft(draft);
+  logger.success(`已完成 ${draft.drafts.length} 個 Issue 的更新草稿分析`);
   console.log(renderPreview(draft.drafts));
   for (const failure of draft.failures) {
     console.log(`❌ Issue #${failure.issueId} 無法產生更新：${failure.error}`);

package/src/redmine/git-evidence.js

@@ -184,3 +184,42 @@ export function collectPullRequestEvidence(pullRequestNumber, execImpl = execFil
     changedFiles: pullRequest.files || [],
   };
 }
+
+/**
+ * 依目前 branch 找到對應的 GitHub Pull Request
+ * @param {string} branchName
+ * @param {Function} execImpl
+ * @returns {object|null}
+ */
+export function findCurrentPullRequestEvidence(branchName, execImpl = execFileSync) {
+  const raw = run(
+    'gh',
+    [
+      'pr',
+      'list',
+      '--head',
+      branchName,
+      '--state',
+      'all',
+      '--limit',
+      '1',
+      '--json',
+      'number,title,body,url,state,mergedAt,commits,files',
+    ],
+    execImpl
+  );
+  const pullRequests = JSON.parse(raw);
+  if (!Array.isArray(pullRequests) || pullRequests.length === 0) return null;
+
+  const pullRequest = pullRequests[0];
+  return {
+    number: Number(pullRequest.number),
+    title: pullRequest.title || '',
+    body: pullRequest.body || '',
+    url: pullRequest.url || '',
+    state: pullRequest.state || '',
+    mergedAt: pullRequest.mergedAt || null,
+    commits: pullRequest.commits || [],
+    changedFiles: pullRequest.files || [],
+  };
+}

package/src/redmine/issue-sync.js

@@ -1,5 +1,4 @@
 import { analyzeIssue as defaultAnalyzeIssue } from './issue-analyzer.js';
-import { createHash } from 'crypto';
 import {
   formatRedmineNote,
   formatRedminePreview,
@@ -54,21 +53,6 @@ export function buildCompletionUpdate(issue, selectedStatus) {
   };
 }
 
-/**
- * 建立單一 Issue 的同步識別
- * @param {{issueId: number|string, evidence: object, pullRequest?: object|null}}
- * @returns {string}
- */
-export function createSyncId({ issueId, evidence = {}, pullRequest = null }) {
-  const identity = pullRequest?.number
-    ? `pr-${pullRequest.url || pullRequest.number}`
-    : `${evidence.repository || 'local'}-${evidence.currentBranch || 'branch'}-${createHash('sha256')
-      .update(`${evidence.commits || ''}\n${evidence.diff || ''}`)
-      .digest('hex')
-      .slice(0, 12)}`;
-  return `redmine-sync:${issueId}:${identity}`;
-}
-
 /**
  * 產生一份待審核的 Redmine 更新草稿
  * @param {object} options
@@ -83,26 +67,30 @@ export async function generateRedmineDraft({
   selectStatusFn = resolveIssueStatus,
   model,
   maxRetries,
+  onProgress = () => {},
 }) {
   const drafts = [];
   const failures = [];
-  for (const issueId of uniqueIssueIds(issueIds)) {
+  const uniqueIds = uniqueIssueIds(issueIds);
+  for (const [index, issueId] of uniqueIds.entries()) {
     try {
+      onProgress({ phase: 'read-issue', index: index + 1, total: uniqueIds.length, issueId });
       const issue = await client.getIssue(issueId);
+      onProgress({ phase: 'issue-read', index: index + 1, total: uniqueIds.length, issueId, subject: issue.subject });
+      onProgress({ phase: 'analyze-issue', index: index + 1, total: uniqueIds.length, issueId });
       const analysis = await analyzeIssueFn({ issue, evidence: { ...evidence, pullRequest }, model, maxRetries });
+      onProgress({ phase: 'issue-analyzed', index: index + 1, total: uniqueIds.length, issueId });
       const fallbackStatuses = issue.allowedStatuses?.length ? [] : await client.getIssueStatuses();
       const selectedStatus = selectStatusFn === resolveIssueStatus
         ? resolveIssueStatus(issue, fallbackStatuses)
         : await selectStatusFn(issue, { client });
+      onProgress({ phase: 'issue-complete', index: index + 1, total: uniqueIds.length, issueId });
       const completion = buildCompletionUpdate(issue, selectedStatus);
-      const syncId = createSyncId({ issueId, evidence, pullRequest });
       const note = formatRedmineNote({
-        issueId,
         issue,
         analysis,
         evidence,
         pullRequest,
-        syncId,
       });
 
       drafts.push({
@@ -119,7 +107,6 @@ export async function generateRedmineDraft({
         customFieldWarning: completion.warning || null,
         analysis,
         note,
-        syncId,
       });
     } catch (error) {
       failures.push({ issueId, error: error.message });
@@ -141,15 +128,16 @@ export async function generateRedmineDraft({
  * @param {{draft: object, client: object, force?: boolean}} options
  * @returns {Promise<Array<object>>}
  */
-export async function applyRedmineDraft({ draft, client, force = false }) {
+export async function applyRedmineDraft({ draft, client, force = false, onProgress = () => {} }) {
   if (!draft || !Array.isArray(draft.drafts)) {
     throw new Error('無效的 Redmine draft');
   }
 
   const results = [];
-  for (const item of draft.drafts) {
+  for (const [index, item] of draft.drafts.entries()) {
     try {
-      const current = await client.getIssue(item.issueId, { include: 'allowed_statuses,journals' });
+      onProgress({ phase: 'apply-issue', index: index + 1, total: draft.drafts.length, issueId: item.issueId });
+      const current = await client.getIssue(item.issueId, { include: 'allowed_statuses' });
 
       const statusChanged = item.originalStatusId !== null && current.status?.id !== item.originalStatusId;
       const descriptionChanged = current.description !== item.originalDescription;

package/src/redmine/redmine-formatters.js

@@ -148,10 +148,10 @@ export function formatRedmineDescription(description = '', source = null) {
 
 /**
  * 格式化 Redmine Issue note
- * @param {{issueId: number|string, analysis: object, evidence: object, pullRequest?: object|null, syncId?: string}} input
+ * @param {{issue?: object, analysis?: object, evidence?: object, pullRequest?: object|null}} input
  * @returns {string}
  */
-export function formatRedmineNote({ issueId, issue = {}, analysis = {}, evidence = {}, pullRequest = null, syncId }) {
+export function formatRedmineNote({ issue = {}, analysis = {}, evidence = {}, pullRequest = null }) {
   const sections = ['## 開發內容', ''];
   const development = Array.isArray(analysis.developmentSummary)
     ? analysis.developmentSummary.join('\n\n')
@@ -188,19 +188,22 @@ export function formatRedmineNote({ issueId, issue = {}, analysis = {}, evidence
 
   if (evidence.currentBranch || evidence.baseBranch || pullRequest) {
     const branch = evidence.currentBranch || '—';
-    const branchUrl = evidence.repository
+    const branchUrl = evidence.repository && branch !== '—'
       ? `https://github.com/${evidence.repository}/tree/${encodeURI(branch)}`
       : '';
+    const base = evidence.baseBranch || '—';
+    const baseUrl = evidence.repository && base !== '—'
+      ? `https://github.com/${evidence.repository}/tree/${encodeURI(base)}`
+      : '';
     const gitLines = [
       '### Git',
       '',
       `- Branch：${branchUrl ? `[${branch}](${branchUrl})` : `\`\`${branch}\`\``}`,
-      `- Base：${evidence.baseBranch || '—'}`,
+      `- Base：${baseUrl ? `[${base}](${baseUrl})` : base}`,
     ];
     if (pullRequest) {
       gitLines.push(
-        `- PR：${pullRequest.url ? `[${pullRequest.url}](${pullRequest.url})` : `#${pullRequest.number}`}`,
-        `- PR 狀態：${pullRequest.state || '—'}${pullRequest.mergedAt ? `（合併於 ${pullRequest.mergedAt}）` : ''}`
+        `- PR：${pullRequest.url ? `[${pullRequest.url}](${pullRequest.url})` : `#${pullRequest.number}`}`
       );
     }
     sections.push(
@@ -213,7 +216,6 @@ export function formatRedmineNote({ issueId, issue = {}, analysis = {}, evidence
     sections.push(`分析依據：${analysis.evidence.join('、')}`, '');
   }
 
-  if (syncId) sections.push(`<!-- ${syncId} issue:${issueId} -->`);
   return sections.filter((section, index) => section || index === 1).join('\n').trim();
 }