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

package/dist/observe/core/optimistic.js

@@ -1,16 +1,16 @@
-import { NOT_PENDING, unwrapOverride, STATUS_UNINITIALIZED, REACTIVE_DIRTY, REACTIVE_CHECK, CONFIG_HAS_LANE, OVERRIDE_UNDEFINED, STATUS_PENDING, CONFIG_OVERRIDE_SUPERSEDED, EFFECT_RENDER, CONFIG_AUTHORITATIVE_OBSERVED, REACTIVE_MANUAL_WRITE, REACTIVE_OPTIMISTIC_DIRTY, LANE_RUN, 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 { attrHooks } from "./attribution-hooks.js";
 
-import { ext, stale, latestReadActive, currentOptimisticLane } 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, origin, clock, insertSubs, schedule, queuePendingNode } 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
@@ -26,18 +26,18 @@ import { GlobalQueue, activeTransition, globalQueue, origin, clock, insertSubs,
  * 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 i = e.o?.De !== NOT_PENDING;
-    const t = i ? unwrapOverride(e.o?.De) : e.ge;
+    const i = e.o?.Ne !== NOT_PENDING;
+    const t = i ? unwrapOverride(e.o?.Ne) : e.Ae;
     if (typeof n === "function") n = n(t);
-    const u = !!(e.S & STATUS_UNINITIALIZED) || 
+    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.it ?? 0) & (REACTIVE_DIRTY | REACTIVE_CHECK)) || !e.Ue || !e.Ue(t, n);
-    if (!u) {
+    !!((e.ft ?? 0) & (REACTIVE_DIRTY | REACTIVE_CHECK)) || !e.Re || !e.Re(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 —
         // and renews the override's PROVENANCE: the newer action re-asks the
@@ -47,7 +47,7 @@ import { GlobalQueue, activeTransition, globalQueue, origin, clock, insertSubs,
         if (i) {
             const n = resolveTransition(e);
             if (n && activeTransition !== n) globalQueue.initTransition(n);
-            if (origin > e.o.Zt) e.o.Zt = origin;
+            if (origin > e.o.zt) e.o.zt = origin;
         }
         return n;
     }
@@ -55,42 +55,93 @@ import { GlobalQueue, activeTransition, globalQueue, origin, clock, insertSubs,
     // 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.en.push(e);
+     else globalQueue.m.tn.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).Yt = activeTransition;
-    ext(e).Lt = clock;
+        ext(e).jt = activeTransition;
+    ext(e).Qt = 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).Zt = origin;
-    const r = getOrCreateLane(e);
-    ext(e).Te = r;
+        ext(e).zt = origin;
+    const u = getOrCreateLane(e);
+    ext(e).de = 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) & ~CONFIG_OVERRIDE_SUPERSEDED;
+        e.C = (e.C | 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).De = n === undefined ? OVERRIDE_UNDEFINED : n;
+        ext(e).Ne = n === undefined ? OVERRIDE_UNDEFINED : n;
     // syncCompanions only pokes _pendingSignal/_latestValueComputed — with
     // neither companion present the call is a guaranteed no-op.
