@nathapp/nax 0.48.4 → 0.49.1

package/src/pipeline/stages/verify.ts

@@ -5,12 +5,11 @@
  * This is a lightweight verification before the full review stage.
  *
  * @returns
- * - `continue`: Tests passed
- * - `escalate`: Tests failed (retry with escalation)
+ * - `continue`: Tests passed, OR TEST_FAILURE (ctx.verifyResult.success===false → rectifyStage handles it)
+ * - `escalate`: TIMEOUT or RUNTIME_CRASH (structural — rectify can't fix these)
  */
 
 import { basename, join } from "node:path";
-import { loadConfigForWorkdir } from "../../config/loader";
 import type { SmartTestRunnerConfig } from "../../config/types";
 import { getLogger } from "../../logger";
 import { logTestOutput } from "../../utils/log-test-output";
@@ -91,10 +90,9 @@ export const verifyStage: PipelineStage = {
   async execute(ctx: PipelineContext): Promise<StageResult> {
     const logger = getLogger();
 
-    // MW-009: resolve effective config for per-package test commands
-    const effectiveConfig = ctx.story.workdir
-      ? await _verifyDeps.loadConfigForWorkdir(join(ctx.workdir, "nax", "config.json"), ctx.story.workdir)
-      : ctx.config;
+    // PKG-003: use centrally resolved effective config (set once per story in iteration-runner)
+    // Falls back to ctx.config for contexts that predate PKG-003 (e.g., acceptance-loop)
+    const effectiveConfig = ctx.effectiveConfig ?? ctx.config;
 
     // Skip verification if tests are not required
     if (!effectiveConfig.quality.requireTests) {
@@ -118,8 +116,8 @@ export const verifyStage: PipelineStage = {
     // Determine effective test command (smart runner or full suite)
     let effectiveCommand = testCommand;
     let isFullSuite = true;
-    const smartRunnerConfig = coerceSmartTestRunner(ctx.config.execution.smartTestRunner);
-    const regressionMode = ctx.config.execution.regressionGate?.mode ?? "deferred";
+    const smartRunnerConfig = coerceSmartTestRunner(effectiveConfig.execution.smartTestRunner);
+    const regressionMode = effectiveConfig.execution.regressionGate?.mode ?? "deferred";
 
     // Resolve {{package}} in testScoped template for monorepo stories.
     // Returns null if package.json is absent (non-JS project) — falls through to smart-runner.
@@ -207,8 +205,8 @@ export const verifyStage: PipelineStage = {
     const result = await _verifyDeps.regression({
       workdir: effectiveWorkdir,
       command: effectiveCommand,
-      timeoutSeconds: ctx.config.execution.verificationTimeoutSeconds,
-      acceptOnTimeout: ctx.config.execution.regressionGate?.acceptOnTimeout ?? true,
+      timeoutSeconds: effectiveConfig.execution.verificationTimeoutSeconds,
+      acceptOnTimeout: effectiveConfig.execution.regressionGate?.acceptOnTimeout ?? true,
     });
 
     // Store result on context for rectify stage
@@ -236,7 +234,7 @@ export const verifyStage: PipelineStage = {
     if (!result.success) {
       // BUG-019: Distinguish timeout from actual test failures
       if (result.status === "TIMEOUT") {
-        const timeout = ctx.config.execution.verificationTimeoutSeconds;
+        const timeout = effectiveConfig.execution.verificationTimeoutSeconds;
         logger.error(
           "verify",
           `Test suite exceeded timeout (${timeout}s). This is NOT a test failure — consider increasing execution.verificationTimeoutSeconds or scoping tests.`,
@@ -259,13 +257,19 @@ export const verifyStage: PipelineStage = {
         logTestOutput(logger, "verify", result.output, { storyId: ctx.story.id });
       }
 
-      return {
-        action: "escalate",
-        reason:
-          result.status === "TIMEOUT"
-            ? `Test suite TIMEOUT after ${ctx.config.execution.verificationTimeoutSeconds}s (not a code failure)`
-            : `Tests failed (exit code ${result.status ?? "non-zero"})`,
-      };
+      // RUNTIME_CRASH and TIMEOUT are structural — escalate immediately (rectify can't fix them)
+      if (result.status === "TIMEOUT" || detectRuntimeCrash(result.output)) {
+        return {
+          action: "escalate",
+          reason:
+            result.status === "TIMEOUT"
+              ? `Test suite TIMEOUT after ${effectiveConfig.execution.verificationTimeoutSeconds}s (not a code failure)`
+              : `Tests failed with runtime crash (exit code ${result.status ?? "non-zero"})`,
+        };
+      }
+
+      // TEST_FAILURE: ctx.verifyResult is set with success:false — rectifyStage handles it next
+      return { action: "continue" };
     }
 
     logger.info("verify", "Tests passed", { storyId: ctx.story.id });
@@ -278,6 +282,5 @@ export const verifyStage: PipelineStage = {
  */
 export const _verifyDeps = {
   regression,
-  loadConfigForWorkdir,
   readPackageName,
 };

package/src/pipeline/types.ts

@@ -58,6 +58,13 @@ export type AgentGetFn = (name: string) => import("../agents/types").AgentAdapte
 export interface PipelineContext {
   /** Ngent configuration */
   config: NaxConfig;
+  /**
+   * Resolved config for this story's package.
+   * When story.workdir is set, this is root config merged with package config.
+   * When no workdir, this equals ctx.config (root).
+   * Set once per story in the iteration runner before pipeline execution.
+   */
+  effectiveConfig: NaxConfig;
   /** Full PRD document */
   prd: PRD;
   /** Current story (or batch leader) */

package/src/utils/git.ts

@@ -181,7 +181,11 @@ export async function autoCommitIfDirty(workdir: string, stage: string, role: st
         return gitRoot;
       }
     })();
-    if (realWorkdir !== realGitRoot) return;
+    // Allow: workdir IS the git root, or workdir is a subdirectory (monorepo package)
+    // Reject: workdir has no git repo at all (realGitRoot would be empty/error)
+    const isAtRoot = realWorkdir === realGitRoot;
+    const isSubdir = realGitRoot && realWorkdir.startsWith(`${realGitRoot}/`);
+    if (!isAtRoot && !isSubdir) return;
 
     const statusProc = _gitDeps.spawn(["git", "status", "--porcelain"], {
       cwd: workdir,
@@ -199,7 +203,11 @@ export async function autoCommitIfDirty(workdir: string, stage: string, role: st
       dirtyFiles: statusOutput.trim().split("\n").length,
     });
 
-    const addProc = _gitDeps.spawn(["git", "add", "-A"], { cwd: workdir, stdout: "pipe", stderr: "pipe" });
+    // Use "git add ." when workdir is a monorepo package subdir — only stages files under
+    // that package, preventing accidental cross-package commits.
+    // Use "git add -A" at repo root to capture renames/deletions across the full tree.
+    const addArgs = isSubdir ? ["git", "add", "."] : ["git", "add", "-A"];
+    const addProc = _gitDeps.spawn(addArgs, { cwd: workdir, stdout: "pipe", stderr: "pipe" });
     await addProc.exited;
 
     const commitProc = _gitDeps.spawn(["git", "commit", "-m", `chore(${storyId}): auto-commit after ${role} session`], {