octane 0.13.1 → 0.13.3

package/dist/cjs/runtime.cjs

@@ -93,6 +93,7 @@ __export(runtime_exports, {
   compilerCacheMappedArray: () => compilerCacheMappedArray,
   compilerMemoRegion: () => compilerMemoRegion,
   compilerMemoWitness: () => compilerMemoWitness,
+  compilerOpaqueTag: () => compilerOpaqueTag,
   compilerOwnsContextProvider: () => compilerOwnsContextProvider,
   componentSlot: () => componentSlot,
   componentSlotLite: () => componentSlotLite,
@@ -368,6 +369,7 @@ var import_dom_binding_protocol = require("./dom-binding-protocol.cjs");
 var import_hydration_markers = require("./hydration-markers.cjs");
 var import_runtime_tags = require("./runtime-tags.cjs");
 var import_dom_focused_move = require("./dom-focused-move.cjs");
+var import_data_encoding = require("./data-encoding.cjs");
 var import_stream_protocol = require("./stream-protocol.cjs");
 var import_renderer_bridge = require("./renderer-bridge.cjs");
 var import_context_identity = require("./context-identity.cjs");
@@ -500,6 +502,7 @@ let SCHEDULED_VISIBILITY_DRIVER = null;
 let DEFERRED_LAYOUT_DRIVER = null;
 let STAGED_COMMIT_CAPTURE = null;
 let FORM_SUBMIT_DRIVER = null;
+let SKIPPED_ROW_REFRESH = null;
 let activityRefState = null;
 let EFFECT_RECONNECT_CONTEXT = null;
 let drainEffectEventUpdates = noop;
@@ -1355,10 +1358,30 @@ function retainNativeRetryReads(block, reads) {
   retry.track(reads);
 }
 function ownNativeAdoption(scope, manifest, consume) {
-  const adoption = (0, import_native_read_seeds.createNativeAdoptionState)(
-    manifest,
-    scope.block.idState.renderOwner?.initialDocumentSignals
-  );
+  const renderOwner = scope.block.idState.renderOwner;
+  const initial = renderOwner?.initialDocumentSignals;
+  const signalOwner = renderOwner?.signalOwner;
+  const initialScopeKey = (signalOwner?.documentOwner ?? signalOwner)?.scopeKey ?? "octane:document";
+  let state = import_read_protocol.nativeSignalHydration ? (0, import_native_read_seeds.createNativeAdoptionState)(
+    typeof manifest === "string" ? (0, import_native_read_seeds.parseNativeSignalManifest)(manifest) : manifest,
+    initial,
+    initialScopeKey
+  ) : void 0;
+  const adoption = state ?? {
+    resolve(owner) {
+      if (state === null || !import_read_protocol.nativeSignalHydration) return void 0;
+      state ??= (0, import_native_read_seeds.createNativeAdoptionState)(
+        typeof manifest === "string" ? (0, import_native_read_seeds.parseNativeSignalManifest)(manifest) : manifest,
+        initial,
+        initialScopeKey
+      );
+      return state.resolve(owner);
+    },
+    release() {
+      state?.release();
+      state = null;
+    }
+  };
   (0, import_read_protocol.registerNativeReadRebase)(import_native_read_client.rebaseNativeRead);
   registerHookCleanup(scope, () => {
     adoption.release();
@@ -7573,6 +7596,7 @@ function blockRare(block) {
     activitySlot: void 0,
     thenables: void 0,
     thenableIdx: 0,
+    batchThenables: void 0,
     warmCache: void 0,
     warmCacheEpisode: void 0,
     updateChain: -1,
@@ -7630,6 +7654,7 @@ function createBlock(kind, parentBlock, parentNode, startMarker, endMarker, body
 }
 let renderPhaseOwner = null;
 let renderPhaseUpdates = null;
+let compilerMemoPass = 0;
 function captureRenderPhaseUpdate(cell, key) {
   const updates = renderPhaseUpdates ??= /* @__PURE__ */ new Map();
   if (!updates.has(cell)) updates.set(cell, { value: cell.value, queue: cell[key]?.slice(), key });
@@ -7657,6 +7682,7 @@ function renderBlock(block) {
   }
   const previousOwner = renderPhaseOwner;
   let previousUpdates = renderPhaseUpdates;
+  if (previousOwner === null) compilerMemoPass++;
   renderPhaseOwner = block;
   renderPhaseUpdates = null;
   try {
@@ -7815,6 +7841,8 @@ function renderBlockInner(block) {
   block.__warmEpisode = CURRENT_WARM_EPISODE;
   EFFECT_EVENT_RENDER_TARGET = effectEventTarget;
   EFFECT_EVENT_ACTION_TARGET = effectEventActionTarget;
+  const replayUpdate = RESUME_REPLAY && block.pending && urgentTransitionRender === null;
+  if (replayUpdate) RESUME_REPLAY = false;
   block.pending = false;
   block.crossRenderUpdate = false;
   const rare = block.rare;
@@ -7822,8 +7850,9 @@ function renderBlockInner(block) {
     if (rare.eventRender !== 0) rare.eventRender++;
     rare.thenableIdx = 0;
     const tState = rare.thenables;
-    if (tState !== void 0 && tState.length !== 0 && (!RESUME_REPLAY || block.__thenableDone === true)) {
-      tState.length = 0;
+    if (tState !== void 0 && (!RESUME_REPLAY || block.__thenableDone === true)) {
+      if (tState.length !== 0) tState.length = 0;
+      rare.batchThenables = void 0;
     }
   }
   block.__thenableDone = false;
@@ -7911,6 +7940,7 @@ function renderBlockInner(block) {
     CURRENT_EFFECT_REACHED = prevEffectReached;
     CURRENT_SCOPE = prevScope;
     CURRENT_BLOCK = prevBlock;
+    if (replayUpdate) RESUME_REPLAY = true;
     try {
       if (NATIVE_READ_DRIVER)
         NATIVE_READ_DRIVER.endRender(block, renderCompleted, isSuspenseException(profileThrown));
@@ -8000,6 +8030,7 @@ function renderReturnedValue(block, out, reset) {
     }
     if (useSingleRoot) {
       const d = out;
+      if (!block.memoInChain) promoteMemoAncestry(block);
       if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__ && !(0, import_profiling.__profileHasComponentMetadata)(d.type)) {
         withProfileComponentOverride(
           d.type,
@@ -8228,7 +8259,11 @@ function componentSlotLite(parentScope, slotKey, host, comp, props, invocationSi
       });
     }
     parentScope.slots[slotKey] = scope;
-    (parentScope.children ??= []).push({ key: slotKey, scope });
+    (parentScope.children ??= []).push({
+      key: slotKey,
+      scope,
+      at: parentScope._slots === null ? 0 : parentScope._slots.length
+    });
     if (unframed !== void 0) {
       mountUnframedLite(
         hydration,
@@ -8260,6 +8295,9 @@ function componentSlotLite(parentScope, slotKey, host, comp, props, invocationSi
   }
   const prevScope = CURRENT_SCOPE;
   const warmPlanCheckpoint = ACTIVE_WARM_PLANS.length;
+  const effectReached = CURRENT_EFFECT_REACHED;
+  CURRENT_EFFECT_REACHED = 0;
+  if (scope.effectSlots !== null) ensureEffectRenderVersion();
   CURRENT_SCOPE = scope;
   if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__)
     (0, import_profiling.__profileTrackComponent)(scope, comp);
@@ -8281,6 +8319,7 @@ function componentSlotLite(parentScope, slotKey, host, comp, props, invocationSi
     } else comp(props, scope, void 0);
     if (hydration !== null) hydration.settleUnclaimed(scope);
     if (retryVisit !== null) pruneSignalRetryVisit(retryVisit, false);
+    if (scope.effectSlots !== null) finishEffectRender(scope);
     if (!scope.mounted) scope.mounted = true;
   } catch (error) {
     if (retryVisit !== null && isSuspenseException(error)) pruneSignalRetryVisit(retryVisit, true);
@@ -8294,6 +8333,7 @@ function componentSlotLite(parentScope, slotKey, host, comp, props, invocationSi
       (0, import_profiling.__profileEndRender)(profileFrame, profileDidThrow, profileThrown);
     if (ACTIVE_WARM_PLANS.length !== warmPlanCheckpoint)
       ACTIVE_WARM_PLANS.length = warmPlanCheckpoint;
+    CURRENT_EFFECT_REACHED = effectReached;
     CURRENT_SCOPE = prevScope;
   }
   if (hydration !== null && adoptedClose !== null) {
@@ -8458,6 +8498,7 @@ function unmountScope(scope, detachDom = true) {
   if (effects !== null) {
     for (let i = 0; i < effects.length; i++) {
       const slot = effects[i];
+      slot.revision++;
       const cleanup = slot.cleanup;
       if (cleanup === void 0) continue;
       slot.cleanup = void 0;
@@ -8531,15 +8572,18 @@ function unmountScopeChildrenAndSlots(scope, detachDom, retireUnowned = true) {
 }
 function unmountScopeChildrenAndSlotsOnly(scope, detachDom) {
   const children = scope.children;
-  if (children !== null)
-    for (let i = 0, n = children.length; i < n; i++) unmountScope(children[i].scope, detachDom);
   const slots = scope._slots;
+  let c = 0;
   if (slots !== null) {
     for (let i = 0, n = slots.length; i < n; i++) {
-      const val = slots[i];
-      unmountSlot(val, detachDom);
+      if (children !== null)
+        for (; c < children.length && children[c].at <= i; c++)
+          unmountScope(children[c].scope, detachDom);
+      unmountSlot(slots[i], detachDom);
     }
   }
+  if (children !== null)
+    for (; c < children.length; c++) unmountScope(children[c].scope, detachDom);
 }
 function unmountSlot(val, detachDom) {
   if ((val.__flags & SLOT_FLAG_TEARDOWN) !== 0) val.__teardown(val, detachDom);
@@ -9444,16 +9488,23 @@ function useCallback(fn, deps, slot) {
 }
 const hookMemoEqual = Object.is;
 let COMPILER_MEMO_PROOFS = null;
+let unprovenCompilerMemo = 0;
 function markCompilerMemo(component, read) {
-  (COMPILER_MEMO_PROOFS ??= /* @__PURE__ */ new WeakMap()).set(component, { read, values: [] });
+  (COMPILER_MEMO_PROOFS ??= /* @__PURE__ */ new WeakMap()).set(component, { read, values: [], pass: -1 });
   return component;
 }
 function compilerMemoWitness(component) {
+  if (typeof component !== "function") return --unprovenCompilerMemo;
   if (component.__memo === true && component.__compare === void 0) return component;
   const proof = COMPILER_MEMO_PROOFS?.get(component);
-  if (proof === void 0 || "defaultProps" in component) return void 0;
-  if (proof.read === null) return proof.values;
-  const values = proof.read();
+  if (proof === void 0 || "defaultProps" in component) return --unprovenCompilerMemo;
+  const read = proof.read;
+  if (read === null) return proof.values;
+  if (proof.pass === compilerMemoPass) return proof.values;
+  if (proof.pass === ~compilerMemoPass) return --unprovenCompilerMemo;
+  proof.pass = ~compilerMemoPass;
+  const values = read();
+  proof.pass = compilerMemoPass;
   const previous = proof.values;
   if (values.length !== previous.length) return proof.values = values;
   for (let index = 0; index < values.length; index++) {
@@ -9741,7 +9792,7 @@ function useEffectEvent(fn, slot) {
   slot = resolveSlot(slot);
   if (slot === void 0) missingSlot("useEffectEvent");
   const scope = CURRENT_SCOPE;
-  const block = scope.block;
+  const block = CURRENT_BLOCK;
   const rare = blockRare(block);
   if (rare.eventRender === 0) rare.eventRender = 1;
   let s = scope.hooks?.get(slot);
@@ -10894,6 +10945,28 @@ function resumeFreshHydrateSource(source) {
     }
   }
 }
+function renderSuspended(hydration, source) {
+  const claim = hydration.suspendedClaims?.get(source);
+  if (claim !== void 0) {
+    hydration.suspendedClaims.delete(source);
+    hydration.renderClaimed(source, claim[0], claim[1]);
+  } else renderBlock(source);
+}
+function finishRoot(hydration) {
+  let remainder = hydration.rootRemainder === void 0 ? hydration.node : hydration.rootRemainder;
+  while (remainder !== null && (remainder === hydration.rootCleanupBoundary || hydration.freshNodes.has(remainder) || isRendererHydrationStyle(remainder)))
+    remainder = getNextSibling(remainder);
+  if (remainder === null) return;
+  hydration.mismatch(
+    __octaneDev ? componentSourceLoc(hydration.rootBlock.body) : void 0,
+    () => "the end of the root",
+    remainder
+  );
+}
+function keepChanges(hydration) {
+  hydration.undoable = false;
+  hydration.saved = hydration.undo = null;
+}
 function activateHydrateBoundary(state) {
   if (state.start === null || state.end === null) return;
   const block = state.block;
@@ -10934,13 +11007,9 @@ function activateHydrateBoundary(state) {
   let restart;
   try {
     if (preserved === void 0 && state.nativeSeedRaw !== void 0) {
-      hydration.nativeAdoption = ownNativeAdoption(
-        block,
-        (0, import_native_read_seeds.parseNativeSignalManifest)(state.nativeSeedRaw),
-        () => {
-          state.nativeSeedRaw = void 0;
-        }
-      );
+      hydration.nativeAdoption = ownNativeAdoption(block, state.nativeSeedRaw, () => {
+        state.nativeSeedRaw = void 0;
+      });
       (0, import_read_protocol.setNativeAdoptionResolver)(hydration.nativeAdoption.resolve);
     }
     if (preserved?.source !== null && preserved?.source !== void 0) {
@@ -10948,7 +11017,7 @@ function activateHydrateBoundary(state) {
       hydration.node = preserved.cursor;
       try {
         if (preserved.fresh) hydration.suspend(() => resumeFreshHydrateSource(source));
-        else hydration.renderSuspended(source);
+        else renderSuspended(hydration, source);
       } catch (error) {
         if (!isSuspenseException(error)) throw error;
         preserveSuspendedHydrateActivation(state, hydration, error);
@@ -10964,7 +11033,7 @@ function activateHydrateBoundary(state) {
         hydration.claimRootRemainder(getNextSibling(adoptedSlot.end));
       }
       hydration.settleValues();
-      hydration.finishRoot();
+      finishRoot(hydration);
       completed = true;
     }
   } catch (thrown) {
@@ -11052,12 +11121,11 @@ function activateHydrateBoundary(state) {
   }
   if (completed) {
     state.initialCaptures = null;
-    hydration.keepChanges();
+    keepChanges(hydration);
     hydration.passSeeds(previousHydration);
     releasePreservedHydrateActivation(state);
     spliceOffscreenCapture(capture);
   }
-  if (completed && hydration.hasAdjacentRangePair && !hydration.presentation) hydration.coalesce();
 }
 function discardHydrateTail(state) {
   const end = state.end;
@@ -11149,7 +11217,7 @@ function initializeHydrateComponent(boundaryBody) {
         }
         const surroundingUpdate = state.props !== props || state.contextChanged;
         state.props = props;
-        if (!state.independent && !state.hydrated) {
+        if (!state.independent && !state.hydrated && state.serverPreserved) {
           const strategy = resolveHydrateStrategy(state);
           if (strategy._t === "never") {
             cleanupHydrateStrategy(state);
@@ -11367,6 +11435,7 @@ function promoteMemoAncestry(scope) {
 }
 function recordContextDependency(block, context) {
   if (block === null || !block.memoInChain) return;
+  SKIPPED_ROW_REFRESH = refreshSkippedRows;
   (block.$$ctxDirect ??= /* @__PURE__ */ new Map()).set(context, context.$$version);
   for (let current = block; current !== null; current = current.parentBlock) {
     if (current.body?.__memo === true || current.$$implicitBail === true) {
@@ -11691,17 +11760,15 @@ function useThenable(thenable, replaceOnResume = false) {
     return hydration.useSeed(thenable, state, idx, replaceOnResume);
   }
   const stored = state[idx];
+  if (stored !== void 0 && stored !== thenable && !replaceOnResume)
+    thenable = replayThenable(block, stored, thenable);
   if (stored === thenable) {
     if (thenable.status === "fulfilled") return thenable.value;
     if (thenable.status === "rejected") throw thenable.reason;
     throw new SuspenseException(thenable);
   }
-  if (stored !== void 0 && RESUME_REPLAY && !replaceOnResume) {
-    if (__octaneDev) warnUncachedUsePromise(block);
-    if (stored.status === "fulfilled") return stored.value;
-    if (stored.status === "rejected") throw stored.reason;
-    throw new SuspenseException(stored);
-  }
+  if (rare.batchThenables !== void 0)
+    thenable = heldBatchThenable(rare.batchThenables, thenable);
   state[idx] = thenable;
   trackThenable(thenable);
   if (thenable.status === "fulfilled") return thenable.value;
@@ -11710,6 +11777,11 @@ function useThenable(thenable, replaceOnResume = false) {
     warnUseWaterfall(block, idx);
   throw new SuspenseException(thenable);
 }
+function replayThenable(block, kept, thenable) {
+  if (!RESUME_REPLAY) return thenable;
+  if (__octaneDev) warnUncachedUsePromise(block);
+  return kept;
+}
 let SETTLED_WAKEABLES = null;
 function resumeOnSettle(wakeable, retry) {
   const onSettle = SETTLED_WAKEABLES?.has(wakeable) === true ? () => void setTimeout(retry, 0) : () => {
@@ -11770,7 +11842,10 @@ function useBatch(items, warm) {
     if (it == null || typeof it.then !== "function") continue;
     trackThenable(it);
     if (it.status === "rejected") break;
-    if (it.status === "pending") (pending ??= []).push(it);
+    if (it.status === "pending") {
+      pending = holdBatchThenables(items);
+      break;
+    }
   }
   if (pending === null) return;
   runActiveWarmPlans(warm);
@@ -11786,6 +11861,32 @@ function useBatch(items, warm) {
   });
   throw new SuspenseException(combined);
 }
+function holdBatchThenables(items) {
+  const block = CURRENT_BLOCK;
+  const rare = blockRare(block);
+  rare.thenables ??= [];
+  const held = rare.batchThenables ??= [];
+  let pending = null;
+  for (let i = 0, at = rare.thenableIdx * 2; i < items.length; i++) {
+    let it = items[i];
+    if (it == null || typeof it.then !== "function") continue;
+    trackThenable(it);
+    const kept = held[at];
+    if (kept === void 0) held[at] = it;
+    else if (kept !== it) {
+      held[at + 1] = it;
+      it = replayThenable(block, kept, it);
+    }
+    at += 2;
+    if (it.status === "rejected") break;
+    if (it.status === "pending") (pending ??= []).push(it);
+  }
+  return pending;
+}
+function heldBatchThenable(held, thenable) {
+  for (let i = 1; i < held.length; i += 2) if (held[i] === thenable) return held[i - 1];
+  return thenable;
+}
 function registerWarmPlan(fn, props) {
   ACTIVE_WARM_PLANS.push(CURRENT_BLOCK, fn, props);
 }
@@ -12764,7 +12865,6 @@ class HydrationCapability {
    */
   replayDepth = -1;
   seedCursor = 0;
-  hasAdjacentRangePair = false;
   freshNodes = /* @__PURE__ */ new WeakSet();
   unframedRootRanges = /* @__PURE__ */ new WeakMap();
   /** Adopted ranges whose first render suspended, by block, with its slot (renderClaimed). */
@@ -12979,11 +13079,6 @@ class HydrationCapability {
     this.saved = this.undo = null;
     if (undo !== null) for (let i = undo.length - 1; i >= 0; i--) undo[i]();
   }
-  /** An island's attempt completed: it keeps the server nodes it changed. */
-  keepChanges() {
-    this.undoable = false;
-    this.saved = this.undo = null;
-  }
   isActive() {
     return this.depth === 0;
   }
@@ -13163,18 +13258,6 @@ class HydrationCapability {
     this.unclaimed = this.unclaimedScope = null;
     this.slotMismatch(scope, this.unclaimedKey, "a component range", node);
   }
-  /**
-   * Resume `source`, the block that a preserved activation suspended in. A
-   * source whose first render into its adopted range suspended claims that
-   * range again, as the render that suspended did.
-   */
-  renderSuspended(source) {
-    const claim = this.suspendedClaims?.get(source);
-    if (claim !== void 0) {
-      this.suspendedClaims.delete(source);
-      this.renderClaimed(source, claim[0], claim[1]);
-    } else renderBlock(source);
-  }
   /**
    * Open a claim on the server range a slot adopted, whose content starts at
    * `first`, for the first render of that content. Returns what endClaim
@@ -13611,11 +13694,7 @@ class HydrationCapability {
   }
   close(open) {
     const known = this.matchingCloses?.get(open);
-    const found = known ?? findMatchingClose(open, this.matchingCloses ??= /* @__PURE__ */ new WeakMap());
-    if (!this.hasAdjacentRangePair && isBlockOpen((STAGED_DOM ? STAGED_DOM.view(open) : open).previousSibling) && isBlockClose(getNextSibling(found))) {
-      this.hasAdjacentRangePair = true;
-    }
-    return found;
+    return known ?? findMatchingClose(open, this.matchingCloses ??= /* @__PURE__ */ new WeakMap());
   }
   /**
    * Adopt the text of a binding-view text hole whose server range `posNode`
@@ -14481,26 +14560,6 @@ class HydrationCapability {
     if ((STAGED_DOM ? STAGED_DOM.view(root) : root).parentNode === parent) return;
     (STAGED_DOM ? STAGED_DOM.view(parent) : parent).insertBefore(root, block.endMarker);
   }
-  /**
-   * After a Hydrate island's content adopted its server range, a server
-   * sibling left after the island's complete client shape is content the
-   * client renders nothing for: a mismatch, which the island falls back from.
-   * Cursor-based adoption may stop on an owned range marker, and the client
-   * may have built nodes there, so look past both, and past renderer style
-   * sidecars. A root keeps the unmatched siblings in its container, as React
-   * does, so only an island settles its remainder.
-   */
-  finishRoot() {
-    let remainder = this.rootRemainder === void 0 ? this.node : this.rootRemainder;
-    while (remainder !== null && (remainder === this.rootCleanupBoundary || this.freshNodes.has(remainder) || isRendererHydrationStyle(remainder)))
-      remainder = getNextSibling(remainder);
-    if (remainder === null) return;
-    this.mismatch(
-      __octaneDev ? componentSourceLoc(this.rootBlock.body) : void 0,
-      () => "the end of the root",
-      remainder
-    );
-  }
   /**
    * Whether `el`, whose only child is a text value, keeps the server content
    * it holds: React compares such a host's text content as a whole, and under
@@ -14865,13 +14924,6 @@ class HydrationCapability {
     for (const [line, node] of unpatched) if (root.contains(node)) lines.push(line);
     if (lines.length !== 0) warnHydrationUnpatched(lines);
   }
-  coalesce() {
-    const leases = this.rootBlock.idState.renderOwner?.bindingLeases;
-    if (leases !== void 0) {
-      for (const lease of leases) if (lease.revision !== void 0 && lease.active()) return;
-    }
-    coalesceHydratedRanges(this.rootBlock, this.liteRanges);
-  }
 }
 function decodeSeedWire(value) {
   const undefinedWire = import_constants.SUSPENSE_SEED_WIRE_PREFIX + "u";
@@ -15835,33 +15887,15 @@ function setBindingClassIfChanged(value, previous, element, receipt) {
   if (value !== previous) setBindingClass(element, receipt, value);
   return value;
 }
-function hydrationMarkerMultiplicity(data, open) {
-  const marker = open ? import_constants.HYDRATION_START : import_constants.HYDRATION_END;
-  if (data === marker) return 1;
-  if (open && (data === import_constants.HYDRATION_FOR_EMPTY || data === import_constants.HYDRATION_FOR_ITEMS)) return 1;
-  if (open && (data.startsWith(import_dom_binding_protocol.BINDING_OPEN_PREFIX) || data.startsWith(import_hydration_markers.HYDRATION_FOR_PREFIX)) && (0, import_dom_binding_protocol.isBindingOpenComment)(data))
-    return 1;
-  if (data.length < 2 || data.charCodeAt(0) !== marker.charCodeAt(0)) return 0;
-  const first = data.charCodeAt(1);
-  if (first < 49 || first > 57) return 0;
-  let value = first - 48;
-  for (let i = 2; i < data.length; i++) {
-    const digit = data.charCodeAt(i) - 48;
-    if (digit < 0 || digit > 9) return 0;
-    value = value * 10 + digit;
-    if (!Number.isSafeInteger(value)) return 0;
-  }
-  return value >= 2 ? value : 0;
-}
 function isBlockOpen(node) {
   if (node === null || node.nodeType !== 8) return false;
   const data = (STAGED_DOM ? STAGED_DOM.view(node) : node).data;
-  return hydrationMarkerMultiplicity(data, true) > 0;
+  return (0, import_stream_protocol.hydrationMarkerMultiplicity)(data, true) > 0;
 }
 function isBlockClose(node) {
   if (node === null || node.nodeType !== 8) return false;
   const data = (STAGED_DOM ? STAGED_DOM.view(node) : node).data;
-  return data === import_constants.HYDRATION_END || hydrationMarkerMultiplicity(data, false) > 1;
+  return data === import_constants.HYDRATION_END || (0, import_stream_protocol.hydrationMarkerMultiplicity)(data, false) > 1;
 }
 function isTextSeparator(node) {
   return node !== null && node.nodeType === 8 && (STAGED_DOM ? STAGED_DOM.view(node) : node).data === import_constants.HYDRATION_TEXT_SEP;
@@ -15880,9 +15914,9 @@ function findMatchingClose(open, matches) {
       if (!close && !nestedOpen && data.length > 1) {
         const first = data.charCodeAt(0);
         if (first === import_constants.HYDRATION_END.charCodeAt(0)) {
-          close = hydrationMarkerMultiplicity(data, false) > 0;
+          close = (0, import_stream_protocol.hydrationMarkerMultiplicity)(data, false) > 0;
         } else if (first === import_constants.HYDRATION_START.charCodeAt(0)) {
-          nestedOpen = hydrationMarkerMultiplicity(data, true) > 0;
+          nestedOpen = (0, import_stream_protocol.hydrationMarkerMultiplicity)(data, true) > 0;
         }
       }
       if (close) {
@@ -22509,7 +22543,11 @@ function hostComponent(scope, slot, tag, props, childrenBody, anchor) {
     scope.slots[slot] = state;
     const childScope = new ScopeImpl(scope, block);
     state.childScope = childScope;
-    (scope.children ??= []).push({ key: slot, scope: childScope });
+    (scope.children ??= []).push({
+      key: slot,
+      scope: childScope,
+      at: scope._slots === null ? 0 : scope._slots.length
+    });
     domNode(block.parentNode).insertBefore(el2, anchor ?? block.endMarker);
     (scope.cleanups ??= []).push(() => queueRefDetach(state.ref, state.el));
   }
@@ -23836,6 +23874,7 @@ function renderPreparedChildList(state, parentBlock, domParent, preparedList, hy
       tail: null,
       size: 0,
       cachedDeps: null,
+      ctxEpoch: 0,
       emptyBlock: null,
       env: void 0,
       adopt: null,
@@ -23971,6 +24010,7 @@ function renderPreparedChildList(state, parentBlock, domParent, preparedList, hy
       ssrMarkerless,
       normalizeKey
     );
+    if (pure && SKIPPED_ROW_REFRESH) SKIPPED_ROW_REFRESH(state.forSlot, parentBlock);
   }
   if (state.forSlot.adopt !== null) {
     const leftovers = state.forSlot.adopt;
@@ -25139,6 +25179,10 @@ function compilerCacheContext(scope, slotKey, previous, restampMemoAncestors = f
   if (restamp) restampCachedSlotContext(slot);
   return current;
 }
+function compilerOpaqueTag(scope, tag) {
+  if (!scope.block.memoInChain) promoteMemoAncestry(scope);
+  return tag;
+}
 const OBJ_PROTO = Object.prototype;
 function shallowEqualProps(a, b) {
   if (a === b) return true;
@@ -26324,10 +26368,9 @@ function takeInitialSuspenseHydration(state, hydration) {
     nativeRaw
   };
 }
-function finishInitialSuspenseHydration(initial, hydration) {
+function finishInitialSuspenseHydration(initial) {
   for (const node of initial.metadata) (STAGED_DOM ? STAGED_DOM.view(node) : node).remove();
   initial.consume?.();
-  if (hydration.hasAdjacentRangePair) hydration.coalesce();
 }
 function catchesInHydrationFallback(render) {
   const transaction = ROOT_RENDER_TRANSACTION;
@@ -26409,10 +26452,7 @@ function renderInitialSuspenseHydration(state, initial, updated = false) {
   let failure;
   try {
     if (initial.nativeRaw !== null) {
-      hydration.nativeAdoption = ownNativeAdoption(
-        block,
-        (0, import_native_read_seeds.parseNativeSignalManifest)(initial.nativeRaw)
-      );
+      hydration.nativeAdoption = ownNativeAdoption(block, initial.nativeRaw);
       (0, import_read_protocol.setNativeAdoptionResolver)(hydration.nativeAdoption.resolve);
     }
     renderBlock(block);
@@ -26459,7 +26499,7 @@ function renderInitialSuspenseHydration(state, initial, updated = false) {
     initialSuspenseHydrations?.delete(state);
     (capture.renderCleanups ??= []).push((discarded) => {
       if (discarded) return;
-      finishInitialSuspenseHydration(initial, hydration);
+      finishInitialSuspenseHydration(initial);
     });
     spliceOffscreenCapture(capture);
     return;
@@ -26493,10 +26533,10 @@ function renderInitialSuspenseHydration(state, initial, updated = false) {
       adoptServerCatch ? initial.start : void 0,
       adoptServerCatch ? initial.end : void 0
     );
-    if (WIP_CAPTURE === null) finishInitialSuspenseHydration(initial, hydration);
+    if (WIP_CAPTURE === null) finishInitialSuspenseHydration(initial);
     else
       (WIP_CAPTURE.renderCleanups ??= []).push((discarded) => {
-        if (!discarded) finishInitialSuspenseHydration(initial, hydration);
+        if (!discarded) finishInitialSuspenseHydration(initial);
       });
   } finally {
     swapHydration(outerHydration);
@@ -26590,7 +26630,7 @@ function mountTry(state, claimsRetryOwners = false) {
   let nativeAdoption;
   if (import_hydration_flag.hydrating && scopedNativeRaw !== void 0 && !freshBoundary) {
     const boundaryId = streamedBoundaryId;
-    nativeAdoption = ownNativeAdoption(b, (0, import_native_read_seeds.parseNativeSignalManifest)(scopedNativeRaw), () => {
+    nativeAdoption = ownNativeAdoption(b, scopedNativeRaw, () => {
       const stash = typeof window !== "undefined" ? window.$OCTS : void 0;
       if (stash !== void 0) {
         delete stash[boundaryId + "$signals"];
@@ -27820,7 +27860,8 @@ function useActionState(action, initialState, permalinkOrSlot, slot) {
   return [s.state, s.dispatch, s.isPending];
 }
 function findAncestorForm(block) {
-  let n = block.startMarker ?? block.parentNode ?? null;
+  const start = block.startMarker;
+  let n = start ? (STAGED_DOM ? STAGED_DOM.view(start) : start).parentNode : block.parentNode ?? null;
   while (n) {
     if (n.nodeName === "FORM") return n;
     n = (STAGED_DOM ? STAGED_DOM.view(n) : n).parentNode;
@@ -27842,7 +27883,7 @@ function useFormStatus(slot) {
         FORM_STATUS_LISTENERS.get(slotRef.form)?.delete(slotRef.listener);
     });
   }
-  const form = findAncestorForm(block);
+  const form = findAncestorForm(scope.block);
   if (form !== s.form) {
     if (s.form && s.listener) FORM_STATUS_LISTENERS.get(s.form)?.delete(s.listener);
     s.form = form;
@@ -28376,16 +28417,17 @@ function unmountLiteArm(state, detachDom) {
 }
 function replaceSharedBlockBoundary(parent, oldStart, oldEnd, newStart, newEnd) {
   if (oldStart === null || oldEnd === null) return;
-  let block = parent;
-  while (block !== null && block.startMarker === oldStart && block.endMarker === oldEnd) {
+  for (let block = parent; block !== null; block = block.parentBlock) {
+    if (block.startMarker === void 0) continue;
+    if (block.startMarker !== oldStart || block.endMarker !== oldEnd) return;
     journalRootProperty(block, "startMarker", block.startMarker);
     journalRootProperty(block, "endMarker", block.endMarker);
     block.startMarker = newStart;
     block.endMarker = newEnd;
-    block = block.parentBlock;
   }
 }
 function sharesBlockBoundary(parent, start, end) {
+  while (parent !== null && parent.startMarker === void 0) parent = parent.parentBlock;
   return parent !== null && start !== null && end !== null && parent.startMarker === start && parent.endMarker === end;
 }
 function renderBranchSlot(parentScope, slotKey, state, domParent, next, body, marker, env, lite) {
@@ -29258,10 +29300,12 @@ function activityBlock(parentScope, slotKey, domParent, mode, body, anchor, env)
 }
 function forEachSubtreeChild(scope, visit, includeHiddenTry = true) {
   const children = scope.children;
-  if (children !== null) for (let i = 0, n = children.length; i < n; i++) visit(children[i].scope);
   const slots = scope._slots;
+  let c = 0;
   if (slots !== null) {
     for (let i = 0, n = slots.length; i < n; i++) {
+      if (children !== null)
+        for (; c < children.length && children[c].at <= i; c++) visit(children[c].scope);
       const val = slots[i];
       if (val.__kind === "forBlockSlot") {
         for (let b = val.head; b !== null; b = b.nextSibling) visit(b);
@@ -29281,6 +29325,7 @@ function forEachSubtreeChild(scope, visit, includeHiddenTry = true) {
       } else if (val.lite != null) visit(val.lite);
     }
   }
+  if (children !== null) for (; c < children.length; c++) visit(children[c].scope);
 }
 function detachRegisteredSubtreeRefs(scope, out, shouldDetach = true, includeHiddenTry = true, uncommitted = null, activityRefs = null) {
   const deoptRoot = scope.deoptNode;
@@ -29533,6 +29578,7 @@ function forBlock(parentScope, slotKey, domParent, inputItems, getKey, itemBody,
       tail: null,
       size: 0,
       cachedDeps: null,
+      ctxEpoch: 0,
       emptyBlock: null,
       env: void 0,
       adopt: null,
@@ -29649,9 +29695,21 @@ function forBlock(parentScope, slotKey, domParent, inputItems, getKey, itemBody,
       (f & 8) !== 0,
       (f & 16) !== 0
     );
+    if (pure && SKIPPED_ROW_REFRESH) SKIPPED_ROW_REFRESH(state, parentBlock);
   }
   hydration?.parkPast(state.end, parentScope);
 }
+function refreshSkippedRows(list, owner) {
+  const epoch = (0, import_context_epoch.contextEpochNow)();
+  const refresh = list.ctxEpoch !== epoch;
+  if (!refresh && !owner.memoInChain) return;
+  for (let item = list.head; item !== null; item = item.nextSibling) {
+    if (item._slots === null && item.children === null) continue;
+    if (refresh && item.$$ctxDepsEpoch !== epoch) refreshBlockForContext(item);
+    if (owner.memoInChain) restampCachedContextScope(item);
+  }
+  list.ctxEpoch = epoch;
+}
 function keyedForBlock(parentScope, slotKey, domParent, items, getKey, itemBody, flags, deps, emptyBody, anchor, ownEnd, selectionBody, signalSite) {
   if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
   const state = parentScope.slots[slotKey];
@@ -29670,6 +29728,7 @@ function keyedForBlock(parentScope, slotKey, domParent, items, getKey, itemBody,
     flags >>> 6,
     selectionBody
   )) {
+    if (SKIPPED_ROW_REFRESH) SKIPPED_ROW_REFRESH(state, parentScope.block);
     return;
   }
   forBlock(
@@ -30256,7 +30315,13 @@ function reconcileKeyed(parentBlock, state, items, keySource, itemBody, pure, si
         record = journalForSlot(state, true);
         journalShape = false;
       }
-      updateSurvivor(block, newItem, newEnd, itemBody, pure, lite, indexIndependent, state.env);
+      if (pure && indexIndependent && block.props === newItem && block.body === itemBody) {
+        if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__)
+          (0, import_profiling.__profileCount)(import_profiling.ProfileCounter.LIST_UPDATE);
+        block.itemIndex = newEnd;
+      } else {
+        updateSurvivor(block, newItem, newEnd, itemBody, pure, lite, indexIndependent, state.env);
+      }
     }
     oldLast = block.prevSibling;
     newEnd--;
@@ -31006,297 +31071,6 @@ function lis(arr, n) {
   }
   return result;
 }
-function scopeHasFragmentRef(scope) {
-  const fields = scope.refFields;
-  if (fields === null) return false;
-  for (let i = 0; i < fields.length; i += 3) {
-    if (fields[i] === "f") return true;
-  }
-  return false;
-}
-function coalesceHydratedRanges(rootBlock, liteRanges) {
-  const blockGroups = /* @__PURE__ */ new WeakMap();
-  const scopeGroups = /* @__PURE__ */ new WeakMap();
-  const ownerGroups = /* @__PURE__ */ new WeakMap();
-  const groups = [];
-  const seenBlocks = /* @__PURE__ */ new WeakSet();
-  const seenScopes = /* @__PURE__ */ new WeakSet();
-  let redundantMarkers = null;
-  let removalRange = null;
-  function canonicalGroup(group) {
-    let canonical = group;
-    while (canonical.parent !== null) canonical = canonical.parent;
-    while (group.parent !== null && group.parent !== canonical) {
-      const parent = group.parent;
-      group.parent = canonical;
-      group = parent;
-    }
-    return canonical;
-  }
-  function makeGroup(startNode, endNode, block, liteScope, owner) {
-    if (!isBlockOpen(startNode) || !isBlockClose(endNode) || startNode === endNode) return null;
-    if ((0, import_dom_binding_protocol.isBindingOpenComment)((STAGED_DOM ? STAGED_DOM.view(startNode) : startNode).data))
-      return null;
-    if ((STAGED_DOM ? STAGED_DOM.view(startNode) : startNode).parentNode === null || (STAGED_DOM ? STAGED_DOM.view(startNode) : startNode).parentNode !== (STAGED_DOM ? STAGED_DOM.view(endNode) : endNode).parentNode)
-      return null;
-    const openDepth = hydrationMarkerMultiplicity(
-      (STAGED_DOM ? STAGED_DOM.view(startNode) : startNode).data,
-      true
-    );
-    const closeDepth = hydrationMarkerMultiplicity(
-      (STAGED_DOM ? STAGED_DOM.view(endNode) : endNode).data,
-      false
-    );
-    if (openDepth === 0 || openDepth !== closeDepth) return null;
-    const group = {
-      start: startNode,
-      end: endNode,
-      depth: openDepth,
-      parent: null,
-      blocks: block === void 0 ? [] : [block],
-      liteScopes: liteScope === void 0 ? [] : [liteScope],
-      owners: owner === void 0 ? [] : [owner]
-    };
-    groups.push(group);
-    if (block !== void 0) blockGroups.set(block, group);
-    if (liteScope !== void 0) scopeGroups.set(liteScope, group);
-    if (owner !== void 0) ownerGroups.set(owner, group);
-    return group;
-  }
-  function writeMultiplicity(group) {
-    domNode(group.start).data = group.depth === 1 ? import_constants.HYDRATION_START : import_constants.HYDRATION_START + String(group.depth);
-    domNode(group.end).data = group.depth === 1 ? import_constants.HYDRATION_END : import_constants.HYDRATION_END + String(group.depth);
-  }
-  function removeRedundantMarkerRun(anchor, after) {
-    if (redundantMarkers === null) return;
-    const adjacent = after ? getNextSibling(anchor) : (STAGED_DOM ? STAGED_DOM.view(anchor) : anchor).previousSibling;
-    if (adjacent === null || adjacent.nodeType !== 8 || !redundantMarkers.has(adjacent)) {
-      return;
-    }
-    let edge = adjacent;
-    for (; ; ) {
-      const next = after ? getNextSibling(edge) : (STAGED_DOM ? STAGED_DOM.view(edge) : edge).previousSibling;
-      if (next === null || next.nodeType !== 8 || !redundantMarkers.has(next)) break;
-      edge = next;
-    }
-    if (STAGED_DOM) {
-      const first = after ? adjacent : edge;
-      const last = after ? edge : adjacent;
-      removeRange(first, getNextSibling(last));
-      return;
-    }
-    const range = removalRange ??= anchor.ownerDocument.createRange();
-    range.setStartBefore(after ? adjacent : edge);
-    range.setEndAfter(after ? edge : adjacent);
-    range.deleteContents();
-  }
-  function unifySharedPair(outer, inner) {
-    outer = canonicalGroup(outer);
-    inner = canonicalGroup(inner);
-    if (outer === inner) return outer;
-    outer.depth = Math.max(outer.depth, inner.depth);
-    inner.parent = outer;
-    writeMultiplicity(outer);
-    return outer;
-  }
-  function rangesAreExactlyNested(outer, inner) {
-    return domNode(outer.start).parentNode !== null && domNode(outer.start).parentNode === domNode(inner.start).parentNode && domNode(outer.end).parentNode === domNode(outer.start).parentNode && domNode(inner.end).parentNode === domNode(outer.start).parentNode && getNextSibling(outer.start) === inner.start && getNextSibling(inner.end) === outer.end;
-  }
-  function borrowGroupMembers(outer, inner) {
-    for (let i = 0; i < inner.blocks.length; i++) {
-      const block = inner.blocks[i];
-      block.startMarker = outer.start;
-      block.endMarker = outer.end;
-      block.exclusiveMarkers = true;
-    }
-    for (let i = 0; i < inner.liteScopes.length; i++) {
-      inner.liteScopes[i].block.endMarker = outer.end;
-    }
-    for (let i = 0; i < inner.owners.length; i++) {
-      const owner = inner.owners[i];
-      owner.start = outer.start;
-      owner.end = outer.end;
-      if (owner.__kind === "componentSlotSlot") {
-        owner.inherited = true;
-      } else if (owner.__kind === "childSlot") {
-        owner.borrowed = true;
-        if (owner.forSlot !== null) {
-          owner.forSlot.start = outer.start;
-          owner.forSlot.end = outer.end;
-        }
-      } else {
-        owner.borrowed = true;
-      }
-    }
-  }
-  function mergeExactRanges(outer, inner) {
-    outer = canonicalGroup(outer);
-    inner = canonicalGroup(inner);
-    if (outer === inner) return outer;
-    if (outer.start === inner.start && outer.end === inner.end) {
-      return unifySharedPair(outer, inner);
-    }
-    if (!rangesAreExactlyNested(outer, inner)) return outer;
-    const mergedDepth = outer.depth + inner.depth;
-    if (!Number.isSafeInteger(mergedDepth)) return outer;
-    (redundantMarkers ??= /* @__PURE__ */ new Set()).add(inner.start).add(inner.end);
-    outer.depth = mergedDepth;
-    inner.parent = outer;
-    writeMultiplicity(outer);
-    return outer;
-  }
-  function attachOwner(group, owner) {
-    if (group === null) return;
-    group = canonicalGroup(group);
-    if (group.owners.indexOf(owner) === -1) group.owners.push(owner);
-    ownerGroups.set(owner, group);
-  }
-  function isBoundaryOwner(owner) {
-    return (0, import_component_flags.hasComponentFlags)(owner.currentComp, import_component_flags.COMPONENT_FLAG_BOUNDARY);
-  }
-  function mayBorrowCandidate(value) {
-    if (value === null || typeof value !== "object") return false;
-    const kind = value.__kind;
-    if (kind === "componentSlotSlot") {
-      const owner = value;
-      return owner.block !== null && !owner.keyed && !isBoundaryOwner(owner) && !scopeHasFragmentRef(owner.block);
-    }
-    if (kind === "childSlot") {
-      const owner = value;
-      return owner.block !== null && owner.forSlot === null && owner.portal === null && !(0, import_component_flags.hasComponentFlags)(owner.currentComp, import_component_flags.COMPONENT_FLAG_BOUNDARY) && !scopeHasFragmentRef(owner.block);
-    }
-    if (kind === "ifBlockSlot" || kind === "switchBlockSlot") {
-      const owner = value;
-      return owner.block === null || !scopeHasFragmentRef(owner.block);
-    }
-    return liteRanges.has(value) && !scopeHasFragmentRef(value);
-  }
-  function mappedGroup(value) {
-    if (value === null || typeof value !== "object") return void 0;
-    const group = ownerGroups.get(value) ?? scopeGroups.get(value);
-    return group === void 0 ? void 0 : canonicalGroup(group);
-  }
-  function soleRangeCandidate(scope) {
-    let only = void 0;
-    let count = 0;
-    const slots = scope.slots;
-    for (let i = 0; i < slots.length; i++) {
-      if (slots[i] === void 0) continue;
-      only = slots[i];
-      count++;
-      if (count > 1) break;
-    }
-    if (count === 1 && mayBorrowCandidate(only)) {
-      const group = mappedGroup(only);
-      if (group !== void 0) return group;
-    }
-    const registered = scope._slots;
-    if (registered !== null && registered.length === 1 && scope.children === null && registered[0].__kind === "childSlot" && registered[0].compactable && mayBorrowCandidate(registered[0])) {
-      const group = ownerGroups.get(registered[0]);
-      return group === void 0 ? null : canonicalGroup(group);
-    }
-    return null;
-  }
-  function compactScopeRange(scope, own) {
-    visitScopeContents(scope);
-    if (own === null || scopeHasFragmentRef(scope)) return;
-    const candidate = soleRangeCandidate(scope);
-    if (candidate !== null) mergeExactRanges(own, candidate);
-  }
-  function visitBlock(block, owner) {
-    if (seenBlocks.has(block)) {
-      const existing = blockGroups.get(block) ?? null;
-      if (owner !== void 0) attachOwner(existing, owner);
-      return existing;
-    }
-    seenBlocks.add(block);
-    const own = makeGroup(block.startMarker, block.endMarker, block, void 0, owner);
-    compactScopeRange(block, own);
-    return blockGroups.get(block) ?? own;
-  }
-  function visitNestedScope(scope) {
-    if (seenScopes.has(scope)) return scopeGroups.get(scope) ?? null;
-    seenScopes.add(scope);
-    const range = liteRanges.get(scope);
-    const own = range === void 0 ? null : makeGroup(range.start, range.end, void 0, scope, void 0);
-    compactScopeRange(scope, own);
-    return scopeGroups.get(scope) ?? own;
-  }
-  function visitForSlot(state) {
-    for (let block = state.head; block !== null; block = block.nextSibling) visitBlock(block);
-    if (state.emptyBlock !== null) visitBlock(state.emptyBlock);
-  }
-  function visitBranchSlot(state) {
-    const inner = state.block === null ? null : visitBlock(state.block);
-    const outer = makeGroup(state.start, state.end, void 0, void 0, state);
-    if (outer !== null && inner !== null && !scopeHasFragmentRef(state.block)) {
-      mergeExactRanges(outer, inner);
-    }
-  }
-  function visitSlot(state, scope) {
-    const kind = state.__kind;
-    if (kind === "componentSlotSlot") {
-      if (state.block !== null) visitBlock(state.block, state);
-      return;
-    }
-    if (kind === "childSlot") {
-      const child2 = state;
-      if (child2.block !== null) visitBlock(child2.block, child2);
-      else if (child2.borrowed) {
-        const own = blockGroups.get(scope.block);
-        if (own !== void 0 && child2.start === own.start && child2.end === own.end)
-          attachOwner(own, child2);
-      }
-      if (child2.forSlot !== null) visitForSlot(child2.forSlot);
-      if (child2.portal?.block != null) visitBlock(child2.portal.block);
-      return;
-    }
-    if (kind === "ifBlockSlot" || kind === "switchBlockSlot") {
-      visitBranchSlot(state);
-      return;
-    }
-    if (kind === "forBlockSlot") {
-      visitForSlot(state);
-      return;
-    }
-    if (kind === "trySlotSlot") {
-      const visible = state.block;
-      const persistent = state.tryBlock;
-      if (visible !== null) visitBlock(visible);
-      if (persistent !== null && persistent !== visible) visitBlock(persistent);
-      return;
-    }
-    if (kind === "activityBlockSlot" || kind === "portalSlotSlot") {
-      if (state.block !== null) visitBlock(state.block);
-      return;
-    }
-    if (state.block != null) visitBlock(state.block);
-  }
-  function visitScopeContents(scope) {
-    const children = scope.children;
-    if (children !== null)
-      for (let i = 0; i < children.length; i++) visitNestedScope(children[i].scope);
-    const registered = scope._slots;
-    if (registered === null) return;
-    for (let i = 0; i < registered.length; i++) visitSlot(registered[i], scope);
-  }
-  visitBlock(rootBlock);
-  for (let i = 0; i < groups.length; i++) {
-    const group = groups[i];
-    const canonical = canonicalGroup(group);
-    if (group.start !== canonical.start || group.end !== canonical.end) {
-      borrowGroupMembers(canonical, group);
-    }
-  }
-  if (redundantMarkers !== null) {
-    for (let i = 0; i < groups.length; i++) {
-      const group = groups[i];
-      if (group.parent !== null) continue;
-      removeRedundantMarkerRun(group.start, true);
-      removeRedundantMarkerRun(group.end, false);
-    }
-  }
-}
 function registerEnabledRootErrorHandlers(root, options) {
   if (options === void 0) return;
   const { onCaughtError, onUncaughtError, onRecoverableError } = options;
@@ -32006,7 +31780,7 @@ function hydrateRootWithOutputHandler(container, bodyOrElement, propsOrOptions,
   registerRootErrorHandlers = registerEnabledRootErrorHandlers;
   assertValidRootContainer(container);
   installHydrationDriver();
-  (0, import_early_values.installEarlyControlBridge)();
+  (0, import_read_protocol.startEarlySignalHydration)(import_early_values.installEarlyControlBridge);
   let body;
   let props;
   let rootKey = null;
@@ -32053,17 +31827,16 @@ function hydrateRootWithOutputHandler(container, bodyOrElement, propsOrOptions,
   if (controlLeases !== void 0 && new Set(controlLeases.map((lease) => lease.control)).size !== controlLeases.length)
     throw new Error((0, import_error_codes_client_generated.formatClientError)(78));
   const signalOwner = rootOptions?.signalOwner ?? (import_document_owner.signalDocumentEnabled ? (0, import_document_owner.documentSignalOwner)(container) : void 0);
-  const initialDocumentSignals = rootOptions?.initialDocumentSignals === void 0 ? void 0 : (0, import_native_read_seeds.captureInitialDocumentSignals)(
+  const initialDocumentSignals = rootOptions?.initialDocumentSignals === void 0 ? void 0 : import_read_protocol.nativeSignalHydration ? (0, import_native_read_seeds.captureInitialDocumentSignals)(
     rootOptions.initialDocumentSignals,
     (signalOwner?.documentOwner ?? signalOwner)?.scopeKey ?? "octane:document"
-  );
+  ) : (0, import_data_encoding.snapshotSignalValue)(rootOptions.initialDocumentSignals);
   const nativeSidecar = findHydrateSeedSidecar(container, import_native_read_seeds.NATIVE_SIGNAL_SEED_ATTR);
-  const nativeManifest = nativeSidecar === null ? void 0 : (0, import_native_read_seeds.materializeNativeSignalManifest)(
-    (0, import_native_read_seeds.parseNativeSignalManifest)(
-      (STAGED_DOM ? STAGED_DOM.view(nativeSidecar) : nativeSidecar).textContent || ""
-    ),
+  const nativeRaw = nativeSidecar === null ? void 0 : (STAGED_DOM ? STAGED_DOM.view(nativeSidecar) : nativeSidecar).textContent || "";
+  const nativeManifest = nativeRaw !== void 0 && import_read_protocol.nativeSignalHydration ? (0, import_native_read_seeds.materializeNativeSignalManifest)(
+    (0, import_native_read_seeds.parseNativeSignalManifest)(nativeRaw),
     initialDocumentSignals
-  );
+  ) : nativeRaw;
   (STAGED_DOM ? STAGED_DOM.view(nativeSidecar) : nativeSidecar)?.remove();
   const ownerToken = claimRootContainer(container);
   registerDelegationTarget(container, true);
@@ -32179,15 +31952,22 @@ function hydrateRootWithOutputHandler(container, bodyOrElement, propsOrOptions,
         });
       };
     }
-    if (nativeManifest !== void 0)
-      hydration.nativeAdoption = ownNativeAdoption(rootBlock, nativeManifest);
     hydration.passthroughRoot = hydration.passthroughRanges = body[import_constants.HYDRATION_RANGE_BOUNDARY] === "passthrough";
     const previousHydration = currentHydration;
     swapHydration(hydration);
-    const previousNative = (0, import_read_protocol.setNativeAdoptionResolver)(hydration.nativeAdoption?.resolve ?? null);
+    const previousNative = (0, import_read_protocol.setNativeAdoptionResolver)(null);
     let completed = false;
     let nativeRecovery;
     try {
+      if (owner.initialDocumentSignals !== void 0 && import_read_protocol.nativeSignalHydration)
+        owner.initialDocumentSignals = (0, import_native_read_seeds.captureInitialDocumentSignals)(
+          owner.initialDocumentSignals,
+          (signalOwner?.documentOwner ?? signalOwner)?.scopeKey ?? "octane:document"
+        );
+      if (nativeManifest !== void 0) {
+        hydration.nativeAdoption = ownNativeAdoption(rootBlock, nativeManifest);
+        (0, import_read_protocol.setNativeAdoptionResolver)(hydration.nativeAdoption.resolve);
+      }
       if (firstNode?.nodeType === 8 && (STAGED_DOM ? STAGED_DOM.view(firstNode) : firstNode).data === body[BINDING_VIEW_ROOT]) {
         rootBlock.startMarker = firstNode;
         rootBlock.endMarker = hydration.close(firstNode);
@@ -32258,7 +32038,6 @@ function hydrateRootWithOutputHandler(container, bodyOrElement, propsOrOptions,
       return;
     }
     if (!completed) return;
-    if (hydration.hasAdjacentRangePair && !hydration.presentation) hydration.coalesce();
     owner.retry = () => {
       if (!rootBlock.disposed) scheduleRender(rootBlock);
     };
@@ -32798,6 +32577,7 @@ function scriptResource(attrs) {
   compilerCacheMappedArray,
   compilerMemoRegion,
   compilerMemoWitness,
+  compilerOpaqueTag,
   compilerOwnsContextProvider,
   componentSlot,
   componentSlotLite,