@sk8metal/michi-cli 0.0.8 → 0.1.0

package/dist/scripts/jira-sync.js

@@ -23,14 +23,14 @@ import { config } from 'dotenv';
 import { loadProjectMeta } from './utils/project-meta.js';
 import { validateFeatureNameOrThrow } from './utils/feature-name-validator.js';
 import { getConfig, getConfigPath } from './utils/config-loader.js';
-import { validateForJiraSync } from './utils/config-validator.js';
-import { updateSpecJsonAfterJiraSync } from './utils/spec-updater.js';
+import { validateForJiraSyncAsync } from './utils/config-validator.js';
+import { updateSpecJsonAfterJiraSync, } from './utils/spec-updater.js';
 config();
 /**
  * リクエスト間のスリープ処理（レートリミット対策）
  */
 function sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
+    return new Promise((resolve) => setTimeout(resolve, ms));
 }
 /**
  * リクエスト間の待機時間（ミリ秒）
@@ -73,18 +73,18 @@ function extractStoryDetails(tasksContent, storyTitle) {
     if (criteriaMatch) {
         details.acceptanceCriteria = criteriaMatch[1]
             .split('\n')
-            .filter(line => line.trim().startsWith('- ['))
-            .map(line => line.replace(/^- \[.\]\s*/, '').trim())
-            .filter(line => line.length > 0);
+            .filter((line) => line.trim().startsWith('- ['))
+            .map((line) => line.replace(/^- \[.\]\s*/, '').trim())
+            .filter((line) => line.length > 0);
     }
     // サブタスク抽出
     const subtasksMatch = storySection.match(/\*\*サブタスク\*\*:\s*\n((?:- \[.\].*\n?)+)/);
     if (subtasksMatch) {
         details.subtasks = subtasksMatch[1]
             .split('\n')
-            .filter(line => line.trim().startsWith('- ['))
-            .map(line => line.replace(/^- \[.\]\s*/, '').trim())
-            .filter(line => line.length > 0);
+            .filter((line) => line.trim().startsWith('- ['))
+            .map((line) => line.replace(/^- \[.\]\s*/, '').trim())
+            .filter((line) => line.length > 0);
     }
     // 依存関係抽出
     const dependenciesMatch = storySection.match(/\*\*依存関係\*\*:\s*(.+)/);
@@ -102,11 +102,11 @@ function createRichADF(details, phaseLabel, githubUrl) {
         content.push({
             type: 'heading',
             attrs: { level: 2 },
-            content: [{ type: 'text', text: '説明' }]
+            content: [{ type: 'text', text: '説明' }],
         });
         content.push({
             type: 'paragraph',
-            content: [{ type: 'text', text: details.description }]
+            content: [{ type: 'text', text: details.description }],
         });
     }
     // メタデータセクション
