@ncoderz/awa 1.8.0 → 1.8.1

package/dist/index.js

@@ -2,13 +2,15 @@
 import {
   DEFAULT_CHECK_CONFIG,
   collectFiles,
+  findSpecFiles,
+  hasAnySpecFile,
   matchSimpleGlob,
   parseSpecs,
   propagate,
   renumberCommand,
   scan,
   scanMarkers
-} from "./chunk-WGGMDWBE.js";
+} from "./chunk-EL7ZWFXO.js";
 import {
   ConfigError,
   DiffError,
@@ -34,7 +36,7 @@ import { Command, Option } from "commander";
 // src/_generated/package_info.ts
 var PACKAGE_INFO = {
   "name": "@ncoderz/awa",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "author": "Richard Sewell <richard.sewell@ncoderz.com>",
   "license": "BSD-3-Clause",
   "description": "awa is an Agent Workflow for AIs. It is also a CLI tool to powerfully manage agent workflow files using templates."
@@ -3569,9 +3571,6 @@ function validateMerge(sourceCode, targetCode) {
   }
 }
 
-// src/core/recode/map-builder.ts
-import { basename as basename6 } from "path";
-
 // src/core/recode/types.ts
 var RecodeError = class extends Error {
   errorCode;
@@ -3588,37 +3587,43 @@ function buildRecodeMap(sourceCode, targetCode, specs) {
     throw new RecodeError("SOURCE_NOT_FOUND", `No spec files found for source code: ${sourceCode}`);
   }
   const entries = /* @__PURE__ */ new Map();
-  const sourceReq = findSpecFile(specs.specFiles, sourceCode, "REQ");
-  if (sourceReq) {
-    const targetReq = findSpecFile(specs.specFiles, targetCode, "REQ");
-    const reqOffset = targetReq ? findHighestReqNumber(targetReq) : 0;
-    buildRequirementEntries(sourceCode, targetCode, sourceReq, reqOffset, entries);
+  const sourceReqs = findSpecFiles(specs.specFiles, sourceCode, "REQ");
+  if (sourceReqs.length > 0) {
+    const targetReqs = findSpecFiles(specs.specFiles, targetCode, "REQ");
+    const reqOffset = findHighestReqNumber(targetReqs);
+    buildRequirementEntries(sourceCode, targetCode, sourceReqs, reqOffset, entries);
   }
-  const sourceDesign = findSpecFile(specs.specFiles, sourceCode, "DESIGN");
-  const targetDesign = findSpecFile(specs.specFiles, targetCode, "DESIGN");
-  if (sourceDesign) {
-    const propOffset = targetDesign ? findHighestPropertyNumber(targetDesign) : 0;
-    buildPropertyEntries(sourceCode, targetCode, sourceDesign, propOffset, entries);
+  const sourceDesigns = findSpecFiles(specs.specFiles, sourceCode, "DESIGN");
+  const targetDesigns = findSpecFiles(specs.specFiles, targetCode, "DESIGN");
+  if (sourceDesigns.length > 0) {
+    const propOffset = findHighestPropertyNumber(targetDesigns);
+    buildPropertyEntries(sourceCode, targetCode, sourceDesigns, propOffset, entries);
   }
-  if (sourceDesign) {
-    buildComponentEntries(sourceCode, targetCode, sourceDesign, entries);
+  if (sourceDesigns.length > 0) {
+    buildComponentEntries(sourceCode, targetCode, sourceDesigns, entries);
   }
   const noChange = entries.size === 0;
   const map = { code: sourceCode, entries };
   return { map, noChange };
 }
-function buildRequirementEntries(_sourceCode, targetCode, sourceReq, reqOffset, entries) {
+function buildRequirementEntries(_sourceCode, targetCode, sourceReqs, reqOffset, entries) {
   const topLevelReqs = [];
   const subReqsByParent = /* @__PURE__ */ new Map();
-  for (const id of sourceReq.requirementIds) {
-    if (id.includes(".")) {
-      const dotIdx = id.lastIndexOf(".");
-      const parent = id.slice(0, dotIdx);
-      const subs = subReqsByParent.get(parent) ?? [];
-      subs.push(id);
-      subReqsByParent.set(parent, subs);
-    } else {
-      topLevelReqs.push(id);
+  const allAcIds = [];
+  for (const sourceReq of sourceReqs) {
+    for (const id of sourceReq.requirementIds) {
+      if (id.includes(".")) {
+        const dotIdx = id.lastIndexOf(".");
+        const parent = id.slice(0, dotIdx);
+        const subs = subReqsByParent.get(parent) ?? [];
+        subs.push(id);
+        subReqsByParent.set(parent, subs);
+      } else {
+        topLevelReqs.push(id);
+      }
+    }
+    for (const acId of sourceReq.acIds) {
+      allAcIds.push(acId);
     }
   }
   const reqNumberMap = /* @__PURE__ */ new Map();
@@ -3642,7 +3647,7 @@ function buildRequirementEntries(_sourceCode, targetCode, sourceReq, reqOffset,
     }
   }
   const acsByParent = /* @__PURE__ */ new Map();
-  for (const acId of sourceReq.acIds) {
+  for (const acId of allAcIds) {
     const parent = acId.split("_AC-")[0];
     const acs = acsByParent.get(parent) ?? [];
     acs.push(acId);
@@ -3658,59 +3663,54 @@ function buildRequirementEntries(_sourceCode, targetCode, sourceReq, reqOffset,
     }
   }
 }
-function buildPropertyEntries(_sourceCode, targetCode, sourceDesign, propOffset, entries) {
-  for (let i = 0; i < sourceDesign.propertyIds.length; i++) {
-    const oldId = sourceDesign.propertyIds[i];
-    const newNum = propOffset + i + 1;
-    const newId = `${targetCode}_P-${newNum}`;
-    entries.set(oldId, newId);
+function buildPropertyEntries(_sourceCode, targetCode, sourceDesigns, propOffset, entries) {
+  let counter = 0;
+  for (const sourceDesign of sourceDesigns) {
+    for (const oldId of sourceDesign.propertyIds) {
+      counter++;
+      const newId = `${targetCode}_P-${propOffset + counter}`;
+      entries.set(oldId, newId);
+    }
   }
 }
-function buildComponentEntries(sourceCode, targetCode, sourceDesign, entries) {
-  for (const compName of sourceDesign.componentNames) {
-    const prefix = `${sourceCode}-`;
-    if (compName.startsWith(prefix)) {
-      const suffix = compName.slice(prefix.length);
-      entries.set(compName, `${targetCode}-${suffix}`);
+function buildComponentEntries(sourceCode, targetCode, sourceDesigns, entries) {
+  for (const sourceDesign of sourceDesigns) {
+    for (const compName of sourceDesign.componentNames) {
+      const prefix = `${sourceCode}-`;
+      if (compName.startsWith(prefix)) {
+        const suffix = compName.slice(prefix.length);
+        entries.set(compName, `${targetCode}-${suffix}`);
+      }
     }
   }
 }
-function findHighestReqNumber(reqFile) {
+function findHighestReqNumber(reqFiles) {
   let max = 0;
-  for (const id of reqFile.requirementIds) {
-    if (id.includes(".")) continue;
-    const match = id.match(/-(\d+)$/);
-    if (match) {
-      const num = Number.parseInt(match[1], 10);
-      if (num > max) max = num;
+  for (const reqFile of reqFiles) {
+    for (const id of reqFile.requirementIds) {
+      if (id.includes(".")) continue;
+      const match = id.match(/-(\d+)$/);
+      if (match) {
+        const num = Number.parseInt(match[1], 10);
+        if (num > max) max = num;
+      }
     }
   }
   return max;
 }
-function findHighestPropertyNumber(designFile) {
+function findHighestPropertyNumber(designFiles) {
   let max = 0;
-  for (const id of designFile.propertyIds) {
-    const match = id.match(/_P-(\d+)$/);
-    if (match) {
-      const num = Number.parseInt(match[1], 10);
-      if (num > max) max = num;
+  for (const designFile of designFiles) {
+    for (const id of designFile.propertyIds) {
+      const match = id.match(/_P-(\d+)$/);
+      if (match) {
+        const num = Number.parseInt(match[1], 10);
+        if (num > max) max = num;
+      }
     }
   }
   return max;
 }
-function findSpecFile(specFiles, code, prefix) {
-  return specFiles.find((sf) => {
-    const name = basename6(sf.filePath);
-    return name.startsWith(`${prefix}-${code}-`);
-  });
-}
-var SPEC_PREFIXES = ["FEAT", "REQ", "DESIGN", "EXAMPLE", "API", "TASK"];
-function hasAnySpecFile(specFiles, code) {
-  return specFiles.some((sf) => {
-    const name = basename6(sf.filePath);
-    return SPEC_PREFIXES.some((prefix) => name.startsWith(`${prefix}-${code}-`));
-  });
-}
 
 // src/commands/merge.ts
 async function mergeCommand(options) {
@@ -3764,7 +3764,7 @@ async function mergeCommand(options) {
       return 2;
     }
     if (options.renumber && !dryRun && !noChange) {
-      const { renumberCommand: renumberCommand2 } = await import("./renumber-ZCI2H5HZ.js");
+      const { renumberCommand: renumberCommand2 } = await import("./renumber-TLBGOWZM.js");
       await renumberCommand2({
         code: options.targetCode,
         dryRun: false,
@@ -3948,7 +3948,7 @@ import { intro as intro4, outro as outro4 } from "@clack/prompts";
 
 // src/core/template-test/fixture-loader.ts
 import { readdir as readdir2 } from "fs/promises";
-import { basename as basename7, extname as extname2, join as join10 } from "path";
+import { basename as basename6, extname as extname2, join as join10 } from "path";
 import { parse } from "smol-toml";
 async function discoverFixtures(templatePath) {
   const testsDir = join10(templatePath, "_tests");
@@ -3970,7 +3970,7 @@ async function discoverFixtures(templatePath) {
 async function parseFixture(filePath) {
   const content = await readTextFile(filePath);
   const parsed = parse(content);
-  const name = basename7(filePath, extname2(filePath));
+  const name = basename6(filePath, extname2(filePath));
   const features = toStringArray2(parsed.features) ?? [];
   const preset = toStringArray2(parsed.preset) ?? [];
   const removeFeatures = toStringArray2(parsed["remove-features"]) ?? [];
@@ -5545,13 +5545,18 @@ function configureTraceCommand(cmd) {
 }
 configureTraceCommand(spec.command("trace"));
 function configureRenumberCommand(cmd) {
-  return cmd.description("Renumber traceability IDs to match document order").argument("[code]", "Feature code to renumber (e.g. CHK, TRC)").option("--all", "Renumber all feature codes", false).option("--dry-run", "Preview changes without modifying files", false).option("--json", "Output results as JSON", false).option("-c, --config <path>", "Path to configuration file").action(async (code, options) => {
+  return cmd.description("Renumber traceability IDs to match document order").argument("[code]", "Feature code to renumber (e.g. CHK, TRC)").option("--all", "Renumber all feature codes", false).option("--dry-run", "Preview changes without modifying files", false).option("--json", "Output results as JSON", false).option(
+    "--expand-unambiguous-ids",
+    "Expand unambiguous malformed ID shorthand (slash ranges, dot-dot ranges) before renumbering",
+    false
+  ).option("-c, --config <path>", "Path to configuration file").action(async (code, options) => {
     const renumberOptions = {
       code,
       all: options.all,
       dryRun: options.dryRun,
       json: options.json,
-      config: options.config
+      config: options.config,
+      expandUnambiguousIds: options.expandUnambiguousIds
     };
     const exitCode = await renumberCommand(renumberOptions);
     process.exit(exitCode);