@nathapp/nax 0.67.19 → 0.68.0

package/dist/nax.js

@@ -16763,7 +16763,6 @@ var init_schemas_debate = __esm(() => {
     exports_external.object({ kind: exports_external.literal("majority-fail-closed") }),
     exports_external.object({ kind: exports_external.literal("majority-fail-open") }),
     exports_external.object({ kind: exports_external.literal("judge") }),
-    exports_external.object({ kind: exports_external.literal("dialogue-verdict") }),
     exports_external.object({
       kind: exports_external.literal("verifier-pick"),
       patch: exports_external.object({
@@ -17187,7 +17186,7 @@ var init_schemas_infra = __esm(() => {
 });
 
 // src/config/schemas-review.ts
-var SemanticReviewConfigSchema, ReviewDialogueConfigSchema, AdversarialReviewConfigSchema, ReviewConfigSchema;
+var SemanticReviewConfigSchema, AdversarialReviewConfigSchema, ReviewConfigSchema;
 var init_schemas_review = __esm(() => {
   init_zod();
   init_schemas_model();
@@ -17206,11 +17205,6 @@ var init_schemas_review = __esm(() => {
     }),
     excludePatterns: exports_external.array(exports_external.string()).optional()
   });
-  ReviewDialogueConfigSchema = exports_external.object({
-    enabled: exports_external.boolean().default(false),
-    maxClarificationsPerAttempt: exports_external.number().int().min(0).max(10).default(2),
-    maxDialogueMessages: exports_external.number().int().min(5).max(100).default(20)
-  });
   AdversarialReviewConfigSchema = exports_external.object({
     model: ConfiguredModelSchema.default("balanced"),
     diffMode: exports_external.enum(["embedded", "ref"]).default("ref"),
@@ -17242,6 +17236,7 @@ var init_schemas_review = __esm(() => {
     }),
     audit: exports_external.object({ enabled: exports_external.boolean().default(false) }).default({ enabled: false }),
     blockingThreshold: exports_external.enum(["error", "warning", "info"]).default("error"),
+    pluginMode: exports_external.enum(["observational", "gating"]).default("observational"),
     semantic: SemanticReviewConfigSchema.optional(),
     adversarial: AdversarialReviewConfigSchema.optional()
   });
@@ -17426,6 +17421,7 @@ var init_schemas3 = __esm(() => {
       commands: {},
       audit: { enabled: false },
       blockingThreshold: "error",
+      pluginMode: "observational",
       semantic: {
         model: "balanced",
         diffMode: "ref",
@@ -18748,10 +18744,10 @@ function _applyLegacyReviewExecutionShim(conf, warn = (msg) => {
   const review = result.review ?? conf.review;
   if (review && typeof review === "object") {
     let newReview = review;
-    const LEGACY_PLUGIN_MODE = "pluginMode";
-    if (LEGACY_PLUGIN_MODE in review) {
-      warn("review.pluginMode is a legacy field that has been removed. Remove it from your config.");
-      const { [LEGACY_PLUGIN_MODE]: _pm, ...rest } = review;
+    const LEGACY_PLUGIN_MODE_VALUE = "per-story";
+    if ("pluginMode" in review && review.pluginMode === LEGACY_PLUGIN_MODE_VALUE) {
+      warn('review.pluginMode: "per-story" is a legacy value that has been removed. Remove it from your config (or set to "observational"/"gating").');
+      const { pluginMode: _pm, ...rest } = review;
       newReview = rest;
     }
     const dialogue = newReview.dialogue;
@@ -30228,9 +30224,6 @@ function resolvePersonas(debaters, stage, autoPersona) {
     return { ...d, persona: assigned };
   });
 }
-function buildDebaterLabel(debater) {
-  return debater.persona ? `${debater.agent} (${debater.persona})` : debater.agent;
-}
 var PERSONA_FRAGMENTS, PLAN_ROTATION, REVIEW_ROTATION;
 var init_personas = __esm(() => {
   PERSONA_FRAGMENTS = {
@@ -32482,33 +32475,6 @@ function llmFindingToReviewFinding(f, opts = {}) {
 function llmFindingsToReviewFindings(findings, opts = {}) {
   return findings.map((f) => llmFindingToReviewFinding(f, opts));
 }
-function findingToReviewFinding(f, opts = {}) {
-  const narrowed = narrowSeverity(f.severity);
-  const ruleId = f.rule?.trim() ? f.rule.trim() : deriveRuleId(f.category, f.message);
-  const result = {
-    ruleId,
-    severity: narrowed,
-    file: f.file ?? "",
-    line: f.line ?? 0,
-    message: f.message
-  };
-  if (f.category)
-    result.category = f.category;
-  const effectiveSource = opts.source ?? f.source;
-  if (effectiveSource)
-    result.source = effectiveSource;
-  const meta3 = { ...f.meta ?? {} };
-  if (f.suggestion)
-    meta3.suggestion = f.suggestion;
-  if (f.severity !== narrowed)
-    meta3.originalSeverity = f.severity;
-  if (Object.keys(meta3).length > 0)
-    result.meta = meta3;
-  return result;
-}
-function findingsToReviewFindings(findings, opts = {}) {
-  return findings.map((f) => findingToReviewFinding(f, opts));
-}
 var SEVERITY_MAP, RULE_ID_SLUG_TOKENS = 6;
 var init_finding_projection = __esm(() => {
   SEVERITY_MAP = {
@@ -35641,7 +35607,9 @@ var init_autofix_implementer = __esm(() => {
     session: { role: "implementer", lifetime: "warm" },
     config: autofixConfigSelector,
     build(input, _ctx) {
-      const prompt = RectifierPromptBuilder.reviewRectification(input.failedChecks, input.story, {
+      const verifierFindings = input.findings?.filter((f) => f.source === "tdd-verifier");
+      const useVerifierContext = verifierFindings !== undefined && verifierFindings.length > 0 && verifierFindings.length === input.findings?.length;
+      const prompt = useVerifierContext ? RectifierPromptBuilder.verifierContext(verifierFindings) : RectifierPromptBuilder.reviewRectification(input.failedChecks, input.story, {
         blockingThreshold: input.blockingThreshold
       });
       return {
@@ -35869,6 +35837,29 @@ var init_debate_stateful = __esm(() => {
   };
 });
 
+// src/debate/selectors/judge.ts
+var RESOLVER_FALLBACK_AGENT = "synthesis", RESOLVER_FALLBACK_MODEL = "fast", judgeSelector = async (ctx) => {
+  const resolverAgent = ctx.stageConfig.resolver.agent ?? RESOLVER_FALLBACK_AGENT;
+  const resolverModel = ctx.stageConfig.resolver.model ?? RESOLVER_FALLBACK_MODEL;
+  const proposals = ctx.proposals.map((p) => p.output);
+  const output = await callOp(ctx.callContext, judgeOp, {
+    proposals,
+    critiques: ctx.critiques,
+    debaters: ctx.debaters,
+    resolverAgent,
+    resolverModel,
+    timeoutSeconds: ctx.stageConfig.timeoutSeconds
+  });
+  return {
+    outcome: output.trim() ? "passed" : "failed",
+    output
+  };
+};
+var init_judge = __esm(() => {
+  init_operations();
+  init_operations();
+});
+
 // src/debate/selectors/majority.ts
 function stripMarkdownFence(text) {
   const match = text.match(/^```(?:json)?\s*\n?([\s\S]*?)\n?```\s*$/);
@@ -35910,125 +35901,6 @@ var majorityFailClosedSelector = async (ctx) => {
   return { outcome: computeMajority(proposalOutputs, true) };
 };
 
-// src/debate/resolvers.ts
-function majorityResolver(proposals, failOpen) {
-  return computeMajority(proposals, failOpen);
-}
-var init_resolvers = __esm(() => {
-  init_prompts();
-});
-
-// src/debate/selectors/pick.ts
-function pickSelectorKind(stageConfig, ctx) {
-  if (stageConfig.selector) {
-    return stageConfig.selector.kind;
-  }
-  if (ctx.reviewerSession && ctx.resolverContextInput) {
-    return "dialogue-verdict";
-  }
-  return pickBaseSelectorKind(stageConfig);
-}
-function pickBaseSelectorKind(stageConfig) {
-  switch (stageConfig.resolver.type) {
-    case "synthesis":
-      return "synthesis";
-    case "majority-fail-closed":
-      return "majority-fail-closed";
-    case "majority-fail-open":
-      return "majority-fail-open";
-    case "custom":
-      return "judge";
-  }
-  return "synthesis";
-}
-
-// src/debate/selectors/dialogue-verdict.ts
-var dialogueVerdictSelector = async (ctx) => {
-  if (ctx.reviewerSession && ctx.resolverContextInput) {
-    try {
-      const debateCtx = {
-        resolverType: ctx.stageConfig.resolver.type
-      };
-      if (ctx.stageConfig.resolver.type === "majority-fail-closed" || ctx.stageConfig.resolver.type === "majority-fail-open") {
-        const failOpen = ctx.stageConfig.resolver.type === "majority-fail-open";
-        const rawOutcome = majorityResolver(ctx.proposals.map((p) => p.output), failOpen);
-        let passCount = 0;
-        let failCount = 0;
-        for (const proposal of ctx.proposals) {
-          const parsed = tryParseLLMJson(proposal.output);
-          if (parsed !== null && typeof parsed.passed === "boolean" && parsed.passed) {
-            passCount++;
-          } else if (failOpen) {
-            passCount++;
-          } else {
-            failCount++;
-          }
-        }
-        debateCtx.majorityVote = { passed: rawOutcome === "passed", passCount, failCount };
-      }
-      const story = {
-        id: ctx.resolverContextInput.story.id,
-        title: ctx.resolverContextInput.story.title,
-        description: "",
-        acceptanceCriteria: ctx.resolverContextInput.story.acceptanceCriteria
-      };
-      const rcRecord = ctx.resolverContextInput;
-      const diffContext = ctx.resolverContextInput.diffMode === "ref" ? {
-        mode: "ref",
-        storyGitRef: rcRecord.storyGitRef ?? "",
-        stat: rcRecord.stat ?? undefined,
-        productionExcludePatterns: rcRecord.productionExcludePatterns
-      } : { mode: "embedded", diff: rcRecord.diff ?? "" };
-      const labeledProposals = ctx.labeledProposals ?? ctx.proposals.map((p) => ({
-        debater: p.debater.agent,
-        output: p.output
-      }));
-      let dialogueResult;
-      if (ctx.resolverContextInput.isReReview) {
-        dialogueResult = await ctx.reviewerSession.reReviewDebate(labeledProposals, ctx.critiques, diffContext, debateCtx);
-      } else {
-        dialogueResult = await ctx.reviewerSession.resolveDebate(labeledProposals, ctx.critiques, diffContext, story, ctx.resolverContextInput.semanticConfig, debateCtx);
-      }
-      const outcome = dialogueResult.checkResult.success ? "passed" : "failed";
-      return {
-        outcome,
-        findings: dialogueResult.checkResult.findings,
-        dialogueResult
-      };
-    } catch {}
-  }
-  const baseKind = pickBaseSelectorKind(ctx.stageConfig);
-  const baseSelector = resolveSelector(baseKind);
-  return baseSelector(ctx);
-};
-var init_dialogue_verdict = __esm(() => {
-  init_resolvers();
-  init_registry2();
-});
-
-// src/debate/selectors/judge.ts
-var RESOLVER_FALLBACK_AGENT = "synthesis", RESOLVER_FALLBACK_MODEL = "fast", judgeSelector = async (ctx) => {
-  const resolverAgent = ctx.stageConfig.resolver.agent ?? RESOLVER_FALLBACK_AGENT;
-  const resolverModel = ctx.stageConfig.resolver.model ?? RESOLVER_FALLBACK_MODEL;
-  const proposals = ctx.proposals.map((p) => p.output);
-  const output = await callOp(ctx.callContext, judgeOp, {
-    proposals,
-    critiques: ctx.critiques,
-    debaters: ctx.debaters,
-    resolverAgent,
-    resolverModel,
-    timeoutSeconds: ctx.stageConfig.timeoutSeconds
-  });
-  return {
-    outcome: output.trim() ? "passed" : "failed",
-    output
-  };
-};
-var init_judge = __esm(() => {
-  init_operations();
-  init_operations();
-});
-
 // src/debate/selectors/synthesis.ts
 var RESOLVER_FALLBACK_AGENT2 = "synthesis", RESOLVER_FALLBACK_MODEL2 = "fast", synthesisSelector = async (ctx) => {
   const resolverAgent = ctx.stageConfig.resolver.agent ?? RESOLVER_FALLBACK_AGENT2;
@@ -36205,7 +36077,6 @@ function registerSelector(kind, strategy) {
 var STRATEGIES;
 var init_registry2 = __esm(() => {
   init_errors();
-  init_dialogue_verdict();
   init_judge();
   init_synthesis();
   init_verifier_pick();
@@ -36214,16 +36085,34 @@ var init_registry2 = __esm(() => {
   registerSelector("majority-fail-closed", majorityFailClosedSelector);
   registerSelector("majority-fail-open", majorityFailOpenSelector);
   registerSelector("judge", judgeSelector);
-  registerSelector("dialogue-verdict", dialogueVerdictSelector);
   registerSelector("verifier-pick", (ctx) => verifierPickSelector(ctx));
 });
 
+// src/debate/selectors/pick.ts
+function pickSelectorKind(stageConfig) {
+  if (stageConfig.selector) {
+    return stageConfig.selector.kind;
+  }
+  return pickBaseSelectorKind(stageConfig);
+}
+function pickBaseSelectorKind(stageConfig) {
+  switch (stageConfig.resolver.type) {
+    case "synthesis":
+      return "synthesis";
+    case "majority-fail-closed":
+      return "majority-fail-closed";
+    case "majority-fail-open":
+      return "majority-fail-open";
+    case "custom":
+      return "judge";
+  }
+}
+
 // src/debate/selectors/index.ts
 var init_selectors2 = __esm(() => {
   init_registry2();
   init_synthesis();
   init_judge();
-  init_dialogue_verdict();
   init_verifier_pick();
 });
 
@@ -36251,14 +36140,10 @@ function buildResolverCallContext(provided, agentManager, storyId, workdir, feat
     ...sessionOverride !== undefined ? { sessionOverride } : {}
   };
 }
-async function resolveOutcome(proposalOutputs, critiqueOutputs, stageConfig, config2, callContext, storyId, timeoutMs, workdir, featureName, reviewerSession, resolverContext, promptSuffix, debaters, agentManager) {
+async function resolveOutcome(proposalOutputs, critiqueOutputs, stageConfig, config2, callContext, storyId, timeoutMs, workdir, featureName, promptSuffix, debaters, agentManager) {
   const logger = _debateSessionDeps.getSafeLogger();
-  if (reviewerSession && !resolverContext) {
-    logger?.warn("debate", "ReviewerSession provided but resolverContext is undefined \u2014 falling back to stateless resolver", { storyId });
-  }
-  const resolverContextInput = resolverContext ? (({ labeledProposals: _lp, ...rest }) => rest)(resolverContext) : undefined;
-  const kind = pickSelectorKind(stageConfig, { reviewerSession, resolverContextInput });
-  if ((kind === "majority-fail-closed" || kind === "majority-fail-open") && workdir !== undefined && !reviewerSession) {
+  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");
   }
   const proposalList = debaters ? debaters.map((debater, i) => ({
@@ -36285,48 +36170,20 @@ async function resolveOutcome(proposalOutputs, critiqueOutputs, stageConfig, con
     stageConfig,
     config: effectiveConfig,
     proposals: proposalList,
-    labeledProposals: resolverContext?.labeledProposals,
     critiques: critiqueOutputs,
     workdir: workdir ?? "",
     featureName: featureName ?? "",
     timeoutMs,
     agentManager: effectiveAgentManager,
-    reviewerSession,
-    resolverContextInput,
     promptSuffix,
     debaters: debaters ?? [],
     callContext: effectiveCallContext
   };
-  const resolverTypeMappedKind = pickBaseSelectorKind(stageConfig);
-  if (kind === "dialogue-verdict") {
-    try {
-      const result2 = await resolveSelector(kind)(selectorCtx);
-      return {
-        outcome: result2.outcome,
-        output: result2.output,
-        findings: result2.findings,
-        dialogueResult: result2.dialogueResult
-      };
-    } catch (err) {
-      logger?.warn("debate", "dialogue-verdict selector failed, falling back to stateless", {
-        storyId,
-        error: err instanceof Error ? err.message : String(err)
-      });
-      const fallbackResult = await resolveSelector(resolverTypeMappedKind)(selectorCtx);
-      return {
-        outcome: fallbackResult.outcome,
-        output: fallbackResult.output,
-        findings: fallbackResult.findings,
-        dialogueResult: fallbackResult.dialogueResult
-      };
-    }
-  }
   const result = await resolveSelector(kind)(selectorCtx);
   return {
     outcome: result.outcome,
     output: result.output,
-    findings: result.findings,
-    dialogueResult: result.dialogueResult
+    findings: result.findings
   };
 }
 var RESOLVER_FALLBACK_AGENT3 = "synthesis", _debateSessionDeps;
@@ -36966,6 +36823,46 @@ var init_verdict = __esm(() => {
 });
 
 // src/operations/verify.ts
+function buildVerifierFindings(verdict, categorization) {
+  if (categorization.success)
+    return [];
+  switch (categorization.failureCategory) {
+    case "verifier-rejected": {
+      const files = verdict.testModifications.files;
+      return [
+        {
+          source: "tdd-verifier",
+          severity: "error",
+          category: "illegitimate-test-edits",
+          fixTarget: "test",
+          message: files.length > 0 ? `Implementer edited test files illegitimately: ${files.join(", ")}` : "Implementer made illegitimate test modifications",
+          meta: {
+            reasoning: verdict.testModifications.reasoning,
+            files
+          }
+        }
+      ];
+    }
+    case "tests-failing": {
+      return [
+        {
+          source: "tdd-verifier",
+          severity: "error",
+          category: "tests-failed",
+          fixTarget: "source",
+          message: `${verdict.tests.failCount} story-scoped test(s) failed (verifier)`,
+          meta: {
+            passCount: verdict.tests.passCount,
+            failCount: verdict.tests.failCount,
+            reasoning: verdict.reasoning
+          }
+        }
+      ];
+    }
+    default:
+      return [];
+  }
+}
 function parseVerdictFromStdout(output, _input, _ctx) {
   if (!output || !output.trim()) {
     throw new ParseValidationError("verifier produced no stdout");
@@ -36985,6 +36882,7 @@ function parseVerdictFromStdout(output, _input, _ctx) {
     estimatedCostUsd: 0,
     durationMs: 0,
     output,
+    normalizedFindings: buildVerifierFindings(verdict, categorization),
     ...categorization.failureCategory && { failureCategory: categorization.failureCategory },
     ...categorization.reviewReason && { reviewReason: categorization.reviewReason }
   };
@@ -37057,6 +36955,7 @@ var init_verify = __esm(() => {
             estimatedCostUsd: 0,
             durationMs: 0,
             output: "",
+            normalizedFindings: buildVerifierFindings(verdict, categorization),
             ...categorization.failureCategory && { failureCategory: categorization.failureCategory },
             ...categorization.reviewReason && { reviewReason: categorization.reviewReason },
             ...isolation && { isolation }
@@ -37068,6 +36967,7 @@ var init_verify = __esm(() => {
           estimatedCostUsd: 0,
           durationMs: 0,
           output: "",
+          normalizedFindings: [],
           reviewReason: "verifier produced unparseable verdict in stdout after retries and no usable verdict file on disk"
         };
       } finally {
@@ -38081,7 +37981,8 @@ var init__finding_to_check = __esm(() => {
     "semantic-review": "semantic",
     "adversarial-review": "adversarial",
     lint: "lint",
-    typecheck: "typecheck"
+    typecheck: "typecheck",
+    "tdd-verifier": "test"
   };
 });
 
@@ -38093,7 +37994,8 @@ function makeAutofixImplementerStrategy(story, config2, sink) {
     fixOp: implementerRectifyOp,
     buildInput: (findings, _prior, _cycleCtx) => ({
       failedChecks: findingsToFailedChecks(findings),
-      story
+      story,
+      findings
     }),
     extractApplied: (output) => {
       for (const decl of output.testEditDeclarations) {
@@ -38116,7 +38018,7 @@ var IMPLEMENTER_SOURCES;
 var init_autofix_implementer_strategy = __esm(() => {
   init__finding_to_check();
   init_autofix_implementer();
-  IMPLEMENTER_SOURCES = new Set(["lint", "typecheck", "semantic-review"]);
+  IMPLEMENTER_SOURCES = new Set(["lint", "typecheck", "semantic-review", "tdd-verifier"]);
 });
 
 // src/operations/autofix-test-writer-strategy.ts
@@ -38859,6 +38761,9 @@ var init_operations = __esm(() => {
 });
 
 // src/findings/cycle.ts
+function normalizeValidateResult(r) {
+  return Array.isArray(r) ? { findings: r, shortCircuited: false } : r;
+}
 function classifySingleSource(before, after) {
   const beforeKeys = new Set(before.map(findingKey));
   const afterKeys = new Set(after.map(findingKey));
@@ -39055,11 +38960,12 @@ async function runFixCycle(cycle, ctx, cycleName, _deps = {}) {
     });
     if (allExhausted) {
       let liteFindingsAfter;
+      let liteShortCircuited = false;
       try {
-        liteFindingsAfter = await cycle.validate(ctx, {
-          mode: "lite",
-          strategiesRun: group.map((s) => s.name)
-        });
+        const liteRaw = await cycle.validate(ctx, { mode: "lite", strategiesRun: group.map((s) => s.name) });
+        const liteResult = normalizeValidateResult(liteRaw);
+        liteFindingsAfter = liteResult.findings;
+        liteShortCircuited = liteResult.shortCircuited ?? false;
       } catch (err) {
         const finishedAt3 = now();
         cycle.iterations.push({
@@ -39097,7 +39003,7 @@ async function runFixCycle(cycle, ctx, cycleName, _deps = {}) {
         finishedAt: finishedAt2
       });
       cycle.findings = liteFindingsAfter;
-      if (liteFindingsAfter.length === 0) {
+      if (liteFindingsAfter.length === 0 && !liteShortCircuited) {
         logger?.info("findings.cycle", "cycle exited \u2014 resolved after terminal lite validate", {
           storyId,
           packageDir,
@@ -39111,6 +39017,21 @@ async function runFixCycle(cycle, ctx, cycleName, _deps = {}) {
           costUsd: totalCostUsd
         };
       }
+      if (liteShortCircuited) {
+        logger?.info("findings.cycle", "cycle exited \u2014 validate short-circuited", {
+          storyId,
+          packageDir,
+          cycleName,
+          reason: "validate-short-circuit",
+          liteFindingsAfterCount: liteFindingsAfter.length
+        });
+        return {
+          iterations: cycle.iterations,
+          finalFindings: liteFindingsAfter,
+          exitReason: "validate-short-circuit",
+          costUsd: totalCostUsd
+        };
+      }
       logger?.info("findings.cycle", "cycle exited \u2014 strategy attempt cap reached (lite validate)", {
         storyId,
         packageDir,
@@ -39131,7 +39052,8 @@ async function runFixCycle(cycle, ctx, cycleName, _deps = {}) {
     let validatorAttempt = 0;
     for (;; ) {
       try {
-        findingsAfter = await cycle.validate(ctx, { mode: "full", strategiesRun: group.map((s) => s.name) });
+        const fullRaw = await cycle.validate(ctx, { mode: "full", strategiesRun: group.map((s) => s.name) });
+        findingsAfter = normalizeValidateResult(fullRaw).findings;
         break;
       } catch (err) {
         if (validatorAttempt >= cycle.config.validatorRetries) {
@@ -39775,7 +39697,6 @@ async function runSemanticDebate(opts) {
     agentManager,
     featureName,
     story,
-    resolverSession,
     diffMode,
     diff,
     stat,
@@ -39793,10 +39714,9 @@ async function runSemanticDebate(opts) {
     ...configuredStageConfig,
     sessionMode: "one-shot",
     mode: "panel",
-    selector: { kind: "dialogue-verdict" },
+    selector: { kind: pickBaseSelectorKind(configuredStageConfig) },
     postDebateVerifier: { kind: "review-grounding-filter" }
   };
-  const isReReview = resolverSession !== undefined && resolverSession.history.length > 0;
   const semanticAgentName = agentManager && typeof agentManager.getDefault === "function" ? agentManager.getDefault() : "claude";
   const semanticCallCtx = {
     runtime,
@@ -39813,89 +39733,10 @@ async function runSemanticDebate(opts) {
     config: naxConfig,
     workdir,
     featureName,
-    timeoutSeconds: naxConfig.execution?.sessionTimeoutSeconds,
-    reviewerSession: resolverSession,
-    resolverContextInput: resolverSession ? {
-      diffMode,
-      ...diffMode === "ref" ? { storyGitRef: effectiveRef, stat, productionExcludePatterns } : { diff },
-      story: { id: story.id, title: story.title, acceptanceCriteria: story.acceptanceCriteria },
-      semanticConfig,
-      blockingThreshold,
-      resolverType: reviewStageConfig.resolver.type,
-      isReReview
-    } : undefined
+    timeoutSeconds: naxConfig.execution?.sessionTimeoutSeconds
   });
-  const historyLenBefore = resolverSession?.history.length ?? 0;
   const debateResult = await debateRunner.run(prompt);
   const debateCost = debateResult.totalCostUsd ?? 0;
-  const sessionUsed = resolverSession && resolverSession.history.length > historyLenBefore;
-  if (sessionUsed) {
-    const durationMs2 = Date.now() - startTime;
-    try {
-      const verdict = resolverSession.getVerdict();
-      const findings = verdict.findings ?? [];
-      if (!verdict.passed && findings.length > 0) {
-        logger?.warn("review", `Semantic review failed (debate+dialogue): ${findings.length} findings`, {
-          storyId: story.id,
-          durationMs: durationMs2
-        });
-        recordSemanticDebateAudit({
-          runtime,
-          workdir,
-          storyId: story.id,
-          featureName,
-          parsed: true,
-          passed: false,
-          blockingThreshold,
-          result: {
-            passed: false,
-            findings: findingsToReviewFindings(findings, { source: "semantic-debate-review" })
-          }
-        });
-        return {
-          check: "semantic",
-          success: false,
-          command: "",
-          exitCode: 1,
-          output: `Semantic review failed:
-
-${findings.map((f) => `${f.rule ?? "semantic"}: ${f.message}`).join(`
-`)}`,
-          durationMs: durationMs2,
-          findings,
-          cost: debateCost
-        };
-      }
-      const label = verdict.passed ? "Semantic review passed (debate+dialogue)" : "Semantic review passed (debate+dialogue, all findings non-blocking)";
-      logger?.info("review", label, { storyId: story.id, durationMs: durationMs2 });
-      recordSemanticDebateAudit({
-        runtime,
-        workdir,
-        storyId: story.id,
-        featureName,
-        parsed: true,
-        passed: true,
-        blockingThreshold,
-        result: {
-          passed: true,
-          findings: findingsToReviewFindings(findings, { source: "semantic-debate-review" })
-        }
-      });
-      return {
-        check: "semantic",
-        success: true,
-        command: "",
-        exitCode: 0,
-        output: label,
-        durationMs: durationMs2,
-        cost: debateCost
-      };
-    } catch {
-      logger?.warn("review", "getVerdict() failed after debate+dialogue \u2014 falling back to stateless verdict", {
-        storyId: story.id
-      });
-    }
-  }
   const resolverPassed = debateResult.outcome === "passed";
   const allFindings = [];
   for (const p of debateResult.proposals) {
@@ -40015,6 +39856,7 @@ ${formatFindings2(debateBlocking)}`,
   };
 }
 var init_semantic_debate = __esm(() => {
+  init_debate();
   init_logger2();
   init_ac_quote_validator();
   init_finding_projection();
@@ -40049,7 +39891,6 @@ async function runSemanticReview(opts) {
     agentManager,
     naxConfig,
     featureName,
-    resolverSession,
     priorSemanticIterations,
     blockingThreshold,
     featureContextMarkdown,
@@ -40183,7 +40024,6 @@ async function runSemanticReview(opts) {
       agentManager: effectiveAgentManager,
       featureName,
       story,
-      resolverSession,
       diffMode,
       diff,
       stat,
@@ -40550,7 +40390,6 @@ async function runReview(opts) {
     naxConfig,
     retrySkipChecks,
     featureName,
-    resolverSession,
     priorFailures,
     priorSemanticIterations,
     featureContextMarkdown,
@@ -40630,7 +40469,6 @@ async function runReview(opts) {
         agentManager,
         naxConfig,
         featureName,
-        resolverSession,
         priorSemanticIterations,
         blockingThreshold: config2.blockingThreshold,
         featureContextMarkdown,
@@ -41568,6 +41406,26 @@ Tests are failing. Fix the source so all tests pass \u2014 not just the ones lis
     parts.push(escapeHatchFor(opts.story));
     return parts.join("");
   }
+  static verifierContext(findings) {
+    if (findings.length === 0) {
+      return "The verifier found no issues.";
+    }
+    const lines = [
+      `Fix the following ${findings.length} verifier finding${findings.length === 1 ? "" : "s"}:
+`
+    ];
+    for (const f of findings) {
+      const reasoning = f.meta?.reasoning ?? "";
+      const detail = reasoning ? `  Reasoning: ${reasoning}
+` : "";
+      lines.push(`- [${f.category}] ${f.message}
+${detail}`);
+    }
+    lines.push(`
+Fix the implementation to resolve all verifier findings.`);
+    return lines.join(`
+`);
+  }
   static failingTestContext(findings) {
     if (findings.length === 0) {
       return "The full test suite has failing tests. Fix the implementation to make all tests pass.";
@@ -46051,17 +45909,6 @@ function createDebaterCallContext(ctx, agentName) {
     }
   };
 }
-function buildResolverContext(successfulProposals, resolverContextInput) {
-  if (!resolverContextInput)
-    return;
-  return {
-    ...resolverContextInput,
-    labeledProposals: successfulProposals.map((proposal) => ({
-      debater: buildDebaterLabel(proposal.debater),
-      output: proposal.output
-    }))
-  };
-}
 async function runZeroSuccessFallback(ctx, prompt, firstDebater) {
   if (!firstDebater)
     return null;
@@ -46090,7 +45937,6 @@ var init_runner_stateful_helpers = __esm(() => {
   init_call();
   init_debate_stateful();
   init_prompts();
-  init_personas();
   DEFAULT_ABORT_SIGNAL = new AbortController().signal;
 });
 
@@ -46212,13 +46058,7 @@ async function runHybrid(ctx, prompt) {
     }
   }
   const proposalOutputs = successfulResults.map((p) => p.output);
-  const resolveResult = await resolveOutcome(proposalOutputs, rebuttals.map((r) => r.output), ctx.stageConfig, ctx.config, { ...ctx.callContext, scopeId: ctx.resolverCallContext?.scopeId ?? ctx.callContext.scopeId }, ctx.storyId, ctx.timeoutSeconds * 1000, ctx.workdir, ctx.featureName, ctx.reviewerSession, ctx.resolverContextInput ? {
-    ...ctx.resolverContextInput,
-    labeledProposals: successfulResults.map((p) => ({
-      debater: buildDebaterLabel(p.debater),
-      output: p.output
-    }))
-  } : undefined, undefined, successfulResults.map((p) => p.debater), agentManager);
+  const resolveResult = await resolveOutcome(proposalOutputs, rebuttals.map((r) => r.output), ctx.stageConfig, ctx.config, { ...ctx.callContext, scopeId: ctx.resolverCallContext?.scopeId ?? ctx.callContext.scopeId }, ctx.storyId, ctx.timeoutSeconds * 1000, ctx.workdir, ctx.featureName, undefined, successfulResults.map((p) => p.debater), agentManager);
   return {
     storyId: ctx.storyId,
     stage: ctx.stage,
@@ -46647,9 +46487,7 @@ async function scoreAndDispatchVerifierPick(resolved, rebuttalSettled, ctx, opts
     timeoutMs: (ctx.stageConfig.timeoutSeconds ?? 600) * 1000,
     agentManager,
     debaters: resolved.map((e) => e.debater),
-    callContext: ctx.callContext,
-    ...ctx.reviewerSession ? { reviewerSession: ctx.reviewerSession } : {},
-    ...ctx.resolverContextInput ? { resolverContextInput: ctx.resolverContextInput } : {}
+    callContext: ctx.callContext
   };
   const manifest = extractManifestFromContext(scoringCtx);
   const scored = await Promise.all(rebutProposals.map(async (p) => ({ proposal: p, score: await computeScore(p, manifest) })));
@@ -46728,9 +46566,7 @@ async function finalizePlanRun(ctx, opts, successful, rebuttalList, outputPaths,
       timeoutMs: (ctx.stageConfig.timeoutSeconds ?? 600) * 1000,
       agentManager,
       debaters: finalizedProposals.map((p) => p.debater),
-      callContext: ctx.callContext,
-      ...ctx.reviewerSession ? { reviewerSession: ctx.reviewerSession } : {},
-      ...ctx.resolverContextInput ? { resolverContextInput: ctx.resolverContextInput } : {}
+      callContext: ctx.callContext
     };
     const manifest = extractManifestFromContext(selectorCtx);
     const scored = await Promise.all(selectorCtx.proposals.map(async (proposal) => ({ proposal, score: await computeScore(proposal, manifest) })));
@@ -46744,7 +46580,7 @@ async function finalizePlanRun(ctx, opts, successful, rebuttalList, outputPaths,
   const outcome = selectorKind === "verifier-pick" ? {
     outcome: "passed",
     output: selectionSummary.winnerOutput ?? finalizedProposals[0]?.output
-  } : await resolveOutcome(proposalOutputs, critiqueOutputs, ctx.stageConfig, ctx.config, ctx.callContext, ctx.storyId, resolverTimeoutMs, opts.workdir, opts.feature, ctx.reviewerSession, buildResolverContext(finalizedProposals.map((p) => ({ debater: p.debater, agentName: p.agentName, output: p.output, cost: 0 })), ctx.resolverContextInput), buildPlanSynthesisSuffix(opts.specContent), finalizedProposals.map((p) => p.debater), agentManager);
+  } : await resolveOutcome(proposalOutputs, critiqueOutputs, ctx.stageConfig, ctx.config, ctx.callContext, ctx.storyId, resolverTimeoutMs, opts.workdir, opts.feature, buildPlanSynthesisSuffix(opts.specContent), finalizedProposals.map((p) => p.debater), agentManager);
   let finalOutcome = outcome.outcome;
   let winningOutput = outcome.output ?? finalizedProposals[0]?.output;
   winningOutput = await readWinnerOutput(selectionSummary.winnerOutputPath ?? outputPaths[0], winningOutput);
@@ -46785,7 +46621,6 @@ async function finalizePlanRun(ctx, opts, successful, rebuttalList, outputPaths,
 var _runPlanDeps, FILE_OUTPUT_INSTRUCTION = "Write the complete PRD JSON to this file path and then reply with a short confirmation:";
 var init_runner_plan_helpers = __esm(() => {
   init_pre_phase();
-  init_runner_stateful_helpers();
   init_verifier_pick();
   init_session_helpers();
   init_verifiers();
@@ -47041,9 +46876,7 @@ async function runPlan(ctx, taskContext, outputFormat, opts) {
     stage: ctx.stage,
     stageConfig: ctx.stageConfig,
     config: ctx.config,
-    callContext: ctx.callContext,
-    reviewerSession: ctx.reviewerSession,
-    resolverContextInput: ctx.resolverContextInput
+    callContext: ctx.callContext
   }, { workdir: opts.workdir, feature: opts.feature, specContent: opts.specContent }, successful, rebuttalList, outputPaths, totalCostUsd, agentManager, selectorKind, includeHybridRebuttals);
 }
 var DEFAULT_MAX_CONCURRENT_DEBATERS = 2;
@@ -47177,7 +47010,7 @@ async function runStateful(ctx, prompt) {
   }).then((result) => ({ ...result, resolvedIndex: proposal.resolvedIndex }))), concurrencyLimit)).flatMap((result) => result.status === "fulfilled" && result.value.success ? [{ debater: resolved[result.value.resolvedIndex].debater, round: 1, output: result.value.rebut }] : []) : [];
   throwIfAborted2();
   const proposalOutputs = successfulProposals.map((proposal) => proposal.output);
-  const outcome = await resolveOutcome(proposalOutputs, rebuttals.map((rebuttal) => rebuttal.output), ctx.stageConfig, ctx.config, { ...ctx.callContext, scopeId: ctx.resolverCallContext?.scopeId ?? ctx.callContext.scopeId }, ctx.storyId, ctx.timeoutSeconds * 1000, ctx.workdir, ctx.featureName, ctx.reviewerSession, buildResolverContext(successfulProposals, ctx.resolverContextInput), undefined, successfulProposals.map((proposal) => proposal.debater), ctx.agentManager);
+  const outcome = await resolveOutcome(proposalOutputs, rebuttals.map((rebuttal) => rebuttal.output), ctx.stageConfig, ctx.config, { ...ctx.callContext, scopeId: ctx.resolverCallContext?.scopeId ?? ctx.callContext.scopeId }, ctx.storyId, ctx.timeoutSeconds * 1000, ctx.workdir, ctx.featureName, undefined, successfulProposals.map((proposal) => proposal.debater), ctx.agentManager);
   logger?.info("debate", "debate:result", {
     storyId: ctx.storyId,
     stage: ctx.stage,
@@ -47220,8 +47053,6 @@ class DebateRunner {
   featureName;
   timeoutSeconds;
   sessionManager;
-  reviewerSession;
-  resolverContextInput;
   constructor(opts) {
     this.ctx = opts.ctx;
     this.stage = opts.stage;
@@ -47231,8 +47062,6 @@ class DebateRunner {
     this.featureName = opts.featureName ?? opts.stage;
     this.timeoutSeconds = opts.timeoutSeconds ?? opts.stageConfig.timeoutSeconds ?? DEFAULT_TIMEOUT_SECONDS;
     this.sessionManager = opts.sessionManager ?? opts.ctx.runtime?.sessionManager;
-    this.reviewerSession = opts.reviewerSession;
-    this.resolverContextInput = opts.resolverContextInput;
   }
   async run(prompt) {
     const sessionMode = this.stageConfig.sessionMode ?? "one-shot";
@@ -47426,14 +47255,7 @@ ${prompt}`;
         critiqueOutputs = critiqueSettled.filter((r) => r.status === "fulfilled").map((r) => r.value);
       }
       const proposalOutputs = successful.map((p) => p.output);
-      const fullResolverContext = this.resolverContextInput ? {
-        ...this.resolverContextInput,
-        labeledProposals: successful.map((s) => ({
-          debater: buildDebaterLabel(s.debater),
-          output: s.output
-        }))
-      } : undefined;
-      const selectorOutcome = await resolveOutcome(proposalOutputs, critiqueOutputs, this.stageConfig, this.config, { ...this.ctx, scopeId: resolverScope.scopeId }, this.ctx.storyId ?? "", this.timeoutSeconds * 1000, this.workdir, this.featureName, this.reviewerSession, fullResolverContext, undefined, successful.map((s) => s.debater), agentManager);
+      const selectorOutcome = await resolveOutcome(proposalOutputs, critiqueOutputs, this.stageConfig, this.config, { ...this.ctx, scopeId: resolverScope.scopeId }, this.ctx.storyId ?? "", this.timeoutSeconds * 1000, this.workdir, this.featureName, undefined, successful.map((s) => s.debater), agentManager);
       let finalOutcome = selectorOutcome.outcome;
       if (config2.postDebateVerifier) {
         const verifierCtx = {
@@ -47443,8 +47265,8 @@ ${prompt}`;
           selectorResult: selectorOutcome,
           workdir: this.workdir,
           ctx: { ...this.ctx, scopeId: verifierScope.scopeId },
-          acceptanceCriteria: this.resolverContextInput?.story.acceptanceCriteria,
-          blockingThreshold: this.resolverContextInput?.blockingThreshold
+          acceptanceCriteria: undefined,
+          blockingThreshold: undefined
         };
         const verifierResult = await resolvePostDebateVerifier(config2.postDebateVerifier.kind)(verifierCtx);
         finalOutcome = verifierResult.outcome;
@@ -47481,9 +47303,7 @@ ${prompt}`;
       agentManager: this.ctx.runtime.agentManager,
       sessionManager: this.sessionManager ?? this.ctx.runtime.sessionManager,
       runtime: this.ctx.runtime,
-      abortSignal: this.ctx.runtime.signal,
-      reviewerSession: this.reviewerSession,
-      resolverContextInput: this.resolverContextInput
+      abortSignal: this.ctx.runtime.signal
     };
   }
   toPlanCtx() {
@@ -47517,6 +47337,11 @@ var init_runner3 = __esm(() => {
   init_verifiers();
 });
 
+// src/debate/resolvers.ts
+var init_resolvers = __esm(() => {
+  init_prompts();
+});
+
 // src/debate/index.ts
 var init_debate = __esm(() => {
   init_runner3();
@@ -53044,7 +52869,7 @@ function extractPhaseFindings(output) {
     return [];
   }
   const record2 = output;
-  const rawArray = Array.isArray(record2.normalizedFindings) ? record2.normalizedFindings : Array.isArray(record2.findings) ? record2.findings : [];
+  const rawArray = Array.isArray(record2.normalizedFindings) && record2.normalizedFindings.length > 0 ? record2.normalizedFindings : Array.isArray(record2.findings) ? record2.findings : [];
   const findings = rawArray.filter(isFinding);
   const success2 = "success" in record2 ? record2.success === true : ("passed" in record2) ? record2.passed === true : findings.length === 0;
   return success2 ? [] : findings;
@@ -53334,7 +53159,7 @@ async function runRectification(ctx, state, phaseCosts, phaseOutputs) {
     config: { maxAttemptsTotal: rectification.maxAttempts, validatorRetries: 1 },
     validate: async (_validateCtx, opts) => {
       if (ctx.runtime.signal?.aborted)
-        return [];
+        return { findings: [], shortCircuited: false };
       const lite = (opts?.mode ?? "full") === "lite";
       const phases = phasesToRevalidate(opts?.strategiesRun, validationPhases);
       getSafeLogger()?.debug("story-orchestrator", "rectification validate scope", {
@@ -53344,6 +53169,7 @@ async function runRectification(ctx, state, phaseCosts, phaseOutputs) {
         phasesSelected: phases.map((p) => p.kind)
       });
       const findings = [];
+      let shortCircuited = false;
       for (const phase of phases) {
         if (lite && phase.kind === "full-suite-gate") {
           continue;
@@ -53358,10 +53184,12 @@ async function runRectification(ctx, state, phaseCosts, phaseOutputs) {
             storyId: ctx.storyId,
             phase: phase.slot.op.name
           });
+          shortCircuited = true;
           break;
         }
       }
-      return rectification.postValidate ? await rectification.postValidate(findings, _validateCtx) : findings;
+      const validated = rectification.postValidate ? await rectification.postValidate(findings, _validateCtx) : findings;
+      return { findings: validated, shortCircuited };
     }
   };
   const cycleResult = await _storyOrchestratorDeps.runFixCycle(cycle, ctx, "story-orchestrator-rectification", { callOp: wrappedCallOp });
@@ -53393,6 +53221,9 @@ async function runRectification(ctx, state, phaseCosts, phaseOutputs) {
   if (EXHAUSTED_EXIT_REASONS.has(cycleResult.exitReason) && cycleResult.finalFindings.length > 0) {
     return { rectificationExhausted: true, unfixedFindings: cycleResult.finalFindings };
   }
+  if (cycleResult.exitReason === "validate-short-circuit") {
+    return { liteScopeIncomplete: true };
+  }
   return {};
 }
 
@@ -53437,7 +53268,7 @@ class ExecutionPlan {
       }
     }
     const rectResult = await runRectification(this.ctx, this.state, phaseCosts, phaseOutputs);
-    if (this.state.rectification && !rectResult.rectificationExhausted) {
+    if (this.state.rectification && (!rectResult.rectificationExhausted || rectResult.liteScopeIncomplete)) {
       let resumeRectifyUsed = false;
       for (const phase of collectOrderedPhases(this.state)) {
         const name = phase.slot.op.name;
@@ -53601,7 +53432,8 @@ var init_story_orchestrator = __esm(() => {
     "max-attempts-per-strategy",
     "bail-when",
     "no-strategy",
-    "agent-gave-up"
+    "agent-gave-up",
+    "validate-short-circuit"
   ]);
   TDD_OP_NAMES = new Set(["test-writer", "implementer", "verifier"]);
   STRICT_VERDICT_PHASE_NAMES = new Set([
@@ -58017,7 +57849,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.67.19",
+    version: "0.68.0",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -58112,8 +57944,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("e80ba4d6"))
-        return "e80ba4d6";
+      if (/^[0-9a-f]{6,10}$/.test("d56db412"))
+        return "d56db412";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -59462,6 +59294,18 @@ async function handleRunCompletion(options) {
       }
     }
   }
+  let pluginGateFailed = false;
+  const deferredReview = options.deferredReview;
+  if (deferredReview?.anyFailed) {
+    const failedReviewers = deferredReview.reviewerResults.filter((r) => !r.passed).map((r) => r.name);
+    pluginGateFailed = config2.review.pluginMode === "gating";
+    logger?.warn("review", "Deferred plugin reviewer(s) reported failures", {
+      storyId: runId,
+      failedReviewers,
+      pluginMode: config2.review.pluginMode,
+      gating: pluginGateFailed
+    });
+  }
   const aggSnap = options.runtime.costAggregator.snapshot();
   const aggregatorTotal = aggSnap.totalCostUsd;
   const reportedTotal = Math.max(totalCost, aggregatorTotal);
@@ -59610,7 +59454,8 @@ async function handleRunCompletion(options) {
       failed: finalCounts.failed,
       skipped: finalCounts.skipped,
       pending: finalCounts.pending
-    }
+    },
+    pluginGateFailed
   };
 }
 var _runCompletionDeps;
@@ -98175,12 +98020,13 @@ async function runCompletionPhase(options) {
     skipRegression: regressionAlreadyPassed,
     sessionManager: options.sessionManager,
     pluginProviderCache: options.pluginProviderCache,
+    deferredReview: options.deferredReview,
     runtime: options.runtime,
     abortSignal: options.abortSignal
   });
-  const { durationMs, runCompletedAt, finalCounts, reportedTotal } = completionResult;
+  const { durationMs, runCompletedAt, finalCounts, reportedTotal, pluginGateFailed } = completionResult;
   if (options.featureDir) {
-    const finalStatus = isComplete(options.prd) ? "completed" : "failed";
+    const finalStatus = isComplete(options.prd) && !pluginGateFailed ? "completed" : "failed";
     options.statusWriter.setRunStatus(finalStatus);
     await options.statusWriter.writeFeatureStatus(options.featureDir, reportedTotal, options.iterations);
   }
@@ -98210,7 +98056,8 @@ async function runCompletionPhase(options) {
   return {
     durationMs,
     runCompletedAt,
-    acceptancePassed
+    acceptancePassed,
+    pluginGateFailed
   };
 }
 
@@ -98302,7 +98149,14 @@ async function runExecutionPhase(options, prd, pluginRegistry) {
     storiesCompleted,
     totalCost
   });
-  return { prd, iterations, storiesCompleted, totalCost, allStoryMetrics };
+  return {
+    prd,
+    iterations,
+    storiesCompleted,
+    totalCost,
+    allStoryMetrics,
+    deferredReview: unifiedResult.deferredReview
+  };
 }
 
 // src/execution/runner-setup.ts
@@ -98466,13 +98320,14 @@ async function run(options) {
       sessionManager,
       agentManager,
       pluginProviderCache,
+      deferredReview: executionResult.deferredReview,
       runtime,
       abortSignal: shutdownController.signal
     });
-    const { durationMs, acceptancePassed } = completionResult;
+    const { durationMs, acceptancePassed, pluginGateFailed } = completionResult;
     runCompleted = true;
     return {
-      success: isComplete(prd) && acceptancePassed,
+      success: isComplete(prd) && acceptancePassed && !pluginGateFailed,
       iterations,
       storiesCompleted,
       totalCost,

package/package.json

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