audit-tools 0.30.25 → 0.30.27

package/dist/remediate/state/types.js

@@ -30,6 +30,15 @@ export const RemediationBlockSchema = z
      * declared surface is a producer bug, not an implicit empty.
      */
     touched_files: z.array(z.string()),
+    /**
+     * 0-based foundations→consumers phase ordinal (auto-phasing, T3). Derived
+     * mechanically at promotion from the persisted phase cut (the module a block's
+     * obligations belong to). The rolling scheduler treats it as a hard barrier: a
+     * block never dispatches until every lower-ordinal block is verified-complete,
+     * giving a per-phase whole-repo green checkpoint. Optional — absent (or all
+     * blocks sharing one ordinal) means a single phase, i.e. no barrier.
+     */
+    phase_ordinal: z.number().int().nonnegative().optional(),
 })
     .strict();
 export const RemediationPlanSchema = z

package/dist/remediate/state/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/remediate/state/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAQtD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAGvE,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC;KACpC,MAAM,CAAC;IACN,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC1B;;;OAGG;IACH,aAAa,EAAE,CAAC,CAAC,OAAO,EAAE;IAC1B;;;;OAIG;IACH,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC5C;;;;OAIG;IACH,iBAAiB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IACjD;;;;;;OAMG;IACH,aAAa,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;CACnC,CAAC;KACD,MAAM,EAAE,CAAC;AAGZ,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC;KACnC,MAAM,CAAC;IACN,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC;IAChC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,sBAAsB,CAAC;IACvC,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE;IACxB,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACnC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,yBAAyB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC3D,cAAc,EAAE,CAAC;SACd,IAAI,CAAC,CAAC,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;SAC9D,QAAQ,EAAE;IACb,+EAA+E;IAC/E,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,QAAQ,EAAE;CAC/C,CAAC;KACD,MAAM,EAAE,CAAC;AAGZ;;;;;GAKG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,WAAW,EAAE,aAAa;IAC1B,aAAa,EAAE,eAAe;IAC9B,oBAAoB,EAAE,2BAA2B;IACjD,4BAA4B,EAAE,mCAAmC;CACzD,CAAC;AAKX,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC;KAC5B,MAAM,CAAC;IACN,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IACtB,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE;IAC3B,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACjC;;;;;OAKG;IACH,aAAa,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC7C,cAAc,EAAE,CAAC,CAAC,KAAK,CACrB,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CACzE;IACD,oBAAoB,EAAE,CAAC,CAAC,KAAK,CAC3B,CAAC;SACE,MAAM,CAAC;QACN,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;YACX,gBAAgB,CAAC,WAAW;YAC5B,gBAAgB,CAAC,aAAa;YAC9B,gBAAgB,CAAC,oBAAoB;YACrC,gBAAgB,CAAC,4BAA4B;SAC9C,CAAC;QACF,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;KACtB,CAAC;SACD,MAAM,EAAE,CACZ;CACF,CAAC;KACD,MAAM,EAAE,CAAC;AAGZ,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC;KACxC,MAAM,CAAC;IACN,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IACtB,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC;QACf,iBAAiB;QACjB,sBAAsB;QACtB,cAAc;QACd,yBAAyB;QACzB,sBAAsB;QACtB,mBAAmB;QACnB,uBAAuB;KACxB,CAAC;IACF,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;IACvB,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;CACxC,CAAC;KACD,MAAM,EAAE,CAAC;AAGZ,+EAA+E;AAC/E,MAAM,CAAC,MAAM,wBAAwB,GACnC,0BAA0B,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC;AAGpD,uEAAuE;AACvE,MAAM,UAAU,uBAAuB,CACrC,KAAc;IAEd,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACxB,wBAA8C,CAAC,QAAQ,CAAC,KAAK,CAAC,CAChE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC;KACxC,MAAM,CAAC;IACN,+DAA+D;IAC/D,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC1B,6EAA6E;IAC7E,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE;CAC3B,CAAC;KACD,MAAM,EAAE,CAAC;AAGZ,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC;KAC/B,MAAM,CAAC;IACN,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;IAC/B,cAAc,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC9C;;;;OAIG;IACH,cAAc,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACtC;;;;OAIG;IACH,sBAAsB,EAAE,0BAA0B,CAAC,QAAQ,EAAE;CAC9D,CAAC;KACD,MAAM,EAAE,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/remediate/state/types.ts"],"names":[],"mappings":"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"}

