@jira-deploy/core 1.0.4 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jira-deploy/core",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "type": "module",
   "main": "./index.js",
   "repository": {

package/tools/grayrelease.js

@@ -570,7 +570,7 @@ export async function handleAutoGrayRelease(args, ctx) {
     });
     await notifier.notify(issueKey, '開始自動執行 GrayRelease 流程');
 
-    const result = await executeGrayReleaseFlow(
+    const result = await executeAutoGrayReleaseFlow(
       issueKey,
       {
         maxBuildRetries: args.maxBuildRetries ?? 3,
@@ -655,7 +655,7 @@ export async function handleContinueGrayRelease(args, ctx) {
       currentStatus: status.currentStatus,
     });
 
-    const result = await executeGrayReleaseFlow(
+    const result = await executeAutoGrayReleaseFlow(
       issueKey,
       {
         maxBuildRetries: args.maxBuildRetries ?? 3,
@@ -830,7 +830,7 @@ async function executeGrayReleaseDeployFlow(issueKey, ctx) {
 /**
  * 主執行流程：從當前狀態開始，自動執行到完成或需要人工介入
  */
-async function executeGrayReleaseFlow(issueKey, options, ctx) {
+async function executeAutoGrayReleaseFlow(issueKey, options, ctx) {
   const { jira, notifier } = ctx;
   const log = [];
   let buildAttempts = 0;
@@ -1007,16 +1007,16 @@ async function runGrayReleaseDeployStep(issueKey, systemCode, ctx, log) {
   await notifier.notify(issueKey, '觸發 GrayRelease Deploy');
 
   // 等待部署完成：優先輪詢 deploy result、VERIFY 狀態，
-  // 或「To Verify」transition 是否出現。
-  // 最多等待 3 分鐘（避免 MCP client timeout），
+  // 最多等待 10 分鐘（避免 MCP client timeout），
   // 若超時則回傳「部署中」訊息，請使用者稍後繼續。
-  const DEPLOY_WAIT_MS = Math.min(getPollTimeoutMs(), 3 * 60 * 1000);
-  const DEPLOY_POLL_MS = Math.min(getPollIntervalMs(), 10_000);
+  // 每 3 分鐘 輪詢一次
+  const DEPLOY_WAIT_MS = Math.min(getPollTimeoutMs(), 10 * 60 * 1000);
+  const DEPLOY_POLL_MS = Math.min(getPollIntervalMs(),  3 * 60 * 1000);
   const deployDeadline = Date.now() + DEPLOY_WAIT_MS;
   let deployCompleted = false;
   let attempts = 0;
 
-  log.push('  ⏳ 等待部署完成（最多 3 分鐘）...');
+  log.push('  ⏳ 等待部署完成（最多 10 分鐘）...');
   while (Date.now() <= deployDeadline) {
     attempts++;
     const issue = await jira.getIssue(issueKey);
@@ -1037,10 +1037,10 @@ async function runGrayReleaseDeployStep(issueKey, systemCode, ctx, log) {
       nextPollMs: DEPLOY_POLL_MS,
     });
 
-    if (statusNow === 'VERIFY') {
+    if (statusNow === 'VERIFY' && isPassingResult(deployResult)) {
       // Jira automation 或 Jenkins 已自動切到 VERIFY
       deployCompleted = true;
-      log.push('  ✅ 狀態已進入 VERIFY（自動切換），跳過手動 To Verify');
+      log.push('  ✅ Deploy 完成，狀態已進入 VERIFY（cid jira worker 自動切換），進入驗證階段');
       break;
     }
 
@@ -1071,8 +1071,9 @@ async function runGrayReleaseDeployStep(issueKey, systemCode, ctx, log) {
     await sleep(DEPLOY_POLL_MS);
   }
 
+
   if (!deployCompleted) {
-    log.push('  ⚠️ 3 分鐘內未看到部署結果，部署可能仍在進行中');
+    log.push('  ⚠️ 10 分鐘內未看到部署結果，部署可能仍在進行中');
     log.push('  請稍後使用 get_grayrelease_status 或 deploy_grayrelease 繼續');
     await notifier.notify(issueKey, '部署仍在進行中，請稍後查詢狀態');
     return false;
@@ -1246,8 +1247,7 @@ async function handleGrayReleaseApproval(issueKey, environment, systemCode, ctx)
 
 /**
  * 判斷是否需要執行 Switch Execution Node
- * 規則：查詢同系統上次 CD 部署的環境群組，若與本次不同則需切換
- * 注意：不查詢 GrayRelease 歷史，因為 GrayRelease 永遠是 nonPrd
+ * 規則：查詢同系統上次 CD or GrayRelease 部署的環境群組，若與本次不同則需切換
  */
 async function needSwitchExecutionNode(issueKey, systemCode, jira) {
   if (await hasRecentSwitchExecutionNodeComment(issueKey, systemCode, jira)) {
@@ -1260,12 +1260,13 @@ async function needSwitchExecutionNode(issueKey, systemCode, jira) {
   // 只查詢 CD 單的部署歷史（不包含 GrayRelease）
   const isPrdEnv = (env) => ['prd', 'dr', 'prd/dr', 'prd&dr'].includes(env?.toLowerCase()?.trim());
 
-  const jql_cd = `project = CID AND issuetype = CD AND "System Code[Select List (single choice)]" = "${systemCode}" AND status = Done AND issueKey != "${issueKey}" ORDER BY updated DESC`;
+  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 {
     const cdResults = await jira.searchIssues(jql_cd, ['customfield_13436', 'updated'], 1);
     const cdIssue = cdResults[0] ?? null;
 
+
     // 查不到歷史 → 保守執行 Switch
     if (!cdIssue) {
       return true;
@@ -1311,7 +1312,7 @@ async function hasRecentSwitchExecutionNodeComment(issueKey, systemCode, jira) {
     const lowerSystemCode = String(systemCode ?? '').toLowerCase();
     return comments.some((comment) => {
       const body = String(comment.body ?? '').toLowerCase();
-      const author = String(comment.author?.displayName ?? comment.author?.name ?? '').toLowerCase();
+      const author = String(comment.author?.displayName ?? '').toLowerCase();
       return author === 'cid jira worker'
         && body.includes('instance_group')
         && body.includes('nonprd_executionnode')

package/tools/index.js

@@ -727,8 +727,8 @@ export async function executeTool(name, args, deps) {
 
       // 查詢同系統最近一筆已完成的部署（CD 或 GrayRelease），回傳 'prd' | 'nonPrd' | null
       const getLastDeployEnvGroup = async (systemCode, excludeKey) => {
-        const jql_cd = `project = CID AND issuetype = CD AND "System Code[Select List (single choice)]" = "${systemCode}" AND status = Done AND issueKey != "${excludeKey}" ORDER BY updated DESC`;
-        const jql_gr = `project = CID AND issuetype = GrayRelease AND "System Code[Select List (single choice)]" = "${systemCode}" AND status = Done ORDER BY updated DESC`;
+        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`;
 
         const [cdResults, grResults] = await Promise.all([
           jira.searchIssues(jql_cd, ['customfield_13436', 'updated'], 1).catch(() => []),