@solidjs/signals 2.0.0-rc.7 → 2.0.0-rc.9

package/dist/prod/core/optimistic.js

@@ -1,14 +1,14 @@
-import { NOT_PENDING, unwrapOverride, STATUS_UNINITIALIZED, REACTIVE_DIRTY, REACTIVE_CHECK, CONFIG_HAS_LANE, OVERRIDE_UNDEFINED, STATUS_PENDING, EFFECT_RENDER, REACTIVE_MANUAL_WRITE, REACTIVE_OPTIMISTIC_DIRTY, EFFECT_USER } from "./constants.js";
+import { NOT_PENDING, unwrapOverride, STATUS_UNINITIALIZED, REACTIVE_DIRTY, REACTIVE_CHECK, CONFIG_HAS_LANE, OVERRIDE_UNDEFINED, STATUS_PENDING, CONFIG_DERIVED_OVERRIDE, CONFIG_OPTIMISTIC, CONFIG_OVERRIDE_SUPERSEDED, EFFECT_RENDER, CONFIG_AUTHORITATIVE_OBSERVED, REACTIVE_MANUAL_WRITE, REACTIVE_OPTIMISTIC_DIRTY, LANE_RUN, EFFECT_USER } from "./constants.js";
 
-import { ext, latestReadActive, currentOptimisticLane, stale } from "./core.js";
+import { ext, hasActiveOverride, stale, enterStagedRead, latestReadActive, currentOptimisticLane } from "./core.js";
 
 import { NotReadyError } from "./error.js";
 
 import "./invariants.js";
 
-import { resolveTransition, getOrCreateLane, hasActiveOverride, activeLanes, signalLanes, laneHeld, findLane, resolveLane, assignOrMergeLane } from "./lanes.js";
+import { resolveTransition, getOrCreateLane, activeLanes, signalLanes, laneHeld, findLane, resolveLane, readsHeldCommitted, assignOrMergeLane } from "./lanes.js";
 
