octane 0.3.2 → 0.3.4

package/dist/runtime.js

@@ -544,7 +544,8 @@ function scopeSignalOwner(scope) {
 }
 function runWithBlockSignalOwner(scope, callback) {
   const owner = scopeSignalOwner(scope);
-  if (owner !== void 0) STREAMED_SIGNAL_OWNER_ACTIVATOR?.(owner);
+  if (owner !== void 0 && (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null))
+    STREAMED_SIGNAL_OWNER_ACTIVATOR?.(owner);
   return owner === void 0 || currentSignalOwner() === owner ? callback() : runWithSignalOwner(owner, callback);
 }
 import { readNativeDomStyle as readNativeDomStyle2, readNativeDomProps } from "./signals/read-protocol.js";
@@ -639,6 +640,8 @@ function nativeProjectionBinding(owner, slotIndex, el, compute, fields) {
   nativePresentationBinding(owner, slotIndex, el, nativeProjectionBody, { el, compute, fields });
 }
 function nativePresentationBinding(owner, slotIndex, el, body, props) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null && el.ownerDocument !== hydrateAttributeProbe.document)
+    throw new PresentationAdoptionMiss(void 0, false);
   let binding = owner.slots[slotIndex];
   if (binding === void 0) {
     const block = createBlock("control-flow", owner.block, el, null, null, body, props);
@@ -670,6 +673,8 @@ function enableNativeReadCollection(abi = 1) {
   ensureNativeReadDriver();
 }
 function beginNativeReadScope(scope, abi = 1) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null)
+    throw new PresentationAdoptionMiss(void 0, false);
   if (abi !== 1) throw new Error(formatClientError(58));
   const block = CURRENT_BLOCK;
   const owner = scope ?? CURRENT_SCOPE;
@@ -677,6 +682,7 @@ function beginNativeReadScope(scope, abi = 1) {
   return ensureNativeReadDriver().beginScope(owner, block);
 }
 function beginActiveNativeReadScope(scope) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return -1;
   const block = CURRENT_BLOCK;
   return block === null ? -1 : NATIVE_READ_DRIVER.beginScope(scope, block);
 }
