@jira-deploy/core 1.0.15 → 1.0.16

package/tools/grayrelease.js

@@ -2,33 +2,48 @@
  * Gray Release 相關 tools
  *   - create_grayrelease_ticket
  *   - link_stg_grayrelease
+ *   - build_grayrelease
  *   - auto_grayrelease
  *   - deploy_grayrelease
  *   - get_grayrelease_status
- *   - wait_build_result
  *   - continue_grayrelease
  */
 import {
-  SYSTEM_CODES,
-  getDeployConfig,
-  ENV_CODES,
-  SUPPORTED_ENVS,
   DEPT_CODES,
+  ENV_CODES,
+  FIELD_OPTIONS,
+  getDeployConfig,
+  GRAY_RELEASE_FIELD_IDS,
   GRAY_RELEASE_MODULE_IDS,
   ISSUE_TYPE_IDS,
+  JIRA_DEFAULTS,
   JIRA_PROJECT_ID,
-  GRAY_RELEASE_FIELD_IDS,
-  SYSTEM_TO_DEPT_MAP,
-  FIELD_OPTIONS,
-  SIGN_VALUES,
   NOTES_TEMPLATES,
-  JIRA_DEFAULTS,
   resolveAccountId,
+  SHARED_FIELD_IDS,
+  SIGN_VALUES,
+  SUPPORTED_ENVS,
+  SYSTEM_CODES,
+  SYSTEM_TO_DEPT_MAP,
 } from '../constants/index.js';
-import { error, ok, today, getServerList } from './helpers.js';
+import {
+  error,
+  getPollIntervalMs,
+  getPollTimeoutMs,
+  getServerList,
+  isFailingResult,
+  isPassingResult,
+  ok,
+  today,
+} from './helpers.js';
+import { assertNoOpenPRBeforeCreate } from './branch-prs.js';
 import { Poller } from '../poller.js';
 import { handleGetReleaseManager, handleWaitForComment } from './release.js';
 import { handleSendJabberMessage } from './jabber.js';
+import {
+  needSwitchExecutionNode as shouldSwitchExecutionNode,
+  waitForSwitchExecutionNode as waitForSharedSwitchExecutionNode,
+} from './deployment-helpers.js';
 
 // ── Flow Definition ──────────────────────────────────────────────
 
@@ -40,7 +55,7 @@ import { handleSendJabberMessage } from './jabber.js';
  *   PLANNING → (Accept) → WAIT FOR BUILD → (GrayRelease Build)
  *   → WAIT FOR BUILD → (Apply to approval) → WAIT APPROVAL
  *   → (Approve，依環境處理簽核) → WAIT DEPLOY
- *   → (Switch Execution Node，視上次 CD 部署環境群組 prd/nonPrd 決定是否需要)
+ *   → (Switch Execution Node，視上次 CD or GrayRelease部署環境群組 prd/nonPrd 決定是否需要)
  *   → WAIT DEPLOY → (GrayRelease Deploy) → WAIT DEPLOY → (To Verify)
  *   → VERIFY → (Verify Success) → MERGE CODE AND TAG → (To Done) → DONE
  *
@@ -49,9 +64,8 @@ import { handleSendJabberMessage } from './jabber.js';
  *   - STG：指派給當日 Release Manager，等待簽核
  *   - UAT：依 env/config 指派第一階段與最終簽核人
  *
