@tacuchi/agent-workflow-cli 25.7.0 → 25.8.0

package/dist/domain/flow/execution-result.js

@@ -52,13 +52,17 @@ export function executionVerdict(result, action, declared, checkoutStates = null
         };
     }
     if (action.evidence.includes(SOURCE_BOUNDED_EVIDENCE)) {
-        const validation = result.validations.find((item) => item.id === SOURCE_BOUNDED_EVIDENCE);
-        const proof = validateCheckoutProof(validation?.proof, checkoutStates);
-        if (proof !== null) {
-            return {
-                message: proof.message,
-                detail: { code: proof.code, action: action.recovery, outcome: "needs_input" },
-            };
+        // Every proof the result carries is judged, not only the first: a batch of
+        // several sources brings one per source, and a stale one among them must not
+        // ride on a fresh sibling.
+        for (const validation of result.validations.filter((item) => item.id === SOURCE_BOUNDED_EVIDENCE)) {
+            const proof = validateCheckoutProof(validation.proof, checkoutStates);
+            if (proof !== null) {
+                return {
+                    message: proof.message,
+                    detail: { code: proof.code, action: action.recovery, outcome: "needs_input" },
+                };
+            }
         }
     }
     const applied = new Set(result.effects.applied);
@@ -81,4 +85,71 @@ export function executionVerdict(result, action, declared, checkoutStates = null
     }
     return null;
 }
+/**
+ * Whether a batch earned its credit with proofs of its OWN checkout — and which.
+ *
+ * The same `detail` in two batches decides nothing: what does is that at least
+ * one source of this batch changed since its base, and that the proof of that
+ * source did not already credit another batch. A source that did not change may
+ * carry the same proof it carried before — a two-source batch that legitimately
+ * touches one of them is still one batch of work.
+ */
+export function batchCreditVerdict(result, input, recovery) {
+    const proofs = result.validations.flatMap((validation) => validation.id === SOURCE_BOUNDED_EVIDENCE && validation.proof !== undefined
+        ? [validation.proof]
+        : []);
+    const refused = (code, message) => ({
+        ok: false,
+        refusal: { message, detail: { code, action: recovery, outcome: "needs_input" } },
+    });
+    const credit = {};
+    for (const source of input.sources) {
+        const own = proofs.filter((proof) => proof.source === source);
+        if (own.length !== 1) {
+            return refused(own.length === 0 ? "WORKLINE_CHECKOUT_PROOF_MISSING" : "WORKLINE_CHECKOUT_PROOF_INVALID", own.length === 0
+                ? `el batch ${input.batch.id} exige una prueba de checkout por fuente y falta la de '${source}'`
+                : `el batch ${input.batch.id} trae ${own.length} pruebas de '${source}': va una por fuente`);
+        }
+        credit[source] = own[0].checkout_digest;
+    }
+    const creditedBy = new Map(input.batches
+        .filter((batch) => batch.id !== input.batch.id)
+        .flatMap((batch) => Object.values(batch.credit ?? {}).map((digest) => [digest, batch.id])));
+    const fresh = input.sources.filter((source) => !creditedBy.has(credit[source]));
+    if (fresh.length === 0) {
+        const reused = input.sources
+            .map((source) => `'${source}' ya acreditó ${creditedBy.get(credit[source])}`)
+            .join("; ");
+        return refused("PLAN_EXEC_PROOF_REUSED", `el batch ${input.batch.id} no trae ninguna prueba propia: ${reused}`);
+    }
+    // A batch that began before its base could be recorded is judged against the
+    // credits and the live checkout alone: a base rebuilt now would be invented.
+    const base = input.batch.base;
+    if (base === undefined || input.scoped === null)
+        return { ok: true, credit };
+    const scoped = input.scoped;
+    const changed = fresh.filter((source) => {
+        const before = base[source];
+        const now = scoped[source];
+        return typeof before === "string" && typeof now === "string" && before !== now;
+    });
+    if (changed.length > 0)
+        return { ok: true, credit };
+    const since = input.batch.iteration === 1 ? "el inicio de la corrida" : "el cierre del batch anterior";
+    const why = input.sources
+        .map((source) => {
+        if (base[source] === null || base[source] === undefined) {
+            return `'${source}' no se pudo observar al empezar el batch`;
+        }
+        if (scoped[source] === null || scoped[source] === undefined) {
+            return `'${source}' no se puede observar ahora`;
+        }
+        if (creditedBy.has(credit[source])) {
+            return `la prueba de '${source}' ya acreditó ${creditedBy.get(credit[source])}`;
+        }
+        return `'${source}' no cambió`;
+    })
+        .join("; ");
+    return refused("PLAN_EXEC_BATCH_UNCHANGED", `el batch ${input.batch.id} no cambió su checkout desde ${since}: ${why}`);
+}
 //# sourceMappingURL=execution-result.js.map

