@nathapp/nax 0.60.2 → 0.61.1

package/dist/nax.js

@@ -3238,7 +3238,14 @@ GOOD (write ACs like these):
 - "validatePostRunAction() returns false and logs warning when postRunAction.execute is not a function"
 - "cleanupRun() calls action.execute() only when action.shouldRun() resolves to true"
 - "When action.execute() throws, cleanupRun() logs at warn level and continues to the next action"
-- "resolveRouting() short-circuits and returns story.routing values when both complexity and testStrategy are already set"`, LANGUAGE_PATTERNS, TYPE_PATTERNS, GROUPING_RULES = `## Story Rules
+- "resolveRouting() short-circuits and returns story.routing values when both complexity and testStrategy are already set"`, LANGUAGE_PATTERNS, TYPE_PATTERNS, SPEC_ANCHOR_RULES = `## Spec Fidelity Rules
+
+When a spec is provided, these rules govern acceptance criteria generation:
+
+1. **Preserve spec ACs.** Every acceptance criterion stated in the spec must appear in \`acceptanceCriteria\`, verbatim or lightly rephrased for testability. Never silently drop a spec AC.
+2. **Do not invent spec ACs.** If you identify useful behavioral edge cases or negative paths that the spec did not explicitly list, place them in \`suggestedCriteria\` (a string array on the same story object) \u2014 never in \`acceptanceCriteria\`. These go through a separate hardening pass.
+3. **Respect story scope.** Each story's criteria must only cover what the spec says for that story. Do not assign criteria that belong to a different story's scope (wrong feature area, wrong file, wrong dependency chain).
+4. **\`suggestedCriteria\` format.** Each element must be a plain behavioral assertion \u2014 an observable output, return value, state change, or error condition that a test can assert. Never include implementation details (imports, internal structure), design suggestions, or vague descriptions.`, GROUPING_RULES = `## Story Rules
 
 - Every story must produce code changes verifiable by tests or review.
 - NEVER create stories for analysis, planning, documentation, or migration plans.
@@ -18063,6 +18070,7 @@ function isLegacyFlatModels(val) {
 var TokenPricingSchema, ModelDefSchema, ModelEntrySchema, PerAgentModelMapSchema, ModelMapSchema, ModelTierSchema, TierConfigSchema, AutoModeConfigSchema, RectificationConfigSchema, RegressionGateConfigSchema, SmartTestRunnerConfigSchema, SMART_TEST_RUNNER_DEFAULT, smartTestRunnerFieldSchema, ExecutionConfigSchema, QualityConfigSchema, TddConfigSchema, ConstitutionConfigSchema, AnalyzeConfigSchema, SemanticReviewConfigSchema, ReviewDialogueConfigSchema, ReviewConfigSchema, PlanConfigSchema, AcceptanceFixConfigSchema, AcceptanceConfigSchema, TestCoverageConfigSchema, ContextAutoDetectConfigSchema, ContextConfigSchema, LlmRoutingConfigSchema, RoutingConfigSchema, OptimizerConfigSchema, PluginConfigEntrySchema, HooksConfigSchema, InteractionConfigSchema, StorySizeGateConfigSchema, PromptAuditConfigSchema, AgentConfigSchema, PrecheckConfigSchema, PromptsConfigSchema, ProjectProfileSchema, VALID_AGENT_TYPES, GenerateConfigSchema, DebaterPersonaEnum, DebaterSchema, toObject = (val) => val === undefined || val === null ? {} : val, RESOLVER_TYPES, makeResolverSchema = (defaultType) => exports_external.preprocess(toObject, exports_external.object({
   type: exports_external.enum(RESOLVER_TYPES).default(defaultType),
   agent: exports_external.string().min(1).optional(),
+  model: exports_external.string().min(1).optional(),
   tieBreaker: exports_external.string().min(1).optional(),
   maxPromptTokens: exports_external.number().int().positive().optional()
 })), DebateStageConfigSchema = (defaults) => exports_external.preprocess(toObject, exports_external.object({
@@ -18308,7 +18316,8 @@ var init_schemas3 = __esm(() => {
   PlanConfigSchema = exports_external.object({
     model: ModelTierSchema,
     outputPath: exports_external.string().min(1, "plan.outputPath must be non-empty"),
-    timeoutSeconds: exports_external.number().int().positive().default(600)
+    timeoutSeconds: exports_external.number().int().positive().default(600),
+    decomposeTimeoutSeconds: exports_external.number().int().min(30).max(1800).optional()
   });
   AcceptanceFixConfigSchema = exports_external.object({
     diagnoseModel: exports_external.string().min(1, "acceptance.fix.diagnoseModel must be non-empty").default("fast"),
@@ -19544,7 +19553,8 @@ class AcpAgentAdapter {
         workdir: options.workdir,
         featureName: options.featureName,
         storyId: options.storyId,
-        sessionRole: options.sessionRole ?? "decompose"
+        sessionRole: options.sessionRole ?? "decompose",
+        timeoutMs: (this.naxConfig?.plan?.decomposeTimeoutSeconds ?? this.naxConfig?.plan?.timeoutSeconds ?? 300) * 1000
       });
       output = completeResult.output;
     } catch (err) {
@@ -21315,14 +21325,16 @@ ${errors3.join(`
   }
   return result.data;
 }
