loopforge 3.0.0 → 3.6.0

package/dist/canonical-state.d.ts.map

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

package/dist/canonical-state.js

@@ -4,11 +4,9 @@
  * consume the same value so they cannot silently drift apart.
  */
 import { createHash } from "node:crypto";
-import { deriveItemId, deriveTodoId } from "./derive-id.js";
-import { unique } from "./token-utils.js";
+import { deriveItemId, STABLE_ID_RE, unique } from "./token-utils.js";
 import { getPolicy } from "./policy.js";
-import { deriveGate } from "./cognitive-governance.js";
-export const CANONICAL_STATE_FORMAT = "loopforge.state";
+export const CANONICAL_STATE_SCHEMA_VERSION = 1;
 // unique() imported from token-utils.ts
 /** Deterministic JSON serialization used by state and prompt hashes. */
 export function stableStringify(value) {
@@ -48,8 +46,7 @@ function addListWithIds(lines, title, values, prefix) {
         if (!trimmed)
             continue;
         // If the value is already an ID, render it as-is
-        const idRegex = /^(c|cr|sg)-[a-f0-9]{8}$/;
-        if (idRegex.test(trimmed)) {
+        if (STABLE_ID_RE.test(trimmed)) {
             lines.push(`- [\`${trimmed}\`] ${trimmed}`);
         }
         else if (idEnabled) {
@@ -62,13 +59,144 @@ function addListWithIds(lines, title, values, prefix) {
     }
     lines.push("");
 }
+/** v3.3.1: Identity-aware variant of addListWithIds for the merged active
+ *  constraint set (hard/plan/criteria/discovered texts together). Each
+ *  item's ID comes from constraint metadata — criteria texts keep their
+ *  cr-XXXXXXXX identity, matching the Success Criteria section and the
+ *  verification gate's ID-first criterion matching. Keeps the state file in
+ *  the same identity namespace as the prompts (module contract: both
+ *  renderers cannot drift apart). */
+function addListWithIdentities(lines, title, values, metadata) {
+    if (values.length === 0)
+        return;
+    const idEnabled = getPolicy().evolution.constraint_id_enabled;
+    const idByText = new Map(metadata.map((meta) => [meta.text, meta.id]));
+    lines.push(`## ${title}`, "");
+    for (const value of values) {
+        const trimmed = value.trim();
+        if (!trimmed)
+            continue;
+        if (STABLE_ID_RE.test(trimmed)) {
+            lines.push(`- [\`${trimmed}\`] ${trimmed}`);
+        }
+        else if (idEnabled) {
+            const id = idByText.get(trimmed) ?? `c-${deriveItemId(trimmed)}`;
+            lines.push(`- [\`${id}\`] ${trimmed}`);
+        }
+        else {
+            lines.push(`- ${trimmed}`);
+        }
+    }
+    lines.push("");
+}
 /** Human/Agent-readable materialized view. It is always reproducible from the
  * canonical state and is never consulted as transaction truth. */
+/** v3.3: Forward-looking "roadmap" view derived from existing state — loop
+ *  position, met/remaining criteria (with IDs), and sub-goal activity.
+ *
+ *  Deliberately label-free: milestone labels/ranges are collapsed content in
+ *  L1 (the diff-collapse invariant) and are rendered in full by Phase
+ *  History everywhere else — the roadmap only reports "N rounds since the
+ *  last milestone boundary", never the boundary's identity. Next action is
+ *  likewise excluded: every level renders its own Next Action section.
+ *  Shared by the state-file and prompt renderers so they cannot silently
+ *  drift apart (module contract above). Returns [] — renders nothing —
+ *  when the state carries none of these. Presentation only; never feeds
+ *  enforcement. */
+export function buildRoadmap(state) {
+    const lastMilestone = state.milestones.length > 0
+        ? state.milestones[state.milestones.length - 1]
+        : null;
+    const roundsSinceMilestone = lastMilestone !== null &&
+        lastMilestone.round_range.end <= state.round
+        ? state.round - lastMilestone.round_range.end
+        : null;
+    const met = state.criterionStatuses.filter((cs) => cs.status === "met").length;
+    const total = state.criterionStatuses.length;
+    const remaining = state.criterionStatuses.filter((cs) => cs.status === "remaining" || cs.status === "unknown");
+    const inProgress = state.subGoals.filter((sg) => sg.status === "in_progress").length;
+    const pending = state.subGoals.filter((sg) => sg.status === "pending").length;
+    // Bare position alone is not forward information — no milestone distance,
+    // criteria, remaining criteria, or sub-goal activity means nothing to
+    // look ahead to. Returns [] so empty states render no section at all.
+    if (roundsSinceMilestone === null && total === 0 &&
+        state.remainingCriteria.length === 0 && inProgress === 0 && pending === 0) {
+        return [];
+    }
+    const lines = [];
+    let position = `Position: round ${state.round}/${state.maxRounds}`;
+    if (roundsSinceMilestone !== null) {
+        position += ` · ${roundsSinceMilestone} round${roundsSinceMilestone === 1 ? "" : "s"} since the last milestone boundary`;
+    }
+    lines.push(`- ${position}`);
+    if (total > 0) {
+        lines.push(`- Criteria: ${met}/${total} met · ${remaining.length} remaining`);
+    }
+    else if (state.remainingCriteria.length > 0) {
+        lines.push(`- Criteria: ${state.remainingCriteria.length} remaining`);
+    }
+    if (remaining.length > 0) {
+        const idEnabled = getPolicy().evolution.constraint_id_enabled;
+        for (const cs of remaining.slice(0, 8)) {
+            const idTag = idEnabled ? ` [\`${cs.id}\`]` : "";
+            const icon = cs.status === "remaining" ? "⬜" : "❔";
+            lines.push(`  - ${icon}${idTag} ${cs.text}`);
+        }
+        if (remaining.length > 8) {
+            lines.push(`  - ... and ${remaining.length - 8} more`);
+        }
+    }
+    if (inProgress > 0 || pending > 0) {
+        lines.push(`- Sub-goals: ${inProgress} in progress · ${pending} pending`);
+    }
+    return lines;
+}
+/** v3.3/v3.4: Render the ACTIVE Round Contract as the Current Task section
+ *  body — the single formatting source shared by prompts and the state
+ *  file (module contract above). The original objective is NOT here: it
+ *  lives in the Objective section. Empty arrays render no line. */
+export function formatRoundContract(contract) {
+    const lines = [];
+    const heading = contract.work_item?.trim();
+    lines.push(`**${heading || "Round Contract"}**`);
+    for (const item of contract.done_when) {
+        lines.push(`- Done when: ${item}`);
+    }
+    for (const item of contract.verification_plan) {
+        lines.push(`- Verify via: ${item}`);
+    }
+    for (const item of contract.scope) {
+        lines.push(`- Scope: ${item}`);
+    }
+    return lines.join("\n");
+}
+// ═══════════════════════════════════════════════════════════════════════════
+// v3.3.1: Shared presentation atoms
+// ═══════════════════════════════════════════════════════════════════════════
+/** The trust bar line ("██████░░░░ 60%"). The L2 Agent Trust section and the
+ *  detailed L1 renderer used to carry private copies of this formula — shared
+ *  here so a formatting change is made once (module contract: renderers must
+ *  not silently drift apart). */
+export function trustBarLine(score) {
+    const barLen = 10;
+    const filled = Math.round(score * barLen);
+    const bar = "█".repeat(filled) + "░".repeat(barLen - filled);
+    return `${bar} ${(score * 100).toFixed(0)}%`;
+}
+/** Milestone heading line ("**🏁 Round 7** (Rounds 3–7, 60%)"). Shared by the
+ *  L2 Phase History and the detailed L1 renderer; the L1 copy previously
+ *  rendered the range as "R3–R7", a format only this heading used. */
+export function milestoneHeading(milestone) {
+    const kindIcon = milestone.kind === "agent_declared"
+        ? "🏁"
+        : milestone.kind === "criteria_milestone" ? "✅" : "📍";
+    return `**${kindIcon} ${milestone.label}** (Rounds ${milestone.round_range.start}–${milestone.round_range.end}, ${(milestone.progress_at_boundary * 100).toFixed(0)}%)`;
+}
 export function renderCanonicalStateMarkdown(state) {
     const lines = [
         `# LoopForge State — ${state.loopId}`,
         "",
-        `**Format**: ${state.format}`,
+        `**Schema**: ${state.schemaVersion}`,
         `**Round**: ${state.round}/${state.maxRounds}`,
         `**Goal ID**: ${state.goalId}`,
         "",
@@ -76,34 +204,21 @@ export function renderCanonicalStateMarkdown(state) {
         "",
         state.objective,
         "",
-        "## Current Focus",
-        "",
-        state.currentFocus,
+        "## Current Task",
         "",
+        state.currentTask,
     ];
-    if (state.todoProjection) {
-        lines.push("## Active Todo Projection", "", state.todoProjection.action, "", `**Completion Signal**: ${state.todoProjection.completionSignal}`, "");
-    }
-    if (state.activeGate) {
-        lines.push("## Active Gate", "");
-        if (state.activeGate.kind === "user") {
-            lines.push(`**Owner**: user`, `**Question**: ${state.activeGate.question}`);
-        }
-        else {
-            lines.push(`**Owner**: agent`, `**Problem**: ${state.activeGate.problem}`);
-        }
-        lines.push("");
-    }
     // v2.11: Success Criteria and Constraints render with stable IDs for exact agent matching
     addListWithIds(lines, "Success Criteria", state.successCriteria, "cr");
     addListWithIds(lines, "Hard Constraints", state.hardConstraints, "c");
-    addListWithIds(lines, "Active Constraints", state.activeConstraints, "c");
+    addListWithIdentities(lines, "Active Constraints", state.activeConstraints, state.constraintMetadata);
     addList(lines, "Changes Since Last Round", state.changesSinceLastRound);
     if (state.progress.estimate !== null ||
         state.progress.criteriaMet.length > 0 ||
         state.progress.criteriaRemaining.length > 0 ||
         state.progress.filesChanged.length > 0 ||
-        state.progress.tests !== null) {
+        state.progress.tests !== null ||
+        state.machineStatus !== undefined) {
         const total = state.progress.criteriaMet.length + state.progress.criteriaRemaining.length;
         lines.push("## Progress Dashboard", "");
         if (total > 0) {
@@ -111,6 +226,21 @@ export function renderCanonicalStateMarkdown(state) {
         }
         if (state.progress.estimate !== null) {
             lines.push(`**Estimated Completion**: ${(state.progress.estimate * 100).toFixed(0)}%`);
+            // v3.3: honest labeling — the estimate is the agent's own number.
+            lines.push("**Signal source**: self-reported estimate (unverified until machine-backed)");
+        }
+        // v3.3: machine side of the comparison — git motion over committed rounds
+        // (v3.6: the object always carries definite values — no "unavailable" arm).
+        if (state.machineStatus) {
+            const ms = state.machineStatus;
+            const motion = ms.gitMotion
+                ? `changes observed in ${ms.motionRounds}/${ms.windowRounds} recent committed rounds`
+                : `no git changes in the last ${ms.windowRounds} committed rounds`;
+            lines.push(`**Machine (git)**: ${motion}`);
+        }
+        if (state.criterionStatuses.length > 0) {
+            const metCount = state.criterionStatuses.filter((cs) => cs.status === "met").length;
+            lines.push(`**Machine (criteria)**: ${metCount}/${state.criterionStatuses.length} met across committed rounds`);
         }
         if (state.progress.tests) {
             lines.push(`**Tests**: ${state.progress.tests.passed} passed, ` +
@@ -123,13 +253,42 @@ export function renderCanonicalStateMarkdown(state) {
         }
         lines.push("");
     }
+    // v3.2: Goal → criteria → evidence vertical view. IDs follow
+    // constraint_id_enabled like every other ID-rendering path.
+    if (state.criterionStatuses.length > 0) {
+        const idEnabled = getPolicy().evolution.constraint_id_enabled;
+        lines.push("## Goal → Criteria", "");
+        for (const cs of state.criterionStatuses) {
+            const icon = cs.status === "met" ? "✅" : cs.status === "remaining" ? "⬜" : "❔";
+            const idTag = idEnabled ? ` [\`${cs.id}\`]` : "";
+            const met = cs.met_at_round !== undefined ? ` (met R${cs.met_at_round})` : "";
+            const related = cs.related_subgoal_ids.length > 0
+                ? ` (related: ${cs.related_subgoal_ids.join(", ")})`
+                : "";
+            lines.push(`- ${icon}${idTag} ${cs.text}${met}${related}`);
+        }
+        lines.push("");
+    }
     addListWithIds(lines, "Remaining", state.remainingCriteria, "cr");
     addList(lines, "Blockers", state.blockers);
     addList(lines, "Discoveries", state.discoveries);
     addList(lines, "Cross-Round Outcomes", state.rollingOutcomes);
     addList(lines, "Recurring Issues", state.recurringIssues);
     addList(lines, "Failed Patterns", state.failedPatterns);
-    addList(lines, "Regression Obligations", state.regressionObligations.map((obligation) => `[${obligation.status}] ${obligation.description}`));
+    // v3.2: Lessons learned — repeated violations / verification failures.
+    if (state.lessons.length > 0) {
+        lines.push("## Lessons Learned", "");
+        for (const lesson of state.lessons.slice(0, 8)) {
+            const icon = lesson.kind === "constraint_violation"
+                ? "🚫"
+                : lesson.kind === "verification_error" ? "⚠️" : "ℹ️";
+            lines.push(`- ${icon} ${lesson.text} — ${lesson.count}× (R${lesson.rounds.join(", R")})`);
+        }
+        if (state.lessons.length > 8) {
+            lines.push(`- ... and ${state.lessons.length - 8} more`);
+        }
+        lines.push("");
+    }
     addList(lines, "Retired Constraints", state.retiredConstraints);
     if (state.inactiveConstraints.length > 0) {
         lines.push("## Inactive Constraints", "");
@@ -150,6 +309,17 @@ export function renderCanonicalStateMarkdown(state) {
         }
         lines.push("");
     }
+    if (state.nextAction) {
+        lines.push("## Next Action", "", state.nextAction, "");
+    }
+    // v3.3: Forward-looking roadmap — same buildRoadmap the prompts render.
+    const roadmap = buildRoadmap(state);
+    if (roadmap.length > 0) {
+        lines.push("## Roadmap", "");
+        for (const line of roadmap)
+            lines.push(line);
+        lines.push("");
+    }
     if (state.verificationFlags.length > 0) {
         lines.push("## Verification", "");
         for (const flag of state.verificationFlags) {
@@ -157,13 +327,26 @@ export function renderCanonicalStateMarkdown(state) {
         }
         lines.push("");
     }
-    if (state.phaseHistory.length > 0) {
+    if (state.milestones.length > 0) {
         lines.push("## Phase History", "");
-        for (const phase of state.phaseHistory) {
-            const range = phase.closedAtRound
-                ? `R${phase.enteredAtRound}-R${phase.closedAtRound}`
-                : `R${phase.enteredAtRound}-current`;
-            lines.push(`### ${phase.label}`, `Range: ${range} | Status: ${phase.status}`, "", `**Outcome**: ${phase.outcome}`, "");
+        for (const m of state.milestones) {
+            const kindIcon = m.kind === "agent_declared"
+                ? "🏁"
+                : m.kind === "criteria_milestone" ? "✅" : "📍";
+            lines.push(`### ${kindIcon} ${m.label}`, `Rounds ${m.round_range.start}–${m.round_range.end} | ` +
+                `Progress: ${(m.progress_at_boundary * 100).toFixed(0)}%`, "", `**Outcome**: ${m.outcome}`, "");
+            if (m.carried_constraints.length > 0) {
+                lines.push("**Carried Constraints**:");
+                for (const c of m.carried_constraints)
+                    lines.push(`- ${c}`);
+                lines.push("");
+            }
+            if (m.resolved_constraints.length > 0) {
+                lines.push("**Resolved During Phase**:");
+                for (const c of m.resolved_constraints)
+                    lines.push(`- ${c}`);
+                lines.push("");
+            }
         }
     }
     if (state.subGoals.length > 0) {
@@ -197,196 +380,89 @@ export function renderCanonicalStateMarkdown(state) {
             : "—";
         lines.push("## Agent Trust", "", `${bar} ${(state.agentTrustScore * 100).toFixed(0)}%`, `Trend (last ${state.agentTrustTrend.length}): ${state.agentTrustTrend.join(" → ")}`, `Average: ${avg}`, "");
     }
-    if (state.loopSynthesis) {
-        lines.push("## Loop Summary", "", state.loopSynthesis, "");
-    }
     if (state.externalContext) {
         lines.push("## External Context", "", state.externalContext, "");
     }
     return lines.join("\n").trimEnd() + "\n";
 }
-export function createCanonicalLoopState(request, response, stateFilePath) {
-    const last = request.last_round_view;
+export function createCanonicalLoopState(request, response, stateFilePath, 
+/** v3.3: Display-only derived data (round stats, machine git-motion).
+ *  Optional 4th param — callers that predate v3.3 stay on 3-arg calls. */
+derived) {
+    const last = request.last_round_result;
     const objective = response.loop_objective;
     const verificationFlags = request.verification_flags ?? [];
     const rolling = response.rolling_summary;
-    const evidence = last?.evidence;
+    const executionEvidence = last?.execution_evidence;
     const changes = unique([
         request.new_since_last_round,
-        last?.summary,
-        ...(last?.discoveries?.wrongAssumptions ?? []).map((value) => `Corrected assumption: ${value}`),
+        last?.output_summary,
+        ...(last?.wrong_assumptions ?? []).map((value) => `Corrected assumption: ${value}`),
     ]);
     const discoveries = unique([
-        ...(last?.discoveries?.newConstraints ?? []),
-        ...(last?.discoveries?.emergedWork ?? []),
-        ...(response.projection?.discoveredFacts ?? []),
+        ...(last?.discovered_constraints ?? []),
+        ...(last?.emerged_subtasks ?? []),
     ]);
     const blockers = unique([
-        ...(last?.violations ?? []),
+        ...(last?.constraint_violations ?? []),
+        last?.manual_fixes_needed,
         request.rejection_notice,
-        ...(response.projection?.activeBlockers ?? []),
+        ...response.warnings,
     ]);
-    const verifiedFacts = unique(response.projection?.verifiedFacts ?? []);
-    const successCriteria = unique(objective?.success_criteria ?? []);
-    const criterionMatches = (criterion) => {
-        const normalizedCriterion = criterion.trim().replace(/\s+/g, " ").toLowerCase();
-        return verifiedFacts.some((fact) => {
-            const normalizedFact = fact.trim().replace(/\s+/g, " ").toLowerCase();
-            return normalizedFact === normalizedCriterion || normalizedFact === `cr-${deriveItemId(criterion)}`;
-        });
-    };
-    const remainingCriteria = successCriteria.filter((criterion) => !criterionMatches(criterion));
-    const criteriaMet = successCriteria.filter(criterionMatches);
-    const issueObligations = [...new Set(rolling?.recurring_issues ?? [])]
-        .filter((issue) => /regress|回归|compatib|兼容|must remain|不能丢/i.test(issue))
-        .map((description, index) => ({
-        id: `reg-${deriveItemId(description)}`,
-        description,
-        sourceRound: Math.max(1, request.round - index),
-        evidenceRefs: [],
-        status: "open",
-    }));
-    const regressionObligations = response.projection?.regressionObligations?.length
-        ? response.projection.regressionObligations
-        : issueObligations;
-    const phaseHistory = (rolling?.milestones ?? []).map((milestone, index) => ({
-        id: `phase-${milestone.generated_at_round}-${index + 1}`,
-        label: milestone.label,
-        status: "completed",
-        enteredAtRound: milestone.round_range.start,
-        closedAtRound: milestone.round_range.end,
-        outcome: milestone.outcome,
-        evidenceRefs: [],
-    }));
-    const lastClosedPhase = phaseHistory.at(-1);
-    if (lastClosedPhase) {
-        phaseHistory.push({
-            id: `phase-active-${lastClosedPhase.closedAtRound + 1}`,
-            label: `After ${lastClosedPhase.label}`,
-            status: "active",
-            enteredAtRound: lastClosedPhase.closedAtRound + 1,
-            outcome: "Work after the latest verified phase boundary is in progress.",
-            evidenceRefs: [],
-        });
-    }
-    else {
-        phaseHistory.push({
-            id: "phase-initial",
-            label: "Execution",
-            status: "active",
-            enteredAtRound: 1,
-            outcome: request.round <= 1 ? "Awaiting first accepted round." : "Work is in progress.",
-            evidenceRefs: [],
-        });
-    }
-    const verificationError = verificationFlags.find((flag) => flag.severity === "error");
-    const activeSubGoal = (response.sub_goals ?? []).find((subGoal) => subGoal.status === "in_progress") ?? (response.sub_goals ?? []).find((subGoal) => subGoal.status === "pending");
-    const currentFocus = verificationError?.detail
-        || blockers[0]
-        || activeSubGoal?.description
-        || remainingCriteria[0]
-        || objective?.objective
-        || request.task;
-    const suggestedNextAction = verificationError
-        ? `Resolve verification finding: ${verificationError.detail}`
-        : blockers[0]
-            ? `Remove blocker with evidence: ${blockers[0]}`
-            : activeSubGoal
-                ? `Advance sub-goal ${activeSubGoal.id}: ${activeSubGoal.description}`
-                : remainingCriteria[0]
-                    ? `Verify remaining criterion: ${remainingCriteria[0]}`
-                    : `Produce verifiable progress toward: ${currentFocus}`;
-    const blockerGate = blockers[0] ? deriveGate(blockers[0], [blockers[0]]).gate : null;
-    const activeGate = blockerGate?.kind === "user"
-        ? blockerGate
-        : verificationError
-            ? {
-                kind: "agent",
-                problem: verificationError.detail,
-                requiredEvidence: [verificationError.check],
-                suggestedResolution: "Resolve the verification finding and rerun the affected check.",
-            }
-            : blockerGate;
-    const todoProjection = currentFocus
-        ? {
-            id: deriveTodoId(currentFocus),
-            sourceType: verificationError
-                ? "verification"
-                : blockers.length > 0
-                    ? "blocker"
-                    : activeSubGoal
-                        ? "sub_goal"
-                        : "criterion",
-            sourceId: verificationError?.check ?? activeSubGoal?.id ?? "objective",
-            action: suggestedNextAction || currentFocus,
-            completionSignal: remainingCriteria[0]
-                || "Provide verifiable evidence for the current focus.",
-            evidenceRequirements: verificationError ? [verificationError.check] : [],
-            gate: activeGate?.kind ?? "none",
-        }
-        : null;
-    const handoff = {
-        goalId: response.goal_id,
-        roundId: `loop:${response.loop_id || request.loop_id}:round:${response.round || request.round}`,
-        phaseId: phaseHistory.at(-1)?.id,
-        focus: currentFocus,
-        verifiedFacts: criteriaMet,
-        unresolvedBlockers: blockers,
-        carriedConstraints: unique(response.constraints_active)
-            .slice(0, getPolicy().checkpoint.max_carried_constraints),
-        failedAttempts: unique(rolling?.key_outcomes ?? [])
-            .filter((outcome) => /\bfailed\b/i.test(outcome)),
-        wrongAssumptions: unique(last?.discoveries?.wrongAssumptions ?? []),
-        evidenceRefs: unique(response.projection?.verifiedEvidenceRefs ?? []),
-        regressionObligations,
-        suggestedNextAction: suggestedNextAction || undefined,
-        gate: activeGate ?? undefined,
-    };
+    // v3.4: The ACTIVE Round Contract (derived — loop-compiler computes it
+    // from committed rounds) drives the Current Task — the contract IS "what
+    // to do this round"; the original objective stays in the Objective
+    // section above. No active contract → the original task text is used,
+    // byte-identical to pre-v3.3 behavior.
+    const roundContract = derived?.roundContract ?? null;
     return {
-        format: "loopforge.state",
+        schemaVersion: CANONICAL_STATE_SCHEMA_VERSION,
         loopId: response.loop_id || request.loop_id,
         round: response.round || request.round,
-        maxRounds: request.max_rounds ?? getPolicy().engine.max_rounds,
+        maxRounds: request.max_rounds ?? 20,
         goalId: response.goal_id,
         objective: objective?.objective || request.task,
         objectiveVersion: objective?.version ?? 1,
-        successCriteria,
+        currentTask: roundContract ? formatRoundContract(roundContract) : request.task,
+        successCriteria: unique(objective?.success_criteria ?? []),
         hardConstraints: unique(objective?.hard_constraints ?? []),
         activeConstraints: unique(response.constraints_active),
         retiredConstraints: unique(response.constraints_retired),
         inactiveConstraints: unique(response.constraints_inactive ?? []),
         constraintMetadata: response.constraint_metadata ?? [],
         changesSinceLastRound: changes,
-        remainingCriteria,
+        remainingCriteria: unique(last?.execution_evidence?.success_criteria_remaining ?? []),
         blockers,
         verificationFlags,
         discoveries,
+        nextAction: last?.next_action?.trim() || response.suggested_next_task,
         rollingOutcomes: unique(rolling?.key_outcomes ?? []),
         recurringIssues: unique(rolling?.recurring_issues ?? []),
         failedPatterns: unique(rolling?.failed_patterns ?? []),
-        loopSynthesis: rolling?.loop_synthesis ?? "",
+        milestones: rolling?.milestones ?? [],
         subGoals: response.sub_goals ?? [],
+        criterionStatuses: response.criterion_statuses ?? [],
+        lessons: response.lessons ?? [],
         agentTrustScore: response.agent_trust_score,
         agentTrustTrend: response.agent_trust_trend ?? [],
+        suggestedNextTask: response.suggested_next_task,
         externalContext: request.external_context?.trim() ?? "",
         stateFilePath,
         progress: {
-            estimate: successCriteria.length > 0 ? criteriaMet.length / successCriteria.length : null,
-            criteriaMet,
-            criteriaRemaining: remainingCriteria,
-            filesChanged: unique(evidence?.observedFiles ?? []),
-            tests: evidence?.testCounts ?? null,
+            estimate: executionEvidence?.progress_estimate ?? null,
+            criteriaMet: unique(executionEvidence?.success_criteria_met ?? []),
+            criteriaRemaining: unique(executionEvidence?.success_criteria_remaining ?? []),
+            filesChanged: unique(executionEvidence?.files_changed ?? []),
+            tests: executionEvidence?.test_results ?? null,
         },
-        regressionObligations,
-        phaseHistory,
-        currentFocus,
-        todoProjection,
-        suggestedNextAction,
-        activeGate,
-        stateFreshness: request.round <= 1 || evidence
-            ? "fresh"
-            : last ? "stale" : "missing",
-        handoff,
+        // v3.3: Conditional presence — empty/absent derived data must not add
+        // keys, or every state hash would change for rounds without it.
+        ...(derived?.roundStats && derived.roundStats.length > 0
+            ? { roundStats: derived.roundStats }
+            : {}),
+        ...(derived?.machineStatus ? { machineStatus: derived.machineStatus } : {}),
+        // v3.3: Conditional presence — no contract, no key (hash stability).
+        ...(roundContract ? { roundContract } : {}),
     };
 }
 //# sourceMappingURL=canonical-state.js.map