edytor 3.0.0 → 5.0.0

package/dist/crdt/text/index/placement.js

@@ -3,41 +3,42 @@
  * ownership the display reads (`ownShim`), and THE shown-kind rule
  * (`typeOf`).
  *
- * A structural change re-decides only what it can change: the winning
- * placement of the blocks whose candidates (or whose parent's
- * registry entry) changed, and the display slot of every block whose
- * slot walk (`displaySlotOf`) reads one that changed — its stored
- * subtree, through the blocks it displays — patched into the parents'
- * child lists. While every block shows its winning candidate (no
- * cycle rejected, none rehomed), a block's placement is its argmax
- * (`resolvePlacements` accepts it), so only a cycle through a changed
- * display edge needs the global resolution, which then runs whole.
- * The layout rules re-run only on the layouts a change reaches.
+ * A structural change re-decides only what it can change: the display
+ * edge of the blocks whose slot, record or mover changed (fork patch
+ * YP22), and the display slot of every block whose slot walk
+ * (`displaySlotOf`) reads one that changed — its stored subtree, through
+ * the blocks it displays — patched into the parents' child lists. A
+ * block's candidate edges are its live move records, strongest first, then
+ * its home slot; it shows at the first that closes no cycle through the
+ * accepted edges (`settle`): the later move wins, and the block whose edge
+ * is the oldest of a cycle falls back to its next candidate, back where it
+ * stood (its previous record, else home; the root's tail only when every
+ * candidate closes a cycle), so a cycle resolves locally: no global pass.
+ * The first build places every block the same way (their unique acyclic
+ * acceptance, whatever the order; the tests' greedy rebuild,
+ * `src/tests/oracles/placements.ts`, is what the self-checks compare). A
+ * placed block's order key is found from its sequence neighbours
+ * (`placement/keys.ts`), never by walking the parent's sequence; a rebuild
+ * keys every list once, in its sequence's order. The layout rules re-run
+ * only on the layouts a change reaches.
  */
-import { bySlot, childrenIndex, displaySlotOf, documentOrder, resolvePlacements, textRanker } from '../../placement/model.js';
+import { bySlot, childrenIndex, displaySlotOf, documentOrder } from '../../placement/model.js';
+import { denseKey, keyBetween } from '../../placement/keys.js';
+import { NO_SLOT, byTail, candidatesOf, cycleThrough, edgeParentOf, collectSlots, homeOf, registryOwners, ownerOfNode, positionsOfItem, slotOwner, slotsBefore } from '../../placement/resolve.js';
+import { cmpStamp, sameUnit } from '../../placement/slots.js';
+import { Y } from '../../engine.js';
+import { engineOps, firstItem } from '../../structs.js';
 import { DEAD, displayOf } from '../model.js';
