qfai 0.2.9 → 0.3.1

package/dist/cli/index.mjs

@@ -137,8 +137,8 @@ function report(copied, skipped, dryRun, label) {
 }
 
 // src/cli/commands/report.ts
-import { mkdir as mkdir2, readFile as readFile10, writeFile } from "fs/promises";
-import path10 from "path";
+import { mkdir as mkdir2, readFile as readFile11, writeFile } from "fs/promises";
+import path14 from "path";
 
 // src/core/config.ts
 import { readFile } from "fs/promises";
@@ -146,13 +146,11 @@ import path4 from "path";
 import { parse as parseYaml } from "yaml";
 var defaultConfig = {
   paths: {
-    specDir: ".qfai/spec",
-    decisionsDir: ".qfai/spec/decisions",
-    scenariosDir: ".qfai/spec/scenarios",
     contractsDir: ".qfai/contracts",
-    uiContractsDir: ".qfai/contracts/ui",
-    apiContractsDir: ".qfai/contracts/api",
-    dataContractsDir: ".qfai/contracts/db",
+    specsDir: ".qfai/specs",
+    rulesDir: ".qfai/rules",
+    outDir: ".qfai/out",
+    promptsDir: ".qfai/prompts",
     srcDir: "src",
     testsDir: "tests"
   },
@@ -177,8 +175,7 @@ var defaultConfig = {
     }
   },
   output: {
-    format: "text",
-    jsonPath: ".qfai/out/validate.json"
+    validateJsonPath: ".qfai/out/validate.json"
   }
 };
 function getConfigPath(root) {
@@ -227,27 +224,6 @@ function normalizePaths(raw, configPath, issues) {
     return base;
   }
   return {
-    specDir: readString(
-      raw.specDir,
-      base.specDir,
-      "paths.specDir",
-      configPath,
-      issues
-    ),
-    decisionsDir: readString(
-      raw.decisionsDir,
-      base.decisionsDir,
-      "paths.decisionsDir",
-      configPath,
-      issues
-    ),
-    scenariosDir: readString(
-      raw.scenariosDir,
-      base.scenariosDir,
-      "paths.scenariosDir",
-      configPath,
-      issues
-    ),
     contractsDir: readString(
       raw.contractsDir,
       base.contractsDir,
@@ -255,24 +231,31 @@ function normalizePaths(raw, configPath, issues) {
       configPath,
       issues
     ),
-    uiContractsDir: readString(
-      raw.uiContractsDir,
-      base.uiContractsDir,
-      "paths.uiContractsDir",
+    specsDir: readString(
+      raw.specsDir,
+      base.specsDir,
+      "paths.specsDir",
       configPath,
       issues
     ),
-    apiContractsDir: readString(
-      raw.apiContractsDir,
-      base.apiContractsDir,
-      "paths.apiContractsDir",
+    rulesDir: readString(
+      raw.rulesDir,
+      base.rulesDir,
+      "paths.rulesDir",
       configPath,
       issues
     ),
-    dataContractsDir: readString(
-      raw.dataContractsDir,
-      base.dataContractsDir,
-      "paths.dataContractsDir",
+    outDir: readString(
+      raw.outDir,
+      base.outDir,
+      "paths.outDir",
+      configPath,
+      issues
+    ),
+    promptsDir: readString(
+      raw.promptsDir,
+      base.promptsDir,
+      "paths.promptsDir",
       configPath,
       issues
     ),
@@ -395,17 +378,10 @@ function normalizeOutput(raw, configPath, issues) {
     return base;
   }
   return {
-    format: readOutputFormat(
-      raw.format,
-      base.format,
-      "output.format",
-      configPath,
-      issues
-    ),
-    jsonPath: readString(
-      raw.jsonPath,
-      base.jsonPath,
-      "output.jsonPath",
+    validateJsonPath: readString(
+      raw.validateJsonPath,
+      base.validateJsonPath,
+      "output.validateJsonPath",
       configPath,
       issues
     )
@@ -472,20 +448,6 @@ function readTraceabilitySeverity(value, fallback, label, configPath, issues) {
   }
   return fallback;
 }
-function readOutputFormat(value, fallback, label, configPath, issues) {
-  if (value === "text" || value === "json" || value === "github") {
-    return value;
-  }
-  if (value !== void 0) {
-    issues.push(
-      configIssue(
-        configPath,
-        `${label} \u306F text|json|github \u306E\u3044\u305A\u308C\u304B\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002`
-      )
-    );
-  }
-  return fallback;
-}
 function configIssue(file, message) {
   return {
     code: "QFAI_CONFIG_INVALID",
@@ -512,7 +474,8 @@ function isRecord(value) {
 }
 
 // src/core/report.ts
-import { readFile as readFile9 } from "fs/promises";
+import { readFile as readFile10 } from "fs/promises";
+import path13 from "path";
 
 // src/core/discovery.ts
 import path6 from "path";
@@ -573,10 +536,24 @@ async function exists2(target) {
 }
 
 // src/core/discovery.ts
-var SPEC_NAMED_PATTERN = /^spec-\d{4}-[^/\\]+\.md$/;
-async function collectSpecFiles(specRoot) {
-  const files = await collectFiles(specRoot, { extensions: [".md"] });
-  return files.filter((file) => isSpecFile(file));
+var SPEC_PACK_DIR_PATTERN = /^spec-\d{3}$/;
+async function collectSpecPackDirs(specsRoot) {
+  const files = await collectFiles(specsRoot, { extensions: [".md"] });
+  const packs = /* @__PURE__ */ new Set();
+  for (const file of files) {
+    if (isSpecPackFile(file, "spec.md")) {
+      packs.add(path6.dirname(file));
+    }
+  }
+  return Array.from(packs).sort();
+}
+async function collectSpecFiles(specsRoot) {
+  const files = await collectFiles(specsRoot, { extensions: [".md"] });
+  return files.filter((file) => isSpecPackFile(file, "spec.md"));
+}
+async function collectScenarioFiles(specsRoot) {
+  const files = await collectFiles(specsRoot, { extensions: [".md"] });
+  return files.filter((file) => isSpecPackFile(file, "scenario.md"));
 }
 async function collectUiContractFiles(uiRoot) {
   return collectFiles(uiRoot, { extensions: [".yaml", ".yml"] });
@@ -595,9 +572,12 @@ async function collectContractFiles(uiRoot, apiRoot, dataRoot) {
   ]);
   return { ui, api, db };
 }
-function isSpecFile(filePath) {
-  const name = path6.basename(filePath).toLowerCase();
-  return SPEC_NAMED_PATTERN.test(name);
+function isSpecPackFile(filePath, baseName) {
+  if (path6.basename(filePath).toLowerCase() !== baseName) {
+    return false;
+  }
+  const dirName = path6.basename(path6.dirname(filePath)).toLowerCase();
+  return SPEC_PACK_DIR_PATTERN.test(dirName);
 }
 
 // src/core/ids.ts
@@ -661,8 +641,8 @@ import { readFile as readFile2 } from "fs/promises";
 import path7 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 async function resolveToolVersion() {
-  if ("0.2.9".length > 0) {
-    return "0.2.9";
+  if ("0.3.1".length > 0) {
+    return "0.3.1";
   }
   try {
     const packagePath = resolvePackageJsonPath();
@@ -682,6 +662,7 @@ function resolvePackageJsonPath() {
 
 // src/core/validators/contracts.ts
 import { readFile as readFile3 } from "fs/promises";
+import path9 from "path";
 
 // src/core/contracts.ts
 import path8 from "path";
@@ -737,19 +718,10 @@ var SQL_DANGEROUS_PATTERNS = [
 ];
 async function validateContracts(root, config) {
   const issues = [];
-  issues.push(
-    ...await validateUiContracts(resolvePath(root, config, "uiContractsDir"))
-  );
-  issues.push(
-    ...await validateApiContracts(
-      resolvePath(root, config, "apiContractsDir")
-    )
-  );
-  issues.push(
-    ...await validateDataContracts(
-      resolvePath(root, config, "dataContractsDir")
-    )
-  );
+  const contractsRoot = resolvePath(root, config, "contractsDir");
+  issues.push(...await validateUiContracts(path9.join(contractsRoot, "ui")));
+  issues.push(...await validateApiContracts(path9.join(contractsRoot, "api")));
+  issues.push(...await validateDataContracts(path9.join(contractsRoot, "db")));
   return issues;
 }
 async function validateUiContracts(uiRoot) {
@@ -965,33 +937,125 @@ function formatError2(error2) {
   return String(error2);
 }
 function issue(code, message, severity, file, rule, refs) {
-  const issue6 = {
+  const issue7 = {
     code,
     severity,
     message
   };
   if (file) {
-    issue6.file = file;
+    issue7.file = file;
   }
   if (rule) {
-    issue6.rule = rule;
+    issue7.rule = rule;
   }
   if (refs && refs.length > 0) {
-    issue6.refs = refs;
+    issue7.refs = refs;
   }
-  return issue6;
+  return issue7;
+}
+
+// src/core/validators/delta.ts
+import { readFile as readFile4 } from "fs/promises";
+import path10 from "path";
+var SECTION_RE = /^##\s+変更区分/m;
+var COMPAT_LINE_RE = /^\s*-\s*\[[ xX]\]\s*Compatibility\b/m;
+var CHANGE_LINE_RE = /^\s*-\s*\[[ xX]\]\s*Change\/Improvement\b/m;
+var COMPAT_CHECKED_RE = /^\s*-\s*\[[xX]\]\s*Compatibility\b/m;
+var CHANGE_CHECKED_RE = /^\s*-\s*\[[xX]\]\s*Change\/Improvement\b/m;
+async function validateDeltas(root, config) {
+  const specsRoot = resolvePath(root, config, "specsDir");
+  const packs = await collectSpecPackDirs(specsRoot);
+  if (packs.length === 0) {
+    return [];
+  }
+  const issues = [];
+  for (const pack of packs) {
+    const deltaPath = path10.join(pack, "delta.md");
+    let text;
+    try {
+      text = await readFile4(deltaPath, "utf-8");
+    } catch (error2) {
+      if (isMissingFileError(error2)) {
+        issues.push(
+          issue2(
+            "QFAI-DELTA-001",
+            "delta.md \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002",
+            "error",
+            deltaPath,
+            "delta.exists"
+          )
+        );
+        continue;
+      }
+      throw error2;
+    }
+    const hasSection = SECTION_RE.test(text);
+    const hasCompatibility = COMPAT_LINE_RE.test(text);
+    const hasChange = CHANGE_LINE_RE.test(text);
+    if (!hasSection || !hasCompatibility || !hasChange) {
+      issues.push(
+        issue2(
+          "QFAI-DELTA-002",
+          "delta.md \u306E\u5909\u66F4\u533A\u5206\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002",
+          "error",
+          deltaPath,
+          "delta.section"
+        )
+      );
+      continue;
+    }
+    const compatibilityChecked = COMPAT_CHECKED_RE.test(text);
+    const changeChecked = CHANGE_CHECKED_RE.test(text);
+    if (compatibilityChecked === changeChecked) {
+      issues.push(
+        issue2(
+          "QFAI-DELTA-003",
+          "delta.md \u306E\u5909\u66F4\u533A\u5206\u306F\u3069\u3061\u3089\u304B1\u3064\u3060\u3051\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\uFF08\u4E21\u65B9ON/\u4E21\u65B9OFF\u306F\u7121\u52B9\u3067\u3059\uFF09\u3002",
+          "error",
+          deltaPath,
+          "delta.classification"
+        )
+      );
+    }
+  }
+  return issues;
+}
+function isMissingFileError(error2) {
+  if (!error2 || typeof error2 !== "object") {
+    return false;
+  }
+  return error2.code === "ENOENT";
+}
+function issue2(code, message, severity, file, rule, refs) {
+  const issue7 = {
+    code,
+    severity,
+    message
+  };
+  if (file) {
+    issue7.file = file;
+  }
+  if (rule) {
+    issue7.rule = rule;
+  }
+  if (refs && refs.length > 0) {
+    issue7.refs = refs;
+  }
+  return issue7;
 }
 
 // src/core/validators/ids.ts
-import { readFile as readFile5 } from "fs/promises";
-import path9 from "path";
+import { readFile as readFile6 } from "fs/promises";
+import path12 from "path";
 
 // src/core/contractIndex.ts
-import { readFile as readFile4 } from "fs/promises";
+import { readFile as readFile5 } from "fs/promises";
+import path11 from "path";
 async function buildContractIndex(root, config) {
-  const uiRoot = resolvePath(root, config, "uiContractsDir");
-  const apiRoot = resolvePath(root, config, "apiContractsDir");
-  const dataRoot = resolvePath(root, config, "dataContractsDir");
+  const contractsRoot = resolvePath(root, config, "contractsDir");
+  const uiRoot = path11.join(contractsRoot, "ui");
+  const apiRoot = path11.join(contractsRoot, "api");
+  const dataRoot = path11.join(contractsRoot, "db");
   const [uiFiles, apiFiles, dataFiles] = await Promise.all([
     collectUiContractFiles(uiRoot),
     collectApiContractFiles(apiRoot),
@@ -1010,7 +1074,7 @@ async function buildContractIndex(root, config) {
 }
 async function indexUiContracts(files, index) {
   for (const file of files) {
-    const text = await readFile4(file, "utf-8");
+    const text = await readFile5(file, "utf-8");
     try {
       const doc = parseStructuredContract(file, text);
       extractUiContractIds(doc).forEach((id) => record(index, id, file));
@@ -1022,7 +1086,7 @@ async function indexUiContracts(files, index) {
 }
 async function indexApiContracts(files, index) {
   for (const file of files) {
-    const text = await readFile4(file, "utf-8");
+    const text = await readFile5(file, "utf-8");
     try {
       const doc = parseStructuredContract(file, text);
       extractApiContractIds(doc).forEach((id) => record(index, id, file));
@@ -1034,7 +1098,7 @@ async function indexApiContracts(files, index) {
 }
 async function indexDataContracts(files, index) {
   for (const file of files) {
-    const text = await readFile4(file, "utf-8");
+    const text = await readFile5(file, "utf-8");
     extractIds(text, "DATA").forEach((id) => record(index, id, file));
   }
 }
@@ -1045,15 +1109,191 @@ function record(index, id, file) {
   index.idToFiles.set(id, current);
 }
 
+// src/core/parse/gherkin.ts
+var FEATURE_RE = /^\s*Feature:\s+/;
+var SCENARIO_RE = /^\s*Scenario(?: Outline)?:\s*(.+)\s*$/;
+var TAG_LINE_RE = /^\s*@/;
+function parseTags(line) {
+  return line.trim().split(/\s+/).filter((tag) => tag.startsWith("@")).map((tag) => tag.replace(/^@/, ""));
+}
+function parseGherkinFeature(text, file) {
+  const lines = text.split(/\r?\n/);
+  const scenarios = [];
+  let featurePresent = false;
+  let featureTags = [];
+  let pendingTags = [];
+  let current = null;
+  const flush = () => {
+    if (!current) return;
+    scenarios.push({
+      ...current,
+      body: current.body.trim()
+    });
+    current = null;
+  };
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i] ?? "";
+    const trimmed = line.trim();
+    if (TAG_LINE_RE.test(trimmed)) {
+      pendingTags.push(...parseTags(trimmed));
+      continue;
+    }
+    if (FEATURE_RE.test(trimmed)) {
+      featurePresent = true;
+      featureTags = [...pendingTags];
+      pendingTags = [];
+      continue;
+    }
+    const match = trimmed.match(SCENARIO_RE);
+    if (match) {
+      const scenarioName = match[1]?.trim();
+      if (!scenarioName) {
+        continue;
+      }
+      flush();
+      current = {
+        name: scenarioName,
+        line: i + 1,
+        tags: [...featureTags, ...pendingTags],
+        body: ""
+      };
+      pendingTags = [];
+      continue;
+    }
+    if (current) {
+      current.body += `${line}
+`;
+    }
+  }
+  flush();
+  return { file, featurePresent, scenarios };
+}
+
+// src/core/parse/markdown.ts
+var HEADING_RE = /^(#{1,6})\s+(.+?)\s*$/;
+function parseHeadings(md) {
+  const lines = md.split(/\r?\n/);
+  const headings = [];
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i] ?? "";
+    const match = line.match(HEADING_RE);
+    if (!match) continue;
+    const levelToken = match[1];
+    const title = match[2];
+    if (!levelToken || !title) continue;
+    headings.push({
+      level: levelToken.length,
+      title: title.trim(),
+      line: i + 1
+    });
+  }
+  return headings;
+}
+function extractH2Sections(md) {
+  const lines = md.split(/\r?\n/);
+  const headings = parseHeadings(md).filter((heading) => heading.level === 2);
+  const sections = /* @__PURE__ */ new Map();
+  for (let i = 0; i < headings.length; i++) {
+    const current = headings[i];
+    if (!current) continue;
+    const next = headings[i + 1];
+    const startLine = current.line + 1;
+    const endLine = (next?.line ?? lines.length + 1) - 1;
+    const body = startLine <= endLine ? lines.slice(startLine - 1, endLine).join("\n") : "";
+    sections.set(current.title.trim(), {
+      title: current.title.trim(),
+      startLine,
+      endLine,
+      body
+    });
+  }
+  return sections;
+}
+
+// src/core/parse/spec.ts
+var SPEC_ID_RE = /\bSPEC-\d{4}\b/;
+var BR_LINE_RE = /^\s*(?:[-*]\s*)?\[(BR-\d{4})\]\[(P[0-3])\]\s*(.+)$/;
+var BR_LINE_ANY_PRIORITY_RE = /^\s*(?:[-*]\s*)?\[(BR-\d{4})\]\[(P[^\]]+)\]\s*(.+)$/;
+var BR_LINE_NO_PRIORITY_RE = /^\s*(?:[-*]\s*)?\[(BR-\d{4})\](?!\s*\[P)\s*(.*\S.*)$/;
+var BR_SECTION_TITLE = "\u696D\u52D9\u30EB\u30FC\u30EB";
+var VALID_PRIORITIES = /* @__PURE__ */ new Set(["P0", "P1", "P2", "P3"]);
+function parseSpec(md, file) {
+  const headings = parseHeadings(md);
+  const h1 = headings.find((heading) => heading.level === 1);
+  const specId = h1?.title.match(SPEC_ID_RE)?.[0];
+  const sections = extractH2Sections(md);
+  const sectionNames = new Set(Array.from(sections.keys()));
+  const brSection = sections.get(BR_SECTION_TITLE);
+  const brLines = brSection ? brSection.body.split(/\r?\n/) : [];
+  const startLine = brSection?.startLine ?? 1;
+  const brs = [];
+  const brsWithoutPriority = [];
+  const brsWithInvalidPriority = [];
+  for (let i = 0; i < brLines.length; i++) {
+    const lineText = brLines[i] ?? "";
+    const lineNumber = startLine + i;
+    const validMatch = lineText.match(BR_LINE_RE);
+    if (validMatch) {
+      const id = validMatch[1];
+      const priority = validMatch[2];
+      const text = validMatch[3];
+      if (!id || !priority || !text) continue;
+      brs.push({
+        id,
+        priority,
+        text: text.trim(),
+        line: lineNumber
+      });
+      continue;
+    }
+    const anyPriorityMatch = lineText.match(BR_LINE_ANY_PRIORITY_RE);
+    if (anyPriorityMatch) {
+      const id = anyPriorityMatch[1];
+      const priority = anyPriorityMatch[2];
+      const text = anyPriorityMatch[3];
+      if (!id || !priority || !text) continue;
+      if (!VALID_PRIORITIES.has(priority)) {
+        brsWithInvalidPriority.push({
+          id,
+          priority,
+          text: text.trim(),
+          line: lineNumber
+        });
+      }
+      continue;
+    }
+    const noPriorityMatch = lineText.match(BR_LINE_NO_PRIORITY_RE);
+    if (noPriorityMatch) {
+      const id = noPriorityMatch[1];
+      const text = noPriorityMatch[2];
+      if (!id || !text) continue;
+      brsWithoutPriority.push({
+        id,
+        text: text.trim(),
+        line: lineNumber
+      });
+    }
+  }
+  const parsed = {
+    file,
+    sections: sectionNames,
+    brs,
+    brsWithoutPriority,
+    brsWithInvalidPriority
+  };
+  if (specId) {
+    parsed.specId = specId;
+  }
+  return parsed;
+}
+
 // src/core/validators/ids.ts
+var SC_TAG_RE = /^SC-\d{4}$/;
 async function validateDefinedIds(root, config) {
   const issues = [];
-  const specRoot = resolvePath(root, config, "specDir");
-  const scenarioRoot = resolvePath(root, config, "scenariosDir");
-  const specFiles = await collectSpecFiles(specRoot);
-  const scenarioFiles = await collectFiles(scenarioRoot, {
-    extensions: [".feature"]
-  });
+  const specsRoot = resolvePath(root, config, "specsDir");
+  const specFiles = await collectSpecFiles(specsRoot);
+  const scenarioFiles = await collectScenarioFiles(specsRoot);
   const defined = /* @__PURE__ */ new Map();
   await collectSpecDefinitionIds(specFiles, defined);
   await collectScenarioDefinitionIds(scenarioFiles, defined);
@@ -1069,7 +1309,7 @@ async function validateDefinedIds(root, config) {
     }
     const sorted = Array.from(files).sort();
     issues.push(
-      issue2(
+      issue3(
         "QFAI-ID-001",
         `ID \u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059: ${id} (${formatFileList(sorted, root)})`,
         "error",
@@ -1082,15 +1322,25 @@ async function validateDefinedIds(root, config) {
 }
 async function collectSpecDefinitionIds(files, out) {
   for (const file of files) {
-    const text = await readFile5(file, "utf-8");
-    extractIds(text, "SPEC").forEach((id) => recordId(out, id, file));
-    extractIds(text, "BR").forEach((id) => recordId(out, id, file));
+    const text = await readFile6(file, "utf-8");
+    const parsed = parseSpec(text, file);
+    if (parsed.specId) {
+      recordId(out, parsed.specId, file);
+    }
+    parsed.brs.forEach((br) => recordId(out, br.id, file));
   }
 }
 async function collectScenarioDefinitionIds(files, out) {
   for (const file of files) {
-    const text = await readFile5(file, "utf-8");
-    extractIds(text, "SC").forEach((id) => recordId(out, id, file));
+    const text = await readFile6(file, "utf-8");
+    const parsed = parseGherkinFeature(text, file);
+    for (const scenario of parsed.scenarios) {
+      for (const tag of scenario.tags) {
+        if (SC_TAG_RE.test(tag)) {
+          recordId(out, tag, file);
+        }
+      }
+    }
   }
 }
 function recordId(out, id, file) {
@@ -1100,58 +1350,60 @@ function recordId(out, id, file) {
 }
 function formatFileList(files, root) {
   return files.map((file) => {
-    const relative = path9.relative(root, file);
+    const relative = path12.relative(root, file);
     return relative.length > 0 ? relative : file;
   }).join(", ");
 }
-function issue2(code, message, severity, file, rule, refs) {
-  const issue6 = {
+function issue3(code, message, severity, file, rule, refs) {
+  const issue7 = {
     code,
     severity,
     message
   };
   if (file) {
-    issue6.file = file;
+    issue7.file = file;
   }
   if (rule) {
-    issue6.rule = rule;
+    issue7.rule = rule;
   }
   if (refs && refs.length > 0) {
-    issue6.refs = refs;
+    issue7.refs = refs;
   }
-  return issue6;
+  return issue7;
 }
 
 // src/core/validators/scenario.ts
-import { readFile as readFile6 } from "fs/promises";
+import { readFile as readFile7 } from "fs/promises";
 var GIVEN_PATTERN = /\bGiven\b/;
 var WHEN_PATTERN = /\bWhen\b/;
 var THEN_PATTERN = /\bThen\b/;
+var SC_TAG_RE2 = /^SC-\d{4}$/;
+var SPEC_TAG_RE = /^SPEC-\d{4}$/;
+var BR_TAG_RE = /^BR-\d{4}$/;
 async function validateScenarios(root, config) {
-  const scenariosRoot = resolvePath(root, config, "scenariosDir");
-  const files = await collectFiles(scenariosRoot, {
-    extensions: [".feature"]
-  });
+  const specsRoot = resolvePath(root, config, "specsDir");
+  const files = await collectScenarioFiles(specsRoot);
   if (files.length === 0) {
     return [
-      issue3(
+      issue4(
         "QFAI-SC-000",
         "Scenario \u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002",
         "info",
-        scenariosRoot,
+        specsRoot,
         "scenario.files"
       )
     ];
   }
   const issues = [];
   for (const file of files) {
-    const text = await readFile6(file, "utf-8");
+    const text = await readFile7(file, "utf-8");
     issues.push(...validateScenarioContent(text, file));
   }
   return issues;
 }
 function validateScenarioContent(text, file) {
   const issues = [];
+  const parsed = parseGherkinFeature(text, file);
   const invalidIds = extractInvalidIds(text, [
     "SPEC",
     "BR",
@@ -1163,7 +1415,7 @@ function validateScenarioContent(text, file) {
   ]);
   if (invalidIds.length > 0) {
     issues.push(
-      issue3(
+      issue4(
         "QFAI-ID-002",
         `ID \u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u304C\u4E0D\u6B63\u3067\u3059: ${invalidIds.join(", ")}`,
         "error",
@@ -1173,94 +1425,114 @@ function validateScenarioContent(text, file) {
       )
     );
   }
-  const scIds = extractIds(text, "SC");
-  if (scIds.length === 0) {
+  const missingStructure = [];
+  if (!parsed.featurePresent) missingStructure.push("Feature");
+  if (parsed.scenarios.length === 0) missingStructure.push("Scenario");
+  if (missingStructure.length > 0) {
     issues.push(
-      issue3(
-        "QFAI-SC-001",
-        "SC ID \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002",
-        "error",
-        file,
-        "scenario.id"
-      )
-    );
-  }
-  const specIds = extractIds(text, "SPEC");
-  if (specIds.length === 0) {
-    issues.push(
-      issue3(
-        "QFAI-SC-002",
-        "SC \u306F SPEC \u3092\u53C2\u7167\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002",
-        "error",
-        file,
-        "scenario.spec"
-      )
-    );
-  }
-  const brIds = extractIds(text, "BR");
-  if (brIds.length === 0) {
-    issues.push(
-      issue3(
-        "QFAI-SC-003",
-        "SC \u306F BR \u3092\u53C2\u7167\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002",
+      issue4(
+        "QFAI-SC-006",
+        `Scenario \u30D5\u30A1\u30A4\u30EB\u306B\u5FC5\u8981\u306A\u69CB\u9020\u304C\u3042\u308A\u307E\u305B\u3093: ${missingStructure.join(
+          ", "
+        )}`,
         "error",
         file,
-        "scenario.br"
+        "scenario.structure"
       )
     );
   }
-  const missingSteps = [];
-  if (!GIVEN_PATTERN.test(text)) {
-    missingSteps.push("Given");
-  }
-  if (!WHEN_PATTERN.test(text)) {
-    missingSteps.push("When");
-  }
-  if (!THEN_PATTERN.test(text)) {
-    missingSteps.push("Then");
+  for (const scenario of parsed.scenarios) {
+    if (scenario.tags.length === 0) {
+      issues.push(
+        issue4(
+          "QFAI-SC-007",
+          `Scenario \u30BF\u30B0\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${scenario.name}`,
+          "error",
+          file,
+          "scenario.tags"
+        )
+      );
+      continue;
+    }
+    const missingTags = [];
+    const scTags = scenario.tags.filter((tag) => SC_TAG_RE2.test(tag));
+    if (scTags.length === 0) {
+      missingTags.push("SC(0\u4EF6)");
+    } else if (scTags.length > 1) {
+      missingTags.push(`SC(${scTags.length}\u4EF6/1\u4EF6\u5FC5\u9808)`);
+    }
+    if (!scenario.tags.some((tag) => SPEC_TAG_RE.test(tag))) {
+      missingTags.push("SPEC");
+    }
+    if (!scenario.tags.some((tag) => BR_TAG_RE.test(tag))) {
+      missingTags.push("BR");
+    }
+    if (missingTags.length > 0) {
+      issues.push(
+        issue4(
+          "QFAI-SC-008",
+          `Scenario \u30BF\u30B0\u306B\u4E0D\u8DB3\u304C\u3042\u308A\u307E\u3059: ${missingTags.join(", ")} (${scenario.name})`,
+          "error",
+          file,
+          "scenario.tagIds"
+        )
+      );
+    }
   }
-  if (missingSteps.length > 0) {
-    issues.push(
-      issue3(
-        "QFAI-SC-005",
-        `Given/When/Then \u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059: ${missingSteps.join(", ")}`,
-        "warning",
-        file,
-        "scenario.steps"
-      )
-    );
+  for (const scenario of parsed.scenarios) {
+    const missingSteps = [];
+    if (!GIVEN_PATTERN.test(scenario.body)) {
+      missingSteps.push("Given");
+    }
+    if (!WHEN_PATTERN.test(scenario.body)) {
+      missingSteps.push("When");
+    }
+    if (!THEN_PATTERN.test(scenario.body)) {
+      missingSteps.push("Then");
+    }
+    if (missingSteps.length > 0) {
+      issues.push(
+        issue4(
+          "QFAI-SC-005",
+          `Given/When/Then \u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059: ${missingSteps.join(", ")} (${scenario.name})`,
+          "warning",
+          file,
+          "scenario.steps"
+        )
+      );
+    }
   }
   return issues;
 }
-function issue3(code, message, severity, file, rule, refs) {
-  const issue6 = {
+function issue4(code, message, severity, file, rule, refs) {
+  const issue7 = {
     code,
     severity,
     message
   };
   if (file) {
-    issue6.file = file;
+    issue7.file = file;
   }
   if (rule) {
-    issue6.rule = rule;
+    issue7.rule = rule;
   }
   if (refs && refs.length > 0) {
-    issue6.refs = refs;
+    issue7.refs = refs;
   }
-  return issue6;
+  return issue7;
 }
 
 // src/core/validators/spec.ts
-import { readFile as readFile7 } from "fs/promises";
+import { readFile as readFile8 } from "fs/promises";
 async function validateSpecs(root, config) {
-  const specsRoot = resolvePath(root, config, "specDir");
+  const specsRoot = resolvePath(root, config, "specsDir");
   const files = await collectSpecFiles(specsRoot);
   if (files.length === 0) {
-    const expected = "spec-0001-<slug>.md";
+    const expected = "spec-001/spec.md";
     return [
-      issue4(
+      issue5(
         "QFAI-SPEC-000",
-        `Spec \u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u914D\u7F6E\u5834\u6240: ${config.paths.specDir} / \u671F\u5F85\u30D1\u30BF\u30FC\u30F3: ${expected}`,
+        `Spec \u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u914D\u7F6E\u5834\u6240: ${config.paths.specsDir} / \u671F\u5F85\u30D1\u30BF\u30FC\u30F3: ${expected}`,
         "info",
         specsRoot,
         "spec.files"
@@ -1269,7 +1541,7 @@ async function validateSpecs(root, config) {
   }
   const issues = [];
   for (const file of files) {
-    const text = await readFile7(file, "utf-8");
+    const text = await readFile8(file, "utf-8");
     issues.push(
       ...validateSpecContent(
         text,
@@ -1282,6 +1554,7 @@ async function validateSpecs(root, config) {
 }
 function validateSpecContent(text, file, requiredSections) {
   const issues = [];
+  const parsed = parseSpec(text, file);
   const invalidIds = extractInvalidIds(text, [
     "SPEC",
     "BR",
@@ -1293,7 +1566,7 @@ function validateSpecContent(text, file, requiredSections) {
   ]);
   if (invalidIds.length > 0) {
     issues.push(
-      issue4(
+      issue5(
         "QFAI-ID-002",
         `ID \u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u304C\u4E0D\u6B63\u3067\u3059: ${invalidIds.join(", ")}`,
         "error",
@@ -1303,10 +1576,9 @@ function validateSpecContent(text, file, requiredSections) {
       )
     );
   }
-  const specIds = extractIds(text, "SPEC");
-  if (specIds.length === 0) {
+  if (!parsed.specId) {
     issues.push(
-      issue4(
+      issue5(
         "QFAI-SPEC-001",
         "SPEC ID \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002",
         "error",
@@ -1315,10 +1587,9 @@ function validateSpecContent(text, file, requiredSections) {
       )
     );
   }
-  const brIds = extractIds(text, "BR");
-  if (brIds.length === 0) {
+  if (parsed.brs.length === 0) {
     issues.push(
-      issue4(
+      issue5(
         "QFAI-SPEC-002",
         "BR ID \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002",
         "error",
@@ -1327,10 +1598,34 @@ function validateSpecContent(text, file, requiredSections) {
       )
     );
   }
+  for (const br of parsed.brsWithoutPriority) {
+    issues.push(
+      issue5(
+        "QFAI-BR-001",
+        `BR \u884C\u306B Priority \u304C\u3042\u308A\u307E\u305B\u3093: ${br.id}`,
+        "error",
+        file,
+        "spec.brPriority",
+        [br.id]
+      )
+    );
+  }
+  for (const br of parsed.brsWithInvalidPriority) {
+    issues.push(
+      issue5(
+        "QFAI-BR-002",
+        `BR Priority \u304C\u4E0D\u6B63\u3067\u3059: ${br.id} (${br.priority})`,
+        "error",
+        file,
+        "spec.brPriority",
+        [br.id]
+      )
+    );
+  }
   const scIds = extractIds(text, "SC");
   if (scIds.length > 0) {
     issues.push(
-      issue4(
+      issue5(
         "QFAI-SPEC-003",
         "Spec \u306F SC \u3092\u53C2\u7167\u3057\u306A\u3044\u30EB\u30FC\u30EB\u3067\u3059\u3002",
         "warning",
@@ -1341,9 +1636,9 @@ function validateSpecContent(text, file, requiredSections) {
     );
   }
   for (const section of requiredSections) {
-    if (!text.includes(section)) {
+    if (!parsed.sections.has(section)) {
       issues.push(
-        issue4(
+        issue5(
           "QFAI-SPEC-004",
           `\u5FC5\u9808\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059: ${section}`,
           "error",
@@ -1355,40 +1650,39 @@ function validateSpecContent(text, file, requiredSections) {
   }
   return issues;
 }
-function issue4(code, message, severity, file, rule, refs) {
-  const issue6 = {
+function issue5(code, message, severity, file, rule, refs) {
+  const issue7 = {
     code,
     severity,
     message
   };
   if (file) {
-    issue6.file = file;
+    issue7.file = file;
   }
   if (rule) {
-    issue6.rule = rule;
+    issue7.rule = rule;
   }
   if (refs && refs.length > 0) {
-    issue6.refs = refs;
+    issue7.refs = refs;
   }
-  return issue6;
+  return issue7;
 }
 
 // src/core/validators/traceability.ts
-import { readFile as readFile8 } from "fs/promises";
+import { readFile as readFile9 } from "fs/promises";
+var SC_TAG_RE3 = /^SC-\d{4}$/;
+var SPEC_TAG_RE2 = /^SPEC-\d{4}$/;
+var BR_TAG_RE2 = /^BR-\d{4}$/;
+var UI_TAG_RE = /^UI-\d{4}$/;
+var API_TAG_RE = /^API-\d{4}$/;
+var DATA_TAG_RE = /^DATA-\d{4}$/;
 async function validateTraceability(root, config) {
   const issues = [];
-  const specsRoot = resolvePath(root, config, "specDir");
-  const decisionsRoot = resolvePath(root, config, "decisionsDir");
-  const scenariosRoot = resolvePath(root, config, "scenariosDir");
+  const specsRoot = resolvePath(root, config, "specsDir");
   const srcRoot = resolvePath(root, config, "srcDir");
   const testsRoot = resolvePath(root, config, "testsDir");
   const specFiles = await collectSpecFiles(specsRoot);
-  const decisionFiles = await collectFiles(decisionsRoot, {
-    extensions: [".md"]
-  });
-  const scenarioFiles = await collectFiles(scenariosRoot, {
-    extensions: [".feature"]
-  });
+  const scenarioFiles = await collectScenarioFiles(specsRoot);
   const upstreamIds = /* @__PURE__ */ new Set();
   const specIds = /* @__PURE__ */ new Set();
   const brIdsInSpecs = /* @__PURE__ */ new Set();
@@ -1400,11 +1694,13 @@ async function validateTraceability(root, config) {
   const contractIndex = await buildContractIndex(root, config);
   const contractIds = contractIndex.ids;
   for (const file of specFiles) {
-    const text = await readFile8(file, "utf-8");
+    const text = await readFile9(file, "utf-8");
     extractAllIds(text).forEach((id) => upstreamIds.add(id));
-    const specIdsInFile = extractIds(text, "SPEC");
-    specIdsInFile.forEach((id) => specIds.add(id));
-    const brIds = extractIds(text, "BR");
+    const parsed = parseSpec(text, file);
+    if (parsed.specId) {
+      specIds.add(parsed.specId);
+    }
+    const brIds = parsed.brs.map((br) => br.id);
     brIds.forEach((id) => brIdsInSpecs.add(id));
     const referencedContractIds = /* @__PURE__ */ new Set([
       ...extractIds(text, "UI"),
@@ -1416,7 +1712,7 @@ async function validateTraceability(root, config) {
     );
     if (unknownContractIds.length > 0) {
       issues.push(
-        issue5(
+        issue6(
           "QFAI-TRACE-009",
           `Spec \u304C\u5B58\u5728\u3057\u306A\u3044\u5951\u7D04 ID \u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059: ${unknownContractIds.join(
             ", "
@@ -1428,37 +1724,50 @@ async function validateTraceability(root, config) {
         )
       );
     }
-    for (const specId of specIdsInFile) {
-      const current = specToBrIds.get(specId) ?? /* @__PURE__ */ new Set();
+    if (parsed.specId) {
+      const current = specToBrIds.get(parsed.specId) ?? /* @__PURE__ */ new Set();
       brIds.forEach((id) => current.add(id));
-      specToBrIds.set(specId, current);
+      specToBrIds.set(parsed.specId, current);
     }
   }
-  for (const file of decisionFiles) {
-    const text = await readFile8(file, "utf-8");
-    extractAllIds(text).forEach((id) => upstreamIds.add(id));
-  }
   for (const file of scenarioFiles) {
-    const text = await readFile8(file, "utf-8");
+    const text = await readFile9(file, "utf-8");
     extractAllIds(text).forEach((id) => upstreamIds.add(id));
-    const specIdsInScenario = extractIds(text, "SPEC");
-    const brIds = extractIds(text, "BR");
-    const scIds = extractIds(text, "SC");
-    const scenarioIds = [
-      ...extractIds(text, "UI"),
-      ...extractIds(text, "API"),
-      ...extractIds(text, "DATA")
-    ];
-    brIds.forEach((id) => brIdsInScenarios.add(id));
-    scIds.forEach((id) => scIdsInScenarios.add(id));
-    scenarioIds.forEach((id) => scenarioContractIds.add(id));
-    if (scenarioIds.length > 0) {
-      scIds.forEach((id) => scWithContracts.add(id));
+    const parsed = parseGherkinFeature(text, file);
+    const specIdsInScenario = /* @__PURE__ */ new Set();
+    const brIds = /* @__PURE__ */ new Set();
+    const scIds = /* @__PURE__ */ new Set();
+    const scenarioIds = /* @__PURE__ */ new Set();
+    for (const scenario of parsed.scenarios) {
+      for (const tag of scenario.tags) {
+        if (SPEC_TAG_RE2.test(tag)) {
+          specIdsInScenario.add(tag);
+        }
+        if (BR_TAG_RE2.test(tag)) {
+          brIds.add(tag);
+        }
+        if (SC_TAG_RE3.test(tag)) {
+          scIds.add(tag);
+        }
+        if (UI_TAG_RE.test(tag) || API_TAG_RE.test(tag) || DATA_TAG_RE.test(tag)) {
+          scenarioIds.add(tag);
+        }
+      }
+    }
+    const specIdsList = Array.from(specIdsInScenario);
+    const brIdsList = Array.from(brIds);
+    const scIdsList = Array.from(scIds);
+    const scenarioIdsList = Array.from(scenarioIds);
+    brIdsList.forEach((id) => brIdsInScenarios.add(id));
+    scIdsList.forEach((id) => scIdsInScenarios.add(id));
+    scenarioIdsList.forEach((id) => scenarioContractIds.add(id));
+    if (scenarioIdsList.length > 0) {
+      scIdsList.forEach((id) => scWithContracts.add(id));
     }
-    const unknownSpecIds = specIdsInScenario.filter((id) => !specIds.has(id));
+    const unknownSpecIds = specIdsList.filter((id) => !specIds.has(id));
     if (unknownSpecIds.length > 0) {
       issues.push(
-        issue5(
+        issue6(
           "QFAI-TRACE-005",
           `Scenario \u304C\u5B58\u5728\u3057\u306A\u3044 SPEC \u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059: ${unknownSpecIds.join(", ")}`,
           "error",
@@ -1468,10 +1777,10 @@ async function validateTraceability(root, config) {
         )
       );
     }
-    const unknownBrIds = brIds.filter((id) => !brIdsInSpecs.has(id));
+    const unknownBrIds = brIdsList.filter((id) => !brIdsInSpecs.has(id));
     if (unknownBrIds.length > 0) {
       issues.push(
-        issue5(
+        issue6(
           "QFAI-TRACE-006",
           `Scenario \u304C\u5B58\u5728\u3057\u306A\u3044 BR \u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059: ${unknownBrIds.join(", ")}`,
           "error",
@@ -1481,10 +1790,12 @@ async function validateTraceability(root, config) {
         )
       );
     }
-    const unknownContractIds = scenarioIds.filter((id) => !contractIds.has(id));
+    const unknownContractIds = scenarioIdsList.filter(
+      (id) => !contractIds.has(id)
+    );
     if (unknownContractIds.length > 0) {
       issues.push(
-        issue5(
+        issue6(
           "QFAI-TRACE-008",
           `Scenario \u304C\u5B58\u5728\u3057\u306A\u3044\u5951\u7D04 ID \u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059: ${unknownContractIds.join(
             ", "
@@ -1496,23 +1807,23 @@ async function validateTraceability(root, config) {
         )
       );
     }
-    if (specIdsInScenario.length > 0) {
+    if (specIdsList.length > 0) {
       const allowedBrIds = /* @__PURE__ */ new Set();
-      for (const specId of specIdsInScenario) {
+      for (const specId of specIdsList) {
         const brIdsForSpec = specToBrIds.get(specId);
         if (!brIdsForSpec) {
           continue;
         }
         brIdsForSpec.forEach((id) => allowedBrIds.add(id));
       }
-      const invalidBrIds = brIds.filter((id) => !allowedBrIds.has(id));
+      const invalidBrIds = brIdsList.filter((id) => !allowedBrIds.has(id));
       if (invalidBrIds.length > 0) {
         issues.push(
-          issue5(
+          issue6(
             "QFAI-TRACE-007",
             `Scenario \u306E BR \u304C\u53C2\u7167 SPEC \u306B\u5C5E\u3057\u3066\u3044\u307E\u305B\u3093: ${invalidBrIds.join(
               ", "
-            )} (SPEC: ${specIdsInScenario.join(", ")})`,
+            )} (SPEC: ${specIdsList.join(", ")})`,
             "error",
             file,
             "traceability.scenarioBrUnderSpec",
@@ -1524,7 +1835,7 @@ async function validateTraceability(root, config) {
   }
   if (upstreamIds.size === 0) {
     return [
-      issue5(
+      issue6(
         "QFAI-TRACE-000",
         "\u4E0A\u6D41 ID \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002",
         "info",
@@ -1539,7 +1850,7 @@ async function validateTraceability(root, config) {
     );
     if (orphanBrIds.length > 0) {
       issues.push(
-        issue5(
+        issue6(
           "QFAI_TRACE_BR_ORPHAN",
           `BR \u304C SC \u306B\u7D10\u3065\u3044\u3066\u3044\u307E\u305B\u3093: ${orphanBrIds.join(", ")}`,
           "error",
@@ -1556,13 +1867,13 @@ async function validateTraceability(root, config) {
     );
     if (scWithoutContracts.length > 0) {
       issues.push(
-        issue5(
+        issue6(
           "QFAI_TRACE_SC_NO_CONTRACT",
           `SC \u304C\u5951\u7D04(UI/API/DATA)\u306B\u63A5\u7D9A\u3057\u3066\u3044\u307E\u305B\u3093: ${scWithoutContracts.join(
             ", "
           )}`,
           "error",
-          scenariosRoot,
+          specsRoot,
           "traceability.scMustTouchContracts",
           scWithoutContracts
         )
@@ -1576,11 +1887,11 @@ async function validateTraceability(root, config) {
       );
       if (orphanContracts.length > 0) {
         issues.push(
-          issue5(
+          issue6(
             "QFAI_CONTRACT_ORPHAN",
             `\u5951\u7D04\u304C SC \u304B\u3089\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u305B\u3093: ${orphanContracts.join(", ")}`,
             "error",
-            scenariosRoot,
+            specsRoot,
             "traceability.allowOrphanContracts",
             orphanContracts
           )
@@ -1604,7 +1915,7 @@ async function validateCodeReferences(upstreamIds, srcRoot, testsRoot) {
   const targetFiles = [...codeFiles, ...testFiles];
   if (targetFiles.length === 0) {
     issues.push(
-      issue5(
+      issue6(
         "QFAI-TRACE-001",
         "\u53C2\u7167\u5BFE\u8C61\u306E\u30B3\u30FC\u30C9/\u30C6\u30B9\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002",
         "info",
@@ -1617,7 +1928,7 @@ async function validateCodeReferences(upstreamIds, srcRoot, testsRoot) {
   const pattern = buildIdPattern(Array.from(upstreamIds));
   let found = false;
   for (const file of targetFiles) {
-    const text = await readFile8(file, "utf-8");
+    const text = await readFile9(file, "utf-8");
     if (pattern.test(text)) {
       found = true;
       break;
@@ -1625,7 +1936,7 @@ async function validateCodeReferences(upstreamIds, srcRoot, testsRoot) {
   }
   if (!found) {
     issues.push(
-      issue5(
+      issue6(
         "QFAI-TRACE-002",
         "\u4E0A\u6D41 ID \u304C\u30B3\u30FC\u30C9/\u30C6\u30B9\u30C8\u306B\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002",
         "warning",
@@ -1640,22 +1951,22 @@ function buildIdPattern(ids) {
   const escaped = ids.map((id) => id.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
   return new RegExp(`\\b(${escaped.join("|")})\\b`);
 }
-function issue5(code, message, severity, file, rule, refs) {
-  const issue6 = {
+function issue6(code, message, severity, file, rule, refs) {
+  const issue7 = {
     code,
     severity,
     message
   };
   if (file) {
-    issue6.file = file;
+    issue7.file = file;
   }
   if (rule) {
-    issue6.rule = rule;
+    issue7.rule = rule;
   }
   if (refs && refs.length > 0) {
-    issue6.refs = refs;
+    issue7.refs = refs;
   }
-  return issue6;
+  return issue7;
 }
 
 // src/core/validate.ts
@@ -1665,6 +1976,7 @@ async function validateProject(root, configResult) {
   const issues = [
     ...configIssues,
     ...await validateSpecs(root, config),
+    ...await validateDeltas(root, config),
     ...await validateScenarios(root, config),
     ...await validateContracts(root, config),
     ...await validateDefinedIds(root, config),
@@ -1680,8 +1992,8 @@ async function validateProject(root, configResult) {
 }
 function countIssues(issues) {
   return issues.reduce(
-    (acc, issue6) => {
-      acc[issue6.severity] += 1;
+    (acc, issue7) => {
+      acc[issue7.severity] += 1;
       return acc;
     },
     { info: 0, warning: 0, error: 0 }
@@ -1694,21 +2006,15 @@ async function createReportData(root, validation, configResult) {
   const resolved = configResult ?? await loadConfig(root);
   const config = resolved.config;
   const configPath = resolved.configPath;
-  const specRoot = resolvePath(root, config, "specDir");
-  const decisionsRoot = resolvePath(root, config, "decisionsDir");
-  const scenariosRoot = resolvePath(root, config, "scenariosDir");
-  const apiRoot = resolvePath(root, config, "apiContractsDir");
-  const uiRoot = resolvePath(root, config, "uiContractsDir");
-  const dbRoot = resolvePath(root, config, "dataContractsDir");
+  const specsRoot = resolvePath(root, config, "specsDir");
+  const contractsRoot = resolvePath(root, config, "contractsDir");
+  const apiRoot = path13.join(contractsRoot, "api");
+  const uiRoot = path13.join(contractsRoot, "ui");
+  const dbRoot = path13.join(contractsRoot, "db");
   const srcRoot = resolvePath(root, config, "srcDir");
   const testsRoot = resolvePath(root, config, "testsDir");
-  const specFiles = await collectSpecFiles(specRoot);
-  const scenarioFiles = await collectFiles(scenariosRoot, {
-    extensions: [".feature"]
-  });
-  const decisionFiles = await collectFiles(decisionsRoot, {
-    extensions: [".md"]
-  });
+  const specFiles = await collectSpecFiles(specsRoot);
+  const scenarioFiles = await collectScenarioFiles(specsRoot);
   const {
     api: apiFiles,
     ui: uiFiles,
@@ -1717,7 +2023,6 @@ async function createReportData(root, validation, configResult) {
   const idsByPrefix = await collectIds([
     ...specFiles,
     ...scenarioFiles,
-    ...decisionFiles,
     ...apiFiles,
     ...uiFiles,
     ...dbFiles
@@ -1742,7 +2047,6 @@ async function createReportData(root, validation, configResult) {
     summary: {
       specs: specFiles.length,
       scenarios: scenarioFiles.length,
-      decisions: decisionFiles.length,
       contracts: {
         api: apiFiles.length,
         ui: uiFiles.length,
@@ -1776,7 +2080,6 @@ function formatReportMarkdown(data) {
   lines.push("## \u6982\u8981");
   lines.push(`- specs: ${data.summary.specs}`);
   lines.push(`- scenarios: ${data.summary.scenarios}`);
-  lines.push(`- decisions: ${data.summary.decisions}`);
   lines.push(
     `- contracts: api ${data.summary.contracts.api} / ui ${data.summary.contracts.ui} / db ${data.summary.contracts.db}`
   );
@@ -1852,7 +2155,7 @@ async function collectIds(files) {
     DATA: /* @__PURE__ */ new Set()
   };
   for (const file of files) {
-    const text = await readFile9(file, "utf-8");
+    const text = await readFile10(file, "utf-8");
     for (const prefix of ID_PREFIXES2) {
       const ids = extractIds(text, prefix);
       ids.forEach((id) => result[prefix].add(id));
@@ -1870,7 +2173,7 @@ async function collectIds(files) {
 async function collectUpstreamIds(files) {
   const ids = /* @__PURE__ */ new Set();
   for (const file of files) {
-    const text = await readFile9(file, "utf-8");
+    const text = await readFile10(file, "utf-8");
     extractAllIds(text).forEach((id) => ids.add(id));
   }
   return ids;
@@ -1891,7 +2194,7 @@ async function evaluateTraceability(upstreamIds, srcRoot, testsRoot) {
   }
   const pattern = buildIdPattern2(Array.from(upstreamIds));
   for (const file of targetFiles) {
-    const text = await readFile9(file, "utf-8");
+    const text = await readFile10(file, "utf-8");
     if (pattern.test(text)) {
       return true;
     }
@@ -1913,20 +2216,20 @@ function toSortedArray(values) {
 }
 function buildHotspots(issues) {
   const map = /* @__PURE__ */ new Map();
-  for (const issue6 of issues) {
-    if (!issue6.file) {
+  for (const issue7 of issues) {
+    if (!issue7.file) {
       continue;
     }
-    const current = map.get(issue6.file) ?? {
-      file: issue6.file,
+    const current = map.get(issue7.file) ?? {
+      file: issue7.file,
       total: 0,
       error: 0,
       warning: 0,
       info: 0
     };
     current.total += 1;
-    current[issue6.severity] += 1;
-    map.set(issue6.file, current);
+    current[issue7.severity] += 1;
+    map.set(issue7.file, current);
   }
   return Array.from(map.values()).sort(
     (a, b) => b.total !== a.total ? b.total - a.total : a.file.localeCompare(b.file)
@@ -1935,21 +2238,22 @@ function buildHotspots(issues) {
 
 // src/cli/commands/report.ts
 async function runReport(options) {
-  const root = path10.resolve(options.root);
+  const root = path14.resolve(options.root);
   const configResult = await loadConfig(root);
-  const input = options.jsonPath ?? configResult.config.output.jsonPath;
-  const inputPath = path10.isAbsolute(input) ? input : path10.resolve(root, input);
+  const input = configResult.config.output.validateJsonPath;
+  const inputPath = path14.isAbsolute(input) ? input : path14.resolve(root, input);
   let validation;
   try {
     validation = await readValidationResult(inputPath);
   } catch (err) {
-    if (isMissingFileError(err)) {
+    if (isMissingFileError2(err)) {
       error(
         [
           `qfai report: \u5165\u529B\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${inputPath}`,
           "",
-          "\u307E\u305A validate.json \u3092\u751F\u6210\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u4F8B:",
-          `  qfai validate --json-path ${input}`,
+          "\u307E\u305A qfai validate \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u4F8B:",
+          "  qfai validate",
+          "\uFF08\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u51FA\u529B\u5148: .qfai/out/validate.json\uFF09",
           "",
           "GitHub Actions \u30C6\u30F3\u30D7\u30EC\u3092\u4F7F\u3063\u3066\u3044\u308B\u5834\u5408\u306F\u3001workflow \u306E validate \u30B8\u30E7\u30D6\u3092\u5148\u306B\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
         ].join("\n")
@@ -1961,10 +2265,11 @@ async function runReport(options) {
   }
   const data = await createReportData(root, validation, configResult);
   const output = options.format === "json" ? formatReportJson(data) : formatReportMarkdown(data);
-  const defaultOut = options.format === "json" ? ".qfai/out/report.json" : ".qfai/out/report.md";
+  const outRoot = resolvePath(root, configResult.config, "outDir");
+  const defaultOut = options.format === "json" ? path14.join(outRoot, "report.json") : path14.join(outRoot, "report.md");
   const out = options.outPath ?? defaultOut;
-  const outPath = path10.isAbsolute(out) ? out : path10.resolve(root, out);
-  await mkdir2(path10.dirname(outPath), { recursive: true });
+  const outPath = path14.isAbsolute(out) ? out : path14.resolve(root, out);
+  await mkdir2(path14.dirname(outPath), { recursive: true });
   await writeFile(outPath, `${output}
 `, "utf-8");
   info(
@@ -1973,7 +2278,7 @@ async function runReport(options) {
   info(`wrote report: ${outPath}`);
 }
 async function readValidationResult(inputPath) {
-  const raw = await readFile10(inputPath, "utf-8");
+  const raw = await readFile11(inputPath, "utf-8");
   const parsed = JSON.parse(raw);
   if (!isValidationResult(parsed)) {
     throw new Error(`validate.json \u306E\u5F62\u5F0F\u304C\u4E0D\u6B63\u3067\u3059: ${inputPath}`);
@@ -2005,7 +2310,7 @@ function isValidationResult(value) {
   }
   return typeof counts.info === "number" && typeof counts.warning === "number" && typeof counts.error === "number";
 }
-function isMissingFileError(error2) {
+function isMissingFileError2(error2) {
   if (!error2 || typeof error2 !== "object") {
     return false;
   }
@@ -2015,7 +2320,7 @@ function isMissingFileError(error2) {
 
 // src/cli/commands/validate.ts
 import { mkdir as mkdir3, writeFile as writeFile2 } from "fs/promises";
-import path11 from "path";
+import path15 from "path";
 
 // src/cli/lib/failOn.ts
 function shouldFail(result, failOn) {
@@ -2030,24 +2335,17 @@ function shouldFail(result, failOn) {
 
 // src/cli/commands/validate.ts
 async function runValidate(options) {
-  const root = path11.resolve(options.root);
+  const root = path15.resolve(options.root);
   const configResult = await loadConfig(root);
   const result = await validateProject(root, configResult);
-  const format = options.format ?? configResult.config.output.format;
-  const explicitJsonPath = options.jsonPath;
+  const format = options.format ?? "text";
   if (format === "text") {
     emitText(result);
   }
   if (format === "github") {
     result.issues.forEach(emitGitHub);
   }
-  const shouldWriteJson = format === "json" || explicitJsonPath !== void 0;
-  if (shouldWriteJson) {
-    const jsonPath = format === "json" ? options.jsonPath ?? configResult.config.output.jsonPath : explicitJsonPath;
-    if (jsonPath) {
-      await emitJson(result, root, jsonPath);
-    }
-  }
+  await emitJson(result, root, configResult.config.output.validateJsonPath);
   const failOn = resolveFailOn(options, configResult.config.validation.failOn);
   return shouldFail(result, failOn) ? 1 : 0;
 }
@@ -2074,20 +2372,20 @@ function emitText(result) {
 `
   );
 }
-function emitGitHub(issue6) {
-  const level = issue6.severity === "error" ? "error" : issue6.severity === "warning" ? "warning" : "notice";
-  const file = issue6.file ? `file=${issue6.file}` : "";
-  const line = issue6.loc?.line ? `,line=${issue6.loc.line}` : "";
-  const column = issue6.loc?.column ? `,col=${issue6.loc.column}` : "";
+function emitGitHub(issue7) {
+  const level = issue7.severity === "error" ? "error" : issue7.severity === "warning" ? "warning" : "notice";
+  const file = issue7.file ? `file=${issue7.file}` : "";
+  const line = issue7.loc?.line ? `,line=${issue7.loc.line}` : "";
+  const column = issue7.loc?.column ? `,col=${issue7.loc.column}` : "";
   const location = file ? ` ${file}${line}${column}` : "";
   process.stdout.write(
-    `::${level}${location}::${issue6.code}: ${issue6.message}
+    `::${level}${location}::${issue7.code}: ${issue7.message}
 `
   );
 }
 async function emitJson(result, root, jsonPath) {
-  const abs = path11.isAbsolute(jsonPath) ? jsonPath : path11.resolve(root, jsonPath);
-  await mkdir3(path11.dirname(abs), { recursive: true });
+  const abs = path15.isAbsolute(jsonPath) ? jsonPath : path15.resolve(root, jsonPath);
+  await mkdir3(path15.dirname(abs), { recursive: true });
   await writeFile2(abs, `${JSON.stringify(result, null, 2)}
 `, "utf-8");
 }
@@ -2148,15 +2446,6 @@ function parseArgs(argv, cwd) {
         i += 1;
         break;
       }
-      case "--json-path":
-        {
-          const next = args[i + 1];
-          if (next) {
-            options.jsonPath = next;
-          }
-        }
-        i += 1;
-        break;
       case "--out":
         {
           const next = args[i + 1];
@@ -2187,7 +2476,7 @@ function applyFormatOption(command, value, options) {
     return;
   }
   if (command === "validate") {
-    if (value === "text" || value === "json" || value === "github") {
+    if (value === "text" || value === "github") {
       options.validateFormat = value;
     }
     return;
@@ -2195,7 +2484,7 @@ function applyFormatOption(command, value, options) {
   if (value === "md" || value === "json") {
     options.reportFormat = value;
   }
-  if (value === "text" || value === "json" || value === "github") {
+  if (value === "text" || value === "github") {
     options.validateFormat = value;
   }
 }
@@ -2221,15 +2510,13 @@ async function run(argv, cwd) {
         root: options.root,
         strict: options.strict,
         format: options.validateFormat,
-        ...options.failOn !== void 0 ? { failOn: options.failOn } : {},
-        ...options.jsonPath !== void 0 ? { jsonPath: options.jsonPath } : {}
+        ...options.failOn !== void 0 ? { failOn: options.failOn } : {}
       });
       return;
     case "report":
       await runReport({
         root: options.root,
         format: options.reportFormat,
-        ...options.jsonPath !== void 0 ? { jsonPath: options.jsonPath } : {},
         ...options.reportOut !== void 0 ? { outPath: options.reportOut } : {}
       });
       return;
@@ -2251,14 +2538,13 @@ Options:
   --root <path>   \u5BFE\u8C61\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
   --dir <path>    init \u306E\u51FA\u529B\u5148
   --force         \u65E2\u5B58\u30D5\u30A1\u30A4\u30EB\u3092\u4E0A\u66F8\u304D
-  --yes           init: \u975E\u5BFE\u8A71\u3067\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u63A1\u7528\uFF08\u73FE\u5728\u306F\u975E\u5BFE\u8A71\u304C\u65E2\u5B9A\u3001\u5C06\u6765\u306E\u5BFE\u8A71\u5C0E\u5165\u6642\u3082\u81EA\u52D5Yes\uFF09
+  --yes           init: \u4E88\u7D04\u30D5\u30E9\u30B0\uFF08\u73FE\u72B6\u306F\u975E\u5BFE\u8A71\u306E\u305F\u3081\u6319\u52D5\u5DEE\u306A\u3057\u3002\u5C06\u6765\u306E\u5BFE\u8A71\u5C0E\u5165\u6642\u306B\u81EA\u52D5Yes\uFF09
   --dry-run       \u5909\u66F4\u3092\u884C\u308F\u305A\u8868\u793A\u306E\u307F
-  --format <text|json|github>  validate \u306E\u51FA\u529B\u5F62\u5F0F
+  --format <text|github>       validate \u306E\u51FA\u529B\u5F62\u5F0F
   --format <md|json>           report \u306E\u51FA\u529B\u5F62\u5F0F
-  --strict              validate: warning \u4EE5\u4E0A\u3067 exit 1
+  --strict                     validate: warning \u4EE5\u4E0A\u3067 exit 1
   --fail-on <error|warning|never>  validate: \u5931\u6557\u6761\u4EF6
-  --json-path <path>     validate: JSON \u51FA\u529B\u5148 / report: validate JSON \u5165\u529B
-  --out <path>           report: \u51FA\u529B\u5148
+  --out <path>                  report: \u51FA\u529B\u5148
   -h, --help      \u30D8\u30EB\u30D7\u8868\u793A
 `;
 }