@nathapp/nax 0.59.3 → 0.60.0-canary.1

package/dist/nax.js

@@ -21444,14 +21444,20 @@ function tryParseLLMJson(text) {
 }
 
 // src/debate/resolvers.ts
-function buildProposalsSection(proposals) {
-  return proposals.map((p, i) => `### Proposal ${i + 1}
-${p}`).join(`
+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) {
-  const proposalsSection = buildProposalsSection(proposals);
+function buildSynthesisPrompt(proposals, critiques, debaters) {
+  const proposalsSection = buildProposalsSection(proposals, debaters);
   const critiquesSection = critiques.length > 0 ? `
 
 ## Critiques
@@ -21466,8 +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 = buildProposalsSection(proposals);
+function buildJudgePrompt(proposals, critiques, debaters) {
+  const proposalsSection = buildProposalsSection(proposals, debaters);
   const critiquesSection = critiques.length > 0 ? `
 
 ## Critiques
@@ -21515,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;
@@ -21527,7 +21533,7 @@ 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";
@@ -21606,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) {
@@ -21675,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,
@@ -21700,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,
@@ -21772,6 +21780,9 @@ function resolvePersonas(debaters, stage, autoPersona) {
     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 = {
@@ -21998,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") {
@@ -22090,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,
@@ -22241,9 +22253,9 @@ async function runHybrid(ctx, prompt) {
   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,
@@ -22288,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,
@@ -22393,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,
@@ -22554,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", {
@@ -25782,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)
@@ -36362,7 +36376,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.59.3",
+    version: "0.60.0-canary.1",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -36442,8 +36456,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("0c763972"))
-        return "0c763972";
+      if (/^[0-9a-f]{6,10}$/.test("1de1f9cc"))
+        return "1de1f9cc";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {

package/package.json

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