@nathapp/nax 0.70.0-canary.1 → 0.70.0-canary.3

package/dist/nax.js

@@ -17028,6 +17028,7 @@ var init_schemas_infra = __esm(() => {
     testPath: exports_external.string().min(1, "acceptance.testPath must be non-empty"),
     command: exports_external.string().optional(),
     model: ConfiguredModelSchema.default("fast"),
+    generateModel: ConfiguredModelSchema.optional(),
     refinement: exports_external.boolean().default(true),
     refinementConcurrency: exports_external.number().int().min(1).max(10).default(3),
     redGate: exports_external.boolean().default(true),
@@ -19231,7 +19232,7 @@ function reshapeSelector(name, fn) {
 var reviewConfigSelector, planConfigSelector, decomposeConfigSelector, rectifyConfigSelector, acceptanceConfigSelector, acceptanceFixConfigSelector, acceptanceGenConfigSelector, tddConfigSelector, debateConfigSelector, routingConfigSelector, verifyConfigSelector, rectificationGateConfigSelector, agentConfigSelector, agentManagerConfigSelector, interactionConfigSelector, precheckConfigSelector, qualityConfigSelector, autofixConfigSelector, executionGatesConfigSelector, testPatternConfigSelector, contextConfigSelector, contextToolRuntimeConfigSelector, promptLoaderConfigSelector, llmRoutingConfigSelector;
 var init_selectors = __esm(() => {
   reviewConfigSelector = pickSelector("review", "review", "debate", "models", "execution", "project", "quality", "agent");
-  planConfigSelector = pickSelector("plan", "plan", "debate", "agent", "project");
+  planConfigSelector = pickSelector("plan", "plan", "debate", "agent", "project", "routing");
   decomposeConfigSelector = pickSelector("decompose", "plan", "agent", "routing");
   rectifyConfigSelector = pickSelector("rectify", "execution");
   acceptanceConfigSelector = pickSelector("acceptance", "acceptance");
@@ -21021,6 +21022,7 @@ class AcpAgentAdapter {
     const MAX_TURNS = opts.maxTurns ?? 10;
     let totalTokenUsage = { inputTokens: 0, outputTokens: 0 };
     let totalExactCostUsd;
+    const interactions = [];
     let turnCount = 0;
     let lastResponse = null;
     let timedOut = false;
@@ -21105,6 +21107,7 @@ class AcpAgentAdapter {
             })
           ]);
           if (response) {
+            interactions.push({ turnIndex: turnCount, question, reply: response.answer });
             currentPrompt = response.answer;
             continue;
           }
@@ -21135,7 +21138,8 @@ class AcpAgentAdapter {
       tokenUsage,
       estimatedCostUsd,
       exactCostUsd,
-      internalRoundTrips: turnCount
+      internalRoundTrips: turnCount,
+      ...interactions.length > 0 ? { interactions } : {}
     };
   }
   async closeSession(handle) {
@@ -22138,6 +22142,7 @@ class AgentManager {
           sessionId: handle.protocolIds?.sessionId ?? null,
           recordId: handle.protocolIds?.recordId ?? null
         },
+        ...result.interactions?.length ? { interactions: result.interactions } : {},
         origin: "runAsSession",
         ...opts.callId !== undefined ? { callId: opts.callId } : {},
         ...opts.scopeId !== undefined ? { scopeId: opts.scopeId } : {}
@@ -22251,6 +22256,34 @@ function resolveDefaultAgent(config2) {
 }
 var FALLBACK_DEFAULT_AGENT = "claude";
 
+// src/agents/shared/agent-profile-resolver.ts
+function resolveAgentAssignment(selectedProfileId, agentRouting, storyId) {
+  if (agentRouting?.enabled !== true)
+    return null;
+  const profiles = agentRouting.profiles ?? [];
+  if (profiles.length === 0)
+    return null;
+  const defaultProfile = agentRouting.default ? profiles.find((p) => p.id === agentRouting.default) : undefined;
+  if (selectedProfileId) {
+    const profile = profiles.find((p) => p.id === selectedProfileId);
+    if (profile)
+      return toAssignment(profile);
+    getSafeLogger()?.warn("routing", `Story ${storyId} selected unknown agent profile "${selectedProfileId}" \u2014 falling back to ${defaultProfile ? `default profile "${defaultProfile.id}"` : "no profile"}`, { storyId, agentProfileId: selectedProfileId });
+  }
+  return defaultProfile ? toAssignment(defaultProfile) : null;
+}
+function toAssignment(p) {
+  return { agent: p.target.agent, agentProfileId: p.id, profileModelTier: p.target.model };
+}
+var init_agent_profile_resolver = __esm(() => {
+  init_logger2();
+});
+
+// src/agents/shared/index.ts
+var init_shared = __esm(() => {
+  init_agent_profile_resolver();
+});
+
 // src/agents/retry/types.ts
 var ParseValidationError;
 var init_types4 = __esm(() => {
@@ -22497,6 +22530,7 @@ var init_agents = __esm(() => {
   init_cost();
   init_version_detection();
   init_manager();
+  init_shared();
   init_retry();
 });
 
@@ -28189,7 +28223,8 @@ function validateStory(raw, index, allIds) {
       complexity,
       testStrategy,
       reasoning: typeof routing.reasoning === "string" && routing.reasoning.trim().length > 0 ? routing.reasoning.trim() : "validated from LLM output",
-      ...noTestJustification !== undefined ? { noTestJustification } : {}
+      ...noTestJustification !== undefined ? { noTestJustification } : {},
+      ...typeof routing.agentProfileId === "string" && routing.agentProfileId.trim().length > 0 ? { agentProfileId: routing.agentProfileId.trim() } : {}
     },
     ...workdir !== undefined ? { workdir } : {},
     ...contextFiles.length > 0 ? { contextFiles } : {},
@@ -34691,8 +34726,10 @@ var init_plan = __esm(() => {
         truncated: () => PlanPromptBuilder.jsonRepair(0, "JSON appears truncated \u2014 please rewrite completely")
       }
     }),
-    build(input, _ctx) {
-      const { taskContext, outputFormat } = new PlanPromptBuilder().build(input.specContent, input.codebaseContext, input.outputPath, input.packages, input.packageDetails, input.projectProfile);
+    build(input, ctx) {
+      const agentRouting = ctx.config.routing?.agents;
+      const profiles = agentRouting?.enabled === true ? agentRouting.profiles ?? [] : [];
+      const { taskContext, outputFormat } = new PlanPromptBuilder().build(input.specContent, input.codebaseContext, input.outputPath, input.packages, input.packageDetails, input.projectProfile, undefined, profiles);
       return {
         role: { id: "role", content: "", overridable: false },
         task: { id: "task", content: `${taskContext}
@@ -34926,8 +34963,10 @@ var init_plan_refine = __esm(() => {
       }
     }),
     fileOutput: (input) => input.outputPath,
-    build(input, _ctx) {
-      const { taskContext, outputFormat } = new PlanPromptBuilder().build(input.specContent, input.codebaseContext, input.outputPath, input.packages, input.packageDetails, input.projectProfile);
+    build(input, ctx) {
+      const agentRouting = ctx.config.routing?.agents;
+      const profiles = agentRouting?.enabled === true ? agentRouting.profiles ?? [] : [];
+      const { taskContext, outputFormat } = new PlanPromptBuilder().build(input.specContent, input.codebaseContext, input.outputPath, input.packages, input.packageDetails, input.projectProfile, undefined, profiles);
       return {
         role: { id: "role", content: "", overridable: false },
         task: {
@@ -35203,15 +35242,12 @@ Consider:
 });
 
 // src/operations/decompose.ts
-var _decomposeOpDeps, decomposeOp;
+var decomposeOp;
 var init_decompose2 = __esm(() => {
   init_decompose();
   init_decompose_prompt();
   init_config();
   init_logger2();
-  _decomposeOpDeps = {
-    getSafeLogger
-  };
   decomposeOp = {
     kind: "complete",
     name: "decompose",
@@ -35236,46 +35272,8 @@ var init_decompose2 = __esm(() => {
         task: { id: "task", content: prompt, overridable: false }
       };
     },
-    parse(output, _input, ctx) {
-      const stories = parseDecomposeOutput(output);
-      const agentRouting = ctx.config.routing?.agents;
-      if (agentRouting?.enabled !== true) {
-        return stories;
-      }
-      const profiles = agentRouting.profiles ?? [];
-      if (profiles.length === 0) {
-        return stories;
-      }
-      const defaultProfile = agentRouting.default ? profiles.find((p) => p.id === agentRouting.default) : undefined;
-      return stories.map((story) => {
-        if (story.agentProfileId) {
-          const profile = profiles.find((p) => p.id === story.agentProfileId);
-          if (profile) {
-            return {
-              ...story,
-              routing: {
-                ...story.routing,
-                agent: profile.target.agent,
-                agentProfileId: profile.id,
-                profileModelTier: profile.target.model
-              }
-            };
-          }
-          _decomposeOpDeps.getSafeLogger()?.warn("decompose", `Story ${story.id} selected unknown agent profile "${story.agentProfileId}" \u2014 falling back to ${defaultProfile ? `default profile "${defaultProfile.id}"` : "no profile"}`, { storyId: story.id, agentProfileId: story.agentProfileId });
-        }
-        if (defaultProfile) {
-          return {
-            ...story,
-            routing: {
-              ...story.routing,
-              agent: defaultProfile.target.agent,
-              agentProfileId: defaultProfile.id,
-              profileModelTier: defaultProfile.target.model
-            }
-          };
-        }
-        return story;
-      });
+    parse(output, _input, _ctx) {
+      return parseDecomposeOutput(output);
     }
   };
 });
@@ -36140,7 +36138,7 @@ var init_acceptance_generate = __esm(() => {
     stage: "acceptance",
     session: { role: "acceptance-gen", lifetime: "fresh" },
     config: acceptanceGenConfigSelector,
-    model: (_input, ctx) => ctx.config.acceptance.model,
+    model: (_input, ctx) => ctx.config.acceptance.generateModel ?? ctx.config.acceptance.model,
     timeoutMs: (_input, ctx) => ctx.config.execution.sessionTimeoutSeconds * 1000,
     build(input, _ctx) {
       const prompt = new AcceptancePromptBuilder().buildGeneratorFromPRDPrompt({
@@ -36244,6 +36242,7 @@ var init_refinement = () => {};
 var acceptanceRefineOp;
 var init_acceptance_refine = __esm(() => {
   init_refinement();
+  init_retry();
   init_config();
   init_logger2();
   init_prompts();
@@ -36253,7 +36252,8 @@ var init_acceptance_refine = __esm(() => {
     stage: "acceptance",
     jsonMode: true,
     config: acceptanceConfigSelector,
-    model: (_input, ctx) => ctx.config.acceptance.model,
+    retry: { preset: "transient-network", maxAttempts: 2, baseDelayMs: 0 },
+    model: (_input, ctx) => ctx.config.acceptance.generateModel ?? ctx.config.acceptance.model,
     timeoutMs: (_input, ctx) => ctx.config.acceptance.timeoutMs,
     build(input, _ctx) {
       const prompt = new AcceptancePromptBuilder().buildRefinementPrompt(input.criteria, input.codebaseContext, {
@@ -36268,8 +36268,11 @@ var init_acceptance_refine = __esm(() => {
       };
     },
     parse(output, input, _ctx) {
+      if (!output || !output.trim()) {
+        throw new ParseValidationError("acceptance-refine: empty output");
+      }
       if (refinementWouldFallback(output)) {
-        getSafeLogger()?.warn("acceptance", "AC refinement returned no usable JSON \u2014 falling back to unrefined criteria", { storyId: input.storyId, criteriaCount: input.criteria.length, responseBytes: output?.length ?? 0 });
+        getSafeLogger()?.warn("acceptance", "AC refinement returned no usable JSON \u2014 falling back to unrefined criteria", { storyId: input.storyId, criteriaCount: input.criteria.length, responseBytes: output.length });
       }
       const items = parseRefinementResponse(output, input.criteria);
       return items.map((item) => ({ ...item, storyId: item.storyId || input.storyId }));
@@ -38583,8 +38586,10 @@ var init_plan_draft = __esm(() => {
     model: (_input, ctx) => ctx.config.plan?.model ?? "fast",
     timeoutMs: (_input, ctx) => (ctx.config.plan?.timeoutSeconds ?? 600) * 1000,
     retry: (input) => createDraftRetryStrategy(input.citationThreshold),
-    build(input, _ctx) {
-      return new PlanPromptBuilder().buildDraft(input);
+    build(input, ctx) {
+      const agentRouting = ctx.config.routing?.agents;
+      const profiles = agentRouting?.enabled === true ? agentRouting.profiles ?? [] : [];
+      return new PlanPromptBuilder().buildDraft({ ...input, profiles });
     },
     parse(output, input, _ctx) {
       return parsePlanDraft(output, input);
@@ -39088,11 +39093,58 @@ var init_full_suite_gate = __esm(() => {
   };
 });
 
+// src/operations/full-suite-rectify-op.ts
+var fullSuiteRectifyOp;
+var init_full_suite_rectify_op = __esm(() => {
+  init_config();
+  init_prompts();
+  init_test_edit_declaration();
+  fullSuiteRectifyOp = {
+    kind: "run",
+    name: "full-suite-rectify",
+    stage: "rectification",
+    session: { role: "implementer", lifetime: "warm" },
+    config: autofixConfigSelector,
+    build(input, _ctx) {
+      const prompt = RectifierPromptBuilder.failingTestRectification(input.findings, input.story);
+      return {
+        role: { id: "role", content: "", overridable: false },
+        task: { id: "task", content: prompt, overridable: false }
+      };
+    },
+    parse(output, _input, _ctx) {
+      const declarations = parseTestEditDeclarations(output);
+      return { applied: true, testEditDeclarations: declarations };
+    }
+  };
+});
+
 // src/operations/full-suite-rectify.ts
-function makeFullSuiteRectifyStrategy(story, config2) {
+function makeFullSuiteRectifyStrategy(story, config2, sink) {
+  const appliesTo = (finding) => finding.source === "test-runner" && (finding.category === "failed-test" || finding.category === "execution-failed");
+  if (sink) {
+    return {
+      name: "full-suite-rectify",
+      appliesTo,
+      fixOp: fullSuiteRectifyOp,
+      buildInput: (findings) => ({ story, findings }),
+      extractApplied: (output) => {
+        for (const d of output.testEditDeclarations) {
+          if (d.reason === "mock_structure" && d.files && d.files.length > 0) {
+            sink.mockHandoffs.push({ files: d.files, reasonDetail: d.reasonDetail ?? "" });
+          } else if (d.reason !== "mock_structure") {
+            sink.testEdits.push(d);
+          }
+        }
+        return { targetFiles: [], summary: "Fixed failing tests" };
+      },
+      maxAttempts: config2.execution.rectification.maxAttemptsPerStrategy,
+      coRun: "exclusive"
+    };
+  }
   return {
     name: "full-suite-rectify",
-    appliesTo: (finding) => finding.source === "test-runner" && (finding.category === "failed-test" || finding.category === "execution-failed"),
+    appliesTo,
     fixOp: implementerOp,
     buildInput: (findings) => ({
       story,
@@ -39105,6 +39157,7 @@ function makeFullSuiteRectifyStrategy(story, config2) {
 }
 var init_full_suite_rectify = __esm(() => {
   init_prompts();
+  init_full_suite_rectify_op();
   init_implement();
 });
 
@@ -39232,7 +39285,8 @@ function applyTestEditDeclarations(findings, declarations, story, invalidMockStr
       const valid = validatePrdQuote(prdQuote, story);
       if (valid) {
         result = result.map((f) => {
-          if (f.file === d.file && f.fixTarget === "source") {
+          const eligible = f.file === d.file && (f.fixTarget === "source" || f.fixTarget == null && f.source === "test-runner");
+          if (eligible) {
             return {
               ...f,
               fixTarget: "test",
@@ -40141,6 +40195,7 @@ var init_operations = __esm(() => {
   init_greenfield_gate();
   init_full_suite_gate();
   init_full_suite_rectify();
+  init_full_suite_rectify_op();
   init_autofix_implementer_strategy();
   init_autofix_test_writer_strategy();
   init_apply_test_edit_declarations();
@@ -42247,6 +42302,23 @@ ${adversarialErrors}
 Do NOT add new features \u2014 only fix valid issues.
 Commit your fixes when done.${scopeConstraint}${noTestIsolationBlock(story)}${escapeHatchFor(story)}`;
 }
+function formatFailingTestsList(findings) {
+  if (findings.length === 0) {
+    return "The full test suite has failing tests. Fix the implementation to make all tests pass.";
+  }
+  const lines = [`Fix the following ${findings.length} failing test${findings.length === 1 ? "" : "s"}:
+`];
+  for (const f of findings) {
+    const location = f.file ? `${f.file}` : "(unknown file)";
+    const rule = f.rule ? `  Test: ${f.rule}
+` : "";
+    lines.push(`- ${location}
+${rule}  Error: ${f.message}
+`);
+  }
+  return lines.join(`
+`);
+}
 function mechanicalRectification(checks3, story, scopeConstraint, opts) {
   const errors3 = formatCheckErrors(checks3, opts);
   const scopeDirective = implementerOwnsTests(story) ? `Fix all errors listed above that are within this story's scope. ${SINGLE_SESSION_PERMIT_HEADLINE}` : `Fix all errors listed above that are within this story's scope \u2014 see the ${exceptionCountWord(story)} narrow exceptions appended below for sibling-story spillover. Do NOT change test files or test behavior except via those exceptions.`;
@@ -42931,22 +43003,23 @@ Before editing, break the work into one small fix per finding above (fix -> re-r
 `);
   }
   static failingTestContext(findings) {
-    if (findings.length === 0) {
-      return "The full test suite has failing tests. Fix the implementation to make all tests pass.";
-    }
-    const lines = [`Fix the following ${findings.length} failing test${findings.length === 1 ? "" : "s"}:
-`];
-    for (const f of findings) {
-      const location = f.file ? `${f.file}` : "(unknown file)";
-      const rule = f.rule ? `  Test: ${f.rule}
-` : "";
-      lines.push(`- ${location}
-${rule}  Error: ${f.message}
-`);
-    }
-    lines.push(`
-Fix the implementation (not the tests) to make all failing tests pass. Run the test suite to verify after each change.`);
-    return lines.join(`
+    const listing = formatFailingTestsList(findings);
+    if (findings.length === 0)
+      return listing;
+    return `${listing}
+Fix the implementation (not the tests) to make all failing tests pass. Run the test suite to verify after each change.`;
+  }
+  static failingTestRectification(findings, story) {
+    const listing = formatFailingTestsList(findings);
+    const exCount = exceptionCountWord(story);
+    const prohibition = `Do NOT change test files or test behavior \u2014 see the ${exCount} narrow exceptions appended below.`;
+    const parts = [listing];
+    parts.push(`
+Fix the implementation (not the tests) to make all failing tests pass. Do not loosen assertions or weaken test expectations. Run the test suite to verify after each change.`);
+    parts.push(`
+${testEditHeadline(story, prohibition)}`);
+    parts.push(escapeHatchFor(story));
+    return parts.join(`
 `);
   }
 }
@@ -43218,7 +43291,13 @@ For each one:
 Write the corrected PRD to this file path: ${outputFilePath}
 Do not output the PRD in chat. After writing the file, reply with a brief text confirmation only.`;
   }
-  build(specContent, codebaseContext, outputFilePath, packages, packageDetails, projectProfile, proposers) {
+  build(specContent, codebaseContext, outputFilePath, packages, packageDetails, projectProfile, proposers, profiles) {
+    const cards = OneShotPromptBuilder.agentCapabilityCards(profiles ?? []);
+    const agentProfilesSection = cards.length > 0 ? `
+
+${cards}
+
+${OneShotPromptBuilder.agentProfileInstruction()}` : "";
     const isMonorepo = packages && packages.length > 0;
     const packageDetailsSection = packageDetails && packageDetails.length > 0 ? buildPackageDetailsSection(packageDetails) : "";
     const monorepoHint = isMonorepo ? `
@@ -43273,7 +43352,7 @@ ${buildSharedQualityRules(specContent, projectProfile)}
 
 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. Set "expectedFiles" to the NEW files the story creates.
 
-${CONTEXT_VS_EXPECTED_FILES_RULE}`;
+${CONTEXT_VS_EXPECTED_FILES_RULE}${agentProfilesSection}`;
     const suggestedCriteriaField = 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."],` : "";
     const outputDirective = outputFilePath ? `Write the PRD JSON directly to this file path: ${outputFilePath}
@@ -43305,7 +43384,8 @@ Generate a JSON object with this exact structure (no markdown, no explanation \u
         "complexity": "simple | medium | complex | expert",
         "testStrategy": "no-test | tdd-simple | three-session-tdd-lite | three-session-tdd | test-after",
         "noTestJustification": "string \u2014 REQUIRED when testStrategy is no-test, explains why tests are unnecessary",
-        "reasoning": "string \u2014 brief classification rationale"
+        "reasoning": "string \u2014 brief classification rationale"${cards.length > 0 ? `,
+        "agentProfileId": "string \u2014 optional, the id of the best-matching profile from the Agent Profiles table above; omit if none fits"` : ""}
       },
       "escalations": [],
       "attempts": 0
@@ -43322,6 +43402,12 @@ ${outputDirective}`;
       content: "You are a senior software architect generating a product requirements document (PRD) as JSON. Your intent is to produce a thorough, evidence-grounded plan.",
       overridable: false
     };
+    const cards = OneShotPromptBuilder.agentCapabilityCards(input.profiles ?? []);
+    const agentProfilesSection = cards.length > 0 ? `
+
+${cards}
+
+${OneShotPromptBuilder.agentProfileInstruction()}` : "";
     const revisionSection = input.revisionFindings && input.revisionFindings.length > 0 ? `
 
 ## Previous draft rejected for the following issues
@@ -43371,7 +43457,7 @@ ${buildSharedQualityRules(input.specContent, input.projectProfile)}
 
 For each story, set "contextFiles" to the key source files the implementer should read before starting (max 5 per story). Cite manifest factIds where relevant. Set "expectedFiles" to the NEW files the story creates.
 
-${CONTEXT_VS_EXPECTED_FILES_RULE}
+${CONTEXT_VS_EXPECTED_FILES_RULE}${agentProfilesSection}
 
 ## Output Schema
 
@@ -43394,7 +43480,8 @@ Produce a JSON object with this exact structure. Field names are mandatory \u201
       "routing": {
         "complexity": "simple | medium | complex | expert",
         "testStrategy": "no-test | tdd-simple | three-session-tdd-lite | three-session-tdd | test-after",
-        "reasoning": "string \u2014 brief classification rationale"
+        "reasoning": "string \u2014 brief classification rationale"${cards.length > 0 ? `,
+        "agentProfileId": "string \u2014 optional, the id of the best-matching profile from the Agent Profiles table above; omit if none fits"` : ""}
       }
     }
   ]
@@ -43434,6 +43521,7 @@ var CONTEXT_VS_EXPECTED_FILES_RULE = `**\`contextFiles\` rule \u2014 files reada
 **\`expectedFiles\` rule \u2014 files THIS story CREATES.** List every NEW file this story authors (relative paths). A file this story creates belongs here, NEVER in \`contextFiles\` \u2014 these are the story's outputs, not files to read first. A file created by an upstream dependency and only read/modified here belongs in \`contextFiles\`, NOT here (this story does not author it). A single path may appear in \`contextFiles\` (an existing sibling to mirror) AND \`expectedFiles\` (the new file itself), but the same path must never be in both.`, EXPECTED_FILES_SCHEMA_FIELD = `"expectedFiles": ["string \u2014 NEW files this story creates (relative paths, omit if none)"],`;
 var init_plan_builder = __esm(() => {
   init_config();
+  init_one_shot_builder();
 });
 
 // src/prompts/builders/grounder-builder.ts
@@ -44645,11 +44733,22 @@ function buildTxtContent(entry) {
     "",
     "=== RESPONSE ===",
     "",
-    entry.response
+    entry.response,
+    ...buildInteractionLines(entry.interactions)
   ];
   return lines.join(`
 `);
 }
+function buildInteractionLines(interactions) {
+  if (!interactions?.length)
+    return [];
+  const lines = ["", "=== INTERACTIONS ===", ""];
+  for (const ix of interactions) {
+    lines.push(`[turn ${ix.turnIndex}] Q: ${ix.question}`, `         A: ${ix.reply}`, "");
+  }
+  lines.pop();
+  return lines;
+}
 
 class PromptAuditor {
   _queue = Promise.resolve();
@@ -45158,7 +45257,8 @@ function attachAuditSubscriber(bus, auditor, runId) {
       ...event.kind === "session-turn" && {
         sessionId: event.protocolIds.sessionId ?? null,
         recordId: event.protocolIds.recordId ?? null,
-        turn: event.turn
+        turn: event.turn,
+        ...event.interactions?.length ? { interactions: event.interactions } : {}
       }
     };
     auditor.record(entry);
@@ -51771,7 +51871,7 @@ var init_precheck = __esm(() => {
 });
 
 // src/prd/decompose-mapper.ts
-function mapDecomposedStoriesToUserStories(stories, parentStoryId, parentWorkdir) {
+function mapDecomposedStoriesToUserStories(stories, parentStoryId, parentWorkdir, parentRouting) {
   return stories.map((story, entryIndex) => {
     if (!story.id) {
       throw new NaxError(`Entry at index ${entryIndex} is missing required field: id`, "DECOMPOSE_VALIDATION_FAILED", {
@@ -51805,10 +51905,19 @@ function mapDecomposedStoriesToUserStories(stories, parentStoryId, parentWorkdir
         complexity: story.complexity,
         testStrategy: story.testStrategy ?? "test-after",
         reasoning: story.reasoning,
-        modelTier: story.routing?.profileModelTier ?? "balanced",
+        modelTier: parentRouting?.profileModelTier ?? story.routing?.profileModelTier ?? "balanced",
         ...story.routing?.agent !== undefined && { agent: story.routing.agent },
         ...story.routing?.agentProfileId !== undefined && { agentProfileId: story.routing.agentProfileId },
-        ...story.routing?.profileModelTier !== undefined && { profileModelTier: story.routing.profileModelTier }
+        ...story.routing?.profileModelTier !== undefined && { profileModelTier: story.routing.profileModelTier },
+        ...parentRouting?.agent !== undefined && { agent: parentRouting.agent },
+        ...parentRouting?.agentProfileId !== undefined && { agentProfileId: parentRouting.agentProfileId },
+        ...parentRouting?.profileModelTier !== undefined && { profileModelTier: parentRouting.profileModelTier },
+        ...parentRouting?.agent !== undefined && {
+          initialAgent: parentRouting.initialAgent ?? parentRouting.agent
+        },
+        ...parentRouting?.agentProfileId !== undefined && {
+          initialProfileId: parentRouting.initialProfileId ?? parentRouting.agentProfileId
+        }
       }
     };
   });
@@ -51874,8 +51983,7 @@ async function planDecomposeCommand(workdir, config2, options) {
     for (let attempt = 0;attempt < maxReplanAttempts; attempt++) {
       if (attempt === 0 && debateDecompEnabled) {
         const decomposeStageConfig = debateStages.decompose;
-        const agentRoutingForDebate = config2.routing?.agents;
-        const profilesForDebate = agentRoutingForDebate?.enabled === true ? agentRoutingForDebate.profiles ?? [] : [];
+        const profilesForDebate = [];
         const prompt = await buildDecomposePromptAsync({
           specContent: "",
           codebaseContext,
@@ -51950,7 +52058,7 @@ ${repairHint}` : codebaseContext;
   } finally {
     await rt.close().catch(() => {});
   }
-  const subStoriesWithParent = mapDecomposedStoriesToUserStories(decompStories, options.storyId, targetStory.workdir);
+  const subStoriesWithParent = mapDecomposedStoriesToUserStories(decompStories, options.storyId, targetStory.workdir, targetStory.routing);
   const updatedStories = prd.userStories.map((s) => s.id === options.storyId ? { ...s, status: "decomposed" } : s);
   const originalIndex = updatedStories.findIndex((s) => s.id === options.storyId);
   const finalStories = [
@@ -52912,15 +53020,28 @@ async function processPackageGroup(ctx, packageDir, groupStories, language, resu
       featureName: ctx.prd.feature,
       agentName: ctx.agentManager.getDefault()
     };
-    const refined = await _hardeningDeps.callOp(callCtx, acceptanceRefineOp, {
-      criteria: story.suggestedCriteria ?? [],
-      codebaseContext: "",
-      storyId: story.id,
-      testStrategy: ctx.config.acceptance?.testStrategy,
-      testFramework: ctx.config.acceptance?.testFramework,
-      storyTitle: story.title,
-      storyDescription: story.description
-    });
+    let refined;
+    try {
+      refined = await _hardeningDeps.callOp(callCtx, acceptanceRefineOp, {
+        criteria: story.suggestedCriteria ?? [],
+        codebaseContext: "",
+        storyId: story.id,
+        testStrategy: ctx.config.acceptance?.testStrategy,
+        testFramework: ctx.config.acceptance?.testFramework,
+        storyTitle: story.title,
+        storyDescription: story.description
+      });
+    } catch {
+      logger?.warn("acceptance", "AC refinement failed after retries \u2014 using unrefined criteria", {
+        storyId: story.id
+      });
+      refined = (story.suggestedCriteria ?? []).map((c) => ({
+        original: c,
+        refined: c,
+        testable: true,
+        storyId: story.id
+      }));
+    }
     groupRefined.push(...refined);
   }
   const suggestedTestPath = resolveSuggestedPackageFeatureTestPath(packageDir, ctx.prd.feature, ctx.config.acceptance?.suggestedTestPath, language);
@@ -53066,6 +53187,7 @@ __export(exports_acceptance, {
   resolveSuggestedTestFile: () => resolveSuggestedTestFile,
   resolveSuggestedPackageFeatureTestPath: () => resolveSuggestedPackageFeatureTestPath,
   resolveAcceptanceFeatureTestPath: () => resolveAcceptanceFeatureTestPath,
+  refinementWouldFallback: () => refinementWouldFallback,
   parseRefinementResponse: () => parseRefinementResponse,
   parseAcceptanceCriteria: () => parseAcceptanceCriteria,
   parseACTextFromSpec: () => parseACTextFromSpec,
@@ -53480,6 +53602,16 @@ ${stderr}` };
               storyDescription: story.description
             }, story.id).then((refined) => {
               results[i] = refined;
+            }).catch(() => {
+              getSafeLogger()?.warn("acceptance-setup", "AC refinement failed after retries \u2014 using unrefined criteria", {
+                storyId: story.id
+              });
+              results[i] = story.acceptanceCriteria.map((c) => ({
+                original: c,
+                refined: c,
+                testable: true,
+                storyId: story.id
+              }));
             }).finally(() => {
               executing.delete(task);
             });
@@ -55039,7 +55171,8 @@ async function runRectification(ctx, state, phaseCosts, phaseOutputs, overrides)
           break;
         }
       }
-      const validated = rectification.postValidate ? await rectification.postValidate(findings, _validateCtx) : findings;
+      const postValidateFn = overrides?.postValidate ?? rectification.postValidate;
+      const validated = postValidateFn ? await postValidateFn(findings, _validateCtx) : findings;
       return { findings: validated, shortCircuited };
     }
   };
@@ -55209,7 +55342,8 @@ class ExecutionPlan {
           strategies: this.state.nonBlockingFixStrategies ?? [],
           excludePhaseKinds: nonBlockingExcludePhases(),
           extraRevalidationKinds: nonBlockingExtraPhases(advCfg),
-          maxAttempts
+          maxAttempts,
+          postValidate: this.state.nonBlockingFixPostValidate
         })
       });
     }
@@ -55305,9 +55439,10 @@ class StoryOrchestratorBuilder {
     this.state.rectification = opts;
     return this;
   }
-  addNonBlockingFix(cfg, strategies) {
+  addNonBlockingFix(cfg, strategies, postValidate) {
     this.state.nonBlockingFix = cfg;
     this.state.nonBlockingFixStrategies = strategies;
+    this.state.nonBlockingFixPostValidate = postValidate;
     return this;
   }
   build(ctx, opts = {}) {
@@ -55437,10 +55572,10 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
   if (inputs.adversarialReview) {
     builder.addAdversarialReview(inputs.adversarialReview);
   }
+  const packageDir = join47(ctx.packageDir, story.workdir ?? "");
+  const resolvedTestPatterns = await resolveTestFilePatterns(config2, ctx.packageDir, story.workdir);
   if (shouldRunRectification(config2) && inputs.rectification) {
     const sink = makeDeclarationSink();
-    const packageDir = join47(ctx.packageDir, story.workdir ?? "");
-    const resolvedTestPatterns = await resolveTestFilePatterns(config2, ctx.packageDir, story.workdir);
     const strategies = [];
     const pkgQuality = ctx.packageView.select(qualityConfigSelector).quality;
     if (pkgQuality?.commands?.lintFix || pkgQuality?.commands?.lintFixScoped) {
@@ -55450,7 +55585,7 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
       strategies.push(makeMechanicalFormatFixStrategy());
     }
     if (inputs.fullSuiteGate && (isThreeSession || regressionMode === "per-story")) {
-      strategies.push(makeFullSuiteRectifyStrategy(story, config2));
+      strategies.push(makeFullSuiteRectifyStrategy(story, config2, sink));
     }
     if (config2.quality.autofix?.enabled !== false) {
       strategies.push(makeAutofixImplementerStrategy(story, config2, sink, {
@@ -55495,8 +55630,23 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
         includeAdversarialReview: false
       }), makeAutofixTestWriterStrategy(story, config2, nbSink));
     }
-    nbStrategies.push(makeFullSuiteRectifyStrategy(story, config2));
-    builder.addNonBlockingFix(nbf, nbStrategies);
+    nbStrategies.push(makeFullSuiteRectifyStrategy(story, config2, nbSink));
+    const nbPostValidate = async (findings, _validateCtx) => {
+      if (nbSink.testEdits.length === 0 && nbSink.mockHandoffs.length === 0)
+        return findings;
+      const pendingMock = nbSink.mockHandoffs.map((h) => ({
+        reason: "mock_structure",
+        file: h.files[0] ?? "",
+        files: h.files,
+        reasonDetail: h.reasonDetail
+      }));
+      const { valid, invalid } = await validateMockStructureFiles(pendingMock, resolvedTestPatterns, packageDir);
+      nbSink.mockHandoffs = valid.map((d) => ({ files: d.files ?? [], reasonDetail: d.reasonDetail ?? "" }));
+      const allDeclarations = [...nbSink.testEdits, ...valid];
+      nbSink.testEdits = [];
+      return applyTestEditDeclarations(findings, allDeclarations, story, invalid);
+    };
+    builder.addNonBlockingFix(nbf, nbStrategies, nbPostValidate);
   }
   return builder.build(ctx, { isThreeSession });
 }
@@ -60095,7 +60245,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.70.0-canary.1",
+    version: "0.70.0-canary.3",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -60190,8 +60340,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("f895b7d3"))
-        return "f895b7d3";
+      if (/^[0-9a-f]{6,10}$/.test("905b80cf"))
+        return "905b80cf";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -95450,6 +95600,7 @@ async function buildPlanModeContext(workdir, fullConfig, options, deps) {
   const branchName = options.branch ?? `feat/${options.feature}`;
   const timeoutSeconds = fullConfig?.plan?.timeoutSeconds ?? DEFAULT_TIMEOUT_SECONDS2;
   const config2 = planConfigSelector.select(fullConfig);
+  const profileName = typeof fullConfig?.profile === "string" && fullConfig.profile ? fullConfig.profile : undefined;
   const runtime = createPlanRuntime(fullConfig, workdir, options.feature);
   const interactionChain = fullConfig ? await deps.initInteractionChain(fullConfig, !process.stdin.isTTY) : null;
   let configuredBridge;
@@ -95477,6 +95628,7 @@ async function buildPlanModeContext(workdir, fullConfig, options, deps) {
     branchName,
     timeoutSeconds,
     config: config2,
+    profileName,
     options,
     runtime,
     interactionChain,
@@ -95525,6 +95677,28 @@ function buildPlanComposition(userStageConfig) {
 // src/plan/strategies/write-prd.ts
 init_errors();
 init_prd();
+
+// src/plan/strategies/finalize-routing.ts
+init_agents();
+function finalizePrdRouting(prd, agentRouting, profileName) {
+  const userStories = prd.userStories.map((story) => {
+    const assignment = resolveAgentAssignment(story.routing?.agentProfileId, agentRouting, story.id);
+    if (!assignment)
+      return story;
+    const routing = {
+      ...story.routing,
+      agent: assignment.agent,
+      agentProfileId: assignment.agentProfileId,
+      profileModelTier: assignment.profileModelTier,
+      initialAgent: story.routing?.initialAgent ?? assignment.agent,
+      initialProfileId: story.routing?.initialProfileId ?? assignment.agentProfileId
+    };
+    return { ...story, routing };
+  });
+  return { ...prd, userStories, routingProfile: profileName ?? "default" };
+}
+
+// src/plan/strategies/write-prd.ts
 async function writeOrRecoverPrd(ctx, prd, err) {
   const tryExtractPrd = (value) => {
     if (value === null || typeof value !== "object")
@@ -95543,12 +95717,14 @@ async function writeOrRecoverPrd(ctx, prd, err) {
   };
   if (prd !== null) {
     if (Array.isArray(prd.userStories)) {
-      await ctx.deps.writeFile(ctx.outputPath, JSON.stringify({ ...prd, project: ctx.projectName }, null, 2));
+      const finalized = finalizePrdRouting({ ...prd, project: ctx.projectName }, ctx.config.routing?.agents, ctx.profileName);
+      await ctx.deps.writeFile(ctx.outputPath, JSON.stringify(finalized, null, 2));
       return ctx.outputPath;
     }
     const normalizedPrd = tryExtractPrd(prd);
     if (normalizedPrd !== null) {
-      await ctx.deps.writeFile(ctx.outputPath, JSON.stringify({ ...normalizedPrd, project: ctx.projectName }, null, 2));
+      const finalized = finalizePrdRouting({ ...normalizedPrd, project: ctx.projectName }, ctx.config.routing?.agents, ctx.profileName);
+      await ctx.deps.writeFile(ctx.outputPath, JSON.stringify(finalized, null, 2));
       return ctx.outputPath;
     }
   }
@@ -95568,7 +95744,8 @@ async function writeOrRecoverPrd(ctx, prd, err) {
       }
     }
     recoveredPrd = recoveredPrd ?? validatePlanOutput(rawContent, ctx.options.feature, ctx.branchName);
-    await ctx.deps.writeFile(ctx.outputPath, JSON.stringify({ ...recoveredPrd, project: ctx.projectName }, null, 2));
+    const finalized = finalizePrdRouting({ ...recoveredPrd, project: ctx.projectName }, ctx.config.routing?.agents, ctx.profileName);
+    await ctx.deps.writeFile(ctx.outputPath, JSON.stringify(finalized, null, 2));
     return ctx.outputPath;
   } catch {
     throw err;
@@ -95587,7 +95764,9 @@ var _debatePlanDeps = {
 class DebatePlanStrategy {
   mode = "debate";
   async execute(ctx) {
-    const { taskContext, outputFormat } = new PlanPromptBuilder().build(ctx.specContent, ctx.codebaseContext, undefined, ctx.relativePackages, ctx.packageDetails, ctx.config.project);
+    const agentRouting = ctx.config.routing?.agents;
+    const profiles = agentRouting?.enabled === true ? agentRouting.profiles ?? [] : [];
+    const { taskContext, outputFormat } = new PlanPromptBuilder().build(ctx.specContent, ctx.codebaseContext, undefined, ctx.relativePackages, ctx.packageDetails, ctx.config.project, undefined, profiles);
     const planStage = ctx.config.debate?.stages?.plan;
     if (!planStage) {
       throw new NaxError("[plan] debate strategy requires config.debate.stages.plan", "PLAN_DEBATE_STAGE_CONFIG_MISSING", {
@@ -95723,7 +95902,8 @@ class PipelinePlanStrategy {
       if (verdict.outcome !== "passed") {
         throw new NaxError(verdict.specDeltasPath ? `Plan pipeline failed; see ${verdict.specDeltasPath}` : "Plan pipeline failed with no spec-deltas path", "PLAN_CRITIC_BLOCKED", { stage: "plan", specDeltasPath: verdict.specDeltasPath });
       }
-      await ctx.deps.writeFile(ctx.outputPath, JSON.stringify({ ...verdict.prd, project: ctx.projectName }, null, 2));
+      const prdToWrite = finalizePrdRouting({ ...verdict.prd, project: ctx.projectName }, ctx.config.routing?.agents, ctx.profileName);
+      await ctx.deps.writeFile(ctx.outputPath, JSON.stringify(prdToWrite, null, 2));
       return ctx.outputPath;
     } finally {
       await ctx.runtime.close().catch(() => {});
@@ -95804,13 +95984,15 @@ class SinglePlanStrategy {
         projectProfile: ctx.config.project
       });
       assertIsValidPrd(prd);
-      await ctx.deps.writeFile(ctx.outputPath, JSON.stringify({ ...prd, project: ctx.projectName }, null, 2));
+      const finalized = finalizePrdRouting({ ...prd, project: ctx.projectName }, ctx.config.routing?.agents, ctx.profileName);
+      await ctx.deps.writeFile(ctx.outputPath, JSON.stringify(finalized, null, 2));
       return ctx.outputPath;
     } catch (err) {
       if (ctx.deps.existsSync(ctx.outputPath)) {
         const rawContent = await ctx.deps.readFile(ctx.outputPath);
         const recoveredPrd = validatePlanOutput(rawContent, ctx.options.feature, ctx.branchName);
-        await ctx.deps.writeFile(ctx.outputPath, JSON.stringify({ ...recoveredPrd, project: ctx.projectName }, null, 2));
+        const finalizedRecovered = finalizePrdRouting({ ...recoveredPrd, project: ctx.projectName }, ctx.config.routing?.agents, ctx.profileName);
+        await ctx.deps.writeFile(ctx.outputPath, JSON.stringify(finalizedRecovered, null, 2));
         return ctx.outputPath;
       }
       throw err;
@@ -96856,6 +97038,7 @@ var FIELD_DESCRIPTIONS = {
   "acceptance.testPath": "Path to acceptance test file (relative to feature dir)",
   "acceptance.command": "Override command to run acceptance tests. Use {{FILE}} as placeholder for the test file path (default: 'bun test {{FILE}} --timeout=60000')",
   "acceptance.model": 'Model selector for acceptance generation/refinement LLM calls. Accepts a tier string such as "fast", "balanced", or "powerful", or an explicit object like { agent: "codex", model: "gpt-5.4" }. Default: "fast".',
+  "acceptance.generateModel": 'Model selector specifically for acceptance test generation and criteria refinement LLM calls. When set, overrides acceptance.model for these two operations. Accepts a tier string such as "fast", "balanced", or "powerful", or an explicit object like { agent: "opencode", model: "opencode-go/deepseek-v4-flash" }. Defaults to acceptance.model when not set.',
   "acceptance.refinement": "Enable acceptance criteria refinement step before execution (default: true). Disable to skip refinement and use generated criteria as-is.",
   "acceptance.timeoutMs": "Timeout for acceptance test generation in milliseconds (default: 1800000 = 30 min)",
   context: "Context injection configuration",

package/package.json

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