qfai 1.0.2 → 1.0.3

package/dist/cli/index.mjs

@@ -208,11 +208,11 @@ function emitPromptNotFound(promptName, candidates) {
 
 // src/cli/commands/doctor.ts
 import { mkdir, writeFile } from "fs/promises";
-import path11 from "path";
+import path12 from "path";
 
 // src/core/doctor.ts
 import { access as access4 } from "fs/promises";
-import path10 from "path";
+import path11 from "path";
 
 // src/core/config.ts
 import { access as access2, readFile as readFile2 } from "fs/promises";
@@ -616,6 +616,7 @@ function isRecord(value) {
 
 // src/core/discovery.ts
 import { access as access3 } from "fs/promises";
+import path5 from "path";
 
 // src/core/specLayout.ts
 import { readdir as readdir2 } from "fs/promises";
@@ -663,7 +664,12 @@ async function collectScenarioFiles(specsRoot) {
   return filterExisting(entries.map((entry) => entry.scenarioPath));
 }
 async function collectUiContractFiles(uiRoot) {
-  return collectFiles(uiRoot, { extensions: [".yaml", ".yml"] });
+  const files = await collectFiles(uiRoot, { extensions: [".yaml", ".yml"] });
+  return filterByBasenamePrefix(files, "ui-");
+}
+async function collectThemaContractFiles(uiRoot) {
+  const files = await collectFiles(uiRoot, { extensions: [".yaml", ".yml"] });
+  return filterByBasenamePrefix(files, "thema-");
 }
 async function collectApiContractFiles(apiRoot) {
   return collectFiles(apiRoot, { extensions: [".yaml", ".yml", ".json"] });
@@ -672,12 +678,13 @@ async function collectDbContractFiles(dbRoot) {
   return collectFiles(dbRoot, { extensions: [".sql"] });
 }
 async function collectContractFiles(uiRoot, apiRoot, dbRoot) {
-  const [ui, api, db] = await Promise.all([
+  const [ui, thema, api, db] = await Promise.all([
     collectUiContractFiles(uiRoot),
+    collectThemaContractFiles(uiRoot),
     collectApiContractFiles(apiRoot),
     collectDbContractFiles(dbRoot)
   ]);
-  return { ui, api, db };
+  return { ui, thema, api, db };
 }
 async function filterExisting(files) {
   const existing = [];
@@ -696,17 +703,23 @@ async function exists3(target) {
     return false;
   }
 }
+function filterByBasenamePrefix(files, prefix) {
+  const lowerPrefix = prefix.toLowerCase();
+  return files.filter(
+    (file) => path5.basename(file).toLowerCase().startsWith(lowerPrefix)
+  );
+}
 
 // src/core/paths.ts
-import path5 from "path";
+import path6 from "path";
 function toRelativePath(root, target) {
   if (!target) {
     return target;
   }
-  if (!path5.isAbsolute(target)) {
+  if (!path6.isAbsolute(target)) {
     return toPosixPath(target);
   }
-  const relative = path5.relative(root, target);
+  const relative = path6.relative(root, target);
   if (!relative) {
     return ".";
   }
@@ -718,7 +731,7 @@ function toPosixPath(value) {
 
 // src/core/traceability.ts
 import { readFile as readFile3 } from "fs/promises";
-import path6 from "path";
+import path7 from "path";
 
 // src/core/gherkin/parse.ts
 import {
@@ -950,7 +963,7 @@ async function collectScTestReferences(root, globs, excludeGlobs) {
     };
   }
   const normalizedFiles = Array.from(
-    new Set(scanResult.files.map((file) => path6.normalize(file)))
+    new Set(scanResult.files.map((file) => path7.normalize(file)))
   );
   for (const file of normalizedFiles) {
     const text = await readFile3(file, "utf-8");
@@ -1013,19 +1026,19 @@ function formatError3(error2) {
 
 // src/core/promptsIntegrity.ts
 import { readFile as readFile4 } from "fs/promises";
-import path8 from "path";
+import path9 from "path";
 
 // src/shared/assets.ts
 import { existsSync } from "fs";
-import path7 from "path";
+import path8 from "path";
 import { fileURLToPath } from "url";
 function getInitAssetsDir() {
   const base = import.meta.url;
   const basePath = base.startsWith("file:") ? fileURLToPath(base) : base;
-  const baseDir = path7.dirname(basePath);
+  const baseDir = path8.dirname(basePath);
   const candidates = [
-    path7.resolve(baseDir, "../../../assets/init"),
-    path7.resolve(baseDir, "../../assets/init")
+    path8.resolve(baseDir, "../../../assets/init"),
+    path8.resolve(baseDir, "../../assets/init")
   ];
   for (const candidate of candidates) {
     if (existsSync(candidate)) {
@@ -1043,10 +1056,10 @@ function getInitAssetsDir() {
 
 // src/core/promptsIntegrity.ts
 async function diffProjectPromptsAgainstInitAssets(root) {
-  const promptsDir = path8.resolve(root, ".qfai", "prompts");
+  const promptsDir = path9.resolve(root, ".qfai", "prompts");
   let templateDir;
   try {
-    templateDir = path8.join(getInitAssetsDir(), ".qfai", "prompts");
+    templateDir = path9.join(getInitAssetsDir(), ".qfai", "prompts");
   } catch {
     return {
       status: "skipped_missing_assets",
@@ -1123,7 +1136,7 @@ function normalizeNewlines(text) {
   return text.replace(/\r\n/g, "\n");
 }
 function toRel(base, abs) {
-  const rel = path8.relative(base, abs);
+  const rel = path9.relative(base, abs);
   return rel.replace(/[\\/]+/g, "/");
 }
 function intersectKeys(a, b) {
@@ -1138,11 +1151,11 @@ function intersectKeys(a, b) {
 
 // src/core/version.ts
 import { readFile as readFile5 } from "fs/promises";
-import path9 from "path";
+import path10 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 async function resolveToolVersion() {
-  if ("1.0.2".length > 0) {
-    return "1.0.2";
+  if ("1.0.3".length > 0) {
+    return "1.0.3";
   }
   try {
     const packagePath = resolvePackageJsonPath();
@@ -1157,7 +1170,7 @@ async function resolveToolVersion() {
 function resolvePackageJsonPath() {
   const base = import.meta.url;
   const basePath = base.startsWith("file:") ? fileURLToPath2(base) : base;
-  return path9.resolve(path9.dirname(basePath), "../../package.json");
+  return path10.resolve(path10.dirname(basePath), "../../package.json");
 }
 
 // src/core/doctor.ts
@@ -1183,7 +1196,7 @@ function normalizeGlobs2(values) {
   return values.map((glob) => glob.trim()).filter((glob) => glob.length > 0);
 }
 async function createDoctorData(options) {
-  const startDir = path10.resolve(options.startDir);
+  const startDir = path11.resolve(options.startDir);
   const checks = [];
   const configPath = getConfigPath(startDir);
   const search = options.rootExplicit ? {
@@ -1246,9 +1259,9 @@ async function createDoctorData(options) {
       details: { path: toRelativePath(root, resolved) }
     });
     if (key === "promptsDir") {
-      const promptsLocalDir = path10.join(
-        path10.dirname(resolved),
-        `${path10.basename(resolved)}.local`
+      const promptsLocalDir = path11.join(
+        path11.dirname(resolved),
+        `${path11.basename(resolved)}.local`
       );
       const found = await exists4(promptsLocalDir);
       addCheck(checks, {
@@ -1321,7 +1334,7 @@ async function createDoctorData(options) {
     message: missingFiles === 0 ? `All spec packs have required files (count=${entries.length})` : `Missing required files in spec packs (missingFiles=${missingFiles})`,
     details: { specPacks: entries.length, missingFiles }
   });
-  const validateJsonAbs = path10.isAbsolute(config.output.validateJsonPath) ? config.output.validateJsonPath : path10.resolve(root, config.output.validateJsonPath);
+  const validateJsonAbs = path11.isAbsolute(config.output.validateJsonPath) ? config.output.validateJsonPath : path11.resolve(root, config.output.validateJsonPath);
   const validateJsonExists = await exists4(validateJsonAbs);
   addCheck(checks, {
     id: "output.validateJson",
@@ -1331,8 +1344,8 @@ async function createDoctorData(options) {
     details: { path: toRelativePath(root, validateJsonAbs) }
   });
   const outDirAbs = resolvePath(root, config, "outDir");
-  const rel = path10.relative(outDirAbs, validateJsonAbs);
-  const inside = rel !== "" && !rel.startsWith("..") && !path10.isAbsolute(rel);
+  const rel = path11.relative(outDirAbs, validateJsonAbs);
+  const inside = rel !== "" && !rel.startsWith("..") && !path11.isAbsolute(rel);
   addCheck(checks, {
     id: "output.pathAlignment",
     severity: inside ? "ok" : "warning",
@@ -1455,12 +1468,12 @@ async function detectOutDirCollisions(root) {
   });
   const configPaths = configScan.files;
   const configRoots = Array.from(
-    new Set(configPaths.map((configPath) => path10.dirname(configPath)))
+    new Set(configPaths.map((configPath) => path11.dirname(configPath)))
   ).sort((a, b) => a.localeCompare(b));
   const outDirToRoots = /* @__PURE__ */ new Map();
   for (const configRoot of configRoots) {
     const { config } = await loadConfig(configRoot);
-    const outDir = path10.normalize(resolvePath(configRoot, config, "outDir"));
+    const outDir = path11.normalize(resolvePath(configRoot, config, "outDir"));
     const roots = outDirToRoots.get(outDir) ?? /* @__PURE__ */ new Set();
     roots.add(configRoot);
     outDirToRoots.set(outDir, roots);
@@ -1486,20 +1499,20 @@ async function detectOutDirCollisions(root) {
   };
 }
 async function findMonorepoRoot(startDir) {
-  let current = path10.resolve(startDir);
+  let current = path11.resolve(startDir);
   while (true) {
-    const gitPath = path10.join(current, ".git");
-    const workspacePath = path10.join(current, "pnpm-workspace.yaml");
+    const gitPath = path11.join(current, ".git");
+    const workspacePath = path11.join(current, "pnpm-workspace.yaml");
     if (await exists4(gitPath) || await exists4(workspacePath)) {
       return current;
     }
-    const parent = path10.dirname(current);
+    const parent = path11.dirname(current);
     if (parent === current) {
       break;
     }
     current = parent;
   }
-  return path10.resolve(startDir);
+  return path11.resolve(startDir);
 }
 
 // src/cli/lib/logger.ts
@@ -1541,8 +1554,8 @@ async function runDoctor(options) {
   const output = options.format === "json" ? formatDoctorJson(data) : formatDoctorText(data);
   const exitCode = shouldFailDoctor(data.summary, options.failOn) ? 1 : 0;
   if (options.outPath) {
-    const outAbs = path11.isAbsolute(options.outPath) ? options.outPath : path11.resolve(process.cwd(), options.outPath);
-    await mkdir(path11.dirname(outAbs), { recursive: true });
+    const outAbs = path12.isAbsolute(options.outPath) ? options.outPath : path12.resolve(process.cwd(), options.outPath);
+    await mkdir(path12.dirname(outAbs), { recursive: true });
     await writeFile(outAbs, `${output}
 `, "utf-8");
     info(`doctor: wrote ${outAbs}`);
@@ -1562,11 +1575,11 @@ function shouldFailDoctor(summary, failOn) {
 }
 
 // src/cli/commands/init.ts
-import path13 from "path";
+import path14 from "path";
 
 // src/cli/lib/fs.ts
 import { access as access5, copyFile, mkdir as mkdir2, readdir as readdir3 } from "fs/promises";
-import path12 from "path";
+import path13 from "path";
 async function copyTemplateTree(sourceRoot, destRoot, options) {
   const files = await collectTemplateFiles(sourceRoot);
   return copyFiles(files, sourceRoot, destRoot, options);
@@ -1574,7 +1587,7 @@ async function copyTemplateTree(sourceRoot, destRoot, options) {
 async function copyTemplatePaths(sourceRoot, destRoot, relativePaths, options) {
   const allFiles = [];
   for (const relPath of relativePaths) {
-    const fullPath = path12.join(sourceRoot, relPath);
+    const fullPath = path13.join(sourceRoot, relPath);
     const files = await collectTemplateFiles(fullPath);
     allFiles.push(...files);
   }
@@ -1584,13 +1597,13 @@ async function copyFiles(files, sourceRoot, destRoot, options) {
   const copied = [];
   const skipped = [];
   const conflicts = [];
-  const protectPrefixes = (options.protect ?? []).map((p) => p.replace(/^[\\/]+/, "").replace(/[\\/]+$/, "")).filter((p) => p.length > 0).map((p) => p + path12.sep);
-  const excludePrefixes = (options.exclude ?? []).map((p) => p.replace(/^[\\/]+/, "").replace(/[\\/]+$/, "")).filter((p) => p.length > 0).map((p) => p + path12.sep);
+  const protectPrefixes = (options.protect ?? []).map((p) => p.replace(/^[\\/]+/, "").replace(/[\\/]+$/, "")).filter((p) => p.length > 0).map((p) => p + path13.sep);
+  const excludePrefixes = (options.exclude ?? []).map((p) => p.replace(/^[\\/]+/, "").replace(/[\\/]+$/, "")).filter((p) => p.length > 0).map((p) => p + path13.sep);
   const isProtectedRelative = (relative) => {
     if (protectPrefixes.length === 0) {
       return false;
     }
-    const normalized = relative.replace(/[\\/]+/g, path12.sep);
+    const normalized = relative.replace(/[\\/]+/g, path13.sep);
     return protectPrefixes.some(
       (prefix) => normalized === prefix.slice(0, -1) || normalized.startsWith(prefix)
     );
@@ -1599,7 +1612,7 @@ async function copyFiles(files, sourceRoot, destRoot, options) {
     if (excludePrefixes.length === 0) {
       return false;
     }
-    const normalized = relative.replace(/[\\/]+/g, path12.sep);
+    const normalized = relative.replace(/[\\/]+/g, path13.sep);
     return excludePrefixes.some(
       (prefix) => normalized === prefix.slice(0, -1) || normalized.startsWith(prefix)
     );
@@ -1607,14 +1620,14 @@ async function copyFiles(files, sourceRoot, destRoot, options) {
   const conflictPolicy = options.conflictPolicy ?? "error";
   if (!options.force && conflictPolicy === "error") {
     for (const file of files) {
-      const relative = path12.relative(sourceRoot, file);
+      const relative = path13.relative(sourceRoot, file);
       if (isExcludedRelative(relative)) {
         continue;
       }
       if (isProtectedRelative(relative)) {
         continue;
       }
-      const dest = path12.join(destRoot, relative);
+      const dest = path13.join(destRoot, relative);
       if (!await shouldWrite(dest, options.force)) {
         conflicts.push(dest);
       }
@@ -1624,18 +1637,18 @@ async function copyFiles(files, sourceRoot, destRoot, options) {
     }
   }
   for (const file of files) {
-    const relative = path12.relative(sourceRoot, file);
+    const relative = path13.relative(sourceRoot, file);
     if (isExcludedRelative(relative)) {
       continue;
     }
-    const dest = path12.join(destRoot, relative);
+    const dest = path13.join(destRoot, relative);
     const forceForThisFile = isProtectedRelative(relative) ? false : options.force;
     if (!await shouldWrite(dest, forceForThisFile)) {
       skipped.push(dest);
       continue;
     }
     if (!options.dryRun) {
-      await mkdir2(path12.dirname(dest), { recursive: true });
+      await mkdir2(path13.dirname(dest), { recursive: true });
       await copyFile(file, dest);
     }
     copied.push(dest);
@@ -1659,7 +1672,7 @@ async function collectTemplateFiles(root) {
   }
   const items = await readdir3(root, { withFileTypes: true });
   for (const item of items) {
-    const fullPath = path12.join(root, item.name);
+    const fullPath = path13.join(root, item.name);
     if (item.isDirectory()) {
       const nested = await collectTemplateFiles(fullPath);
       entries.push(...nested);
@@ -1689,10 +1702,10 @@ async function exists5(target) {
 // src/cli/commands/init.ts
 async function runInit(options) {
   const assetsRoot = getInitAssetsDir();
-  const rootAssets = path13.join(assetsRoot, "root");
-  const qfaiAssets = path13.join(assetsRoot, ".qfai");
-  const destRoot = path13.resolve(options.dir);
-  const destQfai = path13.join(destRoot, ".qfai");
+  const rootAssets = path14.join(assetsRoot, "root");
+  const qfaiAssets = path14.join(assetsRoot, ".qfai");
+  const destRoot = path14.resolve(options.dir);
+  const destQfai = path14.join(destRoot, ".qfai");
   if (options.force) {
     info(
       "NOTE: --force \u306F .qfai/prompts/** \u306E\u307F\u4E0A\u66F8\u304D\u3057\u307E\u3059\uFF08prompts.local \u306F\u4FDD\u8B77\u3055\u308C\u3001specs/contracts \u7B49\u306F\u4E0A\u66F8\u304D\u3057\u307E\u305B\u3093\uFF09\u3002"
@@ -1740,7 +1753,7 @@ function report(copied, skipped, dryRun, label) {
 
 // src/cli/commands/report.ts
 import { mkdir as mkdir3, readFile as readFile14, writeFile as writeFile2 } from "fs/promises";
-import path20 from "path";
+import path22 from "path";
 
 // src/core/normalize.ts
 function normalizeIssuePaths(root, issues) {
@@ -1781,15 +1794,15 @@ function normalizeValidationResult(root, result) {
 
 // src/core/report.ts
 import { readFile as readFile13 } from "fs/promises";
-import path19 from "path";
+import path21 from "path";
 
 // src/core/contractIndex.ts
 import { readFile as readFile6 } from "fs/promises";
-import path14 from "path";
+import path15 from "path";
 
 // 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*$/;
+var CONTRACT_DECLARATION_RE = /^\s*(?:#|\/\/|--|\/\*+|\*+)?\s*QFAI-CONTRACT-ID:\s*((?:API|UI|DB)-\d{4}|THEMA-\d{3})\s*(?:\*\/)?\s*$/gm;
+var CONTRACT_DECLARATION_LINE_RE = /^\s*(?:#|\/\/|--|\/\*+|\*+)?\s*QFAI-CONTRACT-ID:\s*(?:(?:API|UI|DB)-\d{4}|THEMA-\d{3})\s*(?:\*\/)?\s*$/;
 function extractDeclaredContractIds(text) {
   const ids = [];
   for (const match of text.matchAll(CONTRACT_DECLARATION_RE)) {
@@ -1807,20 +1820,22 @@ function stripContractDeclarationLines(text) {
 // src/core/contractIndex.ts
 async function buildContractIndex(root, config) {
   const contractsRoot = resolvePath(root, config, "contractsDir");
-  const uiRoot = path14.join(contractsRoot, "ui");
-  const apiRoot = path14.join(contractsRoot, "api");
-  const dbRoot = path14.join(contractsRoot, "db");
-  const [uiFiles, apiFiles, dbFiles] = await Promise.all([
+  const uiRoot = path15.join(contractsRoot, "ui");
+  const apiRoot = path15.join(contractsRoot, "api");
+  const dbRoot = path15.join(contractsRoot, "db");
+  const [uiFiles, themaFiles, apiFiles, dbFiles] = await Promise.all([
     collectUiContractFiles(uiRoot),
+    collectThemaContractFiles(uiRoot),
     collectApiContractFiles(apiRoot),
     collectDbContractFiles(dbRoot)
   ]);
   const index = {
     ids: /* @__PURE__ */ new Set(),
     idToFiles: /* @__PURE__ */ new Map(),
-    files: { ui: uiFiles, api: apiFiles, db: dbFiles }
+    files: { ui: uiFiles, thema: themaFiles, api: apiFiles, db: dbFiles }
   };
   await indexContractFiles(uiFiles, index);
+  await indexContractFiles(themaFiles, index);
   await indexContractFiles(apiFiles, index);
   await indexContractFiles(dbFiles, index);
   return index;
@@ -1839,7 +1854,15 @@ function record(index, id, file) {
 }
 
 // src/core/ids.ts
-var ID_PREFIXES = ["SPEC", "BR", "SC", "UI", "API", "DB"];
+var ID_PREFIXES = [
+  "SPEC",
+  "BR",
+  "SC",
+  "UI",
+  "API",
+  "DB",
+  "THEMA"
+];
 var STRICT_ID_PATTERNS = {
   SPEC: /\bSPEC-\d{4}\b/g,
   BR: /\bBR-\d{4}\b/g,
@@ -1847,6 +1870,7 @@ var STRICT_ID_PATTERNS = {
   UI: /\bUI-\d{4}\b/g,
   API: /\bAPI-\d{4}\b/g,
   DB: /\bDB-\d{4}\b/g,
+  THEMA: /\bTHEMA-\d{3}\b/g,
   ADR: /\bADR-\d{4}\b/g
 };
 var LOOSE_ID_PATTERNS = {
@@ -1856,6 +1880,7 @@ var LOOSE_ID_PATTERNS = {
   UI: /\bUI-[A-Za-z0-9_-]+\b/gi,
   API: /\bAPI-[A-Za-z0-9_-]+\b/gi,
   DB: /\bDB-[A-Za-z0-9_-]+\b/gi,
+  THEMA: /\bTHEMA-[A-Za-z0-9_-]+\b/gi,
   ADR: /\bADR-[A-Za-z0-9_-]+\b/gi
 };
 function extractIds(text, prefix) {
@@ -1892,7 +1917,7 @@ function isValidId(value, prefix) {
 }
 
 // src/core/parse/contractRefs.ts
-var CONTRACT_REF_ID_RE = /^(?:API|UI|DB)-\d{4}$/;
+var CONTRACT_REF_ID_RE = /^(?:(?:API|UI|DB)-\d{4}|THEMA-\d{3})$/;
 function parseContractRefs(text, options = {}) {
   const linePattern = buildLinePattern(options);
   const lines = [];
@@ -2062,14 +2087,14 @@ function parseSpec(md, file) {
 }
 
 // src/core/validators/contracts.ts
-import { readFile as readFile7 } from "fs/promises";
-import path16 from "path";
+import { access as access6, readFile as readFile7 } from "fs/promises";
+import path17 from "path";
 
 // src/core/contracts.ts
-import path15 from "path";
+import path16 from "path";
 import { parse as parseYaml2 } from "yaml";
 function parseStructuredContract(file, text) {
-  const ext = path15.extname(file).toLowerCase();
+  const ext = path16.extname(file).toLowerCase();
   if (ext === ".json") {
     return JSON.parse(text);
   }
@@ -2086,17 +2111,23 @@ var SQL_DANGEROUS_PATTERNS = [
     label: "ALTER TABLE ... DROP"
   }
 ];
+var THEMA_ID_RE = /^THEMA-\d{3}$/;
 async function validateContracts(root, config) {
   const issues = [];
-  const contractsRoot = resolvePath(root, config, "contractsDir");
-  issues.push(...await validateUiContracts(path16.join(contractsRoot, "ui")));
-  issues.push(...await validateApiContracts(path16.join(contractsRoot, "api")));
-  issues.push(...await validateDbContracts(path16.join(contractsRoot, "db")));
   const contractIndex = await buildContractIndex(root, config);
+  const contractsRoot = resolvePath(root, config, "contractsDir");
+  const uiRoot = path17.join(contractsRoot, "ui");
+  const themaIds = new Set(
+    Array.from(contractIndex.ids).filter((id) => id.startsWith("THEMA-"))
+  );
+  issues.push(...await validateUiContracts(uiRoot, themaIds));
+  issues.push(...await validateThemaContracts(uiRoot));
+  issues.push(...await validateApiContracts(path17.join(contractsRoot, "api")));
+  issues.push(...await validateDbContracts(path17.join(contractsRoot, "db")));
   issues.push(...validateDuplicateContractIds(contractIndex));
   return issues;
 }
-async function validateUiContracts(uiRoot) {
+async function validateUiContracts(uiRoot, themaIds) {
   const files = await collectUiContractFiles(uiRoot);
   if (files.length === 0) {
     return [
@@ -2112,6 +2143,22 @@ async function validateUiContracts(uiRoot) {
   const issues = [];
   for (const file of files) {
     const text = await readFile7(file, "utf-8");
+    const declaredIds = extractDeclaredContractIds(text);
+    issues.push(...validateDeclaredContractIds(declaredIds, file, "UI"));
+    let doc = null;
+    try {
+      doc = parseStructuredContract(file, stripContractDeclarationLines(text));
+    } catch (error2) {
+      issues.push(
+        issue(
+          "QFAI-CONTRACT-001",
+          `UI \u5951\u7D04\u30D5\u30A1\u30A4\u30EB\u306E\u89E3\u6790\u306B\u5931\u6557\u3057\u307E\u3057\u305F: ${file} (${formatError4(error2)})`,
+          "error",
+          file,
+          "contracts.ui.parse"
+        )
+      );
+    }
     const invalidIds = extractInvalidIds(text, [
       "SPEC",
       "BR",
@@ -2119,6 +2166,45 @@ async function validateUiContracts(uiRoot) {
       "UI",
       "API",
       "DB",
+      "THEMA",
+      "ADR"
+    ]).filter((id) => !shouldIgnoreInvalidId(id, doc));
+    if (invalidIds.length > 0) {
+      issues.push(
+        issue(
+          "QFAI-ID-002",
+          `ID \u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u304C\u4E0D\u6B63\u3067\u3059: ${invalidIds.join(", ")}`,
+          "error",
+          file,
+          "id.format",
+          invalidIds
+        )
+      );
+    }
+    if (doc) {
+      issues.push(
+        ...await validateUiContractDoc(doc, file, uiRoot, themaIds)
+      );
+    }
+  }
+  return issues;
+}
+async function validateThemaContracts(uiRoot) {
+  const files = await collectThemaContractFiles(uiRoot);
+  if (files.length === 0) {
+    return [];
+  }
+  const issues = [];
+  for (const file of files) {
+    const text = await readFile7(file, "utf-8");
+    const invalidIds = extractInvalidIds(text, [
+      "SPEC",
+      "BR",
+      "SC",
+      "UI",
+      "API",
+      "DB",
+      "THEMA",
       "ADR"
     ]);
     if (invalidIds.length > 0) {
@@ -2134,17 +2220,95 @@ async function validateUiContracts(uiRoot) {
       );
     }
     const declaredIds = extractDeclaredContractIds(text);
-    issues.push(...validateDeclaredContractIds(declaredIds, file, "UI"));
+    if (declaredIds.length === 0) {
+      issues.push(
+        issue(
+          "QFAI-THEMA-010",
+          `thema \u5951\u7D04\u30D5\u30A1\u30A4\u30EB\u306B QFAI-CONTRACT-ID \u304C\u3042\u308A\u307E\u305B\u3093: ${file}`,
+          "error",
+          file,
+          "contracts.thema.declaration"
+        )
+      );
+      continue;
+    }
+    if (declaredIds.length > 1) {
+      issues.push(
+        issue(
+          "QFAI-THEMA-011",
+          `thema \u5951\u7D04\u30D5\u30A1\u30A4\u30EB\u306B\u8907\u6570\u306E QFAI-CONTRACT-ID \u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059: ${declaredIds.join(
+            ", "
+          )}`,
+          "error",
+          file,
+          "contracts.thema.declaration",
+          declaredIds
+        )
+      );
+      continue;
+    }
+    const declaredId = declaredIds[0] ?? "";
+    if (!THEMA_ID_RE.test(declaredId)) {
+      issues.push(
+        issue(
+          "QFAI-THEMA-012",
+          `thema \u5951\u7D04\u30D5\u30A1\u30A4\u30EB\u306E ID \u5F62\u5F0F\u304C\u4E0D\u6B63\u3067\u3059: ${declaredId}`,
+          "error",
+          file,
+          "contracts.thema.idFormat",
+          [declaredId]
+        )
+      );
+    }
+    let doc;
     try {
-      parseStructuredContract(file, stripContractDeclarationLines(text));
+      doc = parseStructuredContract(file, stripContractDeclarationLines(text));
     } catch (error2) {
       issues.push(
         issue(
-          "QFAI-CONTRACT-001",
-          `UI \u5951\u7D04\u30D5\u30A1\u30A4\u30EB\u306E\u89E3\u6790\u306B\u5931\u6557\u3057\u307E\u3057\u305F: ${file} (${formatError4(error2)})`,
+          "QFAI-THEMA-001",
+          `thema \u5951\u7D04\u30D5\u30A1\u30A4\u30EB\u306E\u89E3\u6790\u306B\u5931\u6557\u3057\u307E\u3057\u305F: ${file} (${formatError4(error2)})`,
           "error",
           file,
-          "contracts.ui.parse"
+          "contracts.thema.parse"
+        )
+      );
+      continue;
+    }
+    const docId = typeof doc.id === "string" ? doc.id : "";
+    if (!THEMA_ID_RE.test(docId)) {
+      issues.push(
+        issue(
+          "QFAI-THEMA-012",
+          docId.length > 0 ? `thema \u306E id \u5F62\u5F0F\u304C\u4E0D\u6B63\u3067\u3059: ${docId}` : "thema \u306E id \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002",
+          "error",
+          file,
+          "contracts.thema.idFormat",
+          docId.length > 0 ? [docId] : void 0
+        )
+      );
+    }
+    const name = typeof doc.name === "string" ? doc.name : "";
+    if (!name) {
+      issues.push(
+        issue(
+          "QFAI-THEMA-014",
+          "thema \u306E name \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002",
+          "error",
+          file,
+          "contracts.thema.name"
+        )
+      );
+    }
+    if (declaredId && docId && declaredId !== docId) {
+      issues.push(
+        issue(
+          "QFAI-THEMA-013",
+          `thema \u306E\u5BA3\u8A00 ID \u3068 id \u304C\u4E00\u81F4\u3057\u307E\u305B\u3093: ${declaredId} / ${docId}`,
+          "error",
+          file,
+          "contracts.thema.idMismatch",
+          [declaredId, docId]
         )
       );
     }
@@ -2174,6 +2338,7 @@ async function validateApiContracts(apiRoot) {
       "UI",
       "API",
       "DB",
+      "THEMA",
       "ADR"
     ]);
     if (invalidIds.length > 0) {
@@ -2242,6 +2407,7 @@ async function validateDbContracts(dbRoot) {
       "UI",
       "API",
       "DB",
+      "THEMA",
       "ADR"
     ]);
     if (invalidIds.length > 0) {
@@ -2348,6 +2514,278 @@ function validateDuplicateContractIds(contractIndex) {
 function hasOpenApi(doc) {
   return typeof doc.openapi === "string" && doc.openapi.length > 0;
 }
+async function validateUiContractDoc(doc, file, uiRoot, themaIds) {
+  const issues = [];
+  if (Object.prototype.hasOwnProperty.call(doc, "themaRef")) {
+    const themaRef = doc.themaRef;
+    if (typeof themaRef !== "string" || themaRef.length === 0) {
+      issues.push(
+        issue(
+          "QFAI-UI-020",
+          "themaRef \u306F THEMA-001 \u5F62\u5F0F\u306E\u6587\u5B57\u5217\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002",
+          "error",
+          file,
+          "contracts.ui.themaRef"
+        )
+      );
+    } else if (!THEMA_ID_RE.test(themaRef)) {
+      issues.push(
+        issue(
+          "QFAI-UI-020",
+          `themaRef \u306E\u5F62\u5F0F\u304C\u4E0D\u6B63\u3067\u3059: ${themaRef}`,
+          "error",
+          file,
+          "contracts.ui.themaRef",
+          [themaRef]
+        )
+      );
+    } else if (!themaIds.has(themaRef)) {
+      issues.push(
+        issue(
+          "QFAI-UI-020",
+          `themaRef \u304C\u5B58\u5728\u3057\u306A\u3044 THEMA \u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059: ${themaRef}`,
+          "error",
+          file,
+          "contracts.ui.themaRef",
+          [themaRef]
+        )
+      );
+    }
+  }
+  const assets = doc.assets;
+  if (assets && typeof assets === "object") {
+    issues.push(
+      ...await validateUiAssets(
+        assets,
+        file,
+        uiRoot
+      )
+    );
+  }
+  return issues;
+}
+async function validateUiAssets(assets, file, uiRoot) {
+  const issues = [];
+  const packValue = assets.pack;
+  const useValue = assets.use;
+  if (packValue === void 0 && useValue === void 0) {
+    return issues;
+  }
+  if (typeof packValue !== "string" || packValue.length === 0) {
+    issues.push(
+      issue(
+        "QFAI-ASSET-001",
+        "assets.pack \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002",
+        "error",
+        file,
+        "assets.pack"
+      )
+    );
+    return issues;
+  }
+  if (!isSafeRelativePath(packValue)) {
+    issues.push(
+      issue(
+        "QFAI-ASSET-001",
+        `assets.pack \u306F ui/ \u914D\u4E0B\u306E\u76F8\u5BFE\u30D1\u30B9\u306E\u307F\u8A31\u53EF\u3055\u308C\u307E\u3059: ${packValue}`,
+        "error",
+        file,
+        "assets.pack",
+        [packValue]
+      )
+    );
+    return issues;
+  }
+  const packDir = path17.resolve(uiRoot, packValue);
+  const packRelative = path17.relative(uiRoot, packDir);
+  if (packRelative.startsWith("..") || path17.isAbsolute(packRelative)) {
+    issues.push(
+      issue(
+        "QFAI-ASSET-001",
+        `assets.pack \u306F ui/ \u914D\u4E0B\u306B\u9650\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044: ${packValue}`,
+        "error",
+        file,
+        "assets.pack",
+        [packValue]
+      )
+    );
+    return issues;
+  }
+  if (!await exists6(packDir)) {
+    issues.push(
+      issue(
+        "QFAI-ASSET-001",
+        `assets.pack \u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: ${packValue}`,
+        "error",
+        file,
+        "assets.pack",
+        [packValue]
+      )
+    );
+    return issues;
+  }
+  const assetsYamlPath = path17.join(packDir, "assets.yaml");
+  if (!await exists6(assetsYamlPath)) {
+    issues.push(
+      issue(
+        "QFAI-ASSET-002",
+        `assets.yaml \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${assetsYamlPath}`,
+        "error",
+        assetsYamlPath,
+        "assets.yaml"
+      )
+    );
+    return issues;
+  }
+  let manifest;
+  try {
+    const manifestText = await readFile7(assetsYamlPath, "utf-8");
+    manifest = parseStructuredContract(assetsYamlPath, manifestText);
+  } catch (error2) {
+    issues.push(
+      issue(
+        "QFAI-ASSET-002",
+        `assets.yaml \u306E\u89E3\u6790\u306B\u5931\u6557\u3057\u307E\u3057\u305F: ${assetsYamlPath} (${formatError4(error2)})`,
+        "error",
+        assetsYamlPath,
+        "assets.yaml"
+      )
+    );
+    return issues;
+  }
+  const items = Array.isArray(manifest.items) ? manifest.items : [];
+  const itemIds = /* @__PURE__ */ new Set();
+  const itemPaths = [];
+  for (const item of items) {
+    if (!item || typeof item !== "object") {
+      continue;
+    }
+    const record2 = item;
+    const id = typeof record2.id === "string" ? record2.id : void 0;
+    const pathValue = typeof record2.path === "string" ? record2.path : void 0;
+    if (id) {
+      itemIds.add(id);
+    }
+    itemPaths.push({ id, path: pathValue });
+  }
+  if (useValue !== void 0) {
+    if (!Array.isArray(useValue) || useValue.some((entry) => typeof entry !== "string")) {
+      issues.push(
+        issue(
+          "QFAI-ASSET-003",
+          "assets.use \u306F\u6587\u5B57\u5217\u914D\u5217\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002",
+          "error",
+          file,
+          "assets.use"
+        )
+      );
+    } else {
+      const missing = useValue.filter((entry) => !itemIds.has(entry));
+      if (missing.length > 0) {
+        issues.push(
+          issue(
+            "QFAI-ASSET-003",
+            `assets.use \u304C assets.yaml \u306B\u5B58\u5728\u3057\u307E\u305B\u3093: ${missing.join(", ")}`,
+            "error",
+            file,
+            "assets.use",
+            missing
+          )
+        );
+      }
+    }
+  }
+  for (const entry of itemPaths) {
+    if (!entry.path) {
+      continue;
+    }
+    if (!isSafeRelativePath(entry.path)) {
+      issues.push(
+        issue(
+          "QFAI-ASSET-004",
+          `assets.yaml \u306E path \u304C\u4E0D\u6B63\u3067\u3059: ${entry.path}`,
+          "error",
+          assetsYamlPath,
+          "assets.path",
+          entry.id ? [entry.id] : [entry.path]
+        )
+      );
+      continue;
+    }
+    const assetPath = path17.resolve(packDir, entry.path);
+    const assetRelative = path17.relative(packDir, assetPath);
+    if (assetRelative.startsWith("..") || path17.isAbsolute(assetRelative)) {
+      issues.push(
+        issue(
+          "QFAI-ASSET-004",
+          `assets.yaml \u306E path \u304C packDir \u3092\u9038\u8131\u3057\u3066\u3044\u307E\u3059: ${entry.path}`,
+          "error",
+          assetsYamlPath,
+          "assets.path",
+          entry.id ? [entry.id] : [entry.path]
+        )
+      );
+      continue;
+    }
+    if (!await exists6(assetPath)) {
+      issues.push(
+        issue(
+          "QFAI-ASSET-004",
+          `assets.yaml \u306E path \u304C\u5B58\u5728\u3057\u307E\u305B\u3093: ${entry.path}`,
+          "error",
+          assetsYamlPath,
+          "assets.path",
+          entry.id ? [entry.id] : [entry.path]
+        )
+      );
+    }
+  }
+  return issues;
+}
+function shouldIgnoreInvalidId(value, doc) {
+  if (!doc) {
+    return false;
+  }
+  const assets = doc.assets;
+  if (!assets || typeof assets !== "object") {
+    return false;
+  }
+  const packValue = assets.pack;
+  if (typeof packValue !== "string" || packValue.length === 0) {
+    return false;
+  }
+  const normalized = packValue.replace(/\\/g, "/");
+  const basename = path17.posix.basename(normalized);
+  if (!basename) {
+    return false;
+  }
+  return value.toLowerCase() === basename.toLowerCase();
+}
+function isSafeRelativePath(value) {
+  if (!value) {
+    return false;
+  }
+  if (path17.isAbsolute(value)) {
+    return false;
+  }
+  const normalized = value.replace(/\\/g, "/");
+  if (/^[A-Za-z]:/.test(normalized)) {
+    return false;
+  }
+  const segments = normalized.split("/");
+  if (segments.some((segment) => segment === "..")) {
+    return false;
+  }
+  return true;
+}
+async function exists6(target) {
+  try {
+    await access6(target);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function formatError4(error2) {
   if (error2 instanceof Error) {
     return error2.message;
@@ -2378,7 +2816,7 @@ function issue(code, message, severity, file, rule, refs, category = "compatibil
 
 // src/core/validators/delta.ts
 import { readFile as readFile8 } from "fs/promises";
-import path17 from "path";
+import path18 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;
@@ -2392,7 +2830,7 @@ async function validateDeltas(root, config) {
   }
   const issues = [];
   for (const pack of packs) {
-    const deltaPath = path17.join(pack, "delta.md");
+    const deltaPath = path18.join(pack, "delta.md");
     let text;
     try {
       text = await readFile8(deltaPath, "utf-8");
@@ -2472,7 +2910,7 @@ function issue2(code, message, severity, file, rule, refs, category = "change",
 
 // src/core/validators/ids.ts
 import { readFile as readFile9 } from "fs/promises";
-import path18 from "path";
+import path19 from "path";
 var SC_TAG_RE3 = /^SC-\d{4}$/;
 async function validateDefinedIds(root, config) {
   const issues = [];
@@ -2538,7 +2976,7 @@ function recordId(out, id, file) {
 }
 function formatFileList(files, root) {
   return files.map((file) => {
-    const relative = path18.relative(root, file);
+    const relative = path19.relative(root, file);
     return relative.length > 0 ? relative : file;
   }).join(", ");
 }
@@ -2596,7 +3034,8 @@ async function validatePromptsIntegrity(root) {
 }
 
 // src/core/validators/scenario.ts
-import { readFile as readFile10 } from "fs/promises";
+import { access as access7, readFile as readFile10 } from "fs/promises";
+import path20 from "path";
 var GIVEN_PATTERN = /\bGiven\b/;
 var WHEN_PATTERN = /\bWhen\b/;
 var THEN_PATTERN = /\bThen\b/;
@@ -2619,6 +3058,18 @@ async function validateScenarios(root, config) {
   }
   const issues = [];
   for (const entry of entries) {
+    const legacyScenarioPath = path20.join(entry.dir, "scenario.md");
+    if (await fileExists(legacyScenarioPath)) {
+      issues.push(
+        issue4(
+          "QFAI-SC-004",
+          "scenario.md \u306F\u975E\u5BFE\u5FDC\u3067\u3059\u3002scenario.feature \u3078\u79FB\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002",
+          "error",
+          legacyScenarioPath,
+          "scenario.legacy"
+        )
+      );
+    }
     let text;
     try {
       text = await readFile10(entry.scenarioPath, "utf-8");
@@ -2650,6 +3101,7 @@ function validateScenarioContent(text, file) {
     "UI",
     "API",
     "DB",
+    "THEMA",
     "ADR"
   ]);
   if (invalidIds.length > 0) {
@@ -2793,6 +3245,14 @@ function isMissingFileError3(error2) {
   }
   return error2.code === "ENOENT";
 }
+async function fileExists(target) {
+  try {
+    await access7(target);
+    return true;
+  } catch {
+    return false;
+  }
+}
 
 // src/core/validators/spec.ts
 import { readFile as readFile11 } from "fs/promises";
@@ -2852,6 +3312,7 @@ function validateSpecContent(text, file, requiredSections) {
     "UI",
     "API",
     "DB",
+    "THEMA",
     "ADR"
   ]);
   if (invalidIds.length > 0) {
@@ -3031,7 +3492,7 @@ async function validateTraceability(root, config) {
             "QFAI-TRACE-021",
             `Spec \u306E\u5951\u7D04 ID \u304C\u4E0D\u6B63\u3067\u3059: ${contractRefs.invalidTokens.join(
               ", "
-            )} (\u4F8B: UI-0001 / API-0001 / DB-0001)`,
+            )} (\u4F8B: UI-0001 / API-0001 / DB-0001 / THEMA-001)`,
             "error",
             file,
             "traceability.specContractRefFormat",
@@ -3095,7 +3556,7 @@ async function validateTraceability(root, config) {
             "QFAI-TRACE-032",
             `Scenario \u306E\u5951\u7D04 ID \u304C\u4E0D\u6B63\u3067\u3059: ${scenarioContractRefs.invalidTokens.join(
               ", "
-            )} (\u4F8B: UI-0001 / API-0001 / DB-0001)`,
+            )} (\u4F8B: UI-0001 / API-0001 / DB-0001 / THEMA-001)`,
             "error",
             file,
             "traceability.scenarioContractRefFormat",
@@ -3474,17 +3935,25 @@ function countIssues(issues) {
 }
 
 // src/core/report.ts
-var ID_PREFIXES2 = ["SPEC", "BR", "SC", "UI", "API", "DB"];
+var ID_PREFIXES2 = [
+  "SPEC",
+  "BR",
+  "SC",
+  "UI",
+  "API",
+  "DB",
+  "THEMA"
+];
 async function createReportData(root, validation, configResult) {
-  const resolvedRoot = path19.resolve(root);
+  const resolvedRoot = path21.resolve(root);
   const resolved = configResult ?? await loadConfig(resolvedRoot);
   const config = resolved.config;
   const configPath = resolved.configPath;
   const specsRoot = resolvePath(resolvedRoot, config, "specsDir");
   const contractsRoot = resolvePath(resolvedRoot, config, "contractsDir");
-  const apiRoot = path19.join(contractsRoot, "api");
-  const uiRoot = path19.join(contractsRoot, "ui");
-  const dbRoot = path19.join(contractsRoot, "db");
+  const apiRoot = path21.join(contractsRoot, "api");
+  const uiRoot = path21.join(contractsRoot, "ui");
+  const dbRoot = path21.join(contractsRoot, "db");
   const srcRoot = resolvePath(resolvedRoot, config, "srcDir");
   const testsRoot = resolvePath(resolvedRoot, config, "testsDir");
   const specFiles = await collectSpecFiles(specsRoot);
@@ -3492,7 +3961,8 @@ async function createReportData(root, validation, configResult) {
   const {
     api: apiFiles,
     ui: uiFiles,
-    db: dbFiles
+    db: dbFiles,
+    thema: themaFiles
   } = await collectContractFiles(uiRoot, apiRoot, dbRoot);
   const contractIndex = await buildContractIndex(resolvedRoot, config);
   const contractIdList = Array.from(contractIndex.ids);
@@ -3519,7 +3989,8 @@ async function createReportData(root, validation, configResult) {
     ...scenarioFiles,
     ...apiFiles,
     ...uiFiles,
-    ...dbFiles
+    ...dbFiles,
+    ...themaFiles
   ]);
   const upstreamIds = await collectUpstreamIds([
     ...specFiles,
@@ -3556,7 +4027,8 @@ async function createReportData(root, validation, configResult) {
       contracts: {
         api: apiFiles.length,
         ui: uiFiles.length,
-        db: dbFiles.length
+        db: dbFiles.length,
+        thema: themaFiles.length
       },
       counts: normalizedValidation.counts
     },
@@ -3566,7 +4038,8 @@ async function createReportData(root, validation, configResult) {
       sc: idsByPrefix.SC,
       ui: idsByPrefix.UI,
       api: idsByPrefix.API,
-      db: idsByPrefix.DB
+      db: idsByPrefix.DB,
+      thema: idsByPrefix.THEMA
     },
     traceability: {
       upstreamIdsFound: upstreamIds.size,
@@ -3636,7 +4109,7 @@ function formatReportMarkdown(data, options = {}) {
   lines.push(`- specs: ${data.summary.specs}`);
   lines.push(`- scenarios: ${data.summary.scenarios}`);
   lines.push(
-    `- contracts: api ${data.summary.contracts.api} / ui ${data.summary.contracts.ui} / db ${data.summary.contracts.db}`
+    `- contracts: api ${data.summary.contracts.api} / ui ${data.summary.contracts.ui} / db ${data.summary.contracts.db} / thema ${data.summary.contracts.thema}`
   );
   lines.push(
     `- issues(total): info ${data.summary.counts.info} / warning ${data.summary.counts.warning} / error ${data.summary.counts.error}`
@@ -3780,6 +4253,7 @@ function formatReportMarkdown(data, options = {}) {
   lines.push(formatIdLine("UI", data.ids.ui));
   lines.push(formatIdLine("API", data.ids.api));
   lines.push(formatIdLine("DB", data.ids.db));
+  lines.push(formatIdLine("THEMA", data.ids.thema));
   lines.push("");
   lines.push("## Traceability");
   lines.push("");
@@ -4001,7 +4475,8 @@ async function collectIds(files) {
     SC: /* @__PURE__ */ new Set(),
     UI: /* @__PURE__ */ new Set(),
     API: /* @__PURE__ */ new Set(),
-    DB: /* @__PURE__ */ new Set()
+    DB: /* @__PURE__ */ new Set(),
+    THEMA: /* @__PURE__ */ new Set()
   };
   for (const file of files) {
     const text = await readFile13(file, "utf-8");
@@ -4016,7 +4491,8 @@ async function collectIds(files) {
     SC: toSortedArray2(result.SC),
     UI: toSortedArray2(result.UI),
     API: toSortedArray2(result.API),
-    DB: toSortedArray2(result.DB)
+    DB: toSortedArray2(result.DB),
+    THEMA: toSortedArray2(result.THEMA)
   };
 }
 async function collectUpstreamIds(files) {
@@ -4180,7 +4656,7 @@ function warnIfTruncated(scan, context) {
 
 // src/cli/commands/report.ts
 async function runReport(options) {
-  const root = path20.resolve(options.root);
+  const root = path22.resolve(options.root);
   const configResult = await loadConfig(root);
   let validation;
   if (options.runValidate) {
@@ -4197,7 +4673,7 @@ async function runReport(options) {
     validation = normalized;
   } else {
     const input = options.inputPath ?? configResult.config.output.validateJsonPath;
-    const inputPath = path20.isAbsolute(input) ? input : path20.resolve(root, input);
+    const inputPath = path22.isAbsolute(input) ? input : path22.resolve(root, input);
     try {
       validation = await readValidationResult(inputPath);
     } catch (err) {
@@ -4224,10 +4700,10 @@ async function runReport(options) {
   warnIfTruncated(data.traceability.testFiles, "report");
   const output = options.format === "json" ? formatReportJson(data) : options.baseUrl ? formatReportMarkdown(data, { baseUrl: options.baseUrl }) : formatReportMarkdown(data);
   const outRoot = resolvePath(root, configResult.config, "outDir");
-  const defaultOut = options.format === "json" ? path20.join(outRoot, "report.json") : path20.join(outRoot, "report.md");
+  const defaultOut = options.format === "json" ? path22.join(outRoot, "report.json") : path22.join(outRoot, "report.md");
   const out = options.outPath ?? defaultOut;
-  const outPath = path20.isAbsolute(out) ? out : path20.resolve(root, out);
-  await mkdir3(path20.dirname(outPath), { recursive: true });
+  const outPath = path22.isAbsolute(out) ? out : path22.resolve(root, out);
+  await mkdir3(path22.dirname(outPath), { recursive: true });
   await writeFile2(outPath, `${output}
 `, "utf-8");
   info(
@@ -4292,15 +4768,15 @@ function isMissingFileError5(error2) {
   return record2.code === "ENOENT";
 }
 async function writeValidationResult(root, outputPath, result) {
-  const abs = path20.isAbsolute(outputPath) ? outputPath : path20.resolve(root, outputPath);
-  await mkdir3(path20.dirname(abs), { recursive: true });
+  const abs = path22.isAbsolute(outputPath) ? outputPath : path22.resolve(root, outputPath);
+  await mkdir3(path22.dirname(abs), { recursive: true });
   await writeFile2(abs, `${JSON.stringify(result, null, 2)}
 `, "utf-8");
 }
 
 // src/cli/commands/validate.ts
 import { mkdir as mkdir4, writeFile as writeFile3 } from "fs/promises";
-import path21 from "path";
+import path23 from "path";
 
 // src/cli/lib/failOn.ts
 function shouldFail(result, failOn) {
@@ -4315,7 +4791,7 @@ function shouldFail(result, failOn) {
 
 // src/cli/commands/validate.ts
 async function runValidate(options) {
-  const root = path21.resolve(options.root);
+  const root = path23.resolve(options.root);
   const configResult = await loadConfig(root);
   const result = await validateProject(root, configResult);
   const normalized = normalizeValidationResult(root, result);
@@ -4440,12 +4916,12 @@ function issueKey(issue7) {
 }
 async function emitJson(result, root, jsonPath) {
   const abs = resolveJsonPath(root, jsonPath);
-  await mkdir4(path21.dirname(abs), { recursive: true });
+  await mkdir4(path23.dirname(abs), { recursive: true });
   await writeFile3(abs, `${JSON.stringify(result, null, 2)}
 `, "utf-8");
 }
 function resolveJsonPath(root, jsonPath) {
-  return path21.isAbsolute(jsonPath) ? jsonPath : path21.resolve(root, jsonPath);
+  return path23.isAbsolute(jsonPath) ? jsonPath : path23.resolve(root, jsonPath);
 }
 var GITHUB_ANNOTATION_LIMIT = 100;