qfai 0.4.2 → 0.4.6

package/dist/index.mjs

@@ -27,7 +27,6 @@ var defaultConfig = {
     },
     traceability: {
       brMustHaveSc: true,
-      scMustTouchContracts: true,
       scMustHaveTest: true,
       testFileGlobs: [],
       testFileExcludeGlobs: [],
@@ -204,13 +203,6 @@ function normalizeValidation(raw, configPath, issues) {
         configPath,
         issues
       ),
-      scMustTouchContracts: readBoolean(
-        traceabilityRaw?.scMustTouchContracts,
-        base.traceability.scMustTouchContracts,
-        "validation.traceability.scMustTouchContracts",
-        configPath,
-        issues
-      ),
       scMustHaveTest: readBoolean(
         traceabilityRaw?.scMustHaveTest,
         base.traceability.scMustHaveTest,
@@ -364,14 +356,14 @@ function isRecord(value) {
 }
 
 // src/core/ids.ts
-var ID_PREFIXES = ["SPEC", "BR", "SC", "UI", "API", "DATA"];
+var ID_PREFIXES = ["SPEC", "BR", "SC", "UI", "API", "DB"];
 var STRICT_ID_PATTERNS = {
   SPEC: /\bSPEC-\d{4}\b/g,
   BR: /\bBR-\d{4}\b/g,
   SC: /\bSC-\d{4}\b/g,
   UI: /\bUI-\d{4}\b/g,
   API: /\bAPI-\d{4}\b/g,
-  DATA: /\bDATA-\d{4}\b/g,
+  DB: /\bDB-\d{4}\b/g,
   ADR: /\bADR-\d{4}\b/g
 };
 var LOOSE_ID_PATTERNS = {
@@ -380,7 +372,7 @@ var LOOSE_ID_PATTERNS = {
   SC: /\bSC-[A-Za-z0-9_-]+\b/gi,
   UI: /\bUI-[A-Za-z0-9_-]+\b/gi,
   API: /\bAPI-[A-Za-z0-9_-]+\b/gi,
-  DATA: /\bDATA-[A-Za-z0-9_-]+\b/gi,
+  DB: /\bDB-[A-Za-z0-9_-]+\b/gi,
   ADR: /\bADR-[A-Za-z0-9_-]+\b/gi
 };
 function extractIds(text, prefix) {
@@ -420,6 +412,10 @@ function isValidId(value, prefix) {
 import { readFile as readFile11 } from "fs/promises";
 import path11 from "path";
 
+// src/core/contractIndex.ts
+import { readFile as readFile2 } from "fs/promises";
+import path4 from "path";
+
 // src/core/discovery.ts
 import { access as access2 } from "fs/promises";
 
@@ -542,14 +538,14 @@ async function collectUiContractFiles(uiRoot) {
 async function collectApiContractFiles(apiRoot) {
   return collectFiles(apiRoot, { extensions: [".yaml", ".yml", ".json"] });
 }
-async function collectDataContractFiles(dataRoot) {
-  return collectFiles(dataRoot, { extensions: [".sql"] });
+async function collectDbContractFiles(dbRoot) {
+  return collectFiles(dbRoot, { extensions: [".sql"] });
 }
-async function collectContractFiles(uiRoot, apiRoot, dataRoot) {
+async function collectContractFiles(uiRoot, apiRoot, dbRoot) {
   const [ui, api, db] = await Promise.all([
     collectUiContractFiles(uiRoot),
     collectApiContractFiles(apiRoot),
-    collectDataContractFiles(dataRoot)
+    collectDbContractFiles(dbRoot)
   ]);
   return { ui, api, db };
 }
@@ -571,9 +567,221 @@ async function exists2(target) {
   }
 }
 
+// src/core/contractsDecl.ts
+var CONTRACT_DECLARATION_RE = /^\s*(?:#|\/\/|--|\/\*+|\*+)?\s*QFAI-CONTRACT-ID:\s*((?:API|UI|DB)-\d{4})\s*(?:\*\/)?\s*$/gm;
+var CONTRACT_DECLARATION_LINE_RE = /^\s*(?:#|\/\/|--|\/\*+|\*+)?\s*QFAI-CONTRACT-ID:\s*(?:API|UI|DB)-\d{4}\s*(?:\*\/)?\s*$/;
+function extractDeclaredContractIds(text) {
+  const ids = [];
+  for (const match of text.matchAll(CONTRACT_DECLARATION_RE)) {
+    const id = match[1];
+    if (id) {
+      ids.push(id);
+    }
+  }
+  return ids;
+}
+function stripContractDeclarationLines(text) {
+  return text.split(/\r?\n/).filter((line) => !CONTRACT_DECLARATION_LINE_RE.test(line)).join("\n");
+}
+
+// src/core/contractIndex.ts
+async function buildContractIndex(root, config) {
+  const contractsRoot = resolvePath(root, config, "contractsDir");
+  const uiRoot = path4.join(contractsRoot, "ui");
+  const apiRoot = path4.join(contractsRoot, "api");
+  const dbRoot = path4.join(contractsRoot, "db");
+  const [uiFiles, apiFiles, dbFiles] = await Promise.all([
+    collectUiContractFiles(uiRoot),
+    collectApiContractFiles(apiRoot),
+    collectDbContractFiles(dbRoot)
+  ]);
+  const index = {
+    ids: /* @__PURE__ */ new Set(),
+    idToFiles: /* @__PURE__ */ new Map(),
+    files: { ui: uiFiles, api: apiFiles, db: dbFiles }
+  };
+  await indexContractFiles(uiFiles, index);
+  await indexContractFiles(apiFiles, index);
+  await indexContractFiles(dbFiles, index);
+  return index;
+}
+async function indexContractFiles(files, index) {
+  for (const file of files) {
+    const text = await readFile2(file, "utf-8");
+    extractDeclaredContractIds(text).forEach((id) => record(index, id, file));
+  }
+}
+function record(index, id, file) {
+  index.ids.add(id);
+  const current = index.idToFiles.get(id) ?? /* @__PURE__ */ new Set();
+  current.add(file);
+  index.idToFiles.set(id, current);
+}
+
+// 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 CONTRACT_REF_LINE_RE = /^[ \t]*QFAI-CONTRACT-REF:[ \t]*([^\r\n]*)[ \t]*$/gm;
+var CONTRACT_REF_ID_RE = /^(?:API|UI|DB)-\d{4}$/;
+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,
+    contractRefs: parseContractRefs(md)
+  };
+  if (specId) {
+    parsed.specId = specId;
+  }
+  return parsed;
+}
+function parseContractRefs(md) {
+  const lines = [];
+  for (const match of md.matchAll(CONTRACT_REF_LINE_RE)) {
+    lines.push((match[1] ?? "").trim());
+  }
+  const ids = [];
+  const invalidTokens = [];
+  let hasNone = false;
+  for (const line of lines) {
+    if (line.length === 0) {
+      invalidTokens.push("(empty)");
+      continue;
+    }
+    const tokens = line.split(",").map((token) => token.trim());
+    for (const token of tokens) {
+      if (token.length === 0) {
+        invalidTokens.push("(empty)");
+        continue;
+      }
+      if (token === "none") {
+        hasNone = true;
+        continue;
+      }
+      if (CONTRACT_REF_ID_RE.test(token)) {
+        ids.push(token);
+        continue;
+      }
+      invalidTokens.push(token);
+    }
+  }
+  return {
+    lines,
+    ids: unique2(ids),
+    invalidTokens: unique2(invalidTokens),
+    hasNone
+  };
+}
+function unique2(values) {
+  return Array.from(new Set(values));
+}
+
 // src/core/traceability.ts
-import { readFile as readFile2 } from "fs/promises";
-import path4 from "path";
+import { readFile as readFile3 } from "fs/promises";
+import path5 from "path";
 
 // src/core/gherkin/parse.ts
 import {
@@ -610,7 +818,7 @@ 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}$/;
+var DB_TAG_RE = /^DB-\d{4}$/;
 function parseScenarioDocument(text, uri) {
   const { gherkinDocument, errors } = parseGherkin(text, uri);
   if (!gherkinDocument) {
@@ -639,10 +847,10 @@ 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 brIds = unique3(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)) {
+      if (UI_TAG_RE.test(tag) || API_TAG_RE.test(tag) || DB_TAG_RE.test(tag)) {
         contractIds.add(tag);
       }
     });
@@ -650,7 +858,7 @@ function buildScenarioAtoms(document) {
       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));
+        extractIds(text, "DB").forEach((id) => contractIds.add(id));
       }
     }
     const atom = {
@@ -729,7 +937,7 @@ function collectStepTexts(step) {
   }
   return texts;
 }
-function unique2(values) {
+function unique3(values) {
   return Array.from(new Set(values));
 }
 
@@ -759,7 +967,7 @@ function extractAnnotatedScIds(text) {
 async function collectScIdsFromScenarioFiles(scenarioFiles) {
   const scIds = /* @__PURE__ */ new Set();
   for (const file of scenarioFiles) {
-    const text = await readFile2(file, "utf-8");
+    const text = await readFile3(file, "utf-8");
     const { document, errors } = parseScenarioDocument(text, file);
     if (!document || errors.length > 0) {
       continue;
@@ -777,7 +985,7 @@ async function collectScIdsFromScenarioFiles(scenarioFiles) {
 async function collectScIdSourcesFromScenarioFiles(scenarioFiles) {
   const sources = /* @__PURE__ */ new Map();
   for (const file of scenarioFiles) {
-    const text = await readFile2(file, "utf-8");
+    const text = await readFile3(file, "utf-8");
     const { document, errors } = parseScenarioDocument(text, file);
     if (!document || errors.length > 0) {
       continue;
@@ -830,10 +1038,10 @@ async function collectScTestReferences(root, globs, excludeGlobs) {
     };
   }
   const normalizedFiles = Array.from(
-    new Set(files.map((file) => path4.normalize(file)))
+    new Set(files.map((file) => path5.normalize(file)))
   );
   for (const file of normalizedFiles) {
-    const text = await readFile2(file, "utf-8");
+    const text = await readFile3(file, "utf-8");
     const scIds = extractAnnotatedScIds(text);
     if (scIds.length === 0) {
       continue;
@@ -890,16 +1098,16 @@ function formatError3(error) {
 }
 
 // src/core/version.ts
-import { readFile as readFile3 } from "fs/promises";
-import path5 from "path";
+import { readFile as readFile4 } from "fs/promises";
+import path6 from "path";
 import { fileURLToPath } from "url";
 async function resolveToolVersion() {
-  if ("0.4.2".length > 0) {
-    return "0.4.2";
+  if ("0.4.6".length > 0) {
+    return "0.4.6";
   }
   try {
     const packagePath = resolvePackageJsonPath();
-    const raw = await readFile3(packagePath, "utf-8");
+    const raw = await readFile4(packagePath, "utf-8");
     const parsed = JSON.parse(raw);
     const version = typeof parsed.version === "string" ? parsed.version : "";
     return version.length > 0 ? version : "unknown";
@@ -910,54 +1118,23 @@ async function resolveToolVersion() {
 function resolvePackageJsonPath() {
   const base = import.meta.url;
   const basePath = base.startsWith("file:") ? fileURLToPath(base) : base;
-  return path5.resolve(path5.dirname(basePath), "../../package.json");
+  return path6.resolve(path6.dirname(basePath), "../../package.json");
 }
 
 // src/core/validators/contracts.ts
-import { readFile as readFile4 } from "fs/promises";
-import path7 from "path";
+import { readFile as readFile5 } from "fs/promises";
+import path8 from "path";
 
 // src/core/contracts.ts
-import path6 from "path";
+import path7 from "path";
 import { parse as parseYaml2 } from "yaml";
 function parseStructuredContract(file, text) {
-  const ext = path6.extname(file).toLowerCase();
+  const ext = path7.extname(file).toLowerCase();
   if (ext === ".json") {
     return JSON.parse(text);
   }
   return parseYaml2(text);
 }
-function extractUiContractIds(doc) {
-  const id = typeof doc.id === "string" ? doc.id : "";
-  return extractIds(id, "UI");
-}
-function extractApiContractIds(doc) {
-  const operationIds = /* @__PURE__ */ new Set();
-  collectOperationIds(doc, operationIds);
-  const ids = /* @__PURE__ */ new Set();
-  for (const operationId of operationIds) {
-    extractIds(operationId, "API").forEach((id) => ids.add(id));
-  }
-  return Array.from(ids);
-}
-function collectOperationIds(value, out) {
-  if (!value || typeof value !== "object") {
-    return;
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      collectOperationIds(item, out);
-    }
-    return;
-  }
-  for (const [key, entry] of Object.entries(value)) {
-    if (key === "operationId" && typeof entry === "string") {
-      out.add(entry);
-      continue;
-    }
-    collectOperationIds(entry, out);
-  }
-}
 
 // src/core/validators/contracts.ts
 var SQL_DANGEROUS_PATTERNS = [
@@ -972,9 +1149,11 @@ var SQL_DANGEROUS_PATTERNS = [
 async function validateContracts(root, config) {
   const issues = [];
   const contractsRoot = resolvePath(root, config, "contractsDir");
-  issues.push(...await validateUiContracts(path7.join(contractsRoot, "ui")));
-  issues.push(...await validateApiContracts(path7.join(contractsRoot, "api")));
-  issues.push(...await validateDataContracts(path7.join(contractsRoot, "db")));
+  issues.push(...await validateUiContracts(path8.join(contractsRoot, "ui")));
+  issues.push(...await validateApiContracts(path8.join(contractsRoot, "api")));
+  issues.push(...await validateDbContracts(path8.join(contractsRoot, "db")));
+  const contractIndex = await buildContractIndex(root, config);
+  issues.push(...validateDuplicateContractIds(contractIndex));
   return issues;
 }
 async function validateUiContracts(uiRoot) {
@@ -992,14 +1171,14 @@ async function validateUiContracts(uiRoot) {
   }
   const issues = [];
   for (const file of files) {
-    const text = await readFile4(file, "utf-8");
+    const text = await readFile5(file, "utf-8");
     const invalidIds = extractInvalidIds(text, [
       "SPEC",
       "BR",
       "SC",
       "UI",
       "API",
-      "DATA",
+      "DB",
       "ADR"
     ]);
     if (invalidIds.length > 0) {
@@ -1014,9 +1193,10 @@ async function validateUiContracts(uiRoot) {
         )
       );
     }
-    let doc;
+    const declaredIds = extractDeclaredContractIds(text);
+    issues.push(...validateDeclaredContractIds(declaredIds, file, "UI"));
     try {
-      doc = parseStructuredContract(file, text);
+      parseStructuredContract(file, stripContractDeclarationLines(text));
     } catch (error) {
       issues.push(
         issue(
@@ -1027,19 +1207,6 @@ async function validateUiContracts(uiRoot) {
           "contracts.ui.parse"
         )
       );
-      continue;
-    }
-    const uiIds = extractUiContractIds(doc);
-    if (uiIds.length === 0) {
-      issues.push(
-        issue(
-          "QFAI-CONTRACT-002",
-          `UI \u5951\u7D04\u306B ID(UI-xxxx) \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${file}`,
-          "error",
-          file,
-          "contracts.ui.id"
-        )
-      );
     }
   }
   return issues;
@@ -1059,14 +1226,14 @@ async function validateApiContracts(apiRoot) {
   }
   const issues = [];
   for (const file of files) {
-    const text = await readFile4(file, "utf-8");
+    const text = await readFile5(file, "utf-8");
     const invalidIds = extractInvalidIds(text, [
       "SPEC",
       "BR",
       "SC",
       "UI",
       "API",
-      "DATA",
+      "DB",
       "ADR"
     ]);
     if (invalidIds.length > 0) {
@@ -1081,9 +1248,11 @@ async function validateApiContracts(apiRoot) {
         )
       );
     }
+    const declaredIds = extractDeclaredContractIds(text);
+    issues.push(...validateDeclaredContractIds(declaredIds, file, "API"));
     let doc;
     try {
-      doc = parseStructuredContract(file, text);
+      doc = parseStructuredContract(file, stripContractDeclarationLines(text));
     } catch (error) {
       issues.push(
         issue(
@@ -1107,44 +1276,32 @@ async function validateApiContracts(apiRoot) {
         )
       );
     }
-    const apiIds = extractApiContractIds(doc);
-    if (apiIds.length === 0) {
-      issues.push(
-        issue(
-          "QFAI-CONTRACT-002",
-          `API \u5951\u7D04\u306B ID(API-xxxx) \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${file}`,
-          "error",
-          file,
-          "contracts.api.id"
-        )
-      );
-    }
   }
   return issues;
 }
-async function validateDataContracts(dataRoot) {
-  const files = await collectDataContractFiles(dataRoot);
+async function validateDbContracts(dbRoot) {
+  const files = await collectDbContractFiles(dbRoot);
   if (files.length === 0) {
     return [
       issue(
-        "QFAI-DATA-000",
-        "DATA \u5951\u7D04\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002",
+        "QFAI-DB-000",
+        "DB \u5951\u7D04\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002",
         "info",
-        dataRoot,
-        "contracts.data.files"
+        dbRoot,
+        "contracts.db.files"
       )
     ];
   }
   const issues = [];
   for (const file of files) {
-    const text = await readFile4(file, "utf-8");
+    const text = await readFile5(file, "utf-8");
     const invalidIds = extractInvalidIds(text, [
       "SPEC",
       "BR",
       "SC",
       "UI",
       "API",
-      "DATA",
+      "DB",
       "ADR"
     ]);
     if (invalidIds.length > 0) {
@@ -1159,6 +1316,8 @@ async function validateDataContracts(dataRoot) {
         )
       );
     }
+    const declaredIds = extractDeclaredContractIds(text);
+    issues.push(...validateDeclaredContractIds(declaredIds, file, "DB"));
     issues.push(...lintSql(text, file));
   }
   return issues;
@@ -1169,17 +1328,83 @@ function lintSql(text, file) {
     if (pattern.test(text)) {
       issues.push(
         issue(
-          "QFAI-DATA-001",
+          "QFAI-DB-001",
           `\u5371\u967A\u306A SQL \u64CD\u4F5C\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059: ${label}`,
           "warning",
           file,
-          "contracts.data.sql"
+          "contracts.db.sql"
         )
       );
     }
   }
   return issues;
 }
+function validateDeclaredContractIds(ids, file, kind) {
+  const issues = [];
+  if (ids.length === 0) {
+    issues.push(
+      issue(
+        "QFAI-CONTRACT-010",
+        `\u5951\u7D04\u30D5\u30A1\u30A4\u30EB\u306B QFAI-CONTRACT-ID \u304C\u3042\u308A\u307E\u305B\u3093: ${file}`,
+        "error",
+        file,
+        "contracts.declaration"
+      )
+    );
+    return issues;
+  }
+  if (ids.length > 1) {
+    issues.push(
+      issue(
+        "QFAI-CONTRACT-011",
+        `\u5951\u7D04\u30D5\u30A1\u30A4\u30EB\u306B\u8907\u6570\u306E QFAI-CONTRACT-ID \u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059: ${ids.join(
+          ", "
+        )}`,
+        "error",
+        file,
+        "contracts.declaration",
+        ids
+      )
+    );
+    return issues;
+  }
+  const [id] = ids;
+  if (id && !id.startsWith(`${kind}-`)) {
+    issues.push(
+      issue(
+        "QFAI-CONTRACT-013",
+        `\u5951\u7D04\u30D5\u30A1\u30A4\u30EB\u306E QFAI-CONTRACT-ID \u304C ${kind}- \u3067\u306F\u3042\u308A\u307E\u305B\u3093: ${id}`,
+        "error",
+        file,
+        "contracts.declarationPrefix",
+        [id]
+      )
+    );
+  }
+  return issues;
+}
+function validateDuplicateContractIds(contractIndex) {
+  const issues = [];
+  for (const [id, files] of contractIndex.idToFiles.entries()) {
+    if (files.size <= 1) {
+      continue;
+    }
+    const sortedFiles = Array.from(files).sort((a, b) => a.localeCompare(b));
+    issues.push(
+      issue(
+        "QFAI-CONTRACT-012",
+        `\u5951\u7D04 ID \u304C\u8907\u6570\u30D5\u30A1\u30A4\u30EB\u3067\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059: ${id} (${sortedFiles.join(
+          ", "
+        )})`,
+        "error",
+        sortedFiles[0],
+        "contracts.idDuplicate",
+        [id]
+      )
+    );
+  }
+  return issues;
+}
 function hasOpenApi(doc) {
   return typeof doc.openapi === "string" && doc.openapi.length > 0;
 }
@@ -1208,8 +1433,8 @@ function issue(code, message, severity, file, rule, refs) {
 }
 
 // src/core/validators/delta.ts
-import { readFile as readFile5 } from "fs/promises";
-import path8 from "path";
+import { readFile as readFile6 } from "fs/promises";
+import path9 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;
@@ -1223,10 +1448,10 @@ async function validateDeltas(root, config) {
   }
   const issues = [];
   for (const pack of packs) {
-    const deltaPath = path8.join(pack, "delta.md");
+    const deltaPath = path9.join(pack, "delta.md");
     let text;
     try {
-      text = await readFile5(deltaPath, "utf-8");
+      text = await readFile6(deltaPath, "utf-8");
     } catch (error) {
       if (isMissingFileError2(error)) {
         issues.push(
@@ -1300,187 +1525,6 @@ function issue2(code, message, severity, file, rule, refs) {
 // src/core/validators/ids.ts
 import { readFile as readFile7 } from "fs/promises";
 import path10 from "path";
-
-// src/core/contractIndex.ts
-import { readFile as readFile6 } from "fs/promises";
-import path9 from "path";
-async function buildContractIndex(root, config) {
-  const contractsRoot = resolvePath(root, config, "contractsDir");
-  const uiRoot = path9.join(contractsRoot, "ui");
-  const apiRoot = path9.join(contractsRoot, "api");
-  const dataRoot = path9.join(contractsRoot, "db");
-  const [uiFiles, apiFiles, dataFiles] = await Promise.all([
-    collectUiContractFiles(uiRoot),
-    collectApiContractFiles(apiRoot),
-    collectDataContractFiles(dataRoot)
-  ]);
-  const index = {
-    ids: /* @__PURE__ */ new Set(),
-    idToFiles: /* @__PURE__ */ new Map(),
-    files: { ui: uiFiles, api: apiFiles, data: dataFiles },
-    structuredParseFailedFiles: /* @__PURE__ */ new Set()
-  };
-  await indexUiContracts(uiFiles, index);
-  await indexApiContracts(apiFiles, index);
-  await indexDataContracts(dataFiles, index);
-  return index;
-}
-async function indexUiContracts(files, index) {
-  for (const file of files) {
-    const text = await readFile6(file, "utf-8");
-    try {
-      const doc = parseStructuredContract(file, text);
-      extractUiContractIds(doc).forEach((id) => record(index, id, file));
-    } catch {
-      index.structuredParseFailedFiles.add(file);
-      extractIds(text, "UI").forEach((id) => record(index, id, file));
-    }
-  }
-}
-async function indexApiContracts(files, index) {
-  for (const file of files) {
-    const text = await readFile6(file, "utf-8");
-    try {
-      const doc = parseStructuredContract(file, text);
-      extractApiContractIds(doc).forEach((id) => record(index, id, file));
-    } catch {
-      index.structuredParseFailedFiles.add(file);
-      extractIds(text, "API").forEach((id) => record(index, id, file));
-    }
-  }
-}
-async function indexDataContracts(files, index) {
-  for (const file of files) {
-    const text = await readFile6(file, "utf-8");
-    extractIds(text, "DATA").forEach((id) => record(index, id, file));
-  }
-}
-function record(index, id, file) {
-  index.ids.add(id);
-  const current = index.idToFiles.get(id) ?? /* @__PURE__ */ new Set();
-  current.add(file);
-  index.idToFiles.set(id, current);
-}
-
-// 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_RE3 = /^SC-\d{4}$/;
 async function validateDefinedIds(root, config) {
   const issues = [];
@@ -1623,7 +1667,7 @@ function validateScenarioContent(text, file) {
     "SC",
     "UI",
     "API",
-    "DATA",
+    "DB",
     "ADR"
   ]);
   if (invalidIds.length > 0) {
@@ -1821,7 +1865,7 @@ function validateSpecContent(text, file, requiredSections) {
     "SC",
     "UI",
     "API",
-    "DATA",
+    "DB",
     "ADR"
   ]);
   if (invalidIds.length > 0) {
@@ -1950,8 +1994,7 @@ async function validateTraceability(root, config) {
   const brIdsInSpecs = /* @__PURE__ */ new Set();
   const brIdsInScenarios = /* @__PURE__ */ new Set();
   const scIdsInScenarios = /* @__PURE__ */ new Set();
-  const scenarioContractIds = /* @__PURE__ */ new Set();
-  const scWithContracts = /* @__PURE__ */ new Set();
+  const specContractIds = /* @__PURE__ */ new Set();
   const specToBrIds = /* @__PURE__ */ new Map();
   const contractIndex = await buildContractIndex(root, config);
   const contractIds = contractIndex.ids;
@@ -1969,6 +2012,64 @@ async function validateTraceability(root, config) {
       brIds.forEach((id) => current.add(id));
       specToBrIds.set(parsed.specId, current);
     }
+    const contractRefs = parsed.contractRefs;
+    if (contractRefs.lines.length === 0) {
+      issues.push(
+        issue6(
+          "QFAI-TRACE-020",
+          "Spec \u306B QFAI-CONTRACT-REF \u304C\u3042\u308A\u307E\u305B\u3093\u3002",
+          "error",
+          file,
+          "traceability.specContractRefRequired"
+        )
+      );
+    } else {
+      if (contractRefs.hasNone && contractRefs.ids.length > 0) {
+        issues.push(
+          issue6(
+            "QFAI-TRACE-021",
+            "Spec \u306E QFAI-CONTRACT-REF \u306B none \u3068\u5951\u7D04 ID \u304C\u6DF7\u5728\u3057\u3066\u3044\u307E\u3059\u3002",
+            "error",
+            file,
+            "traceability.specContractRefFormat"
+          )
+        );
+      }
+      if (contractRefs.invalidTokens.length > 0) {
+        issues.push(
+          issue6(
+            "QFAI-TRACE-021",
+            `Spec \u306E\u5951\u7D04 ID \u304C\u4E0D\u6B63\u3067\u3059: ${contractRefs.invalidTokens.join(
+              ", "
+            )}`,
+            "error",
+            file,
+            "traceability.specContractRefFormat",
+            contractRefs.invalidTokens
+          )
+        );
+      }
+    }
+    contractRefs.ids.forEach((id) => {
+      specContractIds.add(id);
+    });
+    const unknownContractIds = contractRefs.ids.filter(
+      (id) => !contractIds.has(id)
+    );
+    if (unknownContractIds.length > 0) {
+      issues.push(
+        issue6(
+          "QFAI-TRACE-021",
+          `Spec \u304C\u672A\u77E5\u306E\u5951\u7D04 ID \u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059: ${unknownContractIds.join(
+            ", "
+          )}`,
+          "error",
+          file,
+          "traceability.specContractExists",
+          unknownContractIds
+        )
+      );
+    }
   }
   for (const file of scenarioFiles) {
     const text = await readFile10(file, "utf-8");
@@ -2014,10 +2115,6 @@ async function validateTraceability(root, config) {
         scIdsInScenarios.add(id);
         scIdsInFile.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(
@@ -2136,25 +2233,6 @@ async function validateTraceability(root, config) {
       );
     }
   }
-  if (config.validation.traceability.scMustTouchContracts && scIdsInScenarios.size > 0) {
-    const scWithoutContracts = Array.from(scIdsInScenarios).filter(
-      (id) => !scWithContracts.has(id)
-    );
-    if (scWithoutContracts.length > 0) {
-      issues.push(
-        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",
-          specsRoot,
-          "traceability.scMustTouchContracts",
-          scWithoutContracts
-        )
-      );
-    }
-  }
   const scRefsResult = await collectScTestReferences(
     root,
     config.validation.traceability.testFileGlobs,
@@ -2218,16 +2296,16 @@ async function validateTraceability(root, config) {
   if (!config.validation.traceability.allowOrphanContracts) {
     if (contractIds.size > 0) {
       const orphanContracts = Array.from(contractIds).filter(
-        (id) => !scenarioContractIds.has(id)
+        (id) => !specContractIds.has(id)
       );
       if (orphanContracts.length > 0) {
         issues.push(
           issue6(
-            "QFAI_CONTRACT_ORPHAN",
-            `\u5951\u7D04\u304C SC \u304B\u3089\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u305B\u3093: ${orphanContracts.join(", ")}`,
+            "QFAI-TRACE-022",
+            `\u5951\u7D04\u304C Spec \u304B\u3089\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u305B\u3093: ${orphanContracts.join(", ")}`,
             "error",
             specsRoot,
-            "traceability.allowOrphanContracts",
+            "traceability.contractCoverage",
             orphanContracts
           )
         );
@@ -2348,7 +2426,7 @@ function countIssues(issues) {
 }
 
 // src/core/report.ts
-var ID_PREFIXES2 = ["SPEC", "BR", "SC", "UI", "API", "DATA"];
+var ID_PREFIXES2 = ["SPEC", "BR", "SC", "UI", "API", "DB"];
 async function createReportData(root, validation, configResult) {
   const resolved = configResult ?? await loadConfig(root);
   const config = resolved.config;
@@ -2367,6 +2445,23 @@ async function createReportData(root, validation, configResult) {
     ui: uiFiles,
     db: dbFiles
   } = await collectContractFiles(uiRoot, apiRoot, dbRoot);
+  const contractIndex = await buildContractIndex(root, config);
+  const specContractRefs = await collectSpecContractRefs(specFiles);
+  const contractIdList = Array.from(contractIndex.ids);
+  const referencedContracts = /* @__PURE__ */ new Set();
+  for (const ids of specContractRefs.specToContractIds.values()) {
+    ids.forEach((id) => referencedContracts.add(id));
+  }
+  const referencedContractCount = contractIdList.filter(
+    (id) => referencedContracts.has(id)
+  ).length;
+  const orphanContractCount = contractIdList.filter(
+    (id) => !referencedContracts.has(id)
+  ).length;
+  const contractIdToSpecsRecord = mapToSortedRecord(specContractRefs.idToSpecs);
+  const specToContractIdsRecord = mapToSortedRecord(
+    specContractRefs.specToContractIds
+  );
   const idsByPrefix = await collectIds([
     ...specFiles,
     ...scenarioFiles,
@@ -2417,14 +2512,24 @@ async function createReportData(root, validation, configResult) {
       sc: idsByPrefix.SC,
       ui: idsByPrefix.UI,
       api: idsByPrefix.API,
-      data: idsByPrefix.DATA
+      db: idsByPrefix.DB
     },
     traceability: {
       upstreamIdsFound: upstreamIds.size,
       referencedInCodeOrTests: traceability,
       sc: scCoverage,
       scSources: scSourceRecord,
-      testFiles
+      testFiles,
+      contracts: {
+        total: contractIdList.length,
+        referenced: referencedContractCount,
+        orphan: orphanContractCount,
+        idToSpecs: contractIdToSpecsRecord
+      },
+      specs: {
+        contractRefMissing: specContractRefs.missingRefSpecs.size,
+        specToContractIds: specToContractIdsRecord
+      }
     },
     issues: resolvedValidation.issues
   };
@@ -2453,7 +2558,7 @@ function formatReportMarkdown(data) {
   lines.push(formatIdLine("SC", data.ids.sc));
   lines.push(formatIdLine("UI", data.ids.ui));
   lines.push(formatIdLine("API", data.ids.api));
-  lines.push(formatIdLine("DATA", data.ids.data));
+  lines.push(formatIdLine("DB", data.ids.db));
   lines.push("");
   lines.push("## \u30C8\u30EC\u30FC\u30B5\u30D3\u30EA\u30C6\u30A3");
   lines.push(`- \u4E0A\u6D41ID\u691C\u51FA\u6570: ${data.traceability.upstreamIdsFound}`);
@@ -2461,6 +2566,50 @@ function formatReportMarkdown(data) {
     `- \u30B3\u30FC\u30C9/\u30C6\u30B9\u30C8\u53C2\u7167: ${data.traceability.referencedInCodeOrTests ? "\u3042\u308A" : "\u306A\u3057"}`
   );
   lines.push("");
+  lines.push("## \u5951\u7D04\u30AB\u30D0\u30EC\u30C3\u30B8");
+  lines.push(`- total: ${data.traceability.contracts.total}`);
+  lines.push(`- referenced: ${data.traceability.contracts.referenced}`);
+  lines.push(`- orphan: ${data.traceability.contracts.orphan}`);
+  lines.push(
+    `- specContractRefMissing: ${data.traceability.specs.contractRefMissing}`
+  );
+  lines.push("");
+  lines.push("## \u5951\u7D04\u2192Spec");
+  const contractToSpecs = data.traceability.contracts.idToSpecs;
+  const contractIds = Object.keys(contractToSpecs).sort(
+    (a, b) => a.localeCompare(b)
+  );
+  if (contractIds.length === 0) {
+    lines.push("- (none)");
+  } else {
+    for (const contractId of contractIds) {
+      const specs = contractToSpecs[contractId] ?? [];
+      if (specs.length === 0) {
+        lines.push(`- ${contractId}: (none)`);
+      } else {
+        lines.push(`- ${contractId}: ${specs.join(", ")}`);
+      }
+    }
+  }
+  lines.push("");
+  lines.push("## Spec\u2192\u5951\u7D04");
+  const specToContracts = data.traceability.specs.specToContractIds;
+  const specIds = Object.keys(specToContracts).sort(
+    (a, b) => a.localeCompare(b)
+  );
+  if (specIds.length === 0) {
+    lines.push("- (none)");
+  } else {
+    for (const specId of specIds) {
+      const contractIds2 = specToContracts[specId] ?? [];
+      if (contractIds2.length === 0) {
+        lines.push(`- ${specId}: (none)`);
+      } else {
+        lines.push(`- ${specId}: ${contractIds2.join(", ")}`);
+      }
+    }
+  }
+  lines.push("");
   lines.push("## SC\u30AB\u30D0\u30EC\u30C3\u30B8");
   lines.push(`- total: ${data.traceability.sc.total}`);
   lines.push(`- covered: ${data.traceability.sc.covered}`);
@@ -2534,7 +2683,7 @@ function formatReportMarkdown(data) {
   lines.push("");
   lines.push("## \u30C8\u30EC\u30FC\u30B5\u30D3\u30EA\u30C6\u30A3\uFF08\u691C\u8A3C\uFF09");
   const traceIssues = data.issues.filter(
-    (item) => item.rule?.startsWith("traceability.") || item.code.startsWith("QFAI_TRACE") || item.code.startsWith("QFAI-TRACE-") || item.code === "QFAI_CONTRACT_ORPHAN"
+    (item) => item.rule?.startsWith("traceability.") || item.code.startsWith("QFAI_TRACE") || item.code.startsWith("QFAI-TRACE-")
   );
   if (traceIssues.length === 0) {
     lines.push("- (none)");
@@ -2564,6 +2713,33 @@ function formatReportMarkdown(data) {
 function formatReportJson(data) {
   return JSON.stringify(data, null, 2);
 }
+async function collectSpecContractRefs(specFiles) {
+  const specToContractIds = /* @__PURE__ */ new Map();
+  const idToSpecs = /* @__PURE__ */ new Map();
+  const missingRefSpecs = /* @__PURE__ */ new Set();
+  for (const file of specFiles) {
+    const text = await readFile11(file, "utf-8");
+    const parsed = parseSpec(text, file);
+    const specKey = parsed.specId ?? file;
+    const refs = parsed.contractRefs;
+    if (refs.lines.length === 0) {
+      missingRefSpecs.add(specKey);
+    }
+    const currentContracts = specToContractIds.get(specKey) ?? /* @__PURE__ */ new Set();
+    for (const id of refs.ids) {
+      currentContracts.add(id);
+      const specs = idToSpecs.get(id) ?? /* @__PURE__ */ new Set();
+      specs.add(specKey);
+      idToSpecs.set(id, specs);
+    }
+    specToContractIds.set(specKey, currentContracts);
+  }
+  return {
+    specToContractIds,
+    idToSpecs,
+    missingRefSpecs
+  };
+}
 async function collectIds(files) {
   const result = {
     SPEC: /* @__PURE__ */ new Set(),
@@ -2571,7 +2747,7 @@ async function collectIds(files) {
     SC: /* @__PURE__ */ new Set(),
     UI: /* @__PURE__ */ new Set(),
     API: /* @__PURE__ */ new Set(),
-    DATA: /* @__PURE__ */ new Set()
+    DB: /* @__PURE__ */ new Set()
   };
   for (const file of files) {
     const text = await readFile11(file, "utf-8");
@@ -2586,7 +2762,7 @@ async function collectIds(files) {
     SC: toSortedArray2(result.SC),
     UI: toSortedArray2(result.UI),
     API: toSortedArray2(result.API),
-    DATA: toSortedArray2(result.DATA)
+    DB: toSortedArray2(result.DB)
   };
 }
 async function collectUpstreamIds(files) {