package/dist/domain/flow/execution-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"execution-result.js","sourceRoot":"","sources":["../../../src/domain/flow/execution-result.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"execution-result.js","sourceRoot":"","sources":["../../../src/domain/flow/execution-result.ts"],"names":[],"mappings":"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"}

package/dist/domain/flow/route.js.map

@@ -1 +1 @@
-{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../src/domain/flow/route.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAU,CAAC;AAI3E,MAAM,CAAC,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;AACtD,MAAM,CAAC,MAAM,kBAAkB,GAAG,eAAe,CAAC;AAElD,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,UAAU;IACV,oBAAoB;IACpB,qBAAqB;CACb,CAAC;AA2DX;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAC/B,SAAmC,EACnC,YAA+B,EAAE;IAEjC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,KAAK,MAAM,CAAC,EAAE,CAAC;QAClE,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IACD,IACE,SAAS,CAAC,IAAI,CACZ,CAAC,QAAQ,EAAE,EAAE,CACX,QAAQ,CAAC,WAAW,KAAK,YAAY,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CACpF,EACD,CAAC;QACD,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,SAAsD,EACtD,UAAkB;IAElB,OAAO,SAAS,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,IAAI,CAAC;AACnF,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAK,kBAAwC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAChG,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAc;IAC9C,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAK,kBAAwC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAChG,CAAC"}
+{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../src/domain/flow/route.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAU,CAAC;AAI3E,MAAM,CAAC,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;AACtD,MAAM,CAAC,MAAM,kBAAkB,GAAG,eAAe,CAAC;AAElD,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,UAAU;IACV,oBAAoB;IACpB,qBAAqB;CACb,CAAC;AAqEX;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAC/B,SAAmC,EACnC,YAA+B,EAAE;IAEjC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,KAAK,MAAM,CAAC,EAAE,CAAC;QAClE,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IACD,IACE,SAAS,CAAC,IAAI,CACZ,CAAC,QAAQ,EAAE,EAAE,CACX,QAAQ,CAAC,WAAW,KAAK,YAAY,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CACpF,EACD,CAAC;QACD,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,SAAsD,EACtD,UAAkB;IAElB,OAAO,SAAS,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,IAAI,CAAC;AACnF,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAK,kBAAwC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAChG,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAc;IAC9C,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAK,kBAAwC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAChG,CAAC"}

package/dist/domain/flow/rules.js

@@ -21,7 +21,7 @@ import { DOCS_BOUNDARY, RUN_PLACEHOLDERS, conditionOf, } from "./authority.js";
  * is one observation sent twice, and a signal belonging to another boundary is
  * not this rule's evidence. Both would otherwise let a gate fire on noise.
  */
-export function thresholdFired(rule, journey, observations, batchIteration = null) {
+export function thresholdFired(rule, journey, observations, iteration = {}) {
     const observed = journey.find((decision) => decision.id === rule.observed);
     if (observed === undefined)
         return false;
@@ -33,9 +33,8 @@ export function thresholdFired(rule, journey, observations, batchIteration = nul
     const vocabulary = new Set(declaredVocabulary.filter((signal) => counted.includes(signal)));
     const declared = observations
         .filter((observation) => observation.transition === rule.observed &&
-        (batchIteration === null
-            ? observation.batch_iteration === undefined
-            : observation.batch_iteration === batchIteration))
+        observation.batch_iteration === iteration.batch_iteration &&
+        observation.reentry_iteration === iteration.reentry_iteration)
         .flatMap((observation) => observation.signals)
         .filter((signal) => vocabulary.has(signal));
     return new Set(declared).size >= rule.min;
@@ -48,7 +47,7 @@ export function thresholdFired(rule, journey, observations, batchIteration = nul
  * step nobody applied still has to be accounted for, and "it did not happen"
  * without a cause is indistinguishable from a step that was lost.
  */
-export function skipReason(decision, journey, observations, batchIteration = null) {
+export function skipReason(decision, journey, observations, iteration = {}) {
     const condition = conditionOf(decision);
     if (condition === null)
         return null;
@@ -56,7 +55,7 @@ export function skipReason(decision, journey, observations, batchIteration = nul
     // That is the doctrine's own default — "borderline continues without asking" —
     // and it is the direction that assumes nothing: the alternative would emit a
     // question on zero observations and then read the answer as if it had cause.
-    if (thresholdFired(condition.threshold, journey, observations, batchIteration))
+    if (thresholdFired(condition.threshold, journey, observations, iteration))
         return null;
     return condition.otherwise;
 }

package/dist/domain/flow/rules.js.map

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

package/dist/domain/flow/run-state.js

@@ -26,7 +26,7 @@ import { canonicalJson, semanticDigest } from "../../application/semantic-operat
 import { isEffectClass, touchesTheWorld } from "../capability/effects.js";
 import { AttemptLedger } from "../capability/protocol.js";
 import { normalizeObligations, validateDecisionNote } from "../decision-note.js";
-import { journeyOfFlow } from "./authority.js";
+import { expandJourney, journeyOfFlow, } from "./authority.js";
 import { V11_JOURNEY_BASE } from "./journey-baseline.js";
 import { assuranceForRoute, isAssuranceStatus, isRouteDisposition, } from "./route.js";
 /**
@@ -40,7 +40,7 @@ import { assuranceForRoute, isAssuranceStatus, isRouteDisposition, } from "./rou
  * turning the cap off in silence while somebody alternates CLI versions over one
  * run. Failing with a cause is the requirement; failing silently is the defect.
  */
-export const FLOW_RUN_STATE_VERSION = 12;
+export const FLOW_RUN_STATE_VERSION = 13;
 /**
  * The versions this CLI CONTINUES without adoption, newest first.
  *
@@ -50,8 +50,15 @@ export const FLOW_RUN_STATE_VERSION = 12;
  * cursor, the answers or the attempts. Every later version joins this set with its own
  * upgrade step, which is what keeps "v11 or later survives an update" true
  * without an exception per release.
+ *
+ * v13 added `reentries` and the `reentry_iteration` of attempts, observations and
+ * events. All three are absent on a run that never re-entered, which is every
+ * v12 run, so its upgrade step only re-stamps the version.
+ * It also added each batch's `base` and `credit`, a reseated run's `inherited_bases`
+ * and the `route-refused` trace kind. A v12 run has none of them either, and a
+ * batch without `base` is read as the one that was in flight when the CLI updated.
  */
-export const FLOW_RUN_STATE_CONTINUABLE = [FLOW_RUN_STATE_VERSION, 11];
+export const FLOW_RUN_STATE_CONTINUABLE = [FLOW_RUN_STATE_VERSION, 12, 11];
 /**
  * The versions this CLI READS, newest first.
  *
@@ -75,6 +82,7 @@ export const FLOW_RUN_STATE_READABLE = [
  */
 const CONTINUABLE_UPGRADES = {
     11: (state) => ({ ...state, version: 12, journey_base: [...V11_JOURNEY_BASE[state.flow]] }),
+    12: (state) => ({ ...state, version: 13 }),
 };
 /** The CLI-owned run state inside the session folder. Machine-local, dotted. */
 export const FLOW_RUN_STATE_FILE = ".flow-run.json";
@@ -111,12 +119,47 @@ export function attemptsAt(state, transition) {
 }
 /** The monotone-counter key for one boundary, scoped when that boundary repeats in a batch. */
 export function attemptCounterKey(state, transition) {
-    const iteration = currentBatchIteration(state, transition);
-    return attemptCounterKeyForIteration(transition, iteration ?? undefined);
+    return attemptCounterKeyForIteration(transition, iterationOf(state, transition));
 }
-/** Stable counter key for a historical attempt whose batch iteration is recorded on the row. */
+/** Stable counter key for a historical attempt whose iteration is recorded on the row. */
 export function attemptCounterKeyForIteration(transition, iteration) {
-    return iteration === undefined ? transition : `${transition}@batch-${iteration}`;
+    const batch = iteration.batch_iteration === undefined ? "" : `@batch-${iteration.batch_iteration}`;
+    const reentry = iteration.reentry_iteration === undefined ? "" : `@reentry-${iteration.reentry_iteration}`;
+    return `${transition}${batch}${reentry}`;
+}
+/**
+ * The iteration of `transition` where the run stands: its batch copy and its
+ * reentry copy. Spread it into any record keyed per boundary.
+ */
+export function iterationOf(state, transition) {
+    const batch = currentBatchIteration(state, transition);
+    const reentry = currentReentryIteration(state, transition);
+    return {
+        ...(batch === null ? {} : { batch_iteration: batch }),
+        ...(reentry === null ? {} : { reentry_iteration: reentry }),
+    };
+}
+/** Whether a persisted record belongs to this iteration of its boundary. */
+export function sameIteration(record, iteration) {
+    return (record.batch_iteration === iteration.batch_iteration &&
+        record.reentry_iteration === iteration.reentry_iteration);
+}
+/**
+ * Which reentry inserted the row of `transition` the cursor is on, or `null` on
+ * the row's own place. Read at the cursor and backwards from it, so it answers
+ * the same before the row is applied and right after.
+ */
+export function currentReentryIteration(state, transition) {
+    if ((state.reentries ?? []).length === 0)
+        return null;
+    const { rows, copies } = expandJourney(state);
+    for (let index = Math.min(state.applied.length, rows.length - 1); index >= 0; index -= 1) {
+        if (rows[index]?.id !== transition)
+            continue;
+        const copy = copies[index] ?? 0;
+        return copy === 0 ? null : copy;
+    }
+    return null;
 }
 /**
  * The three numbers and the difference between them, computed once.
@@ -127,11 +170,8 @@ export function attemptCounterKeyForIteration(transition, iteration) {
  * directive and the recovery guard would end up disagreeing about the same run.
  */
 function spendAt(state, transition) {
-    const iteration = currentBatchIteration(state, transition);
-    const rows = state.attempts.filter((attempt) => attempt.transition === transition &&
-        (iteration === null
-            ? attempt.batch_iteration === undefined
-            : attempt.batch_iteration === iteration));
+    const iteration = iterationOf(state, transition);
+    const rows = state.attempts.filter((attempt) => attempt.transition === transition && sameIteration(attempt, iteration));
     const key = attemptCounterKey(state, transition);
     const floor = state.attempt_floor?.[key] ?? 0;
     const granted = state.attempt_grants?.[key] ?? 0;
@@ -316,11 +356,10 @@ export function applyAttemptReconciliation(state, reconciliation) {
         grants[key] = repair.after;
         next = sealRunState({ ...withoutSeal(next), attempt_grants: grants });
     }
-    const iteration = currentBatchIteration(next, reconciliation.transition);
     return withEvent(next, {
         kind: "reconciled",
         transition: reconciliation.transition,
-        ...(iteration === null ? {} : { batch_iteration: iteration }),
+        ...iterationOf(next, reconciliation.transition),
         operation: "flow.attempt-reconciliation",
         repairs: reconciliation.repairs,
     });
@@ -350,11 +389,8 @@ function unanswerableAt(state) {
     return null;
 }
 export function recoveryBlockedAt(state, transition) {
-    const iteration = currentBatchIteration(state, transition);
-    const trace = state.events.filter((event) => event.transition === transition &&
-        (iteration === null
-            ? event.batch_iteration === undefined
-            : event.batch_iteration === iteration));
+    const iteration = iterationOf(state, transition);
+    const trace = state.events.filter((event) => event.transition === transition && sameIteration(event, iteration));
     const material = [...trace].reverse().find(declaresMaterialEffect);
     if (material !== undefined)
         return { reason: "materialized", event: material };
@@ -377,6 +413,7 @@ function declaresMaterialEffect(event) {
     // more block a recovery than reading the file could.
     if (event.kind === "reconciled" ||
         event.kind === "aligned" ||
+        event.kind === "route-refused" ||
         event.kind === "restarted" ||
         event.kind === "annulled") {
         return false;
@@ -634,6 +671,46 @@ export function upgradeContinuable(state) {
     }
     return sealRunState(withoutSeal(current));
 }
+/** Record a reentry of the journey, after every one already recorded. */
+export function withReentry(state, reentry) {
+    return sealRunState({
+        ...withoutSeal(state),
+        reentries: [...(state.reentries ?? []), reentry],
+    });
+}
+/**
+ * Take back the last reentry, for the close that recorded its intention and then
+ * could not happen. The field goes back to absent when it empties, so the run
+ * serializes the bytes it had before the intention.
+ */
+export function withoutLastReentry(state) {
+    const { reentries: _all, ...rest } = withoutSeal(state);
+    const kept = (state.reentries ?? []).slice(0, -1);
+    return sealRunState(kept.length === 0 ? rest : { ...rest, reentries: kept });
+}
+/** Seal the base of one batch; a batch that already has one keeps it. */
+export function withPlanExecBatchBase(state, batchId, base) {
+    const batches = state.batches ?? [];
+    const target = batches.find((batch) => batch.id === batchId);
+    // A re-run of the acquisition on the same batch must not move its base: the
+    // batch would then be compared against its own half-done work.
+    if (target === undefined || target.base !== undefined)
+        return state;
+    return sealRunState({
+        ...withoutSeal(state),
+        batches: batches.map((batch) => (batch.id === batchId ? { ...batch, base } : batch)),
+    });
+}
+/** Record the proofs that credited one batch. */
+export function withPlanExecBatchCredit(state, batchId, credit) {
+    const batches = state.batches ?? [];
+    if (!batches.some((batch) => batch.id === batchId))
+        return state;
+    return sealRunState({
+        ...withoutSeal(state),
+        batches: batches.map((batch) => (batch.id === batchId ? { ...batch, credit } : batch)),
+    });
+}
 /** Record one inferred or declared batch, refusing duplicate ids at the caller's boundary. */
 export function withPlanExecBatch(state, batch) {
     const batches = state.batches ?? [];
@@ -954,7 +1031,7 @@ export function restatesLastEvent(state, event) {
     if (last === undefined || last.kind !== "failed" || event.kind !== "failed")
         return false;
     return (last.transition === event.transition &&
-        last.batch_iteration === event.batch_iteration &&
+        sameIteration(last, event) &&
         last.code === event.code &&
         last.message === event.message);
 }
@@ -975,7 +1052,7 @@ export function restatesLastEvent(state, event) {
  */
 export function withObservation(state, observation) {
     const repeated = state.observations.some((past) => past.transition === observation.transition &&
-        past.batch_iteration === observation.batch_iteration &&
+        sameIteration(past, observation) &&
         sameSignals(past.signals, observation.signals));
     if (repeated)
         return state;
@@ -1310,6 +1387,9 @@ function checkRecordShape(parsed, invalid) {
     if (version >= 12 && !isStringArray(parsed.journey_base)) {
         return invalid("no dice contra qué recorrido se escribió su cursor");
     }
+    if (!isReentryArray(parsed.reentries)) {
+        return invalid("declara una reentrada sin tipo, frontera, ocurrencia u origen");
+    }
     if (parsed.exhausted_reruns !== undefined && !isStringArray(parsed.exhausted_reruns)) {
         return invalid("declara vueltas de fronteras agotadas que no son transiciones");
     }
@@ -1350,8 +1430,55 @@ function checkCommonRecordShape(parsed, invalid) {
     if (!isCounterMap(parsed.attempt_floor) || !isCounterMap(parsed.attempt_grants)) {
         return invalid("trae una contabilidad de intentos que no es un contador por transición");
     }
+    if (!isInheritedBaseArray(parsed.inherited_bases)) {
+        return invalid("hereda una base de batch sin sus fases o sin sus fuentes");
+    }
     return null;
 }
+function isInheritedBaseArray(value) {
+    if (value === undefined)
+        return true;
+    return (Array.isArray(value) &&
+        value.every((entry) => isRecord(entry) &&
+            Array.isArray(entry.phases) &&
+            entry.phases.length > 0 &&
+            entry.phases.every((phase) => Number.isInteger(phase) && phase > 0) &&
+            isSourceMap(entry.base, true) &&
+            entry.base !== undefined));
+}
+/**
+ * The bases a reseated run inherits from the archived registry, read tolerantly:
+ * the archive may be the very state that could not be continued, so anything
+ * that is not a well-formed batch base is left behind rather than trusted.
+ */
+export function inheritedBasesFrom(archived) {
+    if (archived === null)
+        return [];
+    let parsed;
+    try {
+        parsed = JSON.parse(archived);
+    }
+    catch {
+        return [];
+    }
+    if (!isRecord(parsed) || !Array.isArray(parsed.batches))
+        return [];
+    const inherited = parsed.batches.flatMap((batch) => {
+        if (!isRecord(batch) || batch.base === undefined)
+            return [];
+        const candidate = { phases: batch.phases, base: batch.base };
+        return isInheritedBaseArray([candidate]) ? [candidate] : [];
+    });
+    const earlier = isInheritedBaseArray(parsed.inherited_bases)
+        ? (parsed.inherited_bases ?? [])
+        : [];
+    return [...earlier, ...inherited];
+}
+export function withInheritedBases(state, inherited) {
+    if (inherited.length === 0)
+        return state;
+    return sealRunState({ ...withoutSeal(state), inherited_bases: [...inherited] });
+}
 /** Fields added by v10 that have no truthful default on a persisted run. */
 function checkV10RecordShape(parsed, invalid) {
     if (!isPlanExecBatchArray(parsed.batches)) {
@@ -1440,7 +1567,7 @@ function isRouteProposal(value) {
             !isRouteDisposition(control.recommendation) ||
             !isRecord(control.alternatives) ||
             !isNonEmptyString(control.alternatives.apply) ||
-            !isNonEmptyString(control.alternatives.omit) ||
+            (control.alternatives.omit !== undefined && !isNonEmptyString(control.alternatives.omit)) ||
             !isNonEmptyString(control.alternatives.substitute) ||
             !isNonEmptyString(control.consequence) ||
             !isNonEmptyString(control.risk) ||
@@ -1542,7 +1669,9 @@ function isPlanExecBatchArray(value) {
             (entry.publication !== undefined &&
                 entry.publication.status === "applied" &&
                 entry.published_plan_digest !== entry.publication.after_plan_digest) ||
-            !PLAN_EXEC_BATCH_STAGES.includes(entry.stage)) {
+            !PLAN_EXEC_BATCH_STAGES.includes(entry.stage) ||
+            !isSourceMap(entry.base, true) ||
+            !isSourceMap(entry.credit, false)) {
             return false;
         }
         ids.add(entry.id);
@@ -1550,6 +1679,14 @@ function isPlanExecBatchArray(value) {
         return true;
     });
 }
+/** Absent, or a non-empty alias → digest map; `nullable` admits an unobserved source. */
+function isSourceMap(value, nullable) {
+    if (value === undefined)
+        return true;
+    if (!isRecord(value) || Object.keys(value).length === 0)
+        return false;
+    return Object.values(value).every((digest) => (nullable && digest === null) || (typeof digest === "string" && digest.length > 0));
+}
 function isPlanExecBatchPublication(value) {
     if (value === undefined)
         return true;
@@ -1862,10 +1999,8 @@ function isEvent(entry) {
         return false;
     if (typeof entry.transition !== "string" || typeof entry.operation !== "string")
         return false;
-    if (entry.batch_iteration !== undefined &&
-        (!Number.isInteger(entry.batch_iteration) || entry.batch_iteration < 1)) {
+    if (!isIterationRecord(entry))
         return false;
-    }
     return EVENT_BODIES.get(entry.kind)?.(entry) === true;
 }
 const nonEmpty = (value) => typeof value === "string" && value.trim().length > 0;
@@ -1888,6 +2023,7 @@ const EVENT_BODIES = new Map(Object.entries({
         isStringArray(entry.tasks) &&
         nonEmpty(entry.digest),
     aligned: (entry) => Number.isInteger(entry.position) && entry.position >= 0 && nonEmpty(entry.reason),
+    "route-refused": (entry) => isRouteDisposition(entry.disposition) && nonEmpty(entry.reason),
     failed: (entry) => typeof entry.code === "string" &&
         typeof entry.message === "string" &&
         typeof entry.recovery === "string" &&
@@ -1913,8 +2049,29 @@ function isObservationArray(value) {
     return value.every((entry) => isRecord(entry) &&
         typeof entry.transition === "string" &&
         isStringArray(entry.signals) &&
-        (entry.batch_iteration === undefined ||
-            (Number.isInteger(entry.batch_iteration) && entry.batch_iteration >= 1)));
+        isIterationRecord(entry));
+}
+const REENTRY_KINDS = ["refine", "close", "reopen"];
+/** Absent, or reentries each with its kind, its boundary, its occurrence and its origin. */
+function isReentryArray(value) {
+    if (value === undefined)
+        return true;
+    if (!Array.isArray(value))
+        return false;
+    return value.every((entry) => isRecord(entry) &&
+        REENTRY_KINDS.includes(entry.kind) &&
+        nonEmpty(entry.transition) &&
+        Number.isInteger(entry.occurrence) &&
+        entry.occurrence >= 1 &&
+        // A redraft names where it re-enters; the other kinds repeat from their row.
+        (entry.kind === "refine"
+            ? nonEmpty(entry.from)
+            : entry.from === null || nonEmpty(entry.from)));
+}
+/** Both iteration fields, each absent or a positive integer. */
+function isIterationRecord(entry) {
+    const ordinal = (value) => value === undefined || (Number.isInteger(value) && value >= 1);
+    return ordinal(entry.batch_iteration) && ordinal(entry.reentry_iteration);
 }
 /**
  * The two optional fields are checked as ABSENT-or-well-formed, never defaulted.
@@ -1950,8 +2107,7 @@ function isAttemptArray(value) {
         Number.isInteger(entry.attempt) &&
         typeof entry.request_digest === "string" &&
         typeof entry.transition === "string" &&
-        (entry.batch_iteration === undefined ||
-            (Number.isInteger(entry.batch_iteration) && entry.batch_iteration >= 1)) &&
+        isIterationRecord(entry) &&
         (entry.parent_request_digest === null || typeof entry.parent_request_digest === "string"));
 }
 //# sourceMappingURL=run-state.js.map