-async function loadConfigForWorkdir(rootConfigPath, packageDir) {
+async function loadConfigForWorkdir(rootConfigPath, packageDir, cliOverrides) {
   const logger = getLogger();
   const resolvedRootConfigPath = resolve5(rootConfigPath);
   const rootNaxDir = dirname2(resolvedRootConfigPath);
-  let rootConfigPromise = _rootConfigCache.get(resolvedRootConfigPath);
+  const profileKey = cliOverrides?.profile ?? "";
+  const cacheKey = profileKey ? `${resolvedRootConfigPath}:${profileKey}` : resolvedRootConfigPath;
+  let rootConfigPromise = _rootConfigCache.get(cacheKey);
   if (!rootConfigPromise) {
-    rootConfigPromise = loadConfig(rootNaxDir);
-    _rootConfigCache.set(resolvedRootConfigPath, rootConfigPromise);
+    rootConfigPromise = loadConfig(rootNaxDir, cliOverrides);
+    _rootConfigCache.set(cacheKey, rootConfigPromise);
   }
   const rootConfig = await rootConfigPromise;
   if (!packageDir) {
@@ -21683,12 +21695,16 @@ async function resolveOutcome(proposalOutputs, critiqueOutputs, stageConfig, con
     const adapter = _debateSessionDeps.getAgent(agentName, config2);
     if (adapter) {
       const synthesisSessionName = workdir !== undefined ? buildSessionName(workdir, featureName, storyId, "synthesis") : undefined;
+      const resolverDebater = { agent: agentName, model: resolverConfig.model };
+      const resolverTier = resolverConfig.model && MODEL_SHORTHAND_TIERS[resolverConfig.model.toLowerCase()] || modelTierFromDebater(resolverDebater);
+      const resolverModelDef = resolveModelDefForDebater(resolverDebater, resolverTier, config2);
       const resolverResult = await synthesisResolver(proposalOutputs, critiqueOutputs, {
         adapter,
         promptSuffix,
         debaters,
         completeOptions: {
-          model: resolveDebaterModel({ agent: agentName }, config2),
+          model: resolverModelDef.model,
+          modelTier: resolverTier,
           config: config2,
           storyId,
           featureName,
@@ -21709,12 +21725,16 @@ async function resolveOutcome(proposalOutputs, critiqueOutputs, stageConfig, con
   if (resolverConfig.type === "custom") {
     const agentName = resolverConfig.agent ?? RESOLVER_FALLBACK_AGENT;
     const judgeSessionName = workdir !== undefined ? buildSessionName(workdir, featureName, storyId, "judge") : undefined;
+    const resolverDebater = { agent: agentName, model: resolverConfig.model };
+    const resolverTier = resolverConfig.model && MODEL_SHORTHAND_TIERS[resolverConfig.model.toLowerCase()] || modelTierFromDebater(resolverDebater);
+    const resolverModelDef = resolveModelDefForDebater(resolverDebater, resolverTier, config2);
     const resolverResult = await judgeResolver(proposalOutputs, critiqueOutputs, resolverConfig, {
       getAgent: (name) => _debateSessionDeps.getAgent(name, config2),
       defaultAgentName: RESOLVER_FALLBACK_AGENT,
       debaters,
       completeOptions: {
-        model: resolveDebaterModel({ agent: agentName }, config2),
+        model: resolverModelDef.model,
+        modelTier: resolverTier,
         config: config2,
         storyId,
         featureName,
@@ -22705,9 +22725,11 @@ ${opts.specContent}
 
 The spec above is the authoritative source for acceptance criteria.
 - Each story's \`acceptanceCriteria\` array MUST contain only criteria that are explicitly stated or directly implied by the spec.
-- If a debater proposed criteria beyond the spec (edge cases, error handling, implementation details), place those in a separate \`suggestedCriteria\` array on the same story object. Each element of \`suggestedCriteria\` MUST be a plain string \u2014 never an object or structured value.
-- Never silently merge debater-invented criteria into \`acceptanceCriteria\`. The distinction matters: \`acceptanceCriteria\` drives automated testing; \`suggestedCriteria\` is logged for human review.
-- Preserve the spec's AC wording. You may refine for clarity but must not change semantics.` : "";
+- If a debater proposed criteria beyond the spec (observable edge cases, error-path behaviors), place those in a separate \`suggestedCriteria\` array on the same story object. Each element of \`suggestedCriteria\` MUST be a plain string \u2014 never an object or structured value.
+- \`suggestedCriteria\` MUST contain only behavioral acceptance criteria \u2014 observable outputs, return values, state changes, or error conditions a test can assert. DO NOT include: implementation details (imports, internal structure), design suggestions ("consider X"), "not required" notes, or any criterion that cannot be expressed as a test assertion.
+- Never silently merge debater-invented criteria into \`acceptanceCriteria\`. The distinction matters: \`acceptanceCriteria\` drives automated testing; \`suggestedCriteria\` gates a hardening pass.
+- Preserve the spec's AC wording. You may refine for clarity but must not change semantics.
+- Preserve each story's \`routing\` object unchanged \u2014 especially \`routing.complexity\` and \`routing.testStrategy\`. These are required by the schema and must not be dropped or modified during synthesis.` : "";
   const planSynthesisSuffix = `IMPORTANT: Your response must be a single valid JSON object in PRD format (with project, feature, branchName, userStories array, etc.). Do NOT wrap it in markdown fences. Output raw JSON only.${specAnchor}`;
   const outcome = await resolveOutcome(proposalOutputs, critiqueOutputs, ctx.stageConfig, ctx.config, ctx.storyId, resolverTimeoutMs, opts.workdir, opts.feature, undefined, undefined, planSynthesisSuffix, successful.map((p) => p.debater));
   const winningOutput = outcome.output ?? successful[0].output;
@@ -25071,6 +25093,31 @@ function resolveAcceptanceTestCandidates(options) {
     return [];
   return [resolveAcceptanceFeatureTestPath(options.featureDir, options.testPathConfig, options.language)];
 }
+function groupStoriesByPackage(prd, workdir, featureName, testPathConfig, language) {
+  const nonFixStories = prd.userStories.filter((s) => !s.id.startsWith("US-FIX-") && s.status !== "decomposed");
+  const groupMap = new Map;
+  for (const story of nonFixStories) {
+    const wd = story.workdir ?? "";
+    if (!groupMap.has(wd)) {
+      groupMap.set(wd, { stories: [], criteria: [] });
+    }
+    const group = groupMap.get(wd);
+    if (group) {
+      group.stories.push(story);
+      group.criteria.push(...story.acceptanceCriteria);
+    }
+  }
+  if (groupMap.size === 0) {
+    groupMap.set("", { stories: [], criteria: [] });
+  }
+  const groups = [];
+  for (const [wd, { stories, criteria }] of groupMap) {
+    const packageDir = wd ? path.join(workdir, wd) : workdir;
+    const testPath = resolveAcceptancePackageFeatureTestPath(packageDir, featureName, testPathConfig, language);
+    groups.push({ testPath, packageDir, stories, criteria });
+  }
+  return groups;
+}
 function suggestedTestFilename(language) {
   switch (language?.toLowerCase()) {
     case "go":
@@ -25142,6 +25189,9 @@ async function loadPRD(path2) {
       story.status = "passed";
     story.status = story.status ?? "pending";
     story.acceptanceCriteria = story.acceptanceCriteria ?? [];
+    if (Array.isArray(story.suggestedCriteria) && story.suggestedCriteria.length === 0) {
+      story.suggestedCriteria = undefined;
+    }
     story.storyPoints = story.storyPoints ?? 1;
   }
   return prd;
@@ -25980,6 +26030,7 @@ Previous test failed because: ${options.previousFailure}` : "";
     featureName: options.featureName,
     sessionRole: "acceptance-gen"
   });
+  const genCostUsd = typeof completeResult === "string" ? 0 : completeResult.costUsd ?? 0;
   const rawOutput = typeof completeResult === "string" ? completeResult : completeResult.output;
   let testCode = extractTestCode(rawOutput);
   logger.debug("acceptance", "Received raw output from LLM", {
@@ -26077,7 +26128,8 @@ Previous test failed because: ${options.previousFailure}` : "";
     }));
     return {
       testCode: generateSkeletonTests(options.featureName, skeletonCriteria, options.testFramework, options.language),
-      criteria: skeletonCriteria
+      criteria: skeletonCriteria,
+      costUsd: genCostUsd
     };
   }
   const refinedJsonContent = JSON.stringify(refinedCriteria.map((c, i) => ({
@@ -26088,7 +26140,7 @@ Previous test failed because: ${options.previousFailure}` : "";
     storyId: c.storyId
   })), null, 2);
   await _generatorPRDDeps.writeFile(join16(options.featureDir, "acceptance-refined.json"), refinedJsonContent);
-  return { testCode, criteria };
+  return { testCode, criteria, costUsd: genCostUsd };
 }
 function parseAcceptanceCriteria(specContent) {
   const criteria = [];
@@ -26366,12 +26418,22 @@ function buildRefinementPrompt(criteria, codebaseContext, options) {
 `);
   const strategySection = buildStrategySection(options);
   const refinedExample = buildRefinedExample(options?.testStrategy);
+  const storyLines = [];
+  if (options?.storyTitle)
+    storyLines.push(`Title: ${options.storyTitle}`);
+  if (options?.storyDescription)
+    storyLines.push(`Description: ${options.storyDescription}`);
+  const storySection = storyLines.length > 0 ? `STORY CONTEXT:
+${storyLines.join(`
+`)}
+
+` : "";
   const codebaseSection = codebaseContext ? `CODEBASE CONTEXT:
 ${codebaseContext}
 ` : "";
   const core2 = `You are an acceptance criteria refinement assistant. Your task is to convert raw acceptance criteria into concrete, machine-verifiable assertions.
 
-${codebaseSection}${strategySection}ACCEPTANCE CRITERIA TO REFINE:
+${storySection}${codebaseSection}${strategySection}ACCEPTANCE CRITERIA TO REFINE:
 ${criteriaList}
 
 For each criterion, produce a refined version that is concrete and automatically testable where possible.
@@ -26455,13 +26517,28 @@ function parseRefinementResponse(response, criteria) {
 }
 async function refineAcceptanceCriteria(criteria, context) {
   if (criteria.length === 0) {
-    return [];
+    return { criteria: [], costUsd: 0 };
   }
-  const { storyId, featureName, workdir, codebaseContext, config: config2, testStrategy, testFramework } = context;
+  const {
+    storyId,
+    featureName,
+    workdir,
+    codebaseContext,
+    config: config2,
+    testStrategy,
+    testFramework,
+    storyTitle,
+    storyDescription
+  } = context;
   const logger = getLogger();
   const modelTier = config2.acceptance?.model ?? "fast";
   const modelDef = resolveModelForAgent(config2.models, config2.autoMode.defaultAgent, modelTier, config2.autoMode.defaultAgent);
-  const prompt = buildRefinementPrompt(criteria, codebaseContext, { testStrategy, testFramework });
+  const prompt = buildRefinementPrompt(criteria, codebaseContext, {
+    testStrategy,
+    testFramework,
+    storyTitle,
+    storyDescription
+  });
   let response;
   try {
     const completeResult = await _refineDeps.adapter.complete(prompt, {
@@ -26475,20 +26552,21 @@ async function refineAcceptanceCriteria(criteria, context) {
       sessionRole: "refine",
       timeoutMs: config2.acceptance?.timeoutMs ?? 120000
     });
+    const costUsd = typeof completeResult === "string" ? 0 : completeResult.costUsd ?? 0;
     response = typeof completeResult === "string" ? completeResult : completeResult.output;
+    const parsed = parseRefinementResponse(response, criteria);
+    return {
+      criteria: parsed.map((item) => ({ ...item, storyId: item.storyId || storyId })),
+      costUsd
+    };
   } catch (error48) {
     const reason = errorMessage(error48);
     logger.warn("refinement", "adapter.complete() failed, falling back to original criteria", {
       storyId,
       error: reason
     });
-    return fallbackCriteria(criteria, storyId);
+    return { criteria: fallbackCriteria(criteria, storyId), costUsd: 0 };
   }
-  const parsed = parseRefinementResponse(response, criteria);
-  return parsed.map((item) => ({
-    ...item,
-    storyId: item.storyId || storyId
-  }));
 }
 function fallbackCriteria(criteria, storyId = "") {
   return criteria.map((c) => ({
@@ -26540,14 +26618,17 @@ async function runHardeningPass(ctx) {
     const allRefined = [];
     for (const story of storiesWithSuggested) {
       const criteria = story.suggestedCriteria ?? [];
-      const refined = await _hardeningDeps.refine(criteria, {
+      const refineResult = await _hardeningDeps.refine(criteria, {
         storyId: story.id,
         featureName: ctx.prd.feature,
         workdir: ctx.workdir,
         codebaseContext: "",
-        config: ctx.config
+        config: ctx.config,
+        storyTitle: story.title,
+        storyDescription: story.description
       });
-      allRefined.push(...refined);
+      allRefined.push(...refineResult.criteria);
+      result.costUsd += refineResult.costUsd;
     }
     const language = ctx.config.project?.language;
     const suggestedTestPath = resolveSuggestedPackageFeatureTestPath(ctx.workdir, ctx.prd.feature, ctx.config.acceptance?.suggestedTestPath, language);
@@ -26568,6 +26649,7 @@ async function runHardeningPass(ctx) {
       language,
       targetTestFile: suggestedTestPath
     });
+    result.costUsd += genResult.costUsd ?? 0;
     if (genResult.testCode) {
       await _hardeningDeps.writeFile(suggestedTestPath, genResult.testCode);
     }
@@ -26586,22 +26668,30 @@ async function runHardeningPass(ctx) {
 ${stderr}`;
     const failedACs = parseTestFailures(output);
     const failedSet = new Set(failedACs.map((ac) => ac.toUpperCase()));
+    const refinedByStory = new Map;
+    for (const r of allRefined) {
+      const list = refinedByStory.get(r.storyId) ?? [];
+      list.push(r);
+      refinedByStory.set(r.storyId, list);
+    }
     let acIndex = 0;
     for (const story of storiesWithSuggested) {
-      const suggested = story.suggestedCriteria ?? [];
+      const storyRefined = refinedByStory.get(story.id) ?? [];
       const toPromote = [];
       const toDiscard = [];
-      for (const criterion of suggested) {
+      for (const refinedCriterion of storyRefined) {
         acIndex++;
         const acId = `AC-${acIndex}`;
-        if (failedSet.has(acId) || exitCode !== 0 && failedACs.length === 0) {
-          toDiscard.push(criterion);
+        const nonTestable = refinedCriterion.testable === false;
+        if (nonTestable || failedSet.has(acId) || exitCode !== 0 && failedACs.length === 0) {
+          toDiscard.push(refinedCriterion.original);
         } else {
-          toPromote.push(criterion);
+          toPromote.push(refinedCriterion.original);
         }
       }
       if (toPromote.length > 0) {
-        story.acceptanceCriteria = [...story.acceptanceCriteria, ...toPromote];
+        const existingACs = new Set(story.acceptanceCriteria);
+        story.acceptanceCriteria = [...story.acceptanceCriteria, ...toPromote.filter((ac) => !existingACs.has(ac))];
         result.promoted.push(...toPromote);
       }
       result.discarded.push(...toDiscard);
@@ -26666,6 +26756,24 @@ function parseTestFailures(output) {
         }
       }
     }
+    if (line.includes("--- FAIL:")) {
+      const acMatch = line.match(/AC[-_]?(\d+)/i);
+      if (acMatch) {
+        const acId = `AC-${acMatch[1]}`;
+        if (!failedACs.includes(acId)) {
+          failedACs.push(acId);
+        }
+      }
+    }
+    if (/FAILED\s/.test(line)) {
+      const acMatch = line.match(/AC[-_]?(\d+)/i);
+      if (acMatch) {
+        const acId = `AC-${acMatch[1]}`;
+        if (!failedACs.includes(acId)) {
+          failedACs.push(acId);
+        }
+      }
+    }
   }
   return failedACs;
 }
@@ -26917,7 +27025,7 @@ ${stderr}` };
     },
     refine: async (_criteria, _context) => {
       const { refineAcceptanceCriteria: refineAcceptanceCriteria2 } = await Promise.resolve().then(() => (init_refinement(), exports_refinement));
-      return refineAcceptanceCriteria2(_criteria, _context);
+      return (await refineAcceptanceCriteria2(_criteria, _context)).criteria;
     },
     generate: async (_stories, _refined, _options) => {
       const { generateFromPRD: generateFromPRD2 } = await Promise.resolve().then(() => (init_generator(), exports_generator));
@@ -26937,29 +27045,9 @@ ${stderr}` };
       const testPathConfig = ctx.config.acceptance.testPath;
       const metaPath = path5.join(ctx.featureDir, "acceptance-meta.json");
       const allCriteria = ctx.prd.userStories.filter((s) => !s.id.startsWith("US-FIX-") && s.status !== "decomposed").flatMap((s) => s.acceptanceCriteria);
-      const nonFixStories = ctx.prd.userStories.filter((s) => !s.id.startsWith("US-FIX-") && s.status !== "decomposed");
-      const workdirGroups = new Map;
-      for (const story of nonFixStories) {
-        const wd = story.workdir ?? "";
-        if (!workdirGroups.has(wd)) {
-          workdirGroups.set(wd, { stories: [], criteria: [] });
-        }
-        const group = workdirGroups.get(wd);
-        if (group) {
-          group.stories.push(story);
-          group.criteria.push(...story.acceptanceCriteria);
-        }
-      }
-      if (workdirGroups.size === 0) {
-        workdirGroups.set("", { stories: [], criteria: [] });
-      }
       const featureName = ctx.prd.feature ?? ctx.prd.featureName;
-      const testPaths = [];
-      for (const [workdir] of workdirGroups) {
-        const packageDir = workdir ? path5.join(ctx.workdir, workdir) : ctx.workdir;
-        const testPath = resolveAcceptancePackageFeatureTestPath(packageDir, featureName, testPathConfig, language);
-        testPaths.push({ testPath, packageDir });
-      }
+      const groups = groupStoriesByPackage(ctx.prd, ctx.workdir, featureName, testPathConfig, language);
+      const nonFixStories = groups.flatMap((g) => g.stories);
       let totalCriteria = 0;
       let testableCount = 0;
       const fingerprint = computeACFingerprint(allCriteria);
@@ -26980,7 +27068,7 @@ ${stderr}` };
             storedFingerprint: meta3.acFingerprint
           });
         }
-        for (const { testPath } of testPaths) {
+        for (const { testPath } of groups) {
           if (await _acceptanceSetupDeps.fileExists(testPath)) {
             await _acceptanceSetupDeps.copyFile(testPath, `${testPath}.bak`);
             await _acceptanceSetupDeps.deleteFile(testPath);
@@ -27030,9 +27118,8 @@ ${stderr}` };
           })));
         }
         testableCount = allRefinedCriteria.filter((r) => r.testable).length;
-        for (const [workdir, group] of workdirGroups) {
-          const packageDir = workdir ? path5.join(ctx.workdir, workdir) : ctx.workdir;
-          const testPath = resolveAcceptancePackageFeatureTestPath(packageDir, featureName, testPathConfig, language);
+        for (const group of groups) {
+          const { testPath, packageDir } = group;
           const groupStoryIds = new Set(group.stories.map((s) => s.id));
           const groupRefined = allRefinedCriteria.filter((r) => groupStoryIds.has(r.storyId));
           let modelDef;
@@ -27067,13 +27154,13 @@ ${stderr}` };
           generator: "nax"
         });
       }
-      ctx.acceptanceTestPaths = testPaths;
+      ctx.acceptanceTestPaths = groups.map((g) => ({ testPath: g.testPath, packageDir: g.packageDir }));
       if (ctx.config.acceptance.redGate === false) {
         ctx.acceptanceSetup = { totalCriteria, testableCount, redFailCount: 0 };
         return { action: "continue" };
       }
       let redFailCount = 0;
-      for (const { testPath, packageDir } of testPaths) {
+      for (const { testPath, packageDir } of groups) {
         const runCmd = buildAcceptanceRunCommand(testPath, ctx.config.project?.testFramework, ctx.config.acceptance.command);
         getSafeLogger()?.info("acceptance-setup", "Running acceptance RED gate command", {
           cmd: runCmd.join(" "),
@@ -29152,7 +29239,6 @@ var CLARIFY_REGEX, autofixStage, _autofixDeps;
 var init_autofix = __esm(() => {
   init_registry();
   init_config();
-  init_loader();
   init_logger2();
   init_quality();
   init_event_bus();
@@ -29268,8 +29354,7 @@ var init_autofix = __esm(() => {
     getAgent: (name, config2) => createAgentRegistry(config2).getAgent(name),
     runQualityCommand,
     recheckReview,
-    runAgentRectification: (ctx, lintFixCmd, formatFixCmd, effectiveWorkdir) => runAgentRectification(ctx, lintFixCmd, formatFixCmd, effectiveWorkdir),
-    loadConfigForWorkdir
+    runAgentRectification: (ctx, lintFixCmd, formatFixCmd, effectiveWorkdir) => runAgentRectification(ctx, lintFixCmd, formatFixCmd, effectiveWorkdir)
   };
 });
 
@@ -29398,17 +29483,17 @@ var init_completion = __esm(() => {
             logger.warn("completion", "Story marked for re-review", { storyId: completedStory.id });
           }
         }
-      }
-      const semanticCheck = ctx.reviewResult?.checks?.find((c) => c.check === "semantic");
-      if (ctx.featureDir && semanticCheck) {
-        const verdict = {
-          storyId: ctx.story.id,
-          passed: semanticCheck.success,
-          timestamp: new Date().toISOString(),
-          acCount: ctx.story.acceptanceCriteria?.length ?? 0,
-          findings: semanticCheck.success ? [] : semanticCheck.findings ?? []
-        };
-        await _completionDeps.persistSemanticVerdict(ctx.featureDir, ctx.story.id, verdict);
+        const semanticCheck = ctx.reviewResult?.checks?.find((c) => c.check === "semantic");
+        if (ctx.featureDir && semanticCheck) {
+          const verdict = {
+            storyId: completedStory.id,
+            passed: semanticCheck.success,
+            timestamp: new Date().toISOString(),
+            acCount: completedStory.acceptanceCriteria?.length ?? 0,
+            findings: semanticCheck.success ? [] : semanticCheck.findings ?? []
+          };
+          await _completionDeps.persistSemanticVerdict(ctx.featureDir, completedStory.id, verdict);
+        }
       }
       await _completionDeps.savePRD(ctx.prd, prdPath);
       const updatedCounts = countStories(ctx.prd);
@@ -36572,7 +36657,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.60.2",
+    version: "0.61.1",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -36652,8 +36737,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("db851936"))
-        return "db851936";
+      if (/^[0-9a-f]{6,10}$/.test("a11d3b57"))
+        return "a11d3b57";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -39060,7 +39145,8 @@ async function runIteration(ctx, prd, selection, iterations, totalCost, allStory
     }
   }
   const accumulatedAttemptCost = (story.priorFailures || []).reduce((sum, f) => sum + (f.cost || 0), 0);
-  const effectiveConfig = story.workdir ? await _iterationRunnerDeps.loadConfigForWorkdir(join45(ctx.workdir, ".nax", "config.json"), story.workdir) : ctx.config;
+  const profileOverride = ctx.config.profile && ctx.config.profile !== "default" ? { profile: ctx.config.profile } : undefined;
+  const effectiveConfig = story.workdir ? await _iterationRunnerDeps.loadConfigForWorkdir(join45(ctx.workdir, ".nax", "config.json"), story.workdir, profileOverride) : ctx.config;
   const pipelineContext = {
     config: effectiveConfig,
     rootConfig: ctx.config,
@@ -39863,9 +39949,10 @@ async function runParallelBatch(options) {
     worktreePaths.set(story.id, path17.join(workdir, ".nax-wt", story.id));
   }
   const rootConfigPath = path17.join(workdir, ".nax", "config.json");
+  const profileOverride = config2.profile && config2.profile !== "default" ? { profile: config2.profile } : undefined;
   const storyEffectiveConfigs = new Map;
   await Promise.all(stories.filter((story) => story.workdir).map(async (story) => {
-    const effectiveConfig = await loadConfigForWorkdir(rootConfigPath, story.workdir);
+    const effectiveConfig = await loadConfigForWorkdir(rootConfigPath, story.workdir, profileOverride);
     storyEffectiveConfigs.set(story.id, effectiveConfig);
   }));
   const workerResult = await _parallelBatchDeps.executeParallelBatch(stories, workdir, config2, pipelineContext, worktreePaths, maxConcurrency, eventEmitter, storyEffectiveConfigs.size > 0 ? storyEffectiveConfigs : undefined);
@@ -73387,6 +73474,9 @@ ${packageDetailsSection}
 For each user story, set the "workdir" field to the relevant package path (e.g. "packages/api"). Stories that span the root should omit "workdir".` : "";
   const workdirField = isMonorepo ? `
       "workdir": "string \u2014 optional, relative path to package (e.g. \\"packages/api\\"). Omit for root-level stories.",` : "";
+  const specAnchorSection = specContent.trim() ? `
+
+${SPEC_ANCHOR_RULES}` : "";
   const taskContext = `You are a senior software architect generating a product requirements document (PRD) as JSON.
 
 ## Step 1: Understand the Spec
@@ -73427,7 +73517,7 @@ Based on your Step 2 analysis, create stories that produce CODE CHANGES.
 
 ${GROUPING_RULES}
 
-${getAcQualityRules(projectProfile)}
+${getAcQualityRules(projectProfile)}${specAnchorSection}
 
 For each story, set "contextFiles" to the key source files the agent should read before implementing (max 5 per story). Use your Step 2 analysis to identify the most relevant files. Leave empty for greenfield stories with no existing files to reference.
 
@@ -73450,7 +73540,8 @@ Generate a JSON object with this exact structure (no markdown, no explanation \u
       "id": "string \u2014 e.g. US-001",
       "title": "string \u2014 concise story title",
       "description": "string \u2014 detailed description of the story",
-      "acceptanceCriteria": ["string \u2014 behavioral, testable criteria. Format: 'When [X], then [Y]'. One assertion per AC. Never include quality gates."],
+      "acceptanceCriteria": ["string \u2014 behavioral, testable criteria. Format: 'When [X], then [Y]'. One assertion per AC. Never include quality gates."],${specContent.trim() ? `
+      "suggestedCriteria": ["string \u2014 optional. Behavioral edge cases or negative paths you identified that are NOT in the spec. Plain assertions only \u2014 observable outputs, return values, state changes, or error conditions. No implementation details or vague descriptions. Omit this field if empty."],` : ""}
       "contextFiles": ["string \u2014 key source files the agent should read (max 5, relative paths)"],
       "tags": ["string \u2014 routing tags, e.g. feature, security, api"],
       "dependencies": ["string \u2014 story IDs this story depends on"],${workdirField}
@@ -76350,6 +76441,7 @@ init_version();
 init_crash_recovery();
 
 // src/execution/runner-completion.ts
+init_test_path();
 init_hooks();
 init_logger2();
 init_prd();
@@ -76382,6 +76474,7 @@ async function runCompletionPhase(options) {
       logger?.info("execution", "Acceptance already passed \u2014 skipping acceptance phase");
     } else if (options.config.acceptance.enabled && isComplete(options.prd)) {
       options.statusWriter.setPostRunPhase("acceptance", { status: "running" });
+      const acceptanceTestPaths = options.featureDir ? groupStoriesByPackage(options.prd, options.workdir, options.feature, options.config.acceptance.testPath, options.config.project?.language).map((g) => ({ testPath: g.testPath, packageDir: g.packageDir })) : undefined;
       const acceptanceResult = await _runnerCompletionDeps.runAcceptanceLoop({
         config: options.config,
         prd: options.prd,
@@ -76397,7 +76490,8 @@ async function runCompletionPhase(options) {
         pluginRegistry: options.pluginRegistry,
         eventEmitter: options.eventEmitter,
         statusWriter: options.statusWriter,
-        agentGetFn: options.agentGetFn
+        agentGetFn: options.agentGetFn,
+        acceptanceTestPaths
       });
       const lastRunAt = new Date().toISOString();
       if (acceptanceResult.success) {

package/package.json

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