phasegate 0.283.0 → 0.315.0

package/scripts/harness/quick-mode/application/usecases/classify-change-category-usecase.ts

@@ -6,10 +6,15 @@
  * paths から変更カテゴリを分類し fullModeRequired 判定と理由を返す UseCase
  */
 
-import { ChangedFile } from '../../domain/value-objects/changed-file.js';
-import { QuickModeJudgmentEngine } from '../../domain/services/quick-mode-judgment-engine.js';
-import type { QuickModeConfigPort } from '../ports/quick-mode-config-port.js';
-import type { ChangeCategoryClassificationContract, ChangeCategoryPerFile } from '../dto/change-category-classification-contract.js';
+import { QuickModeJudgmentEngine } from "../../domain/services/quick-mode-judgment-engine.js";
+import type { ChangeKind } from "../../domain/types/change-kind.js";
+import { ChangedFile } from "../../domain/value-objects/changed-file.js";
+import type {
+  ChangeCategoryClassificationContract,
+  ChangeCategoryPerFile,
+} from "../dto/change-category-classification-contract.js";
+import type { FileExistencePort } from "../ports/file-existence-port.js";
+import type { QuickModeConfigPort } from "../ports/quick-mode-config-port.js";
 
 export interface ClassifyChangeCategoryUseCaseInput {
   readonly paths: readonly string[];
@@ -23,20 +28,41 @@ export interface ClassifyChangeCategoryUseCaseInput {
 export interface ClassifyChangeCategoryUseCaseDeps {
   quickModeConfigPort: QuickModeConfigPort;
   judgmentEngine?: QuickModeJudgmentEngine;
+  fileExistencePort?: FileExistencePort;
 }
 
 export class ClassifyChangeCategoryUseCase {
   private readonly quickModeConfigPort: QuickModeConfigPort;
   private readonly judgmentEngine: QuickModeJudgmentEngine;
+  private readonly fileExistencePort?: FileExistencePort;
 
   constructor(deps: ClassifyChangeCategoryUseCaseDeps) {
     this.quickModeConfigPort = deps.quickModeConfigPort;
     this.judgmentEngine = deps.judgmentEngine ?? new QuickModeJudgmentEngine();
+    this.fileExistencePort = deps.fileExistencePort;
   }
 
-  async execute(
-    input: ClassifyChangeCategoryUseCaseInput
-  ): Promise<Readonly<ChangeCategoryClassificationContract>> {
+  /**
+   * targetChanges 引数自体が渡されない経路（CLI: check-change-category --paths）向けの
+   * changeKind 推定。hook 経路は beforeContent=null → CREATE と判定するため、同一パスで
+   * CLI=MODIFY(bugfix) / hook=CREATE(feature) に割れていた（WI-334）。
+   * ファイルが存在しない場合は CREATE、存在する場合は MODIFY と推定して hook 判定と一致させる。
+   * port 未注入・存在チェック失敗時は従来どおり MODIFY 既定（安全側）。
+   * なお hook は targetChanges を常に配列（空を含む）で渡すため推定対象外となり、
+   * Bash 抽出ターゲット等（配列にエントリが無いパス）の従来挙動は変えない。
+   */
+  private async inferChangeKind(filePath: string): Promise<ChangeKind> {
+    if (this.fileExistencePort === undefined) {
+      return "MODIFY";
+    }
+    try {
+      return (await this.fileExistencePort.exists(filePath)) ? "MODIFY" : "CREATE";
+    } catch {
+      return "MODIFY";
+    }
+  }
+
+  async execute(input: ClassifyChangeCategoryUseCaseInput): Promise<Readonly<ChangeCategoryClassificationContract>> {
     const config = await this.quickModeConfigPort.getConfig();
 
     if (input.paths.length === 0) {
@@ -47,21 +73,33 @@ export class ClassifyChangeCategoryUseCase {
       });
     }
 
+    const inferenceEnabled = input.targetChanges === undefined;
     const targetChanges = new Map((input.targetChanges ?? []).map((change) => [change.filePath, change]));
-    const changedFiles = input.paths.map((p) => {
-      const targetChange = targetChanges.get(p);
-      const beforeContent = targetChange?.beforeContent ?? null;
-      const afterContent = targetChange?.afterContent ?? null;
-      return ChangedFile.create({
-        filePath: p,
-        // 変更前の内容が無く変更後の内容がある場合は新規作成 (CREATE) とみなす。
-        // 以前は無条件で MODIFY 固定だったため、新規 domain/ ファイルが
-        // NEW_DOMAIN 判定を回避して quick mode をすり抜けていた。
-        changeKind: beforeContent === null && afterContent !== null ? 'CREATE' : 'MODIFY',
-        beforeContent,
-        afterContent,
-      });
-    });
+    const changedFiles = await Promise.all(
+      input.paths.map(async (p) => {
+        const targetChange = targetChanges.get(p);
+        if (targetChange === undefined && inferenceEnabled) {
+          // targetChanges 引数が渡されない経路（CLI）はファイル存在で CREATE/MODIFY を推定する（WI-334）
+          return ChangedFile.create({
+            filePath: p,
+            changeKind: await this.inferChangeKind(p),
+            beforeContent: null,
+            afterContent: null,
+          });
+        }
+        const beforeContent = targetChange?.beforeContent ?? null;
+        const afterContent = targetChange?.afterContent ?? null;
+        return ChangedFile.create({
+          filePath: p,
+          // 変更前の内容が無く変更後の内容がある場合は新規作成 (CREATE) とみなす。
+          // 以前は無条件で MODIFY 固定だったため、新規 domain/ ファイルが
+          // NEW_DOMAIN 判定を回避して quick mode をすり抜けていた。
+          changeKind: beforeContent === null && afterContent !== null ? "CREATE" : "MODIFY",
+          beforeContent,
+          afterContent,
+        });
+      }),
+    );
 
     const classification = this.judgmentEngine.classify(changedFiles, config);
     const eligibility = this.judgmentEngine.judge(changedFiles, config);
@@ -76,7 +114,7 @@ export class ClassifyChangeCategoryUseCase {
           categoryForFile = categoryKey;
         }
       });
-      perFile.push({ path, category: categoryForFile ?? 'unknown' });
+      perFile.push({ path, category: categoryForFile ?? "unknown" });
     }
 
     const fullModeRequired = !eligibility.isEligible();

package/scripts/harness/quick-mode/composition-root.ts

@@ -5,19 +5,20 @@
  * quick-mode ユニットの Composition Root
  */
 
-import { GitDiffChangedFilesAdapter } from './infrastructure/adapters/git-diff-changed-files-adapter.js';
-import { HarnessConfigQuickModeConfigAdapter } from './infrastructure/adapters/harness-config-quick-mode-config-adapter.js';
-import { ValidatorSystemValidatorIdRegistryAdapter } from './infrastructure/adapters/validator-system-validator-id-registry-adapter.js';
-import { ValidatorSystemQuickModeExecutionAdapter } from './infrastructure/adapters/validator-system-quick-mode-execution-adapter.js';
-import { QuickModeJudgmentEngine } from './domain/services/quick-mode-judgment-engine.js';
-import { ValidatorRelaxationService } from './domain/services/validator-relaxation-service.js';
-import { QuickModeDecisionContractMapper } from './application/mappers/quick-mode-decision-contract-mapper.js';
-import { JudgeQuickModeEligibilityUseCase } from './application/usecases/judge-quick-mode-eligibility-usecase.js';
-import { BuildRelaxationProfileUseCase } from './application/usecases/build-relaxation-profile-usecase.js';
-import { ExecuteQuickCiCheckUseCase } from './application/usecases/execute-quick-ci-check-usecase.js';
-import { ClassifyChangeCategoryUseCase } from './application/usecases/classify-change-category-usecase.js';
-import { CiCheckQuickModeHandler } from './presentation/handlers/ci-check-quick-mode-handler.js';
-import { CheckChangeCategoryHandler } from './presentation/handlers/check-change-category-handler.js';
+import { QuickModeDecisionContractMapper } from "./application/mappers/quick-mode-decision-contract-mapper.js";
+import { BuildRelaxationProfileUseCase } from "./application/usecases/build-relaxation-profile-usecase.js";
+import { ClassifyChangeCategoryUseCase } from "./application/usecases/classify-change-category-usecase.js";
+import { ExecuteQuickCiCheckUseCase } from "./application/usecases/execute-quick-ci-check-usecase.js";
+import { JudgeQuickModeEligibilityUseCase } from "./application/usecases/judge-quick-mode-eligibility-usecase.js";
+import { QuickModeJudgmentEngine } from "./domain/services/quick-mode-judgment-engine.js";
+import { ValidatorRelaxationService } from "./domain/services/validator-relaxation-service.js";
+import { FsFileExistenceAdapter } from "./infrastructure/adapters/fs-file-existence-adapter.js";
+import { GitDiffChangedFilesAdapter } from "./infrastructure/adapters/git-diff-changed-files-adapter.js";
+import { HarnessConfigQuickModeConfigAdapter } from "./infrastructure/adapters/harness-config-quick-mode-config-adapter.js";
+import { ValidatorSystemQuickModeExecutionAdapter } from "./infrastructure/adapters/validator-system-quick-mode-execution-adapter.js";
+import { ValidatorSystemValidatorIdRegistryAdapter } from "./infrastructure/adapters/validator-system-validator-id-registry-adapter.js";
+import { CheckChangeCategoryHandler } from "./presentation/handlers/check-change-category-handler.js";
+import { CiCheckQuickModeHandler } from "./presentation/handlers/ci-check-quick-mode-handler.js";
 
 export interface QuickModeCompositionRoot {
   handler: CiCheckQuickModeHandler;
@@ -28,12 +29,20 @@ export interface QuickModeCompositionRoot {
   classifyUseCase: ClassifyChangeCategoryUseCase;
 }
 
-export function createQuickModeCompositionRoot(): QuickModeCompositionRoot {
+export interface QuickModeCompositionRootOptions {
+  configPath?: string;
+  rootDir?: string;
+}
+
+export function createQuickModeCompositionRoot(
+  options: QuickModeCompositionRootOptions = {},
+): QuickModeCompositionRoot {
   // Infrastructure
   const gitDiffAdapter = new GitDiffChangedFilesAdapter();
-  const harnessConfigAdapter = new HarnessConfigQuickModeConfigAdapter();
+  const harnessConfigAdapter = new HarnessConfigQuickModeConfigAdapter(options.configPath);
   const validatorIdRegistryAdapter = new ValidatorSystemValidatorIdRegistryAdapter();
   const validatorExecutionPort = new ValidatorSystemQuickModeExecutionAdapter();
+  const fileExistencePort = new FsFileExistenceAdapter(options.rootDir);
 
   // Domain Services
   const judgmentEngine = new QuickModeJudgmentEngine();
@@ -72,6 +81,7 @@ export function createQuickModeCompositionRoot(): QuickModeCompositionRoot {
   const classifyUseCase = new ClassifyChangeCategoryUseCase({
     quickModeConfigPort,
     judgmentEngine,
+    fileExistencePort,
   });
 
   // Presentation

package/scripts/harness/quick-mode/domain/services/quick-mode-judgment-engine.ts

@@ -2,6 +2,8 @@
  * @layer domain
  * @unit quick-mode
  * @work-item-id WI-204
+ * @work-item-id WI-349
+ * @work-item-id WI-352
  *
  * ChangedFile[]をChangeClassificationに変換し、3拒否ルールを評価してQuickModeEligibilityを返すドメインサービス
  */
@@ -24,6 +26,37 @@ const RISK_PRIORITY: Record<string, number> = {
   docs: 0,
 };
 
+// config: リポジトリ直下の bootstrap 設定ファイル（列挙型 allowlist）。
+// これらは unit を持たず、CREATE だと feature に落ちて allowedCategories に
+// 入れる手段がないため greenfield な初期セットアップが恒久的にブロックされていた。
+// ワイルドカード（.github/** 等）には広げず、実在する bootstrap ファイル名のみを
+// 列挙して fail-closed を維持する（WI-334 の .github/workflows、
+// WI-261 の skills/**/*.md と同型の判断）。
+// package.json は protected-file 経路で別途保護されるためここには含めない。
+// @work-item-id WI-352
+const ROOT_BOOTSTRAP_CONFIG_FILES: ReadonlySet<string> = new Set([
+  ".gitignore",
+  ".gitattributes",
+  ".editorconfig",
+  ".npmrc",
+  ".nvmrc",
+  "tsconfig.json",
+]);
+
+const HUSKY_DIRECTORY_PREFIX = ".husky/";
+
+function isRootBootstrapConfigFile(filePath: string): boolean {
+  if (ROOT_BOOTSTRAP_CONFIG_FILES.has(filePath)) {
+    return true;
+  }
+  // tsconfig.*.json（tsconfig.build.json / tsconfig.test.json 等）もルート直下のみ許可
+  if (/^tsconfig\.[^/]+\.json$/.test(filePath)) {
+    return true;
+  }
+  // .husky/ 配下の hook スクリプト（L0 の runtime 定義）
+  return filePath.startsWith(HUSKY_DIRECTORY_PREFIX) && filePath.slice(HUSKY_DIRECTORY_PREFIX.length).length > 0;
+}
+
 function categorizeFile(file: ChangedFile): ChangeCategory {
   const { filePath, changeKind } = file;
 
@@ -37,6 +70,23 @@ function categorizeFile(file: ChangedFile): ChangeCategory {
     return ChangeCategory.fromString("config");
   }
 
+  // config: .github/workflows/ 配下の CI workflow（.yml / .yaml）。
+  // CI workflow は unit を持たない構成ファイルであり、CREATE でも config に分類する。
+  // 内容レベルの防御は L3-006 injection scanner と integrity pin が担う
+  // （WI-261 の skills/**/*.md → docs 分類と同型の判断）。
+  // MODIFY がフォールバックで bugfix として quick を通過する現状との整合も取る。
+  // .github/ 全体には広げず workflows/ 配下の yml/yaml に限定し、
+  // それ以外の .github/ 配下は従来どおりフォールバック（fail-closed）を維持する。
+  // @work-item-id WI-334
+  if (filePath.startsWith(".github/workflows/") && (filePath.endsWith(".yml") || filePath.endsWith(".yaml"))) {
+    return ChangeCategory.fromString("config");
+  }
+
+  // config: リポジトリ直下の bootstrap 設定ファイル（WI-352）
+  if (isRootBootstrapConfigFile(filePath)) {
+    return ChangeCategory.fromString("config");
+  }
+
   if (isCommentOnlyDiff(file)) {
     return ChangeCategory.fromString("docs");
   }
@@ -80,6 +130,17 @@ function categorizeFile(file: ChangedFile): ChangeCategory {
   return ChangeCategory.fromString("bugfix");
 }
 
+/**
+ * WI-349: 遮断理由に判定根拠（分類カテゴリと変更種別）を含める。
+ *
+ * 従来はパス列挙のみだったため「なぜそのパスが不許可なのか」が読み取れず、
+ * 利用者が「ワークツリーの無関係な変更のせいでブロックされている」と
+ * 誤認する原因になっていた（issue #41 症状②）。
+ */
+function describeChangedFile(file: ChangedFile, category: string): string {
+  return `${file.filePath} (category=${category}, changeKind=${file.changeKind})`;
+}
+
 export class QuickModeJudgmentEngine {
   classify(changedFiles: readonly ChangedFile[], _config?: QuickModeConfig): ChangeClassification {
     if (changedFiles.length === 0) {
@@ -115,9 +176,13 @@ export class QuickModeJudgmentEngine {
     // 1. MIXED_CHANGES評価: allowedCategories 外のカテゴリが含まれる場合
     if (config.isFullModeRequiredFor("mixedCategories")) {
       const notAllowedFiles: ChangedFile[] = [];
+      const notAllowedDescriptions: string[] = [];
       classification.categorizedFiles.forEach((files, categoryKey) => {
         if (!config.isAllowed(categoryKey)) {
           notAllowedFiles.push(...files);
+          for (const file of files) {
+            notAllowedDescriptions.push(describeChangedFile(file, categoryKey));
+          }
         }
       });
 
@@ -125,7 +190,7 @@ export class QuickModeJudgmentEngine {
         return QuickModeEligibility.rejected(
           "MIXED_CHANGES",
           notAllowedFiles,
-          `allowedCategories外のファイルが含まれています: ${notAllowedFiles.map((f) => f.filePath).join(", ")}`,
+          `allowedCategories外のファイルが含まれています: ${notAllowedDescriptions.join(", ")}`,
         );
       }
     }
@@ -140,7 +205,9 @@ export class QuickModeJudgmentEngine {
         return QuickModeEligibility.rejected(
           "NEW_DOMAIN",
           newDomainFiles,
-          `domain/配下に新規ファイルが追加されています: ${newDomainFiles.map((f) => f.filePath).join(", ")}`,
+          `domain/配下に新規ファイルが追加されています: ${newDomainFiles
+            .map((f) => describeChangedFile(f, categorizeFile(f).toString()))
+            .join(", ")}`,
         );
       }
     }
@@ -155,7 +222,9 @@ export class QuickModeJudgmentEngine {
         return QuickModeEligibility.rejected(
           "API_CONTRACT",
           apiContractFiles,
-          `Port/Adapterインターフェースファイルの変更が含まれています: ${apiContractFiles.map((f) => f.filePath).join(", ")}`,
+          `Port/Adapterインターフェースファイルの変更が含まれています: ${apiContractFiles
+            .map((f) => describeChangedFile(f, categorizeFile(f).toString()))
+            .join(", ")}`,
         );
       }
     }

package/scripts/harness/quick-mode/infrastructure/adapters/fs-file-existence-adapter.ts

@@ -0,0 +1,38 @@
+/**
+ * @layer infrastructure
+ * @unit quick-mode
+ * @work-item-id WI-334
+ *
+ * FileExistencePort の fs 実装。
+ * 相対パスは baseDir（既定: process.cwd()）基準で解決する。
+ * stat が ENOENT / ENOTDIR 以外で失敗した場合（権限エラー等）は
+ * 「存在する」扱いにして呼び出し側の changeKind 推定を MODIFY 既定
+ * （従来どおりの安全側）に倒す。
+ */
+
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { FileExistencePort } from "../../application/ports/file-existence-port.js";
+
+export class FsFileExistenceAdapter implements FileExistencePort {
+  private readonly baseDir: string;
+
+  constructor(baseDir?: string) {
+    this.baseDir = baseDir ?? process.cwd();
+  }
+
+  async exists(filePath: string): Promise<boolean> {
+    const absolutePath = path.isAbsolute(filePath) ? filePath : path.join(this.baseDir, filePath);
+    try {
+      await fs.stat(absolutePath);
+      return true;
+    } catch (err) {
+      const error = err as NodeJS.ErrnoException;
+      if (error.code === "ENOENT" || error.code === "ENOTDIR") {
+        return false;
+      }
+      // stat 失敗（権限等）は存在扱い → changeKind は従来どおり MODIFY 既定（安全側）
+      return true;
+    }
+  }
+}

package/scripts/harness/skill-quality/infrastructure/adapters/file-system-requirement-test-matrix-adapter.ts

@@ -2,26 +2,69 @@
  * @layer infrastructure
  * @unit skill-quality
  * @work-item-id WI-188
+ * @work-item-id WI-341
  */
-import { readFile } from 'node:fs/promises';
-import type { RequirementTestMatrixPort, RequirementTestMatrix } from '../../domain/ports/requirement-test-matrix-port.js';
-import { SkillQualityError } from '../../domain/errors/skill-quality-error.js';
+import { readFile } from "node:fs/promises";
+import { SkillQualityError } from "../../domain/errors/skill-quality-error.js";
+import type {
+  RequirementTestMatrix,
+  RequirementTestMatrixPort,
+} from "../../domain/ports/requirement-test-matrix-port.js";
+
+interface GeneratedMatrixAcMapping {
+  readonly acId: string;
+  readonly testReferences: readonly unknown[];
+}
+
+interface GeneratedMatrixStory {
+  readonly storyId: string;
+  readonly storyMappings: readonly GeneratedMatrixAcMapping[];
+}
 
 export class FileSystemRequirementTestMatrixAdapter implements RequirementTestMatrixPort {
-  constructor(private readonly matrixFilePath: string = '.harness/requirement-test-matrix.json') {}
+  constructor(private readonly matrixFilePath: string = ".harness/requirement-test-matrix.json") {}
 
   async read(storyId: string): Promise<RequirementTestMatrix> {
     let raw: string;
     try {
-      raw = await readFile(this.matrixFilePath, 'utf-8');
+      raw = await readFile(this.matrixFilePath, "utf-8");
     } catch {
-      throw new SkillQualityError('MATRIX_FILE_NOT_FOUND', `requirement-test-matrix.json not found at ${this.matrixFilePath}`);
+      throw new SkillQualityError(
+        "MATRIX_FILE_NOT_FOUND",
+        `requirement-test-matrix.json not found at ${this.matrixFilePath}`,
+      );
     }
-    const data = JSON.parse(raw) as Record<string, unknown>;
+    let data: Record<string, unknown>;
+    try {
+      data = JSON.parse(raw) as Record<string, unknown>;
+    } catch {
+      throw new SkillQualityError(
+        "MATRIX_FILE_NOT_FOUND",
+        `requirement-test-matrix.json could not be parsed at ${this.matrixFilePath}`,
+      );
+    }
+
+    if (Array.isArray(data.stories)) {
+      const story = (data.stories as GeneratedMatrixStory[]).find((candidate) => candidate.storyId === storyId);
+      if (story === undefined) {
+        throw new SkillQualityError("STORY_NOT_FOUND", `Story ${storyId} not found in ${this.matrixFilePath}`);
+      }
+
+      const uncoveredIds = story.storyMappings
+        .filter((mapping) => !Array.isArray(mapping.testReferences) || mapping.testReferences.length === 0)
+        .map((mapping) => mapping.acId);
+      return {
+        storyId,
+        total: story.storyMappings.length,
+        covered: story.storyMappings.length - uncoveredIds.length,
+        uncoveredIds,
+      };
+    }
+
     const rootEntry = data as { total?: unknown; covered?: unknown; uncoveredIds?: unknown };
     const explicitEntry = data[storyId];
     if (explicitEntry === undefined && rootEntry.total === undefined) {
-      throw new SkillQualityError('STORY_NOT_FOUND', `Story ${storyId} not found in ${this.matrixFilePath}`);
+      throw new SkillQualityError("STORY_NOT_FOUND", `Story ${storyId} not found in ${this.matrixFilePath}`);
     }
     const entry = (explicitEntry ?? data) as { total: number; covered: number; uncoveredIds: string[] };
     return {

package/scripts/harness/skill-quality/presentation/handlers/check-coverage-handler.ts

@@ -2,12 +2,14 @@
  * @layer presentation
  * @unit skill-quality
  * @work-item-id WI-188
+ * @work-item-id WI-341
  */
-import type { CheckCoverageUseCase } from '../../application/usecases/check-coverage-usecase.js';
+import type { CheckCoverageUseCase } from "../../application/usecases/check-coverage-usecase.js";
+import { SkillQualityError } from "../../domain/errors/skill-quality-error.js";
 
 export interface CheckCoverageArgs {
   storyId: string;
-  format?: 'human' | 'json';
+  format?: "human" | "json";
 }
 
 export class CheckCoverageHandler {
@@ -16,9 +18,9 @@ export class CheckCoverageHandler {
   async handle(args: CheckCoverageArgs): Promise<{ exitCode: number; message: string }> {
     try {
       const output = await this.useCase.execute({ storyId: args.storyId });
-      const format = args.format ?? 'human';
+      const format = args.format ?? "human";
 
-      if (format === 'json') {
+      if (format === "json") {
         return { exitCode: output.meetsThreshold ? 0 : 1, message: JSON.stringify(output, null, 2) };
       }
 
@@ -26,7 +28,7 @@ export class CheckCoverageHandler {
       const codeRate = output.coverageReport.codeCoverage.lineCoverage.toFixed(1);
       const msg = `Requirement coverage: ${reqRate}% (threshold: ${output.requirementThreshold}%)\nCode coverage: ${codeRate}% (threshold: ${output.codeThreshold}%)`;
 
-      if (output.skipped === true && output.skipReason === 'no-tests') {
+      if (output.skipped === true && output.skipReason === "no-tests") {
         return { exitCode: 0, message: `Coverage SKIPPED (no tests)\n${msg}` };
       }
 
@@ -35,7 +37,12 @@ export class CheckCoverageHandler {
       }
       return { exitCode: 1, message: `Coverage FAILED\n${msg}` };
     } catch (err) {
-      return { exitCode: 2, message: `Error: ${err instanceof Error ? err.message : String(err)}` };
+      const message = err instanceof Error ? err.message : String(err);
+      if (args.format === "json") {
+        const code = err instanceof SkillQualityError ? err.code : "UNEXPECTED_ERROR";
+        return { exitCode: 2, message: JSON.stringify({ error: { code, message } }, null, 2) };
+      }
+      return { exitCode: 2, message: `Error: ${message}` };
     }
   }
 }

package/scripts/harness/traceability-model/domain/value-objects/work-item-frontmatter.ts

@@ -1,5 +1,6 @@
 // @unit traceability-model
 // @layer domain
+// @work-item-id WI-337
 /**
  * WorkItemFrontmatter — 設計文書 frontmatter から抽出した WI メタデータ（H03-04 / ISSUE-026 Phase A-2）。
  *
@@ -8,7 +9,7 @@
  */
 
 export type WorkItemType = 'story' | 'issue' | 'fix' | 'refactor' | 'chore';
-export type WorkItemSeverity = 'trivial' | 'normal' | 'high';
+export type WorkItemSeverity = 'trivial' | 'normal' | 'medium' | 'high' | 'critical' | 'major';
 export type WorkItemStatus =
   | 'drafted'
   | 'reflected'
@@ -47,7 +48,10 @@ export const WORK_ITEM_TYPES: ReadonlySet<WorkItemType> = new Set([
 export const WORK_ITEM_SEVERITIES: ReadonlySet<WorkItemSeverity> = new Set([
   'trivial',
   'normal',
+  'medium',
   'high',
+  'critical',
+  'major',
 ]);
 
 export const WORK_ITEM_STATUSES: ReadonlySet<WorkItemStatus> = new Set([

package/scripts/harness/traceability-model/infrastructure/gateways/file-system-work-item-identity-gateway.ts

@@ -1,6 +1,7 @@
 // @unit traceability-model
 // @layer infrastructure
 // @work-item-id WI-106
+// @work-item-id WI-337
 
 import { readdir, readFile } from "node:fs/promises";
 import * as path from "node:path";
@@ -8,6 +9,7 @@ import type {
   WorkItemIdentityEntry,
   WorkItemIdentityPort,
 } from "../../domain/ports/work-item-identity-port.js";
+import { WorkItemFrontmatterValidationError } from "../../domain/value-objects/work-item-frontmatter.js";
 import { parseWorkItemFrontmatter } from "../parsers/work-item-frontmatter-parser.js";
 
 const WI_DIR_PATTERN = /^WI-\d+$/;
@@ -67,7 +69,10 @@ export class FileSystemWorkItemIdentityGateway implements WorkItemIdentityPort {
     try {
       const content = await readFile(path.join(this.rootDir, descriptionPath), "utf8");
       return parseWorkItemFrontmatter(content)?.id ?? null;
-    } catch {
+    } catch (error) {
+      if (error instanceof WorkItemFrontmatterValidationError) {
+        console.warn(`[phasegate] warning: ${descriptionPath} をスキップしました: ${error.message}`);
+      }
       return null;
     }
   }

package/scripts/harness/traceability-model/infrastructure/gateways/file-system-work-item-status-gateway.ts

@@ -1,11 +1,15 @@
 // @unit traceability-model
 // @layer infrastructure
 // @work-item-id WI-126 / WI-140
+// @work-item-id WI-337
 
 import { readdir, readFile, writeFile } from "node:fs/promises";
 import * as path from "node:path";
 import type { WorkItemStatusPort } from "../../domain/ports/work-item-status-port.js";
-import type { WorkItemFrontmatter } from "../../domain/value-objects/work-item-frontmatter.js";
+import {
+  type WorkItemFrontmatter,
+  WorkItemFrontmatterValidationError,
+} from "../../domain/value-objects/work-item-frontmatter.js";
 import type {
   WorkItemStatusApplyResult,
   WorkItemStatusInput,
@@ -52,7 +56,16 @@ export class FileSystemWorkItemStatusGateway implements WorkItemStatusPort {
     const inputs: WorkItemStatusInput[] = [];
     for (const entry of entries) {
       const content = await readFile(path.join(this.rootDir, entry.descriptionPath), "utf8");
-      const frontmatter = parseWorkItemFrontmatter(content);
+      let frontmatter: WorkItemFrontmatter | null;
+      try {
+        frontmatter = parseWorkItemFrontmatter(content);
+      } catch (error) {
+        if (error instanceof WorkItemFrontmatterValidationError) {
+          console.warn(`[phasegate] warning: ${entry.descriptionPath} をスキップしました: ${error.message}`);
+          continue;
+        }
+        throw error;
+      }
       if (frontmatter === null) continue;
 
       const aliases = this.aliasesFor(frontmatter);

package/scripts/harness/validator-system/application/use-cases/aggregate-validation-results-usecase.ts

@@ -4,9 +4,9 @@
  *
  * AggregateValidationResultsUseCase — H08-05: バリデータ結果統合集約
  */
-import type { ValidationResultContract } from '../dto/validation-result-contract.js';
-import type { AggregateResultsInput } from '../dto/aggregate-results-input.js';
-import type { AggregatedValidationReport } from '../dto/aggregated-validation-report.js';
+import { isEffectivelyPassed } from "../../domain/services/effective-severity-policy.js";
+import type { AggregateResultsInput } from "../dto/aggregate-results-input.js";
+import type { AggregatedValidationReport } from "../dto/aggregated-validation-report.js";
 
 export class AggregateValidationResultsUseCase {
   execute(input: AggregateResultsInput): AggregatedValidationReport {
@@ -24,7 +24,7 @@ export class AggregateValidationResultsUseCase {
     }[] = [];
     let totalErrors = 0;
     let totalWarnings = 0;
-    const errorsByLayer: Record<'L2' | 'L3' | 'L4', number> = { L2: 0, L3: 0, L4: 0 };
+    const errorsByLayer: Record<"L2" | "L3" | "L4", number> = { L2: 0, L3: 0, L4: 0 };
 
     for (const result of results) {
       if (result.skipped) {
@@ -32,12 +32,9 @@ export class AggregateValidationResultsUseCase {
         continue;
       }
 
-      // ADR-017: warning-only validator fail は failOnWarning=false で overall PASS、true で従来挙動 (FAIL)
-      const hasNonWarningError = result.errors.some((e) => e.severity !== 'warning');
-      const hasWarnings = result.errors.some((e) => e.severity === 'warning');
-      const isEmptyFail = !result.passed && result.errors.length === 0;
-      const hasFail =
-        !result.passed && (isEmptyFail || hasNonWarningError || (failOnWarning && hasWarnings));
+      // ADR-017 / WI-332: warning-only validator fail は failOnWarning=false で overall PASS、
+      // true で従来挙動 (FAIL)。実効判定は domain の共有実装 isEffectivelyPassed に一本化。
+      const hasFail = !isEffectivelyPassed(result, failOnWarning);
 
       if (hasFail) {
         failedValidators++;
@@ -54,7 +51,7 @@ export class AggregateValidationResultsUseCase {
         };
         allErrors.push(errorEntry);
 
-        if (error.severity === 'warning') {
+        if (error.severity === "warning") {
           totalWarnings++;
         } else {
           totalErrors++;
@@ -62,9 +59,9 @@ export class AggregateValidationResultsUseCase {
 
         // レイヤー別集計
         const code = error.code;
-        if (code.startsWith('L2-')) errorsByLayer.L2++;
-        else if (code.startsWith('L3-')) errorsByLayer.L3++;
-        else if (code.startsWith('L4-')) errorsByLayer.L4++;
+        if (code.startsWith("L2-")) errorsByLayer.L2++;
+        else if (code.startsWith("L3-")) errorsByLayer.L3++;
+        else if (code.startsWith("L4-")) errorsByLayer.L4++;
       }
     }