@sk8metal/michi-cli 0.0.6 → 0.0.8

package/scripts/utils/__tests__/spec-updater.test.ts

@@ -0,0 +1,220 @@
+/**
+ * spec-updater のテスト
+ */
+
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { mkdirSync, rmSync, existsSync, readFileSync, writeFileSync } from 'fs';
+import { resolve } from 'path';
+import {
+  loadSpecJson,
+  saveSpecJson,
+  updateSpecJsonAfterConfluenceSync,
+  updateSpecJsonAfterJiraSync,
+  type SpecJson
+} from '../spec-updater.js';
+
+const testDir = resolve(__dirname, '../../../.test-tmp');
+const testFeatureName = 'test-feature';
+
+describe('spec-updater', () => {
+  beforeEach(() => {
+    // テスト用ディレクトリを作成
+    if (existsSync(testDir)) {
+      rmSync(testDir, { recursive: true });
+    }
+    mkdirSync(resolve(testDir, '.kiro/specs', testFeatureName), { recursive: true });
+  });
+
+  afterEach(() => {
+    // テスト用ディレクトリを削除
+    if (existsSync(testDir)) {
+      rmSync(testDir, { recursive: true });
+    }
+  });
+
+  describe('loadSpecJson', () => {
+    it('spec.jsonが存在しない場合、最小限の構造を返す', () => {
+      const spec = loadSpecJson(testFeatureName, testDir);
+
+      expect(spec).toEqual({
+        featureName: testFeatureName,
+        confluence: {},
+        jira: {},
+        milestones: {}
+      });
+    });
+
+    it('spec.jsonが存在する場合、その内容を返す', () => {
+      const specPath = resolve(testDir, '.kiro/specs', testFeatureName, 'spec.json');
+      const testSpec: SpecJson = {
+        featureName: testFeatureName,
+        projectName: 'Test Project',
+        confluence: {
+          spaceKey: 'TEST'
+        },
+        jira: {},
+        milestones: {}
+      };
+
+      writeFileSync(specPath, JSON.stringify(testSpec, null, 2));
+
+      const spec = loadSpecJson(testFeatureName, testDir);
+      expect(spec).toEqual(testSpec);
+    });
+  });
+
+  describe('saveSpecJson', () => {
+    it('spec.jsonを保存し、lastUpdatedを追加する', () => {
+      const spec: SpecJson = {
+        featureName: testFeatureName,
+        confluence: {},
+        jira: {},
+        milestones: {}
+      };
+
+      saveSpecJson(testFeatureName, spec, testDir);
+
+      const specPath = resolve(testDir, '.kiro/specs', testFeatureName, 'spec.json');
+      expect(existsSync(specPath)).toBe(true);
+
+      const saved = JSON.parse(readFileSync(specPath, 'utf-8'));
+      expect(saved.featureName).toBe(testFeatureName);
+      expect(saved.lastUpdated).toBeDefined();
+    });
+  });
+
+  describe('updateSpecJsonAfterConfluenceSync', () => {
+    it('Confluence同期後にspec.jsonを正しく更新する（requirements）', () => {
+      updateSpecJsonAfterConfluenceSync(
+        testFeatureName,
+        'requirements',
+        {
+          pageId: 'page123',
+          url: 'https://example.atlassian.net/wiki/spaces/TEST/pages/page123',
+          title: 'Test Requirements',
+          spaceKey: 'TEST'
+        },
+        testDir
+      );
+
+      const spec = loadSpecJson(testFeatureName, testDir);
+
+      expect(spec.confluence?.spaceKey).toBe('TEST');
+      expect(spec.confluence?.requirements).toEqual({
+        pageId: 'page123',
+        url: 'https://example.atlassian.net/wiki/spaces/TEST/pages/page123',
+        title: 'Test Requirements'
+      });
+      expect(spec.milestones?.requirementsCompleted).toBe(true);
+    });
+
+    it('Confluence同期後にspec.jsonを正しく更新する（design）', () => {
+      updateSpecJsonAfterConfluenceSync(
+        testFeatureName,
+        'design',
+        {
+          pageId: 'page456',
+          url: 'https://example.atlassian.net/wiki/spaces/TEST/pages/page456',
+          title: 'Test Design',
+          spaceKey: 'TEST'
+        },
+        testDir
+      );
+
+      const spec = loadSpecJson(testFeatureName, testDir);
+
+      expect(spec.confluence?.design).toEqual({
+        pageId: 'page456',
+        url: 'https://example.atlassian.net/wiki/spaces/TEST/pages/page456',
+        title: 'Test Design'
+      });
+      expect(spec.milestones?.designCompleted).toBe(true);
+    });
+
+    it('Confluence同期後にspec.jsonを正しく更新する（tasks）', () => {
+      updateSpecJsonAfterConfluenceSync(
+        testFeatureName,
+        'tasks',
+        {
+          pageId: 'page789',
+          url: 'https://example.atlassian.net/wiki/spaces/TEST/pages/page789',
+          title: 'Test Tasks',
+          spaceKey: 'TEST'
+        },
+        testDir
+      );
+
+      const spec = loadSpecJson(testFeatureName, testDir);
+
+      expect(spec.confluence?.tasks).toEqual({
+        pageId: 'page789',
+        url: 'https://example.atlassian.net/wiki/spaces/TEST/pages/page789',
+        title: 'Test Tasks'
+      });
+      expect(spec.milestones?.tasksCompleted).toBe(true);
+    });
+  });
+
+  describe('updateSpecJsonAfterJiraSync', () => {
+    it('JIRA同期後にspec.jsonを正しく更新する', () => {
+      updateSpecJsonAfterJiraSync(
+        testFeatureName,
+        {
+          projectKey: 'TEST',
+          epicKey: 'TEST-123',
+          epicUrl: 'https://example.atlassian.net/browse/TEST-123',
+          storyKeys: ['TEST-124', 'TEST-125', 'TEST-126']
+        },
+        testDir
+      );
+
+      const spec = loadSpecJson(testFeatureName, testDir);
+
+      expect(spec.jira).toEqual({
+        projectKey: 'TEST',
+        epicKey: 'TEST-123',
+        epicUrl: 'https://example.atlassian.net/browse/TEST-123',
+        storyKeys: ['TEST-124', 'TEST-125', 'TEST-126']
+      });
+      expect(spec.milestones?.jiraSyncCompleted).toBe(true);
+    });
+  });
+
+  describe('統合シナリオ', () => {
+    it('Confluence → JIRA の順に同期した場合、両方の情報が保持される', () => {
+      // 1. Confluence 同期（requirements）
+      updateSpecJsonAfterConfluenceSync(
+        testFeatureName,
+        'requirements',
+        {
+          pageId: 'page123',
+          url: 'https://example.atlassian.net/wiki/spaces/TEST/pages/page123',
+          title: 'Test Requirements',
+          spaceKey: 'TEST'
+        },
+        testDir
+      );
+
+      // 2. JIRA 同期
+      updateSpecJsonAfterJiraSync(
+        testFeatureName,
+        {
+          projectKey: 'TEST',
+          epicKey: 'TEST-123',
+          epicUrl: 'https://example.atlassian.net/browse/TEST-123',
+          storyKeys: ['TEST-124']
+        },
+        testDir
+      );
+
+      // 両方の情報が保持されているか確認
+      const spec = loadSpecJson(testFeatureName, testDir);
+
+      expect(spec.confluence?.spaceKey).toBe('TEST');
+      expect(spec.confluence?.requirements).toBeDefined();
+      expect(spec.jira?.epicKey).toBe('TEST-123');
+      expect(spec.milestones?.requirementsCompleted).toBe(true);
+      expect(spec.milestones?.jiraSyncCompleted).toBe(true);
+    });
+  });
+});

