@ncoderz/awa 1.8.1 → 1.8.3

package/dist/index.js

@@ -10,7 +10,7 @@ import {
   renumberCommand,
   scan,
   scanMarkers
-} from "./chunk-EL7ZWFXO.js";
+} from "./chunk-2VUVSW6T.js";
 import {
   ConfigError,
   DiffError,
@@ -28,7 +28,7 @@ import {
   rmDir,
   walkDirectory,
   writeTextFile
-} from "./chunk-LRQWZCYL.js";
+} from "./chunk-GOIBZQFJ.js";
 
 // src/cli/index.ts
 import { Command, Option } from "commander";
@@ -36,7 +36,7 @@ import { Command, Option } from "commander";
 // src/_generated/package_info.ts
 var PACKAGE_INFO = {
   "name": "@ncoderz/awa",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "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."
@@ -1820,11 +1820,19 @@ function buildCheckConfig(fileConfig, cliOptions) {
   const allowWarnings = cliOptions.allowWarnings === true ? true : typeof section?.["allow-warnings"] === "boolean" ? section["allow-warnings"] : DEFAULT_CHECK_CONFIG.allowWarnings;
   const specOnly = cliOptions.specOnly === true ? true : typeof section?.["spec-only"] === "boolean" ? section["spec-only"] : DEFAULT_CHECK_CONFIG.specOnly;
   const fix = cliOptions.fix === false ? false : DEFAULT_CHECK_CONFIG.fix;
+  const extraSpecGlobs = toStringArray(section?.["extra-spec-globs"]) ?? [
+    ...DEFAULT_CHECK_CONFIG.extraSpecGlobs
+  ];
+  const extraSpecIgnore = toStringArray(section?.["extra-spec-ignore"]) ?? [
+    ...DEFAULT_CHECK_CONFIG.extraSpecIgnore
+  ];
   return {
     specGlobs,
     codeGlobs,
     specIgnore,
     codeIgnore,
+    extraSpecGlobs,
+    extraSpecIgnore,
     ignoreMarkers,
     markers,
     idPattern,
@@ -3548,18 +3556,18 @@ async function executeRenames(renames, sourceCode, targetCode, dryRun) {
   }
   return renames;
 }
-async function findStaleRefs(sourceCode, specFiles) {
+async function findStaleRefs(sourceCode, filePaths) {
   const stale = [];
   const pattern = new RegExp(`\\b${sourceCode}-\\d`, "g");
-  for (const sf of specFiles) {
+  for (const filePath of filePaths) {
     let content;
     try {
-      content = await readFile8(sf.filePath, "utf-8");
+      content = await readFile8(filePath, "utf-8");
     } catch {
       continue;
     }
     if (pattern.test(content)) {
-      stale.push(sf.filePath);
+      stale.push(filePath);
     }
     pattern.lastIndex = 0;
   }
@@ -3716,7 +3724,7 @@ function findHighestPropertyNumber(designFiles) {
 async function mergeCommand(options) {
   try {
     validateMerge(options.sourceCode, options.targetCode);
-    const { markers, specs } = await scan(options.config);
+    const { markers, specs, config } = await scan(options.config);
     const dryRun = options.dryRun === true;
     if (!hasAnySpecFile(specs.specFiles, options.targetCode)) {
       throw new MergeError(
@@ -3732,7 +3740,7 @@ async function mergeCommand(options) {
     let affectedFiles = [];
     let totalReplacements = 0;
     if (!recodeNoChange) {
-      const result2 = await propagate(map, specs, markers, dryRun);
+      const result2 = await propagate(map, specs, markers, config, dryRun);
       affectedFiles = result2.affectedFiles;
       totalReplacements = result2.totalReplacements;
     }
@@ -3744,10 +3752,13 @@ async function mergeCommand(options) {
     );
     const movedSourcePaths = new Set(moves.map((m) => m.sourceFile));
     const propagatedPaths = new Set(affectedFiles.map((af) => af.filePath));
-    const nonSourceFiles = specs.specFiles.filter(
-      (sf) => !movedSourcePaths.has(sf.filePath) && !propagatedPaths.has(sf.filePath)
+    const specFilePaths = specs.specFiles.map((sf) => sf.filePath);
+    const combinedIgnore = [...config.specIgnore, ...config.extraSpecIgnore];
+    const extraFiles = await collectFiles(config.extraSpecGlobs, combinedIgnore);
+    const allFiles = [.../* @__PURE__ */ new Set([...specFilePaths, ...extraFiles])].filter(
+      (p) => !movedSourcePaths.has(p) && !propagatedPaths.has(p)
     );
-    const staleRefs = await findStaleRefs(options.sourceCode, nonSourceFiles);
+    const staleRefs = await findStaleRefs(options.sourceCode, allFiles);
     const noChange = recodeNoChange && moves.length === 0;
     const result = {
       sourceCode: options.sourceCode,
@@ -3764,7 +3775,7 @@ async function mergeCommand(options) {
       return 2;
     }
     if (options.renumber && !dryRun && !noChange) {
-      const { renumberCommand: renumberCommand2 } = await import("./renumber-TLBGOWZM.js");
+      const { renumberCommand: renumberCommand2 } = await import("./renumber-TGDI47IS.js");
       await renumberCommand2({
         code: options.targetCode,
         dryRun: false,
@@ -3872,7 +3883,7 @@ function formatJson3(result) {
 // src/commands/recode.ts
 async function recodeCommand(options) {
   try {
-    const { markers, specs } = await scan(options.config);
+    const { markers, specs, config } = await scan(options.config);
     const dryRun = options.dryRun === true;
     const { map, noChange: recodeNoChange } = buildRecodeMap(
       options.sourceCode,
@@ -3882,7 +3893,7 @@ async function recodeCommand(options) {
     let affectedFiles = [];
     let totalReplacements = 0;
     if (!recodeNoChange) {
-      const result2 = await propagate(map, specs, markers, dryRun);
+      const result2 = await propagate(map, specs, markers, config, dryRun);
       affectedFiles = result2.affectedFiles;
       totalReplacements = result2.totalReplacements;
     }
@@ -3895,11 +3906,15 @@ async function recodeCommand(options) {
       );
     }
     await executeRenames(renames, options.sourceCode, options.targetCode, dryRun);
+    const renamedPaths = new Set(renames.map((r) => r.oldPath));
     const propagatedPaths = new Set(affectedFiles.map((af) => af.filePath));
-    const nonSourceFiles = specs.specFiles.filter(
-      (sf) => !renames.some((r) => r.oldPath === sf.filePath) && !propagatedPaths.has(sf.filePath)
+    const specFilePaths = specs.specFiles.map((sf) => sf.filePath);
+    const combinedIgnore = [...config.specIgnore, ...config.extraSpecIgnore];
+    const extraFiles = await collectFiles(config.extraSpecGlobs, combinedIgnore);
+    const allFiles = [.../* @__PURE__ */ new Set([...specFilePaths, ...extraFiles])].filter(
+      (p) => !renamedPaths.has(p) && !propagatedPaths.has(p)
     );
-    const staleRefs = await findStaleRefs(options.sourceCode, nonSourceFiles);
+    const staleRefs = await findStaleRefs(options.sourceCode, allFiles);
     const noChange = recodeNoChange && renames.length === 0;
     const result = {
       sourceCode: options.sourceCode,
@@ -5393,6 +5408,15 @@ async function writeCache(latestVersion) {
   }
 }
 
+// src/cli/option-source.ts
+function cliProvidedOption(command, options, key) {
+  const source = command.getOptionValueSource(key);
+  if (source === "cli" || source === "env") {
+    return options[key];
+  }
+  return void 0;
+}
+
 // src/cli/index.ts
 var version = PACKAGE_INFO.version;
 var program = new Command();
@@ -5411,24 +5435,25 @@ function configureGenerateCommand(cmd) {
   ).option("-c, --config <path>", "Path to configuration file").option("--refresh", "Force refresh of cached Git templates", false).option("--all-targets", "Process all named targets from config", false).option("--target <name>", "Process a specific named target from config").option(
     "--overlay <path...>",
     "Overlay directory paths applied over base template (repeatable)"
-  ).option("--json", "Output results as JSON (implies --dry-run)", false).option("--summary", "Output compact one-line summary", false).action(async (output, options) => {
+  ).option("--json", "Output results as JSON (implies --dry-run)", false).option("--summary", "Output compact one-line summary", false).action(async (output, options, command) => {
+    const allTargets = cliProvidedOption(command, options, "allTargets");
     const cliOptions = {
       output,
-      template: options.template,
-      features: options.features,
-      preset: options.preset,
-      removeFeatures: options.removeFeatures,
-      force: options.force,
-      dryRun: options.dryRun,
-      delete: options.delete,
-      config: options.config,
-      refresh: options.refresh,
-      all: options.allTargets,
-      allTargets: options.allTargets,
-      target: options.target,
-      overlay: options.overlay || [],
-      json: options.json,
-      summary: options.summary
+      template: cliProvidedOption(command, options, "template"),
+      features: cliProvidedOption(command, options, "features"),
+      preset: cliProvidedOption(command, options, "preset"),
+      removeFeatures: cliProvidedOption(command, options, "removeFeatures"),
+      force: cliProvidedOption(command, options, "force"),
+      dryRun: cliProvidedOption(command, options, "dryRun"),
+      delete: cliProvidedOption(command, options, "delete"),
+      config: cliProvidedOption(command, options, "config"),
+      refresh: cliProvidedOption(command, options, "refresh"),
+      all: allTargets,
+      allTargets,
+      target: cliProvidedOption(command, options, "target"),
+      overlay: cliProvidedOption(command, options, "overlay"),
+      json: cliProvidedOption(command, options, "json"),
+      summary: cliProvidedOption(command, options, "summary")
     };
     await generateCommand(cliOptions);
   });
@@ -5438,24 +5463,25 @@ configureGenerateCommand(program.command("init"));
 template.command("diff").description("Compare template output with existing target directory").argument("[target]", "Target directory to compare against (optional if specified in config)").option("-t, --template <source>", "Template source (local path or Git repository)").option("-f, --features <flag...>", "Feature flags (can be specified multiple times)").option("--preset <name...>", "Preset names to enable (can be specified multiple times)").option(
   "--remove-features <flag...>",
   "Feature flags to remove (can be specified multiple times)"
-).option("-c, --config <path>", "Path to configuration file").option("--refresh", "Force refresh of cached Git templates", false).option("--list-unknown", "Include target-only files in diff results", false).option("--all-targets", "Process all named targets from config", false).option("--target <name>", "Process a specific named target from config").option("-w, --watch", "Watch template directory for changes and re-run diff", false).option("--overlay <path...>", "Overlay directory paths applied over base template (repeatable)").option("--json", "Output results as JSON", false).option("--summary", "Output compact one-line summary", false).action(async (target, options) => {
+).option("-c, --config <path>", "Path to configuration file").option("--refresh", "Force refresh of cached Git templates", false).option("--list-unknown", "Include target-only files in diff results", false).option("--all-targets", "Process all named targets from config", false).option("--target <name>", "Process a specific named target from config").option("-w, --watch", "Watch template directory for changes and re-run diff", false).option("--overlay <path...>", "Overlay directory paths applied over base template (repeatable)").option("--json", "Output results as JSON", false).option("--summary", "Output compact one-line summary", false).action(async (target, options, command) => {
+  const allTargets = cliProvidedOption(command, options, "allTargets");
   const cliOptions = {
     output: target,
     // Use target as output for consistency
-    template: options.template,
-    features: options.features,
-    preset: options.preset,
-    removeFeatures: options.removeFeatures,
-    config: options.config,
-    refresh: options.refresh,
-    listUnknown: options.listUnknown,
-    all: options.allTargets,
-    allTargets: options.allTargets,
-    target: options.target,
-    watch: options.watch,
-    overlay: options.overlay || [],
-    json: options.json,
-    summary: options.summary
+    template: cliProvidedOption(command, options, "template"),
+    features: cliProvidedOption(command, options, "features"),
+    preset: cliProvidedOption(command, options, "preset"),
+    removeFeatures: cliProvidedOption(command, options, "removeFeatures"),
+    config: cliProvidedOption(command, options, "config"),
+    refresh: cliProvidedOption(command, options, "refresh"),
+    listUnknown: cliProvidedOption(command, options, "listUnknown"),
+    all: allTargets,
+    allTargets,
+    target: cliProvidedOption(command, options, "target"),
+    watch: cliProvidedOption(command, options, "watch"),
+    overlay: cliProvidedOption(command, options, "overlay"),
+    json: cliProvidedOption(command, options, "json"),
+    summary: cliProvidedOption(command, options, "summary")
   };
   const exitCode = await diffCommand(cliOptions);
   process.exit(exitCode);
@@ -5475,41 +5501,41 @@ program.command("check").description(
 ).option(
   "--no-fix",
   "Skip regeneration of Requirements Traceability sections in DESIGN and TASK files"
-).action(async (options) => {
+).action(async (options, command) => {
   const cliOptions = {
-    config: options.config,
-    specIgnore: options.specIgnore,
-    codeIgnore: options.codeIgnore,
-    format: options.format,
-    json: options.json,
-    summary: options.summary,
-    allowWarnings: options.allowWarnings,
-    specOnly: options.specOnly,
-    fix: options.fix
+    config: cliProvidedOption(command, options, "config"),
+    specIgnore: cliProvidedOption(command, options, "specIgnore"),
+    codeIgnore: cliProvidedOption(command, options, "codeIgnore"),
+    format: cliProvidedOption(command, options, "format"),
+    json: cliProvidedOption(command, options, "json"),
+    summary: cliProvidedOption(command, options, "summary"),
+    allowWarnings: cliProvidedOption(command, options, "allowWarnings"),
+    specOnly: cliProvidedOption(command, options, "specOnly"),
+    fix: cliProvidedOption(command, options, "fix")
   };
   const exitCode = await checkCommand(cliOptions);
   process.exit(exitCode);
 });
-template.command("features").description("Discover feature flags available in a template").option("-t, --template <source>", "Template source (local path or Git repository)").option("-c, --config <path>", "Path to configuration file").option("--refresh", "Force refresh of cached Git templates", false).option("--overlay <path...>", "Overlay directory paths applied over base template (repeatable)").option("--json", "Output results as JSON", false).option("--summary", "Output compact one-line summary", false).action(async (options) => {
+template.command("features").description("Discover feature flags available in a template").option("-t, --template <source>", "Template source (local path or Git repository)").option("-c, --config <path>", "Path to configuration file").option("--refresh", "Force refresh of cached Git templates", false).option("--overlay <path...>", "Overlay directory paths applied over base template (repeatable)").option("--json", "Output results as JSON", false).option("--summary", "Output compact one-line summary", false).action(async (options, command) => {
   const exitCode = await featuresCommand({
-    template: options.template,
-    config: options.config,
-    refresh: options.refresh,
-    json: options.json,
-    summary: options.summary,
-    overlay: options.overlay || []
+    template: cliProvidedOption(command, options, "template"),
+    config: cliProvidedOption(command, options, "config"),
+    refresh: cliProvidedOption(command, options, "refresh"),
+    json: cliProvidedOption(command, options, "json"),
+    summary: cliProvidedOption(command, options, "summary"),
+    overlay: cliProvidedOption(command, options, "overlay")
   });
   process.exit(exitCode);
 });
-template.command("test").description("Run template test fixtures to verify expected output").option("-t, --template <source>", "Template source (local path or Git repository)").option("-c, --config <path>", "Path to configuration file").option("--update-snapshots", "Update stored snapshots with current rendered output", false).option("--refresh", "Force refresh of cached Git templates", false).option("--overlay <path...>", "Overlay directory paths applied over base template (repeatable)").option("--json", "Output results as JSON", false).option("--summary", "Output compact one-line summary", false).action(async (options) => {
+template.command("test").description("Run template test fixtures to verify expected output").option("-t, --template <source>", "Template source (local path or Git repository)").option("-c, --config <path>", "Path to configuration file").option("--update-snapshots", "Update stored snapshots with current rendered output", false).option("--refresh", "Force refresh of cached Git templates", false).option("--overlay <path...>", "Overlay directory paths applied over base template (repeatable)").option("--json", "Output results as JSON", false).option("--summary", "Output compact one-line summary", false).action(async (options, command) => {
   const testOptions = {
-    template: options.template,
-    config: options.config,
-    updateSnapshots: options.updateSnapshots,
-    refresh: options.refresh,
-    json: options.json,
-    summary: options.summary,
-    overlay: options.overlay || []
+    template: cliProvidedOption(command, options, "template"),
+    config: cliProvidedOption(command, options, "config"),
+    updateSnapshots: cliProvidedOption(command, options, "updateSnapshots") ?? false,
+    refresh: cliProvidedOption(command, options, "refresh"),
+    json: cliProvidedOption(command, options, "json"),
+    summary: cliProvidedOption(command, options, "summary"),
+    overlay: cliProvidedOption(command, options, "overlay")
   };
   const exitCode = await testCommand(testOptions);
   process.exit(exitCode);
@@ -5606,7 +5632,7 @@ var isDisabledByEnv = !!process.env.NO_UPDATE_NOTIFIER;
 if (!isJsonOrSummary && isTTY && !isDisabledByEnv) {
   updateCheckPromise = (async () => {
     try {
-      const { configLoader: configLoader2 } = await import("./config-EJIXC7D7.js");
+      const { configLoader: configLoader2 } = await import("./config-SJLBJX77.js");
       const configPath = process.argv.indexOf("-c") !== -1 ? process.argv[process.argv.indexOf("-c") + 1] : process.argv.indexOf("--config") !== -1 ? process.argv[process.argv.indexOf("--config") + 1] : void 0;
       const fileConfig = await configLoader2.load(configPath ?? null);
       const updateCheckConfig = fileConfig?.["update-check"];