@nathapp/nax 0.70.2 → 0.70.4

package/dist/nax.js

@@ -18185,7 +18185,8 @@ class Logger {
         mkdirSync(dir, { recursive: true });
       }
     } catch (error48) {
-      console.error(`[logger] Failed to create log directory: ${error48}`);
+      process.stderr.write(`[logger] Failed to create log directory: ${error48}
+`);
     }
   }
   shouldLog(level) {
@@ -18254,7 +18255,8 @@ ${JSON.stringify(entry.data, null, 2)}`;
 `;
     const filePath = this.filePath;
     this.writeQueueTail = this.writeQueueTail.then(() => appendFile(filePath, line).catch((error48) => {
-      console.error(`[logger] Failed to write to log file: ${error48}`);
+      process.stderr.write(`[logger] Failed to write to log file: ${error48}
+`);
     }));
   }
   async flush() {
@@ -20898,7 +20900,7 @@ class AcpAgentAdapter {
         session = await client.createSession({ agentName, permissionMode, sessionName: completeSessionName });
         let timeoutId;
         const timeoutPromise = new Promise((_, reject) => {
-          timeoutId = setTimeout(() => reject(new Error(`complete() timed out after ${timeoutMs}ms`)), timeoutMs);
+          timeoutId = setTimeout(() => reject(new NaxError("complete() timed out", "AGENT_TIMEOUT", { stage: "acp", timeoutMs })), timeoutMs);
         });
         timeoutPromise.catch(() => {});
         let response;
@@ -21226,6 +21228,7 @@ class AcpAgentAdapter {
 }
 var MAX_AGENT_OUTPUT_CHARS = 5000, INTERACTION_TIMEOUT_MS, AGENT_REGISTRY, DEFAULT_ENTRY;
 var init_adapter = __esm(() => {
+  init_errors();
   init_logger2();
   init_cost();
   init_types3();
@@ -24689,26 +24692,79 @@ function parsePytestOutput(output) {
       });
     }
   }
+  const verboseStacks = parsePytestVerboseStacks(output);
+  for (const failure of failures) {
+    const leafName = failure.testName.split(" > ").pop() ?? failure.testName;
+    const stack = verboseStacks.get(leafName) ?? verboseStacks.get(failure.testName) ?? verboseStacks.get(failure.testName.replace(/ > /g, "."));
+    if (stack && stack.length > 0) {
+      failure.stackTrace = stack;
+    }
+  }
   return {
     passed: common.passed,
     failed: common.failed,
     failures: failures.length > 0 ? failures : common.failures
   };
 }
+function parsePytestVerboseStacks(output) {
+  const result = new Map;
+  const failuresIdx = output.indexOf("FAILURES");
+  if (failuresIdx === -1)
+    return result;
+  let currentTest = null;
+  for (const line of output.slice(failuresIdx).split(`
+`)) {
+    const headerMatch = line.match(/^_{4,}\s+(.+?)\s+_{4,}$/);
+    if (headerMatch) {
+      currentTest = headerMatch[1].trim();
+      continue;
+    }
+    if (currentTest) {
+      const fileLineMatch = line.match(/^(\S+\.py):(\d+):/);
+      if (fileLineMatch) {
+        const entry = `${fileLineMatch[1]}:${fileLineMatch[2]}`;
+        const existing = result.get(currentTest) ?? [];
+        result.set(currentTest, [...existing, entry]);
+      }
+    }
+  }
+  return result;
+}
 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) {
+  const lines = output.split(`
+`);
+  let i = 0;
+  while (i < lines.length) {
+    const failMatch = lines[i].match(/^--- FAIL:\s+(\S+)\s+\([\d.]+s\)/);
+    if (failMatch) {
+      const testName = failMatch[1];
+      i++;
+      const errorLines = [];
+      while (i < lines.length) {
+        const line = lines[i];
+        if (!line.trim()) {
+          i++;
+          continue;
+        }
+        const errMatch = line.match(/^\s{4,}(\S+\.go):(\d+):\s+(.+)$/);
+        if (errMatch) {
+          errorLines.push({ file: errMatch[1], lineNum: errMatch[2], msg: errMatch[3] });
+          i++;
+        } else {
+          break;
+        }
+      }
       failures.push({
-        file: "unknown",
-        testName: m[1],
-        error: "Unknown error",
-        stackTrace: []
+        file: errorLines[0]?.file ?? "unknown",
+        testName,
+        error: errorLines[0]?.msg ?? "Unknown error",
+        stackTrace: errorLines.map((e) => `${e.file}:${e.lineNum}: ${e.msg}`)
       });
+      continue;
     }
+    i++;
   }
   return {
     passed: common.passed,
@@ -28130,39 +28186,51 @@ function normalizeComplexity(raw) {
 }
 function validateStory(raw, index, allIds) {
   if (typeof raw !== "object" || raw === null || Array.isArray(raw)) {
-    throw new Error(`[schema] story[${index}] must be an object`);
+    throw new NaxError(`[schema] story[${index}] must be an object`, "SCHEMA_VALIDATION_FAILED", {
+      stage: "schema",
+      index
+    });
   }
   const s = raw;
   const rawId = s.id;
   if (rawId === undefined || rawId === null || rawId === "") {
-    throw new Error(`[schema] story[${index}].id is required and must be non-empty`);
+    throw new NaxError(`[schema] story[${index}].id is required and must be non-empty`, "SCHEMA_VALIDATION_FAILED", {
+      stage: "schema",
+      index
+    });
   }
   if (typeof rawId !== "string") {
-    throw new Error(`[schema] story[${index}].id must be a string`);
+    throw new NaxError(`[schema] story[${index}].id must be a string`, "SCHEMA_VALIDATION_FAILED", {
+      stage: "schema",
+      index
+    });
   }
   const id = normalizeStoryId(rawId);
   validateStoryId(id);
   const title = s.title;
   if (!title || typeof title !== "string" || title.trim() === "") {
-    throw new Error(`[schema] story[${index}].title is required and must be non-empty`);
+    throw new NaxError(`[schema] story[${index}].title is required and must be non-empty`, "SCHEMA_VALIDATION_FAILED", {
+      stage: "schema",
+      index
+    });
   }
   const description = s.description;
   if (!description || typeof description !== "string" || description.trim() === "") {
-    throw new Error(`[schema] story[${index}].description is required and must be non-empty`);
+    throw new NaxError(`[schema] story[${index}].description is required and must be non-empty`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index });
   }
   const ac = s.acceptanceCriteria;
   if (!Array.isArray(ac) || ac.length === 0) {
-    throw new Error(`[schema] story[${index}].acceptanceCriteria is required and must be a non-empty array`);
+    throw new NaxError(`[schema] story[${index}].acceptanceCriteria is required and must be a non-empty array`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index });
   }
   for (let i = 0;i < ac.length; i++) {
     if (typeof ac[i] !== "string") {
-      throw new Error(`[schema] story[${index}].acceptanceCriteria[${i}] must be a string`);
+      throw new NaxError(`[schema] story[${index}].acceptanceCriteria[${i}] must be a string`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index, acIndex: i });
     }
   }
   let suggestedCriteria;
   if (s.suggestedCriteria !== undefined && s.suggestedCriteria !== null) {
     if (!Array.isArray(s.suggestedCriteria)) {
-      throw new Error(`[schema] story[${index}].suggestedCriteria must be an array when present`);
+      throw new NaxError(`[schema] story[${index}].suggestedCriteria must be an array when present`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index });
     }
     if (s.suggestedCriteria.length > 0) {
       const coerced = [];
@@ -28173,7 +28241,7 @@ function validateStory(raw, index, allIds) {
         } else if (item !== null && typeof item === "object" && typeof item.criterion === "string") {
           coerced.push(item.criterion);
         } else {
-          throw new Error(`[schema] story[${index}].suggestedCriteria[${i}] must be a string`);
+          throw new NaxError(`[schema] story[${index}].suggestedCriteria[${i}] must be a string`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index, scIndex: i });
         }
       }
       suggestedCriteria = coerced;