-        (e.o?.be !== undefined || e.o?.pe !== undefined) && GlobalQueue.Ae !== null && GlobalQueue.Ae(e, n);
-    if (e.ot !== undefined) e.ae = clock;
+        (e.o?.he !== undefined || e.o?.Ge !== undefined) && GlobalQueue.De !== null && GlobalQueue.De(e, n);
+    if (e.ht !== undefined) e.fe = 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.Te && !activeTransition && i.Ln.o?.nn !== undefined) {
+        e.Ae = 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.Te ? currentTransition(i.Te) : globalQueue.m).tn.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.C = (e.C | CONFIG_DERIVED_OVERRIDE) & ~CONFIG_OVERRIDE_SUPERSEDED;
+    e.o.Ne = 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.en.length; n++) {
-        const i = e.en[n];
-        if (hasActiveOverride(i) && "S" in i && i.S & STATUS_PENDING && i.o?._ instanceof NotReadyError) {
+    for (let n = 0; n < e.tn.length; n++) {
+        const i = e.tn[n];
+        if (!(i.C & CONFIG_DERIVED_OVERRIDE) && i.o?.nn === undefined && hasActiveOverride(i) && "S" in i && i.S & STATUS_PENDING && i.o?._ instanceof NotReadyError) {
             return true;
         }
     }
@@ -104,30 +155,42 @@ function resolveOptimisticNodes(e) {
     const n = e.length;
     for (let i = 0; i < n; i++) {
         const n = e[i];
-        if (n.o !== null) n.o.Te = undefined;
+        if (n.o !== null) n.o.de = 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 t = n.o?.De;
-        ext(n).De = NOT_PENDING;
+        const t = n.o?.Ne;
+        // 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.C & CONFIG_DERIVED_OVERRIDE;
+        ext(n).Ne = r && !(n.C & 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 &= ~CONFIG_OVERRIDE_SUPERSEDED;
-        if (!u && t !== NOT_PENDING && n.ge !== unwrapOverride(t)) insertSubs(n, true);
-        n.Ee = null;
-        if (n.o !== null) n.o.Yt = null;
+                const u = (n.C & CONFIG_OVERRIDE_SUPERSEDED) !== 0;
+        n.C &= -8912897;
+        if (!u && t !== NOT_PENDING && n.Ae !== unwrapOverride(t)) {
+            if (r) n.Ae = unwrapOverride(t); else insertSubs(n, true);
+        }
+        n.Te = null;
+        if (n.o !== null) n.o.jt = 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 i = 0; i < n; i++) {
         const n = e[i];
-        if (n.o?.be || n.o?.pe) GlobalQueue.Dn(n);
-        const t = n.o?.Qe;
-        if (t && (t.o?.be === n || t.o?.pe === n)) GlobalQueue.Dn(t);
+        if (n.o?.he || n.o?.Ge) GlobalQueue.Qn(n);
+        const t = n.o?.nn;
+        if (t && (t.o?.he === n || t.o?.Ge === n)) GlobalQueue.Qn(t);
     }
     e.splice(0, n);
 }
@@ -162,13 +225,13 @@ function resolveOptimisticNodes(e) {
  * 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.Ue || !e.Ue(n, unwrapOverride(e.o.De));
+    const i = !e.Re || !e.Re(n, unwrapOverride(e.o.Ne));
     if (!i) {
-        if (!(e.T & CONFIG_OVERRIDE_SUPERSEDED)) {
-            if (e.T & CONFIG_AUTHORITATIVE_OBSERVED) GlobalQueue.En?.(e);
+        if (!(e.C & CONFIG_OVERRIDE_SUPERSEDED)) {
+            if (e.C & CONFIG_AUTHORITATIVE_OBSERVED) GlobalQueue.Tn?.(e);
             return;
         }
-        e.T &= ~CONFIG_OVERRIDE_SUPERSEDED;
+        e.C &= ~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
@@ -176,19 +239,19 @@ function resolveOptimisticNodes(e) {
         // 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.Zt) return;
-        e.T |= CONFIG_OVERRIDE_SUPERSEDED;
-        const n = e.o?.Te;
+        if (origin && origin < e.o.zt) return;
+        e.C |= CONFIG_OVERRIDE_SUPERSEDED;
+        const n = e.o?.de;
         if (n) {
             const i = findLane(n);
             const t = [ e ];
             while (t.length) {
                 const e = t.pop();
-                const n = e.o?.Te;
+                const n = e.o?.de;
                 if (!n || findLane(n) !== i) continue;
-                e.o.Te = undefined;
-                i._e.delete(e);
-                for (let n = e.u; n !== null; n = n.se) t.push(n.le);
+                e.o.de = undefined;
+                i.Ie.delete(e);
+                for (let n = e.u; n !== null; n = n.ie) t.push(n.se);
             }
         }
     }
@@ -196,15 +259,95 @@ function resolveOptimisticNodes(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.Tt || e.dt.length || !e.tn.length || e.rn.size || transitionBlocked(e)) return false;
+    for (const n of e.ot.keys()) if (sourceObserved(e, n, e) && n.o?.ut?.has(n) && !resolveLane(n)) return false;
+    let n = false;
+    for (const i of e.tn) {
+        if (!hasActiveOverride(i) || i.o.nn || 
+        // A derived override re-derives when its source's is superseded.
+        i.C & (CONFIG_OVERRIDE_SUPERSEDED | CONFIG_DERIVED_OVERRIDE) || i.S & STATUS_UNINITIALIZED) continue;
+        const e = i._e !== NOT_PENDING ? i._e : i.Ae;
+        if (!i.Re || !i.Re(e, unwrapOverride(i.o.Ne))) {
+            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.C & 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. */ function supersededRead(e) {
-    if (stale && e.Ee && activeTransition !== e.Ee) return unwrapOverride(e.o?.De);
-    return e.Pe !== NOT_PENDING ? e.Pe : e.ge;
+ * 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.Ae;
+    if (!(e.C & CONFIG_OVERRIDE_SUPERSEDED)) return unwrapOverride(e.o?.Ne);
+    // 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?.Ne);
+    // 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._e !== NOT_PENDING ? e._e : e.Ae;
 }
 
 /**
@@ -219,12 +362,12 @@ function resolveOptimisticNodes(e) {
  * 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.Pe === NOT_PENDING ? e.ge : e.Pe;
+    const i = e._e === NOT_PENDING ? e.Ae : e._e;
     if (typeof n === "function") n = n(i);
     if (attrHooks !== null) attrHooks.write(e, i, n);
-    if (e.Pe === NOT_PENDING) queuePendingNode(e);
-    e.Pe = n;
-    GlobalQueue.Ae?.(e, n);
+    if (e._e === NOT_PENDING) queuePendingNode(e);
+    e._e = n;
+    GlobalQueue.De?.(e, n);
     supersedeOverride(e, n);
     schedule();
     return n;
@@ -239,7 +382,7 @@ function runQueue(e, n) {
  * laneHeld).
  */ function runLaneEffects(e) {
     for (const n of activeLanes) {
-        if (n.gn || laneHeld(n)) continue;
+        if (n.wn || laneHeld(n)) continue;
         const i = n.vn[e - 1];
         if (i.length) {
             n.vn[e - 1] = [];
@@ -248,19 +391,19 @@ function runQueue(e, n) {
     }
     // 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.bn?.();
+        if (e === EFFECT_RENDER) GlobalQueue.Vn?.();
 }
 
 function cleanupCompletedLanes(e) {
     for (const n of activeLanes) {
-        const i = e ? n.Ee === e : !n.Ee;
+        const i = e ? n.Te === e : !n.Te;
         if (!i) continue;
-        if (!n.gn) {
+        if (!n.wn) {
             if (n.vn[0].length) runQueue(n.vn[0], EFFECT_RENDER);
             if (n.vn[1].length) runQueue(n.vn[1], EFFECT_USER);
         }
-        if (n.Ln.o?.Te === n) if (n.Ln.o !== null) n.Ln.o.Te = undefined;
-        n._e.clear();
+        if (n.Ln.o?.de === n) if (n.Ln.o !== null) n.Ln.o.de = undefined;
+        n.Ie.clear();
         n.vn[0].length = 0;
         n.vn[1].length = 0;
         activeLanes.delete(n);
@@ -278,11 +421,13 @@ 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?.Te;
+    // 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?.de;
     if (!n) return false;
-    return findLane(n) === findLane(currentOptimisticLane) && !hasActiveOverride(e);
+    return findLane(n) === findLane(currentOptimisticLane) && (!hasActiveOverride(e) || (e.C & CONFIG_DERIVED_OVERRIDE) !== 0);
 }
 
 /**
@@ -302,10 +447,10 @@ function cleanupCompletedLanes(e) {
  * that reads a pending mid-transition write sees the committed value; the sub
  * is recorded for replay at commit.
  */ function gatedRead(e, n, i) {
-    if (latestReadActive || e.Pe === NOT_PENDING || e.ot || n !== e && !(n.it & REACTIVE_MANUAL_WRITE)) {
+    if (latestReadActive || e._e === NOT_PENDING || e.ht || n !== e && !(n.ft & REACTIVE_MANUAL_WRITE)) {
         return false;
     }
-    activeTransition.ht.add(i);
+    activeTransition.Ht.add(i);
     return true;
 }
 
@@ -313,7 +458,7 @@ function cleanupCompletedLanes(e) {
  * 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, i) {
-    if (e.o?.De !== undefined || !!e.o?.Te || !!(n.S & STATUS_PENDING)) {
+    if (e.o?.Ne !== undefined || !!e.o?.de || !!(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
@@ -328,10 +473,10 @@ function cleanupCompletedLanes(e) {
         // 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.Pe !== NOT_PENDING && e.Pe !== e.ge) (activeTransition ?? globalQueue.m).ht.add(i);
+        if (e._e !== NOT_PENDING && e._e !== e.Ae) (activeTransition ?? globalQueue.m).Ht.add(i);
         return true;
     }
-    if (n === e && stale && i.o?.Qe !== e) {
+    if (n === e && stale && i.o?.nn !== 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
@@ -343,7 +488,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.Pe !== NOT_PENDING) (activeTransition ?? globalQueue.m).ht.add(i);
+        if (e._e !== NOT_PENDING) (activeTransition ?? globalQueue.m).Ht.add(i);
         return true;
     }
     return false;
@@ -366,18 +511,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.Qn && !activeTransition && !n.Ee && n.Ln.o?.Qe !== undefined && e.o?.De === undefined) {
-            if (e.o !== null) e.o.Te = undefined;
+                if (!globalQueue.Sn && !activeTransition && !n.Te && n.Ln.o?.nn !== undefined && e.o?.Ne === undefined) {
+            if (e.o !== null) e.o.de = undefined;
             return false;
         }
         return n;
     }
-    for (let n = e.te; n; n = n.ne) {
-        const i = n.oe;
-        if (i.it & REACTIVE_OPTIMISTIC_DIRTY) {
+    for (let n = e.ee; n; n = n.te) {
+        const i = n.re;
+        if (i.ft & REACTIVE_OPTIMISTIC_DIRTY) {
             const n = resolveLane(i);
             if (n) {
-                e.it |= REACTIVE_OPTIMISTIC_DIRTY;
+                e.ft |= REACTIVE_OPTIMISTIC_DIRTY;
                 assignOrMergeLane(e, n);
                 return n;
             }
@@ -392,22 +537,22 @@ function cleanupCompletedLanes(e) {
  * the source's own write/commit/settlement paths keep it current. */ function laneAsyncPending(e) {
     const n = findLane(currentOptimisticLane);
     if (n.Ln !== e) {
-        n._e.add(e);
-        ext(e).Te = n;
-        e.T |= CONFIG_HAS_LANE;
+        n.Ie.add(e);
+        ext(e).de = n;
+        e.C |= CONFIG_HAS_LANE;
     }
 }
 
 /** recompute()'s success path: the node's async settled, clear it from its lane. */ function laneAsyncSettled(e) {
     const n = resolveLane(e);
     if (n) {
-        n._e.delete(e);
+        n.Ie.delete(e);
     }
 }
 
 function trackOptimisticStore(e) {
     // After initTransition, globalQueue._batch IS activeTransition (same reference)
-    globalQueue.m.nn.add(e);
+    globalQueue.m.rn.add(e);
     schedule();
 }
 
@@ -416,23 +561,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.pn !== null) return;
-    GlobalQueue.pn = optimisticWrite;
+    if (GlobalQueue.mn !== null) return;
+    GlobalQueue.mn = optimisticWrite;
     GlobalQueue.Un = resolveOptimisticNodes;
-    GlobalQueue.Pn = transitionBlocked;
-    GlobalQueue.Fn = cleanupCompletedLanes;
-    GlobalQueue.Vn = runLaneEffects;
+    GlobalQueue.kn = transitionBlocked;
+    GlobalQueue.xn = cleanupCompletedLanes;
+    GlobalQueue.Mn = runLaneEffects;
     GlobalQueue.Oe = supersedeOverride;
-    GlobalQueue.Sn = supersededRead;
-    GlobalQueue.Rn = landOnOverride;
-    GlobalQueue.An = gatedRead;
-    GlobalQueue.dn = laneSuspends;
-    GlobalQueue.Tn = laneLive;
-    GlobalQueue.On = laneReadsCommitted;
-    GlobalQueue.Ft = recomputeLane;
-    GlobalQueue.vt = laneAsyncPending;
-    GlobalQueue.Ht = laneAsyncSettled;
-    GlobalQueue.Hn = trackOptimisticStore;
+    GlobalQueue.yn = endOptimism;
+    GlobalQueue.Dn = overrideRead;
+    GlobalQueue.ge = laneOverride;
+    GlobalQueue.Fn = landOnOverride;
+    GlobalQueue.hn = gatedRead;
+    GlobalQueue.Gn = laneSuspends;
+    GlobalQueue.Rn = laneLive;
+    GlobalQueue.An = laneReadsCommitted;
+    GlobalQueue.gt = recomputeLane;
+    GlobalQueue.kt = laneAsyncPending;
+    GlobalQueue.vt = laneAsyncSettled;
+    GlobalQueue.jn = trackOptimisticStore;
 }
 
 export { installOptimisticEngine };