- * Rebuild 規則：
- *   VERIFY 狀態只有在使用者明確要求 build/rebuild 時，才可透過 build_ticket({rebuild: true})
- *   執行 Verify fail 回到 PLANNING 後重新 GrayRelease Build。
+ * Build 規則：
+ *   DONE 以外的狀態都會先回到 PLANNING，再重新觸發 GrayRelease Build。
  */
 const GRAYRELEASE_FLOW_MAP = {
   'PLANNING': {
@@ -101,14 +115,6 @@ function normalizeStatusName(statusName) {
     .toUpperCase();
 }
 
-function getPollIntervalMs() {
-  return parseInt(process.env.POLL_INTERVAL_MS ?? '30000');
-}
-
-function getPollTimeoutMs() {
-  return parseInt(process.env.POLL_TIMEOUT_MS ?? '3600000');
-}
-
 function progress(ctx, event) {
   if (typeof ctx.progress === 'function') {
     ctx.progress(event);
@@ -130,18 +136,13 @@ function getGrayReleaseUatApprovers() {
   };
 }
 
-function isPassingResult(value) {
-  return ['pass', 'passed', 'success', 'succeeded', 'done'].includes(
-    String(value ?? '').trim().toLowerCase(),
-  );
-}
-
-function isFailingResult(value) {
-  return ['fail', 'failed', 'failure', 'error'].includes(
-    String(value ?? '').trim().toLowerCase(),
-  );
-}
-
+/**
+ * 根據 transition name 搜尋 issue 可用的 transition，回傳該 transition 物件（包含 id）以便後續呼叫 transition API
+ * @param issueKey
+ * @param transitionName
+ * @param jira
+ * @returns {Object|undefined}
+ */
 async function findTransitionByName(issueKey, transitionName, jira) {
   const transitions = await jira.getTransitions(issueKey);
   return transitions.find((transition) => (
@@ -149,7 +150,8 @@ async function findTransitionByName(issueKey, transitionName, jira) {
   ));
 }
 
-async function waitForGrayReleaseResult(issueKey, fieldId, label, jira, onProgress = () => { }) {
+async function waitForGrayReleaseResult(issueKey, fieldId, label, jira, onProgress = () => {
+}) {
   const intervalMs = getPollIntervalMs();
   const timeoutMs = getPollTimeoutMs();
   const startedAt = Date.now();
@@ -174,7 +176,7 @@ async function waitForGrayReleaseResult(issueKey, fieldId, label, jira, onProgre
     });
 
     if (isPassingResult(lastValue)) {
-      return { issueKey, fieldId, result: lastValue, attempts };
+      return;
     }
 
     if (isFailingResult(lastValue)) {
@@ -277,6 +279,21 @@ export function getGrayReleaseToolDefinitions() {
         },
       },
     },
+    {
+      name: 'build_grayrelease',
+      description:
+        '觸發 GrayRelease 上版單的 Jenkins Build。DONE 以外的狀態會先切回 PLANNING，再走到 WAIT FOR BUILD 後觸發 GrayRelease Build；若使用者要求 GrayRelease deploy、dev deploy 或部署灰度單，必須改用 deploy_grayrelease。',
+      inputSchema: {
+        type: 'object',
+        required: ['issueKey'],
+        properties: {
+          issueKey: {
+            type: 'string',
+            description: 'GrayRelease 單 issue key，例如 CID-822',
+          },
+        },
+      },
+    },
     {
       name: 'auto_grayrelease',
       description:
@@ -333,34 +350,6 @@ export function getGrayReleaseToolDefinitions() {
         },
       },
     },
-    {
-      name: 'wait_build_result',
-      description:
-        '輪詢等待 Jira issue 的 Build 結果欄位變成 pass 或 fail。通常接在 build_ticket 成功觸發 Jenkins build 後使用，確認 pass 後再呼叫 deploy_grayrelease；不可用 deploy_grayrelease 取代等待 build pass。',
-      inputSchema: {
-        type: 'object',
-        required: ['issueKey'],
-        properties: {
-          issueKey: {
-            type: 'string',
-            description: '要等待 build 結果的 issue key，例如 GrayRelease 單 CID-822',
-          },
-          resultFieldId: {
-            type: 'string',
-            description: '(選填) Build 結果欄位 ID，預設 customfield_13432',
-            default: GRAY_RELEASE_FIELD_IDS.buildResult,
-          },
-          pollIntervalMs: {
-            type: 'number',
-            description: '輪詢間隔毫秒，預設讀 POLL_INTERVAL_MS',
-          },
-          timeoutMs: {
-            type: 'number',
-            description: '最長等待毫秒，預設讀 POLL_TIMEOUT_MS',
-          },
-        },
-      },
-    },
     {
       name: 'continue_grayrelease',
       description:
@@ -397,14 +386,13 @@ export function getGrayReleaseToolDefinitions() {
  * @returns {Promise<{key:string, summary:string}[]>}
  */
 async function findUnlinkedStgGrayReleases(gitBranch, moduleId, jira) {
-  const STG_ENV_ID = '14356';
-  const GR_ISSUE_TYPE = '12601';
+  const GR_ISSUE_TYPE = ISSUE_TYPE_IDS.GrayRelease;
   const jql = [
     'project = CID',
     `issuetype = ${GR_ISSUE_TYPE}`,
-    `cf[13436] = ${STG_ENV_ID}`,
-    `cf[13431] = "${gitBranch.replace(/"/g, '\\"')}"`,
-    `cf[13444] = ${moduleId}`,
+    `CID_env = STG`,
+    `CID_branch ~ "${gitBranch.replace(/"/g, '\\"').replace(/\//g, '\\u002f')}"`,
+    `CID_system_module = ${moduleId}`,
     'ORDER BY created DESC',
   ].join(' AND ');
 
@@ -435,7 +423,7 @@ export async function handleCreateGrayReleaseTicket(args, { jira, notifier }) {
     const normalizedArgs = {
       ...args,
       module: args.module ?? args.systemCode?.toLowerCase(),
-      gitBranch: args.gitBranch ?? args.grayVersion,
+      gitBranch: args.gitBranch,
       environment: args.environment?.toLowerCase(),
     };
 
@@ -519,6 +507,13 @@ export async function handleCreateGrayReleaseTicket(args, { jira, notifier }) {
     // gray release notes
     fields[GRAY_RELEASE_FIELD_IDS.grayReleaseNotes] = NOTES_TEMPLATES.grayRelease;
 
+    await assertNoOpenPRBeforeCreate({
+      ticketType: 'grayrelease',
+      systemCode: normalizedArgs.systemCode,
+      module: normalizedArgs.module,
+      branch: normalizedArgs.gitBranch,
+    }, { jira });
+
     if (normalizedArgs.dryRun) {
       return ok({ dryRun: true, summary: fields.summary, grayReleaseVersion, fields });
     }
@@ -546,6 +541,11 @@ export async function handleCreateGrayReleaseTicket(args, { jira, notifier }) {
       if (stgTickets.length > 0) {
         result.suggest_link = {
           message: `找到以下 STG 灰度單（branch: ${args.gitBranch}）尚未關聯到任何 UAT 灰度單，是否要建立 relates to 關聯到 ${issue.key}？`,
+          toolName: 'link_stg_grayrelease',
+          arguments: {
+            uatKey: issue.key,
+            stgKeys: stgTickets.map((ticket) => ticket.key),
+          },
           stgTickets,
           hint: '回覆「是」或 yes 即可自動關聯，或直接呼叫 link_stg_grayrelease',
         };
@@ -561,22 +561,50 @@ export async function handleCreateGrayReleaseTicket(args, { jira, notifier }) {
 /**
  * 將 STG 灰度單關聯（relates to）到 UAT 灰度單
  */
-export async function handleLinkStgGrayRelease(args, { jira, notifier }) {
+export async function handleLinkStgGrayRelease(args, {
+  jira, notifier, progress = () => {
+  }
+}) {
   try {
     const { uatKey, stgKeys } = args;
     if (!Array.isArray(stgKeys) || stgKeys.length === 0) {
       return error('stgKeys 不可為空');
     }
 
+    progress({
+      phase: 'action',
+      title: '開始關聯 STG 灰度單',
+      detail: `${stgKeys.join(', ')} -> ${uatKey}`,
+      issueKey: uatKey,
+      total: stgKeys.length,
+    });
+
     const linked = [];
     const failed = [];
 
-    for (const stgKey of stgKeys) {
+    for (const [index, stgKey] of stgKeys.entries()) {
       try {
         await jira.linkIssue(stgKey, uatKey, 'Relates');
         linked.push(stgKey);
+        progress({
+          phase: 'done',
+          title: 'STG 灰度單關聯成功',
+          detail: `${stgKey} -> ${uatKey}`,
+          issueKey: uatKey,
+          current: index + 1,
+          total: stgKeys.length,
+        });
+
       } catch (e) {
         failed.push({ key: stgKey, reason: e.message });
+        progress({
+          phase: 'error',
+          title: 'STG 灰度單關聯失敗',
+          detail: `${stgKey}: ${e.message}`,
+          issueKey: uatKey,
+          current: index + 1,
+          total: stgKeys.length,
+        });
       }
     }
 
@@ -584,6 +612,15 @@ export async function handleLinkStgGrayRelease(args, { jira, notifier }) {
       await notifier.notify(uatKey, `已將 STG 灰度單 ${linked.join(', ')} relates to ${uatKey}`);
     }
 
+    progress({
+      phase: failed.length > 0 ? 'done' : 'done',
+      title: 'STG 灰度單關聯完成',
+      detail: `成功 ${linked.length} 張，失敗 ${failed.length} 張`,
+      issueKey: uatKey,
+      linked,
+      failed,
+    });
+
     return ok({
       uatKey,
       linked,
@@ -600,6 +637,20 @@ export async function handleLinkStgGrayRelease(args, { jira, notifier }) {
 
 // ── Handlers (NEW) ───────────────────────────────────────────────
 
+/**
+ * 觸發 GrayRelease Build。
+ */
+export async function handleBuildGrayRelease(args, ctx) {
+  const { issueKey } = args;
+
+  try {
+    const result = await executeGrayReleaseBuildFlow(issueKey, ctx);
+    return ok(result);
+  } catch (err) {
+    return error(`build_grayrelease 失敗: ${err.message}`);
+  }
+}
+
 /**
  * 自動執行 GrayRelease 完整流程
  */
@@ -643,71 +694,12 @@ export async function handleGetGrayReleaseStatus(args, { jira }) {
   }
 }
 
-export async function handleWaitBuildResult(args, ctx) {
-  const { issueKey } = args;
-  const { jira } = ctx;
-  const fieldId = args.resultFieldId ?? GRAY_RELEASE_FIELD_IDS.buildResult;
-  const intervalMs = args.pollIntervalMs ?? getPollIntervalMs();
-  const timeoutMs = args.timeoutMs ?? getPollTimeoutMs();
-  const startedAt = Date.now();
-  const deadline = Date.now() + timeoutMs;
-  let attempts = 0;
-  let lastValue;
-  let currentStatus;
-
-  try {
-    while (true) {
-      attempts++;
-      const issue = await jira.getIssue(issueKey);
-      currentStatus = issue.fields.status?.name;
-      const fields = await jira.getIssueFields(issueKey, [fieldId]);
-      const raw = fields[fieldId];
-      lastValue = raw?.value ?? raw;
-
-      progress(ctx, {
-        phase: 'polling',
-        title: '等待 Build 結果',
-        detail: `${fieldId}: ${lastValue ?? 'empty'}`,
-        issueKey,
-        currentStatus,
-        attempts,
-        elapsedMs: Date.now() - startedAt,
-        timeoutMs,
-        nextPollMs: intervalMs,
-      });
-
-      if (isPassingResult(lastValue)) {
-        return ok({
-          issueKey,
-          fieldId,
-          result: lastValue,
-          buildResult: lastValue,
-          currentStatus,
-          attempts,
-        });
-      }
-
-      if (isFailingResult(lastValue)) {
-        return error(`Build 失敗，${fieldId}: ${lastValue}`);
-      }
-
-      if (Date.now() >= deadline) {
-        return error(`Build 結果等待逾時，${fieldId}: ${lastValue ?? 'empty'}`);
-      }
-
-      await sleep(intervalMs);
-    }
-  } catch (err) {
-    return error(`wait_build_result 失敗: ${err.message}`);
-  }
-}
-
 /**
- * 執行 GrayRelease 部署流程，不觸發 rebuild。
+ * 執行 GrayRelease 部署流程，不觸發 build。
  */
 export async function handleDeployGrayRelease(args, ctx) {
   const { issueKey } = args;
-  const { jira, notifier } = ctx;
+  const { notifier } = ctx;
 
   try {
     progress(ctx, {
@@ -777,6 +769,70 @@ export async function handleContinueGrayRelease(args, ctx) {
 
 // ── Internal Helpers ─────────────────────────────────────────────
 
+const GRAYRELEASE_RESET_TO_PLANNING_TRANSITIONS = [
+  'Verify fail',
+  'Back to Planning',
+  'To Planning',
+  'Planning',
+];
+
+async function executeGrayReleaseBuildFlow(issueKey, ctx) {
+  const { jira, notifier } = ctx;
+  const log = [];
+
+  const initIssue = await jira.getIssue(issueKey);
+  const initStatus = initIssue.fields.status.name;
+  const normalizedInitStatus = normalizeStatusName(initStatus);
+
+  if (normalizedInitStatus === 'DONE') {
+    throw new Error('GrayRelease 已是 DONE，不會自動重新 build。若確定要重跑，請先手動退回流程狀態。');
+  }
+
+  await resetGrayReleaseToPlanningForBuild(issueKey, normalizedInitStatus, jira, log);
+
+  log.push('執行 Accept，進入 WAIT FOR BUILD...');
+  await jira.transitionByName(issueKey, 'Accept');
+  await sleep(10 * 1000);
+
+  log.push('執行 GrayRelease Build...');
+  await jira.transitionByName(issueKey, 'GrayRelease Build');
+
+  const issue = await jira.getIssue(issueKey);
+  const newStatus = issue.fields.status.name;
+  log.push(`✅ GrayRelease Build 已觸發，目前狀態：${newStatus}`);
+  await notifier.notify(issueKey, `Jenkins GrayRelease Build 已觸發（${newStatus}）`);
+
+  return { issueKey, status: newStatus, steps: log };
+}
+
+async function resetGrayReleaseToPlanningForBuild(issueKey, normalizedStatus, jira, log) {
+  if (normalizedStatus === 'PLANNING') {
+    log.push('目前已是 PLANNING，直接進入 build 前置流程');
+    return;
+  }
+
+  const resetTrans = await findAnyGrayReleaseTransition(
+    issueKey,
+    GRAYRELEASE_RESET_TO_PLANNING_TRANSITIONS,
+    jira,
+  );
+
+  if (!resetTrans) {
+    throw new Error('找不到回到 PLANNING 的 transition，無法先 reset 後 build');
+  }
+
+  log.push(`先觸發「${resetTrans.name}」回到 PLANNING，再重新 build...`);
+  await jira.transitionById(issueKey, resetTrans.id);
+  await sleep(10 * 1000);
+}
+
+async function findAnyGrayReleaseTransition(issueKey, names, jira) {
+  const list = await jira.getTransitions(issueKey);
+  return list.find((transition) => (
+    names.some((name) => transition.name.toLowerCase() === name.toLowerCase())
+  ));
+}
+
 /**
  * 查詢 GrayRelease 單狀態並分析下一步
  */
@@ -844,10 +900,7 @@ async function executeGrayReleaseDeployFlow(issueKey, ctx) {
   }
 
   log.push(`🚀 開始執行 GrayRelease Deploy - 環境: ${environment.toUpperCase()}`);
-  log.push('  先執行 Planning，確保部署流程從可簽核狀態重新開始');
-  await jira.transitionByName(issueKey, 'Planning');
-  await notifier.notify(issueKey, '開始執行 GrayRelease deploy 流程，先回到 Planning');
-  
+
   while (true) {
     const issue = await jira.getIssue(issueKey);
     const currentStatus = issue.fields.status.name;
@@ -880,11 +933,36 @@ async function executeGrayReleaseDeployFlow(issueKey, ctx) {
     }
 
     if (normalizedStatus === 'WAIT FOR BUILD') {
+      const buildFields = await jira.getIssueFields(issueKey, [SHARED_FIELD_IDS.buildResult]);
+      const rawBuildResult = buildFields[SHARED_FIELD_IDS.buildResult];
+      const buildResult = rawBuildResult?.value ?? rawBuildResult;
+      if (!isPassingResult(buildResult)) {
+        const message = `GrayRelease Build 尚未通過，${SHARED_FIELD_IDS.buildResult}: ${buildResult ?? 'empty'}。是否要先執行 build_grayrelease？`;
+        log.push(`  ⏸️ ${message}`);
+        return {
+          issueKey,
+          finalStatus: currentStatus,
+          needsBuild: true,
+          confirm_build: true,
+          buildResult,
+          buildResultFieldId: SHARED_FIELD_IDS.buildResult,
+          message,
+          suggest_build: {
+            message,
+            toolName: 'build_grayrelease',
+            arguments: { issueKey },
+            hint: '回覆「是」或 yes 即可先執行 build_grayrelease；build pass 後再執行 deploy_grayrelease。',
+          },
+          log,
+        };
+      }
+
       const applyTransition = await findTransitionByName(issueKey, 'Apply to approval', jira);
       if (!applyTransition) {
-        log.push('  ⏸️ 目前仍需 build，deploy_grayrelease 不會觸發 rebuild');
+        log.push('  ⏸️ 目前仍需 build，deploy_grayrelease 不會觸發 build');
         break;
       }
+
       log.push('  執行: Apply to approval');
       await jira.transitionByName(issueKey, 'Apply to approval');
       await notifier.notify(issueKey, '進入 GrayRelease 部署簽核流程');
@@ -913,7 +991,7 @@ async function executeGrayReleaseDeployFlow(issueKey, ctx) {
     }
 
     if (normalizedStatus === 'VERIFY') {
-      log.push('  ⏸️ 已進入 VERIFY，請人工驗證；若需重 build 請明確執行 build/rebuild');
+      log.push('  ⏸️ 已進入 VERIFY，請人工驗證；若需再次 build 請明確執行 build');
       break;
     }
 
@@ -1009,7 +1087,7 @@ async function executeAutoGrayReleaseFlow(issueKey, options, ctx) {
       log.push('  ⏳ 等待 Jenkins Build 完成...');
       await waitForGrayReleaseResult(
         issueKey,
-        GRAY_RELEASE_FIELD_IDS.buildResult,
+        SHARED_FIELD_IDS.buildResult,
         'GrayRelease Build',
         jira,
         ctx.progress,
@@ -1093,7 +1171,13 @@ async function executeAutoGrayReleaseFlow(issueKey, options, ctx) {
 
 async function runGrayReleaseDeployStep(issueKey, systemCode, ctx, log) {
   const { jira, notifier } = ctx;
-  const needSwitch = await needSwitchExecutionNode(issueKey, systemCode, jira, log);
+  const needSwitch = await shouldSwitchExecutionNode({
+    issueKey,
+    systemCode,
+    envGroup: 'nonPrd',
+    jira,
+    log,
+  });
 
   if (needSwitch) {
     log.push('  執行: Switch Execution Node');
@@ -1104,7 +1188,7 @@ async function runGrayReleaseDeployStep(issueKey, systemCode, ctx, log) {
     });
     await jira.transitionByName(issueKey, 'Switch Execution Node');
     await notifier.notify(issueKey, '切換 Ansible instance');
-    await waitForSwitchExecutionNode(issueKey, systemCode, jira);
+    await waitForSharedSwitchExecutionNode({ issueKey, systemCode, envGroup: 'nonPrd', jira });
   }
 
   log.push('  執行: GrayRelease Deploy');
@@ -1192,7 +1276,7 @@ async function handleGrayReleaseApproval(issueKey, environment, systemCode, ctx)
 
   // STG: 查 wiki 值班組長 → assign → 發 jabber → 等待 approve
   if (env === 'stg') {
-    const managerResult = await handleGetReleaseManager({}, {});
+    const managerResult = await handleGetReleaseManager();
     const managerData = parseToolResult(managerResult);
 
     if (!managerData?.found) {
@@ -1235,8 +1319,8 @@ async function handleGrayReleaseApproval(issueKey, environment, systemCode, ctx)
     // 輪詢等待 Approve（狀態變為 WAIT DEPLOY）
     const poller = new Poller(jira);
     await poller.waitForStatus(issueKey, 'WAIT DEPLOY', {
-      intervalMs: parseInt(process.env.POLL_INTERVAL_MS ?? '30000'),
-      timeoutMs: parseInt(process.env.POLL_TIMEOUT_MS ?? '3600000'),
+      intervalMs: getPollIntervalMs(),
+      timeoutMs: getPollTimeoutMs(),
       onProgress: ctx.progress,
     });
 
@@ -1280,8 +1364,8 @@ async function handleGrayReleaseApproval(issueKey, environment, systemCode, ctx)
         issueKey,
         keyword: 'approved',
         authorAccountId: commentReviewerAccountId,
-        timeoutMs: parseInt(process.env.POLL_TIMEOUT_MS ?? '3600000'),
-        intervalMs: parseInt(process.env.POLL_INTERVAL_MS ?? '30000'),
+        intervalMs: getPollIntervalMs(),
+        timeoutMs: getPollTimeoutMs(),
       },
       { jira, progress: ctx.progress },
     );
@@ -1324,8 +1408,8 @@ async function handleGrayReleaseApproval(issueKey, environment, systemCode, ctx)
 
     const poller = new Poller(jira);
     await poller.waitForStatus(issueKey, 'WAIT DEPLOY', {
-      intervalMs: parseInt(process.env.POLL_INTERVAL_MS ?? '30000'),
-      timeoutMs: parseInt(process.env.POLL_TIMEOUT_MS ?? '3600000'),
+      intervalMs: getPollIntervalMs(),
+      timeoutMs: getPollTimeoutMs(),
       onProgress: ctx.progress,
     });
 
@@ -1335,82 +1419,6 @@ async function handleGrayReleaseApproval(issueKey, environment, systemCode, ctx)
   throw new Error(`不支援的環境: ${environment}`);
 }
 
-/**
- * 判斷是否需要執行 Switch Execution Node
- * 規則：查詢同系統上次 CD or GrayRelease 部署的環境群組，若與本次不同則需切換
- */
-async function needSwitchExecutionNode(issueKey, systemCode, jira, log) {
-  if (await hasRecentSwitchExecutionNodeComment(issueKey, systemCode, jira)) {
-    return false;
-  }
-
-  // GrayRelease 永遠是 nonPrd 群組
-  const thisGroup = 'nonPrd';
-
-  // 只查詢 CD 單的部署歷史（不包含 GrayRelease）
-  const isPrdEnv = (env) => ['prd', 'dr', 'prd/dr', 'prd&dr'].includes(env?.toLowerCase()?.trim());
-
-  const jql_cd = `project = CID AND (issuetype = CD OR issuetype = GrayRelease) AND text ~ "${systemCode}" AND status = Done AND issueKey != "${issueKey}" ORDER BY updated DESC`;
-
-  try {
-    log.push(`  before 查詢歷史 CD/GrayRelease 單，判斷是否需要切換 Execution Node`);
-    const cdResults = await jira.searchIssues(jql_cd, ['customfield_13436', 'updated'], 1);
-    log.push(`  after 查詢歷史 CD/GrayRelease 單，判斷是否需要切換 Execution Node`, cdResults);
-    const cdIssue = cdResults[0] ?? null;
-
-    // 查不到歷史 → 保守執行 Switch
-    if (!cdIssue) {
-      return true;
-    }
-
-    // CD：讀 customfield_13436.value 判斷群組
-    const envVal = cdIssue.fields?.customfield_13436?.value ?? '';
-    const lastGroup = isPrdEnv(envVal) ? 'prd' : 'nonPrd';
-
-    // 群組不同 → 需要 Switch
-    return lastGroup !== thisGroup;
-  } catch {
-    // 查詢失敗 → 保守執行 Switch
-    return true;
-  }
-}
-
-async function waitForSwitchExecutionNode(issueKey, systemCode, jira) {
-  const waitMs = parseInt(process.env.SWITCH_EXECUTION_NODE_WAIT_MS ?? '180000');
-  const intervalMs = getPollIntervalMs();
-  const deadline = Date.now() + waitMs;
-
-  while (true) {
-
-    if (Date.now() >= deadline) {
-      return;
-    }
-
-    await sleep(intervalMs);
-  }
-}
-
-async function hasRecentSwitchExecutionNodeComment(issueKey, systemCode, jira) {
-  if (!jira.getComments) {
-    return false;
-  }
-
-  try {
-    const comments = await jira.getComments(issueKey);
-    const lowerSystemCode = String(systemCode ?? '').toLowerCase();
-    return comments.some((comment) => {
-      const body = String(comment.body ?? '').toLowerCase();
-      const author = String(comment.author?.displayName ?? '').toLowerCase();
-      return author === 'cid jira worker'
-        && body.includes('instance_group')
-        && body.includes('nonprd_executionnode')
-        && (!lowerSystemCode || body.includes(lowerSystemCode));
-    });
-  } catch {
-    return false;
-  }
-}
-
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }