@jira-deploy/core 1.0.2 → 1.0.4

package/constants/defaults.js

@@ -100,7 +100,7 @@ export const NOTES_TEMPLATES = {
 5. 若需搭配不同分支的 Jenkins pipeline 執行，請設定 CID_jenkinsfile_branch，預設為 master。
 6. 有任何額外參數請以 json 格式填入 CID_extra_vars 欄位。
 7. 集群佈署僅支援相同環境與相同 CID_extra_vars 佈署。
-8. 集群佈署時，CID_deploy_result 代表整個佈署流程的開始或成功與否。
+8. 集群佈署時，customfield_13433(CID_deploy_result) 代表整個佈署流程的開始或成功與否。
 9. 若佈署時出現任一失敗則將終止整個集群佈署。
 10. CID_grayrelease_version 版本號不支援 '/'，請務必注意以 '-' 取代。`,
 };

package/constants/environments.js

@@ -22,7 +22,7 @@ export const DEPT_CODES = {
 export const SUPPORTED_ENVS = {
   library: ['dev', 'stg', 'uat', 'prd'],
   ci: ['dev', 'stg'],
-  cd: ['stg', 'uat', 'prd/dr', 'prd', 'dr'],
+  cd: ['dev', 'stg', 'uat', 'prd/dr', 'prd', 'dr'],
   grayRelease: ['dev', 'stg', 'uat'],
 };
 

package/constants/field-ids.js

@@ -3,7 +3,7 @@
  * 所有 customfield_XXXXX 在這裡集中管理
  */
 
-import {ASSIGNEE_DEFAULTS} from './defaults.js';
+import { ASSIGNEE_DEFAULTS } from './defaults.js';
 
 // ============ 共用欄位 (所有 Issue Type 都用) ============
 export const SHARED_FIELD_IDS = {
@@ -24,7 +24,7 @@ export const SHARED_FIELD_IDS = {
   authManagerSign: 'customfield_13904',
   releaseInfo: 'customfield_13906',
 };
- 
+
 // ============ CD 專用欄位 ============
 export const CD_FIELD_IDS = {
   ...SHARED_FIELD_IDS,
@@ -60,4 +60,7 @@ export const GRAY_RELEASE_FIELD_IDS = {
   grayReleaseVersion: 'customfield_14700',
   clusterList: 'customfield_14701',
   grayReleaseNotes: 'customfield_14511',
+  // Field names resolved to customfield IDs at runtime.
+  buildResult: 'customfield_13432',
+  deployResult: 'customfield_13433',
 };

package/dry-run.js

@@ -24,15 +24,19 @@
  *  node src/dry-run.js create_ci_ticket '{"systemCode":"IBK","relatesTo":["CID-1708"]}'
  *  node src/dry-run.js create_ci_ticket '{"systemCode":"IBK","relatesTo":["CID-1178","CID-1182"]}'
  *  node src/dry-run.js build_ticket '{"issueKey":"CID-1709"}' --live
+ *  node src/dry-run.js wait_to_dev '{"issueKey":"CID-1709"}' --live
  *  node src/dry-run.js wait_to_stg '{"issueKey":"CID-1709"}' --live
  *
  *  # CD 票
+ *  node src/dry-run.js create_cd_ticket '{"systemCode":"IBK","environment":"dev","ciTicket":"CID-1709"}'
  *  node src/dry-run.js create_cd_ticket '{"systemCode":"IBK","environment":"stg","ciTicket":"CID-1709"}'
  *  node src/dry-run.js create_cd_ticket '{"systemCode":"CWA","environment":"prd","ciTicket":"CID-1709","metaTest":true}'
  *  node src/dry-run.js create_cd_ticket '{"systemCode":"IBK","environment":"prd","ciTicket":"CID-1709","metaTest":true}' --live
+ *  node src/dry-run.js prepare_cd_deployment '{"issueKey":"CID-1710","environment":"dev"}' --live
  *  node src/dry-run.js prepare_cd_deployment '{"issueKey":"CID-1710","environment":"stg"}' --live
  *
  *  # Deployment sub-task 觸發（新）
+ *  node src/dry-run.js trigger_deployment '{"cdIssueKey":"CID-1710","environment":"dev"}' --live
  *  node src/dry-run.js trigger_deployment '{"cdIssueKey":"CID-1710","environment":"stg"}' --live
  *  node src/dry-run.js trigger_deployment '{"cdIssueKey":"CID-1713","environment":"uat"}' --live
  *  node src/dry-run.js trigger_deployment '{"cdIssueKey":"CID-1716","environment":"stg","applyForClose":true}' --live

package/jira-client.js

@@ -21,6 +21,7 @@ export class JiraClient {
       },
     });
     this.dryRun = DRY_RUN;
+    this.fieldIdByName = new Map();
   }
 
   // 建立 issue
@@ -93,6 +94,18 @@ export class JiraClient {
     return res.data.fields;
   }
 
+  async getFieldIdByName(fieldName) {
+    if (this.fieldIdByName.has(fieldName)) {
+      return this.fieldIdByName.get(fieldName);
+    }
+
+    const res = await this.http.get('/field');
+    const field = (res.data ?? []).find((item) => item.id === fieldName || item.name === fieldName);
+    const fieldId = field?.id ?? fieldName;
+    this.fieldIdByName.set(fieldName, fieldId);
+    return fieldId;
+  }
+
   // 依 ID 直接切換狀態（不查名稱，適合 race condition 處理）
   async transitionById(issueKey, transitionId) {
     if (this.dryRun) {

package/package.json

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

package/poller.js

@@ -21,6 +21,7 @@ export class Poller {
   async waitForStatus(issueKey, targetStatus, options = {}) {
     const intervalMs = options.intervalMs ?? parseInt(process.env.POLL_INTERVAL_MS ?? '30000');
     const timeoutMs = options.timeoutMs ?? parseInt(process.env.POLL_TIMEOUT_MS ?? '3600000');
+    const progress = typeof options.onProgress === 'function' ? options.onProgress : () => {};
 
     const startTime = Date.now();
     let attempts = 0;
@@ -34,20 +35,32 @@ export class Poller {
       attempts++;
       const issue = await this.jira.getIssue(issueKey);
       const currentStatus = issue.fields.status.name;
+      const elapsedMs = Date.now() - startTime;
 
       console.error(`[Poller] attempt #${attempts} — current: "${currentStatus}"`);
+      progress({
+        phase: 'polling',
+        title: `等待 ${issueKey} 狀態`,
+        detail: `target=${targetStatus}`,
+        issueKey,
+        currentStatus,
+        targetStatus,
+        attempts,
+        elapsedMs,
+        timeoutMs,
+        nextPollMs: intervalMs,
+      });
 
       if (currentStatus.toLowerCase() === targetStatus.toLowerCase()) {
         return {
           issueKey,
           status: currentStatus,
-          elapsedMs: Date.now() - startTime,
+          elapsedMs,
           attempts,
         };
       }
 
-      const elapsed = Date.now() - startTime;
-      if (elapsed >= timeoutMs) {
+      if (elapsedMs >= timeoutMs) {
         throw new Error(
           `Timeout waiting for "${issueKey}" to reach "${targetStatus}". ` +
           `Last status: "${currentStatus}" after ${attempts} attempts.`,

package/tools/cd.js

@@ -27,7 +27,9 @@ export function getCDToolDefinitions() {
   return [
     {
       name: 'create_cd_ticket',
-      description: '建立 CD Deploy 上版單。專用工具，提前驗證必填欄位和叢集配置',
+      description:
+        '建立 CD Deploy 上版單。只有使用者明確要求或確認要建立 CD Deploy/CD 單時才使用；' +
+        '模糊 deploy/部署且上下文是 GrayRelease 時，應先詢問是否改用 deploy_grayrelease，不可直接開 CD 單。',
       inputSchema: {
         type: 'object',
         required: ['systemCode', 'environment'],
@@ -40,7 +42,7 @@ export function getCDToolDefinitions() {
           environment: {
             type: 'string',
             enum: Object.keys(ENV_CODES),
-            description: '部署環境，必填，預設為 stg',
+            description: '部署環境，必填。若使用者未指定且不是已確認的 workflow，應先詢問，不可因 deploy/部署模糊指令自行補 stg',
           },
           isClusterDeploy: {
             type: 'boolean',
@@ -54,11 +56,11 @@ export function getCDToolDefinitions() {
           ciTicket: {
             type: 'string',
             description:
-              '關聯的 CI 單 issue key，例如 CID-1677。自動：① 取 release_version 填入 summary/CID_deploy_version ② 查 CI 所有 relates Library 單，各自取 CID_branch 找 LBPRJ 版本頁 → 加 Web Link',
+              '關聯的 CI 單 issue key，例如 CID-1677；必須是 CI 單，不可使用 GrayRelease 單。自動：① 取 release_version 填入 summary/CID_deploy_version ② 查 CI 所有 relates Library 單，各自取 CID_branch 找 LBPRJ 版本頁 → 加 Web Link',
           },
           linkedCiKey: {
             type: 'string',
-            description: '關聯的 CI 單 issue key；等同 ciTicket，保留給 agent/CLI workflow 使用',
+            description: '關聯的 CI 單 issue key；等同 ciTicket，保留給 agent/CLI workflow 使用；不可使用 GrayRelease 單',
           },
           clusterDeploy: {
             type: 'string',
@@ -274,7 +276,7 @@ export async function handleCreateCDTicket(args, {jira, notifier}) {
 
     await notifier.notify(
       issue.key,
-      `CD Deploy 單已建立。系統: ${args.systemCode}, 環境: ${args.environment}, Cluster: ${args.clusterDeploy}`,
+      `CD Deploy 單已建立。系統: ${normalizedArgs.systemCode}, 環境: ${normalizedArgs.environment}, Cluster: ${serverList.join(',')}`,
     );
     return ok({
       issueKey: issue.key,
@@ -283,6 +285,8 @@ export async function handleCreateCDTicket(args, {jira, notifier}) {
       type: 'CD Deploy',
       system: normalizedArgs.systemCode,
       environment: normalizedArgs.environment,
+      clusterDeploy: serverList,
+      isClusterDeploy: normalizedArgs.isClusterDeploy,
     });
   } catch (err) {
     return error(`無法建立 CD 單: ${err.message}`);