@nathapp/nax 0.57.3 → 0.57.4

package/dist/nax.js

@@ -3307,6 +3307,12 @@ function buildPlanModeDecomposePrompt(options) {
 
 ${siblings.map((s) => `- ${s.id}: ${s.title}`).join(`
 `)}
+` : "";
+  const maxAcCount = options.config?.precheck?.storySizeGate?.maxAcCount;
+  const acConstraint = maxAcCount != null ? `
+## Acceptance Criteria Constraint
+
+Every sub-story must have at most ${maxAcCount} acceptance criteria. If a story would exceed this limit, split it into additional sub-stories instead of adding more ACs.
 ` : "";
   return `You are a senior software architect decomposing a complex user story into smaller, implementable sub-stories.
 
@@ -3316,7 +3322,7 @@ ${JSON.stringify(targetStory, null, 2)}${siblingsSummary}
 ## Codebase Context
 
 ${options.codebaseContext}
-
+${acConstraint}
 ${COMPLEXITY_GUIDE}
 
 ${TEST_STRATEGY_GUIDE}
@@ -21073,6 +21079,50 @@ function errorMessage(err) {
   return err instanceof Error ? err.message : String(err);
 }
 
+// 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/acceptance/refinement.ts
 var exports_refinement = {};
 __export(exports_refinement, {
@@ -21086,7 +21136,7 @@ function buildRefinementPrompt(criteria, codebaseContext, options) {
 `);
   const strategySection = buildStrategySection(options);
   const refinedExample = buildRefinedExample(options?.testStrategy);
-  return `You are an acceptance criteria refinement assistant. Your task is to convert raw acceptance criteria into concrete, machine-verifiable assertions.
+  const core2 = `You are an acceptance criteria refinement assistant. Your task is to convert raw acceptance criteria into concrete, machine-verifiable assertions.
 
 CODEBASE CONTEXT:
 ${codebaseContext}
@@ -21095,7 +21145,7 @@ ACCEPTANCE CRITERIA TO REFINE:
 ${criteriaList}
 
 For each criterion, produce a refined version that is concrete and automatically testable where possible.
-Respond with ONLY a JSON array (no markdown code fences):
+Respond with a JSON array:
 [{
   "original": "<exact original criterion text>",
   "refined": "<concrete, machine-verifiable description>",
@@ -21107,8 +21157,8 @@ Rules:
 - "original" must match the input criterion text exactly
 - "refined" must be a concrete assertion (e.g., ${refinedExample})
 - "testable" is false only if the criterion cannot be automatically verified (e.g., "UX feels responsive", "design looks good")
-- "storyId" leave as empty string \u2014 it will be assigned by the caller
-- Respond with ONLY the JSON array`;
+- "storyId" leave as empty string \u2014 it will be assigned by the caller`;
+  return wrapJsonPrompt(core2);
 }
 function buildStrategySection(options) {
   if (!options?.testStrategy) {
@@ -21157,7 +21207,9 @@ function parseRefinementResponse(response, criteria) {
     return fallbackCriteria(criteria);
   }
   try {
-    const parsed = JSON.parse(response);
+    const fromFence = extractJsonFromMarkdown(response);
+    const cleaned = stripTrailingCommas(fromFence !== response ? fromFence : response);
+    const parsed = JSON.parse(cleaned);
     if (!Array.isArray(parsed)) {
       return fallbackCriteria(criteria);
     }
@@ -21917,7 +21969,7 @@ function buildRoutingPrompt(story, config2) {
   const { title, description, acceptanceCriteria, tags } = story;
   const criteria = acceptanceCriteria.map((c, i) => `${i + 1}. ${c}`).join(`
 `);
-  return `You are a code task router. Classify a user story's complexity and select the cheapest model tier that will succeed.
+  const core2 = `You are a code task router. Classify a user story's complexity and select the cheapest model tier that will succeed.
 
 ## Story
 Title: ${title}
@@ -21943,8 +21995,9 @@ Tags: ${tags.join(", ")}
 - Many files \u2260 complex \u2014 copy-paste refactors across files are simple.
 - Pure refactoring/deletion with no new behavior \u2192 simple.
 
-Respond with ONLY this JSON (no markdown, no explanation):
+Respond with:
 {"complexity":"simple|medium|complex|expert","modelTier":"fast|balanced|powerful","reasoning":"<one line>"}`;
+  return wrapJsonPrompt(core2);
 }
 function buildBatchRoutingPrompt(stories, config2) {
   const storyBlocks = stories.map((story, idx) => {
@@ -21958,7 +22011,7 @@ ${criteria}
   }).join(`
 
 `);
-  return `You are a code task router. Classify each story's complexity and select the cheapest model tier that will succeed.
+  const batchCore = `You are a code task router. Classify each story's complexity and select the cheapest model tier that will succeed.
 
 ## Stories
 ${storyBlocks}
@@ -21980,8 +22033,9 @@ ${storyBlocks}
 - Many files \u2260 complex \u2014 copy-paste refactors across files are simple.
 - Pure refactoring/deletion with no new behavior \u2192 simple.
 
-Respond with ONLY a JSON array (no markdown, no explanation):
+Respond with a JSON array:
 [{"id":"US-001","complexity":"simple|medium|complex|expert","modelTier":"fast|balanced|powerful","reasoning":"<one line>"}]`;
+  return wrapJsonPrompt(batchCore);
 }
 function validateRoutingDecision(parsed, config2, story) {
   if (!parsed.complexity || !parsed.modelTier || !parsed.reasoning) {
@@ -22006,35 +22060,22 @@ function validateRoutingDecision(parsed, config2, story) {
   };
 }
 function stripCodeFences(text) {
-  let result = text.trim();
-  if (result.startsWith("```")) {
-    const lines = result.split(`
-`);
-    result = lines.slice(1, -1).join(`
-`).trim();
+  const trimmed = text.trim();
+  const fromFence = extractJsonFromMarkdown(trimmed);
+  if (fromFence !== trimmed)
+    return fromFence;
+  if (trimmed.startsWith("json")) {
+    return trimmed.slice(4).trim();
   }
-  if (result.startsWith("json")) {
-    result = result.slice(4).trim();
-  }
-  return result;
+  return trimmed;
 }
 function parseRoutingResponse(output, story, config2) {
-  const jsonText = stripCodeFences(output);
+  const jsonText = extractJsonFromMarkdown(output.trim());
   const parsed = JSON.parse(jsonText);
   return validateRoutingDecision(parsed, config2, story);
 }
 function parseBatchResponse(output, stories, config2) {
-  let jsonText = output.trim();
-  if (jsonText.startsWith("```")) {
-    const lines = jsonText.split(`
-`);
-    jsonText = lines.slice(1, -1).join(`
-`).trim();
-  }
-  if (jsonText.startsWith("json")) {
-    jsonText = jsonText.slice(4).trim();
-  }
-  const parsed = JSON.parse(jsonText);
+  const parsed = JSON.parse(extractJsonFromMarkdown(output.trim()));
   if (!Array.isArray(parsed)) {
     throw new Error("Batch LLM response must be a JSON array");
   }
@@ -22468,7 +22509,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.57.3",
+    version: "0.57.4",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -22547,8 +22588,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("166deae0"))
-        return "166deae0";
+      if (/^[0-9a-f]{6,10}$/.test("b3088982"))
+        return "b3088982";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -27090,7 +27131,7 @@ function buildPrompt(story, semanticConfig, diff, stat) {
 ${semanticConfig.rules.map((r, i) => `${i + 1}. ${r}`).join(`
 `)}
 ` : "";
-  return `You are a semantic code reviewer with access to the repository files. Your job is to verify that the implementation satisfies the story's acceptance criteria (ACs). You are NOT a linter or style checker \u2014 lint, typecheck, and convention checks are handled separately.
+  const core2 = `You are a semantic code reviewer with access to the repository files. Your job is to verify that the implementation satisfies the story's acceptance criteria (ACs). You are NOT a linter or style checker \u2014 lint, typecheck, and convention checks are handled separately.
 
 ## Story: ${story.title}
 
@@ -27138,25 +27179,36 @@ Respond with JSON only \u2014 no explanation text before or after:
 }
 
 If all ACs are correctly implemented, respond with { "passed": true, "findings": [] }.`;
+  return wrapJsonPrompt(core2);
+}
+function validateLLMShape(parsed) {
+  if (typeof parsed !== "object" || parsed === null)
+    return null;
+  const obj = parsed;
+  if (typeof obj.passed !== "boolean")
+    return null;
+  if (!Array.isArray(obj.findings))
+    return null;
+  return { passed: obj.passed, findings: obj.findings };
 }
 function parseLLMResponse(raw) {
+  const text = raw.trim();
   try {
-    let cleaned = raw.trim();
-    const fenceMatch = cleaned.match(/^```(?:json)?\s*\n([\s\S]*?)\n```/);
-    if (fenceMatch)
-      cleaned = fenceMatch[1].trim();
-    const parsed = JSON.parse(cleaned);
-    if (typeof parsed !== "object" || parsed === null)
-      return null;
-    const obj = parsed;
-    if (typeof obj.passed !== "boolean")
-      return null;
-    if (!Array.isArray(obj.findings))
-      return null;
-    return { passed: obj.passed, findings: obj.findings };
-  } catch {
-    return null;
+    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 null;
 }
 function formatFindings(findings) {
   return findings.map((f) => `[${f.severity}] ${f.file}:${f.line} \u2014 ${f.issue}
@@ -70812,16 +70864,6 @@ function mapDecomposedStoriesToUserStories(stories, parentStoryId) {
 init_test_strategy();
 var VALID_COMPLEXITY = ["simple", "medium", "complex", "expert"];
 var STORY_ID_NO_SEPARATOR = /^([A-Za-z]+)(\d+)$/;
-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 normalizeStoryId(id) {
   const match = id.match(STORY_ID_NO_SEPARATOR);
   if (match) {
@@ -71485,61 +71527,74 @@ async function planDecomposeCommand(workdir, config2, options) {
     throw new Error(`[decompose] No agent adapter found for '${agentName}'`);
   const timeoutSeconds = config2?.plan?.timeoutSeconds ?? DEFAULT_TIMEOUT_SECONDS2;
   const maxAcCount = config2?.precheck?.storySizeGate?.maxAcCount ?? Number.POSITIVE_INFINITY;
+  const maxReplanAttempts = config2?.precheck?.storySizeGate?.maxReplanAttempts ?? 3;
   if (typeof adapter.decompose !== "function") {
     throw new NaxError(`Agent "${agentName}" does not support decompose() required by plan --decompose`, "DECOMPOSE_NOT_SUPPORTED", { stage: "decompose", agent: agentName, storyId: options.storyId });
   }
   const debateStages = config2?.debate?.stages;
   const debateDecompEnabled = config2?.debate?.enabled && debateStages?.decompose?.enabled;
   let decompStories;
-  if (debateDecompEnabled) {
-    const decomposeStageConfig = debateStages.decompose;
-    const prompt = buildDecomposePrompt({
-      specContent: "",
-      codebaseContext,
-      workdir,
-      targetStory,
-      siblings,
-      featureName: options.feature,
-      storyId: options.storyId,
-      config: config2
-    });
-    const debateSession = _planDeps.createDebateSession({
-      storyId: options.storyId,
-      stage: "decompose",
-      stageConfig: decomposeStageConfig,
-      config: config2,
-      workdir,
-      featureName: options.feature,
-      timeoutSeconds
-    });
-    const debateResult = await debateSession.run(prompt);
-    if (debateResult.outcome !== "failed" && debateResult.output) {
-      decompStories = parseDecomposeOutput(debateResult.output);
-    }
-  }
-  if (!decompStories) {
-    const result = await adapter.decompose({
-      specContent: "",
-      codebaseContext,
-      workdir,
-      targetStory,
-      siblings,
-      featureName: options.feature,
-      storyId: options.storyId,
-      config: config2
-    });
-    decompStories = result.stories;
-  }
-  for (const sub of decompStories) {
-    if (!sub.complexity || !sub.testStrategy) {
-      throw new NaxError(`Sub-story "${sub.id}" is missing required routing fields`, "DECOMPOSE_VALIDATION_FAILED", {
+  let repairHint = "";
+  for (let attempt = 0;attempt < maxReplanAttempts; attempt++) {
+    if (attempt === 0 && debateDecompEnabled) {
+      const decomposeStageConfig = debateStages.decompose;
+      const prompt = buildDecomposePrompt({
+        specContent: "",
+        codebaseContext,
+        workdir,
+        targetStory,
+        siblings,
+        featureName: options.feature,
+        storyId: options.storyId,
+        config: config2
+      });
+      const debateSession = _planDeps.createDebateSession({
+        storyId: options.storyId,
         stage: "decompose",
-        storyId: sub.id
+        stageConfig: decomposeStageConfig,
+        config: config2,
+        workdir,
+        featureName: options.feature,
+        timeoutSeconds
       });
+      const debateResult = await debateSession.run(prompt);
+      if (debateResult.outcome !== "failed" && debateResult.output) {
+        decompStories = parseDecomposeOutput(debateResult.output);
+      }
     }
-    if (sub.acceptanceCriteria && sub.acceptanceCriteria.length > maxAcCount) {
-      throw new NaxError(`Sub-story "${sub.id}" has ${sub.acceptanceCriteria.length} ACs, exceeds maxAcCount of ${maxAcCount}`, "DECOMPOSE_VALIDATION_FAILED", { stage: "decompose", storyId: sub.id });
+    if (!decompStories) {
+      const effectiveContext = repairHint ? `${codebaseContext}
+
+${repairHint}` : codebaseContext;
+      const result = await adapter.decompose({
+        specContent: "",
+        codebaseContext: effectiveContext,
+        workdir,
+        targetStory,
+        siblings,
+        featureName: options.feature,
+        storyId: options.storyId,
+        config: config2
+      });
+      decompStories = result.stories;
+    }
+    for (const sub of decompStories) {
+      if (!sub.complexity || !sub.testStrategy) {
+        throw new NaxError(`Sub-story "${sub.id}" is missing required routing fields`, "DECOMPOSE_VALIDATION_FAILED", {
+          stage: "decompose",
+          storyId: sub.id
+        });
+      }
+    }
+    const violations = decompStories.filter((sub) => sub.acceptanceCriteria && sub.acceptanceCriteria.length > maxAcCount);
+    if (violations.length === 0)
+      break;
+    const violationSummary = violations.map((v) => `"${v.id}" (${v.acceptanceCriteria.length} ACs, max ${maxAcCount})`).join(", ");
+    if (attempt + 1 >= maxReplanAttempts) {
+      throw new NaxError(`Decompose AC repair failed after ${maxReplanAttempts} attempts. Oversized sub-stories: ${violationSummary}`, "DECOMPOSE_VALIDATION_FAILED", { stage: "decompose", storyId: options.storyId });
     }
+    repairHint = `REPAIR REQUIRED (attempt ${attempt + 1}/${maxReplanAttempts}): The following sub-stories exceeded maxAcCount of ${maxAcCount}: ${violationSummary}. Split each offending story further so every sub-story has at most ${maxAcCount} acceptance criteria.`;
+    decompStories = undefined;
   }
   const subStoriesWithParent = mapDecomposedStoriesToUserStories(decompStories, options.storyId);
   const updatedStories = prd.userStories.map((s) => s.id === options.storyId ? { ...s, status: "decomposed" } : s);

package/package.json

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