@jira-deploy/core 1.0.2 → 1.0.4

package/tools/index.js

@@ -1,10 +1,10 @@
-import {Poller} from '../poller.js';
+import { Poller } from '../poller.js';
 import {
   getLibraryToolDefinitions,
   handleCreateLibraryTicket,
   handleGetNextLibVersion,
 } from './library.js';
-import {getCIToolDefinitions, handleCreateCITicket, handleGetNextCIVersion} from './ci.js';
+import { getCIToolDefinitions, handleCreateCITicket, handleGetNextCIVersion } from './ci.js';
 import {
   SYSTEM_CODES,
   ENV_CODES,
@@ -12,11 +12,15 @@ import {
   SUPPORTED_ENVS,
   resolveAccountId,
 } from '../constants/index.js';
-import {getCDToolDefinitions, handleCreateCDTicket} from './cd.js';
+import { getCDToolDefinitions, handleCreateCDTicket } from './cd.js';
 import {
   getGrayReleaseToolDefinitions,
   handleCreateGrayReleaseTicket,
   handleLinkStgGrayRelease,
+  handleAutoGrayRelease,
+  handleDeployGrayRelease,
+  handleGetGrayReleaseStatus,
+  handleContinueGrayRelease,
 } from './grayrelease.js';
 import {
   getReleaseToolDefinitions,
@@ -25,7 +29,7 @@ import {
   handleGetReleaseManager,
   handleWaitForComment,
 } from './release.js';
-import {getJabberToolDefinitions, handleSendJabberMessage} from './jabber.js';
+import { getJabberToolDefinitions, handleSendJabberMessage } from './jabber.js';
 import {
   getWorkflowToolDefinitions,
   handleRunLibToStgReleaseWorkflow,
@@ -39,6 +43,7 @@ const READ_ONLY_TOOL_NAMES = new Set([
   'get_unreleased_versions',
   'get_release_manager',
   'wait_for_comment',
+  'get_grayrelease_status',
 ]);
 
 function withToolAnnotations(tools) {
@@ -84,7 +89,7 @@ export function getToolDefinitions() {
         type: 'object',
         required: ['issueKey', 'transitionName'],
         properties: {
-          issueKey: {type: 'string', description: '例如 OPS-123'},
+          issueKey: { type: 'string', description: '例如 OPS-123' },
           transitionName: {
             type: 'string',
             description: '狀態名稱，例如 "Pending Approval"、"Approved"、"In Progress"、"Done"',
@@ -100,7 +105,7 @@ export function getToolDefinitions() {
         type: 'object',
         required: ['issueKey'],
         properties: {
-          issueKey: {type: 'string'},
+          issueKey: { type: 'string' },
           targetStatus: {
             type: 'string',
             default: 'Approved',
@@ -124,7 +129,7 @@ export function getToolDefinitions() {
         type: 'object',
         required: ['issueKey'],
         properties: {
-          issueKey: {type: 'string'},
+          issueKey: { type: 'string' },
         },
       },
     },
@@ -135,8 +140,8 @@ export function getToolDefinitions() {
         type: 'object',
         required: ['issueKey', 'message'],
         properties: {
-          issueKey: {type: 'string'},
-          message: {type: 'string', description: '留言內容'},
+          issueKey: { type: 'string' },
+          message: { type: 'string', description: '留言內容' },
         },
       },
     },
@@ -147,7 +152,7 @@ export function getToolDefinitions() {
         type: 'object',
         required: ['issueKey'],
         properties: {
-          issueKey: {type: 'string'},
+          issueKey: { type: 'string' },
         },
       },
     },
@@ -159,8 +164,8 @@ export function getToolDefinitions() {
         type: 'object',
         required: ['inwardKey', 'outwardKey'],
         properties: {
-          inwardKey: {type: 'string', description: '被包含方 issue key，例如 CD 單 CID-1669'},
-          outwardKey: {type: 'string', description: '包含方 issue key，例如 CI 單 CID-1668'},
+          inwardKey: { type: 'string', description: '被包含方 issue key，例如 CD 單 CID-1669' },
+          outwardKey: { type: 'string', description: '包含方 issue key，例如 CI 單 CID-1668' },
           linkType: {
             type: 'string',
             description:
@@ -173,14 +178,33 @@ export function getToolDefinitions() {
     {
       name: 'build_ticket',
       description:
-        '觸發 Library 或 CI 上版單的 Jenkins Build。自動處理前置狀態切換與 Jira Automation 等待，不需要手動切換狀態。',
+        '觸發 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，例如 CID-1668',
+            description: '要 build 的 issue key，例如 CI/Library 單 CID-1668，或可重複 rebuild 的 GrayRelease 單 CID-822',
+          },
+          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，例如 CID-1668',
           },
         },
       },
@@ -308,7 +332,8 @@ export function getToolDefinitions() {
  * 執行 tool，回傳 { content: [{ type: 'text', text }] }
  */
 export async function executeTool(name, args, deps) {
-  const {jira, notifier} = deps;
+  const { jira, notifier } = deps;
+  const progress = typeof deps.progress === 'function' ? deps.progress : () => {};
   const poller = new Poller(jira);
 
   switch (name) {
@@ -330,6 +355,7 @@ export async function executeTool(name, args, deps) {
       const result = await poller.waitForStatus(args.issueKey, targetStatus, {
         intervalMs: args.pollIntervalMs,
         timeoutMs: args.timeoutMs,
+        onProgress: progress,
       });
 
       await notifier.notify(
@@ -351,43 +377,55 @@ export async function executeTool(name, args, deps) {
 
     case 'add_deploy_comment': {
       await notifier.notify(args.issueKey, args.message);
-      return ok({issueKey: args.issueKey, commented: true});
+      return ok({ issueKey: args.issueKey, commented: true });
     }
 
     case 'list_transitions': {
       const transitions = await jira.getTransitions(args.issueKey);
-      return ok(transitions.map((t) => ({id: t.id, name: t.name, to: t.to.name})));
+      return ok(transitions.map((t) => ({ id: t.id, name: t.name, to: t.to.name })));
     }
 
     case 'create_library_ticket':
-      return handleCreateLibraryTicket(args, {jira, notifier});
+      return handleCreateLibraryTicket(args, { jira, notifier });
 
     case 'create_ci_ticket': {
-      return handleCreateCITicket(args, {jira, notifier});
+      return handleCreateCITicket(args, { jira, notifier });
     }
 
     case 'create_cd_ticket': {
-      return handleCreateCDTicket(args, {jira, notifier});
+      return handleCreateCDTicket(args, { jira, notifier });
     }
 
     case 'create_grayrelease_ticket': {
-      return handleCreateGrayReleaseTicket(args, {jira, notifier});
+      return handleCreateGrayReleaseTicket(args, { jira, notifier, progress });
     }
 
     case 'link_stg_grayrelease':
-      return handleLinkStgGrayRelease(args, {jira, notifier});
+      return handleLinkStgGrayRelease(args, { jira, notifier, progress });
+
+    case 'auto_grayrelease':
+      return handleAutoGrayRelease(args, { jira, notifier, progress });
+
+    case 'deploy_grayrelease':
+      return handleDeployGrayRelease(args, { jira, notifier, progress });
+
+    case 'get_grayrelease_status':
+      return handleGetGrayReleaseStatus(args, { jira });
+
+    case 'continue_grayrelease':
+      return handleContinueGrayRelease(args, { jira, notifier, progress });
 
     case 'get_unreleased_versions':
-      return handleGetUnreleasedVersions(args, {jira});
+      return handleGetUnreleasedVersions(args, { jira });
 
     case 'transition_to_wait_approval':
-      return handleTransitionToWaitApproval(args, {jira, notifier});
+      return handleTransitionToWaitApproval(args, { jira, notifier });
 
     case 'get_release_manager':
       return handleGetReleaseManager(args, {});
 
     case 'wait_for_comment':
-      return handleWaitForComment(args, {jira});
+      return handleWaitForComment(args, { jira, progress });
 
     case 'send_jabber_message':
       return handleSendJabberMessage(args, {});
@@ -398,6 +436,7 @@ export async function executeTool(name, args, deps) {
         notifier,
         executeToolImpl: deps.executeToolImpl ?? executeTool,
         workflowWaitOptions: deps.workflowWaitOptions,
+        progress,
       });
 
     case 'run_lib_to_stg_release':
@@ -406,6 +445,7 @@ export async function executeTool(name, args, deps) {
         notifier,
         executeToolImpl: deps.executeToolImpl ?? executeTool,
         workflowWaitOptions: deps.workflowWaitOptions,
+        progress,
       });
 
     case 'link_issues': {
@@ -420,7 +460,7 @@ export async function executeTool(name, args, deps) {
     }
 
     case 'build_ticket': {
-      const {issueKey} = args;
+      const { issueKey, rebuild = false } = args;
       const log = [];
 
       /**
@@ -435,11 +475,21 @@ export async function executeTool(name, args, deps) {
        * 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，這裡不可處理部署流程
        */
 
-        // 前置 transitions：若 "Build" 尚未出現，先觸發這些讓 Jira Automation 推進
-        // 'Upload Lib Report'：Library 票從 TO DO 的第一步（對應 UI 的 Upload Library Report）
+      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）
 
@@ -448,6 +498,11 @@ export async function executeTool(name, args, deps) {
         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) {
@@ -458,17 +513,58 @@ export async function executeTool(name, args, deps) {
         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
-        let buildTrans = await findTransition('Build');
+        // 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 transition，逐步觸發前置狀態...');
+          log.push('未找到 Build/GrayRelease Build transition，逐步觸發前置狀態...');
           let preTriggered = false;
 
           // 最多嘗試 PRE_TRANSITIONS.length 輪，每輪觸發一個可用的前置 transition
@@ -486,9 +582,9 @@ export async function executeTool(name, args, deps) {
             // 等 Jira 更新狀態
             await new Promise((r) => setTimeout(r, 2000));
 
-            buildTrans = await findTransition('Build');
+            buildTrans = await findAnyTransition(BUILD_TRANSITIONS);
             if (buildTrans) {
-              log.push(`  已找到 Build transition`);
+              log.push(`  已找到 ${buildTrans.name} transition`);
               break;
             }
           }
@@ -496,7 +592,7 @@ export async function executeTool(name, args, deps) {
           // 若還沒出現，再給 Jira Automation 最多 30s
           if (!buildTrans) {
             log.push('  等待 Jira Automation 推進（最多 30s）...');
-            buildTrans = await waitForTransition('Build');
+            buildTrans = await waitForAnyTransition(BUILD_TRANSITIONS);
           }
 
           // 若仍未找到 Build transition，但有觸發前置 transition 且狀態已推進，
@@ -513,41 +609,83 @@ export async function executeTool(name, args, deps) {
                 issueKey,
                 `Library Build 已觸發（Jira Auto）狀態：${initStatus} → ${currentStatus}`,
               );
-              return ok({issueKey, status: currentStatus, steps: log, autoTriggered: true});
+              return ok({ issueKey, status: currentStatus, steps: log, autoTriggered: true });
             }
           }
         }
 
         if (!buildTrans) {
           const issue = await jira.getIssue(issueKey);
-          return error(`找不到 Build transition，目前狀態：${issue.fields.status.name}`);
+          return error(`找不到 Build/GrayRelease Build transition，目前狀態：${issue.fields.status.name}`);
         }
 
         // Step 4: 執行 Build
-        log.push(`執行 Build transition (id: ${buildTrans.id})...`);
+        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(`✅ Build 已觸發，目前狀態：${newStatus}`);
-        await notifier.notify(issueKey, `Jenkins Build 已觸發（${newStatus}）`);
+        log.push(`✅ ${buildTrans.name} 已觸發，目前狀態：${newStatus}`);
+        await notifier.notify(issueKey, `Jenkins ${buildTrans.name} 已觸發（${newStatus}）`);
 
-        return ok({issueKey, status: newStatus, steps: log});
+        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 { 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'},
+        { transition: 'Upload Scan Report', targetStatus: 'Upload Report' },
+        { transition: 'Accept', targetStatus: 'Wait To DEV' },
+        { transition: 'Dev Done', targetStatus: 'Wait To STG' },
       ];
 
       try {
@@ -573,14 +711,14 @@ export async function executeTool(name, args, deps) {
         log.push(`✅ 完成，目前狀態：${finalStatus}`);
         await notifier.notify(issueKey, `已切換至 ${finalStatus}，可進行 STG 部署`);
 
-        return ok({issueKey, status: finalStatus, steps: log});
+        return ok({ issueKey, status: finalStatus, steps: log });
       } catch (err) {
         return error(`wait_to_stg 失敗: ${err.message}`);
       }
     }
 
     case 'trigger_deployment': {
-      const {cdIssueKey, environment} = args;
+      const { cdIssueKey, environment } = args;
       const log = [];
 
       // 判斷環境是否屬於 PRD 群組（prd / dr / prd/dr / prd&dr）
@@ -635,10 +773,10 @@ export async function executeTool(name, args, deps) {
       // 依序觸發的 Deployment transitions
       // conditionalWait: true → 依 needSwitch 決定是否執行並等待 180s
       const DEPLOY_TRANSITIONS = [
-        {name: 'To Pretask'},
-        {name: 'Swtich Execution Node', conditionalWait: true},
-        {name: 'To AutoDeploy'},
-        {name: 'Trigger AutoDeploy'},
+        { name: 'To Pretask' },
+        { name: 'Swtich Execution Node', conditionalWait: true },
+        { name: 'To AutoDeploy' },
+        { name: 'Trigger AutoDeploy' },
       ];
       // 環境字串對照（用於 sub-task summary 比對）
       const envUpper = environment.toUpperCase().replace('/', '').replace('&', '');
@@ -784,25 +922,34 @@ export async function executeTool(name, args, deps) {
     }
 
     case 'prepare_cd_deployment': {
-      const {issueKey} = args;
+      const { issueKey } = args;
       // 正規化環境名稱（prd&dr → prd/dr）
       const envCode = args.environment.toLowerCase().replace('&', '/');
       const log = [];
 
       // CD 部署前置 transitions（依序嘗試，直到找到部署 transition 或完成申請流程）
-      // STG 完整流程：
+      // DEV 流程會跳過通知主管簽核，建立 deployment 後直接嘗試自助 Approved / To Wait Deploy。
+      // STG/UAT/PRD 完整流程：
       //   TO DO → (Accept) → Wait For Send Notice Email
       //         → (Prepare to create deployment ticket) → Prepare For Deploy  ← 建立 Deployment sub-task
       //         → (Apply for approval) → Wait Approval  ← 等 Reviewer 核准
       //         → Wait Deploy  ← 核准後自動切換，再呼叫 trigger_deployment
       // ⚠️ 不加 'Approved'：Approved 需要其他主管才能執行
-      const CD_PRE_TRANSITIONS = [
+      const CD_PRE_TRANSITIONS = envCode === 'dev' ? [
+        'Accept',
+      ] : [
         'Accept',
         'Prepare to create deployment ticket',
         'Apply for approval',
         'To Wait Deploy',
       ];
 
+      const DEV_SELF_SERVICE_TRANSITIONS = [
+        'Apply for approval',
+        'Approved',
+        'To Wait Deploy',
+      ];
+
       // 部署 transition 名稱（支援多種命名）
       const DEPLOY_TRANSITION_NAMES = [
         'Prepare to create deployment ticket', // 實際 Jira transition 名稱
@@ -822,7 +969,7 @@ export async function executeTool(name, args, deps) {
         // Step 2: 更新 CD 單的環境欄位（customfield_13436）
         if (CD_FIELD_IDS.env && ENV_CODES[envCode]) {
           await jira.updateIssue(issueKey, {
-            [CD_FIELD_IDS.env]: {id: ENV_CODES[envCode]},
+            [CD_FIELD_IDS.env]: { id: ENV_CODES[envCode] },
           });
           log.push(`✅ 環境欄位更新為 ${envCode.toUpperCase()}`);
         }
@@ -839,6 +986,45 @@ export async function executeTool(name, args, deps) {
 
         let deployTrans = await findDeployTrans();
 
+        const getCurrentStatus = async () => {
+          const issue = await jira.getIssue(issueKey);
+          return issue.fields.status.name;
+        };
+
+        const runDevSelfServiceTransitions = async () => {
+          if (envCode !== 'dev') return;
+          for (const transitionName of DEV_SELF_SERVICE_TRANSITIONS) {
+            const currentStatus = await getCurrentStatus();
+            if (currentStatus.toLowerCase() === 'wait deploy') {
+              log.push('  DEV 自助流程已到 Wait Deploy，停止續跑');
+              break;
+            }
+
+            const transitions = await jira.getTransitions(issueKey);
+            const next = transitions.find(
+              (t) => t.name.toLowerCase() === transitionName.toLowerCase(),
+            );
+            if (!next) continue;
+
+            log.push(`  DEV 自助流程觸發「${next.name}」...`);
+            await jira.transitionById(issueKey, next.id);
+            await new Promise((r) => setTimeout(r, 2000));
+          }
+        };
+
+        if (envCode === 'dev') {
+          const currentStatus = await getCurrentStatus();
+          if (currentStatus.toLowerCase() === 'wait deploy') {
+            log.push('✅ CD 單已在 Wait Deploy，無需重複 prepare');
+            return ok({
+              issueKey,
+              environment: envCode,
+              status: currentStatus,
+              steps: log,
+            });
+          }
+        }
+
         if (!deployTrans) {
           log.push('未找到部署 transition，逐步觸發前置狀態...');
           for (const preName of CD_PRE_TRANSITIONS) {
@@ -858,6 +1044,25 @@ export async function executeTool(name, args, deps) {
           }
         }
 
+        if (!deployTrans && envCode === 'dev') {
+          await runDevSelfServiceTransitions();
+          const currentStatus = await getCurrentStatus();
+          if (currentStatus.toLowerCase() === 'wait deploy') {
+            log.push(`✅ DEV 自助流程完成，目前狀態：${currentStatus}`);
+            await notifier.notify(
+              issueKey,
+              `CD 部署已觸發（環境: ${envCode.toUpperCase()}，狀態: ${currentStatus}）`,
+            );
+            return ok({
+              issueKey,
+              environment: envCode,
+              status: currentStatus,
+              steps: log,
+            });
+          }
+          deployTrans = await findDeployTrans();
+        }
+
         if (!deployTrans) {
           const issue = await jira.getIssue(issueKey);
           const transitions = await jira.getTransitions(issueKey);
@@ -871,21 +1076,37 @@ export async function executeTool(name, args, deps) {
 
         // Step 4: 觸发部署 transition
         log.push(`執行「${deployTrans.name}」transition（id: ${deployTrans.id}）...`);
-        await jira.transitionById(issueKey, deployTrans.id);
+        try {
+          await jira.transitionById(issueKey, deployTrans.id);
+        } catch (err) {
+          if (envCode === 'dev' && err.message.includes('Already create deployment ticket')) {
+            log.push('  Deployment ticket 已存在，繼續 DEV approval 續跑流程');
+          } else {
+            throw err;
+          }
+        }
 
         const issue = await jira.getIssue(issueKey);
         const newStatus = issue.fields.status.name;
         log.push(`✅ 部署已觸发，目前狀態：${newStatus}`);
 
+        await runDevSelfServiceTransitions();
+
+        const finalIssue = await jira.getIssue(issueKey);
+        const finalStatus = finalIssue.fields.status.name;
+        if (finalStatus !== newStatus) {
+          log.push(`✅ DEV 自助流程完成，目前狀態：${finalStatus}`);
+        }
+
         await notifier.notify(
           issueKey,
-          `CD 部署已觸發（環境: ${envCode.toUpperCase()}，狀態: ${newStatus}）`,
+          `CD 部署已觸發（環境: ${envCode.toUpperCase()}，狀態: ${finalStatus}）`,
         );
 
         return ok({
           issueKey,
           environment: envCode,
-          status: newStatus,
+          status: finalStatus,
           steps: log,
         });
       } catch (err) {
@@ -894,8 +1115,8 @@ export async function executeTool(name, args, deps) {
     }
 
     case 'update_assignee': {
-      const {issueKey} = args;
-      let {accountId, displayName} = args;
+      const { issueKey } = args;
+      let { accountId, displayName } = args;
 
       // 若只提供 displayName（或名稱），嘗試從 USER_MAP 查找 accountId
       if (!accountId && displayName) {
@@ -916,7 +1137,7 @@ export async function executeTool(name, args, deps) {
         await jira.updateAssignee(issueKey, accountId);
         return ok({
           issueKey,
-          assignee: {accountId, displayName: displayName ?? accountId},
+          assignee: { accountId, displayName: displayName ?? accountId },
           message: `✅ ${issueKey} Assignee 已更新為 ${displayName ? `${displayName}(${accountId})` : accountId}`,
         });
       } catch (err) {
@@ -925,7 +1146,7 @@ export async function executeTool(name, args, deps) {
     }
 
     case 'cancel_release': {
-      const {systemCode} = args;
+      const { systemCode } = args;
       let ciIssueKey = args.ciIssueKey ?? null;
 
       try {
@@ -1017,46 +1238,46 @@ export async function executeTool(name, args, deps) {
     }
 
     case 'get_release_status': {
-      const {systemCode} = args;
+      const { systemCode } = args;
 
       // 狀態 → 說明 + 建議下一步
       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 === '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 === 'released') return {emoji: '✅', desc: '已完成', next: '可開 CI'};
-          if (s === 'cancelled') return {emoji: '❌', desc: '已取消', next: null};
-          return {emoji: '🔄', desc: status, next: null};
+          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 === '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 === '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 === '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 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)'};
-          if (s === 'done') return {emoji: '✅', desc: '已完成', next: null};
-          if (s === 'cancelled') return {emoji: '❌', desc: '已取消', next: null};
-          return {emoji: '🔄', desc: status, next: null};
+          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 === '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 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)' };
+          if (s === 'done') return { emoji: '✅', desc: '已完成', next: null };
+          if (s === 'cancelled') return { emoji: '❌', desc: '已取消', next: null };
+          return { emoji: '🔄', desc: status, next: null };
         }
         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 === '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'};
-          if (s === 'deploying') return {emoji: '🚀', desc: '部署中', next: null};
-          if (s === 'done') return {emoji: '✅', desc: '部署完成', next: null};
-          if (s === 'cancelled') return {emoji: '❌', desc: '已取消', next: null};
-          return {emoji: '🔄', desc: status, next: null};
+          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 === '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' };
+          if (s === 'deploying') return { emoji: '🚀', desc: '部署中', next: null };
+          if (s === 'done') return { emoji: '✅', desc: '部署完成', next: null };
+          if (s === 'cancelled') return { emoji: '❌', desc: '已取消', next: null };
+          return { emoji: '🔄', desc: status, next: null };
         }
-        return {emoji: '🔄', desc: status, next: null};
+        return { emoji: '🔄', desc: status, next: null };
       };
 
       try {
@@ -1096,9 +1317,8 @@ export async function executeTool(name, args, deps) {
           const linked = l.inwardIssue ?? l.outwardIssue;
           const d = describeStatus('Library', linked.fields.status?.name ?? '');
           const gitBranch = libraryExtraFields[i]?.customfield_13431 ?? '（無）';
-          return `  ${linked.key}  [${linked.fields.status?.name}] ${d.emoji} ${d.desc}${
-            d.next ? ` → ${d.next}(${linked.key})` : ''
-          }\n    branch: ${gitBranch}\n    ${linked.fields.summary ?? ''}`;
+          return `  ${linked.key}  [${linked.fields.status?.name}] ${d.emoji} ${d.desc}${d.next ? ` → ${d.next}(${linked.key})` : ''
+            }\n    branch: ${gitBranch}\n    ${linked.fields.summary ?? ''}`;
         });
 
         // Step 3: 查近期 CD 單（取 5 筆）
@@ -1117,9 +1337,8 @@ export async function executeTool(name, args, deps) {
 
         const cdLines = Object.entries(cdByEnv).map(([env, cd]) => {
           const d = describeStatus('CD', cd.fields.status.name);
-          return `  ${env.toUpperCase()}：${cd.key} [${cd.fields.status.name}] ${d.emoji} ${d.desc}${
-            d.next ? ` → ${d.next}` : ''
-          }`;
+          return `  ${env.toUpperCase()}：${cd.key} [${cd.fields.status.name}] ${d.emoji} ${d.desc}${d.next ? ` → ${d.next}` : ''
+            }`;
         });
 
         // Step 4: 組合輸出
@@ -1128,8 +1347,7 @@ export async function executeTool(name, args, deps) {
           `📦 ${systemCode} Release 現況（${today}）`,
           '',
           '── CI ──────────────────────────────',
-          `  ${ciIssue.key}  [${ciIssue.fields.status.name}] ${ciStatus.emoji} ${ciStatus.desc}${
-            ciStatus.next ? ` → ${ciStatus.next}` : ''
+          `  ${ciIssue.key}  [${ciIssue.fields.status.name}] ${ciStatus.emoji} ${ciStatus.desc}${ciStatus.next ? ` → ${ciStatus.next}` : ''
           }`,
           `  版本：${ciVersion}`,
           '',
@@ -1140,17 +1358,17 @@ export async function executeTool(name, args, deps) {
           ...(cdLines.length ? cdLines : ['  （尚無 CD 單）']),
         ];
 
-        return ok({summary: lines.join('\n'), ci: ciIssue.key, version: ciVersion});
+        return ok({ summary: lines.join('\n'), ci: ciIssue.key, version: ciVersion });
       } catch (err) {
         return error(`get_release_status 失敗: ${err.message}`);
       }
     }
 
     case 'get_next_lib_version':
-      return handleGetNextLibVersion(args, {jira});
+      return handleGetNextLibVersion(args, { jira });
 
     case 'get_next_ci_version':
-      return handleGetNextCIVersion(args, {jira});
+      return handleGetNextCIVersion(args, { jira });
 
     default:
       throw new Error(`Unknown tool: ${name}`);
@@ -1159,13 +1377,13 @@ export async function executeTool(name, args, deps) {
 
 function ok(data) {
   return {
-    content: [{type: 'text', text: JSON.stringify(data, null, 2)}],
+    content: [{ type: 'text', text: JSON.stringify(data, null, 2) }],
   };
 }
 
 function error(msg) {
   return {
-    content: [{type: 'text', text: `❌ 錯誤: ${msg}`}],
+    content: [{ type: 'text', text: `❌ 錯誤: ${msg}` }],
     isError: true,
   };
 }