package/dist/remediate/steps/contractPipeline.d.ts

@@ -2,12 +2,18 @@ import { type ValidationIssue, type JudgeReport, type SessionConfig } from "audi
 import type { ContractPipelineArtifactName } from "../contractPipeline/artifactStore.js";
 import type { RemediationStep } from "./types.js";
 /**
- * Maximum judge-ordered contract repairs per run. After the cap, the run
- * proceeds to implementation planning with the unrepaired counterexamples
- * carried as residual risks — an unbounded critic↔repair oscillation is the
- * failure mode this exists to prevent.
+ * Runaway backstop for the judge↔repair loop — the LOUD exception path, NOT the
+ * normal terminator. The loop normally terminates by *convergence*: it keeps
+ * repairing only while each round surfaces a genuinely NEW accepted counterexample
+ * (real progress), reaches a fixpoint when the judge approves, and escalates to the
+ * user the moment a round re-accepts an already-addressed counterexample without
+ * progress (a stall/oscillation). This ceiling exists only so a pathological run
+ * that keeps minting brand-new accepted counterexamples forever cannot loop without
+ * bound; hitting it is itself an escalation (loud), never a silent proceed. It is
+ * deliberately generous — a genuinely deep but converging design (each round a new
+ * real defect) must not be cut mid-convergence (the failure mode of the former N=2).
  */
-export declare const MAX_CONTRACT_REPAIR_ITERATIONS = 2;
+export declare const MAX_CONTRACT_REPAIR_ITERATIONS = 8;
 /** Maximum implementation_dag regenerations after traceability rejections. */
 export declare const MAX_DAG_REGENERATION_ATTEMPTS = 2;
 /**

package/dist/remediate/steps/contractPipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contractPipeline.d.ts","sourceRoot":"","sources":["../../../src/remediate/steps/contractPipeline.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"contractPipeline.d.ts","sourceRoot":"","sources":["../../../src/remediate/steps/contractPipeline.ts"],"names":[],"mappings":"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"}

package/dist/remediate/steps/contractPipeline.js

@@ -23,8 +23,10 @@ import { existsSync } from "node:fs";
 import { mkdir, rename } from "node:fs/promises";
 import { join } from "node:path";
 import { writeJsonFile, readOptionalJsonFile, formatValidationIssues, hashContent, isRecord, withFsRetry, captureStepBoundaryFriction, } from "audit-tools/shared";
-import { CP_ARTIFACT_NAMES, contractArtifactExists, contractArtifactFilePath, contractPipelineDir, detectStaleArtifacts, isEnvelope, pathASeedFilePath, readContractArtifact, writeContractArtifact, } from "../contractPipeline/artifactStore.js";
-import { readIntakeRiskSignal, writeIntakeRiskSignal, escalateRiskSignal, decompositionRiskEvidence, adversarialDepthForTier, } from "../riskSignal.js";
+import { CP_ARTIFACT_NAMES, contractArtifactExists, contractArtifactFilePath, contractPipelineDir, detectStaleArtifacts, envelopePayload, isEnvelope, pathASeedFilePath, readContractArtifact, writeContractArtifact, } from "../contractPipeline/artifactStore.js";
+import { readIntakeRiskSignal, writeIntakeRiskSignal, escalateRiskSignal, decompositionRiskEvidence, adversarialDepthForTier, roundTripGranularityForTier, } from "../riskSignal.js";
+import { phaseOrdinalForObligations, moduleSlug, renderPhaseCutSection, } from "../contractPipeline/phaseCut.js";
+import { ensurePhaseCutArtifact, readPhaseCutArtifact } from "../contractPipeline/phaseCutArtifact.js";
 import { detectCyclicSeamObligations, validateCycleBreak, } from "../contractPipeline/cyclicSeamResolution.js";
 import { deriveObligationLedger, buildTestValidatorPlanScaffold, buildImplementationDagScaffold, acceptedCounterexampleIds, } from "../contractPipeline/derive.js";
 import { ensureNodeId, toBlockId } from "../contractPipeline/idRegistry.js";
@@ -60,14 +62,39 @@ const ARTIFACT_TO_PHASE = {
 // ── Phase → step kind mapping ──────────────────────────────────────────────────
 const CONTRACT_STEP_KIND = "contract_pipeline";
 const PRE_IMPLEMENTATION_PHASE_ORDER = CONTRACT_PIPELINE_PHASE_ORDER.filter((phase) => phase !== "closing");
+/**
+ * Granularity collapse group (T1 slice 4b). The framing phases — goal, context,
+ * decomposition — are ONE coherent act of authoring (scope the change top-down):
+ * they carry no adversarial judgment and no deterministic derivation interleaves
+ * them, so for low-complexity work they fold into a single round-trip producing
+ * all three artifacts instead of three gated steps. The group deliberately STOPS
+ * at decomposition (before module_contract_drafting): keeping the decomposition→
+ * drafting boundary lets the slice-4a escalate-on-evidence intercept inspect the
+ * fresh decomposition and raise the tier — un-collapsing every remaining phase —
+ * before any contract is drafted or the per-module wave fans out. Collapse is
+ * best-effort: any member artifact the worker omits or writes malformed is
+ * re-emitted as its own fine-grained step by `nextMissingContractPhase`, so no
+ * work is ever lost. See `roundTripGranularityForTier`.
+ */
+const FRAMING_COLLAPSE_GROUP = [
+    "goal_normalization",
+    "context_collection",
+    "decomposition",
+];
 // ── Bounded-loop caps ─────────────────────────────────────────────────────────
 /**
- * Maximum judge-ordered contract repairs per run. After the cap, the run
- * proceeds to implementation planning with the unrepaired counterexamples
- * carried as residual risks — an unbounded critic↔repair oscillation is the
- * failure mode this exists to prevent.
+ * Runaway backstop for the judge↔repair loop — the LOUD exception path, NOT the
+ * normal terminator. The loop normally terminates by *convergence*: it keeps
+ * repairing only while each round surfaces a genuinely NEW accepted counterexample
+ * (real progress), reaches a fixpoint when the judge approves, and escalates to the
+ * user the moment a round re-accepts an already-addressed counterexample without
+ * progress (a stall/oscillation). This ceiling exists only so a pathological run
+ * that keeps minting brand-new accepted counterexamples forever cannot loop without
+ * bound; hitting it is itself an escalation (loud), never a silent proceed. It is
+ * deliberately generous — a genuinely deep but converging design (each round a new
+ * real defect) must not be cut mid-convergence (the failure mode of the former N=2).
  */
