@nathapp/nax 0.65.1 → 0.65.2

package/dist/nax.js

@@ -19957,7 +19957,9 @@ var init_schemas_execution = __esm(() => {
       test: exports_external.string().optional(),
       testScoped: exports_external.string().optional(),
       lintFix: exports_external.string().optional(),
+      lintFixScoped: exports_external.string().optional(),
       formatFix: exports_external.string().optional(),
+      formatFixScoped: exports_external.string().optional(),
       build: exports_external.string().optional()
     }).default({}),
     lintOutput: exports_external.object({
@@ -20045,7 +20047,7 @@ var init_schemas_execution = __esm(() => {
 });
 
 // src/config/schemas-infra.ts
-var PlanConfigSchema, AcceptanceFixConfigSchema, AcceptanceConfigSchema, LlmRoutingConfigSchema, RoutingConfigSchema, OptimizerConfigSchema, PluginConfigEntrySchema, HooksConfigSchema, InteractionConfigSchema, StorySizeGateConfigSchema, PromptAuditConfigSchema, AgentFallbackConfigSchema, AgentIdleWatchdogConfigSchema, AgentAcpConfigSchema, AgentConfigSchema, PrecheckConfigSchema, PromptsConfigSchema, ProjectProfileSchema, VALID_AGENT_TYPES, GenerateConfigSchema, CuratorThresholdsSchema, CuratorConfigSchema;
+var PlanConfigSchema, AcceptanceFixConfigSchema, AcceptanceConfigSchema, LlmRoutingConfigSchema, RoutingConfigSchema, OptimizerConfigSchema, PluginConfigEntrySchema, HooksConfigSchema, InteractionConfigSchema, StorySizeGateConfigSchema, PromptAuditConfigSchema, AgentFallbackConfigSchema, DEFAULT_AGENT_IDLE_WATCHDOG_CONFIG, AgentIdleWatchdogConfigSchema, AgentAcpConfigSchema, AgentConfigSchema, PrecheckConfigSchema, PromptsConfigSchema, ProjectProfileSchema, VALID_AGENT_TYPES, GenerateConfigSchema, CuratorThresholdsSchema, CuratorConfigSchema;
 var init_schemas_infra = __esm(() => {
   init_zod();
   init_schemas_model();
@@ -20147,6 +20149,14 @@ var init_schemas_infra = __esm(() => {
     onQualityFailure: exports_external.boolean().default(false),
     rebuildContext: exports_external.boolean().default(true)
   });
+  DEFAULT_AGENT_IDLE_WATCHDOG_CONFIG = {
+    enabled: true,
+    mode: "warn-then-cancel",
+    idleTimeoutSeconds: 900,
+    activityKinds: ["message_update", "thinking_update", "usage_update"],
+    cancelGraceSeconds: 10,
+    maxRetryAttempts: 3
+  };
   AgentIdleWatchdogConfigSchema = exports_external.object({
     enabled: exports_external.boolean().default(true),
     mode: exports_external.enum(["off", "observe", "warn-then-cancel", "cancel"]).default("warn-then-cancel"),
@@ -20173,7 +20183,7 @@ var init_schemas_infra = __esm(() => {
       rebuildContext: true
     }),
     acp: AgentAcpConfigSchema.default({ promptRetries: 0 }),
-    idleWatchdog: AgentIdleWatchdogConfigSchema.optional()
+    idleWatchdog: AgentIdleWatchdogConfigSchema.default(DEFAULT_AGENT_IDLE_WATCHDOG_CONFIG)
   });
   PrecheckConfigSchema = exports_external.object({
     storySizeGate: StorySizeGateConfigSchema
@@ -20255,7 +20265,9 @@ var init_schemas_review = __esm(() => {
       test: exports_external.string().optional(),
       build: exports_external.string().optional(),
       lintFix: exports_external.string().optional(),
-      formatFix: exports_external.string().optional()
+      lintFixScoped: exports_external.string().optional(),
+      formatFix: exports_external.string().optional(),
+      formatFixScoped: exports_external.string().optional()
     }),
     pluginMode: exports_external.enum(["per-story", "deferred"]).default("per-story"),
     audit: exports_external.object({ enabled: exports_external.boolean().default(false) }).default({ enabled: false }),
@@ -20546,7 +20558,8 @@ var init_schemas3 = __esm(() => {
       maxInteractionTurns: 20,
       promptAudit: { enabled: false },
       fallback: { enabled: false, map: {}, maxHopsPerStory: 2, onQualityFailure: false, rebuildContext: true },
-      acp: { promptRetries: 0 }
+      acp: { promptRetries: 0 },
+      idleWatchdog: DEFAULT_AGENT_IDLE_WATCHDOG_CONFIG
     }),
     precheck: PrecheckConfigSchema.optional().default({
       storySizeGate: {
@@ -20716,6 +20729,15 @@ function mergePackageConfig(root, packageOverride) {
         ...packageOverride.quality?.commands?.lintFix !== undefined && {
           lintFix: packageOverride.quality.commands.lintFix
         },
+        ...packageOverride.quality?.commands?.lintFixScoped !== undefined && {
+          lintFixScoped: packageOverride.quality.commands.lintFixScoped
+        },
+        ...packageOverride.quality?.commands?.formatFix !== undefined && {
+          formatFix: packageOverride.quality.commands.formatFix
+        },
+        ...packageOverride.quality?.commands?.formatFixScoped !== undefined && {
+          formatFixScoped: packageOverride.quality.commands.formatFixScoped
+        },
         ...packageOverride.quality?.commands?.typecheck !== undefined && {
           typecheck: packageOverride.quality.commands.typecheck
         },
@@ -29412,10 +29434,14 @@ For each acceptance criterion, verify the current codebase implements it correct
 - The \`verifiedBy.observed\` field MUST be a **verbatim** 1-3 line code excerpt copy-pasted from the file \u2014 not a description. Paste the actual source lines (or a substring of them) that prove your claim. A description like "function X does not check Y" is not a verifiable observation; quote the lines that demonstrate the omission instead. If you cannot quote an exact excerpt that proves your point, downgrade the finding to "unverifiable".
 
 **AC-grounding rule \u2014 required for every "error" finding:**
-- Every "error" finding MUST include \`acQuote\`: a verbatim substring of one AC bullet that names or constrains the exact file, function, or symbol you are flagging.
+- Every "error" finding MUST include \`acQuote\`: a verbatim substring of one AC bullet that names or constrains the exact **symbol** you are flagging \u2014 not merely the file the symbol lives in.
 - Include \`acIndex\` (1-based) indicating which AC bullet you are quoting.
-- If no AC bullet mentions the file, function, or symbol being flagged, the finding is out-of-scope. Emit it as \`severity: "info"\` instead \u2014 it cannot block the story.
-- Copy \`acQuote\` directly from the Acceptance Criteria text \u2014 do not paraphrase.
+- Copy \`acQuote\` directly from the Acceptance Criteria \u2014 including any backticks, asterisks, or punctuation. Do not paraphrase, strip formatting, or rewrite.
+
+**The "AC names the file but not the symbol" trap (most common failure mode):**
+If the AC bullet mentions a file or component but the **specific symbol you are flagging** (the function, class, interface, type, or convention) is not named in that bullet, the AC does **not** constrain your finding. Emit it as \`severity: "info"\` \u2014 not \`"error"\`. **Convention / coding-standard violations almost always belong as \`"info"\`** unless an AC specifically names the convention or the symbol it concerns.
+
+If you cannot find an AC that names the **specific symbol** in your finding, downgrade to \`"info"\`. A finding dropped by the validator as ungrounded is worse than one correctly classified as advisory.
 
 Flag issues only when you have confirmed:
 1. An AC is not implemented or partially implemented (verified by reading the actual files)
@@ -29663,10 +29689,22 @@ Severity guide:
 \`passed\` may be \`true\` with findings if all findings are \`"info"\` or \`"unverifiable"\`.
 
 **AC-grounding rule \u2014 required for every "error" finding:**
-- \`acQuote\` must be a verbatim substring of one AC bullet (from the Acceptance Criteria above) that names or constrains the exact file, function, or symbol you are flagging.
+- \`acQuote\` must be a verbatim substring of one AC bullet (from the Acceptance Criteria above) that names or constrains the exact **symbol** you are flagging \u2014 not merely the file the symbol lives in.
 - \`acIndex\` is the 1-based position of that AC bullet in the list.
-- If no AC bullet mentions the file, function, or symbol being flagged, emit the finding as \`"info"\` instead \u2014 it cannot block the story.
-- Do not paraphrase the AC text \u2014 copy it exactly.`;
+- Copy \`acQuote\` **exactly** from the AC text, including any backticks, asterisks, or punctuation. Do not paraphrase, strip formatting, or rewrite.
+
+**The "AC names the file but not the symbol" trap (most common failure mode):**
+If the AC bullet mentions a file or component but the **specific symbol you are flagging** (the function, class, interface, type, or convention) is not named in that bullet, the AC does **not** constrain your finding. Emit it as \`"info"\` \u2014 not \`"error"\`.
+
+Worked example:
+- AC#1 reads: \`\`\`\`AstIndexService.indexCommit() is called by the code_commit outbox handler\`\`\`\`
+- You found that \`code-commit-outbox-handler.ts\` defines a custom \`ExtendedPrismaClient\` interface, violating a project convention rule.
+- WRONG: severity \`"error"\`, \`acQuote: "AstIndexService.indexCommit() is called by the code_commit outbox handler"\`, \`acIndex: 1\`. \u2014 AC#1 is about *who calls indexCommit*; it says nothing about Prisma typing. Picking it because the file is named is mis-grounding.
+- RIGHT: severity \`"info"\`, no \`acQuote\`. The convention violation is real, but no AC constrains \`ExtendedPrismaClient\`, so it cannot block the story.
+
+**Convention / coding-standard violations almost always belong as \`"info"\`** unless an AC specifically names the convention or the symbol it concerns.
+
+If you cannot find an AC that names the **specific symbol** in your finding, downgrade to \`"info"\`. A finding dropped by the validator is worse than one correctly classified as advisory.`;
 var init_adversarial_review_builder = () => {};
 
 // src/prompts/builders/acceptance-builder-helpers.ts
@@ -33670,12 +33708,79 @@ var init_rectify = __esm(() => {
   init_prompts();
 });
 
+// src/operations/test-edit-declaration.ts
+function readBlockField(block, key) {
+  const re = new RegExp(`^${key}:\\s*(.+)$`, "m");
+  const m = block.match(re);
+  if (!m?.[1])
+    return null;
+  return m[1].trim();
+}
+function unwrapQuotes(s) {
+  if (s.length >= 2 && s.startsWith('"') && s.endsWith('"'))
+    return s.slice(1, -1);
+  return s;
+}
+function parseTestEditDeclarations(output) {
+  const result = [];
+  const blocks = output.split(/\n\s*\n/);
+  for (const block of blocks) {
+    const reasonMatch = block.match(REASON_RE);
+    if (!reasonMatch?.[1])
+      continue;
+    const reason = reasonMatch[1];
+    if (reason === "prd_contract") {
+      const file3 = readBlockField(block, "FILE");
+      const prdQuote = readBlockField(block, "PRD_QUOTE");
+      const testBefore = readBlockField(block, "TEST_BEFORE");
+      const testAfter = readBlockField(block, "TEST_AFTER");
+      if (!file3 || !prdQuote || !testBefore || !testAfter)
+        continue;
+      result.push({
+        reason,
+        file: file3,
+        prdQuote: unwrapQuotes(prdQuote),
+        testBefore,
+        testAfter
+      });
+    } else if (reason === "lint_only") {
+      const file3 = readBlockField(block, "FILE");
+      const finding = readBlockField(block, "FINDING");
+      if (!file3 || !finding)
+        continue;
+      result.push({ reason, file: file3, finding });
+    } else if (reason === "sibling_scope") {
+      const file3 = readBlockField(block, "SIBLING_FILE");
+      const finding = readBlockField(block, "FINDING");
+      if (!file3 || !finding)
+        continue;
+      result.push({ reason, file: file3, finding });
+    }
+  }
+  return result;
+}
+function normaliseWs(s) {
+  return s.replace(/\s+/g, " ").replace(/\s*([(),<>])\s*/g, "$1").replace(/\s*:\s*/g, ": ").trim();
+}
+function validatePrdQuote(prdQuote, story) {
+  if (!prdQuote.trim())
+    return false;
+  const needle = normaliseWs(prdQuote);
+  const haystack = normaliseWs([story.description, ...story.acceptanceCriteria].join(" "));
+  return haystack.includes(needle);
+}
+var REASON_RE;
+var init_test_edit_declaration = __esm(() => {
+  REASON_RE = /^TEST_EDIT_REASON:\s*(prd_contract|lint_only|sibling_scope)\s*$/m;
+});
+
 // src/operations/autofix-implementer.ts
 var implementerRectifyOp;
 var init_autofix_implementer = __esm(() => {
   init_config();
   init_logger2();
   init_prompts();
+  init_test_edit_declaration();
   implementerRectifyOp = {
     kind: "run",
     name: "autofix-implementer",
@@ -33690,15 +33795,20 @@ var init_autofix_implementer = __esm(() => {
       };
     },
     parse(output, input, _ctx) {
-      const match = output.match(/^UNRESOLVED:\s*(.+)$/ms);
-      const editReasonMatch = output.match(/TEST_EDIT_REASON:\s*(\w+)/);
-      if (editReasonMatch) {
+      const unresolvedMatch = output.match(/^UNRESOLVED:\s*(.+)$/m);
+      const declarations = parseTestEditDeclarations(output);
+      for (const d of declarations) {
         getSafeLogger()?.info("autofix", "test_edit_declared", {
           storyId: input.story.id,
-          reason: editReasonMatch[1]
+          reason: d.reason,
+          file: d.file
         });
       }
-      return { applied: true, ...match ? { unresolvedReason: match[1]?.trim() } : {} };
+      return {
+        applied: true,
+        testEditDeclarations: declarations,
+        ...unresolvedMatch ? { unresolvedReason: unresolvedMatch[1]?.trim() } : {}
+      };
     }
   };
 });
@@ -35142,6 +35252,7 @@ var init_operations = __esm(() => {
   init_adversarial_review();
   init_rectify();
   init_autofix_implementer();
+  init_test_edit_declaration();
   init_autofix_test_writer();
   init_debate_propose();
   init_debate_rebut();
@@ -43417,7 +43528,7 @@ function collectAdversarialSourceChecks(ctx) {
 function buildAutofixStrategies(ctx, maxAttempts) {
   const implementer = {
     name: "autofix-implementer",
-    appliesTo: (f) => (f.fixTarget ?? "source") === "source",
+    appliesTo: (f) => (f.fixTarget ?? "source") === "source" && f.category !== "prd_quote_mismatch",
     fixOp: implementerRectifyOp,
     maxAttempts,
     coRun: "co-run-sequential",
@@ -43425,16 +43536,22 @@ function buildAutofixStrategies(ctx, maxAttempts) {
       failedChecks: collectFailedChecks(ctx),
       story: ctx.story
     }),
-    extractApplied: (output) => ({
-      summary: output.unresolvedReason ?? "",
-      unresolved: output.unresolvedReason
-    })
+    extractApplied: (output) => {
+      const decls = output.testEditDeclarations ?? [];
+      if (decls.length > 0) {
+        ctx.testEditDeclarations = [...ctx.testEditDeclarations ?? [], ...decls];
+      }
+      return {
+        summary: output.unresolvedReason ?? "",
+        unresolved: output.unresolvedReason
+      };
+    }
   };
   const testWriter = {
     name: "autofix-test-writer",
     appliesTo: (f) => f.fixTarget === "test" || (f.fixTarget ?? "source") === "source" && f.severity === "error" && f.source === "adversarial-review",
     fixOp: testWriterRectifyOp,
-    maxAttempts: 1,
+    maxAttempts: 2,
     coRun: "co-run-sequential",
     buildInput: (findings, _prior, _cycleCtx) => {
       const hasSourceBug = findings.some((f) => (f.fixTarget ?? "source") === "source" && f.source === "adversarial-review");
@@ -43455,6 +43572,25 @@ function buildAutofixStrategies(ctx, maxAttempts) {
   };
   return [testWriter, implementer];
 }
+function autofixCapacityExhausted(ctx) {
+  const findings = collectCurrentFindings(ctx);
+  if (findings.length === 0)
+    return false;
+  const maxAttempts = ctx.config.quality.autofix?.maxAttempts ?? 3;
+  const maxTotal = ctx.config.quality.autofix?.maxTotalAttempts ?? 12;
+  const prior = ctx.autofixPriorIterations ?? [];
+  const totalUsed = prior.reduce((sum, iter) => sum + iter.fixesApplied.length, 0);
+  if (totalUsed >= maxTotal)
+    return true;
+  const strategies = buildAutofixStrategies(ctx, maxAttempts);
+  const active = strategies.filter((s) => findings.some((f) => s.appliesTo(f)));
+  if (active.length === 0)
+    return true;
+  return active.some((s) => {
+    const used = prior.reduce((sum, iter) => sum + iter.fixesApplied.filter((fa) => fa.strategyName === s.name).length, 0);
+    return used >= s.maxAttempts;
+  });
+}
 function buildEscalationDigest(findings) {
   const byFile = new Map;
   for (const f of findings) {
@@ -43494,6 +43630,50 @@ async function writeShadowReport(ctx, result, initialFindingsCount) {
     });
   }
 }
+function applyTestEditDeclarations(findings, declarations, story) {
+  if (declarations.length === 0)
+    return findings;
+  const out = [...findings];
+  const originalLength = findings.length;
+  const reTaggedKeys = new Set;
+  for (const decl of declarations) {
+    if (decl.reason !== "prd_contract")
+      continue;
+    if (!validatePrdQuote(decl.prdQuote ?? "", story)) {
+      out.push({
+        source: "adversarial-review",
+        severity: "warning",
+        category: "prd_quote_mismatch",
+        message: `Implementer declared TEST_EDIT_REASON: prd_contract with PRD_QUOTE not found in story description or AC text: ${decl.prdQuote}`,
+        file: decl.file,
+        fixTarget: "source"
+      });
+      continue;
+    }
+    for (let i = 0;i < originalLength; i++) {
+      if (reTaggedKeys.has(i))
+        continue;
+      if (out[i].file !== decl.file)
+        continue;
+      if ((out[i].fixTarget ?? "source") === "test")
+        continue;
+      out[i] = {
+        ...out[i],
+        fixTarget: "test",
+        meta: {
+          ...out[i].meta ?? {},
+          prdContractDeclaration: {
+            prdQuote: decl.prdQuote,
+            testBefore: decl.testBefore,
+            testAfter: decl.testAfter
+          }
+        }
+      };
+      reTaggedKeys.add(i);
+    }
+  }
+  return out;
+}
 async function runAgentRectificationV2(ctx, _lintFixCmd, _formatFixCmd, _effectiveWorkdir) {
   const logger = getLogger();
   const storyId = ctx.story.id;
@@ -43517,7 +43697,18 @@ async function runAgentRectificationV2(ctx, _lintFixCmd, _formatFixCmd, _effecti
     },
     async validate(_cycleCtx) {
       await _autofixDeps.recheckReview(ctx);
-      return collectCurrentFindings(ctx);
+      const fresh = collectCurrentFindings(ctx);
+      const pending = ctx.testEditDeclarations ?? [];
+      if (pending.length === 0)
+        return fresh;
+      const retagged = applyTestEditDeclarations(fresh, pending, ctx.story);
+      ctx.testEditDeclarations = [];
+      logger.info("autofix-cycle", "applied test-edit declarations", {
+        storyId: ctx.story.id,
+        declarationCount: pending.length,
+        reTaggedCount: retagged.filter((f) => f.fixTarget === "test").length - fresh.filter((f) => f.fixTarget === "test").length
+      });
+      return retagged;
     }
   };
   const result = await runFixCycle(cycle, cycleCtx, "autofix-v2");
@@ -45170,6 +45361,42 @@ ${formatFindings2(blockingFindings)}`,
     };
   }
   if (!parsed.passed && blockingFindings.length === 0) {
+    if (acDropped.length > 0) {
+      const durationMs3 = Date.now() - startTime;
+      logger?.warn("review", "Adversarial review fail-closed: blocking findings dropped as ungrounded", {
+        storyId: story.id,
+        durationMs: durationMs3,
+        droppedCount: acDropped.length,
+        dropCodes: acDropped.map((d) => d.code)
+      });
+      const dropSummary = acDropped.map((d, i) => `${i + 1}. [${d.code}] ${d.finding.file ?? "<unknown>"}: ${d.finding.issue}`).join(`
+`);
+      recordAdversarialAudit({
+        runtime,
+        workdir,
+        projectDir,
+        storyId: story.id,
+        featureName,
+        parsed: true,
+        failOpen: false,
+        passed: false,
+        blockingThreshold: threshold,
+        result: { passed: false, findings: [] },
+        advisoryFindings: advisoryFindings.length > 0 ? llmFindingsToReviewFindings(advisoryFindings, { source: "adversarial-review" }) : undefined
+      });
+      return {
+        check: "adversarial",
+        success: false,
+        command: "",
+        exitCode: 1,
+        output: `Adversarial review failed: ${acDropped.length} blocking finding(s) dropped as ungrounded \u2014 the model emitted "passed: false" with concerns it could not ground in any acceptance criterion. Either re-classify these as "info" upstream or extend the ACs. Drops:
+
+${dropSummary}`,
+        durationMs: durationMs3,
+        advisoryFindings: advisoryFindings.length > 0 ? toAdversarialReviewFindings(advisoryFindings) : undefined,
+        cost: llmCost
+      };
+    }
     const durationMs2 = Date.now() - startTime;
     logger?.info("review", "Adversarial review passed (all findings below blocking threshold)", {
       storyId: story.id,
@@ -46228,6 +46455,42 @@ ${formatFindings(blockingFindings)}`;
     };
   }
   if (!sanitizedParsed.passed && blockingFindings.length === 0) {
+    if (acDropped.length > 0) {
+      const durationMs3 = Date.now() - startTime;
+      logger?.warn("review", "Semantic review fail-closed: blocking findings dropped as ungrounded", {
+        storyId: story.id,
+        durationMs: durationMs3,
+        droppedCount: acDropped.length,
+        dropCodes: acDropped.map((d) => d.code)
+      });
+      const dropSummary = acDropped.map((d, i) => `${i + 1}. [${d.code}] ${d.finding.file ?? "<unknown>"}: ${d.finding.issue}`).join(`
+`);
+      recordSemanticAudit({
+        runtime,
+        workdir,
+        projectDir,
+        storyId: story.id,
+        featureName,
+        parsed: true,
+        failOpen: false,
+        passed: false,
+        blockingThreshold: threshold,
+        result: { passed: false, findings: [] },
+        advisoryFindings: advisoryFindings.length > 0 ? llmFindingsToReviewFindings(advisoryFindings, { source: "semantic-review" }) : undefined
+      });
+      return {
+        check: "semantic",
+        success: false,
+        command: "",
+        exitCode: 1,
+        output: `Semantic review failed: ${acDropped.length} blocking finding(s) dropped as ungrounded \u2014 the model emitted "passed: false" with concerns it could not ground in any acceptance criterion. Either re-classify these as "info" upstream or extend the ACs. Drops:
+
+${dropSummary}`,
+        durationMs: durationMs3,
+        advisoryFindings: advisoryFindings.length > 0 ? toReviewFindings(advisoryFindings) : undefined,
+        cost: llmCost
+      };
+    }
     const durationMs2 = Date.now() - startTime;
     logger?.info("review", "Semantic review passed (all findings below blocking threshold)", {
       storyId: story.id,
@@ -47315,12 +47578,115 @@ async function recheckReview(ctx) {
     return false;
   return ctx.reviewResult?.success === true;
 }
+async function runMechanicalFixes(ctx, failedCheckNames) {
+  const commands = resolveMechanicalFixCommands(ctx, failedCheckNames);
+  for (const resolved of commands) {
+    if (resolved.skipped)
+      continue;
+    pipelineEventBus.emit({ type: "autofix:started", storyId: ctx.story.id, command: resolved.command });
+    const result = await _autofixDeps.runQualityCommand({
+      commandName: resolved.commandName,
+      command: resolved.command,
+      workdir: ctx.workdir,
+      storyId: ctx.story.id
+    });
+    logMechanicalFixResult(ctx, resolved, result.exitCode);
+  }
+}
+function resolveMechanicalFixCommands(ctx, failedCheckNames) {
+  if (!failedCheckNames.has("lint"))
+    return [];
+  const scopeFiles = collectLintScopeFiles(ctx.reviewResult?.checks ?? []);
+  return [resolveFixCommand(ctx, "lintFix", scopeFiles), resolveFixCommand(ctx, "formatFix", scopeFiles)].filter((cmd) => cmd !== undefined);
+}
+function resolveFixCommand(ctx, commandName, scopeFiles) {
+  const broad = resolveBroadFixCommand(ctx, commandName);
+  const template = resolveScopedFixTemplate(ctx, commandName);
+  if (!broad && !template)
+    return;
+  if (!scopeFiles)
+    return warnAndUseFullFix(ctx, commandName, broad, "missing_lint_scope");
+  if (scopeFiles.length === 0)
+    return logEmptyFixScope(ctx, commandName, broad ?? template ?? "");
+  if (template) {
+    return {
+      commandName,
+      command: template.replaceAll("{{files}}", scopeFiles.map(shellQuotePath2).join(" ")),
+      scoped: true
+    };
+  }
+  if (!broad)
+    return;
+  const derived = deriveScopedFixCommand(broad, scopeFiles);
+  if (derived)
+    return { commandName, command: derived, scoped: true };
+  return warnAndUseFullFix(ctx, commandName, broad, "unsupported_scoped_command_shape");
+}
+function collectLintScopeFiles(checks3) {
+  const lintChecks = checks3.filter((check2) => check2.check === "lint" && !check2.success);
+  if (lintChecks.length === 0)
+    return;
+  if (lintChecks.some((check2) => !check2.lintScope))
+    return;
+  if (lintChecks.some((check2) => check2.lintScope?.status === "degraded"))
+    return;
+  const files = lintChecks.flatMap((check2) => check2.lintScope?.packageGroups.flatMap((group) => group.files) ?? []);
+  return [...new Set(files)];
+}
+function resolveBroadFixCommand(ctx, commandName) {
+  return commandName === "lintFix" ? ctx.config.quality.commands.lintFix ?? ctx.config.review.commands.lintFix : ctx.config.quality.commands.formatFix ?? ctx.config.review.commands.formatFix;
+}
+function hasMechanicalFixCommand(ctx) {
+  return ["lintFix", "formatFix"].some((name) => resolveBroadFixCommand(ctx, name) ?? resolveScopedFixTemplate(ctx, name));
+}
+function resolveScopedFixTemplate(ctx, commandName) {
+  return commandName === "lintFix" ? ctx.config.review.commands.lintFixScoped ?? ctx.config.quality.commands.lintFixScoped : ctx.config.review.commands.formatFixScoped ?? ctx.config.quality.commands.formatFixScoped;
+}
+function deriveScopedFixCommand(command, files) {
+  const trimmed = command.trim();
+  const supportedTools = ["eslint", "biome", "ruff", "flake8", "prettier"];
+  const isSupported = supportedTools.some((tool) => trimmed === tool || trimmed.startsWith(`${tool} `)) || supportedTools.some((tool) => trimmed.startsWith(`bunx ${tool}`));
+  if (!isSupported)
+    return;
+  return `${command} ${files.map(shellQuotePath2).join(" ")}`;
+}
+function shellQuotePath2(path9) {
+  return `'${path9.replaceAll("'", "'\\''")}'`;
+}
+function logEmptyFixScope(ctx, commandName, command) {
+  getLogger().info("autofix", `${toScopeLogPrefix(commandName)}_scope_empty`, { storyId: ctx.story.id });
+  return { commandName, command, scoped: true, skipped: true };
+}
+function warnAndUseFullFix(ctx, commandName, command, reason) {
+  getLogger().warn("autofix", `${toScopeLogPrefix(commandName)}_scope_degraded`, { storyId: ctx.story.id, reason });
+  if (!command)
+    return { commandName, command: "", scoped: false, skipped: true };
+  return { commandName, command, scoped: false };
+}
+function toScopeLogPrefix(commandName) {
+  return commandName === "lintFix" ? "lint_fix" : "format_fix";
+}
+function logMechanicalFixResult(ctx, resolved, exitCode) {
+  const logger = getLogger();
+  logger.debug("autofix", `${resolved.commandName} exit=${exitCode}`, {
+    storyId: ctx.story.id,
+    command: resolved.command,
+    scoped: resolved.scoped
+  });
+  if (exitCode !== 0) {
+    logger.warn("autofix", `${resolved.commandName} command failed \u2014 may not have fixed all issues`, {
+      storyId: ctx.story.id,
+      exitCode
+    });
+  }
+}
 var NON_FIXABLE_BY_RECTIFICATION, autofixStage, _autofixDeps;
 var init_autofix = __esm(() => {
   init_logger2();
   init_quality();
   init_event_bus();
   init_autofix_agent();
+  init_autofix_cycle();
   init_autofix_scope_split();
   init_autofix_test_writer2();
   NON_FIXABLE_BY_RECTIFICATION = new Set(["git-clean"]);
@@ -47345,8 +47711,7 @@ var init_autofix = __esm(() => {
       if (!reviewResult || reviewResult.success) {
         return { action: "continue" };
       }
-      const lintFixCmd = ctx.config.quality.commands.lintFix ?? ctx.config.review.commands.lintFix;
-      const formatFixCmd = ctx.config.quality.commands.formatFix ?? ctx.config.review.commands.formatFix;
+      ctx.autofixAttempt = (ctx.autofixAttempt ?? 0) + 1;
       const failedCheckNames = new Set((reviewResult.checks ?? []).filter((c) => !c.success).map((c) => c.check));
       const hasLintFailure = failedCheckNames.has("lint");
       const totalFindingCount = (reviewResult.checks ?? []).reduce((n, c) => n + (c.findings?.length ?? 0), 0);
@@ -47367,42 +47732,8 @@ var init_autofix = __esm(() => {
         failedChecks: [...failedCheckNames],
         workdir: ctx.workdir
       });
-      if (hasLintFailure && (lintFixCmd || formatFixCmd)) {
-        if (lintFixCmd) {
-          pipelineEventBus.emit({ type: "autofix:started", storyId: ctx.story.id, command: lintFixCmd });
-          const lintResult = await _autofixDeps.runQualityCommand({
-            commandName: "lintFix",
-            command: lintFixCmd,
-            workdir: ctx.workdir,
-            storyId: ctx.story.id
-          });
-          logger.debug("autofix", `lintFix exit=${lintResult.exitCode}`, { storyId: ctx.story.id, command: lintFixCmd });
-          if (lintResult.exitCode !== 0) {
-            logger.warn("autofix", "lintFix command failed \u2014 may not have fixed all issues", {
-              storyId: ctx.story.id,
-              exitCode: lintResult.exitCode
-            });
-          }
-        }
-        if (formatFixCmd) {
-          pipelineEventBus.emit({ type: "autofix:started", storyId: ctx.story.id, command: formatFixCmd });
-          const fmtResult = await _autofixDeps.runQualityCommand({
-            commandName: "formatFix",
-            command: formatFixCmd,
-            workdir: ctx.workdir,
-            storyId: ctx.story.id
-          });
-          logger.debug("autofix", `formatFix exit=${fmtResult.exitCode}`, {
-            storyId: ctx.story.id,
-            command: formatFixCmd
-          });
-          if (fmtResult.exitCode !== 0) {
-            logger.warn("autofix", "formatFix command failed \u2014 may not have fixed all issues", {
-              storyId: ctx.story.id,
-              exitCode: fmtResult.exitCode
-            });
-          }
-        }
+      if (hasLintFailure && hasMechanicalFixCommand(ctx)) {
+        await runMechanicalFixes(ctx, failedCheckNames);
         const recheckPassed = await _autofixDeps.recheckReview(ctx);
         pipelineEventBus.emit({ type: "autofix:completed", storyId: ctx.story.id, fixed: recheckPassed });
         if (recheckPassed) {
@@ -47445,7 +47776,7 @@ var init_autofix = __esm(() => {
         cost: agentCost,
         unresolvedReason,
         escalationDigest
-      } = await _autofixDeps.runAgentRectification(ctx, lintFixCmd, formatFixCmd, ctx.workdir);
+      } = await _autofixDeps.runAgentRectification(ctx, resolveBroadFixCommand(ctx, "lintFix"), resolveBroadFixCommand(ctx, "formatFix"), ctx.workdir);
       if (!agentFixed && unresolvedReason) {
         if (ctx.mechanicalFailedOnly) {
           logger.warn("autofix", "Mechanical-only failure unfixable \u2014 proceeding (LLM review passed)", {
@@ -47480,7 +47811,8 @@ var init_autofix = __esm(() => {
       const totalUsed = ctx.autofixAttempt ?? 0;
       const currentlyFailing = new Set((ctx.reviewResult?.checks ?? []).filter((c) => !c.success || c.failOpen).map((c) => c.check));
       const nowPassing = [...failedCheckNames].filter((c) => !currentlyFailing.has(c));
-      if (nowPassing.length > 0 && totalUsed < maxTotal) {
+      const capacityExhausted = autofixCapacityExhausted(ctx);
+      if (nowPassing.length > 0 && totalUsed < maxTotal && !capacityExhausted) {
         ctx.retrySkipChecks = new Set([...ctx.retrySkipChecks ?? [], ...nowPassing]);
         logger.info("autofix", "Partial progress \u2014 retrying review with updated skip list", {
           storyId: ctx.story.id,
@@ -47490,6 +47822,13 @@ var init_autofix = __esm(() => {
         });
         return { action: "retry", fromStage: "review", cost: agentCost };
       }
+      if (nowPassing.length > 0 && capacityExhausted) {
+        logger.info("autofix", "Partial progress \u2014 but autofix capacity exhausted; escalating instead of retrying review", {
+          storyId: ctx.story.id,
+          nowPassing,
+          remaining: [...currentlyFailing]
+        });
+      }
       logger.warn("autofix", "Autofix exhausted \u2014 escalating", { storyId: ctx.story.id });
       return {
         action: "escalate",
@@ -54286,7 +54625,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.65.1",
+    version: "0.65.2",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -54372,8 +54711,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("3aa1ff6b"))
-        return "3aa1ff6b";
+      if (/^[0-9a-f]{6,10}$/.test("99828ef9"))
+        return "99828ef9";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -90724,6 +91063,7 @@ __export(exports_curator, {
   _curatorCmdDeps: () => _curatorCmdDeps
 });
 import { readdirSync as readdirSync10 } from "fs";
+import { unlink as unlink4 } from "fs/promises";
 import { basename as basename16, join as join79 } from "path";
 function getProjectKey(config2, projectDir) {
   return config2.name?.trim() || basename16(projectDir);
@@ -90994,6 +91334,16 @@ async function curatorGc(options) {
 `)}
 `;
   await _curatorCmdDeps.writeFile(rollupPath, newContent);
+  const projectKey = getProjectKey(config2, resolved.projectDir);
+  const outputDir = _curatorCmdDeps.projectOutputDir(projectKey, config2.outputDir);
+  const perRunsDir = join79(outputDir, "runs");
+  for (const runId of uniqueRunIds) {
+    if (!keepSet.has(runId)) {
+      const runDir = join79(perRunsDir, runId);
+      await _curatorCmdDeps.removeFile(join79(runDir, "observations.jsonl"));
+      await _curatorCmdDeps.removeFile(join79(runDir, "curator-proposals.md"));
+    }
+  }
   console.log(`[gc] Pruned rollup to ${keep} most recent runs (was ${uniqueRunIds.length}).`);
 }
 var _curatorCmdDeps, DEFAULT_KEEP = 50;
@@ -91017,6 +91367,11 @@ var init_curator2 = __esm(() => {
       const prev = await existing.exists() ? await existing.text() : "";
       await Bun.write(p, prev + content);
     },
+    removeFile: async (p) => {
+      try {
+        await unlink4(p);
+      } catch {}
+    },
     openInEditor: async (filePath) => {
       const editor = process.env.EDITOR ?? process.env.VISUAL ?? "vi";
       const proc = Bun.spawnSync([editor, filePath], { stdio: ["inherit", "inherit", "inherit"] });
@@ -92516,6 +92871,8 @@ var FIELD_DESCRIPTIONS = {
   "quality.commands.typecheck": "Custom typecheck command",
   "quality.commands.lint": "Custom lint command",
   "quality.commands.lintScoped": "Scoped lint command template for story-owned files (supports {{files}})",
+  "quality.commands.lintFixScoped": "Scoped lint fix command template for story-owned files (supports {{files}})",
+  "quality.commands.formatFixScoped": "Scoped format fix command template for story-owned files (supports {{files}})",
   "quality.commands.test": "Custom test command",
   "quality.commands.build": "Custom build command",
   "quality.forceExit": "Append --forceExit to test command (prevents hangs)",
@@ -92549,6 +92906,8 @@ var FIELD_DESCRIPTIONS = {
   "review.commands.typecheck": "Custom typecheck command for review",
   "review.commands.lint": "Custom lint command for review",
   "review.commands.lintScoped": "Scoped lint command template for review (supports {{files}})",
+  "review.commands.lintFixScoped": "Scoped lint fix command template for review (supports {{files}})",
+  "review.commands.formatFixScoped": "Scoped format fix command template for review (supports {{files}})",
   "review.commands.test": "Custom test command for review",
   "review.commands.build": "Custom build command for review",
   "review.semantic": "Semantic review configuration (code quality analysis)",

package/package.json

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