@@ -28182,21 +28250,24 @@ function validateStory(raw, index, allIds) {
   const routing = typeof s.routing === "object" && s.routing !== null ? s.routing : {};
   const rawComplexity = routing.complexity ?? s.complexity;
   if (rawComplexity === undefined || rawComplexity === null) {
-    throw new Error(`[schema] story[${index}] missing complexity. Set routing.complexity to one of: ${VALID_COMPLEXITY.join(", ")}`);
+    throw new NaxError(`[schema] story[${index}] missing complexity. Set routing.complexity to one of: ${VALID_COMPLEXITY.join(", ")}`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index });
   }
   if (typeof rawComplexity !== "string") {
-    throw new Error(`[schema] story[${index}].routing.complexity must be a string`);
+    throw new NaxError(`[schema] story[${index}].routing.complexity must be a string`, "SCHEMA_VALIDATION_FAILED", {
+      stage: "schema",
+      index
+    });
   }
   const complexity = normalizeComplexity(rawComplexity);
   if (complexity === null) {
-    throw new Error(`[schema] story[${index}].routing.complexity "${rawComplexity}" is invalid. Valid values: ${VALID_COMPLEXITY.join(", ")}`);
+    throw new NaxError(`[schema] story[${index}].routing.complexity "${rawComplexity}" is invalid. Valid values: ${VALID_COMPLEXITY.join(", ")}`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index, rawComplexity });
   }
   const rawTestStrategy = routing.testStrategy ?? s.testStrategy;
   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"`);
+      throw new NaxError(`[schema] story[${index}].routing.noTestJustification is required when testStrategy is "no-test"`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index });
     }
   }
   if (testStrategy !== "no-test" && typeof rawJustification === "string" && rawJustification.trim() !== "") {
@@ -28207,7 +28278,7 @@ function validateStory(raw, index, allIds) {
   const dependencies = Array.isArray(rawDeps) ? rawDeps : [];
   for (const dep of dependencies) {
     if (!allIds.has(dep)) {
-      throw new Error(`[schema] story[${index}].dependencies references unknown story ID "${dep}"`);
+      throw new NaxError(`[schema] story[${index}].dependencies references unknown story ID "${dep}"`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index, dep });
     }
   }
   const rawTags = s.tags;
@@ -28216,13 +28287,16 @@ function validateStory(raw, index, allIds) {
   let workdir;
   if (rawWorkdir !== undefined && rawWorkdir !== null) {
     if (typeof rawWorkdir !== "string") {
-      throw new Error(`[schema] story[${index}].workdir must be a string`);
+      throw new NaxError(`[schema] story[${index}].workdir must be a string`, "SCHEMA_VALIDATION_FAILED", {
+        stage: "schema",
+        index
+      });
     }
     if (rawWorkdir.startsWith("/")) {
-      throw new Error(`[schema] story[${index}].workdir must be relative (no leading /): "${rawWorkdir}"`);
+      throw new NaxError(`[schema] story[${index}].workdir must be relative (no leading /): "${rawWorkdir}"`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index, rawWorkdir });
     }
     if (rawWorkdir.includes("..")) {
-      throw new Error(`[schema] story[${index}].workdir must not contain '..': "${rawWorkdir}"`);
+      throw new NaxError(`[schema] story[${index}].workdir must not contain '..': "${rawWorkdir}"`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index, rawWorkdir });
     }
     workdir = rawWorkdir;
   }
@@ -28234,10 +28308,10 @@ function validateStory(raw, index, allIds) {
         if (f.trim() === "")
           continue;
         if (f.startsWith("/")) {
-          throw new Error(`[schema] story[${index}].contextFiles entry must be relative (no absolute paths): "${f}"`);
+          throw new NaxError(`[schema] story[${index}].contextFiles entry must be relative (no absolute paths): "${f}"`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index, filePath: f });
         }
         if (f.includes("..")) {
-          throw new Error(`[schema] story[${index}].contextFiles entry must not contain '..': "${f}"`);
+          throw new NaxError(`[schema] story[${index}].contextFiles entry must not contain '..': "${f}"`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index, filePath: f });
         }
         contextFiles.push(f);
       } else if (typeof f === "object" && f !== null && typeof f.path === "string") {
@@ -28246,10 +28320,10 @@ function validateStory(raw, index, allIds) {
         if (path === "")
           continue;
         if (path.startsWith("/")) {
-          throw new Error(`[schema] story[${index}].contextFiles entry must be relative (no absolute paths): "${path}"`);
+          throw new NaxError(`[schema] story[${index}].contextFiles entry must be relative (no absolute paths): "${path}"`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index, filePath: path });
         }
         if (path.includes("..")) {
-          throw new Error(`[schema] story[${index}].contextFiles entry must not contain '..': "${path}"`);
+          throw new NaxError(`[schema] story[${index}].contextFiles entry must not contain '..': "${path}"`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index, filePath: path });
         }
         const entry = { path };
         if (typeof obj.factId === "string" && obj.factId.length > 0) {
@@ -28269,10 +28343,10 @@ function validateStory(raw, index, allIds) {
       if (trimmed === "")
         continue;
       if (trimmed.startsWith("/")) {
-        throw new Error(`[schema] story[${index}].expectedFiles entry must be relative (no absolute paths): "${trimmed}"`);
+        throw new NaxError(`[schema] story[${index}].expectedFiles entry must be relative (no absolute paths): "${trimmed}"`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index, filePath: trimmed });
       }
       if (trimmed.includes("..")) {
-        throw new Error(`[schema] story[${index}].expectedFiles entry must not contain '..': "${trimmed}"`);
+        throw new NaxError(`[schema] story[${index}].expectedFiles entry must not contain '..': "${trimmed}"`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index, filePath: trimmed });
       }
       expectedFiles.push(trimmed);
     }
@@ -28282,7 +28356,7 @@ function validateStory(raw, index, allIds) {
   if (s.verifiedBy !== undefined && s.verifiedBy !== null) {
     const vb = s.verifiedBy;
     if (typeof vb.kind !== "string" || !VALID_VERIFIED_BY_KINDS.includes(vb.kind)) {
-      throw new Error(`[schema] story[${index}].verifiedBy.kind "${vb.kind}" is invalid. Valid values: ${VALID_VERIFIED_BY_KINDS.join(", ")}`);
+      throw new NaxError(`[schema] story[${index}].verifiedBy.kind "${vb.kind}" is invalid. Valid values: ${VALID_VERIFIED_BY_KINDS.join(", ")}`, "SCHEMA_VALIDATION_FAILED", { stage: "schema", index, kind: vb.kind });
     }
     verifiedBy = {
       kind: vb.kind,
@@ -28337,18 +28411,23 @@ function parseRawString(text) {
     return JSON.parse(sanitized);
   } catch (err) {
     const parseErr = err;
-    throw new Error(`[schema] Failed to parse JSON: ${parseErr.message}`, { cause: parseErr });
+    throw new NaxError(`[schema] Failed to parse JSON: ${parseErr.message}`, "SCHEMA_VALIDATION_FAILED", {
+      stage: "schema",
+      cause: parseErr
+    });
   }
 }
 function validatePlanOutput(raw, feature, branch) {
   const parsed = typeof raw === "string" ? parseRawString(raw) : raw;
   if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-    throw new Error("[schema] PRD output must be a JSON object");
+    throw new NaxError("[schema] PRD output must be a JSON object", "SCHEMA_VALIDATION_FAILED", { stage: "schema" });
   }
   const obj = parsed;
   const rawStories = obj.userStories;
   if (!Array.isArray(rawStories) || rawStories.length === 0) {
-    throw new Error("[schema] userStories is required and must be a non-empty array");
+    throw new NaxError("[schema] userStories is required and must be a non-empty array", "SCHEMA_VALIDATION_FAILED", {
+      stage: "schema"
+    });
   }
   const allIds = new Set;
   for (const story of rawStories) {
@@ -28375,6 +28454,7 @@ function validatePlanOutput(raw, feature, branch) {
 var VALID_COMPLEXITY, STORY_ID_NO_SEPARATOR;
 var init_schema2 = __esm(() => {
   init_test_strategy();
+  init_errors();
   VALID_COMPLEXITY = ["simple", "medium", "complex", "expert"];
   STORY_ID_NO_SEPARATOR = /^([A-Za-z]+)(\d+)$/;
 });
@@ -28676,7 +28756,12 @@ async function scanTestFiles(options) {
           describes
         });
       }
-    } catch {}
+    } catch (err) {
+      getLogger().debug("test-scanner", "Failed to read file during glob scan", {
+        path: fullPath,
+        error: errorMessage(err)
+      });
+    }
   }
   files.sort((a, b) => a.relativePath.localeCompare(b.relativePath));
   return files;
