@solidjs/signals 2.0.0-beta.14 → 2.0.0-beta.16

package/dist/prod.js

@@ -53,115 +53,19 @@ const STORE_SNAPSHOT_PROPS = "sp";
 const SUPPORTS_PROXY = typeof Proxy === "function";
 const defaultContext = {};
 const $REFRESH = Symbol("refresh");
-const diagnosticListeners = new Set();
-const diagnosticCaptures = new Set();
-let diagnosticSequence = 0;
 const DEV$1 = undefined;
-function emitDiagnostic(e) {
-  const t = { sequence: ++diagnosticSequence, ...e };
-  for (const e of diagnosticListeners) e(t);
-  for (const e of diagnosticCaptures) e.push(t);
-  return t;
-}
-function actualInsertIntoHeap(e, t) {
-  const n = (e.i?.t ? e.i.u?.o : e.i?.o) ?? -1;
-  if (n >= e.o) e.o = n + 1;
-  const i = e.o;
-  const r = t.l[i];
-  if (r === undefined) t.l[i] = e;
-  else {
-    const t = r.S;
-    t.T = e;
-    e.S = t;
-    r.S = e;
-  }
-  if (i > t._) t._ = i;
-}
-function insertIntoHeap(e, t) {
-  let n = e.O;
-  if (n & (REACTIVE_IN_HEAP | REACTIVE_RECOMPUTING_DEPS | REACTIVE_MANUAL_WRITE)) return;
-  if (n & REACTIVE_CHECK) {
-    e.O = (n & -4) | REACTIVE_DIRTY | REACTIVE_IN_HEAP;
-  } else e.O = n | REACTIVE_IN_HEAP;
-  if (!(n & REACTIVE_IN_HEAP_HEIGHT)) actualInsertIntoHeap(e, t);
+function devCheckActiveOverrides(e) {
+  return;
 }
-function insertIntoHeapHeight(e, t) {
-  let n = e.O;
-  if (
-    n &
-    (REACTIVE_IN_HEAP | REACTIVE_RECOMPUTING_DEPS | REACTIVE_IN_HEAP_HEIGHT | REACTIVE_MANUAL_WRITE)
-  )
-    return;
-  e.O = n | REACTIVE_IN_HEAP_HEIGHT;
-  actualInsertIntoHeap(e, t);
+function devCheckFlushStart() {
+  return;
 }
-function deleteFromHeap(e, t) {
-  const n = e.O;
-  if (!(n & (REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT))) return;
-  e.O = n & -25;
-  const i = e.o;
-  if (e.S === e) t.l[i] = undefined;
-  else {
-    const n = e.T;
-    const r = t.l[i];
-    const o = n ?? r;
-    if (e === r) t.l[i] = n;
-    else e.S.T = n;
-    o.S = e.S;
-  }
-  e.S = e;
-  e.T = undefined;
+typeof globalThis !== "undefined" && !!globalThis.process?.env?.COMPANION_CENSUS;
+function devCensusCompanions(e) {
+  return;
 }
-function markHeap(e) {
-  if (e.R) return;
-  e.R = true;
-  for (let t = 0; t <= e._; t++) {
-    for (let n = e.l[t]; n !== undefined; n = n.T) {
-      if (n.O & REACTIVE_IN_HEAP) markNode(n);
-    }
-  }
-}
-function markNode(e, t = REACTIVE_DIRTY) {
-  const n = e.O;
-  if ((n & (REACTIVE_CHECK | REACTIVE_DIRTY)) >= t) return;
-  e.O = (n & -4) | t;
-  for (let t = e.I; t !== null; t = t.p) {
-    markNode(t.h, REACTIVE_CHECK);
-  }
-  if (e.N !== null) {
-    for (let t = e.N; t !== null; t = t.A) {
-      for (let e = t.I; e !== null; e = e.p) {
-        markNode(e.h, REACTIVE_CHECK);
-      }
-    }
-  }
-}
-function runHeap(e, t) {
-  e.R = false;
-  for (e.C = 0; e.C <= e._; e.C++) {
-    let n = e.l[e.C];
-    while (n !== undefined) {
-      if (n.O & REACTIVE_IN_HEAP) t(n);
-      else adjustHeight(n, e);
-      n = e.l[e.C];
-    }
-  }
-  e._ = 0;
-}
-function adjustHeight(e, t) {
-  deleteFromHeap(e, t);
-  let n = e.o;
-  for (let t = e.P; t; t = t.D) {
-    const e = t.m;
-    const i = e.V || e;
-    if (i.L && i.o >= n) n = i.o + 1;
-  }
-  if (e.o !== n) {
-    e.o = n;
-    for (let n = e.I; n !== null; n = n.p) {
-      insertIntoHeapHeight(n.h, t);
-    }
-  }
+function devCheckQuiescent(e) {
+  return;
 }
 const signalLanes = new WeakMap();
 const activeLanes = new Set();
@@ -170,69 +74,73 @@ function getOrCreateLane(e) {
   if (t) {
     return findLane(t);
   }
-  const n = e.U;
-  const i = n?.G ? findLane(n.G) : null;
-  t = { k: e, F: new Set(), W: [[], []], H: null, M: activeTransition, j: i };
+  const n = e.t;
+  const i = n?.i ? findLane(n.i) : null;
+  t = { o: e, u: new Set(), l: [[], []], S: null, T: activeTransition, _: i };
   signalLanes.set(e, t);
   activeLanes.add(t);
-  e.$ = false;
   return t;
 }
 function findLane(e) {
-  while (e.H) e = e.H;
+  while (e.S) e = e.S;
   return e;
 }
 function mergeLanes(e, t) {
   e = findLane(e);
   t = findLane(t);
   if (e === t) return e;
-  t.H = e;
-  for (const n of t.F) e.F.add(n);
-  e.W[0].push(...t.W[0]);
-  e.W[1].push(...t.W[1]);
+  t.S = e;
+  for (const n of t.u) e.u.add(n);
+  t.u.clear();
+  e.l[0].push(...t.l[0]);
+  e.l[1].push(...t.l[1]);
+  t.l[0].length = 0;
+  t.l[1].length = 0;
   return e;
 }
 function resolveLane(e) {
-  const t = e.G;
+  const t = e.i;
   if (!t) return undefined;
   const n = findLane(t);
   if (activeLanes.has(n)) return n;
-  e.G = undefined;
+  e.i = undefined;
   return undefined;
 }
 function resolveTransition(e) {
-  return resolveLane(e)?.M ?? e.M;
+  return resolveLane(e)?.T ?? e.T;
 }
 function hasActiveOverride(e) {
-  return !!(e.K !== undefined && e.K !== NOT_PENDING);
+  return !!(e.O !== undefined && e.O !== NOT_PENDING);
 }
 function assignOrMergeLane(e, t) {
   const n = findLane(t);
-  const i = e.G;
+  const i = e.i;
   if (i) {
-    if (i.H) {
-      e.G = t;
+    if (i.S) {
+      e.i = t;
       return;
     }
     const r = findLane(i);
     if (activeLanes.has(r)) {
       if (r !== n && !hasActiveOverride(e)) {
-        if (n.j && findLane(n.j) === r) {
-          e.G = t;
-        } else if (r.j && findLane(r.j) === n);
+        if (n._ && findLane(n._) === r) {
+          e.i = t;
+        } else if (r._ && findLane(r._) === n);
         else mergeLanes(n, r);
       }
       return;
     }
   }
-  e.G = t;
+  e.i = t;
 }
 const transitions = new Set();
-const dirtyQueue = { l: new Array(2e3).fill(undefined), R: false, C: 0, _: 0 };
-const zombieQueue = { l: new Array(2e3).fill(undefined), R: false, C: 0, _: 0 };
+const dirtyQueue = { p: new Array(2e3).fill(undefined), R: false, I: 0, h: 0 };
+const zombieQueue = { p: new Array(2e3).fill(undefined), R: false, I: 0, h: 0 };
 let clock = 0;
 let activeTransition = null;
 let scheduled = false;
+let halted = false;
+let haltNotified = false;
 let syncDepth = 0;
 let projectionWriteActive = false;
 let stashedOptimisticReads = null;
@@ -244,23 +152,23 @@ function canUseSimpleSyncFlush(e) {
   return (
     transitions.size === 0 &&
     activeLanes.size === 0 &&
-    e.Y.length === 0 &&
-    e.Z.length === 0 &&
-    e.q.size === 0 &&
+    e.A.length === 0 &&
+    e.N.length === 0 &&
+    e.C.size === 0 &&
     transientStoreNodes.size === 0
   );
 }
 function sweepTransientStoreNodes() {
   if (transientStoreNodes.size === 0) return;
   for (const e of transientStoreNodes) {
-    if (e.I !== null) {
+    if (e.P !== null) {
       transientStoreNodes.delete(e);
       continue;
     }
-    if (e.B !== NOT_PENDING) continue;
-    if (e.K !== undefined && e.K !== NOT_PENDING) continue;
+    if (e.D !== NOT_PENDING) continue;
+    if (e.O !== undefined && e.O !== NOT_PENDING) continue;
     transientStoreNodes.delete(e);
-    e.X?.();
+    e.m?.();
   }
 }
 function enforceLoadingBoundary(e) {}
@@ -269,27 +177,27 @@ function shouldReadStashedOptimisticValue(e) {
 }
 function runLaneEffects(e) {
   for (const t of activeLanes) {
-    if (t.H || t.F.size > 0) continue;
-    const n = t.W[e - 1];
+    if (t.S || t.u.size > 0) continue;
+    const n = t.l[e - 1];
     if (n.length) {
-      t.W[e - 1] = [];
+      t.l[e - 1] = [];
       runQueue(n, e);
     }
   }
 }
 function queueStashedOptimisticEffects(e) {
-  for (let t = e.I; t !== null; t = t.p) {
-    const e = t.h;
-    if (!e.J) continue;
-    if (e.J === EFFECT_TRACKED) {
-      if (!e.ee) {
-        e.ee = true;
-        e.te.enqueue(EFFECT_USER, e.ne);
+  for (let t = e.P; t !== null; t = t.L) {
+    const e = t.U;
+    if (!e.V) continue;
+    if (e.V === EFFECT_TRACKED) {
+      if (!e.G) {
+        e.G = true;
+        e.F.enqueue(EFFECT_USER, e.k);
       }
       continue;
     }
-    const n = e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
-    if (n.C > e.o) n.C = e.o;
+    const n = e.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+    if (n.I > e.H) n.I = e.H;
     insertIntoHeap(e, n);
   }
 }
@@ -297,153 +205,177 @@ function setProjectionWriteActive(e) {
   projectionWriteActive = e;
 }
 function mergeTransitionState(e, t) {
-  t.ie = e;
-  e.re.push(...t.re);
-  for (const n of activeLanes) if (n.M === t) n.M = e;
-  e.Z.push(...t.Z);
-  for (const n of t.q) e.q.add(n);
-  for (const [n, i] of t.oe) {
-    let t = e.oe.get(n);
-    if (!t) e.oe.set(n, (t = new Set()));
+  t.M = e;
+  e.j.push(...t.j);
+  for (const n of activeLanes) if (n.T === t) n.T = e;
+  e.N.push(...t.N);
+  for (const n of t.C) e.C.add(n);
+  for (const [n, i] of t.$) {
+    let t = e.$.get(n);
+    if (!t) e.$.set(n, (t = new Set()));
     for (const e of i) t.add(e);
   }
-  for (const n of t.se) e.se.add(n);
+  for (const n of t.K) e.K.add(n);
 }
 function resolveOptimisticNodes(e) {
-  for (let t = 0; t < e.length; t++) {
-    const n = e[t];
-    n.G = undefined;
-    if (n.B !== NOT_PENDING) {
-      n.ue = n.B;
-      n.B = NOT_PENDING;
-    }
-    const i = n.K;
-    n.K = NOT_PENDING;
-    if (i !== NOT_PENDING && n.ue !== i) insertSubs(n, true);
-    n.M = null;
-  }
-  e.length = 0;
+  const t = e.length;
+  for (let n = 0; n < t; n++) {
+    const t = e[n];
+    t.i = undefined;
+    if (!(t.Y & STATUS_PENDING)) t.Y &= ~STATUS_UNINITIALIZED;
+    const i = t.O;
+    t.O = NOT_PENDING;
+    if (i !== NOT_PENDING && t.Z !== i) insertSubs(t, true);
+    t.T = null;
+  }
+  for (let n = 0; n < t; n++) {
+    const t = e[n];
+    if (t.B || t.q) snapCompanionsToState(t);
+    const i = t.t;
+    if (i && (i.B === t || i.q === t)) snapCompanionsToState(i);
+  }
+  e.splice(0, t);
 }
 function cleanupCompletedLanes(e) {
   for (const t of activeLanes) {
-    const n = e ? t.M === e : !t.M;
+    const n = e ? t.T === e : !t.T;
     if (!n) continue;
-    if (!t.H) {
-      if (t.W[0].length) runQueue(t.W[0], EFFECT_RENDER);
-      if (t.W[1].length) runQueue(t.W[1], EFFECT_USER);
-    }
-    if (t.k.G === t) t.k.G = undefined;
-    t.F.clear();
-    t.W[0].length = 0;
-    t.W[1].length = 0;
+    if (!t.S) {
+      if (t.l[0].length) runQueue(t.l[0], EFFECT_RENDER);
+      if (t.l[1].length) runQueue(t.l[1], EFFECT_USER);
+    }
+    if (t.o.i === t) t.o.i = undefined;
+    t.u.clear();
+    t.l[0].length = 0;
+    t.l[1].length = 0;
     activeLanes.delete(t);
-    signalLanes.delete(t.k);
+    signalLanes.delete(t.o);
   }
 }
 function schedule() {
+  if (halted) {
+    notifyHalted();
+    return;
+  }
   if (scheduled) return;
   scheduled = true;
-  if (!syncDepth && !globalQueue.ce && !projectionWriteActive) queueMicrotask(flush);
+  if (!syncDepth && !globalQueue.X && !projectionWriteActive) queueMicrotask(flush);
+}
+function haltReactivity() {
+  if (halted) return;
+  halted = true;
+  let e = "[REACTIVITY_HALTED] An uncaught error halted the reactive system.";
+  console.error(e);
+}
+function notifyHalted() {
+  if (haltNotified) return;
+  haltNotified = true;
+  console.error("[REACTIVITY_HALTED] Update ignored.");
+}
+function resetErrorHalt() {
+  halted = false;
+  haltNotified = false;
 }
 class Queue {
-  i = null;
-  le = [[], []];
-  Y = [];
+  J = null;
+  ee = [[], []];
+  A = [];
   created = clock;
   addChild(e) {
-    this.Y.push(e);
-    e.i = this;
+    this.A.push(e);
+    e.J = this;
   }
   removeChild(e) {
-    const t = this.Y.indexOf(e);
+    const t = this.A.indexOf(e);
     if (t >= 0) {
-      this.Y.splice(t, 1);
-      e.i = null;
+      this.A.splice(t, 1);
+      e.J = null;
     }
   }
   notify(e, t, n, i) {
-    if (this.i) return this.i.notify(e, t, n, i);
+    if (this.J) return this.J.notify(e, t, n, i);
     return false;
   }
   run(e) {
-    if (this.le[e - 1].length) {
-      const t = this.le[e - 1];
-      this.le[e - 1] = [];
+    if (this.ee[e - 1].length) {
+      const t = this.ee[e - 1];
+      this.ee[e - 1] = [];
       runQueue(t, e);
     }
-    for (let t = 0; t < this.Y.length; t++) this.Y[t].run?.(e);
+    for (let t = 0; t < this.A.length; t++) this.A[t].run?.(e);
   }
   enqueue(e, t) {
     if (e) {
       if (currentOptimisticLane) {
         const n = findLane(currentOptimisticLane);
-        n.W[e - 1].push(t);
+        n.l[e - 1].push(t);
       } else {
-        this.le[e - 1].push(t);
+        this.ee[e - 1].push(t);
       }
     }
     schedule();
   }
   stashQueues(e) {
-    e.le[0].push(...this.le[0]);
-    e.le[1].push(...this.le[1]);
-    this.le = [[], []];
-    for (let t = 0; t < this.Y.length; t++) {
-      let n = this.Y[t];
-      let i = e.Y[t];
+    e.ee[0].push(...this.ee[0]);
+    e.ee[1].push(...this.ee[1]);
+    this.ee = [[], []];
+    for (let t = 0; t < this.A.length; t++) {
+      let n = this.A[t];
+      let i = e.A[t];
       if (!i) {
-        i = { le: [[], []], Y: [] };
-        e.Y[t] = i;
+        i = { ee: [[], []], A: [] };
+        e.A[t] = i;
       }
       n.stashQueues(i);
     }
   }
   restoreQueues(e) {
-    this.le[0].push(...e.le[0]);
-    this.le[1].push(...e.le[1]);
-    for (let t = 0; t < e.Y.length; t++) {
-      const n = e.Y[t];
-      let i = this.Y[t];
+    this.ee[0].push(...e.ee[0]);
+    this.ee[1].push(...e.ee[1]);
+    for (let t = 0; t < e.A.length; t++) {
+      const n = e.A[t];
+      let i = this.A[t];
       if (i) i.restoreQueues(n);
     }
   }
 }
 class GlobalQueue extends Queue {
-  ce = false;
-  ae = null;
-  fe = [];
-  Z = [];
-  q = new Set();
-  static Ee;
-  static Se;
-  static Te;
-  static de = null;
+  X = false;
+  te = null;
+  ne = [];
+  N = [];
+  C = new Set();
+  static ie;
+  static re;
+  static oe;
+  static se = null;
   flush() {
-    if (this.ce) return;
-    this.ce = true;
+    if (this.X) return;
+    this.X = true;
     try {
-      runHeap(dirtyQueue, GlobalQueue.Ee);
+      if (false);
+      runHeap(dirtyQueue, GlobalQueue.ie);
       if (activeTransition) {
         const e = transitionComplete(activeTransition);
         if (!e) {
           const e = activeTransition;
-          runHeap(zombieQueue, GlobalQueue.Ee);
-          this.ae = null;
-          this.fe = [];
-          this.Z = [];
-          this.q = new Set();
+          runHeap(zombieQueue, GlobalQueue.ie);
+          this.te = null;
+          this.ne = [];
+          this.N = [];
+          this.C = new Set();
           runLaneEffects(EFFECT_RENDER);
           runLaneEffects(EFFECT_USER);
-          this.stashQueues(e._e);
+          this.stashQueues(e.ue);
           clock++;
-          scheduled = dirtyQueue._ >= dirtyQueue.C;
-          reassignPendingTransition(e.fe);
+          scheduled = dirtyQueue.h >= dirtyQueue.I;
+          reassignPendingTransition(e.ne);
           activeTransition = null;
-          if (!e.re.length && !e.oe.size && e.Z.length) {
+          if (!e.j.length && !e.$.size && e.N.length) {
             stashedOptimisticReads = new Set();
-            for (let t = 0; t < e.Z.length; t++) {
-              const n = e.Z[t];
-              if (n.L || n.Oe & CONFIG_OWNED_WRITE) continue;
+            for (let t = 0; t < e.N.length; t++) {
+              const n = e.N[t];
+              if (n.ce || n.le & CONFIG_OWNED_WRITE) continue;
               stashedOptimisticReads.add(n);
               queueStashedOptimisticEffects(n);
             }
@@ -455,44 +387,52 @@ class GlobalQueue extends Queue {
           }
           return;
         }
-        this.fe !== activeTransition.fe && this.fe.push(...activeTransition.fe);
-        this.restoreQueues(activeTransition._e);
+        this.ne !== activeTransition.ne && this.ne.push(...activeTransition.ne);
+        this.restoreQueues(activeTransition.ue);
         transitions.delete(activeTransition);
         const t = activeTransition;
         activeTransition = null;
-        reassignPendingTransition(this.fe);
+        reassignPendingTransition(this.ne);
         finalizePureQueue(t);
       } else {
         if (canUseSimpleSyncFlush(this)) {
           commitPendingNodes();
-          if (dirtyQueue._ >= dirtyQueue.C) {
-            runHeap(dirtyQueue, GlobalQueue.Ee);
+          if (dirtyQueue.h >= dirtyQueue.I) {
+            runHeap(dirtyQueue, GlobalQueue.ie);
             commitPendingNodes();
           }
         } else {
-          if (transitions.size) runHeap(zombieQueue, GlobalQueue.Ee);
+          if (transitions.size) runHeap(zombieQueue, GlobalQueue.ie);
           finalizePureQueue();
         }
       }
       clock++;
-      scheduled = dirtyQueue._ >= dirtyQueue.C;
+      scheduled = dirtyQueue.h >= dirtyQueue.I;
       activeLanes.size && runLaneEffects(EFFECT_RENDER);
       this.run(EFFECT_RENDER);
       activeLanes.size && runLaneEffects(EFFECT_USER);
       this.run(EFFECT_USER);
       if (false);
+      if (
+        false &&
+        !scheduled &&
+        !activeTransition &&
+        transitions.size === 0 &&
+        activeLanes.size === 0
+      );
+      if (false);
     } finally {
-      this.ce = false;
+      this.X = false;
     }
   }
   notify(e, t, n, i) {
     if (t & STATUS_PENDING) {
       if (n & STATUS_PENDING) {
-        const t = i !== undefined ? i : e.Re;
+        const t = i !== undefined ? i : e.ae;
         if (activeTransition && t) {
           const n = t.source;
-          let i = activeTransition.oe.get(n);
-          if (!i) activeTransition.oe.set(n, (i = new Set()));
+          let i = activeTransition.$.get(n);
+          if (!i) activeTransition.$.set(n, (i = new Set()));
           const r = i.size;
           i.add(e);
           if (i.size !== r) schedule();
@@ -505,18 +445,18 @@ class GlobalQueue extends Queue {
   initTransition(e) {
     if (e) e = currentTransition(e);
     if (e && e === activeTransition) return;
-    if (!e && activeTransition && activeTransition.Ie === clock) return;
+    if (!e && activeTransition && activeTransition.fe === clock) return;
     if (!activeTransition) {
       activeTransition = e ?? {
-        Ie: clock,
-        fe: [],
-        oe: new Map(),
-        Z: [],
-        q: new Set(),
-        re: [],
-        _e: { le: [[], []], Y: [] },
-        ie: false,
-        se: new Set()
+        fe: clock,
+        ne: [],
+        $: new Map(),
+        N: [],
+        C: new Set(),
+        j: [],
+        ue: { ee: [[], []], A: [] },
+        M: false,
+        K: new Set()
       };
     } else if (e) {
       const t = activeTransition;
@@ -525,104 +465,106 @@ class GlobalQueue extends Queue {
       activeTransition = e;
     }
     transitions.add(activeTransition);
-    activeTransition.Ie = clock;
-    if (this.ae !== null) {
-      this.ae.M = activeTransition;
-      activeTransition.fe.push(this.ae);
-      this.ae = null;
-    }
-    if (this.fe !== activeTransition.fe) {
-      for (let e = 0; e < this.fe.length; e++) {
-        const t = this.fe[e];
-        t.M = activeTransition;
-        activeTransition.fe.push(t);
+    activeTransition.fe = clock;
+    if (this.te !== null) {
+      this.te.T = activeTransition;
+      activeTransition.ne.push(this.te);
+      this.te = null;
+    }
+    if (this.ne !== activeTransition.ne) {
+      for (let e = 0; e < this.ne.length; e++) {
+        const t = this.ne[e];
+        t.T = activeTransition;
+        activeTransition.ne.push(t);
       }
-      this.fe = activeTransition.fe;
+      this.ne = activeTransition.ne;
     }
-    if (this.Z !== activeTransition.Z) {
-      for (let e = 0; e < this.Z.length; e++) {
-        const t = this.Z[e];
-        t.M = activeTransition;
-        activeTransition.Z.push(t);
+    if (this.N !== activeTransition.N) {
+      for (let e = 0; e < this.N.length; e++) {
+        const t = this.N[e];
+        t.T = activeTransition;
+        activeTransition.N.push(t);
       }
-      this.Z = activeTransition.Z;
+      this.N = activeTransition.N;
     }
     for (const e of activeLanes) {
-      if (!e.M) e.M = activeTransition;
+      if (!e.T) e.T = activeTransition;
     }
-    if (this.q !== activeTransition.q) {
-      for (const e of this.q) activeTransition.q.add(e);
-      this.q = activeTransition.q;
+    if (this.C !== activeTransition.C) {
+      for (const e of this.C) activeTransition.C.add(e);
+      this.C = activeTransition.C;
     }
   }
 }
 function queuePendingNode(e) {
   if (activeTransition) {
-    globalQueue.fe.push(e);
+    globalQueue.ne.push(e);
     return;
   }
-  if (globalQueue.ae === null && globalQueue.fe.length === 0) {
-    globalQueue.ae = e;
+  if (globalQueue.te === null && globalQueue.ne.length === 0) {
+    globalQueue.te = e;
     return;
   }
-  if (globalQueue.ae !== null) {
-    globalQueue.fe.push(globalQueue.ae);
-    globalQueue.ae = null;
+  if (globalQueue.te !== null) {
+    globalQueue.ne.push(globalQueue.te);
+    globalQueue.te = null;
   }
-  globalQueue.fe.push(e);
+  globalQueue.ne.push(e);
 }
 function insertSubs(e, t = false) {
-  const n = e.G || currentOptimisticLane;
-  const i = e.pe !== undefined;
-  for (let r = e.I; r !== null; r = r.p) {
-    if (i && r.h.Oe & CONFIG_IN_SNAPSHOT_SCOPE) {
-      r.h.O |= REACTIVE_SNAPSHOT_STALE;
+  const n = e.i || currentOptimisticLane;
+  const i = e.Ee !== undefined;
+  for (let r = e.P; r !== null; r = r.L) {
+    if (i && r.U.le & CONFIG_IN_SNAPSHOT_SCOPE) {
+      r.U.W |= REACTIVE_SNAPSHOT_STALE;
       continue;
     }
     if (t && n) {
-      r.h.O |= REACTIVE_OPTIMISTIC_DIRTY;
-      assignOrMergeLane(r.h, n);
+      r.U.W |= REACTIVE_OPTIMISTIC_DIRTY;
+      assignOrMergeLane(r.U, n);
     } else if (t) {
-      r.h.O |= REACTIVE_OPTIMISTIC_DIRTY;
-      r.h.G = undefined;
-    }
-    const e = r.h;
-    if (e.J === EFFECT_TRACKED) {
-      if (!e.ee) {
-        e.ee = true;
-        e.te.enqueue(EFFECT_USER, e.ne);
+      r.U.W |= REACTIVE_OPTIMISTIC_DIRTY;
+      r.U.i = undefined;
+    }
+    const e = r.U;
+    if (e.V === EFFECT_TRACKED) {
+      if (!e.G) {
+        e.G = true;
+        e.F.enqueue(EFFECT_USER, e.k);
       }
       continue;
     }
-    const o = r.h.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
-    if (o.C > r.h.o) o.C = r.h.o;
-    insertIntoHeap(r.h, o);
+    const o = r.U.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+    if (o.I > r.U.H) o.I = r.U.H;
+    insertIntoHeap(r.U, o);
   }
 }
 function commitPendingNode(e) {
   const t = e;
-  if (!t.L) {
-    if (e.B !== NOT_PENDING) {
-      e.ue = e.B;
-      e.B = NOT_PENDING;
+  if (!t.ce) {
+    if (e.D !== NOT_PENDING) {
+      e.Z = e.D;
+      e.D = NOT_PENDING;
     }
+    if (e.B || e.q) snapCompanionsToState(e);
     return;
   }
-  if (e.B !== NOT_PENDING) {
-    e.ue = e.B;
-    e.B = NOT_PENDING;
-    if (e.J && e.J !== EFFECT_TRACKED) e.ee = true;
+  if (e.D !== NOT_PENDING) {
+    e.Z = e.D;
+    e.D = NOT_PENDING;
+    if (e.V && e.V !== EFFECT_TRACKED) e.G = true;
   }
-  t.O &= ~REACTIVE_MANUAL_WRITE;
-  if (!(t.he & STATUS_PENDING)) t.he &= ~STATUS_UNINITIALIZED;
-  if (t.Ne !== null || t.Ae !== null) GlobalQueue.Se(t, false, true);
+  t.W &= ~REACTIVE_MANUAL_WRITE;
+  if (!(t.Y & STATUS_PENDING)) t.Y &= ~STATUS_UNINITIALIZED;
+  if (t.de !== null || t.Se !== null) GlobalQueue.re(t, false, true);
+  if (e.B || e.q) snapCompanionsToState(e);
 }
 function commitPendingNodes() {
-  if (globalQueue.ae !== null) {
-    commitPendingNode(globalQueue.ae);
-    globalQueue.ae = null;
+  if (globalQueue.te !== null) {
+    commitPendingNode(globalQueue.te);
+    globalQueue.te = null;
   }
-  const e = globalQueue.fe;
+  const e = globalQueue.ne;
   for (let t = 0; t < e.length; t++) {
     commitPendingNode(e[t]);
   }
@@ -631,32 +573,32 @@ function commitPendingNodes() {
 function finalizePureQueue(e = null, t = false) {
   const n = !t;
   if (n) commitPendingNodes();
-  if (!t && globalQueue.Y.length) checkBoundaryChildren(globalQueue);
-  const i = dirtyQueue._ >= dirtyQueue.C;
-  if (i) runHeap(dirtyQueue, GlobalQueue.Ee);
+  if (!t && globalQueue.A.length) checkBoundaryChildren(globalQueue);
+  const i = dirtyQueue.h >= dirtyQueue.I;
+  if (i) runHeap(dirtyQueue, GlobalQueue.ie);
   if (n) {
     if (i) commitPendingNodes();
-    resolveOptimisticNodes(e ? e.Z : globalQueue.Z);
-    if (e && e.se.size) {
-      for (const t of e.se) {
-        if (t.O & REACTIVE_DISPOSED) continue;
-        if (t.J === EFFECT_TRACKED) {
-          if (!t.ee) {
-            t.ee = true;
-            t.te.enqueue(EFFECT_USER, t.ne);
+    resolveOptimisticNodes(e ? e.N : globalQueue.N);
+    if (e && e.K.size) {
+      for (const t of e.K) {
+        if (t.W & REACTIVE_DISPOSED) continue;
+        if (t.V === EFFECT_TRACKED) {
+          if (!t.G) {
+            t.G = true;
+            t.F.enqueue(EFFECT_USER, t.k);
           }
           continue;
         }
-        const e = t.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
-        if (e.C > t.o) e.C = t.o;
+        const e = t.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+        if (e.I > t.H) e.I = t.H;
         insertIntoHeap(t, e);
       }
-      e.se.clear();
+      e.K.clear();
     }
-    const t = e ? e.q : globalQueue.q;
-    if (GlobalQueue.de && t.size) {
+    const t = e ? e.C : globalQueue.C;
+    if (GlobalQueue.se && t.size) {
       for (const e of t) {
-        GlobalQueue.de(e);
+        GlobalQueue.se(e);
       }
       t.clear();
       schedule();
@@ -666,18 +608,18 @@ function finalizePureQueue(e = null, t = false) {
   }
 }
 function checkBoundaryChildren(e) {
-  for (const t of e.Y) {
+  for (const t of e.A) {
     t.checkSources?.();
     checkBoundaryChildren(t);
   }
 }
 function trackOptimisticStore(e) {
-  globalQueue.q.add(e);
+  globalQueue.C.add(e);
   schedule();
 }
 function reassignPendingTransition(e) {
   for (let t = 0; t < e.length; t++) {
-    e[t].M = activeTransition;
+    e[t].T = activeTransition;
   }
 }
 const globalQueue = new GlobalQueue();
@@ -687,13 +629,17 @@ function flush(e) {
     try {
       return e();
     } finally {
-      flush();
-      syncDepth--;
+      try {
+        flush();
+      } finally {
+        syncDepth--;
+      }
     }
   }
-  if (globalQueue.ce) {
+  if (globalQueue.X) {
     return;
   }
+  if (halted) return;
   while (scheduled || activeTransition) {
     globalQueue.flush();
   }
@@ -702,22 +648,22 @@ function runQueue(e, t) {
   for (let n = 0; n < e.length; n++) e[n](t);
 }
 function reporterBlocksSource(e, t) {
-  if (e.O & (REACTIVE_ZOMBIE | REACTIVE_DISPOSED)) return false;
-  if (e.Ce === t || e.Pe?.has(t)) return true;
-  for (let n = e.P; n; n = n.D) {
-    let e = n.m;
+  if (e.W & (REACTIVE_ZOMBIE | REACTIVE_DISPOSED)) return false;
+  if (e.Te === t || e._e?.has(t)) return true;
+  for (let n = e.Oe; n; n = n.pe) {
+    let e = n.Re;
     while (e) {
-      if (e === t || e.V === t) return true;
-      e = e.U;
+      if (e === t || e.Ie === t) return true;
+      e = e.t;
     }
   }
-  return !!(e.he & STATUS_PENDING && e.Re instanceof NotReadyError && e.Re.source === t);
+  return !!(e.Y & STATUS_PENDING && e.ae instanceof NotReadyError && e.ae.source === t);
 }
 function transitionComplete(e) {
-  if (e.ie) return true;
-  if (e.re.length) return false;
+  if (e.M) return true;
+  if (e.j.length) return false;
   let t = true;
-  for (const [n, i] of e.oe) {
+  for (const [n, i] of e.$) {
     let r = false;
     for (const e of i) {
       if (reporterBlocksSource(e, n)) {
@@ -726,32 +672,31 @@ function transitionComplete(e) {
       }
       i.delete(e);
     }
-    if (!r) e.oe.delete(n);
-    else if (n.he & STATUS_PENDING && n.Re?.source === n) {
+    if (!r) e.$.delete(n);
+    else if (n.Y & STATUS_PENDING && n.ae?.source === n) {
       t = false;
       break;
     }
   }
   if (t) {
-    for (let n = 0; n < e.Z.length; n++) {
-      const i = e.Z[n];
+    for (let n = 0; n < e.N.length; n++) {
+      const i = e.N[n];
       if (
         hasActiveOverride(i) &&
-        "he" in i &&
-        i.he & STATUS_PENDING &&
-        i.Re instanceof NotReadyError &&
-        i.Re.source !== i
+        "Y" in i &&
+        i.Y & STATUS_PENDING &&
+        i.ae instanceof NotReadyError
       ) {
         t = false;
         break;
       }
     }
   }
-  t && (e.ie = true);
+  t && (e.M = true);
   return t;
 }
 function currentTransition(e) {
-  while (e.ie && typeof e.ie === "object") e = e.ie;
+  while (e.M && typeof e.M === "object") e = e.M;
   return e;
 }
 function setActiveTransition(e) {
@@ -766,67 +711,178 @@ function runInTransition(e, t) {
     activeTransition = n;
   }
 }
+function actualInsertIntoHeap(e, t) {
+  const n = (e.J?.he ? e.J.Ae?.H : e.J?.H) ?? -1;
+  if (n >= e.H) e.H = n + 1;
+  const i = e.H;
+  const r = t.p[i];
+  if (r === undefined) t.p[i] = e;
+  else {
+    const t = r.Ne;
+    t.Ce = e;
+    e.Ne = t;
+    r.Ne = e;
+  }
+  if (i > t.h) t.h = i;
+}
+function insertIntoHeap(e, t) {
+  let n = e.W;
+  if (n & (REACTIVE_IN_HEAP | REACTIVE_RECOMPUTING_DEPS | REACTIVE_MANUAL_WRITE)) return;
+  if (n & REACTIVE_CHECK) {
+    e.W = (n & -4) | REACTIVE_DIRTY | REACTIVE_IN_HEAP;
+  } else e.W = n | REACTIVE_IN_HEAP;
+  if (!(n & REACTIVE_IN_HEAP_HEIGHT)) actualInsertIntoHeap(e, t);
+}
+function insertIntoHeapHeight(e, t) {
+  let n = e.W;
+  if (
+    n &
+    (REACTIVE_IN_HEAP | REACTIVE_RECOMPUTING_DEPS | REACTIVE_IN_HEAP_HEIGHT | REACTIVE_MANUAL_WRITE)
+  )
+    return;
+  e.W = n | REACTIVE_IN_HEAP_HEIGHT;
+  actualInsertIntoHeap(e, t);
+}
+function deleteFromHeap(e, t) {
+  const n = e.W;
+  if (!(n & (REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT))) return;
+  e.W = n & -25;
+  const i = e.H;
+  if (e.Ne === e) t.p[i] = undefined;
+  else {
+    const n = e.Ce;
+    const r = t.p[i];
+    const o = n ?? r;
+    if (e === r) t.p[i] = n;
+    else e.Ne.Ce = n;
+    o.Ne = e.Ne;
+  }
+  e.Ne = e;
+  e.Ce = undefined;
+}
+function markHeap(e) {
+  if (e.R) return;
+  e.R = true;
+  for (let t = 0; t <= e.h; t++) {
+    for (let n = e.p[t]; n !== undefined; n = n.Ce) {
+      if (n.W & REACTIVE_IN_HEAP) markNode(n);
+    }
+  }
+}
+function markNode(e, t = REACTIVE_DIRTY) {
+  const n = e.W;
+  if ((n & (REACTIVE_CHECK | REACTIVE_DIRTY)) >= t) return;
+  e.W = (n & -4) | t;
+  for (let t = e.P; t !== null; t = t.L) {
+    markNode(t.U, REACTIVE_CHECK);
+  }
+  if (e.ye !== null) {
+    for (let t = e.ye; t !== null; t = t.Pe) {
+      for (let e = t.P; e !== null; e = e.L) {
+        markNode(e.U, REACTIVE_CHECK);
+      }
+    }
+  }
+}
+function runHeap(e, t) {
+  e.R = false;
+  for (e.I = 0; e.I <= e.h; e.I++) {
+    let n = e.p[e.I];
+    while (n !== undefined) {
+      if (n.W & REACTIVE_IN_HEAP) t(n);
+      else adjustHeight(n, e);
+      n = e.p[e.I];
+    }
+  }
+  e.h = 0;
+}
+function adjustHeight(e, t) {
+  deleteFromHeap(e, t);
+  let n = e.H;
+  for (let t = e.Oe; t; t = t.pe) {
+    const e = t.Re;
+    const i = e.Ie || e;
+    if (i.ce && i.H >= n) n = i.H + 1;
+  }
+  if (e.H !== n) {
+    e.H = n;
+    for (let t = e.P; t !== null; t = t.L) {
+      insertIntoHeapHeight(t.U, t.U.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+    }
+  }
+}
 const PENDING_OWNER = {};
 function markDisposal(e) {
   let t = e.ge;
   while (t) {
-    t.O |= REACTIVE_ZOMBIE;
-    if (t.O & REACTIVE_IN_HEAP) {
-      deleteFromHeap(t, dirtyQueue);
-      insertIntoHeap(t, zombieQueue);
+    const e = t.W;
+    t.W = e | REACTIVE_ZOMBIE;
+    if (e & (REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT)) {
+      deleteFromHeap(t, e & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+      if (e & REACTIVE_IN_HEAP) insertIntoHeap(t, zombieQueue);
+      else insertIntoHeapHeight(t, zombieQueue);
     }
     markDisposal(t);
     t = t.De;
   }
 }
 function dispose(e) {
-  let t = e.P || null;
-  do {
+  let t = e.Oe;
+  while (t !== null) {
     t = unlinkSubs(t);
-  } while (t !== null);
-  e.P = null;
-  e.ye = null;
+  }
+  e.Oe = null;
+  e.me = null;
   disposeChildren(e, true);
 }
 function disposeChildren(e, t = false, n) {
-  const i = e.O;
+  const i = e.W;
   if (i & REACTIVE_DISPOSED) return;
-  if (t) e.O = i | REACTIVE_DISPOSED;
-  if (t && e.L) e.ve = null;
-  let r = n ? e.Ne : e.ge;
+  if (t) {
+    e.W = i | REACTIVE_DISPOSED;
+    const t = e;
+    if (t.B || t.q) snapCompanionsToState(t);
+  }
+  if (t && e.ce) e.be = null;
+  let r = n ? e.de : e.ge;
   while (r) {
     const e = r.De;
-    if (r.P) {
+    if (r.Oe) {
       const e = r;
-      deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-      let t = e.P;
+      deleteFromHeap(e, e.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+      let t = e.Oe;
       do {
         t = unlinkSubs(t);
       } while (t !== null);
-      e.P = null;
-      e.ye = null;
+      e.Oe = null;
+      e.me = null;
     }
     disposeChildren(r, true);
     r = e;
   }
   if (n) {
-    e.Ne = null;
+    e.de = null;
   } else {
     e.ge = null;
-    e.me = 0;
+    e.ve = 0;
   }
-  if (t && !n && !(i & REACTIVE_ZOMBIE) && e.i !== null && !(e.i.O & REACTIVE_DISPOSED)) {
+  if (t && !n && !(i & REACTIVE_ZOMBIE) && e.J !== null && !(e.J.W & REACTIVE_DISPOSED)) {
     const t = e.we;
     const n = e.De;
     if (t !== null) t.De = n;
-    else e.i.ge = n;
+    else e.J.ge = n;
     if (n !== null) n.we = t;
     e.we = null;
   }
   runDisposal(e, n);
+  if (t && e.Le) {
+    const t = e.Le;
+    e.Le = undefined;
+    t();
+  }
 }
 function runDisposal(e, t) {
-  let n = t ? e.Ae : e.be;
+  let n = t ? e.Se : e.Ue;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e = 0; e < n.length; e++) {
@@ -836,12 +892,12 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? (e.Ae = null) : (e.be = null);
+  t ? (e.Se = null) : (e.Ue = null);
 }
 function childId(e, t) {
   let n = e;
-  while (n.Oe & CONFIG_TRANSPARENT && n.i) n = n.i;
-  if (n.id != null) return formatId(n.id, t ? n.me++ : n.me);
+  while (n.le & CONFIG_TRANSPARENT && n.J) n = n.J;
+  if (n.id != null) return formatId(n.id, t ? n.ve++ : n.ve);
   throw new Error("Cannot get child id from owner without an id");
 }
 function getNextChildId(e) {
@@ -864,13 +920,13 @@ function getOwner() {
 }
 function cleanup(e) {
   if (!context) return e;
-  if (!context.be) context.be = e;
-  else if (Array.isArray(context.be)) context.be.push(e);
-  else context.be = [context.be, e];
+  if (!context.Ue) context.Ue = e;
+  else if (Array.isArray(context.Ue)) context.Ue.push(e);
+  else context.Ue = [context.Ue, e];
   return e;
 }
 function isDisposed(e) {
-  return !!(e.O & (REACTIVE_DISPOSED | REACTIVE_ZOMBIE));
+  return !!(e.W & (REACTIVE_DISPOSED | REACTIVE_ZOMBIE));
 }
 function disposeRootSelf(e = true) {
   disposeChildren(this, e);
@@ -880,19 +936,19 @@ function createOwner(e) {
   const n = e?.transparent ?? false;
   const i = {
     id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
-    Oe: n ? CONFIG_TRANSPARENT : 0,
-    t: true,
-    u: t?.t ? t.u : t,
+    le: n ? CONFIG_TRANSPARENT : 0,
+    he: true,
+    Ae: t?.he ? t.Ae : t,
     ge: null,
     De: null,
     we: null,
-    be: null,
-    te: t?.te ?? globalQueue,
+    Ue: null,
+    F: t?.F ?? globalQueue,
     Ve: t?.Ve || defaultContext,
-    me: 0,
-    Ae: null,
-    Ne: null,
-    i: t,
+    ve: 0,
+    Se: null,
+    de: null,
+    J: t,
     dispose: disposeRootSelf
   };
   if (t) {
@@ -912,128 +968,137 @@ function createRoot(e, t) {
   return runWithOwner(n, () => e(() => n.dispose()));
 }
 function unlinkSubs(e) {
-  const t = e.m;
-  const n = e.D;
-  const i = e.p;
-  const r = e.Le;
-  if (i !== null) i.Le = r;
-  else t.Ue = r;
-  if (r !== null) r.p = i;
+  const t = e.Re;
+  const n = e.pe;
+  const i = e.L;
+  const r = e.Ge;
+  if (i !== null) i.Ge = r;
+  else t.Fe = r;
+  if (r !== null) r.L = i;
   else {
-    t.I = i;
+    t.P = i;
     if (i === null) {
-      t.X?.();
+      t.m?.();
       const e = t;
-      e.L && e.Oe & CONFIG_AUTO_DISPOSE && !(e.O & REACTIVE_ZOMBIE) && unobserved(e);
+      e.ce && e.le & CONFIG_AUTO_DISPOSE && !(e.W & REACTIVE_ZOMBIE) && unobserved(e);
     }
   }
   return n;
 }
 function trimStaleDeps(e) {
-  const t = e.ye;
-  let n = t !== null ? t.D : e.P;
+  const t = e.me;
+  let n = t !== null ? t.pe : e.Oe;
   if (n !== null) {
     do {
       n = unlinkSubs(n);
     } while (n !== null);
-    if (t !== null) t.D = null;
-    else e.P = null;
+    if (t !== null) t.pe = null;
+    else e.Oe = null;
   }
 }
 function unobserved(e) {
-  deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-  let t = e.P;
+  deleteFromHeap(e, e.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+  let t = e.Oe;
   while (t !== null) {
     t = unlinkSubs(t);
   }
-  e.P = null;
-  e.ye = null;
+  e.Oe = null;
+  e.me = null;
   disposeChildren(e, true);
 }
-function link(e, t) {
-  const n = t.ye;
-  if (n !== null && n.m === e) return;
-  let i = null;
-  const r = t.O & REACTIVE_RECOMPUTING_DEPS;
-  if (r) {
-    i = n !== null ? n.D : t.P;
-    if (i !== null && i.m === e) {
-      t.ye = i;
+function link(e, t, n = false) {
+  const i = t.me;
+  if (i !== null && i.Re === e) {
+    i.ke = n;
+    return;
+  }
+  let r = null;
+  const o = t.W & REACTIVE_RECOMPUTING_DEPS;
+  if (o) {
+    r = i !== null ? i.pe : t.Oe;
+    if (r !== null && r.Re === e) {
+      r.We = t.He;
+      t.me = r;
+      r.ke = n;
       return;
     }
   }
-  const o = e.Ue;
-  if (o !== null && o.h === t && (!r || isValidLink(o, t))) return;
-  const s = (t.ye = e.Ue = { m: e, h: t, D: i, Le: o, p: null });
-  if (n !== null) n.D = s;
-  else t.P = s;
-  if (o !== null) o.p = s;
-  else e.I = s;
-}
-function isValidLink(e, t) {
-  const n = t.ye;
-  if (n !== null) {
-    let i = t.P;
-    do {
-      if (i === e) return true;
-      if (i === n) break;
-      i = i.D;
-    } while (i !== null);
+  const s = e.Fe;
+  if (s !== null && s.U === t && (!o || s.We === t.He)) {
+    s.ke = n;
+    return;
   }
-  return false;
+  const u = (t.me = e.Fe = { Re: e, U: t, pe: r, Ge: s, L: null, We: t.He, ke: n });
+  if (i !== null) i.pe = u;
+  else t.Oe = u;
+  if (s !== null) s.L = u;
+  else e.P = u;
 }
 function addPendingSource(e, t) {
-  if (e.Ce === t || e.Pe?.has(t)) return false;
-  if (!e.Ce) {
-    e.Ce = t;
+  if (e.Te === t || e._e?.has(t)) return false;
+  if (!e.Te) {
+    e.Te = t;
     return true;
   }
-  if (!e.Pe) {
-    e.Pe = new Set([e.Ce, t]);
+  if (!e._e) {
+    e._e = new Set([e.Te, t]);
   } else {
-    e.Pe.add(t);
+    e._e.add(t);
   }
-  e.Ce = undefined;
+  e.Te = undefined;
   return true;
 }
 function removePendingSource(e, t) {
-  if (e.Ce) {
-    if (e.Ce !== t) return false;
-    e.Ce = undefined;
+  if (e.Te) {
+    if (e.Te !== t) return false;
+    e.Te = undefined;
     return true;
   }
-  if (!e.Pe?.delete(t)) return false;
-  if (e.Pe.size === 1) {
-    e.Ce = e.Pe.values().next().value;
-    e.Pe = undefined;
-  } else if (e.Pe.size === 0) {
-    e.Pe = undefined;
+  if (!e._e?.delete(t)) return false;
+  if (e._e.size === 1) {
+    e.Te = e._e.values().next().value;
+    e._e = undefined;
+  } else if (e._e.size === 0) {
+    e._e = undefined;
   }
   return true;
 }
 function clearPendingSources(e) {
-  e.Ce = undefined;
-  e.Pe?.clear();
-  e.Pe = undefined;
+  e.Te = undefined;
+  e._e?.clear();
+  e._e = undefined;
 }
 function setPendingError(e, t, n) {
   if (!t) {
-    e.Re = null;
+    e.ae = null;
     return;
   }
   if (n instanceof NotReadyError && n.source === t) {
-    e.Re = n;
+    e.ae = n;
     return;
   }
-  const i = e.Re;
+  const i = e.ae;
   if (!(i instanceof NotReadyError) || i.source !== t) {
-    e.Re = new NotReadyError(t);
+    e.ae = new NotReadyError(t);
   }
 }
 function forEachDependent(e, t) {
-  for (let n = e.I; n !== null; n = n.p) t(n.h);
-  for (let n = e.N; n !== null; n = n.A) {
-    for (let e = n.I; e !== null; e = e.p) t(e.h);
+  for (let n = e.P; n !== null; n = n.L) t(n.U, n);
+  for (let n = e.ye; n !== null; n = n.Pe) {
+    for (let e = n.P; e !== null; e = e.L) t(e.U, e);
+  }
+}
+function enqueueForRerun(e) {
+  if (e.V === EFFECT_TRACKED) {
+    const t = e;
+    if (!t.G) {
+      t.G = true;
+      t.F.enqueue(EFFECT_USER, t.k);
+    }
+  } else {
+    const t = e.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+    if (t.I > e.H) t.I = e.H;
+    insertIntoHeap(e, t);
   }
 }
 function settlePendingSource(e) {
@@ -1042,88 +1107,88 @@ function settlePendingSource(e) {
   const settle = i => {
     if (n.has(i) || !removePendingSource(i, e)) return;
     n.add(i);
-    i.Ie = clock;
-    const r = i.Ce ?? i.Pe?.values().next().value;
+    i.fe = clock;
+    const r = i.Te ?? i._e?.values().next().value;
     if (r) {
       setPendingError(i, r);
       updatePendingSignal(i);
     } else {
-      i.he &= ~STATUS_PENDING;
+      i.Y &= ~STATUS_PENDING;
       setPendingError(i);
       updatePendingSignal(i);
-      if (i.Ge) {
-        if (i.J === EFFECT_TRACKED) {
-          const e = i;
-          if (!e.ee) {
-            e.ee = true;
-            e.te.enqueue(EFFECT_USER, e.ne);
-          }
-        } else {
-          const e = i.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
-          if (e.C > i.o) e.C = i.o;
-          insertIntoHeap(i, e);
-        }
+      if (i.Me) {
+        enqueueForRerun(i);
         t = true;
       }
-      i.Ge = false;
+      i.Me = false;
     }
     forEachDependent(i, settle);
   };
   forEachDependent(e, settle);
   if (t) schedule();
 }
+function isThenable(e) {
+  return e != null && typeof e === "object" && typeof e.then === "function";
+}
 function handleAsync(e, t, n) {
   let i = false;
   let r = false;
   if (typeof t === "object" && t !== null) {
     untrack(() => {
       i = t[Symbol.asyncIterator];
-      r = !i && typeof t.then === "function";
+      r = !i && isThenable(t);
     });
   }
   if (!r && !i) {
-    e.ve = null;
+    e.be = null;
     return t;
   }
-  e.ve = t;
+  e.be = t;
   let o;
   const handleError = n => {
-    if (e.ve !== t) return;
+    if (e.be !== t) return;
     globalQueue.initTransition(resolveTransition(e));
     notifyStatus(e, n instanceof NotReadyError ? STATUS_PENDING : STATUS_ERROR, n);
-    e.Ie = clock;
+    e.fe = clock;
   };
   const asyncWrite = (i, r) => {
-    if (e.ve !== t) return;
-    if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY)) return;
+    if (e.be !== t) return;
+    if (e.W & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY)) return;
     globalQueue.initTransition(resolveTransition(e));
-    const o = !!(e.he & STATUS_UNINITIALIZED);
+    const o = !!(e.Y & STATUS_UNINITIALIZED);
     trimStaleDeps(e);
     clearStatus(e);
     const s = resolveLane(e);
-    if (s) s.F.delete(e);
-    if (n) n(i);
-    else if (e.K !== undefined) {
-      if (e.K !== undefined && e.K !== NOT_PENDING) e.B = i;
-      else {
-        e.ue = i;
-        insertSubs(e);
-      }
-      e.Ie = clock;
+    if (s) s.u.delete(e);
+    if (n) {
+      n(i);
+      if (o) clearStatus(e, true);
+    } else if (e.O !== undefined) {
+      if (e.D === NOT_PENDING) queuePendingNode(e);
+      e.D = i;
+      syncCompanions(e, i);
+      if (!hasActiveOverride(e)) insertSubs(e);
+      e.fe = clock;
     } else if (s) {
-      const t = e.J;
-      const n = e.ue;
-      const r = e.ke;
-      if ((!t && o) || !r || !r(i, n)) {
-        e.ue = i;
-        e.Ie = clock;
-        if (e.Fe) {
-          setSignal(e.Fe, i);
+      const t = e.V;
+      const n = e.Z;
+      const r = e.xe;
+      try {
+        if ((!t && o) || !r || !r(i, n)) {
+          e.Z = i;
+          e.fe = clock;
+          syncCompanions(e, i);
+          insertSubs(e, true);
         }
-        insertSubs(e, true);
+      } catch (t) {
+        notifyStatus(e, STATUS_ERROR, t);
       }
     } else {
-      setSignal(e, () => i);
+      try {
+        setSignal(e, () => i);
+      } catch (t) {
+        notifyStatus(e, STATUS_ERROR, t);
+      }
     }
     settlePendingSource(e);
     schedule();
@@ -1132,20 +1197,28 @@ function handleAsync(e, t, n) {
   };
   if (r) {
     let n = false,
-      i = true;
+      i = false,
+      r,
+      s = true;
     t.then(
       e => {
-        if (i) {
+        if (s) {
           o = e;
           n = true;
         } else asyncWrite(e);
       },
       e => {
-        if (!i) handleError(e);
+        if (s) {
+          r = e;
+          i = true;
+        } else handleError(e);
       }
     );
-    i = false;
-    if (!n) {
+    s = false;
+    if (i) {
+      handleError(r);
+      throw r;
+    } else if (!n) {
       globalQueue.initTransition(resolveTransition(e));
       throw new NotReadyError(context);
     }
@@ -1159,9 +1232,7 @@ function handleAsync(e, t, n) {
       r = true;
       try {
         const e = n.return?.();
-        if (e && typeof e.then === "function") {
-          e.then(undefined, () => {});
-        }
+        if (isThenable(e)) e.then(undefined, () => {});
       } catch {}
     });
     const iterate = () => {
@@ -1174,7 +1245,7 @@ function handleAsync(e, t, n) {
             s = n;
             u = true;
             if (n.done) r = true;
-          } else if (e.ve !== t) {
+          } else if (e.be !== t) {
             return;
           } else if (!n.done) asyncWrite(n.value, iterate);
           else {
@@ -1184,7 +1255,7 @@ function handleAsync(e, t, n) {
           }
         },
         n => {
-          if (!c && e.ve === t) {
+          if (!c && e.be === t) {
             r = true;
             handleError(n);
           }
@@ -1207,55 +1278,62 @@ function handleAsync(e, t, n) {
   return o;
 }
 function clearStatus(e, t = false) {
-  if (e.Ce || e.Pe) clearPendingSources(e);
-  if (e.Ge) e.Ge = false;
-  e.he = t ? 0 : e.he & STATUS_UNINITIALIZED;
-  if (e.Re) setPendingError(e);
-  if (e.We) updatePendingSignal(e);
-  if (e.xe) e.xe();
+  if (e.Te || e._e) clearPendingSources(e);
+  if (e.Me) e.Me = false;
+  e.Y = t ? 0 : e.Y & STATUS_UNINITIALIZED;
+  if (e.ae) setPendingError(e);
+  if (e.B || e.q) updatePendingSignal(e);
+  if (e.ye) updateChildCompanions(e);
+  if (e.Qe) e.Qe();
 }
 function notifyStatus(e, t, n, i, r) {
   if (t === STATUS_ERROR && !(n instanceof StatusError) && !(n instanceof NotReadyError))
     n = new StatusError(e, n);
   const o = t === STATUS_PENDING && n instanceof NotReadyError ? n.source : undefined;
   const s = o === e;
-  const u = t === STATUS_PENDING && e.K !== undefined && !s;
+  const u = t === STATUS_PENDING && e.O !== undefined && !s;
   const c = u && hasActiveOverride(e);
   if (!i) {
     if (t === STATUS_PENDING && o) {
       addPendingSource(e, o);
-      e.he = STATUS_PENDING | (e.he & STATUS_UNINITIALIZED);
+      e.Y = STATUS_PENDING | (e.Y & STATUS_UNINITIALIZED);
       setPendingError(e, o, n);
     } else {
       clearPendingSources(e);
-      e.he = t | (t !== STATUS_ERROR ? e.he & STATUS_UNINITIALIZED : 0);
-      e.Re = n;
+      e.Y = t | (t !== STATUS_ERROR ? e.Y & STATUS_UNINITIALIZED : 0);
+      e.ae = n;
     }
     updatePendingSignal(e);
+    if (e.ye) updateChildCompanions(e);
   }
   if (r && !i) {
     assignOrMergeLane(e, r);
   }
   const l = i || c;
   const a = i || u ? undefined : r;
-  if (e.xe) {
+  if (e.Qe) {
     if (i && t === STATUS_PENDING) {
       return;
     }
     if (l) {
-      e.xe(t, n);
+      e.Qe(t, n);
     } else {
-      e.xe();
+      e.Qe();
     }
     return;
   }
-  forEachDependent(e, e => {
-    e.Ie = clock;
+  forEachDependent(e, (e, i) => {
+    e.fe = clock;
     if (
-      (t === STATUS_PENDING && o && e.Ce !== o && !e.Pe?.has(o)) ||
-      (t !== STATUS_PENDING && (e.Re !== n || e.Ce || e.Pe))
+      (t === STATUS_PENDING && o && e.Te !== o && !e._e?.has(o)) ||
+      (t !== STATUS_PENDING && (e.ae !== n || e.Te || e._e))
     ) {
-      if (!l && !e.M) queuePendingNode(e);
+      if (i.ke && t !== STATUS_PENDING && !(n instanceof NotReadyError)) {
+        enqueueForRerun(e);
+        schedule();
+        return;
+      }
+      if (!l && !e.T) queuePendingNode(e);
       notifyStatus(e, t, n, l, a);
     }
   });
@@ -1283,23 +1361,21 @@ function enableExternalSource(e) {
     externalSourceConfig = { factory: t, untrack: n };
   }
 }
-GlobalQueue.Ee = recompute;
-GlobalQueue.Se = disposeChildren;
+GlobalQueue.ie = recompute;
+GlobalQueue.re = disposeChildren;
 let tracking = false;
 let stale = false;
-let refreshing = false;
 let pendingCheckActive = false;
-let foundPending = false;
 let latestReadActive = false;
 let context = null;
 let currentOptimisticLane = null;
-let pendingCheckSources = null;
+let pendingProbe = null;
 let snapshotCaptureActive = false;
 let snapshotSources = null;
 function ownerInSnapshotScope(e) {
   while (e) {
-    if (e.He) return true;
-    e = e.i;
+    if (e.je) return true;
+    e = e.J;
   }
   return false;
 }
@@ -1308,27 +1384,27 @@ function setSnapshotCapture(e) {
   if (e && !snapshotSources) snapshotSources = new Set();
 }
 function markSnapshotScope(e) {
-  e.He = true;
+  e.je = true;
 }
 function releaseSnapshotScope(e) {
-  e.He = false;
+  e.je = false;
   releaseSubtree(e);
   schedule();
 }
 function releaseSubtree(e) {
   let t = e.ge;
   while (t) {
-    if (t.He) {
+    if (t.je) {
       t = t.De;
       continue;
     }
-    if (t.L) {
+    if (t.ce) {
       const e = t;
-      e.Oe &= ~CONFIG_IN_SNAPSHOT_SCOPE;
-      if (e.O & REACTIVE_SNAPSHOT_STALE) {
-        e.O &= ~REACTIVE_SNAPSHOT_STALE;
-        e.O |= REACTIVE_DIRTY;
-        if (dirtyQueue.C > e.o) dirtyQueue.C = e.o;
+      e.le &= ~CONFIG_IN_SNAPSHOT_SCOPE;
+      if (e.W & REACTIVE_SNAPSHOT_STALE) {
+        e.W &= ~REACTIVE_SNAPSHOT_STALE;
+        e.W |= REACTIVE_DIRTY;
+        if (dirtyQueue.I > e.H) dirtyQueue.I = e.H;
         insertIntoHeap(e, dirtyQueue);
       }
     }
@@ -1339,7 +1415,7 @@ function releaseSubtree(e) {
 function clearSnapshots() {
   if (snapshotSources) {
     for (const e of snapshotSources) {
-      delete e.pe;
+      delete e.Ee;
       delete e[STORE_SNAPSHOT_PROPS];
     }
     snapshotSources = null;
@@ -1347,192 +1423,204 @@ function clearSnapshots() {
   snapshotCaptureActive = false;
 }
 function recompute(e, t = false) {
-  const n = e.J;
+  const n = e.V;
   if (!t) {
-    if (e.M && (!n || activeTransition) && activeTransition !== e.M)
-      globalQueue.initTransition(e.M);
-    deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-    e.ve = null;
-    if (e.M || n === EFFECT_TRACKED) disposeChildren(e);
-    else if (e.ge !== null || e.be !== null) {
+    if (e.T && (!n || activeTransition) && activeTransition !== e.T)
+      globalQueue.initTransition(e.T);
+    deleteFromHeap(e, e.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+    e.be = null;
+    if (e.T || n === EFFECT_TRACKED) disposeChildren(e);
+    else if (e.ge !== null || e.Ue !== null) {
       markDisposal(e);
-      e.Ae = e.be;
-      e.Ne = e.ge;
-      e.be = null;
+      e.Se = e.Ue;
+      e.de = e.ge;
+      e.Ue = null;
       e.ge = null;
-      e.me = 0;
+      e.ve = 0;
     } else;
   }
-  let i = !!(e.O & REACTIVE_OPTIMISTIC_DIRTY);
-  const r = e.K !== undefined && e.K !== NOT_PENDING;
-  const o = !!(e.he & STATUS_PENDING);
-  const s = !!(e.he & STATUS_UNINITIALIZED);
-  const u = context;
+  let i = !!(e.W & REACTIVE_OPTIMISTIC_DIRTY);
+  const r = e.O !== undefined && e.O !== NOT_PENDING;
+  !!(e.Y & STATUS_PENDING);
+  const o = !!(e.Y & STATUS_UNINITIALIZED);
+  const s = context;
   context = e;
-  e.ye = null;
-  e.O = REACTIVE_RECOMPUTING_DEPS;
-  e.Ie = clock;
-  let c = e.B === NOT_PENDING ? e.ue : e.B;
-  let l = e.o;
-  let a = tracking;
-  let f = currentOptimisticLane;
+  e.me = null;
+  e.He++;
+  e.W = REACTIVE_RECOMPUTING_DEPS;
+  e.fe = clock;
+  let u = e.D === NOT_PENDING ? e.Z : e.D;
+  let c = e.H;
+  let l = tracking;
+  let a = currentOptimisticLane;
   tracking = true;
   if (i) {
     const t = resolveLane(e);
     if (t) currentOptimisticLane = t;
-  } else if (activeTransition && !t && activeTransition.Z.length) {
-    for (let t = e.P; t; t = t.D) {
-      const n = t.m;
-      if (n.O & REACTIVE_OPTIMISTIC_DIRTY) {
+  } else if (activeTransition && !t && activeTransition.N.length) {
+    for (let t = e.Oe; t; t = t.pe) {
+      const n = t.Re;
+      if (n.W & REACTIVE_OPTIMISTIC_DIRTY) {
         const t = resolveLane(n);
         if (t) {
           i = true;
           currentOptimisticLane = t;
-          e.O |= REACTIVE_OPTIMISTIC_DIRTY;
+          e.W |= REACTIVE_OPTIMISTIC_DIRTY;
           assignOrMergeLane(e, t);
           break;
         }
       }
     }
   }
-  const E = n && n !== EFFECT_USER;
-  const S = stale;
-  if (E) stale = true;
+  const f = n && n !== EFFECT_USER;
+  const E = stale;
+  if (f) stale = true;
   try {
-    if (!false && e.Oe & CONFIG_SYNC) {
-      c = e.L(c);
-      e.ve = null;
+    if (!false && e.le & CONFIG_SYNC) {
+      u = e.ce(u);
+      e.be = null;
     } else {
-      const t = e.ve;
-      const n = e.L(c);
+      const t = e.be;
+      const n = e.ce(u);
       const i = typeof n === "object" && n !== null;
-      const r = e.ve !== t;
-      c = r || !i ? n : handleAsync(e, n);
-      if (!r && !i) e.ve = null;
+      const r = e.be !== t;
+      u = r || !i ? n : handleAsync(e, n);
+      if (!r && !i) e.be = null;
     }
     clearStatus(e, t);
-    if (e.G) {
+    if (e.i) {
       const t = resolveLane(e);
       if (t) {
-        t.F.delete(e);
-        updatePendingSignal(t.k);
+        t.u.delete(e);
+        updatePendingSignal(t.o);
       }
     }
   } catch (t) {
     if (t instanceof NotReadyError && currentOptimisticLane) {
       const t = findLane(currentOptimisticLane);
-      if (t.k !== e) {
-        t.F.add(e);
-        e.G = t;
-        updatePendingSignal(t.k);
+      if (t.o !== e) {
+        t.u.add(e);
+        e.i = t;
+        updatePendingSignal(t.o);
       }
     }
-    if (t instanceof NotReadyError) e.Ge = true;
+    if (t instanceof NotReadyError) e.Me = true;
     notifyStatus(
       e,
       t instanceof NotReadyError ? STATUS_PENDING : STATUS_ERROR,
       t,
       undefined,
-      t instanceof NotReadyError ? e.G : undefined
+      t instanceof NotReadyError ? e.i : undefined
     );
   } finally {
-    tracking = a;
-    if (E) stale = S;
-    e.O = REACTIVE_NONE | (t ? e.O & REACTIVE_SNAPSHOT_STALE : 0);
-    context = u;
+    tracking = l;
+    if (f) stale = E;
+    e.W = REACTIVE_NONE | (t ? e.W & REACTIVE_SNAPSHOT_STALE : 0);
+    context = s;
   }
-  if (!e.Re) {
+  if (!e.ae) {
     trimStaleDeps(e);
-    const u = r ? e.K : e.B === NOT_PENDING ? e.ue : e.B;
-    const a = (!n && s) || !e.ke || !e.ke(u, c);
-    if (n && a) {
-      e.ee = !e.Re;
-      if (!t) e.te.enqueue(n, GlobalQueue.Te.bind(null, e));
-    }
-    if (a) {
-      const s = r ? e.K : undefined;
-      if (t || (n && activeTransition !== e.M) || i) {
-        e.ue = c;
+    const s = r ? e.O : e.D === NOT_PENDING ? e.Z : e.D;
+    let l = false;
+    try {
+      l = (!n && o) || !e.xe || !e.xe(s, u);
+    } catch (t) {
+      notifyStatus(e, STATUS_ERROR, t);
+    }
+    if (n && l) {
+      e.G = !e.ae;
+      if (!t) e.F.enqueue(n, (e.$e ??= GlobalQueue.oe.bind(null, e)));
+    }
+    if (e.ae);
+    else if (l) {
+      const o = r ? e.O : undefined;
+      if (t || (n && activeTransition !== e.T) || i) {
+        e.Z = u;
         if (r && i) {
-          e.K = c;
-          e.B = c;
+          e.O = u;
+          e.D = NOT_PENDING;
         }
-      } else e.B = c;
-      if (r && !i && o && !e.$) e.K = c;
-      if (!r || i || e.K !== s) insertSubs(e, i || r);
+      } else {
+        e.D = u;
+        if (activeTransition || e.T) syncCompanions(e, u);
+      }
+      if (!r || i || e.O !== o) insertSubs(e, i || r);
     } else if (r) {
-      e.B = c;
-    } else if (e.o != l) {
-      for (let t = e.I; t !== null; t = t.p) {
-        insertIntoHeapHeight(t.h, t.h.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+      if (e.D === NOT_PENDING) queuePendingNode(e);
+      e.D = u;
+    } else if (e.H != c) {
+      for (let t = e.P; t !== null; t = t.L) {
+        insertIntoHeapHeight(t.U, t.U.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
       }
     }
   }
-  currentOptimisticLane = f;
-  const T =
-    e.B !== NOT_PENDING ||
-    e.Ne !== null ||
-    e.Ae !== null ||
-    !!(e.he & (STATUS_PENDING | STATUS_UNINITIALIZED));
-  T && (!t || e.he & STATUS_PENDING) && !e.M && !(activeTransition && r) && queuePendingNode(e);
-  e.M && n && activeTransition !== e.M && runInTransition(e.M, () => recompute(e));
+  currentOptimisticLane = a;
+  const d =
+    e.D !== NOT_PENDING ||
+    e.de !== null ||
+    e.Se !== null ||
+    !!(e.Y & (STATUS_PENDING | STATUS_UNINITIALIZED));
+  d && (!t || e.Y & STATUS_PENDING) && (!e.T || r) && queuePendingNode(e);
+  e.T && n && activeTransition !== e.T && runInTransition(e.T, () => recompute(e));
 }
 function updateIfNecessary(e) {
-  if (e.O & REACTIVE_CHECK) {
-    for (let t = e.P; t; t = t.D) {
-      const n = t.m;
-      const i = n.V || n;
-      if (i.L) {
+  if (e.W & REACTIVE_CHECK) {
+    for (let t = e.Oe; t; t = t.pe) {
+      const n = t.Re;
+      const i = n.Ie || n;
+      if (i.ce) {
         updateIfNecessary(i);
       }
-      if (e.O & REACTIVE_DIRTY) {
+      if (e.W & REACTIVE_DIRTY) {
         break;
       }
     }
   }
-  if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY) || (e.Re && e.Ie < clock && !e.ve)) {
+  if (e.W & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY) || (e.ae && e.fe < clock && !e.be)) {
     recompute(e);
   }
-  e.O = e.O & (REACTIVE_SNAPSHOT_STALE | REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT);
+  e.W = e.W & (REACTIVE_SNAPSHOT_STALE | REACTIVE_IN_HEAP | REACTIVE_IN_HEAP_HEIGHT);
 }
 function computed(e, t) {
   const n = t?.transparent ?? false;
   const i = {
     id: t?.id ?? (n ? context?.id : context?.id != null ? getNextChildId(context) : undefined),
-    Oe:
+    le:
       (n ? CONFIG_TRANSPARENT : 0) |
       (t?.ownedWrite ? CONFIG_OWNED_WRITE : 0) |
       (!context || t?.lazy ? CONFIG_AUTO_DISPOSE : 0) |
       (t?.sync ? CONFIG_SYNC : 0) |
+      (t?.Ke ? CONFIG_NO_SNAPSHOT : 0) |
       (snapshotCaptureActive && ownerInSnapshotScope(context) ? CONFIG_IN_SNAPSHOT_SCOPE : 0),
-    ke: t?.equals != null ? t.equals : isEqual,
-    X: t?.unobserved,
-    be: null,
-    te: context?.te ?? globalQueue,
+    xe: t?.equals != null ? t.equals : isEqual,
+    m: t?.unobserved,
+    Ue: null,
+    F: context?.F ?? globalQueue,
     Ve: context?.Ve ?? defaultContext,
-    me: 0,
-    L: e,
-    ue: undefined,
-    o: 0,
-    N: null,
-    T: undefined,
-    S: null,
-    P: null,
+    ve: 0,
+    ce: e,
+    Z: undefined,
+    H: 0,
     ye: null,
-    I: null,
-    Ue: null,
-    i: context,
+    Ce: undefined,
+    Ne: null,
+    Oe: null,
+    me: null,
+    He: 0,
+    P: null,
+    Fe: null,
+    J: context,
     De: null,
     we: null,
     ge: null,
-    O: t?.lazy ? REACTIVE_LAZY : REACTIVE_NONE,
-    he: STATUS_UNINITIALIZED,
-    Ie: clock,
-    B: NOT_PENDING,
-    Ae: null,
-    Ne: null,
-    ve: null,
-    M: null
+    W: t?.lazy ? REACTIVE_LAZY : REACTIVE_NONE,
+    Y: STATUS_UNINITIALIZED,
+    fe: clock,
+    D: NOT_PENDING,
+    Se: null,
+    de: null,
+    be: null,
+    T: null
   };
   setupComputedNode(i, t);
   return i;
@@ -1541,55 +1629,55 @@ function createEffectNode(e, t, n, i, r, o) {
   const s = o?.transparent ?? false;
   const u = {
     id: o?.id ?? (s ? context?.id : context?.id != null ? getNextChildId(context) : undefined),
-    Oe:
+    le:
       (s ? CONFIG_TRANSPARENT : 0) |
       (o?.ownedWrite ? CONFIG_OWNED_WRITE : 0) |
       (o?.sync ? CONFIG_SYNC : 0) |
       (snapshotCaptureActive && ownerInSnapshotScope(context) ? CONFIG_IN_SNAPSHOT_SCOPE : 0),
-    ke: false,
-    X: o?.unobserved,
-    be: null,
-    te: context?.te ?? globalQueue,
+    xe: false,
+    m: o?.unobserved,
+    Ue: null,
+    F: context?.F ?? globalQueue,
     Ve: context?.Ve ?? defaultContext,
-    me: 0,
-    L: e,
-    ue: undefined,
-    o: 0,
-    N: null,
-    T: undefined,
-    S: null,
-    P: null,
+    ve: 0,
+    ce: e,
+    Z: undefined,
+    H: 0,
     ye: null,
-    I: null,
-    Ue: null,
-    i: context,
+    Ce: undefined,
+    Ne: null,
+    Oe: null,
+    me: null,
+    He: 0,
+    P: null,
+    Fe: null,
+    J: context,
     De: null,
     we: null,
     ge: null,
-    O: REACTIVE_LAZY,
-    he: STATUS_UNINITIALIZED,
-    Ie: clock,
-    B: NOT_PENDING,
-    Ae: null,
-    Ne: null,
-    ve: null,
-    M: null,
-    ee: false,
-    Me: undefined,
-    Qe: t,
-    je: n,
-    $e: undefined,
-    Ke: false,
-    J: i,
-    xe: r
+    W: REACTIVE_LAZY,
+    Y: STATUS_UNINITIALIZED,
+    fe: clock,
+    D: NOT_PENDING,
+    Se: null,
+    de: null,
+    be: null,
+    T: null,
+    G: false,
+    Ye: undefined,
+    Ze: t,
+    Be: n,
+    Le: undefined,
+    V: i,
+    Qe: r
   };
   setupComputedNode(u, lazyOptions);
   return u;
 }
 const lazyOptions = { lazy: true };
 function setupComputedNode(e, t) {
-  e.S = e;
-  const n = context?.t ? context.u : context;
+  e.Ne = e;
+  const n = context?.he ? context.Ae : context;
   if (context) {
     const t = context.ge;
     if (t === null) {
@@ -1600,54 +1688,54 @@ function setupComputedNode(e, t) {
       context.ge = e;
     }
   }
-  if (n) e.o = n.o + 1;
+  if (n) e.H = n.H + 1;
   if (externalSourceConfig) {
     const t = signal(undefined, { equals: false, ownedWrite: true });
-    const n = externalSourceConfig.factory(e.L, () => {
+    const n = externalSourceConfig.factory(e.ce, () => {
       setSignal(t, undefined);
     });
     cleanup(() => n.dispose());
-    e.L = e => {
+    e.ce = e => {
       read(t);
       return n.track(e);
     };
   }
   !t?.lazy && recompute(e, true);
   if (snapshotCaptureActive && !t?.lazy) {
-    if (!(e.he & STATUS_PENDING)) {
-      e.pe = e.ue === undefined ? NO_SNAPSHOT : e.ue;
+    if (!(e.Y & STATUS_PENDING) && !(e.le & CONFIG_NO_SNAPSHOT)) {
+      e.Ee = e.Z === undefined ? NO_SNAPSHOT : e.Z;
       snapshotSources.add(e);
     }
   }
 }
 function signal(e, t, n = null) {
   const i = {
-    ke: t?.equals != null ? t.equals : isEqual,
-    Oe: (t?.ownedWrite ? CONFIG_OWNED_WRITE : 0) | (t?.Ye ? CONFIG_NO_SNAPSHOT : 0),
-    X: t?.unobserved,
-    ue: e,
-    I: null,
-    Ue: null,
-    Ie: clock,
-    V: n,
-    A: n?.N || null,
-    B: NOT_PENDING
+    xe: t?.equals != null ? t.equals : isEqual,
+    le: (t?.ownedWrite ? CONFIG_OWNED_WRITE : 0) | (t?.Ke ? CONFIG_NO_SNAPSHOT : 0),
+    m: t?.unobserved,
+    Z: e,
+    P: null,
+    Fe: null,
+    fe: clock,
+    Ie: n,
+    Pe: n?.ye || null,
+    D: NOT_PENDING
   };
-  n && (n.N = i);
-  if (snapshotCaptureActive && !(i.Oe & CONFIG_NO_SNAPSHOT) && !((n?.he ?? 0) & STATUS_PENDING)) {
-    i.pe = e === undefined ? NO_SNAPSHOT : e;
+  n && (n.ye = i);
+  if (snapshotCaptureActive && !(i.le & CONFIG_NO_SNAPSHOT) && !((n?.Y ?? 0) & STATUS_PENDING)) {
+    i.Ee = e === undefined ? NO_SNAPSHOT : e;
     snapshotSources.add(i);
   }
   return i;
 }
 function optimisticSignal(e, t) {
   const n = signal(e, t);
-  n.K = NOT_PENDING;
+  n.O = NOT_PENDING;
   return n;
 }
 function optimisticComputed(e, t) {
   const n = computed(e, t);
-  n.K = NOT_PENDING;
+  n.O = NOT_PENDING;
   return n;
 }
 function isEqual(e, t) {
@@ -1664,222 +1752,199 @@ function untrack(e, t) {
     tracking = n;
   }
 }
+function prepareComputed(e, t) {
+  if (e.W & REACTIVE_LAZY) {
+    e.W &= ~REACTIVE_LAZY;
+    recompute(e, true);
+  } else if (e.W & REACTIVE_DISPOSED) {
+    recompute(e, true);
+  } else if (t) {
+    updateIfNecessary(e);
+  }
+}
 function read(e) {
   if (latestReadActive) {
     const t = getLatestValueComputed(e);
     const n = latestReadActive;
     latestReadActive = false;
-    const i = e.K !== undefined && e.K !== NOT_PENDING ? e.K : e.ue;
+    const i = e.O !== undefined && e.O !== NOT_PENDING ? e.O : e.Z;
     let r;
     try {
       r = read(t);
-    } catch (e) {
-      if (!context && e instanceof NotReadyError) return i;
-      throw e;
+    } catch (t) {
+      if (t instanceof NotReadyError && (!context || !(e.Y & STATUS_UNINITIALIZED))) return i;
+      throw t;
     } finally {
       latestReadActive = n;
     }
-    if (t.he & STATUS_PENDING) return i;
-    if (stale && currentOptimisticLane && t.G) {
-      const e = findLane(t.G);
+    if (t.Y & STATUS_PENDING) return i;
+    if (stale && currentOptimisticLane && t.i) {
+      const e = findLane(t.i);
       const n = findLane(currentOptimisticLane);
-      if (e !== n && e.F.size > 0) {
+      if (e !== n && e.u.size > 0) {
         return i;
       }
     }
     return r;
   }
-  if (pendingCheckActive) {
-    const t = e.V;
-    const n = pendingCheckActive;
-    pendingCheckActive = false;
-    let i = context;
-    if (i?.t) i = i.u;
-    const r = t || e;
-    const o = e;
-    if (typeof o.L === "function") {
-      const t = e;
-      if (t.O & REACTIVE_LAZY) {
-        t.O &= ~REACTIVE_LAZY;
-        recompute(t, true);
-      } else if (t.O & REACTIVE_DISPOSED) {
-        recompute(t, true);
-      } else {
-        updateIfNecessary(t);
-      }
-    }
-    if (i && r.he & STATUS_PENDING && r.he & STATUS_UNINITIALIZED) {
-      if (tracking && e !== i) link(e, i);
-      pendingCheckActive = n;
-      throw r.Re;
-    }
-    if (t && e.K !== undefined) {
-      if (e.K !== NOT_PENDING && (t.ve || !!(t.he & STATUS_PENDING))) {
-        foundPending = true;
-      }
-      collectPendingSources(e);
-      collectPendingSources(t);
-      if (i && tracking) link(e, i);
-    } else {
-      collectPendingSources(e);
-      if (t) collectPendingSources(t);
-    }
-    pendingCheckActive = n;
-  }
   let t = context;
-  if (t?.t) t = t.u;
+  if (t?.he) t = t.Ae;
   const n = e;
-  if (typeof n.L === "function") {
-    const t = e;
-    if (t.O & REACTIVE_LAZY) {
-      t.O &= ~REACTIVE_LAZY;
-      recompute(t, true);
-    } else if (t.O & REACTIVE_DISPOSED) {
-      recompute(t, true);
+  const i = e.Ie;
+  const r = i || e;
+  if (pendingCheckActive) {
+    pendingCheckActive = false;
+    if (typeof n.ce === "function") prepareComputed(e, true);
+    if (t && r.Y & STATUS_PENDING && r.Y & STATUS_UNINITIALIZED) {
+      if (tracking && e !== t) link(e, t);
+      pendingCheckActive = true;
+      throw r.ae;
     }
+    collectPendingSources(e);
+    if (i) collectPendingSources(i);
+    pendingCheckActive = true;
+  } else if (typeof n.ce === "function") {
+    prepareComputed(e, false);
   }
-  const i = e.V || e;
   if (
-    !n.L &&
-    i === e &&
-    e.K === undefined &&
-    e.pe === undefined &&
+    !n.ce &&
+    r === e &&
+    e.O === undefined &&
+    e.Ee === undefined &&
     activeTransition === null &&
     currentOptimisticLane === null &&
     !snapshotCaptureActive &&
     true
   ) {
     if (t && tracking) link(e, t);
-    return !t || e.B === NOT_PENDING ? e.ue : e.B;
+    return !t || e.D === NOT_PENDING ? e.Z : e.D;
   }
   if (t && tracking) {
-    link(e, t);
-    if (i.L) {
-      const n = e.O & REACTIVE_ZOMBIE;
-      if (i.o >= (n ? zombieQueue.C : dirtyQueue.C)) {
+    link(e, t, pendingCheckActive);
+    if (r.ce) {
+      const n = e.W & REACTIVE_ZOMBIE;
+      if (r.H >= (n ? zombieQueue.I : dirtyQueue.I)) {
         markNode(t);
         markHeap(n ? zombieQueue : dirtyQueue);
-        updateIfNecessary(i);
+        updateIfNecessary(r);
       }
-      const r = i.o;
-      if (r >= t.o && e.i !== t) {
-        t.o = r + 1;
+      const i = r.H;
+      if (i >= t.H && e.J !== t) {
+        t.H = i + 1;
       }
     }
   }
-  if (i.he & STATUS_PENDING) {
-    if (t && !(stale && i.M && activeTransition !== i.M)) {
+  if (r.Y & STATUS_PENDING) {
+    if (t && !(stale && r.T && activeTransition !== r.T)) {
       if (currentOptimisticLane) {
-        const n = i.G;
-        const r = findLane(currentOptimisticLane);
-        if (n && findLane(n) === r && !hasActiveOverride(i)) {
+        const n = r.i;
+        const i = findLane(currentOptimisticLane);
+        if (n && findLane(n) === i && !hasActiveOverride(r)) {
           if (!tracking && e !== t) link(e, t);
-          throw i.Re;
+          throw r.ae;
         }
       } else {
         if (!tracking && e !== t) link(e, t);
-        throw i.Re;
+        throw r.ae;
       }
-    } else if (t && i !== e && i.he & STATUS_UNINITIALIZED) {
+    } else if (t && r !== e && r.Y & STATUS_UNINITIALIZED) {
       if (!tracking && e !== t) link(e, t);
-      throw i.Re;
-    } else if (!t && i.he & STATUS_UNINITIALIZED) {
-      throw i.Re;
+      throw r.ae;
+    } else if (!t && r.Y & STATUS_UNINITIALIZED) {
+      throw r.ae;
     }
   }
-  if (e.L && e.he & STATUS_ERROR) {
-    if (e.Ie < clock) {
+  if (e.ce && e.Y & STATUS_ERROR) {
+    if (tracking && !pendingCheckActive && e.fe < clock) {
       recompute(e);
       return read(e);
-    } else throw e.Re;
+    } else throw e.ae;
   }
-  if (snapshotCaptureActive && t && t.Oe & CONFIG_IN_SNAPSHOT_SCOPE) {
-    const n = e.pe;
+  if (snapshotCaptureActive && t && t.le & CONFIG_IN_SNAPSHOT_SCOPE) {
+    const n = e.Ee;
     if (n !== undefined) {
       const i = n === NO_SNAPSHOT ? undefined : n;
-      const r = e.B !== NOT_PENDING ? e.B : e.ue;
-      if (r !== i) t.O |= REACTIVE_SNAPSHOT_STALE;
+      const r = e.D !== NOT_PENDING ? e.D : e.Z;
+      if (r !== i) t.W |= REACTIVE_SNAPSHOT_STALE;
       return i;
     }
   }
-  if (e.K !== undefined && e.K !== NOT_PENDING) {
-    if (t && stale && shouldReadStashedOptimisticValue(e)) return e.ue;
-    return e.K;
+  if (e.O !== undefined && e.O !== NOT_PENDING) {
+    if (t && stale && shouldReadStashedOptimisticValue(e)) return e.Z;
+    return e.O;
   }
   if (
     activeTransition !== null &&
     currentOptimisticLane !== null &&
     !latestReadActive &&
-    e.B !== NOT_PENDING &&
-    i === e &&
-    !e.L &&
+    e.D !== NOT_PENDING &&
+    (r === e || !!(r.W & REACTIVE_MANUAL_WRITE)) &&
+    !e.ce &&
     t
   ) {
-    activeTransition.se.add(t);
-    return e.ue;
+    activeTransition.K.add(t);
+    return e.Z;
   }
-  const r =
+  const o =
     !t ||
     (currentOptimisticLane !== null &&
-      (e.K !== undefined || e.G || (i === e && stale) || !!(i.he & STATUS_PENDING))) ||
-    e.B === NOT_PENDING ||
-    (stale && e.M && activeTransition !== e.M)
-      ? e.ue
-      : e.B;
+      (e.O !== undefined || e.i || (r === e && stale && t.t !== e) || !!(r.Y & STATUS_PENDING))) ||
+    e.D === NOT_PENDING ||
+    (stale && e.T && activeTransition !== e.T)
+      ? e.Z
+      : e.D;
+  if (pendingCheckActive && pendingProbe !== null && e.D !== NOT_PENDING && o === e.D)
+    pendingProbe.freshReads.add(e);
   if (
     !t &&
-    i === e &&
-    typeof n.L === "function" &&
-    e.Oe & CONFIG_AUTO_DISPOSE &&
-    !(i.he & STATUS_PENDING) &&
-    !e.I
+    r === e &&
+    typeof n.ce === "function" &&
+    e.le & CONFIG_AUTO_DISPOSE &&
+    !(r.Y & STATUS_PENDING) &&
+    !e.P
   ) {
     unobserved(e);
   }
-  return r;
+  return o;
 }
 function setSignal(e, t) {
-  if (e.M && activeTransition !== e.M) globalQueue.initTransition(e.M);
-  const n = e.K !== undefined && !projectionWriteActive;
-  const i = e.K !== undefined && e.K !== NOT_PENDING;
-  const r = n ? (i ? e.K : e.ue) : e.B === NOT_PENDING ? e.ue : e.B;
+  if (e.T && activeTransition !== e.T) globalQueue.initTransition(e.T);
+  const n = e.O !== undefined && !projectionWriteActive;
+  const i = e.O !== undefined && e.O !== NOT_PENDING;
+  const r = n ? (i ? e.O : e.Z) : e.D === NOT_PENDING ? e.Z : e.D;
   if (typeof t === "function") t = t(r);
-  const o = !e.ke || !e.ke(r, t) || !!(e.he & STATUS_UNINITIALIZED);
+  const o = !!(e.Y & STATUS_UNINITIALIZED) || !e.xe || !e.xe(r, t);
   if (!o) {
-    if (n && i && e.L) {
-      insertSubs(e, true);
-      schedule();
+    if (n && i) {
+      const t = resolveTransition(e);
+      if (t && activeTransition !== t) globalQueue.initTransition(t);
     }
     return t;
   }
   if (n) {
-    const n = e.K === NOT_PENDING;
+    const n = e.O === NOT_PENDING;
     if (!n) globalQueue.initTransition(resolveTransition(e));
-    if (n) {
-      e.B = e.ue;
-      globalQueue.Z.push(e);
-    }
-    e.$ = true;
+    if (n) globalQueue.N.push(e);
     const i = getOrCreateLane(e);
-    e.G = i;
-    e.K = t;
+    e.i = i;
+    e.O = t;
   } else {
-    if (e.B === NOT_PENDING) queuePendingNode(e);
-    e.B = t;
+    if (e.D === NOT_PENDING) queuePendingNode(e);
+    e.D = t;
   }
-  if (e.We) updatePendingSignal(e);
-  if (e.Fe) {
-    setSignal(e.Fe, t);
-  }
-  e.Ie = clock;
+  syncCompanions(e, t);
+  e.fe = clock;
   insertSubs(e, n);
   schedule();
   return t;
 }
 function suppressComputedRecompute(e) {
-  deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
-  if (!(e.O & REACTIVE_MANUAL_WRITE) && e.B === NOT_PENDING) queuePendingNode(e);
-  e.O = (e.O & -4) | REACTIVE_MANUAL_WRITE;
+  deleteFromHeap(e, e.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+  if (!(e.W & REACTIVE_MANUAL_WRITE) && e.D === NOT_PENDING) {
+    queuePendingNode(e);
+    schedule();
+  }
+  e.W = (e.W & -4) | REACTIVE_MANUAL_WRITE;
 }
 function setMemo(e, t) {
   const n = setSignal(e, t);
@@ -1899,78 +1964,96 @@ function runWithOwner(e, t) {
   }
 }
 function getPendingSignal(e) {
-  if (!e.We) {
-    e.We = optimisticSignal(false, { ownedWrite: true });
-    if (e.U) {
-      e.We.U = e;
-    }
-    if (computePendingState(e)) setSignal(e.We, true);
+  if (!e.B) {
+    e.B = optimisticSignal(false, { ownedWrite: true });
+    e.B.t = e;
+    if (computePendingState(e)) setSignal(e.B, true);
   }
-  return e.We;
+  return e.B;
 }
 function collectPendingSources(e) {
-  pendingCheckSources?.add(e);
-  const t = e.V || e;
-  if (t !== e) pendingCheckSources?.add(t);
+  if (!pendingProbe) return;
+  pendingProbe.sources.add(e);
+  const t = e.Ie || e;
+  if (t !== e) pendingProbe.sources.add(t);
 }
 function computePendingState(e) {
   const t = e;
-  const n = e.V;
-  if (e.U) {
-    const n = e.U;
-    if (n.he & STATUS_PENDING && !(n.he & STATUS_UNINITIALIZED)) return true;
-    return e.B !== NOT_PENDING && !(t.he & STATUS_UNINITIALIZED);
+  if (t.W & REACTIVE_DISPOSED) return false;
+  const n = e.Ie;
+  if ((n || t).qe) return false;
+  if (e.t) {
+    const t = e.t;
+    if (hasActiveOverride(t)) return false;
+    const n = t.Ie || t;
+    if (n.qe) return false;
+    return !!(n.Y & STATUS_PENDING && !(n.Y & STATUS_UNINITIALIZED));
+  }
+  if (hasActiveOverride(e)) return false;
+  if (n && e.D !== NOT_PENDING) {
+    return !!(n.W & REACTIVE_MANUAL_WRITE) || (!n.be && !(n.Y & STATUS_PENDING));
+  }
+  if (e.D !== NOT_PENDING && !(t.Y & STATUS_UNINITIALIZED)) return true;
+  return !!(t.Y & STATUS_PENDING && !(t.Y & STATUS_UNINITIALIZED));
+}
+function syncCompanions(e, t) {
+  if (e.B) updatePendingSignal(e);
+  if (e.q) setSignal(e.q, t);
+}
+function updatePendingSignal(e) {
+  if (e.B) {
+    setSignal(e.B, computePendingState(e));
   }
-  if (n && e.B !== NOT_PENDING) {
-    return !n.ve && !(n.he & STATUS_PENDING);
+  if (e.q) updatePendingSignal(e.q);
+}
+function updateChildCompanions(e) {
+  for (let t = e.ye; t !== null; t = t.Pe) {
+    if (t.B || t.q) updatePendingSignal(t);
   }
-  if (e.K !== undefined && e.K !== NOT_PENDING) {
-    if (t.he & STATUS_PENDING && !(t.he & STATUS_UNINITIALIZED)) return true;
-    if (e.U) {
-      const t = e.G ? findLane(e.G) : null;
-      return !!(t && t.F.size > 0);
+}
+function snapCompanionsToState(e) {
+  const t = e.B;
+  if (t && (t.O === undefined || t.O === NOT_PENDING)) {
+    const n = computePendingState(e);
+    if (t.Z !== n || t.D !== NOT_PENDING) {
+      t.Z = n;
+      t.D = NOT_PENDING;
+      t.fe = clock;
+      insertSubs(t);
+      schedule();
     }
-    return true;
   }
-  if (e.K !== undefined && e.K === NOT_PENDING && !e.U) {
-    return false;
-  }
-  if (e.B !== NOT_PENDING && !(t.he & STATUS_UNINITIALIZED)) return true;
-  return !!(t.he & STATUS_PENDING && !(t.he & STATUS_UNINITIALIZED));
-}
-function updatePendingSignal(e) {
-  if (e.We) {
-    const t = computePendingState(e);
-    const n = e.We;
-    setSignal(n, t);
-    if (!t && n.G) {
-      const t = resolveLane(e);
-      if (t && t.F.size > 0) {
-        const e = findLane(n.G);
-        if (e !== t) {
-          mergeLanes(t, e);
-        }
-      }
-      signalLanes.delete(n);
-      n.G = undefined;
+  const n = e.q;
+  if (n && !(n.W & REACTIVE_DISPOSED)) {
+    if (
+      (n.O === undefined || n.O === NOT_PENDING) &&
+      n.D === NOT_PENDING &&
+      !Object.is(n.Z, e.Z) &&
+      !(n.W & (REACTIVE_DIRTY | REACTIVE_CHECK))
+    ) {
+      n.W |= REACTIVE_DIRTY;
+      insertIntoHeap(n, n.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+      insertSubs(n);
+      schedule();
     }
+    snapCompanionsToState(n);
   }
 }
 function getLatestValueComputed(e) {
-  if (!e.Fe) {
+  if (!e.q) {
     const t = latestReadActive;
     latestReadActive = false;
     const n = pendingCheckActive;
     pendingCheckActive = false;
     const i = context;
     context = null;
-    e.Fe = optimisticComputed(() => read(e));
-    e.Fe.U = e;
+    e.q = optimisticComputed(() => read(e));
+    e.q.t = e;
     context = i;
     pendingCheckActive = n;
     latestReadActive = t;
   }
-  return e.Fe;
+  return e.q;
 }
 function staleValues(e, t = true) {
   const n = stale;
@@ -1992,16 +2075,14 @@ function latest(e) {
 }
 function isPending(e) {
   const t = pendingCheckActive;
-  const n = foundPending;
-  const i = pendingCheckSources;
+  const n = pendingProbe;
   pendingCheckActive = true;
-  foundPending = false;
-  pendingCheckSources = new Set();
+  const i = (pendingProbe = { found: false, sources: new Set(), freshReads: new Set() });
   const collectPending = () => {
     pendingCheckActive = false;
     try {
-      pendingCheckSources.forEach(e => {
-        if (read(getPendingSignal(e))) foundPending = true;
+      i.sources.forEach(e => {
+        if (read(getPendingSignal(e)) && !i.freshReads.has(e)) i.found = true;
       });
     } finally {
       pendingCheckActive = true;
@@ -2010,38 +2091,29 @@ function isPending(e) {
   try {
     e();
     collectPending();
-    return foundPending;
+    return i.found;
   } catch (e) {
     collectPending();
     if (e instanceof NotReadyError) {
-      if (foundPending && !(e.source?.he & STATUS_UNINITIALIZED)) return true;
+      if (i.found && !(e.source?.Y & STATUS_UNINITIALIZED)) return true;
       if (context) throw e;
     }
-    return foundPending;
+    return i.found;
   } finally {
     pendingCheckActive = t;
-    foundPending = n;
-    pendingCheckSources = i;
+    pendingProbe = n;
   }
 }
 function refresh(e) {
-  let t = refreshing;
-  refreshing = true;
-  try {
-    const t = e?.[$REFRESH];
-    if (false && !t);
-    if (t && typeof t.L === "function" && !(t.O & REACTIVE_DISPOSED)) {
-      recompute(t);
-    }
-  } finally {
-    refreshing = t;
-    if (!t) {
-      schedule();
-    }
+  const t = e?.[$REFRESH];
+  if (!t) {
+    return;
+  }
+  if (typeof t.ce === "function" && !(t.W & (REACTIVE_DISPOSED | REACTIVE_MANUAL_WRITE))) {
+    t.W = (t.W & ~REACTIVE_CHECK) | REACTIVE_DIRTY;
+    insertIntoHeap(t, t.W & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
+    schedule();
   }
-}
-function isRefreshing() {
-  return refreshing;
 }
 function createContext(e, t) {
   return { id: Symbol(t), defaultValue: e };
@@ -2073,88 +2145,106 @@ function effect(e, t, n, i) {
   const o = createEffectNode(e, t, n, r ? EFFECT_USER : EFFECT_RENDER, notifyEffectStatus, i);
   recompute(o, true);
   !i?.defer &&
-    (o.J === EFFECT_USER || i?.schedule
-      ? o.te.enqueue(o.J, runEffect.bind(null, o))
-      : runEffect(o));
+    (o.V === EFFECT_USER || i?.schedule ? o.F.enqueue(o.V, runEffect.bind(null, o)) : runEffect(o));
 }
 function notifyEffectStatus(e, t) {
-  const n = e !== undefined ? e : this.he;
-  const i = t !== undefined ? t : this.Re;
+  const n = e !== undefined ? e : this.Y;
+  const i = t !== undefined ? t : this.ae;
   if (n & STATUS_ERROR) {
-    let e = i;
-    this.te.notify(this, STATUS_PENDING, 0);
-    if (this.J === EFFECT_USER) {
-      try {
-        return this.je
-          ? this.je(e, () => {
-              this.$e?.();
-              this.$e = undefined;
-            })
-          : console.error(e);
-      } catch (t) {
-        e = t;
+    this.F.notify(this, STATUS_PENDING, 0);
+    if (this.V === EFFECT_USER) {
+      if (this.Y & STATUS_ERROR) {
+        this.G = true;
+        this.F.enqueue(this.V, (this.$e ??= runEffect.bind(null, this)));
       }
+      return;
+    }
+    if (!this.F.notify(this, STATUS_ERROR, STATUS_ERROR)) {
+      haltReactivity();
+      throw i;
     }
-    if (!this.te.notify(this, STATUS_ERROR, STATUS_ERROR)) throw e;
-  } else if (this.J === EFFECT_RENDER) {
-    this.te.notify(this, STATUS_PENDING | STATUS_ERROR, n, i);
+  } else if (this.V === EFFECT_RENDER) {
+    this.F.notify(this, STATUS_PENDING | STATUS_ERROR, n, i);
   }
 }
 function runEffect(e) {
-  if (!e.ee || e.O & REACTIVE_DISPOSED) return;
-  e.$e?.();
-  e.$e = undefined;
-  try {
-    const t = e.Qe(e.ue, e.Me);
-    if (false && t !== undefined && typeof t !== "function");
-    e.$e = t;
-    if (e.$e && !e.Ke) {
-      e.Ke = true;
-      runWithOwner(e.i, () => cleanup(() => e.$e?.()));
+  if (!e.G || e.W & REACTIVE_DISPOSED) return;
+  if (e.Y & STATUS_ERROR && e.V === EFFECT_USER) {
+    const t = e.ae instanceof StatusError ? (e.ae.cause ?? e.ae) : e.ae;
+    e.Ye = e.Z;
+    e.G = false;
+    try {
+      e.Be
+        ? e.Be(t, () => {
+            const t = e.Le;
+            e.Le = undefined;
+            t?.();
+          })
+        : console.error(t);
+    } catch (t) {
+      if (!e.F.notify(e, STATUS_ERROR, STATUS_ERROR)) {
+        haltReactivity();
+        throw t;
+      }
     }
+    return;
+  }
+  const t = e.Le;
+  e.Le = undefined;
+  try {
+    t?.();
+    const n = e.Ze(e.Z, e.Ye);
+    if (false && n !== undefined && typeof n !== "function");
+    e.Le = n;
   } catch (t) {
-    e.Re = new StatusError(e, t);
-    e.he |= STATUS_ERROR;
-    if (!e.te.notify(e, STATUS_ERROR, STATUS_ERROR)) throw t;
+    e.ae = new StatusError(e, t);
+    e.Y |= STATUS_ERROR;
+    if (!e.F.notify(e, STATUS_ERROR, STATUS_ERROR)) {
+      haltReactivity();
+      throw t;
+    }
   } finally {
-    e.Me = e.ue;
-    e.ee = false;
+    e.Ye = e.Z;
+    e.G = false;
   }
 }
-GlobalQueue.Te = runEffect;
+GlobalQueue.oe = runEffect;
 function trackedEffect(e, t) {
   const run = () => {
-    if (!n.ee || n.O & REACTIVE_DISPOSED) return;
+    if (!n.G || n.W & REACTIVE_DISPOSED) return;
     try {
-      n.ee = false;
+      n.G = false;
       recompute(n);
     } finally {
     }
   };
   const n = computed(
     () => {
-      n.$e?.();
-      n.$e = undefined;
-      const t = staleValues(e);
-      n.$e = t;
+      const t = n.Le;
+      n.Le = undefined;
+      t?.();
+      const i = staleValues(e);
+      n.Le = i;
     },
     { ...t, lazy: true }
   );
-  n.$e = undefined;
-  n.Oe = (n.Oe & ~CONFIG_AUTO_DISPOSE) | CONFIG_CHILDREN_FORBIDDEN;
-  n.ee = true;
-  n.J = EFFECT_TRACKED;
-  n.xe = (e, t) => {
-    const i = e !== undefined ? e : n.he;
+  n.Le = undefined;
+  n.le = (n.le & ~CONFIG_AUTO_DISPOSE) | CONFIG_CHILDREN_FORBIDDEN;
+  n.G = true;
+  n.V = EFFECT_TRACKED;
+  n.Qe = (e, t) => {
+    const i = e !== undefined ? e : n.Y;
     if (i & STATUS_ERROR) {
-      n.te.notify(n, STATUS_PENDING, 0);
-      const e = t !== undefined ? t : n.Re;
-      if (!n.te.notify(n, STATUS_ERROR, STATUS_ERROR)) throw e;
+      n.F.notify(n, STATUS_PENDING, 0);
+      const e = t !== undefined ? t : n.ae;
+      if (!n.F.notify(n, STATUS_ERROR, STATUS_ERROR)) {
+        haltReactivity();
+        throw e;
+      }
     }
   };
-  n.ne = run;
-  n.te.enqueue(EFFECT_USER, run);
-  cleanup(() => n.$e?.());
+  n.k = run;
+  n.F.enqueue(EFFECT_USER, run);
 }
 function restoreTransition(e, t) {
   globalQueue.initTransition(e);
@@ -2168,11 +2258,11 @@ function action(e) {
       const r = e(...t);
       globalQueue.initTransition();
       let o = activeTransition;
-      o.re.push(r);
+      o.j.push(r);
       const done = (e, t) => {
         o = currentTransition(o);
-        const s = o.re.indexOf(r);
-        if (s >= 0) o.re.splice(s, 1);
+        const s = o.j.indexOf(r);
+        if (s >= 0) o.j.splice(s, 1);
         setActiveTransition(o);
         schedule();
         t ? i(t) : n(e);
@@ -2184,13 +2274,12 @@ function action(e) {
         } catch (e) {
           return done(undefined, e);
         }
-        if (n instanceof Promise)
-          return void n.then(run, e => restoreTransition(o, () => step(e, true)));
+        if (isThenable(n)) return void n.then(run, e => done(undefined, e));
         run(n);
       };
       const run = e => {
         if (e.done) return done(e.value);
-        if (e.value instanceof Promise)
+        if (isThenable(e.value))
           return void e.value.then(
             e => restoreTransition(o, () => step(e)),
             e => restoreTransition(o, () => step(e, true))
@@ -2211,7 +2300,7 @@ function accessor(e) {
 function createSignal(e, t) {
   if (typeof e === "function") {
     const n = computed(e, t);
-    n.Oe &= ~CONFIG_AUTO_DISPOSE;
+    n.le &= ~CONFIG_AUTO_DISPOSE;
     return [accessor(n), setMemo.bind(null, n)];
   }
   const n = signal(e, t);
@@ -2253,22 +2342,25 @@ function createReaction(e, t) {
 function resolve(e) {
   return new Promise((t, n) => {
     createRoot(i => {
-      computed(() => {
-        try {
-          t(e());
-        } catch (e) {
-          if (e instanceof NotReadyError) throw e;
+      effect(
+        e,
+        e => {
+          t(e);
+          i();
+        },
+        e => {
           n(e);
-        }
-        i();
-      });
+          i();
+        },
+        { user: true }
+      );
     });
   });
 }
 function createOptimistic(e, t) {
   if (typeof e === "function") {
     const n = optimisticComputed(e, t);
-    n.Oe &= ~CONFIG_AUTO_DISPOSE;
+    n.le &= ~CONFIG_AUTO_DISPOSE;
     return [accessor(n), setSignal.bind(null, n)];
   }
   const n = optimisticSignal(e, t);
@@ -2276,26 +2368,103 @@ function createOptimistic(e, t) {
 }
 function onSettled(e) {
   const t = getOwner();
-  t && !(t.Oe & CONFIG_CHILDREN_FORBIDDEN)
+  t && !(t.le & CONFIG_CHILDREN_FORBIDDEN)
     ? createTrackedEffect(() => untrack(e), undefined)
     : globalQueue.enqueue(EFFECT_USER, () => {
-        const t = e();
-        t?.();
+        e();
       });
 }
+function nodeKeys(e) {
+  const t = Object.keys(e);
+  if (symbolKeyedRecords.has(e)) {
+    const n = Object.getOwnPropertySymbols(e);
+    for (let e = 0, i = n.length; e < i; e++) {
+      if (n[e] !== $TRACK) t.push(n[e]);
+    }
+  }
+  return t;
+}
 function unwrap(e) {
-  return e?.[$TARGET]?.[STORE_NODE] ?? e;
+  if (e === null || typeof e !== "object") return e;
+  return e[$TARGET]?.[STORE_VALUE] ?? e;
 }
 function getOverrideValue(e, t, n, i) {
   if (i && n in i) return i[n];
   return t && n in t ? t[n] : e[n];
 }
+function addEnumSymbols(e, t, n) {
+  for (let i = 0, r = t.length; i < r; i++) {
+    if (Object.prototype.propertyIsEnumerable.call(e, t[i])) n.add(t[i]);
+  }
+}
 function getAllKeys(e, t, n) {
   const i = getKeys(e, t);
   const r = Object.keys(n);
-  return Array.from(new Set([...i, ...r]));
+  const o = e[$TARGET]
+    ? untrack(() => Object.getOwnPropertySymbols(e))
+    : Object.getOwnPropertySymbols(e);
+  const s = Object.getOwnPropertySymbols(n);
+  if (o.length === 0 && s.length === 0) {
+    if (i.length === r.length) {
+      let e = true;
+      for (let t = 0; t < i.length; t++) {
+        if (i[t] !== r[t]) {
+          e = false;
+          break;
+        }
+      }
+      if (e) return i;
+    }
+    const e = new Set(i);
+    for (let t = 0; t < r.length; t++) e.add(r[t]);
+    return Array.from(e);
+  }
+  const u = new Set(i);
+  addEnumSymbols(e, o, u);
+  if (t) {
+    for (const e of Reflect.ownKeys(t)) {
+      t[e] === $DELETED ? u.delete(e) : u.add(e);
+    }
+  }
+  for (let e = 0; e < r.length; e++) u.add(r[e]);
+  addEnumSymbols(n, s, u);
+  return Array.from(u);
+}
+function wrapValue(e, t) {
+  return isWrappable(e) ? wrap(e, t) : e;
+}
+function itemKey(e, t) {
+  return isWrappable(e) ? t(e) : e;
+}
+function keyedMatch(e, t, n) {
+  return e === t || (isWrappable(e) && isWrappable(t) && n(e) === n(t));
+}
+function syncArrayNodeMembership(e, t) {
+  let n = e[STORE_NODE];
+  if (n) {
+    const e = nodeKeys(n);
+    for (let i = 0, r = e.length; i < r; i++) {
+      const r = e[i];
+      r in t || setSignal(n[r], undefined);
+    }
+  }
+  if ((n = e[STORE_HAS])) {
+    const e = nodeKeys(n);
+    for (let i = 0, r = e.length; i < r; i++) {
+      const r = e[i];
+      setSignal(n[r], r in t);
+    }
+  }
+}
+function applyArrayItem(e, t, n, i, r) {
+  if (isWrappable(e) && isWrappable(t)) {
+    const o = wrap(t, n);
+    i && setSignal(i, o);
+    applyState(e, o, r);
+  } else i && setSignal(i, wrapValue(e, n));
 }
 function applyState(e, t, n) {
+  e = unwrap(e);
   const i = t?.[$TARGET];
   if (!i) return;
   if (i[STORE_OVERRIDE] || i[STORE_OPTIMISTIC_OVERRIDE]) {
@@ -2307,106 +2476,109 @@ function applyState(e, t, n) {
 function applyStateFast(e, t, n) {
   const i = t[STORE_VALUE];
   if (e === i) return;
+  const r = t[STORE_NODE];
   (t[STORE_LOOKUP] || storeLookup).set(e, t[$PROXY]);
   t[STORE_VALUE] = e;
   if (Array.isArray(i)) {
-    let r = false;
-    const o = i.length;
-    if (e.length && o && e[0] && n(e[0]) != null) {
-      let s, u, c, l, a, f, E, S;
-      for (
-        c = 0, l = Math.min(o, e.length);
-        c < l && ((f = i[c]) === e[c] || (f && e[c] && n(f) === n(e[c])));
-        c++
-      ) {
-        applyState(e[c], wrap(f, t), n);
+    let o = false;
+    const s = i.length;
+    if (e.length && s && isWrappable(e[0]) && n(e[0]) != null) {
+      let u, c, l, a, f, E, d, S;
+      for (l = 0, a = Math.min(s, e.length); l < a && keyedMatch((E = i[l]), e[l], n); l++) {
+        isWrappable(E) && isWrappable(e[l]) && applyState(e[l], wrap(E, t), n);
       }
       const T = new Array(e.length),
-        d = new Map();
+        _ = new Map();
       for (
-        l = o - 1, a = e.length - 1;
-        l >= c && a >= c && ((f = i[l]) === e[a] || (f && e[a] && n(f) === n(e[a])));
-        l--, a--
+        a = s - 1, f = e.length - 1;
+        a >= l && f >= l && keyedMatch((E = i[a]), e[f], n);
+        a--, f--
       ) {
-        T[a] = f;
+        T[f] = E;
       }
-      if (c > a || c > l) {
-        for (u = c; u <= a; u++) {
-          r = true;
-          t[STORE_NODE][u] && setSignal(t[STORE_NODE][u], wrap(e[u], t));
+      if (l > f || l > a) {
+        for (c = l; c <= f; c++) {
+          o = true;
+          r?.[c] && setSignal(r[c], wrapValue(e[c], t));
         }
-        for (; u < e.length; u++) {
-          r = true;
-          const i = wrap(T[u], t);
-          t[STORE_NODE][u] && setSignal(t[STORE_NODE][u], i);
-          applyState(e[u], i, n);
+        for (; c < e.length; c++) {
+          o = true;
+          applyArrayItem(e[c], T[c], t, r?.[c], n);
         }
-        r && t[STORE_NODE][$TRACK] && setSignal(t[STORE_NODE][$TRACK], void 0);
-        o !== e.length && t[STORE_NODE].length && setSignal(t[STORE_NODE].length, e.length);
+        syncArrayNodeMembership(t, e);
+        (o || s !== e.length) && notifySelf(t);
+        s !== e.length && r?.length && setSignal(r.length, e.length);
         return;
       }
-      E = new Array(a + 1);
-      for (u = a; u >= c; u--) {
-        f = e[u];
-        S = f ? n(f) : f;
-        s = d.get(S);
-        E[u] = s === undefined ? -1 : s;
-        d.set(S, u);
-      }
-      for (s = c; s <= l; s++) {
-        f = i[s];
-        S = f ? n(f) : f;
-        u = d.get(S);
-        if (u !== undefined && u !== -1) {
-          T[u] = f;
-          u = E[u];
-          d.set(S, u);
+      d = new Array(f + 1);
+      for (c = f; c >= l; c--) {
+        E = e[c];
+        S = itemKey(E, n);
+        u = _.get(S);
+        d[c] = u === undefined ? -1 : u;
+        _.set(S, c);
+      }
+      for (u = l; u <= a; u++) {
+        E = i[u];
+        S = itemKey(E, n);
+        c = _.get(S);
+        if (c !== undefined && c !== -1) {
+          T[c] = E;
+          c = d[c];
+          _.set(S, c);
         }
       }
-      for (u = c; u < e.length; u++) {
-        if (u in T) {
-          const i = wrap(T[u], t);
-          t[STORE_NODE][u] && setSignal(t[STORE_NODE][u], i);
-          applyState(e[u], i, n);
-        } else t[STORE_NODE][u] && setSignal(t[STORE_NODE][u], wrap(e[u], t));
+      for (c = l; c < e.length; c++) {
+        if (c in T) {
+          applyArrayItem(e[c], T[c], t, r?.[c], n);
+        } else r?.[c] && setSignal(r[c], wrapValue(e[c], t));
       }
-      if (c < e.length) r = true;
+      if (l < e.length) o = true;
     } else if (e.length) {
-      for (let r = 0, o = e.length; r < o; r++) {
-        const o = i[r];
-        isWrappable(o)
-          ? applyState(e[r], wrap(o, t), n)
-          : t[STORE_NODE][r] && setSignal(t[STORE_NODE][r], e[r]);
+      for (let s = 0, u = e.length; s < u; s++) {
+        const u = i[s];
+        if (isWrappable(u) && isWrappable(e[s])) applyState(e[s], wrap(u, t), n);
+        else {
+          if (u !== e[s]) o = true;
+          r?.[s] && setSignal(r[s], wrapValue(e[s], t));
+        }
       }
     }
-    if (o !== e.length) {
-      r = true;
-      t[STORE_NODE].length && setSignal(t[STORE_NODE].length, e.length);
+    syncArrayNodeMembership(t, e);
+    if (s !== e.length) {
+      o = true;
+      r?.length && setSignal(r.length, e.length);
     }
-    r && t[STORE_NODE][$TRACK] && setSignal(t[STORE_NODE][$TRACK], void 0);
+    o && notifySelf(t);
     return;
   }
-  let r = t[STORE_NODE];
-  if (r) {
-    const o = r[$TRACK];
-    const s = o ? getAllKeys(i, undefined, e) : Object.keys(r);
+  let o = t[STORE_NODE];
+  if (o) {
+    const r = o[$TRACK];
+    const s = r ? getAllKeys(i, undefined, e) : nodeKeys(o);
     for (let u = 0, c = s.length; u < c; u++) {
       const c = s[u];
-      const l = r[c];
+      const l = o[c];
       const a = unwrap(i[c]);
       let f = unwrap(e[c]);
       if (a === f) continue;
-      if (!a || !isWrappable(a) || !isWrappable(f) || (n(a) != null && n(a) !== n(f))) {
-        o && setSignal(o, void 0);
+      if (
+        !a ||
+        !isWrappable(a) ||
+        !isWrappable(f) ||
+        Array.isArray(a) !== Array.isArray(f) ||
+        (n(a) != null && n(a) !== n(f))
+      ) {
+        r && setSignal(r, void 0);
         l && setSignal(l, isWrappable(f) ? wrap(f, t) : f);
       } else applyState(f, wrap(a, t), n);
     }
   }
-  if ((r = t[STORE_HAS])) {
-    const t = Object.keys(r);
+  if ((o = t[STORE_HAS])) {
+    const t = nodeKeys(o);
     for (let n = 0, i = t.length; n < i; n++) {
       const i = t[n];
-      setSignal(r[i], i in e);
+      setSignal(o[i], i in e);
     }
   }
 }
@@ -2419,101 +2591,107 @@ function applyStateSlow(e, t, n) {
   t[STORE_VALUE] = e;
   t[STORE_OVERRIDE] = undefined;
   if (Array.isArray(i)) {
-    let s = false;
-    const u = getOverrideValue(i, r, "length", o);
-    if (e.length && u && e[0] && n(e[0]) != null) {
-      let c, l, a, f, E, S, T, d;
+    let u = false;
+    const c = getOverrideValue(i, r, "length", o);
+    if (e.length && c && isWrappable(e[0]) && n(e[0]) != null) {
+      let l, a, f, E, d, S, T, _;
       for (
-        a = 0, f = Math.min(u, e.length);
-        a < f && ((S = getOverrideValue(i, r, a, o)) === e[a] || (S && e[a] && n(S) === n(e[a])));
-        a++
+        f = 0, E = Math.min(c, e.length);
+        f < E && keyedMatch((S = getOverrideValue(i, r, f, o)), e[f], n);
+        f++
       ) {
-        applyState(e[a], wrap(S, t), n);
+        isWrappable(S) && isWrappable(e[f]) && applyState(e[f], wrap(S, t), n);
       }
-      const _ = new Array(e.length),
-        O = new Map();
+      const O = new Array(e.length),
+        p = new Map();
       for (
-        f = u - 1, E = e.length - 1;
-        f >= a &&
-        E >= a &&
-        ((S = getOverrideValue(i, r, f, o)) === e[E] || (S && e[E] && n(S) === n(e[E])));
-        f--, E--
+        E = c - 1, d = e.length - 1;
+        E >= f && d >= f && keyedMatch((S = getOverrideValue(i, r, E, o)), e[d], n);
+        E--, d--
       ) {
-        _[E] = S;
+        O[d] = S;
       }
-      if (a > E || a > f) {
-        for (l = a; l <= E; l++) {
-          s = true;
-          t[STORE_NODE][l] && setSignal(t[STORE_NODE][l], wrap(e[l], t));
+      if (f > d || f > E) {
+        for (a = f; a <= d; a++) {
+          u = true;
+          s?.[a] && setSignal(s[a], wrapValue(e[a], t));
         }
-        for (; l < e.length; l++) {
-          s = true;
-          const i = wrap(_[l], t);
-          t[STORE_NODE][l] && setSignal(t[STORE_NODE][l], i);
-          applyState(e[l], i, n);
+        for (; a < e.length; a++) {
+          u = true;
+          applyArrayItem(e[a], O[a], t, s?.[a], n);
         }
-        s && t[STORE_NODE][$TRACK] && setSignal(t[STORE_NODE][$TRACK], void 0);
-        u !== e.length && t[STORE_NODE].length && setSignal(t[STORE_NODE].length, e.length);
+        const i = e.length;
+        syncArrayNodeMembership(t, e);
+        (u || c !== i) && notifySelf(t);
+        c !== i && s?.length && setSignal(s.length, i);
         return;
       }
-      T = new Array(E + 1);
-      for (l = E; l >= a; l--) {
-        S = e[l];
-        d = S ? n(S) : S;
-        c = O.get(d);
-        T[l] = c === undefined ? -1 : c;
-        O.set(d, l);
-      }
-      for (c = a; c <= f; c++) {
-        S = getOverrideValue(i, r, c, o);
-        d = S ? n(S) : S;
-        l = O.get(d);
-        if (l !== undefined && l !== -1) {
-          _[l] = S;
-          l = T[l];
-          O.set(d, l);
+      T = new Array(d + 1);
+      for (a = d; a >= f; a--) {
+        S = e[a];
+        _ = itemKey(S, n);
+        l = p.get(_);
+        T[a] = l === undefined ? -1 : l;
+        p.set(_, a);
+      }
+      for (l = f; l <= E; l++) {
+        S = getOverrideValue(i, r, l, o);
+        _ = itemKey(S, n);
+        a = p.get(_);
+        if (a !== undefined && a !== -1) {
+          O[a] = S;
+          a = T[a];
+          p.set(_, a);
         }
       }
-      for (l = a; l < e.length; l++) {
-        if (l in _) {
-          const i = wrap(_[l], t);
-          t[STORE_NODE][l] && setSignal(t[STORE_NODE][l], i);
-          applyState(e[l], i, n);
-        } else t[STORE_NODE][l] && setSignal(t[STORE_NODE][l], wrap(e[l], t));
+      for (a = f; a < e.length; a++) {
+        if (a in O) {
+          applyArrayItem(e[a], O[a], t, s?.[a], n);
+        } else s?.[a] && setSignal(s[a], wrapValue(e[a], t));
       }
-      if (a < e.length) s = true;
+      if (f < e.length) u = true;
     } else if (e.length) {
-      for (let s = 0, u = e.length; s < u; s++) {
-        const u = getOverrideValue(i, r, s, o);
-        isWrappable(u)
-          ? applyState(e[s], wrap(u, t), n)
-          : t[STORE_NODE][s] && setSignal(t[STORE_NODE][s], e[s]);
+      for (let c = 0, l = e.length; c < l; c++) {
+        const l = getOverrideValue(i, r, c, o);
+        if (isWrappable(l) && isWrappable(e[c])) applyState(e[c], wrap(l, t), n);
+        else {
+          if (l !== e[c]) u = true;
+          s?.[c] && setSignal(s[c], wrapValue(e[c], t));
+        }
       }
     }
-    if (u !== e.length) {
-      s = true;
-      t[STORE_NODE].length && setSignal(t[STORE_NODE].length, e.length);
+    const l = e.length;
+    syncArrayNodeMembership(t, e);
+    if (c !== l) {
+      u = true;
+      s?.length && setSignal(s.length, l);
     }
-    s && t[STORE_NODE][$TRACK] && setSignal(t[STORE_NODE][$TRACK], void 0);
+    u && notifySelf(t);
     return;
   }
   if (s) {
     const u = s[$TRACK];
-    const c = u ? getAllKeys(i, r, e) : Object.keys(s);
+    const c = u ? getAllKeys(i, r, e) : nodeKeys(s);
     for (let l = 0, a = c.length; l < a; l++) {
       const a = c[l];
       const f = s[a];
       const E = unwrap(getOverrideValue(i, r, a, o));
-      let S = unwrap(e[a]);
-      if (E === S) continue;
-      if (!E || !isWrappable(E) || !isWrappable(S) || (n(E) != null && n(E) !== n(S))) {
+      let d = unwrap(e[a]);
+      if (E === d) continue;
+      if (
+        !E ||
+        !isWrappable(E) ||
+        !isWrappable(d) ||
+        Array.isArray(E) !== Array.isArray(d) ||
+        (n(E) != null && n(E) !== n(d))
+      ) {
         u && setSignal(u, void 0);
-        f && setSignal(f, isWrappable(S) ? wrap(S, t) : S);
-      } else applyState(S, wrap(E, t), n);
+        f && setSignal(f, isWrappable(d) ? wrap(d, t) : d);
+      } else applyState(d, wrap(E, t), n);
     }
   }
   if ((s = t[STORE_HAS])) {
-    const t = Object.keys(s);
+    const t = nodeKeys(s);
     for (let n = 0, i = t.length; n < i; n++) {
       const i = t[n];
       setSignal(s[i], i in e);
@@ -2525,7 +2703,7 @@ function reconcile(e, t) {
     if (n == null) throw new Error("Cannot reconcile null or undefined state");
     const i = typeof t === "string" ? e => e[t] : t;
     const r = i(n);
-    if (r !== undefined && i(e) !== i(n))
+    if (r !== undefined && i(e) !== r)
       throw new Error("Cannot reconcile states with different identity");
     applyState(e, n, i);
   };
@@ -2555,45 +2733,46 @@ function createProjectionInternal(e, t, n) {
     if (!i) i = getOwner();
     runProjectionComputed(o, e, n?.key || "id");
   }, undefined);
-  i.Oe &= ~CONFIG_AUTO_DISPOSE;
+  i.le &= ~CONFIG_AUTO_DISPOSE;
   return { store: o, node: i };
 }
 function createProjection(e, t, n) {
   return createProjectionInternal(e, t, n).store;
 }
-function runProjectionComputed(e, t, n, i) {
-  const r = getOwner();
-  let o = false;
-  let s;
-  const u = new Proxy(
+function runProjectionComputed(e, t, n, i, r) {
+  const o = getOwner();
+  let s = false;
+  let u;
+  const c = new Proxy(
     e,
-    createWriteTraps(() => !o || r.ve === s)
+    createWriteTraps(() => !s || o.be === u, r)
   );
-  storeSetter(u, u => {
-    s = t(u);
-    o = true;
+  storeSetter(c, r => {
+    u = t(r);
+    s = true;
     const commit = t => {
-      if (t === u || t === undefined) return;
+      if (t === r || t === undefined) return;
       const write = () => storeSetter(e, reconcile(t, n));
       i ? i(write) : write();
     };
-    commit(handleAsync(r, s, commit));
+    commit(handleAsync(o, u, commit));
   });
-  return r;
+  return o;
 }
-function createWriteTraps(e) {
-  const t = {
-    get(e, n) {
+function createWriteTraps(e, t) {
+  const n = {
+    get(e, t) {
       let i;
       setWriteOverride(true);
       setProjectionWriteActive(true);
       try {
-        i = e[n];
+        i = e[t];
       } finally {
         setWriteOverride(false);
         setProjectionWriteActive(false);
       }
-      return typeof i === "object" && i !== null ? new Proxy(i, t) : i;
+      if (t === $TARGET) return i;
+      return typeof i === "object" && i !== null ? new Proxy(i, n) : i;
     },
     has(e, t) {
       let n;
@@ -2607,24 +2786,26 @@ function createWriteTraps(e) {
       }
       return n;
     },
-    set(t, n, i) {
+    set(n, i, r) {
       if (e && !e()) return true;
       setWriteOverride(true);
       setProjectionWriteActive(true);
       try {
-        t[n] = i;
+        n[i] = r;
+        t?.();
       } finally {
         setWriteOverride(false);
         setProjectionWriteActive(false);
       }
       return true;
     },
-    deleteProperty(t, n) {
+    deleteProperty(n, i) {
       if (e && !e()) return true;
       setWriteOverride(true);
       setProjectionWriteActive(true);
       try {
-        delete t[n];
+        delete n[i];
+        t?.();
       } finally {
         setWriteOverride(false);
         setProjectionWriteActive(false);
@@ -2632,7 +2813,7 @@ function createWriteTraps(e) {
       return true;
     }
   };
-  return t;
+  return n;
 }
 const $TRACK = Symbol(0),
   $TARGET = Symbol(0),
@@ -2647,7 +2828,9 @@ const STORE_VALUE = "v",
   STORE_WRAP = "w",
   STORE_LOOKUP = "l",
   STORE_FIREWALL = "f",
-  STORE_OPTIMISTIC = "p";
+  STORE_OPTIMISTIC = "p",
+  STORE_MASKED = "m";
+const STORE_SELF_PENDING = Symbol(0);
 function createStoreProxy(e, t = storeTraps, n) {
   let i;
   if (Array.isArray(e)) {
@@ -2665,6 +2848,7 @@ function createStoreProxy(e, t = storeTraps, n) {
   return (i[$PROXY] = new Proxy(i, t));
 }
 const storeLookup = new WeakMap();
+const symbolKeyedRecords = new WeakSet();
 function wrap(e, t) {
   if (t?.[STORE_WRAP]) return t[STORE_WRAP](e, t);
   let n = e[$PROXY] || storeLookup.get(e);
@@ -2682,17 +2866,45 @@ function setWriteOverride(e) {
 function writeOnly(e) {
   return writeOverride || !!Writing?.has(e);
 }
-function unwrapStoreValue(e) {
-  return e?.[$TARGET]?.[STORE_VALUE] ?? e;
+function unwrapStoreValue(e, t, n) {
+  const i = e?.[$TARGET] || n?.get(e)?.[$TARGET];
+  if (!i) return e;
+  const r = i[STORE_OVERRIDE];
+  if (!r) return i[STORE_VALUE];
+  if (!t) t = new Map();
+  if (t.has(e)) return t.get(e);
+  const o = i[STORE_VALUE];
+  const s = Array.isArray(o);
+  const u = s ? [] : Object.create(Object.getPrototypeOf(o));
+  t.set(e, u);
+  n = i[STORE_LOOKUP] ?? storeLookup;
+  for (const e of getKeys(o, r)) {
+    if (s && e === "length") continue;
+    const i = e in r ? r[e] : o[e];
+    if (i !== $DELETED) u[e] = unwrapStoreValue(i, t, n);
+  }
+  if (s) u.length = r.length ?? o.length;
+  return u;
 }
 function isPrototypePollutionKey$1(e) {
   return e === "__proto__" || e === "constructor" || e === "prototype";
 }
-function hasOwnStoreProperty(e, t) {
+function ownEnumerableKeys(e) {
+  return Reflect.ownKeys(e).filter(t => Object.prototype.propertyIsEnumerable.call(e, t));
+}
+function getOverlayLayer(e, t) {
   const n = e[STORE_OPTIMISTIC_OVERRIDE];
-  if (n && Object.prototype.hasOwnProperty.call(n, t) && n[t] !== $DELETED) return true;
+  if (n && t in n) return n;
   const i = e[STORE_OVERRIDE];
-  if (i && Object.prototype.hasOwnProperty.call(i, t) && i[t] !== $DELETED) return true;
+  if (i && t in i) return i;
+  return undefined;
+}
+function visibleNodeValue(e) {
+  return e.O !== undefined && e.O !== NOT_PENDING ? e.O : e.D !== NOT_PENDING ? e.D : e.Z;
+}
+function hasOwnStoreProperty(e, t) {
+  const n = getOverlayLayer(e, t);
+  if (n) return n[t] !== $DELETED;
   return Object.prototype.hasOwnProperty.call(unwrapStoreValue(e[STORE_VALUE]), t);
 }
 function hasInheritedAccessor(e, t) {
@@ -2716,19 +2928,33 @@ function getNode(e, t, n, i, r = isEqual, o, s) {
     {
       equals: r,
       unobserved() {
-        if (e[t] === u) delete e[t];
+        if (e[t] === u) {
+          delete e[t];
+          if (typeof t === "symbol" && t !== $TRACK && symbolKeyedRecords.has(e)) {
+            const t = Object.getOwnPropertySymbols(e);
+            let n = false;
+            for (let e = 0, i = t.length; e < i; e++) {
+              if (t[e] !== $TRACK) {
+                n = true;
+                break;
+              }
+            }
+            if (!n) symbolKeyedRecords.delete(e);
+          }
+        }
       }
     },
     i
   );
   if (o) {
-    u.K = NOT_PENDING;
+    u.O = NOT_PENDING;
   }
   if (s && t in s) {
     const e = s[t];
-    u.pe = e === undefined ? NO_SNAPSHOT : e;
+    u.Ee = e === undefined ? NO_SNAPSHOT : e;
     snapshotSources?.add(u);
   }
+  if (typeof t === "symbol" && t !== $TRACK) symbolKeyedRecords.add(e);
   return (e[t] = u);
 }
 function trackSelf(e, t = $TRACK) {
@@ -2737,8 +2963,16 @@ function trackSelf(e, t = $TRACK) {
       getNode(getNodes(e, STORE_NODE), t, undefined, e[STORE_FIREWALL], false, e[STORE_OPTIMISTIC])
     );
 }
+function notifySelf(e) {
+  const t = e[STORE_NODE]?.[$TRACK];
+  t && setSignal(t, e[STORE_OPTIMISTIC] && !projectionWriteActive ? STORE_SELF_PENDING : undefined);
+}
 function getKeys(e, t, n = true) {
-  const i = untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)));
+  const i = e[$TARGET]
+    ? untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)))
+    : n
+      ? Object.keys(e)
+      : Reflect.ownKeys(e);
   if (!t) return i;
   const r = new Set(i);
   const o = Reflect.ownKeys(t);
@@ -2752,15 +2986,31 @@ function getPropertyDescriptor(e, t, n) {
   if (t && n in t) {
     if (t[n] === $DELETED) return void 0;
     const i = Reflect.getOwnPropertyDescriptor(t, n);
-    if (i?.get || i?.set || !(n in e)) return i;
+    if (i?.get || i?.set) return i;
+    const r = Reflect.getOwnPropertyDescriptor(e, n);
+    if (!r) return i;
+    if (r.get || r.set) return r;
+    r.value = t[n];
+    return r;
   }
   return Reflect.getOwnPropertyDescriptor(e, n);
 }
+function maskStoreTarget(e, t) {
+  const n = e[STORE_FIREWALL];
+  if (!n) return;
+  if (!!e[STORE_MASKED] === t) return;
+  e[STORE_MASKED] = t;
+  const i = (n.qe = (n.qe || 0) + (t ? 1 : -1));
+  if ((t && i === 1) || (!t && i === 0)) {
+    updatePendingSignal(n);
+    updateChildCompanions(n);
+  }
+}
 function prepareStoreWrite(e, t, n) {
   if (e[STORE_OPTIMISTIC]) {
     const t = e[STORE_FIREWALL];
-    if (t?.M) {
-      globalQueue.initTransition(t.M);
+    if (t?.T) {
+      globalQueue.initTransition(t.T);
     }
   }
   const i = e[STORE_VALUE];
@@ -2768,7 +3018,7 @@ function prepareStoreWrite(e, t, n) {
   if (
     snapshotCaptureActive &&
     typeof n !== "symbol" &&
-    !((e[STORE_FIREWALL]?.he ?? 0) & STATUS_PENDING)
+    !((e[STORE_FIREWALL]?.Y ?? 0) & STATUS_PENDING)
   ) {
     if (!e[STORE_SNAPSHOT_PROPS]) {
       e[STORE_SNAPSHOT_PROPS] = Object.create(null);
@@ -2780,9 +3030,14 @@ function prepareStoreWrite(e, t, n) {
   }
   const o = e[STORE_OPTIMISTIC] && !projectionWriteActive;
   const s = o ? STORE_OPTIMISTIC_OVERRIDE : STORE_OVERRIDE;
-  if (o) trackOptimisticStore(t);
   return { base: r, overrideKey: s, state: i };
 }
+function armOptimisticStoreWrite(e, t) {
+  if (e[STORE_OPTIMISTIC] && !projectionWriteActive) {
+    trackOptimisticStore(t);
+    maskStoreTarget(e, true);
+  }
+}
 function upsertStoreNode(e, t, n, i, r) {
   if (t[n]) return t[n];
   const o = isWrappable(i) ? wrap(i, e) : i;
@@ -2821,7 +3076,7 @@ function notifyStoreProperty(e, t, n, i, r, o) {
       setSignal(n, undefined);
     }
   }
-  l[$TRACK] && setSignal(l[$TRACK], undefined);
+  notifySelf(e);
 }
 let Writing = null;
 const storeTraps = {
@@ -2833,73 +3088,64 @@ const storeTraps = {
       trackSelf(e);
       return n;
     }
-    const i = getNodes(e, STORE_NODE);
-    const r = i[t];
-    const o = e[STORE_VALUE];
+    const i = getObserver() === e[STORE_FIREWALL];
+    const r = getNodes(e, STORE_NODE);
+    const o = i ? undefined : r[t];
+    const s = e[STORE_VALUE];
     if (
-      !r &&
+      !o &&
       !e[STORE_OVERRIDE] &&
       !e[STORE_OPTIMISTIC_OVERRIDE] &&
       !e[STORE_CUSTOM_PROTO] &&
       !e[STORE_OPTIMISTIC] &&
       !e[STORE_SNAPSHOT_PROPS] &&
-      !o[$TARGET] &&
-      !(t in o) &&
+      !s[$TARGET] &&
+      !(t in s) &&
       getObserver() &&
+      !i &&
       !writeOnly(n)
     ) {
-      return read(getNode(i, t, undefined, e[STORE_FIREWALL]));
-    }
-    const s = e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE];
-    const u = s || (e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]);
-    const c = !!e[STORE_VALUE][$TARGET];
-    const l = s
-      ? e[STORE_OPTIMISTIC_OVERRIDE]
-      : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
-        ? e[STORE_OVERRIDE]
-        : e[STORE_VALUE];
-    if (!r) {
-      const i = Object.getOwnPropertyDescriptor(l, t);
+      return read(getNode(r, t, undefined, e[STORE_FIREWALL]));
+    }
+    const u = getOverlayLayer(e, t);
+    const c = !!u;
+    const l = !!e[STORE_VALUE][$TARGET];
+    const a = u ?? e[STORE_VALUE];
+    if (!o) {
+      const i = Object.getOwnPropertyDescriptor(a, t);
       if (i && i.get) return i.get.call(n);
-      if (!i && !u && e[STORE_CUSTOM_PROTO]) {
-        const e = unwrapStoreValue(l);
+      if (!i && !c && e[STORE_CUSTOM_PROTO]) {
+        const e = unwrapStoreValue(a);
         if (hasInheritedAccessor(e, t)) {
-          return Reflect.get(l, t, n);
+          return Reflect.get(a, t, n);
         }
       }
     }
     if (writeOnly(n)) {
       if (isPrototypePollutionKey$1(t) && !hasOwnStoreProperty(e, t)) return undefined;
-      let n =
-        r && (u || !c)
-          ? r.K !== undefined && r.K !== NOT_PENDING
-            ? r.K
-            : r.B !== NOT_PENDING
-              ? r.B
-              : r.ue
-          : l[t];
+      let n = o && (c || !l) ? visibleNodeValue(o) : a[t];
       n === $DELETED && (n = undefined);
       if (!isWrappable(n)) return n;
       const i = wrap(n, e);
       Writing?.add(i);
       return i;
     }
-    let a = r ? (u || !c ? read(i[t]) : (read(i[t]), l[t])) : l[t];
-    a === $DELETED && (a = undefined);
-    if (!r) {
-      if (!u && typeof a === "function" && !l.hasOwnProperty(t)) {
+    let f = o ? (c || !l ? read(r[t]) : (read(r[t]), a[t])) : a[t];
+    f === $DELETED && (f = undefined);
+    if (!o) {
+      if (!c && typeof f === "function" && !Object.prototype.hasOwnProperty.call(a, t)) {
         let t;
         return !Array.isArray(e[STORE_VALUE]) &&
           (t = Object.getPrototypeOf(e[STORE_VALUE])) &&
           t !== Object.prototype
-          ? a.bind(l)
-          : a;
-      } else if (getObserver()) {
+          ? f.bind(a)
+          : f;
+      } else if (getObserver() && !i) {
         return read(
           getNode(
-            i,
+            r,
             t,
-            isWrappable(a) ? wrap(a, e) : a,
+            isWrappable(f) ? wrap(f, e) : f,
             e[STORE_FIREWALL],
             isEqual,
             e[STORE_OPTIMISTIC],
@@ -2908,23 +3154,19 @@ const storeTraps = {
         );
       }
     }
-    return isWrappable(a) ? wrap(a, e) : a;
+    return isWrappable(f) ? wrap(f, e) : f;
   },
   has(e, t) {
     if (t === $PROXY || t === $TRACK || t === "__proto__") return true;
-    const n =
-      e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE]
-        ? e[STORE_OPTIMISTIC_OVERRIDE][t] !== $DELETED
-        : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
-          ? e[STORE_OVERRIDE][t] !== $DELETED
-          : t in e[STORE_VALUE];
-    if (writeOnly(e[$PROXY])) return n;
-    const i = getNodes(e, STORE_HAS);
-    if (i[t]) return read(i[t]);
+    const n = getOverlayLayer(e, t);
+    const i = n ? n[t] !== $DELETED : t in e[STORE_VALUE];
+    if (writeOnly(e[$PROXY]) || getObserver() === e[STORE_FIREWALL]) return i;
+    const r = getNodes(e, STORE_HAS);
+    if (r[t]) return read(r[t]);
     if (getObserver()) {
-      return read(getNode(i, t, n, e[STORE_FIREWALL], isEqual, e[STORE_OPTIMISTIC]));
+      return read(getNode(r, t, i, e[STORE_FIREWALL], isEqual, e[STORE_OPTIMISTIC]));
     }
-    return n;
+    return i;
   },
   set(e, t, n) {
     if (t === "__proto__") return true;
@@ -2932,43 +3174,45 @@ const storeTraps = {
     if (writeOnly(i)) {
       untrack(() => {
         const { base: r, overrideKey: o, state: s } = prepareStoreWrite(e, i, t);
-        const u =
-          e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE]
-            ? e[STORE_OPTIMISTIC_OVERRIDE][t]
-            : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
-              ? e[STORE_OVERRIDE][t]
-              : r;
-        const c =
-          e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE]
-            ? e[STORE_OPTIMISTIC_OVERRIDE][t] !== $DELETED
-            : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
-              ? e[STORE_OVERRIDE][t] !== $DELETED
-              : t in e[STORE_VALUE];
-        const l = unwrapStoreValue(n);
-        const a = Array.isArray(s) && t !== "length";
-        const f = a ? parseInt(t) + 1 : 0;
-        const E =
-          a &&
-          (e[STORE_OPTIMISTIC_OVERRIDE] && "length" in e[STORE_OPTIMISTIC_OVERRIDE]
-            ? e[STORE_OPTIMISTIC_OVERRIDE].length
-            : e[STORE_OVERRIDE] && "length" in e[STORE_OVERRIDE]
-              ? e[STORE_OVERRIDE].length
-              : s.length);
-        const S = a && f > E ? f : undefined;
-        if (u === l && S === undefined) return true;
-        if (l !== undefined && l === r && S === undefined) delete e[o]?.[t];
+        const u = getOverlayLayer(e, t);
+        const c = u ? u[t] : r;
+        const l = u ? u[t] !== $DELETED : t in e[STORE_VALUE];
+        const a = unwrapStoreValue(n);
+        const f = Array.isArray(s) && t !== "length" && typeof t !== "symbol";
+        const E = f ? parseInt(t) + 1 : 0;
+        const d = f && (getOverlayLayer(e, "length") ?? s).length;
+        const S = f && E > d ? E : undefined;
+        if (c === a && S === undefined) return true;
+        armOptimisticStoreWrite(e, i);
+        if (a !== undefined && a === r && S === undefined) delete e[o]?.[t];
         else {
           const n = e[o] || (e[o] = Object.create(null));
-          n[t] = l;
+          n[t] = a;
           if (S !== undefined) n.length = S;
         }
-        notifyStoreProperty(e, t, "set", l, u, c);
+        notifyStoreProperty(e, t, "set", a, c, l);
+        if (
+          Array.isArray(s) &&
+          t === "length" &&
+          typeof a === "number" &&
+          typeof c === "number" &&
+          a < c
+        ) {
+          const t = e[o] || (e[o] = Object.create(null));
+          for (let n = a; n < c; n++) {
+            if (t[n] === $DELETED) continue;
+            const i = n in t ? t[n] : s[n];
+            if (!(n in t) && !(n in s)) continue;
+            t[n] = $DELETED;
+            notifyStoreProperty(e, n, "delete", undefined, i, true);
+          }
+        }
         if (Array.isArray(s) && t !== "length" && S !== undefined) {
           const t = getNodes(e, STORE_NODE);
           if (t.length) {
             setSignal(t.length, S);
           } else if (!projectionWriteActive && !e[STORE_OPTIMISTIC]) {
-            const n = upsertStoreNode(e, t, "length", E, e[STORE_SNAPSHOT_PROPS]);
+            const n = upsertStoreNode(e, t, "length", d, e[STORE_SNAPSHOT_PROPS]);
             setSignal(n, S);
           }
         }
@@ -2983,6 +3227,7 @@ const storeTraps = {
     if (writeOnly(i)) {
       untrack(() => {
         const { base: r, overrideKey: o } = prepareStoreWrite(e, i, t);
+        armOptimisticStoreWrite(e, i);
         const s = "value" in n ? { ...n, value: unwrapStoreValue(n.value) } : n;
         Object.defineProperty(e[o] || (e[o] = Object.create(null)), t, s);
         notifyStoreProperty(e, t, "invalidate");
@@ -2999,25 +3244,22 @@ const storeTraps = {
       untrack(() => {
         const n = e[STORE_OPTIMISTIC] && !projectionWriteActive;
         const i = n ? STORE_OPTIMISTIC_OVERRIDE : STORE_OVERRIDE;
-        if (n) trackOptimisticStore(e[$PROXY]);
-        const r =
-          e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE]
-            ? e[STORE_OPTIMISTIC_OVERRIDE][t]
-            : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
-              ? e[STORE_OVERRIDE][t]
-              : e[STORE_VALUE][t];
+        const r = getOverlayLayer(e, t);
+        const o = r ? r[t] : e[STORE_VALUE][t];
         if (t in e[STORE_VALUE] || (e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE])) {
+          armOptimisticStoreWrite(e, e[$PROXY]);
           (e[i] || (e[i] = Object.create(null)))[t] = $DELETED;
         } else if (e[i] && t in e[i]) {
+          armOptimisticStoreWrite(e, e[$PROXY]);
           delete e[i][t];
         } else return true;
-        notifyStoreProperty(e, t, "delete", undefined, r, true);
+        notifyStoreProperty(e, t, "delete", undefined, o, true);
       });
     }
     return true;
   },
   ownKeys(e) {
-    trackSelf(e);
+    if (getObserver() !== e[STORE_FIREWALL]) trackSelf(e);
     let t = getKeys(e[STORE_VALUE], e[STORE_OVERRIDE], false);
     if (e[STORE_OPTIMISTIC_OVERRIDE]) {
       const n = new Set(t);
@@ -3037,7 +3279,9 @@ const storeTraps = {
       if (n?.get || n?.set || !(t in e[STORE_VALUE])) return n;
       const i = getPropertyDescriptor(e[STORE_VALUE], e[STORE_OVERRIDE], t);
       if (i) {
-        return { ...i, value: e[STORE_OPTIMISTIC_OVERRIDE][t] };
+        const n = Reflect.getOwnPropertyDescriptor(e, t);
+        const r = !n || n.configurable ? true : i.configurable;
+        return { ...i, configurable: r, value: e[STORE_OPTIMISTIC_OVERRIDE][t] };
       }
       return {
         value: e[STORE_OPTIMISTIC_OVERRIDE][t],
@@ -3046,7 +3290,12 @@ const storeTraps = {
         configurable: true
       };
     }
-    return getPropertyDescriptor(e[STORE_VALUE], e[STORE_OVERRIDE], t);
+    const n = getPropertyDescriptor(e[STORE_VALUE], e[STORE_OVERRIDE], t);
+    if (n && !n.configurable) {
+      const i = Reflect.getOwnPropertyDescriptor(e, t);
+      if (!i || i.configurable) return { ...n, configurable: true };
+    }
+    return n;
   },
   getPrototypeOf(e) {
     return Object.getPrototypeOf(e[STORE_VALUE]);
@@ -3063,7 +3312,7 @@ function storeSetter(e, t) {
         for (let t = 0, i = n.length; t < i; t++) e[t] = n[t];
         e.length = n.length;
       } else {
-        const t = new Set([...Object.keys(e), ...Object.keys(n)]);
+        const t = new Set([...ownEnumerableKeys(e), ...ownEnumerableKeys(n)]);
         t.forEach(t => {
           if (t in n) e[t] = n[t];
           else delete e[t];
@@ -3080,11 +3329,16 @@ function createStore(e, t, n) {
     r = i ? createProjectionInternal(e, t, n).store : wrap(e);
   return [
     r,
-    i ? e => (storeSetter(r, e), suppressComputedRecompute(r[$REFRESH])) : e => storeSetter(r, e)
+    i
+      ? e => {
+          suppressComputedRecompute(r[$REFRESH]);
+          storeSetter(r, e);
+        }
+      : e => storeSetter(r, e)
   ];
 }
 function createOptimisticStore(e, t, n) {
-  GlobalQueue.de ||= clearOptimisticStore;
+  GlobalQueue.se ||= clearOptimisticStore;
   const i = typeof e === "function";
   const r = i ? t : e;
   const o = i ? e : undefined;
@@ -3093,30 +3347,47 @@ function createOptimisticStore(e, t, n) {
 }
 function clearOptimisticStore(e) {
   const t = e[$TARGET];
-  if (!t || !t[STORE_OPTIMISTIC_OVERRIDE]) return;
-  const n = t[STORE_OPTIMISTIC_OVERRIDE];
-  const i = t[STORE_NODE];
+  if (!t) return;
+  maskStoreTarget(t, false);
+  if (!t[STORE_OPTIMISTIC_OVERRIDE]) return;
+  clearOptimisticOverride(t);
+}
+function clearOptimisticOverride(e) {
+  const t = e[STORE_OPTIMISTIC_OVERRIDE];
+  if (!t) return;
+  maskStoreTarget(e, false);
+  const n = e[STORE_NODE];
+  delete e[STORE_OPTIMISTIC_OVERRIDE];
+  const i = projectionWriteActive;
   setProjectionWriteActive(true);
   try {
-    if (i) {
-      for (const e of Reflect.ownKeys(n)) {
-        if (i[e]) {
-          i[e].G = undefined;
-          const n =
-            t[STORE_OVERRIDE] && e in t[STORE_OVERRIDE] ? t[STORE_OVERRIDE][e] : t[STORE_VALUE][e];
-          const r = n === $DELETED ? undefined : n;
-          setSignal(i[e], isWrappable(r) ? wrap(r, t) : r);
+    if (n) {
+      for (const i of Reflect.ownKeys(t)) {
+        if (n[i]) {
+          const t = n[i];
+          t.i = undefined;
+          const r = getOverlayLayer(e, i);
+          const o = r ? r[i] : e[STORE_VALUE][i];
+          const s = o === $DELETED ? undefined : o;
+          const u = isWrappable(s) ? wrap(s, e) : s;
+          const c = visibleNodeValue(t);
+          t.O = NOT_PENDING;
+          t.D = NOT_PENDING;
+          t.Z = u;
+          if (!t.xe || !t.xe(c, u)) {
+            insertSubs(t, true);
+            schedule();
+          }
         }
       }
-      if (i[$TRACK]) {
-        i[$TRACK].G = undefined;
-        setSignal(i[$TRACK], undefined);
+      if (n[$TRACK]) {
+        n[$TRACK].i = undefined;
+        notifySelf(e);
       }
     }
   } finally {
-    setProjectionWriteActive(false);
+    setProjectionWriteActive(i);
   }
-  delete t[STORE_OPTIMISTIC_OVERRIDE];
 }
 function createOptimisticProjectionInternal(e, t, n) {
   let i;
@@ -3141,23 +3412,29 @@ function createOptimisticProjectionInternal(e, t, n) {
   };
   const o = wrapProjection(t);
   if (e) {
+    const clearProjectionOverride = () => {
+      const e = o[$TARGET];
+      if (e?.[STORE_OPTIMISTIC_OVERRIDE]) clearOptimisticOverride(e);
+    };
     const wrapCommit = e => {
+      const t = projectionWriteActive;
       setProjectionWriteActive(true);
       try {
         e();
+        clearProjectionOverride();
       } finally {
-        setProjectionWriteActive(false);
+        setProjectionWriteActive(t);
       }
     };
     i = computed(() => {
       setProjectionWriteActive(true);
       try {
-        runProjectionComputed(o, e, n?.key || "id", wrapCommit);
+        runProjectionComputed(o, e, n?.key || "id", wrapCommit, clearProjectionOverride);
       } finally {
         setProjectionWriteActive(false);
       }
     }, undefined);
-    i.Oe &= ~CONFIG_AUTO_DISPOSE;
+    i.le &= ~CONFIG_AUTO_DISPOSE;
   }
   return { store: o, node: i };
 }
@@ -3213,10 +3490,10 @@ function updatePath(e, t, n = 0) {
     delete e[i];
   } else if (i === undefined || (isWrappable(r) && isWrappable(o) && !Array.isArray(o))) {
     const t = i !== undefined ? e[i] : e;
-    const n = Object.keys(o);
+    const n = ownEnumerableKeys(o);
     for (let e = 0; e < n.length; e++) {
       const i = n[e];
-      if (isPrototypePollutionKey(i)) continue;
+      if (typeof i === "string" && isPrototypePollutionKey(i)) continue;
       const r = Object.getOwnPropertyDescriptor(o, i);
       if (r.get || r.set) Object.defineProperty(t, i, r);
       else t[i] = r.value;
@@ -3233,6 +3510,11 @@ const storePath = Object.assign(
   },
   { DELETE: DELETE }
 );
+function mergedOverlay(e) {
+  const t = e[STORE_OVERRIDE];
+  const n = e[STORE_OPTIMISTIC_OVERRIDE];
+  return t && n ? { ...t, ...n } : (n ?? t);
+}
 function snapshotImpl(e, t, n, i) {
   let r, o, s, u, c, l;
   if (!isWrappable(e)) return e;
@@ -3240,20 +3522,20 @@ function snapshotImpl(e, t, n, i) {
   if (!n) n = new Map();
   if ((r = e[$TARGET] || i?.get(e)?.[$TARGET])) {
     if (t) trackSelf(r, $TRACK);
-    s = r[STORE_OVERRIDE];
+    s = mergedOverlay(r);
     o = Array.isArray(r[STORE_VALUE]);
     n.set(
       e,
       s ? (u = o ? [] : Object.create(Object.getPrototypeOf(r[STORE_VALUE]))) : r[STORE_VALUE]
     );
     e = r[STORE_VALUE];
-    i = storeLookup;
+    i = r[STORE_LOOKUP] ?? storeLookup;
   } else {
     o = Array.isArray(e);
     n.set(e, e);
   }
   if (o) {
-    const o = s?.length || e.length;
+    const o = s?.length ?? e.length;
     for (let a = 0; a < o; a++) {
       l = s && a in s ? s[a] : e[a];
       if (l === $DELETED) continue;
@@ -3263,13 +3545,30 @@ function snapshotImpl(e, t, n, i) {
         u[a] = c;
       }
     }
+    if (u) u.length = o;
+  } else if (!s) {
+    const o = getKeys(e, undefined);
+    for (let s = 0, a = o.length; s < a; s++) {
+      const a = o[s];
+      const f = Object.getOwnPropertyDescriptor(e, a);
+      if (f.get) continue;
+      l = f.value;
+      if (t && isWrappable(l)) wrap(l, r);
+      if ((c = snapshotImpl(l, t, n, i)) !== l || u) {
+        if (!u) {
+          u = Object.create(Object.getPrototypeOf(e));
+          Object.assign(u, e);
+        }
+        u[a] = c;
+      }
+    }
   } else {
     const o = getKeys(e, s);
     for (let a = 0, f = o.length; a < f; a++) {
       let f = o[a];
       const E = getPropertyDescriptor(e, s, f);
       if (E.get) continue;
-      l = s && f in s ? s[f] : e[f];
+      l = f in s ? s[f] : e[f];
       if (t && isWrappable(l)) wrap(l, r);
       if ((c = snapshotImpl(l, t, n, i)) !== e[f] || u) {
         if (!u) {
@@ -3352,7 +3651,7 @@ function merge(...e) {
         keys() {
           const e = new Set();
           for (let t = 0; t < n.length; t++) {
-            const i = Object.keys(resolveSource(n[t]));
+            const i = ownEnumerableKeys(resolveSource(n[t]));
             for (let t = 0; t < i.length; t++) e.add(i[t]);
           }
           return [...e];
@@ -3404,7 +3703,7 @@ function omit(e, ...t) {
           return !t.includes(n) && n in e;
         },
         keys() {
-          return Object.keys(e).filter(e => !t.includes(e));
+          return ownEnumerableKeys(e).filter(e => !t.includes(e));
         }
       },
       propTraps
@@ -3428,74 +3727,74 @@ function mapArray(e, t, n) {
   const r = t.length > 1;
   const o = t;
   const s = {
-    Ze: createOwner(),
-    qe: 0,
-    Be: e,
-    ze: [],
-    Xe: o,
-    Je: [],
+    ze: createOwner(),
+    Xe: 0,
+    Je: e,
     et: [],
-    tt: i,
-    nt: i || n?.keyed === false ? [] : undefined,
-    it: r && n?.keyed !== false ? [] : undefined,
-    rt: n?.keyed === false,
-    ot: n?.fallback
+    tt: o,
+    nt: [],
+    it: [],
+    rt: i,
+    ot: i || n?.keyed === false ? [] : undefined,
+    st: r && n?.keyed !== false ? [] : undefined,
+    ut: n?.keyed === false,
+    ct: n?.fallback
   };
   const u = computed(updateKeyedMap.bind(s));
-  s.Ze.u = u;
-  u.Oe &= ~CONFIG_AUTO_DISPOSE;
+  s.ze.Ae = u;
+  u.le &= ~CONFIG_AUTO_DISPOSE;
   return accessor(u);
 }
 const pureOptions = { ownedWrite: true };
 function updateKeyedMap() {
-  const e = this.Be() || [],
+  const e = this.Je() || [],
     t = e.length;
   e[$TRACK];
-  runWithOwner(this.Ze, () => {
+  runWithOwner(this.ze, () => {
     let n,
       i,
-      r = this.nt
-        ? this.rt
+      r = this.ot
+        ? this.ut
           ? () => {
-              this.nt[i] = signal(e[i], pureOptions);
-              return this.Xe(accessor(this.nt[i]), i);
+              this.ot[i] = signal(e[i], pureOptions);
+              return this.tt(accessor(this.ot[i]), i);
             }
           : () => {
-              this.nt[i] = signal(e[i], pureOptions);
-              this.it && (this.it[i] = signal(i, pureOptions));
-              return this.Xe(accessor(this.nt[i]), this.it ? accessor(this.it[i]) : undefined);
+              this.ot[i] = signal(e[i], pureOptions);
+              this.st && (this.st[i] = signal(i, pureOptions));
+              return this.tt(accessor(this.ot[i]), this.st ? accessor(this.st[i]) : undefined);
             }
-        : this.it
+        : this.st
           ? () => {
               const t = e[i];
-              this.it[i] = signal(i, pureOptions);
-              return this.Xe(t, accessor(this.it[i]));
+              this.st[i] = signal(i, pureOptions);
+              return this.tt(t, accessor(this.st[i]));
             }
           : () => {
               const t = e[i];
-              return this.Xe(t);
+              return this.tt(t);
             };
     if (t === 0) {
-      if (this.qe !== 0) {
-        this.Ze.dispose(false);
+      if (this.Xe !== 0) {
+        this.ze.dispose(false);
+        this.it = [];
         this.et = [];
-        this.ze = [];
-        this.Je = [];
-        this.qe = 0;
-        this.nt && (this.nt = []);
-        this.it && (this.it = []);
-      }
-      if (this.ot && !this.Je[0]) {
-        this.Je[0] = runWithOwner((this.et[0] = createOwner()), this.ot);
-      }
-    } else if (this.qe === 0) {
-      if (this.et[0]) this.et[0].dispose();
-      this.Je = new Array(t);
+        this.nt = [];
+        this.Xe = 0;
+        this.ot && (this.ot = []);
+        this.st && (this.st = []);
+      }
+      if (this.ct && !this.nt[0]) {
+        this.nt[0] = runWithOwner((this.it[0] = createOwner()), this.ct);
+      }
+    } else if (this.Xe === 0) {
+      if (this.it[0]) this.it[0].dispose();
+      this.nt = new Array(t);
       for (i = 0; i < t; i++) {
-        this.ze[i] = e[i];
-        this.Je[i] = runWithOwner((this.et[i] = createOwner()), r);
+        this.et[i] = e[i];
+        this.nt[i] = runWithOwner((this.it[i] = createOwner()), r);
       }
-      this.qe = t;
+      this.Xe = t;
     } else {
       let o,
         s,
@@ -3505,157 +3804,173 @@ function updateKeyedMap() {
         a,
         f,
         E = new Array(t),
-        S = new Array(t),
-        T = this.nt ? new Array(t) : undefined,
-        d = this.it ? new Array(t) : undefined;
+        d = new Array(t),
+        S = this.ot ? new Array(t) : undefined,
+        T = this.st ? new Array(t) : undefined;
       for (
-        o = 0, s = Math.min(this.qe, t);
-        o < s && (this.ze[o] === e[o] || (this.nt && compare(this.tt, this.ze[o], e[o])));
+        o = 0, s = Math.min(this.Xe, t);
+        o < s && (this.et[o] === e[o] || (this.ot && compare(this.rt, this.et[o], e[o])));
         o++
       ) {
-        if (this.nt) setSignal(this.nt[o], e[o]);
+        if (this.ot) setSignal(this.ot[o], e[o]);
       }
       for (
-        s = this.qe - 1, u = t - 1;
+        s = this.Xe - 1, u = t - 1;
         s >= o &&
         u >= o &&
-        (this.ze[s] === e[u] || (this.nt && compare(this.tt, this.ze[s], e[u])));
+        (this.et[s] === e[u] || (this.ot && compare(this.rt, this.et[s], e[u])));
         s--, u--
       ) {
-        E[u] = this.Je[s];
-        S[u] = this.et[s];
-        T && (T[u] = this.nt[s]);
-        d && (d[u] = this.it[s]);
+        E[u] = this.nt[s];
+        d[u] = this.it[s];
+        S && (S[u] = this.ot[s]);
+        T && (T[u] = this.st[s]);
       }
       a = new Map();
       f = new Array(u + 1);
       for (i = u; i >= o; i--) {
         c = e[i];
-        l = this.tt ? this.tt(c) : c;
+        l = this.rt ? this.rt(c) : c;
         n = a.get(l);
         f[i] = n === undefined ? -1 : n;
         a.set(l, i);
       }
       for (n = o; n <= s; n++) {
-        c = this.ze[n];
-        l = this.tt ? this.tt(c) : c;
+        c = this.et[n];
+        l = this.rt ? this.rt(c) : c;
         i = a.get(l);
         if (i !== undefined && i !== -1) {
-          E[i] = this.Je[n];
-          S[i] = this.et[n];
-          T && (T[i] = this.nt[n]);
-          d && (d[i] = this.it[n]);
+          E[i] = this.nt[n];
+          d[i] = this.it[n];
+          S && (S[i] = this.ot[n]);
+          T && (T[i] = this.st[n]);
           i = f[i];
           a.set(l, i);
-        } else this.et[n].dispose();
+        } else this.it[n].dispose();
       }
       for (i = o; i < t; i++) {
         if (i in E) {
-          this.Je[i] = E[i];
-          this.et[i] = S[i];
-          if (T) {
-            this.nt[i] = T[i];
-            setSignal(this.nt[i], e[i]);
+          this.nt[i] = E[i];
+          this.it[i] = d[i];
+          if (S) {
+            this.ot[i] = S[i];
+            setSignal(this.ot[i], e[i]);
           }
-          if (d) {
-            this.it[i] = d[i];
-            setSignal(this.it[i], i);
+          if (T) {
+            this.st[i] = T[i];
+            setSignal(this.st[i], i);
           }
         } else {
-          this.Je[i] = runWithOwner((this.et[i] = createOwner()), r);
+          this.nt[i] = runWithOwner((this.it[i] = createOwner()), r);
         }
       }
-      this.Je = this.Je.slice(0, (this.qe = t));
-      this.ze = e.slice(0);
+      this.nt = this.nt.slice(0, (this.Xe = t));
+      this.et = e.slice(0);
     }
   });
-  return this.Je;
+  return this.nt;
 }
 function repeat(e, t, n) {
   const i = t;
   const r = computed(
     updateRepeat.bind({
-      Ze: createOwner(),
-      qe: 0,
-      st: 0,
-      ut: e,
-      Xe: i,
-      et: [],
-      Je: [],
-      ct: n?.from,
-      ot: n?.fallback
+      ze: createOwner(),
+      Xe: 0,
+      lt: 0,
+      ft: e,
+      tt: i,
+      it: [],
+      nt: [],
+      Et: n?.from,
+      ct: n?.fallback
     })
   );
-  r.Oe &= ~CONFIG_AUTO_DISPOSE;
+  r.le &= ~CONFIG_AUTO_DISPOSE;
   return accessor(r);
 }
 function updateRepeat() {
-  const e = this.ut();
-  const t = this.ct?.() || 0;
-  runWithOwner(this.Ze, () => {
+  const e = this.ft();
+  const t = this.Et?.() || 0;
+  runWithOwner(this.ze, () => {
     if (e === 0) {
-      if (this.qe !== 0) {
-        this.Ze.dispose(false);
-        this.et = [];
-        this.Je = [];
-        this.qe = 0;
+      if (this.Xe !== 0) {
+        this.ze.dispose(false);
+        this.it = [];
+        this.nt = [];
+        this.Xe = 0;
+        this.lt = 0;
       }
-      if (this.ot && !this.Je[0]) {
-        this.Je[0] = runWithOwner((this.et[0] = createOwner()), this.ot);
+      if (this.ct && !this.nt[0]) {
+        this.nt[0] = runWithOwner((this.it[0] = createOwner()), this.ct);
       }
       return;
     }
     const n = t + e;
-    const i = this.st + this.qe;
-    if (this.qe === 0 && this.et[0]) this.et[0].dispose();
-    for (let e = n; e < i; e++) this.et[e - this.st].dispose();
-    if (this.st < t) {
-      let e = this.st;
-      while (e < t && e < this.qe) this.et[e++].dispose();
-      this.et.splice(0, t - this.st);
-      this.Je.splice(0, t - this.st);
-    } else if (this.st > t) {
-      let n = i - this.st - 1;
-      let r = this.st - t;
-      this.et.length = this.Je.length = e;
+    const i = this.lt + this.Xe;
+    if (this.Xe === 0 && this.it[0]) this.it[0].dispose();
+    if (t >= i || n <= this.lt) {
+      for (let e = 0; e < this.Xe; e++) this.it[e].dispose();
+      this.it = new Array(e);
+      this.nt = new Array(e);
+      for (let n = 0; n < e; n++)
+        this.nt[n] = runWithOwner((this.it[n] = createOwner()), () => this.tt(t + n));
+      this.lt = t;
+      this.Xe = e;
+      return;
+    }
+    for (let e = n; e < i; e++) this.it[e - this.lt].dispose();
+    if (this.lt < t) {
+      const e = t - this.lt;
+      for (let t = 0; t < e && t < this.Xe; t++) this.it[t].dispose();
+      this.it.splice(0, e);
+      this.nt.splice(0, e);
+    } else if (this.lt > t) {
+      let n = i - this.lt - 1;
+      let r = this.lt - t;
+      this.it.length = this.nt.length = e;
       while (n >= r) {
-        this.et[n] = this.et[n - r];
-        this.Je[n] = this.Je[n - r];
+        this.it[n] = this.it[n - r];
+        this.nt[n] = this.nt[n - r];
         n--;
       }
       for (let e = 0; e < r; e++) {
-        this.Je[e] = runWithOwner((this.et[e] = createOwner()), () => this.Xe(e + t));
+        this.nt[e] = runWithOwner((this.it[e] = createOwner()), () => this.tt(e + t));
       }
     }
     for (let e = i; e < n; e++) {
-      this.Je[e - t] = runWithOwner((this.et[e - t] = createOwner()), () => this.Xe(e));
+      this.nt[e - t] = runWithOwner((this.it[e - t] = createOwner()), () => this.tt(e));
     }
-    this.Je = this.Je.slice(0, e);
-    this.st = t;
-    this.qe = e;
+    this.nt = this.nt.slice(0, e);
+    this.lt = t;
+    this.Xe = e;
   });
-  return this.Je;
+  return this.nt;
 }
 function compare(e, t, n) {
   return e ? e(t) === e(n) : true;
 }
 function boundaryComputed(e, t) {
   const n = computed(e, { lazy: true });
-  n.xe = (e, t) => {
-    const i = e !== undefined ? e : n.he;
-    const r = t !== undefined ? t : n.Re;
-    n.he &= ~n.lt;
-    n.te.notify(n, n.lt, i, r);
+  n.Qe = (e, t) => {
+    const i = e !== undefined ? e : n.Y;
+    const r = t !== undefined ? t : n.ae;
+    n.Y &= ~n.dt;
+    n.F.notify(n, STATUS_PENDING | STATUS_ERROR, i, r);
+    const o = i & ~n.dt & (STATUS_PENDING | STATUS_ERROR);
+    if (o) {
+      n.Y &= ~o;
+      if (n.ae === r && !(n.Y & (STATUS_PENDING | STATUS_ERROR))) n.ae = undefined;
+    }
   };
-  n.lt = t;
-  n.Oe &= ~CONFIG_AUTO_DISPOSE;
+  n.dt = t;
+  n.le &= ~CONFIG_AUTO_DISPOSE;
   recompute(n, true);
   return n;
 }
 function createBoundChildren(e, t, n, i) {
-  const r = e.te;
-  r.addChild((e.te = n));
-  cleanup(() => r.removeChild(e.te));
+  const r = e.F;
+  r.addChild((e.F = n));
+  cleanup(() => r.removeChild(e.F));
   return runWithOwner(e, () => {
     const e = computed(t);
     return boundaryComputed(() => flatten(read(e)), i);
@@ -3670,52 +3985,52 @@ function isRevealController(e) {
   return e instanceof RevealController;
 }
 function isSlotReady(e) {
-  return isRevealController(e) ? e.isReady() : e.ft.size === 0 && !e.Et;
+  return isRevealController(e) ? e.isReady() : e.St.size === 0 && !e.Tt;
 }
 function isSlotMinimallyReady(e) {
   return isRevealController(e) ? e.isMinimallyReady() : isSlotReady(e);
 }
 function setSlotState(e, t, n, i) {
-  setSignal(e.St, n);
-  setSignal(e.Tt, i);
+  setSignal(e._t, n);
+  setSignal(e.Ot, i);
   if (isRevealController(e)) {
-    if (!n && e.dt === t) e.dt = undefined;
+    if (!n && e.Rt === t) e.Rt = undefined;
     return e.evaluate(n, i);
   }
-  if (!n && e._t === t && e.Ot) e._t = undefined;
+  if (!n && e.It === t && e.ht) e.It = undefined;
 }
 class RevealController {
+  At;
+  Nt;
+  Ct = [];
   Rt;
-  It;
-  ht = [];
-  dt;
-  St = signal(false, { ownedWrite: true, Ye: true });
-  Tt = signal(false, { ownedWrite: true, Ye: true });
-  Nt = true;
-  At = true;
-  Ct = false;
+  _t = signal(false, { ownedWrite: true, Ke: true });
+  Ot = signal(false, { ownedWrite: true, Ke: true });
+  yt = true;
+  Pt = true;
+  gt = false;
   constructor(e, t) {
-    this.Rt = e;
-    this.It = t;
+    this.At = e;
+    this.Nt = t;
   }
-  Pt(e) {
-    for (let t = 0; t < this.ht.length; t++) {
-      const n = this.ht[t];
-      if ((isRevealController(n) ? n.dt : n._t) !== this) continue;
+  Dt(e) {
+    for (let t = 0; t < this.Ct.length; t++) {
+      const n = this.Ct[t];
+      if ((isRevealController(n) ? n.Rt : n.It) !== this) continue;
       if (e(n) === false) return false;
     }
     return true;
   }
   isReady() {
-    return this.Pt(isSlotReady);
+    return this.Dt(isSlotReady);
   }
   isMinimallyReady() {
-    const e = untrack(this.Rt);
+    const e = untrack(this.At);
     if (e === "together") return this.isReady();
     if (e === "natural") {
       let e = false;
       let t = false;
-      this.Pt(n => {
+      this.Dt(n => {
         e = true;
         if (isSlotMinimallyReady(n)) {
           t = true;
@@ -3725,58 +4040,58 @@ class RevealController {
       return !e || t;
     }
     let t = true;
-    this.Pt(e => {
+    this.Dt(e => {
       t = isSlotMinimallyReady(e);
       return false;
     });
     return t;
   }
   register(e) {
-    if (this.ht.includes(e)) return;
-    this.ht.push(e);
-    const t = untrack(this.Rt);
-    (setSignal(e.St, true), setSignal(e.Tt, t === "sequential" ? !!untrack(this.It) : false));
+    if (this.Ct.includes(e)) return;
+    this.Ct.push(e);
+    const t = untrack(this.At);
+    (setSignal(e._t, true), setSignal(e.Ot, t === "sequential" ? !!untrack(this.Nt) : false));
     untrack(() => this.evaluate());
   }
   unregister(e) {
-    const t = this.ht.indexOf(e);
-    if (t >= 0) this.ht.splice(t, 1);
+    const t = this.Ct.indexOf(e);
+    if (t >= 0) this.Ct.splice(t, 1);
     untrack(() => this.evaluate());
   }
   evaluate(e, t) {
-    if (this.Ct) return;
-    this.Ct = true;
-    const n = this.Nt;
-    const i = this.At;
+    if (this.gt) return;
+    this.gt = true;
+    const n = this.yt;
+    const i = this.Pt;
     try {
-      const n = e ?? read(this.St),
-        i = untrack(this.Rt),
-        r = i === "sequential" && !!untrack(this.It),
+      const n = e ?? read(this._t),
+        i = untrack(this.At),
+        r = i === "sequential" && !!untrack(this.Nt),
         o = t ?? r;
       if (n) {
-        this.Pt(e => setSlotState(e, this, true, o));
+        this.Dt(e => setSlotState(e, this, true, o));
       } else if (i === "natural") {
-        this.Pt(e => {
+        this.Dt(e => {
           if (isRevealController(e)) {
-            setSignal(e.Tt, false);
-            setSignal(e.St, false);
+            setSignal(e.Ot, false);
+            setSignal(e._t, false);
             e.evaluate(false, false);
           } else {
             setSlotState(e, this, !isSlotReady(e), false);
           }
         });
       } else if (i === "together") {
-        const e = this.Pt(isSlotMinimallyReady);
-        this.Pt(t => setSlotState(t, this, !e, false));
+        const e = this.Dt(isSlotMinimallyReady);
+        this.Dt(t => setSlotState(t, this, !e, false));
       } else {
         let e = false;
-        this.Pt(t => {
+        this.Dt(t => {
           if (e) return setSlotState(t, this, true, r);
           if (isSlotReady(t)) return setSlotState(t, this, false, false);
           e = true;
           if (isRevealController(t)) {
-            setSignal(t.Tt, false);
-            setSignal(t.St, false);
+            setSignal(t.Ot, false);
+            setSignal(t._t, false);
             t.evaluate(false, false);
           } else {
             setSlotState(t, this, true, false);
@@ -3784,101 +4099,101 @@ class RevealController {
         });
       }
     } finally {
-      this.Nt = this.isReady();
-      this.At = this.isMinimallyReady();
-      this.Ct = false;
+      this.yt = this.isReady();
+      this.Pt = this.isMinimallyReady();
+      this.gt = false;
     }
-    if (this.dt && (n !== this.Nt || i !== this.At)) this.dt.evaluate();
+    if (this.Rt && (n !== this.yt || i !== this.Pt)) this.Rt.evaluate();
   }
 }
 class CollectionQueue extends Queue {
-  gt;
-  ft = new Set();
-  Dt;
-  Et = true;
-  St = signal(false, { ownedWrite: true, Ye: true });
-  Re;
-  Tt = signal(false, { ownedWrite: true, Ye: true });
-  _t;
-  Ot = false;
-  yt;
-  vt = ON_INIT;
+  bt;
+  St = new Set();
+  vt;
+  Tt = true;
+  _t = signal(false, { ownedWrite: true, Ke: true });
+  ae;
+  Ot = signal(false, { ownedWrite: true, Ke: true });
+  It;
+  ht = false;
+  wt;
+  Lt = ON_INIT;
   constructor(e) {
     super();
-    this.gt = e;
+    this.bt = e;
   }
   run(e) {
-    if (!e || (read(this.St) && (!_revealUsed || read(this.Tt)))) return;
+    if (!e || (read(this._t) && (!_revealUsed || read(this.Ot)))) return;
     return super.run(e);
   }
   notify(e, t, n, i) {
-    if (!(t & this.gt)) return super.notify(e, t, n, i);
-    if (this.Ot && this.yt) {
+    if (!(t & this.bt)) return super.notify(e, t, n, i);
+    if (this.ht && this.wt) {
       const e = untrack(() => {
         try {
-          return this.yt();
+          return this.wt();
         } catch {
           return ON_INIT;
         }
       });
-      if (e !== this.vt) {
-        this.vt = e;
-        this.Ot = false;
-        this.ft.clear();
+      if (e !== this.Lt) {
+        this.Lt = e;
+        this.ht = false;
+        this.St.clear();
       }
     }
-    if (this.gt & STATUS_PENDING && this.Ot) return super.notify(e, t, n, i);
-    if (this.gt & STATUS_PENDING && n & STATUS_ERROR) {
+    if (this.bt & STATUS_PENDING && n & STATUS_ERROR) {
       return super.notify(e, STATUS_ERROR, n, i);
     }
-    if (n & this.gt) {
-      this.Et = true;
-      const t = i?.source || e.Re?.source;
+    if (this.bt & STATUS_PENDING && this.ht) return super.notify(e, t, n, i);
+    if (n & this.bt) {
+      this.Tt = true;
+      const t = i?.source || e.ae?.source;
       if (t) {
-        const e = this.ft.size === 0;
-        this.ft.add(t);
-        if (e) setSignal(this.St, true);
-        if (this.gt & STATUS_ERROR) {
-          setSignal(this.Re, t.Re?.cause ?? t.Re);
+        const e = this.St.size === 0;
+        this.St.add(t);
+        if (e) setSignal(this._t, true);
+        if (this.bt & STATUS_ERROR) {
+          setSignal(this.ae, t.ae?.cause ?? t.ae);
         }
       }
     }
-    t &= ~this.gt;
+    t &= ~this.bt;
     return t ? super.notify(e, t, n, i) : true;
   }
   checkSources() {
-    for (const e of this.ft) {
+    for (const e of this.St) {
       if (
-        e.O & REACTIVE_DISPOSED ||
-        (!(e.he & this.gt) && !(this.gt & STATUS_ERROR && e.he & STATUS_PENDING))
+        e.W & REACTIVE_DISPOSED ||
+        (!(e.Y & this.bt) && !(this.bt & STATUS_ERROR && e.Y & STATUS_PENDING))
       )
-        this.ft.delete(e);
+        this.St.delete(e);
     }
-    if (!this.ft.size) {
-      if (this.gt & STATUS_PENDING && this.Et && !this.Ot && this.Dt) {
-        this.Et = !!(this.Dt.he & this.gt);
+    if (!this.St.size) {
+      if (this.bt & STATUS_PENDING && this.Tt && !this.ht && this.vt) {
+        this.Tt = !!(this.vt.Y & this.bt);
       } else {
-        this.Et = false;
+        this.Tt = false;
       }
-      if (!this.Et) {
-        setSignal(this.St, false);
-        if (this.yt) {
+      if (!this.Tt) {
+        setSignal(this._t, false);
+        if (this.wt) {
           try {
-            this.vt = untrack(() => this.yt());
+            this.Lt = untrack(() => this.wt());
           } catch {}
         }
       }
     }
-    if (_revealUsed) this._t?.evaluate();
+    if (_revealUsed) this.It?.evaluate();
   }
 }
 function createCollectionBoundary(e, t, n, i) {
   const r = createOwner();
   if (_revealUsed) setContext(RevealControllerContext, null, r);
   const o = new CollectionQueue(e);
-  if (e === STATUS_ERROR) o.Re = signal(undefined, { ownedWrite: true, Ye: true });
-  if (i) o.yt = i;
-  const s = (o.Dt = createBoundChildren(r, t, o, e));
+  if (e === STATUS_ERROR) o.ae = signal(undefined, { ownedWrite: true, Ke: true });
+  if (i) o.wt = i;
+  const s = (o.vt = createBoundChildren(r, t, o, e));
   untrack(() => {
     let t = false;
     try {
@@ -3887,23 +4202,26 @@ function createCollectionBoundary(e, t, n, i) {
       if (e instanceof NotReadyError) t = true;
       else throw e;
     }
-    o.Et = t || !!(s.he & e) || s.Re instanceof NotReadyError;
+    o.Tt = t || !!(s.Y & e) || s.ae instanceof NotReadyError;
   });
   const u = _revealUsed && e === STATUS_PENDING ? getContext(RevealControllerContext) : null;
   if (u) {
-    o._t = u;
+    o.It = u;
     u.register(o);
     cleanup(() => u.unregister(o));
   }
   return accessor(
-    computed(() => {
-      if (!read(o.St)) {
-        const e = read(s);
-        if (!untrack(() => read(o.St))) return ((o.Ot = true), e);
-      }
-      if (_revealUsed && read(o.Tt)) return undefined;
-      return n(o);
-    })
+    computed(
+      () => {
+        if (!read(o._t)) {
+          const e = read(s);
+          if (!untrack(() => read(o._t))) return ((o.ht = true), e);
+        }
+        if (_revealUsed && read(o.Ot)) return undefined;
+        return n(o);
+      },
+      { Ke: true }
+    )
   );
 }
 function createLoadingBoundary(e, t, n) {
@@ -3911,8 +4229,8 @@ function createLoadingBoundary(e, t, n) {
 }
 function createErrorBoundary(e, t) {
   return createCollectionBoundary(STATUS_ERROR, e, e =>
-    t(accessor(e.Re), () => {
-      for (const t of e.ft) recompute(t);
+    t(accessor(e.ae), () => {
+      for (const t of e.St) recompute(t);
       schedule();
     })
   );
@@ -3933,7 +4251,7 @@ function createRevealOrder(e, t) {
       s.evaluate();
     });
     if (i) {
-      s.dt = i;
+      s.Rt = i;
       i.register(s);
       cleanup(() => i.unregister(s));
     }
@@ -4030,7 +4348,6 @@ export {
   isDisposed,
   isEqual,
   isPending,
-  isRefreshing,
   isWrappable,
   latest,
   mapArray,
@@ -4044,6 +4361,7 @@ export {
   refresh,
   releaseSnapshotScope,
   repeat,
+  resetErrorHalt,
   resolve,
   runWithOwner,
   setContext,