@sk8metal/michi-cli 0.5.0 → 0.8.0

package/scripts/template/multi-repo-renderer.ts

@@ -0,0 +1,172 @@
+/**
+ * Multi-Repo template renderer
+ *
+ * Provides template rendering functionality for Multi-Repo projects
+ */
+
+import { readFileSync } from 'fs';
+import { resolve, relative, isAbsolute } from 'path';
+import { renderTemplate, type TemplateContext } from './renderer.js';
+
+export interface MultiRepoTemplateContext {
+  PROJECT_NAME: string;
+  JIRA_KEY: string;
+  CONFLUENCE_SPACE: string;
+  CREATED_AT: string;
+}
+
+/**
+ * Create Multi-Repo template context
+ *
+ * @param projectName - Project name
+ * @param jiraKey - JIRA project key
+ * @param confluenceSpace - Confluence space key
+ * @param createdAt - Created timestamp (ISO 8601 format)
+ * @returns Multi-Repo template context
+ */
+export const createMultiRepoTemplateContext = (
+  projectName: string,
+  jiraKey: string,
+  confluenceSpace: string,
+  createdAt?: string
+): MultiRepoTemplateContext => ({
+  PROJECT_NAME: projectName,
+  JIRA_KEY: jiraKey,
+  CONFLUENCE_SPACE: confluenceSpace,
+  CREATED_AT: createdAt || new Date().toISOString(),
+});
+
+/**
+ * Load Multi-Repo template file
+ *
+ * Security: Path traversal prevention with three-layer validation:
+ * 1. Validate template name (no path separators)
+ * 2. Resolve absolute paths
+ * 3. Verify path containment
+ *
+ * @param templateName - Template name (e.g., "overview/requirements", "steering/multi-repo")
+ * @param projectRoot - Project root directory
+ * @returns Template content
+ * @throws {Error} If template file not found or path traversal detected
+ */
+export const loadMultiRepoTemplate = (
+  templateName: string,
+  projectRoot: string = process.cwd()
+): string => {
+  // Security Layer 1: Validate template name
+  // Reject path traversal characters (../, ..\, absolute paths)
+  if (templateName.includes('..') || templateName.includes('\\')) {
+    throw new Error(
+      `Invalid template name: ${templateName}\n` +
+      'Template name must not contain path traversal characters (\\, ..)'
+    );
+  }
+
+  // Security Layer 2: Resolve absolute paths
+  const templateDir = resolve(projectRoot, 'templates', 'multi-repo');
+  const templatePath = resolve(templateDir, `${templateName}.md`);
+
+  // Security Layer 3: Verify path containment
+  const relativePath = relative(templateDir, templatePath);
+  if (relativePath.startsWith('..') || isAbsolute(relativePath)) {
+    throw new Error(
+      `Invalid template path: ${templateName}\n` +
+      `Template path is outside template directory: ${templateDir}`
+    );
+  }
+
+  try {
+    return readFileSync(templatePath, 'utf-8');
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    throw new Error(
+      `Multi-Repo template not found: ${templateName}.md\n` +
+      `Path: ${templatePath}\n` +
+      `Error: ${errorMessage}`
+    );
+  }
+};
+
+/**
+ * Render Multi-Repo template with placeholder replacement
+ *
+ * @param template - Template string
+ * @param context - Multi-Repo template context
+ * @returns Rendered template string
+ */
+export const renderMultiRepoTemplate = (
+  template: string,
+  context: MultiRepoTemplateContext
+): string => {
+  // Convert MultiRepoTemplateContext to TemplateContext
+  const templateContext: TemplateContext = {
+    LANG_CODE: 'ja', // Default language
+    DEV_GUIDELINES: '', // Not used for Multi-Repo templates
+    KIRO_DIR: '.kiro',
+    AGENT_DIR: '.claude',
+    PROJECT_NAME: context.PROJECT_NAME,
+    JIRA_KEY: context.JIRA_KEY,
+    CONFLUENCE_SPACE: context.CONFLUENCE_SPACE,
+    CREATED_AT: context.CREATED_AT,
+  };
+
+  return renderTemplate(template, templateContext);
+};
+
+/**
+ * Load and render Multi-Repo template
+ *
+ * @param templateName - Template name
+ * @param context - Multi-Repo template context
+ * @param projectRoot - Project root directory
+ * @returns Rendered template string
+ */
+export const loadAndRenderMultiRepoTemplate = (
+  templateName: string,
+  context: MultiRepoTemplateContext,
+  projectRoot: string = process.cwd()
+): string => {
+  const template = loadMultiRepoTemplate(templateName, projectRoot);
+  return renderMultiRepoTemplate(template, context);
+};
+
+/**
+ * Batch render multiple Multi-Repo templates
+ *
+ * @param templateNames - Array of template names
+ * @param context - Multi-Repo template context
+ * @param projectRoot - Project root directory
+ * @returns Map of template names to rendered strings
+ */
+export const renderMultiRepoTemplates = (
+  templateNames: string[],
+  context: MultiRepoTemplateContext,
+  projectRoot: string = process.cwd()
+): Record<string, string> => {
+  const rendered: Record<string, string> = {};
+
+  for (const templateName of templateNames) {
+    rendered[templateName] = loadAndRenderMultiRepoTemplate(
+      templateName,
+      context,
+      projectRoot
+    );
+  }
+
+  return rendered;
+};
+
+/**
+ * List of all Multi-Repo template names
+ */
+export const MULTI_REPO_TEMPLATES = [
+  'overview/requirements',
+  'overview/architecture',
+  'overview/sequence',
+  'steering/multi-repo',
+  'tests/strategy',
+  'docs/ci-status',
+  'docs/release-notes',
+] as const;
+
+export type MultiRepoTemplateName = typeof MULTI_REPO_TEMPLATES[number];

