ai-git-tools 2.1.4 → 2.1.6

package/README.md

@@ -352,7 +352,7 @@ ai-git-tools redmine-update --apply --from redmine-update.json
 
 Preview 會以色彩分開顯示每個 Issue 的開發內容、程式修改重點、API 變更、重要技術細節、修改檔案與實際 note。狀態由 Redmine API 提供選單，只有使用者選擇的 status 才會寫入。
 
-原始 Issue description 會保留原始內容；若 AI 產生可靠流程，工具只替換 description 中由 `ai-git-tools` 管理的 Mermaid 區塊，不會重複追加。更新摘要會寫入 notes，並使用 Markdown 標題、項目符號與雙反引號標示程式路徑、API path、function 與 class。只有找到明確測試或驗證證據時才會加入驗證段落；流程圖會使用 Redmine Mermaid macro 並放在 description（公司 Redmine 的 notes 不支援 Mermaid）：
+原始 Issue description 會保留原始內容；AI 可產生多張流程圖，每張流程圖都有穩定的用途 ID。相同 ID 會更新原流程圖，不同 ID 會追加新流程圖；既有沒有 ID 的 Mermaid 會保留，內容相同時不重複追加。更新摘要會寫入 notes，並使用 Markdown 標題、項目符號與雙反引號標示程式路徑、API path、function 與 class。只有找到明確測試或驗證證據時才會加入驗證段落；流程圖會使用 Redmine Mermaid macro 並放在 description（公司 Redmine 的 notes 不支援 Mermaid）：
 
 ```text
 {{mermaid
@@ -366,6 +366,8 @@ Issue note 的基本責任分工如下：`description` 保存原始需求，`sta
 
 當 preview 選擇「已解決」後套用，工具會同步將完成百分比設為 `100%`，並依欄位名稱找到 `程式碼更版進度` custom field，勾選測試機選項 `測`。custom field ID 會從 Issue API 動態取得，不會寫死公司 Redmine 的 ID。
 
