@ncoderz/awa 1.7.1 → 1.7.2

package/dist/index.js

@@ -24,7 +24,7 @@ import { Command, Option } from "commander";
 // src/_generated/package_info.ts
 var PACKAGE_INFO = {
   "name": "@ncoderz/awa",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "author": "Richard Sewell <richard.sewell@ncoderz.com>",
   "license": "MIT",
   "description": "awa is an Agent Workflow for AIs. It is also a CLI tool to powerfully manage agent workflow files using templates."
@@ -340,20 +340,15 @@ async function collectCodeFiles(codeGlobs, ignore) {
 import { readFile as readFile2, writeFile } from "fs/promises";
 import { basename } from "path";
 async function fixMatrices(specs, crossRefPatterns) {
-  const codeToReqFile = buildCodeToReqFileMap(specs.specFiles);
+  const reqFileMaps = buildReqFileMaps(specs.specFiles);
   const fileResults = [];
   for (const specFile of specs.specFiles) {
     const fileName = basename(specFile.filePath);
     if (fileName.startsWith("DESIGN-")) {
-      const changed = await fixDesignMatrix(specFile.filePath, codeToReqFile, crossRefPatterns);
+      const changed = await fixDesignMatrix(specFile.filePath, reqFileMaps, crossRefPatterns);
       fileResults.push({ filePath: specFile.filePath, changed });
     } else if (fileName.startsWith("TASK-")) {
-      const changed = await fixTaskMatrix(
-        specFile.filePath,
-        codeToReqFile,
-        specs,
-        crossRefPatterns
-      );
+      const changed = await fixTaskMatrix(specFile.filePath, reqFileMaps, specs, crossRefPatterns);
       fileResults.push({ filePath: specFile.filePath, changed });
     }
   }
@@ -362,20 +357,45 @@ async function fixMatrices(specs, crossRefPatterns) {
     fileResults
   };
 }
-function buildCodeToReqFileMap(specFiles) {
-  const map = /* @__PURE__ */ new Map();
+function buildReqFileMaps(specFiles) {
+  const idToReqFile = /* @__PURE__ */ new Map();
+  const codeToReqFilesSet = /* @__PURE__ */ new Map();
   for (const sf of specFiles) {
-    if (/\bREQ-/.test(basename(sf.filePath)) && sf.code) {
-      map.set(sf.code, basename(sf.filePath));
+    const fileName = basename(sf.filePath);
+    if (!/\bREQ-/.test(fileName)) continue;
+    for (const reqId of sf.requirementIds) {
+      idToReqFile.set(reqId, fileName);
+    }
+    for (const acId of sf.acIds) {
+      idToReqFile.set(acId, fileName);
     }
+    if (sf.code) {
+      const existing = codeToReqFilesSet.get(sf.code) ?? /* @__PURE__ */ new Set();
+      existing.add(fileName);
+      codeToReqFilesSet.set(sf.code, existing);
+    }
+  }
+  const codeToReqFiles = /* @__PURE__ */ new Map();
+  for (const [code, files] of codeToReqFilesSet) {
+    codeToReqFiles.set(code, [...files].sort());
   }
-  return map;
+  return { idToReqFile, codeToReqFiles };
 }
-function getCodePrefix(id) {
-  const match = /^([A-Z][A-Z0-9]*)[-_]/.exec(id);
-  return match?.[1] ?? "";
+function resolveReqFile(id, maps) {
+  const direct = maps.idToReqFile.get(id);
+  if (direct) return direct;
+  const acMatch = /^(.+)_AC-\d+$/.exec(id);
+  if (acMatch?.[1]) {
+    return maps.idToReqFile.get(acMatch[1]);
+  }
+  const propMatch = /^([A-Z][A-Z0-9]*)_P-\d+$/.exec(id);
+  if (propMatch?.[1]) {
+    const files = maps.codeToReqFiles.get(propMatch[1]);
+    return files?.[0];
+  }
+  return void 0;
 }
-async function fixDesignMatrix(filePath, codeToReqFile, crossRefPatterns) {
+async function fixDesignMatrix(filePath, reqFileMaps, crossRefPatterns) {
   let content;
   try {
     content = await readFile2(filePath, "utf-8");
@@ -400,7 +420,7 @@ async function fixDesignMatrix(filePath, codeToReqFile, crossRefPatterns) {
     }
   }
   const allAcIds = [...acToComponents.keys()];
-  const grouped = groupByReqFile(allAcIds, codeToReqFile);
+  const grouped = groupByReqFile(allAcIds, reqFileMaps);
   const newSection = generateDesignSection(grouped, acToComponents, acToProperties);
   const newContent = replaceTraceabilitySection(content, newSection);
   if (newContent === content) return false;
@@ -475,7 +495,7 @@ function generateDesignSection(grouped, acToComponents, acToProperties) {
   }
   return lines.join("\n");
 }
-async function fixTaskMatrix(filePath, codeToReqFile, specs, crossRefPatterns) {
+async function fixTaskMatrix(filePath, reqFileMaps, specs, crossRefPatterns) {
   let content;
   try {
     content = await readFile2(filePath, "utf-8");
@@ -509,7 +529,7 @@ async function fixTaskMatrix(filePath, codeToReqFile, specs, crossRefPatterns) {
     }
   }
   const allIdsForMatrix = [.../* @__PURE__ */ new Set([...acToTasks.keys(), ...idToTestTasks.keys()])];
-  const grouped = groupByReqFile(allIdsForMatrix, codeToReqFile);
+  const grouped = groupByReqFile(allIdsForMatrix, reqFileMaps);
   const newSection = generateTaskSection(grouped, acToTasks, idToTestTasks, sourcePropertyIds);
   const newContent = replaceTraceabilitySection(content, newSection);
   if (newContent === content) return false;
@@ -604,11 +624,10 @@ function generateTaskSection(grouped, acToTasks, idToTestTasks, propertyIds) {
   }
   return lines.join("\n").trimEnd();
 }
-function groupByReqFile(ids, codeToReqFile) {
+function groupByReqFile(ids, maps) {
   const groups = /* @__PURE__ */ new Map();
   for (const id of ids) {
-    const code = getCodePrefix(id);
-    const reqFile = codeToReqFile.get(code);
+    const reqFile = resolveReqFile(id, maps);
     if (!reqFile) continue;
     const existing = groups.get(reqFile) ?? [];
     existing.push(id);