@sk8metal/michi-cli 0.3.0 → 0.5.0

package/scripts/pr-automation.ts

@@ -15,13 +15,23 @@ interface PROptions {
 }
 
 async function createPR(options: PROptions): Promise<void> {
+  const { getRepositoryInfo } = await import('./utils/project-meta.js');
   const token = process.env.GITHUB_TOKEN;
-  const repo = process.env.GITHUB_REPO;
-  
-  if (!token || !repo) {
-    throw new Error('Missing GitHub credentials');
+
+  if (!token) {
+    throw new Error('Missing GitHub credentials. Required: GITHUB_TOKEN');
   }
-  
+
+  // .kiro/project.json から repository 情報を取得
+  let repo: string;
+  try {
+    repo = getRepositoryInfo();
+  } catch (error) {
+    throw new Error(
+      `Failed to get repository info from .kiro/project.json: ${error instanceof Error ? error.message : error}`,
+    );
+  }
+
   const [owner, repoName] = repo.split('/');
   const octokit = new Octokit({ auth: token });
   

package/scripts/pre-flight-check.ts

@@ -16,6 +16,13 @@ interface PreFlightResult {
   warnings: string[];
 }
 
+interface ProjectMeta {
+  projectId?: string;
+  projectName?: string;
+  jiraProjectKey?: string;
+  [key: string]: unknown;
+}
+
 /**
  * .env設定をチェック
  */
@@ -78,7 +85,7 @@ function checkProjectJson(): { errors: string[], warnings: string[] } {
     return { errors, warnings };
   }
   
-  let projectMeta: any;
+  let projectMeta: ProjectMeta;
   try {
     projectMeta = JSON.parse(readFileSync(projectJsonPath, 'utf-8'));
   } catch {
@@ -125,16 +132,18 @@ async function checkConfluenceSpace(spaceKey: string): Promise<{ errors: string[
     if (response.data) {
       console.log(`  ✅ Confluenceスペース確認: ${spaceKey} (${response.data.name})`);
     }
-  } catch (error: any) {
-    if (error.response?.status === 404) {
+  } catch (error: unknown) {
+    const isAxiosError = axios.isAxiosError(error);
+    if (isAxiosError && error.response?.status === 404) {
       errors.push(`❌ Confluenceスペースが存在しません: ${spaceKey}`);
       errors.push(`   → Confluenceで新しいスペースを作成: ${url}/wiki/spaces`);
       errors.push('   → または、.envのCONFLUENCE_PRD_SPACEを修正してください');
-    } else if (error.response?.status === 401) {
+    } else if (isAxiosError && error.response?.status === 401) {
       errors.push('❌ Confluence認証エラー（.envの認証情報を確認）');
       errors.push(`   → API Token管理: ${url.replace('atlassian.net', 'atlassian.net/manage/profile/security/api-tokens')}`);
     } else {
-      warnings.push(`⚠️  Confluenceスペースチェック失敗: ${error.message}`);
+      const message = error instanceof Error ? error.message : String(error);
+      warnings.push(`⚠️  Confluenceスペースチェック失敗: ${message}`);
     }
   }
   
@@ -169,18 +178,20 @@ async function checkJiraProject(projectKey: string): Promise<{ errors: string[],
     if (response.data) {
       console.log(`  ✅ JIRAプロジェクト確認: ${projectKey} (${response.data.name})`);
     }
-  } catch (error: any) {
-    if (error.response?.status === 404) {
+  } catch (error: unknown) {
+    const isAxiosError = axios.isAxiosError(error);
+    if (isAxiosError && error.response?.status === 404) {
       errors.push(`❌ JIRAプロジェクトが存在しません: ${projectKey}`);
       errors.push(`   → JIRAプロジェクト作成: ${url}/jira/projects/create`);
       errors.push(`   → プロジェクト一覧: ${url}/jira/settings/projects`);
       errors.push('   → または、.kiro/project.jsonのjiraProjectKeyを修正してください');
       errors.push(`      現在の設定: "${projectKey}" → 実際に存在するキーに変更`);
-    } else if (error.response?.status === 401) {
+    } else if (isAxiosError && error.response?.status === 401) {
       errors.push('❌ JIRA認証エラー（.envの認証情報を確認）');
       errors.push('   → API Token管理: https://id.atlassian.com/manage-profile/security/api-tokens');
     } else {
-      warnings.push(`⚠️  JIRAプロジェクトチェック失敗: ${error.message}`);
+      const message = error instanceof Error ? error.message : String(error);
+      warnings.push(`⚠️  JIRAプロジェクトチェック失敗: ${message}`);
     }
   }
   

package/scripts/pre-publish-check.sh

@@ -142,23 +142,8 @@ echo_success "Test feature initialized"
 # ========================================
 echo_step "Testing New Phases (0.3-0.4, 1, A, B)"
 
-# Phase 0.3: テストタイプ選択
-echo_info "Testing Phase 0.3: test-type-selection"
-if npm run phase:run "${TEST_FEATURE}" test-type-selection > /dev/null 2>&1; then
-  echo_success "Phase 0.3 succeeded"
-else
-  echo_error "Phase 0.3 failed"
-  exit 1
-fi
-
-# Phase 0.4: テスト仕様書作成
-echo_info "Testing Phase 0.4: test-spec"
-if npm run phase:run "${TEST_FEATURE}" test-spec > /dev/null 2>&1; then
-  echo_success "Phase 0.4 succeeded"
-else
-  echo_error "Phase 0.4 failed"
-  exit 1
-fi
+# Phase 0.3-0.4: Test planning is now handled by AI command /michi:test-planning
+# (CLI commands removed)
 
 # Phase 1: 環境構築
 echo_info "Testing Phase 1: environment-setup"
@@ -192,23 +177,7 @@ fi
 # ========================================
 echo_step "Testing Phase Validations"
 
-# Phase 0.3
-echo_info "Validating Phase 0.3"
-if npm run validate:phase "${TEST_FEATURE}" test-type-selection > /dev/null 2>&1; then
-  echo_success "Phase 0.3 validation passed"
-else
-  echo_error "Phase 0.3 validation failed"
-  exit 1
-fi
-
-# Phase 0.4
-echo_info "Validating Phase 0.4"
-if npm run validate:phase "${TEST_FEATURE}" test-spec > /dev/null 2>&1; then
-  echo_success "Phase 0.4 validation passed"
-else
-  echo_error "Phase 0.4 validation failed"
-  exit 1
-fi
+# Phase 0.3-0.4: Validation removed (test planning is now handled by AI command)
 
 # Phase 1
 echo_info "Validating Phase 1"

package/scripts/resource-dashboard.ts

@@ -70,7 +70,7 @@ async function createResourceDashboard(): Promise<void> {
               const { data } = await octokit.repos.getContent({
                 owner: org,
                 repo: repo.name,
-                path: `projects/${(projectEntry as any).name}/.kiro/project.json`
+                path: `projects/${(projectEntry as { name: string }).name}/.kiro/project.json`
               });
 
               if ('content' in data) {
@@ -154,16 +154,16 @@ async function createResourceDashboard(): Promise<void> {
         existingPage.id,
         pageTitle,
         dashboardContent,
-        existingPage.version.number
+        existingPage.version!.number
       );
       const baseUrl = process.env.ATLASSIAN_URL || '';
-      pageUrl = `${baseUrl}/wiki${updated._links.webui}`;
+      pageUrl = `${baseUrl}/wiki${updated._links!.webui}`;
       console.log(`✅ Dashboard page updated: ${pageUrl}`);
     } else {
       // 新規ページを作成
       const created = await client.createPage(spaceKey, pageTitle, dashboardContent, ['dashboard', 'resource-management']);
       const baseUrl = process.env.ATLASSIAN_URL || '';
-      pageUrl = `${baseUrl}/wiki${created._links.webui}`;
+      pageUrl = `${baseUrl}/wiki${created._links!.webui}`;
       console.log(`✅ Dashboard page created: ${pageUrl}`);
     }
   } catch (error) {

package/scripts/spec-impl-workflow.ts

@@ -258,12 +258,20 @@ ${jiraLink}
 *この PR は spec-impl ワークフローで自動作成されました*`;
 
     const { Octokit } = await import('@octokit/rest');
+    const { getRepositoryInfo } = await import('./utils/project-meta.js');
     const token = process.env.GITHUB_TOKEN;
-    const repo = process.env.GITHUB_REPO;
 
-    if (!token || !repo) {
+    if (!token) {
+      throw new Error('Missing GitHub credentials. Required: GITHUB_TOKEN');
+    }
+
+    // .kiro/project.json から repository 情報を取得
+    let repo: string;
+    try {
+      repo = getRepositoryInfo();
+    } catch (error) {
       throw new Error(
-        'Missing GitHub credentials. Required: GITHUB_TOKEN, GITHUB_REPO',
+        `Failed to get repository info from .kiro/project.json: ${error instanceof Error ? error.message : error}`,
       );
     }
 
@@ -299,7 +307,7 @@ ${jiraLink}
   // 2. Epic と Story を「レビュー待ち」に遷移
   try {
     await transitionEpicAndStory(jiraInfo, statusMapping.readyForReview);
-  } catch (error) {
+  } catch (_error) {
     console.error(
       `⚠️  JIRA ステータス更新に失敗しましたが、PR は作成されています: ${prUrl}`,
     );
@@ -393,12 +401,20 @@ export async function onSpecImplEnd(
 
   // PR 作成
   const { Octokit } = await import('@octokit/rest');
+  const { getRepositoryInfo } = await import('./utils/project-meta.js');
   const token = process.env.GITHUB_TOKEN;
-  const repo = process.env.GITHUB_REPO;
 
-  if (!token || !repo) {
+  if (!token) {
+    throw new Error('Missing GitHub credentials. Required: GITHUB_TOKEN');
+  }
+
+  // .kiro/project.json から repository 情報を取得
+  let repo: string;
+  try {
+    repo = getRepositoryInfo();
+  } catch (error) {
     throw new Error(
-      'Missing GitHub credentials. Required: GITHUB_TOKEN, GITHUB_REPO',
+      `Failed to get repository info from .kiro/project.json: ${error instanceof Error ? error.message : error}`,
     );
   }
 

package/scripts/template/renderer.ts

@@ -80,7 +80,7 @@ export const renderTemplate = (
  * // Result: { lang: "ja", dir: ".kiro" }
  * ```
  */
-export const renderJsonTemplate = <T = any>(
+export const renderJsonTemplate = <T = unknown>(
   template: string,
   context: TemplateContext
 ): T => {

package/scripts/test-interactive.ts

@@ -120,20 +120,6 @@ function question(rl: readline.Interface, query: string): Promise<string> {
   });
 }
 
-/**
- * Yes/No質問
- */
-async function confirm(rl: readline.Interface, prompt: string, defaultValue: boolean = true): Promise<boolean> {
-  const defaultText = defaultValue ? '[Y/n]' : '[y/N]';
-  const answer = await question(rl, `${prompt} ${defaultText}: `);
-
-  if (!answer) {
-    return defaultValue;
-  }
-
-  return answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes';
-}
-
 /**
  * 選択肢を表示
  */
@@ -676,11 +662,6 @@ async function main(): Promise<number> {
     console.log('Phase Bテスト（手動回帰、負荷、セキュリティ）を対話的に作成します。\n');
 
     // テストタイプを選択
-    const testTypeChoices = TEST_TYPES.map(t => ({
-      value: t.value,
-      label: `${t.label} - ${t.description}`
-    }));
-
     console.log('テストタイプを選択してください:');
     TEST_TYPES.forEach((t, index) => {
       console.log(`  ${index + 1}. ${t.label}`);

package/scripts/test-new-features.ts

@@ -3,7 +3,7 @@
  */
 
 import { executeTests, generateTestReport } from './utils/test-runner.js';
-import { createReleaseNotes, getCommits, generateReleaseNotes, formatReleaseNotes } from './utils/release-notes-generator.js';
+import { getCommits, generateReleaseNotes, formatReleaseNotes } from './utils/release-notes-generator.js';
 import { getApprovalStatus } from './utils/confluence-approval.js';
 
 async function testTestRunner() {
@@ -32,8 +32,9 @@ async function testTestRunner() {
     console.log(report.substring(0, 500) + '...');
 
     return true;
-  } catch (error: any) {
-    console.error('❌ テストランナーエラー:', error.message);
+  } catch (error: unknown) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.error('❌ テストランナーエラー:', message);
     return false;
   }
 }
@@ -74,8 +75,9 @@ async function testReleaseNotesGenerator() {
       console.log('⚠️  コミットが見つかりませんでした');
       return false;
     }
-  } catch (error: any) {
-    console.error('❌ リリースノート生成エラー:', error.message);
+  } catch (error: unknown) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.error('❌ リリースノート生成エラー:', message);
     return false;
   }
 }
@@ -123,8 +125,9 @@ async function testConfluenceApproval() {
     console.log(`  承認者: ${status.approvers.join(', ') || 'なし'}`);
 
     return true;
-  } catch (error: any) {
-    console.error('❌ Confluence承認状態確認エラー:', error.message);
+  } catch (error: unknown) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.error('❌ Confluence承認状態確認エラー:', message);
     return false;
   }
 }

package/scripts/test-npm-package.sh

@@ -208,23 +208,8 @@ fi
 
 echo_info "Testing phase:run commands..."
 
-# Phase 0.3: test-type-selection
-echo_info "Testing phase:run test-type-selection"
-if "$MICHI_CMD" phase:run test-feature test-type-selection > /dev/null 2>&1; then
-  echo_success "phase:run test-type-selection succeeded"
-else
-  echo_error "phase:run test-type-selection failed"
-  exit 1
-fi
-
-# Phase 0.4: test-spec
-echo_info "Testing phase:run test-spec"
-if "$MICHI_CMD" phase:run test-feature test-spec > /dev/null 2>&1; then
-  echo_success "phase:run test-spec succeeded"
-else
-  echo_error "phase:run test-spec failed"
-  exit 1
-fi
+# Phase 0.3-0.4: test planning is now handled by AI command /michi:test-planning
+# (CLI commands removed)
 
 # Phase 1: environment-setup
 echo_info "Testing phase:run environment-setup"
@@ -260,23 +245,7 @@ echo_step "Testing Validation Commands"
 
 echo_info "Testing validate:phase commands..."
 
-# Phase 0.3
-echo_info "Validating test-type-selection"
-if "$MICHI_CMD" validate:phase test-feature test-type-selection > /dev/null 2>&1; then
-  echo_success "validate:phase test-type-selection succeeded"
-else
-  echo_error "validate:phase test-type-selection failed"
-  exit 1
-fi
-
-# Phase 0.4
-echo_info "Validating test-spec"
-if "$MICHI_CMD" validate:phase test-feature test-spec > /dev/null 2>&1; then
-  echo_success "validate:phase test-spec succeeded"
-else
-  echo_error "validate:phase test-spec failed"
-  exit 1
-fi
+# Phase 0.3-0.4: validation removed (test planning is now handled by AI command)
 
 # Phase 1
 echo_info "Validating environment-setup"

package/scripts/test-spec-generator.ts

@@ -8,10 +8,7 @@ import { join } from 'path';
 import {
   extractComponents,
   extractFlows,
-  extractRequirements,
-  type Component,
-  type Flow,
-  type Requirement
+  extractRequirements
 } from './utils/markdown-parser.js';
 import {
   loadTestSpecTemplate,
@@ -24,9 +21,8 @@ import {
  * 単体テスト仕様書を生成
  */
 export async function generateUnitTestSpec(feature: string, projectRoot: string = process.cwd()): Promise<string> {
-  const requirementsPath = join(projectRoot, '.kiro', 'specs', feature, 'requirements.md');
   const designPath = join(projectRoot, '.kiro', 'specs', feature, 'design.md');
-  
+
   if (!existsSync(designPath)) {
     throw new Error(`design.mdが見つかりません: ${designPath}`);
   }
@@ -229,7 +225,7 @@ export async function generateE2ETestSpec(feature: string, projectRoot: string =
         'テストユーザーが作成されている',
         'テストデータが準備されている'
       ],
-      steps: req.acceptanceCriteria.slice(0, 3).map((ac, idx) => 
+      steps: req.acceptanceCriteria.slice(0, 3).map(ac =>
         `${ac.substring(0, 100)}...を実行`
       ),
       expectedResults: req.acceptanceCriteria.map(ac => 

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

@@ -10,6 +10,7 @@ import {
   loadConfig,
   getConfig,
   getConfigPath,
+  getGlobalEnvPath,
   clearConfigCache
 } from '../config-loader.js';
 
@@ -32,6 +33,9 @@ describe('config-loader', () => {
     // 環境変数をバックアップ
     originalEnv = { ...process.env };
 
+    // HOMEディレクトリをテスト用に変更（グローバル設定の影響を排除）
+    process.env.HOME = testProjectRoot;
+
     // キャッシュをクリア（クリーンな状態から開始）
     clearConfigCache();
   });
@@ -250,5 +254,150 @@ describe('config-loader', () => {
       consoleWarnSpy.mockRestore();
     });
   });
+
+  describe('5層階層対応', () => {
+    describe('getGlobalEnvPath', () => {
+      it('~/.michi/.envのパスを返す', () => {
+        const envPath = getGlobalEnvPath();
+        expect(envPath).toBe(join(process.env.HOME as string, '.michi', '.env'));
+      });
+    });
+
+    describe('グローバル.envからの設定読み込み', () => {
+      it('グローバル.envからAtlassian設定を読み込む', () => {
+        clearConfigCache();
+
+        // ~/.michi/.env を作成
+        const globalEnvPath = join(testProjectRoot, '.michi', '.env');
+        writeFileSync(globalEnvPath, 'ATLASSIAN_URL=https://test.atlassian.net\n');
+
+        const config = loadConfig(testProjectRoot);
+
+        // グローバル.envの値が読み込まれることを確認
+        expect(config).toHaveProperty('atlassian');
+        // 注: 実装後に具体的なアサーションを追加
+      });
+
+      it('グローバル.envが存在しない場合でもエラーにならない', () => {
+        clearConfigCache();
+
+        // ~/.michi/.env を削除
+        const globalEnvPath = join(testProjectRoot, '.michi', '.env');
+        if (existsSync(globalEnvPath)) {
+          unlinkSync(globalEnvPath);
+        }
+
+        expect(() => {
+          loadConfig(testProjectRoot);
+        }).not.toThrow();
+      });
+    });
+
+    describe('project.jsonからの設定読み込み', () => {
+      it('project.jsonからプロジェクトメタデータを読み込む', () => {
+        clearConfigCache();
+
+        // .kiro/project.json を作成
+        const projectJsonPath = join(testProjectRoot, '.kiro', 'project.json');
+        mkdirSync(join(testProjectRoot, '.kiro'), { recursive: true });
+        writeFileSync(projectJsonPath, JSON.stringify({
+          projectId: 'test-project',
+          projectName: 'Test Project',
+          jiraProjectKey: 'TP'
+        }));
+
+        const config = loadConfig(testProjectRoot);
+
+        // project.jsonの値が読み込まれることを確認
+        expect(config).toHaveProperty('project');
+        // 注: 実装後に具体的なアサーションを追加
+      });
+
+      it('project.jsonが存在しない場合でもエラーにならない', () => {
+        clearConfigCache();
+
+        // .kiro/project.json を削除
+        const projectJsonPath = join(testProjectRoot, '.kiro', 'project.json');
+        if (existsSync(projectJsonPath)) {
+          unlinkSync(projectJsonPath);
+        }
+
+        expect(() => {
+          loadConfig(testProjectRoot);
+        }).not.toThrow();
+      });
+    });
+
+    describe('優先順位の検証', () => {
+      it('プロジェクト.envがグローバル.envより優先される', () => {
+        clearConfigCache();
+
+        // グローバル.env
+        const globalEnvPath = join(testProjectRoot, '.michi', '.env');
+        writeFileSync(globalEnvPath, 'CONFLUENCE_PRD_SPACE=GLOBAL\n');
+
+        // プロジェクト.env
+        const projectEnvPath = join(testProjectRoot, '.env');
+        writeFileSync(projectEnvPath, 'CONFLUENCE_PRD_SPACE=PROJECT\n');
+
+        const config = loadConfig(testProjectRoot);
+
+        // プロジェクト.envの値が優先されることを確認
+        expect(config.confluence?.spaces?.requirements).toBe('PROJECT');
+      });
+    });
+
+    describe('キャッシュ無効化', () => {
+      it('グローバル.envを変更するとキャッシュが無効化される', async () => {
+        clearConfigCache();
+
+        // 最初の設定
+        const globalEnvPath = join(testProjectRoot, '.michi', '.env');
+        writeFileSync(globalEnvPath, 'CONFLUENCE_PRD_SPACE=INITIAL\n');
+
+        const config1 = getConfig(testProjectRoot);
+
+        // ファイルシステムのmtime精度を考慮して少し待つ
+        await new Promise(resolve => setTimeout(resolve, 10));
+
+        // 設定を更新
+        writeFileSync(globalEnvPath, 'CONFLUENCE_PRD_SPACE=UPDATED\n');
+
+        const config2 = getConfig(testProjectRoot);
+
+        // 異なる値が返されることを確認（キャッシュが無効化された）
+        expect(config1.confluence?.spaces?.requirements).toBe('INITIAL');
+        expect(config2.confluence?.spaces?.requirements).toBe('UPDATED');
+      });
+
+      it('project.jsonを変更するとキャッシュが無効化される', async () => {
+        clearConfigCache();
+
+        // 最初の設定
+        const projectJsonPath = join(testProjectRoot, '.kiro', 'project.json');
+        mkdirSync(join(testProjectRoot, '.kiro'), { recursive: true });
+        writeFileSync(projectJsonPath, JSON.stringify({
+          projectId: 'initial-id',
+          projectName: 'Initial Name'
+        }));
+
+        const config1 = getConfig(testProjectRoot);
+
+        // ファイルシステムのmtime精度を考慮して少し待つ
+        await new Promise(resolve => setTimeout(resolve, 10));
+
+        // 設定を更新
+        writeFileSync(projectJsonPath, JSON.stringify({
+          projectId: 'updated-id',
+          projectName: 'Updated Name'
+        }));
+
+        const config2 = getConfig(testProjectRoot);
+
+        // 異なるオブジェクトが返されることを確認（キャッシュが無効化された）
+        expect(config1).not.toBe(config2);
+      });
+    });
+  });
 });
 

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

@@ -393,6 +393,8 @@ describe('config-validator', () => {
       writeFileSync(
         projectJsonPath,
         JSON.stringify({
+          projectId: 'test-project',
+          projectName: 'Test Project',
           jiraProjectKey: 'TEST',
         }),
       );

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

@@ -185,7 +185,6 @@ URL_WITH_PARAMS=https://example.com?param1=value1&param2=value2
         ['ATLASSIAN_API_TOKEN', 'token123'],
         ['GITHUB_ORG', 'myorg'],
         ['GITHUB_TOKEN', 'ghp_xxx'],
-        ['GITHUB_REPO', 'myorg/myrepo'],
         ['CONFLUENCE_PRD_SPACE', 'PRD'],
         ['CONFLUENCE_QA_SPACE', 'QA'],
         ['CONFLUENCE_RELEASE_SPACE', 'RELEASE'],
@@ -217,7 +216,6 @@ ATLASSIAN_API_TOKEN=test_token_123
 # GitHub設定
 GITHUB_ORG=testorg
 GITHUB_TOKEN=ghp_test123
-GITHUB_REPO=testorg/testrepo
 
 # Confluence共有スペース
 CONFLUENCE_PRD_SPACE=PRD