@jira-deploy/core 1.0.14 → 1.0.16

package/tools/index.js

@@ -1,39 +1,46 @@
 import { Poller } from '../poller.js';
+import { getBuildToolDefinitions, handleWaitBuildResult } from './build.js';
+import { getBranchPRToolDefinitions, handleValidateBranchNoOpenPR } from './branch-prs.js';
 import {
   getLibraryToolDefinitions,
+  handleBuildLibrary,
   handleCreateLibraryTicket,
-  handleGetNextLibVersion,
 } from './library.js';
-import { getCIToolDefinitions, handleCreateCITicket, handleGetNextCIVersion } from './ci.js';
 import {
-  SYSTEM_CODES,
-  ENV_CODES,
-  CD_FIELD_IDS,
-  SUPPORTED_ENVS,
-  resolveAccountId,
-} from '../constants/index.js';
-import { getCDToolDefinitions, handleCreateCDTicket } from './cd.js';
+  getCIToolDefinitions,
+  handleBuildCI,
+  handleCreateCITicket,
+  handleGetNextCIVersion,
+  handleWaitToDev,
+  handleWaitToPrdDr,
+  handleWaitToStg,
+  handleWaitToUat,
+} from './ci.js';
+import { CD_FIELD_IDS, ENV_CODES, resolveAccountId, SUPPORTED_ENVS, } from '../constants/index.js';
+import { getCDToolDefinitions, handleCDApproval, handleCreateCDTicket } from './cd.js';
+import { getDeploymentToolDefinitions, handleTriggerDeployment } from './deployment.js';
 import {
   getGrayReleaseToolDefinitions,
-  handleCreateGrayReleaseTicket,
-  handleLinkStgGrayRelease,
   handleAutoGrayRelease,
+  handleBuildGrayRelease,
+  handleContinueGrayRelease,
+  handleCreateGrayReleaseTicket,
   handleDeployGrayRelease,
   handleGetGrayReleaseStatus,
-  handleContinueGrayRelease,
+  handleLinkStgGrayRelease,
 } from './grayrelease.js';
 import {
   getReleaseToolDefinitions,
+  handleGetReleaseManager,
   handleGetUnreleasedVersions,
   handleTransitionToWaitApproval,
-  handleGetReleaseManager,
   handleWaitForComment,
 } from './release.js';
 import { getJabberToolDefinitions, handleSendJabberMessage } from './jabber.js';
 import {
   getWorkflowToolDefinitions,
-  handleRunLibToStgReleaseWorkflow,
-  handleRunStgFullReleaseWorkflow,
+  handleContinueReleaseToCdReadyWorkflow,
+  handleRunReleaseToStgWorkflow,
 } from './workflows.js';
 
 const READ_ONLY_TOOL_NAMES = new Set([
@@ -44,6 +51,8 @@ const READ_ONLY_TOOL_NAMES = new Set([
   'get_release_manager',
   'wait_for_comment',
   'get_grayrelease_status',
+  'wait_build_result',
+  'validate_branch_no_open_pr',
 ]);
 
 function withToolAnnotations(tools) {
@@ -75,9 +84,12 @@ function withToolAnnotations(tools) {
  */
 export function getToolDefinitions() {
   return withToolAnnotations([
+    ...getBuildToolDefinitions(),
+    ...getBranchPRToolDefinitions(),
     ...getLibraryToolDefinitions(),
     ...getCIToolDefinitions(),
     ...getCDToolDefinitions(),
+    ...getDeploymentToolDefinitions(),
     ...getGrayReleaseToolDefinitions(),
     ...getReleaseToolDefinitions(),
     ...getJabberToolDefinitions(),
@@ -175,83 +187,10 @@ export function getToolDefinitions() {
         },
       },
     },
-    {
-      name: 'build_ticket',
-      description:
-        '觸發 Library、CI 或 GrayRelease 上版單的 Jenkins Build。自動處理前置狀態切換與 Jira Automation 等待，不需要手動切換狀態。GrayRelease 僅在使用者明確要求 build/rebuild 時使用此 tool；若使用者要求 GrayRelease deploy、dev deploy 或部署灰度單，必須改用 deploy_grayrelease，不可用此 tool 觸發 rebuild。',
-      inputSchema: {
-        type: 'object',
-        required: ['issueKey'],
-        properties: {
-          issueKey: {
-            type: 'string',
-            description: '要 build 的 issue key，例如 CI、Library 或 GrayRelease 單',
-          },
-          rebuild: {
-            type: 'boolean',
-            description: '(選填) 只有明確要重 build GrayRelease VERIFY 單時才設定 rebuild=true。GrayRelease deploy 請用 deploy_grayrelease。',
-          },
-        },
-      },
-    },
-    {
-      name: 'wait_to_dev',
-      description:
-        'CI 單 build 完成後，自動走完掃描流程切到 Wait To DEV 狀態。流程：Compliance Scan → Upload Scan Report → Accept → Wait To DEV（不執行 Dev Done）',
-      inputSchema: {
-        type: 'object',
-        required: ['issueKey'],
-        properties: {
-          issueKey: {
-            type: 'string',
-            description: 'CI issue key',
-          },
-        },
-      },
-    },
-    {
-      name: 'wait_to_stg',
-      description:
-        'CI 單 build 完成後，自動走完掃描流程切到 Wait To STG 狀態。流程：Compliance Scan → Upload Scan Report → Accept → Dev Done → Wait To STG',
-      inputSchema: {
-        type: 'object',
-        required: ['issueKey'],
-        properties: {
-          issueKey: {
-            type: 'string',
-            description: 'CI issue key',
-          },
-        },
-      },
-    },
-    {
-      name: 'trigger_deployment',
-      description:
-        '在 CD 單的 Deployment sub-task 上依序觸發部署 transitions（To Pretask → To AutoDeploy → Trigger AutoDeploy）。接在 prepare_cd_deployment 之後使用。當使用者說「幫我 Deploy」、「上版」、「deploy」時優先使用這個 tool',
-      inputSchema: {
-        type: 'object',
-        required: ['cdIssueKey', 'environment'],
-        properties: {
-          cdIssueKey: {
-            type: 'string',
-            description: 'CD 單 issue key',
-          },
-          environment: {
-            type: 'string',
-            enum: SUPPORTED_ENVS.cd,
-            description: `部署目標環境：${SUPPORTED_ENVS.cd.join(' / ')}`,
-          },
-          applyForClose: {
-            type: 'boolean',
-            description: '部署觸發後是否同步對 CD 單執行 Apply for close（預設 false）',
-          },
-        },
-      },
-    },
     {
       name: 'prepare_cd_deployment',
       description:
-        '在 CD 單點擊「Prepare to Create Deployment」觸發部署。自動更新環境欄位並執行 transition，啟動 Jenkins 部署流程。',
+        '在 CD 單點擊「Prepare to Create Deployment」觸發部署前置流程；非 DEV 會依環境處理 CD 簽核，核准後自動推進到 Wait Deploy。',
       inputSchema: {
         type: 'object',
         required: ['issueKey', 'environment'],
@@ -333,7 +272,8 @@ export function getToolDefinitions() {
  */
 export async function executeTool(name, args, deps) {
   const { jira, notifier } = deps;
-  const progress = typeof deps.progress === 'function' ? deps.progress : () => {};
+  const progress = typeof deps.progress === 'function' ? deps.progress : () => {
+  };
   const poller = new Poller(jira);
 
   switch (name) {
@@ -347,6 +287,9 @@ export async function executeTool(name, args, deps) {
       }
     }
 
+    case 'validate_branch_no_open_pr':
+      return handleValidateBranchNoOpenPR(args, { jira });
+
     case 'wait_for_approval': {
       const targetStatus = args.targetStatus ?? 'Approved';
 
@@ -388,12 +331,18 @@ export async function executeTool(name, args, deps) {
     case 'create_library_ticket':
       return handleCreateLibraryTicket(args, { jira, notifier });
 
+    case 'build_library':
+      return handleBuildLibrary(args, { jira, notifier, progress });
+
     case 'create_ci_ticket': {
       return handleCreateCITicket(args, { jira, notifier });
     }
 
+    case 'build_ci':
+      return handleBuildCI(args, { jira, notifier, progress });
+
     case 'create_cd_ticket': {
-      return handleCreateCDTicket(args, { jira, notifier });
+      return handleCreateCDTicket(args, { jira, notifier, progress });
     }
 
     case 'create_grayrelease_ticket': {
@@ -409,9 +358,15 @@ export async function executeTool(name, args, deps) {
     case 'deploy_grayrelease':
       return handleDeployGrayRelease(args, { jira, notifier, progress });
 
+    case 'build_grayrelease':
+      return handleBuildGrayRelease(args, { jira, notifier, progress });
+
     case 'get_grayrelease_status':
       return handleGetGrayReleaseStatus(args, { jira });
 
+    case 'wait_build_result':
+      return handleWaitBuildResult(args, { jira, progress });
+
     case 'continue_grayrelease':
       return handleContinueGrayRelease(args, { jira, notifier, progress });
 
@@ -422,7 +377,7 @@ export async function executeTool(name, args, deps) {
       return handleTransitionToWaitApproval(args, { jira, notifier });
 
     case 'get_release_manager':
-      return handleGetReleaseManager(args, {});
+      return handleGetReleaseManager(args);
 
     case 'wait_for_comment':
       return handleWaitForComment(args, { jira, progress });
@@ -430,8 +385,8 @@ export async function executeTool(name, args, deps) {
     case 'send_jabber_message':
       return handleSendJabberMessage(args, {});
 
-    case 'run_stg_full_release':
-      return handleRunStgFullReleaseWorkflow(args, {
+    case 'run_release_to_stg':
+      return handleRunReleaseToStgWorkflow(args, {
         jira,
         notifier,
         executeToolImpl: deps.executeToolImpl ?? executeTool,
@@ -439,8 +394,8 @@ export async function executeTool(name, args, deps) {
         progress,
       });
 
-    case 'run_lib_to_stg_release':
-      return handleRunLibToStgReleaseWorkflow(args, {
+    case 'continue_release_to_cd_ready':
+      return handleContinueReleaseToCdReadyWorkflow(args, {
         jira,
         notifier,
         executeToolImpl: deps.executeToolImpl ?? executeTool,
@@ -459,467 +414,20 @@ export async function executeTool(name, args, deps) {
       }
     }
 
-    case 'build_ticket': {
-      const { issueKey, rebuild = false } = args;
-      const log = [];
-
-      /**
-       * CI Release 完整狀態流程：
-       *   TO DO → (Accept) → Wait for Build → (Build) → Compliance Scan
-       *   → (Upload Scan Report) → Upload Report → (Accept) → Wait To DEV
-       *   → (Dev Done) → Wait To STG → (STG Done) → Wait To UAT
-       *   → (UAT Done) → Wait For Upload → (Upload To Pre-Release)
-       *   → Wait For Upload → (Upload Done) → Wait To PRD/DR
-       *   → (PRD/DR Done)
-       *
-       * Library Release 完整狀態流程：
-       *   TO DO → (Upload Lib Report) → UPLOAD LIB REPORT → (Apply for approval) → Wait Approval → (Approved) → WAIT FOR LIB BUILD → (Build) → Released
-       *   或：TO DO → (Upload Lib Report) → UPLOAD LIB REPORT → Jira Automation 自動觸發 Jenkins（無手動 Build）
-      *
-      * GrayRelease build/rebuild：
-      *   - 一般 build：PLANNING → Accept → WAIT FOR BUILD → GrayRelease Build
-      *   - VERIFY rebuild：只有 args.rebuild=true 時，才允許 Verify fail 回到 PLANNING 後重 build
-      *   - GrayRelease deploy 已拆到 deploy_grayrelease，這裡不可處理部署流程
-       */
-
-      const BUILD_TRANSITIONS = ['Build', 'GrayRelease Build'];
-      const PRE_TRANSITIONS = ['Upload Lib Report', 'Apply for approval', 'Approved', 'Accept'];
-      const GRAYRELEASE_REBUILD_TRANSITIONS = [
-        'Verify fail',
-        'Back to Planning',
-        'To Planning',
-        'Planning',
-      ];
-      const POLL_INTERVAL = 3000; // 3s
-      const MAX_WAIT_MS = 30000; // 最多等 30s（避免 MCP client timeout）
-
-      const findTransition = async (name) => {
-        const list = await jira.getTransitions(issueKey);
-        return list.find((t) => t.name.toLowerCase() === name.toLowerCase());
-      };
-
-      const findAnyTransition = async (names) => {
-        const list = await jira.getTransitions(issueKey);
-        return list.find((t) => names.some((name) => t.name.toLowerCase() === name.toLowerCase()));
-      };
-
-      const waitForTransition = async (name) => {
-        const deadline = Date.now() + MAX_WAIT_MS;
-        while (Date.now() < deadline) {
-          const t = await findTransition(name);
-          if (t) return t;
-          await new Promise((r) => setTimeout(r, POLL_INTERVAL));
-        }
-        return null;
-      };
-
-      const waitForAnyTransition = async (names) => {
-        const deadline = Date.now() + MAX_WAIT_MS;
-        while (Date.now() < deadline) {
-          const t = await findAnyTransition(names);
-          if (t) return t;
-          await new Promise((r) => setTimeout(r, POLL_INTERVAL));
-        }
-        return null;
-      };
-
-      try {
-        // 記錄初始狀態（用於判斷是否有狀態推進）
-        const initIssue = await jira.getIssue(issueKey);
-        const initStatus = initIssue.fields.status.name;
-
-        // Step 1: 確認目前是否已有 Build transition（GrayRelease 名稱為 GrayRelease Build）
-        let buildTrans = await findAnyTransition(BUILD_TRANSITIONS);
-
-        const normalizedInitStatus = initStatus.trim().toUpperCase();
-
-        // GrayRelease 特例：VERIFY 狀態只有明確 rebuild=true 才允許回到可 build 流程。
-        if (!buildTrans && initStatus.toLowerCase() === 'verify') {
-          const resetTrans = await findAnyTransition(GRAYRELEASE_REBUILD_TRANSITIONS);
-          if (resetTrans && !rebuild) {
-            return error(
-              '目前為 VERIFY，build_ticket 不會自動重 build GrayRelease。若要部署請使用 deploy_grayrelease；若要重 build 請呼叫 build_ticket 並設定 rebuild=true。',
-            );
-          }
-          if (resetTrans) {
-            log.push(`目前為 VERIFY，GrayRelease rebuild 先觸發「${resetTrans.name}」回到可 build 流程...`);
-            await jira.transitionById(issueKey, resetTrans.id);
-            await new Promise((r) => setTimeout(r, 2000));
-            buildTrans = await findAnyTransition(BUILD_TRANSITIONS);
-          }
-        }
-
-        if (!buildTrans && ['WAIT APPROVAL', 'WAIT DEPLOY'].includes(normalizedInitStatus)) {
-          const transitions = await jira.getTransitions(issueKey);
-          const grayDeployTransition = transitions.find((t) => (
-            ['approve', 'grayrelease deploy', 'to verify', 'switch execution node']
-              .includes(t.name.toLowerCase())
-          ));
-          if (grayDeployTransition) {
-            return error(
-              `目前狀態 ${initStatus} 屬於 GrayRelease deploy 流程，請使用 deploy_grayrelease，不要用 build_ticket。`,
-            );
-          }
-        }
-
-        // Step 2: 若沒有，逐步觸發前置 transitions
-        if (!buildTrans) {
-          log.push('未找到 Build/GrayRelease Build transition，逐步觸發前置狀態...');
-          let preTriggered = false;
-
-          // 最多嘗試 PRE_TRANSITIONS.length 輪，每輪觸發一個可用的前置 transition
-          for (let step = 0; step < PRE_TRANSITIONS.length; step++) {
-            const transitions = await jira.getTransitions(issueKey);
-            const pre = transitions.find((t) =>
-              PRE_TRANSITIONS.some((name) => t.name.toLowerCase() === name.toLowerCase()),
-            );
-            if (!pre) break;
-
-            log.push(`  [step ${step + 1}] 觸發「${pre.name}」...`);
-            await jira.transitionById(issueKey, pre.id).catch(() => {
-            });
-            preTriggered = true;
-            // 等 Jira 更新狀態
-            await new Promise((r) => setTimeout(r, 2000));
-
-            buildTrans = await findAnyTransition(BUILD_TRANSITIONS);
-            if (buildTrans) {
-              log.push(`  已找到 ${buildTrans.name} transition`);
-              break;
-            }
-          }
-
-          // 若還沒出現，再給 Jira Automation 最多 30s
-          if (!buildTrans) {
-            log.push('  等待 Jira Automation 推進（最多 30s）...');
-            buildTrans = await waitForAnyTransition(BUILD_TRANSITIONS);
-          }
-
-          // 若仍未找到 Build transition，但有觸發前置 transition 且狀態已推進，
-          // 代表此 Library workflow 由 Jira Automation 自動觸發 Jenkins（無需手動 Build）
-          if (!buildTrans && preTriggered) {
-            const currentIssue = await jira.getIssue(issueKey);
-            const currentStatus = currentIssue.fields.status.name;
-            if (currentStatus !== initStatus) {
-              log.push(
-                `⚠️ 無手動 Build transition，但狀態已推進：${initStatus} → ${currentStatus}`,
-              );
-              log.push('  Jenkins Build 可能已由 Jira Automation 自動觸發');
-              await notifier.notify(
-                issueKey,
-                `Library Build 已觸發（Jira Auto）狀態：${initStatus} → ${currentStatus}`,
-              );
-              return ok({ issueKey, status: currentStatus, steps: log, autoTriggered: true });
-            }
-          }
-        }
-
-        if (!buildTrans) {
-          const issue = await jira.getIssue(issueKey);
-          return error(`找不到 Build/GrayRelease Build transition，目前狀態：${issue.fields.status.name}`);
-        }
-
-        // Step 4: 執行 Build
-        log.push(`執行 ${buildTrans.name} transition (id: ${buildTrans.id})...`);
-        await jira.transitionById(issueKey, buildTrans.id);
-
-        const issue = await jira.getIssue(issueKey);
-        const newStatus = issue.fields.status.name;
-        log.push(`✅ ${buildTrans.name} 已觸發，目前狀態：${newStatus}`);
-        await notifier.notify(issueKey, `Jenkins ${buildTrans.name} 已觸發（${newStatus}）`);
-
-        return ok({ issueKey, status: newStatus, steps: log });
-      } catch (err) {
-        return error(`build_ticket 失敗: ${err.message}`);
-      }
-    }
-
-    case 'wait_to_dev': {
-      const { issueKey } = args;
-      const log = [];
-
-      const STEPS = [
-        { transition: 'Upload Scan Report', targetStatus: 'Upload Report' },
-        { transition: 'Accept', targetStatus: 'Wait To DEV' },
-      ];
-      const finalTargetStatus = STEPS.at(-1).targetStatus;
-
-      try {
-        for (const step of STEPS) {
-          const transitions = await jira.getTransitions(issueKey);
-          const t = transitions.find((t) => t.name.toLowerCase() === step.transition.toLowerCase());
-          if (!t) {
-            const issue = await jira.getIssue(issueKey);
-            const current = issue.fields.status.name;
-            if (current.toLowerCase() === step.targetStatus.toLowerCase()) {
-              log.push(`  已是 ${current}，跳過「${step.transition}」`);
-              continue;
-            }
-            if (current.toLowerCase() === finalTargetStatus.toLowerCase()) {
-              log.push(`  已是 ${current}，流程已完成`);
-              break;
-            }
-            return error(`找不到 transition「${step.transition}」，目前狀態：${current}`);
-          }
-          log.push(`執行「${t.name}」→ ${step.targetStatus}`);
-          await jira.transitionById(issueKey, t.id);
-        }
-
-        const issue = await jira.getIssue(issueKey);
-        const finalStatus = issue.fields.status.name;
-        log.push(`✅ 完成，目前狀態：${finalStatus}`);
-        await notifier.notify(issueKey, `已切換至 ${finalStatus}，可進行 DEV 部署`);
-
-        return ok({ issueKey, status: finalStatus, steps: log });
-      } catch (err) {
-        return error(`wait_to_dev 失敗: ${err.message}`);
-      }
-    }
-
-    case 'wait_to_stg': {
-      const { issueKey } = args;
-      const log = [];
-
-      // CI 掃描 → STG 的標準流程步驟
-      // 每個元素：{ transition: '名稱', targetStatus: '到達後的狀態名稱' }
-      const STEPS = [
-        { transition: 'Upload Scan Report', targetStatus: 'Upload Report' },
-        { transition: 'Accept', targetStatus: 'Wait To DEV' },
-        { transition: 'Dev Done', targetStatus: 'Wait To STG' },
-      ];
-
-      try {
-        for (const step of STEPS) {
-          const transitions = await jira.getTransitions(issueKey);
-          const t = transitions.find((t) => t.name.toLowerCase() === step.transition.toLowerCase());
-          if (!t) {
-            // 確認目前狀態是否已達目標，若是則跳過此步
-            const issue = await jira.getIssue(issueKey);
-            const current = issue.fields.status.name;
-            if (current.toLowerCase() === step.targetStatus.toLowerCase()) {
-              log.push(`  已是 ${current}，跳過「${step.transition}」`);
-              continue;
-            }
-            return error(`找不到 transition「${step.transition}」，目前狀態：${current}`);
-          }
-          log.push(`執行「${t.name}」→ ${step.targetStatus}`);
-          await jira.transitionById(issueKey, t.id);
-        }
-
-        const issue = await jira.getIssue(issueKey);
-        const finalStatus = issue.fields.status.name;
-        log.push(`✅ 完成，目前狀態：${finalStatus}`);
-        await notifier.notify(issueKey, `已切換至 ${finalStatus}，可進行 STG 部署`);
-
-        return ok({ issueKey, status: finalStatus, steps: log });
-      } catch (err) {
-        return error(`wait_to_stg 失敗: ${err.message}`);
-      }
-    }
-
-    case 'trigger_deployment': {
-      const { cdIssueKey, environment } = args;
-      const log = [];
-
-      // 判斷環境是否屬於 PRD 群組（prd / dr / prd/dr / prd&dr）
-      const isPrdEnv = (env) =>
-        ['prd', 'dr', 'prd/dr', 'prd&dr'].includes(env.toLowerCase().trim());
-
-      // 查詢同系統最近一筆已完成的部署（CD 或 GrayRelease），回傳 'prd' | 'nonPrd' | null
-      const getLastDeployEnvGroup = async (systemCode, excludeKey) => {
-        const jql_cd = `project = CID AND issuetype = CD AND text ~ "${systemCode}" AND status = Done AND issueKey != "${excludeKey}" ORDER BY updated DESC`;
-        const jql_gr = `project = CID AND issuetype = GrayRelease AND text ~ "${systemCode}" AND status = Done ORDER BY updated DESC`;
+    case 'wait_to_dev':
+      return handleWaitToDev(args, { jira, notifier, progress });
 
-        const [cdResults, grResults] = await Promise.all([
-          jira.searchIssues(jql_cd, ['customfield_13436', 'updated'], 1).catch(() => []),
-          jira.searchIssues(jql_gr, ['updated'], 1).catch(() => []),
-        ]);
+    case 'wait_to_stg':
+      return handleWaitToStg(args, { jira, notifier, progress });
 
-        const cdIssue = cdResults[0] ?? null;
-        const grIssue = grResults[0] ?? null;
+    case 'wait_to_uat':
+      return handleWaitToUat(args, { jira, notifier, progress });
 
-        // 沒有任何記錄 → 保守執行
-        if (!cdIssue && !grIssue) return null;
+    case 'wait_to_prd_dr':
+      return handleWaitToPrdDr(args, { jira, notifier, progress });
 
-        // 若只有其中一筆，直接用那筆
-        // 若兩筆都有，取 updated 較新者
-        let lastIssue = null;
-        let lastIsGray = false;
-
-        if (cdIssue && grIssue) {
-          const cdUpdated = new Date(cdIssue.fields?.updated ?? 0);
-          const grUpdated = new Date(grIssue.fields?.updated ?? 0);
-          if (grUpdated > cdUpdated) {
-            lastIssue = grIssue;
-            lastIsGray = true;
-          } else {
-            lastIssue = cdIssue;
-          }
-        } else if (grIssue) {
-          lastIssue = grIssue;
-          lastIsGray = true;
-        } else {
-          lastIssue = cdIssue;
-        }
-
-        // GrayRelease 永遠是 nonPrd
-        if (lastIsGray) return 'nonPrd';
-
-        // CD：讀 customfield_13436.value 判斷群組
-        const envVal = lastIssue.fields?.customfield_13436?.value ?? '';
-        return isPrdEnv(envVal) ? 'prd' : 'nonPrd';
-      };
-
-      // 依序觸發的 Deployment transitions
-      // conditionalWait: true → 依 needSwitch 決定是否執行並等待 180s
-      const DEPLOY_TRANSITIONS = [
-        { name: 'To Pretask' },
-        { name: 'Swtich Execution Node', conditionalWait: true },
-        { name: 'To AutoDeploy' },
-        { name: 'Trigger AutoDeploy' },
-      ];
-      // 環境字串對照（用於 sub-task summary 比對）
-      const envUpper = environment.toUpperCase().replace('/', '').replace('&', '');
-
-      try {
-        // Step 1: 取得 CD 單的 sub-tasks
-        const subTasks = await jira.getSubTasks(cdIssueKey);
-        if (!subTasks.length) {
-          return error(
-            `CD 單 ${cdIssueKey} 目前沒有 Deployment sub-task，請先執行 prepare_cd_deployment`,
-          );
-        }
-
-        log.push(`找到 ${subTasks.length} 個 sub-task：${subTasks.map((t) => t.key).join(', ')}`);
-
-        // Step 2: 依環境篩選 Deployment sub-task（比對 summary 中的環境標籤）
-        // 支援格式：[STG]、[UAT]、[PRD]、[DR]、[PRD/DR]、PRDDR 等
-        const envVariants = [envUpper, `[${envUpper}]`];
-        let deploymentKey = null;
-
-        for (const st of subTasks) {
-          const summaryUpper = (st.fields?.summary ?? '').toUpperCase().replace(/[\s/]/g, '');
-          if (envVariants.some((v) => summaryUpper.includes(v.replace(/[\s/]/g, '')))) {
-            deploymentKey = st.key;
-            break;
-          }
-        }
-
-        // fallback：若沒有符合環境的，取第一個 sub-task
-        if (!deploymentKey) {
-          deploymentKey = subTasks[0].key;
-          log.push(
-            `  ⚠️ 未找到明確符合環境 ${environment} 的 sub-task，使用第一個：${deploymentKey}`,
-          );
-        } else {
-          log.push(`  對應環境 ${environment} 的 Deployment 單：${deploymentKey}`);
-        }
-
-        // Step 2.5: 判斷是否需要執行 Switch Execution Node
-        // 規則：上次部署環境群組（prd/nonPrd）與本次不同時才需要切換 Ansible instance
-        const thisGroup = isPrdEnv(environment) ? 'prd' : 'nonPrd';
-        let needSwitch = true; // 預設保守執行
-
-        try {
-          const cdFields = await jira.getIssueFields(cdIssueKey, ['customfield_13443']);
-          const systemCode = cdFields?.customfield_13443?.value;
-          if (systemCode) {
-            const lastGroup = await getLastDeployEnvGroup(systemCode, cdIssueKey);
-            if (lastGroup === null) {
-              log.push(`  ⚠️ 找不到 ${systemCode} 的歷史部署記錄，保守執行 Switch Execution Node`);
-            } else if (lastGroup === thisGroup) {
-              needSwitch = false;
-              log.push(`  ✅ 上次部署同為 ${lastGroup} 群組，跳過 Switch Execution Node`);
-            } else {
-              log.push(`  🔄 環境群組變更（${lastGroup} → ${thisGroup}），需執行 Switch Execution Node`);
-            }
-          } else {
-            log.push(`  ⚠️ 無法取得 systemCode，保守執行 Switch Execution Node`);
-          }
-        } catch (e) {
-          log.push(`  ⚠️ 判斷 Switch 條件失敗（${e.message}），保守執行`);
-        }
-
-        // Step 3: 依序執行 transitions
-        for (const step of DEPLOY_TRANSITIONS) {
-          // conditionalWait: 依 needSwitch 決定是否執行
-          if (step.conditionalWait && !needSwitch) {
-            log.push(`  ⏭️ 跳過「${step.name}」（同環境群組，無需切換 Ansible instance）`);
-            continue;
-          }
-
-          const transitions = await jira.getTransitions(deploymentKey);
-          const t = transitions.find((t) => t.name.toLowerCase() === step.name.toLowerCase());
-
-          if (!t) {
-            const issue = await jira.getIssue(deploymentKey);
-            const available = transitions.map((t) => t.name).join(', ');
-            if (['To AutoDeploy', 'Trigger AutoDeploy'].includes(step.name)) {
-              return error(
-                `找不到必要部署 transition「${step.name}」，目前狀態：${issue.fields.status.name}，可用：${available || '無'}`,
-              );
-            }
-            log.push(
-              `  ⚠️ 找不到「${step.name}」（目前狀態：${issue.fields.status.name}，可用：${available || '無'}），跳過`,
-            );
-            continue;
-          }
-
-          log.push(`  執行「${t.name}」...`);
-          await jira.transitionById(deploymentKey, t.id);
-          await new Promise((r) => setTimeout(r, 2000));
-
-          if (step.conditionalWait) {
-            const SWITCH_WAIT_MS = 180_000;
-            const secs = SWITCH_WAIT_MS / 1000;
-            log.push(`  ⏳ 等待 ${secs}s（等待 Ansible instance 切換完成）...`);
-            await notifier.notify(deploymentKey, `⏳ 等待 ${secs}s 後繼續部署...`);
-            await new Promise((r) => setTimeout(r, SWITCH_WAIT_MS));
-            log.push(`  ✅ 等待完成，繼續執行`);
-          }
-        }
-
-        const finalIssue = await jira.getIssue(deploymentKey);
-        const finalStatus = finalIssue.fields.status.name;
-        log.push(`✅ Deployment 已觸发，目前狀態：${finalStatus}`);
-        await notifier.notify(
-          deploymentKey,
-          `Deployment 部署已觸發（環境：${environment.toUpperCase()}，狀態：${finalStatus}）`,
-        );
-
-        // 若 applyForClose=true，同步對 CD 單觸發 Apply for close
-        if (args.applyForClose) {
-          try {
-            const cdTransitions = await jira.getTransitions(cdIssueKey);
-            const closeT = cdTransitions.find((t) => t.name.toLowerCase() === 'apply for close');
-            if (closeT) {
-              log.push(`  對 CD 單 ${cdIssueKey} 執行「${closeT.name}」...`);
-              await jira.transitionById(cdIssueKey, closeT.id);
-              const cdIssue = await jira.getIssue(cdIssueKey);
-              log.push(`  CD 單狀態：${cdIssue.fields.status.name}`);
-              await notifier.notify(cdIssueKey, `CD 單已提交關閉申請（Apply for close）`);
-            } else {
-              const available = cdTransitions.map((t) => t.name).join(', ');
-              log.push(
-                `  ⚠️ CD 單找不到「Apply for close」transition（可用：${available || '無'}）`,
-              );
-            }
-          } catch (e) {
-            log.push(`  ⚠️ Apply for close 失敗：${e.message}`);
-          }
-        }
-
-        return ok({
-          cdIssueKey,
-          deploymentKey,
-          environment,
-          status: finalStatus,
-          steps: log,
-        });
-      } catch (err) {
-        return error(`trigger_deployment 失敗: ${err.message}`);
-      }
-    }
+    case 'trigger_deployment':
+      return handleTriggerDeployment(args, { jira, notifier, progress });
 
     case 'prepare_cd_deployment': {
       const { issueKey } = args;
@@ -941,7 +449,6 @@ export async function executeTool(name, args, deps) {
         'Accept',
         'Prepare to create deployment ticket',
         'Apply for approval',
-        'To Wait Deploy',
       ];
 
       const DEV_SELF_SERVICE_TRANSITIONS = [
@@ -991,6 +498,11 @@ export async function executeTool(name, args, deps) {
           return issue.fields.status.name;
         };
 
+        const getSystemCode = async () => {
+          const fields = await jira.getIssueFields(issueKey, [CD_FIELD_IDS.systemCode]);
+          return fields?.[CD_FIELD_IDS.systemCode]?.value ?? fields?.[CD_FIELD_IDS.systemCode] ?? '';
+        };
+
         const runDevSelfServiceTransitions = async () => {
           if (envCode !== 'dev') return;
           for (const transitionName of DEV_SELF_SERVICE_TRANSITIONS) {
@@ -1044,6 +556,52 @@ export async function executeTool(name, args, deps) {
           }
         }
 
+        const runNonDevApprovalFlow = async () => {
+          if (envCode === 'dev') return false;
+
+          for (let attempts = 0; attempts < 12; attempts++) {
+            const currentStatus = await getCurrentStatus();
+            const normalizedStatus = currentStatus.trim().replace(/\s+/g, ' ').toLowerCase();
+
+            if (normalizedStatus === 'wait deploy') {
+              log.push('✅ CD 單已在 Wait Deploy，簽核前置流程完成');
+              return true;
+            }
+
+            if (normalizedStatus === 'wait approval') {
+              const systemCode = await getSystemCode();
+              log.push(`  處理 CD 簽核流程 (環境: ${envCode})`);
+              const approvalResult = await handleCDApproval(issueKey, envCode, systemCode, {
+                jira,
+                notifier,
+                progress,
+              });
+              log.push(`  ✅ CD 簽核完成 by ${approvalResult.by}`);
+              continue;
+            }
+
+            const transitions = await jira.getTransitions(issueKey);
+            const nextTransitionNames = normalizedStatus === 'wait for send notice email'
+              ? ['To Wait Deploy']
+              : ['Apply for approval', 'To Wait Deploy'];
+            const next = nextTransitionNames
+              .map((transitionName) => transitions.find(
+                (transition) => transition.name.toLowerCase() === transitionName.toLowerCase(),
+              ))
+              .find(Boolean);
+
+            if (!next) {
+              return false;
+            }
+
+            log.push(`  觸發「${next.name}」...`);
+            await jira.transitionById(issueKey, next.id);
+            await new Promise((r) => setTimeout(r, 2000));
+          }
+
+          throw new Error('CD 簽核前置流程超過最大嘗試次數');
+        };
+
         if (!deployTrans && envCode === 'dev') {
           await runDevSelfServiceTransitions();
           const currentStatus = await getCurrentStatus();
@@ -1091,6 +649,7 @@ export async function executeTool(name, args, deps) {
         log.push(`✅ 部署已觸发，目前狀態：${newStatus}`);
 
         await runDevSelfServiceTransitions();
+        await runNonDevApprovalFlow();
 
         const finalIssue = await jira.getIssue(issueKey);
         const finalStatus = finalIssue.fields.status.name;
@@ -1244,21 +803,25 @@ export async function executeTool(name, args, deps) {
       const describeStatus = (issueType, status) => {
         const s = status.toLowerCase();
         if (issueType === 'Library') {
-          if (s === 'to do') return { emoji: '⏳', desc: '尚未開始', next: `執行 build_ticket` };
-          if (s === 'upload lib report') return { emoji: '⏳', desc: '等待上傳 Lib Report', next: `執行 build_ticket` };
+          if (s === 'to do') return { emoji: '⏳', desc: '尚未開始', next: `執行 build_library` };
+          if (s === 'upload lib report') return { emoji: '⏳', desc: '等待上傳 Lib Report', next: `執行 build_library` };
           if (s === 'wait approval') return { emoji: '⏳', desc: '等待主管核准', next: `wait_for_approval` };
-          if (s === 'wait for lib build') return { emoji: '🔨', desc: '等待 Jenkins Build', next: `執行 build_ticket` };
+          if (s === 'wait for lib build') return { emoji: '🔨', desc: '等待 Jenkins Build', next: `執行 build_library` };
           if (s === 'released') return { emoji: '✅', desc: '已完成', next: '可開 CI' };
           if (s === 'cancelled') return { emoji: '❌', desc: '已取消', next: null };
           return { emoji: '🔄', desc: status, next: null };
         }
         if (issueType === 'CI') {
-          if (s === 'to do') return { emoji: '⏳', desc: '尚未開始', next: '執行 build_ticket' };
-          if (s === 'wait for build') return { emoji: '⏳', desc: '等待 Jenkins Build', next: '執行 build_ticket' };
+          if (s === 'to do') return { emoji: '⏳', desc: '尚未開始', next: '執行 build_ci' };
+          if (s === 'wait for build') return { emoji: '⏳', desc: '等待 Jenkins Build', next: '執行 build_ci' };
           if (s === 'compliance scan') return { emoji: '🔍', desc: '掃描中', next: '執行 wait_to_stg' };
           if (s === 'upload report') return { emoji: '📋', desc: '上傳掃描報告', next: '執行 wait_to_stg' };
           if (s === 'wait to dev') return { emoji: '🔄', desc: 'Build 完成，等待 DEV', next: '執行 wait_to_stg' };
-          if (s === 'wait to stg') return { emoji: '✅', desc: 'Build 完成，等待 STG 部署', next: '可建 CD(STG) 並執行 prepare_cd_deployment' };
+          if (s === 'wait to stg') return {
+            emoji: '✅',
+            desc: 'Build 完成，等待 STG 部署',
+            next: '可建 CD(STG) 並執行 prepare_cd_deployment'
+          };
           if (s === 'wait to uat') return { emoji: '✅', desc: 'STG 完成，等待 UAT', next: '可建 CD(UAT)' };
           if (s === 'wait for upload') return { emoji: '📦', desc: '等待上傳 Pre-Release', next: null };
           if (s === 'wait to prd/dr') return { emoji: '✅', desc: 'UAT 完成，等待 PRD/DR', next: '可建 CD(PRD/DR)' };
@@ -1268,7 +831,11 @@ export async function executeTool(name, args, deps) {
         }
         if (issueType === 'CD') {
           if (s === 'to do') return { emoji: '⏳', desc: '尚未開始', next: '執行 prepare_cd_deployment' };
-          if (s === 'wait for send notice email') return { emoji: '⏳', desc: '等待通知信', next: '執行 prepare_cd_deployment' };
+          if (s === 'wait for send notice email') return {
+            emoji: '⏳',
+            desc: '等待通知信',
+            next: '執行 prepare_cd_deployment'
+          };
           if (s === 'prepare for deploy') return { emoji: '⏳', desc: '部署單建立中', next: null };
           if (s === 'wait approval') return { emoji: '⏳', desc: '等待主管核准', next: 'wait_for_approval' };
           if (s === 'wait deploy') return { emoji: '✅', desc: '已核准，等待部署', next: '執行 trigger_deployment' };
@@ -1295,7 +862,13 @@ export async function executeTool(name, args, deps) {
         const ciIssue = ciIssues[0];
         const ciStatus = describeStatus('CI', ciIssue.fields.status.name);
         const ciVersion = ciIssue.fields.customfield_13438
-          ? (() => { try { return JSON.stringify(JSON.parse(ciIssue.fields.customfield_13438)); } catch { return ciIssue.fields.customfield_13438; } })()
+          ? (() => {
+            try {
+              return JSON.stringify(JSON.parse(ciIssue.fields.customfield_13438));
+            } catch {
+              return ciIssue.fields.customfield_13438;
+            }
+          })()
           : '（尚無版本）';
 
         // Step 2: 從 CI issuelinks 找 Library 單（Relates），並平行查 gitBranch
@@ -1364,9 +937,6 @@ export async function executeTool(name, args, deps) {
       }
     }
 
-    case 'get_next_lib_version':
-      return handleGetNextLibVersion(args, { jira });
-
     case 'get_next_ci_version':
       return handleGetNextCIVersion(args, { jira });