octane 0.4.2 → 0.4.3

package/dist/cjs/runtime.cjs

@@ -38,6 +38,7 @@ __export(runtime_exports, {
   __useLinkedStateWithGetter: () => __useLinkedStateWithGetter,
   __useReducerWithGetter: () => __useReducerWithGetter,
   __useStateWithGetter: () => __useStateWithGetter,
+  __voidRootProps: () => __voidRootProps,
   __vtSeen: () => __vtSeen,
   act: () => act,
   activityBlock: () => activityBlock,
@@ -158,7 +159,6 @@ __export(runtime_exports, {
   isChildrenBlock: () => isChildrenBlock,
   isHydratingStyle: () => isHydratingStyle,
   isInActScope: () => isInActScope,
-  isNativeSignalDiagnosticProbe: () => isNativeSignalDiagnosticProbe,
   isValidElement: () => isValidElement,
   keyedForBlock: () => keyedForBlock,
   lazy: () => lazy,
@@ -358,7 +358,6 @@ var import_transition_state = require("./signals/transition-state.cjs");
 var import_transition_candidate = require("./signals/transition-candidate.cjs");
 var import_read_protocol = require("./signals/read-protocol.cjs");
 var import_native_read_events = require("./signals/native-read-events.cjs");
-var import_diagnostic_local_hook = require("./signals/diagnostic-local-hook.cjs");
 var import_native_read_seeds = require("./signals/native-read-seeds.cjs");
 var import_owner_context = require("./signals/owner-context.cjs");
 var import_document_owner = require("./signals/document-owner.cjs");
@@ -596,10 +595,34 @@ function enableSignalBindings(abi = 1, potentialOnly = false) {
   SIGNAL_BINDINGS_ENABLED = true;
   if (!potentialOnly) (0, import_document_owner.enableSignalDocument)(abi);
 }
-function signalIdentityKey(value) {
+function signalIdentityToken(value, position) {
   if (value === null) return "null";
   const kind = typeof value;
-  return kind === "string" || kind === "number" || kind === "bigint" || kind === "boolean" ? kind.charCodeAt(0).toString(36) + ":" + String(value) : kind === "undefined" ? "u:" : "o:" + String(value);
+  return kind === "string" || kind === "number" || kind === "bigint" || kind === "boolean" ? kind.charCodeAt(0).toString(36) + ":" + String(value) : kind === "undefined" ? "u:" : { value, position };
+}
+function signalIdentityKey(token, base, site, parents, componentKey, ids) {
+  if (typeof token === "string") return token;
+  const namespace = base + JSON.stringify([site ?? "legacy", parents, componentKey]);
+  const state = ids.signalState ??= { prefix: ids.prefix, next: 0 };
+  const namespaces = state.opaqueKeys ??= /* @__PURE__ */ new Map();
+  let keys = namespaces.get(namespace);
+  if (keys === void 0) {
+    keys = { objects: /* @__PURE__ */ new WeakMap(), symbols: /* @__PURE__ */ new Map(), used: /* @__PURE__ */ new Set(), next: 0 };
+    namespaces.set(namespace, keys);
+  }
+  const value = token.value;
+  let id = typeof value === "symbol" ? keys.symbols.get(value) : keys.objects.get(value);
+  if (id === void 0) {
+    id = token.position;
+    if (id === void 0 || keys.used.has(id)) {
+      while (keys.used.has(keys.next)) keys.next++;
+      id = keys.next++;
+    }
+    keys.used.add(id);
+    if (typeof value === "symbol") keys.symbols.set(value, id);
+    else keys.objects.set(value, id);
+  }
+  return "o:" + id.toString(36);
 }
 function rootSignalInstanceKey(ids) {
   return JSON.stringify([ids.signalState?.prefix ?? ids.prefix, "root"]);
@@ -631,14 +654,14 @@ function stampSignalInstanceKey(scope, key) {
 }
 function structuralSignalInstanceKey(parentScope, invocationSite, key, hasKey) {
   let base = resolveSignalInstanceKey(parentScope);
-  const itemKeys = [];
+  const itemTokens = [];
   const visited = /* @__PURE__ */ new Set();
   let scope = parentScope;
   while (base === void 0 && scope !== null) {
     const block2 = scope.block;
     if (!visited.has(block2)) {
       visited.add(block2);
-      if (block2.forSlot !== null) itemKeys.push(signalIdentityKey(block2.key));
+      if (block2.forSlot !== null) itemTokens.push(signalIdentityToken(block2.key, block2.itemIndex));
       base = resolveSignalInstanceKey(block2);
     }
     scope = scope.parent;
@@ -648,14 +671,28 @@ function structuralSignalInstanceKey(parentScope, invocationSite, key, hasKey) {
   while (base === void 0 && block !== null) {
     if (!visited.has(block)) {
       visited.add(block);
-      if (block.forSlot !== null) itemKeys.push(signalIdentityKey(block.key));
+      if (block.forSlot !== null) itemTokens.push(signalIdentityToken(block.key, block.itemIndex));
     }
     base = resolveSignalInstanceKey(block);
     block = block.parentBlock;
   }
   base ??= rootSignalInstanceKey(parentScope.block.idState);
-  itemKeys.reverse();
-  return base + JSON.stringify([invocationSite ?? "legacy", itemKeys, hasKey ? signalIdentityKey(key) : ""]);
+  itemTokens.reverse();
+  const ids = parentScope.block.idState;
+  let itemKeys = itemTokens;
+  for (const token of itemTokens) {
+    if (typeof token === "string") continue;
+    itemKeys = [];
+    for (const entry of itemTokens) {
+      itemKeys.push(signalIdentityKey(entry, base, invocationSite, itemKeys, false, ids));
+    }
+    break;
+  }
+  return base + JSON.stringify([
+    invocationSite ?? "legacy",
+    itemKeys,
+    hasKey ? signalIdentityKey(signalIdentityToken(key), base, invocationSite, itemKeys, true, ids) : ""
+  ]);
 }
 function stampSignalInstance(scope, parentScope, invocationSite, key, hasKey) {
   if (SIGNAL_BINDINGS_ENABLED || import_document_owner.signalDocumentEnabled) {
@@ -676,6 +713,19 @@ function scopeSignalOwner(scope) {
   }
   if (documentOwner === void 0) return;
   let owner = SCOPE_SIGNAL_OWNERS.get(scope);
+  if ((owner === void 0 || owner === false) && scope.block.forSlot === null && scope.signalInstanceParent === null && scope.signalInstanceResolved === void 0) {
+    let parent = scope.parent ?? scope.block.parentBlock;
+    while (parent !== null) {
+      if (parent instanceof LiteBlockImpl) break;
+      if (parent.signalInstanceParent !== null || parent.signalInstanceResolved !== void 0)
+        break;
+      if (parent.block.forSlot?.signalSite !== void 0) {
+        SCOPE_SIGNAL_OWNERS.set(scope, false);
+        return scopeSignalOwner(parent);
+      }
+      parent = parent.parent ?? parent.block.parentBlock;
+    }
+  }
   const retired = owner === null;
   if (!owner || owner.documentOwner !== documentOwner) {
     const ids = scope.block.idState;
@@ -697,7 +747,7 @@ function scopeSignalOwner(scope) {
         scopeKey: documentOwner.scopeKey,
         documentOwner,
         instanceOwner: scope,
-        instanceKey: resolveSignalInstanceKey(scope) ?? rootSignalInstanceKey(ids)
+        instanceKey: resolveSignalInstanceKey(scope) ?? (scope.block.forSlot?.signalSite !== void 0 ? structuralSignalInstanceKey(scope, scope.block.forSlot.signalSite, void 0, false) : rootSignalInstanceKey(ids))
       };
       identity.instanceOwner = identity;
       owner = Object.freeze(identity);
@@ -710,8 +760,7 @@ function scopeSignalOwner(scope) {
 }
 function runWithBlockSignalOwner(scope, callback) {
   const owner = scopeSignalOwner(scope);
-  if (owner !== void 0 && (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null))
-    (0, import_document_owner.streamedSignalOwnerActivator)?.(owner);
+  if (owner !== void 0) (0, import_document_owner.streamedSignalOwnerActivator)?.(owner);
   return owner === void 0 || (0, import_owner_context.currentSignalOwner)() === owner ? callback() : (0, import_owner_context.runWithSignalOwner)(owner, callback);
 }
 function disposeNativeStyleBinding(binding) {
@@ -724,9 +773,49 @@ function nativeStyleBody(props, scope) {
   journalRootProperty(scope.slots, 0, scope.slots[0]);
   scope.slots[0] = value;
 }
-function nativeStyleBinding(owner, slotIndex, el, value) {
+function nativeStyleBinding(owner, slotIndex, el, value, literal) {
+  if (literal === 1) {
+    const binding = owner.slots[slotIndex];
+    if ((binding === void 0 || binding.block === null) && isScalarStyleLiteral(value)) {
+      writeScalarNativeStyle(owner, slotIndex, binding, el, value);
+      return;
+    }
+  }
   nativePresentationBinding(owner, slotIndex, el, nativeStyleBody, { el, value });
 }
+function isScalarStyleLiteral(value) {
+  for (const name in value) {
+    const item = value[name];
+    if (item !== null && (typeof item === "object" || typeof item === "function")) return false;
+  }
+  return true;
+}
+function writeScalarNativeStyle(owner, slotIndex, binding, el, value) {
+  if (binding === void 0) {
+    binding = {
+      __kind: "nativeStyleBinding",
+      __flags: SLOT_FLAG_TEARDOWN,
+      __teardown: disposeNativeStyleBinding,
+      block: null,
+      el,
+      style: void 0
+    };
+    if (owner.slots.length === 0) owner.slots.push(void 0);
+    owner.slots[slotIndex] = binding;
+    registerSlot(owner, binding);
+  } else if (binding.el !== el) {
+    if (TRANSITION_JOURNAL !== null) {
+      TRANSITION_JOURNAL.push(JOURNAL_PROP, binding, "el", binding.el);
+      TRANSITION_JOURNAL.push(JOURNAL_PROP, binding, "style", binding.style);
+    }
+    binding.el = el;
+    binding.style = void 0;
+  }
+  setStyle(el, value, binding.style);
+  if (TRANSITION_JOURNAL !== null)
+    TRANSITION_JOURNAL.push(JOURNAL_PROP, binding, "style", binding.style);
+  binding.style = value;
+}
 function prepareNativeProjection(props, scope) {
   const prepare = () => {
     const projected = props.compute();
@@ -805,8 +894,6 @@ 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);
@@ -815,11 +902,19 @@ function nativePresentationBinding(owner, slotIndex, el, body, props) {
       __kind: "nativeStyleBinding",
       __flags: SLOT_FLAG_TEARDOWN,
       __teardown: disposeNativeStyleBinding,
-      block
+      block,
+      el: null,
+      style: void 0
     };
     if (owner.slots.length === 0) owner.slots.push(void 0);
     owner.slots[slotIndex] = binding;
     registerSlot(owner, binding);
+  } else if (binding.block === null) {
+    const block = createBlock("control-flow", owner.block, el, null, null, body, props);
+    block.parent = owner;
+    if (binding.el === el) block.slots[0] = binding.style;
+    journalRootProperty(binding, "block", binding.block);
+    binding.block = block;
   } else {
     const block = binding.block;
     if (block.parentNode !== el) {
@@ -835,19 +930,16 @@ function nativePresentationBinding(owner, slotIndex, el, body, props) {
 }
 function enableNativeReadCollection(abi = 1) {
   if (abi !== 1) throw new Error((0, import_error_codes_client_generated.formatClientError)(58));
-  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   ensureNativeReadDriver();
 }
 function beginNativeReadScope(scope, abi = 1) {
   if (abi !== 1) throw new Error((0, import_error_codes_client_generated.formatClientError)(58));
-  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return -1;
   const block = CURRENT_BLOCK;
   const owner = scope ?? CURRENT_SCOPE;
   if (block === null || owner === null) return -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);
 }
@@ -956,14 +1048,12 @@ function endNativeReadScope(token, _completed) {
   if (token >= 0) NATIVE_READ_DRIVER.endScope(token);
 }
 function beginNativeReadWitness(detached = false) {
-  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return -1;
   return detached ? ensureNativeReadDriver().beginWitness(true) : NATIVE_READ_DRIVER?.beginWitness() ?? -1;
 }
 function finishNativeReadWitness(token, completed) {
   return token < 0 ? null : NATIVE_READ_DRIVER.finishWitness(token, completed);
 }
 function replayNativeReadWitness(witness) {
-  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   NATIVE_READ_DRIVER?.replay(witness);
 }
 function retainNativeRetryReads(block, reads) {
@@ -1084,13 +1174,13 @@ function hydrationMismatchMode(el) {
 }
 function warnHydrationValueMismatch(loc, what, serverVal, clientVal) {
   if (process.env.NODE_ENV === "production") return;
-  if (!loc || hydrateAttributeProbe !== null) return;
+  if (!loc) 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 || hydrateAttributeProbe !== null) return;
+  if (process.env.NODE_ENV === "production" || !loc) 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.`
   );
@@ -1109,7 +1199,7 @@ function describeHydrationNode(node) {
 }
 function warnHydrationStructuralMismatch(loc, expected, actual) {
   if (process.env.NODE_ENV === "production") return;
-  if (!loc || hydrateAttributeProbe !== null) return;
+  if (!loc) 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.`
   );
@@ -6615,8 +6705,7 @@ function captureRenderPhaseUpdate(cell, key) {
 function renderBlock(block) {
   if (import_document_owner.signalDocumentEnabled || block.idState.renderOwner?.signalOwner !== void 0) {
     const owner = scopeSignalOwner(block);
-    if (owner !== void 0 && (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null))
-      (0, import_document_owner.streamedSignalOwnerActivator)?.(owner);
+    if (owner !== void 0) (0, import_document_owner.streamedSignalOwnerActivator)?.(owner);
     if (owner !== void 0 && (0, import_owner_context.currentSignalOwner)() !== owner) {
       (0, import_owner_context.runWithSignalOwner)(owner, () => renderBlock(block));
       return;
@@ -6793,8 +6882,7 @@ function renderBlockInner(block) {
   let profileThrown;
   let renderCompleted = false;
   let renderRetry = false;
-  if (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null)
-    NATIVE_READ_DRIVER?.beginRender(block);
+  NATIVE_READ_DRIVER?.beginRender(block);
   NATIVE_BLOCK_RETRIES?.get(block)?.clear();
   try {
     if (urgentTransitionRender !== null)
@@ -6862,8 +6950,7 @@ function renderBlockInner(block) {
     CURRENT_SCOPE = prevScope;
     CURRENT_BLOCK = prevBlock;
     try {
-      if (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null)
-        NATIVE_READ_DRIVER?.endRender(block, renderCompleted, isSuspenseException(profileThrown));
+      NATIVE_READ_DRIVER?.endRender(block, renderCompleted, isSuspenseException(profileThrown));
     } finally {
       if (urgentTransitionRender !== null)
         urgentTransitionDriver.endUrgent(block, urgentTransitionRender);
@@ -7176,8 +7263,7 @@ function componentSlotLite(parentScope, slotKey, host, comp, props, anchor, invo
   try {
     if (import_document_owner.signalDocumentEnabled || scope.block.idState.renderOwner?.signalOwner !== void 0) {
       const owner = scopeSignalOwner(scope);
-      if (owner !== void 0 && (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null))
-        (0, import_document_owner.streamedSignalOwnerActivator)?.(owner);
+      if (owner !== void 0) (0, import_document_owner.streamedSignalOwnerActivator)?.(owner);
       if (owner === void 0 || (0, import_owner_context.currentSignalOwner)() === owner) {
         comp(props, scope, void 0);
       } else (0, import_owner_context.runWithSignalOwner)(owner, () => comp(props, scope, void 0));
@@ -7481,20 +7567,13 @@ function resolveSlot(slot) {
   const resolved = (0, import_hook_slot_cache.resolveHookPath)(slotStack, slot, false);
   return typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__ ? (0, import_profiling.__profileResolveHook)(resolved, typeof slot === "symbol" ? slot : void 0) : resolved;
 }
-function isNativeSignalDiagnosticProbe() {
-  return process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null;
-}
-function nativeLocalHook(name, initialize, dispose, slot, diagnosticInitialize) {
-  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null && (name !== "useSignal$" || diagnosticInitialize === void 0 || !(0, import_diagnostic_local_hook.isNativeSignalDiagnosticInitializer)(diagnosticInitialize)))
-    throw new PresentationAdoptionMiss(void 0, false);
+function nativeLocalHook(name, initialize, dispose, slot) {
   slot = resolveSlot(slot);
   if (slot === void 0 || CURRENT_SCOPE === null) missingSlot(name);
   const scope = CURRENT_SCOPE;
   let cell = scope.hooks?.get(slot);
   if (cell === void 0) {
-    cell = {
-      nativeValue: process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null ? diagnosticInitialize() : initialize()
-    };
+    cell = { nativeValue: initialize() };
     ensureHooks(scope).set(slot, cell);
     const value = cell.nativeValue;
     registerHookCleanup(scope, () => dispose(value));
@@ -8523,10 +8602,7 @@ function __createCompiledContext(defaultValue) {
     const dialect = children[CHILDREN_BODY] ?? children;
     const previous = scope.hooks?.get(CHILDREN_DIALECT_SLOT);
     if (previous !== dialect) {
-      if (previous !== void 0 && (previous === 2 || dialect === 2)) {
-        resetScopeChildren(scope);
-        if (scope.block.disposed) return;
-      } else if (previous !== void 0) {
+      if (previous !== void 0) {
         invalidateSharedBodyOutput(scope);
         if (TRANSITION_JOURNAL !== null && !ROOT_RENDER_ROLLBACK) {
           const hooks = scope.hooks;
@@ -8545,19 +8621,7 @@ function initializeContext(ctx, defaultValue) {
   ctx.$$version = 0;
   (0, import_context_identity.registerContext)(ctx);
   if (process.env.NODE_ENV !== "production") {
-    let consumerWarned = false;
-    Object.defineProperty(ctx, "Consumer", {
-      configurable: true,
-      get() {
-        if (!consumerWarned) {
-          consumerWarned = true;
-          console.error(
-            "Octane has no Context.Consumer. Read the context directly with use(Context) or useContext(Context) in the child component \u2014 Octane hooks are call-site keyed, so the read is legal behind any condition the render-prop form was working around."
-          );
-        }
-        return void 0;
-      }
-    });
+    (0, import_context_identity.defineRemovedContextMembers)(ctx);
   }
   return ctx;
 }
@@ -8628,28 +8692,23 @@ function provideContext(scope, context, value) {
       if (had) values.set(context, previous);
       else values.delete(context);
     });
-  if (had && (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null)) {
+  if (had) {
     context.$$version++;
     (0, import_context_epoch.bumpContextEpoch)();
   }
   values.set(context, value);
 }
 const CHILDREN_BODY = /* @__PURE__ */ Symbol.for("octane.childrenBody");
-const CHILDREN_DIAGNOSTIC_CAPTURES = /* @__PURE__ */ Symbol.for(
-  "octane.childrenDiagnosticCaptures"
-);
+const CHILDREN_CAPTURES = /* @__PURE__ */ Symbol.for("octane.childrenCaptures");
 function markSingleRoot(component) {
   component.$$singleRoot = true;
   return component;
 }
-function markChildrenBlock(fn, body) {
+function markChildrenBlock(fn, body, captures) {
   if (typeof fn === "function") {
     fn[import_runtime_tags.CHILDREN_BLOCK_TAG] = 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;
-    }
+    if (captures !== void 0) fn[CHILDREN_CAPTURES] = captures;
   }
   return fn;
 }
@@ -8799,20 +8858,7 @@ 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) {
+function collectHydrateContexts(scope) {
   let contexts = null;
   const add = (values) => {
     if (values === null) return;
@@ -8827,7 +8873,7 @@ function copyHydrateDiagnosticContexts(scope) {
     add(block.$$ctxValues);
   return contexts;
 }
-function changedHydrateDiagnosticContexts(initial, next) {
+function changedHydrateContexts(initial, next) {
   if ((initial?.size ?? 0) !== (next?.size ?? 0)) return true;
   if (initial !== null) {
     for (const [context, value] of initial) {
@@ -8836,24 +8882,23 @@ function changedHydrateDiagnosticContexts(initial, next) {
   }
   return false;
 }
-function changedHydrateDiagnosticCaptures(initial, next) {
+function changedHydrateCaptures(initial, next) {
+  if (initial === next) return false;
   if (initial.__data === void 0 || next.__data === void 0)
-    return changedHydrateDiagnosticChildren(initial.children, next.children);
+    return changedHydrateChildren(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) {
+function changedHydrateChildren(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;
+    const initialCaptures = initial[CHILDREN_CAPTURES];
+    const nextCaptures = next[CHILDREN_CAPTURES];
     if (body === void 0 || body !== next[CHILDREN_BODY] || initialCaptures == null || nextCaptures == null)
       return true;
     const before = initialCaptures();
@@ -8867,177 +8912,16 @@ function changedHydrateDiagnosticChildren(initial, next) {
     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)) && import_dom_binding_claims.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(
+function hydrateServerValuesStale(state) {
+  const initial = state.initialCaptures;
+  if (initial === null) return false;
+  if (initial.stale || changedHydrateCaptures(initial.props, state.props)) return true;
+  return initial.contextEpoch !== (0, import_context_epoch.contextEpochNow)() && changedHydrateContexts(
+    initial.contexts,
+    collectHydrateContexts(
       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 diagnosticNative = state.nativeSeedRaw === void 0 ? void 0 : (0, import_native_read_seeds.createNativeAdoptionState)((0, import_native_read_seeds.parseNativeSignalManifest)(state.nativeSeedRaw));
-  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 diagnosticDriver = NATIVE_READ_DRIVER;
-  const nativeProbeToken = diagnosticDriver?.pauseLifecycle() ?? -1;
-  const previousWriteGuard = (0, import_read_protocol.beginNativeWriteGuard)();
-  const previousNative = (0, import_read_protocol.setNativeAdoptionResolver)(diagnosticNative?.resolve ?? 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 {
-      try {
-        diagnosticNative?.release();
-      } finally {
-        try {
-          (0, import_read_protocol.setNativeAdoptionResolver)(previousNative);
-          (0, import_read_protocol.endNativeWriteGuard)(previousWriteGuard);
-          if (nativeProbeToken >= 0) diagnosticDriver.resumeLifecycle(nativeProbeToken);
-        } finally {
-          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--;
@@ -9221,7 +9105,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);
+  state.initialCaptures = null;
   cleanupHydrateStreamWait(state);
   state.hasError = true;
   state.error = error;
@@ -9339,7 +9223,7 @@ function teardownHydrateBoundary(state) {
   }
   if (DEFERRED_LAYOUT_DRIVER?.stageAction(() => teardownHydrateBoundary(state), true) === true)
     return;
-  if (process.env.NODE_ENV !== "production") initialHydrateAttributes?.delete(state);
+  state.initialCaptures = null;
   cleanupHydrateInstallers(state);
   cleanupHydrateStreamWait(state);
   if (preserved !== void 0) {
@@ -9717,25 +9601,22 @@ function createHydrateSlot(props, scope, boundaryId, boundaryBody) {
     hasError: false,
     error: void 0,
     replays: [],
-    independent: props.__independent !== void 0
+    independent: props.__independent !== void 0,
+    initialCaptures: null
   };
   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 ?? {
+  if (serverPreserved && !state.independent) {
+    state.initialCaptures = {
       props,
-      ids: copyHydrateDiagnosticIds(idState),
-      contexts: copyHydrateDiagnosticContexts(scope)
+      contexts: collectHydrateContexts(scope),
+      contextEpoch: (0, import_context_epoch.contextEpochNow)(),
+      stale: hydration.staleServerValues
     };
-    (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) (0, import_event_capture.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 : (0, import_event_capture.takePendingHydrationIntents)(wrapper);
   if (state.independent) {
@@ -9762,9 +9643,9 @@ function activateHydrateBoundary(state) {
     return;
   }
   const hydration = preserved?.hydration ?? new HydrationCapability(block, getNextSibling(state.start), null);
+  if (!hydration.staleServerValues && hydrateServerValuesStale(state))
+    hydration.staleServerValues = true;
   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);
   }
@@ -9839,7 +9720,7 @@ function activateHydrateBoundary(state) {
   if (nativeRecovery !== void 0) {
     noteRecoverableHydrationError(() => nativeRecovery, block);
     state.serverPreserved = false;
-    if (process.env.NODE_ENV !== "production") initialHydrateAttributes?.delete(state);
+    state.initialCaptures = null;
     state.serverActivationStarted = false;
     state.seedRaw = null;
     state.nativeSeedRaw = void 0;
@@ -9870,7 +9751,7 @@ function activateHydrateBoundary(state) {
     return;
   }
   if (completed) {
-    if (process.env.NODE_ENV !== "production") initialHydrateAttributes?.delete(state);
+    state.initialCaptures = null;
     releasePreservedHydrateActivation(state);
     spliceOffscreenCapture(capture);
   }
@@ -9980,7 +9861,7 @@ function notifyHydrateBoundary(state, scope) {
     return;
   }
   state.didNotify = true;
-  if (process.env.NODE_ENV !== "production") initialHydrateAttributes?.delete(state);
+  state.initialCaptures = null;
   cleanupHydrateInstallers(state);
   state.props.onHydrated?.();
   domNode(state.wrapper).removeAttribute(import_constants.HYDRATE_WHEN_ATTR);
@@ -11485,6 +11366,8 @@ class HydrationCapability {
   rootBlock;
   node;
   seeds;
+  /** Parent captures changed before this dormant boundary activated. */
+  staleServerValues = false;
   depth = 0;
   seedCursor = 0;
   hasAdjacentRangePair = false;
@@ -11555,6 +11438,7 @@ class HydrationCapability {
     warnHydrationStructuralMismatch(loc, expected, actual);
   }
   recordTextMismatch(node, loc, server) {
+    if (this.staleServerValues) return;
     if (process.env.NODE_ENV === "production" && ROOT_ERROR_HANDLERS === null) return;
     if (!this.textWarnings.has(node)) this.textWarnings.set(node, { loc, server });
   }
@@ -11778,6 +11662,9 @@ class HydrationCapability {
           describeHydrationNode(cursor)
         );
       if (isBlockClose(cursor)) return this.freshClone(template2);
+      const target = CURRENT_BLOCK?.parentNode;
+      if (!claimsRoot && target != null && (STAGED_DOM?.view(cursor) ?? cursor).parentNode !== target)
+        return this.freshClone(template2);
       if (isBlockOpen(cursor)) {
         const close = this.close(cursor);
         this.node = getNextSibling(close);
@@ -11859,6 +11746,11 @@ class HydrationCapability {
     return created;
   }
   htextSwap(posNode, text) {
+    if (isEmptyTextSlot(posNode)) {
+      const empty = (STAGED_DOM?.view(document) ?? document).createTextNode("");
+      domNode((STAGED_DOM?.view(posNode) ?? posNode).parentNode).replaceChild(empty, posNode);
+      posNode = empty;
+    }
     if (posNode !== null && posNode.nodeType === 3) {
       const server = (STAGED_DOM?.view(posNode) ?? posNode).nodeValue;
       if (server !== text && !isTextParserNormalizedMatch(server, text)) {
@@ -11900,7 +11792,8 @@ class HydrationCapability {
       cursor = getNextSibling(cursor);
       if (isTextSeparator(cursor)) {
         const after = getNextSibling(cursor);
-        if (after !== null && (after.nodeType === 3 || isTextSeparator(after))) cursor = after;
+        if (after !== null && (after.nodeType === 3 || isTextSeparator(after) || isEmptyTextSlot(after)))
+          cursor = after;
       }
     }
     return cursor;
@@ -11911,20 +11804,13 @@ 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 (import_dom_binding_claims.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" && !checkInitialHydrateAttribute(this, el, name, server))
+    if (process.env.NODE_ENV !== "production" && !this.staleServerValues)
       warnHydrationValueMismatch(el.__oct_loc, `attribute \`${name}\``, server, next);
     return true;
   }
@@ -11932,15 +11818,11 @@ 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 (import_dom_binding_claims.domBindingClaims.get(el)?.get("class") === rawServer) return false;
     if (mode === 0) return true;
     if (mode === 1) return false;
-    if (process.env.NODE_ENV !== "production" && !checkInitialHydrateAttribute(this, el, "class", rawServer))
+    if (process.env.NODE_ENV !== "production" && !this.staleServerValues)
       warnHydrationValueMismatch(el.__oct_loc, "attribute `class`", server, next);
     return true;
   }
@@ -11951,11 +11833,7 @@ 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) {
-          if (process.env.NODE_ENV !== "production")
-            this.allowClass(el, write.next, write.absentIsEmpty);
-          continue;
-        }
+        if ((STAGED_DOM?.view(el) ?? el).getAttribute("class") === rawTarget) continue;
         if (!this.allowClass(el, write.next, write.absentIsEmpty)) continue;
         if (write.remove) (STAGED_DOM?.view(el) ?? el).removeAttribute("class");
         else if (write.useAttribute)
@@ -11968,21 +11846,7 @@ class HydrationCapability {
   }
   applyStyle(el, value, _prev, staticCss, entries) {
     const mode = hydrationMismatchMode(el);
-    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;
-    }
+    if (mode === 1) return true;
     const style = (STAGED_DOM?.view(el) ?? el).style;
     const hadStyleAttribute = (STAGED_DOM?.view(el) ?? el).hasAttribute("style");
     const before = style.cssText;
@@ -11998,11 +11862,7 @@ class HydrationCapability {
           applyStyleProperty(el, expectedStyle, entries[i], entry);
       }
     }
-    let claims = import_dom_binding_claims.domBindingClaims.get(el);
-    if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) {
-      const original = hydrateAttributeProbe.originals.get(el);
-      if (original !== void 0) claims = import_dom_binding_claims.domBindingClaims.get(original);
-    }
+    const claims = import_dom_binding_claims.domBindingClaims.get(el);
     if (claims !== void 0) {
       for (const [channel, published] of claims) {
         if (!channel.startsWith("style:")) continue;
@@ -12016,20 +11876,10 @@ 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" && !checkInitialHydrateAttribute(this, el, "style", hadStyleAttribute ? before : null)) {
+    if (mode === 2 && process.env.NODE_ENV !== "production" && !this.staleServerValues) {
       warnHydrationValueMismatch(el.__oct_loc, "style", before, expected);
     }
     return true;
@@ -12543,7 +12393,7 @@ function endPresentationHydration(frame, completed = true) {
 }
 function preparedPresentationAttribute(el, name, value, kind) {
   if (kind === "class") return value == null || value === false ? null : (0, import_css.normalizeClass)(value);
-  if (kind === "booleanAttr")
+  if (kind === "booleanAttr" || kind === setBooleanAttribute)
     return !!value && typeof value !== "function" && typeof value !== "symbol";
   const result = coerceAttrValue(el, name, value);
   return result === "" && import_constants.BOOLEAN_ATTR_PROPS.has(name.toLowerCase()) ? true : result;
@@ -12553,7 +12403,7 @@ function preparePresentationSignalBinding(args, frame, text = false) {
   const name = text ? void 0 : args[3];
   const value = args[text ? 3 : 4];
   const site = args[text ? 4 : 5];
-  const attributeKind = text ? void 0 : args[6] ?? "attr";
+  const attributeKind = text ? void 0 : args[6];
   const policy = text ? args[5] ? DIRECT_SIGNAL_TEXT_ONLY_POLICY : DIRECT_SIGNAL_TEXT_POLICY : DIRECT_SIGNAL_ATTRIBUTE_POLICY;
   return runWithBlockSignalOwner(scope, () => {
     const handle = isSignalHandle(value) ? value : null;
@@ -12918,6 +12768,9 @@ function isBlockClose(node) {
 function isTextSeparator(node) {
   return node !== null && node.nodeType === 8 && (STAGED_DOM?.view(node) ?? node).data === import_constants.HYDRATION_TEXT_SEP;
 }
+function isEmptyTextSlot(node) {
+  return node !== null && node.nodeType === 8 && (STAGED_DOM?.view(node) ?? node).data === "";
+}
 function findMatchingClose(open, matches) {
   let nested = null;
   let node = getNextSibling(open);
@@ -13113,23 +12966,10 @@ function writeDirectSignalText(target, value, kind, previous) {
 }
 function writeDirectSignalAttribute(target, value, _kind, _previous, name, attributeKind) {
   const element = target;
-  switch (attributeKind) {
-    case "class":
-      if (element.namespaceURI === HTML_NS) setClassName(element, value);
-      else setClassAttr(element, value);
-      break;
-    case "booleanAttr":
-      setBooleanAttribute(element, name, value);
-      break;
-    case "ariaAttr":
-      setAriaAttribute(element, name, value);
-      break;
-    case "stringData":
-      setStringData(element, name, value);
-      break;
-    default:
-      setAttribute(element, name, value);
-  }
+  if (attributeKind === "class") {
+    if (element.namespaceURI === HTML_NS) setClassName(element, value);
+    else setClassAttr(element, value);
+  } else attributeKind(element, name, value);
   return value;
 }
 function writeDirectSignalValue(target, value, _kind, _previous, _name, _attributeKind) {
@@ -13167,6 +13007,7 @@ const DIRECT_SIGNAL_CONTROL_POLICY = {
     if (snapshot !== null) validateDirectSignalControl(target, site);
     return snapshot;
   },
+  restored: (target, value) => (0, import_control_capture.isRestoredHydrationTextarea)(target, value),
   activate(binding, revision) {
     installDirectSignalControl(binding);
     if (!binding.pendingControl) (0, import_event_capture.consumeHydrationControl)(binding.target, revision);
@@ -13275,7 +13116,9 @@ function createDirectSignalBinding(scope, target, value, site, policy, name, att
   if (text !== void 0) binding.text = text;
   const controlSnapshot = policy.control?.snapshot(target, site) ?? null;
   const initial = handle === null ? value : readSignalBinding(handle);
-  binding.pendingControl = activeHydration() !== null && isWritableSignal(handle) && controlSnapshot !== null && (controlSnapshot.editRevision > 0 || (0, import_control_capture.isRestoredHydrationTextarea)(target, initial));
+  binding.pendingControl = activeHydration() !== null && isWritableSignal(handle) && controlSnapshot !== null && // Only control policies snapshot, so text/attribute bindings never retain
+  // the restored-textarea adoption graph.
+  (controlSnapshot.editRevision > 0 || policy.control.restored(target, initial));
   if (binding.pendingControl) binding.value = initial;
   if (!binding.pendingControl) writeDirectSignalBinding(binding, initial);
   if (STAGED_COMMIT_CAPTURE !== null) {
@@ -13295,14 +13138,14 @@ 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 && (!import_document_owner.signalDocumentEnabled || (0, import_owner_context.currentSignalOwner)() !== SCOPE_SIGNAL_OWNERS.get(scope))) {
     if (!import_document_owner.signalDocumentEnabled) enableSignalBindings();
-    return runWithBlockSignalOwner(
-      scope,
-      () => bindDirectSignal(scope, previous, target, value, site, policy, name, attributeKind)
-    );
+    if ((0, import_owner_context.currentSignalOwner)() !== scopeSignalOwner(scope)) {
+      return runWithBlockSignalOwner(
+        scope,
+        () => bindDirectSignal(scope, previous, target, value, site, policy, name, attributeKind)
+      );
+    }
   }
   if (handle === null && prior === null) {
     if (kind === "attribute" && previous === value) {
@@ -13385,7 +13228,7 @@ function bindSignalText(scope, previous, position, value, site, onlyChild = fals
     onlyChild ? DIRECT_SIGNAL_TEXT_ONLY_POLICY : DIRECT_SIGNAL_TEXT_POLICY
   );
 }
-function bindSignalAttribute(scope, previous, element, name, value, site, attributeKind = "attr") {
+function bindSignalAttribute(scope, previous, element, name, value, site, attributeKind) {
   if (previous === value && value !== void 0 && (value === null || typeof value !== "object" && typeof value !== "function"))
     return previous;
   return bindDirectSignal(
@@ -13495,7 +13338,15 @@ function setHTML(el, value) {
   if (hydration !== null && !hydration.isFresh(el)) {
     const server = el.localName === "script" ? (STAGED_DOM?.view(el) ?? el).textContent ?? "" : (STAGED_DOM?.view(el) ?? el).innerHTML;
     const expected = el.localName === "script" ? normalizeScriptTextForHydration(escapeInlineScriptContentForHydration(next)) : normalizeHTMLForHydration(el, next);
-    if (server === expected || isHydrationSuppressed(el)) return;
+    if (server === expected) {
+      if (el.localName !== "script") {
+        const host2 = STAGED_DOM?.view(el) ?? el;
+        journalRootProperty(el, DANGER_HTML_VALUE, host2[DANGER_HTML_VALUE]);
+        host2[DANGER_HTML_VALUE] = next;
+      }
+      return;
+    }
+    if (isHydrationSuppressed(el)) return;
     warnHydrationKeptServerValue(
       el.__oct_loc,
       "`dangerouslySetInnerHTML` content",
@@ -13504,8 +13355,14 @@ function setHTML(el, value) {
     );
     return;
   }
-  if (el.localName === "script") setScriptText(el, next);
-  else if (ROOT_RENDER_TRANSACTION !== null && !ROOT_RENDER_ROLLBACK) {
+  if (el.localName === "script") {
+    setScriptText(el, next);
+    return;
+  }
+  const host = STAGED_DOM?.view(el) ?? el;
+  if (host[DANGER_HTML_VALUE] === next) return;
+  journalRootProperty(el, DANGER_HTML_VALUE, host[DANGER_HTML_VALUE]);
+  if (ROOT_RENDER_TRANSACTION !== null && !ROOT_RENDER_ROLLBACK) {
     journalBag();
     journalRootRange(el, null, null);
     deferRootRange(el, getFirstChild(el), (STAGED_DOM?.view(el) ?? el).lastChild);
@@ -13514,7 +13371,9 @@ function setHTML(el, value) {
     while (getFirstChild(fresh) !== null)
       (STAGED_DOM?.view(el) ?? el).appendChild(getFirstChild(fresh));
   } else (STAGED_DOM?.view(el) ?? el).innerHTML = next;
+  host[DANGER_HTML_VALUE] = next;
 }
+const DANGER_HTML_VALUE = /* @__PURE__ */ Symbol("octane.dangerHTMLValue");
 const DANGER_HTML_ACTIVE = "__oct_dangerHTML";
 let DANGER_HTML_EVER_ACTIVE = false;
 const DANGER_HTML_STATIC_CHILD = "__oct_dangerChild";
@@ -13539,7 +13398,14 @@ function setDangerouslySetInnerHTML(el, value) {
   const wasActive = (STAGED_DOM?.view(el) ?? el)[DANGER_HTML_ACTIVE] === true;
   if (value == null) {
     (STAGED_DOM?.view(el) ?? el)[DANGER_HTML_ACTIVE] = false;
-    if (wasActive) setHTML(el, null);
+    if (wasActive) {
+      setHTML(el, null);
+      const host = STAGED_DOM?.view(el) ?? el;
+      if (host[DANGER_HTML_VALUE] !== void 0) {
+        journalRootProperty(el, DANGER_HTML_VALUE, host[DANGER_HTML_VALUE]);
+        host[DANGER_HTML_VALUE] = void 0;
+      }
+    }
     return;
   }
   if (value != null && import_constants.VOID_ELEMENTS.has(el.localName)) {
@@ -15611,7 +15477,6 @@ 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;
@@ -17825,8 +17690,6 @@ 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(
@@ -20547,7 +20410,8 @@ function renderPreparedChildList(state, parentBlock, domParent, preparedList, hy
       adopt: null,
       plainDeopt: false,
       mappedNative: void 0,
-      selectionItems: void 0
+      selectionItems: void 0,
+      signalSite: void 0
     };
     if (upgradeArmed) {
       state.forSlot.adopt = buildDeoptAdoptQueue(upgradeChildren, state.start, state.end);
@@ -21732,7 +21596,7 @@ function shallowEqualProps(a, b) {
   let count = 0;
   for (const k in a) {
     const v = a[k];
-    if (!Object.is(v, b[k]) || v === void 0 && !import_has_own.hasOwnProp.call(b, k)) return false;
+    if (!import_has_own.hasOwnProp.call(b, k) || !Object.is(v, b[k])) return false;
     count++;
   }
   for (const _k in b) count--;
@@ -21830,8 +21694,7 @@ function hmr(fn) {
     }
   };
   function wrapper(props, scope, extra) {
-    if (scope !== void 0 && (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null))
-      meta.liveBlocks.add(scope.block);
+    if (scope !== void 0) meta.liveBlocks.add(scope.block);
     return meta.fn(props, scope, extra);
   }
   Object.defineProperty(wrapper, HMR, {
@@ -22230,8 +22093,7 @@ function mountPassthroughPending(state, thenable) {
     setTryBranch(state, -1);
     scheduleRender(state.parentBlock);
   };
-  if (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null)
-    thenable.then(retry, retry);
+  thenable.then(retry, retry);
 }
 function renderPassthroughTry(state) {
   if (state.branch === 0 && state.block !== null) {
@@ -22735,10 +22597,10 @@ function takeInitialSuspenseHydration(state, hydration) {
     if (payload === void 0) {
       payload = {
         seedRaw: typeof stash?.[boundaryId] === "string" ? stash[boundaryId] : null,
-        nativeRaw: (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null) && typeof stash?.[boundaryId + "$signals"] === "string" ? stash[boundaryId + "$signals"] : null
+        nativeRaw: typeof stash?.[boundaryId + "$signals"] === "string" ? stash[boundaryId + "$signals"] : null
       };
       (initialStreamedPayloads ??= /* @__PURE__ */ new WeakMap()).set(owner, payload);
-      if (stash !== void 0 && (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null)) {
+      if (stash !== void 0) {
         delete stash[boundaryId];
         delete stash[boundaryId + "$signals"];
       }
@@ -22776,8 +22638,7 @@ function takeInitialSuspenseHydration(state, hydration) {
       continue;
     if (attr === import_constants.SUSPENSE_RESOLVED_SEED_ATTR)
       seedRaw = (STAGED_DOM?.view(script) ?? script).textContent;
-    else if (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null)
-      nativeRaw = (STAGED_DOM?.view(script) ?? script).textContent;
+    else nativeRaw = (STAGED_DOM?.view(script) ?? script).textContent;
     sidecars.push(script);
     cursor = getNextSibling(script);
   }
@@ -22818,8 +22679,7 @@ 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?.staleServerValues) hydration.staleServerValues = true;
   if (previousHydration?.retryPresentation !== void 0)
     hydration.retryPresentation = previousHydration.retryPresentation;
   const previousCapture = WIP_CAPTURE;
@@ -22888,8 +22748,7 @@ function renderInitialSuspenseHydration(state, initial) {
         return;
       scheduleRender(state.parentBlock);
     };
-    if (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null)
-      suspended.then(resume, resume);
+    suspended.then(resume, resume);
     return;
   }
   initialSuspenseHydrations?.delete(state);
@@ -22956,8 +22815,7 @@ 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" && (process.env.NODE_ENV === "production" || hydrateAttributeProbe === null))
-      scopedNativeRaw = nativeRaw;
+    if (typeof nativeRaw === "string") scopedNativeRaw = nativeRaw;
     adoptCursor = getNextSibling(adoptCursor);
   } else if (
     // A shell hydrated before its streamed segment swaps still has the
@@ -23919,7 +23777,6 @@ 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 = () => {
@@ -25267,7 +25124,6 @@ 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;
@@ -25662,7 +25518,7 @@ function switchBlock(parentScope, slotKey, domParent, discriminant, cases, defau
   }
   renderBranchSlot(parentScope, slotKey, state, domParent, nextIdx, body, "switch", env);
 }
-function forBlock(parentScope, slotKey, domParent, inputItems, getKey, itemBody, flags, deps, emptyBody, anchor, ownEnd) {
+function forBlock(parentScope, slotKey, domParent, inputItems, getKey, itemBody, flags, deps, emptyBody, anchor, ownEnd, signalSite) {
   if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
   const items = Array.isArray(inputItems) ? inputItems : Array.from(inputItems);
   const parentBlock = parentScope.block;
@@ -25708,7 +25564,8 @@ function forBlock(parentScope, slotKey, domParent, inputItems, getKey, itemBody,
       // one hidden class and the stamp in childSlot transitions nothing.
       plainDeopt: false,
       mappedNative: void 0,
-      selectionItems: void 0
+      selectionItems: void 0,
+      signalSite
     };
     parentScope.slots[slotKey] = state;
     registerSlot(parentScope, state);
@@ -25824,7 +25681,7 @@ function forBlock(parentScope, slotKey, domParent, inputItems, getKey, itemBody,
   }
   if (hydration !== null) hydration.node = getNextSibling(state.end);
 }
-function keyedForBlock(parentScope, slotKey, domParent, items, getKey, itemBody, flags, deps, emptyBody, anchor, ownEnd, selectionBody) {
+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];
   if (TRANSITION_JOURNAL !== null && ROOT_RENDER_TRANSACTION === null) {
@@ -25855,7 +25712,8 @@ function keyedForBlock(parentScope, slotKey, domParent, items, getKey, itemBody,
     deps,
     emptyBody,
     anchor,
-    ownEnd
+    ownEnd,
+    signalSite
   );
   if (TRANSITION_JOURNAL === null || ROOT_RENDER_TRANSACTION !== null) {
     const rendered = parentScope.slots[slotKey];
@@ -27239,7 +27097,7 @@ function coalesceHydratedRanges(rootBlock, liteRanges) {
       mergeExactRanges(outer, inner);
     }
   }
-  function visitSlot(state) {
+  function visitSlot(state, scope) {
     const kind = state.__kind;
     if (kind === "componentSlotSlot") {
       if (state.block !== null) visitBlock(state.block, state);
@@ -27248,6 +27106,11 @@ function coalesceHydratedRanges(rootBlock, liteRanges) {
     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;
@@ -27279,7 +27142,7 @@ function coalesceHydratedRanges(rootBlock, liteRanges) {
       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]);
+    for (let i = 0; i < registered.length; i++) visitSlot(registered[i], scope);
   }
   visitBlock(rootBlock);
   for (let i = 0; i < groups.length; i++) {
@@ -27874,6 +27737,7 @@ function makeRoot(container, rootBlock, currentBody, currentKey, idState, output
           currentKey = null;
         }
       } finally {
+        idState.signalState?.opaqueKeys?.clear();
         NATIVE_READ_DRIVER?.clearDeferredRefs(renderOwner);
         renderOwner.current = null;
         renderOwner.retry = noop;
@@ -27926,6 +27790,10 @@ function createRoot(container, options) {
 function __createVoidRoot(container, options) {
   return createRootWithOutputHandler(container, options, null);
 }
+function __voidRootProps(type, props) {
+  (0, import_shared_value_helpers.applyElementDefaultProps)(type, props);
+  return props;
+}
 function hydrateRoot(container, bodyOrElement, propsOrOptions, rootOptions) {
   return hydrateRootWithOutputHandler(
     container,
@@ -28225,6 +28093,7 @@ function createIndependentHydrateActivator(body) {
       if (notify !== null) useEffect(notify, [scope], HYDRATE_NOTIFY_SLOT);
     };
     const framed = (_props, scope) => {
+      stampSignalInstanceKey(scope, rootSignalInstanceKey(scope.block.idState));
       tryBlock(scope, 0, scope.block.parentNode, content, null, null, scope.block.endMarker);
     };
     const adapter = (_props, scope) => {
@@ -28320,7 +28189,6 @@ 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 = (0, import_resource_hint_diagnostics.resourceHintWarning)("preload", href, options);
     if (warning !== null) console.error(warning);
@@ -28358,7 +28226,6 @@ 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 = (0, import_resource_hint_diagnostics.resourceHintWarning)("preinit", href, options);
     if (warning !== null) console.error(warning);
@@ -28383,7 +28250,6 @@ 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 = (0, import_resource_hint_diagnostics.resourceHintWarning)("preconnect", href, options);
     if (warning !== null) console.error(warning);
@@ -28405,7 +28271,6 @@ function preconnect(href, options) {
   });
 }
 function prefetchDNS(href) {
-  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   if (process.env.NODE_ENV !== "production") {
     const warning = (0, import_resource_hint_diagnostics.resourceHintWarning)("prefetchDNS", href, arguments[1], arguments.length > 1);
     if (warning !== null) console.error(warning);
@@ -28421,7 +28286,6 @@ function prefetchDNS(href) {
   });
 }
 function preloadModule(href, options) {
-  if (process.env.NODE_ENV !== "production" && hydrateAttributeProbe !== null) return;
   if (process.env.NODE_ENV !== "production") {
     const warning = (0, import_resource_hint_diagnostics.resourceHintWarning)("preloadModule", href, options);
     if (warning !== null) console.error(warning);
@@ -28443,7 +28307,6 @@ 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 = (0, import_resource_hint_diagnostics.resourceHintWarning)("preinitModule", href, options);
     if (warning !== null) console.error(warning);
@@ -28552,7 +28415,6 @@ 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;
@@ -28572,7 +28434,6 @@ 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;
@@ -28603,7 +28464,6 @@ 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;
@@ -28639,6 +28499,7 @@ function scriptResource(attrs) {
   __useLinkedStateWithGetter,
   __useReducerWithGetter,
   __useStateWithGetter,
+  __voidRootProps,
   __vtSeen,
   act,
   activityBlock,
@@ -28759,7 +28620,6 @@ function scriptResource(attrs) {
   isChildrenBlock,
   isHydratingStyle,
   isInActScope,
-  isNativeSignalDiagnosticProbe,
   isValidElement,
   keyedForBlock,
   lazy,