@nathapp/nax 0.73.0-canary.1 → 0.73.1

package/dist/nax.js

@@ -36839,8 +36839,7 @@ function resolvePytestBin(packageDir) {
 }
 function buildAcceptanceRunCommand(testPath, testFramework, commandOverride, packageDir) {
   if (commandOverride) {
-    const resolved = commandOverride.replace(/\{\{files\}\}/g, testPath).replace(/\{\{file\}\}/g, testPath).replace(/\{\{FILE\}\}/g, testPath);
-    return resolved.trim().split(/\s+/);
+    return commandOverride.trim().split(/\s+/).map((part) => part.replace(/\{\{files\}\}/g, testPath).replace(/\{\{file\}\}/g, testPath).replace(/\{\{FILE\}\}/g, testPath));
   }
   switch (testFramework?.toLowerCase()) {
     case "vitest":
@@ -40291,14 +40290,21 @@ var init_autofix_test_writer_strategy = __esm(() => {
 });
 
 // src/operations/apply-test-edit-declarations.ts
-function applyTestEditDeclarations(findings, declarations, story, invalidMockStructure) {
+function applyTestEditDeclarations(findings, declarations, story, opts = {}) {
+  const { invalidMockStructure, allowTestRetag = true } = opts;
   let result = [...findings];
-  const advisories = [];
+  const diagnostics = [];
   for (const d of declarations) {
     if (d.reason === "prd_contract") {
       const prdQuote = d.prdQuote ?? "";
       const valid = validatePrdQuote(prdQuote, story);
-      if (valid) {
+      if (!valid) {
+        diagnostics.push({
+          reason: "prd_quote_mismatch",
+          file: d.file,
+          detail: `PRD quote not found verbatim in story text for file: ${d.file}`
+        });
+      } else if (allowTestRetag) {
         result = result.map((f) => {
           const eligible = f.file === d.file && (f.fixTarget === "source" || f.fixTarget == null && f.source === "test-runner");
           if (eligible) {
@@ -40313,31 +40319,18 @@ function applyTestEditDeclarations(findings, declarations, story, invalidMockStr
           }
           return f;
         });
-      } else {
-        advisories.push({
-          source: "autofix",
-          severity: "warning",
-          category: "prd_quote_mismatch",
-          message: `PRD quote not found verbatim in story text for file: ${d.file}`,
-          file: d.file,
-          fixTarget: "source"
-        });
       }
     }
   }
-  if (invalidMockStructure && invalidMockStructure.length > 0) {
-    for (const d of invalidMockStructure) {
-      const fileList = (d.files ?? [d.file]).join(", ");
-      advisories.push({
-        source: "autofix",
-        severity: "warning",
-        category: "mock_structure_invalid_files",
-        message: `Mock structure handoff references file that does not exist or is not a test file: ${fileList}`,
-        fixTarget: "source"
-      });
-    }
+  for (const d of invalidMockStructure ?? []) {
+    const fileList = (d.files ?? [d.file]).join(", ");
+    diagnostics.push({
+      reason: "mock_structure_invalid_files",
+      file: d.file,
+      detail: `Mock structure handoff references file that does not exist or is not a test file: ${fileList}`
+    });
   }
-  return [...result, ...advisories];
+  return { findings: result, diagnostics };
 }
 var init_apply_test_edit_declarations = __esm(() => {
   init_test_edit_declaration();
@@ -41637,12 +41630,14 @@ async function runFixCycle(cycle, ctx, cycleName, _deps = {}) {
     }
     const active = selectActiveStrategies(cycle.strategies, cycle.findings, cycle.verdict);
     if (active.length === 0) {
-      logger?.info("findings.cycle", "cycle exited \u2014 no matching strategy", {
+      const orphanSources = [...new Set(cycle.findings.map((f) => f.source))];
+      logger?.warn("findings.cycle", "cycle exited \u2014 no matching strategy (orphaned findings)", {
         storyId,
         packageDir,
         cycleName,
         reason: "no-strategy",
-        findingsCount: cycle.findings.length
+        findingsCount: cycle.findings.length,
+        orphanSources
       });
       return {
         iterations: cycle.iterations,
@@ -58427,6 +58422,20 @@ import { join as join50 } from "path";
 function requiresInitialRefCapture(strategy) {
   return isThreeSessionStrategy(strategy);
 }
+function logRejectedDeclarations(diagnostics, ctx) {
+  if (diagnostics.length === 0)
+    return;
+  const logger = getSafeLogger();
+  for (const d of diagnostics) {
+    logger?.warn("findings.cycle", "test-edit declaration rejected \u2014 ignoring declaration", {
+      storyId: ctx.storyId,
+      packageDir: ctx.packageDir,
+      reason: d.reason,
+      file: d.file,
+      detail: d.detail
+    });
+  }
+}
 function isFreshRun(story) {
   const hasAttempts = (story.attempts ?? 0) > 0;
   const hasReviewEscalation = (story.priorFailures ?? []).some((f) => f.stage === "review");
@@ -58498,7 +58507,7 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
         strategies.push(makeAutofixTestWriterStrategy(story, config2, sink));
       }
     }
-    const postValidate = async (findings, _validateCtx) => {
+    const postValidate = async (findings, validateCtx) => {
       if (sink.testEdits.length === 0 && sink.mockHandoffs.length === 0)
         return findings;
       const pendingMock = sink.mockHandoffs.map((h) => ({
@@ -58511,7 +58520,12 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
       sink.mockHandoffs = valid.map((d) => ({ files: d.files ?? [], reasonDetail: d.reasonDetail ?? "" }));
       const allDeclarations = [...sink.testEdits, ...valid];
       sink.testEdits = [];
-      return applyTestEditDeclarations(findings, allDeclarations, story, invalid);
+      const applied = applyTestEditDeclarations(findings, allDeclarations, story, {
+        invalidMockStructure: invalid,
+        allowTestRetag: isThreeSession
+      });
+      logRejectedDeclarations(applied.diagnostics, validateCtx);
+      return applied.findings;
     };
     const rectOpts = {
       ...inputs.rectification,
@@ -58551,7 +58565,7 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
       }));
     }
     nbStrategies.push(makeFullSuiteRectifyStrategy(story, config2, nbSink));
-    const nbPostValidate = async (findings, _validateCtx) => {
+    const nbPostValidate = async (findings, validateCtx) => {
       if (nbSink.testEdits.length === 0 && nbSink.mockHandoffs.length === 0)
         return findings;
       const pendingMock = nbSink.mockHandoffs.map((h) => ({
@@ -58564,7 +58578,12 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
       nbSink.mockHandoffs = valid.map((d) => ({ files: d.files ?? [], reasonDetail: d.reasonDetail ?? "" }));
       const allDeclarations = [...nbSink.testEdits, ...valid];
       nbSink.testEdits = [];
-      return applyTestEditDeclarations(findings, allDeclarations, story, invalid);
+      const applied = applyTestEditDeclarations(findings, allDeclarations, story, {
+        invalidMockStructure: invalid,
+        allowTestRetag: isThreeSession
+      });
+      logRejectedDeclarations(applied.diagnostics, validateCtx);
+      return applied.findings;
     };
     builder.addNonBlockingFix(nbf, nbStrategies, nbPostValidate);
   }
@@ -58572,6 +58591,7 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
 }
 var init_build_plan_for_strategy = __esm(() => {
   init_config();
+  init_logger2();
   init_operations();
   init_execution_gates();
   init_full_suite_rectify();
@@ -59183,6 +59203,17 @@ async function decideStageAction(ctx, planResult, inspection, opts) {
     ctx.tddFailureCategory = failureCategory;
   }
   if (planResult.rectificationExhausted && planResult.unfixedFindings && planResult.unfixedFindings.length > 0) {
+    const blockingThreshold = ctx.config?.review?.blockingThreshold ?? "error";
+    const blockingUnfixed = planResult.unfixedFindings.filter((f) => isBlockingSeverity(f.severity ?? "error", blockingThreshold));
+    if (blockingUnfixed.length === 0) {
+      logger.warn("execution", "Rectification exhausted but all unfixed findings are advisory (below blocking threshold) \u2014 proceeding", {
+        storyId: ctx.story.id,
+        blockingThreshold,
+        unfixedCount: planResult.unfixedFindings.length,
+        unfixedSources: [...new Set(planResult.unfixedFindings.map((f) => f.source))]
+      });
+      return { action: "continue" };
+    }
     const sources = new Set(planResult.unfixedFindings.map((f) => f.source));
     const allMechanical = [...sources].every((s) => s === "lint" || s === "typecheck");
     if (allMechanical) {
@@ -59344,6 +59375,7 @@ var init_post_run = __esm(() => {
   init_operations();
   init_execution_helpers();
   init_quality();
+  init_severity();
   init_scratch_writer();
   init_rollback();
   init_git();
@@ -59925,6 +59957,8 @@ var init_queue_handler = __esm(() => {
 import path15 from "path";
 var queueCheckStage;
 var init_queue_check = __esm(() => {
+  init_config();
+  init_errors();
   init_queue_handler();
   init_logger2();
   init_prd();
@@ -59973,8 +60007,11 @@ var init_queue_check = __esm(() => {
           continue;
         }
         if (cmd.type === "INJECT") {
-          const storyFilePath = path15.isAbsolute(cmd.storyFile) ? cmd.storyFile : path15.join(ctx.workdir, cmd.storyFile);
           try {
+            if (path15.isAbsolute(cmd.storyFile)) {
+              throw new NaxError(`INJECT storyFile must be a relative path within the workspace: ${cmd.storyFile}`, "INJECT_PATH_ABSOLUTE", { stage: "queue-check", storyId: ctx.story?.id ?? "unknown", storyFile: cmd.storyFile });
+            }
+            const storyFilePath = validateFilePath(path15.join(ctx.workdir, cmd.storyFile), ctx.workdir);
             const raw = await Bun.file(storyFilePath).json();
             const existingIds = new Set(ctx.prd.userStories.map((s) => s.id));
             const story = validateInjectedStory(raw, existingIds);
@@ -63447,13 +63484,9 @@ var init_loader4 = __esm(() => {
 });
 
 // src/execution/checkpoint/writer.ts
-import { rename } from "fs/promises";
+import { appendFile as appendFile4 } from "fs/promises";
 async function defaultAppend(filePath, line) {
-  const file3 = Bun.file(filePath);
-  const existing = await file3.exists() ? await file3.text() : "";
-  const tmpPath = `${filePath}.tmp`;
-  await Bun.write(tmpPath, existing + line);
-  await rename(tmpPath, filePath);
+  await appendFile4(filePath, line, "utf8");
 }
 function createCheckpointWriter(filePath, runId) {
   return new CheckpointWriter({ filePath, runId, _deps: { append: defaultAppend } });
@@ -63554,15 +63587,8 @@ async function loadCheckpoints(featureDir, options = { _deps: { read: defaultRea
       break;
     }
   }
-  let latestRunId;
-  for (const r of validRecords) {
-    latestRunId = maxRunId(latestRunId, r.runId);
-  }
-  if (latestRunId === undefined)
-    return new Map;
-  const latest = validRecords.filter((r) => r.runId === latestRunId);
   const grouped = new Map;
-  for (const r of latest) {
+  for (const r of validRecords) {
     const list = grouped.get(r.storyId);
     if (list) {
       list.push(r);
@@ -63570,6 +63596,13 @@ async function loadCheckpoints(featureDir, options = { _deps: { read: defaultRea
       grouped.set(r.storyId, [r]);
     }
   }
+  for (const [storyId, records] of grouped) {
+    let latestRunId;
+    for (const r of records) {
+      latestRunId = maxRunId(latestRunId, r.runId);
+    }
+    grouped.set(storyId, records.filter((r) => r.runId === latestRunId));
+  }
   const result = new Map;
   for (const [storyId, records] of grouped) {
     const seen = new Set;
@@ -63842,7 +63875,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.73.0-canary.1",
+    version: "0.73.1",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -63943,8 +63976,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("425d60d1"))
-        return "425d60d1";
+      if (/^[0-9a-f]{6,10}$/.test("73c95c44"))
+        return "73c95c44";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -64850,7 +64883,7 @@ var init_acceptance_loop = __esm(() => {
 });
 
 // src/session/scratch-purge.ts
-import { mkdir as mkdir12, rename as rename2, rm } from "fs/promises";
+import { mkdir as mkdir12, rename, rm } from "fs/promises";
 import { dirname as dirname13, join as join84 } from "path";
 async function purgeStaleScratch(projectDir, featureName, retentionDays, archiveInsteadOfDelete = false) {
   const sessionsDir = join84(projectDir, ".nax", "features", featureName, "sessions");
@@ -64903,7 +64936,7 @@ var init_scratch_purge = __esm(() => {
     remove: (path24) => rm(path24, { recursive: true, force: true }),
     move: async (src, dest) => {
       await mkdir12(dirname13(dest), { recursive: true });
-      await rename2(src, dest);
+      await rename(src, dest);
     },
     now: () => Date.now()
   };
@@ -66053,7 +66086,7 @@ var init_ensure_package_dirs = __esm(() => {
 });
 
 // src/pipeline/subscribers/events-writer.ts
-import { appendFile as appendFile4, mkdir as mkdir13 } from "fs/promises";
+import { appendFile as appendFile5, mkdir as mkdir13 } from "fs/promises";
 import { basename as basename15, join as join85 } from "path";
 function wireEventsWriter(bus, feature, runId, workdir) {
   const logger = getSafeLogger();
@@ -66068,7 +66101,7 @@ function wireEventsWriter(bus, feature, runId, workdir) {
           await mkdir13(eventsDir, { recursive: true });
           dirReady = true;
         }
-        await appendFile4(eventsFile, `${JSON.stringify(line)}
+        await appendFile5(eventsFile, `${JSON.stringify(line)}
 `);
       } catch (err) {
         logger?.warn("events-writer", "Failed to write event line (non-fatal)", {
@@ -69031,7 +69064,7 @@ var init_runner_execution = __esm(() => {
 });
 
 // src/execution/status-file.ts
-import { rename as rename3, unlink as unlink3 } from "fs/promises";
+import { rename as rename2, unlink as unlink3 } from "fs/promises";
 import { resolve as resolve16 } from "path";
 function countProgress(prd) {
   const stories = prd.userStories;
@@ -69086,7 +69119,7 @@ async function writeStatusFile(filePath, status) {
     await unlink3(tmpPath);
   } catch {}
   await Bun.write(tmpPath, JSON.stringify(status, null, 2));
-  await rename3(tmpPath, resolvedPath);
+  await rename2(tmpPath, resolvedPath);
 }
 var init_status_file = () => {};
 
@@ -69242,7 +69275,7 @@ __export(exports_migrate, {
   detectGeneratedContent: () => detectGeneratedContent
 });
 import { existsSync as existsSync36 } from "fs";
-import { mkdir as mkdir16, readdir as readdir5, rename as rename4 } from "fs/promises";
+import { mkdir as mkdir16, readdir as readdir5, rename as rename3 } from "fs/promises";
 import path28 from "path";
 async function detectGeneratedContent(naxDir) {
   if (!existsSync36(naxDir))
@@ -69331,7 +69364,7 @@ async function migrateCommand(options) {
     const archiveBase = path28.join(globalConfigDir(), "_archive");
     const archiveDest = path28.join(archiveBase, `${options.reclaim}-${Date.now()}`);
     await mkdir16(archiveBase, { recursive: true });
-    await rename4(src, archiveDest);
+    await rename3(src, archiveDest);
     logger.info("migrate", `Reclaimed: archived to ${archiveDest}`, { storyId: "_migrate" });
     return;
   }
@@ -69410,7 +69443,7 @@ async function migrateCommand(options) {
   Remove the destination or run nax migrate --dry-run to inspect.`, "MIGRATE_CONFLICT", { stage: "migrate", src: candidate.srcPath, dest });
     }
     try {
-      await rename4(candidate.srcPath, dest);
+      await rename3(candidate.srcPath, dest);
     } catch (err) {
       const isXdev = err instanceof Error && "code" in err && err.code === "EXDEV";
       if (isXdev) {
@@ -102467,6 +102500,7 @@ async function resolveFeatureAcceptance(featureName, workdir) {
         testPath: relative15(repoRoot, g.testPath),
         exists: await Bun.file(g.testPath).exists(),
         command,
+        cwd: packageDir,
         language: g.language
       };
     }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nathapp/nax",
-  "version": "0.73.0-canary.1",
+  "version": "0.73.1",
   "description": "AI Coding Agent Orchestrator — loops until done",
   "type": "module",
   "bin": {