qfai 0.3.1 → 0.3.2

package/dist/cli/index.mjs

@@ -478,7 +478,7 @@ 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";
@@ -535,25 +535,50 @@ async function exists2(target) {
   }
 }
 
-// src/core/discovery.ts
-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));
+// 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;
   }
-  return Array.from(packs).sort();
+}
+function isMissingFileError(error2) {
+  if (!error2 || typeof error2 !== "object") {
+    return false;
+  }
+  return error2.code === "ENOENT";
+}
+
+// src/core/discovery.ts
+async function collectSpecPackDirs(specsRoot) {
+  const entries = await collectSpecEntries(specsRoot);
+  return entries.map((entry) => entry.dir);
 }
 async function collectSpecFiles(specsRoot) {
-  const files = await collectFiles(specsRoot, { extensions: [".md"] });
-  return files.filter((file) => isSpecPackFile(file, "spec.md"));
+  const entries = await collectSpecEntries(specsRoot);
+  return filterExisting(entries.map((entry) => entry.specPath));
 }
 async function collectScenarioFiles(specsRoot) {
-  const files = await collectFiles(specsRoot, { extensions: [".md"] });
-  return files.filter((file) => isSpecPackFile(file, "scenario.md"));
+  const entries = await collectSpecEntries(specsRoot);
+  return filterExisting(entries.map((entry) => entry.scenarioPath));
 }
 async function collectUiContractFiles(uiRoot) {
   return collectFiles(uiRoot, { extensions: [".yaml", ".yml"] });
@@ -572,12 +597,22 @@ async function collectContractFiles(uiRoot, apiRoot, dataRoot) {
   ]);
   return { ui, api, db };
 }
-function isSpecPackFile(filePath, baseName) {
-  if (path6.basename(filePath).toLowerCase() !== baseName) {
+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;
   }
-  const dirName = path6.basename(path6.dirname(filePath)).toLowerCase();
-  return SPEC_PACK_DIR_PATTERN.test(dirName);
 }
 
 // src/core/ids.ts
@@ -641,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.1".length > 0) {
-    return "0.3.1";
+  if ("0.3.2".length > 0) {
+    return "0.3.2";
   }
   try {
     const packagePath = resolvePackageJsonPath();
@@ -975,7 +1010,7 @@ async function validateDeltas(root, config) {
     try {
       text = await readFile4(deltaPath, "utf-8");
     } catch (error2) {
-      if (isMissingFileError(error2)) {
+      if (isMissingFileError2(error2)) {
         issues.push(
           issue2(
             "QFAI-DELTA-001",
@@ -1020,7 +1055,7 @@ async function validateDeltas(root, config) {
   }
   return issues;
 }
-function isMissingFileError(error2) {
+function isMissingFileError2(error2) {
   if (!error2 || typeof error2 !== "object") {
     return false;
   }
@@ -1109,66 +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(?: 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) {
@@ -1287,8 +1262,166 @@ 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 specsRoot = resolvePath(root, config, "specsDir");
@@ -1333,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);
         }
       }
@@ -1377,17 +1513,19 @@ 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 specsRoot = resolvePath(root, config, "specsDir");
-  const files = await collectScenarioFiles(specsRoot);
-  if (files.length === 0) {
+  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",
         specsRoot,
         "scenario.files"
@@ -1395,15 +1533,31 @@ async function validateScenarios(root, config) {
     ];
   }
   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",
@@ -1425,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(
@@ -1441,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(
@@ -1455,16 +1647,16 @@ function validateScenarioContent(text, file) {
       continue;
     }
     const missingTags = [];
-    const scTags = scenario.tags.filter((tag) => SC_TAG_RE2.test(tag));
+    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) {
@@ -1479,15 +1671,16 @@ function validateScenarioContent(text, file) {
       );
     }
   }
-  for (const scenario of parsed.scenarios) {
+  for (const scenario of document.scenarios) {
     const missingSteps = [];
-    if (!GIVEN_PATTERN.test(scenario.body)) {
+    const keywords = scenario.steps.map((step) => step.keyword.trim());
+    if (!keywords.some((keyword) => GIVEN_PATTERN.test(keyword))) {
       missingSteps.push("Given");
     }
-    if (!WHEN_PATTERN.test(scenario.body)) {
+    if (!keywords.some((keyword) => WHEN_PATTERN.test(keyword))) {
       missingSteps.push("When");
     }
-    if (!THEN_PATTERN.test(scenario.body)) {
+    if (!keywords.some((keyword) => THEN_PATTERN.test(keyword))) {
       missingSteps.push("Then");
     }
     if (missingSteps.length > 0) {
@@ -1521,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, "specsDir");
-  const files = await collectSpecFiles(specsRoot);
-  if (files.length === 0) {
-    const expected = "spec-001/spec.md";
+  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.specsDir} / \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"
@@ -1540,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
       )
     );
@@ -1667,15 +1884,18 @@ 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, "specsDir");
@@ -1733,104 +1953,97 @@ async function validateTraceability(root, config) {
   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) {
@@ -2246,7 +2459,7 @@ async function runReport(options) {
   try {
     validation = await readValidationResult(inputPath);
   } catch (err) {
-    if (isMissingFileError2(err)) {
+    if (isMissingFileError5(err)) {
       error(
         [
           `qfai report: \u5165\u529B\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${inputPath}`,
@@ -2310,7 +2523,7 @@ function isValidationResult(value) {
   }
   return typeof counts.info === "number" && typeof counts.warning === "number" && typeof counts.error === "number";
 }
-function isMissingFileError2(error2) {
+function isMissingFileError5(error2) {
   if (!error2 || typeof error2 !== "object") {
     return false;
   }