@@ -123,12 +123,12 @@ function createRichADF(details, phaseLabel, githubUrl) {
         content.push({
             type: 'heading',
             attrs: { level: 2 },
-            content: [{ type: 'text', text: 'メタデータ' }]
+            content: [{ type: 'text', text: 'メタデータ' }],
         });
-        metadata.forEach(item => {
+        metadata.forEach((item) => {
             content.push({
                 type: 'paragraph',
-                content: [{ type: 'text', text: item }]
+                content: [{ type: 'text', text: item }],
             });
         });
     }
@@ -137,18 +137,20 @@ function createRichADF(details, phaseLabel, githubUrl) {
         content.push({
             type: 'heading',
             attrs: { level: 2 },
-            content: [{ type: 'text', text: '完了条件' }]
+            content: [{ type: 'text', text: '完了条件' }],
         });
-        const listItems = details.acceptanceCriteria.map(criterion => ({
+        const listItems = details.acceptanceCriteria.map((criterion) => ({
             type: 'listItem',
-            content: [{
+            content: [
+                {
                     type: 'paragraph',
-                    content: [{ type: 'text', text: criterion }]
-                }]
+                    content: [{ type: 'text', text: criterion }],
+                },
+            ],
         }));
         content.push({
             type: 'bulletList',
-            content: listItems
+            content: listItems,
         });
     }
     // サブタスクセクション
@@ -156,30 +158,32 @@ function createRichADF(details, phaseLabel, githubUrl) {
         content.push({
             type: 'heading',
             attrs: { level: 2 },
-            content: [{ type: 'text', text: 'サブタスク' }]
+            content: [{ type: 'text', text: 'サブタスク' }],
         });
-        const listItems = details.subtasks.map(subtask => ({
+        const listItems = details.subtasks.map((subtask) => ({
             type: 'listItem',
-            content: [{
+            content: [
+                {
                     type: 'paragraph',
-                    content: [{ type: 'text', text: subtask }]
-                }]
+                    content: [{ type: 'text', text: subtask }],
+                },
+            ],
         }));
         content.push({
             type: 'bulletList',
-            content: listItems
+            content: listItems,
         });
     }
     // フッター（Phase、GitHubリンク）
     content.push({
-        type: 'rule'
+        type: 'rule',
     });
     content.push({
         type: 'paragraph',
         content: [
             { type: 'text', text: 'Phase: ', marks: [{ type: 'strong' }] },
-            { type: 'text', text: phaseLabel }
-        ]
+            { type: 'text', text: phaseLabel },
+        ],
     });
     content.push({
         type: 'paragraph',
@@ -188,17 +192,19 @@ function createRichADF(details, phaseLabel, githubUrl) {
             {
                 type: 'text',
                 text: githubUrl,
-                marks: [{
+                marks: [
+                    {
                         type: 'link',
-                        attrs: { href: githubUrl }
-                    }]
-            }
-        ]
+                        attrs: { href: githubUrl },
+                    },
+                ],
+            },
+        ],
     });
     return {
         type: 'doc',
         version: 1,
-        content: content
+        content: content,
     };
 }
 /**
@@ -206,19 +212,19 @@ function createRichADF(details, phaseLabel, githubUrl) {
  */
 function textToADF(text) {
     // 改行で分割して段落を作成
-    const paragraphs = text.split('\n').filter(line => line.trim().length > 0);
+    const paragraphs = text.split('\n').filter((line) => line.trim().length > 0);
     return {
         type: 'doc',
         version: 1,
-        content: paragraphs.map(para => ({
+        content: paragraphs.map((para) => ({
             type: 'paragraph',
             content: [
                 {
                     type: 'text',
-                    text: para.trim()
-                }
-            ]
-        }))
+                    text: para.trim(),
+                },
+            ],
+        })),
     };
 }
 function getJIRAConfig() {
@@ -247,17 +253,43 @@ class JIRAClient {
         // レートリミット対策: リクエスト前に待機
         await sleep(this.requestDelay);
         try {
+            // JIRA API v3の検索エンドポイントを使用
+            // GET /rest/api/3/search でJQL検索を実行（GETメソッドが推奨）
             const response = await axios.get(`${this.baseUrl}/search`, {
-                params: { jql, maxResults: 100 },
+                params: {
+                    jql,
+                    maxResults: 100,
+                    fields: 'summary,issuetype,status,key',
+                },
                 headers: {
-                    'Authorization': `Basic ${this.auth}`,
-                    'Content-Type': 'application/json'
-                }
+                    Authorization: `Basic ${this.auth}`,
+                    'Content-Type': 'application/json',
+                },
             });
             return response.data.issues || [];
         }
         catch (error) {
-            console.error('Error searching issues:', error instanceof Error ? error.message : error);
+            // エラーハンドリング改善
+            if (axios.isAxiosError(error)) {
+                const status = error.response?.status;
+                const errorMessages = error.response?.data?.errorMessages || [];
+                const message = errorMessages.join(', ') || error.message;
+                console.error(`Error searching issues (HTTP ${status}): ${message}`);
+                if (status === 410) {
+                    console.error('💡 Hint: The search API endpoint returned 410 (Gone).');
+                    console.error('   This may indicate the endpoint has been deprecated or disabled.');
+                    console.error('   Check JIRA instance configuration or try alternative search methods.');
+                }
+                else if (status === 401) {
+                    console.error('💡 Hint: Authentication failed. Check ATLASSIAN_API_TOKEN in .env');
+                }
+                else if (status === 403) {
+                    console.error('💡 Hint: Permission denied. Check API token permissions in JIRA.');
+                }
+            }
+            else {
+                console.error('Error searching issues:', error instanceof Error ? error.message : error);
+            }
             throw error; // エラーを再スローして呼び出し元で処理
         }
     }
@@ -266,9 +298,9 @@ class JIRAClient {
         await sleep(this.requestDelay);
         const response = await axios.post(`${this.baseUrl}/issue`, payload, {
             headers: {
-                'Authorization': `Basic ${this.auth}`,
-                'Content-Type': 'application/json'
-            }
+                Authorization: `Basic ${this.auth}`,
+                'Content-Type': 'application/json',
+            },
         });
         return response.data;
     }
@@ -277,28 +309,159 @@ class JIRAClient {
         await sleep(this.requestDelay);
         await axios.put(`${this.baseUrl}/issue/${issueKey}`, payload, {
             headers: {
-                'Authorization': `Basic ${this.auth}`,
-                'Content-Type': 'application/json'
-            }
+                Authorization: `Basic ${this.auth}`,
+                'Content-Type': 'application/json',
+            },
         });
     }