@@ -35298,145 +35383,11 @@ var init_decompose = __esm(() => {
   init_errors();
 });
 
-// src/agents/shared/decompose-prompt.ts
-function buildPlanModeInstructions(targetStoryId, 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 `Decompose the target story (${targetStoryId}) into smaller, implementable sub-stories.
-
-${COMPLEXITY_GUIDE}
-
-${TEST_STRATEGY_GUIDE}
-
-${GROUPING_RULES}${acConstraint}`;
-}
-function buildDecomposePromptSync(input) {
-  if (input.targetStory) {
-    return buildPlanModePromptSync(input);
-  }
-  return buildSpecModePromptSync(input);
-}
-async function buildDecomposePromptAsync(options) {
-  if (options.targetStory) {
-    return buildPlanModePrompt(options);
-  }
-  return buildSpecModePrompt(options);
-}
-function buildPlanModePromptSync(input) {
-  const targetStory = input.targetStory;
-  const siblings = input.siblings ?? [];
-  const instructions = buildPlanModeInstructions(targetStory.id, input.maxAcCount ?? null);
-  let builder = OneShotPromptBuilder.for("decomposer").instructions(instructions).inputData("Target Story", JSON.stringify(targetStory, null, 2)).inputData("Codebase Context", input.codebaseContext);
-  if (siblings.length > 0) {
-    const siblingsSummary = siblings.map((s) => `- ${s.id}: ${s.title}`).join(`
-`);
-    builder = builder.inputData("Sibling Stories", siblingsSummary);
-  }
-  return builder.agentProfiles(input.profiles ?? []).jsonSchema(DECOMPOSE_PLAN_SCHEMA).build();
-}
-function buildSpecModePromptSync(input) {
-  return OneShotPromptBuilder.for("decomposer").instructions(SPEC_DECOMPOSE_INSTRUCTIONS).inputData("Codebase Context", input.codebaseContext).inputData("Feature Specification", input.specContent).agentProfiles(input.profiles ?? []).jsonSchema(DECOMPOSE_SPEC_SCHEMA).build();
-}
-async function buildPlanModePrompt(options) {
-  const targetStory = options.targetStory;
-  const siblings = options.siblings ?? [];
-  const maxAcCount = options.maxAcCount ?? null;
-  const instructions = buildPlanModeInstructions(targetStory.id, maxAcCount);
-  let builder = OneShotPromptBuilder.for("decomposer").instructions(instructions).inputData("Target Story", JSON.stringify(targetStory, null, 2)).inputData("Codebase Context", options.codebaseContext);
-  if (siblings.length > 0) {
-    const siblingsSummary = siblings.map((s) => `- ${s.id}: ${s.title}`).join(`
-`);
-    builder = builder.inputData("Sibling Stories", siblingsSummary);
-  }
-  return builder.agentProfiles(options.profiles ?? []).jsonSchema(DECOMPOSE_PLAN_SCHEMA).build();
-}
-async function buildSpecModePrompt(options) {
-  return OneShotPromptBuilder.for("decomposer").instructions(SPEC_DECOMPOSE_INSTRUCTIONS).inputData("Codebase Context", options.codebaseContext).inputData("Feature Specification", options.specContent).agentProfiles(options.profiles ?? []).jsonSchema(DECOMPOSE_SPEC_SCHEMA).build();
-}
-var DECOMPOSE_SPEC_SCHEMA, DECOMPOSE_PLAN_SCHEMA, SPEC_DECOMPOSE_INSTRUCTIONS;
-var init_decompose_prompt = __esm(() => {
-  init_test_strategy();
-  init_prompts();
-  DECOMPOSE_SPEC_SCHEMA = {
-    name: "DecomposedStory[]",
-    description: "Respond with ONLY a JSON array \u2014 no markdown code fences, no explanation text before or after.",
-    example: [
-      {
-        id: "US-001",
-        title: "Story title",
-        description: "Story description",
-        acceptanceCriteria: ["Criterion 1"],
-        tags: ["tag1"],
-        dependencies: [],
-        complexity: "medium",
-        contextFiles: ["src/path/to/file.ts"],
-        reasoning: "Why this complexity level",
-        estimatedLOC: 150,
-        risks: ["Risk 1"],
-        testStrategy: "test-after",
-        agentProfileId: ""
-      }
-    ]
-  };
-  DECOMPOSE_PLAN_SCHEMA = {
-    name: "SubStory[]",
-    description: "Return a JSON array of sub-stories \u2014 no markdown code fences, no explanation \u2014 JSON array only.",
-    example: [
-      {
-        id: "US-001-A",
-        title: "Sub-story title",
-        description: "Description",
-        acceptanceCriteria: ["Behavioral, testable criterion"],
-        contextFiles: ["src/path/to/file.ts"],
-        tags: [],
-        dependencies: [],
-        complexity: "simple",
-        reasoning: "Why this complexity",
-        estimatedLOC: 0,
-        risks: [],
-        testStrategy: "no-test | tdd-simple | three-session-tdd-lite | three-session-tdd | test-after",
-        agentProfileId: ""
-      }
-    ]
-  };
-  SPEC_DECOMPOSE_INSTRUCTIONS = `Break down the feature specification into user stories and classify each story's complexity.
-
-For each story, provide:
-1. id: Story ID (e.g., "US-001")
-2. title: Concise story title
-3. description: What needs to be implemented
-4. acceptanceCriteria: Array of testable criteria
-5. tags: Array of routing tags (e.g., ["security", "api"])
-6. dependencies: Array of story IDs this depends on (e.g., ["US-001"])
-7. complexity: "simple" | "medium" | "complex" | "expert"
-8. contextFiles: Array of file paths to inject into agent prompt before execution
-9. reasoning: Why this complexity level
-10. estimatedLOC: Estimated lines of code to change
-11. risks: Array of implementation risks
-12. testStrategy: "no-test" | "test-after" | "tdd-simple" | "three-session-tdd" | "three-session-tdd-lite"
-13. noTestJustification: string (REQUIRED when testStrategy is "no-test" \u2014 explain why tests are unnecessary)
-14. agentProfileId: (optional) profile id from the Agent Profiles table \u2014 assign the best-matching profile for each story; omit if no profiles are listed or none fits well
-
-${COMPLEXITY_GUIDE}
-
-${TEST_STRATEGY_GUIDE}
-
-${GROUPING_RULES}
-
-Consider:
-1. Does infrastructure exist? (e.g., "add caching" when no cache layer exists = complex)
-2. How many files will be touched?
-3. Are there cross-cutting concerns (auth, validation, error handling)?
-4. Does it require new dependencies or architectural decisions?`;
-});
-
 // src/operations/decompose.ts
 var decomposeOp;
 var init_decompose2 = __esm(() => {
+  init_prompts();
   init_decompose();
-  init_decompose_prompt();
   init_config();
   init_logger2();
   decomposeOp = {
@@ -35892,10 +35843,10 @@ var init_routing = __esm(() => {
 });
 
 // src/operations/classify-route.ts
-var CLASSIFY_ROLE = `You are a story classifier that assigns complexity and model tier to user stories.
-Respond with JSON only \u2014 no explanation text before or after.`, classifyRouteOp, BATCH_ROUTING_SCHEMA_INLINE = `Respond with a JSON array \u2014 no explanation, no markdown.
+var classifyRouteOp, BATCH_ROUTING_SCHEMA_INLINE = `Respond with a JSON array \u2014 no explanation, no markdown.
 Example: [{"id":"US-001","complexity":"simple","modelTier":"fast","reasoning":"<one line>"}]`, classifyRouteBatchOp;
 var init_classify_route = __esm(() => {
+  init_prompts();
   init_config();
   init_routing();
   init_llm_parsing();
@@ -35923,7 +35874,7 @@ ${criteria}`,
       ].join(`
 `);
       return {
-        role: { id: "role", content: CLASSIFY_ROLE, overridable: false },
+        role: { id: "role", content: OneShotPromptBuilder.classifierRoleContent(), overridable: false },
         task: { id: "task", content: `${ROUTING_INSTRUCTIONS}
 
 ## Story
@@ -35970,7 +35921,7 @@ ${storyBlocks}
 
 ${BATCH_ROUTING_SCHEMA_INLINE}`;
       return {
-        role: { id: "role", content: CLASSIFY_ROLE, overridable: false },
+        role: { id: "role", content: OneShotPromptBuilder.classifierRoleContent(), overridable: false },
         task: { id: "task", content: taskContent, overridable: false }
       };
     },
@@ -37536,7 +37487,7 @@ async function resolveOutcome(proposalOutputs, critiqueOutputs, stageConfig, con
   const logger = _debateSessionDeps.getSafeLogger();
   const kind = pickSelectorKind(stageConfig);
   if ((kind === "majority-fail-closed" || kind === "majority-fail-open") && workdir !== undefined) {
-    logger?.warn("debate", "majority resolver does not support implementer session resumption \u2014 switch to synthesis or custom resolver for context-aware semantic review");
+    logger?.warn("debate", "majority resolver does not support implementer session resumption \u2014 switch to synthesis or custom resolver for context-aware semantic review", { storyId });
   }
   const proposalList = debaters ? debaters.map((debater, i) => ({
     debater,
@@ -38472,7 +38423,7 @@ Options:`);
       const prompt = OneShotPromptBuilder.for("auto-approver").instructions(AUTO_APPROVER_INSTRUCTIONS).inputData("Interaction Request", requestLines.join(`
 `)).jsonSchema(AUTO_APPROVER_SCHEMA).build();
       return {
-        role: { id: "role", content: "You are an AI orchestration decision-maker.", overridable: false },
+        role: { id: "role", content: OneShotPromptBuilder.autoApproverRoleContent(), overridable: false },
         task: { id: "task", content: prompt, overridable: false }
       };
     },
@@ -39330,7 +39281,12 @@ var init_full_suite_rectify_op = __esm(() => {
     },
     parse(output, _input, _ctx) {
       const declarations = parseTestEditDeclarations(output);
-      return { applied: true, testEditDeclarations: declarations };
+      const unresolvedMatch = output.match(/^UNRESOLVED:\s*(.+)$/m);
+      return {
+        applied: true,
+        testEditDeclarations: declarations,
+        ...unresolvedMatch ? { unresolvedReason: unresolvedMatch[1]?.trim() } : {}
+      };
     }
   };
 });
@@ -39352,7 +39308,13 @@ function makeFullSuiteRectifyStrategy(story, config2, sink) {
             sink.testEdits.push(d);
           }
         }
-        return { targetFiles: [], summary: "Fixed failing tests" };
+        const hasDeclarations = output.testEditDeclarations.length > 0;
+        const unresolved = output.unresolvedReason && !hasDeclarations ? output.unresolvedReason : undefined;
+        return {
+          targetFiles: [],
+          summary: unresolved ?? "Fixed failing tests",
+          ...unresolved ? { unresolved } : {}
+        };
       },
       maxAttempts: config2.execution.rectification.maxAttemptsPerStrategy,
       coRun: "exclusive"
@@ -39413,6 +39375,7 @@ var init__finding_to_check = __esm(() => {
 function makeAutofixImplementerStrategy(story, config2, sink, opts = {}) {
   const claimsAdversarial = opts.includeAdversarialReview === true;
   const adversarialReviewByFixTarget = opts.adversarialReviewByFixTarget;
+  const blockingThreshold = opts.promptSeverityFloor ?? config2.review?.blockingThreshold;
   return {
     name: "autofix-implementer",
     appliesTo: (f) => (f.fixTarget === "source" || f.fixTarget == null) && IMPLEMENTER_SOURCES.has(f.source) || adversarialReviewByFixTarget !== undefined && f.source === "adversarial-review" && f.fixTarget === adversarialReviewByFixTarget || adversarialReviewByFixTarget === undefined && claimsAdversarial && f.source === "adversarial-review",
@@ -39420,7 +39383,8 @@ function makeAutofixImplementerStrategy(story, config2, sink, opts = {}) {
     buildInput: (findings, _prior, _cycleCtx) => ({
       failedChecks: findingsToFailedChecks(findings),
       story,
-      findings
+      findings,
+      blockingThreshold
     }),
     extractApplied: (output) => {
       for (const decl of output.testEditDeclarations) {
@@ -39449,6 +39413,7 @@ var init_autofix_implementer_strategy = __esm(() => {
 // src/operations/autofix-test-writer-strategy.ts
 function makeAutofixTestWriterStrategy(story, config2, sink, opts = {}) {
   const includeAdversarial = opts.includeAdversarialReview !== false;
+  const blockingThreshold = opts.promptSeverityFloor ?? config2.review?.blockingThreshold;
   return {
     name: "autofix-test-writer",
     appliesTo: (f) => f.fixTarget === "test" || includeAdversarial && f.source === "adversarial-review" || sink.mockHandoffs.length > 0,
@@ -39473,7 +39438,7 @@ function makeAutofixTestWriterStrategy(story, config2, sink, opts = {}) {
           failedChecks: findingsToFailedChecks(findings),
           story,
           mode: "mock-restructure",
-          blockingThreshold: config2.review?.blockingThreshold,
+          blockingThreshold,
           handoffReason,
           handoffFiles
         };
@@ -39481,7 +39446,7 @@ function makeAutofixTestWriterStrategy(story, config2, sink, opts = {}) {
       return {
         failedChecks: findingsToFailedChecks(findings),
         story,
-        blockingThreshold: config2.review?.blockingThreshold
+        blockingThreshold
       };
     },
     maxAttempts: config2.execution.rectification.maxAttemptsPerStrategy,
@@ -43351,6 +43316,13 @@ ${OneShotPromptBuilder.agentProfileInstruction()}`
     ].join(`
 `);
   }
+  static classifierRoleContent() {
+    return `You are a story classifier that assigns complexity and model tier to user stories.
+Respond with JSON only \u2014 no explanation text before or after.`;
+  }
+  static autoApproverRoleContent() {
+    return "You are an AI orchestration decision-maker.";
+  }
   static agentCapabilityCards(profiles) {
     if (profiles.length === 0)
       return "";
@@ -44038,6 +44010,140 @@ Please enhance the original proposal to address these runner-up criteria while m
   }
 }
 
+// src/prompts/builders/decompose-builder.ts
+function buildPlanModeInstructions(targetStoryId, 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 `Decompose the target story (${targetStoryId}) into smaller, implementable sub-stories.
+
+${COMPLEXITY_GUIDE}
+
+${TEST_STRATEGY_GUIDE}
+
+${GROUPING_RULES}${acConstraint}`;
+}
+function buildDecomposePromptSync(input) {
+  if (input.targetStory) {
+    return buildPlanModePromptSync(input);
+  }
+  return buildSpecModePromptSync(input);
+}
+async function buildDecomposePromptAsync(options) {
+  if (options.targetStory) {
+    return buildPlanModePrompt(options);
+  }
+  return buildSpecModePrompt(options);
+}
+function buildPlanModePromptSync(input) {
+  const targetStory = input.targetStory;
+  const siblings = input.siblings ?? [];
+  const instructions = buildPlanModeInstructions(targetStory.id, input.maxAcCount ?? null);
+  let builder = OneShotPromptBuilder.for("decomposer").instructions(instructions).inputData("Target Story", JSON.stringify(targetStory, null, 2)).inputData("Codebase Context", input.codebaseContext);
+  if (siblings.length > 0) {
+    const siblingsSummary = siblings.map((s) => `- ${s.id}: ${s.title}`).join(`
+`);
+    builder = builder.inputData("Sibling Stories", siblingsSummary);
+  }
+  return builder.agentProfiles(input.profiles ?? []).jsonSchema(DECOMPOSE_PLAN_SCHEMA).build();
+}
+function buildSpecModePromptSync(input) {
+  return OneShotPromptBuilder.for("decomposer").instructions(SPEC_DECOMPOSE_INSTRUCTIONS).inputData("Codebase Context", input.codebaseContext).inputData("Feature Specification", input.specContent).agentProfiles(input.profiles ?? []).jsonSchema(DECOMPOSE_SPEC_SCHEMA).build();
+}
+async function buildPlanModePrompt(options) {
+  const targetStory = options.targetStory;
+  const siblings = options.siblings ?? [];
+  const maxAcCount = options.maxAcCount ?? null;
+  const instructions = buildPlanModeInstructions(targetStory.id, maxAcCount);
+  let builder = OneShotPromptBuilder.for("decomposer").instructions(instructions).inputData("Target Story", JSON.stringify(targetStory, null, 2)).inputData("Codebase Context", options.codebaseContext);
+  if (siblings.length > 0) {
+    const siblingsSummary = siblings.map((s) => `- ${s.id}: ${s.title}`).join(`
+`);
+    builder = builder.inputData("Sibling Stories", siblingsSummary);
+  }
+  return builder.agentProfiles(options.profiles ?? []).jsonSchema(DECOMPOSE_PLAN_SCHEMA).build();
+}
+async function buildSpecModePrompt(options) {
+  return OneShotPromptBuilder.for("decomposer").instructions(SPEC_DECOMPOSE_INSTRUCTIONS).inputData("Codebase Context", options.codebaseContext).inputData("Feature Specification", options.specContent).agentProfiles(options.profiles ?? []).jsonSchema(DECOMPOSE_SPEC_SCHEMA).build();
+}
+var DECOMPOSE_SPEC_SCHEMA, DECOMPOSE_PLAN_SCHEMA, SPEC_DECOMPOSE_INSTRUCTIONS;
+var init_decompose_builder = __esm(() => {
+  init_test_strategy();
+  init_one_shot_builder();
+  DECOMPOSE_SPEC_SCHEMA = {
+    name: "DecomposedStory[]",
+    description: "Respond with ONLY a JSON array \u2014 no markdown code fences, no explanation text before or after.",
+    example: [
+      {
+        id: "US-001",
+        title: "Story title",
+        description: "Story description",
+        acceptanceCriteria: ["Criterion 1"],
+        tags: ["tag1"],
+        dependencies: [],
+        complexity: "medium",
+        contextFiles: ["src/path/to/file.ts"],
+        reasoning: "Why this complexity level",
+        estimatedLOC: 150,
+        risks: ["Risk 1"],
+        testStrategy: "test-after",
+        agentProfileId: ""
+      }
+    ]
+  };
+  DECOMPOSE_PLAN_SCHEMA = {
+    name: "SubStory[]",
+    description: "Return a JSON array of sub-stories \u2014 no markdown code fences, no explanation \u2014 JSON array only.",
+    example: [
+      {
+        id: "US-001-A",
+        title: "Sub-story title",
+        description: "Description",
+        acceptanceCriteria: ["Behavioral, testable criterion"],
+        contextFiles: ["src/path/to/file.ts"],
+        tags: [],
+        dependencies: [],
+        complexity: "simple",
+        reasoning: "Why this complexity",
+        estimatedLOC: 0,
+        risks: [],
+        testStrategy: "no-test | tdd-simple | three-session-tdd-lite | three-session-tdd | test-after",
+        agentProfileId: ""
+      }
+    ]
+  };
+  SPEC_DECOMPOSE_INSTRUCTIONS = `Break down the feature specification into user stories and classify each story's complexity.
+
+For each story, provide:
+1. id: Story ID (e.g., "US-001")
+2. title: Concise story title
+3. description: What needs to be implemented
+4. acceptanceCriteria: Array of testable criteria
+5. tags: Array of routing tags (e.g., ["security", "api"])
+6. dependencies: Array of story IDs this depends on (e.g., ["US-001"])
+7. complexity: "simple" | "medium" | "complex" | "expert"
+8. contextFiles: Array of file paths to inject into agent prompt before execution
+9. reasoning: Why this complexity level
+10. estimatedLOC: Estimated lines of code to change
+11. risks: Array of implementation risks
+12. testStrategy: "no-test" | "test-after" | "tdd-simple" | "three-session-tdd" | "three-session-tdd-lite"
+13. noTestJustification: string (REQUIRED when testStrategy is "no-test" \u2014 explain why tests are unnecessary)
+14. agentProfileId: (optional) profile id from the Agent Profiles table \u2014 assign the best-matching profile for each story; omit if no profiles are listed or none fits well
+
+${COMPLEXITY_GUIDE}
+
+${TEST_STRATEGY_GUIDE}
+
+${GROUPING_RULES}
+
+Consider:
+1. Does infrastructure exist? (e.g., "add caching" when no cache layer exists = complex)
+2. How many files will be touched?
+3. Are there cross-cutting concerns (auth, validation, error handling)?
+4. Does it require new dependencies or architectural decisions?`;
+});
+
 // src/prompts/index.ts
 var init_prompts = __esm(() => {
   init_tdd_builder();
@@ -44052,6 +44158,7 @@ var init_prompts = __esm(() => {
   init_plan_builder();
   init_types5();
   init_compose2();
+  init_decompose_builder();
 });
 
 // src/operations/build-hop-callback.ts
@@ -47963,7 +48070,7 @@ async function runHybrid(ctx, prompt) {
   const resolved = [];
   for (const debater of debaters) {
     if (!agentManager.getAgent(debater.agent)) {
-      logger?.warn("debate", `Agent '${debater.agent}' not found \u2014 skipping debater`);
+      logger?.warn("debate", `Agent '${debater.agent}' not found \u2014 skipping debater`, { storyId: ctx.storyId });
       continue;
     }
     resolved.push({ debater, agentName: debater.agent });
@@ -48912,7 +49019,7 @@ async function runStateful(ctx, prompt) {
   const resolved = debaters.flatMap((debater) => ctx.agentManager.getAgent(debater.agent) ? [{ debater, agentName: debater.agent }] : []);
   for (const debater of debaters) {
     if (!ctx.agentManager.getAgent(debater.agent)) {
-      logger?.warn("debate", `Agent '${debater.agent}' not found \u2014 skipping debater`);
+      logger?.warn("debate", `Agent '${debater.agent}' not found \u2014 skipping debater`, { storyId: ctx.storyId });
     }
   }
   logger?.info("debate", "debate:start", {
@@ -49083,7 +49190,7 @@ class DebateRunner {
       if (sessionMode === "stateful")
         return this.runSessionModeWithScopes(prompt, runHybrid);
       const logger = _debateSessionDeps.getSafeLogger();
-      logger?.warn("debate", `hybrid mode requires sessionMode: stateful, but got '${sessionMode}' \u2014 falling back to one-shot`);
+      logger?.warn("debate", `hybrid mode requires sessionMode: stateful, but got '${sessionMode}' \u2014 falling back to one-shot`, { storyId: this.ctx.storyId });
       return this.runPanelOneShot(prompt);
     }
     if (sessionMode === "stateful")
@@ -49127,7 +49234,9 @@ class DebateRunner {
       const resolved = [];
       for (const debater of debaters) {
         if (!agentManager.getAgent(debater.agent)) {
-          logger?.warn("debate", `Agent '${debater.agent}' not found \u2014 skipping debater`);
+          logger?.warn("debate", `Agent '${debater.agent}' not found \u2014 skipping debater`, {
+            storyId: this.ctx.storyId
+          });
           continue;
         }
         resolved.push({ debater, agentName: debater.agent });
@@ -49442,13 +49551,13 @@ class InteractionChain {
   async send(request) {
     const plugin = this.getPrimary();
     if (!plugin) {
-      throw new Error("No interaction plugin registered");
+      throw new NaxError("No interaction plugin registered", "INTERACTION_ERROR", { stage: "run" });
     }
     await plugin.send(request);
   }
   async receive(requestId, timeout) {
     if (this.plugins.length === 0) {
-      throw new Error("No interaction plugin registered");
+      throw new NaxError("No interaction plugin registered", "INTERACTION_ERROR", { stage: "run", requestId });
     }
     const timeoutMs = timeout ?? this.config.defaultTimeout;
     const errors3 = [];
@@ -49462,7 +49571,11 @@ class InteractionChain {
       }
     }
     const errorMessages = errors3.map((e) => e.message).join("; ");
-    throw new Error(`All interaction plugins failed: ${errorMessages}`);
+    throw new NaxError(`All interaction plugins failed: ${errorMessages}`, "INTERACTION_ERROR", {
+      stage: "run",
+      requestId,
+      pluginCount: this.plugins.length
+    });
   }
   async prompt(request) {
     await this.send(request);
@@ -49512,19 +49625,29 @@ class InteractionChain {
     }
   }
 }
+var init_chain = __esm(() => {
+  init_errors();
+});
 
 // src/interaction/state.ts
 import * as path6 from "path";
 function validateInteractionId(id) {
   if (!SAFE_INTERACTION_ID_RE.test(id)) {
-    throw new Error(`Invalid interaction ID \u2014 must match [a-zA-Z0-9_-]{1,128}: ${id}`);
+    throw new NaxError(`Invalid interaction ID \u2014 must match [a-zA-Z0-9_-]{1,128}: ${id}`, "INTERACTION_ERROR", {
+      stage: "run",
+      id
+    });
   }
 }
 function assertPathWithin(filePath, baseDir) {
   const resolved = path6.resolve(filePath);
   const base = path6.resolve(baseDir);
   if (!resolved.startsWith(base + path6.sep) && resolved !== base) {
-    throw new Error(`Path traversal detected: ${filePath} is outside ${baseDir}`);
+    throw new NaxError(`Path traversal detected: ${filePath} is outside ${baseDir}`, "INTERACTION_ERROR", {
+      stage: "run",
+      filePath,
+      baseDir
+    });
   }
 }
 async function loadPendingInteraction(requestId, featureDir) {
@@ -49565,6 +49688,7 @@ async function listPendingInteractions(featureDir) {
 }
 var SAFE_INTERACTION_ID_RE;
 var init_state = __esm(() => {
+  init_errors();
   SAFE_INTERACTION_ID_RE = /^[a-zA-Z0-9_-]{1,128}$/;
 });
 
@@ -50875,6 +50999,7 @@ async function initInteractionChain(config2, headless) {
 }
 var init_init = __esm(() => {
   init_logger2();
+  init_chain();
   init_auto();
   init_cli();
   init_telegram();
@@ -50917,6 +51042,7 @@ var init_bridge_builder = __esm(() => {
 // src/interaction/index.ts
 var init_interaction = __esm(() => {
   init_types8();
+  init_chain();
   init_state();
   init_cli();
   init_telegram();
@@ -52346,9 +52472,9 @@ async function runReplanLoop(workdir, config2, options) {
   _planDeps.processExit(1);
 }
 var init_plan_decompose = __esm(() => {
+  init_prompts();
   init_agents();
   init_decompose();
-  init_decompose_prompt();
   init_errors();
   init_logger2();
   init_operations();
@@ -54396,18 +54522,20 @@ var init_constitution2 = __esm(() => {
       if (result) {
         ctx.constitution = result;
         logger.debug("constitution", "Constitution loaded", {
+          storyId: ctx.story.id,
           tokens: result.tokens,
           truncated: result.truncated
         });
         if (result.truncated) {
           logger.warn("constitution", "Constitution truncated", {
+            storyId: ctx.story.id,
             originalTokens: result.originalTokens,
             tokens: result.tokens,
             maxTokens: ctx.config.constitution.maxTokens
           });
         }
       } else {
-        logger.debug("constitution", "Constitution not found or failed to load");
+        logger.debug("constitution", "Constitution not found or failed to load", { storyId: ctx.story.id });
       }
       return { action: "continue" };
     }
@@ -55640,7 +55768,11 @@ async function runRectification(ctx, state, phaseCosts, phaseOutputs, overrides)
     });
   }
   if (EXHAUSTED_EXIT_REASONS.has(cycleResult.exitReason) && cycleResult.finalFindings.length > 0) {
-    return { rectificationExhausted: true, unfixedFindings: cycleResult.finalFindings };
+    return {
+      rectificationExhausted: true,
+      unfixedFindings: cycleResult.finalFindings,
+      ...cycleResult.unresolvedDetail ? { unresolvedDetail: cycleResult.unresolvedDetail } : {}
+    };
   }
   if (cycleResult.exitReason === "validate-short-circuit") {
     return { liteScopeIncomplete: true };
@@ -56047,18 +56179,24 @@ async function buildPlanForStrategy(ctx, story, config2, testStrategy, inputs) {
     const nbSink = makeDeclarationSink();
     if (nbf.scope === "source") {
       nbStrategies.push(makeAutofixImplementerStrategy(story, config2, nbSink, {
-        includeAdversarialReview: true
+        includeAdversarialReview: true,
+        promptSeverityFloor: "info"
       }));
     } else if (nbf.scope === "triage") {
       nbStrategies.push(makeAutofixImplementerStrategy(story, config2, nbSink, {
-        adversarialReviewByFixTarget: "source"
+        adversarialReviewByFixTarget: "source",
+        promptSeverityFloor: "info"
       }), makeAutofixTestWriterStrategy(story, config2, nbSink, {
-        includeAdversarialReview: false
+        includeAdversarialReview: false,
+        promptSeverityFloor: "info"
       }));
     } else {
       nbStrategies.push(makeAutofixImplementerStrategy(story, config2, nbSink, {
-        includeAdversarialReview: false
-      }), makeAutofixTestWriterStrategy(story, config2, nbSink));
+        includeAdversarialReview: false,
+        promptSeverityFloor: "info"
+      }), makeAutofixTestWriterStrategy(story, config2, nbSink, {
+        promptSeverityFloor: "info"
+      }));
     }
     nbStrategies.push(makeFullSuiteRectifyStrategy(story, config2, nbSink));
     const nbPostValidate = async (findings, _validateCtx) => {
@@ -56127,15 +56265,6 @@ function toVerifyScopedMode(mode) {
 function hasReviewEscalation(story) {
   return (story.priorFailures ?? []).some((f) => f.stage === "review");
 }
-async function buildThreeSessionPrompt(role, ctx, lite) {
-  return TddPromptBuilder.buildForRole(role, ctx.workdir, ctx.config, ctx.story, {
-    lite,
-    contextMarkdown: ctx.contextMarkdown,
-    featureContextMarkdown: ctx.featureContextMarkdown,
-    contextBundle: ctx.contextBundle,
-    constitution: ctx.constitution?.content
-  });
-}
 function buildFeatureCtxBlock(ctx, role) {
   const bundleMarkdown = ctx.contextBundle?.pushMarkdown.trim();
   if (bundleMarkdown) {
@@ -56167,10 +56296,17 @@ async function assemblePlanInputsFromCtx(ctx) {
   }
   const packageDirRel = packageDirRelative(ctx.projectDir, ctx.workdir);
   const resolvedTestPatterns = await resolveTestFilePatterns(config2, ctx.projectDir, packageDirRel);
+  const tddOpts = {
+    lite: isLite,
+    contextMarkdown: ctx.contextMarkdown,
+    featureContextMarkdown: ctx.featureContextMarkdown,
+    contextBundle: ctx.contextBundle,
+    constitution: ctx.constitution?.content
+  };
   const [testWriterPrompt, implementerPrompt, verifierPrompt] = _isTdd ? await Promise.all([
-    _isFreshRun ? buildThreeSessionPrompt("test-writer", ctx, isLite) : Promise.resolve(""),
-    buildThreeSessionPrompt("implementer", ctx, isLite),
-    buildThreeSessionPrompt("verifier", ctx, isLite)
+    _isFreshRun ? TddPromptBuilder.buildForRole("test-writer", ctx.workdir, ctx.config, ctx.story, tddOpts) : Promise.resolve(""),
+    TddPromptBuilder.buildForRole("implementer", ctx.workdir, ctx.config, ctx.story, tddOpts),
+    TddPromptBuilder.buildForRole("verifier", ctx.workdir, ctx.config, ctx.story, tddOpts)
   ]) : ["", ctx.prompt, ""];
   const testWriterInput = _isTdd && _isFreshRun ? {
     story,
@@ -56662,10 +56798,12 @@ async function decideStageAction(ctx, planResult, inspection, opts) {
       logger.error("execution", "Rectification exhausted with unfixed findings", {
         storyId: ctx.story.id,
         findingsCount: planResult.unfixedFindings.length,
-        findingSources
+        findingSources,
+        ...planResult.unresolvedDetail ? { unresolvedDetail: planResult.unresolvedDetail } : {}
       });
       await cleanupSessionOnFailure(ctx);
-      return { action: "escalate", reason: "Rectification exhausted with unfixed findings" };
+      const exhaustedReason = planResult.unresolvedDetail ? `Rectification exhausted: ${planResult.unresolvedDetail}` : "Rectification exhausted with unfixed findings";
+      return { action: "escalate", reason: exhaustedReason };
     }
   }
   if (selfVerificationFailed) {
@@ -57156,7 +57294,7 @@ var init_optimizer2 = __esm(() => {
     async execute(ctx) {
       const logger = _optimizerDeps.getLogger();
       if (!ctx.prompt) {
-        logger.debug("optimizer", "No prompt to optimize, skipping");
+        logger.debug("optimizer", "No prompt to optimize, skipping", { storyId: ctx.story?.id ?? "unknown" });
         return { action: "continue" };
       }
       const optimizer = resolveOptimizer(ctx.config, ctx.plugins);
@@ -57169,6 +57307,7 @@ var init_optimizer2 = __esm(() => {
       ctx.prompt = result.prompt;
       const savingsPercent = Math.round(result.savings * 100);
       logger.info("optimizer", `${optimizer.name}: ${savingsPercent}% savings`, {
+        storyId: ctx.story?.id ?? "unknown",
         originalTokens: result.originalTokens,
         optimizedTokens: result.optimizedTokens,
         tokensSaved: result.originalTokens - result.optimizedTokens,
@@ -57241,6 +57380,7 @@ var init_prompt = __esm(() => {
       ctx.prompt = prompt;
       if (isBatch) {
         logger.info("prompt", "Batch session prepared", {
+          storyId: "batch",
           storyCount: ctx.stories.length,
           testStrategy: ctx.routing.testStrategy
         });
@@ -57369,12 +57509,12 @@ var init_queue_check = __esm(() => {
       }
       for (const cmd of queueCommands) {
         if (cmd.type === "PAUSE") {
-          logger.warn("queue", "Paused by user", { command: "PAUSE" });
+          logger.warn("queue", "Paused by user", { storyId: ctx.story?.id ?? "unknown", command: "PAUSE" });
           await clearQueueFile(ctx.workdir);
           return { action: "pause", reason: "User requested pause via .queue.txt" };
         }
         if (cmd.type === "ABORT") {
-          logger.warn("queue", "Aborting: marking remaining stories as skipped");
+          logger.warn("queue", "Aborting: marking remaining stories as skipped", { storyId: ctx.story?.id ?? "unknown" });
           for (const s of ctx.prd.userStories) {
             if (s.status === "pending") {
               markStorySkipped(ctx.prd, s.id);
@@ -57969,8 +58109,7 @@ __export(exports_init_context, {
   initPackage: () => initPackage,
   initContext: () => initContext,
   generatePackageContextTemplate: () => generatePackageContextTemplate,
-  generateContextTemplate: () => generateContextTemplate,
-  _initContextDeps: () => _initContextDeps
+  generateContextTemplate: () => generateContextTemplate
 });
 import { basename as basename9, join as join52 } from "path";
 async function bunFileExists(path14) {
@@ -58159,39 +58298,6 @@ function generateContextTemplate(scan) {
 `).trim()}
 `;
 }
-async function generateContextWithLLM(scan) {
-  const logger = getLogger();
-  const scanSummary = `
-Project: ${scan.projectName}
-Entry Points: ${scan.entryPoints.join(", ") || "None detected"}
-Config Files: ${scan.configFiles.join(", ") || "None detected"}
-Total Files: ${scan.fileTree.length}
-Description: ${scan.packageManifest?.description || "Not provided"}
-`;
-  const prompt = `
-You are a technical documentation expert. Generate a concise, well-structured context.md file for a software project based on this scan:
-
-${scanSummary}
-
-The context.md should include:
-1. Project overview (name, purpose, key technologies)
-2. Entry points and main modules
-3. Key dependencies and why they're used
-4. Development setup and common commands
-5. Architecture overview (brief)
-6. Development guidelines
-
-Keep it under 2000 tokens. Use markdown formatting. Be specific to the detected stack and structure.
-`;
-  try {
-    const result = await _initContextDeps.callLLM(prompt);
-    logger.info("init", "Generated context.md with LLM", { storyId: "init-context" });
-    return result;
-  } catch (err) {
-    logger.warn("init", `LLM context generation failed, falling back to template: ${err instanceof Error ? err.message : String(err)}`, { storyId: "init-context" });
-    return generateContextTemplate(scan);
-  }
-}
 function generatePackageContextTemplate(packagePath) {
   const packageName = packagePath.split("/").pop() ?? packagePath;
   return `# ${packageName} \u2014 Context
@@ -58246,26 +58352,15 @@ async function initContext(projectRoot, options = {}) {
     await bunMkdirp(naxDir);
   }
   const scan = await scanProject(projectRoot);
-  let content;
-  if (options.ai) {
-    content = await generateContextWithLLM(scan);
-  } else {
-    content = generateContextTemplate(scan);
-  }
+  const content = generateContextTemplate(scan);
   await Bun.write(contextPath, content);
   logger.info("init", "Generated .nax/context.md template from project scan", {
     storyId: "init-context",
     path: contextPath
   });
 }
-var _initContextDeps;
 var init_init_context = __esm(() => {
   init_logger2();
-  _initContextDeps = {
-    callLLM: async (_prompt) => {
-      throw new Error("callLLM not implemented");
-    }
-  };
 });
 
 // src/cli/init-detect.ts
@@ -58699,7 +58794,7 @@ async function initProject(projectRoot, options) {
   } else {
     logger.info("init", "Project config already exists", { path: configPath });
   }
-  await initContext(projectRoot, { ai: options?.ai, force: options?.force });
+  await initContext(projectRoot, { force: options?.force });
   const constitutionPath = join54(projectDir, "constitution.md");
   if (!existsSync23(constitutionPath) || options?.force) {
     await Bun.write(constitutionPath, buildConstitution(stack));
@@ -60691,7 +60786,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.70.2",
+    version: "0.70.4",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -60791,8 +60886,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("0e202cfa"))
-        return "0e202cfa";
+      if (/^[0-9a-f]{6,10}$/.test("b2d5d046"))
+        return "b2d5d046";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -63043,16 +63138,37 @@ ${missing.join(`
       });
       const [exitCode, stderr] = await Promise.all([proc.exited, new Response(proc.stderr).text()]);
       if (exitCode !== 0) {
-        throw new Error(`Failed to create worktree: ${stderr || "unknown error"}`);
+        throw new NaxError(`Failed to create worktree: ${stderr || "unknown error"}`, "WORKTREE_ERROR", {
+          stage: "worktree",
+          storyId,
+          projectRoot,
+          stderr
+        });
       }
     } catch (error48) {
+      if (error48 instanceof NaxError) {
+        throw error48;
+      }
       if (error48 instanceof Error) {
         if (error48.message.includes("not a git repository")) {
-          throw new Error(`Not a git repository: ${projectRoot}`);
+          throw new NaxError(`Not a git repository: ${projectRoot}`, "WORKTREE_ERROR", {
+            stage: "worktree",
+            storyId,
+            projectRoot
+          });
         }
-        throw error48;
+        throw new NaxError(error48.message, "WORKTREE_ERROR", {
+          stage: "worktree",
+          storyId,
+          projectRoot,
+          cause: error48
+        });
       }
-      throw new Error(`Failed to create worktree: ${String(error48)}`);
+      throw new NaxError(`Failed to create worktree: ${String(error48)}`, "WORKTREE_ERROR", {
+        stage: "worktree",
+        storyId,
+        projectRoot
+      });
     }
     const envSource = join80(projectRoot, ".env");
     if (existsSync31(envSource)) {
@@ -63061,7 +63177,12 @@ ${missing.join(`
         symlinkSync(envSource, envTarget, "file");
       } catch (error48) {
         await this.remove(projectRoot, storyId);
-        throw new Error(`Failed to symlink .env: ${errorMessage(error48)}`);
+        throw new NaxError(`Failed to symlink .env: ${errorMessage(error48)}`, "WORKTREE_ERROR", {
+          stage: "worktree",
+          storyId,
+          envSource,
+          envTarget
+        });
       }
     }
   }
@@ -63078,15 +63199,29 @@ ${missing.join(`
       const [exitCode, stderr] = await Promise.all([proc.exited, new Response(proc.stderr).text()]);
       if (exitCode !== 0) {
         if (stderr.includes("not found") || stderr.includes("does not exist") || stderr.includes("no such worktree") || stderr.includes("is not a working tree")) {
-          throw new Error(`Worktree not found: ${worktreePath}`);
+          throw new NaxError(`Worktree not found: ${worktreePath}`, "WORKTREE_ERROR", {
+            stage: "worktree",
+            storyId,
+            worktreePath
+          });
         }
-        throw new Error(`Failed to remove worktree: ${stderr || "unknown error"}`);
+        throw new NaxError(`Failed to remove worktree: ${stderr || "unknown error"}`, "WORKTREE_ERROR", {
+          stage: "worktree",
+          storyId,
+          worktreePath,
+          stderr
+        });
       }
     } catch (error48) {
-      if (error48 instanceof Error) {
+      if (error48 instanceof NaxError) {
         throw error48;
       }
-      throw new Error(`Failed to remove worktree: ${String(error48)}`);
+      throw new NaxError(error48 instanceof Error ? error48.message : String(error48), "WORKTREE_ERROR", {
+        stage: "worktree",
+        storyId,
+        worktreePath,
+        cause: error48 instanceof Error ? error48 : undefined
+      });
     }
     try {
       const proc = _managerDeps.spawn(["git", "branch", "-D", branchName], {
@@ -63121,14 +63256,22 @@ ${missing.join(`
         new Response(proc.stdout).text()
       ]);
       if (exitCode !== 0) {
-        throw new Error(`Failed to list worktrees: ${stderr || "unknown error"}`);
+        throw new NaxError(`Failed to list worktrees: ${stderr || "unknown error"}`, "WORKTREE_ERROR", {
+          stage: "worktree",
+          projectRoot,
+          stderr
+        });
       }
       return this.parseWorktreeList(stdout);
     } catch (error48) {
-      if (error48 instanceof Error) {
+      if (error48 instanceof NaxError) {
         throw error48;
       }
-      throw new Error(`Failed to list worktrees: ${String(error48)}`);
+      throw new NaxError(error48 instanceof Error ? error48.message : String(error48), "WORKTREE_ERROR", {
+        stage: "worktree",
+        projectRoot,
+        cause: error48 instanceof Error ? error48 : undefined
+      });
     }
   }
   parseWorktreeList(output) {
@@ -63156,6 +63299,7 @@ ${missing.join(`
 }
 var _managerDeps;
 var init_manager3 = __esm(() => {
+  init_errors();
   init_logger2();
   init_bun_deps();
   init_gitignore();
@@ -65802,17 +65946,24 @@ async function runPrecheckValidation(ctx) {
     ctx.statusWriter.setRunStatus("precheck-failed");
     ctx.statusWriter.setCurrentStory(null);
     await ctx.statusWriter.update(0, 0);
-    console.error("");
-    console.error(source_default.red("\u274C PRECHECK FAILED"));
-    console.error(source_default.red("\u2500".repeat(60)));
+    process.stderr.write(`
+`);
+    process.stderr.write(`${source_default.red("\u274C PRECHECK FAILED")}
+`);
+    process.stderr.write(`${source_default.red("\u2500".repeat(60))}
+`);
     for (const blocker of precheckResult.output.blockers) {
-      console.error(source_default.red(`\u2717 ${blocker.name}: ${blocker.message}`));
+      process.stderr.write(`${source_default.red(`\u2717 ${blocker.name}: ${blocker.message}`)}
+`);
     }
-    console.error(source_default.red("\u2500".repeat(60)));
-    console.error(source_default.yellow(`
-Run 'nax precheck' for detailed information`));
-    console.error(source_default.dim(`Use --skip-precheck to bypass (not recommended)
-`));
+    process.stderr.write(`${source_default.red("\u2500".repeat(60))}
+`);
+    process.stderr.write(`${source_default.yellow(`
+Run 'nax precheck' for detailed information`)}
+`);
+    process.stderr.write(`${source_default.dim(`Use --skip-precheck to bypass (not recommended)
+`)}
+`);
     throw new Error(`Precheck failed: ${precheckResult.output.blockers.map((b) => b.name).join(", ")}`);
   }
   if (precheckResult.output.warnings.length > 0) {
@@ -65821,12 +65972,15 @@ Run 'nax precheck' for detailed information`));
       issues: precheckResult.output.warnings.map((w) => w.name)
     });
     if (ctx.headless && ctx.formatterMode !== "json") {
-      console.log(source_default.yellow(`
-\u26A0\uFE0F  Precheck warnings:`));
+      process.stdout.write(`${source_default.yellow(`
+\u26A0\uFE0F  Precheck warnings:`)}
+`);
       for (const warning of precheckResult.output.warnings) {
-        console.log(source_default.yellow(`  \u26A0 ${warning.name}: ${warning.message}`));
+        process.stdout.write(`${source_default.yellow(`  \u26A0 ${warning.name}: ${warning.message}`)}
+`);
       }
-      console.log("");
+      process.stdout.write(`
+`);
     }
   } else {
     logger?.info("precheck", "All precheck validations passed");

package/package.json

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