+同一個 Issue 若已經有先前的 notes，後續再次執行更新仍會新增一筆新的 Redmine journal，不會因為已有 notes 而略過；只有 Issue 的需求內容或狀態在產生草稿後被其他人修改時，才會停下來要求重新確認。
+
 ## ⚙️ 配置
 
 配置檔案範例（\`.ai-git-config.js\`）：

package/package.json

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

package/src/redmine/issue-analyzer.js

@@ -2,6 +2,7 @@ import { AIClient } from '../core/ai-client.js';
 
 const ANALYSIS_FIELDS = [
   'developmentSummary',
+  'requirementDescription',
   'codeChanges',
   'apiChanges',
   'technicalDetails',
@@ -11,10 +12,48 @@ const ANALYSIS_FIELDS = [
   'evidence',
 ];
 
+function normalizeFlowcharts(value) {
+  const flowcharts = Array.isArray(value)
+    ? value
+    : value
+      ? [{ source: value }]
+      : [];
+
+  const usedIds = new Set();
+  return flowcharts
+    .filter(flowchart => flowchart && typeof flowchart === 'object')
+    .map((flowchart, index) => {
+      const title = typeof flowchart.title === 'string' ? flowchart.title.trim() : '';
+      const requestedId = typeof flowchart.id === 'string' ? flowchart.id.trim() : '';
+      const stableId = (requestedId || title || `flowchart-${index + 1}`)
+        .toLowerCase()
+        .replace(/[^a-z0-9_-]+/g, '-')
+        .replace(/^-+|-+$/g, '') || `flowchart-${index + 1}`;
+
+      let uniqueId = stableId;
+      if (usedIds.has(uniqueId)) uniqueId = `${stableId}-${index + 1}`;
+      usedIds.add(uniqueId);
+
+      return {
+        id: uniqueId,
+        title,
+        source: typeof flowchart.source === 'string' ? flowchart.source.trim() : '',
+        evidence: asStringArray(flowchart.evidence),
+      };
+    })
+    .filter(flowchart => flowchart.source);
+}
+
 function asStringArray(value) {
   return Array.isArray(value) ? value.filter(item => typeof item === 'string') : [];
 }
 
+function asBehaviorRules(value) {
+  return Array.isArray(value)
+    ? value.filter(rule => rule && typeof rule.scenario === 'string' && typeof rule.behavior === 'string')
+    : [];
+}
+
 function filterEvidenceBackedClaims(result, evidence = {}) {
   const source = JSON.stringify(evidence);
   const evidenceRefs = result.evidence.filter(
@@ -45,7 +84,8 @@ export function buildIssueAnalysisPrompt({ issue, evidence }) {
 - 不得捏造 API endpoint、參數、檔案、function、class、測試或部署結果。
 - 沒有明確測試或驗證證據時，verification 必須是空陣列。
 - 沒有可靠 API 變更證據時，apiChanges 必須是空陣列。
-- 若能從實際流程推導出可靠的複製流程，才產生 flowchart；否則為 null。flowchart 必須以 graph TD 開始，不要加入 Mermaid wrapper 或 code fence。
+- requirementDescription 應整理指定 Issue 的需求重點；behaviorRules 使用 scenario/behavior 物件陣列。
+- 若能從實際流程推導出可靠的複製流程，才產生 flowcharts；否則為空陣列。每張流程圖必須有穩定、描述用途的 id，source 必須以 graph TD 開始，不要加入 Mermaid wrapper 或 code fence。
 - developmentSummary、codeChanges、apiChanges、technicalDetails 中的程式路徑、API path、function 與 class 使用雙反引號標示；需要多行程式片段時使用 code block。
 - 不要產生 suggestedStatus、coverage 或 confidence，也不要決定 Redmine status。
 
@@ -59,17 +99,19 @@ ${JSON.stringify(evidence, null, 2)}
 {
   "issueId": ${issue.id},
   "developmentSummary": [],
+  "requirementDescription": "",
+  "behaviorRules": [],
   "codeChanges": [],
   "apiChanges": [],
   "technicalDetails": [],
   "modifiedFiles": [],
   "verification": [],
-  "flowchart": null,
+  "flowcharts": [],
   "unresolvedItems": [],
   "evidence": []
 }
 
-各欄位都必須是字串陣列，flowchart 必須是合法 Mermaid source 字串或 null。`;
+developmentSummary、codeChanges、apiChanges、technicalDetails、modifiedFiles、verification、unresolvedItems 與 evidence 必須是字串陣列；requirementDescription 必須是字串；behaviorRules 必須是包含 scenario 與 behavior 字串的物件陣列；flowcharts 必須是包含 id、title、source 與 evidence 的物件陣列。`;
 }
 
 /**
@@ -83,12 +125,14 @@ export function parseIssueAnalysis(content, issueId) {
   const result = { issueId };
 
   for (const field of ANALYSIS_FIELDS) {
-    result[field] = asStringArray(parsed[field]);
+    result[field] = field === 'requirementDescription'
+      ? (typeof parsed[field] === 'string' ? parsed[field].trim() : '')
+      : asStringArray(parsed[field]);
   }
+  result.behaviorRules = asBehaviorRules(parsed.behaviorRules);
+  result.flowcharts = normalizeFlowcharts(parsed.flowcharts || parsed.flowchart);
 
-  result.flowchart = typeof parsed.flowchart === 'string' && parsed.flowchart.trim()
-    ? parsed.flowchart.trim()
-    : null;
+  result.flowchart = result.flowcharts[0]?.source || null;
 
   return result;
 }

package/src/redmine/issue-sync.js

@@ -84,10 +84,11 @@ export async function generateRedmineDraft({
       const analysis = await analyzeIssueFn({ issue, evidence: { ...evidence, pullRequest }, model, maxRetries });
       const selectedStatus = await selectStatusFn(issue, { client });
       const completion = buildCompletionUpdate(issue, selectedStatus);
-      const description = formatRedmineDescription(issue.description, analysis.flowchart);
+      const description = formatRedmineDescription(issue.description, analysis.flowcharts);
       const syncId = createSyncId({ issueId, evidence, pullRequest });
       const note = formatRedmineNote({
         issueId,
+        issue,
         analysis,
         evidence,
         pullRequest,
@@ -125,11 +126,6 @@ export async function generateRedmineDraft({
   };
 }
 
-function hasSyncId(issue, syncId) {
-  const journals = issue.raw?.journals || [];
-  return journals.some(journal => journal.notes?.includes(syncId));
-}
-
 /**
  * 套用已審核的 Redmine 更新草稿
  * @param {{draft: object, client: object, force?: boolean}} options
@@ -144,10 +140,6 @@ export async function applyRedmineDraft({ draft, client, force = false }) {
   for (const item of draft.drafts) {
     try {
       const current = await client.getIssue(item.issueId, { include: 'allowed_statuses,journals' });
-      if (!force && hasSyncId(current, item.syncId)) {
-        results.push({ issueId: item.issueId, skipped: true, reason: 'duplicate' });
-        continue;
-      }
 
       const statusChanged = item.originalStatusId !== null && current.status?.id !== item.originalStatusId;
       const descriptionChanged = current.description !== item.originalDescription;

package/src/redmine/redmine-formatters.js

@@ -6,8 +6,66 @@ function bulletSection(title, items) {
   return `### ${title}\n${items.map(item => `- ${item}`).join('\n')}\n`;
 }
 
