@nathapp/nax 0.46.1 → 0.46.2

package/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.46.2] - 2026-03-17
+
+### Fixed
+- **Review rectification:** When lint or typecheck fails in the review stage and mechanical autofix (`lintFix`, `formatFix`) cannot resolve it, nax now spawns an agent rectification session with the exact error output as context. The agent fixes the issues, commits, and re-runs review to verify. Reuses `quality.autofix.maxAttempts` (default: 2) for agent attempts.
+
+### Tests
+- 12 new tests in `test/unit/pipeline/stages/autofix.test.ts` covering agent rectification paths.
+
 ## [0.46.1] - 2026-03-17
 
 ### Fixed

package/dist/nax.js

@@ -22178,7 +22178,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.46.1",
+    version: "0.46.2",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -22251,8 +22251,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("405c88a"))
-        return "405c88a";
+      if (/^[0-9a-f]{6,10}$/.test("506ad27"))
+        return "506ad27";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -24086,6 +24086,99 @@ ${stderr}` };
   };
 });
 
+// src/agents/shared/validation.ts
+function validateAgentForTier(agent, tier) {
+  return agent.capabilities.supportedTiers.includes(tier);
+}
+function validateAgentFeature(agent, feature) {
+  return agent.capabilities.features.has(feature);
+}
+function describeAgentCapabilities(agent) {
+  const tiers = agent.capabilities.supportedTiers.join(",");
+  const features = Array.from(agent.capabilities.features).join(",");
+  const maxTokens = agent.capabilities.maxContextTokens;
+  return `${agent.name}: tiers=[${tiers}], maxTokens=${maxTokens}, features=[${features}]`;
+}
+
+// src/agents/shared/version-detection.ts
+async function getAgentVersion(binaryName) {
+  try {
+    const proc = _versionDetectionDeps.spawn([binaryName, "--version"], {
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    const exitCode = await proc.exited;
+    if (exitCode !== 0) {
+      return null;
+    }
+    const stdout = await new Response(proc.stdout).text();
+    const versionLine = stdout.trim().split(`
+`)[0];
+    const versionMatch = versionLine.match(/v?(\d+\.\d+(?:\.\d+)?(?:[-+][\w.]+)?)/);
+    if (versionMatch) {
+      return versionMatch[0];
+    }
+    return versionLine || null;
+  } catch {
+    return null;
+  }
+}
+async function getAgentVersions() {
+  const agents = await getInstalledAgents();
+  const agentsByName = new Map(agents.map((a) => [a.name, a]));
+  const { ALL_AGENTS: ALL_AGENTS2 } = await Promise.resolve().then(() => (init_registry(), exports_registry));
+  const versions2 = await Promise.all(ALL_AGENTS2.map(async (agent) => {
+    const version2 = agentsByName.has(agent.name) ? await getAgentVersion(agent.binary) : null;
+    return {
+      name: agent.name,
+      displayName: agent.displayName,
+      version: version2,
+      installed: agentsByName.has(agent.name)
+    };
+  }));
+  return versions2;
+}
+var _versionDetectionDeps;
+var init_version_detection = __esm(() => {
+  init_registry();
+  _versionDetectionDeps = {
+    spawn(cmd, opts) {
+      return Bun.spawn(cmd, opts);
+    }
+  };
+});
+
+// src/agents/index.ts
+var exports_agents = {};
+__export(exports_agents, {
+  validateAgentForTier: () => validateAgentForTier,
+  validateAgentFeature: () => validateAgentFeature,
+  parseTokenUsage: () => parseTokenUsage,
+  getInstalledAgents: () => getInstalledAgents,
+  getAllAgentNames: () => getAllAgentNames,
+  getAgentVersions: () => getAgentVersions,
+  getAgentVersion: () => getAgentVersion,
+  getAgent: () => getAgent,
+  formatCostWithConfidence: () => formatCostWithConfidence,
+  estimateCostFromTokenUsage: () => estimateCostFromTokenUsage,
+  estimateCostFromOutput: () => estimateCostFromOutput,
+  estimateCostByDuration: () => estimateCostByDuration,
+  estimateCost: () => estimateCost,
+  describeAgentCapabilities: () => describeAgentCapabilities,
+  checkAgentHealth: () => checkAgentHealth,
+  MODEL_PRICING: () => MODEL_PRICING,
+  CompleteError: () => CompleteError,
+  ClaudeCodeAdapter: () => ClaudeCodeAdapter,
+  COST_RATES: () => COST_RATES
+});
+var init_agents = __esm(() => {
+  init_types2();
+  init_claude();
+  init_registry();
+  init_cost();
+  init_version_detection();
+});
+
 // src/pipeline/event-bus.ts
 class PipelineEventBus {
   subscribers = new Map;
@@ -24496,8 +24589,87 @@ async function recheckReview(ctx) {
   const result = await reviewStage2.execute(ctx);
   return result.action === "continue";
 }
+function collectFailedChecks(ctx) {
+  return (ctx.reviewResult?.checks ?? []).filter((c) => !c.success);
+}
+function buildReviewRectificationPrompt(failedChecks, story) {
+  const errors3 = failedChecks.map((c) => `## ${c.check} errors (exit code ${c.exitCode})
+\`\`\`
+${c.output}
+\`\`\``).join(`
+
+`);
+  return `You are fixing lint/typecheck errors from a code review.
+
+Story: ${story.title} (${story.id})
+
+The following quality checks failed after implementation:
+
+${errors3}
+
+Fix ALL errors listed above. Do NOT change test files or test behavior.
+Do NOT add new features \u2014 only fix the quality check errors.
+Commit your fixes when done.`;
+}
+async function runAgentRectification(ctx) {
+  const logger = getLogger();
+  const maxAttempts = ctx.config.quality.autofix?.maxAttempts ?? 2;
+  const failedChecks = collectFailedChecks(ctx);
+  if (failedChecks.length === 0) {
+    logger.debug("autofix", "No failed checks found \u2014 skipping agent rectification", { storyId: ctx.story.id });
+    return false;
+  }
+  logger.info("autofix", "Starting agent rectification for review failures", {
+    storyId: ctx.story.id,
+    failedChecks: failedChecks.map((c) => c.check),
+    maxAttempts
+  });
+  const agentGetFn = ctx.agentGetFn ?? getAgent;
+  for (let attempt = 1;attempt <= maxAttempts; attempt++) {
+    logger.info("autofix", `Agent rectification attempt ${attempt}/${maxAttempts}`, { storyId: ctx.story.id });
+    const agent = agentGetFn(ctx.config.autoMode.defaultAgent);
+    if (!agent) {
+      logger.error("autofix", "Agent not found \u2014 cannot run agent rectification", { storyId: ctx.story.id });
+      return false;
+    }
+    const prompt = buildReviewRectificationPrompt(failedChecks, ctx.story);
+    const modelTier = ctx.story.routing?.modelTier ?? ctx.config.autoMode.escalation.tierOrder[0]?.tier ?? "balanced";
+    const modelDef = resolveModel(ctx.config.models[modelTier]);
+    await agent.run({
+      prompt,
+      workdir: ctx.workdir,
+      modelTier,
+      modelDef,
+      timeoutSeconds: ctx.config.execution.sessionTimeoutSeconds,
+      dangerouslySkipPermissions: resolvePermissions(ctx.config, "rectification").skipPermissions,
+      pipelineStage: "rectification",
+      config: ctx.config,
+      maxInteractionTurns: ctx.config.agent?.maxInteractionTurns,
+      storyId: ctx.story.id,
+      sessionRole: "implementer"
+    });
+    const passed = await _autofixDeps.recheckReview(ctx);
+    if (passed) {
+      logger.info("autofix", `[OK] Agent rectification succeeded on attempt ${attempt}`, {
+        storyId: ctx.story.id
+      });
+      return true;
+    }
+    const updatedFailed = collectFailedChecks(ctx);
+    if (updatedFailed.length > 0) {
+      failedChecks.splice(0, failedChecks.length, ...updatedFailed);
+    }
+    logger.warn("autofix", `Agent rectification still failing after attempt ${attempt}`, {
+      storyId: ctx.story.id
+    });
+  }
+  logger.warn("autofix", "Agent rectification exhausted", { storyId: ctx.story.id });
+  return false;
+}
 var autofixStage, _autofixDeps;
 var init_autofix = __esm(() => {
+  init_agents();
+  init_config();
   init_logger2();
   init_event_bus();
   autofixStage = {
@@ -24523,14 +24695,7 @@ var init_autofix = __esm(() => {
       }
       const lintFixCmd = ctx.config.quality.commands.lintFix;
       const formatFixCmd = ctx.config.quality.commands.formatFix;
-      if (!lintFixCmd && !formatFixCmd) {
-        logger.debug("autofix", "No fix commands configured \u2014 skipping autofix", { storyId: ctx.story.id });
-        return { action: "escalate", reason: "Review failed and no autofix commands configured" };
-      }
-      const maxAttempts = ctx.config.quality.autofix?.maxAttempts ?? 2;
-      let fixed = false;
-      for (let attempt = 1;attempt <= maxAttempts; attempt++) {
-        logger.info("autofix", `Autofix attempt ${attempt}/${maxAttempts}`, { storyId: ctx.story.id });
+      if (lintFixCmd || formatFixCmd) {
         if (lintFixCmd) {
           pipelineEventBus.emit({ type: "autofix:started", storyId: ctx.story.id, command: lintFixCmd });
           const lintResult = await _autofixDeps.runCommand(lintFixCmd, ctx.workdir);
@@ -24556,22 +24721,24 @@ var init_autofix = __esm(() => {
         const recheckPassed = await _autofixDeps.recheckReview(ctx);
         pipelineEventBus.emit({ type: "autofix:completed", storyId: ctx.story.id, fixed: recheckPassed });
         if (recheckPassed) {
-          if (ctx.reviewResult) {
+          if (ctx.reviewResult)
             ctx.reviewResult = { ...ctx.reviewResult, success: true };
-          }
-          fixed = true;
-          break;
+          logger.info("autofix", "Mechanical autofix succeeded \u2014 retrying review", { storyId: ctx.story.id });
+          return { action: "retry", fromStage: "review" };
         }
       }
-      if (fixed) {
-        logger.info("autofix", "Autofix succeeded \u2014 retrying review", { storyId: ctx.story.id });
+      const agentFixed = await _autofixDeps.runAgentRectification(ctx);
+      if (agentFixed) {
+        if (ctx.reviewResult)
+          ctx.reviewResult = { ...ctx.reviewResult, success: true };
+        logger.info("autofix", "Agent rectification succeeded \u2014 retrying review", { storyId: ctx.story.id });
         return { action: "retry", fromStage: "review" };
       }
       logger.warn("autofix", "Autofix exhausted \u2014 escalating", { storyId: ctx.story.id });
       return { action: "escalate", reason: "Autofix exhausted: review still failing after fix attempts" };
     }
   };
-  _autofixDeps = { runCommand, recheckReview };
+  _autofixDeps = { runCommand, recheckReview, runAgentRectification };
 });
 
 // src/execution/progress.ts
@@ -25719,99 +25886,6 @@ ${pluginMarkdown}` : pluginMarkdown;
   };
 });
 
-// src/agents/shared/validation.ts
-function validateAgentForTier(agent, tier) {
-  return agent.capabilities.supportedTiers.includes(tier);
-}
-function validateAgentFeature(agent, feature) {
-  return agent.capabilities.features.has(feature);
-}
-function describeAgentCapabilities(agent) {
-  const tiers = agent.capabilities.supportedTiers.join(",");
-  const features = Array.from(agent.capabilities.features).join(",");
-  const maxTokens = agent.capabilities.maxContextTokens;
-  return `${agent.name}: tiers=[${tiers}], maxTokens=${maxTokens}, features=[${features}]`;
-}
-
-// src/agents/shared/version-detection.ts
-async function getAgentVersion(binaryName) {
-  try {
-    const proc = _versionDetectionDeps.spawn([binaryName, "--version"], {
-      stdout: "pipe",
-      stderr: "pipe"
-    });
-    const exitCode = await proc.exited;
-    if (exitCode !== 0) {
-      return null;
-    }
-    const stdout = await new Response(proc.stdout).text();
-    const versionLine = stdout.trim().split(`
-`)[0];
-    const versionMatch = versionLine.match(/v?(\d+\.\d+(?:\.\d+)?(?:[-+][\w.]+)?)/);
-    if (versionMatch) {
-      return versionMatch[0];
-    }
-    return versionLine || null;
-  } catch {
-    return null;
-  }
-}
-async function getAgentVersions() {
-  const agents = await getInstalledAgents();
-  const agentsByName = new Map(agents.map((a) => [a.name, a]));
-  const { ALL_AGENTS: ALL_AGENTS2 } = await Promise.resolve().then(() => (init_registry(), exports_registry));
-  const versions2 = await Promise.all(ALL_AGENTS2.map(async (agent) => {
-    const version2 = agentsByName.has(agent.name) ? await getAgentVersion(agent.binary) : null;
-    return {
-      name: agent.name,
-      displayName: agent.displayName,
-      version: version2,
-      installed: agentsByName.has(agent.name)
-    };
-  }));
-  return versions2;
-}
-var _versionDetectionDeps;
-var init_version_detection = __esm(() => {
-  init_registry();
-  _versionDetectionDeps = {
-    spawn(cmd, opts) {
-      return Bun.spawn(cmd, opts);
-    }
-  };
-});
-
-// src/agents/index.ts
-var exports_agents = {};
-__export(exports_agents, {
-  validateAgentForTier: () => validateAgentForTier,
-  validateAgentFeature: () => validateAgentFeature,
-  parseTokenUsage: () => parseTokenUsage,
-  getInstalledAgents: () => getInstalledAgents,
-  getAllAgentNames: () => getAllAgentNames,
-  getAgentVersions: () => getAgentVersions,
-  getAgentVersion: () => getAgentVersion,
-  getAgent: () => getAgent,
-  formatCostWithConfidence: () => formatCostWithConfidence,
-  estimateCostFromTokenUsage: () => estimateCostFromTokenUsage,
-  estimateCostFromOutput: () => estimateCostFromOutput,
-  estimateCostByDuration: () => estimateCostByDuration,
-  estimateCost: () => estimateCost,
-  describeAgentCapabilities: () => describeAgentCapabilities,
-  checkAgentHealth: () => checkAgentHealth,
-  MODEL_PRICING: () => MODEL_PRICING,
-  CompleteError: () => CompleteError,
-  ClaudeCodeAdapter: () => ClaudeCodeAdapter,
-  COST_RATES: () => COST_RATES
-});
-var init_agents = __esm(() => {
-  init_types2();
-  init_claude();
-  init_registry();
-  init_cost();
-  init_version_detection();
-});
-
 // src/tdd/isolation.ts
 function isTestFile(filePath) {
   return TEST_PATTERNS.some((pattern) => pattern.test(filePath));

package/package.json

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

package/src/pipeline/stages/autofix.ts

@@ -3,7 +3,11 @@
  * Autofix Stage (ADR-005, Phase 2)
  *
  * Runs after a failed review stage. Attempts to fix quality issues
- * automatically (lint, format) before escalating.
+ * automatically before escalating:
+ *
+ * Phase 1 — Mechanical fix: runs lintFix / formatFix commands (if configured)
+ * Phase 2 — Agent rectification: spawns an agent session with the review error
+ *            output as context (reuses the pattern from rectification-loop.ts)
  *
  * Language-agnostic: uses quality.commands.lintFix / formatFix from config.
  * No hardcoded tool names.
@@ -12,10 +16,15 @@
  *
  * Returns:
  * - `retry` fromStage:"review" — autofix resolved the failures
- * - `escalate`                 — max attempts exhausted or no fix commands
+ * - `escalate`                 — max attempts exhausted or agent unavailable
  */
 
+import { getAgent } from "../../agents";
+import { resolveModel } from "../../config";
+import { resolvePermissions } from "../../config/permissions";
 import { getLogger } from "../../logger";
+import type { UserStory } from "../../prd";
+import type { ReviewCheckResult } from "../../review/types";
 import { pipelineEventBus } from "../event-bus";
 import type { PipelineContext, PipelineStage, StageResult } from "../types";
 
@@ -45,18 +54,8 @@ export const autofixStage: PipelineStage = {
     const lintFixCmd = ctx.config.quality.commands.lintFix;
     const formatFixCmd = ctx.config.quality.commands.formatFix;
 
-    if (!lintFixCmd && !formatFixCmd) {
-      logger.debug("autofix", "No fix commands configured — skipping autofix", { storyId: ctx.story.id });
-      return { action: "escalate", reason: "Review failed and no autofix commands configured" };
-    }
-
-    const maxAttempts = ctx.config.quality.autofix?.maxAttempts ?? 2;
-    let fixed = false;
-
-    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-      logger.info("autofix", `Autofix attempt ${attempt}/${maxAttempts}`, { storyId: ctx.story.id });
-
-      // Step 1: lint fix
+    // Phase 1: Mechanical fix (if commands are configured)
+    if (lintFixCmd || formatFixCmd) {
       if (lintFixCmd) {
         pipelineEventBus.emit({ type: "autofix:started", storyId: ctx.story.id, command: lintFixCmd });
         const lintResult = await _autofixDeps.runCommand(lintFixCmd, ctx.workdir);
@@ -69,7 +68,6 @@ export const autofixStage: PipelineStage = {
         }
       }
 
-      // Step 2: format fix
       if (formatFixCmd) {
         pipelineEventBus.emit({ type: "autofix:started", storyId: ctx.story.id, command: formatFixCmd });
         const fmtResult = await _autofixDeps.runCommand(formatFixCmd, ctx.workdir);
@@ -82,22 +80,21 @@ export const autofixStage: PipelineStage = {
         }
       }
 
-      // Re-run review to check if fixed
       const recheckPassed = await _autofixDeps.recheckReview(ctx);
       pipelineEventBus.emit({ type: "autofix:completed", storyId: ctx.story.id, fixed: recheckPassed });
 
       if (recheckPassed) {
-        // Update ctx.reviewResult so downstream stages see the corrected state
-        if (ctx.reviewResult) {
-          ctx.reviewResult = { ...ctx.reviewResult, success: true };
-        }
-        fixed = true;
-        break;
+        if (ctx.reviewResult) ctx.reviewResult = { ...ctx.reviewResult, success: true };
+        logger.info("autofix", "Mechanical autofix succeeded — retrying review", { storyId: ctx.story.id });
+        return { action: "retry", fromStage: "review" };
       }
     }
 
-    if (fixed) {
-      logger.info("autofix", "Autofix succeeded — retrying review", { storyId: ctx.story.id });
+    // Phase 2: Agent rectification — spawn agent with review error context
+    const agentFixed = await _autofixDeps.runAgentRectification(ctx);
+    if (agentFixed) {
+      if (ctx.reviewResult) ctx.reviewResult = { ...ctx.reviewResult, success: true };
+      logger.info("autofix", "Agent rectification succeeded — retrying review", { storyId: ctx.story.id });
       return { action: "retry", fromStage: "review" };
     }
 
@@ -134,7 +131,97 @@ async function recheckReview(ctx: PipelineContext): Promise<boolean> {
   return result.action === "continue";
 }
 
+function collectFailedChecks(ctx: PipelineContext): ReviewCheckResult[] {
+  return (ctx.reviewResult?.checks ?? []).filter((c) => !c.success);
+}
+
+export function buildReviewRectificationPrompt(failedChecks: ReviewCheckResult[], story: UserStory): string {
+  const errors = failedChecks
+    .map((c) => `## ${c.check} errors (exit code ${c.exitCode})\n\`\`\`\n${c.output}\n\`\`\``)
+    .join("\n\n");
+
+  return `You are fixing lint/typecheck errors from a code review.
+
+Story: ${story.title} (${story.id})
+
+The following quality checks failed after implementation:
+
+${errors}
+
+Fix ALL errors listed above. Do NOT change test files or test behavior.
+Do NOT add new features — only fix the quality check errors.
+Commit your fixes when done.`;
+}
+
+async function runAgentRectification(ctx: PipelineContext): Promise<boolean> {
+  const logger = getLogger();
+  const maxAttempts = ctx.config.quality.autofix?.maxAttempts ?? 2;
+  const failedChecks = collectFailedChecks(ctx);
+
+  if (failedChecks.length === 0) {
+    logger.debug("autofix", "No failed checks found — skipping agent rectification", { storyId: ctx.story.id });
+    return false;
+  }
+
+  logger.info("autofix", "Starting agent rectification for review failures", {
+    storyId: ctx.story.id,
+    failedChecks: failedChecks.map((c) => c.check),
+    maxAttempts,
+  });
+
+  const agentGetFn = ctx.agentGetFn ?? getAgent;
+
+  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    logger.info("autofix", `Agent rectification attempt ${attempt}/${maxAttempts}`, { storyId: ctx.story.id });
+
+    const agent = agentGetFn(ctx.config.autoMode.defaultAgent);
+    if (!agent) {
+      logger.error("autofix", "Agent not found — cannot run agent rectification", { storyId: ctx.story.id });
+      return false;
+    }
+
+    const prompt = buildReviewRectificationPrompt(failedChecks, ctx.story);
+    const modelTier = ctx.story.routing?.modelTier ?? ctx.config.autoMode.escalation.tierOrder[0]?.tier ?? "balanced";
+    const modelDef = resolveModel(ctx.config.models[modelTier]);
+
+    await agent.run({
+      prompt,
+      workdir: ctx.workdir,
+      modelTier,
+      modelDef,
+      timeoutSeconds: ctx.config.execution.sessionTimeoutSeconds,
+      dangerouslySkipPermissions: resolvePermissions(ctx.config, "rectification").skipPermissions,
+      pipelineStage: "rectification",
+      config: ctx.config,
+      maxInteractionTurns: ctx.config.agent?.maxInteractionTurns,
+      storyId: ctx.story.id,
+      sessionRole: "implementer",
+    });
+
+    const passed = await _autofixDeps.recheckReview(ctx);
+    if (passed) {
+      logger.info("autofix", `[OK] Agent rectification succeeded on attempt ${attempt}`, {
+        storyId: ctx.story.id,
+      });
+      return true;
+    }
+
+    // Refresh failed checks for next attempt
+    const updatedFailed = collectFailedChecks(ctx);
+    if (updatedFailed.length > 0) {
+      failedChecks.splice(0, failedChecks.length, ...updatedFailed);
+    }
+
+    logger.warn("autofix", `Agent rectification still failing after attempt ${attempt}`, {
+      storyId: ctx.story.id,
+    });
+  }
+
+  logger.warn("autofix", "Agent rectification exhausted", { storyId: ctx.story.id });
+  return false;
+}
+
 /**
  * Injectable deps for testing.
  */
-export const _autofixDeps = { runCommand, recheckReview };
+export const _autofixDeps = { runCommand, recheckReview, runAgentRectification };