@nathapp/nax 0.69.5 → 0.69.7

package/dist/nax.js

@@ -18041,7 +18041,7 @@ function redactSecrets(input) {
 }
 var SECRET_KEY_PATTERN, SECRET_VALUE_PATTERNS, REDACTED = "[REDACTED]";
 var init_redact = __esm(() => {
-  SECRET_KEY_PATTERN = /(SECRET|TOKEN|API_?KEY|PASSWORD|PRIVATE_?KEY|ACCESS_?KEY|WEBHOOK)/i;
+  SECRET_KEY_PATTERN = /(SECRET|TOKEN(?!s\b)|API_?KEY|PASSWORD|PRIVATE_?KEY|ACCESS_?KEY|WEBHOOK)/i;
   SECRET_VALUE_PATTERNS = [
     /sk-[A-Za-z0-9_-]{16,}/g,
     /ghp_[A-Za-z0-9]{16,}/g,
@@ -24993,12 +24993,15 @@ async function getGitRootMemo(workdir) {
   }
   return result ?? null;
 }
-function extractPatternSuffix(pattern) {
-  const lastStar = pattern.lastIndexOf("*");
-  if (lastStar === -1)
+function extractBasenamePattern(pattern) {
+  const basename4 = pattern.slice(pattern.lastIndexOf("/") + 1);
+  const parts = basename4.split("*");
+  if (parts.length !== 2)
     return null;
-  const suffix = pattern.slice(lastStar + 1);
-  return suffix.length > 0 ? suffix : null;
+  const [prefix, suffix] = parts;
+  if (!prefix && !suffix)
+    return null;
+  return { prefix, suffix };
 }
 function extractSearchTerms(sourceFile) {
   const withoutPrefix = sourceFile.replace(/^(?:.*\/)?src\//, "");
@@ -25036,28 +25039,11 @@ async function importGrepFallback(sourceFiles, workdir, testFilePatterns) {
   return results.filter((p) => p !== null);
 }
 async function mapSourceToTests(sourceFiles, workdir, packagePrefix, testFilePatterns = [...DEFAULT_TEST_FILE_PATTERNS]) {
-  const testSuffixes = [...new Set(testFilePatterns.map(extractPatternSuffix).filter((s) => s !== null))];
+  const shapes = dedupeBasenamePatterns(testFilePatterns);
+  const testDirs = [...new Set([...DEFAULT_SEPARATED_TEST_DIRS, ...extractTestDirs(testFilePatterns)])];
   const result = [];
   for (const sourceFile of sourceFiles) {
-    const sourceWithoutExt = sourceFile.replace(/\.[^.]+$/, "");
-    let innerRelative;
-    let testBase;
-    if (packagePrefix) {
-      const srcRoot = `${packagePrefix}/src/`;
-      const inner = sourceFile.startsWith(srcRoot) ? sourceFile.slice(srcRoot.length) : sourceFile.replace(/^.*\/src\//, "");
-      innerRelative = inner.replace(/\.[^.]+$/, "");
-      testBase = `${workdir}/${packagePrefix}`;
-    } else {
-      innerRelative = sourceFile.replace(/^src\//, "").replace(/\.[^.]+$/, "");
-      testBase = workdir;
-    }
-    const candidates = [];
-    for (const suffix of testSuffixes) {
-      for (const testDir of DEFAULT_SEPARATED_TEST_DIRS) {
-        candidates.push(`${testBase}/${testDir}/${innerRelative}${suffix}`);
-      }
-      candidates.push(`${workdir}/${sourceWithoutExt}${suffix}`);
-    }
+    const candidates = buildTestCandidates(sourceFile, workdir, packagePrefix, shapes, testDirs);
     const existsFlags = await Promise.all(candidates.map((c) => _bunDeps.file(c).exists()));
     candidates.forEach((c, i) => {
       if (existsFlags[i])
@@ -25066,6 +25052,58 @@ async function mapSourceToTests(sourceFiles, workdir, packagePrefix, testFilePat
   }
   return result;
 }
+function dedupeBasenamePatterns(testFilePatterns) {
+  const seen = new Set;
+  const shapes = [];
+  for (const pattern of testFilePatterns) {
+    const shape = extractBasenamePattern(pattern);
+    if (!shape)
+      continue;
+    const key = `${shape.prefix}\x00${shape.suffix}`;
+    if (seen.has(key))
+      continue;
+    seen.add(key);
+    shapes.push(shape);
+  }
+  return shapes;
+}
+function buildTestCandidates(sourceFile, workdir, packagePrefix, shapes, testDirs) {
+  const sourceWithoutExt = sourceFile.replace(/\.[^.]+$/, "");
+  let innerRelative;
+  let testBase;
+  if (packagePrefix) {
+    const srcRoot = `${packagePrefix}/src/`;
+    const inner = sourceFile.startsWith(srcRoot) ? sourceFile.slice(srcRoot.length) : sourceFile.replace(/^.*\/src\//, "");
+    innerRelative = inner.replace(/\.[^.]+$/, "");
+    testBase = `${workdir}/${packagePrefix}`;
+  } else {
+    innerRelative = sourceFile.replace(/^src\//, "").replace(/\.[^.]+$/, "");
+    testBase = workdir;
+  }
+  const lastSlash = innerRelative.lastIndexOf("/");
+  const innerDir = lastSlash === -1 ? "" : innerRelative.slice(0, lastSlash);
+  const baseName = lastSlash === -1 ? innerRelative : innerRelative.slice(lastSlash + 1);
+  const sourceDirAbs = sourceWithoutExt.includes("/") ? `${workdir}/${sourceWithoutExt.slice(0, sourceWithoutExt.lastIndexOf("/"))}` : workdir;
+  const candidates = [];
+  for (const { prefix, suffix } of shapes) {
+    if (prefix === "") {
+      for (const testDir of testDirs) {
+        candidates.push(`${testBase}/${testDir}/${innerRelative}${suffix}`);
+      }
+      candidates.push(`${workdir}/${sourceWithoutExt}${suffix}`);
+    } else {
+      const named = `${prefix}${baseName}${suffix}`;
+      for (const testDir of testDirs) {
+        candidates.push(`${testBase}/${testDir}/${innerDir ? `${innerDir}/` : ""}${named}`);
+        if (innerDir)
+          candidates.push(`${testBase}/${testDir}/${named}`);
+      }
+      candidates.push(`${sourceDirAbs}/${named}`);
+    }
+  }
+  const sourceAbs = `${workdir}/${sourceFile}`;
+  return [...new Set(candidates)].filter((c) => c !== sourceAbs);
+}
 function buildSmartTestCommand(testFiles, baseCommand) {
   if (testFiles.length === 0) {
     return baseCommand;
@@ -39763,28 +39801,47 @@ var init_verify_scoped = __esm(() => {
         timeoutSeconds: scopedTimeout,
         isFullSuite: selection.isFullSuite
       });
+      const runTests = async (command) => {
+        const result2 = await deps.regression({
+          workdir: cmdWorkdir,
+          command,
+          timeoutSeconds: scopedTimeout,
+          forceExit: quality.quality?.forceExit,
+          detectOpenHandles: quality.quality?.detectOpenHandles,
+          detectOpenHandlesRetries: quality.quality?.detectOpenHandlesRetries,
+          gracePeriodMs: quality.quality?.gracePeriodMs,
+          drainTimeoutMs: quality.quality?.drainTimeoutMs,
+          shell: quality.quality?.shell,
+          stripEnvVars: quality.quality?.stripEnvVars
+        });
+        const parsed2 = result2.output ? deps.parseTestOutput(result2.output) : { passed: 0, failed: 0, failures: [] };
+        return { result: result2, parsed: parsed2 };
+      };
       const start = Date.now();
-      const result = await deps.regression({
-        workdir: cmdWorkdir,
-        command: selection.effectiveCommand,
-        timeoutSeconds: quality.execution?.regressionGate?.timeoutSeconds ?? 600,
-        forceExit: quality.quality?.forceExit,
-        detectOpenHandles: quality.quality?.detectOpenHandles,
-        detectOpenHandlesRetries: quality.quality?.detectOpenHandlesRetries,
-        gracePeriodMs: quality.quality?.gracePeriodMs,
-        drainTimeoutMs: quality.quality?.drainTimeoutMs,
-        shell: quality.quality?.shell,
-        stripEnvVars: quality.quality?.stripEnvVars
-      });
+      let effectiveCommand = selection.effectiveCommand;
+      let isFullSuite = selection.isFullSuite;
+      let scopeTestFallback = selection.scopeTestFallback;
+      let { result, parsed } = await runTests(effectiveCommand);
+      const ranNoTests = parsed.passed === 0 && parsed.failed === 0 && parsed.failures.length === 0;
+      if (!result.success && result.status !== "TIMEOUT" && !isFullSuite && ranNoTests) {
+        logger.warn("verify[scoped]", "Scoped run executed no tests \u2014 falling back to full suite", {
+          storyId: input.storyId,
+          command: effectiveCommand,
+          exitCode: result.exitCode
+        });
+        effectiveCommand = baseCommand;
+        isFullSuite = true;
+        scopeTestFallback = true;
+        ({ result, parsed } = await runTests(effectiveCommand));
+      }
       const durationMs = Date.now() - start;
-      const parsed = result.output ? deps.parseTestOutput(result.output) : { passed: 0, failed: 0, failures: [] };
       if (result.success) {
         logger.info("verify[scoped]", "Scoped tests passed", {
           storyId: input.storyId,
           passCount: parsed.passed,
           durationMs,
-          scopeTestFallback: selection.scopeTestFallback ?? false,
-          isFullSuite: selection.isFullSuite
+          scopeTestFallback: scopeTestFallback ?? false,
+          isFullSuite
         });
         return {
           success: true,
@@ -39792,16 +39849,16 @@ var init_verify_scoped = __esm(() => {
           findings: [],
           durationMs,
           passCount: parsed.passed,
-          isFullSuite: selection.isFullSuite,
-          scopeTestFallback: selection.scopeTestFallback
+          isFullSuite,
+          scopeTestFallback
         };
       }
       if (result.status === "TIMEOUT") {
         logger.warn("verify[scoped]", "Scoped tests timed out", {
           storyId: input.storyId,
           durationMs,
-          scopeTestFallback: selection.scopeTestFallback ?? false,
-          isFullSuite: selection.isFullSuite
+          scopeTestFallback: scopeTestFallback ?? false,
+          isFullSuite
         });
         return {
           success: false,
@@ -39809,8 +39866,8 @@ var init_verify_scoped = __esm(() => {
           findings: [],
           durationMs,
           passCount: parsed.passed,
-          isFullSuite: selection.isFullSuite,
-          scopeTestFallback: selection.scopeTestFallback
+          isFullSuite,
+          scopeTestFallback
         };
       }
       logger.warn("verify[scoped]", "Scoped tests failed", {
@@ -39818,17 +39875,35 @@ var init_verify_scoped = __esm(() => {
         passCount: parsed.passed,
         failCount: parsed.failed,
         durationMs,
-        scopeTestFallback: selection.scopeTestFallback ?? false,
-        isFullSuite: selection.isFullSuite
+        scopeTestFallback: scopeTestFallback ?? false,
+        isFullSuite
       });
+      let findings = deps.testSummaryToFindings(parsed);
+      if (findings.length === 0) {
+        logger.warn("verify[scoped]", "Scoped verify execution-failed \u2014 emitting synth finding", {
+          storyId: input.storyId,
+          command: effectiveCommand,
+          exitCode: result.exitCode,
+          cwd: cmdWorkdir
+        });
+        findings = [
+          executionFailureToFinding({
+            command: result.command ?? effectiveCommand,
+            exitCode: result.exitCode,
+            output: result.output ?? "",
+            packageDir: input.packagePrefix,
+            cwd: cmdWorkdir
+          })
+        ];
+      }
       return {
         success: false,
         status: "failed",
-        findings: deps.testSummaryToFindings(parsed),
+        findings,
         durationMs,
         passCount: parsed.passed,
-        isFullSuite: selection.isFullSuite,
-        scopeTestFallback: selection.scopeTestFallback
+        isFullSuite,
+        scopeTestFallback
       };
     }
   };
@@ -39973,26 +40048,23 @@ async function runFixCycle(cycle, ctx, cycleName, _deps = {}) {
         costUsd: totalCostUsd
       };
     }
-    for (const strategy of active) {
-      const attempts = countStrategyAttempts(cycle.iterations, strategy.name);
-      if (attempts >= strategy.maxAttempts) {
-        logger?.info("findings.cycle", "cycle exited \u2014 strategy attempt cap reached", {
-          storyId,
-          packageDir,
-          cycleName,
-          reason: "max-attempts-per-strategy",
-          exhaustedStrategy: strategy.name,
-          attempts,
-          maxAttempts: strategy.maxAttempts
-        });
-        return {
-          iterations: cycle.iterations,
-          finalFindings: cycle.findings,
-          exitReason: "max-attempts-per-strategy",
-          exhaustedStrategy: strategy.name,
-          costUsd: totalCostUsd
-        };
-      }
+    const uncappedActive = active.filter((s) => countStrategyAttempts(cycle.iterations, s.name) < s.maxAttempts);
+    if (uncappedActive.length === 0) {
+      const exhaustedStrategy = active.find((s) => countStrategyAttempts(cycle.iterations, s.name) >= s.maxAttempts);
+      logger?.info("findings.cycle", "cycle exited \u2014 all active strategies exhausted", {
+        storyId,
+        packageDir,
+        cycleName,
+        reason: "max-attempts-per-strategy",
+        exhaustedStrategy: exhaustedStrategy?.name
+      });
+      return {
+        iterations: cycle.iterations,
+        finalFindings: cycle.findings,
+        exitReason: "max-attempts-per-strategy",
+        exhaustedStrategy: exhaustedStrategy?.name,
+        costUsd: totalCostUsd
+      };
     }
     const totalAttempts = countTotalAttempts(cycle.iterations);
     if (totalAttempts >= cycle.config.maxAttemptsTotal) {
@@ -40011,7 +40083,7 @@ async function runFixCycle(cycle, ctx, cycleName, _deps = {}) {
         costUsd: totalCostUsd
       };
     }
-    for (const strategy of active) {
+    for (const strategy of uncappedActive) {
       const bailReason = strategy.bailWhen?.(cycle.iterations) ?? null;
       if (bailReason !== null) {
         logger?.info("findings.cycle", "cycle exited \u2014 bail predicate fired", {
@@ -40031,7 +40103,7 @@ async function runFixCycle(cycle, ctx, cycleName, _deps = {}) {
         };
       }
     }
-    const group = selectExecutionGroup(active);
+    const group = selectExecutionGroup(uncappedActive);
     const startedAt = now();
     const findingsBefore = [...cycle.findings];
     const fixesApplied = [];
@@ -40142,6 +40214,19 @@ async function runFixCycle(cycle, ctx, cycleName, _deps = {}) {
         };
       }
       if (liteShortCircuited) {
+        const companions = uncappedActive.filter((s) => !group.includes(s));
+        if (companions.length > 0) {
+          const iterCostUsd = fixesApplied.reduce((sum, fa) => sum + (fa.costUsd ?? 0), 0);
+          totalCostUsd += iterCostUsd;
+          logger?.info("findings.cycle", "exclusive strategy exhausted \u2014 continuing to companion strategies", {
+            storyId,
+            packageDir,
+            cycleName,
+            exhaustedStrategies: group.map((s) => s.name),
+            remainingStrategies: companions.map((s) => s.name)
+          });
+          continue;
+        }
         logger?.info("findings.cycle", "cycle exited \u2014 validate short-circuited", {
           storyId,
           packageDir,
@@ -54803,6 +54888,33 @@ class ExecutionPlan {
         }
       }
     }
+    if (this.state.rectification && rectResult.rectificationExhausted) {
+      const mechanicalOnly = !!rectResult.unfixedFindings?.length && rectResult.unfixedFindings.every((f) => f.source === "lint" || f.source === "typecheck");
+      if (mechanicalOnly) {
+        for (const phase of collectOrderedPhases(this.state)) {
+          const name = phase.slot.op.name;
+          if (name in phaseOutputs)
+            continue;
+          try {
+            await runPhase(this.ctx, phase.slot, phaseCosts, phaseOutputs, this.isThreeSession);
+          } catch (error48) {
+            logger?.error("story-orchestrator", "Phase threw unexpected error (mechanical-only resume)", {
+              storyId: this.ctx.storyId,
+              phase: name,
+              error: errorMessage(error48)
+            });
+            throw error48;
+          }
+          if (!phasePassed(name, phaseOutputs[name], this.ctx.storyId)) {
+            logger?.warn("story-orchestrator", "Phase failed in mechanical-only resume", {
+              storyId: this.ctx.storyId,
+              phase: name
+            });
+            break;
+          }
+        }
+      }
+    }
     const advCfg = this.state.adversarialReview ? this.state.nonBlockingFix : undefined;
     const advisoryOut = phaseOutputs["adversarial-review"];
     const advisoryFindings = advisoryOut?.advisoryFindings ?? [];
@@ -55663,7 +55775,7 @@ async function decideStageAction(ctx, planResult, inspection, opts) {
     const sources = new Set(planResult.unfixedFindings.map((f) => f.source));
     const allMechanical = [...sources].every((s) => s === "lint" || s === "typecheck");
     if (allMechanical) {
-      logger.warn("execution", "Mechanical-only failure unfixable \u2014 proceeding (LLM review passed)", {
+      logger.warn("execution", "Mechanical-only failure unfixable \u2014 proceeding (style-only errors remain)", {
         storyId: ctx.story.id
       });
       return { action: "continue" };
@@ -59658,7 +59770,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.69.5",
+    version: "0.69.7",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -59753,8 +59865,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("f09a75e2"))
-        return "f09a75e2";
+      if (/^[0-9a-f]{6,10}$/.test("d524317e"))
+        return "d524317e";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {

package/package.json

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