-const MERMAID_START = '<!-- ai-git-tools:mermaid:start -->';
-const MERMAID_END = '<!-- ai-git-tools:mermaid:end -->';
+function paragraphSection(title, content) {
+  if (!content) return '';
+  return `### ${title}\n\n${content}\n`;
+}
+
+function formatBehaviorRules(rules = []) {
+  if (!Array.isArray(rules) || rules.length === 0) return '';
+  const rows = rules
+    .filter(rule => rule?.scenario && rule?.behavior)
+    .map(rule => `| ${String(rule.scenario).replaceAll('|', '\\|')} | ${String(rule.behavior).replaceAll('|', '\\|')} |`);
+  if (rows.length === 0) return '';
+  return `### 行為規則\n\n| 情境 | 行為 |\n|---|---|\n${rows.join('\n')}\n`;
+}
+
+const MERMAID_START = '<!-- ai-git-tools:mermaid:start';
+const MERMAID_END = '<!-- ai-git-tools:mermaid:end';
+
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function normalizeFlowchartId(id, index) {
+  const source = typeof id === 'string' && id.trim() ? id : `flowchart-${index + 1}`;
+  return source
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9_-]+/g, '-')
+    .replace(/^-+|-+$/g, '') || `flowchart-${index + 1}`;
+}
+
+function normalizeFlowchartInput(flowcharts) {
+  if (Array.isArray(flowcharts)) return flowcharts;
+  if (typeof flowcharts === 'string' && flowcharts.trim()) {
+    return [{ id: 'flowchart-1', title: '開發流程', source: flowcharts }];
+  }
+  return [];
+}
+
+function hasSameMermaid(description, mermaid) {
+  const existing = description.match(/\{\{\s*mermaid\b[\s\S]*?\}\}/gi) || [];
+  return existing.some(block => formatMermaid(block) === mermaid);
+}
+
+function managedFlowchartPattern(id) {
+  const escapedId = escapeRegExp(id);
+  return new RegExp(
+    `${escapeRegExp(MERMAID_START)} id="${escapedId}" -->[\\s\\S]*?${escapeRegExp(MERMAID_END)} id="${escapedId}" -->`
+  );
+}
+
+function formatManagedFlowchart(flowchart, index) {
+  const mermaid = formatMermaid(flowchart.source);
+  if (!mermaid) return '';
+
+  const id = normalizeFlowchartId(flowchart.id, index);
+  const title = typeof flowchart.title === 'string' && flowchart.title.trim()
+    ? flowchart.title.trim()
+    : '開發流程';
+  return `${MERMAID_START} id="${id}" -->\n\n### 流程圖：${title}\n\n${mermaid}\n\n${MERMAID_END} id="${id}" -->`;
+}
 
 /**
  * 將 Mermaid source 包成 Redmine macro
@@ -23,9 +81,9 @@ export function formatMermaid(source) {
     .replace(/\s*```$/, '')
     .trim();
 
-  if (cleanSource.startsWith('{{mermaid')) {
+  if (/^\{\{\s*mermaid\b/i.test(cleanSource)) {
     cleanSource = cleanSource
-      .replace(/^\{\{mermaid\s*/, '')
+      .replace(/^\{\{\s*mermaid\s*/i, '')
       .replace(/\s*\}\}$/, '')
       .trim();
   }
