gdp-wired 0.17.0 → 0.18.0

package/dist/core/cyclic.js

@@ -1,6 +1,6 @@
 import { substC, substE } from "../kernel/kernel.js";
-import { descentGoal, mainGoal, premiseGoal, refuseCyclic } from "../kernel/cyclic.js";
-import { cellProducts, grow } from "../kernel/prove.js";
+import { baseHyps, descentGoal, instHyps, mainGoal, premiseGoal, refuseCyclic } from "../kernel/cyclic.js";
+import { cellProducts, grow, profile, usedHyps, widen } from "../kernel/prove.js";
 const v = (name) => ({ op: 'var', name });
 const k = (value) => ({ op: 'const', value });
 const add = (a, b) => ({ op: 'add', a, b });
@@ -17,46 +17,320 @@ const vars = (s) => ({ vars: s, maps: {}, flags: {} });
 const omega = v('O$');
 export const pair = (u, key) => add(u, { op: 'prod', a: key, b: omega });
 // Every goal grown, then the whole checked by the kernel.
-export function proveCyclic(facts, specs) {
-    const nodes = [];
-    const grown = (g, node) => {
-        const was = cellProducts.on;
+// GDP_CYCLIC_PROF=1: each comparison's line also has where the cyclic proof's time went, by goal kind (main, premise,
+// descent, the kernel's check): ms, goals, hypotheses, solver and row ms.
+export const cyclicProf = {};
+const profOn = () => env()?.GDP_CYCLIC_PROF === '1';
+function timedKind(kind, hyps, f) {
+    if (!profOn())
+        return f();
+    const was = profile.on, s0 = profile.solveMs, r0 = profile.rowsMs, t0 = performance.now();
+    profile.on = true;
+    try {
+        return f();
+    }
+    finally {
+        profile.on = was;
+        const p = (cyclicProf[kind] ??= { ms: 0, n: 0, hyps: 0, solveMs: 0, rowsMs: 0 });
+        p.ms += performance.now() - t0;
+        p.n++;
+        p.hyps += hyps;
+        p.solveMs += profile.solveMs - s0;
+        p.rowsMs += profile.rowsMs - r0;
+    }
+}
+// Each goal grown first on what it reads: its node's hypotheses and its own last ones (a use's guard, the conclusion
+// negated) kept whole, and of the rest (the facts at the node's terms, the uses) only the parts it reaches: a
+// conjunction's conjuncts (under a guard, as a step's equations are, one per state variable) each a part of its own; an
+// equation that gives a cell (a state variable's value at t, a function's at a key) reached when its cell is, and then
+// its terms' cells and its guard's; any other part reached when it shares a cell with what is, or reads none. The
+// weaker goal's tree is the whole goal's (`widen`); where the weaker goal isn't refuted, the whole is grown as before.
+// GDP_CYCLIC_SLICE=0 grows the whole goal only.
+// A cell by what it may be equal to: a run's map read at time u and any key (two keys the prover may prove equal) is
+// one, by its map and u; a function's read at any key is one, by the function; a run's other reads are themselves.
+const cellsIn = (t, out = new Set()) => {
+    if (t && typeof t === 'object') {
+        const o = t, map = o.map;
+        if (o.op === 'get') {
+            const key = o.key;
+            out.add(key.op === 'add' && key.b.op === 'prod' && JSON.stringify(key.b.b) === JSON.stringify(omega) ? `${map}@${JSON.stringify(key.a)}` : map.endsWith('@') ? JSON.stringify(o) : map);
+        }
+        for (const val of Object.values(o))
+            cellsIn(val, out);
+    }
+    return out;
+};
+function partsOf(c, guards = [], out = []) {
+    if (c.op === 'and')
+        c.xs.forEach(x => partsOf(x, guards, out));
+    else if (c.op === 'or' && c.xs.length === 2 && c.xs[0].op === 'not')
+        partsOf(c.xs[1], [...guards, c.xs[0]], out);
+    else
+        out.push({ c, guards });
+    return out;
+}
+function rebuild(c, keep, at = { j: 0 }) {
+    if (c.op === 'and') {
+        const xs = c.xs.flatMap(x => { const y = rebuild(x, keep, at); return y ? [y] : []; });
+        return xs.length ? and(...xs) : undefined;
+    }
+    if (c.op === 'or' && c.xs.length === 2 && c.xs[0].op === 'not') {
+        const b = rebuild(c.xs[1], keep, at);
+        return b && { op: 'or', xs: [c.xs[0], b] };
+    }
+    return keep(at.j++) ? c : undefined;
+}
+// The hypotheses with a part the goal reaches (whole ones included).
+export function reached(g, whole) { return slice(g, whole, true); }
+export function slice(g, whole, hypsOnly = false) {
+    const reach = new Set(), parts = g.hyps.map(h => partsOf(h));
+    const pieces = [];
+    g.hyps.forEach((h, i) => {
+        if (whole(i)) {
+            cellsIn(h, reach);
+            return;
+        }
+        parts[i].forEach(({ c, guards }, j) => {
+            // (an equation between two reads, a law's, gives neither: it is reached by either)
+            const gives = c.op === '=' && c.a.op === 'get' && c.b.op !== 'get' ? [...cellsIn(c.a)][0] : undefined, cells = cellsIn(c.op === '=' && gives ? c.b : c);
+            for (const x of guards)
+                cellsIn(x, cells);
+            pieces.push({ c, guards, i, j, gives, cells });
+        });
+    });
+    const kept = new Set();
+    for (let grew = true; grew;) {
+        grew = false;
+        for (const [q, p] of pieces.entries()) {
+            if (kept.has(q) || (p.gives ? !reach.has(p.gives) : p.cells.size && ![...p.cells].some(c => reach.has(c))))
+                continue;
+            kept.add(q);
+            grew = true;
+            for (const c of p.cells)
+                reach.add(c);
+            if (p.gives)
+                reach.add(p.gives);
+        }
+    }
+    if (hypsOnly)
+        return new Set(g.hyps.flatMap((_, i) => (whole(i) || pieces.some((p, q) => p.i === i && kept.has(q)) ? [i] : [])));
+    // The equations that give a cell the conclusion reads (a step's, the start's) join the conclusion, under their guards:
+    // the prover splits the conclusion's atoms first, as the usual rule does a law read after the step.
+    const last = g.hyps.length - 1, concl = whole(last) ? cellsIn(g.hyps[last]) : new Set();
+    const joins = (p) => !!p.gives && concl.has(p.gives);
+    if (kept.size === pieces.length && !pieces.some(joins))
+        return undefined;
+    const stays = new Set(), joined = [];
+    for (const [q, p] of pieces.entries())
+        if (kept.has(q)) {
+            if (joins(p))
+                joined.push(p.guards.reduceRight((acc, x) => ({ op: 'or', xs: [x, acc] }), p.c));
+            else
+                stays.add(`${p.i}:${p.j}`);
+        }
+    const from = [], joinedFrom = [...new Set(pieces.flatMap((p, q) => (kept.has(q) && joins(p) ? [p.i] : [])))];
+    const hyps = g.hyps.flatMap((h, i) => {
+        const r = whole(i) || parts[i].every((_, j) => stays.has(`${i}:${j}`)) ? h : rebuild(h, j => stays.has(`${i}:${j}`));
+        if (r)
+            from.push([i]);
+        return r ? [r] : [];
+    });
+    if (joined.length) {
+        hyps[hyps.length - 1] = and(hyps.at(-1), ...joined);
+        from[from.length - 1].push(...joinedFrom);
+    }
+    return { name: g.name, hyps, from };
+}
+let sliceNow = false;
+const sliceOn = () => sliceNow && env()?.GDP_CYCLIC_SLICE !== '0';
+const afterOn = () => env()?.GDP_CYCLIC_AFTER !== '0';
+const stepNodesOn = () => env()?.GDP_CYCLIC_STEP !== '0';
+// Trees already grown, by their goal (a node met again: a recurrence's lemmas in its laws between, a machine proven again),
+// with the facts and uses a node's own goal kept.
+const grownBefore = new Map();
+// `order`: the order the nodes are grown in, by default those with a weak variant first (a variant that uses a weak node
+// is passed over).
+export function proveCyclic(facts, specs, order = [...specs.keys()].sort((i, j) => Number(!specs[i].variants?.some(x => x.weak)) - Number(!specs[j].variants?.some(x => x.weak)))) {
+    const nodes = [], shapes = [...specs], weak = new Set();
+    let later, refuted = false;
+    // A goal's tree, and the hypotheses its leaves read (of the whole goal, a weaker goal's read through where they came from).
+    const grown = (g, node, own) => {
+        const was = cellProducts.on, kind = g.name.endsWith('its rank below') ? 'descent' : g.name.includes(': use of node') ? 'premise' : 'main';
         cellProducts.on = true;
-        let o;
         try {
-            o = grow(g);
+            const sliced = sliceOn() ? slice(g, own) : undefined, part = sliced && hide(sliced);
+            if (part) {
+                // (within two seconds: a weaker goal no easier than the whole is left to the whole)
+                const t0 = performance.now(), p = timedKind(`${kind} sliced`, part.hyps.length, () => grow(part, new Map(), { nodes: 0, until: performance.now() + Math.min(2_000, later ?? 2_000) }));
+                if (env()?.GDP_CYCLIC_DEBUG)
+                    console.error(`[cyc] ${g.name}: ${part.hyps.length} hyps${part !== sliced ? ' (opaque)' : ''}, ${'tree' in p ? `${p.nodes} nodes` : p.stuck}, ${Math.round(performance.now() - t0)} ms`);
+                if ('tree' in p)
+                    return { tree: p.tree, from: part, used: () => new Set([...usedHyps(part, p.tree)].flatMap(i => part.from[i])) };
+                if (part !== sliced) {
+                    const q = timedKind(`${kind} sliced`, sliced.hyps.length, () => grow(sliced, new Map(), { nodes: 0, until: performance.now() + Math.min(2_000, later ?? 2_000) }));
+                    if ('tree' in q)
+                        return { tree: q.tree, from: sliced, used: () => new Set([...usedHyps(sliced, q.tree)].flatMap(i => sliced.from[i])) };
+                }
+            }
+            const o = timedKind(kind, g.hyps.length, () => grow(g, new Map(), { nodes: 0, until: performance.now() + (later ?? Math.max(20_000, 1_000 * g.hyps.length)) }));
+            return 'tree' in o ? { tree: o.tree, from: g, used: () => usedHyps(g, o.tree) } : { proven: false, checked: false, node, goal: g.name, stuck: o.stuck };
         }
         finally {
             cellProducts.on = was;
         }
-        return 'tree' in o ? o.tree : { proven: false, checked: false, node, goal: g.name, stuck: o.stuck };
     };
-    for (const n of specs) {
-        const main = grown(mainGoal(facts, specs, n), n.name);
-        if ('proven' in main)
-            return main;
-        const uses = [];
-        for (const u of n.uses) {
-            const m = specs[u.node];
-            if (!m)
-                return { proven: false, checked: false, node: n.name, goal: `use of node ${u.node}`, stuck: 'no such node' };
-            const premises = [];
-            for (const [i, c] of m.hyps.entries()) {
-                const t = grown(premiseGoal(facts, n, u, c, i), n.name);
-                if ('proven' in t)
-                    return t;
-                premises.push(t);
+    const withProducts = (f) => { const was = cellProducts.on; cellProducts.on = true; try {
+        return f();
+    }
+    finally {
+        cellProducts.on = was;
+    } };
+    // The tree made the goal's own (a weaker goal's widened), or grown on the goal itself where that fails.
+    const own = (r, g) => (r.from === g ? r.tree : timedKind('widen', 0, () => widen(r.from, g, r.tree, opaqueOf.get(r.from))));
+    const whole = (g, node, mine) => {
+        const key = JSON.stringify(g.hyps), before = grownBefore.get(key);
+        if (before)
+            return before.tree;
+        const r = grown(g, node, mine);
+        if ('proven' in r)
+            return r;
+        const t = own(r, g) ?? (() => { const o = grow(g); return 'tree' in o ? o.tree : undefined; })();
+        if (!t)
+            return { proven: false, checked: false, node, goal: g.name, stuck: 'unknown' };
+        if (grownBefore.size >= 4096)
+            grownBefore.clear();
+        grownBefore.set(key, { tree: t });
+        return t;
+    };
+    // A goal with the node's opaque terms read as variables (z$0, z$1, ...), remembered with them for `widen`.
+    const opaqueOf = new WeakMap();
+    let hidden = [];
+    const hide = (g) => {
+        if (!hidden.length)
+            return g;
+        let text = JSON.stringify(g.hyps);
+        const names = {};
+        hidden.forEach((e, i) => { const id = JSON.stringify(e); if (text.includes(id)) {
+            text = text.replaceAll(id, JSON.stringify(v(`z$${i}`)));
+            names[`z$${i}`] = e;
+        } });
+        if (!Object.keys(names).length)
+            return g;
+        const out = { ...g, hyps: JSON.parse(text) };
+        opaqueOf.set(out, names);
+        return out;
+    };
+    // A node's goal grown; then the node keeps only the facts and uses its tree reads (the fewer, the fewer hypotheses its
+    // goal has for the kernel to read at every leaf, and the fewer uses to prove below); then each use's goals.
+    const attempt = ({ opaque, variants: _v, weak: _w, slice: sl, ...n0 }) => {
+        hidden = opaque ?? [];
+        sliceNow = !!sl;
+        // A goal's own hypotheses: the node's, and those after its facts and uses.
+        const n1 = { ...n0, insts: n0.insts.filter(p => facts[p.fact]) };
+        const base = baseHyps(facts, n1).length, mine = (tail) => (i) => i < n1.hyps.length || i >= base + tail;
+        const g = mainGoal(facts, shapes, n1), key = JSON.stringify(g.hyps), before = grownBefore.get(key);
+        let n = n1, main, src;
+        if (before) {
+            n = { ...n1, insts: before.insts?.map(i => n1.insts[i]) ?? n1.insts, uses: before.uses?.map(j => n1.uses[j]) ?? n1.uses };
+            main = before.tree;
+            src = { tree: main, from: mainGoal(facts, shapes, n) };
+        }
+        else {
+            // First the node with only the facts and uses its goal reaches, its goal grown as it is (within two seconds).
+            const h0 = n1.hyps.length, keep = sliceOn() ? reached(g, mine(n1.uses.length)) : undefined;
+            const n2 = keep && { ...n1, insts: n1.insts.filter((_, i) => keep.has(h0 + i)), uses: n1.uses.filter((_, j) => keep.has(base + j)) };
+            if (n2 && (n2.insts.length < n1.insts.length || n2.uses.length < n1.uses.length)) {
+                const g2 = mainGoal(facts, shapes, n2), part = hide(g2);
+                const p = timedKind('main selected', g2.hyps.length, () => withProducts(() => grow(part, new Map(), { nodes: 0, until: performance.now() + Math.min(2_000, later ?? 2_000) })));
+                if (env()?.GDP_CYCLIC_DEBUG)
+                    console.error(`[cyc] ${g.name}: ${g2.hyps.length} of ${g.hyps.length} hyps selected, ${'tree' in p ? `${p.nodes} nodes` : p.stuck}`);
+                const t = 'tree' in p ? own({ tree: p.tree, from: part }, g2) : undefined;
+                if (t && 'tree' in p) {
+                    n = n2;
+                    main = t;
+                    src = { tree: p.tree, from: part };
+                }
+            }
+            // Then the whole node, its goal sliced; it keeps the facts and uses its tree reads.
+            if (!main) {
+                const r = grown(g, n1.name, mine(n1.uses.length));
+                if ('proven' in r)
+                    return r;
+                const used = sliceOn() ? timedKind('used', 0, r.used) : undefined;
+                const trim = used ? { ...n1, insts: n1.insts.filter((_, i) => used.has(h0 + i)), uses: n1.uses.filter((_, j) => used.has(base + j)) } : n1;
+                const g2 = trim.insts.length < n1.insts.length || trim.uses.length < n1.uses.length ? mainGoal(facts, shapes, trim) : g;
+                const t2 = own(r, g2);
+                main = t2 ?? own(r, g) ?? (() => { const o = grow(g); return 'tree' in o ? o.tree : undefined; })();
+                if (!main)
+                    return { proven: false, checked: false, node: n1.name, goal: g.name, stuck: 'unknown' };
+                if (t2)
+                    n = trim;
+                src = { tree: r.tree, from: r.from };
+            }
+            if (grownBefore.size >= 4096)
+                grownBefore.clear();
+            grownBefore.set(key, { tree: main, insts: n.insts.map(p => n1.insts.indexOf(p)), uses: n.uses.map(u => n1.uses.indexOf(u)) });
+        }
+        hidden = [];
+        // Each use's goals; where one isn't proven with the facts the node kept, again with all of them.
+        const usesOf = (n) => {
+            const nb = baseHyps(facts, n).length, mine2 = (i) => i < n.hyps.length || i >= nb, out = [];
+            for (const u of n.uses) {
+                const m = shapes[u.node];
+                if (!m)
+                    return { proven: false, checked: false, node: n.name, goal: `use of node ${u.node}`, stuck: 'no such node' };
+                const premises = [];
+                for (const [i, c] of m.hyps.entries()) {
+                    const t = whole(premiseGoal(facts, n, u, c, i), n.name, mine2);
+                    if ('proven' in t)
+                        return t;
+                    premises.push(t);
+                }
+                const descent = whole(descentGoal(facts, n, u, m), n.name, mine2);
+                if ('proven' in descent)
+                    return descent;
+                out.push({ ...u, premises, descent });
+            }
+            return out;
+        };
+        const uses = usesOf(n);
+        if (!('proven' in uses))
+            return { ...n, uses, main: main };
+        if (n.insts.length === n1.insts.length || !src)
+            return uses;
+        const n3 = { ...n, insts: n1.insts }, main3 = own(src, mainGoal(facts, shapes, n3)), uses3 = main3 ? usesOf(n3) : uses;
+        return main3 && !('proven' in uses3) ? { ...n3, uses: uses3, main: main3 } : uses;
+    };
+    for (const i of order) {
+        let failed;
+        for (const [j, spec] of [specs[i], ...(specs[i].variants ?? [])].entries()) {
+            // (a variant after the first within a few seconds a goal, one second once a node is refuted: a variant the first
+            // wasn't proven by is seldom needed, and seldom proves a node where another is refuted)
+            later = j ? (refuted ? 1_000 : 3_000) : undefined;
+            if (spec.uses.some(u => weak.has(u.node)))
+                continue;
+            const r = attempt(spec);
+            if ('proven' in r) {
+                failed ??= r;
+                if (r.stuck === 'sat')
+                    refuted = true;
+                continue;
             }
-            const descent = grown(descentGoal(facts, n, u, m), n.name);
-            if ('proven' in descent)
-                return descent;
-            uses.push({ ...u, premises, descent });
+            nodes[i] = r;
+            shapes[i] = spec;
+            failed = undefined;
+            if (spec.weak)
+                weak.add(i);
+            break;
         }
-        nodes.push({ ...n, uses, main });
+        if (failed || !nodes[i])
+            return failed ?? { proven: false, checked: false, node: specs[i].name, goal: specs[i].name, stuck: 'unknown' };
     }
-    const proof = { facts, nodes }, why = refuseCyclic(proof);
+    const proof = { facts, nodes }, why = timedKind('check', 0, () => refuseCyclic(proof));
     return { proven: true, checked: why === undefined, proof, ...(why ? { why } : {}) };
 }
+// An instance's nodes, and their variants, grown first on what their goals read.
+const sliced = (specs) => specs.map(sp => ({ ...sp, slice: true, ...(sp.variants ? { variants: sp.variants.map(x => ({ ...x, slice: true })) } : {}) }));
 // The facts of a machine's functions (laws about every key of them), as cyclic facts.
 const factOf = (l) => ({ name: l.name, keys: [...(l.forall ? [l.forall] : []), ...(l.keys ?? [])], holds: l.holds });
 export function recurNodes(r) {
@@ -81,11 +355,41 @@ export function recurNodes(r) {
             insts: [{ fact: 1, at: [less1(y)] }],
             uses: [...r.between.map((_, j) => ({ node: n + j, subst: { y: less1(y) }, guard: le(add(x, k(1)), y) })), ...lemmaUses(x, yes), ...lemmaUses(y, yes), ...lemmaUses(less1(y), le(k(1), y))],
         });
-    return { facts, specs: withReads(facts, specs) };
+    if (!stepNodesOn())
+        return { facts, specs: sliced(withReads(facts, specs)) };
+    // Each lemma and law twice, as a machine's laws are (GDP_CYCLIC_STEP=0 states the first alone): at x (rank (0, x, 1)),
+    // from f(0) or from the lemma after a step to x, rank (0, x, 0), read at next(x − 1, f(x − 1)) (the usual rule's step
+    // goal) and using every lemma at x − 1; a law between x and y likewise at y (rank (1, y, ·)), after a step to y using
+    // the laws at y − 1 and the lemmas at x and y − 1.
+    const b = r.between.length, step = (e) => substE(r.next, vars({ x: less1(e), prev: get(f, less1(e)) }));
+    const atStep = (l) => substC(l.holds, vars({ x, fx: step(x) }));
+    const lemmaAfter = r.lemmas.map((l) => {
+        const name = `${r.name}: ${l.name}, after a step`, hyps = [le(k(1), x)];
+        return { name, hyps, concl: atStep(l), rank: [k(0), x, k(0)], insts: [], uses: lemmaUses(less1(x), yes), variants: [{ name, hyps, concl: yes, rank: [k(0), x, k(0)], insts: [], uses: [], weak: true }] };
+    });
+    const betweenAfter = r.between.map((l) => {
+        const name = `${r.name}: ${l.name}, after a step`, hyps = [le(add(x, k(1)), y)];
+        return { name, hyps, concl: substC(l.holds, vars({ x, fx: get(f, x), y, fy: step(y) })), rank: [k(1), y, k(0)], insts: [],
+            uses: [...r.between.map((_, j) => ({ node: n + j, subst: { y: less1(y) }, guard: yes })), ...lemmaUses(x, yes), ...lemmaUses(less1(y), yes)],
+            variants: [{ name, hyps, concl: yes, rank: [k(1), y, k(0)], insts: [], uses: [], weak: true }] };
+    });
+    const own = specs.map((sp, i) => {
+        const lemma = i < n, a = { ...sp, rank: [...sp.rank, k(1)], insts: lemma ? sp.insts : [{ fact: 1, at: [less1(y)] }],
+            uses: lemma ? [{ node: n + b + i, subst: {}, guard: le(k(1), x) }] : [{ node: 2 * n + b + (i - n), subst: {}, guard: le(add(x, k(1)), y) }, ...lemmaUses(x, yes), ...lemmaUses(y, yes)],
+            variants: [{ ...sp, rank: [...sp.rank, k(1)] }] };
+        return a;
+    });
+    const all = withReads(facts, [...own, ...lemmaAfter, ...betweenAfter]);
+    for (const [i, a] of all.slice(0, n + b).entries()) {
+        const o = shared(facts, a, all[n + b + i].concl);
+        if (o.length)
+            all[i] = { ...a, opaque: o };
+    }
+    return { facts, specs: sliced(all.map(sp => (sp.variants ? { ...sp, variants: withReads(facts, sp.variants, all) } : sp))) };
 }
 // Function facts at the keys a node's goal reads them at: each fact about every key of a function read f[k] (the key
 // alone) at each key f is read at, twice over (a fact's own reads give more keys).
-function withReads(facts, specs) {
+function withReads(facts, specs, nodes = specs) {
     const simple = facts.flatMap((f, i) => {
         if (f.keys.length !== 1)
             return [];
@@ -104,7 +408,7 @@ function withReads(facts, specs) {
     return specs.map(n => {
         const insts = [...n.insts], seen = new Set(insts.map(p => JSON.stringify(p)));
         for (let round = 0; round < 2; round++) {
-            const goal = [n.hyps, n.concl, insts.map(p => substC(facts[p.fact].holds, vars(Object.fromEntries(facts[p.fact].keys.map((key, i) => [key, p.at[i]]))))), n.uses.map(u => substC(specs[u.node].concl, vars(u.subst)))];
+            const goal = [n.hyps, n.concl, insts.map(p => substC(facts[p.fact].holds, vars(Object.fromEntries(facts[p.fact].keys.map((key, i) => [key, p.at[i]]))))), n.uses.map(u => substC(nodes[u.node].concl, vars(u.subst)))];
             for (const s of simple)
                 for (const key of readsIn(goal, s.map)) {
                     const p = { fact: s.fact, at: [key] }, id = JSON.stringify(p);
@@ -197,6 +501,14 @@ export function machineNodes(m, laws, instances) {
         { name: `${m.name}: params are naturals`, keys: [], holds: and(yes, ...m.params.map(x => le(k(0), v(x)))) },
     ];
     const fi = (name) => facts.findIndex(f => f.name === name);
+    // The run's facts at time t: the start and the step (Bridge.lean's cycCanon has them so).
+    const run = (when) => [{ fact: 0, at: [when] }, { fact: 1, at: [when] }];
+    const nexts = new Map(state.flatMap(s => { const e = m.step.state?.[s]; return e && !(e.op === 'var' && e.name === s) && afterOn() ? [[JSON.stringify(inlineE(e)), get(`${s}@`, t)]] : []; }));
+    const afterStep = (e) => {
+        const walk = (x) => (Array.isArray(x) ? x.map(walk) : !x || typeof x !== 'object' ? x
+            : nexts.get(JSON.stringify(x)) ?? Object.fromEntries(Object.entries(x).map(([key, val]) => [key, walk(val)])));
+        return nexts.size ? walk(e) : e;
+    };
     const keysOf = (l) => [...(l.forall ? [l.forall] : []), ...(l.keys ?? [])];
     // A map read at the node's time t at key e: that map's start, step and natural facts at (t, e).
     const mapInsts = (c) => {
@@ -221,12 +533,86 @@ export function machineNodes(m, laws, instances) {
         walk(c);
         return out;
     };
+    // Each law twice (GDP_CYCLIC_STEP=0 states the first alone, its goal the whole step): at time t, rank (t, 1), and after
+    // a step from t − 1, rank (t, 0), the law read at the state the step gives (the usual rule's step goal, over the run's
+    // cells at t − 1). The law at t is the start's at t = 0, and after t's step else: the step's equations carry the law
+    // after the step to the state at t. The law after the step uses every law at t − 1, at the keys the machine's proof
+    // assumes them at, with the functions' facts at the keys it names, as the usual rule's goal does.
+    function stepNodes(single) {
+        const L = laws.length, pre = at(less1(t)), one = le(k(1), t);
+        const fresh = Object.fromEntries(laws.flatMap(x => (x.forall ? [[`${x.forall}#`, v(x.forall)]] : [])));
+        const over = (e, frame) => substE(substE(e, vars(fresh)), frame);
+        // The state the step gives, over the frame before it.
+        const upd = { flags: {}, vars: Object.fromEntries(state.map(st => [st, inlineE(m.step.state?.[st] ?? v(st))])), maps: Object.fromEntries(mapNames.map(map => [map, (kk) => {
+                    const w = m.step.maps?.[map];
+                    // (a write's reads at its key read at the key read instead, as the map's step fact has them: the same cells there)
+                    return !w ? get(map, kk) : 'each' in w ? substE(inlineE(w.value), vars({ [w.each]: kk })) : { op: 'if', c: eq(kk, inlineE(w.key)), then: readsAt(inlineE(w.value), inlineE(w.key), kk), else: get(map, kk) };
+                }])) };
+        const omegaHyp = mapNames.length ? [{ op: '<', a: T, b: omega }] : [];
+        const fnInsts = (inst, frame) => (m.facts ?? []).flatMap(f => {
+            const ks = keysOf(f), flat = inst[f.name] ?? [], fact = fi(f.name);
+            if (!ks.length)
+                return [{ fact, at: [] }];
+            return Array.from({ length: Math.floor(flat.length / ks.length) }, (_, i) => ({ fact, at: flat.slice(i * ks.length, (i + 1) * ks.length).map(e => over(e, frame)) }));
+        });
+        const naturals = (when) => state.map(st => ({ fact: fi(`${m.name}: ${st} is a natural`), at: [when] }));
+        const params = { fact: fi(`${m.name}: params are naturals`), at: [] };
+        // The law at t first with the start's and the step's facts alone, then with the functions' facts at the keys the
+        // machine's proof names (read at t: the start's case), then as one node whose goal is the whole step (its uses the
+        // laws at t − 1), for a law after the step that isn't proven (that node then holds outright, a weak variant).
+        const nowNodes = laws.map((l, i) => {
+            const concl = substC(l.holds, at(t)), inst = instances[l.name] ?? {};
+            const hyps = [...(m.pre ? [m.pre] : []), le(t, T), ...omegaHyp], uses = [{ node: L + i, subst: {}, guard: one }];
+            const lean = [...run(t), ...mapInsts(concl), ...naturals(t), params];
+            const fns = fnInsts(inst, at(t));
+            return { name: `${m.name}: ${l.name}`, hyps, concl, rank: [t, k(1)], insts: lean, uses,
+                variants: [...(fns.length ? [{ name: `${m.name}: ${l.name}`, hyps, concl, rank: [t, k(1)], insts: [...lean, ...fns], uses }] : []), { ...single[i], rank: [t, k(1)] }] };
+        });
+        const stepNodes = laws.map((l) => {
+            const inst = instances[l.name] ?? {}, concl = substC(substC(substC(l.holds, vars(fresh)), upd), pre);
+            const uses = laws.flatMap((l2, j) => {
+                const ks = keysOf(l2);
+                if (!ks.length)
+                    return [{ node: j, subst: { 't$': less1(t) }, guard: one }];
+                const flat = inst[l2.name] ?? [];
+                return Array.from({ length: Math.floor(flat.length / ks.length) }, (_, q) => ({ node: j, subst: { 't$': less1(t), ...Object.fromEntries(ks.map((kn, r) => [kn, over(flat[q * ks.length + r], pre)])) }, guard: one }));
+            });
+            // (the request the step assumes a hypothesis of its own, which the law at t has from the step's fact: the step's
+            // equations are no hypothesis of this goal)
+            const hyps = [...(m.pre ? [m.pre] : []), one, le(t, T), ...omegaHyp, ...(m.assume ? [now(inline(m.assume), less1(t))] : [])], name = `${m.name}: ${l.name}, after a step`;
+            return { name, hyps, concl, rank: [t, k(0)], insts: [...fnInsts(inst, pre), ...naturals(less1(t)), params], uses,
+                variants: [{ name, hyps, concl: yes, rank: [t, k(0)], insts: [], uses: [], weak: true }] };
+        });
+        // The law at t reads the law after the step and the step's facts at t: the terms they share (the state the step
+        // gives) are opaque to its search, so that it carries the one to the other without splitting the step's cases.
+        for (const [i, a] of nowNodes.entries()) {
+            const o = shared(facts, a, stepNodes[i].concl);
+            if (o.length)
+                a.opaque = o;
+        }
+        return [...nowNodes, ...stepNodes];
+    }
     const specs = laws.map(l => {
         const inst = instances[l.name] ?? {};
         // Terms over the frame before the step (the machine's proof proves a law about every key at a fresh key k#: here
         // the node's own k).
         const fresh = Object.fromEntries(laws.flatMap(x => (x.forall ? [[`${x.forall}#`, v(x.forall)]] : [])));
         const pre = at(less1(t)), before = (e) => substE(substE(e, vars(fresh)), pre);
+        // A function's fact also at its keys with the terms the step gives a state variable (the usual proof reads the state
+        // after the step so) as that variable's cell at t, where it then reads the function where the law at t does: at the
+        // key its own reads are at, not one the prover would have to prove equal to it.
+        const fnReads = (x) => { const out = []; const walk = (y) => { if (y && typeof y === 'object') {
+            const o = y;
+            if (o.op === 'get' && !o.map.endsWith('@'))
+                out.push(JSON.stringify(o));
+            Object.values(o).forEach(walk);
+        } }; walk(x); return out; };
+        const concl = substC(l.holds, at(t)), reads = new Set(fnReads(concl));
+        const after = (e) => substE(afterStep(substE(e, vars(fresh))), pre);
+        const both = (tuple, make, read) => {
+            const a = make(tuple.map(before)), b = make(tuple.map(after));
+            return JSON.stringify(a) === JSON.stringify(b) || !fnReads(read(b)).some(c => reads.has(c)) ? [a] : [a, b];
+        };
         // The laws at the step before, at the keys the machine's proof assumes them at.
         const uses = laws.flatMap((l2, j) => {
             const ks = keysOf(l2);
@@ -237,20 +623,58 @@ export function machineNodes(m, laws, instances) {
         });
         // The functions' facts at the keys the proof names, over the frame before the step (at t = 0, the start's).
         const factInsts = (m.facts ?? []).flatMap(f => {
-            const ks = keysOf(f), flat = inst[f.name] ?? [];
+            const ks = keysOf(f), flat = inst[f.name] ?? [], fact = fi(f.name);
             if (!ks.length)
-                return [{ fact: fi(f.name), at: [] }];
-            return Array.from({ length: Math.floor(flat.length / ks.length) }, (_, i) => ({ fact: fi(f.name), at: flat.slice(i * ks.length, (i + 1) * ks.length).map(before) }));
+                return [{ fact, at: [] }];
+            return Array.from({ length: Math.floor(flat.length / ks.length) }, (_, i) => both(flat.slice(i * ks.length, (i + 1) * ks.length), at => ({ fact, at }), p => substC(f.holds, vars(Object.fromEntries(ks.map((kn, q) => [kn, p.at[q]])))))).flat();
         });
-        const concl = substC(l.holds, at(t));
         const useConcls = uses.map(us => substC(substC(laws[us.node].holds, at(t)), vars(us.subst)));
         const base = mapInsts([concl, useConcls]);
         return {
             name: `${m.name}: ${l.name}`, hyps: [...(m.pre ? [m.pre] : []), le(t, T), ...(mapNames.length ? [{ op: '<', a: T, b: omega }] : [])], concl, rank: [t],
-            insts: [{ fact: 0, at: [t] }, { fact: 1, at: [t] }, ...factInsts, ...base, ...state.map(st => ({ fact: fi(`${m.name}: ${st} is a natural`), at: [t] })), { fact: fi(`${m.name}: params are naturals`), at: [] }], uses,
+            insts: [...run(t), ...factInsts, ...base, ...state.map(st => ({ fact: fi(`${m.name}: ${st} is a natural`), at: [t] })), { fact: fi(`${m.name}: params are naturals`), at: [] }], uses,
         };
     });
-    return { facts, specs };
+    return { facts, specs: sliced(stepNodesOn() ? stepNodes(specs) : specs) };
+}
+// The terms (not a read, a variable or a constant) of a conclusion that a node's facts read too, largest first; none
+// inside a product (a product of a term's linear form is no linear form).
+function shared(facts, a, concl) {
+    const inst = instHyps(facts, a.insts), theirs = JSON.stringify(inst), seen = new Set(), out = [], factors = new Set();
+    const inProducts = (x, under = false) => {
+        if (!x || typeof x !== 'object')
+            return;
+        if (Array.isArray(x)) {
+            x.forEach(y => inProducts(y, under));
+            return;
+        }
+        const o = x;
+        if (under)
+            factors.add(JSON.stringify(o));
+        for (const val of Object.values(o))
+            inProducts(val, under || o.op === 'prod');
+    };
+    inProducts([concl, inst]);
+    const walk = (x) => {
+        if (!x || typeof x !== 'object')
+            return;
+        if (Array.isArray(x)) {
+            x.forEach(walk);
+            return;
+        }
+        const o = x, id = JSON.stringify(o);
+        if (['if', 'add', 'sub', 'min', 'max', 'mul', 'prod'].includes(o.op) && theirs.includes(id) && !factors.has(id)) {
+            if (!seen.has(id)) {
+                seen.add(id);
+                out.push(o);
+            }
+            return;
+        }
+        for (const val of Object.values(o))
+            walk(val);
+    };
+    walk(concl);
+    return out.sort((x, y) => JSON.stringify(y).length - JSON.stringify(x).length);
 }
 // --- folds over trees -----------------------------------------------------------------------------------------------
 // The tree as a table of nodes below its size N: a node n is a leaf (Kind[n] = 0) whose values come from its inputs,
@@ -271,11 +695,29 @@ export function foldNodes(f, laws) {
         insts: [{ fact: 0, at: [n] }, ...[n, left(n), right(n)].map(i => ({ fact: 1, at: [i] })), { fact: 2, at: [] }],
         uses: laws.flatMap((_, j) => [left, right].map(c => ({ node: j, subst: { 'n$': c(n) }, guard: eq(kind(n), k(1)) }))),
     }));
-    return { facts, specs };
+    if (!stepNodesOn())
+        return { facts, specs: sliced(specs) };
+    // Each law twice, as a machine's are (GDP_CYCLIC_STEP=0 states the first alone): at a node n, rank (n, 1), from the
+    // table's leaf case or from the law at a node from its children, rank (n, 0), the law read at the values the node's
+    // case gives (the usual rule's node goal, over the table's cells at its children), using every law at both children.
+    const L = laws.length, hyps = [...(f.pre ? [f.pre] : []), { op: '<', a: n, b: N }], inner = eq(kind(n), k(1));
+    const valuesAt = vars({ ...Object.fromEntries(f.inputs.map(x => [x, get(`${x}@`, n)])), ...Object.fromEntries(names.map(x => [x, substE(f.node[x], nodeAt(n))])) });
+    const fromChildren = laws.map((l) => {
+        const name = `${f.name}: ${l.name}, from its children`, h = [...hyps, inner];
+        return { name, hyps: h, concl: substC(l.holds, valuesAt), rank: [n, k(0)], insts: [{ fact: 0, at: [n] }, ...[left(n), right(n)].map(i => ({ fact: 1, at: [i] })), { fact: 2, at: [] }],
+            uses: laws.flatMap((_, j) => [left, right].map(c => ({ node: j, subst: { 'n$': c(n) }, guard: yes }))), variants: [{ name, hyps: h, concl: yes, rank: [n, k(0)], insts: [], uses: [], weak: true }] };
+    });
+    const atNode = laws.map((l, i) => {
+        const a = { name: `${f.name}: ${l.name}`, hyps, concl: substC(l.holds, at(n)), rank: [n, k(1)], insts: [{ fact: 0, at: [n] }, { fact: 1, at: [n] }, { fact: 2, at: [] }],
+            uses: [{ node: L + i, subst: {}, guard: inner }], variants: [{ ...specs[i], rank: [n, k(1)] }] };
+        const o = shared(facts, a, fromChildren[i].concl);
+        return o.length ? { ...a, opaque: o } : a;
+    });
+    return { facts, specs: sliced([...atNode, ...fromChildren]) };
 }
 // --- the cyclic route beside the usual one (GDP_CYCLIC=1) -------------------------------------------------------------
 // With GDP_CYCLIC=1, every proof the instances above cover is made again as a cyclic proof, and a verdict that differs
-// throws: the suite run so shows the rules are instances. Each comparison is printed to stderr as a line `cyclic: {...}`.
+// throws (GDP_CYCLIC_LAX=1 only prints it, to measure a whole run): the suite run so shows the rules are instances. Each comparison is printed to stderr as a line `cyclic: {...}`.
 const env = () => globalThis.process?.env;
 let quiet = 0;
 export const cyclicOn = () => quiet === 0 && env()?.GDP_CYCLIC === '1';
@@ -287,9 +729,12 @@ finally {
     quiet--;
 } };
 export function crossCyclic(kind, name, usual, run, usualMs) {
+    for (const key of Object.keys(cyclicProf))
+        delete cyclicProf[key];
     const t0 = performance.now(), out = run(), ms = Math.round(performance.now() - t0);
     const cyclic = out.proven && out.checked;
-    console.error(`cyclic: ${JSON.stringify({ kind, name, usual, cyclic, ms, ...(usualMs === undefined ? {} : { usualMs: Math.round(usualMs) }), ...(out.proven ? { nodes: out.proof.nodes.length, ...(out.why ? { why: out.why } : {}) } : { goal: out.goal, stuck: out.stuck }) })}`);
-    if (cyclic !== usual)
+    const prof = profOn() ? { prof: Object.fromEntries(Object.entries(cyclicProf).map(([key, p]) => [key, Object.fromEntries(Object.entries(p).map(([f, x]) => [f, Math.round(x)]))])) } : {};
+    console.error(`cyclic: ${JSON.stringify({ kind, name, usual, cyclic, ms, ...(usualMs === undefined ? {} : { usualMs: Math.round(usualMs) }), ...prof, ...(out.proven ? { nodes: out.proof.nodes.length, ...(out.why ? { why: out.why } : {}) } : { goal: out.goal, stuck: out.stuck }) })}`);
+    if (cyclic !== usual && env()?.GDP_CYCLIC_LAX !== '1')
         throw new Error(`cyclic route: ${kind} ${name} is ${cyclic ? 'proven' : 'not proven'} as a cyclic proof, ${usual ? 'proven' : 'not proven'} the usual way${out.proven ? (out.why ? ` (${out.why})` : '') : ` (${out.goal}: ${out.stuck})`}`);
 }