-import { GlobalQueue, activeTransition, globalQueue, clock, insertSubs, schedule } from "./scheduler.js";
+import { GlobalQueue, activeTransition, globalQueue, origin, clock, insertSubs, schedule, sourceObserved, currentTransition, queuePendingNode } from "./scheduler.js";
 
 /**
  * The optimistic write engine, moved out of core.ts/scheduler.ts. Everything
@@ -24,60 +24,122 @@ import { GlobalQueue, activeTransition, globalQueue, clock, insertSubs, schedule
  * once the gate holds — the same late-binding contract as verdict.ts.
  */
 /** The optimistic half of setSignal, fired when `_overrideValue !== undefined`. */ function optimisticWrite(e, n) {
-    const t = e.o?.Pe !== NOT_PENDING;
-    const i = t ? unwrapOverride(e.o?.Pe) : e.be;
-    if (typeof n === "function") n = n(i);
-    const u = !!(e.S & STATUS_UNINITIALIZED) || 
+    const i = e.o?.Ce !== NOT_PENDING;
+    const t = i ? unwrapOverride(e.o?.Ce) : e.Qe;
+    if (typeof n === "function") n = n(t);
+    const r = !!(e.S & STATUS_UNINITIALIZED) || 
     // A dirty node's _value is stale (its queued recompute hasn't run — e.g.
     // a latest() shadow marked by the previous landing's companion snap), so
     // equality against it must not swallow the write. Without this, a sync
     // push returning the shadow to that stale value was dropped, the snap
     // recompute then committed the parent's old value, and the banner showed
     // the previous transition's target (#3041 follow-up).
-    !!((e.ie ?? 0) & (REACTIVE_DIRTY | REACTIVE_CHECK)) || !e.pe || !e.pe(i, n);
-    if (!u) {
+    !!((e.ue ?? 0) & (REACTIVE_DIRTY | REACTIVE_CHECK)) || !e.Fe || !e.Fe(t, n);
+    if (!r) {
         // Same-value write with an active override still entangles the current
-        // action's transition — the hold must outlast all overlapping actions.
-        if (t) {
+        // action's transition — the hold must outlast all overlapping actions —
+        // and renews the override's PROVENANCE: the newer action re-asks the
+        // question, so an older action's answer arriving later is stale to it
+        // too (#3331; a same-value re-prediction otherwise let the first
+        // action's slow source supersede and restart the downstream flight).
+        if (i) {
             const n = resolveTransition(e);
             if (n && activeTransition !== n) globalQueue.initTransition(n);
+            if (origin > e.o.vt) e.o.vt = origin;
         }
         return n;
     }
-    if (t) globalQueue.initTransition(resolveTransition(e));
+    if (i) globalQueue.initTransition(resolveTransition(e));
     // No revert target is stashed: while the override is active every reader
     // sees it (A17), so authoritative arrivals commit silently into _value and
     // reverting is just dropping the override — _value is already correct.
-     else globalQueue.m.Xe.push(e);
+     else globalQueue.m.rt.push(e);
     // Stamp ownership on the node (post-merge, so entangled writers share the
     // joint root). resolveTransition prefers this over the lane's _transition,
     // which a shared subscriber can merge across transactions (#2912).
-        ext(e).Tt = activeTransition;
-    const r = getOrCreateLane(e);
-    ext(e).$e = r;
-    e.T |= CONFIG_HAS_LANE;
+        ext(e).Ft = activeTransition;
+    ext(e).Ct = clock;
+    // Provenance: the action asking. An answer an OLDER action's flight brings
+    // back is a stale question and holds silently to commit (#3331).
+        ext(e).vt = origin;
+    const u = getOrCreateLane(e);
+    ext(e).Ue = u;
+    // A fresh override re-masks: whatever truth is staged, this write is the
+    // value for the graph again until the source answers it (#3331).
+        e.T = (e.T | CONFIG_HAS_LANE) & -8912897;
     // Literal undefined must not land raw: the slot doubles as the optimistic
     // brand, and erasing it makes the write invisible and routes follow-up
     // writes off the optimistic path into permanent commits (#2898).
-        ext(e).Pe = n === undefined ? OVERRIDE_UNDEFINED : n;
+        ext(e).Ce = n === undefined ? OVERRIDE_UNDEFINED : n;
     // syncCompanions only pokes _pendingSignal/_latestValueComputed — with
     // neither companion present the call is a guaranteed no-op.
-        (e.o?.ye !== undefined || e.o?.Ce !== undefined) && GlobalQueue.Ue !== null && GlobalQueue.Ue(e, n);
-    if (e.oe !== undefined) e.Te = clock;
+        (e.o?.je !== undefined || e.o?.xe !== undefined) && GlobalQueue.me !== null && GlobalQueue.me(e, n);
+    if (e.ce !== undefined) e.Pe = clock;
  // §12e: computed-only slot
         insertSubs(e, true);
     schedule();
     return n;
 }
 
+/**
+ * Lanes stage (#3479): a lane pass's publish for a memo. An optimistic
+ * derivation is an override — the speculative result lives in the override
+ * slot, `_value` stays the committed truth. The whole optimistic frame is then
+ * in one place: the lane's readers and untracked reads see it (A17), a render
+ * effect off the held lane sees the committed frame whole (readsHeldCommitted,
+ * #3460) — the source's shadow AND its derivations — where a speculative
+ * `_value` beside a committed shadow tore it. The node joins the
+ * transaction's optimistic nodes on its first speculative publish; the revert
+ * drops the override and re-derives it from the truth (a derived override has
+ * no truth of its own — see resolveOptimisticNodes, endOptimism).
+ */ function laneOverride(e, n, i) {
+    // The wake-only channel (#3009, see recomputeLane): a plain write to a
+    // latest()-tracked source rides a companion-sourced lane with no
+    // transaction on either side only to wake the verdict companions. Nothing
+    // is speculative — the pass commits directly, as any plain write does.
+    i = findLane(i);
+    if (!i.Ge && !activeTransition && i.an.o?.Ht !== undefined) {
+        e.Qe = n;
+        return;
+    }
+    if (!hasActiveOverride(e)) {
+        // It reverts with the lane's transaction (a landing runs outside any
+        // flush, where the ambient batch would revert it at its own end); an
+        // orphan lane's falls to the batch, adopted with it (initTransition) as a
+        // write's is. No `_overrideOwner`: a derived override is a plain member,
+        // its transaction its lane's (resolveTransition), and it merges lanes
+        // through itself as any shared reader does (assignOrMergeLane). No
+        // provenance stamp either: not an intent, any truth supersedes it.
+        (i.Ge ? currentTransition(i.Ge) : globalQueue.m).rt.push(e);
+    }
+    // A lane pass's output is a derivation — also over a WRITTEN guess it
+    // corrects (a `createOptimistic(fn)` re-derived from fresh upstream data):
+    // the guess is gone, the slot holds fn's answer, and the revert promotes it
+    // rather than dropping to a stale `_value` and re-asking downstream (the
+    // next user write re-arms the guess: optimisticWrite clears the bit). No
+    // `_overrideTime` stamp: that marks a user WRITE unflushed until the flush
+    // that carries it (A28) and shields it from same-tick supersession — a pass's
+    // result is neither (a pulled ownerless memo publishes outside any flush).
+    // A fresh lane frame ends a supersession in force: the pass just dropped
+    // the staged truth it pointed at (recompute, INV-11 corollary) — left set,
+    // the flag served a `_value` never committed (fuzzer latest-1 #2481).
+        e.T = (e.T | CONFIG_DERIVED_OVERRIDE) & ~CONFIG_OVERRIDE_SUPERSEDED;
+    e.o.Ce = n === undefined ? OVERRIDE_UNDEFINED : n;
+}
+
 /**
  * transitionComplete's override blockage: a settling transition stays open
  * while one of its optimistic nodes holds an active override that is still
- * pending on real (non-affects-sentinel) async.
+ * pending on real (non-affects-sentinel) async. A derived override's flight is
+ * the lane's own work, never authoritative — it does not hold the settle.
+ * Neither is a companion's (#3494): the `latest()` shadow backfilled under the
+ * owner's transaction (A28 (3)) is an observation of the flight, and a
+ * mainline `latest(details)` after the flight's last reader unmounted held the
+ * released write until the orphaned request landed.
  */ function transitionBlocked(e) {
-    for (let n = 0; n < e.Xe.length; n++) {
-        const t = e.Xe[n];
-        if (hasActiveOverride(t) && "S" in t && t.S & STATUS_PENDING && t.o?._ instanceof NotReadyError) {
+    for (let n = 0; n < e.rt.length; n++) {
+        const i = e.rt[n];
+        if (!(i.T & CONFIG_DERIVED_OVERRIDE) && i.o?.Ht === undefined && hasActiveOverride(i) && "S" in i && i.S & STATUS_PENDING && i.o?._ instanceof NotReadyError) {
             return true;
         }
     }
@@ -89,33 +151,226 @@ function resolveOptimisticNodes(e) {
     // notifications) may push fresh optimistic nodes; only this batch settles
     // now, so iterate a fixed window and splice it out at the end.
     const n = e.length;
-    for (let t = 0; t < n; t++) {
-        const n = e[t];
-        if (n.o !== null) n.o.$e = undefined;
+    for (let i = 0; i < n; i++) {
+        const n = e[i];
+        if (n.o !== null) n.o.Ue = undefined;
         // Revert is a pure drop: there is no revert target to commit —
         // override-covered authoritative values hold in _pendingValue and
         // elevate on their OWN transition's schedule (A18 as re-ruled 2026-07-07).
                 if (!(n.S & STATUS_PENDING)) n.S &= ~STATUS_UNINITIALIZED;
-        const i = n.o?.Pe;
-        ext(n).Pe = NOT_PENDING;
-        if (i !== NOT_PENDING && n.be !== unwrapOverride(i)) insertSubs(n, true);
-        n.Ae = null;
-        if (n.o !== null) n.o.Tt = null;
+        const t = n.o?.Ce;
+        // A derived override (lanes stage, #3479) has no truth of its own: the
+        // slot disarms — the memo is plain again — and the override PROMOTES to
+        // `_value`. Not superseded, nothing it derives from told it otherwise
+        // (a source override that reverts to a differing truth dirties it just
+        // above — sources join this list before their derivations — and its
+        // recompute then replaces the promotion), so by the graph's invariant
+        // the override IS what a recompute from the truth yields. Re-deriving
+        // instead re-asked an async member's flight and held the transaction on
+        // it — a waterfall after the reveal.
+                const r = n.T & CONFIG_DERIVED_OVERRIDE;
+        ext(n).Ce = r && !(n.T & CONFIG_OPTIMISTIC) ? undefined : NOT_PENDING;
+        // A superseded override's subscribers already re-derived from the truth
+        // when it arrived (#3331) — the drop changes nothing they read. Everyone
+        // else learns of the correction here: this drop IS their notification.
+                const u = (n.T & CONFIG_OVERRIDE_SUPERSEDED) !== 0;
+        n.T &= -8912897;
+        if (!u && t !== NOT_PENDING && n.Qe !== unwrapOverride(t)) {
+            if (r) n.Qe = unwrapOverride(t); else insertSubs(n, true);
+        }
+        n.Ge = null;
+        if (n.o !== null) n.o.Ft = null;
     }
     // Settlement checkpoint (#2838): companions caught in this batch (or owned
     // by a node in it) re-derive from committed state, so verdicts survive the
     // transition that produced them (A19 — pending is a property of the data).
-        for (let t = 0; t < n; t++) {
-        const n = e[t];
-        if (n.o?.ye || n.o?.Ce) GlobalQueue.un(n);
-        const i = n.o?.St;
-        if (i && (i.o?.ye === n || i.o?.Ce === n)) GlobalQueue.un(i);
+        for (let i = 0; i < n; i++) {
+        const n = e[i];
+        if (n.o?.je || n.o?.xe) GlobalQueue.En(n);
+        const t = n.o?.Ht;
+        if (t && (t.o?.je === n || t.o?.xe === n)) GlobalQueue.En(t);
     }
     e.splice(0, n);
 }
 
+/**
+ * A18 supersession (#3331): the node's own source arrived with a value that
+ * differs from its active override. "Knowing otherwise" ends the optimism for
+ * the graph at once: the override stays only as the DISPLAYED value (untracked
+ * reads, the applied frame) until the owning transaction commits, while
+ * tracked readers see the staged truth and re-derive from it as that
+ * transaction's held work — so async downstream restarts now, not at the
+ * revert (no waterfall).
+ *
+ * The lane's job for this node is over: a lane applies an optimistic view
+ * ahead of its transaction, and there is no optimistic view left — the
+ * corrected cascade is plain transaction-held work (staged memos, effect runs
+ * in the stashable queues). Demote the node and every cascade member that
+ * rides this lane; the caller then notifies on the plain channel. Runners the
+ * lane still holds for demoted effects (the optimistic frame that never got to
+ * apply) defer to the regular queue in runEffect. In a lane merged with a
+ * still-optimistic source, members shared with that source lose their lane
+ * too and simply wait for the transaction — less optimistic, never torn.
+ *
+ * A later arrival EQUAL to the override (an earlier action's answer superseded
+ * this one's; now this one's answer confirms it) ends the supersession: the
+ * graph re-derives from the override, which is the truth again. Notifies the
+ * subscribers in both cases. A plain matching confirmation (no supersession
+ * in force) is A17-silent for ordinary subscribers and wakes only an
+ * authoritative-view reader (until()'s predicate, refresh()'s waiter) that
+ * observed this node past its override — "authoritative arrival equal to the
+ * override" is exactly the acknowledgment it waits for (#3164, #3303). The
+ * wake hook is installed by the setters of that bit; optional here because
+ * the bit only implies the optimistic engine was consulted.
+ */ function supersedeOverride(e, n) {
+    const i = !e.Fe || !e.Fe(n, unwrapOverride(e.o.Ce));
+    if (!i) {
+        if (!(e.T & CONFIG_OVERRIDE_SUPERSEDED)) {
+            if (e.T & CONFIG_AUTHORITATIVE_OBSERVED) GlobalQueue.Zt?.(e);
+            return;
+        }
+        e.T &= ~CONFIG_OVERRIDE_SUPERSEDED;
+    } else {
+        // Provenance (#3331): an answer brought back by an OLDER action than the
+        // one that wrote this override answers a question the user has since
+        // changed. It is staged like any other landing and reveals if it is
+        // still the truth when the transaction commits, but it does not move the
+        // graph now — a slow source must not leak back in over a newer intent.
+        // 0 is mainline (no action): always the current question.
+        if (origin && origin < e.o.vt) return;
+        e.T |= CONFIG_OVERRIDE_SUPERSEDED;
+        const n = e.o?.Ue;
+        if (n) {
+            const i = findLane(n);
+            const t = [ e ];
+            while (t.length) {
+                const e = t.pop();
+                const n = e.o?.Ue;
+                if (!n || findLane(n) !== i) continue;
+                e.o.Ue = undefined;
+                i.ye.delete(e);
+                for (let n = e.u; n !== null; n = n.Ne) t.push(n._e);
+            }
+        }
+    }
+    insertSubs(e);
+}
+
+/**
+ * The flush's pre-verdict step once the action bodies have ended (#3427).
+ * The bodies were the optimism's justification; with them over, the
+ * overrides still in force revert at the settle — unless the transaction is
+ * still waiting on AUTHORITATIVE work: an override node's own source in
+ * flight (`transitionBlocked` — that answer supersedes or confirms on
+ * arrival), or a held flight that does not derive from an override (a plain
+ * write's load the action asked for). Through that window the optimistic
+ * world stands: a co-written "saving" flag stays rendered until the page it
+ * covers lands (A17 — the optimistic world is one).
+ *
+ * The flights that DO derive from an override — routed through a live lane —
+ * are obsolete: their input is the guess that is about to revert, and nobody
+ * will read their answer. With nothing authoritative left, each override's
+ * truth is already here (the staged value an A17-silent landing left, else
+ * the committed value) and supersedes it now, exactly as an arriving
+ * differing truth does (A18, #3331): the graph re-derives from it as this
+ * transaction's held work — a lane-derived memo re-asks with the truth, its
+ * other changed inputs included — and the transaction settles when THAT
+ * lands. Before this the settle first waited for the obsolete flight,
+ * revealed the obsolete optimistic frame when it landed, and only then
+ * started the correction — a waterfall with a flash in the middle. Returns
+ * whether it superseded anything (the caller re-runs the heap).
+ *
+ * The optimistic world is one, so it ends early only when all of it can. An
+ * optimistic STORE edit cannot yet: its truth is the base layer under an
+ * overlay that `_clearOptimisticStores` folds off at settlement, with no
+ * tracked/displayed split — superseding its tracking signals alone would
+ * re-derive readers against a still-displayed overlay (and a memo reading
+ * both a signal and the store would ask a mixed question). A transaction
+ * holding one keeps the settle-then-revert order throughout. Companions
+ * (`_parentSource` set) are optimistic nodes too — a verdict written through
+ * the optimistic path so it flushes ahead of the hold — but they answer for
+ * their owner and snap at settlement (`_snapCompanions`), not here.
+ */ function endOptimism(e) {
+    if (!e.he || e.pe.length || !e.rt.length || e.dn.size || transitionBlocked(e)) return false;
+    for (const n of e.oe.keys()) if (sourceObserved(e, n, e) && n.o?.ae?.has(n) && !resolveLane(n)) return false;
+    let n = false;
+    for (const i of e.rt) {
+        if (!hasActiveOverride(i) || i.o.Ht || 
+        // A derived override re-derives when its source's is superseded.
+        i.T & (CONFIG_OVERRIDE_SUPERSEDED | CONFIG_DERIVED_OVERRIDE) || i.S & STATUS_UNINITIALIZED) continue;
+        const e = i.ve !== NOT_PENDING ? i.ve : i.Qe;
+        if (!i.Fe || !i.Fe(e, unwrapOverride(i.o.Ce))) {
+            supersedeOverride(i, e);
+            // Judged by the mark, not the call: a provenance refusal (an older
+            // action's window is still open) leaves the node for a later pass.
+                        if (i.T & CONFIG_OVERRIDE_SUPERSEDED) n = true;
+        }
+    }
+    return n;
+}
+
+/** read()'s value for a tracked reader of a superseded node: the truth —
+ * staged, or already committed (a mainline landing commits at the head of
+ * its flush, ahead of the heap run, and the override drops only at the
+ * batch's end; in between the graph must not fall back to the override it
+ * has left) — or the displayed override for a stale (render) reader of some
+ * OTHER transaction, the same visibility a foreign transaction's staged
+ * write has. */
+/**
+ * A tracked read of an active override (read()'s override arm). Lanes mirror
+ * transitions (#3460): a render effect OFF the override's held lane — re-run
+ * by a sync write, or mounted mid-hold — sees the committed value, as a stale
+ * reader of a held transaction does, and publishes now; the lane's release
+ * re-runs it (readsHeldCommitted). The lane defers the override's own readers'
+ * runs, so the committed value is what is on screen — the override is the
+ * visible value only once the lane has revealed (or, demoted at body-end,
+ * A18). Otherwise the override displays, unless the node's own source
+ * answered with a DIFFERENT value (A18 supersession, #3331): the optimism is
+ * over for the graph — a tracked reader sees the staged truth — while the
+ * override remains the DISPLAYED value for untracked reads (and for a stale
+ * reader of some other transaction).
+ */ function overrideRead(e, n) {
+    if (stale && readsHeldCommitted(e, n)) return e.Qe;
+    if (!(e.T & CONFIG_OVERRIDE_SUPERSEDED)) return unwrapOverride(e.o?.Ce);
+    // The owning transaction: `_overrideOwner` (#2912), not the stamp — an
+    // override written directly inside an action never passes the adoption
+    // loop that stamps `_transition`, and a body-end supersession (#3427)
+    // stages nothing that would queue it. Without the owner a stale reader of
+    // a body-ended node read the committed truth beside a display still
+    // showing the override.
+        const i = resolveTransition(e);
+    if (stale && i && activeTransition !== i) return unwrapOverride(e.o?.Ce);
+    // A superseded read is a staged read (A29) whether the truth is staged or
+    // already committed: the pass that derives from it derives from the
+    // owning transaction's world (the override is still displayed by it).
+        enterStagedRead(e, i);
+    return e.ve !== NOT_PENDING ? e.ve : e.Qe;
+}
+
+/**
+ * An authoritative store landing on an override-covered node — a derived
+ * optimistic store's own truth arriving over a tentative edit through the
+ * projection-write channel (setSignal under projectionWriteActive). The
+ * store twin of asyncWrite's override branch: the truth stages for its
+ * transaction's commit whatever its relation to the committed value (a
+ * landing equal to committed still differs from the override), companions
+ * learn of it, and supersedeOverride decides the rest — A18 supersession with
+ * action provenance, or an A17-silent confirmation (#3331). Before this the
+ * landing took setSignal's plain path: a differing truth staged silently
+ * under the override and the graph never moved until the commit.
+ */ function landOnOverride(e, n) {
+    const i = e.ve === NOT_PENDING ? e.Qe : e.ve;
+    if (typeof n === "function") n = n(i);
+    if (e.ve === NOT_PENDING) queuePendingNode(e);
+    e.ve = n;
+    GlobalQueue.me?.(e, n);
+    supersedeOverride(e, n);
+    schedule();
+    return n;
+}
+
 function runQueue(e, n) {
-    for (let t = 0; t < e.length; t++) e[t](n);
+    for (let i = 0; i < e.length; i++) e[i](n | LANE_RUN);
 }
 
 /**
@@ -123,32 +378,32 @@ function runQueue(e, n) {
  * laneHeld).
  */ function runLaneEffects(e) {
     for (const n of activeLanes) {
-        if (n.rn || laneHeld(n)) continue;
-        const t = n.tn[e - 1];
-        if (t.length) {
-            n.tn[e - 1] = [];
-            runQueue(t, e);
+        if (n.cn || laneHeld(n)) continue;
+        const i = n.fn[e - 1];
+        if (i.length) {
+            n.fn[e - 1] = [];
+            runQueue(i, e);
         }
     }
     // Optimistic patch applications ride the same visibility slot as lane
     // effects (in-flight DOM updates); no-op unless patches registered.
-        if (e === EFFECT_RENDER) GlobalQueue.ln?.();
+        if (e === EFFECT_RENDER) GlobalQueue.In?.();
 }
 
 function cleanupCompletedLanes(e) {
     for (const n of activeLanes) {
-        const t = e ? n.Ae === e : !n.Ae;
-        if (!t) continue;
-        if (!n.rn) {
-            if (n.tn[0].length) runQueue(n.tn[0], EFFECT_RENDER);
-            if (n.tn[1].length) runQueue(n.tn[1], EFFECT_USER);
+        const i = e ? n.Ge === e : !n.Ge;
+        if (!i) continue;
+        if (!n.cn) {
+            if (n.fn[0].length) runQueue(n.fn[0], EFFECT_RENDER);
+            if (n.fn[1].length) runQueue(n.fn[1], EFFECT_USER);
         }
-        if (n.nn.o?.$e === n) if (n.nn.o !== null) n.nn.o.$e = undefined;
-        n.Oe.clear();
-        n.tn[0].length = 0;
-        n.tn[1].length = 0;
+        if (n.an.o?.Ue === n) if (n.an.o !== null) n.an.o.Ue = undefined;
+        n.ye.clear();
+        n.fn[0].length = 0;
+        n.fn[1].length = 0;
         activeLanes.delete(n);
-        signalLanes.delete(n.nn);
+        signalLanes.delete(n.an);
     }
 }
 
@@ -162,30 +417,44 @@ function cleanupCompletedLanes(e) {
     // this is only reachable under a lane, which implies the engine.
     if (e.S & STATUS_UNINITIALIZED) return true;
     // Per-lane suspension: only throw if in same lane as pending async
-    // AND the node doesn't have an active override (overrides are the visible value,
-    // downstream in the lane should read the override, not throw)
-        const n = e.o?.$e;
+    // AND the node doesn't have an active WRITTEN override (overrides are the
+    // visible value, downstream in the lane should read the override, not
+    // throw). A derived override (#3479) is a previous speculative answer, not
+    // an intent: the re-ask pending behind it suspends like any lane async.
+        const n = e.o?.Ue;
     if (!n) return false;
-    return findLane(n) === findLane(currentOptimisticLane) && !hasActiveOverride(e);
+    return findLane(n) === findLane(currentOptimisticLane) && (!hasActiveOverride(e) || (e.T & CONFIG_DERIVED_OVERRIDE) !== 0);
+}
+
+/**
+ * read()'s reveal carve-out asks whether a pending node is routed through a
+ * LIVE lane: a lane-derived flight's inputs are already revealed through the
+ * lane (the override, or latest()'s fresh value), so a stale reader of another
+ * transaction must hold on the flight rather than show the node's committed
+ * value beside them (#3334). Exact, not sticky: `resolveLane` clears a lane
+ * reference the engine has since retired, so a node that was once lane-routed
+ * and is now pending under a plain hold is judged by that hold alone.
+ */ function laneLive(e) {
+    return resolveLane(e) !== undefined;
 }
 
 /**
  * read()'s entanglement gate: a reader recomputing under an optimistic lane
  * that reads a pending mid-transition write sees the committed value; the sub
  * is recorded for replay at commit.
- */ function gatedRead(e, n, t) {
-    if (latestReadActive || e.Re === NOT_PENDING || e.oe || n !== e && !(n.ie & REACTIVE_MANUAL_WRITE)) {
+ */ function gatedRead(e, n, i) {
+    if (latestReadActive || e.ve === NOT_PENDING || e.ce || n !== e && !(n.ue & REACTIVE_MANUAL_WRITE)) {
         return false;
     }
-    activeTransition.cn.add(t);
+    activeTransition.ct.add(i);
     return true;
 }
 
 /**
  * read()'s value selection under a lane: return the committed `_value` for
  * optimistic/lane-assigned signals, stale-mode reads, and pending owners.
- */ function laneReadsCommitted(e, n, t) {
-    if (e.o?.Pe !== undefined || !!e.o?.$e || !!(n.S & STATUS_PENDING)) {
+ */ function laneReadsCommitted(e, n, i) {
+    if (e.o?.Ce !== undefined || !!e.o?.Ue || !!(n.S & STATUS_PENDING)) {
         // The committed view hides a staged in-flight value that will promote
         // silently (commitPendingNode never re-notifies). gatedRead records plain
         // signals for replay at commit; async memos are excluded from it by the
@@ -193,11 +462,17 @@ function cleanupCompletedLanes(e) {
         // already settled (laneAsyncSettled keeps _optimisticLane) served its
         // committed value to a reader that never re-ran after the landing, so a
         // pending-gated branch stayed one value behind permanently (#3041
-        // follow-up). Record the reader under the same replay contract.
-        if (e.Re !== NOT_PENDING) (activeTransition ?? globalQueue.m).cn.add(t);
+        // follow-up). Record the reader under the same replay contract — when
+        // the commit will actually change what it read: a staged value equal to
+        // the committed one (a lane recompute already published it, INV-11)
+        // promotes to the same view, and a replay would only re-run effects
+        // against an unchanged frame (#3330). An override-covered node's revert
+        // notifies its own subscribers when the truth differs (resolveOptimistic
+        // Nodes), so the reader is recorded only for the staged-vs-committed gap.
+        if (e.ve !== NOT_PENDING && e.ve !== e.Qe) (activeTransition ?? globalQueue.m).ct.add(i);
         return true;
     }
-    if (n === e && stale && t.o?.St !== e) {
+    if (n === e && stale && i.o?.Ht !== e) {
         // The committed view can hide a staged write (a lane member — even just
         // an isPending companion flip — puts the reader "under a lane"). The
         // staged value commits with no re-delivery (commitPendingNode never
@@ -209,7 +484,7 @@ function cleanupCompletedLanes(e) {
         // into the transaction (#3041 follow-up: a pending-gated branch that
         // first read its async source during the landing flush stayed one value
         // behind permanently); with none, into the ambient batch.
-        if (e.Re !== NOT_PENDING) (activeTransition ?? globalQueue.m).cn.add(t);
+        if (e.ve !== NOT_PENDING) (activeTransition ?? globalQueue.m).ct.add(i);
         return true;
     }
     return false;
@@ -232,18 +507,18 @@ function cleanupCompletedLanes(e) {
         // recompute() runs plain: the value stages and commits with the flush.
         // (el's own override slot excludes companions themselves; a lane merged
         // into a real optimistic lane resolves to a non-companion source.)
-                if (!globalQueue.fn && !activeTransition && !n.Ae && n.nn.o?.St !== undefined && e.o?.Pe === undefined) {
-            if (e.o !== null) e.o.$e = undefined;
+                if (!globalQueue.Kt && !activeTransition && !n.Ge && n.an.o?.Ht !== undefined && e.o?.Ce === undefined) {
+            if (e.o !== null) e.o.Ue = undefined;
             return false;
         }
         return n;
     }
-    for (let n = e.lt; n; n = n.ot) {
-        const t = n.st;
-        if (t.ie & REACTIVE_OPTIMISTIC_DIRTY) {
-            const n = resolveLane(t);
+    for (let n = e.Se; n; n = n.de) {
+        const i = n.Ee;
+        if (i.ue & REACTIVE_OPTIMISTIC_DIRTY) {
+            const n = resolveLane(i);
             if (n) {
-                e.ie |= REACTIVE_OPTIMISTIC_DIRTY;
+                e.ue |= REACTIVE_OPTIMISTIC_DIRTY;
                 assignOrMergeLane(e, n);
                 return n;
             }
@@ -257,9 +532,9 @@ function cleanupCompletedLanes(e) {
  * companion is NOT refreshed here: its verdict never read _pendingAsync, and
  * the source's own write/commit/settlement paths keep it current. */ function laneAsyncPending(e) {
     const n = findLane(currentOptimisticLane);
-    if (n.nn !== e) {
-        n.Oe.add(e);
-        ext(e).$e = n;
+    if (n.an !== e) {
+        n.ye.add(e);
+        ext(e).Ue = n;
         e.T |= CONFIG_HAS_LANE;
     }
 }
@@ -267,13 +542,13 @@ function cleanupCompletedLanes(e) {
 /** recompute()'s success path: the node's async settled, clear it from its lane. */ function laneAsyncSettled(e) {
     const n = resolveLane(e);
     if (n) {
-        n.Oe.delete(e);
+        n.ye.delete(e);
     }
 }
 
 function trackOptimisticStore(e) {
     // After initTransition, globalQueue._batch IS activeTransition (same reference)
-    globalQueue.m.En.add(e);
+    globalQueue.m.dn.add(e);
     schedule();
 }
 
@@ -282,19 +557,25 @@ function trackOptimisticStore(e) {
  * create optimistic state (verdict.ts at module top level, createOptimistic
  * and createOptimisticStore at first call) BEFORE any optimistic node exists.
  */ function installOptimisticEngine() {
-    if (GlobalQueue.yt !== null) return;
-    GlobalQueue.yt = optimisticWrite;
-    GlobalQueue.Tn = resolveOptimisticNodes;
-    GlobalQueue.dn = transitionBlocked;
-    GlobalQueue.In = cleanupCompletedLanes;
-    GlobalQueue.Nn = runLaneEffects;
-    GlobalQueue.Ut = gatedRead;
-    GlobalQueue.kt = laneSuspends;
-    GlobalQueue.xt = laneReadsCommitted;
-    GlobalQueue.Je = recomputeLane;
-    GlobalQueue.tt = laneAsyncPending;
-    GlobalQueue.et = laneAsyncSettled;
-    GlobalQueue._n = trackOptimisticStore;
+    if (GlobalQueue.ln !== null) return;
+    GlobalQueue.ln = optimisticWrite;
+    GlobalQueue.On = resolveOptimisticNodes;
+    GlobalQueue.Nn = transitionBlocked;
+    GlobalQueue.Rn = cleanupCompletedLanes;
+    GlobalQueue._n = runLaneEffects;
+    GlobalQueue.we = supersedeOverride;
+    GlobalQueue.Tn = endOptimism;
+    GlobalQueue.en = overrideRead;
+    GlobalQueue.Ve = laneOverride;
+    GlobalQueue.un = landOnOverride;
+    GlobalQueue.tn = gatedRead;
+    GlobalQueue.$t = laneSuspends;
+    GlobalQueue.Xt = laneLive;
+    GlobalQueue.Bt = laneReadsCommitted;
+    GlobalQueue.st = recomputeLane;
+    GlobalQueue._t = laneAsyncPending;
+    GlobalQueue.ft = laneAsyncSettled;
+    GlobalQueue.Dn = trackOptimisticStore;
 }
 
 export { installOptimisticEngine };