package/scripts/template/renderer.ts

@@ -14,6 +14,11 @@ export interface TemplateContext {
   PROJECT_ID?: string;
   FEATURE_NAME?: string;
   TIMESTAMP?: string;
+  // Multi-Repo specific placeholders
+  PROJECT_NAME?: string;
+  JIRA_KEY?: string;
+  CONFLUENCE_SPACE?: string;
+  CREATED_AT?: string;
 }
 
 /**

package/scripts/test-execution-generator.ts

@@ -6,6 +6,73 @@
 import { readFileSync, writeFileSync, existsSync, mkdirSync, chmodSync } from 'fs';
 import { join } from 'path';
 
+/**
+ * セキュリティ: URLバリデーション
+ * HTTP/HTTPS URLのみ許可、特殊文字やコマンドインジェクションを防ぐ
+ */
+function validateUrl(url: string): void {
+  // 基本的なURL形式チェック
+  try {
+    const parsed = new URL(url);
+    if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
+      throw new Error(`Invalid protocol: ${parsed.protocol}. Only http: and https: are allowed.`);
+    }
+  } catch (_error) {
+    throw new Error(`Invalid URL format: ${url}`);
+  }
+
+  // コマンドインジェクション対策: 危険な文字を検出
+  const dangerousChars = /[;`$()&|<>]/;
+  if (dangerousChars.test(url)) {
+    throw new Error(`URL contains dangerous characters: ${url}`);
+  }
+}
+
+/**
+ * セキュリティ: Bash用文字列エスケープ
+ * シェルスクリプト内で安全に使用できる形式にエスケープ
+ */
+function escapeBash(str: string): string {
+  // シングルクォートで囲み、シングルクォート自体をエスケープ
+  return `'${str.replace(/'/g, '\'\\\'\'')}'`;
+}
+
+/**
+ * セキュリティ: Python用文字列エスケープ
+ * Pythonコード内で安全に使用できる形式にエスケープ
+ */
+function escapePython(str: string): string {
+  return str
+    .replace(/\\/g, '\\\\')  // バックスラッシュ
+    .replace(/"/g, '\\"')    // ダブルクォート
+    .replace(/\n/g, '\\n')   // 改行
+    .replace(/\r/g, '\\r')   // キャリッジリターン
+    .replace(/\t/g, '\\t');  // タブ
+}
+
+/**
+ * セキュリティ: Python識別子バリデーション
+ * Pythonのクラス名として有効な形式かチェック
+ */
+function validatePythonIdentifier(name: string): void {
+  // Python識別子のルール: 英字またはアンダースコアで始まり、英数字とアンダースコアのみ
+  const pythonIdentifierPattern = /^[A-Za-z_][A-Za-z0-9_]*$/;
+  if (!pythonIdentifierPattern.test(name)) {
+    throw new Error(`Invalid Python identifier: ${name}. Must start with letter or underscore, and contain only letters, numbers, and underscores.`);
+  }
+
+  // Pythonの予約語チェック
+  const pythonKeywords = [
+    'False', 'None', 'True', 'and', 'as', 'assert', 'async', 'await',
+    'break', 'class', 'continue', 'def', 'del', 'elif', 'else', 'except',
+    'finally', 'for', 'from', 'global', 'if', 'import', 'in', 'is', 'lambda',
+    'nonlocal', 'not', 'or', 'pass', 'raise', 'return', 'try', 'while', 'with', 'yield'
+  ];
+  if (pythonKeywords.includes(name)) {
+    throw new Error(`Invalid Python identifier: ${name} is a reserved keyword.`);
+  }
+}
+
 /**
  * テスト実行ファイルの生成オプション
  */
@@ -151,28 +218,47 @@ function generateLocustFile(
   endpoint: { endpoint: string; method: string; baseUrl: string },
   perfReqs: { targetRps: string; targetResponseTime: string }
 ): string {
+  // セキュリティ: URLバリデーション
+  validateUrl(endpoint.baseUrl);
+
+  // セキュリティ: Pythonエスケープ
+  const escapedFeature = escapePython(feature);
+  const escapedEndpoint = escapePython(endpoint.endpoint);
+  const escapedMethod = escapePython(endpoint.method);
+  const escapedBaseUrl = escapePython(endpoint.baseUrl);
+  const escapedTargetRps = escapePython(perfReqs.targetRps);
+  const escapedTargetResponseTime = escapePython(perfReqs.targetResponseTime);
+
+  // セキュリティ: Pythonクラス名の生成と検証
+  let className = feature.replace(/[^a-zA-Z0-9]/g, '_');
+  // クラス名は大文字で始まる必要がある（Python慣例）
+  if (!/^[A-Z]/.test(className)) {
+    className = 'Test' + className.charAt(0).toUpperCase() + className.slice(1);
+  }
+  // Python識別子として有効かチェック
+  validatePythonIdentifier(className);
+
   const methodLower = endpoint.method.toLowerCase();
   const hasBody = ['post', 'put', 'patch'].includes(methodLower);
-  const className = feature.replace(/[^a-zA-Z0-9]/g, '');
 
   let taskCode = '';
   if (hasBody) {
     taskCode = `        self.client.${methodLower}(
-            "${endpoint.endpoint}",
+            "${escapedEndpoint}",
             json={},
             headers={"Content-Type": "application/json"}
         )`;
   } else {
-    taskCode = `        self.client.${methodLower}("${endpoint.endpoint}")`;
+    taskCode = `        self.client.${methodLower}("${escapedEndpoint}")`;
   }
 
   return `"""
-${feature} 負荷テスト
-自動生成: michi phase:run ${feature} phase-b
+${escapedFeature} 負荷テスト
+自動生成: michi phase:run ${escapedFeature} phase-b
 
 目標:
-- RPS: ${perfReqs.targetRps}
-- 応答時間: ${perfReqs.targetResponseTime}ms以内
+- RPS: ${escapedTargetRps}
+- 応答時間: ${escapedTargetResponseTime}ms以内
 """
 
 from locust import HttpUser, task, between
@@ -182,11 +268,11 @@ class ${className}User(HttpUser):
     """テスト対象ユーザーシミュレーション"""
 
     wait_time = between(1, 3)
-    host = "${endpoint.baseUrl}"
+    host = "${escapedBaseUrl}"
 
     @task
     def test_endpoint(self):
-        """${endpoint.endpoint}への${endpoint.method}リクエスト"""
+        """${escapedEndpoint}への${escapedMethod}リクエスト"""
 ${taskCode}
 
 
@@ -369,14 +455,21 @@ function generateZapScript(
   feature: string,
   endpoint: { baseUrl: string }
 ): string {
+  // セキュリティ: URLバリデーション（コマンドインジェクション対策）
+  validateUrl(endpoint.baseUrl);
+
+  // セキュリティ: Bashエスケープ（追加の防御層）
+  const escapedUrl = escapeBash(endpoint.baseUrl);
+  const escapedFeature = escapeBash(feature);
+
   return `#!/bin/bash
 # OWASP ZAPセキュリティスキャン実行スクリプト
-# 自動生成: michi phase:run ${feature} phase-b
+# 自動生成: michi phase:run ${escapedFeature} phase-b
 
 set -e
 
 # 変数定義
-TARGET_URL="${endpoint.baseUrl}"
+TARGET_URL=${escapedUrl}
 CONFIG_FILE="zap-config.yaml"
 REPORT_DIR="./reports"
 

package/scripts/test-script-runner.ts

@@ -0,0 +1,130 @@
+/**
+ * テストスクリプトランナー
+ * Multi-Repoプロジェクトのテストスクリプトを実行
+ */
+
+import { execSync } from 'child_process';
+import { join } from 'path';
+
+/**
+ * テストタイプ
+ */
+export type TestType = 'e2e' | 'integration' | 'performance';
+
+/**
+ * テスト実行結果
+ */
+export interface TestExecutionResult {
+  success: boolean;
+  exitCode: number;
+  executionTime: number; // 秒単位
+  outputPath: string;
+  error?: string;
+}
+
+/**
+ * execSync実行時のエラー型
+ */
+interface ExecError extends Error {
+  status?: number;
+  stderr?: Buffer | string;
+}
+
+/**
+ * テストスクリプトランナー
+ */
+export class TestScriptRunner {
+  /**
+   * テストスクリプトを実行
+   *
+   * @param projectName プロジェクト名
+   * @param testType テストタイプ (e2e | integration | performance)
+   * @param projectRoot プロジェクトルートディレクトリ（デフォルト: process.cwd()）
+   * @returns テスト実行結果
+   */
+  async runTestScript(
+    projectName: string,
+    testType: TestType,
+    projectRoot: string = process.cwd()
+  ): Promise<TestExecutionResult> {
+    // 1. テストスクリプトパスを生成
+    const scriptPath = join(
+      projectRoot,
+      'docs',
+      'michi',
+      projectName,
+      'tests',
+      'scripts',
+      `run-${testType}.sh`
+    );
+
+    // 2. テスト結果の出力先パスを生成（スクリプト側で使用）
+    const timestamp = new Date().toISOString().replace(/[:.]/g, '-').split('T')[0];
+    const outputPath = join(
+      projectRoot,
+      'docs',
+      'michi',
+      projectName,
+      'tests',
+      'results',
+      `${testType}-${timestamp}.log`
+    );
+
+    // 3. 実行前のログ出力
+    console.log('🚀 テストスクリプトを実行中...');
+    console.log(`  テストタイプ: ${testType}`);
+    console.log(`  スクリプトパス: ${scriptPath}`);
+    console.log(`  実行開始時刻: ${new Date().toLocaleString('ja-JP', { timeZone: 'Asia/Tokyo' })}`);
+
+    // 4. テストスクリプトを実行
+    const startTime = Date.now();
+    let exitCode = 0;
+    let error: string | undefined;
+
+    try {
+      execSync(scriptPath, {
+        stdio: 'inherit', // リアルタイム出力
+        encoding: 'utf-8',
+      });
+    } catch (err) {
+      // スクリプト実行エラー
+      const execError = err as ExecError;
+      exitCode = execError.status !== undefined ? execError.status : 1;
+      error = execError.message;
+
+      // stderrがある場合は追加
+      if (execError.stderr) {
+        const stderrStr = execError.stderr.toString();
+        error = stderrStr || error;
+      }
+    }
+
+    const endTime = Date.now();
+    const executionTime = (endTime - startTime) / 1000; // ミリ秒から秒に変換
+
+    // 5. 実行後のログ出力
+    console.log('\n📊 テスト実行結果:');
+    console.log(`  終了コード: ${exitCode}`);
+    console.log(`  実行時間: ${executionTime.toFixed(2)}秒`);
+    console.log(`  テスト結果ファイル: ${outputPath}`);
+
+    const success = exitCode === 0;
+
+    if (success) {
+      console.log('✅ テスト実行が成功しました');
+    } else {
+      console.log('❌ テスト実行が失敗しました');
+      if (error) {
+        console.log(`  エラー: ${error}`);
+      }
+    }
+
+    return {
+      success,
+      exitCode,
+      executionTime,
+      outputPath,
+      error,
+    };
+  }
+}

package/scripts/utils/__tests__/config-validator.test.ts

@@ -147,6 +147,22 @@ describe('config-validator', () => {
   });
 
   describe('validateForConfluenceSync', () => {
+    let savedConfluenceSpace: string | undefined;
+
+    beforeEach(() => {
+      // 環境変数を保存
+      savedConfluenceSpace = process.env.CONFLUENCE_PRD_SPACE;
+    });
+
+    afterEach(() => {
+      // 環境変数を復元
+      if (savedConfluenceSpace !== undefined) {
+        process.env.CONFLUENCE_PRD_SPACE = savedConfluenceSpace;
+      } else {
+        delete process.env.CONFLUENCE_PRD_SPACE;
+      }
+    });
+
     it('spaces設定がない場合は警告を返す', () => {
       // 環境変数をクリア
       delete process.env.CONFLUENCE_PRD_SPACE;
@@ -236,6 +252,7 @@ describe('config-validator', () => {
     });
 
     it('環境変数CONFLUENCE_PRD_SPACEがある場合は情報メッセージ', () => {
+      // 環境変数を明示的に設定
       process.env.CONFLUENCE_PRD_SPACE = 'Michi';
       const configPath = join(testProjectRoot, '.michi/config.json');
       writeFileSync(
@@ -259,23 +276,48 @@ describe('config-validator', () => {
   });
 
   describe('validateForJiraSync', () => {
+    let savedStoryEnv: string | undefined;
+    let savedSubtaskEnv: string | undefined;
+
     beforeEach(() => {
-      // 環境変数をクリア
+      // 環境変数を保存して削除
+      savedStoryEnv = process.env.JIRA_ISSUE_TYPE_STORY;
+      savedSubtaskEnv = process.env.JIRA_ISSUE_TYPE_SUBTASK;
       delete process.env.JIRA_ISSUE_TYPE_STORY;
       delete process.env.JIRA_ISSUE_TYPE_SUBTASK;
     });
 
-    it('issueTypes.story設定がない場合はエラー', () => {
+    afterEach(() => {
+      // 環境変数を復元
+      if (savedStoryEnv !== undefined) {
+        process.env.JIRA_ISSUE_TYPE_STORY = savedStoryEnv;
+      } else {
+        delete process.env.JIRA_ISSUE_TYPE_STORY;
+      }
+      if (savedSubtaskEnv !== undefined) {
+        process.env.JIRA_ISSUE_TYPE_SUBTASK = savedSubtaskEnv;
+      } else {
+        delete process.env.JIRA_ISSUE_TYPE_SUBTASK;
+      }
+    });
+
+    it('issueTypes.story設定がない場合はエラー（デフォルト設定なし）', () => {
       const configPath = join(testProjectRoot, '.michi/config.json');
+      // issueTypes.storyを明示的にnullに設定してデフォルト値を無効化
       writeFileSync(
         configPath,
         JSON.stringify({
-          jira: {},
+          jira: {
+            issueTypes: {
+              story: null,
+            },
+          },
         }),
       );
 
       const result = validateForJiraSync(testProjectRoot);
 
+      // story=nullの場合、環境変数もないのでエラーになる
       expect(result.valid).toBe(false);
       expect(result.errors.length).toBeGreaterThan(0);
       expect(result.errors[0]).toContain('issueTypes.story');
@@ -301,6 +343,7 @@ describe('config-validator', () => {
     });
 
     it('環境変数JIRA_ISSUE_TYPE_STORYがある場合は情報メッセージ', () => {
+      // 環境変数を明示的に設定
       process.env.JIRA_ISSUE_TYPE_STORY = '10036';
       const configPath = join(testProjectRoot, '.michi/config.json');
       writeFileSync(
@@ -322,7 +365,7 @@ describe('config-validator', () => {
       }
     });
 
-    it('issueTypes.subtask設定がない場合は警告', () => {
+    it('issueTypes.subtask設定がない場合は警告（デフォルト設定なし）', () => {
       const configPath = join(testProjectRoot, '.michi/config.json');
       writeFileSync(
         configPath,
@@ -330,6 +373,7 @@ describe('config-validator', () => {
           jira: {
             issueTypes: {
               story: '10036',
+              subtask: null, // 明示的にnullに設定してデフォルト値を無効化
             },
           },
         }),
@@ -337,6 +381,7 @@ describe('config-validator', () => {
 
       const result = validateForJiraSync(testProjectRoot);
 
+      // subtask=nullの場合、環境変数もないので警告になる
       expect(result.valid).toBe(true);
       expect(result.warnings.length).toBeGreaterThan(0);
       expect(result.warnings[0]).toContain('subtask');
@@ -365,8 +410,23 @@ describe('config-validator', () => {
   });
 
   describe('validateForJiraSyncAsync', () => {
+    let savedEnv: {
+      JIRA_ISSUE_TYPE_STORY?: string;
+      JIRA_ISSUE_TYPE_SUBTASK?: string;
+      ATLASSIAN_URL?: string;
+      ATLASSIAN_EMAIL?: string;
+      ATLASSIAN_API_TOKEN?: string;
+    };
+
     beforeEach(() => {
-      // 環境変数をクリア
+      // 環境変数を保存して削除
+      savedEnv = {
+        JIRA_ISSUE_TYPE_STORY: process.env.JIRA_ISSUE_TYPE_STORY,
+        JIRA_ISSUE_TYPE_SUBTASK: process.env.JIRA_ISSUE_TYPE_SUBTASK,
+        ATLASSIAN_URL: process.env.ATLASSIAN_URL,
+        ATLASSIAN_EMAIL: process.env.ATLASSIAN_EMAIL,
+        ATLASSIAN_API_TOKEN: process.env.ATLASSIAN_API_TOKEN,
+      };
       delete process.env.JIRA_ISSUE_TYPE_STORY;
       delete process.env.JIRA_ISSUE_TYPE_SUBTASK;
       delete process.env.ATLASSIAN_URL;
@@ -374,6 +434,35 @@ describe('config-validator', () => {
       delete process.env.ATLASSIAN_API_TOKEN;
     });
 
+    afterEach(() => {
+      // 環境変数を復元
+      if (savedEnv.JIRA_ISSUE_TYPE_STORY !== undefined) {
+        process.env.JIRA_ISSUE_TYPE_STORY = savedEnv.JIRA_ISSUE_TYPE_STORY;
+      } else {
+        delete process.env.JIRA_ISSUE_TYPE_STORY;
+      }
+      if (savedEnv.JIRA_ISSUE_TYPE_SUBTASK !== undefined) {
+        process.env.JIRA_ISSUE_TYPE_SUBTASK = savedEnv.JIRA_ISSUE_TYPE_SUBTASK;
+      } else {
+        delete process.env.JIRA_ISSUE_TYPE_SUBTASK;
+      }
+      if (savedEnv.ATLASSIAN_URL !== undefined) {
+        process.env.ATLASSIAN_URL = savedEnv.ATLASSIAN_URL;
+      } else {
+        delete process.env.ATLASSIAN_URL;
+      }
+      if (savedEnv.ATLASSIAN_EMAIL !== undefined) {
+        process.env.ATLASSIAN_EMAIL = savedEnv.ATLASSIAN_EMAIL;
+      } else {
+        delete process.env.ATLASSIAN_EMAIL;
+      }
+      if (savedEnv.ATLASSIAN_API_TOKEN !== undefined) {
+        process.env.ATLASSIAN_API_TOKEN = savedEnv.ATLASSIAN_API_TOKEN;
+      } else {
+        delete process.env.ATLASSIAN_API_TOKEN;
+      }
+    });
+
     it('認証情報が未設定の場合は同期版と同じ結果を返す', async () => {
       const configPath = join(testProjectRoot, '.michi/config.json');
       writeFileSync(
@@ -406,6 +495,7 @@ describe('config-validator', () => {
     });
 
     it('認証情報が設定されていて、Issue Type IDが存在する場合は成功', async () => {
+      // 環境変数を明示的に設定
       process.env.ATLASSIAN_URL = 'https://test.atlassian.net';
       process.env.ATLASSIAN_EMAIL = 'test@example.com';
       process.env.ATLASSIAN_API_TOKEN = 'test-token';
@@ -451,16 +541,23 @@ describe('config-validator', () => {
     });
 
     it('認証情報が設定されていて、Issue Type IDが存在しない場合はエラー', async () => {
+      // 環境変数を明示的に設定（既存の環境変数を上書き）
       process.env.ATLASSIAN_URL = 'https://test.atlassian.net';
       process.env.ATLASSIAN_EMAIL = 'test@example.com';
       process.env.ATLASSIAN_API_TOKEN = 'test-token';
       process.env.JIRA_ISSUE_TYPE_STORY = '99999'; // 存在しないID
 
       const configPath = join(testProjectRoot, '.michi/config.json');
+      // issueTypes.storyを環境変数から取得するように空にする
+      // （デフォルト値を使わないように明示的にnullに設定）
       writeFileSync(
         configPath,
         JSON.stringify({
-          jira: {},
+          jira: {
+            issueTypes: {
+              story: null, // 環境変数から取得
+            },
+          },
         }),
       );
 
@@ -501,6 +598,7 @@ describe('config-validator', () => {
     });
 
     it('JIRA API取得に失敗した場合は警告を追加するがエラーにはしない', async () => {
+      // 環境変数を明示的に設定
       process.env.ATLASSIAN_URL = 'https://test.atlassian.net';
       process.env.ATLASSIAN_EMAIL = 'test@example.com';
       process.env.ATLASSIAN_API_TOKEN = 'test-token';