@@ -50,19 +108,27 @@ export function formatMermaid(source) {
  * @returns {string}
  */
 export function formatRedmineDescription(description = '', source = null) {
-  const mermaid = formatMermaid(source);
-  if (!mermaid) return description;
+  let result = description;
+  const flowcharts = normalizeFlowchartInput(source);
 
-  const block = `${MERMAID_START}\n\n### 開發流程\n\n${mermaid}\n\n${MERMAID_END}`;
-  const markerPattern = new RegExp(
-    `${MERMAID_START.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}[\\s\\S]*?${MERMAID_END.replace(/[.*+?^${}()|[\]\\\\]/g, '\\$&')}`
-  );
+  flowcharts.forEach((flowchart, index) => {
+    const mermaid = formatMermaid(flowchart?.source);
+    if (!mermaid) return;
 
-  if (markerPattern.test(description)) {
-    return description.replace(markerPattern, block);
-  }
+    const block = formatManagedFlowchart(flowchart, index);
+    const id = normalizeFlowchartId(flowchart?.id, index);
+    const markerPattern = managedFlowchartPattern(id);
+    if (markerPattern.test(result)) {
+      result = result.replace(markerPattern, block);
+      return;
+    }
 
-  return `${description.trim()}\n\n${block}`.trim();
+    if (!hasSameMermaid(result, mermaid)) {
+      result = `${result.trim()}\n\n${block}`.trim();
+    }
+  });
+
+  return result;
 }
 
 /**
@@ -70,9 +136,13 @@ export function formatRedmineDescription(description = '', source = null) {
  * @param {{issueId: number|string, analysis: object, evidence: object, pullRequest?: object|null, syncId?: string}} input
  * @returns {string}
  */
-export function formatRedmineNote({ issueId, analysis = {}, evidence = {}, pullRequest = null, syncId }) {
-  const sections = [`## Git 開發更新（Issue #${issueId}）`, ''];
-  const development = bulletSection('開發內容', analysis.developmentSummary);
+export function formatRedmineNote({ issueId, issue = {}, analysis = {}, evidence = {}, pullRequest = null, syncId }) {
+  const sections = ['## 開發內容', ''];
+  const development = Array.isArray(analysis.developmentSummary)
+    ? analysis.developmentSummary.join('\n\n')
+    : analysis.developmentSummary || '';
+  const requirementDescription = analysis.requirementDescription || issue.description || '';
+  const behaviorRules = formatBehaviorRules(analysis.behaviorRules);
   const codeChanges = bulletSection('程式修改重點', analysis.codeChanges);
   const apiChanges = bulletSection('API 變更', analysis.apiChanges);
   const technicalDetails = bulletSection('重要技術細節', analysis.technicalDetails);
@@ -83,15 +153,26 @@ export function formatRedmineNote({ issueId, analysis = {}, evidence = {}, pullR
       : evidence.changedFiles?.map(file => `\`\`${file}\`\``)
   );
   const verification = bulletSection('驗證結果', analysis.verification);
-  const unresolved = bulletSection('尚未完成或待確認', analysis.unresolvedItems);
+  const unresolved = analysis.unresolvedItems?.length
+    ? `### 待確認\n${analysis.unresolvedItems.map(item => `- [ ] ${item}`).join('\n')}\n`
+    : '';
 
-  sections.push(development, codeChanges, apiChanges, technicalDetails, modifiedFiles, verification);
+  sections.push(
+    development,
+    paragraphSection('需求說明', requirementDescription),
+    behaviorRules,
+    modifiedFiles,
+    codeChanges,
+    apiChanges,
+    technicalDetails,
+    verification
+  );
   sections.push(unresolved);
 
   if (evidence.currentBranch || evidence.baseBranch) {
     sections.push(
-      `### Git 關聯\n\n- Branch：\`\`${evidence.currentBranch || '—'}\`\``,
-      `- 比較基準：\`\`${evidence.baseBranch || '—'}\`\``,
+      `### Git\n\n- Branch：\`\`${evidence.currentBranch || '—'}\`\``,
+      `- Base：\`\`${evidence.baseBranch || '—'}\`\``,
       ''
     );
   }