package/scripts/utils/confluence-hierarchy.ts

@@ -14,8 +14,9 @@ import type { ConfluenceConfig, ConfluencePageCreationGranularity } from '../con
  * ページ作成結果
  */
 export interface PageCreationResult {
+  id: string;      // ページID（idとpageIdの両方をサポート）
+  pageId: string;  // ページID（後方互換性のため）
   url: string;
-  pageId: string;
   title: string;
 }
 
@@ -281,6 +282,7 @@ export async function createSinglePage(
   const baseUrl = process.env.ATLASSIAN_URL || '';
   return {
     pages: [{
+      id: page.id,
       url: `${baseUrl}/wiki${page._links.webui}`,
       pageId: page.id,
       title: pageTitle
@@ -351,6 +353,7 @@ export async function createBySectionPages(
     
     const baseUrl = process.env.ATLASSIAN_URL || '';
     pages.push({
+      id: page.id,
       url: `${baseUrl}/wiki${page._links.webui}`,
       pageId: page.id,
       title: pageTitle
@@ -474,6 +477,7 @@ export async function createByHierarchySimplePages(
   const baseUrl = process.env.ATLASSIAN_URL || '';
   return {
     pages: [{
+      id: childPage.id,
       url: `${baseUrl}/wiki${childPage._links.webui}`,
       pageId: childPage.id,
       title: childPageTitle
@@ -609,6 +613,7 @@ export async function createByHierarchyNestedPages(
     
     const baseUrl = process.env.ATLASSIAN_URL || '';
     pages.push({
+      id: sectionPage.id,
       url: `${baseUrl}/wiki${sectionPage._links.webui}`,
       pageId: sectionPage.id,
       title: sectionPageTitle
@@ -756,6 +761,7 @@ export async function createManualPages(
       
       const baseUrl = process.env.ATLASSIAN_URL || '';
       pages.push({
+        id: page.id,
         url: `${baseUrl}/wiki${page._links.webui}`,
         pageId: page.id,
         title: pageTitle

package/scripts/utils/project-finder.ts

@@ -0,0 +1,184 @@
+/**
+ * プロジェクト検出ユーティリティ
+ * リポジトリルートを検出し、projects/配下のプロジェクトを検索
+ * 複数プロジェクトが存在する場合、選択機能を提供
+ */
+
+import { existsSync, readdirSync } from 'fs';
+import { resolve, join, dirname } from 'path';
+import { readFileSync } from 'fs';
+import type { ProjectMetadata } from './project-meta.js';
+
+export interface ProjectLocation {
+  path: string;
+  projectId: string;
+  projectName: string;
+  jiraProjectKey: string;
+}
+
+/**
+ * 指定されたディレクトリに.kiro/project.jsonが存在するか確認
+ */
+function hasProjectJson(dir: string): boolean {
+  const projectJsonPath = join(dir, '.kiro', 'project.json');
+  return existsSync(projectJsonPath);
+}
+
+/**
+ * プロジェクトメタデータを読み込む
+ */
+function loadProjectMetadata(dir: string): ProjectMetadata | null {
+  const projectJsonPath = join(dir, '.kiro', 'project.json');
+  
+  if (!existsSync(projectJsonPath)) {
+    return null;
+  }
+  
+  try {
+    const content = readFileSync(projectJsonPath, 'utf-8');
+    const meta = JSON.parse(content) as ProjectMetadata;
+    return meta;
+  } catch (error) {
+    // パースエラーなどは無視
+    return null;
+  }
+}
+
+/**
+ * 現在のディレクトリから親ディレクトリを遡って.kiro/project.jsonを検索
+ */
+export function findCurrentProject(startDir: string = process.cwd()): ProjectLocation | null {
+  let currentDir = resolve(startDir);
+  const root = resolve('/');
+  
+  while (currentDir !== root && currentDir !== dirname(currentDir)) {
+    if (hasProjectJson(currentDir)) {
+      const meta = loadProjectMetadata(currentDir);
+      if (meta) {
+        return {
+          path: currentDir,
+          projectId: meta.projectId,
+          projectName: meta.projectName,
+          jiraProjectKey: meta.jiraProjectKey
+        };
+      }
+    }
+    
+    const parentDir = dirname(currentDir);
+    if (parentDir === currentDir) {
+      break;
+    }
+    currentDir = parentDir;
+  }
+  
+  return null;
+}
+
+/**
+ * リポジトリルートを検出
+ * .gitディレクトリまたはprojects/ディレクトリの存在から判断
+ */
+export function findRepositoryRoot(startDir: string = process.cwd()): string {
+  let currentDir = resolve(startDir);
+  const root = resolve('/');
+  
+  while (currentDir !== root && currentDir !== dirname(currentDir)) {
+    // .gitディレクトリまたはprojects/ディレクトリが存在する場合、リポジトリルートと判断
+    if (existsSync(join(currentDir, '.git')) || existsSync(join(currentDir, 'projects'))) {
+      return currentDir;
+    }
+    
+    const parentDir = dirname(currentDir);
+    if (parentDir === currentDir) {
+      break;
+    }
+    currentDir = parentDir;
+  }
+  
+  // リポジトリルートが見つからない場合、現在のディレクトリを返す
+  return resolve(startDir);
+}
+
+/**
+ * リポジトリルートからprojects/配下の全プロジェクトを検索
+ * 統一されたディレクトリ構成: すべてのプロジェクトはprojects/{project-id}/配下に配置
+ */
+export function findAllProjects(
+  searchDir?: string
+): ProjectLocation[] {
+  const projects: ProjectLocation[] = [];
+  
+  // リポジトリルートを検出
+  const repoRoot = searchDir ? findRepositoryRoot(searchDir) : findRepositoryRoot();
+  const projectsDir = join(repoRoot, 'projects');
+  
+  // projects/ディレクトリが存在しない場合は空配列を返す
+  if (!existsSync(projectsDir)) {
+    return projects;
+  }
+  
+  try {
+    // projects/配下のディレクトリを取得
+    const entries = readdirSync(projectsDir, { withFileTypes: true });
+    
+    for (const entry of entries) {
+      // 隠しディレクトリはスキップ
+      if (entry.name.startsWith('.')) {
+        continue;
+      }
+      
+      if (entry.isDirectory()) {
+        const projectDir = join(projectsDir, entry.name);
+        // プロジェクトディレクトリに.kiro/project.jsonがあるか確認
+        if (hasProjectJson(projectDir)) {
+          const meta = loadProjectMetadata(projectDir);
+          if (meta) {
+            projects.push({
+              path: projectDir,
+              projectId: meta.projectId,
+              projectName: meta.projectName,
+              jiraProjectKey: meta.jiraProjectKey
+            });
+          }
+        }
+      }
+    }
+  } catch (error) {
+    // アクセス権限エラーなどは無視
+  }
+  
+  return projects;
+}
+
+/**
+ * 複数プロジェクトから選択する（対話的）
+ */
+export async function selectProject(
+  projects: ProjectLocation[],
+  question: (prompt: string) => Promise<string>
+): Promise<ProjectLocation | null> {
+  if (projects.length === 0) {
+    return null;
+  }
+  
+  if (projects.length === 1) {
+    return projects[0];
+  }
+  
+  console.log('\n📋 複数のプロジェクトが見つかりました:');
+  projects.forEach((project, index) => {
+    console.log(`  ${index + 1}. ${project.projectName} (${project.projectId}) - ${project.path}`);
+  });
+  
+  const answer = await question(`\n選択してください [1-${projects.length}]: `);
+  const index = parseInt(answer.trim(), 10) - 1;
+  
+  if (index >= 0 && index < projects.length) {
+    return projects[index];
+  }
+  
+  // 無効な入力の場合は最初のプロジェクトを返す
+  console.log('⚠️  無効な選択です。最初のプロジェクトを使用します。');
+  return projects[0];
+}
+

package/scripts/utils/spec-updater.ts

@@ -0,0 +1,212 @@
+/**
+ * spec.json 更新ユーティリティ
+ * Confluence/JIRA 同期後に spec.json を更新する
+ */
+
+import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
+import { resolve, dirname } from 'path';
+
+/**
+ * spec.json の型定義
+ */
+export interface SpecJson {
+  featureName?: string;
+  projectName?: string;
+  confluence?: {
+    spaceKey?: string;
+    requirements?: {
+      pageId?: string;
+      url?: string;
+      title?: string;
+    };
+    design?: {
+      pageId?: string;
+      url?: string;
+      title?: string;
+    };
+    tasks?: {
+      pageId?: string;
+      url?: string;
+      title?: string;
+    };
+  };
+  jira?: {
+    projectKey?: string;
+    epicKey?: string;
+    epicUrl?: string;
+    storyKeys?: string[];
+  };
+  milestones?: {
+    requirementsCompleted?: boolean;
+    designCompleted?: boolean;
+    tasksCompleted?: boolean;
+    jiraSyncCompleted?: boolean;
+  };
+  lastUpdated?: string;
+}
+
+/**
+ * spec.json を読み込む
+ */
+export function loadSpecJson(featureName: string, projectRoot: string = process.cwd()): SpecJson {
+  const specPath = resolve(projectRoot, `.kiro/specs/${featureName}/spec.json`);
+
+  if (!existsSync(specPath)) {
+    // 新規作成する場合は最低限の構造を返す
+    return {
+      featureName,
+      confluence: {},
+      jira: {},
+      milestones: {},
+    };
+  }
+
+  try {
+    const content = readFileSync(specPath, 'utf-8');
+    return JSON.parse(content);
+  } catch (error) {
+    console.warn(`⚠️  Failed to load spec.json from ${specPath}: ${error instanceof Error ? error.message : 'Unknown error'}`);
+    return {
+      featureName,
+      confluence: {},
+      jira: {},
+      milestones: {},
+    };
+  }
+}
+
+/**
+ * spec.json を保存する
+ * @param featureName 機能名
+ * @param spec 保存する spec オブジェクト（lastUpdated フィールドが更新されます）
+ * @param projectRoot プロジェクトルート（デフォルト: process.cwd()）
+ */
+export function saveSpecJson(featureName: string, spec: SpecJson, projectRoot: string = process.cwd()): void {
+  const specDir = resolve(projectRoot, `.kiro/specs/${featureName}`);
+  const specPath = resolve(specDir, 'spec.json');
+
+  // ディレクトリが存在しない場合は作成
+  if (!existsSync(specDir)) {
+    mkdirSync(specDir, { recursive: true });
+  }
+
+  // lastUpdated を更新
+  spec.lastUpdated = new Date().toISOString();
+
+  try {
+    writeFileSync(specPath, JSON.stringify(spec, null, 2), 'utf-8');
+    console.log(`✅ Updated spec.json: ${specPath}`);
+  } catch (error) {
+    console.error(`❌ Failed to save spec.json to ${specPath}: ${error instanceof Error ? error.message : 'Unknown error'}`);
+    throw error;
+  }
+}
+
+/**
+ * Confluence 同期後に spec.json を更新
+ */
+export function updateSpecJsonAfterConfluenceSync(
+  featureName: string,
+  docType: 'requirements' | 'design' | 'tasks',
+  pageInfo: {
+    pageId: string;
+    url: string;
+    title: string;
+    spaceKey: string;
+  },
+  projectRoot: string = process.cwd()
+): void {
+  const spec = loadSpecJson(featureName, projectRoot);
+
+  // Confluence 情報を更新
+  if (!spec.confluence) {
+    spec.confluence = {};
+  }
+
+  // スペースキーを設定
+  if (pageInfo.spaceKey) {
+    spec.confluence.spaceKey = pageInfo.spaceKey;
+  }
+
+  // 新形式：ドキュメントタイプごとのページ情報を更新
+  spec.confluence[docType] = {
+    pageId: pageInfo.pageId,
+    url: pageInfo.url,
+    title: pageInfo.title,
+  };
+
+  // 旧形式（後方互換性のため併記）
+  if (docType === 'requirements') {
+    (spec.confluence as any).requirementsPageId = pageInfo.pageId;
+    (spec.confluence as any).requirementsUrl = pageInfo.url;
+  } else if (docType === 'design') {
+    (spec.confluence as any).designPageId = pageInfo.pageId;
+    (spec.confluence as any).designUrl = pageInfo.url;
+  } else if (docType === 'tasks') {
+    (spec.confluence as any).tasksPageId = pageInfo.pageId;
+    (spec.confluence as any).tasksUrl = pageInfo.url;
+  }
+
+  // マイルストーンを更新
+  if (!spec.milestones) {
+    spec.milestones = {};
+  }
+
+  // 新形式：フラットなフィールド
+  if (docType === 'requirements') {
+    spec.milestones.requirementsCompleted = true;
+    // 旧形式（後方互換性のため併記）
+    if (!(spec.milestones as any).requirements) {
+      (spec.milestones as any).requirements = {};
+    }
+    (spec.milestones as any).requirements.completed = true;
+  } else if (docType === 'design') {
+    spec.milestones.designCompleted = true;
+    // 旧形式（後方互換性のため併記）
+    if (!(spec.milestones as any).design) {
+      (spec.milestones as any).design = {};
+    }
+    (spec.milestones as any).design.completed = true;
+  } else if (docType === 'tasks') {
+    spec.milestones.tasksCompleted = true;
+    // 旧形式（後方互換性のため併記）
+    if (!(spec.milestones as any).tasks) {
+      (spec.milestones as any).tasks = {};
+    }
+    (spec.milestones as any).tasks.completed = true;
+  }
+
+  saveSpecJson(featureName, spec, projectRoot);
+}
+
+/**
+ * JIRA 同期後に spec.json を更新
+ */
+export function updateSpecJsonAfterJiraSync(
+  featureName: string,
+  jiraInfo: {
+    projectKey: string;
+    epicKey: string;
+    epicUrl: string;
+    storyKeys: string[];
+  },
+  projectRoot: string = process.cwd()
+): void {
+  const spec = loadSpecJson(featureName, projectRoot);
+
+  // JIRA 情報を更新
+  spec.jira = {
+    projectKey: jiraInfo.projectKey,
+    epicKey: jiraInfo.epicKey,
+    epicUrl: jiraInfo.epicUrl,
+    storyKeys: jiraInfo.storyKeys,
+  };
+
+  // マイルストーンを更新
+  if (!spec.milestones) {
+    spec.milestones = {};
+  }
+  spec.milestones.jiraSyncCompleted = true;
+
+  saveSpecJson(featureName, spec, projectRoot);
+}