-import { addTo, dropFrom } from './shared.js';
 /** Placement maintenance of one doc's index, over its state, claims, streams and layout rules. */
 export const indexPlacement = (ix) => {
-    const { blocks, displaysMap, ownerChanged, streamIx, placed, placementsMap, regroup, byArgParent, following, dirtyLists, leftLists, placementSeeds, stateSeeds, kindsOf, ensureOwners, ownerOf, top, streamOf, streamsIn, streamAt, role, lineKind, itemKind, rowKind, rowOfTable, declaredRows, cellKind, cellRank, declaredItems, dissolve, redissolve } = ix;
+    const { doc, registry, blocks, displaysMap, ownerChanged, placementsMap, following, dirtyLists, leftLists, placementSeeds, stateSeeds, kindsOf, slotsByBlock, rawOrder, edges, fallen, rejected, ensureOwners, ownerOf, top, streamOf, streamsIn, streamAt, kindOf, lineKind, itemKind, rowKind, rowOfTable, cellKind, cellRank, dissolve, redissolve } = ix;
+    const kept = engineOps(Y).isKeptReplaced;
     // ── placements and the children index (maintained) ────────────
-    /** The blocks of `home`'s text, in text order (segment 0's first). */
-    const rowBlocks = (home) => {
-        const at = placed.get(home);
-        if (at === undefined)
-            return [];
-        return at.head === null ? at.blocks : [at.head, ...at.blocks];
-    };
-    const ranker = textRanker(blocks, placementsMap, (b) => streamIx.get(b)?.home, rowBlocks);
-    /** Resolved parent → the blocks placed under it. */
-    const kidsOf = new Map();
     /** The document holds a layout or an item kind: `kids0` and `kidsMap` differ. */
     let layoutMode = false;
     /** The line kinds the roles declare, and those of the lines islands the document holds. */
     let lineKinds = new Set();
     let orderCache = null;
-    /** Some block shows no argmax candidate (a cycle rejected one, or none): passes run whole. */
-    let irregular = false;
     let layoutBlocks = 0;
     let itemBlocks = 0;
     /** Tables, rows and cells (`table.*`): their rules run in the layout pass. */
@@ -46,9 +47,9 @@ export const indexPlacement = (ix) => {
     const ownShim = {
         ownerOf,
         hidden: (b) => ownerOf(b) !== b || ix.dissolved.has(b),
-        childless: (b) => role(b, (r, type) => r.childless(type)) === true,
-        island: (b) => role(b, (r, type) => r.island(type)) === true,
-        container: (b) => role(b, (r, type) => r.container(type)) === true,
+        childless: (b) => kindOf(b)?.childless === true,
+        island: (b) => kindOf(b)?.island === true,
+        container: (b) => kindOf(b)?.container === true,
         lined: (b) => lineKind(b) !== undefined,
         passes: (b) => ix.dissolved.has(b),
         sheds: (owner, child) => {
@@ -58,11 +59,11 @@ export const indexPlacement = (ix) => {
         },
         slotRank: (owner, id) => cellRank(owner, id),
         top,
+        claimIndex: (holder, m) => blocks.get(holder)?.claims.findIndex((c) => c.m === m) ?? -1,
         streamOf,
         streamsIn,
         streamAt,
-        display: (b) => displayOf(b, blocks, ownShim),
-        textRank: (id, parent, rank) => ranker.rank(id, parent, rank)
+        display: (b) => displayOf(b, blocks, ownShim)
     };
     /** Re-count `id`'s kind facts; a fact the roles never declared forces a full pass. */
     const noteKind = (id) => {
@@ -108,17 +109,6 @@ export const indexPlacement = (ix) => {
         if (layoutMode !== layoutBlocks + itemBlocks + tableBlocks > 0)
             ix.placementFull = true;
     };
-    /** The argmax candidate's parent (a registry entry or the root), and its index entry. */
-    const argParent = (rec) => rec?.cands[0]?.p;
-    const noteCands = (id, before) => {
-        const after = argParent(blocks.get(id));
-        if (before === after)
-            return;
-        if (typeof before === 'string')
-            dropFrom(byArgParent, before, id);
-        if (typeof after === 'string')
-            addTo(byArgParent, after, id);
-    };
     /** The ownership the layout rules read: none of their decisions applied. */
     const own0 = {
         ...ownShim,
@@ -210,12 +200,12 @@ export const indexPlacement = (ix) => {
             if (out.has(x))
                 continue;
             out.add(x);
-            for (const c of kidsOf.get(x) ?? [])
-                stack.push(c);
+            for (const c of rawOrder.get(x) ?? [])
+                stack.push(c.id);
             for (const d of displaysMap.get(x) ?? [])
                 if (d !== x)
-                    for (const c of kidsOf.get(d) ?? [])
-                        stack.push(c);
+                    for (const c of rawOrder.get(d) ?? [])
+                        stack.push(c.id);
         }
         return out;
     };
@@ -231,59 +221,294 @@ export const indexPlacement = (ix) => {
         else
             following.delete(id);
     };
-    /** The placement `resolvePlacements` gives `id` while every block shows its argmax. */
-    const argmaxOf = (id) => {
-        const rec = blocks.get(id);
-        if (rec === undefined)
-            return undefined;
-        const c = rec.cands[0];
-        if (c === undefined)
-            return null;
-        const p = c.p !== null && !blocks.has(c.p) ? null : c.p;
-        return { parent: p, rank: c.r };
+    // ── edges, keys and acceptance ─────────────────────────────────
+    /**
+     * Whether the slot map has been read from the sequences: once, before the
+     * first rebuild (a shell settled on the first fold asks for a home), then
+     * the fold keeps it and every rebuild fills it again.
+     */
+    let slotsRead = false;
+    /** What the first read collected, for a rebuild while no sequence changed since (one scan). */
+    let collected = null;
+    let collectedAt = -1;
+    const readSlots = () => {
+        slotsRead = true;
+        slotsByBlock.clear();
+        // Every registry node, its kept incarnations too (the records may not all be built yet).
+        collected = collectSlots(doc, registryOwners(registry, kept));
+        collectedAt = ix.seqEpoch;
+        for (const [b, refs] of collected.slots)
+            slotsByBlock.set(b, refs);
     };
-    /** A display edge walk from `id`'s parent reaches `id` (or loops): the argmax graph has a cycle. */
-    const cyclic = (id) => {
-        let steps = 0;
-        for (let cur = placementsMap.get(id)?.parent ?? null; cur !== null;) {
-            const o = ownerOf(cur);
-            const at = o === DEAD ? cur : o;
-            if (at === id || ++steps > blocks.size)
-                return true;
-            const cp = placementsMap.get(at);
-            if (cp === undefined)
-                return false;
-            cur = cp.parent;
-        }
-        return false;
+    /** Put `ref` (`null`: none) where the slot map holds unit `u` of the slots naming id `b`. */
+    const putSlot = (b, u, ref) => {
+        const list = (slotsByBlock.get(b) ?? []).filter((x) => !sameUnit(x, u));
+        if (ref !== null)
+            list.push(ref);
+        if (list.length === 0)
+            slotsByBlock.delete(b);
+        else
+            slotsByBlock.set(b, list);
+    };
+    /** `id`'s home slot among the slots naming its registry id (`null`: none). */
+    const homeFor = (id) => {
+        if (!slotsRead)
+            readSlots();
+        return homeOf(registry, kept, slotsByBlock, id);
     };
+    /**
+     * Re-own the home slots of `node`'s sequence after the registry value it
+     * stands for changed (a concurrent creation of one id won or lost, its
+     * losing incarnation shown or not): each slot's parent is the node's owner
+     * now, and its block re-placed; a node that is no block of the document
+     * any more holds no slot (as a rebuild reads it).
+     */
+    const reslot = (node) => {
+        if (!slotsRead)
+            return; // the first read collects them as they are
+        const owner = ownerOfNode(registry, kept, node);
+        for (let it = firstItem(node); it !== null; it = it.right)
+            for (const { value, unit, via } of positionsOfItem(doc, it)) {
+                if (via !== null)
+                    continue; // a record's unit is another sequence's slot
+                const b = value.b;
+                putSlot(b, unit, owner === undefined ? null : { parent: owner, ...unit });
+                for (const id of new Set([b, slotOwner(registry, kept, b, unit.c)])) {
+                    const rec = blocks.get(id);
+                    if (rec !== undefined)
+                        rec.home = homeOf(registry, kept, slotsByBlock, id);
+                    placementSeeds.add(id);
+                }
+            }
+    };
+    /** The slot items a rebuild collected (its homes' items, read once), while it places every block. */
+    let known = null;
+    /** `id`'s candidate edges, read from the engine: its live records, strongest first, then home (`[]`: no slot, or gone). */
+    const candidatesFor = (id) => {
+        const home = blocks.get(id)?.home ?? homeFor(id);
+        return home === null ? [] : candidatesOf(doc, registry, kept, home, known?.get(home));
+    };
+    /** The owner of the sequence `id`'s slot shows in as the engine stands (its mover's, else home's; `null`: the root). */
+    const edgeParent = (id) => {
+        const home = blocks.get(id)?.home ?? homeFor(id);
+        return home === null ? undefined : edgeParentOf(doc, registry, kept, home);
+    };
+    /** The raw children of `parent` in order (every block whose edge parent it is), kept sorted by key. */
+    const rawList = (parent) => {
+        let l = rawOrder.get(parent);
+        if (l === undefined)
+            rawOrder.set(parent, (l = []));
+        return l;
+    };
+    /** Counts the placement writes: a key's walk that saw one happen under it walks again. */
+    let placedEpoch = 0;
+    /** Whether a placement is keyed as it is decided: not while a rebuild places every block (it keys them after, in one pass). */
+    let keyed = true;
     const setPlacement = (id, pl) => {
+        ix.foldStats.placed++;
+        placedEpoch++;
         const old = placementsMap.get(id);
-        if (old !== undefined)
-            dropFrom(kidsOf, old.parent, id);
+        if (keyed && old !== undefined) {
+            const l = rawList(old.parent);
+            const at = seek(l, { id, rank: old.rank });
+            if (l[at]?.id === id)
+                l.splice(at, 1);
+            if (l.length === 0)
+                rawOrder.delete(old.parent);
+        }
         if (pl === undefined)
             placementsMap.delete(id);
         else {
             placementsMap.set(id, pl);
-            addTo(kidsOf, pl.parent, id);
+            if (!keyed)
+                return;
+            const l = rawList(pl.parent);
+            const slot = { id, rank: pl.rank };
+            l.splice(seek(l, slot), 0, slot);
+        }
+    };
+    /**
+     * The key `id` takes under `edge.parent`: between the key of the nearest
+     * block shown where it stands before `id`'s place in the sequence (placed
+     * first when it is a pending seed; walked past when it shows elsewhere)
+     * and the next key of that list. Placing a pending neighbour can drop a
+     * block the walk already passed back into that stretch (a cycle's
+     * fallback, back where it stood): a walk under which a placement changed
+     * walks again, so the key it returns reads one state.
+     */
+    const keyFor = (id, edge, place) => {
+        for (;;) {
+            const before = placedEpoch;
+            const lrank = leftKey(id, edge, place);
+            if (placedEpoch !== before)
+                continue;
+            const list = rawOrder.get(edge.parent) ?? [];
+            const i = lrank === undefined ? 0 : seek(list, { id: '', rank: lrank }) + 1;
+            return keyBetween(lrank, list[i]?.rank);
+        }
+    };
+    /** The key of the nearest block shown before `id`'s place at `edge`, under its parent (`undefined`: none). */
+    const leftKey = (id, edge, place) => {
+        const home = blocks.get(id)?.home ?? homeFor(id);
+        for (const e of slotsBefore(doc, edge, home)) {
+            const b = slotOwner(registry, kept, e.value.b, e.unit.c);
+            // `id` itself (its place before this one) keys nothing.
+            if (b === id)
+                continue;
+            // A slot that is not its block's home (a second creation of one id) places nothing.
+            const h = blocks.get(b)?.home ?? homeFor(b);
+            if (h === null || !sameUnit(h, e.unit))
+                continue;
+            place(b);
+            const pl = placementsMap.get(b);
+            const shows = edges.get(b);
+            if (pl !== undefined &&
+                pl.parent === edge.parent &&
+                !rejected.has(b) &&
+                shows != null &&
+                shows.via === e.via)
+                return pl.rank;
+        }
+        return undefined;
+    };
+    /** The key of `id` at the root's tail, among the rejected by stamp then id, after the last top-level block. */
+    const tailKey = (id, stamp) => {
+        const tail = [...rejected]
+            .filter((x) => x !== id)
+            .map((x) => ({ id: x, stamp: edges.get(x)?.stamp ?? NO_SLOT }))
+            .sort(byTail);
+        const list = rawOrder.get(null) ?? [];
+        const me = { id, stamp };
+        let at = 0;
+        while (at < tail.length && byTail(tail[at], me) < 0)
+            at++;
+        const prev = at > 0
+            ? placementsMap.get(tail[at - 1].id)?.rank
+            : list[list.length - tail.length - 1]?.rank;
+        const next = at < tail.length ? placementsMap.get(tail[at].id)?.rank : undefined;
+        return keyBetween(prev, next);
+    };
+    /** Show `id` at the root's tail: every edge closes a cycle, or none. */
+    const reject = (id, edge) => {
+        edges.set(id, edge);
+        if (placementsMap.has(id))
+            setPlacement(id, undefined);
+        fallen.delete(id);
+        rejected.add(id);
+        const rank = keyed ? tailKey(id, edge?.stamp ?? NO_SLOT) : '';
+        setPlacement(id, { parent: null, rank });
+    };
+    /** The same display edge: the same sequence, the same record, the same stamp. */
+    const sameEdge = (a, b) => a.parent === b.parent && a.via === b.via && cmpStamp(a.stamp, b.stamp) === 0;
+    /** Whether `edge` (of `id`) is a place `id` may take now: a live parent, and no cycle it would be the oldest edge of. */
+    const admits = (id, edge) => {
+        const parent = edge.parent;
+        if (parent === undefined || (parent !== null && !blocks.has(parent)))
+            return { ok: false, drop: null };
+        const cycle = cycleThrough(placementsMap, ownerOf, id, parent);
+        if (cycle === null)
+            return { ok: true, drop: null };
+        let [min, minStamp] = [id, edge.stamp];
+        for (const m of cycle) {
+            const e = m === id ? edge : edges.get(m);
+            if (m !== id && e && cmpStamp(e.stamp, minStamp) < 0)
+                [min, minStamp] = [m, e.stamp];
+        }
+        return min === id ? { ok: false, drop: null } : { ok: true, drop: min };
+    };
+    /**
+     * Place `id` at its strongest candidate edge from `from` on that closes no
+     * cycle it would be the oldest edge of (the later move wins). When the
+     * edge closes a cycle through an older edge, that edge's block is dropped
+     * to its next candidate (back where it stood before that move), and so on
+     * down its records to home; a block every candidate of which fails shows
+     * at the root's tail. `place` places a pending neighbour first. Returns
+     * the blocks whose placement changed.
+     */
+    const settle = (id, place, from = 0) => {
+        const changed = [id];
+        const cands = candidatesFor(id);
+        for (let n = from; n < cands.length; n++) {
+            const edge = cands[n];
+            // The key first: its walk places the pending neighbours, so the cycle
+            // check reads them placed (a neighbour placed after it could close a
+            // cycle through `id` that no check saw).
+            const rank = keyed ? keyFor(id, edge, place) : '';
+            const { ok, drop } = admits(id, edge);
+            if (!ok)
+                continue;
+            edges.set(id, edge);
+            rejected.delete(id);
+            if (n > 0)
+                fallen.add(id);
+            else
+                fallen.delete(id);
+            if (placementsMap.has(id))
+                setPlacement(id, undefined);
+            setPlacement(id, { parent: edge.parent, rank });
+            if (drop !== null) {
+                const now = edges.get(drop);
+                const at = now ? candidatesFor(drop).findIndex((c) => sameEdge(c, now)) : -1;
+                changed.push(...settle(drop, () => { }, at + 1));
+            }
+            return changed;
+        }
+        reject(id, cands[0] ?? null);
+        return changed;
+    };
+    /** Whether a candidate stronger than `id`'s accepted edge would take it now. */
+    const canRise = (id) => {
+        const cands = candidatesFor(id);
+        const now = edges.get(id);
+        const at = rejected.has(id) || !now ? cands.length : cands.findIndex((c) => sameEdge(c, now));
+        for (let n = 0; n < (at < 0 ? cands.length : at); n++)
+            if (admits(id, cands[n]).ok)
+                return true;
+        return false;
+    };
+    /**
+     * Try every block below its strongest edge again (a changed edge may have
+     * broken its cycle, or made another the one to drop): those that rise join
+     * `moved`.
+     */
+    const retryFallen = (moved) => {
+        for (let round = 0; round < fallen.size + rejected.size + 2; round++) {
+            let changed = false;
+            const below = [...rejected, ...fallen]
+                .map((x) => ({ id: x, stamp: candidatesFor(x)[0]?.stamp ?? NO_SLOT }))
+                .sort((a, b) => -byTail(a, b));
+            for (const { id } of below) {
+                if (!canRise(id))
+                    continue;
+                for (const x of settle(id, () => { }))
+                    moved.add(x);
+                changed = true;
+            }
+            if (!changed)
+                break;
         }
     };
-    /** Everything rebuilt from the records (the first build, roles, an irregular state). */
+    /**
+     * Everything rebuilt from the sequences (the first build, roles): every
+     * block placed as an edit places one (`settle`, then `retryFallen`) —
+     * the one acyclic acceptance, whatever the order the blocks come in —
+     * then keyed in one pass over each sequence's places (dense keys in its
+     * order), the root's tail after the last top-level block.
+     */
     const rebuildPlacements = () => {
         ix.placementFull = false;
-        ranker.forget();
-        regroup.clear();
         placementSeeds.clear();
         stateSeeds.clear();
         ownerChanged.clear();
-        ix.itemKinds = declaredItems();
+        const declared = ix.roles?.declared();
+        ix.itemKinds = new Set(declared?.items);
         for (const b of blocks.keys()) {
             const item = itemKind(b);
             if (item !== undefined)
                 ix.itemKinds.add(item);
         }
-        lineKinds = new Set(ix.roles?.lineKinds());
-        ix.rowKinds = declaredRows();
+        lineKinds = new Set(declared?.lines);
+        ix.rowKinds = new Map(declared?.rows);
         for (const b of blocks.keys()) {
             const type = blocks.get(b)?.type;
             const rows = type === undefined ? undefined : rowOfTable(type);
@@ -299,32 +524,60 @@ export const indexPlacement = (ix) => {
         for (const line of lineCounts.keys())
             lineKinds.add(line);
         ix.placementFull = false;
-        const resolved = resolvePlacements(blocks, ownerOf);
+        // The first read's slots while no sequence changed since (one scan).
+        const { slots, items, places } = collected !== null && collectedAt === ix.seqEpoch
+            ? collected
+            : collectSlots(doc, blocks.values());
+        collected = null;
+        slotsByBlock.clear();
+        for (const [b, refs] of slots)
+            slotsByBlock.set(b, refs);
+        slotsRead = true;
         placementsMap.clear();
-        kidsOf.clear();
-        irregular = false;
-        for (const [id, pl] of resolved) {
-            setPlacement(id, pl);
-            const arg = argmaxOf(id);
-            if (!arg || arg.parent !== pl.parent || arg.rank !== pl.rank)
-                irregular = true;
-        }
+        edges.clear();
+        rawOrder.clear();
+        fallen.clear();
+        rejected.clear();
+        [keyed, known] = [false, items];
+        for (const id of blocks.keys())
+            settle(id, () => { });
+        if (fallen.size + rejected.size > 0)
+            retryFallen(new Set());
+        [keyed, known] = [true, null];
+        // The lists in key order: a block where its edge shows it, in its sequence's order.
+        for (const [owner, list] of places)
+            for (const e of list) {
+                const b = slotOwner(registry, kept, e.value.b, e.unit.c);
+                const pl = placementsMap.get(b);
+                const h = blocks.get(b)?.home;
+                if (pl?.parent !== owner || rejected.has(b) || !h || !sameUnit(h, e.unit))
+                    continue;
+                if (edges.get(b)?.via !== e.via)
+                    continue;
+                const l = rawList(owner);
+                pl.rank = denseKey(l.length);
+                l.push({ id: b, rank: pl.rank });
+            }
+        // The root's tail, keyed as an edit keys a rejected block, in its order.
+        const tail = [...rejected].map((x) => ({ id: x, stamp: edges.get(x)?.stamp ?? NO_SLOT }));
+        rejected.clear();
+        for (const { id } of tail.sort(byTail))
+            reject(id, edges.get(id) ?? null);
         layoutMode = layoutBlocks + itemBlocks + tableBlocks > 0;
         ix.dissolved = new Set();
-        const index = (own, map) => {
+        const index = (map) => {
             const at = new Map();
             for (const [parent, list] of map)
                 for (const { id, rank, reset } of list)
                     at.set(id, reset === undefined ? { parent, rank } : { parent, rank, reset });
-            void own;
             return at;
         };
         ix.kids0 = childrenIndex(placementsMap, own0);
-        ix.slots0 = index(own0, ix.kids0);
+        ix.slots0 = index(ix.kids0);
         if (layoutMode) {
             ix.dissolved = dissolve(ix.kids0);
             ix.kidsMap = childrenIndex(placementsMap, ownShim);
-            ix.slots = index(ownShim, ix.kidsMap);
+            ix.slots = index(ix.kidsMap);
         }
         else
             [ix.kidsMap, ix.slots] = [ix.kids0, ix.slots0];
@@ -337,48 +590,61 @@ export const indexPlacement = (ix) => {
     };
     const ensurePlacements = () => {
         ensureOwners();
-        if (ix.placementFull || irregular) {
-            if (ix.placementFull || placementSeeds.size + stateSeeds.size + ownerChanged.size > 0)
-                rebuildPlacements();
-            return;
-        }
-        if (placementSeeds.size + stateSeeds.size + ownerChanged.size + regroup.size === 0)
+        if (ix.placementFull)
+            return rebuildPlacements();
+        if (placementSeeds.size + stateSeeds.size + ownerChanged.size === 0)
             return;
         const moved = new Set();
-        for (const id of placementSeeds) {
-            // A candidate change (a move, even to the same slot) re-decides its text's order.
-            const home = streamIx.get(id)?.home;
-            if (home !== undefined)
-                regroup.add(home);
-            const next = argmaxOf(id);
-            if (next === null)
-                return rebuildPlacements();
-            const old = placementsMap.get(id);
-            if (old?.parent === next?.parent && old?.rank === next?.rank)
-                continue;
-            setPlacement(id, next);
-            moved.add(id);
-        }
-        // A changed display edge closing a cycle needs the global resolution.
-        for (const id of moved)
-            if (cyclic(id))
-                return rebuildPlacements();
+        const seeds = new Set(placementSeeds);
+        const done = new Set();
+        /** Place one seed (its left neighbour first, when it is a seed too). */
+        const place = (id) => {
+            if (done.has(id) || !seeds.has(id))
+                return;
+            done.add(id);
+            if (!blocks.has(id)) {
+                if (placementsMap.has(id)) {
+                    setPlacement(id, undefined);
+                    edges.delete(id);
+                    fallen.delete(id);
+                    rejected.delete(id);
+                    moved.add(id);
+                }
+                return;
+            }
+            const top = candidatesFor(id)[0] ?? null;
+            const old = edges.get(id);
+            // The same edge, placed at its strongest: its key still orders it (its neighbours' keys are theirs).
+            if (top !== null &&
+                old &&
+                !rejected.has(id) &&
+                !fallen.has(id) &&
+                placementsMap.has(id) &&
+                sameEdge(top, old))
+                return;
+            for (const x of settle(id, place))
+                moved.add(x);
+        };
+        for (const id of [...seeds])
+            place(id);
+        // A changed claim owner can close a cycle through a display edge that did not change.
         for (const o of ownerChanged)
-            for (const c of kidsOf.get(o) ?? [])
-                if (cyclic(c))
-                    return rebuildPlacements();
-        const seeds = new Set([...moved, ...stateSeeds, ...ownerChanged]);
-        // Every block of a text whose pieces' order may have changed re-reads its slot.
-        for (const home of regroup)
-            for (const b of ranker.regroup(home))
-                if (placementsMap.has(b))
-                    seeds.add(b);
-        regroup.clear();
+            for (const c of [...(rawOrder.get(o) ?? [])]) {
+                const edge = edges.get(c.id);
+                if (!edge || rejected.has(c.id) || edge.parent === undefined)
+                    continue;
+                if (cycleThrough(placementsMap, ownerOf, c.id, edge.parent) !== null)
+                    for (const x of settle(c.id, () => { }))
+                        moved.add(x);
+            }
+        if (rejected.size + fallen.size > 0 && (moved.size > 0 || ownerChanged.size > 0))
+            retryFallen(moved);
+        const seeds2 = new Set([...moved, ...stateSeeds, ...ownerChanged]);
         const kinds = [...stateSeeds];
         placementSeeds.clear();
         stateSeeds.clear();
         ownerChanged.clear();
-        const affected = reach(seeds);
+        const affected = reach(seeds2);
         let touched = affected;
         const changed = patch(ix.kids0, ix.slots0, own0, affected);
         let any = changed.size > 0;
@@ -395,6 +661,19 @@ export const indexPlacement = (ix) => {
             ix.kidsVersion++;
         }
     };
+    /**
+     * A plain block (the document's default kind) directly in a container
+     * whose item is a kind of its own that renders content (a list) shows
+     * as that item — the read-time side of the facade's `fitted`: a race
+     * (a peer's lift of an item another peer's outdent moves, a concurrent
+     * undo of a retype) or an explicit write never shows a bare paragraph
+     * in a list. Anywhere else it shows `plain`.
+     */
+    const itemOf = (under, plain) => {
+        const parent = typeOf(under);
+        const { container, child } = ix.roles.of(parent);
+        return container && ix.roles.of(child).rendersContent ? child : plain;
+    };
     /**
      * The kind `id` displays as — THE shown-kind rule, read from its slot
      * and the role table. A block directly in an island declared `lines`
@@ -411,25 +690,11 @@ export const indexPlacement = (ix) => {
      * (`itemOf`). Any other shows its stored kind (a retype shows). Read from the stored kinds
      * at call time: a retype rebuilds no placement.
      */
-    /**
-     * A plain block (the document's default kind) directly in a container
-     * whose item is a kind of its own that renders content (a list) shows
-     * as that item — the read-time side of the facade's `fitted`: a race
-     * (a peer's lift of an item another peer's outdent moves, a concurrent
-     * undo of a retype) or an explicit write never shows a bare paragraph
-     * in a list. Anywhere else it shows `plain`.
-     */
-    const itemOf = (under, plain) => {
-        const parent = typeOf(under);
-        if (!ix.roles.container(parent))
-            return plain;
-        const item = ix.roles.defaultChild(parent);
-        return ix.roles.rendersContent(item) ? item : plain;
-    };
     const typeOf = (id) => {
         const stored = blocks.get(id)?.type ?? 'unknown';
         const slot = ix.slots.get(id);
-        if (ix.roles === null || slot === undefined)
+        const roles = ix.roles;
+        if (roles === null || slot === undefined)
             return stored;
         const { parent: under, reset } = slot;
         const line = under === null || lineKinds.size === 0 ? undefined : lineKind(under);
@@ -437,38 +702,36 @@ export const indexPlacement = (ix) => {
             return line;
         const lined = lineKinds.has(stored);
         const from = reset === undefined ? undefined : (blocks.get(reset)?.type ?? null);
-        if (!lined && (from === undefined || stored !== ix.roles.defaultChild(from)))
-            return stored === ix.roles.defaultChild(null) && under !== null
-                ? itemOf(under, stored)
-                : stored;
+        const plain = roles.of(null).child;
+        if (!lined && (from === undefined || stored !== roles.of(from).child))
+            return stored === plain && under !== null ? itemOf(under, stored) : stored;
         // Out of a removed list, inside an outer list of its kind: still an item. A
         // container whose item is the document's default kind (a column) holds no
         // items of its own: a paragraph under one is no list's item.
-        if (!lined && typeof from === 'string' && ix.roles.container(from))
+        if (!lined && typeof from === 'string' && roles.of(from).container)
             for (let u = under; u !== null; u = ix.slots.get(u)?.parent ?? null) {
-                const t = typeOf(u);
-                if (ix.roles.container(t) &&
-                    ix.roles.defaultChild(t) === stored &&
-                    stored !== ix.roles.defaultChild(null))
+                const t = roles.of(typeOf(u));
+                if (t.container && t.child === stored && stored !== plain)
                     return stored;
             }
-        const kind = ix.roles.defaultChild(under === null ? null : typeOf(under));
-        if (ix.roles.rendersContent(kind) || !ix.roles.rendersContent(stored))
+        const kind = roles.of(under === null ? null : typeOf(under)).child;
+        if (roles.of(kind).rendersContent || !roles.of(stored).rendersContent)
             return kind;
         // Never a line kind outside its island, even where the slot's kind shows nothing.
-        return lined ? ix.roles.defaultChild(null) : stored;
+        return lined ? plain : stored;
     };
     /** The document order, cached until a child list changes. */
     const order = () => (orderCache ??= documentOrder(ix.kidsMap));
     return {
-        ranker,
         ownShim,
         own0,
         noteKind,
-        argParent,
-        noteCands,
+        homeFor,
+        putSlot,
+        edgeParent,
         noteFollowing,
         ensurePlacements,
+        reslot,
         typeOf,
         order
     };