@jira-deploy/core 1.0.13 → 1.0.15

package/package.json

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

package/tools/grayrelease.js

@@ -5,6 +5,7 @@
  *   - auto_grayrelease
  *   - deploy_grayrelease
  *   - get_grayrelease_status
+ *   - wait_build_result
  *   - continue_grayrelease
  */
 import {
@@ -332,6 +333,34 @@ 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:
@@ -614,6 +643,65 @@ 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。
  */
@@ -756,10 +844,10 @@ async function executeGrayReleaseDeployFlow(issueKey, ctx) {
   }
 
   log.push(`🚀 開始執行 GrayRelease Deploy - 環境: ${environment.toUpperCase()}`);
-  log.push('  確保每次都會從 build 開始，先執行: Planning');
+  log.push('  先執行 Planning，確保部署流程從可簽核狀態重新開始');
   await jira.transitionByName(issueKey, 'Planning');
-  await notifier.notify(issueKey, '確保每次都會從 Planning 開始，準備進入部署流程');
-
+  await notifier.notify(issueKey, '開始執行 GrayRelease deploy 流程，先回到 Planning');
+  
   while (true) {
     const issue = await jira.getIssue(issueKey);
     const currentStatus = issue.fields.status.name;
@@ -867,6 +955,9 @@ async function executeAutoGrayReleaseFlow(issueKey, options, ctx) {
   }
 
   log.push(`🚀 開始執行 GrayRelease 流程 - 環境: ${environment.toUpperCase()}`);
+  log.push('  先執行 PLANNING，確保流程從頭開始');
+  await jira.transitionByName(issueKey, 'Planning');
+  await notifier.notify(issueKey, '開始自動執行 GrayRelease 流程，從 PLANNING 開始');
 
   while (true) {
     const issue = await jira.getIssue(issueKey);
@@ -1154,7 +1245,7 @@ async function handleGrayReleaseApproval(issueKey, environment, systemCode, ctx)
 
   // UAT: assign first reviewer → 等待留言 → 轉 final approver → 等待 approve
   if (env === 'uat') {
-    const {commentReviewerAlias, finalApproverAlias} = getGrayReleaseUatApprovers();
+    const { commentReviewerAlias, finalApproverAlias } = getGrayReleaseUatApprovers();
     const commentReviewerAccountId = resolveAccountId(commentReviewerAlias);
     if (!commentReviewerAccountId) {
       throw new Error(`找不到 UAT 第一階段簽核人 accountId，請設定 GRAYRELEASE_UAT_COMMENT_REVIEWER_ALIAS 或 release.grayReleaseUatApprovers.commentReviewerAlias`);

package/tools/index.js

@@ -20,6 +20,7 @@ import {
   handleAutoGrayRelease,
   handleDeployGrayRelease,
   handleGetGrayReleaseStatus,
+  handleWaitBuildResult,
   handleContinueGrayRelease,
 } from './grayrelease.js';
 import {
@@ -44,6 +45,7 @@ const READ_ONLY_TOOL_NAMES = new Set([
   'get_release_manager',
   'wait_for_comment',
   'get_grayrelease_status',
+  'wait_build_result',
 ]);
 
 function withToolAnnotations(tools) {
@@ -412,6 +414,9 @@ export async function executeTool(name, args, deps) {
     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 });