+    /**
+     * JIRAチケットのステータスを変更（トランジション実行）
+     * @param issueKey JIRAチケットキー (例: "PROJ-123")
+     * @param transitionName 遷移先ステータス名 (例: "In Progress", "Ready for Review")
+     * @throws トランジションが見つからない場合はエラー
+     */
+    async transitionIssue(issueKey, transitionName) {
+        // レートリミット対策: リクエスト前に待機
+        await sleep(this.requestDelay);
+        try {
+            // 1. 利用可能なトランジションを取得
+            const transitionsResponse = await axios.get(`${this.baseUrl}/issue/${issueKey}/transitions`, {
+                headers: {
+                    Authorization: `Basic ${this.auth}`,
+                    'Content-Type': 'application/json',
+                },
+            });
+            const transitions = transitionsResponse.data.transitions || [];
+            // 2. transitionNameに一致するトランジションIDを特定
+            // 名前の完全一致または部分一致で検索
+            const transition = transitions.find((t) => t.name.toLowerCase() === transitionName.toLowerCase() ||
+                t.name.toLowerCase().includes(transitionName.toLowerCase()));
+            if (!transition) {
+                const availableTransitions = transitions
+                    .map((t) => t.name)
+                    .join(', ');
+                throw new Error(`Transition "${transitionName}" not found for issue ${issueKey}. ` +
+                    `Available transitions: ${availableTransitions || 'none'}`);
+            }
+            // レートリミット対策: リクエスト前に待機
+            await sleep(this.requestDelay);
+            // 3. トランジションを実行
+            await axios.post(`${this.baseUrl}/issue/${issueKey}/transitions`, {
+                transition: { id: transition.id },
+            }, {
+                headers: {
+                    Authorization: `Basic ${this.auth}`,
+                    'Content-Type': 'application/json',
+                },
+            });
+            console.log(`✅ ${issueKey} のステータスを「${transition.name}」に変更しました`);
+        }
+        catch (error) {
+            if (axios.isAxiosError(error)) {
+                const status = error.response?.status;
+                const errorMessages = error.response?.data?.errorMessages || [];
+                const message = errorMessages.join(', ') || error.message;
+                console.error(`Error transitioning issue ${issueKey} (HTTP ${status}): ${message}`);
+                if (status === 404) {
+                    console.error(`💡 Hint: Issue ${issueKey} was not found. Check the issue key.`);
+                }
+                else if (status === 400) {
+                    console.error('💡 Hint: The transition may not be valid from the current status.');
+                }
+            }
+            throw error;
+        }
+    }
+    /**
+     * JIRAチケットにコメントを追加
+     * @param issueKey JIRAチケットキー
+     * @param commentText コメント内容
+     */
+    async addComment(issueKey, commentText) {
+        // レートリミット対策: リクエスト前に待機
+        await sleep(this.requestDelay);
+        try {
+            // Atlassian Document Format (ADF) でコメントを作成
+            const commentBody = {
+                type: 'doc',
+                version: 1,
+                content: [
+                    {
+                        type: 'paragraph',
+                        content: [
+                            {
+                                type: 'text',
+                                text: commentText,
+                            },
+                        ],
+                    },
+                ],
+            };
+            await axios.post(`${this.baseUrl}/issue/${issueKey}/comment`, {
+                body: commentBody,
+            }, {
+                headers: {
+                    Authorization: `Basic ${this.auth}`,
+                    'Content-Type': 'application/json',
+                },
+            });
+            console.log(`✅ ${issueKey} にコメントを追加しました`);
+        }
+        catch (error) {
+            if (axios.isAxiosError(error)) {
+                const status = error.response?.status;
+                const errorMessages = error.response?.data?.errorMessages || [];
+                const message = errorMessages.join(', ') || error.message;
+                console.error(`Error adding comment to ${issueKey} (HTTP ${status}): ${message}`);
+                if (status === 404) {
+                    console.error(`💡 Hint: Issue ${issueKey} was not found. Check the issue key.`);
+                }
+            }
+            throw error;
+        }
+    }
+    /**
+     * プロジェクトのIssue Type IDを取得
+     * @param projectKey プロジェクトキー
+     * @param issueTypeName Issue Type名（例: "Epic", "Story"）
+     * @returns Issue Type ID
+     */
+    async getIssueTypeId(projectKey, issueTypeName) {
+        await sleep(this.requestDelay);
+        try {
+            const response = await axios.get(`${this.baseUrl}/project/${projectKey}`, {
+                headers: {
+                    Authorization: `Basic ${this.auth}`,
+                    'Content-Type': 'application/json',
+                },
+            });
+            const issueTypes = (response.data.issueTypes || []);
+            const issueType = issueTypes.find((it) => it.name.toLowerCase() === issueTypeName.toLowerCase() ||
+                it.name === issueTypeName);
+            return issueType ? issueType.id : null;
+        }
+        catch (error) {
+            console.error(`Error getting issue type ID for ${issueTypeName}:`, error instanceof Error ? error.message : error);
+            return null;
+        }
+    }
 }
 async function syncTasksToJIRA(featureName) {
     console.log(`Syncing tasks for feature: ${featureName}`);
     // feature名のバリデーション（必須）
     validateFeatureNameOrThrow(featureName);
-    // 実行前の必須設定値チェック
-    const validation = validateForJiraSync();
+    // 実行前の必須設定値チェック（非同期版：Issue Type IDの存在チェック付き）
+    const validation = await validateForJiraSyncAsync();
     if (validation.info.length > 0) {
-        validation.info.forEach(msg => console.log(`ℹ️  ${msg}`));
+        validation.info.forEach((msg) => console.log(`ℹ️  ${msg}`));
     }
     if (validation.warnings.length > 0) {
         console.warn('⚠️  Warnings:');
-        validation.warnings.forEach(warning => console.warn(`   ${warning}`));
+        validation.warnings.forEach((warning) => console.warn(`   ${warning}`));
     }
     if (validation.errors.length > 0) {
         console.error('❌ Configuration errors:');
-        validation.errors.forEach(error => console.error(`   ${error}`));
+        validation.errors.forEach((error) => console.error(`   ${error}`));
         const configPath = getConfigPath();
         console.error(`\n設定ファイル: ${configPath}`);
         throw new Error('JIRA同期に必要な設定値が不足しています。上記のエラーを確認して設定を修正してください。');
@@ -306,26 +469,35 @@ async function syncTasksToJIRA(featureName) {
     console.log(`⏳ Request delay: ${getRequestDelay()}ms (set ATLASSIAN_REQUEST_DELAY to adjust)`);
     // 設定からissue type IDを取得（検索と作成の両方で使用）
     const appConfig = getConfig();
-    const storyIssueTypeId = appConfig.jira?.issueTypes?.story || process.env.JIRA_ISSUE_TYPE_STORY;
-    const subtaskIssueTypeId = appConfig.jira?.issueTypes?.subtask || process.env.JIRA_ISSUE_TYPE_SUBTASK;
+    const projectMeta = loadProjectMeta();
+    const config = getJIRAConfig();
+    const client = new JIRAClient(config);
+    // StoryタイプのIDを動的に取得（日本語JIRAでは "ストーリー" という名前の場合がある）
+    let storyIssueTypeId = appConfig.jira?.issueTypes?.story || process.env.JIRA_ISSUE_TYPE_STORY;
+    console.log(`📋 Story Issue Type ID from config/env: ${storyIssueTypeId || 'not found'}`);
     if (!storyIssueTypeId) {
-        throw new Error('JIRA Story issue type ID is not configured. ' +
+        console.log('🔍 Attempting to find Story issue type dynamically...');
+        const foundId = (await client.getIssueTypeId(projectMeta.jiraProjectKey, 'Story')) ||
+            (await client.getIssueTypeId(projectMeta.jiraProjectKey, 'ストーリー'));
+        storyIssueTypeId = foundId ?? undefined;
+        console.log(`📋 Story Issue Type ID from API: ${storyIssueTypeId || 'not found'}`);
+    }
+    if (!storyIssueTypeId) {
+        throw new Error('JIRA Story issue type ID is not configured and could not be found in project. ' +
             'Please set JIRA_ISSUE_TYPE_STORY environment variable or configure it in .michi/config.json. ' +
             'You can find the issue type ID in JIRA UI (Settings > Issues > Issue types) or via REST API: ' +
-            'GET https://your-domain.atlassian.net/rest/api/3/issuetype');
+            'GET https://your-domain.atlassian.net/rest/api/3/project/{projectKey}');
     }
-    const projectMeta = loadProjectMeta();
+    console.log(`✅ Using Story Issue Type ID: ${storyIssueTypeId}`);
     const tasksPath = resolve(`.kiro/specs/${featureName}/tasks.md`);
     const tasksContent = readFileSync(tasksPath, 'utf-8');
-    const config = getJIRAConfig();
-    const client = new JIRAClient(config);
     // spec.jsonを読み込んで既存のEpicキーを確認
     const specPath = resolve(`.kiro/specs/${featureName}/spec.json`);
     let spec = {};
     try {
         spec = JSON.parse(readFileSync(specPath, 'utf-8'));
     }
-    catch (error) {
+    catch {
         console.error('spec.json not found or invalid');
     }
     let epic;
@@ -347,8 +519,10 @@ async function syncTasksToJIRA(featureName) {
         }
         catch (error) {
             console.error('❌ Failed to search existing Epics:', error instanceof Error ? error.message : error);
-            console.error('⚠️  Cannot verify idempotency - Epic creation may result in duplicates');
-            throw new Error(`JIRA Epic search failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
+            console.error('⚠️  Cannot verify idempotency - proceeding with Epic creation');
+            console.error('   If Epic already exists, manual cleanup may be required');
+            // 検索失敗時はフォールバック: 新規作成を試みる（重複リスクあり）
+            existingEpics = [];
         }
         if (existingEpics.length > 0) {
             console.log(`Found existing Epic with similar title: ${existingEpics[0].key}`);
@@ -356,27 +530,38 @@ async function syncTasksToJIRA(featureName) {
             epic = existingEpics[0];
         }
         else {
+            // EpicタイプのIDを取得（日本語JIRAでは "エピック" という名前の場合がある）
+            const epicTypeId = (await client.getIssueTypeId(projectMeta.jiraProjectKey, 'Epic')) ||
+                (await client.getIssueTypeId(projectMeta.jiraProjectKey, 'エピック'));
+            if (!epicTypeId) {
+                throw new Error('Epic issue type not found in project. ' +
+                    'Please ensure the project has Epic issue type enabled.');
+            }
             const epicDescription = `機能: ${featureName}\nGitHub: ${projectMeta.repository}/tree/main/.kiro/specs/${featureName}`;
             const epicPayload = {
                 fields: {
                     project: { key: projectMeta.jiraProjectKey },
                     summary: epicSummary,
                     description: textToADF(epicDescription), // ADF形式に変換
-                    issuetype: { name: 'Epic' },
-                    labels: projectMeta.confluenceLabels
-                }
+                    issuetype: { id: epicTypeId }, // IDを使用（nameではなく）
+                    labels: projectMeta.confluenceLabels,
+                },
             };
             epic = await client.createIssue(epicPayload);
             console.log(`✅ Epic created: ${epic.key}`);
         }
     }
+    // Epicが確実に設定されていることを確認
+    if (!epic) {
+        throw new Error('Epic creation or retrieval failed');
+    }
     // 既存のStoryを検索（重複防止）
     // ラベルで検索（summary検索では "Story: タイトル" 形式に一致しないため）
     // issuetype検索にはIDを使用（名前は言語依存のため）
-    const jql = `project = ${projectMeta.jiraProjectKey} AND issuetype = ${storyIssueTypeId} AND labels = "${featureName}"`;
+    const storyJql = `project = ${projectMeta.jiraProjectKey} AND issuetype = ${storyIssueTypeId} AND labels = "${featureName}"`;
     let existingStories = [];
     try {
-        existingStories = await client.searchIssues(jql);
+        existingStories = await client.searchIssues(storyJql);
     }
     catch (error) {
         console.error('❌ Failed to search existing Stories:', error instanceof Error ? error.message : error);
@@ -385,12 +570,17 @@ async function syncTasksToJIRA(featureName) {
         // 検索失敗時も処理を継続（既存ストーリーなしとして扱う）
         existingStories = [];
     }
-    const existingStorySummaries = new Set(existingStories.map((s) => s.fields.summary));
-    const existingStoryKeys = new Set(existingStories.map((s) => s.key));
+    const existingStorySummaries = new Set(existingStories
+        .filter((s) => s?.fields?.summary)
+        .map((s) => s.fields.summary));
+    const existingStoryKeys = new Set(existingStories
+        .filter((s) => s?.key)
+        .map((s) => s.key));
     console.log(`Found ${existingStories.length} existing stories for this feature`);
     // フェーズラベル検出用の正規表現
     // Phase X: フェーズ名（ラベル）の形式を検出
-    const phasePattern = /## Phase [\d.]+:\s*(.+?)（(.+?)）/;
+    // Phase番号: 数字（0, 1, 2...）、ドット付き数字（0.1, 0.2...）、英字（A, B）に対応
+    const phasePattern = /## Phase [\d.A-Z]+:\s*(.+?)(?:（(.+?)）)?/;
     // Story作成（フェーズ検出付きパーサー）
     const lines = tasksContent.split('\n');
     let currentPhaseLabel = 'implementation'; // デフォルトは実装フェーズ
@@ -400,27 +590,98 @@ async function syncTasksToJIRA(featureName) {
         // フェーズ検出
         const phaseMatch = line.match(phasePattern);
         if (phaseMatch) {
-            const phaseName = phaseMatch[2]; // 括弧内のラベル（例: Requirements）
-            // フェーズ名からラベルを決定
-            if (phaseName.includes('要件定義') || phaseName.toLowerCase().includes('requirements')) {
+            const phaseTitle = phaseMatch[1]; // フェーズタイトル全体
+            const phaseName = phaseMatch[2] || phaseTitle; // 括弧内のラベル（例: Requirements）または全体
+            // Phase番号を抽出（例: "0.1", "2", "A"）
+            const phaseNumberMatch = line.match(/## Phase ([\d.A-Z]+):/);
+            const phaseNumber = phaseNumberMatch ? phaseNumberMatch[1] : '';
+            // フェーズ番号またはフェーズ名からラベルを決定
+            // 新ワークフロー構造に対応
+            if (phaseNumber === '0.0' ||
+                phaseName.includes('初期化') ||
+                phaseName.toLowerCase().includes('init')) {
+                currentPhaseLabel = 'spec-init';
+            }
+            else if (phaseNumber === '0.1' ||
+                phaseName.includes('要件定義') ||
+                phaseName.toLowerCase().includes('requirements')) {
                 currentPhaseLabel = 'requirements';
             }
-            else if (phaseName.includes('設計') || phaseName.toLowerCase().includes('design')) {
+            else if (phaseNumber === '0.2' ||
+                phaseName.includes('設計') ||
+                phaseName.toLowerCase().includes('design')) {
                 currentPhaseLabel = 'design';
             }
-            else if (phaseName.includes('実装') || phaseName.toLowerCase().includes('implementation')) {
+            else if (phaseNumber === '0.3' ||
+                phaseName.includes('テストタイプ') ||
+                phaseName.toLowerCase().includes('test-type') ||
+                phaseName.toLowerCase().includes('test type')) {
+                currentPhaseLabel = 'test-type-selection';
+            }
+            else if (phaseNumber === '0.4' ||
+                phaseName.includes('テスト仕様') ||
+                phaseName.toLowerCase().includes('test-spec') ||
+                phaseName.toLowerCase().includes('test spec')) {
+                currentPhaseLabel = 'test-spec';
+            }
+            else if (phaseNumber === '0.5' ||
+                phaseName.includes('タスク分割') ||
+                phaseName.toLowerCase().includes('tasks') ||
+                phaseName.toLowerCase().includes('task breakdown')) {
+                currentPhaseLabel = 'spec-tasks';
+            }
+            else if (phaseNumber === '0.6' ||
+                phaseName.includes('JIRA') ||
+                phaseName.toLowerCase().includes('jira')) {
+                currentPhaseLabel = 'jira-sync';
+            }
+            else if (phaseNumber === '1' ||
+                phaseName.includes('環境構築') ||
+                phaseName.toLowerCase().includes('environment') ||
+                phaseName.toLowerCase().includes('setup')) {
+                currentPhaseLabel = 'environment-setup';
+            }
+            else if (phaseNumber === '2' ||
+                phaseName.includes('実装') ||
+                phaseName.includes('TDD') ||
+                phaseName.toLowerCase().includes('implementation')) {
                 currentPhaseLabel = 'implementation';
             }
-            else if (phaseName.includes('試験') || phaseName.toLowerCase().includes('testing')) {
-                currentPhaseLabel = 'testing';
+            else if (phaseNumber === 'A' ||
+                phaseNumber.toLowerCase() === 'a' ||
+                phaseName.includes('PR前') ||
+                phaseName.toLowerCase().includes('pr-test') ||
+                phaseName.toLowerCase().includes('pr test')) {
+                currentPhaseLabel = 'phase-a';
             }
-            else if (phaseName.includes('リリース準備') || phaseName.toLowerCase().includes('release-prep') || phaseName.toLowerCase().includes('release preparation')) {
+            else if (phaseNumber === '3' ||
+                phaseName.includes('追加QA') ||
+                phaseName.includes('QA') ||
+                phaseName.includes('試験') ||
+                phaseName.toLowerCase().includes('testing') ||
+                phaseName.toLowerCase().includes('additional qa')) {
+                currentPhaseLabel = 'additional-qa';
+            }
+            else if (phaseNumber === 'B' ||
+                phaseNumber.toLowerCase() === 'b' ||
+                phaseName.includes('リリース準備テスト') ||
+                phaseName.toLowerCase().includes('release-test') ||
+                phaseName.toLowerCase().includes('release test')) {
+                currentPhaseLabel = 'phase-b';
+            }
+            else if (phaseNumber === '4' ||
+                phaseName.includes('リリース準備') ||
+                phaseName.toLowerCase().includes('release-prep') ||
+                phaseName.toLowerCase().includes('release preparation')) {
                 currentPhaseLabel = 'release-prep';
             }
-            else if (phaseName.includes('リリース') || phaseName.toLowerCase().includes('release')) {
+            else if (phaseNumber === '5' ||
+                (phaseName.includes('リリース') && !phaseName.includes('準備')) ||
+                (phaseName.toLowerCase().includes('release') &&
+                    !phaseName.toLowerCase().includes('prep'))) {
                 currentPhaseLabel = 'release';
             }
-            console.log(`📌 Phase detected: ${phaseName} (label: ${currentPhaseLabel})`);
+            console.log(`📌 Phase detected: ${phaseTitle} (number: ${phaseNumber}, label: ${currentPhaseLabel})`);
             continue;
         }
         // Story検出
@@ -432,9 +693,13 @@ async function syncTasksToJIRA(featureName) {
         // 既に同じタイトルのStoryが存在するかチェック
         if (existingStorySummaries.has(storySummary)) {
             console.log(`Skipping Story (already exists): ${storyTitle}`);
-            const existing = existingStories.find((s) => s.fields.summary === storySummary);
+            const existing = existingStories.find((s) => s?.fields?.summary === storySummary);
             if (existing) {
                 createdStories.push(existing.key);
+                existingStoryKeys.add(existing.key);
+            }
+            else {
+                console.warn(`⚠️  Warning: Story "${storyTitle}" is in summary set but not found in existingStories array`);
             }
             continue;
         }
@@ -448,9 +713,9 @@ async function syncTasksToJIRA(featureName) {
             const richDescription = createRichADF(storyDetails, currentPhaseLabel, githubUrl);
             // 優先度のマッピング（デフォルト: Medium）
             const priorityMap = {
-                'High': 'High',
-                'Medium': 'Medium',
-                'Low': 'Low'
+                High: 'High',
+                Medium: 'Medium',
+                Low: 'Low',
             };
             const priority = storyDetails.priority && priorityMap[storyDetails.priority]
                 ? priorityMap[storyDetails.priority]
@@ -470,9 +735,13 @@ async function syncTasksToJIRA(featureName) {
                     summary: storySummary,
                     description: richDescription, // リッチなADF形式
                     issuetype: { id: storyIssueTypeId },
-                    labels: [...projectMeta.confluenceLabels, featureName, currentPhaseLabel],
-                    priority: { name: priority }
-                }
+                    labels: [
+                        ...projectMeta.confluenceLabels,
+                        featureName,
+                        currentPhaseLabel,
+                    ],
+                    priority: { name: priority },
+                },
             };
             // 期限（Due Date）を設定
             if (storyDetails.dueDate) {
@@ -516,7 +785,8 @@ async function syncTasksToJIRA(featureName) {
             if (error.response?.data) {
                 console.error('  📋 JIRA API Error Details:', JSON.stringify(error.response.data, null, 2));
                 // Story Pointsフィールドのエラーの場合、警告を表示
-                if (error.response.data.errors && Object.keys(error.response.data.errors).some(key => key.includes('customfield'))) {
+                if (error.response.data.errors &&
+                    Object.keys(error.response.data.errors).some((key) => key.includes('customfield'))) {
                     console.error('  ⚠️  Story Pointsフィールドの設定に失敗しました。');
                     console.error('  💡 環境変数 JIRA_STORY_POINTS_FIELD を正しいカスタムフィールドIDに設定してください。');
                     console.error('  💡 JIRA管理画面でStory PointsのカスタムフィールドIDを確認してください。');
@@ -526,8 +796,8 @@ async function syncTasksToJIRA(featureName) {
         }
     }
     // 新規作成数と再利用数を正確に計算
-    const newStoryCount = createdStories.filter(key => !existingStoryKeys.has(key)).length;
-    const reusedStoryCount = createdStories.filter(key => existingStoryKeys.has(key)).length;
+    const newStoryCount = createdStories.filter((key) => !existingStoryKeys.has(key)).length;
+    const reusedStoryCount = createdStories.filter((key) => existingStoryKeys.has(key)).length;
     console.log('\n✅ JIRA sync completed');
     console.log(`   Epic: ${epic.key}`);
     console.log(`   Stories: ${createdStories.length} processed (${newStoryCount} new, ${reusedStoryCount} reused)`);
@@ -538,7 +808,7 @@ async function syncTasksToJIRA(featureName) {
             projectKey: projectMeta.jiraProjectKey,
             epicKey: epic.key,
             epicUrl: `${jiraBaseUrl}/browse/${epic.key}`,
-            storyKeys: createdStories
+            storyKeys: createdStories,
         });
     }
     catch (error) {