@nathapp/nax 0.59.2 → 0.60.0-canary.1

package/dist/nax.js

@@ -18060,7 +18060,7 @@ function isLegacyFlatModels(val) {
   }
   return false;
 }
-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, DebaterSchema, toObject = (val) => val === undefined || val === null ? {} : val, RESOLVER_TYPES, makeResolverSchema = (defaultType) => exports_external.preprocess(toObject, exports_external.object({
+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(),
   tieBreaker: exports_external.string().min(1).optional(),
@@ -18072,7 +18072,8 @@ var TokenPricingSchema, ModelDefSchema, ModelEntrySchema, PerAgentModelMapSchema
   rounds: exports_external.number().int().min(1).default(defaults.rounds),
   mode: exports_external.enum(["panel", "hybrid"]).default("panel"),
   debaters: exports_external.array(DebaterSchema).min(2, "debaters must have at least 2 entries").optional(),
-  timeoutSeconds: exports_external.number().int().positive().default(600)
+  timeoutSeconds: exports_external.number().int().positive().default(600),
+  autoPersona: exports_external.boolean().default(false)
 })), DebateConfigSchema, NaxConfigSchema;
 var init_schemas3 = __esm(() => {
   init_zod();
@@ -18431,9 +18432,11 @@ var init_schemas3 = __esm(() => {
   GenerateConfigSchema = exports_external.object({
     agents: exports_external.array(exports_external.enum(VALID_AGENT_TYPES)).optional()
   });
+  DebaterPersonaEnum = exports_external.enum(["challenger", "pragmatist", "completionist", "security", "testability"]);
   DebaterSchema = exports_external.object({
     agent: exports_external.string().min(1, "debater.agent must be non-empty"),
-    model: exports_external.string().min(1, "debater.model must be non-empty").optional()
+    model: exports_external.string().min(1, "debater.model must be non-empty").optional(),
+    persona: DebaterPersonaEnum.optional()
   });
   RESOLVER_TYPES = ["synthesis", "majority-fail-closed", "majority-fail-open", "custom"];
   DebateConfigSchema = exports_external.preprocess(toObject, exports_external.object({
@@ -18722,7 +18725,8 @@ var init_schemas3 = __esm(() => {
           sessionMode: "stateful",
           rounds: 3,
           mode: "panel",
-          timeoutSeconds: 600
+          timeoutSeconds: 600,
+          autoPersona: false
         },
         review: {
           enabled: true,
@@ -18730,7 +18734,8 @@ var init_schemas3 = __esm(() => {
           sessionMode: "one-shot",
           rounds: 2,
           mode: "panel",
-          timeoutSeconds: 600
+          timeoutSeconds: 600,
+          autoPersona: false
         },
         acceptance: {
           enabled: false,
@@ -18738,7 +18743,8 @@ var init_schemas3 = __esm(() => {
           sessionMode: "one-shot",
           rounds: 1,
           mode: "panel",
-          timeoutSeconds: 600
+          timeoutSeconds: 600,
+          autoPersona: false
         },
         rectification: {
           enabled: false,
@@ -18746,7 +18752,8 @@ var init_schemas3 = __esm(() => {
           sessionMode: "one-shot",
           rounds: 1,
           mode: "panel",
-          timeoutSeconds: 600
+          timeoutSeconds: 600,
+          autoPersona: false
         },
         escalation: {
           enabled: false,
@@ -18754,7 +18761,8 @@ var init_schemas3 = __esm(() => {
           sessionMode: "one-shot",
           rounds: 1,
           mode: "panel",
-          timeoutSeconds: 600
+          timeoutSeconds: 600,
+          autoPersona: false
         }
       }
     })),
@@ -21365,28 +21373,91 @@ var init_config = __esm(() => {
   init_profile();
 });
 
-// src/debate/prompts.ts
-function buildCritiquePrompt(taskPrompt, allProposals, debaterIndex) {
-  const othersProposals = allProposals.filter((_, i) => i !== debaterIndex);
-  const proposalsSection = othersProposals.map((p, i) => `### Proposal ${i + 1}
-${p}`).join(`
-
-`);
-  return `You are reviewing proposals from other agents for the following task.
-
-## Task
-${taskPrompt}
+// src/utils/llm-json.ts
+function extractJsonFromMarkdown(text) {
+  const match = text.match(/```(?:json)?\s*\n([\s\S]*?)\n?\s*```/);
+  if (match) {
+    return match[1] ?? text;
+  }
+  return text;
+}
+function stripTrailingCommas(text) {
+  return text.replace(/,\s*([}\]])/g, "$1");
+}
+function extractJsonObject(text) {
+  const objStart = text.indexOf("{");
+  const arrStart = text.indexOf("[");
+  let start;
+  let closeChar;
+  if (objStart === -1 && arrStart === -1)
+    return null;
+  if (objStart === -1) {
+    start = arrStart;
+    closeChar = "]";
+  } else if (arrStart === -1) {
+    start = objStart;
+    closeChar = "}";
+  } else if (objStart < arrStart) {
+    start = objStart;
+    closeChar = "}";
+  } else {
+    start = arrStart;
+    closeChar = "]";
+  }
+  const end = text.lastIndexOf(closeChar);
+  if (end <= start)
+    return null;
+  return text.slice(start, end + 1);
+}
+function wrapJsonPrompt(prompt) {
+  return `IMPORTANT: Your entire response must be a single JSON object or array. Do not explain your reasoning. Do not use markdown formatting. Output ONLY the JSON.
 
-## Other Agents' Proposals
-${proposalsSection}
+${prompt.trim()}
 
-Please critique these proposals and provide your refined analysis, identifying strengths, weaknesses, and your own updated position.`;
+YOUR RESPONSE MUST START WITH { OR [ AND END WITH } OR ]. No other text.`;
+}
+function parseLLMJson(text) {
+  const trimmed = text.trim();
+  try {
+    return JSON.parse(trimmed);
+  } catch {}
+  const fromFence = extractJsonFromMarkdown(trimmed);
+  if (fromFence !== trimmed) {
+    try {
+      return JSON.parse(stripTrailingCommas(fromFence));
+    } catch {}
+  }
+  const bareJson = extractJsonObject(trimmed);
+  if (bareJson) {
+    try {
+      return JSON.parse(stripTrailingCommas(bareJson));
+    } catch {}
+  }
+  throw new SyntaxError("[llm-json] Failed to parse LLM response as JSON");
 }
-function buildSynthesisPrompt(proposals, critiques) {
-  const proposalsSection = proposals.map((p, i) => `### Proposal ${i + 1}
-${p}`).join(`
+function tryParseLLMJson(text) {
+  try {
+    return parseLLMJson(text);
+  } catch {
+    return null;
+  }
+}
+
+// src/debate/resolvers.ts
+function buildDebaterLabel(debater) {
+  return debater.persona ? `${debater.agent} (${debater.persona})` : debater.agent;
+}
+function buildProposalsSection(proposals, debaters) {
+  return proposals.map((p, i) => {
+    const label = debaters?.[i] ? buildDebaterLabel(debaters[i]) : String(i + 1);
+    return `### Proposal ${label}
+${p}`;
+  }).join(`
 
 `);
+}
+function buildSynthesisPrompt(proposals, critiques, debaters) {
+  const proposalsSection = buildProposalsSection(proposals, debaters);
   const critiquesSection = critiques.length > 0 ? `
 
 ## Critiques
@@ -21401,11 +21472,8 @@ ${proposalsSection}${critiquesSection}
 
 Please synthesize these into the best possible unified response, incorporating the strongest elements from each proposal.`;
 }
-function buildJudgePrompt(proposals, critiques) {
-  const proposalsSection = proposals.map((p, i) => `### Proposal ${i + 1}
-${p}`).join(`
-
-`);
+function buildJudgePrompt(proposals, critiques, debaters) {
+  const proposalsSection = buildProposalsSection(proposals, debaters);
   const critiquesSection = critiques.length > 0 ? `
 
 ## Critiques
@@ -21420,28 +21488,6 @@ ${proposalsSection}${critiquesSection}
 
 As the judge, provide your final verdict with clear reasoning, selecting or synthesizing the best approach.`;
 }
-function buildRebuttalContext(prompt, proposals, rebuttalOutputs, currentDebaterIndex) {
-  const proposalsSection = proposals.map((p, i) => `### Proposal ${i + 1} (${p.debater.agent})
-${p.output}`).join(`
-
-`);
-  const rebuttalsSection = rebuttalOutputs.length > 0 ? `
-
-## Previous Rebuttals
-${rebuttalOutputs.map((r, i) => `${i + 1}. ${r}`).join(`
-
-`)}` : "";
-  const debaterNumber = currentDebaterIndex + 1;
-  return `${prompt}
-
-## Proposals
-${proposalsSection}${rebuttalsSection}
-
-## Your Task
-You are debater ${debaterNumber}. Provide your rebuttal to the proposals and previous rebuttals above.`;
-}
-
-// src/debate/resolvers.ts
 function stripMarkdownFence(text) {
   const match = text.match(/^```(?:json)?\s*\n?([\s\S]*?)\n?```\s*$/);
   return match ? match[1] ?? text : text;
@@ -21475,7 +21521,7 @@ function majorityResolver(proposals, failOpen) {
   return passCount > failCount ? "passed" : "failed";
 }
 async function synthesisResolver(proposals, critiques, opts) {
-  const base = buildSynthesisPrompt(proposals, critiques);
+  const base = buildSynthesisPrompt(proposals, critiques, opts.debaters);
   const prompt = opts.promptSuffix ? `${base}
 
 ${opts.promptSuffix}` : base;
@@ -21487,11 +21533,10 @@ async function judgeResolver(proposals, critiques, resolverConfig, opts) {
   if (!adapter) {
     throw new Error(`[debate] Judge agent '${agentName}' not found`);
   }
-  const prompt = buildJudgePrompt(proposals, critiques);
+  const prompt = buildJudgePrompt(proposals, critiques, opts.debaters);
   return adapter.complete(prompt, opts.completeOptions);
 }
 var DEFAULT_FALLBACK_AGENT = "claude";
-var init_resolvers = () => {};
 
 // src/debate/session-helpers.ts
 function resolveDebaterModel(debater, config2) {
@@ -21567,7 +21612,7 @@ function resolveModelDefForDebater(debater, tier, config2) {
     return resolveModelForAgent(configModels, debater.agent, "fast", configDefaultAgent);
   }
 }
-async function resolveOutcome(proposalOutputs, critiqueOutputs, stageConfig, config2, storyId, timeoutMs, workdir, featureName, reviewerSession, resolverContext, promptSuffix) {
+async function resolveOutcome(proposalOutputs, critiqueOutputs, stageConfig, config2, storyId, timeoutMs, workdir, featureName, reviewerSession, resolverContext, promptSuffix, debaters) {
   const resolverConfig = stageConfig.resolver;
   const logger = _debateSessionDeps.getSafeLogger();
   if (reviewerSession && resolverContext) {
@@ -21581,21 +21626,13 @@ async function resolveOutcome(proposalOutputs, critiqueOutputs, stageConfig, con
         let passCount = 0;
         let failCount = 0;
         for (const proposal of proposalOutputs) {
-          try {
-            const stripped = proposal.trim().replace(/^```(?:json)?\s*\n?/, "").replace(/\n?```\s*$/, "");
-            const parsed = JSON.parse(stripped);
-            if (typeof parsed.passed === "boolean" && parsed.passed)
-              passCount++;
-            else if (failOpen)
-              passCount++;
-            else
-              failCount++;
-          } catch {
-            if (failOpen)
-              passCount++;
-            else
-              failCount++;
-          }
+          const parsed = tryParseLLMJson(proposal);
+          if (parsed !== null && typeof parsed.passed === "boolean" && parsed.passed)
+            passCount++;
+          else if (failOpen)
+            passCount++;
+          else
+            failCount++;
         }
         debateCtx.majorityVote = { passed: rawOutcome === "passed", passCount, failCount };
       }
@@ -21644,6 +21681,7 @@ async function resolveOutcome(proposalOutputs, critiqueOutputs, stageConfig, con
       const resolverResult = await synthesisResolver(proposalOutputs, critiqueOutputs, {
         adapter,
         promptSuffix,
+        debaters,
         completeOptions: {
           model: resolveDebaterModel({ agent: agentName }, config2),
           config: config2,
@@ -21669,6 +21707,7 @@ async function resolveOutcome(proposalOutputs, critiqueOutputs, stageConfig, con
     const resolverResult = await judgeResolver(proposalOutputs, critiqueOutputs, resolverConfig, {
       getAgent: (name) => _debateSessionDeps.getAgent(name, config2),
       defaultAgentName: RESOLVER_FALLBACK_AGENT,
+      debaters,
       completeOptions: {
         model: resolveDebaterModel({ agent: agentName }, config2),
         config: config2,
@@ -21694,7 +21733,6 @@ var init_session_helpers = __esm(() => {
   init_registry();
   init_config();
   init_logger2();
-  init_resolvers();
   _debateSessionDeps = {
     getAgent: (name, config2) => config2 ? createAgentRegistry(config2).getAgent(name) : getAgent(name),
     getSafeLogger,
@@ -21728,6 +21766,174 @@ async function allSettledBounded(tasks, limit) {
   return results;
 }
 
+// src/debate/personas.ts
+function resolvePersonas(debaters, stage, autoPersona) {
+  if (!autoPersona)
+    return debaters;
+  const rotation = stage === "plan" ? PLAN_ROTATION : REVIEW_ROTATION;
+  let rotationIndex = 0;
+  return debaters.map((d) => {
+    if (d.persona)
+      return d;
+    const assigned = rotation[rotationIndex % rotation.length];
+    rotationIndex++;
+    return { ...d, persona: assigned };
+  });
+}
+function buildDebaterLabel2(debater) {
+  return debater.persona ? `${debater.agent} (${debater.persona})` : debater.agent;
+}
+var PERSONA_FRAGMENTS, PLAN_ROTATION, REVIEW_ROTATION;
+var init_personas = __esm(() => {
+  PERSONA_FRAGMENTS = {
+    challenger: {
+      identity: "You are the challenger \u2014 your job is to stress-test proposals and find weaknesses.",
+      lens: "Question every assumption. Look for missing edge cases, unhandled error states, " + "and scenarios where the proposed approach could break under real-world conditions. " + "If a proposal lacks justification for a design choice, call it out."
+    },
+    pragmatist: {
+      identity: "You are the pragmatist \u2014 your job is to find the simplest path that satisfies the spec.",
+      lens: "Favour minimal scope, fewest files changed, and lowest complexity. " + "Challenge any proposal that adds abstraction, configuration, or code beyond what the spec requires. " + "If something can be done in 5 lines instead of 50, advocate for the 5-line version."
+    },
+    completionist: {
+      identity: "You are the completionist \u2014 your job is to ensure nothing is missed.",
+      lens: "Verify every acceptance criterion is addressed. Check that edge cases have tests, " + "that error messages are user-friendly, and that the implementation handles all status/state variants. " + "If the spec is ambiguous, flag it and propose the safer interpretation."
+    },
+    security: {
+      identity: "You are the security reviewer \u2014 your job is to surface risks before they ship.",
+      lens: "Evaluate input validation, secret handling, injection vectors, and trust boundaries. " + "Check that user-supplied data is never used unsanitised in commands, queries, or file paths. " + "If the proposal touches auth, permissions, or external APIs, apply extra scrutiny."
+    },
+    testability: {
+      identity: "You are the testability advocate \u2014 your job is to ensure the design is verifiable.",
+      lens: "Assess whether the proposed implementation can be tested without mocks, " + "whether test boundaries are clean, and whether the acceptance criteria are machine-verifiable. " + "Challenge any design that makes testing harder (global state, tight coupling, hidden side effects)."
+    }
+  };
+  PLAN_ROTATION = ["challenger", "pragmatist", "completionist", "security", "testability"];
+  REVIEW_ROTATION = ["security", "completionist", "testability", "challenger", "pragmatist"];
+});
+
+// src/debate/prompt-builder.ts
+class DebatePromptBuilder {
+  stageContext;
+  options;
+  constructor(stageContext, options) {
+    this.stageContext = stageContext;
+    this.options = options;
+  }
+  buildProposalPrompt(debaterIndex) {
+    const personaBlock = this.buildPersonaBlock(debaterIndex);
+    return `${this.stageContext.taskContext}${personaBlock}
+
+${this.stageContext.outputFormat}`;
+  }
+  buildCritiquePrompt(debaterIndex, proposals) {
+    const otherProposals = proposals.filter((_, i) => i !== debaterIndex);
+    const proposalsSection = this.buildProposalsSection(otherProposals);
+    const personaBlock = this.buildPersonaBlock(debaterIndex);
+    return `You are reviewing proposals for a ${this.stageContext.stage} task.
+
+## Task
+${this.stageContext.taskContext}${personaBlock}
+
+## Other Agents' Proposals
+${proposalsSection}
+
+Please critique these proposals and provide your refined analysis, identifying strengths, weaknesses, and your own updated position.`;
+  }
+  buildRebuttalPrompt(debaterIndex, proposals, priorRebuttals) {
+    const contextBlock = this.options.sessionMode === "one-shot" ? `${this.stageContext.taskContext}
+
+` : "";
+    const proposalsSection = this.buildProposalsSection(proposals);
+    const rebuttalsSection = this.buildRebuttalsSection(priorRebuttals);
+    const personaBlock = this.buildPersonaBlock(debaterIndex);
+    const debaterNumber = debaterIndex + 1;
+    return `${contextBlock}## Proposals
+${proposalsSection}${rebuttalsSection}${personaBlock}
+
+## Your Task
+You are debater ${debaterNumber}. Provide your critique in prose.
+Identify strengths, weaknesses, and specific improvements for each proposal.
+Do NOT output JSON \u2014 focus on analysis only.`;
+  }
+  buildSynthesisPrompt(proposals, critiques, promptSuffix) {
+    const proposalsSection = this.buildProposalsSection(proposals);
+    const critiquesSection = this.buildCritiquesSection(critiques);
+    return `You are a synthesis agent. Your task is to combine the strongest elements from multiple proposals into a single, optimal response.
+
+${this.stageContext.taskContext}
+
+## Proposals
+${proposalsSection}
+
+## Critiques
+${critiquesSection}
+
+Please synthesize these into the best possible unified response, incorporating the strongest elements from each proposal.
+${this.stageContext.outputFormat}${promptSuffix ? `
+${promptSuffix}` : ""}`;
+  }
+  buildJudgePrompt(proposals, critiques) {
+    const proposalsSection = this.buildProposalsSection(proposals);
+    const critiquesSection = this.buildCritiquesSection(critiques);
+    return `You are a judge evaluating multiple proposals. Select the best proposal or synthesize the optimal response.
+
+${this.stageContext.taskContext}
+
+## Proposals
+${proposalsSection}
+
+## Critiques
+${critiquesSection}
+
+Evaluate each proposal against the critiques and provide the best possible response.
+${this.stageContext.outputFormat}`;
+  }
+  buildClosePrompt() {
+    return "Close this debate session.";
+  }
+  buildPersonaBlock(debaterIndex) {
+    const debater = this.options.debaters[debaterIndex];
+    if (!debater?.persona)
+      return "";
+    const { identity, lens } = PERSONA_FRAGMENTS[debater.persona];
+    return `
+
+## Your Role
+${identity}
+${lens}`;
+  }
+  buildProposalsSection(proposals) {
+    return proposals.map((p, i) => `### Proposal ${i + 1} (${this.buildDebaterLabel(p.debater)})
+${p.output}`).join(`
+
+`);
+  }
+  buildRebuttalsSection(rebuttals) {
+    if (rebuttals.length === 0)
+      return "";
+    return `
+
+## Previous Rebuttals
+${rebuttals.map((r, i) => `${i + 1}. ${r.output}`).join(`
+
+`)}`;
+  }
+  buildCritiquesSection(critiques) {
+    if (critiques.length === 0)
+      return "";
+    return critiques.map((c, i) => `### Critique ${i + 1} (${this.buildDebaterLabel(c.debater)})
+${c.output}`).join(`
+
+`);
+  }
+  buildDebaterLabel(debater) {
+    return debater.persona ? `${debater.agent} (${debater.persona})` : debater.agent;
+  }
+}
+var init_prompt_builder = __esm(() => {
+  init_personas();
+});
+
 // src/debate/session-stateful.ts
 async function runStatefulTurn(ctx, adapter, debater, prompt, roleKey, keepSessionOpen) {
   const modelTier = modelTierFromDebater(debater);
@@ -21783,7 +21989,9 @@ async function closeStatefulSession(ctx, adapter, debater, roleKey) {
 async function runStateful(ctx, prompt) {
   const logger = _debateSessionDeps.getSafeLogger();
   const config2 = ctx.stageConfig;
-  const debaters = config2.debaters ?? [];
+  const personaStage = ctx.stage === "plan" ? "plan" : "review";
+  const rawDebaters = config2.debaters ?? [];
+  const debaters = resolvePersonas(rawDebaters, personaStage, config2.autoPersona ?? false);
   let totalCostUsd = 0;
   const resolved = [];
   for (const debater of debaters) {
@@ -21801,7 +22009,8 @@ async function runStateful(ctx, prompt) {
   });
   const debate = ctx.config?.debate;
   const concurrencyLimit = debate?.maxConcurrentDebaters ?? 2;
-  const proposalSettled = await allSettledBounded(resolved.map(({ debater, adapter }, debaterIdx) => () => runStatefulTurn(ctx, adapter, debater, prompt, `debate-${ctx.stage}-${debaterIdx}`, config2.rounds > 1)), concurrencyLimit);
+  const proposalBuilder = new DebatePromptBuilder({ taskContext: prompt, outputFormat: "", stage: ctx.stage }, { debaters: resolved.map((r) => r.debater), sessionMode: "stateful" });
+  const proposalSettled = await allSettledBounded(resolved.map(({ debater, adapter }, debaterIdx) => () => runStatefulTurn(ctx, adapter, debater, proposalBuilder.buildProposalPrompt(debaterIdx), `debate-${ctx.stage}-${debaterIdx}`, config2.rounds > 1)), concurrencyLimit);
   const successfulProposals = proposalSettled.filter((r) => r.status === "fulfilled").map((r) => r.value);
   for (const r of proposalSettled) {
     if (r.status === "fulfilled") {
@@ -21880,8 +22089,9 @@ async function runStateful(ctx, prompt) {
   }
   let critiqueOutputs = [];
   if (config2.rounds > 1) {
-    const proposalOutputs2 = successfulProposals.map((s) => s.output);
-    const critiqueSettled = await allSettledBounded(successfulProposals.map((proposal, successfulIdx) => () => runStatefulTurn(ctx, proposal.adapter, proposal.debater, buildCritiquePrompt(prompt, proposalOutputs2, successfulIdx), proposal.roleKey ?? `debate-${ctx.stage}-${successfulIdx}`, false)), concurrencyLimit);
+    const proposals2 = successfulProposals.map((s) => ({ debater: s.debater, output: s.output }));
+    const critiqueBuilder = new DebatePromptBuilder({ taskContext: prompt, outputFormat: "", stage: ctx.stage }, { debaters: proposals2.map((p) => p.debater), sessionMode: ctx.stageConfig.sessionMode ?? "one-shot" });
+    const critiqueSettled = await allSettledBounded(successfulProposals.map((proposal, successfulIdx) => () => runStatefulTurn(ctx, proposal.adapter, proposal.debater, critiqueBuilder.buildCritiquePrompt(successfulIdx, proposals2), proposal.roleKey ?? `debate-${ctx.stage}-${successfulIdx}`, false)), concurrencyLimit);
     for (const r of critiqueSettled) {
       if (r.status === "fulfilled") {
         totalCostUsd += r.value.cost;
@@ -21892,9 +22102,9 @@ async function runStateful(ctx, prompt) {
   const proposalOutputs = successfulProposals.map((s) => s.output);
   const fullResolverContext = ctx.resolverContextInput ? {
     ...ctx.resolverContextInput,
-    labeledProposals: successfulProposals.map((s) => ({ debater: s.debater.agent, output: s.output }))
+    labeledProposals: successfulProposals.map((s) => ({ debater: buildDebaterLabel2(s.debater), output: s.output }))
   } : undefined;
-  const outcome = await resolveOutcome(proposalOutputs, critiqueOutputs, ctx.stageConfig, ctx.config, ctx.storyId, ctx.timeoutSeconds * 1000, ctx.workdir, ctx.featureName, ctx.reviewerSession, fullResolverContext);
+  const outcome = await resolveOutcome(proposalOutputs, critiqueOutputs, ctx.stageConfig, ctx.config, ctx.storyId, ctx.timeoutSeconds * 1000, ctx.workdir, ctx.featureName, ctx.reviewerSession, fullResolverContext, undefined, successfulProposals.map((s) => s.debater));
   totalCostUsd += outcome.resolverCostUsd;
   const proposals = successfulProposals.map((s) => ({
     debater: s.debater,
@@ -21917,11 +22127,13 @@ async function runStateful(ctx, prompt) {
   };
 }
 var init_session_stateful = __esm(() => {
+  init_personas();
+  init_prompt_builder();
   init_session_helpers();
 });
 
 // src/debate/session-hybrid.ts
-async function runRebuttalLoop(ctx, proposals, originalPrompt, sessionRolePrefix) {
+async function runRebuttalLoop(ctx, proposals, builder, sessionRolePrefix) {
   const logger = _debateSessionDeps.getSafeLogger();
   const config2 = ctx.stageConfig;
   const rebuttals = [];
@@ -21929,7 +22141,7 @@ async function runRebuttalLoop(ctx, proposals, originalPrompt, sessionRolePrefix
   const proposalList = proposals.map((s) => ({ debater: s.debater, output: s.output }));
   try {
     for (let round = 1;round <= config2.rounds; round++) {
-      const priorRebuttals = rebuttals.filter((r) => r.round < round).map((r) => r.output);
+      const priorRebuttals = rebuttals.filter((r) => r.round < round);
       for (let debaterIdx = 0;debaterIdx < proposals.length; debaterIdx++) {
         const proposal = proposals[debaterIdx];
         const sessionRole = `${sessionRolePrefix}-${debaterIdx}`;
@@ -21938,7 +22150,7 @@ async function runRebuttalLoop(ctx, proposals, originalPrompt, sessionRolePrefix
           round,
           debaterIndex: debaterIdx
         });
-        const rebuttalPrompt = buildRebuttalContext(originalPrompt, proposalList, priorRebuttals, debaterIdx);
+        const rebuttalPrompt = builder.buildRebuttalPrompt(debaterIdx, proposalList, priorRebuttals);
         try {
           const turnResult = await runStatefulTurn(ctx, proposal.adapter, proposal.debater, rebuttalPrompt, sessionRole, true);
           costUsd += turnResult.cost;
@@ -21968,7 +22180,9 @@ async function runRebuttalLoop(ctx, proposals, originalPrompt, sessionRolePrefix
 async function runHybrid(ctx, prompt) {
   const logger = _debateSessionDeps.getSafeLogger();
   const config2 = ctx.stageConfig;
-  const debaters = config2.debaters ?? [];
+  const personaStage = ctx.stage === "plan" ? "plan" : "review";
+  const rawDebaters = config2.debaters ?? [];
+  const debaters = resolvePersonas(rawDebaters, personaStage, config2.autoPersona ?? false);
   let totalCostUsd = 0;
   const resolved = [];
   for (const debater of debaters) {
@@ -22033,14 +22247,15 @@ async function runHybrid(ctx, prompt) {
   }
   const proposalOutputs = successfulProposals.map((s) => s.output);
   const proposalList = successfulProposals.map((s) => ({ debater: s.debater, output: s.output }));
-  const { rebuttals, costUsd: rebuttalCost } = await runRebuttalLoop(ctx, successfulProposals, prompt, "debate-hybrid");
+  const rebuttalBuilder = new DebatePromptBuilder({ taskContext: prompt, outputFormat: "", stage: ctx.stage }, { debaters: successfulProposals.map((s) => s.debater), sessionMode: "stateful" });
+  const { rebuttals, costUsd: rebuttalCost } = await runRebuttalLoop(ctx, successfulProposals, rebuttalBuilder, "debate-hybrid");
   totalCostUsd += rebuttalCost;
   const critiqueOutputs = rebuttals.map((r) => r.output);
   const fullResolverContext = ctx.resolverContextInput ? {
     ...ctx.resolverContextInput,
-    labeledProposals: successfulProposals.map((s) => ({ debater: s.debater.agent, output: s.output }))
+    labeledProposals: successfulProposals.map((s) => ({ debater: buildDebaterLabel2(s.debater), output: s.output }))
   } : undefined;
-  const resolveResult = await resolveOutcome(proposalOutputs, critiqueOutputs, ctx.stageConfig, ctx.config, ctx.storyId, ctx.timeoutSeconds * 1000, ctx.workdir, ctx.featureName, ctx.reviewerSession, fullResolverContext);
+  const resolveResult = await resolveOutcome(proposalOutputs, critiqueOutputs, ctx.stageConfig, ctx.config, ctx.storyId, ctx.timeoutSeconds * 1000, ctx.workdir, ctx.featureName, ctx.reviewerSession, fullResolverContext, undefined, successfulProposals.map((s) => s.debater));
   totalCostUsd += resolveResult.resolverCostUsd;
   return {
     storyId: ctx.storyId,
@@ -22055,6 +22270,8 @@ async function runHybrid(ctx, prompt) {
   };
 }
 var init_session_hybrid = __esm(() => {
+  init_personas();
+  init_prompt_builder();
   init_session_helpers();
   init_session_stateful();
 });
@@ -22063,7 +22280,9 @@ var init_session_hybrid = __esm(() => {
 async function runOneShot(ctx, prompt) {
   const logger = _debateSessionDeps.getSafeLogger();
   const config2 = ctx.stageConfig;
-  const debaters = config2.debaters ?? [];
+  const personaStage = ctx.stage === "plan" ? "plan" : "review";
+  const rawDebaters = config2.debaters ?? [];
+  const debaters = resolvePersonas(rawDebaters, personaStage, config2.autoPersona ?? false);
   let totalCostUsd = 0;
   const resolved = [];
   for (const debater of debaters) {
@@ -22081,7 +22300,8 @@ async function runOneShot(ctx, prompt) {
   });
   const debate = ctx.config?.debate;
   const concurrencyLimit = debate?.maxConcurrentDebaters ?? 2;
-  const proposalSettled = await allSettledBounded(resolved.map(({ debater, adapter }, i) => () => runComplete(adapter, prompt, {
+  const proposalBuilder = new DebatePromptBuilder({ taskContext: prompt, outputFormat: "", stage: ctx.stage }, { debaters: resolved.map((r) => r.debater), sessionMode: "one-shot" });
+  const proposalSettled = await allSettledBounded(resolved.map(({ debater, adapter }, i) => () => runComplete(adapter, proposalBuilder.buildProposalPrompt(i), {
     model: resolveDebaterModel(debater, ctx.config),
     featureName: ctx.stage,
     config: ctx.config,
@@ -22166,8 +22386,9 @@ async function runOneShot(ctx, prompt) {
   }
   let critiqueOutputs = [];
   if (config2.rounds > 1) {
-    const proposalOutputs2 = successful.map((p) => p.output);
-    const critiqueSettled = await allSettledBounded(successful.map(({ debater, adapter }, i) => () => runComplete(adapter, buildCritiquePrompt(prompt, proposalOutputs2, i), {
+    const proposals2 = successful.map((p) => ({ debater: p.debater, output: p.output }));
+    const critiqueBuilder = new DebatePromptBuilder({ taskContext: prompt, outputFormat: "", stage: ctx.stage }, { debaters: proposals2.map((p) => p.debater), sessionMode: ctx.stageConfig.sessionMode ?? "one-shot" });
+    const critiqueSettled = await allSettledBounded(successful.map(({ debater, adapter }, i) => () => runComplete(adapter, critiqueBuilder.buildCritiquePrompt(i, proposals2), {
       model: resolveDebaterModel(debater, ctx.config),
       featureName: ctx.stage,
       config: ctx.config,
@@ -22185,9 +22406,9 @@ async function runOneShot(ctx, prompt) {
   const proposalOutputs = successful.map((p) => p.output);
   const fullResolverContext = ctx.resolverContextInput ? {
     ...ctx.resolverContextInput,
-    labeledProposals: successful.map((p) => ({ debater: p.debater.agent, output: p.output }))
+    labeledProposals: successful.map((p) => ({ debater: buildDebaterLabel2(p.debater), output: p.output }))
   } : undefined;
-  const outcome = await resolveOutcome(proposalOutputs, critiqueOutputs, ctx.stageConfig, ctx.config, ctx.storyId, ctx.timeoutMs, ctx.workdir, ctx.featureName, ctx.reviewerSession, fullResolverContext);
+  const outcome = await resolveOutcome(proposalOutputs, critiqueOutputs, ctx.stageConfig, ctx.config, ctx.storyId, ctx.timeoutMs, ctx.workdir, ctx.featureName, ctx.reviewerSession, fullResolverContext, undefined, successful.map((p) => p.debater));
   totalCostUsd += outcome.resolverCostUsd;
   const proposals = successful.map((p) => ({
     debater: p.debater,
@@ -22210,15 +22431,18 @@ async function runOneShot(ctx, prompt) {
   };
 }
 var init_session_one_shot = __esm(() => {
+  init_personas();
+  init_prompt_builder();
   init_session_helpers();
 });
 
 // src/debate/session-plan.ts
 import { join as join10 } from "path";
-async function runPlan2(ctx, basePrompt, opts) {
+async function runPlan2(ctx, taskContext, outputFormat, opts) {
   const logger = _debateSessionDeps.getSafeLogger();
   const config2 = ctx.stageConfig;
-  const debaters = config2.debaters ?? [];
+  const rawDebaters = config2.debaters ?? [];
+  const debaters = resolvePersonas(rawDebaters, "plan", config2.autoPersona ?? false);
   let totalCostUsd = 0;
   const resolved = [];
   for (const debater of debaters) {
@@ -22236,14 +22460,15 @@ async function runPlan2(ctx, basePrompt, opts) {
   });
   const debate = ctx.config?.debate;
   const concurrencyLimit = debate?.maxConcurrentDebaters ?? 2;
-  const settled = await allSettledBounded(resolved.map(({ debater, adapter }, i) => async () => {
+  const proposalBuilder = new DebatePromptBuilder({ taskContext, outputFormat, stage: "plan" }, { debaters: resolved.map((r) => r.debater), sessionMode: ctx.stageConfig.sessionMode ?? "one-shot" });
+  const settled = await allSettledBounded(resolved.map(({ debater: rd, adapter }, i) => async () => {
     const tempOutputPath = join10(opts.outputDir, `prd-debate-${i}.json`);
-    const debaterPrompt = `${basePrompt}
+    const debaterPrompt = `${proposalBuilder.buildProposalPrompt(i)}
 
 Write the PRD JSON directly to this file path: ${tempOutputPath}
 Do NOT output the JSON to the conversation. Write the file, then reply with a brief confirmation.`;
-    const modelTier = modelTierFromDebater(debater);
-    const modelDef = resolveModelDefForDebater(debater, modelTier, ctx.config);
+    const modelTier = modelTierFromDebater(rd);
+    const modelDef = resolveModelDefForDebater(rd, modelTier, ctx.config);
     const planResult = await adapter.plan({
       prompt: debaterPrompt,
       workdir: opts.workdir,
@@ -22259,7 +22484,7 @@ Do NOT output the JSON to the conversation. Write the file, then reply with a br
       sessionRole: `plan-${i}`
     });
     const output = await _debateSessionDeps.readFile(tempOutputPath);
-    return { debater, adapter, output, cost: planResult.costUsd ?? 0 };
+    return { debater: rd, adapter, output, cost: planResult.costUsd ?? 0 };
   }), concurrencyLimit);
   const successful = [];
   for (let i = 0;i < settled.length; i++) {
@@ -22332,7 +22557,8 @@ Do NOT output the JSON to the conversation. Write the file, then reply with a br
       featureName: opts.feature,
       timeoutSeconds: opts.timeoutSeconds ?? 600
     };
-    const { rebuttals, costUsd } = await runRebuttalLoop(hybridCtx, successful, basePrompt, "plan-hybrid");
+    const rebuttalBuilder = new DebatePromptBuilder({ taskContext, outputFormat: "", stage: "plan" }, { debaters: successful.map((p) => p.debater), sessionMode });
+    const { rebuttals, costUsd } = await runRebuttalLoop(hybridCtx, successful, rebuttalBuilder, "plan-hybrid");
     critiqueOutputs = rebuttals.map((r) => r.output);
     rebuttalList = rebuttals;
     totalCostUsd += costUsd;
@@ -22341,7 +22567,7 @@ Do NOT output the JSON to the conversation. Write the file, then reply with a br
   }
   const resolverTimeoutMs = (ctx.stageConfig.timeoutSeconds ?? 600) * 1000;
   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.";
-  const outcome = await resolveOutcome(proposalOutputs, critiqueOutputs, ctx.stageConfig, ctx.config, ctx.storyId, resolverTimeoutMs, opts.workdir, opts.feature, undefined, undefined, planSynthesisSuffix);
+  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;
   const proposals = successful.map((p) => ({ debater: p.debater, output: p.output }));
   logger?.info("debate", "debate:result", {
@@ -22363,6 +22589,8 @@ Do NOT output the JSON to the conversation. Write the file, then reply with a br
   };
 }
 var init_session_plan = __esm(() => {
+  init_personas();
+  init_prompt_builder();
   init_session_helpers();
   init_session_hybrid();
 });
@@ -22448,13 +22676,13 @@ class DebateSession {
       resolverContextInput: this.resolverContextInput
     }, prompt);
   }
-  async runPlan(basePrompt, opts) {
+  async runPlan(taskContext, outputFormat, opts) {
     return runPlan2({
       storyId: this.storyId,
       stage: this.stage,
       stageConfig: this.stageConfig,
       config: this.config
-    }, basePrompt, opts);
+    }, taskContext, outputFormat, opts);
   }
 }
 var DEFAULT_TIMEOUT_SECONDS = 600;
@@ -22471,8 +22699,8 @@ var init_session = __esm(() => {
 var init_debate = __esm(() => {
   init_session();
   init_session_helpers();
-  init_resolvers();
-  init_session_helpers();
+  init_prompt_builder();
+  init_personas();
 });
 
 // src/interaction/bridge-builder.ts
@@ -23653,50 +23881,6 @@ var init_init = __esm(() => {
   init_webhook();
 });
 
-// src/utils/llm-json.ts
-function extractJsonFromMarkdown(text) {
-  const match = text.match(/```(?:json)?\s*\n([\s\S]*?)\n?\s*```/);
-  if (match) {
-    return match[1] ?? text;
-  }
-  return text;
-}
-function stripTrailingCommas(text) {
-  return text.replace(/,\s*([}\]])/g, "$1");
-}
-function extractJsonObject(text) {
-  const objStart = text.indexOf("{");
-  const arrStart = text.indexOf("[");
-  let start;
-  let closeChar;
-  if (objStart === -1 && arrStart === -1)
-    return null;
-  if (objStart === -1) {
-    start = arrStart;
-    closeChar = "]";
-  } else if (arrStart === -1) {
-    start = objStart;
-    closeChar = "}";
-  } else if (objStart < arrStart) {
-    start = objStart;
-    closeChar = "}";
-  } else {
-    start = arrStart;
-    closeChar = "]";
-  }
-  const end = text.lastIndexOf(closeChar);
-  if (end <= start)
-    return null;
-  return text.slice(start, end + 1);
-}
-function wrapJsonPrompt(prompt) {
-  return `IMPORTANT: Your entire response must be a single JSON object or array. Do not explain your reasoning. Do not use markdown formatting. Output ONLY the JSON.
-
-${prompt.trim()}
-
-YOUR RESPONSE MUST START WITH { OR [ AND END WITH } OR ]. No other text.`;
-}
-
 // src/prd/validate.ts
 function validateStoryId(id) {
   if (!id || id.length === 0) {
@@ -25611,7 +25795,8 @@ Rules:
 - Every test MUST have real assertions that PASS when the feature is correctly implemented and FAIL when it is broken
 - **Prefer behavioral tests** \u2014 import functions and call them rather than reading source files. For example, to verify "getPostRunActions() returns empty array", import PluginRegistry and call getPostRunActions(), don't grep the source file for the method name.
 - **File output (REQUIRED)**: Write the acceptance test file DIRECTLY to the path shown below. Do NOT output the test code in your response. After writing the file, reply with a brief confirmation.
-- **Path anchor (CRITICAL)**: Write the test file to this exact path: \`${join16(options.workdir, ".nax", "features", options.featureName, resolveAcceptanceTestFile2(options.language, options.config?.acceptance?.testPath))}\`. Import from package sources using relative paths like \`../../../src/...\` (3 levels up from \`.nax/features/<name>/\` to the package root).`;
+- **Path anchor (CRITICAL)**: Write the test file to this exact path: \`${join16(options.workdir, ".nax", "features", options.featureName, resolveAcceptanceTestFile2(options.language, options.config?.acceptance?.testPath))}\`. Import from package sources using relative paths like \`../../../src/...\` (3 levels up from \`.nax/features/<name>/\` to the package root).
+- **Process cwd**: When spawning child processes to invoke a CLI or binary, set the working directory to the **package root** (\`join(import.meta.dir, "../../..")\`) as your default \u2014 unless your Step 2 exploration reveals the CLI uses a different working directory convention (e.g. reads config from \`~/.config/\`, or resolves paths relative to a flag value). Always check how the CLI resolves file paths before assuming.`;
   const implementationSection = options.implementationContext && options.implementationContext.length > 0 ? `
 
 ## Implementation (already exists)
@@ -25802,7 +25987,7 @@ Rules:
 - Every test MUST have real assertions that PASS when the feature is correctly implemented and FAIL when it is broken
 - **Prefer behavioral tests** \u2014 import functions and call them rather than reading source files. For example, to verify "getPostRunActions() returns empty array", import PluginRegistry and call getPostRunActions(), don't grep the source file for the method name.
 - Output raw code only \u2014 no markdown fences, start directly with the language's import or package declaration
-- **Path anchor (CRITICAL)**: This test file will be saved at \`<repo-root>/.nax/features/${featureName}/${resolvedTestPath}\` and will ALWAYS run from the repo root. The repo root is exactly 4 \`../\` levels above \`__dirname\`: \`join(__dirname, '..', '..', '..', '..')\`. For monorepo projects, navigate into packages from root (e.g. \`join(root, 'apps/api/src')\`).`;
+- **Path anchor (CRITICAL)**: This test file will be saved at \`<repo-root>/.nax/features/${featureName}/${resolvedTestPath}\` and will ALWAYS run from the repo root. The repo root is exactly 3 \`../\` levels above \`__dirname\`: \`join(__dirname, '..', '..', '..')\`. For monorepo projects, navigate into packages from root (e.g. \`join(root, 'apps/api/src')\`).`;
 }
 async function generateAcceptanceTests(adapter, options) {
   const logger = getLogger();
@@ -26960,6 +27145,7 @@ function buildReviewPrompt(diff, story, _semanticConfig) {
     "## Diff",
     diff,
     "",
+    "Also flag any changes in the diff not required by the acceptance criteria above as out-of-scope findings.",
     "Respond with JSON: { passed: boolean, findings: [...], findingReasoning: { [id]: string } }"
   ].join(`
 `);
@@ -26981,7 +27167,7 @@ function buildReReviewPrompt(updatedDiff, previousFindings) {
   ].join(`
 `);
 }
-function buildProposalsSection(proposals) {
+function buildProposalsSection2(proposals) {
   return proposals.map((p) => `### ${p.debater}
 ${p.output}`).join(`
 
@@ -27025,7 +27211,7 @@ function buildDebateResolverPrompt(proposals, critiques, diff, story, _semanticC
 `);
   const framing = buildResolverFraming(resolverContext);
   const voteTally = buildVoteTallyLine(resolverContext);
-  const proposalsSection = buildProposalsSection(proposals);
+  const proposalsSection = buildProposalsSection2(proposals);
   const critiquesSection = buildCritiquesSection(critiques);
   return [
     framing,
@@ -27051,7 +27237,7 @@ function buildDebateReReviewPrompt(proposals, critiques, updatedDiff, previousFi
   const framing = buildResolverFraming(resolverContext);
   const findingsList = previousFindings.length > 0 ? previousFindings.map((f) => `- ${f.ruleId}: ${f.message}`).join(`
 `) : "(none)";
-  const proposalsSection = buildProposalsSection(proposals);
+  const proposalsSection = buildProposalsSection2(proposals);
   const critiquesSection = buildCritiquesSection(critiques);
   return [
     `${framing} This is a re-review after implementer changes.`,
@@ -27074,12 +27260,10 @@ function buildDebateReReviewPrompt(proposals, critiques, updatedDiff, previousFi
 
 // src/review/dialogue.ts
 function extractDeltaSummary(rawOutput, previousFindings, newFindings) {
-  try {
-    const parsed = JSON.parse(rawOutput);
-    if (typeof parsed.deltaSummary === "string" && parsed.deltaSummary.length > 0) {
-      return parsed.deltaSummary;
-    }
-  } catch {}
+  const parsed = tryParseLLMJson(rawOutput);
+  if (parsed && typeof parsed.deltaSummary === "string" && parsed.deltaSummary.length > 0) {
+    return parsed.deltaSummary;
+  }
   const newIds = new Set(newFindings.map((f) => f.ruleId));
   const prevIds = new Set(previousFindings.map((f) => f.ruleId));
   const resolved = previousFindings.filter((f) => !newIds.has(f.ruleId));
@@ -27119,7 +27303,7 @@ function compactHistory(history) {
 function parseReviewResponse(output) {
   let parsed;
   try {
-    parsed = JSON.parse(output);
+    parsed = parseLLMJson(output);
   } catch {
     throw new NaxError("[dialogue] Failed to parse reviewer JSON response", "REVIEWER_PARSE_FAILED", {
       stage: "review",
@@ -27698,23 +27882,11 @@ function validateLLMShape(parsed) {
   return { passed: obj.passed, findings: obj.findings };
 }
 function parseLLMResponse(raw) {
-  const text = raw.trim();
   try {
-    return validateLLMShape(JSON.parse(text));
-  } catch {}
-  const fromFence = extractJsonFromMarkdown(text);
-  if (fromFence !== text) {
-    try {
-      return validateLLMShape(JSON.parse(stripTrailingCommas(fromFence)));
-    } catch {}
-  }
-  const bareJson = extractJsonObject(text);
-  if (bareJson) {
-    try {
-      return validateLLMShape(JSON.parse(stripTrailingCommas(bareJson)));
-    } catch {}
+    return validateLLMShape(tryParseLLMJson(raw));
+  } catch {
+    return null;
   }
-  return null;
 }
 function formatFindings(findings) {
   return findings.map((f) => `[${f.severity}] ${f.file}:${f.line} \u2014 ${f.issue}
@@ -28689,6 +28861,7 @@ async function runAgentRectification(ctx, lintFixCmd, formatFixCmd, effectiveWor
         config: ctx.config,
         projectDir: ctx.projectDir,
         maxInteractionTurns: ctx.config.agent?.maxInteractionTurns,
+        featureName: ctx.prd.feature,
         storyId: ctx.story.id,
         sessionRole: "implementer"
       });
@@ -30466,61 +30639,34 @@ var init_executor = __esm(() => {
 });
 
 // src/verification/parser.ts
-function parseBunTestOutput(output) {
-  if (isJestLikeOutput(output)) {
-    return parseJestOutput(output);
-  }
-  return parseBunOutput(output);
-}
-function isJestLikeOutput(output) {
-  return /^\s*Tests:\s+\d+/m.test(output) || /^\s*Test Files\s+\d+/m.test(output);
+function detectFramework(output) {
+  if (/^\s*Test Files\s+\d+/m.test(output))
+    return "vitest";
+  if (/^\s*Tests:\s+\d+/m.test(output))
+    return "jest";
+  if (/={3,}\s+\d+\s+(?:failed|passed).*in\s+[\d.]+s\s*={3,}/m.test(output))
+    return "pytest";
+  if (/^--- (?:FAIL|PASS):/m.test(output) || /^(?:ok|FAIL)\s+\t/m.test(output))
+    return "go";
+  if (/^\(fail\)\s/m.test(output) || /^bun test/m.test(output) || /[\u2713\u2714\u2717\u2718]/m.test(output))
+    return "bun";
+  return "unknown";
 }
-function parseJestOutput(output) {
-  const failures = [];
-  let passed = 0;
-  let failed = 0;
-  const summaryMatches = Array.from(output.matchAll(/^\s*Tests:\s+(.*)/gm));
-  if (summaryMatches.length > 0) {
-    const summaryLine = summaryMatches[summaryMatches.length - 1][1];
-    const failedMatch = summaryLine.match(/(\d+)\s+failed/);
-    const passedMatch = summaryLine.match(/(\d+)\s+passed/);
-    if (failedMatch)
-      failed = Number.parseInt(failedMatch[1], 10);
-    if (passedMatch)
-      passed = Number.parseInt(passedMatch[1], 10);
-  }
-  let currentFile = "unknown";
-  const lines = output.split(`
-`);
-  for (let i = 0;i < lines.length; i++) {
-    const line = lines[i];
-    const fileMatch = line.match(/^\s*(?:FAIL|PASS)\s+(\S+\.[jt]sx?)/);
-    if (fileMatch) {
-      currentFile = fileMatch[1];
-      continue;
-    }
-    const bulletMatch = line.match(/^\s+\u25CF\s+(.+)$/);
-    if (bulletMatch) {
-      const testName = bulletMatch[1].trim();
-      let error48 = "";
-      for (let j = i + 1;j < lines.length && j < i + 10; j++) {
-        const next = lines[j].trim();
-        if (!next)
-          continue;
-        if (next.startsWith("\u25CF") || /^(?:FAIL|PASS)\s/.test(next))
-          break;
-        error48 = next;
-        break;
-      }
-      failures.push({
-        file: currentFile,
-        testName,
-        error: error48 || "Unknown error",
-        stackTrace: []
-      });
-    }
+function parseTestOutput(output) {
+  const framework = detectFramework(output);
+  switch (framework) {
+    case "bun":
+      return parseBunOutput(output);
+    case "jest":
+    case "vitest":
+      return parseJestOutput(output);
+    case "pytest":
+      return parsePytestOutput(output);
+    case "go":
+      return parseGoTestOutput(output);
+    default:
+      return parseCommonOutput(output);
   }
-  return { passed, failed, failures };
 }
 function parseBunOutput(output) {
   const lines = output.split(`
@@ -30582,6 +30728,122 @@ function parseBunOutput(output) {
   }
   return { passed, failed, failures };
 }
+function parseJestOutput(output) {
+  const failures = [];
+  let passed = 0;
+  let failed = 0;
+  const summaryMatches = Array.from(output.matchAll(/^\s*Tests:\s+(.*)/gm));
+  if (summaryMatches.length > 0) {
+    const summaryLine = summaryMatches[summaryMatches.length - 1][1];
+    const failedMatch = summaryLine.match(/(\d+)\s+failed/);
+    const passedMatch = summaryLine.match(/(\d+)\s+passed/);
+    if (failedMatch)
+      failed = Number.parseInt(failedMatch[1], 10);
+    if (passedMatch)
+      passed = Number.parseInt(passedMatch[1], 10);
+  }
+  let currentFile = "unknown";
+  const lines = output.split(`
+`);
+  for (let i = 0;i < lines.length; i++) {
+    const line = lines[i];
+    const fileMatch = line.match(/^\s*(?:FAIL|PASS)\s+(\S+\.[jt]sx?)/);
+    if (fileMatch) {
+      currentFile = fileMatch[1];
+      continue;
+    }
+    const bulletMatch = line.match(/^\s+\u25CF\s+(.+)$/);
+    if (bulletMatch) {
+      const testName = bulletMatch[1].trim();
+      let error48 = "";
+      for (let j = i + 1;j < lines.length && j < i + 10; j++) {
+        const next = lines[j].trim();
+        if (!next)
+          continue;
+        if (next.startsWith("\u25CF") || /^(?:FAIL|PASS)\s/.test(next))
+          break;
+        error48 = next;
+        break;
+      }
+      failures.push({
+        file: currentFile,
+        testName,
+        error: error48 || "Unknown error",
+        stackTrace: []
+      });
+    }
+  }
+  return { passed, failed, failures };
+}
+function parsePytestOutput(output) {
+  const common = parseCommonOutput(output);
+  const failures = [];
+  for (const line of output.split(`
+`)) {
+    const m = line.match(/^FAILED\s+(\S+)(?:\s+-\s+(.*))?$/);
+    if (m) {
+      const [, location, reason] = m;
+      const parts = location.split("::");
+      failures.push({
+        file: parts[0] ?? location,
+        testName: parts.slice(1).join(" > ") || location,
+        error: reason?.trim() || "Unknown error",
+        stackTrace: []
+      });
+    }
+  }
+  return {
+    passed: common.passed,
+    failed: common.failed,
+    failures: failures.length > 0 ? failures : common.failures
+  };
+}
+function parseGoTestOutput(output) {
+  const common = parseCommonOutput(output);
+  const failures = [];
+  for (const line of output.split(`
+`)) {
+    const m = line.match(/^--- FAIL:\s+(\S+)\s+\([\d.]+s\)/);
+    if (m) {
+      failures.push({
+        file: "unknown",
+        testName: m[1],
+        error: "Unknown error",
+        stackTrace: []
+      });
+    }
+  }
+  return {
+    passed: common.passed,
+    failed: common.failed,
+    failures: failures.length > 0 ? failures : common.failures
+  };
+}
+function parseCommonOutput(output) {
+  let passed = 0;
+  let failed = 0;
+  const patterns = [
+    /(\d+)\s+pass(?:ed)?(?:,\s*|\s+)(\d+)\s+fail/i,
+    /Tests:\s+(\d+)\s+passed,\s+(\d+)\s+failed/i,
+    /(\d+)\s+pass/i
+  ];
+  for (const pattern of patterns) {
+    const matches = Array.from(output.matchAll(new RegExp(pattern, "gi")));
+    if (matches.length > 0) {
+      const last = matches[matches.length - 1];
+      passed = Number.parseInt(last[1], 10);
+      failed = last[2] ? Number.parseInt(last[2], 10) : 0;
+      break;
+    }
+  }
+  if (failed === 0) {
+    const failMatches = Array.from(output.matchAll(/(\d+)\s+fail/gi));
+    if (failMatches.length > 0) {
+      failed = Number.parseInt(failMatches[failMatches.length - 1][1], 10);
+    }
+  }
+  return { passed, failed, failures: [] };
+}
 function formatFailureSummary(failures, maxChars = 2000) {
   if (failures.length === 0) {
     return "No test failures";
@@ -30595,48 +30857,24 @@ function formatFailureSummary(failures, maxChars = 2000) {
     const errorLine = `   Error: ${failure.error}`;
     const stackLine = failure.stackTrace.length > 0 ? `   ${failure.stackTrace[0]}` : "";
     const blockLines = [header, errorLine];
-    if (stackLine) {
+    if (stackLine)
       blockLines.push(stackLine);
-    }
     blockLines.push("");
     const block = blockLines.join(`
 `);
-    const blockLength = block.length;
-    if (totalChars + blockLength > maxChars && lines.length > 0) {
-      const remaining = failures.length - i;
+    if (totalChars + block.length > maxChars && lines.length > 0) {
       lines.push(`
-... and ${remaining} more failure(s) (truncated)`);
+... and ${failures.length - i} more failure(s) (truncated)`);
       break;
     }
     lines.push(...blockLines);
-    totalChars += blockLength;
+    totalChars += block.length;
   }
   return lines.join(`
 `).trim();
 }
-function parseTestOutput(output, exitCode) {
-  const patterns = [
-    /(\d+)\s+pass(?:ed)?(?:,\s+|\s+)(\d+)\s+fail/i,
-    /Tests:\s+(\d+)\s+passed,\s+(\d+)\s+failed/i,
-    /(\d+)\s+pass/i
-  ];
-  let passCount = 0;
-  let failCount = 0;
-  for (const pattern of patterns) {
-    const matches = Array.from(output.matchAll(new RegExp(pattern, "gi")));
-    if (matches.length > 0) {
-      const lastMatch = matches[matches.length - 1];
-      passCount = Number.parseInt(lastMatch[1], 10);
-      failCount = lastMatch[2] ? Number.parseInt(lastMatch[2], 10) : 0;
-      break;
-    }
-  }
-  if (failCount === 0) {
-    const failMatches = Array.from(output.matchAll(/(\d+)\s+fail/gi));
-    if (failMatches.length > 0) {
-      failCount = Number.parseInt(failMatches[failMatches.length - 1][1], 10);
-    }
-  }
+function analyzeTestExitCode(output, exitCode) {
+  const { passed: passCount, failed: failCount } = parseCommonOutput(output);
   const allTestsPassed = passCount > 0 && failCount === 0;
   const isEnvironmentalFailure = allTestsPassed && exitCode !== 0;
   const result = {
@@ -30707,7 +30945,7 @@ async function runVerificationCore(options) {
   }
   const exitCode = execution.exitCode ?? 1;
   if (exitCode !== 0 && execution.output) {
-    const analysis = parseTestOutput(execution.output, exitCode);
+    const analysis = analyzeTestExitCode(execution.output, exitCode);
     if (analysis.isEnvironmentalFailure) {
       return {
         status: "ENVIRONMENTAL_FAILURE",
@@ -31000,7 +31238,7 @@ async function runFullSuiteGate(story, config2, workdir, agent, implementerTier,
   });
   const fullSuitePassed = fullSuiteResult.success && fullSuiteResult.exitCode === 0;
   if (!fullSuitePassed && fullSuiteResult.output) {
-    const testSummary = _rectificationGateDeps.parseBunTestOutput(fullSuiteResult.output);
+    const testSummary = _rectificationGateDeps.parseTestOutput(fullSuiteResult.output);
     if (testSummary.failed > 0) {
       return await runRectificationLoop(story, config2, workdir, agent, implementerTier, contextMarkdown, lite, logger, testSummary, rectificationConfig, testCmd, fullSuiteTimeout, featureName, projectDir);
     }
@@ -31134,7 +31372,7 @@ async function runRectificationLoop(story, config2, workdir, agent, implementerT
         return true;
       }
       if (retryFullSuite.output) {
-        const newTestSummary = _rectificationGateDeps.parseBunTestOutput(retryFullSuite.output);
+        const newTestSummary = _rectificationGateDeps.parseTestOutput(retryFullSuite.output);
         state.currentFailures = newTestSummary.failed;
         testSummary.failures = newTestSummary.failures;
         testSummary.failed = newTestSummary.failed;
@@ -31182,7 +31420,7 @@ var init_rectification_gate = __esm(() => {
   init_prompts();
   _rectificationGateDeps = {
     executeWithTimeout,
-    parseBunTestOutput,
+    parseTestOutput,
     shouldRetryRectification
   };
 });
@@ -33152,9 +33390,6 @@ function calculateMaxIterations(tierOrder) {
   return tierOrder.reduce((sum, t) => sum + t.attempts, 0);
 }
 
-// src/execution/test-output-parser.ts
-var init_test_output_parser = () => {};
-
 // src/verification/rectification-loop.ts
 async function _defaultRunDebate(storyId, stageConfig, prompt, config2) {
   const logger = getSafeLogger();
@@ -33207,7 +33442,7 @@ async function runRectificationLoop2(opts) {
   } = opts;
   const logger = getSafeLogger();
   const rectificationConfig = config2.execution.rectification;
-  const testSummary = parseBunTestOutput(testOutput);
+  const testSummary = parseTestOutput(testOutput);
   const label = promptPrefix ? "regression rectification" : "rectification";
   const rectificationState = {
     attempt: 0,
@@ -33342,13 +33577,13 @@ ${rectificationPrompt}`;
         return true;
       }
       if (retryVerification.output) {
-        const newTestSummary = parseBunTestOutput(retryVerification.output);
+        const newTestSummary = parseTestOutput(retryVerification.output);
         state.currentFailures = newTestSummary.failed;
         state.lastExitCode = retryVerification.status === "SUCCESS" ? 0 : 1;
         testSummary.failures = newTestSummary.failures;
         testSummary.failed = newTestSummary.failed;
         testSummary.passed = newTestSummary.passed;
-        if (newTestSummary.failed === 0) {
+        if (newTestSummary.failed === 0 && (retryVerification.status === "SUCCESS" || newTestSummary.passed > 0)) {
           state.lastExitCode = 0;
           logger?.info("rectification", `[OK] ${label} succeeded after parsing retry output`, {
             storyId: story.id,
@@ -33488,7 +33723,6 @@ var init_rectification_loop = __esm(() => {
   init_cost();
   init_registry();
   init_config();
-  init_test_output_parser();
   init_logger2();
   init_prd();
   init_rectification();
@@ -33754,7 +33988,7 @@ class RegressionStrategy {
     });
     const durationMs = Date.now() - start;
     if (result.success) {
-      const parsed2 = result.output ? parseBunTestOutput(result.output) : { passed: 0, failed: 0, failures: [] };
+      const parsed2 = result.output ? parseTestOutput(result.output) : { passed: 0, failed: 0, failures: [] };
       return makePassResult(ctx.storyId, "regression", {
         rawOutput: result.output,
         passCount: parsed2.passed,
@@ -33770,7 +34004,7 @@ class RegressionStrategy {
     if (result.status === "TIMEOUT") {
       return makeFailResult(ctx.storyId, "regression", "TIMEOUT", { rawOutput: result.output, durationMs });
     }
-    const parsed = result.output ? parseBunTestOutput(result.output) : { passed: 0, failed: 0, failures: [] };
+    const parsed = result.output ? parseTestOutput(result.output) : { passed: 0, failed: 0, failures: [] };
     return makeFailResult(ctx.storyId, "regression", "TEST_FAILURE", {
       rawOutput: result.output,
       passCount: parsed.passed,
@@ -33994,7 +34228,7 @@ class ScopedStrategy {
     });
     const durationMs = Date.now() - start;
     if (result.success) {
-      const parsed2 = result.output ? parseBunTestOutput(result.output) : { passed: 0, failed: 0, failures: [] };
+      const parsed2 = result.output ? parseTestOutput(result.output) : { passed: 0, failed: 0, failures: [] };
       return makePassResult(ctx.storyId, "scoped", {
         rawOutput: result.output,
         passCount: parsed2.passed,
@@ -34010,7 +34244,7 @@ class ScopedStrategy {
         scopeTestFallback
       });
     }
-    const parsed = result.output ? parseBunTestOutput(result.output) : { passed: 0, failed: 0, failures: [] };
+    const parsed = result.output ? parseTestOutput(result.output) : { passed: 0, failed: 0, failures: [] };
     return makeFailResult(ctx.storyId, "scoped", "TEST_FAILURE", {
       rawOutput: result.output,
       passCount: parsed.passed,
@@ -34344,12 +34578,11 @@ function stripCodeFences(text) {
   return trimmed;
 }
 function parseRoutingResponse(output, story, config2) {
-  const jsonText = extractJsonFromMarkdown(output.trim());
-  const parsed = JSON.parse(jsonText);
+  const parsed = parseLLMJson(output);
   return validateRoutingDecision(parsed, config2, story);
 }
 function parseBatchResponse(output, stories, config2) {
-  const parsed = JSON.parse(extractJsonFromMarkdown(output.trim()));
+  const parsed = parseLLMJson(output);
   if (!Array.isArray(parsed)) {
     throw new Error("Batch LLM response must be a JSON array");
   }
@@ -36143,7 +36376,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.59.2",
+    version: "0.60.0-canary.1",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -36223,8 +36456,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("d42d47be"))
-        return "d42d47be";
+      if (/^[0-9a-f]{6,10}$/.test("1de1f9cc"))
+        return "1de1f9cc";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -36887,28 +37120,17 @@ function parseDiagnosisResult(output) {
   if (!output || output.trim() === "") {
     return null;
   }
-  try {
-    const cleaned = output.trim();
-    let jsonStr = cleaned;
-    const firstBrace = cleaned.indexOf("{");
-    const lastBrace = cleaned.lastIndexOf("}");
-    if (firstBrace !== -1 && lastBrace !== -1 && lastBrace > firstBrace) {
-      jsonStr = cleaned.slice(firstBrace, lastBrace + 1);
-    }
-    const parsed = JSON.parse(jsonStr);
-    if (typeof parsed.verdict === "string" && typeof parsed.reasoning === "string" && typeof parsed.confidence === "number") {
-      return {
-        verdict: parsed.verdict,
-        reasoning: parsed.reasoning,
-        confidence: parsed.confidence,
-        testIssues: parsed.testIssues,
-        sourceIssues: parsed.sourceIssues
-      };
-    }
-    return null;
-  } catch {
-    return null;
+  const parsed = tryParseLLMJson(output);
+  if (parsed && typeof parsed.verdict === "string" && typeof parsed.reasoning === "string" && typeof parsed.confidence === "number") {
+    return {
+      verdict: parsed.verdict,
+      reasoning: parsed.reasoning,
+      confidence: parsed.confidence,
+      testIssues: Array.isArray(parsed.testIssues) ? parsed.testIssues : undefined,
+      sourceIssues: Array.isArray(parsed.sourceIssues) ? parsed.sourceIssues : undefined
+    };
   }
+  return null;
 }
 var MAX_SOURCE_FILES = 5, MAX_FILE_LINES = 500, MAX_TEST_OUTPUT_CHARS = 2000;
 var init_fix_diagnosis = __esm(() => {
@@ -37106,6 +37328,12 @@ async function regenerateAcceptanceTest(testPath, acceptanceContext) {
   logger?.info("acceptance", `Backed up acceptance test -> ${bakPath}`);
   const { unlink: unlink3 } = await import("fs/promises");
   await unlink3(testPath);
+  if (acceptanceContext.featureDir) {
+    const metaPath = path15.join(acceptanceContext.featureDir, "acceptance-meta.json");
+    try {
+      await unlink3(metaPath);
+    } catch {}
+  }
   let implementationContext;
   const storyGitRef = acceptanceContext.storyGitRef;
   const workdir = acceptanceContext.workdir;
@@ -37746,7 +37974,7 @@ async function runDeferredRegression(options) {
       affectedStories: []
     };
   }
-  const testSummary = _regressionDeps.parseBunTestOutput(fullSuiteResult.output);
+  const testSummary = _regressionDeps.parseTestOutput(fullSuiteResult.output);
   if (testSummary.failed === 0 && testSummary.passed === 0) {
     logger?.warn("regression", "No test results parsed from output \u2014 test runner likely crashed or errored (not a regression, accepting as pass)", { output: fullSuiteResult.output.slice(0, 500) });
     return {
@@ -37892,7 +38120,7 @@ var init_run_regression = __esm(() => {
   _regressionDeps = {
     runVerification: fullSuite,
     runRectificationLoop: runRectificationLoop2,
-    parseBunTestOutput,
+    parseTestOutput,
     reverseMapTestToSource
   };
 });
@@ -38873,6 +39101,11 @@ async function handlePipelineSuccess(ctx, pipelineResult) {
         const diffSummary = await captureDiffSummary(ctx.workdir, ctx.storyGitRef, completedStory.workdir);
         if (diffSummary) {
           completedStory.diffSummary = diffSummary;
+        } else {
+          logger?.debug("context-chain", "No diff summary captured (agent may not have committed yet)", {
+            storyId: completedStory.id,
+            storyGitRef: ctx.storyGitRef
+          });
         }
       } catch {}
     }
@@ -72809,13 +73042,16 @@ function validateStory(raw, index, allIds) {
     throw new Error(`[schema] story[${index}].routing.complexity "${rawComplexity}" is invalid. Valid values: ${VALID_COMPLEXITY.join(", ")}`);
   }
   const rawTestStrategy = routing.testStrategy ?? s.testStrategy;
-  const testStrategy = resolveTestStrategy(typeof rawTestStrategy === "string" ? rawTestStrategy : undefined);
+  let testStrategy = resolveTestStrategy(typeof rawTestStrategy === "string" ? rawTestStrategy : undefined);
   const rawJustification = routing.noTestJustification ?? s.noTestJustification;
   if (testStrategy === "no-test") {
     if (!rawJustification || typeof rawJustification !== "string" || rawJustification.trim() === "") {
       throw new Error(`[schema] story[${index}].routing.noTestJustification is required when testStrategy is "no-test"`);
     }
   }
+  if (testStrategy !== "no-test" && typeof rawJustification === "string" && rawJustification.trim() !== "") {
+    testStrategy = "no-test";
+  }
   const noTestJustification = typeof rawJustification === "string" && rawJustification.trim() !== "" ? rawJustification.trim() : undefined;
   const rawDeps = s.dependencies;
   const dependencies = Array.isArray(rawDeps) ? rawDeps : [];
@@ -72975,7 +73211,7 @@ async function planCommand(workdir, config2, options) {
   let rawResponse;
   const debateEnabled = config2?.debate?.enabled && config2?.debate?.stages?.plan?.enabled;
   if (debateEnabled) {
-    const basePrompt = buildPlanningPrompt(specContent, codebaseContext, undefined, relativePackages, packageDetails, config2?.project);
+    const { taskContext: planTaskContext, outputFormat: planOutputFormat } = buildPlanningPrompt(specContent, codebaseContext, undefined, relativePackages, packageDetails, config2?.project);
     const resolvedPerm = resolvePermissions(config2, "plan");
     const planStageConfig = config2?.debate?.stages.plan;
     const debateSession = _planDeps.createDebateSession({
@@ -72992,7 +73228,7 @@ async function planCommand(workdir, config2, options) {
       rounds: planStageConfig.rounds,
       feature: options.feature
     });
-    const debateResult = await debateSession.runPlan(basePrompt, {
+    const debateResult = await debateSession.runPlan(planTaskContext, planOutputFormat, {
       workdir,
       feature: options.feature,
       outputDir,
@@ -73011,7 +73247,10 @@ async function planCommand(workdir, config2, options) {
     }
   } else if (options.auto) {
     const isAcp = config2?.agent?.protocol === "acp";
-    const prompt = buildPlanningPrompt(specContent, codebaseContext, isAcp ? outputPath : undefined, relativePackages, packageDetails, config2?.project);
+    const { taskContext: autoTaskCtx, outputFormat: autoOutputFmt } = buildPlanningPrompt(specContent, codebaseContext, isAcp ? outputPath : undefined, relativePackages, packageDetails, config2?.project);
+    const prompt = `${autoTaskCtx}
+
+${autoOutputFmt}`;
     const adapter = _planDeps.getAgent(agentName, config2);
     if (!adapter)
       throw new Error(`[plan] No agent adapter found for '${agentName}'`);
@@ -73097,7 +73336,10 @@ async function planCommand(workdir, config2, options) {
     rawResponse = await runInteractivePlan();
   }
   async function runInteractivePlan() {
-    const prompt = buildPlanningPrompt(specContent, codebaseContext, outputPath, relativePackages, packageDetails, config2?.project);
+    const { taskContext: interactiveTaskCtx, outputFormat: interactiveOutputFmt } = buildPlanningPrompt(specContent, codebaseContext, outputPath, relativePackages, packageDetails, config2?.project);
+    const prompt = `${interactiveTaskCtx}
+
+${interactiveOutputFmt}`;
     const adapter = _planDeps.getAgent(agentName, config2);
     if (!adapter)
       throw new Error(`[plan] No agent adapter found for '${agentName}'`);
@@ -73304,7 +73546,7 @@ ${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.",` : "";
-  return `You are a senior software architect generating a product requirements document (PRD) as JSON.
+  const taskContext = `You are a senior software architect generating a product requirements document (PRD) as JSON.
 
 ## Step 1: Understand the Spec
 
@@ -73332,6 +73574,8 @@ If this is a greenfield project (empty or minimal codebase):
 
 Record ALL findings in the "analysis" field of the output JSON. This analysis is provided to every implementation agent as context \u2014 be thorough.
 
+**Important:** The codebase context below contains file names and structure only \u2014 no file content. Do NOT assert specific line numbers. The implementer will read the actual files via contextFiles.
+
 ## Codebase Context
 
 ${codebaseContext}${monorepoHint}
@@ -73348,9 +73592,8 @@ For each story, set "contextFiles" to the key source files the agent should read
 
 ${COMPLEXITY_GUIDE}
 
-${TEST_STRATEGY_GUIDE}
-
-## Output Schema
+${TEST_STRATEGY_GUIDE}`;
+  const outputFormat = `## Output Schema
 
 Generate a JSON object with this exact structure (no markdown, no explanation \u2014 JSON only):
 
@@ -73386,6 +73629,7 @@ Generate a JSON object with this exact structure (no markdown, no explanation \u
 
 ${outputFilePath ? `Write the PRD JSON directly to this file path: ${outputFilePath}
 Do NOT output the JSON to the conversation. Write the file, then reply with a brief confirmation.` : "Output ONLY the JSON object. Do not wrap in markdown code blocks."}`;
+  return { taskContext, outputFormat };
 }
 async function planDecomposeCommand(workdir, config2, options) {
   const prdPath = join11(workdir, ".nax", "features", options.feature, "prd.json");