ai-git-tools 2.1.8 → 2.1.9

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.8",
+  "version": "2.1.9",
   "description": "AI-powered Git automation tools for commit messages and PR generation",
   "main": "src/index.js",
   "type": "module",

package/src/redmine/issue-sync.js

@@ -137,7 +137,7 @@ export async function applyRedmineDraft({ draft, client, force = false, onProgre
   for (const [index, item] of draft.drafts.entries()) {
     try {
       onProgress({ phase: 'apply-issue', index: index + 1, total: draft.drafts.length, issueId: item.issueId });
-      const current = await client.getIssue(item.issueId, { include: 'allowed_statuses,journals' });
+      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,7 +148,7 @@ 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({ issue = {}, analysis = {}, evidence = {}, pullRequest = null }) {
@@ -188,19 +188,22 @@ export function formatRedmineNote({ issue = {}, analysis = {}, evidence = {}, pu
 
   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：${branchUrl ? `[${evidence.baseBranch || '—'}](https://github.com/${evidence.repository}/tree/${encodeURI(evidence.baseBranch || '')})` : 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(