@@ -911,13 +917,13 @@ function hydrationMismatchMode(el) {
 }
 function warnHydrationValueMismatch(loc, what, serverVal, clientVal) {
   if (process.env.NODE_ENV === "production") return;
-  if (!loc) return;
+  if (!loc || hydrateAttributeProbe !== null) return;
   console.error(
     `Octane hydration mismatch at ${loc}: server rendered ${what} ${JSON.stringify(serverVal)} but the client rendered ${JSON.stringify(clientVal)}. The client value was used. If this difference is intentional (e.g. a timestamp or random id), add suppressHydrationWarning to the element.`
   );
 }
 function warnHydrationKeptServerValue(loc, what, serverVal, clientVal) {
-  if (process.env.NODE_ENV === "production" || !loc) return;
+  if (process.env.NODE_ENV === "production" || !loc || hydrateAttributeProbe !== null) return;
   console.error(
     `Octane hydration mismatch at ${loc}: server rendered ${what} ${JSON.stringify(serverVal)} but the client rendered ${JSON.stringify(clientVal)}. The server value was kept. If this difference is intentional, add suppressHydrationWarning to the element.`
   );
@@ -936,7 +942,7 @@ function describeHydrationNode(node) {
 }
 function warnHydrationStructuralMismatch(loc, expected, actual) {
   if (process.env.NODE_ENV === "production") return;
-  if (!loc) return;
+  if (!loc || hydrateAttributeProbe !== null) return;
   console.error(
     `Octane hydration mismatch at ${loc}: the client expected ${expected} but the server rendered ${actual}. The mismatched subtree was rebuilt on the client.`
   );
@@ -6426,7 +6432,8 @@ function captureRenderPhaseUpdate(cell, key) {
 function renderBlock(block) {
   if (signalDocumentEnabled || block.idState.renderOwner?.signalOwner !== void 0) {
     const owner = scopeSignalOwner(block);
-    if (owner !== void 0) STREAMED_SIGNAL_OWNER_ACTIVATOR?.(owner);
+    if (owner !== void 0 && (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null))
+      STREAMED_SIGNAL_OWNER_ACTIVATOR?.(owner);
     if (owner !== void 0 && currentSignalOwner() !== owner) {
       runWithSignalOwner(owner, () => renderBlock(block));
       return;
@@ -6585,7 +6592,13 @@ function renderBlockInner(block) {
     block.__thenableDone = false;
   }
   if (block.$$ctxReads !== null) block.$$ctxReads.clear();
-  if (block.$$ctxDirect !== null) block.$$ctxDirect.clear();
+  if (block.$$ctxDirect !== null) {
+    const state = block.slots[0];
+    if (state?.__kind === "hydrateBlockSlot" && state.parentBlock === block && !state.independent && !state.hydrated) {
+      state.contextChanged = block.$$ctxDepsEpoch !== contextEpochNow() && ctxDirectChanged(block);
+    }
+    block.$$ctxDirect.clear();
+  }
   block.$$ctxDepsEpoch = contextEpochNow();
   block.currentRenderMode = urgentTransitionRender !== null ? "urgent" : block.pendingMode ?? prevBlock?.currentRenderMode ?? "urgent";
   block.currentRenderDeferred = urgentTransitionRender !== null ? false : block.pendingMode !== null ? block.pendingDeferred : prevBlock?.currentRenderDeferred ?? false;
@@ -6610,7 +6623,9 @@ function renderBlockInner(block) {
       renderRetry = true;
       return true;
     }
-    if (out !== void 0 && block.outputHandler !== null) block.outputHandler(block, out);
+    if (block.outputHandler !== null && (out !== void 0 || block.slots[0]?.returnedOutput === true)) {
+      block.outputHandler(block, out ?? null);
+    }
     finishEffectRender(block);
     if (!block.mounted) block.mounted = true;
     if (block.renderStatus === RENDER_RETRYING) block.renderStatus = RENDER_VALID;
@@ -6669,6 +6684,14 @@ function renderBlockInner(block) {
     }
   }
 }
+let RETURNED_OUTPUT_SCOPE = null;
+function setReturnedOutputOwner(state, returned) {
+  if (state.returnedOutput === returned) return;
+  if (TRANSITION_JOURNAL !== null && !ROOT_RENDER_ROLLBACK) {
+    TRANSITION_JOURNAL.push(JOURNAL_PROP, state, "returnedOutput", state.returnedOutput);
+  }
+  state.returnedOutput = returned;
+}
 function returnSlotTail(block, state) {
   const candidates = [
     state?.end,
@@ -6685,59 +6708,82 @@ function returnSlotTail(block, state) {
   }
   return null;
 }
-function renderReturnedValue(block, out) {
-  const isComponentDescriptor = out !== null && out.$$kind === ELEMENT_TAG && out.key == null && typeof out.type === "function";
-  const existingRet = block.slots[0];
-  let replacedStart = null;
-  let replacedEnd = null;
-  const useSingleRoot = isComponentDescriptor && (out.type.$$singleRoot === true || activeHydration()?.passthroughRanges === true || // STICKY regime: a return slot mounted through the componentSlot route
-  // (most importantly by the passthrough-hydration branch above, whose
-  // condition is false again once hydration ends) keeps that route while
-  // the returned component identity is unchanged. Falling through to the
-  // childSlot route would dispose the slot for a mere kind flip — tearing
-  // down the very subtree hydration just adopted on its FIRST update. An
-  // identity change still disposes below (matching remount semantics).
-  existingRet !== void 0 && existingRet.__kind === "componentSlotSlot" && existingRet.currentComp === out.type);
-  if (existingRet !== void 0 && existingRet.__kind !== (useSingleRoot ? "componentSlotSlot" : "childSlot")) {
-    const swapDriver = TRANSITION_SWAP_DRIVER;
-    const transitionMode = block.currentRenderMode === "transition";
-    const committedSuspense = swapDriver !== null && activeHydration() === null && preservesCommittedSuspense(block);
-    const transitionSwap = ROOT_RENDER_TRANSACTION === null || committedSuspense ? swapDriver : null;
-    const suspenseSwap = transitionSwap !== null && !transitionMode && activeHydration() === null && committedSuspense;
-    if (transitionSwap !== null && activeHydration() === null && (transitionMode || suspenseSwap)) {
-      const tail = returnSlotTail(block, existingRet);
-      if (tail !== null) {
-        const probe = transitionSwap.render(
-          block,
-          block.parentNode,
-          tail,
-          ROOT_RENDERABLE_BODY,
-          out,
-          renderReturnedValue
-        );
-        transitionSwap.dispose(probe.wip);
-        if (probe.failed) throw probe.error;
-        if (probe.suspended) throw new SuspenseException(probe.suspended);
-      }
+function renderReturnedValue(block, out, reset) {
+  const previous = RETURNED_OUTPUT_SCOPE;
+  RETURNED_OUTPUT_SCOPE = block;
+  try {
+    if (reset === true) {
+      const state2 = block.slots[0];
+      if (state2 !== void 0) disposeReturnSlot(block, state2);
+      return;
     }
-    if (ROOT_RENDER_TRANSACTION !== null && !existingRet.inherited && !existingRet.borrowed && existingRet.ownerHost == null) {
-      const first = existingRet.start ?? existingRet.hostNode ?? existingRet.text ?? existingRet.block?.startMarker ?? existingRet.end ?? null;
-      const last = existingRet.end ?? existingRet.block?.endMarker ?? first;
-      if (sharesBlockBoundary(block, first, last)) {
-        replacedStart = first;
-        replacedEnd = last;
+    const isComponentDescriptor = out !== null && out.$$kind === ELEMENT_TAG && out.key == null && typeof out.type === "function";
+    const existingRet = block.slots[0];
+    let replacedStart = null;
+    let replacedEnd = null;
+    const useSingleRoot = isComponentDescriptor && (out.type.$$singleRoot === true || activeHydration()?.passthroughRanges === true || // STICKY regime: a return slot mounted through the componentSlot route
+    // (most importantly by the passthrough-hydration branch above, whose
+    // condition is false again once hydration ends) keeps that route while
+    // the returned component identity is unchanged. Falling through to the
+    // childSlot route would dispose the slot for a mere kind flip — tearing
+    // down the very subtree hydration just adopted on its FIRST update. An
+    // identity change still disposes below (matching remount semantics).
+    existingRet !== void 0 && existingRet.__kind === "componentSlotSlot" && existingRet.currentComp === out.type);
+    if (existingRet !== void 0 && existingRet.__kind !== (useSingleRoot ? "componentSlotSlot" : "childSlot")) {
+      const swapDriver = TRANSITION_SWAP_DRIVER;
+      const transitionMode = block.currentRenderMode === "transition";
+      const committedSuspense = swapDriver !== null && activeHydration() === null && preservesCommittedSuspense(block);
+      const transitionSwap = ROOT_RENDER_TRANSACTION === null || committedSuspense ? swapDriver : null;
+      const suspenseSwap = transitionSwap !== null && !transitionMode && activeHydration() === null && committedSuspense;
+      if (transitionSwap !== null && activeHydration() === null && (transitionMode || suspenseSwap)) {
+        const tail = returnSlotTail(block, existingRet);
+        if (tail !== null) {
+          const probe = transitionSwap.render(
+            block,
+            block.parentNode,
+            tail,
+            ROOT_RENDERABLE_BODY,
+            out,
+            renderReturnedValue
+          );
+          transitionSwap.dispose(probe.wip);
+          if (probe.failed) throw probe.error;
+          if (probe.suspended) throw new SuspenseException(probe.suspended);
+        }
       }
+      if (ROOT_RENDER_TRANSACTION !== null && !existingRet.inherited && !existingRet.borrowed && existingRet.ownerHost == null) {
+        const first = existingRet.start ?? existingRet.hostNode ?? existingRet.text ?? existingRet.block?.startMarker ?? existingRet.end ?? null;
+        const last = existingRet.end ?? existingRet.block?.endMarker ?? first;
+        if (sharesBlockBoundary(block, first, last)) {
+          replacedStart = first;
+          replacedEnd = last;
+        }
+      }
+      disposeReturnSlot(block, existingRet);
+      if (block.disposed) return;
     }
-    disposeReturnSlot(block, existingRet);
-    if (block.disposed) return;
-  }
-  if (useSingleRoot) {
-    const d = out;
-    if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__ && !__profileHasComponentMetadata(d.type)) {
-      withProfileComponentOverride(
-        d.type,
-        null,
-        () => componentSlot(
+    if (useSingleRoot) {
+      const d = out;
+      if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__ && !__profileHasComponentMetadata(d.type)) {
+        withProfileComponentOverride(
+          d.type,
+          null,
+          () => componentSlot(
+            block,
+            0,
+            block.parentNode,
+            d.type,
+            d.props,
+            block.endMarker,
+            d.key ?? void 0,
+            true,
+            void 0,
+            activeHydration() !== null && elementKeyWasProvided(d),
+            d.__octaneInvocationSite
+          )
+        );
+      } else {
+        componentSlot(
           block,
           0,
           block.parentNode,
@@ -6749,66 +6795,63 @@ function renderReturnedValue(block, out) {
           void 0,
           activeHydration() !== null && elementKeyWasProvided(d),
           d.__octaneInvocationSite
-        )
-      );
+        );
+      }
     } else {
-      componentSlot(
-        block,
-        0,
-        block.parentNode,
-        d.type,
-        d.props,
-        block.endMarker,
-        d.key ?? void 0,
-        true,
-        void 0,
-        activeHydration() !== null && elementKeyWasProvided(d),
-        d.__octaneInvocationSite
-      );
+      const returnHydration = activeHydration();
+      if (returnHydration !== null && block.slots[0] === void 0 && block.startMarker !== null && block.endMarker !== null && block.startMarker !== block.endMarker && block.startMarker.nodeType === 8 && block.endMarker.nodeType === 8 && (getNextSibling(block.startMarker) === block.endMarker || returnHydration.isUnframedRootRange(block.startMarker, block.endMarker))) {
+        const borrowed = {
+          __kind: "childSlot",
+          start: block.startMarker,
+          end: block.endMarker,
+          ownerHost: null,
+          borrowed: true,
+          compactable: false,
+          block: null,
+          text: null,
+          currentComp: null,
+          currentIsBodyFn: false,
+          forSlot: null,
+          hostNode: null,
+          portal: null
+        };
+        block.slots[0] = borrowed;
+        registerSlot(block, borrowed);
+      }
+      childSlot(block, 0, block.parentNode, out, block.endMarker);
     }
-  } else {
-    const returnHydration = activeHydration();
-    if (returnHydration !== null && block.slots[0] === void 0 && block.startMarker !== null && block.endMarker !== null && block.startMarker !== block.endMarker && block.startMarker.nodeType === 8 && block.endMarker.nodeType === 8 && (getNextSibling(block.startMarker) === block.endMarker || returnHydration.isUnframedRootRange(block.startMarker, block.endMarker))) {
-      const borrowed = {
-        __kind: "childSlot",
-        start: block.startMarker,
-        end: block.endMarker,
-        ownerHost: null,
-        borrowed: true,
-        compactable: false,
-        block: null,
-        text: null,
-        currentComp: null,
-        currentIsBodyFn: false,
-        forSlot: null,
-        hostNode: null,
-        portal: null
-      };
-      block.slots[0] = borrowed;
-      registerSlot(block, borrowed);
+    if (replacedStart !== null) {
+      const incoming = block.slots[0];
+      const first = incoming.start ?? incoming.hostNode ?? incoming.text ?? incoming.block?.startMarker ?? incoming.end ?? null;
+      const last = incoming.end ?? incoming.block?.endMarker ?? first;
+      replaceSharedBlockBoundary(block, replacedStart, replacedEnd, first, last);
     }
-    childSlot(block, 0, block.parentNode, out, block.endMarker);
-  }
-  if (replacedStart !== null) {
-    const incoming = block.slots[0];
-    const first = incoming.start ?? incoming.hostNode ?? incoming.text ?? incoming.block?.startMarker ?? incoming.end ?? null;
-    const last = incoming.end ?? incoming.block?.endMarker ?? first;
-    replaceSharedBlockBoundary(block, replacedStart, replacedEnd, first, last);
+    const state = block.slots[0];
+    if (!block.disposed && state !== void 0 && state.returnedOutput !== true) {
+      if (TRANSITION_JOURNAL !== null && !ROOT_RENDER_ROLLBACK) {
+        TRANSITION_JOURNAL.push(JOURNAL_PROP, state, "returnedOutput", state.returnedOutput);
+      }
+      state.returnedOutput = true;
+    }
+  } finally {
+    RETURNED_OUTPUT_SCOPE = previous;
   }
 }
 function disposeReturnSlot(block, state) {
+  const kind = state.__kind;
+  const end = (kind === "ifBlockSlot" || kind === "switchBlockSlot") && state.start === null && state.block?.endMarker != null ? state.block.endMarker : state.end;
   const transaction = ROOT_RENDER_TRANSACTION;
   if (transaction !== null && !transaction.aborted && !ROOT_RENDER_ROLLBACK) {
     const parent = state.ownerHost ?? block.parentNode;
     const borrowed = state.inherited === true || state.borrowed === true;
-    let first = state.ownerHost != null || borrowed && state.start === null ? getFirstChild(parent) : borrowed ? getNextSibling(state.start) : state.start ?? state.hostNode ?? state.text ?? state.block?.startMarker ?? state.end ?? null;
-    if (borrowed && first === state.end) first = null;
-    const last = first === null ? null : state.ownerHost != null || borrowed && state.end === null ? (STAGED_DOM?.view(parent) ?? parent).lastChild : borrowed ? domNode(state.end).previousSibling : state.end ?? state.block?.endMarker ?? first;
+    let first = state.ownerHost != null || borrowed && state.start === null ? getFirstChild(parent) : borrowed ? getNextSibling(state.start) : state.start ?? state.hostNode ?? state.text ?? state.block?.startMarker ?? end ?? null;
+    if (borrowed && first === end) first = null;
+    const last = first === null ? null : state.ownerHost != null || borrowed && end === null ? (STAGED_DOM?.view(parent) ?? parent).lastChild : borrowed ? domNode(end).previousSibling : end ?? state.block?.endMarker ?? first;
     journalRootSlot(
       state,
       parent,
       borrowed ? state.start : first !== null ? (STAGED_DOM?.view(first) ?? first).previousSibling : (STAGED_DOM?.view(parent) ?? parent).lastChild,
-      borrowed ? state.end : (STAGED_DOM?.view(last) ?? last)?.nextSibling ?? null
+      borrowed ? end : (STAGED_DOM?.view(last) ?? last)?.nextSibling ?? null
     );
     const retiredBlock = state.block ?? state.portal?.block;
     if (retiredBlock != null) retireRootBlock(retiredBlock);
@@ -6831,7 +6874,7 @@ function disposeReturnSlot(block, state) {
     block.slots[0] = void 0;
     return;
   }
-  if (state.__kind === "childSlot") {
+  if (kind === "childSlot") {
     if (state.portal) {
       teardownPortalState(state.portal);
       state.portal = null;
@@ -6845,13 +6888,17 @@ function disposeReturnSlot(block, state) {
     clearChildContent(state);
     if (!state.borrowed) {
       domNode(state.start)?.remove();
-      domNode(state.end)?.remove();
+      domNode(end)?.remove();
     }
   } else {
-    if (state.block) unmountBlock(state.block, true);
-    if (!state.inherited) {
+    if (kind === "componentSlotSlot") {
+      if (state.block) unmountBlock(state.block, true);
+    } else {
+      unmountSlot(state, true);
+    }
+    if (!state.inherited && !state.borrowed) {
       domNode(state.start)?.remove?.();
-      domNode(state.end)?.remove?.();
+      domNode(end)?.remove?.();
     }
   }
   const reg = block._slots;
@@ -7239,6 +7286,8 @@ function resolveSlot(slot) {
   return typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__ ? __profileResolveHook(resolved, typeof slot === "symbol" ? slot : void 0) : resolved;
 }
 function nativeLocalHook(name, initialize, dispose, slot) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null)
+    throw new PresentationAdoptionMiss(void 0, false);
   slot = resolveSlot(slot);
   if (slot === void 0 || CURRENT_SCOPE === null) missingSlot(name);
   const scope = CURRENT_SCOPE;
@@ -8349,6 +8398,10 @@ function renderSharedBody(body, props, scope, extra) {
   }
 }
 function invalidateSharedBodyOutput(scope) {
+  const state = scope.slots[0];
+  if (scope === scope.block && scope.block.outputHandler !== null && (state?.__kind === "childSlot" || state?.__kind === "componentSlotSlot" || state?.__kind === "ifBlockSlot" || state?.__kind === "switchBlockSlot" || state?.__kind === "activityBlockSlot")) {
+    setReturnedOutputOwner(state, true);
+  }
   const first = scope.compilerMemo;
   if (first === null) return;
   invalidateSharedBodyMemoRegion(first);
@@ -8374,13 +8427,16 @@ function provideContext(scope, context, value) {
       if (had) values.set(context, previous);
       else values.delete(context);
     });
-  if (had) {
+  if (had && (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null)) {
     context.$$version++;
     bumpContextEpoch();
   }
   values.set(context, value);
 }
 const CHILDREN_BODY = /* @__PURE__ */ Symbol.for("octane.childrenBody");
+const CHILDREN_DIAGNOSTIC_CAPTURES = /* @__PURE__ */ Symbol.for(
+  "octane.childrenDiagnosticCaptures"
+);
 function markSingleRoot(component) {
   component.$$singleRoot = true;
   return component;
@@ -8389,6 +8445,10 @@ function markChildrenBlock(fn, body) {
   if (typeof fn === "function") {
     fn[CHILDREN_BLOCK] = true;
     if (body !== void 0) fn[CHILDREN_BODY] = body;
+    if (process.env.NODE_ENV !== "production") {
+      const captures = arguments[2];
+      if (captures !== void 0) fn[CHILDREN_DIAGNOSTIC_CAPTURES] = captures;
+    }
   }
   return fn;
 }
@@ -8538,6 +8598,233 @@ const HYDRATE_STREAM_SCAN_MASK = 1 | 128;
 let hydrateStreamWaitCleanups = null;
 let preservedHydrateActivations = null;
 let preservedHydrateActivationCount = 0;
+let initialHydrateAttributes = null;
+let hydrateAttributeProbe = null;
+function copyHydrateDiagnosticIds(ids) {
+  const first = { prefix: ids.prefix, next: ids.next };
+  let copy = first;
+  while (true) {
+    if (ids.limit !== void 0) copy.limit = ids.limit;
+    if (ids.signalState !== void 0) copy.signalState = { ...ids.signalState };
+    if (ids.overflow === void 0) return first;
+    ids = ids.overflow;
+    copy = copy.overflow = { prefix: ids.prefix, next: ids.next };
+  }
+}
+function copyHydrateDiagnosticContexts(scope) {
+  let contexts = null;
+  const add = (values) => {
+    if (values === null) return;
+    for (const [context, value] of values) {
+      contexts ??= /* @__PURE__ */ new Map();
+      if (!contexts.has(context)) contexts.set(context, value);
+    }
+  };
+  for (let current = scope; current !== null; current = current.parent)
+    add(current.$$ctxValues);
+  for (let block = scope.block.parentBlock; block !== null; block = block.parentBlock)
+    add(block.$$ctxValues);
+  return contexts;
+}
+function changedHydrateDiagnosticContexts(initial, next) {
+  if ((initial?.size ?? 0) !== (next?.size ?? 0)) return true;
+  if (initial !== null) {
+    for (const [context, value] of initial) {
+      if (next === null || !next.has(context) || !Object.is(value, next.get(context))) return true;
+    }
+  }
+  return false;
+}
+function changedHydrateDiagnosticCaptures(initial, next) {
+  if (initial.__data === void 0 || next.__data === void 0)
+    return changedHydrateDiagnosticChildren(initial.children, next.children);
+  if (initial.__data.length !== next.__data.length) return true;
+  for (let i = 0; i < initial.__data.length; i++) {
+    if (!Object.is(initial.__data[i], next.__data[i])) return true;
+  }
+  return false;
+}
+function changedHydrateDiagnosticChildren(initial, next) {
+  if (initial === next) return false;
+  if (typeof initial !== "function" || typeof next !== "function") return true;
+  try {
+    const body = initial[CHILDREN_BODY];
+    const initialCaptures = initial[CHILDREN_DIAGNOSTIC_CAPTURES];
+    const nextCaptures = next[CHILDREN_DIAGNOSTIC_CAPTURES];
+    if (initialCaptures === void 0 && nextCaptures === void 0 && isChildrenBlock(initial) && isChildrenBlock(next))
+      return false;
+    if (body === void 0 || body !== next[CHILDREN_BODY] || initialCaptures == null || nextCaptures == null)
+      return true;
+    const before = initialCaptures();
+    const after = nextCaptures();
+    if (before.length !== after.length) return true;
+    for (let i = 0; i < before.length; i++) {
+      if (!Object.is(before[i], after[i])) return true;
+    }
+    return false;
+  } catch {
+    return true;
+  }
+}
+function recordInitialHydrateAttribute(el, name, server, next) {
+  const probe = hydrateAttributeProbe;
+  const original = probe?.originals.get(el);
+  if (original === void 0) return;
+  let values = probe.attributes.get(original);
+  if (values === void 0) probe.attributes.set(original, values = /* @__PURE__ */ new Map());
+  const previous = values.get(name);
+  values.set(name, {
+    server: previous === void 0 ? server : previous.server,
+    next,
+    suppressed: isHydrationSuppressed(el),
+    checked: false
+  });
+}
+function checkInitialHydrateAttribute(hydration, el, name, server) {
+  const initial = hydration.attributeBaselines?.attributes.get(el)?.get(name);
+  if (initial === void 0) return false;
+  if (initial.checked) return true;
+  initial.checked = true;
+  if (!initial.suppressed && initial.server !== initial.next && !(name !== "class" && name !== "style" && initial.next !== null && isAttributeParserNormalizedMatch(initial.server, initial.next)) && domBindingClaims.get(el)?.get(name) !== server) {
+    warnHydrationValueMismatch(
+      el.__oct_loc,
+      name === "style" ? "style" : `attribute \`${name}\``,
+      name === "style" ? initial.server ?? "" : initial.server,
+      name === "style" ? initial.next ?? "" : initial.next
+    );
+  }
+  return true;
+}
+function probeInitialHydrateAttributes(state) {
+  const snapshot = initialHydrateAttributes?.get(state);
+  if (snapshot === void 0 || !changedHydrateDiagnosticCaptures(snapshot.props, state.props) && !changedHydrateDiagnosticContexts(
+    snapshot.contexts,
+    copyHydrateDiagnosticContexts(
+      CURRENT_SCOPE?.block === state.parentBlock ? CURRENT_SCOPE : state.parentBlock
+    )
+  ))
+    return;
+  try {
+    return collectInitialHydrateAttributes(state, snapshot);
+  } catch {
+    return;
+  }
+}
+function collectInitialHydrateAttributes(state, snapshot) {
+  const ownerDocument = document.implementation.createHTMLDocument("");
+  const originalWrapper = state.wrapper;
+  const source = STAGED_DOM?.view(originalWrapper) ?? originalWrapper;
+  const template2 = ownerDocument.createElement("template");
+  template2.innerHTML = source.outerHTML;
+  const wrapper = ownerDocument.adoptNode(template2.content.firstElementChild);
+  const probe = {
+    document: ownerDocument,
+    originals: /* @__PURE__ */ new WeakMap(),
+    attributes: /* @__PURE__ */ new WeakMap(),
+    boundaries: /* @__PURE__ */ new WeakMap()
+  };
+  probe.originals.set(wrapper, originalWrapper);
+  const originals = source.querySelectorAll("*");
+  const copies = wrapper.querySelectorAll("*");
+  if (originals.length !== copies.length) return;
+  for (let i = 0; i < originals.length; i++) {
+    const original = originals[i];
+    const copy = copies[i];
+    if (copy.localName !== original.localName || copy.namespaceURI !== original.namespaceURI || probe.originals.get(copy.parentElement) !== (STAGED_DOM?.view(original) ?? original).parentElement)
+      return;
+    probe.originals.set(copy, original);
+  }
+  const start = wrapper.firstChild;
+  if (start === null || !isBlockOpen(start)) return;
+  const end = findMatchingClose(start, /* @__PURE__ */ new WeakMap());
+  const initialChild = (_props, scope, extra) => {
+    if (state.loadedBody !== null) state.loadedBody(snapshot.props.__data, scope, extra);
+    else childrenAsBody(snapshot.props.children)(void 0, scope, extra);
+  };
+  const body = (_props, scope) => {
+    tryBlock(scope, 0, wrapper, initialChild, null, null, end);
+  };
+  const block = createBlock("control-flow", null, wrapper, start, end, body, void 0);
+  block.idState = copyHydrateDiagnosticIds(snapshot.ids);
+  block.$$ctxValues = snapshot.contexts === null ? null : new Map(snapshot.contexts);
+  const hydration = new HydrationCapability(block, start.nextSibling, null);
+  if (state.seedRaw !== null) hydration.seeds = hydration.parseSeeds(state.seedRaw);
+  hydration.protectRootAnchor(end);
+  const capture = createOffscreenCapture();
+  const previousHydration = currentHydration;
+  const previousCapture = WIP_CAPTURE;
+  const previousProbe = hydrateAttributeProbe;
+  const previousTransaction = ROOT_RENDER_TRANSACTION;
+  const previousJournal = TRANSITION_JOURNAL;
+  const previousAttempt = ACTIVE_TRANSITION_ATTEMPT;
+  const previousScopedReadTracking = SCOPED_READ_TRACKING;
+  const previousScopedReads = SCOPED_READS;
+  const previousWarm = CURRENT_WARM;
+  const previousWarmClaims = CURRENT_WARM_CLAIMS;
+  const previousWarmEpisode = CURRENT_WARM_EPISODE;
+  const previousWarmPlans = ACTIVE_WARM_PLANS.splice(0);
+  const previousStagedDom = STAGED_DOM;
+  const previousStagedCapture = STAGED_COMMIT_CAPTURE;
+  const previousPresentation = PRESENTATION_HYDRATION;
+  const previousSelectSyncs = SELECT_SYNCS;
+  const previousSelectDefaultSyncs = SELECT_DEFAULT_SYNCS;
+  const previousFormChecks = DEV_FORM_CHECKS;
+  const previousAutofocus = AUTOFOCUS_QUEUE;
+  const previousNative = setNativeAdoptionResolver(null);
+  const refDetachCheckpoint = refDetachQueue.length;
+  currentHydration = hydration;
+  WIP_CAPTURE = capture;
+  hydrateAttributeProbe = probe;
+  ROOT_RENDER_TRANSACTION = null;
+  TRANSITION_JOURNAL = null;
+  ACTIVE_TRANSITION_ATTEMPT = null;
+  SCOPED_READ_TRACKING = false;
+  SCOPED_READS = null;
+  CURRENT_WARM = null;
+  CURRENT_WARM_CLAIMS = null;
+  CURRENT_WARM_EPISODE = 0;
+  STAGED_DOM = null;
+  STAGED_COMMIT_CAPTURE = null;
+  PRESENTATION_HYDRATION = null;
+  SELECT_SYNCS = [];
+  SELECT_DEFAULT_SYNCS = [];
+  DEV_FORM_CHECKS = [];
+  AUTOFOCUS_QUEUE = [];
+  try {
+    renderBlock(block);
+    drainHydrationRenderPhaseUpdates(block);
+    hydration.flushClassWrites();
+  } catch {
+  } finally {
+    try {
+      disposeWip({ block, start, end, capture, domParent: wrapper, refDetachCheckpoint });
+      drainHydrationRenderPhaseUpdates(block);
+    } finally {
+      setNativeAdoptionResolver(previousNative);
+      currentHydration = previousHydration;
+      WIP_CAPTURE = previousCapture;
+      hydrateAttributeProbe = previousProbe;
+      ROOT_RENDER_TRANSACTION = previousTransaction;
+      TRANSITION_JOURNAL = previousJournal;
+      ACTIVE_TRANSITION_ATTEMPT = previousAttempt;
+      SCOPED_READ_TRACKING = previousScopedReadTracking;
+      SCOPED_READS = previousScopedReads;
+      CURRENT_WARM = previousWarm;
+      CURRENT_WARM_CLAIMS = previousWarmClaims;
+      CURRENT_WARM_EPISODE = previousWarmEpisode;
+      ACTIVE_WARM_PLANS.length = 0;
+      ACTIVE_WARM_PLANS.push(...previousWarmPlans);
+      STAGED_DOM = previousStagedDom;
+      STAGED_COMMIT_CAPTURE = previousStagedCapture;
+      PRESENTATION_HYDRATION = previousPresentation;
+      SELECT_SYNCS = previousSelectSyncs;
+      SELECT_DEFAULT_SYNCS = previousSelectDefaultSyncs;
+      DEV_FORM_CHECKS = previousFormChecks;
+      AUTOFOCUS_QUEUE = previousAutofocus;
+    }
+  }
+  return probe;
+}
 function releasePreservedHydrateActivation(state) {
   if (preservedHydrateActivations?.delete(state)) preservedHydrateActivationCount--;
 }
@@ -8720,6 +9007,7 @@ function createHydrateBoundaryBody(state, renderChild, pendingBody) {
 }
 function failHydrateBoundary(state, error) {
   if (state.hasError || state.block.disposed) return;
+  if (process.env.NODE_ENV !== "production") initialHydrateAttributes?.delete(state);
   cleanupHydrateStreamWait(state);
   state.hasError = true;
   state.error = error;
@@ -8837,6 +9125,7 @@ function teardownHydrateBoundary(state) {
   }
   if (DEFERRED_LAYOUT_DRIVER?.stageAction(() => teardownHydrateBoundary(state), true) === true)
     return;
+  if (process.env.NODE_ENV !== "production") initialHydrateAttributes?.delete(state);
   cleanupHydrateInstallers(state);
   cleanupHydrateStreamWait(state);
   if (preserved !== void 0) {
@@ -9187,6 +9476,7 @@ function createHydrateSlot(props, scope, boundaryId, boundaryBody) {
     end,
     parentBlock,
     props,
+    contextChanged: false,
     boundaryId: (STAGED_DOM?.view(wrapper) ?? wrapper).getAttribute(HYDRATE_ID_ATTR) ?? boundaryId,
     intentBoundary,
     delegatedDynamicIntent: takeDelegatedDynamicHydrationIntent(wrapper),
@@ -9216,10 +9506,22 @@ function createHydrateSlot(props, scope, boundaryId, boundaryBody) {
     independent: props.__independent !== void 0
   };
   if (nativeSeedRaw !== null) state.nativeSeedRaw = nativeSeedRaw;
+  if (process.env.NODE_ENV !== "production" && serverPreserved && !state.independent) {
+    const original = hydrateAttributeProbe?.originals.get(wrapper);
+    const inherited = hydration?.attributeBaselines?.boundaries.get(wrapper);
+    const snapshot = inherited ?? {
+      props,
+      ids: copyHydrateDiagnosticIds(idState),
+      contexts: copyHydrateDiagnosticContexts(scope)
+    };
+    (initialHydrateAttributes ??= /* @__PURE__ */ new WeakMap()).set(state, snapshot);
+    if (original !== void 0) hydrateAttributeProbe.boundaries.set(original, snapshot);
+  }
   scope.slots[0] = state;
   registerSlot(scope, state);
   if (!state.independent) registerHydrationIntentBoundary(wrapper, intentBoundary);
   block.body = boundaryBody(state);
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return state;
   const initialStrategy = resolveHydrateStrategy(state);
   const pendingIntents = state.independent ? void 0 : takePendingHydrationIntents(wrapper);
   if (state.independent) {
@@ -9247,6 +9549,8 @@ function activateHydrateBoundary(state) {
   }
   const hydration = preserved?.hydration ?? new HydrationCapability(block, getNextSibling(state.start), null);
   if (preserved === void 0) {
+    if (process.env.NODE_ENV !== "production")
+      hydration.attributeBaselines = probeInitialHydrateAttributes(state);
     if (state.seedRaw !== null) hydration.seeds = hydration.parseSeeds(state.seedRaw);
     hydration.protectRootAnchor(state.end);
   }
@@ -9321,6 +9625,7 @@ function activateHydrateBoundary(state) {
   if (nativeRecovery !== void 0) {
     noteRecoverableHydrationError(() => nativeRecovery, block);
     state.serverPreserved = false;
+    if (process.env.NODE_ENV !== "production") initialHydrateAttributes?.delete(state);
     state.serverActivationStarted = false;
     state.seedRaw = null;
     state.nativeSeedRaw = void 0;
@@ -9351,6 +9656,7 @@ function activateHydrateBoundary(state) {
     return;
   }
   if (completed) {
+    if (process.env.NODE_ENV !== "production") initialHydrateAttributes?.delete(state);
     releasePreservedHydrateActivation(state);
     spliceOffscreenCapture(capture);
   }
@@ -9460,6 +9766,7 @@ function notifyHydrateBoundary(state, scope) {
     return;
   }
   state.didNotify = true;
+  if (process.env.NODE_ENV !== "production") initialHydrateAttributes?.delete(state);
   cleanupHydrateInstallers(state);
   state.props.onHydrated?.();
   domNode(state.wrapper).removeAttribute(HYDRATE_WHEN_ATTR);
@@ -9489,6 +9796,7 @@ function initializeHydrateComponent(boundaryBody) {
         if (state.independent !== (props.__independent !== void 0)) {
           throw new Error(formatClientError(66));
         }
+        const surroundingUpdate = state.props !== props || state.contextChanged;
         state.props = props;
         if (!state.independent && !state.hydrated) {
           const strategy = resolveHydrateStrategy(state);
@@ -9496,7 +9804,8 @@ function initializeHydrateComponent(boundaryBody) {
             cleanupHydrateStrategy(state);
             invalidateHydrateActivation(state);
           } else if (!state.activationRequested) {
-            requestHydrateBoundary(state);
+            const shouldDefer = surroundingUpdate ? false : strategy._d ? strategy._d() : strategy._t !== "load";
+            if (!shouldDefer) requestHydrateBoundary(state);
           }
         }
       }
@@ -11388,13 +11697,20 @@ class HydrationCapability {
       ns,
       name.indexOf(":") >= 0 ? name.slice(name.indexOf(":") + 1) : name
     ) : (STAGED_DOM?.view(el) ?? el).getAttribute(name);
+    if (process.env.NODE_ENV !== "production") {
+      if (hydrateAttributeProbe !== null) {
+        recordInitialHydrateAttribute(el, name, server, next);
+      } else {
+        checkInitialHydrateAttribute(this, el, name, server);
+      }
+    }
     if (server === next) return false;
     if (domBindingClaims.get(el)?.get(name) === server) return false;
     if (next !== null && isAttributeParserNormalizedMatch(server, next)) return false;
     const mode = hydrationMismatchMode(el);
     if (mode === 0) return true;
     if (mode === 1) return false;
-    if (process.env.NODE_ENV !== "production")
+    if (process.env.NODE_ENV !== "production" && !checkInitialHydrateAttribute(this, el, name, server))
       warnHydrationValueMismatch(el.__oct_loc, `attribute \`${name}\``, server, next);
     return true;
   }
@@ -11402,11 +11718,15 @@ class HydrationCapability {
     const mode = hydrationMismatchMode(el);
     const rawServer = (STAGED_DOM?.view(el) ?? el).getAttribute("class");
     const server = absentIsEmpty && rawServer === null ? "" : rawServer;
+    if (process.env.NODE_ENV !== "production") {
+      if (hydrateAttributeProbe !== null) recordInitialHydrateAttribute(el, "class", server, next);
+      else checkInitialHydrateAttribute(this, el, "class", rawServer);
+    }
     if (server === next) return true;
     if (domBindingClaims.get(el)?.get("class") === rawServer) return false;
     if (mode === 0) return true;
     if (mode === 1) return false;
-    if (process.env.NODE_ENV !== "production")
+    if (process.env.NODE_ENV !== "production" && !checkInitialHydrateAttribute(this, el, "class", rawServer))
       warnHydrationValueMismatch(el.__oct_loc, "attribute `class`", server, next);
     return true;
   }
@@ -11417,7 +11737,11 @@ class HydrationCapability {
     try {
       for (const [el, write] of this.classWrites) {
         const rawTarget = write.remove ? null : write.next;
-        if ((STAGED_DOM?.view(el) ?? el).getAttribute("class") === rawTarget) continue;
+        if ((STAGED_DOM?.view(el) ?? el).getAttribute("class") === rawTarget) {
+          if (process.env.NODE_ENV !== "production")
+            this.allowClass(el, write.next, write.absentIsEmpty);
+          continue;
+        }
         if (!this.allowClass(el, write.next, write.absentIsEmpty)) continue;
         if (write.remove) (STAGED_DOM?.view(el) ?? el).removeAttribute("class");
         else if (write.useAttribute)
@@ -11430,7 +11754,21 @@ class HydrationCapability {
   }
   applyStyle(el, value, _prev, staticCss, entries) {
     const mode = hydrationMismatchMode(el);
-    if (mode === 1) return true;
+    if (mode === 1) {
+      if (process.env.NODE_ENV !== "production") {
+        if (hydrateAttributeProbe !== null) recordInitialHydrateAttribute(el, "style", null, null);
+        else {
+          const current = STAGED_DOM?.view(el) ?? el;
+          checkInitialHydrateAttribute(
+            this,
+            el,
+            "style",
+            current.hasAttribute("style") ? current.style.cssText : null
+          );
+        }
+      }
+      return true;
+    }
     const style = (STAGED_DOM?.view(el) ?? el).style;
     const hadStyleAttribute = (STAGED_DOM?.view(el) ?? el).hasAttribute("style");
     const before = style.cssText;
@@ -11446,7 +11784,11 @@ class HydrationCapability {
           applyStyleProperty(el, expectedStyle, entries[i], entry);
       }
     }
-    const claims = domBindingClaims.get(el);
+    let claims = domBindingClaims.get(el);
+    if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) {
+      const original = hydrateAttributeProbe.originals.get(el);
+      if (original !== void 0) claims = domBindingClaims.get(original);
+    }
     if (claims !== void 0) {
       for (const [channel, published] of claims) {
         if (!channel.startsWith("style:")) continue;
@@ -11460,10 +11802,20 @@ class HydrationCapability {
     }
     const expected = expectedStyle.cssText;
     const expectsStyleAttribute = expected !== "";
+    if (process.env.NODE_ENV !== "production") {
+      if (hydrateAttributeProbe !== null)
+        recordInitialHydrateAttribute(
+          el,
+          "style",
+          hadStyleAttribute ? before : null,
+          expectsStyleAttribute ? expected : null
+        );
+      else checkInitialHydrateAttribute(this, el, "style", hadStyleAttribute ? before : null);
+    }
     if (before === expected && hadStyleAttribute === expectsStyleAttribute) return true;
     if (expectsStyleAttribute) style.cssText = expected;
     else (STAGED_DOM?.view(el) ?? el).removeAttribute("style");
-    if (mode === 2 && process.env.NODE_ENV !== "production") {
+    if (mode === 2 && process.env.NODE_ENV !== "production" && !checkInitialHydrateAttribute(this, el, "style", hadStyleAttribute ? before : null)) {
       warnHydrationValueMismatch(el.__oct_loc, "style", before, expected);
     }
     return true;
@@ -12729,6 +13081,8 @@ function bindDirectSignal(scope, previous, target, value, site, policy, name, at
   const kind = policy.kind;
   const prior = typeof previous === "object" && previous !== null && previous[DIRECT_SIGNAL_BINDING] === true ? previous : null;
   const handle = isSignalHandle(value) ? value : null;
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null && handle !== null)
+    throw new PresentationAdoptionMiss(void 0, false);
   if (handle !== null && (!signalDocumentEnabled || currentSignalOwner() !== SCOPE_SIGNAL_OWNERS.get(scope))) {
     if (!signalDocumentEnabled) enableSignalBindings();
     return runWithBlockSignalOwner(
@@ -15052,6 +15406,7 @@ function namespaceHeadElement(headKey, tag, attrs, text, authoredKey) {
   return createElement(namespaceHead, config);
 }
 function injectStyle(id, css, nonce) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   if (typeof document === "undefined") {
     _injectedStyles.add(id);
     return;
@@ -17265,6 +17620,8 @@ function registerValuePortalFragmentOwners(portal2, parentBlock, anchor) {
   }
 }
 function renderPortalState(prev, parentBlock, target, rawBody, rawProps, host, env, key = null) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null && target.ownerDocument !== hydrateAttributeProbe.document)
+    target = hydrateAttributeProbe.document.createDocumentFragment();
   const hydration = activeHydration();
   if (hydration !== null) {
     return hydration.suspend(
@@ -17981,6 +18338,18 @@ function componentSlotVoid(parentScope, slotKey, domParent, comp, props, anchor,
 }
 function componentSlotImpl(outputHandler, parentScope, slotKey, domParent, body, identity, props, renderProps, anchor, key, singleRoot, inherit, hasKey, invocationSite) {
   if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE) {
+    const state2 = parentScope.slots[0];
+    if (state2?.returnedOutput === true) {
+      if (state2.__kind === "componentSlotSlot") {
+        setReturnedOutputOwner(state2, false);
+      } else {
+        const block = parentScope.block;
+        block.outputHandler(block, null, true);
+        if (block.disposed) return;
+      }
+    }
+  }
   const parentBlock = parentScope.block;
   const hydration = activeHydration();
   if (hydration !== null && (anchor != null && hydration.isFresh(anchor) || hydration.isFresh(domParent))) {
@@ -20222,6 +20591,18 @@ function bindingChildSlot(parentScope, slotKey, domParent, value, marker, anchor
 }
 function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsHost, compactable, includeKeyedSingle = true, compiledMapBody, compiledMapKey, compiledMapFlags, compiledMapDeps, mappedFallback, bindingMarker) {
   if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE) {
+    const state2 = parentScope.slots[0];
+    if (state2?.returnedOutput === true) {
+      if (state2.__kind === "childSlot") {
+        setReturnedOutputOwner(state2, false);
+      } else {
+        const block = parentScope.block;
+        block.outputHandler(block, null, true);
+        if (block.disposed) return;
+      }
+    }
+  }
   if (IMPLICIT_SIGNAL_CHILD_DEPTH === 0) {
     const existing = parentScope.slots[slotKey];
     const previous = existing?.implicitSignal;
@@ -20850,6 +21231,9 @@ function textSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, compac
     childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, void 0, compactable);
     return;
   }
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE && state.returnedOutput === true) {
+    setReturnedOutputOwner(state, false);
+  }
   const str = vt === "string" ? value : vt === "boolean" || value == null ? "" : String(value);
   if (state.text !== null) {
     updateTextValue(state.text, str);
@@ -21241,7 +21625,8 @@ function hmr(fn) {
     }
   };
   function wrapper(props, scope, extra) {
-    if (scope !== void 0) meta.liveBlocks.add(scope.block);
+    if (scope !== void 0 && (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null))
+      meta.liveBlocks.add(scope.block);
     return meta.fn(props, scope, extra);
   }
   Object.defineProperty(wrapper, HMR, {
@@ -21640,7 +22025,8 @@ function mountPassthroughPending(state, thenable) {
     setTryBranch(state, -1);
     scheduleRender(state.parentBlock);
   };
-  thenable.then(retry, retry);
+  if (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null)
+    thenable.then(retry, retry);
 }
 function renderPassthroughTry(state) {
   if (state.branch === 0 && state.block !== null) {
@@ -22143,10 +22529,10 @@ function takeInitialSuspenseHydration(state, hydration) {
     if (payload === void 0) {
       payload = {
         seedRaw: typeof stash?.[boundaryId] === "string" ? stash[boundaryId] : null,
-        nativeRaw: typeof stash?.[boundaryId + "$signals"] === "string" ? stash[boundaryId + "$signals"] : null
+        nativeRaw: (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null) && typeof stash?.[boundaryId + "$signals"] === "string" ? stash[boundaryId + "$signals"] : null
       };
       (initialStreamedPayloads ??= /* @__PURE__ */ new WeakMap()).set(owner, payload);
-      if (stash !== void 0) {
+      if (stash !== void 0 && (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null)) {
         delete stash[boundaryId];
         delete stash[boundaryId + "$signals"];
       }
@@ -22183,7 +22569,8 @@ function takeInitialSuspenseHydration(state, hydration) {
       continue;
     if (attr === SUSPENSE_RESOLVED_SEED_ATTR)
       seedRaw = (STAGED_DOM?.view(script) ?? script).textContent;
-    else nativeRaw = (STAGED_DOM?.view(script) ?? script).textContent;
+    else if (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null)
+      nativeRaw = (STAGED_DOM?.view(script) ?? script).textContent;
     sidecars.push(script);
     cursor = getNextSibling(script);
   }
@@ -22224,6 +22611,8 @@ function renderInitialSuspenseHydration(state, initial) {
   hydration.claimRootRemainder(initial.end);
   hydration.protectRootAnchor(initial.end);
   const previousHydration = currentHydration;
+  if (process.env.NODE_ENV !== "production")
+    hydration.attributeBaselines = previousHydration?.attributeBaselines;
   if (previousHydration?.retryPresentation !== void 0)
     hydration.retryPresentation = previousHydration.retryPresentation;
   const previousCapture = WIP_CAPTURE;
@@ -22292,7 +22681,8 @@ function renderInitialSuspenseHydration(state, initial) {
         return;
       scheduleRender(state.parentBlock);
     };
-    suspended.then(resume, resume);
+    if (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null)
+      suspended.then(resume, resume);
     return;
   }
   initialSuspenseHydrations?.delete(state);
@@ -22359,7 +22749,8 @@ function mountTry(state) {
     const raw = stash !== void 0 ? stash[streamedBoundaryId] : void 0;
     if (typeof raw === "string") scopedSeeds = hydration.parseSeeds(raw);
     const nativeRaw = stash?.[streamedBoundaryId + "$signals"];
-    if (typeof nativeRaw === "string") scopedNativeRaw = nativeRaw;
+    if (typeof nativeRaw === "string" && (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null))
+      scopedNativeRaw = nativeRaw;
     adoptCursor = getNextSibling(adoptCursor);
   } else if (
     // A shell hydrated before its streamed segment swaps still has the
@@ -23311,6 +23702,7 @@ function flushStagedReveals() {
   }
 }
 function attachResume(state, thenable) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   if (state.pendingThenable === thenable) return;
   state.pendingThenable = thenable;
   const retry = () => {
@@ -24350,6 +24742,17 @@ function renderBranchSlot(parentScope, slotKey, state, domParent, next, body, ma
 }
 function ifBlock(parentScope, slotKey, domParent, cond, thenBody, elseBody, anchor, env) {
   let state = parentScope.slots[slotKey];
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE && state?.returnedOutput === true) {
+    if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
+    if (state.__kind === "ifBlockSlot") {
+      setReturnedOutputOwner(state, false);
+    } else {
+      const block = parentScope.block;
+      block.outputHandler(block, null, true);
+      if (block.disposed) return;
+      state = void 0;
+    }
+  }
   if (state === void 0) {
     const hydration = activeHydration();
     let start = null;
@@ -24615,6 +25018,7 @@ function queueCurrentActivityRefs(activity) {
   }
 }
 function suspendHiddenActivity(state, thenable) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   if (state.pendingThenable === thenable) return;
   state.pendingThenable = thenable;
   const block = state.block;
@@ -24696,6 +25100,18 @@ function queueActivityDeactivation(state, block, commitVersion) {
 }
 function activityBlock(parentScope, slotKey, domParent, mode, body, anchor, env) {
   if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE) {
+    const state2 = parentScope.slots[0];
+    if (state2?.returnedOutput === true) {
+      if (state2.__kind === "activityBlockSlot") {
+        setReturnedOutputOwner(state2, false);
+      } else {
+        const block = parentScope.block;
+        block.outputHandler(block, null, true);
+        if (block.disposed) return;
+      }
+    }
+  }
   if (mode === "hidden") ensureScheduledVisibilityDriver();
   const parentBlock = parentScope.block;
   const hydration = activeHydration();
@@ -24952,6 +25368,17 @@ function deactivateScope(scope, disconnectPassive = true) {
 }
 function switchBlock(parentScope, slotKey, domParent, discriminant, cases, defaultBody, anchor, env) {
   let state = parentScope.slots[slotKey];
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE && state?.returnedOutput === true) {
+    if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
+    if (state.__kind === "switchBlockSlot") {
+      setReturnedOutputOwner(state, false);
+    } else {
+      const block = parentScope.block;
+      block.outputHandler(block, null, true);
+      if (block.disposed) return;
+      state = void 0;
+    }
+  }
   if (state === void 0) {
     const hydration = activeHydration();
     let start = null;
@@ -25341,7 +25768,8 @@ function fastMapSlot(scopeOrItems, slotOrMethod, domParent, items, method, nativ
     callback = native;
     native = mapSlot(items, method);
   }
-  const state = scopeOrItems.slots[slotOrMethod]?.forSlot;
+  const slot = scopeOrItems.slots[slotOrMethod];
+  const state = slot?.forSlot;
   const parent = native === true ? fastHostListParent(state, items, flags) : null;
   if (parent === null) {
     return mapSlot(
@@ -25360,6 +25788,9 @@ function fastMapSlot(scopeOrItems, slotOrMethod, domParent, items, method, nativ
       ownEnd
     );
   }
+  if (slotOrMethod === 0 && scopeOrItems !== RETURNED_OUTPUT_SCOPE && slot.returnedOutput === true) {
+    setReturnedOutputOwner(slot, false);
+  }
   mountFastHostItems(
     scopeOrItems,
     state,
@@ -26277,6 +26708,10 @@ function moveFocusedNodeBefore(parent, node, anchor, snapshots) {
     moveBefore.call(parent, node, anchor);
     return;
   }
+  if (STAGED_DOM.view(node).parentNode !== parent || anchor !== null && STAGED_DOM.view(anchor).parentNode !== parent) {
+    STAGED_DOM.view(parent).insertBefore(node, anchor);
+    return;
+  }
   if (node === anchor || getNextSibling(node) === anchor) return;
   if (anchor === null || ((STAGED_DOM?.view(node) ?? node).compareDocumentPosition(anchor) & Node.DOCUMENT_POSITION_FOLLOWING) !== 0) {
     let cursor = getNextSibling(node);
@@ -27602,6 +28037,7 @@ function applyHintAttrs(el, opts) {
   }
 }
 function preload(href, options) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   if (process.env.NODE_ENV !== "production") {
     const warning = resourceHintWarning("preload", href, options);
     if (warning !== null) console.error(warning);
@@ -27639,6 +28075,7 @@ function preload(href, options) {
   });
 }
 function preinit(href, options) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   if (process.env.NODE_ENV !== "production") {
     const warning = resourceHintWarning("preinit", href, options);
     if (warning !== null) console.error(warning);
@@ -27663,6 +28100,7 @@ function preinit(href, options) {
   }
 }
 function preconnect(href, options) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   if (process.env.NODE_ENV !== "production") {
     const warning = resourceHintWarning("preconnect", href, options);
     if (warning !== null) console.error(warning);
@@ -27684,6 +28122,7 @@ function preconnect(href, options) {
   });
 }
 function prefetchDNS(href) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   if (process.env.NODE_ENV !== "production") {
     const warning = resourceHintWarning("prefetchDNS", href, arguments[1], arguments.length > 1);
     if (warning !== null) console.error(warning);
@@ -27699,6 +28138,7 @@ function prefetchDNS(href) {
   });
 }
 function preloadModule(href, options) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   if (process.env.NODE_ENV !== "production") {
     const warning = resourceHintWarning("preloadModule", href, options);
     if (warning !== null) console.error(warning);
@@ -27720,6 +28160,7 @@ function preloadModule(href, options) {
   });
 }
 function preinitModule(href, options) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   if (process.env.NODE_ENV !== "production") {
     const warning = resourceHintWarning("preinitModule", href, options);
     if (warning !== null) console.error(warning);
@@ -27828,6 +28269,7 @@ function warnInvalidStylesheetResource(reason) {
   );
 }
 function stylesheetResource(attrs, invalidReason) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   if (process.env.NODE_ENV !== "production" && invalidReason !== void 0) {
     warnInvalidStylesheetResource(invalidReason);
     return;
@@ -27847,6 +28289,7 @@ function stylesheetResource(attrs, invalidReason) {
   state.sheets.add(href);
 }
 function styleResource(attrs, css, development) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   if (typeof document === "undefined" || attrs == null) return;
   const href = attrs.href;
   if (typeof href !== "string" || href === "") return;
@@ -27877,6 +28320,7 @@ function resetFloatResourceState() {
   if (typeof window !== "undefined") delete window.$OCTFR;
 }
 function scriptResource(attrs) {
+  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   if (typeof document === "undefined" || attrs == null) return;
   const src = attrs.src;
   if (typeof src !== "string" || src === "") return;