ai-git-tools 2.1.15 → 2.1.16

package/README.md

@@ -411,6 +411,9 @@ ai-git-tools redmine-subtasks --issue 18793 --preview --output redmine-subtasks.
 
 # 確認草稿中的 title 與 content 後才建立子任務
 ai-git-tools redmine-subtasks --apply --from redmine-subtasks.json
+
+# 重新拆分後，覆蓋該 draft 快照中的既有受控子任務
+ai-git-tools redmine-subtasks --apply --from redmine-subtasks.json --replace
 ```
 
 可以明確指定範圍；目前只接受 `frontend`：
@@ -448,7 +451,7 @@ flowchart TD
 
 子任務涉及頁面但主 Issue 沒有明確畫面設計時，content 會附上純文字 wireframe，只描述資訊區塊、主要操作與已知狀態，不猜測顏色、尺寸或像素。沒有可靠流程或畫面需求時，對應區段會省略，未決事項會保留為待確認項目。
 
-這個流程使用 schema v2 draft。舊版 v1 草稿不可直接套用，請重新執行 preview。apply 前會重新讀取主 Issue；若 subject、description、project 或 tracker 已變更，預設會停止建立，確認變更仍可套用時才使用 `--force`。`--force` 只略過 parent snapshot conflict，不會略過 schema、payload 或 duplicate validation。既有子任務若有相同 managed key 或完全相同 title，會略過以避免重複建立；children summary 沒有 description 時，工具會再讀取 child detail 判斷 managed key。多筆建立採逐筆處理，部分成功不會回滾已建立的子任務。
+這個流程使用 schema v2 draft。舊版 v1 草稿不可直接套用，請重新執行 preview。apply 前會重新讀取主 Issue；若 subject、description、project 或 tracker 已變更，預設會停止建立，確認變更仍可套用時才使用 `--force`。`--force` 只略過 parent snapshot conflict，不會略過 schema、payload 或 duplicate validation。既有子任務若有相同 managed key 或完全相同 title，會略過以避免重複建立；children summary 沒有 description 時，工具會再讀取 child detail 判斷 managed key。若重新產生 preview 後要覆蓋上一次拆分的內容，請在 apply 時加上 `--replace`；它只會依 draft 快照順序覆蓋帶有工具 managed marker 的既有子任務，數量增加時建立新的子任務，數量減少時不刪除多出的舊項目。多筆建立或更新採逐筆處理，部分成功不會回滾已建立或已更新的子任務。
 
 此命令只建立主 Issue 底下的子任務，不會修改主 Issue 的 status、description、notes、done ratio 或完成欄位。API key 沿用上方的 `REDMINE_API_KEY` 環境變數，不會放入 CLI 參數、草稿或輸出內容；AI 產出的拆分結果仍必須由使用者審核。
 

package/bin/cli.js

@@ -117,6 +117,7 @@ registerCommand(program, 'redmine-subtasks', '分析主 Issue 的 Frontend 需
   { flags: '--apply', description: '套用已審核的子任務草稿' },
   { flags: '--from <file>', description: '指定要套用的子任務草稿 JSON' },
   { flags: '--force', description: '強制略過主 Issue 內容衝突檢查' },
+  { flags: '--replace', description: '覆蓋 draft 快照中的既有受控子任務' },
 ], redmineSubtasksCommand);
 
 program.parse();

package/package.json

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

package/src/commands/redmine-subtasks.js

@@ -28,6 +28,7 @@ export function validateRedmineSubtaskOptions(options = {}) {
   if (options.from && !options.apply) throw new Error('--from 只能搭配 --apply 使用');
   if (options.output && !options.preview) throw new Error('--output 只能搭配 --preview 使用');
   if (options.force && !options.apply) throw new Error('--force 只能搭配 --apply 使用');
+  if (options.replace && !options.apply) throw new Error('--replace 只能搭配 --apply 使用');
   if (options.scope !== undefined && options.scope !== 'frontend') {
     throw new Error('目前 redmine-subtasks 只支援 frontend scope');
   }
@@ -75,6 +76,8 @@ export function formatSubtaskProgress(progress = {}) {
       return `[${progress.index}/${progress.total}] 整理 screen wireframe...`;
     case 'create-child':
       return `[${progress.index}/${progress.total}] 建立子任務：${progress.title || '無標題'}`;
+    case 'replace-child':
+      return `[${progress.index}/${progress.total}] 覆蓋子任務：${progress.title || '無標題'}`;
     case 'preview':
       return '預覽完成，尚未修改 Redmine';
     default:
@@ -94,7 +97,9 @@ function printProgress(progress) {
 
 function printApplyResults(results) {
   for (const result of results) {
-    if (result.created) {
+    if (result.updated) {
+      console.log(`✅ 子任務「${result.title}」已覆蓋：#${result.childId || '—'}`);
+    } else if (result.created) {
       console.log(`✅ 子任務「${result.title}」已建立：#${result.childId || '—'}`);
     } else if (result.skipped) {
       console.log(`⚠️ 子任務「${result.title}」略過：已有相同子任務`);
@@ -110,7 +115,7 @@ function printApplyResults(results) {
 }
 
 function hasSubtaskFailures(results = []) {
-  return results.some(result => result.blocked || result.created === false);
+  return results.some(result => result.blocked || result.created === false || result.updated === false);
 }
 
 /**
@@ -131,6 +136,7 @@ export async function redmineSubtasksCommand(options = {}) {
       draft,
       client,
       force: options.force,
+      replace: options.replace,
       onProgress: printProgress,
     });
     printApplyResults(results);

package/src/core/ai-client.js

@@ -110,13 +110,7 @@ export class AIClient {
           onPermissionRequest: approveAll,
         });
 
-        // 使用 Promise.race 實現超時控制
-        const responsePromise = session.sendAndWait({ prompt });
-        const timeoutPromise = new Promise((_, reject) => {
-          setTimeout(() => reject(new Error(`AI 請求超時 (${timeout}ms)`)), timeout);
-        });
-
-        const response = await Promise.race([responsePromise, timeoutPromise]);
+        const response = await session.sendAndWait({ prompt }, timeout);
 
         const content = response?.data?.content || '';
         return toTraditionalChinese(content.trim());

package/src/redmine/redmine-client.js

@@ -175,14 +175,15 @@ export class RedmineClient {
 
   /**
   * @param {number|string} issueId
-  * @param {{statusId?: number, doneRatio?: number, dueDate?: string, description?: string, notes?: string, customFields?: Array<object>}} update
+  * @param {{statusId?: number, doneRatio?: number, dueDate?: string, subject?: string, description?: string, notes?: string, customFields?: Array<object>}} update
    * @returns {Promise<object>}
    */
-  async updateIssue(issueId, { statusId, doneRatio, dueDate, description, notes, customFields }) {
+  async updateIssue(issueId, { statusId, doneRatio, dueDate, subject, description, notes, customFields }) {
     const issue = {};
     if (statusId !== undefined && statusId !== null) issue.status_id = statusId;
     if (doneRatio !== undefined && doneRatio !== null) issue.done_ratio = doneRatio;
     if (dueDate !== undefined && dueDate !== null) issue.due_date = dueDate;
+    if (subject !== undefined) issue.subject = subject;
     if (description !== undefined) issue.description = description;
     if (notes) issue.notes = notes;
     if (Array.isArray(customFields) && customFields.length > 0) {

package/src/redmine/subtask-sync.js

@@ -93,6 +93,14 @@ function getExistingManagedKeys(children = []) {
   return new Set(children.map(child => getManagedSubtaskKey(child.description)).filter(Boolean));
 }
 
+function getReplaceableChildren(parent, children, parentIssueId) {
+  const childrenById = new Map(children.map(child => [String(child.id), child]));
+  const managedPrefix = buildManagedSubtaskKey(parentIssueId, '');
+  return (Array.isArray(parent?.children) ? parent.children : [])
+    .map(child => childrenById.get(String(child?.id)))
+    .filter(child => getManagedSubtaskKey(child?.description)?.startsWith(managedPrefix));
+}
+
 async function loadChildDetails(client, children = []) {
   const unavailableChildIds = [];
   if (typeof client?.getIssue !== 'function') {
@@ -203,10 +211,10 @@ export async function generateSubtaskDraft({
 
 /**
  * 套用已審核的子任務 draft
- * @param {{draft: object, client: object, force?: boolean, onProgress?: Function}} options
+ * @param {{draft: object, client: object, force?: boolean, replace?: boolean, onProgress?: Function}} options
  * @returns {Promise<Array<object>>}
  */
-export async function applySubtaskDraft({ draft, client, force = false, onProgress = () => {} }) {
+export async function applySubtaskDraft({ draft, client, force = false, replace = false, onProgress = () => {} }) {
   validateSubtaskDraft(draft);
   const parentIssueId = draft.parent.id;
   const current = await client.getIssue(parentIssueId, { include: 'children,relations' });
@@ -228,20 +236,53 @@ export async function applySubtaskDraft({ draft, client, force = false, onProgre
     }];
   }
   const children = childDetails.children;
+  const replaceableChildren = replace
+    ? getReplaceableChildren(draft.parent, children, parentIssueId)
+    : [];
+  const replacedChildIds = new Set();
   const managedKeys = getExistingManagedKeys(children);
   const titles = getExistingChildTitles(children);
   const results = [];
   for (const [index, subtask] of draft.subtasks.entries()) {
     const subtaskId = subtask.id || subtask.key;
+    const managedKey = buildManagedSubtaskKey(parentIssueId, subtaskId);
+    const replacement = replace
+      ? replaceableChildren.find(child => !replacedChildIds.has(String(child.id))
+        && getManagedSubtaskKey(child.description) === managedKey)
+        || replaceableChildren.find(child => !replacedChildIds.has(String(child.id)))
+      : null;
     onProgress({
-      phase: 'create-child',
+      phase: replacement ? 'replace-child' : 'create-child',
       index: index + 1,
       total: draft.subtasks.length,
       parentIssueId,
       key: subtaskId,
       title: subtask.title,
     });
-    const managedKey = buildManagedSubtaskKey(parentIssueId, subtaskId);
+    if (replacement) {
+      replacedChildIds.add(String(replacement.id));
+      try {
+        await client.updateIssue(replacement.id, {
+          subject: subtask.title,
+          description: subtask.content,
+        });
+        results.push({
+          ...(draft.version === 2 ? { id: subtaskId } : { key: subtaskId }),
+          title: subtask.title,
+          updated: true,
+          childId: replacement.id,
+        });
+      } catch (error) {
+        results.push({
+          ...(draft.version === 2 ? { id: subtaskId } : { key: subtaskId }),
+          title: subtask.title,
+          updated: false,
+          childId: replacement.id,
+          error: sanitizeError(error, client),
+        });
+      }
+      continue;
+    }
     if (managedKeys.has(managedKey) || titles.has(String(subtask.title).trim().toLocaleLowerCase())) {
       results.push({
         ...(draft.version === 2 ? { id: subtaskId } : { key: subtaskId }),