@jira-deploy/core 1.0.3 → 1.0.4

package/tools/release.js

@@ -7,8 +7,8 @@
  */
 import https from 'https';
 import http from 'http';
-import {error, getModuleName, ok, today} from './helpers.js';
-import {SYSTEM_CODES, SYSTEM_MODULES} from '../constants/index.js';
+import { error, getModuleName, ok } from './helpers.js';
+import { SYSTEM_CODES, SYSTEM_MODULES } from '../constants/index.js';
 
 // ── Schema definitions ───────────────────────────────────────────
 export function getReleaseToolDefinitions() {
@@ -100,7 +100,7 @@ export function getReleaseToolDefinitions() {
 
 // ── Handlers ─────────────────────────────────────────────────────
 
-export async function handleGetUnreleasedVersions(args, {jira}) {
+export async function handleGetUnreleasedVersions(args, { jira }) {
   try {
     const projectKey = args.projectKey ?? 'LBPRJ';
     const versions = await jira.getUnreleasedVersionsList(projectKey);
@@ -109,7 +109,7 @@ export async function handleGetUnreleasedVersions(args, {jira}) {
       return ok({
         projectKey,
         total: versions.length,
-        versions: versions.map((v) => ({id: v.id, name: v.name})),
+        versions: versions.map((v) => ({ id: v.id, name: v.name })),
       });
     }
 
@@ -135,13 +135,13 @@ export async function handleGetUnreleasedVersions(args, {jira}) {
       };
     });
 
-    return ok({projectKey, systemCode: args.systemCode, total: parsed.length, versions: parsed});
+    return ok({ projectKey, systemCode: args.systemCode, total: parsed.length, versions: parsed });
   } catch (err) {
     return error(`無法查詢 unreleased versions: ${err.message}`);
   }
 }
 
-export async function handleTransitionToWaitApproval(args, {jira, notifier}) {
+export async function handleTransitionToWaitApproval(args, { jira, notifier }) {
   try {
     await jira.transitionByName(args.cdIssueKey, 'Apply for approval');
     await notifier.notify(args.cdIssueKey, '已切換到 Wait Approval，等待主管簽核');
@@ -157,7 +157,8 @@ export async function handleTransitionToWaitApproval(args, {jira, notifier}) {
 
 export async function handleGetReleaseManager(args, _ctx) {
   try {
-    const date = args.date ?? today();
+
+    const date = new Date().toISOString();
 
     // dryRun 模式：回傳 mock 資料
     if (args.dryRun) {
@@ -166,7 +167,7 @@ export async function handleGetReleaseManager(args, _ctx) {
         found: true,
         name: 'Alvin Wang',
         dryRun: true,
-        event: {what: 'Sign off staff', who: 'Alvin Wang (BK00236)'},
+        event: { what: 'Sign off staff', who: 'Alvin Wang (BK00236)' },
       });
     }
 
@@ -177,42 +178,55 @@ export async function handleGetReleaseManager(args, _ctx) {
     }
 
     // Release Manager 值班表的 sub-calendar ID（來自 wiki 頁 109861360）
-    const SUB_CALENDAR_ID = 'afcd2271-8dfa-410e-a922-454f1eec03c0';
+    const SUB_CALENDAR_ID = '7e83502d-7994-4d90-87c2-9268e5d7d565';
 
     const nextDay = new Date(date);
     nextDay.setDate(nextDay.getDate() + 1);
-    const endDate = nextDay.toISOString().slice(0, 10);
+    const endDate = nextDay.toISOString();
 
     const path =
       `/rest/calendar-services/1.0/calendar/events.json` +
       `?subCalendarId=${encodeURIComponent(SUB_CALENDAR_ID)}` +
-      `&start=${date}&end=${endDate}` +
+      `&start=${encodeURIComponent(date)}&end=${encodeURIComponent(endDate)}` +
       `&userTimeZoneId=Asia%2FTaipei`;
 
     const data = await calendarRequest(CONF_BASE_URL, path, CONF_TOKEN);
     const events = data.events ?? [];
 
-    // 找 what 欄位（event title）包含 "Sign off staff" 的事件
+    // 找 event title/what 欄位包含 "Sign off staff" 的事件。
     const signOffEvent = events.find(
       (e) =>
-        (e.what ?? '').toLowerCase().includes('sign off staff') ||
-        (e.title ?? '').toLowerCase().includes('sign off staff'),
+        (e.title ?? '').toLowerCase().includes('sign off staff') ||
+        (e.what ?? '').toLowerCase().includes('sign off staff'),
     );
 
     if (!signOffEvent) {
       return ok({
         date,
         found: false,
-        allEvents: events.map((e) => ({what: e.what, who: e.who})),
+        allEvents: events.map((e) => ({
+          title: e.title,
+          what: e.what,
+          who: e.who,
+        })),
         message: `${date} 找不到 Sign off staff 事件，請手動確認值班組長`,
       });
     }
 
     // 回傳值班人員資訊
+    const invitee = signOffEvent.invitees?.[0];
+    const legacyWho = signOffEvent.who ?? '';
+    const legacyName = legacyWho.replace(/\s*\([^)]*\)\s*$/, '').trim();
+    const legacyAccountId = legacyWho.match(/\(([^)]+)\)/)?.[1];
+    const managerName = (invitee?.displayName ?? legacyName)
+      || signOffEvent.title
+      || signOffEvent.what
+      || 'Unknown';
     return ok({
       date,
       found: true,
-      name: signOffEvent.who ?? signOffEvent.what ?? '',
+      name: managerName,
+      authorAccountId: invitee?.name ?? legacyAccountId ?? 'Unknown',
       event: signOffEvent,
     });
   } catch (err) {
@@ -220,7 +234,7 @@ export async function handleGetReleaseManager(args, _ctx) {
   }
 }
 
-export async function handleWaitForComment(args, {jira}) {
+export async function handleWaitForComment(args, { jira, progress = () => {} }) {
   // dryRun 模式：直接回傳 mock 結果
   if (args.dryRun) {
     return ok({
@@ -248,6 +262,7 @@ export async function handleWaitForComment(args, {jira}) {
   while (true) {
     attempts++;
     const comments = await jira.getComments(args.issueKey);
+    const elapsedMs = Date.now() - startTime;
 
     const match = comments.find((c) => {
       const bodyMatch = (c.body ?? '').toLowerCase().includes(args.keyword.toLowerCase());
@@ -255,6 +270,18 @@ export async function handleWaitForComment(args, {jira}) {
       return bodyMatch && authorMatch;
     });
 
+    progress({
+      phase: 'polling',
+      title: '等待 Jira comment',
+      detail: `keyword="${args.keyword}"` +
+        (args.authorAccountId ? `, author=${args.authorAccountId}` : ''),
+      issueKey: args.issueKey,
+      attempts,
+      elapsedMs,
+      timeoutMs,
+      nextPollMs: intervalMs,
+    });
+
     if (match) {
       return ok({
         found: true,
@@ -267,10 +294,9 @@ export async function handleWaitForComment(args, {jira}) {
       });
     }
 
-    const elapsed = Date.now() - startTime;
-    if (elapsed >= timeoutMs) {
+    if (elapsedMs >= timeoutMs) {
       return error(
-        `Timeout：等待 "${args.keyword}" comment in ${args.issueKey}（${attempts} 次輪詢，${Math.round(elapsed / 1000)}s）`,
+        `Timeout：等待 "${args.keyword}" comment in ${args.issueKey}（${attempts} 次輪詢，${Math.round(elapsedMs / 1000)}s）`,
       );
     }
 
@@ -292,7 +318,7 @@ function calendarRequest(baseUrl, path, token) {
         path: url.pathname + url.search,
         method: 'GET',
         rejectUnauthorized: false,
-        headers: {Authorization: `Bearer ${token}`, Accept: 'application/json'},
+        headers: { Authorization: `Bearer ${token}`, Accept: 'application/json' },
       },
       (res) => {
         let data = '';
@@ -300,6 +326,7 @@ function calendarRequest(baseUrl, path, token) {
         res.on('end', () => {
           if (res.statusCode >= 200 && res.statusCode < 300) {
             try {
+
               resolve(JSON.parse(data));
             } catch (e) {
               reject(new Error(`JSON parse error: ${e.message}`));

package/tools/workflows.js

@@ -80,6 +80,12 @@ function parseToolJson(result) {
 
 async function runToolOrThrow(name, args, deps, workflowLog) {
   workflowLog.push(`- ${name}: ${formatJson(args)}`);
+  deps.progress?.({
+    phase: 'action',
+    title: `執行 workflow step: ${name}`,
+    toolName: name,
+    issueKey: args.issueKey ?? args.cdIssueKey ?? args.linkedCiKey,
+  });
   const result = await deps.executeToolImpl(name, args, deps);
   return parseToolJson(result);
 }
@@ -89,10 +95,24 @@ async function waitForIssueStatus(issueKey, targetStatuses, deps, options = {})
   const intervalMs = options.intervalMs ?? 5000;
   const startedAt = Date.now();
   const wanted = targetStatuses.map((status) => status.toLowerCase());
+  let attempts = 0;
 
   while (Date.now() - startedAt < timeoutMs) {
+    attempts++;
     const issue = await deps.jira.getIssue(issueKey);
     const current = issue.fields?.status?.name ?? '';
+    deps.progress?.({
+      phase: 'polling',
+      title: `等待 ${issueKey} workflow 狀態`,
+      detail: `target=${targetStatuses.join(' / ')}`,
+      issueKey,
+      currentStatus: current,
+      targetStatus: targetStatuses.join(' / '),
+      attempts,
+      elapsedMs: Date.now() - startedAt,
+      timeoutMs,
+      nextPollMs: intervalMs,
+    });
     if (wanted.includes(current.toLowerCase())) {
       return current;
     }