-export const MAX_CONTRACT_REPAIR_ITERATIONS = 2;
+export const MAX_CONTRACT_REPAIR_ITERATIONS = 8;
 /** Maximum implementation_dag regenerations after traceability rejections. */
 export const MAX_DAG_REGENERATION_ATTEMPTS = 2;
 /**
@@ -106,12 +133,6 @@ export async function writeCyclicSeamRepairState(artifactsDir, state) {
     await writeJsonFile(cyclicSeamRepairStatePath(artifactsDir), state);
 }
 // ── Envelope handling ─────────────────────────────────────────────────────────
-/** Payload of a stored artifact whether or not it has been enveloped yet. */
-function envelopePayload(envelope) {
-    if (!envelope)
-        return undefined;
-    return isEnvelope(envelope) ? envelope.payload : envelope;
-}
 /**
  * Render a pre-filled skeleton section (S3 scaffold) for the partially-derivable
  * phases. The tool derives the structure/ids/cross-refs from the already-present
@@ -318,11 +339,26 @@ function inferRepairDirective(judge) {
         instruction: "Address every judge-accepted counterexample in the judge report's classifications.",
     };
 }
+/** Judge-accepted counterexample ids from a judge report's classifications. */
+function acceptedCeIdsOf(judge) {
+    return (judge?.classifications ?? [])
+        .filter((c) => c.classification === "accepted")
+        .map((c) => c.counterexample_id);
+}
 /**
- * Decide whether implementation planning may proceed: an approved judge
- * verdict proceeds; a failing verdict triggers one targeted repair per judge
- * report, capped at MAX_CONTRACT_REPAIR_ITERATIONS — after the cap, the run
- * proceeds with the unrepaired counterexamples recorded as residual risks.
+ * Decide whether implementation planning may proceed. Convergence-terminated,
+ * NOT capped at an arbitrary count:
+ *   - approved verdict ⇒ proceed (the fixpoint);
+ *   - a needs_repair verdict that surfaces a NEW accepted counterexample (one not
+ *     already addressed by a prior repair) ⇒ repair (genuine progress);
+ *   - a needs_repair verdict whose accepted counterexamples were ALL already
+ *     addressed ⇒ escalate (stall/oscillation — the repair loop is not converging,
+ *     surface the outstanding counterexamples to the user instead of silently
+ *     shipping residual risk or looping);
+ *   - the runaway backstop (MAX_CONTRACT_REPAIR_ITERATIONS) ⇒ escalate (loud).
+ * The former fixed N=2 cap that proceeded-with-residual-risk at an arbitrary count
+ * is gone: a deep-but-converging run is no longer cut mid-convergence, and a
+ * genuinely non-converging run is surfaced rather than buried.
  */
 async function evaluateJudgeGate(artifactsDir) {
     const judgeEnvelope = await readContractArtifact(artifactsDir, "judge_report");
@@ -334,12 +370,6 @@ async function evaluateJudgeGate(artifactsDir) {
     const repairState = await readRepairState(artifactsDir);
     const judgeHash = judgeEnvelope.content_hash;
     const alreadyHandled = repairState.repairs.some((repair) => repair.judge_hash === judgeHash);
-    if (!alreadyHandled && repairState.repairs.length >= MAX_CONTRACT_REPAIR_ITERATIONS) {
-        return {
-            kind: "proceed_residual",
-            note: `The judge verdict remains "needs_repair" after ${repairState.repairs.length} repair iteration(s) (the cap). Proceed anyway: treat every judge-accepted counterexample that remains unaddressed as a residual risk, and cover each one with an implementation or verification node.`,
-        };
-    }
     // Map judge.repair_directive.target if present; if absent, infer from classifications.
     const rawDirective = judge.repair_directive;
     const directive = rawDirective
@@ -350,7 +380,36 @@ async function evaluateJudgeGate(artifactsDir) {
             instruction: rawDirective.instruction,
         }
         : inferRepairDirective(judge);
-    return { kind: "repair", directive, judgeHash };
+    const acceptedIds = acceptedCeIdsOf(judge);
+    const addressed = new Set(repairState.repairs.flatMap((r) => r.accepted_ce_ids ?? []));
+    const newAccepted = acceptedIds.filter((id) => !addressed.has(id));
+    // Idempotent re-entry: this exact judge report already drove a repair (its hash
+    // is recorded). Re-emit the same repair directive; do not re-evaluate convergence
+    // (the repair has not yet produced a fresh judge report).
+    if (alreadyHandled) {
+        return { kind: "repair", directive, judgeHash, acceptedCeIds: newAccepted };
+    }
+    // Runaway backstop (loud) — the exception path, not the normal terminator.
+    if (repairState.repairs.length >= MAX_CONTRACT_REPAIR_ITERATIONS) {
+        return {
+            kind: "escalate",
+            reason: "runaway",
+            outstanding: acceptedIds,
+            note: `The judge↔repair loop reached its runaway backstop (${repairState.repairs.length} repair rounds) without converging. Each round was still surfacing accepted counterexamples. This is pathological non-convergence — review the outstanding counterexamples and the contract design with the user before proceeding.`,
+        };
+    }
+    // Progress: a new accepted counterexample (or the first round) ⇒ repair.
+    if (repairState.repairs.length === 0 || newAccepted.length > 0) {
+        return { kind: "repair", directive, judgeHash, acceptedCeIds: newAccepted };
+    }
+    // Stall: a needs_repair verdict whose every accepted counterexample was already
+    // addressed by a prior repair ⇒ the loop is not converging ⇒ escalate.
+    return {
+        kind: "escalate",
+        reason: "stall",
+        outstanding: acceptedIds,
+        note: `The judge re-accepted counterexample(s) that a prior repair already addressed (${acceptedIds.join(", ") || "none newly accepted"}), with no new accepted counterexample this round. The repair loop is not converging on these items. Resolve them with the user — adjust the contract design or accept the counterexamples as known limitations — before the plan can be promoted.`,
+    };
 }
 /**
  * The traceability invariant: no implementation_dag node may exist without
@@ -777,6 +836,45 @@ After writing the output file, run:
             stopCondition: `Stop after writing the contract-pipeline output for phase "${phase}" and running next-step.`,
         });
     };
+    // T1 slice 4b: emit ONE round-trip whose prompt concatenates the rendered
+    // specs of several consecutive authoring phases. The worker writes every
+    // named artifact top-down (each later phase's inputs are the files it wrote in
+    // the earlier sections of the same round-trip), then runs next-step once. The
+    // group header overrides the per-section "stop after writing" lines so they are
+    // not read as three separate stop points.
+    const buildCollapsedFramingStep = (phases) => {
+        const sections = phases.map((phase) => {
+            const rendered = renderContractPipelinePrompt({
+                role: phase,
+                artifactPaths,
+                sourcePaths,
+                repoRoot: root,
+                pathASeedPath,
+                hostCanDispatchSubagents: options.hostCanDispatchSubagents,
+                adversarialDepth,
+            });
+            return { phase, rendered };
+        });
+        const outputPaths = sections.map((s) => s.rendered.outputPath);
+        const header = `# Collapsed Authoring Round-Trip — ${phases.length} Phases
+
+This is a low-complexity change, so these ${phases.length} coherent authoring phases are combined into a SINGLE round-trip. Complete EVERY section below — author them top-down, writing each artifact to its named path (each later section's inputs are the files you write in the earlier sections of this same round-trip). Then run next-step ONCE.
+
+Treat any per-section "Stop after writing the output file / do not advance" instruction as scoped to that section only — it does NOT mean stop the round-trip. Finish all sections first.
+
+If you cannot complete a section (an artifact would be malformed), write the ones you can and run next-step: the pipeline re-emits any missing or invalid artifact as its own fine-grained step, so no work is lost.
+
+Artifacts to produce (in order):
+${outputPaths.map((p, i) => `${i + 1}. \`${p}\` (${phases[i]})`).join("\n")}`;
+        const body = sections
+            .map((s) => `\n---\n\n${s.rendered.prompt}`)
+            .join("\n");
+        return buildStep({
+            prompt: `${header}\n${body}`,
+            outputPath: outputPaths[outputPaths.length - 1],
+            stopCondition: `Stop after writing all ${phases.length} collapsed-framing artifacts (${phases.join(", ")}) and running next-step once.`,
+        });
+    };
     const buildParallelModuleWaveStep = async (phase) => {
         // DC-3: fan the phase out to ONE agent per module, concurrency-capped by the
         // shared wave scheduler (the same quota/host machinery implement dispatch
@@ -1061,8 +1159,10 @@ ${rejectionRewriteInstruction(archived.archivedPath)}`);
             return buildNextContractPipelineStep(options);
         }
     }
-    // 3. Judge gate: implementation planning is reachable only through an
-    //    approved verdict, a bounded targeted repair, or the repair cap.
+    // 3. Judge gate: implementation planning is reachable only through an approved
+    //    verdict (the fixpoint) or a convergent targeted repair. A stalled /
+    //    non-converging repair loop escalates to the user (blocked) instead of
+    //    silently proceeding with residual risk.
     if (nextPhase === "implementation_planning") {
         const gate = await evaluateJudgeGate(artifactsDir);
         if (gate.kind === "repair") {
@@ -1073,6 +1173,7 @@ ${rejectionRewriteInstruction(archived.archivedPath)}`);
                     judge_hash: gate.judgeHash,
                     target: repairTarget,
                     at: new Date().toISOString(),
+                    accepted_ce_ids: gate.acceptedCeIds,
                 });
                 await writeRepairState(artifactsDir, repairState);
             }
@@ -1088,11 +1189,37 @@ ${rejectionRewriteInstruction(archived.archivedPath)}`);
                 stopCondition: `Stop after rewriting "${repairTarget}" per the judge repair directive and running next-step.`,
             });
         }
-        if (gate.kind === "proceed_residual") {
-            return buildPhaseStep("implementation_planning", `## Repair Cap Reached — Residual Risks
+        if (gate.kind === "escalate") {
+            // Non-convergence (stall or runaway backstop): surface it to the user
+            // loudly rather than promoting a plan over an un-converged contract. The
+            // outstanding accepted counterexamples are named so the user can resolve
+            // them (revise the contract design or accept them as known limitations).
+            await captureStepBoundaryFriction(artifactsDir, runId, {
+                eventType: "repair_round",
+                discriminator: `judge_nonconvergence:${gate.reason}`,
+                note: `Judge↔repair loop escalated (${gate.reason}): ${gate.note}`,
+                category: "trap",
+            }, "remediate-code");
+            return writeCurrentStep({
+                stepKind: CONTRACT_STEP_KIND,
+                status: "blocked",
+                runId,
+                repoRoot: root,
+                artifactsDir,
+                prompt: `# Judge↔Repair Loop Did Not Converge
 
 ${gate.note}
-`);
+
+## Outstanding accepted counterexamples
+
+${gate.outstanding.length > 0
+                    ? gate.outstanding.map((id) => `- ${id}`).join("\n")
+                    : "_(none newly accepted this round)_"}
+
+Read the judge_report and counterexample artifacts, decide with the user how to resolve each outstanding counterexample (revise the contract design and re-run, or accept it as a known limitation), then re-run next-step.`,
+                allowedCommands: [],
+                stopCondition: "Stop — the contract pipeline is blocked on a non-converging judge↔repair loop pending a user decision.",
+            });
         }
         // gate.kind === "proceed": fall through to the normal phase step below.
     }
@@ -1601,6 +1728,39 @@ ${preCriticCitationGate.errorLines.join("\n")}
         }
         return buildParallelModuleWaveStep(nextPhase);
     }
+    // Auto-phasing (T3): at the conceptual-design critique, hand the critic the
+    // tool-DERIVED phase cut so it assesses design quality WITHIN a mechanically
+    // dependency-ordered foundations→consumers phasing, instead of rejecting an
+    // arbitrary N-goal change as "over-scoped" and forcing the host to re-scope by
+    // hand at intake. The cut is derived deterministically from the finalized module
+    // contracts' directional neighbor_needs edges (present by the critique phase) and
+    // PERSISTED as the `phase_cut.json` sidecar here, so the cut the critic sees and
+    // the cut the implementation-DAG promotion enforces are one source. Only injected
+    // into the prompt when there is a genuine multi-phase cut to communicate.
+    if (nextPhase === "critique") {
+        const cut = await ensurePhaseCutArtifact(artifactsDir);
+        if (cut && cut.phases.length > 1) {
+            const reReview = await buildReReviewSection(nextPhase, artifactsDir);
+            const phaseCutSection = renderPhaseCutSection(cut);
+            return buildPhaseStep("critique", reReview ? `${phaseCutSection}\n${reReview}` : phaseCutSection);
+        }
+    }
+    // Granularity collapse (T1 slice 4b): for low-complexity work, fold the framing
+    // suffix [nextPhase..decomposition] into ONE round-trip producing several
+    // artifacts, instead of one gated step per phase. Reads the POST-escalation
+    // riskSignal (slice 4a may have already raised the tier above), so the dial is
+    // never frozen at run start — `fine` for medium/high keeps full per-phase
+    // isolation. Only collapses a genuine multi-phase suffix; a single trailing
+    // framing phase falls through to the normal per-phase dispatch below.
+    if (nextPhase &&
+        roundTripGranularityForTier(riskSignal?.tier) === "collapsed" &&
+        FRAMING_COLLAPSE_GROUP.includes(nextPhase)) {
+        const startIdx = FRAMING_COLLAPSE_GROUP.indexOf(nextPhase);
+        const suffix = FRAMING_COLLAPSE_GROUP.slice(startIdx);
+        if (suffix.length > 1) {
+            return buildCollapsedFramingStep([...suffix]);
+        }
+    }
     // Skeleton-scaffolded phases (S3): the tool pre-fills structure/ids from the
     // derived obligation ledger so the worker fills only the judgment slots.
     if (nextPhase === "test_validator_plan" || nextPhase === "implementation_planning") {
@@ -1683,6 +1843,22 @@ export async function promoteImplementationDagToExtractedPlan(artifactsDir) {
             obligationMap.set(obl.id, obl.kind);
         }
     }
+    // Auto-phasing (T3): read the persisted phase cut and re-key its module-phase
+    // map by `moduleSlug(name)` — the fragment the obligation ledger encodes into
+    // `OBL-<slug>-…` ids. The block phase ordinal is then derived MECHANICALLY from
+    // each node's obligations (never trusting a worker-carried field, which a node
+    // merge could drop), so a foundation block always sorts below the consumers that
+    // depend on it. Absent cut (single module / no finalized contracts) → no
+    // ordinals, i.e. one phase, no barrier.
+    const phaseCut = await readPhaseCutArtifact(artifactsDir);
+    const slugToOrdinal = new Map();
+    if (phaseCut) {
+        for (const [name, ordinal] of Object.entries(phaseCut.module_phase)) {
+            slugToOrdinal.set(moduleSlug(name), ordinal);
+        }
+    }
+    const lastOrdinal = Math.max(0, ...slugToOrdinal.values());
+    const hasMultiPhase = phaseCut ? phaseCut.phases.length > 1 : false;
     const nodes = Array.isArray(dag?.nodes) ? dag.nodes : [];
     const findings = nodes.map((node, index) => {
         const id = ensureNodeId(node.id, index);
@@ -1755,6 +1931,15 @@ export async function promoteImplementationDagToExtractedPlan(artifactsDir) {
         const touchedFiles = [
             ...new Set(node.output_files ?? node.files_likely_touched ?? []),
         ];
+        // Phase ordinal from the union of this node's obligations (max → fail-toward-
+        // later). Only stamped when there is a genuine multi-phase cut, so a single-
+        // phase change carries no ordinal and the scheduler runs no barrier.
+        const phaseOrdinal = hasMultiPhase
+            ? phaseOrdinalForObligations([
+                ...(node.satisfies_obligations ?? []),
+                ...(node.verification_obligation_ids ?? []),
+            ], slugToOrdinal, lastOrdinal)
+            : undefined;
         return {
             block_id: toBlockId(nodeId),
             items: [nodeId],
@@ -1765,6 +1950,7 @@ export async function promoteImplementationDagToExtractedPlan(artifactsDir) {
             // touched_files is REQUIRED on the block contract; promote the node's
             // declared write scope so the file-ownership scheduler can read it.
             touched_files: touchedFiles,
+            ...(phaseOrdinal !== undefined ? { phase_ordinal: phaseOrdinal } : {}),
             ...(node.targeted_commands && node.targeted_commands.length > 0
                 ? { targeted_commands: [...node.targeted_commands] }
                 : {}),