octane 0.2.13 → 0.2.15

package/dist/runtime.js

@@ -1,4 +1,5 @@
 import { resolveHookPath } from "./hook-slot-cache.js";
+import { domBindingClaims } from "./dom-binding-claims.js";
 import { DOMStage } from "./dom-stage.js";
 import { __normalizeBindingStyle } from "./dom-binding-styles.js";
 import {
@@ -9,6 +10,10 @@ import {
   releaseBindingHandoff
 } from "./dom-binding-handoff.js";
 import { bumpContextEpoch, contextEpochNow } from "./context-epoch.js";
+import {
+  CONTROL_HANDOFF,
+  hasSignalControlBinding
+} from "./signals/control-handoff.js";
 import {
   SUSPENSE_SCRIPT_ATTR,
   SUSPENSE_RESOLVED_COMMENT,
@@ -2257,7 +2262,9 @@ function rollbackRootRender(transaction) {
 }
 function retireDetachedBindingLeases(owner) {
   for (const lease of owner.bindingLeases) {
-    if (owner.bindingContainer.contains(lease.anchor)) continue;
+    const preparation = lease.host !== void 0 && !lease.active() ? PRESENTATION_PREPARATIONS.get(lease) : void 0;
+    if (preparation !== void 0 ? !preparation.scope.block.disposed : owner.bindingContainer.contains(lease.anchor))
+      continue;
     owner.bindingLeases.delete(lease);
     PRESENTATION_PREPARATIONS.delete(lease);
     releaseBindingHandoff(lease);
@@ -6292,7 +6299,8 @@ function nativeEffectPublicationCurrent(entry, slot) {
   if (ROOT_RENDER_TRANSACTION !== null) journalObjectOnce(slot);
   slot.deps = void 0;
   slot.active = slot.connectedFn !== null;
-  invalidateRender(entry.scope.block, entry.scope.block);
+  if (!entry.scope.block.idState.renderOwner?.disposed && !blockSubtreeDisposed(entry.scope.block))
+    scheduleNativeRead(entry.scope.block);
   return false;
 }
 function drainMutationEffects() {
@@ -8662,6 +8670,7 @@ function releasePreservedHydrateActivation(state) {
 function pendingHydrateOwner(target) {
   let owner = null;
   for (let block = target; block !== null; block = block.parentBlock) {
+    if (block.block !== block) continue;
     const state = block.slots[0];
     if (state?.__kind === "hydrateBlockSlot" && !state.hydrated && preservedHydrateActivations?.has(state))
       owner = state;
@@ -11409,7 +11418,7 @@ class HydrationCapability {
     const first = getFirstChild(el);
     if (first !== null && first.nodeType === 3) {
       const server = (STAGED_DOM?.view(first) ?? first).nodeValue;
-      if (server !== text && !isTextParserNormalizedMatch(server, text) && !isHydrationSuppressed(el)) {
+      if (server !== text && domBindingClaims.get(el)?.get("#text") !== server && !isTextParserNormalizedMatch(server, text) && !isHydrationSuppressed(el)) {
         this.recordTextMismatch(first, loc || el.__oct_loc, server);
         (STAGED_DOM?.view(first) ?? first).nodeValue = text;
       }
@@ -11494,6 +11503,7 @@ class HydrationCapability {
       name.indexOf(":") >= 0 ? name.slice(name.indexOf(":") + 1) : name
     ) : (STAGED_DOM?.view(el) ?? el).getAttribute(name);
     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;
@@ -11504,10 +11514,11 @@ class HydrationCapability {
   }
   allowClass(el, next, absentIsEmpty = false) {
     const mode = hydrationMismatchMode(el);
-    if (mode === 0) return true;
     const rawServer = (STAGED_DOM?.view(el) ?? el).getAttribute("class");
     const server = absentIsEmpty && rawServer === null ? "" : 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")
       warnHydrationValueMismatch(el.__oct_loc, "attribute `class`", server, next);
@@ -11549,6 +11560,18 @@ class HydrationCapability {
           applyStyleProperty(el, expectedStyle, entries[i], entry);
       }
     }
+    const claims = domBindingClaims.get(el);
+    if (claims !== void 0) {
+      for (const [channel, published] of claims) {
+        if (!channel.startsWith("style:")) continue;
+        const property = channel.slice(6);
+        const value2 = style.getPropertyValue(property);
+        const priority = style.getPropertyPriority(property);
+        if ((value2 === "" ? null : value2 + (priority ? " !important" : "")) !== published) continue;
+        if (value2 === "") expectedStyle.removeProperty(property);
+        else expectedStyle.setProperty(property, value2, priority);
+      }
+    }
     const expected = expectedStyle.cssText;
     const expectsStyleAttribute = expected !== "";
     if (before === expected && hadStyleAttribute === expectsStyleAttribute) return true;
@@ -11856,7 +11879,7 @@ function isAdoptionControl(error) {
 }
 function presentationFailure(error) {
   const frame = PRESENTATION_HYDRATION;
-  if (frame?.revision !== void 0 && !isSuspenseException(error) && !isAdoptionControl(error)) {
+  if (frame !== null && !isSuspenseException(error) && !isAdoptionControl(error)) {
     const failure = new PresentationAdoptionMiss(frame.lease, false);
     failure.failure = error;
     throw failure;
@@ -11867,12 +11890,25 @@ function presentationMiss(retry = true) {
   throw new PresentationAdoptionMiss(PRESENTATION_HYDRATION?.lease, retry);
 }
 function currentPresentation(frame) {
-  if (frame.revision === void 0) return true;
+  if (frame.controls !== void 0 && [...frame.controls.values()].some(({ valid }) => !valid()))
+    return false;
+  if (frame.revision === void 0 && frame.controls === void 0) return true;
   const lease = frame.lease;
-  return lease.active() && lease.valid?.() !== false && lease.revision?.() === frame.revision && lease.root.parentNode !== null && lease.end?.parentNode === lease.root.parentNode && [...frame.witnesses.values()].every(
+  return lease.active() && lease.valid?.() !== false && lease.revision?.() === frame.revision && lease.root.parentNode !== null && (lease.host === void 0 ? lease.end?.parentNode === lease.root.parentNode : lease.owner === frame.scope.block.idState.renderOwner && frame.scope.block.idState.renderOwner.bindingContainer.contains(lease.root)) && [...frame.witnesses.values()].every(
     (witness) => witness === null || validateNativeReadWitness(witness)
   );
 }
+function trackPresentationFrame(frame) {
+  if (frame.current !== void 0) return;
+  frame.current = currentPresentation;
+  (WIP_CAPTURE.presentations ??= []).push(frame);
+  if (frame.hydration === null) return;
+  frame.hydration.presentation = true;
+  for (let block = frame.scope.block; block !== null; block = block.parentBlock) {
+    preserveRootCreatedDom(block);
+    if (block === frame.hydration.rootBlock) break;
+  }
+}
 function currentPresentations(capture) {
   return capture.presentations?.every((frame) => frame.current(frame)) !== false;
 }
@@ -11908,7 +11944,7 @@ function hasClosedPresentationView(lease, scope, id) {
     return false;
   }
 }
-function beginPresentationHydration(scope, id, supported = false, structural = false, conditionalRest = false) {
+function beginPresentationHydration(scope, id, supported = false, structural = false, conditionalRest = false, host = false) {
   const owner = scope.block.idState.renderOwner;
   if (PRESENTATION_HYDRATION !== null && PRESENTATION_HYDRATION.scope.block.idState.renderOwner === owner) {
     if (conditionalRest) {
@@ -11920,15 +11956,17 @@ function beginPresentationHydration(scope, id, supported = false, structural = f
   if (owner?.bindingLeases === void 0 || WIP_CAPTURE === null) return null;
   const hydration = activeHydration();
   const lease = [...owner.bindingLeases].find(
-    (candidate) => candidate.id === id && (candidate.root === scope.block.startMarker || candidate.root === hydration?.node || candidate.root.nodeType === 8 && candidate.root.nextSibling === hydration?.node)
+    (candidate) => candidate.id === id && (candidate.root === scope.block.startMarker || candidate.root === hydration?.node || candidate.root.nodeType === 8 && candidate.root.nextSibling === hydration?.node || candidate.host !== void 0 && PRESENTATION_PREPARATIONS.get(candidate)?.scope === scope)
   );
   if (lease === void 0) return null;
+  if (!lease.active()) throw new PresentationAdoptionMiss(lease, false);
+  if (host !== (lease.host !== void 0)) throw new PresentationAdoptionMiss(lease, false);
   if (conditionalRest ? !supported || !structural || !hasClosedPresentationView(lease, scope, id) : !supported)
     throw new PresentationAdoptionMiss(lease, false);
   const revision = lease.revision?.();
-  if (revision !== void 0 && revision >= 0 && lease.valid?.() === false)
+  if ((revision === void 0 || revision >= 0) && lease.valid?.() === false)
     throw new PresentationAdoptionMiss(lease, false);
-  if (revision !== void 0 && (!structural || revision < 0))
+  if (revision !== void 0 && (!structural && !host || revision < 0))
     throw new PresentationAdoptionMiss(lease, revision < 0, revision);
   const pending = PRESENTATION_PREPARATIONS.get(lease);
   const frame = {
@@ -11941,42 +11979,95 @@ function beginPresentationHydration(scope, id, supported = false, structural = f
     readToken: beginNativeReadScope(scope),
     witnessToken: beginNativeReadWitness(),
     witnesses: pending?.scope === scope ? new Map(pending.witnesses) : /* @__PURE__ */ new Map(),
+    ...lease.host === void 0 ? {} : { hostSuccessors: new Map(pending?.scope === scope ? pending.hostSuccessors : void 0) },
+    ...pending?.scope === scope && pending.controls !== void 0 ? { controls: new Map(pending.controls) } : {},
     completed: false,
     lease,
-    ...revision === void 0 ? {} : { revision, current: currentPresentation },
+    ...revision === void 0 ? {} : { revision },
     hydration
   };
   PRESENTATION_HYDRATION = frame;
-  if (revision !== void 0 && hydration !== null) {
-    hydration.presentation = true;
-    for (let block = scope.block; block !== null; block = block.parentBlock) {
-      preserveRootCreatedDom(block);
-      if (block === hydration.rootBlock) break;
-    }
-  }
+  if (revision !== void 0 || frame.controls !== void 0) trackPresentationFrame(frame);
   PRESENTATION_PREPARATIONS.set(lease, frame);
-  if (revision !== void 0) (WIP_CAPTURE.presentations ??= []).push(frame);
+  const hostRefs = host ? WIP_CAPTURE.refs : void 0;
   (WIP_CAPTURE.renderCleanups ??= []).push((discarded) => {
     if (discarded || !frame.completed || owner.disposed || scope.block.disposed || PRESENTATION_PREPARATIONS.get(lease) !== frame)
       return;
     if (!currentPresentation(frame)) {
-      frame.hydration?.retryPresentation?.();
+      if (frame.hydration?.retryPresentation !== void 0) frame.hydration.retryPresentation();
+      else throw new PresentationAdoptionMiss(lease, false);
       return;
     }
     PRESENTATION_PREPARATIONS.delete(lease);
     owner.bindingLeases.delete(lease);
     releaseBindingHandoff(lease);
+    let publicationStarted = false;
     let published = false;
+    let hostFailed = false;
+    let hostFailure;
     try {
       lease.retire(() => {
-        for (const writes of frame.writes.values()) for (const write of writes.values()) write();
+        publicationStarted = true;
+        try {
+          for (const writes of frame.writes.values()) for (const write of writes.values()) write();
+        } catch (error) {
+          for (const stop of frame.hostSuccessors?.values() ?? []) {
+            try {
+              stop();
+            } catch {
+            }
+          }
+          frame.hostSuccessors?.clear();
+          for (const [element, control] of frame.controls ?? []) {
+            const binding = control.binding;
+            if (binding.disposed && control.valid(true)) continue;
+            (owner.controlLeases ??= /* @__PURE__ */ new Map()).set(element, control.lease);
+            if (binding.disposed) continue;
+            if (binding.input !== void 0) renderControlledState(element).v = UNCONTROLLED;
+            control.stop = binding.unsubscribe;
+            binding.unsubscribe = void 0;
+            disposeDirectSignalBinding(binding);
+          }
+          for (const control of frame.controls?.values() ?? []) {
+            try {
+              control.stop?.();
+            } catch {
+            }
+          }
+          throw error;
+        }
         published = true;
       });
     } catch (error) {
-      if (!published) throw error;
-      reportRendererOwnerError(scope, error);
+      if (!publicationStarted) throw error;
+      if (frame.hostSuccessors !== void 0) {
+        hostFailed = true;
+        hostFailure = error;
+      } else reportRendererOwnerError(scope, error);
     } finally {
+      if (frame.hostSuccessors !== void 0 && (!published || lease.valid?.() === false)) {
+        published = false;
+        owner.bindingLeases.add(lease);
+        PRESENTATION_PREPARATIONS.set(lease, frame);
+        for (const entry of hostRefs) if (entry.el === lease.root) entry.ref = null;
+        for (const stop of frame.hostSuccessors.values()) {
+          try {
+            stop();
+          } catch (error) {
+            if (!hostFailed) {
+              hostFailed = true;
+              hostFailure = error;
+            }
+          }
+        }
+        if (!hostFailed) {
+          hostFailed = true;
+          hostFailure = new Error(formatClientError(77));
+        }
+      }
+      frame.hostSuccessors?.clear();
       frame.writes.clear();
+      frame.controls?.clear();
       if (published && !owner.disposed && owner.current !== null && [...frame.witnesses.values()].some(
         (witness) => witness !== null && !validateNativeReadWitness(witness)
       )) {
@@ -11986,6 +12077,7 @@ function beginPresentationHydration(scope, id, supported = false, structural = f
       }
       frame.witnesses.clear();
     }
+    if (hostFailed) reportRendererOwnerError(scope, hostFailure);
   });
   return frame;
 }
@@ -12004,13 +12096,33 @@ function preparedPresentationAttribute(el, name, value, kind) {
   const result = coerceAttrValue(el, name, value);
   return result === "" && BOOLEAN_ATTR_PROPS.has(name.toLowerCase()) ? true : result;
 }
-function preparePresentationSignalAttribute(args, frame) {
-  const [scope, previous, element, name, value, site, attributeKind = "attr"] = args;
+function preparePresentationSignalBinding(args, frame, text = false) {
+  const [scope, previous, element] = args;
+  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 kind = text ? args[5] ? "textOnlyChild" : "text" : "attribute";
   return runWithBlockSignalOwner(scope, () => {
     const handle = isSignalHandle(value) ? value : null;
-    const current = handle === null ? value : handle.get();
-    const prepared = preparedPresentationAttribute(element, name, current, attributeKind);
+    const witness = handle !== null && frame.lease.host !== void 0 ? beginNativeReadWitness(true) : -1;
+    let current;
+    let readCompleted = false;
+    try {
+      current = handle === null ? value : handle.get();
+      readCompleted = true;
+    } finally {
+      if (witness >= 0)
+        frame.witnesses.set(handle, finishNativeReadWitness(witness, readCompleted));
+    }
+    if (text && (current !== null && (typeof current === "object" || typeof current === "function") || typeof args[7] !== "string"))
+      presentationMiss(false);
+    const prepared = text ? bindingText(element, current, args[7]) : preparedPresentationAttribute(element, name, current, attributeKind);
     if (handle === null) {
+      if (text) {
+        frame.writes.get(element)?.delete("signalText");
+        return prepared;
+      }
       preparePresentationOperation(
         frame,
         element,
@@ -12020,12 +12132,12 @@ function preparePresentationSignalAttribute(args, frame) {
       return value;
     }
     const prior = previous;
-    const reusable = prior?.[DIRECT_SIGNAL_BINDING] === true && !prior.disposed && prior.unsubscribe === void 0 && prior.handle === handle && prior.target === element && prior.site === site && prior.name === name && prior.attributeKind === attributeKind;
+    const reusable = prior?.[DIRECT_SIGNAL_BINDING] === true && !prior.disposed && prior.unsubscribe === void 0 && prior.handle === handle && prior.target === element && prior.kind === kind && prior.site === site && prior.name === name && prior.attributeKind === attributeKind;
     const binding = reusable ? prior : {
       [DIRECT_SIGNAL_BINDING]: true,
       scope,
       target: element,
-      kind: "attribute",
+      kind,
       site,
       name,
       attributeKind,
@@ -12033,16 +12145,114 @@ function preparePresentationSignalAttribute(args, frame) {
       value: current,
       disposed: false
     };
+    if (text) binding.text = prepared;
     if (!reusable) registerHookCleanup(scope, () => disposeDirectSignalBinding(binding));
-    preparePresentationOperation(frame, element, name, () => {
+    frame.hostSuccessors?.set(binding, () => disposeDirectSignalBinding(binding));
+    preparePresentationOperation(frame, element, name ?? "signalText", () => {
       if (binding.disposed) return;
-      writeDirectSignalScalar(element, prepared, "attribute", previous, name, attributeKind);
+      if (!text)
+        writeDirectSignalScalar(element, prepared, "attribute", previous, name, attributeKind);
       binding.value = current;
       runWithBlockSignalOwner(scope, () => activateDirectSignalBinding(binding, void 0));
     });
     return binding;
   });
 }
+function preparePresentationSignalValue(args, frame) {
+  const [scope, previous, element, handle, site] = args;
+  return runWithBlockSignalOwner(scope, () => {
+    if (element.localName !== "textarea" || element.namespaceURI !== HTML_NS || !isWritableSignal(handle))
+      presentationMiss(false);
+    validateDirectSignalControl(element, site);
+    const value = handle.get();
+    if (typeof value !== "string") presentationMiss(false);
+    const owner = scope.block.idState.renderOwner;
+    const lease = owner.controlLeases?.get(element);
+    const valid = (retired = false) => owner.bindingContainer.contains(element) && (!retired || frame.lease.valid?.() !== false) && (lease !== void 0 && !retired ? lease.owner === owner && lease.active() && runWithBlockSignalOwner(scope, () => lease.matches(handle)) : !hasSignalControlBinding(element, "value") && !hasHydrationControlSignalWriter(element, "value"));
+    if (!valid()) presentationMiss(false);
+    const prior = previous;
+    const reusable = prior?.[DIRECT_SIGNAL_BINDING] === true && !prior.disposed && prior.input === void 0 && prior.handle === handle && prior.target === element && prior.kind === "value" && prior.site === site;
+    const binding = reusable ? prior : {
+      [DIRECT_SIGNAL_BINDING]: true,
+      scope,
+      target: element,
+      kind: "value",
+      site,
+      handle,
+      value,
+      disposed: false
+    };
+    (frame.controls ??= /* @__PURE__ */ new Map()).set(element, { valid, binding, lease });
+    trackPresentationFrame(frame);
+    if (!reusable) registerHookCleanup(scope, () => disposeDirectSignalBinding(binding));
+    if (binding.unsubscribe === void 0) {
+      const notify = Object.assign(
+        () => {
+          if (binding.controlWriterCleanup !== void 0) updateDirectSignalBinding(binding);
+        },
+        {
+          [NATIVE_TRANSITION_CONSUMER]: {
+            active: () => binding.controlWriterCleanup !== void 0 && !binding.disposed && !scope.block.disposed,
+            prepare: () => prepareNativeTransitionBlock(scope.block)
+          }
+        }
+      );
+      const stop = handle[SIGNAL_BINDING_SUBSCRIBE](
+        notify,
+        () => disposeDirectSignalBinding(binding)
+      );
+      if (typeof stop !== "function") throw new TypeError(formatClientError(74));
+      if (binding.disposed || scope.block.disposed) {
+        stop();
+        presentationMiss(false);
+      }
+      binding.unsubscribe = stop;
+    }
+    preparePresentationOperation(frame, element, "value", () => {
+      if (binding.disposed || scope.block.disposed) return;
+      runWithBlockSignalOwner(scope, () => {
+        if (!valid()) throw new Error(formatClientError(77));
+        const before = snapshotHydrationControl(element);
+        const ctrl = armControlled(element);
+        ctrl.composing = before.composing || lease?.composing() === true;
+        if (ctrl.composing) element.addEventListener("blur", onCtrlCompositionEnd);
+        ctrl.v = UNCONTROLLED;
+        let failed = false;
+        let failure;
+        if (lease !== void 0) {
+          try {
+            lease.retire();
+          } catch (error) {
+            failed = true;
+            failure = error;
+          } finally {
+            lease.owner = void 0;
+          }
+        }
+        if (lease !== void 0 && !scope.block.disposed && !valid(true))
+          throw failed ? failure : new Error(formatClientError(77));
+        if (lease !== void 0) owner.controlLeases.delete(element);
+        if (!binding.disposed && !scope.block.disposed) {
+          const snapshot = snapshotHydrationControl(element);
+          binding.value = element.value;
+          binding.pendingControl = snapshot.editRevision > (lease === void 0 ? 0 : before.editRevision);
+          installDirectSignalControl(binding);
+          if (!binding.pendingControl) consumeHydrationControl(element, snapshot.revision);
+          if (binding.pendingControl) queueDirectSignalControlAdoption(binding);
+          else {
+            const current = readSignalBinding(handle);
+            ctrl.sawV = true;
+            ctrl.v = value;
+            binding.value = current;
+            writeDirectSignalBinding(binding, current);
+          }
+        }
+        if (failed) reportRendererOwnerError(scope, failure);
+      });
+    });
+    return binding;
+  });
+}
 function presentationHostWrite(writer, ...args) {
   const frame = PRESENTATION_HYDRATION;
   if (frame === null) return writer(...args);
@@ -12074,6 +12284,20 @@ function presentationHostWrite(writer, ...args) {
 function presentationWrite(writer, kind, ...args) {
   const frame = PRESENTATION_HYDRATION;
   if (frame === null) return writer(...args);
+  if (frame.lease.host !== void 0) {
+    const channels = frame.lease.host;
+    const changed2 = kind.endsWith("IfChanged") || kind.startsWith("updateFresh");
+    const element2 = kind === "bindSignalAttribute" || kind === "nativeStyleBinding" || kind === "nativeProjectionBinding" ? args[2] : args[changed2 ? 2 : 0];
+    const keys = kind === "nativeProjectionBinding" ? args[4].map((field) => field === "className" ? "class" : field) : kind === "setStyleProperties" ? args[1].filter((_, index) => index % 2 === 0).map((key2) => "style:" + key2) : [
+      kind === "nativeStyleBinding" || kind === "setStyle" ? "style" : kind === "setStyleProperty" ? "style:" + args[1] : kind.includes("Class") ? "class" : kind === "bindSignalAttribute" ? args[3] : args[changed2 ? 3 : 1]
+    ];
+    if (element2 !== frame.lease.root || keys.some((key2) => !channels.has(key2)) || kind === "bindSignalValue" || kind === "setEventHandler" || kind === "bindSignalText" || kind === "setText" || kind === "markDangerouslySetInnerHTMLChildren")
+      presentationMiss(false);
+  }
+  if (kind === "queueNativeChangeDiagnostic") {
+    preparePresentationOperation(frame, args[0], "nativeChangeDiagnostic", () => writer(...args));
+    return void 0;
+  }
   if (kind === "markDangerouslySetInnerHTMLChildren") {
     const element2 = args[0];
     if (!frame.writes.get(element2)?.has("hostProps") || element2[DANGER_HTML_ACTIVE] === true)
@@ -12081,28 +12305,32 @@ function presentationWrite(writer, kind, ...args) {
     preparePresentationOperation(frame, element2, "hostChildren", () => writer(element2));
     return void 0;
   }
-  if (kind === "bindSignalText") {
-    const value = args[3];
-    if (value !== null && (typeof value === "object" || typeof value === "function") || typeof args[7] !== "string")
-      presentationMiss(false);
-    return bindingText(args[2], value, args[7]);
-  }
+  if (kind === "bindSignalText") return preparePresentationSignalBinding(args, frame, true);
   if (kind === "setText") {
     const text = coerceText(args[1]);
     preparePresentationOperation(frame, args[0], "text", () => writer(args[0], text));
     return void 0;
   }
-  if (kind === "bindSignalAttribute") return preparePresentationSignalAttribute(args, frame);
+  if (kind === "bindSignalAttribute") return preparePresentationSignalBinding(args, frame);
+  if (kind === "bindSignalValue") return preparePresentationSignalValue(args, frame);
   if (kind === "nativeStyleBinding" || kind === "nativeProjectionBinding") {
     const [owner, slot, el] = args;
     const style = kind === "nativeStyleBinding";
-    nativePresentationBinding(
-      owner,
-      slot,
-      el,
-      style ? preparedNativeStyleBody : preparedNativeProjectionBody,
-      style ? { el, value: args[3], frame } : { el, compute: args[3], fields: args[4], frame }
-    );
+    try {
+      nativePresentationBinding(
+        owner,
+        slot,
+        el,
+        style ? preparedNativeStyleBody : preparedNativeProjectionBody,
+        style ? { el, value: args[3], frame } : { el, compute: args[3], fields: args[4], frame }
+      );
+    } finally {
+      if (frame.hostSuccessors !== void 0) {
+        const binding = owner.slots[slot];
+        if (binding !== void 0)
+          frame.hostSuccessors.set(binding, () => disposeNativeStyleBinding(binding));
+      }
+    }
     return void 0;
   }
   const prepared = args.slice();
@@ -12321,11 +12549,14 @@ function disposeDirectSignalBinding(binding) {
   if (DEFERRED_LAYOUT_DRIVER?.stageAction(() => disposeDirectSignalBinding(binding)) === true)
     return;
   binding.disposed = true;
-  binding.unsubscribe?.();
-  retireNativeTransitionBlock(binding.scope.block);
-  binding.controlWriterCleanup?.();
-  if (binding.input !== void 0) {
-    domNode(binding.target).removeEventListener("input", binding.input);
+  try {
+    binding.unsubscribe?.();
+  } finally {
+    retireNativeTransitionBlock(binding.scope.block);
+    binding.controlWriterCleanup?.();
+    if (binding.input !== void 0) {
+      domNode(binding.target).removeEventListener("input", binding.input);
+    }
   }
 }
 function directSignalControlValue(binding, snapshot) {
@@ -12490,6 +12721,8 @@ function activateDirectSignalBinding(binding, revision) {
   }
 }
 function createDirectSignalBinding(scope, target, value, site, kind, name, attributeKind, text) {
+  if (kind === "value" && scope.block.idState.renderOwner?.controlLeases?.has(target))
+    presentationMiss(false);
   const handle = isSignalHandle(value) ? value : null;
   const binding = {
     [DIRECT_SIGNAL_BINDING]: true,
@@ -14473,6 +14706,8 @@ function bindSignalHostPropSources(scope, previous, element, sources, site, hasN
     binding.sources = sources;
   }
   const valueControl = winningSignalHostControl(sources, "value");
+  if (valueControl !== null && scope.block.idState.renderOwner?.controlLeases?.has(element))
+    presentationMiss(false);
   const checkedControl = winningSignalHostControl(sources, "checked");
   const controlSnapshot = isWritableSignal(valueControl) || isWritableSignal(checkedControl) ? snapshotHydrationControl(element) : null;
   if (controlSnapshot !== null) {
@@ -16125,6 +16360,7 @@ function setNativeChangeDiagnosticMetadata(el, value) {
   if (value === "runtime") queueDevFormDiagnostic(el, CURRENT_SCOPE ?? void 0, true);
 }
 function setValue(el, value) {
+  if (CURRENT_SCOPE?.block.idState.renderOwner?.controlLeases?.has(el)) presentationMiss(false);
   const input = el;
   const ctrl = armControlled(el);
   if (TRANSITION_JOURNAL !== null) journalControlled(el, "value", "defaultValue");
@@ -26884,6 +27120,11 @@ function makeRoot(container, rootBlock, currentBody, currentKey, idState, output
       }
       unmounted = true;
       renderOwner.disposed = true;
+      if (renderOwner.controlLeases !== void 0) {
+        for (const lease of renderOwner.controlLeases.values())
+          if (lease !== void 0) lease.owner = void 0;
+        renderOwner.controlLeases.clear();
+      }
       if (renderOwner.bindingLeases !== void 0) {
         for (const lease of renderOwner.bindingLeases) {
           releaseBindingHandoff(lease);
@@ -26944,7 +27185,8 @@ function makeRoot(container, rootBlock, currentBody, currentKey, idState, output
 }
 function createRootWithOutputHandler(container, options, outputHandler) {
   assertValidRootContainer(container);
-  if (options?.bindingLeases !== void 0) throw new Error(formatClientError(76));
+  if (options?.bindingLeases !== void 0 || options?.controlLeases !== void 0)
+    throw new Error(formatClientError(76));
   options = warnCreateRootElementOption(options);
   const ownerToken = claimRootContainer(container);
   registerDelegationTarget(container, true);
@@ -27004,12 +27246,20 @@ function hydrateRoot(container, bodyOrElement, propsOrOptions, rootOptions) {
   const bindingLeases = rootOptions?.bindingLeases?.map((handle) => {
     const capability = handle;
     const lease = capability[BINDING_HANDOFF]?.();
-    if (lease === void 0 || !lease.active() || lease.owner !== void 0 || !container.contains(lease.root))
+    if (lease === void 0 || !lease.active() || lease.host !== void 0 && lease.valid?.() === false || lease.owner !== void 0 || !container.contains(lease.root))
       throw new Error(formatClientError(77));
     return lease;
   });
   if (bindingLeases !== void 0 && new Set(bindingLeases).size !== bindingLeases.length)
     throw new Error(formatClientError(78));
+  const controlLeases = rootOptions?.controlLeases?.map((handle) => {
+    const lease = handle?.[CONTROL_HANDOFF]?.();
+    if (!bindingLeases?.length || lease === void 0 || !lease.active() || lease.owner !== void 0 || lease.channel !== "value" || lease.control.localName !== "textarea" || !container.contains(lease.control))
+      throw new Error(formatClientError(77));
+    return lease;
+  });
+  if (controlLeases !== void 0 && new Set(controlLeases.map((lease) => lease.control)).size !== controlLeases.length)
+    throw new Error(formatClientError(78));
   const nativeSidecar = findHydrateSeedSidecar(container, NATIVE_SIGNAL_SEED_ATTR);
   const nativeManifest = nativeSidecar === null ? void 0 : parseNativeSignalManifest(
     (STAGED_DOM?.view(nativeSidecar) ?? nativeSidecar).textContent || ""
@@ -27071,6 +27321,10 @@ function hydrateRoot(container, bodyOrElement, propsOrOptions, rootOptions) {
     rootOptions
   );
   const owner = idState.renderOwner;
+  if (controlLeases !== void 0) {
+    owner.controlLeases = new Map(controlLeases.map((lease) => [lease.control, lease]));
+    for (const lease of controlLeases) lease.owner = owner;
+  }
   if (bindingLeases !== void 0) {
     owner.bindingLeases = new Set(bindingLeases);
     owner.bindingContainer = container;
@@ -27104,7 +27358,7 @@ function hydrateRoot(container, bodyOrElement, propsOrOptions, rootOptions) {
     while (firstNode !== null && (firstNode.nodeType === 10 || isRendererHydrationStyle(firstNode)))
       firstNode = getNextSibling(firstNode);
     const hydration = new HydrationCapability(rootBlock, firstNode, seeds);
-    if (bindingLeases?.some((lease) => lease.revision !== void 0)) {
+    if (bindingLeases?.length) {
       const attempted = rootBlock;
       hydration.retryPresentation = () => {
         if (owner.disposed || owner.current !== attempted) return;
@@ -27112,7 +27366,12 @@ function hydrateRoot(container, bodyOrElement, propsOrOptions, rootOptions) {
         collectVisibleSubtreeRefs(attempted, refs);
         withRefDetachSuppression(refs, () => unmountBlock(attempted, false));
         queueMicrotask(() => {
-          if (!owner.disposed && owner.current === attempted) adopt();
+          if (owner.disposed || owner.current !== attempted) return;
+          try {
+            adopt();
+          } catch (error) {
+            if (!reportUncaughtError(rootBlock, error)) throw error;
+          }
         });
       };
     }

package/dist/server/streamed-signals.js

@@ -1,4 +1,5 @@
 import { encodeSignalValue } from "../data-encoding.js";
+import { STREAM_SCRIPT_ATTR } from "../stream-protocol.js";
 import {
   encodeStreamedRendererFrameForScript,
   isStreamFrameIdentity,
@@ -159,12 +160,12 @@ function escapeAttribute(value) {
 }
 function streamedRendererFrameScript(frame, nonce) {
   const encoded = encodeStreamedRendererFrameForScript(frame);
-  return `<script${nonce === void 0 ? "" : ` nonce="${escapeAttribute(nonce)}"`}>globalThis.__octaneStreamedRenderer.receive(${encoded});</script>`;
+  return `<script ${STREAM_SCRIPT_ATTR}${nonce === void 0 ? "" : ` nonce="${escapeAttribute(nonce)}"`}>globalThis.__octaneStreamedRenderer.receive(${encoded});</script>`;
 }
 function streamedSignalSelectionScript(identity, nonce) {
   if (!isStreamFrameIdentity(identity)) throw new TypeError("Invalid streamed signal identity.");
   const encoded = JSON.stringify(identity).replace(/&/g, "\\u0026").replace(/</g, "\\u003c").replace(/>/g, "\\u003e").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
-  return `<script${nonce === void 0 ? "" : ` nonce="${escapeAttribute(nonce)}"`}>(function(g){var k="__octaneStreamedRenderer",e=g[k];if(!e){var q=[];g[k]={version:1,frames:q,receive:function(f){if(q.length>=512){this.overflow=true;return;}q.push(f);}};}var z="__octaneStreamedSignalSelections",v=g[z];if(!v){var a=[];v=g[z]={version:1,identities:a,register:function(i){if(a.length>=256){this.overflow=true;return;}a.push(i);}};}v.register(${encoded});})(globalThis);</script>`;
+  return `<script ${STREAM_SCRIPT_ATTR}${nonce === void 0 ? "" : ` nonce="${escapeAttribute(nonce)}"`}>(function(g){var k="__octaneStreamedRenderer",e=g[k];if(!e){var q=[];g[k]={version:1,frames:q,receive:function(f){if(q.length>=512){this.overflow=true;return;}q.push(f);}};}var z="__octaneStreamedSignalSelections",v=g[z];if(!v){var a=[];v=g[z]={version:1,identities:a,register:function(i){if(a.length>=256){this.overflow=true;return;}a.push(i);}};}v.register(${encoded});})(globalThis);</script>`;
 }
 function createStreamedSignalInjection(identity, result, options = {}) {
   const budget = limits(options);