qfai 0.3.0 → 0.3.2

package/dist/cli/index.mjs

@@ -138,7 +138,7 @@ function report(copied, skipped, dryRun, label) {
 
 // src/cli/commands/report.ts
 import { mkdir as mkdir2, readFile as readFile11, writeFile } from "fs/promises";
-import path10 from "path";
+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",
@@ -513,9 +475,10 @@ function isRecord(value) {
 
 // src/core/report.ts
 import { readFile as readFile10 } from "fs/promises";
+import path13 from "path";
 
 // src/core/discovery.ts
-import path6 from "path";
+import { access as access3 } from "fs/promises";
 
 // src/core/fs.ts
 import { access as access2, readdir as readdir2 } from "fs/promises";
@@ -572,11 +535,50 @@ async function exists2(target) {
   }
 }
 
+// src/core/specLayout.ts
+import { readdir as readdir3 } from "fs/promises";
+import path6 from "path";
+var SPEC_DIR_RE = /^spec-\d{4}$/;
+async function collectSpecEntries(specsRoot) {
+  const dirs = await listSpecDirs(specsRoot);
+  const entries = dirs.map((dir) => ({
+    dir,
+    specPath: path6.join(dir, "spec.md"),
+    deltaPath: path6.join(dir, "delta.md"),
+    scenarioPath: path6.join(dir, "scenario.md")
+  }));
+  return entries.sort((a, b) => a.dir.localeCompare(b.dir));
+}
+async function listSpecDirs(specsRoot) {
+  try {
+    const items = await readdir3(specsRoot, { withFileTypes: true });
+    return items.filter((item) => item.isDirectory()).map((item) => item.name).filter((name) => SPEC_DIR_RE.test(name.toLowerCase())).map((name) => path6.join(specsRoot, name));
+  } catch (error2) {
+    if (isMissingFileError(error2)) {
+      return [];
+    }
+    throw error2;
+  }
+}
+function isMissingFileError(error2) {
+  if (!error2 || typeof error2 !== "object") {
+    return false;
+  }
+  return error2.code === "ENOENT";
+}
+
 // 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));
+async function collectSpecPackDirs(specsRoot) {
+  const entries = await collectSpecEntries(specsRoot);
+  return entries.map((entry) => entry.dir);
+}
+async function collectSpecFiles(specsRoot) {
+  const entries = await collectSpecEntries(specsRoot);
+  return filterExisting(entries.map((entry) => entry.specPath));
+}
+async function collectScenarioFiles(specsRoot) {
+  const entries = await collectSpecEntries(specsRoot);
+  return filterExisting(entries.map((entry) => entry.scenarioPath));
 }
 async function collectUiContractFiles(uiRoot) {
   return collectFiles(uiRoot, { extensions: [".yaml", ".yml"] });
@@ -595,9 +597,22 @@ 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);
+async function filterExisting(files) {
+  const existing = [];
+  for (const file of files) {
+    if (await exists3(file)) {
+      existing.push(file);
+    }
+  }
+  return existing;
+}
+async function exists3(target) {
+  try {
+    await access3(target);
+    return true;
+  } catch {
+    return false;
+  }
 }
 
 // src/core/ids.ts
@@ -661,8 +676,8 @@ import { readFile as readFile2 } from "fs/promises";
 import path7 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 async function resolveToolVersion() {
-  if ("0.3.0".length > 0) {
-    return "0.3.0";
+  if ("0.3.2".length > 0) {
+    return "0.3.2";
   }
   try {
     const packagePath = resolvePackageJsonPath();
@@ -682,6 +697,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 +753,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) {
@@ -982,72 +989,78 @@ function issue(code, message, severity, file, rule, refs) {
   return issue7;
 }
 
-// src/core/validators/decisions.ts
+// src/core/validators/delta.ts
 import { readFile as readFile4 } from "fs/promises";
-
-// src/core/parse/adr.ts
-var ADR_ID_RE = /\bADR-\d{4}\b/;
-function extractField(md, key) {
-  const pattern = new RegExp(`^\\s*-\\s*${key}:\\s*(.+)\\s*$`, "m");
-  return md.match(pattern)?.[1]?.trim();
-}
-function parseAdr(md, file) {
-  const adrId = md.match(ADR_ID_RE)?.[0];
-  const fields = {};
-  const status = extractField(md, "Status");
-  const context = extractField(md, "Context");
-  const decision = extractField(md, "Decision");
-  const consequences = extractField(md, "Consequences");
-  const related = extractField(md, "Related");
-  if (status) fields.status = status;
-  if (context) fields.context = context;
-  if (decision) fields.decision = decision;
-  if (consequences) fields.consequences = consequences;
-  if (related) fields.related = related;
-  const parsed = {
-    file,
-    fields
-  };
-  if (adrId) {
-    parsed.adrId = adrId;
-  }
-  return parsed;
-}
-
-// src/core/validators/decisions.ts
-var REQUIRED_FIELDS = [
-  { key: "status", label: "Status" },
-  { key: "context", label: "Context" },
-  { key: "decision", label: "Decision" },
-  { key: "consequences", label: "Consequences" }
-];
-async function validateDecisions(root, config) {
-  const decisionsRoot = resolvePath(root, config, "decisionsDir");
-  const files = await collectFiles(decisionsRoot, { extensions: [".md"] });
-  if (files.length === 0) {
+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 file of files) {
-    const text = await readFile4(file, "utf-8");
-    const parsed = parseAdr(text, file);
-    const missing = REQUIRED_FIELDS.filter(
-      (field) => !parsed.fields[field.key]
-    );
-    if (missing.length > 0) {
+  for (const pack of packs) {
+    const deltaPath = path10.join(pack, "delta.md");
+    let text;
+    try {
+      text = await readFile4(deltaPath, "utf-8");
+    } catch (error2) {
+      if (isMissingFileError2(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-ADR-001",
-          `ADR \u5FC5\u9808\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059: ${missing.map((field) => field.label).join(", ")}`,
+          "QFAI-DELTA-002",
+          "delta.md \u306E\u5909\u66F4\u533A\u5206\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002",
           "error",
-          file,
-          "adr.requiredFields"
+          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 isMissingFileError2(error2) {
+  if (!error2 || typeof error2 !== "object") {
+    return false;
+  }
+  return error2.code === "ENOENT";
+}
 function issue2(code, message, severity, file, rule, refs) {
   const issue7 = {
     code,
@@ -1068,14 +1081,16 @@ function issue2(code, message, severity, file, rule, refs) {
 
 // src/core/validators/ids.ts
 import { readFile as readFile6 } from "fs/promises";
-import path9 from "path";
+import path12 from "path";
 
 // src/core/contractIndex.ts
 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),
@@ -1129,38 +1144,6 @@ 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:\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;
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i] ?? "";
-    if (FEATURE_RE.test(line)) {
-      featurePresent = true;
-    }
-    const match = line.match(SCENARIO_RE);
-    if (!match) continue;
-    const scenarioName = match[1];
-    if (!scenarioName) continue;
-    const tags = [];
-    for (let j = i - 1; j >= 0; j--) {
-      const previous = lines[j] ?? "";
-      if (previous.trim() === "") continue;
-      if (!TAG_LINE_RE.test(previous)) break;
-      tags.unshift(...parseTags(previous));
-    }
-    scenarios.push({ name: scenarioName, line: i + 1, tags });
-  }
-  return { file, featurePresent, scenarios };
-}
-
 // src/core/parse/markdown.ts
 var HEADING_RE = /^(#{1,6})\s+(.+?)\s*$/;
 function parseHeadings(md) {
@@ -1204,9 +1187,9 @@ function extractH2Sections(md) {
 
 // src/core/parse/spec.ts
 var SPEC_ID_RE = /\bSPEC-\d{4}\b/;
-var BR_LINE_RE = /^\s*-\s*\[?(BR-\d{4})\]?\s*\((P[0-3])\)\s*(.+)$/;
-var BR_LINE_ANY_PRIORITY_RE = /^\s*-\s*\[?(BR-\d{4})\]?\s*\((P[^)]+)\)\s*(.+)$/;
-var BR_LINE_NO_PRIORITY_RE = /^\s*-\s*\[?(BR-\d{4})\]?\s+(?!\()(.*\S.*)$/;
+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) {
@@ -1279,16 +1262,171 @@ function parseSpec(md, file) {
   return parsed;
 }
 
-// src/core/validators/ids.ts
+// src/core/gherkin/parse.ts
+import {
+  AstBuilder,
+  GherkinClassicTokenMatcher,
+  Parser
+} from "@cucumber/gherkin";
+import { randomUUID } from "crypto";
+function parseGherkin(source, uri) {
+  const errors = [];
+  const uuidFn = () => randomUUID();
+  const builder = new AstBuilder(uuidFn);
+  const matcher = new GherkinClassicTokenMatcher();
+  const parser = new Parser(builder, matcher);
+  try {
+    const gherkinDocument = parser.parse(source);
+    gherkinDocument.uri = uri;
+    return { gherkinDocument, errors };
+  } catch (error2) {
+    errors.push(formatError3(error2));
+    return { gherkinDocument: null, errors };
+  }
+}
+function formatError3(error2) {
+  if (error2 instanceof Error) {
+    return error2.message;
+  }
+  return String(error2);
+}
+
+// src/core/scenarioModel.ts
+var SPEC_TAG_RE = /^SPEC-\d{4}$/;
 var SC_TAG_RE = /^SC-\d{4}$/;
+var BR_TAG_RE = /^BR-\d{4}$/;
+var UI_TAG_RE = /^UI-\d{4}$/;
+var API_TAG_RE = /^API-\d{4}$/;
+var DATA_TAG_RE = /^DATA-\d{4}$/;
+function parseScenarioDocument(text, uri) {
+  const { gherkinDocument, errors } = parseGherkin(text, uri);
+  if (!gherkinDocument) {
+    return { document: null, errors };
+  }
+  const feature = gherkinDocument.feature;
+  if (!feature) {
+    return {
+      document: { uri, featureTags: [], scenarios: [] },
+      errors
+    };
+  }
+  const featureTags = collectTagNames(feature.tags);
+  const scenarios = collectScenarioNodes(feature, featureTags);
+  return {
+    document: {
+      uri,
+      featureName: feature.name,
+      featureTags,
+      scenarios
+    },
+    errors
+  };
+}
+function buildScenarioAtoms(document) {
+  return document.scenarios.map((scenario) => {
+    const specIds = scenario.tags.filter((tag) => SPEC_TAG_RE.test(tag));
+    const scIds = scenario.tags.filter((tag) => SC_TAG_RE.test(tag));
+    const brIds = unique2(scenario.tags.filter((tag) => BR_TAG_RE.test(tag)));
+    const contractIds = /* @__PURE__ */ new Set();
+    scenario.tags.forEach((tag) => {
+      if (UI_TAG_RE.test(tag) || API_TAG_RE.test(tag) || DATA_TAG_RE.test(tag)) {
+        contractIds.add(tag);
+      }
+    });
+    for (const step of scenario.steps) {
+      for (const text of collectStepTexts(step)) {
+        extractIds(text, "UI").forEach((id) => contractIds.add(id));
+        extractIds(text, "API").forEach((id) => contractIds.add(id));
+        extractIds(text, "DATA").forEach((id) => contractIds.add(id));
+      }
+    }
+    const atom = {
+      uri: document.uri,
+      featureName: document.featureName ?? "",
+      scenarioName: scenario.name,
+      kind: scenario.kind,
+      brIds,
+      contractIds: Array.from(contractIds).sort()
+    };
+    if (scenario.line !== void 0) {
+      atom.line = scenario.line;
+    }
+    if (specIds.length === 1) {
+      const specId = specIds[0];
+      if (specId) {
+        atom.specId = specId;
+      }
+    }
+    if (scIds.length === 1) {
+      const scId = scIds[0];
+      if (scId) {
+        atom.scId = scId;
+      }
+    }
+    return atom;
+  });
+}
+function collectScenarioNodes(feature, featureTags) {
+  const scenarios = [];
+  for (const child of feature.children) {
+    if (child.scenario) {
+      scenarios.push(buildScenarioNode(child.scenario, featureTags, []));
+    }
+    if (child.rule) {
+      const ruleTags = collectTagNames(child.rule.tags);
+      for (const ruleChild of child.rule.children) {
+        if (ruleChild.scenario) {
+          scenarios.push(
+            buildScenarioNode(ruleChild.scenario, featureTags, ruleTags)
+          );
+        }
+      }
+    }
+  }
+  return scenarios;
+}
+function buildScenarioNode(scenario, featureTags, ruleTags) {
+  const tags = [...featureTags, ...ruleTags, ...collectTagNames(scenario.tags)];
+  const kind = scenario.examples.length > 0 ? "ScenarioOutline" : "Scenario";
+  return {
+    name: scenario.name,
+    kind,
+    line: scenario.location?.line,
+    tags,
+    steps: scenario.steps
+  };
+}
+function collectTagNames(tags) {
+  return tags.map((tag) => tag.name.replace(/^@/, ""));
+}
+function collectStepTexts(step) {
+  const texts = [];
+  if (step.text) {
+    texts.push(step.text);
+  }
+  if (step.docString?.content) {
+    texts.push(step.docString.content);
+  }
+  if (step.dataTable?.rows) {
+    for (const row of step.dataTable.rows) {
+      for (const cell of row.cells) {
+        texts.push(cell.value);
+      }
+    }
+  }
+  return texts;
+}
+function unique2(values) {
+  return Array.from(new Set(values));
+}
+
+// src/core/validators/ids.ts
+var SC_TAG_RE2 = /^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);
@@ -1328,10 +1466,13 @@ async function collectSpecDefinitionIds(files, out) {
 async function collectScenarioDefinitionIds(files, out) {
   for (const file of files) {
     const text = await readFile6(file, "utf-8");
-    const parsed = parseGherkinFeature(text, file);
-    for (const scenario of parsed.scenarios) {
+    const { document, errors } = parseScenarioDocument(text, file);
+    if (!document || errors.length > 0) {
+      continue;
+    }
+    for (const scenario of document.scenarios) {
       for (const tag of scenario.tags) {
-        if (SC_TAG_RE.test(tag)) {
+        if (SC_TAG_RE2.test(tag)) {
           recordId(out, tag, file);
         }
       }
@@ -1345,7 +1486,7 @@ 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(", ");
 }
@@ -1372,35 +1513,51 @@ 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}$/;
+var SC_TAG_RE3 = /^SC-\d{4}$/;
+var SPEC_TAG_RE2 = /^SPEC-\d{4}$/;
+var BR_TAG_RE2 = /^BR-\d{4}$/;
 async function validateScenarios(root, config) {
-  const scenariosRoot = resolvePath(root, config, "scenariosDir");
-  const files = await collectFiles(scenariosRoot, {
-    extensions: [".feature"]
-  });
-  if (files.length === 0) {
+  const specsRoot = resolvePath(root, config, "specsDir");
+  const entries = await collectSpecEntries(specsRoot);
+  if (entries.length === 0) {
+    const expected = "spec-0001/scenario.md";
+    const legacy = "spec-001/scenario.md";
     return [
       issue4(
         "QFAI-SC-000",
-        "Scenario \u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002",
+        `Scenario \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} (${legacy} \u306F\u975E\u5BFE\u5FDC)`,
         "info",
-        scenariosRoot,
+        specsRoot,
         "scenario.files"
       )
     ];
   }
   const issues = [];
-  for (const file of files) {
-    const text = await readFile7(file, "utf-8");
-    issues.push(...validateScenarioContent(text, file));
+  for (const entry of entries) {
+    let text;
+    try {
+      text = await readFile7(entry.scenarioPath, "utf-8");
+    } catch (error2) {
+      if (isMissingFileError3(error2)) {
+        issues.push(
+          issue4(
+            "QFAI-SC-001",
+            "scenario.md \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002",
+            "error",
+            entry.scenarioPath,
+            "scenario.exists"
+          )
+        );
+        continue;
+      }
+      throw error2;
+    }
+    issues.push(...validateScenarioContent(text, entry.scenarioPath));
   }
   return issues;
 }
 function validateScenarioContent(text, file) {
   const issues = [];
-  const parsed = parseGherkinFeature(text, file);
   const invalidIds = extractInvalidIds(text, [
     "SPEC",
     "BR",
@@ -1422,9 +1579,47 @@ function validateScenarioContent(text, file) {
       )
     );
   }
+  const { document, errors } = parseScenarioDocument(text, file);
+  if (!document || errors.length > 0) {
+    issues.push(
+      issue4(
+        "QFAI-SC-010",
+        `Gherkin \u306E\u89E3\u6790\u306B\u5931\u6557\u3057\u307E\u3057\u305F: ${errors.join(", ") || "unknown"}`,
+        "error",
+        file,
+        "scenario.parse"
+      )
+    );
+    return issues;
+  }
+  const featureSpecTags = document.featureTags.filter(
+    (tag) => SPEC_TAG_RE2.test(tag)
+  );
+  if (featureSpecTags.length === 0) {
+    issues.push(
+      issue4(
+        "QFAI-SC-009",
+        "Feature \u30BF\u30B0\u306B SPEC \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002",
+        "error",
+        file,
+        "scenario.featureSpec"
+      )
+    );
+  } else if (featureSpecTags.length > 1) {
+    issues.push(
+      issue4(
+        "QFAI-SC-009",
+        `Feature \u306E SPEC \u30BF\u30B0\u304C\u8907\u6570\u3042\u308A\u307E\u3059: ${featureSpecTags.join(", ")}`,
+        "error",
+        file,
+        "scenario.featureSpec",
+        featureSpecTags
+      )
+    );
+  }
   const missingStructure = [];
-  if (!parsed.featurePresent) missingStructure.push("Feature");
-  if (parsed.scenarios.length === 0) missingStructure.push("Scenario");
+  if (!document.featureName) missingStructure.push("Feature");
+  if (document.scenarios.length === 0) missingStructure.push("Scenario");
   if (missingStructure.length > 0) {
     issues.push(
       issue4(
@@ -1438,7 +1633,7 @@ function validateScenarioContent(text, file) {
       )
     );
   }
-  for (const scenario of parsed.scenarios) {
+  for (const scenario of document.scenarios) {
     if (scenario.tags.length === 0) {
       issues.push(
         issue4(
@@ -1452,13 +1647,16 @@ function validateScenarioContent(text, file) {
       continue;
     }
     const missingTags = [];
-    if (!scenario.tags.some((tag) => SC_TAG_RE2.test(tag))) {
-      missingTags.push("SC");
+    const scTags = scenario.tags.filter((tag) => SC_TAG_RE3.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))) {
+    if (!scenario.tags.some((tag) => SPEC_TAG_RE2.test(tag))) {
       missingTags.push("SPEC");
     }
-    if (!scenario.tags.some((tag) => BR_TAG_RE.test(tag))) {
+    if (!scenario.tags.some((tag) => BR_TAG_RE2.test(tag))) {
       missingTags.push("BR");
     }
     if (missingTags.length > 0) {
@@ -1473,26 +1671,29 @@ function validateScenarioContent(text, file) {
       );
     }
   }
-  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");
-  }
-  if (missingSteps.length > 0) {
-    issues.push(
-      issue4(
-        "QFAI-SC-005",
-        `Given/When/Then \u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059: ${missingSteps.join(", ")}`,
-        "warning",
-        file,
-        "scenario.steps"
-      )
-    );
+  for (const scenario of document.scenarios) {
+    const missingSteps = [];
+    const keywords = scenario.steps.map((step) => step.keyword.trim());
+    if (!keywords.some((keyword) => GIVEN_PATTERN.test(keyword))) {
+      missingSteps.push("Given");
+    }
+    if (!keywords.some((keyword) => WHEN_PATTERN.test(keyword))) {
+      missingSteps.push("When");
+    }
+    if (!keywords.some((keyword) => THEN_PATTERN.test(keyword))) {
+      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;
 }
@@ -1513,18 +1714,25 @@ function issue4(code, message, severity, file, rule, refs) {
   }
   return issue7;
 }
+function isMissingFileError3(error2) {
+  if (!error2 || typeof error2 !== "object") {
+    return false;
+  }
+  return error2.code === "ENOENT";
+}
 
 // src/core/validators/spec.ts
 import { readFile as readFile8 } from "fs/promises";
 async function validateSpecs(root, config) {
-  const specsRoot = resolvePath(root, config, "specDir");
-  const files = await collectSpecFiles(specsRoot);
-  if (files.length === 0) {
-    const expected = "spec-0001-<slug>.md";
+  const specsRoot = resolvePath(root, config, "specsDir");
+  const entries = await collectSpecEntries(specsRoot);
+  if (entries.length === 0) {
+    const expected = "spec-0001/spec.md";
+    const legacy = "spec-001/spec.md";
     return [
       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} (${legacy} \u306F\u975E\u5BFE\u5FDC)`,
         "info",
         specsRoot,
         "spec.files"
@@ -1532,12 +1740,29 @@ async function validateSpecs(root, config) {
     ];
   }
   const issues = [];
-  for (const file of files) {
-    const text = await readFile8(file, "utf-8");
+  for (const entry of entries) {
+    let text;
+    try {
+      text = await readFile8(entry.specPath, "utf-8");
+    } catch (error2) {
+      if (isMissingFileError4(error2)) {
+        issues.push(
+          issue5(
+            "QFAI-SPEC-005",
+            "spec.md \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002",
+            "error",
+            entry.specPath,
+            "spec.exists"
+          )
+        );
+        continue;
+      }
+      throw error2;
+    }
     issues.push(
       ...validateSpecContent(
         text,
-        file,
+        entry.specPath,
         config.validation.require.specSections
       )
     );
@@ -1659,29 +1884,25 @@ function issue5(code, message, severity, file, rule, refs) {
   }
   return issue7;
 }
+function isMissingFileError4(error2) {
+  if (!error2 || typeof error2 !== "object") {
+    return false;
+  }
+  return error2.code === "ENOENT";
+}
 
 // src/core/validators/traceability.ts
 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}$/;
+var SC_TAG_RE4 = /^SC-\d{4}$/;
+var SPEC_TAG_RE3 = /^SPEC-\d{4}$/;
+var BR_TAG_RE3 = /^BR-\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();
@@ -1729,111 +1950,100 @@ async function validateTraceability(root, config) {
       specToBrIds.set(parsed.specId, current);
     }
   }
-  for (const file of decisionFiles) {
-    const text = await readFile9(file, "utf-8");
-    extractAllIds(text).forEach((id) => upstreamIds.add(id));
-  }
   for (const file of scenarioFiles) {
     const text = await readFile9(file, "utf-8");
     extractAllIds(text).forEach((id) => upstreamIds.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 = specIdsList.filter((id) => !specIds.has(id));
-    if (unknownSpecIds.length > 0) {
-      issues.push(
-        issue6(
-          "QFAI-TRACE-005",
-          `Scenario \u304C\u5B58\u5728\u3057\u306A\u3044 SPEC \u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059: ${unknownSpecIds.join(", ")}`,
-          "error",
-          file,
-          "traceability.scenarioSpecExists",
-          unknownSpecIds
-        )
-      );
-    }
-    const unknownBrIds = brIdsList.filter((id) => !brIdsInSpecs.has(id));
-    if (unknownBrIds.length > 0) {
-      issues.push(
-        issue6(
-          "QFAI-TRACE-006",
-          `Scenario \u304C\u5B58\u5728\u3057\u306A\u3044 BR \u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059: ${unknownBrIds.join(", ")}`,
-          "error",
-          file,
-          "traceability.scenarioBrExists",
-          unknownBrIds
-        )
-      );
-    }
-    const unknownContractIds = scenarioIdsList.filter(
-      (id) => !contractIds.has(id)
-    );
-    if (unknownContractIds.length > 0) {
-      issues.push(
-        issue6(
-          "QFAI-TRACE-008",
-          `Scenario \u304C\u5B58\u5728\u3057\u306A\u3044\u5951\u7D04 ID \u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059: ${unknownContractIds.join(
-            ", "
-          )}`,
-          config.validation.traceability.unknownContractIdSeverity,
-          file,
-          "traceability.scenarioContractExists",
-          unknownContractIds
-        )
-      );
+    const { document, errors } = parseScenarioDocument(text, file);
+    if (!document || errors.length > 0) {
+      continue;
     }
-    if (specIdsList.length > 0) {
-      const allowedBrIds = /* @__PURE__ */ new Set();
-      for (const specId of specIdsList) {
-        const brIdsForSpec = specToBrIds.get(specId);
-        if (!brIdsForSpec) {
-          continue;
-        }
-        brIdsForSpec.forEach((id) => allowedBrIds.add(id));
+    const atoms = buildScenarioAtoms(document);
+    for (const [index, scenario] of document.scenarios.entries()) {
+      const atom = atoms[index];
+      if (!atom) {
+        continue;
+      }
+      const specTags = scenario.tags.filter((tag) => SPEC_TAG_RE3.test(tag));
+      const brTags = scenario.tags.filter((tag) => BR_TAG_RE3.test(tag));
+      const scTags = scenario.tags.filter((tag) => SC_TAG_RE4.test(tag));
+      brTags.forEach((id) => brIdsInScenarios.add(id));
+      scTags.forEach((id) => scIdsInScenarios.add(id));
+      atom.contractIds.forEach((id) => scenarioContractIds.add(id));
+      if (atom.contractIds.length > 0) {
+        scTags.forEach((id) => scWithContracts.add(id));
+      }
+      const unknownSpecIds = specTags.filter((id) => !specIds.has(id));
+      if (unknownSpecIds.length > 0) {
+        issues.push(
+          issue6(
+            "QFAI-TRACE-005",
+            `Scenario \u304C\u5B58\u5728\u3057\u306A\u3044 SPEC \u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059: ${unknownSpecIds.join(
+              ", "
+            )} (${scenario.name})`,
+            "error",
+            file,
+            "traceability.scenarioSpecExists",
+            unknownSpecIds
+          )
+        );
       }
-      const invalidBrIds = brIdsList.filter((id) => !allowedBrIds.has(id));
-      if (invalidBrIds.length > 0) {
+      const unknownBrIds = brTags.filter((id) => !brIdsInSpecs.has(id));
+      if (unknownBrIds.length > 0) {
         issues.push(
           issue6(
-            "QFAI-TRACE-007",
-            `Scenario \u306E BR \u304C\u53C2\u7167 SPEC \u306B\u5C5E\u3057\u3066\u3044\u307E\u305B\u3093: ${invalidBrIds.join(
+            "QFAI-TRACE-006",
+            `Scenario \u304C\u5B58\u5728\u3057\u306A\u3044 BR \u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059: ${unknownBrIds.join(
               ", "
-            )} (SPEC: ${specIdsList.join(", ")})`,
+            )} (${scenario.name})`,
             "error",
             file,
-            "traceability.scenarioBrUnderSpec",
-            invalidBrIds
+            "traceability.scenarioBrExists",
+            unknownBrIds
+          )
+        );
+      }
+      const unknownContractIds = atom.contractIds.filter(
+        (id) => !contractIds.has(id)
+      );
+      if (unknownContractIds.length > 0) {
+        issues.push(
+          issue6(
+            "QFAI-TRACE-008",
+            `Scenario \u304C\u5B58\u5728\u3057\u306A\u3044\u5951\u7D04 ID \u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059: ${unknownContractIds.join(
+              ", "
+            )} (${scenario.name})`,
+            config.validation.traceability.unknownContractIdSeverity,
+            file,
+            "traceability.scenarioContractExists",
+            unknownContractIds
           )
         );
       }
+      if (specTags.length > 0 && brTags.length > 0) {
+        const allowedBrIds = /* @__PURE__ */ new Set();
+        for (const specId of specTags) {
+          const brIdsForSpec = specToBrIds.get(specId);
+          if (!brIdsForSpec) {
+            continue;
+          }
+          brIdsForSpec.forEach((id) => allowedBrIds.add(id));
+        }
+        const invalidBrIds = brTags.filter((id) => !allowedBrIds.has(id));
+        if (invalidBrIds.length > 0) {
+          issues.push(
+            issue6(
+              "QFAI-TRACE-007",
+              `Scenario \u306E BR \u304C\u53C2\u7167 SPEC \u306B\u5C5E\u3057\u3066\u3044\u307E\u305B\u3093: ${invalidBrIds.join(
+                ", "
+              )} (SPEC: ${specTags.join(", ")}) (${scenario.name})`,
+              "error",
+              file,
+              "traceability.scenarioBrUnderSpec",
+              invalidBrIds
+            )
+          );
+        }
+      }
     }
   }
   if (upstreamIds.size === 0) {
@@ -1876,7 +2086,7 @@ async function validateTraceability(root, config) {
             ", "
           )}`,
           "error",
-          scenariosRoot,
+          specsRoot,
           "traceability.scMustTouchContracts",
           scWithoutContracts
         )
@@ -1894,7 +2104,7 @@ async function validateTraceability(root, config) {
             "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
           )
@@ -1979,8 +2189,8 @@ async function validateProject(root, configResult) {
   const issues = [
     ...configIssues,
     ...await validateSpecs(root, config),
+    ...await validateDeltas(root, config),
     ...await validateScenarios(root, config),
-    ...await validateDecisions(root, config),
     ...await validateContracts(root, config),
     ...await validateDefinedIds(root, config),
     ...await validateTraceability(root, config)
@@ -2009,21 +2219,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,
@@ -2032,7 +2236,6 @@ async function createReportData(root, validation, configResult) {
   const idsByPrefix = await collectIds([
     ...specFiles,
     ...scenarioFiles,
-    ...decisionFiles,
     ...apiFiles,
     ...uiFiles,
     ...dbFiles
@@ -2057,7 +2260,6 @@ async function createReportData(root, validation, configResult) {
     summary: {
       specs: specFiles.length,
       scenarios: scenarioFiles.length,
-      decisions: decisionFiles.length,
       contracts: {
         api: apiFiles.length,
         ui: uiFiles.length,
@@ -2091,7 +2293,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}`
   );
@@ -2250,21 +2451,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 (isMissingFileError5(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")
@@ -2276,10 +2478,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(
@@ -2320,7 +2523,7 @@ function isValidationResult(value) {
   }
   return typeof counts.info === "number" && typeof counts.warning === "number" && typeof counts.error === "number";
 }
-function isMissingFileError(error2) {
+function isMissingFileError5(error2) {
   if (!error2 || typeof error2 !== "object") {
     return false;
   }
@@ -2330,7 +2533,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) {
@@ -2345,24 +2548,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;
 }
@@ -2401,8 +2597,8 @@ function emitGitHub(issue7) {
   );
 }
 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");
 }
@@ -2463,15 +2659,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];
@@ -2502,7 +2689,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;
@@ -2510,7 +2697,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;
   }
 }
@@ -2536,15 +2723,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;
@@ -2566,14 +2751,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
 `;
 }