ai-git-tools 2.1.4 → 2.1.5

package/README.md

@@ -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.5",
   "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',
@@ -15,6 +16,12 @@ 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(
@@ -59,6 +66,8 @@ ${JSON.stringify(evidence, null, 2)}
 {
   "issueId": ${issue.id},
   "developmentSummary": [],
+  "requirementDescription": "",
+  "behaviorRules": [],
   "codeChanges": [],
   "apiChanges": [],
   "technicalDetails": [],
@@ -69,7 +78,7 @@ ${JSON.stringify(evidence, null, 2)}
   "evidence": []
 }
 
-各欄位都必須是字串陣列，flowchart 必須是合法 Mermaid source 字串或 null。`;
+developmentSummary、codeChanges、apiChanges、technicalDetails、modifiedFiles、verification、unresolvedItems 與 evidence 必須是字串陣列；requirementDescription 必須是字串；behaviorRules 必須是包含 scenario 與 behavior 字串的物件陣列；flowchart 必須是合法 Mermaid source 字串或 null。`;
 }
 
 /**
@@ -83,8 +92,11 @@ 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.flowchart = typeof parsed.flowchart === 'string' && parsed.flowchart.trim()
     ? parsed.flowchart.trim()

package/src/redmine/issue-sync.js

@@ -88,6 +88,7 @@ export async function generateRedmineDraft({
       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,6 +6,20 @@ function bulletSection(title, items) {
   return `### ${title}\n${items.map(item => `- ${item}`).join('\n')}\n`;
 }
 
+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 -->';
 
@@ -70,9 +84,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 +101,26 @@ export function formatRedmineNote({ issueId, analysis = {}, evidence = {}, pullR
       : evidence.changedFiles?.map(file => `\`\`${file}\`\``)
   );
   const verification = bulletSection('驗證結果', analysis.verification);
-  const unresolved = bulletSection('尚未完成或待確認', analysis.unresolvedItems);
-
-  sections.push(development, codeChanges, apiChanges, technicalDetails, modifiedFiles, verification);
+  const unresolved = analysis.unresolvedItems?.length
+    ? `### 待確認\n${analysis.unresolvedItems.map(item => `- [ ] ${item}`).join('\n')}\n`
+    : '';
+
+  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 || '—'}\`\``,
       ''
     );
   }