@sk8metal/michi-cli 0.8.2 → 0.8.4

package/scripts/pr-automation.ts

@@ -3,9 +3,9 @@
  */
 
 import { Octokit } from '@octokit/rest';
-import { config } from 'dotenv';
+import { loadEnv } from './utils/env-loader.js';
 
-config();
+loadEnv();
 
 interface PROptions {
   branch: string;

package/scripts/pre-flight-check.ts

@@ -6,9 +6,9 @@
 import { existsSync, readFileSync } from 'fs';
 import { join } from 'path';
 import axios from 'axios';
-import { config } from 'dotenv';
+import { loadEnv } from './utils/env-loader.js';
 
-config();
+loadEnv();
 
 interface PreFlightResult {
   valid: boolean;

package/scripts/resource-dashboard.ts

@@ -4,11 +4,11 @@
  */
 
 import { Octokit } from '@octokit/rest';
-import { config } from 'dotenv';
+import { loadEnv } from './utils/env-loader.js';
 import { ConfluenceClient, getConfluenceConfig } from './confluence-sync.js';
 import { getConfig } from './utils/config-loader.js';
 
-config();
+loadEnv();
 
 interface ProjectResource {
   projectName: string;

package/scripts/spec-impl-workflow.ts

@@ -7,7 +7,7 @@
  * - 終了時: PR作成、Epic + 最初の Story を「レビュー待ち」に移動、PRリンクをコメント
  */
 
-import { config } from 'dotenv';
+import { loadEnv } from './utils/env-loader.js';
 import { JIRAClient } from './jira-sync.js';
 import { getConfig } from './utils/config-loader.js';
 import {
@@ -16,7 +16,7 @@ import {
   JiraInfo,
 } from './utils/spec-loader.js';
 
-config();
+loadEnv();
 
 /**
  * spec-impl 統合ワークフローのオプション

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

@@ -13,6 +13,13 @@ import {
   type MultiRepoTemplateContext,
 } from '../multi-repo-renderer.js';
 import * as fs from 'fs';
+import { fileURLToPath } from 'url';
+import { dirname, resolve } from 'path';
+
+// Calculate MICHI_PACKAGE_ROOT for tests
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const MICHI_PACKAGE_ROOT = resolve(__dirname, '..', '..', '..');
 
 vi.mock('fs');
 
@@ -63,10 +70,11 @@ describe('loadMultiRepoTemplate', () => {
     const mockContent = '# {{PROJECT_NAME}} - Requirements';
     vi.spyOn(fs, 'readFileSync').mockReturnValue(mockContent);
 
-    const content = loadMultiRepoTemplate('overview/requirements', '/test/root');
+    const content = loadMultiRepoTemplate('overview/requirements');
 
+    const expectedPath = resolve(MICHI_PACKAGE_ROOT, 'templates', 'multi-repo', 'overview', 'requirements.md');
     expect(fs.readFileSync).toHaveBeenCalledWith(
-      '/test/root/templates/multi-repo/overview/requirements.md',
+      expectedPath,
       'utf-8'
     );
     expect(content).toBe(mockContent);
@@ -77,7 +85,7 @@ describe('loadMultiRepoTemplate', () => {
       throw new Error('ENOENT: no such file or directory');
     });
 
-    expect(() => loadMultiRepoTemplate('invalid/template', '/test/root')).toThrow(
+    expect(() => loadMultiRepoTemplate('invalid/template')).toThrow(
       'Multi-Repo template not found: invalid/template.md'
     );
   });
@@ -151,8 +159,7 @@ describe('loadAndRenderMultiRepoTemplate', () => {
 
     const rendered = loadAndRenderMultiRepoTemplate(
       'overview/requirements',
-      context,
-      '/test/root'
+      context
     );
 
     expect(rendered).toBe('# test-project Requirements\n\n**JIRA**: TEST');
@@ -184,8 +191,7 @@ describe('renderMultiRepoTemplates', () => {
 
     const rendered = renderMultiRepoTemplates(
       ['overview/requirements', 'overview/architecture'],
-      context,
-      '/test/root'
+      context
     );
 
     expect(rendered['overview/requirements']).toBe('# test-project Requirements');
@@ -200,7 +206,7 @@ describe('renderMultiRepoTemplates', () => {
       CREATED_AT: '2025-12-14T10:00:00Z',
     };
 
-    const rendered = renderMultiRepoTemplates([], context, '/test/root');
+    const rendered = renderMultiRepoTemplates([], context);
 
     expect(rendered).toEqual({});
   });
@@ -248,8 +254,7 @@ describe('統合テスト', () => {
 
     const rendered = loadAndRenderMultiRepoTemplate(
       'overview/requirements',
-      context,
-      '/test/root'
+      context
     );
 
     expect(rendered).toContain('# my-awesome-project - 要件定義書');

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

@@ -5,9 +5,15 @@
  */
 
 import { readFileSync } from 'fs';
-import { resolve, relative, isAbsolute } from 'path';
+import { resolve, relative, isAbsolute, dirname } from 'path';
+import { fileURLToPath } from 'url';
 import { renderTemplate, type TemplateContext } from './renderer.js';
 
+// Resolve Michi package root directory
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const MICHI_PACKAGE_ROOT = resolve(__dirname, '..', '..');
+
 export interface MultiRepoTemplateContext {
   PROJECT_NAME: string;
   JIRA_KEY: string;
@@ -51,7 +57,7 @@ export const createMultiRepoTemplateContext = (
  */
 export const loadMultiRepoTemplate = (
   templateName: string,
-  projectRoot: string = process.cwd()
+  _projectRoot: string = process.cwd()
 ): string => {
   // Security Layer 1: Validate template name
   // Reject path traversal characters (../, ..\, absolute paths)
@@ -63,7 +69,7 @@ export const loadMultiRepoTemplate = (
   }
 
   // Security Layer 2: Resolve absolute paths
-  const templateDir = resolve(projectRoot, 'templates', 'multi-repo');
+  const templateDir = resolve(MICHI_PACKAGE_ROOT, 'templates', 'multi-repo');
   const templatePath = resolve(templateDir, `${templateName}.md`);
 
   // Security Layer 3: Verify path containment

package/scripts/test-workflow-stages.ts

@@ -3,10 +3,10 @@
  * testとreleaseステージのみを実行
  */
 
-import { config } from 'dotenv';
+import { loadEnv } from './utils/env-loader.js';
 import { WorkflowOrchestrator, WorkflowConfig } from './workflow-orchestrator.js';
 
-config();
+loadEnv();
 
 async function main() {
   const args = process.argv.slice(2);

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

@@ -0,0 +1,145 @@
+/**
+ * env-loader.ts のユニットテスト
+ */
+
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { writeFileSync, existsSync, mkdirSync, rmSync } from 'fs';
+import { join } from 'path';
+import { config } from 'dotenv';
+
+describe('env-loader', () => {
+  const testDir = join(process.cwd(), 'test-temp-env-loader');
+  const testGlobalDir = join(testDir, '.michi');
+  const testGlobalEnvPath = join(testGlobalDir, '.env');
+  const testLocalEnvPath = join(testDir, '.env');
+
+  // 元の環境変数を保存
+  const originalEnv = { ...process.env };
+  const originalHome = process.env.HOME;
+  const originalCwd = process.cwd();
+
+  beforeEach(() => {
+    // テスト用ディレクトリ作成
+    if (!existsSync(testDir)) {
+      mkdirSync(testDir, { recursive: true });
+    }
+    if (!existsSync(testGlobalDir)) {
+      mkdirSync(testGlobalDir, { recursive: true });
+    }
+
+    // カレントディレクトリをテストディレクトリに変更
+    process.chdir(testDir);
+
+    // 環境変数をクリア
+    for (const key in process.env) {
+      if (key.startsWith('TEST_')) {
+        delete process.env[key];
+      }
+    }
+  });
+
+  afterEach(() => {
+    // カレントディレクトリを戻す
+    process.chdir(originalCwd);
+
+    // クリーンアップ
+    if (existsSync(testDir)) {
+      rmSync(testDir, { recursive: true, force: true });
+    }
+
+    // 環境変数を復元
+    process.env = { ...originalEnv };
+    if (originalHome) {
+      process.env.HOME = originalHome;
+    }
+  });
+
+  it('should load global .env if exists', () => {
+    // グローバル .env を作成
+    const globalContent = `TEST_GLOBAL_VAR=global_value
+TEST_SHARED_VAR=global_shared`;
+    writeFileSync(testGlobalEnvPath, globalContent, 'utf-8');
+
+    // HOMEを一時的に変更
+    process.env.HOME = testDir;
+
+    // dotenvで読み込みをシミュレート（env-loader.tsと同じロジック）
+    if (existsSync(testGlobalEnvPath)) {
+      config({ path: testGlobalEnvPath });
+    }
+
+    expect(process.env.TEST_GLOBAL_VAR).toBe('global_value');
+    expect(process.env.TEST_SHARED_VAR).toBe('global_shared');
+  });
+
+  it('should load local .env if exists', () => {
+    // ローカル .env を作成
+    const localContent = `TEST_LOCAL_VAR=local_value
+TEST_SHARED_VAR=local_shared`;
+    writeFileSync(testLocalEnvPath, localContent, 'utf-8');
+
+    // dotenvでローカル.envを読み込み
+    config();
+
+    expect(process.env.TEST_LOCAL_VAR).toBe('local_value');
+    expect(process.env.TEST_SHARED_VAR).toBe('local_shared');
+  });
+
+  it('should override global with local', () => {
+    // グローバル .env を作成
+    const globalContent = `TEST_GLOBAL_VAR=global_value
+TEST_SHARED_VAR=global_shared`;
+    writeFileSync(testGlobalEnvPath, globalContent, 'utf-8');
+
+    // ローカル .env を作成
+    const localContent = `TEST_LOCAL_VAR=local_value
+TEST_SHARED_VAR=local_shared`;
+    writeFileSync(testLocalEnvPath, localContent, 'utf-8');
+
+    // HOMEを一時的に変更
+    process.env.HOME = testDir;
+
+    // env-loader.tsと同じロジックで読み込み
+    if (existsSync(testGlobalEnvPath)) {
+      config({ path: testGlobalEnvPath });
+    }
+    config({ override: true }); // ローカル .env（グローバルを上書き）
+
+    // ローカルがグローバルを上書きする
+    expect(process.env.TEST_GLOBAL_VAR).toBe('global_value');
+    expect(process.env.TEST_LOCAL_VAR).toBe('local_value');
+    expect(process.env.TEST_SHARED_VAR).toBe('local_shared'); // ローカルで上書き
+  });
+
+  it('should handle missing files gracefully', () => {
+    // 両方のファイルを作成しない
+    process.env.HOME = join(testDir, 'nonexistent');
+
+    // エラーを投げないことを確認
+    expect(() => {
+      if (existsSync(join(process.env.HOME!, '.michi', '.env'))) {
+        config({ path: join(process.env.HOME!, '.michi', '.env') });
+      }
+      config();
+    }).not.toThrow();
+  });
+
+  it('should not fail if global directory does not exist', () => {
+    // ローカル .env のみ作成
+    const localContent = `TEST_LOCAL_VAR=local_value`;
+    writeFileSync(testLocalEnvPath, localContent, 'utf-8');
+
+    // .michiディレクトリが存在しないHOMEを設定
+    process.env.HOME = join(testDir, 'no-michi-dir');
+
+    expect(() => {
+      const globalPath = join(process.env.HOME!, '.michi', '.env');
+      if (existsSync(globalPath)) {
+        config({ path: globalPath });
+      }
+      config();
+    }).not.toThrow();
+
+    expect(process.env.TEST_LOCAL_VAR).toBe('local_value');
+  });
+});

package/scripts/utils/config-loader.ts

@@ -7,7 +7,8 @@ import { readFileSync, writeFileSync, existsSync, statSync, renameSync, unlinkSy
 import { resolve, relative, isAbsolute, dirname } from 'path';
 import { fileURLToPath } from 'url';
 import { homedir } from 'os';
-import { config, parse as dotenvParse } from 'dotenv';
+import { parse as dotenvParse } from 'dotenv';
+import { loadEnv } from './env-loader.js';
 import {
   AppConfigSchema,
   MultiRepoProjectSchema,
@@ -18,7 +19,7 @@ import {
 } from '../config/config-schema.js';
 
 // 環境変数読み込み
-config();
+loadEnv();
 
 /**
  * グローバル設定ファイルのパス定数

package/scripts/utils/env-loader.ts

@@ -0,0 +1,25 @@
+/**
+ * 環境変数読み込みユーティリティ
+ * グローバル設定（~/.michi/.env）とローカル設定（.env）を読み込む
+ */
+
+import { config } from 'dotenv';
+import { existsSync } from 'fs';
+import { join } from 'path';
+import { homedir } from 'os';
+
+/**
+ * 環境変数を読み込む
+ * グローバル設定（~/.michi/.env）→ローカル設定（.env）の順で読み込み
+ * ローカル設定がグローバル設定を上書きする
+ */
+export function loadEnv(): void {
+  // 1. グローバル設定 ~/.michi/.env を読み込む
+  const globalEnvPath = join(homedir(), '.michi', '.env');
+  if (existsSync(globalEnvPath)) {
+    config({ path: globalEnvPath });
+  }
+
+  // 2. ローカル設定 .env を読み込む（グローバル設定を上書き）
+  config({ override: true });
+}

package/scripts/workflow-orchestrator.ts

@@ -3,7 +3,7 @@
  * AI開発フロー全体を統合実行
  */
 
-import { config } from 'dotenv';
+import { loadEnv } from './utils/env-loader.js';
 import { loadProjectMeta } from './utils/project-meta.js';
 import { syncToConfluence, getConfluenceConfig } from './confluence-sync.js';
 import { syncTasksToJIRA } from './jira-sync.js';
@@ -12,7 +12,7 @@ import { executeTests, generateTestReport } from './utils/test-runner.js';
 import { createReleaseNotes } from './utils/release-notes-generator.js';
 import { pollForApproval, waitForManualApproval } from './utils/confluence-approval.js';
 
-config();
+loadEnv();
 
 export interface WorkflowConfig {
   feature: string;