octane 0.2.12 → 0.2.13

package/dist/runtime.server.js

@@ -1,6 +1,7 @@
 import { trustHTML } from "./trusted-html.js";
 import { readNativeDomStyle, readNativeDomProps } from "./signals/read-protocol.js";
 import { resolveHookPath } from "./hook-slot-cache.js";
+import { encodeBindingKey, isBindingOpenComment } from "./dom-binding-protocol.js";
 import {
   BLOCK_OPEN,
   BLOCK_CLOSE,
@@ -22,6 +23,9 @@ import {
   HYDRATE_ID_COUNT_ATTR,
   HYDRATE_STREAM_TOKEN_ATTR,
   HYDRATE_SEED_ATTR,
+  INDEPENDENT_HYDRATE_MANIFEST_ATTR,
+  HYDRATE_INDEPENDENT_ATTR,
+  SIGNAL_CONTROL_ATTR,
   STREAM_BOUNDARY_ATTR,
   STREAM_SEGMENT_ATTR,
   STREAM_SEED_ATTR,
@@ -38,6 +42,10 @@ import {
   SVG_ONLY_TAGS,
   VOID_ELEMENTS
 } from "./constants.js";
+import {
+  createIndependentHydrateManifest,
+  serializeIndependentHydrateManifest
+} from "./independent-hydration-protocol.js";
 import { hasOwnProp } from "./has-own.js";
 import { headOwnershipSuffix } from "./head-ownership.js";
 import { resourceHintWarning } from "./resource-hint-diagnostics.js";
@@ -54,6 +62,7 @@ import {
   invalidHostPropertiesWarning,
   unsupportedAttributeCoercionWarning
 } from "./host-property-diagnostics.js";
+import { streamedSignalBootstrapJs } from "./server/early-signals.js";
 import {
   applyElementDefaultProps,
   childElementKey,
@@ -91,6 +100,76 @@ import {
   NATIVE_SIGNAL_FRESH_COMMENT,
   mergeNativeSeedReads
 } from "./signals/native-read-seeds.js";
+import {
+  captureSignalOwner,
+  currentSignalOwner,
+  enterSynchronousSignalOwner,
+  retireSignalOwnerIdentity,
+  restoreSynchronousSignalOwner,
+  runWithSignalOwner
+} from "./signals/owner-context.js";
+import {
+  runWithServerSignalQueryAttemptObserver
+} from "./signals/query-attempt-observer.js";
+import {
+  SIGNAL_BINDING_IDENTITY,
+  SIGNAL_HANDLE
+} from "./signals/types.js";
+function isSignalHandle(value) {
+  return (typeof value === "object" || typeof value === "function") && value !== null && value[SIGNAL_HANDLE] === true;
+}
+function readSignalBinding(handle) {
+  if (RESOLVED !== null && !SERVER_SIGNAL_OWNER_ACTIVE) {
+    return withServerSignalBinding(() => handle.get());
+  }
+  return handle.get();
+}
+function withServerSignalBinding(read) {
+  ensureServerSignalOwner();
+  const owner = serverSignalOwner(FRAME);
+  const injection = RESOLVED.resourceOptions?.injection;
+  return runWithSignalOwner(
+    owner,
+    () => injection?.observeSignalAttempt === void 0 ? read() : runWithServerSignalQueryAttemptObserver(
+      owner,
+      (attempt) => injection.observeSignalAttempt(attempt, captureSignalOwner(owner)),
+      injection.createSignalAttemptObservations,
+      read
+    )
+  );
+}
+function isWritableSignal(value) {
+  return isSignalHandle(value) && value.kind === "signal" && typeof value.set === "function";
+}
+function ssrSignalValue(value) {
+  return isSignalHandle(value) ? readSignalBinding(value) : value;
+}
+const SSR_SIGNAL_CONTROL = /* @__PURE__ */ Symbol("octane.ssr-signal-control");
+function isSsrSignalControlValue(value) {
+  return typeof value === "object" && value !== null && value[SSR_SIGNAL_CONTROL] === true;
+}
+function unwrapSsrSignalControlValue(value) {
+  return isSsrSignalControlValue(value) ? value.value : value;
+}
+function ssrSignalControlValue(value, site) {
+  if (!isWritableSignal(value)) return ssrSignalValue(value);
+  if (RESOLVED !== null && !SERVER_SIGNAL_OWNER_ACTIVE) {
+    return withServerSignalBinding(() => serverSignalControlValue(value, site));
+  }
+  return serverSignalControlValue(value, site);
+}
+function serverSignalControlValue(value, site) {
+  const owner = currentSignalOwner();
+  if (owner === null || !("documentOwner" in owner)) return value.get();
+  if (RESOLVED !== null) RESOLVED.hasSignalControls = true;
+  return {
+    [SSR_SIGNAL_CONTROL]: true,
+    value: value.get(),
+    site,
+    owner,
+    binding: value[SIGNAL_BINDING_IDENTITY]()
+  };
+}
 const NATIVE_ARRAY_MAP = Array.prototype.map;
 const NATIVE_REFLECT_APPLY = Reflect.apply;
 const NATIVE_ARRAY_SPECIES_GETTER = Object.getOwnPropertyDescriptor(Array, Symbol.species)?.get;
@@ -184,6 +263,12 @@ const ACTIVE_PU_WARM_PLANS = [];
 let CURRENT_PU_WARM_CLAIMS = null;
 let ID_COUNTER = 0;
 let ID_PREFIX = "";
+let SIGNAL_INSTANCE_PREFIX = "";
+let SIGNAL_COMPONENT_INSTANCE_KEY = "";
+let SERVER_SIGNAL_OWNER_ACTIVE = false;
+let SIGNAL_CONTROL_SITE = "";
+const EMPTY_SIGNAL_LIST_KEYS = [];
+let SIGNAL_LIST_KEYS = EMPTY_SIGNAL_LIST_KEYS;
 function newStyleCollector() {
   const collector = /* @__PURE__ */ new Map();
   collector.replay = null;
@@ -406,6 +491,13 @@ const SCOPED_VALUE_PROPERTIES = {
     get() {
       return this[SCOPED_VALUE_RESOLVER]().children;
     }
+  },
+  __octaneInvocationSite: {
+    configurable: true,
+    enumerable: false,
+    get() {
+      return this[SCOPED_VALUE_RESOLVER]().__octaneInvocationSite;
+    }
   }
 };
 function restoreWritableScopedChildren(props, name, value) {
@@ -561,10 +653,15 @@ function scopedValueDescriptor(resolve) {
   Object.defineProperty(descriptor, "key", SCOPED_VALUE_PROPERTIES.key);
   Object.defineProperty(descriptor, "ref", SCOPED_VALUE_PROPERTIES.ref);
   Object.defineProperty(descriptor, "children", SCOPED_VALUE_PROPERTIES.children);
+  Object.defineProperty(
+    descriptor,
+    "__octaneInvocationSite",
+    SCOPED_VALUE_PROPERTIES.__octaneInvocationSite
+  );
   if (process.env.NODE_ENV !== "production") Object.freeze(descriptor);
   return descriptor;
 }
-function createScopedElement(type, props, readChildren) {
+function createScopedElement(type, props, readChildren, invocationSite) {
   const src = props ?? null;
   const key = hasElementConfigKey(src) ? "" + src.key : null;
   const copiedProps = copyScopedElementConfig(type, src);
@@ -581,9 +678,9 @@ function createScopedElement(type, props, readChildren) {
     }
     return resolvedChildren;
   };
-  return scopedElementDescriptor(type, copiedProps, key, children);
+  return scopedElementDescriptor(type, copiedProps, key, children, invocationSite);
 }
-function nativeCreateScopedElement(type, props, readChildren) {
+function nativeCreateScopedElement(type, props, readChildren, invocationSite) {
   const src = props ?? null;
   const key = hasElementConfigKey(src) ? "" + src.key : null;
   const copiedProps = copyScopedElementConfig(type, src);
@@ -591,10 +688,11 @@ function nativeCreateScopedElement(type, props, readChildren) {
     type,
     copiedProps,
     key,
-    createNativeServerScopedResolver(readChildren)
+    createNativeServerScopedResolver(readChildren),
+    invocationSite
   );
 }
-function scopedElementDescriptor(type, copiedProps, key, children) {
+function scopedElementDescriptor(type, copiedProps, key, children, invocationSite) {
   setScopedChildrenResolver(copiedProps, children);
   SCOPED_ELEMENT_PROPS.add(copiedProps);
   const descriptor = {
@@ -604,31 +702,43 @@ function scopedElementDescriptor(type, copiedProps, key, children) {
     key,
     ref: copiedProps.ref !== void 0 ? copiedProps.ref : null
   };
+  if (invocationSite !== void 0) descriptor.__octaneInvocationSite = invocationSite;
   Object.defineProperty(descriptor, "children", SCOPED_CHILDREN_PROPERTY);
   setScopedChildrenResolver(descriptor, children);
   return finalizeElementDescriptor(descriptor);
 }
 function createElement(type, props, ...children) {
+  return createElementFromConfig(void 0, type, props, children);
+}
+function createElementAt(invocationSite, type, props, ...children) {
+  return createElementFromConfig(invocationSite, type, props, children);
+}
+function createElementFromConfig(invocationSite, type, props, children) {
   if (typeof type === "function" && isRendererContext(type)) {
     registerServerRendererContextProvider(renderServerContextProvider);
   }
   const src = props ?? null;
   const key = hasElementConfigKey(src) ? "" + src.key : null;
-  let kids = children.length > 0 ? children.length === 1 ? children[0] : children : src?.children;
-  if (children.length > 1) POSITIONAL_CHILDREN.add(children);
-  if (children.length > 1 && process.env.NODE_ENV !== "production") Object.freeze(children);
+  const hasPositional = children !== void 0 && children.length > 0;
+  let kids = hasPositional ? children.length === 1 ? children[0] : children : src?.children;
+  if (children !== void 0 && children.length > 1) {
+    POSITIONAL_CHILDREN.add(children);
+    if (process.env.NODE_ENV !== "production") Object.freeze(children);
+  }
   const p = copyElementConfig(src);
-  if (children.length > 0) p.children = kids;
+  if (hasPositional) p.children = kids;
   applyElementDefaultProps(type, p);
   kids = p.children;
-  return finalizeElementDescriptor({
+  const descriptor = {
     $$kind: ELEMENT_TAG,
     type,
     props: p,
     key,
     ref: p.ref !== void 0 ? p.ref : null,
     children: kids ?? null
-  });
+  };
+  if (invocationSite !== void 0) descriptor.__octaneInvocationSite = invocationSite;
+  return finalizeElementDescriptor(descriptor);
 }
 const POSITIONAL_CHILDREN = /* @__PURE__ */ new WeakSet();
 function positionalChildren(children) {
@@ -860,6 +970,8 @@ function cloneElement(element, config, ...children) {
       children: kids ?? null
     };
   }
+  if (element.__octaneInvocationSite !== void 0)
+    descriptor.__octaneInvocationSite = element.__octaneInvocationSite;
   return finalizeElementDescriptor(descriptor);
 }
 function cloneAndReplaceElementKey(element, key) {
@@ -1082,6 +1194,15 @@ function ssrHtml(html) {
   if (CURRENT_SCOPE === null) VT_SSR_HAS_RAW_HTML = false;
   return new RawServerHtml(html);
 }
+const BINDING_HTML_ROOT = /* @__PURE__ */ Symbol.for("octane.binding.html");
+function ssrBindingHtml(html, id) {
+  const output = new ServerHtml(html);
+  output[BINDING_HTML_ROOT] = "[b;" + id + ";root";
+  return output;
+}
+function bindPresentationView(view, _id) {
+  return markComponentFlags(view, COMPONENT_FLAG_BOUNDARY, view.name);
+}
 function serverComponentOutput(out, scope) {
   if (out == null) return "";
   if (typeof out === "string") return escapeHtml(out);
@@ -1119,21 +1240,53 @@ function ssrTextPre(v) {
 }
 function ssrComponentDescriptor(d, scope) {
   if (SCOPED_ELEMENT_PROPS.has(d.props)) {
-    return ssrComponent(scope, d.type, d.props);
+    return ssrComponent(
+      scope,
+      d.type,
+      d.props,
+      void 0,
+      d.key ?? void 0,
+      void 0,
+      d.__octaneInvocationSite
+    );
   }
   const children = d.children;
   if (children == null || children === d.props?.children) {
-    return ssrComponent(scope, d.type, d.props);
+    return ssrComponent(
+      scope,
+      d.type,
+      d.props,
+      void 0,
+      d.key ?? void 0,
+      void 0,
+      d.__octaneInvocationSite
+    );
   }
-  return ssrComponent(scope, d.type, {
-    ...d.props,
-    children
-  });
+  return ssrComponent(
+    scope,
+    d.type,
+    { ...d.props, children },
+    void 0,
+    d.key ?? void 0,
+    void 0,
+    d.__octaneInvocationSite
+  );
 }
 function ssrChild(v, scope) {
+  if (isSignalHandle(v)) {
+    v = readSignalBinding(v);
+  }
   if (probingDangerHtmlChild(v)) return "";
   return ssrChildValue(v, scope, true);
 }
+function ssrBindingChild(value, scope, marker) {
+  const html = ssrChild(value, scope);
+  if (!MARKERS) return html;
+  const openingEnd = html.indexOf("-->");
+  const framed = html.startsWith(BLOCK_OPEN) || html.startsWith("<!--") && openingEnd !== -1 && isBindingOpenComment(html.slice(4, openingEnd));
+  const content = framed && html.endsWith(BLOCK_CLOSE) ? html.slice(openingEnd + 3, -BLOCK_CLOSE.length) : html;
+  return ssrBindingBlock(content, marker);
+}
 function ssrChildValue(v, scope, includeKeyedSingle, selfMarkItem = false) {
   if (v !== null && typeof v === "object" && SERVER_HTML in v) {
     return v[SERVER_HTML];
@@ -1384,6 +1537,20 @@ function ssrDescriptorContent(v, scope) {
 function ssrBlock(content) {
   return MARKERS ? BLOCK_OPEN + content + BLOCK_CLOSE : String(content);
 }
+function ssrBindingBlock(content, marker) {
+  return MARKERS ? "<!--" + marker + "-->" + content + BLOCK_CLOSE : String(content);
+}
+function ssrBindingKey(key, seen) {
+  const encoded = encodeBindingKey(key);
+  if (seen.has(encoded)) throw new TypeError(formatServerError(73));
+  seen.add(encoded);
+  return encoded;
+}
+function ssrBindingClass(receipt, values) {
+  const snapshot = [normalizeClass(values[0]), values[1].map(normalizeClass)];
+  const classes = [snapshot[0], ...snapshot[1]].filter(Boolean).join(" ");
+  return ' class="' + escapeAttr(classes) + '" ' + receipt + '="' + escapeAttr(JSON.stringify(snapshot)) + '"';
+}
 function ssrFragmentMarker(open, _ref) {
   return MARKERS ? open ? "<!--frag-->" : "<!--/frag-->" : "";
 }
@@ -1466,31 +1633,48 @@ function withAsyncListScope(kind, fn) {
 function ssrControl(siteKey, fn) {
   const frame = FRAME;
   const occurrence = frame === null ? 0 : nextFrameOccurrence(frame, "@control:" + siteKey);
-  return withAsyncIdentity("control:" + siteKey, occurrence, fn);
+  const previousSignalControl = SIGNAL_CONTROL_SITE;
+  SIGNAL_CONTROL_SITE = siteKey;
+  try {
+    return withAsyncIdentity("control:" + siteKey, occurrence, fn);
+  } finally {
+    SIGNAL_CONTROL_SITE = previousSignalControl;
+  }
 }
-function enterAsyncArm(armKey) {
+function enterAsyncArm(armKey, mapped = false) {
   const previous = ASYNC_SCOPE;
   const frame = FRAME;
   const occurrence = frame === null ? 0 : nextFrameOccurrence(frame, "@arm-position:");
   const fallbackPosition = armKey !== null && (typeof armKey === "object" || typeof armKey === "function" || typeof armKey === "symbol") ? previous + "|@arm-position:" + occurrence : void 0;
+  if (SERVER_SIGNAL_BINDINGS_POTENTIAL && SIGNAL_CONTROL_SITE.charCodeAt(0) === 102) {
+    SIGNAL_LIST_KEYS = [
+      ...SIGNAL_LIST_KEYS,
+      signalIdentityKey(mapped ? "k" + String(armKey) : armKey)
+    ];
+  }
   ASYNC_SCOPE = previous + "|@arm:" + asyncIdentityKey(armKey, false, fallbackPosition);
-  return previous;
 }
 function ssrArm(armKey, fn) {
-  const previous = enterAsyncArm(armKey);
+  const previous = ASYNC_SCOPE;
+  const previousSignalKeys = SIGNAL_LIST_KEYS;
   try {
+    enterAsyncArm(armKey);
     return fn();
   } finally {
     ASYNC_SCOPE = previous;
+    SIGNAL_LIST_KEYS = previousSignalKeys;
   }
 }
-function ssrForItem(armKey, fn, item, index, scope, block) {
-  const previous = enterAsyncArm(armKey);
+function ssrForItem(armKey, fn, item, index, scope, block, mapped = false) {
+  const previous = ASYNC_SCOPE;
+  const previousSignalKeys = SIGNAL_LIST_KEYS;
   try {
+    enterAsyncArm(armKey, mapped);
     const html = index === void 0 ? fn(item, scope) : fn(item, index, scope);
     return block ? ssrBlock(html) : html;
   } finally {
     ASYNC_SCOPE = previous;
+    SIGNAL_LIST_KEYS = previousSignalKeys;
   }
 }
 function ssrPortal() {
@@ -1899,14 +2083,32 @@ function ssrClass(sources) {
   }
   return found ? ssrAttr("class", value) : "";
 }
-function ssrSnapshotSpread(obj) {
+function ssrSnapshotSpread(obj, controlSite, deferStyle = false) {
   if (obj == null) return null;
   const source = Object(obj);
   const snapshot = /* @__PURE__ */ Object.create(null);
   for (const key of Reflect.ownKeys(source)) {
     if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-    const value = source[key];
-    if (typeof key === "string") snapshot[key] = value;
+    let value = source[key];
+    if (typeof key !== "string") continue;
+    if (key === "style" && deferStyle) {
+      snapshot[key] = value;
+      continue;
+    }
+    if (controlSite !== void 0 && (key === "value" || key === "checked") && isWritableSignal(value)) {
+      value = ssrSignalControlValue(value, controlSite);
+    } else if (isSignalHandle(value)) value = readSignalBinding(value);
+    else if (key === "style" && value !== null && typeof value === "object") {
+      let style;
+      for (const name of Object.keys(value)) {
+        const current = value[name];
+        if (!isSignalHandle(current)) continue;
+        style ??= { ...value };
+        style[name] = readSignalBinding(current);
+      }
+      if (style !== void 0) value = style;
+    }
+    snapshot[key] = value;
   }
   return snapshot;
 }
@@ -2031,24 +2233,48 @@ function ssrFormAuthoringDiagnostics(tag, sources) {
   return "";
 }
 function ssrValueAttr(v) {
+  v = unwrapSsrSignalControlValue(v);
   if (v == null || typeof v === "function" || typeof v === "symbol") return "";
   return ' value="' + escapeAttr(typeof v === "string" ? v : String(v)) + '"';
 }
 function ssrCheckedAttr(v) {
+  v = unwrapSsrSignalControlValue(v);
   return v == null || !v ? "" : " checked";
 }
 function ssrInputAttrs(sources) {
   const props = resolveFormControlSources(sources);
   if (process.env.NODE_ENV !== "production") {
     devValidateSsrFormProps("input", {
-      value: props.value,
-      defaultValue: props.defaultValue,
-      checked: props.checked,
-      defaultChecked: props.defaultChecked
+      value: unwrapSsrSignalControlValue(props.value),
+      defaultValue: unwrapSsrSignalControlValue(props.defaultValue),
+      checked: unwrapSsrSignalControlValue(props.checked),
+      defaultChecked: unwrapSsrSignalControlValue(props.defaultChecked)
     });
   }
   return ssrValueAttr(props.value ?? props.defaultValue) + ssrCheckedAttr(props.checked ?? props.defaultChecked);
 }
+function ssrSignalControlAttrs(sources) {
+  const props = resolveFormControlSources(sources);
+  const controls = [];
+  let ownerKey;
+  const record = (value, channel) => {
+    if (!isSsrSignalControlValue(value)) return;
+    const documentKey = value.owner.documentOwner.scopeKey;
+    if (ownerKey !== void 0 && ownerKey !== documentKey) {
+      throw new Error(formatServerError(68));
+    }
+    ownerKey = documentKey;
+    controls.push([
+      value.binding.scope === "document" ? "" : value.owner.instanceKey,
+      value.binding.nodeKey,
+      channel
+    ]);
+  };
+  record(props.value, "value");
+  record(props.checked, "checked");
+  if (controls.length === 0) return "";
+  return " " + SIGNAL_CONTROL_ATTR + '="' + escapeAttr(JSON.stringify([1, ownerKey, controls])) + '"';
+}
 function resolveFormControlSources(sources) {
   const resolved = {
     value: void 0,
@@ -2099,6 +2325,7 @@ function resolveFormControlSources(sources) {
   return resolved;
 }
 function ssrTextareaValue(v) {
+  v = unwrapSsrSignalControlValue(v);
   if (v == null) return "";
   const s = escapeHtml(typeof v === "string" ? v : String(v));
   return s.charCodeAt(0) === 10 ? "\n" + s : s;
@@ -2107,8 +2334,8 @@ function ssrTextareaValueSources(sources) {
   const props = resolveFormControlSources(sources);
   if (process.env.NODE_ENV !== "production") {
     devValidateSsrFormProps("textarea", {
-      value: props.value,
-      defaultValue: props.defaultValue
+      value: unwrapSsrSignalControlValue(props.value),
+      defaultValue: unwrapSsrSignalControlValue(props.defaultValue)
     });
   }
   const value = props.value ?? props.defaultValue;
@@ -2120,6 +2347,8 @@ function ssrSelectAttrs(sources) {
 }
 const SELECT_STACK = [];
 function ssrSelectScope(value, defaultValue, multiple, children) {
+  value = unwrapSsrSignalControlValue(value);
+  defaultValue = unwrapSsrSignalControlValue(defaultValue);
   if (process.env.NODE_ENV !== "production") {
     devValidateSsrFormProps("select", { value, defaultValue, multiple });
   }
@@ -2478,10 +2707,96 @@ function replayUpdatedComponentBody(comp, props, scope, frame, hp, snapshot, war
     hp.occ = null;
     rewindComponentReplayState(snapshot, scope, frame);
     ACTIVE_PU_WARM_PLANS.length = warmPlanCheckpoint;
-    out = comp(props ?? {}, scope, void 0);
+    out = invokeServerSignalComponent(comp, props, scope, serverSignalOwner(frame));
   } while (hp.update);
   return out;
 }
+function signalIdentityKey(value) {
+  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);
+}
+function serverStructuralSignalInstanceKey(invocationSite, key) {
+  return resolveServerSignalInstanceKey(SIGNAL_COMPONENT_INSTANCE_KEY) + JSON.stringify([
+    invocationSite ?? "legacy",
+    SIGNAL_LIST_KEYS,
+    key != null ? signalIdentityKey(key) : ""
+  ]);
+}
+function resolveServerSignalInstanceKey(identity) {
+  if (typeof identity === "string") return identity;
+  if (identity.signalInstanceKey !== void 0) return identity.signalInstanceKey;
+  const pending = [];
+  while (typeof identity !== "string") {
+    if (identity.signalInstanceKey !== void 0) {
+      identity = identity.signalInstanceKey;
+      break;
+    }
+    pending.push(identity);
+    identity = identity.signalParentKey;
+  }
+  for (let index = pending.length - 1; index >= 0; index--) {
+    const frame = pending[index];
+    identity += JSON.stringify([
+      frame.signalInvocationSite ?? "legacy",
+      frame.signalListKeys,
+      frame.signalKey
+    ]);
+    frame.signalInstanceKey = identity;
+  }
+  return identity;
+}
+function serverSignalOwner(_frame) {
+  const resolved = RESOLVED;
+  if (resolved !== null && SERVER_SIGNAL_BINDINGS_ENABLED && resolved.signalOwner === void 0) {
+    ensureServerSignalOwner();
+  }
+  if (resolved === null || resolved.signalOwner === void 0 || resolved.signalInstances === void 0)
+    return;
+  const instanceKey = resolveServerSignalInstanceKey(SIGNAL_COMPONENT_INSTANCE_KEY) || JSON.stringify([SIGNAL_INSTANCE_PREFIX, "root"]);
+  let owner = resolved.signalInstances.get(instanceKey);
+  if (owner === void 0) {
+    owner = Object.freeze({
+      scopeKey: resolved.signalOwner.scopeKey,
+      documentOwner: resolved.signalOwner,
+      instanceOwner: Object.freeze({}),
+      instanceKey
+    });
+    resolved.signalInstances.set(instanceKey, owner);
+  }
+  return owner;
+}
+function ensureServerSignalOwner() {
+  const resolved = RESOLVED;
+  if (resolved.signalOwner !== void 0 && resolved.signalInstances !== void 0) return;
+  const ambient = currentSignalOwner();
+  resolved.signalOwner = ambient === null ? Object.freeze({ scopeKey: "octane:document" }) : isRendererSignalOwner(ambient) ? ambient.documentOwner : ambient;
+  resolved.ownedSignalOwner = ambient === null;
+  resolved.signalInstances = /* @__PURE__ */ new Map();
+}
+function invokeServerSignalComponent(comp, props, scope, owner) {
+  if (owner === void 0) return comp(props ?? {}, scope, void 0);
+  const invoke = () => {
+    const previous = SERVER_SIGNAL_OWNER_ACTIVE;
+    SERVER_SIGNAL_OWNER_ACTIVE = true;
+    try {
+      return comp(props ?? {}, scope, void 0);
+    } finally {
+      SERVER_SIGNAL_OWNER_ACTIVE = previous;
+    }
+  };
+  const injection = RESOLVED?.resourceOptions?.injection;
+  const observe = injection?.observeSignalAttempt;
+  return runWithSignalOwner(
+    owner,
+    () => observe === void 0 ? invoke() : runWithServerSignalQueryAttemptObserver(
+      owner,
+      (attempt) => observe(attempt, captureSignalOwner(owner)),
+      injection.createSignalAttemptObservations,
+      invoke
+    )
+  );
+}
 function invokeComponentBody(comp, props, scope, frame) {
   const prevHP = HOOK_PASS;
   const hp = { hooks: null, occ: null, update: false };
@@ -2490,7 +2805,7 @@ function invokeComponentBody(comp, props, scope, frame) {
   HOOK_PASS = hp;
   try {
     ACTIVE_PU_WARM_PLANS.length = warmPlanCheckpoint;
-    let out = comp(props ?? {}, scope, void 0);
+    let out = invokeServerSignalComponent(comp, props, scope, serverSignalOwner(frame));
     if (hp.update) {
       out = replayUpdatedComponentBody(comp, props, scope, frame, hp, snapshot, warmPlanCheckpoint);
     }
@@ -2502,14 +2817,25 @@ function invokeComponentBody(comp, props, scope, frame) {
     HOOK_PASS = prevHP;
   }
 }
-function renderComponentFramed(comp, props, parent, frame, inherit) {
-  const prevScope = CURRENT_SCOPE;
-  const prevFrame = FRAME;
-  const prevComp = CURRENT_COMP;
-  const prevProps = CURRENT_PROPS;
-  const prevParent = CURRENT_PARENT_SCOPE;
-  const prevAsyncScope = ASYNC_SCOPE;
-  const parentScope = parent ?? prevScope;
+function captureServerComponentContext() {
+  return {
+    scope: CURRENT_SCOPE,
+    frame: FRAME,
+    comp: CURRENT_COMP,
+    props: CURRENT_PROPS,
+    parent: CURRENT_PARENT_SCOPE,
+    asyncScope: ASYNC_SCOPE,
+    signalInstance: SIGNAL_COMPONENT_INSTANCE_KEY,
+    signalOwnerActive: SERVER_SIGNAL_OWNER_ACTIVE,
+    signalControl: SIGNAL_CONTROL_SITE,
+    signalListKeys: SIGNAL_LIST_KEYS,
+    owner: void 0,
+    previousOwner: void 0
+  };
+}
+function renderComponentFramed(comp, props, parent, frame, inherit, instanceKey, bindingMarker) {
+  const previous = captureServerComponentContext();
+  const parentScope = parent ?? previous.scope;
   const scope = ssrScope(parentScope);
   CURRENT_SCOPE = scope;
   FRAME = frame;
@@ -2517,6 +2843,9 @@ function renderComponentFramed(comp, props, parent, frame, inherit) {
   CURRENT_PROPS = props;
   CURRENT_PARENT_SCOPE = parentScope;
   ASYNC_SCOPE = frame.asyncScope;
+  if (instanceKey !== void 0) SIGNAL_COMPONENT_INSTANCE_KEY = instanceKey;
+  SIGNAL_CONTROL_SITE = "";
+  SIGNAL_LIST_KEYS = EMPTY_SIGNAL_LIST_KEYS;
   const nativeToken = NATIVE_READ_COLLECTOR === null ? -1 : beginActiveNativeReadScope(scope);
   let nativeCompleted = false;
   try {
@@ -2528,7 +2857,20 @@ function renderComponentFramed(comp, props, parent, frame, inherit) {
     HOOK_PASS = hookPass;
     try {
       ACTIVE_PU_WARM_PLANS.length = warmPlanCheckpoint;
-      out = comp(props ?? {}, scope, void 0);
+      previous.owner = serverSignalOwner(frame);
+      if (previous.owner === void 0) {
+        out = comp(props ?? {}, scope, void 0);
+      } else if (RESOLVED?.resourceOptions?.injection?.observeSignalAttempt !== void 0 || (previous.previousOwner = enterSynchronousSignalOwner(previous.owner)) === void 0) {
+        out = invokeServerSignalComponent(comp, props, scope, previous.owner);
+      } else {
+        try {
+          SERVER_SIGNAL_OWNER_ACTIVE = true;
+          out = comp(props ?? {}, scope, void 0);
+        } finally {
+          SERVER_SIGNAL_OWNER_ACTIVE = previous.signalOwnerActive;
+          restoreSynchronousSignalOwner(previous.previousOwner);
+        }
+      }
       if (hookPass.update) {
         out = replayUpdatedComponentBody(
           comp,
@@ -2546,22 +2888,29 @@ function renderComponentFramed(comp, props, parent, frame, inherit) {
     }
     const inner = serverComponentOutput(out, scope);
     nativeCompleted = true;
-    return MARKERS && !inherit ? BLOCK_OPEN + inner + BLOCK_CLOSE : inner;
+    if (!MARKERS || inherit) return inner;
+    const marker = bindingMarker ?? (out !== null && typeof out === "object" ? out[BINDING_HTML_ROOT] : void 0);
+    return (marker === void 0 ? BLOCK_OPEN : "<!--" + marker + "-->") + inner + BLOCK_CLOSE;
   } catch (error) {
     throw normalizeThrownServerThenable(error);
   } finally {
     if (nativeToken >= 0) NATIVE_READ_COLLECTOR.endScope(nativeToken, nativeCompleted);
-    CURRENT_SCOPE = prevScope;
-    FRAME = prevFrame;
-    CURRENT_COMP = prevComp;
-    CURRENT_PROPS = prevProps;
-    CURRENT_PARENT_SCOPE = prevParent;
-    ASYNC_SCOPE = prevAsyncScope;
-  }
-}
-function ssrComponent(parent, comp, props, inherit, key, identityScoped) {
+    CURRENT_SCOPE = previous.scope;
+    FRAME = previous.frame;
+    CURRENT_COMP = previous.comp;
+    CURRENT_PROPS = previous.props;
+    CURRENT_PARENT_SCOPE = previous.parent;
+    ASYNC_SCOPE = previous.asyncScope;
+    SIGNAL_COMPONENT_INSTANCE_KEY = previous.signalInstance;
+    SERVER_SIGNAL_OWNER_ACTIVE = previous.signalOwnerActive;
+    SIGNAL_CONTROL_SITE = previous.signalControl;
+    SIGNAL_LIST_KEYS = previous.signalListKeys;
+  }
+}
+function ssrComponent(parent, comp, props, inherit, key, identityScoped, invocationSite, bindingMarker) {
   const activity = comp === Activity;
   if (activity && key === void 0) key = props?.key;
+  let signalInstanceKey = SERVER_SIGNAL_BINDINGS_ENABLED ? serverStructuralSignalInstanceKey(invocationSite, key) : void 0;
   const previousIdentityScope = ASYNC_SCOPE;
   if (identityScoped !== true) {
     ASYNC_SCOPE = previousIdentityScope + "|@component-type:" + asyncIdentityKey(comp, false);
@@ -2616,17 +2965,41 @@ function ssrComponent(parent, comp, props, inherit, key, identityScoped) {
       asyncScope: ASYNC_SCOPE,
       namespace: explicitNamespace ?? pf.namespace
     };
-    return renderComponentFramed(comp, props, parent, frame, inherit);
+    if (signalInstanceKey === void 0 && SERVER_SIGNAL_BINDINGS_POTENTIAL) {
+      frame.signalParentKey = SIGNAL_COMPONENT_INSTANCE_KEY;
+      frame.signalInvocationSite = invocationSite;
+      frame.signalListKeys = SIGNAL_LIST_KEYS;
+      frame.signalKey = key != null ? signalIdentityKey(key) : "";
+      signalInstanceKey = frame;
+    }
+    return renderComponentFramed(
+      comp,
+      props,
+      parent,
+      frame,
+      inherit,
+      signalInstanceKey,
+      bindingMarker
+    );
   } finally {
     if (identityScoped !== true) ASYNC_SCOPE = previousIdentityScope;
   }
 }
 let NEXT_COMPONENT_NAMESPACE = null;
-function ssrComponentNS(parent, comp, props, namespace, inherit, key) {
+function ssrComponentNS(parent, comp, props, namespace, inherit, key, invocationSite, bindingMarker) {
   const previous = NEXT_COMPONENT_NAMESPACE;
   NEXT_COMPONENT_NAMESPACE = namespace;
   try {
-    return ssrComponent(parent, comp, props, inherit, key);
+    return ssrComponent(
+      parent,
+      comp,
+      props,
+      inherit,
+      key,
+      void 0,
+      invocationSite,
+      bindingMarker
+    );
   } finally {
     NEXT_COMPONENT_NAMESPACE = previous;
   }
@@ -2651,6 +3024,50 @@ function streamTokenForPendingHtml(html) {
   const stream = STREAM;
   return stream !== null && html.includes(STREAM_BOUNDARY_ATTR + '="' + stream.token + "-") ? stream.token : null;
 }
+function ssrIndependentHydrateSidecar(props, instanceId) {
+  const independent = props.__independent;
+  if (independent === void 0) return "";
+  const registry = RESOLVED?.resourceOptions?.independentHydration;
+  if (registry === void 0) {
+    throw new Error(formatServerError(69));
+  }
+  const build = registry.resolve(independent.manifestTemplate.boundaryId);
+  if (build === void 0) {
+    throw new Error(formatServerError(70));
+  }
+  const manifest = createIndependentHydrateManifest(
+    independent.manifestTemplate,
+    independent.captures,
+    instanceId,
+    registry.buildId,
+    build
+  );
+  return '<script type="application/json" ' + INDEPENDENT_HYDRATE_MANIFEST_ATTR + NONCE_ATTR + ">" + serializeIndependentHydrateManifest(manifest) + "</script>";
+}
+function withServerIndependentIdentity(prefix, idSeed, render) {
+  const previous = SIGNAL_INSTANCE_PREFIX;
+  const previousInstance = SIGNAL_COMPONENT_INSTANCE_KEY;
+  const previousControl = SIGNAL_CONTROL_SITE;
+  const previousListKeys = SIGNAL_LIST_KEYS;
+  const previousIdPrefix = ID_PREFIX;
+  const previousIdCounter = ID_COUNTER;
+  SIGNAL_INSTANCE_PREFIX = prefix;
+  SIGNAL_COMPONENT_INSTANCE_KEY = JSON.stringify([prefix, "root"]);
+  SIGNAL_CONTROL_SITE = "";
+  SIGNAL_LIST_KEYS = EMPTY_SIGNAL_LIST_KEYS;
+  ID_PREFIX = prefix + "-";
+  ID_COUNTER = idSeed;
+  try {
+    return render();
+  } finally {
+    SIGNAL_INSTANCE_PREFIX = previous;
+    SIGNAL_COMPONENT_INSTANCE_KEY = previousInstance;
+    SIGNAL_CONTROL_SITE = previousControl;
+    SIGNAL_LIST_KEYS = previousListKeys;
+    ID_PREFIX = previousIdPrefix;
+    ID_COUNTER = previousIdCounter + ID_COUNTER - idSeed;
+  }
+}
 function ssrHydrateAttrs(id, when, idCount, permanentStaticAncestor = false, streamToken = null) {
   const direct = typeof when !== "function" && when !== null ? when : null;
   let attrs = ssrAttr(HYDRATE_ID_ATTR, id, "div") + ssrAttr(
@@ -2708,7 +3125,8 @@ const PermanentStaticHydrate = /* @__PURE__ */ markComponentFlags(
   "PermanentStaticHydrate"
 );
 const hydrate = /* @__PURE__ */ markComponentFlags(
-  function Hydrate(props, scope) {
+  function Hydrate(rawProps, scope) {
+    const props = rawProps;
     const id = useId();
     return ssrHtml(
       withSsrElementContext(
@@ -2726,7 +3144,7 @@ const hydrate = /* @__PURE__ */ markComponentFlags(
           let children;
           let nativeReads = null;
           try {
-            children = ssrBlock(
+            const renderChildren = () => ssrBlock(
               ssrTry(
                 scope,
                 "jsx-hydrate",
@@ -2736,6 +3154,11 @@ const hydrate = /* @__PURE__ */ markComponentFlags(
                 "html"
               )
             );
+            children = props.__independent === void 0 ? renderChildren() : withServerIndependentIdentity(
+              id,
+              props.__independent.manifestTemplate.idSeed,
+              renderChildren
+            );
           } finally {
             nativeReads = finishNativeSeedCapture(nativeCapture, previousNativeReads, false);
           }
@@ -2753,7 +3176,8 @@ const hydrate = /* @__PURE__ */ markComponentFlags(
           const seedSidecar = seedJson === null || seedJson === "[]" ? "" : '<script type="application/json" ' + HYDRATE_SEED_ATTR + NONCE_ATTR + ">" + seedJson + "</script>";
           const nativeSeeds = permanentStaticAncestor ? void 0 : NATIVE_READ_COLLECTOR?.serialize(nativeReads);
           const nativeSidecar = nativeSeeds === void 0 ? "" : serializeNativeSignalSeeds(nativeSeeds, NONCE_ATTR);
-          return "<div" + attrs + ">" + children + seedSidecar + nativeSidecar + "</div>";
+          const independentSidecar = permanentStaticAncestor ? "" : ssrIndependentHydrateSidecar(props, id);
+          return "<div" + attrs + (props.__independent === void 0 ? "" : " " + HYDRATE_INDEPENDENT_ATTR + '=""') + ">" + children + seedSidecar + nativeSidecar + independentSidecar + "</div>";
         }),
         "html"
       )
@@ -3227,7 +3651,8 @@ function normalizeThrownServerThenable(error) {
       comp: CURRENT_COMP,
       props: CURRENT_PROPS,
       parentScope: CURRENT_PARENT_SCOPE,
-      frame
+      frame,
+      signalInstanceKey: SIGNAL_COMPONENT_INSTANCE_KEY
     });
   }
   return SSR_SUSPENSE;
@@ -3499,7 +3924,8 @@ function use(usable, siteKey, directSite) {
       comp: CURRENT_COMP,
       props: CURRENT_PROPS,
       parentScope: CURRENT_PARENT_SCOPE,
-      frame
+      frame,
+      signalInstanceKey: SIGNAL_COMPONENT_INSTANCE_KEY
     });
   }
   throw SSR_SUSPENSE;
@@ -3666,7 +4092,8 @@ function puBatch(thenables, warm) {
       comp: CURRENT_COMP,
       props: CURRENT_PROPS,
       parentScope: CURRENT_PARENT_SCOPE,
-      frame
+      frame,
+      signalInstanceKey: SIGNAL_COMPONENT_INSTANCE_KEY
     });
   }
   throw SSR_SUSPENSE;
@@ -3830,7 +4257,8 @@ function lazy(load) {
         comp: CURRENT_COMP,
         props: CURRENT_PROPS,
         parentScope: CURRENT_PARENT_SCOPE,
-        frame
+        frame,
+        signalInstanceKey: SIGNAL_COMPONENT_INSTANCE_KEY
       });
     }
     throw SSR_SUSPENSE;
@@ -4316,9 +4744,26 @@ function serializeNativeSignalSeeds(signals, nonceAttr, attr = NATIVE_SIGNAL_SEE
   const json = JSON.stringify(signals).replace(/</g, "\\u003c");
   return '<script type="application/json" ' + attr + nonceAttr + ">" + json + "</script>";
 }
+let SERVER_SIGNAL_BINDINGS_ENABLED = false;
+let SERVER_SIGNAL_BINDINGS_POTENTIAL = false;
+function enableServerSignalBindings(abi = 1, potentialOnly = false) {
+  if (abi !== 1) throw new TypeError(formatServerError(71));
+  SERVER_SIGNAL_BINDINGS_POTENTIAL = true;
+  if (!potentialOnly) SERVER_SIGNAL_BINDINGS_ENABLED = true;
+}
+function isRendererSignalOwner(owner) {
+  return "documentOwner" in owner;
+}
 function newResolvedMap(resourceOptions) {
   const m = /* @__PURE__ */ new Map();
   if (resourceOptions !== void 0) m.resourceOptions = resourceOptions;
+  if (SERVER_SIGNAL_BINDINGS_ENABLED || resourceOptions?.signalOwner !== void 0) {
+    const ambient = currentSignalOwner();
+    const configured = resourceOptions?.signalOwner ?? ambient;
+    m.signalOwner = configured === void 0 || configured === null ? Object.freeze({ scopeKey: "octane:document" }) : isRendererSignalOwner(configured) ? configured.documentOwner : configured;
+    m.ownedSignalOwner = configured === void 0 || configured === null;
+    m.signalInstances = /* @__PURE__ */ new Map();
+  }
   m.asyncIdentities = /* @__PURE__ */ new Map();
   m.asyncPositionIdentities = /* @__PURE__ */ new Map();
   m.nextAsyncIdentity = 0;
@@ -4362,6 +4807,13 @@ function releaseServerRenderResources(resolved) {
   }
   const resources = resolved.resources;
   resolved.resourceOptions = void 0;
+  if (resolved.signalInstances !== void 0) {
+    for (const owner of resolved.signalInstances.values()) retireSignalOwnerIdentity(owner);
+    resolved.signalInstances.clear();
+  }
+  if (resolved.ownedSignalOwner && resolved.signalOwner !== void 0) {
+    retireSignalOwnerIdentity(resolved.signalOwner);
+  }
   if (resources !== void 0) resolved.resources = void 0;
   if (resources === void 0 || resources.finished) return;
   resources.finished = true;
@@ -4387,6 +4839,11 @@ function saveAmbient() {
     warmClaims: CURRENT_PU_WARM_CLAIMS,
     id: ID_COUNTER,
     idPrefix: ID_PREFIX,
+    signalInstancePrefix: SIGNAL_INSTANCE_PREFIX,
+    signalComponentInstanceKey: SIGNAL_COMPONENT_INSTANCE_KEY,
+    signalOwnerActive: SERVER_SIGNAL_OWNER_ACTIVE,
+    signalControlSite: SIGNAL_CONTROL_SITE,
+    signalListKeys: SIGNAL_LIST_KEYS,
     css: CSS,
     nonceAttr: NONCE_ATTR,
     markers: MARKERS,
@@ -4440,6 +4897,11 @@ function restoreAmbient(a) {
   CURRENT_PU_WARM_CLAIMS = a.warmClaims;
   ID_COUNTER = a.id;
   ID_PREFIX = a.idPrefix;
+  SIGNAL_INSTANCE_PREFIX = a.signalInstancePrefix;
+  SIGNAL_COMPONENT_INSTANCE_KEY = a.signalComponentInstanceKey;
+  SERVER_SIGNAL_OWNER_ACTIVE = a.signalOwnerActive;
+  SIGNAL_CONTROL_SITE = a.signalControlSite;
+  SIGNAL_LIST_KEYS = a.signalListKeys;
   CSS = a.css;
   NONCE_ATTR = a.nonceAttr;
   MARKERS = a.markers;
@@ -4480,6 +4942,11 @@ function runFullFramedPass(component, props, resolved, nonceAttr = "", identifie
   CURRENT_PU_WARM_CLAIMS = null;
   ID_COUNTER = 0;
   ID_PREFIX = identifierPrefix;
+  SIGNAL_INSTANCE_PREFIX = identifierPrefix;
+  SIGNAL_COMPONENT_INSTANCE_KEY = JSON.stringify([identifierPrefix, "root"]);
+  SERVER_SIGNAL_OWNER_ACTIVE = false;
+  SIGNAL_CONTROL_SITE = "";
+  SIGNAL_LIST_KEYS = EMPTY_SIGNAL_LIST_KEYS;
   NONCE_ATTR = nonceAttr;
   ASYNC_SCOPE = "";
   MARKERS = markers;
@@ -4533,6 +5000,10 @@ function runFullFramedPass(component, props, resolved, nonceAttr = "", identifie
   try {
     const out = invokeComponentBody(component, props, root, FRAME);
     body = serverComponentOutput(out, root);
+    if (markers && out !== null && typeof out === "object") {
+      const marker = out[BINDING_HTML_ROOT];
+      if (marker !== void 0) body = ssrBindingBlock(body, marker);
+    }
     nativePassCompleted = true;
   } catch (err) {
     err = normalizeThrownServerThenable(err);
@@ -4577,7 +5048,8 @@ function runFullFramedPass(component, props, resolved, nonceAttr = "", identifie
     vtCandidates,
     rawHtml,
     cssEntries: cssMap,
-    sheets: headBuf.sheets
+    sheets: headBuf.sheets,
+    hasSignalControls: resolved.hasSignalControls === true
   };
   if (signals !== void 0) result.signals = signals;
   return result;
@@ -4592,6 +5064,11 @@ function runDiscoveryRound(jobs, resolved, identifierPrefix) {
   CURRENT_PU_WARM_CLAIMS = null;
   ID_COUNTER = 0;
   ID_PREFIX = identifierPrefix;
+  SIGNAL_INSTANCE_PREFIX = identifierPrefix;
+  SIGNAL_COMPONENT_INSTANCE_KEY = JSON.stringify([identifierPrefix, "root"]);
+  SERVER_SIGNAL_OWNER_ACTIVE = false;
+  SIGNAL_CONTROL_SITE = "";
+  SIGNAL_LIST_KEYS = EMPTY_SIGNAL_LIST_KEYS;
   NONCE_ATTR = "";
   ASYNC_SCOPE = "";
   MARKERS = true;
@@ -4638,7 +5115,14 @@ function runDiscoveryRound(jobs, resolved, identifierPrefix) {
         namespace: void 0
       };
       try {
-        renderComponentFramed(job.comp, job.props, job.parentScope, frame);
+        renderComponentFramed(
+          job.comp,
+          job.props,
+          job.parentScope,
+          frame,
+          void 0,
+          job.signalInstanceKey
+        );
       } catch (err) {
         if (!ssrIsSuspense(err)) continue;
       }
@@ -4856,10 +5340,13 @@ async function runBuffered(component, props, options, nonceAttr, resolved) {
     if (resolved.pu.touched !== void 0) resolved.pu.touched = /* @__PURE__ */ new Set();
   }
 }
-function passToResult(pass, nonceAttr, separateHead = false) {
+function passToResult(pass, nonceAttr, separateHead = false, independentHydration = false, externalSignalBootstrap = false) {
   let body = pass.body;
   if (pass.serial.length > 0) body += serializeSuspenseSeeds(pass.serial, nonceAttr);
   if (pass.signals !== void 0) body += serializeNativeSignalSeeds(pass.signals, nonceAttr);
+  if (!externalSignalBootstrap && (pass.hasSignalControls || independentHydration)) {
+    body += "<script " + STREAM_SCRIPT_ATTR + nonceAttr + ">" + streamedSignalBootstrapJs(independentHydration) + "</script>";
+  }
   let result;
   if (separateHead) {
     result = {
@@ -4874,20 +5361,108 @@ function passToResult(pass, nonceAttr, separateHead = false) {
   if (pass.signals !== void 0) result.signals = pass.signals;
   return result;
 }
+async function collectBufferedInjection(injection, signal) {
+  let revision = 0;
+  let wake;
+  let settled = false;
+  let failed = false;
+  let failure;
+  const notify = () => {
+    revision++;
+    const resume = wake;
+    wake = void 0;
+    resume?.();
+  };
+  const unsubscribe = injection.subscribe(notify);
+  signal?.addEventListener("abort", notify, { once: true });
+  injection.done.then(
+    () => {
+      settled = true;
+      notify();
+    },
+    (error) => {
+      failed = true;
+      failure = error;
+      settled = true;
+      notify();
+    }
+  );
+  let html = "";
+  try {
+    injection.renderComplete?.();
+    for (; ; ) {
+      signal?.throwIfAborted();
+      const chunk = injection.take();
+      if (chunk !== "") {
+        html += chunk;
+        injection.accepted?.();
+        continue;
+      }
+      if (settled) {
+        if (failed) throw failure;
+        return html;
+      }
+      const observed = revision;
+      await new Promise((resolve) => {
+        wake = resolve;
+        if (settled || revision !== observed) {
+          wake = void 0;
+          resolve();
+        }
+      });
+    }
+  } finally {
+    unsubscribe();
+    signal?.removeEventListener("abort", notify);
+  }
+}
+function insertBufferedInjection(pass, injection) {
+  if (injection === "") return;
+  const tailStart = documentTailStart(pass.body);
+  pass.body = tailStart === -1 ? pass.body + injection : pass.body.slice(0, tailStart) + injection + pass.body.slice(tailStart);
+}
 async function prerender(entryComponent, props, options) {
   const component = typeof entryComponent === "function" ? entryComponent : renderEntryValue;
   if (typeof entryComponent !== "function") {
     options ??= props;
     props = { value: entryComponent };
   }
-  const nonceAttr = nonceAttrOf(options);
-  const resolved = newResolvedMap(options ?? null);
+  const preparedOptions = needsAutomaticSignalInjection(options) ? await prepareAutomaticSignalInjection(options) : options;
+  const injection = preparedOptions?.injection;
+  const cancelRender = injection === void 0 ? void 0 : new AbortController();
+  injection?.done.then(NOOP, (error) => cancelRender.abort(error));
+  const renderOptions = cancelRender === void 0 ? preparedOptions : {
+    ...preparedOptions,
+    signal: preparedOptions?.signal === void 0 ? cancelRender.signal : AbortSignal.any([preparedOptions.signal, cancelRender.signal])
+  };
+  const nonceAttr = nonceAttrOf(renderOptions);
+  const resolved = newResolvedMap(renderOptions ?? null);
   try {
+    const pass = await runBuffered(component, props, renderOptions, nonceAttr, resolved);
+    if (injection !== void 0) {
+      try {
+        insertBufferedInjection(
+          pass,
+          await collectBufferedInjection(injection, renderOptions?.signal)
+        );
+      } catch (error) {
+        renderOptions?.onError?.(error);
+        throw error;
+      }
+    }
     return passToResult(
-      await runBuffered(component, props, options, nonceAttr, resolved),
+      pass,
       nonceAttr,
-      options?.headChannel === "separate"
+      renderOptions?.headChannel === "separate",
+      renderOptions?.independentHydration !== void 0,
+      renderOptions?.earlySignalBootstrap === "external"
     );
+  } catch (error) {
+    try {
+      injection?.cancel?.(error);
+    } catch {
+    }
+    throw error;
   } finally {
     releaseServerRenderResources(resolved);
   }
@@ -5002,7 +5577,13 @@ function renderToString(entryComponent, props, options) {
   } finally {
     releaseServerRenderResources(resolved);
   }
-  return passToResult(pass, nonceAttr, options?.headChannel === "separate");
+  return passToResult(
+    pass,
+    nonceAttr,
+    options?.headChannel === "separate",
+    options?.independentHydration !== void 0,
+    options?.earlySignalBootstrap === "external"
+  );
 }
 function renderToStaticMarkup(entryComponent, props, options) {
   const component = typeof entryComponent === "function" ? entryComponent : renderEntryValue;
@@ -5718,6 +6299,20 @@ function drain(){
 }
 })();`;
 }
+function needsAutomaticSignalInjection(options) {
+  return options?.streamedSignals !== void 0 && options?.injection?.observeSignalAttempt === void 0;
+}
+async function prepareAutomaticSignalInjection(options) {
+  const config = options.streamedSignals;
+  const { createAutomaticStreamedSignalInjection } = await import("./server/streamed-signals.js");
+  return {
+    ...options,
+    injection: createAutomaticStreamedSignalInjection(
+      { ...config, nonce: options.nonce },
+      options.injection
+    )
+  };
+}
 function withStream(stream, fn) {
   const prev = STREAM;
   STREAM = stream;
@@ -5897,7 +6492,14 @@ async function runStream(component, props, options, sink, resolved) {
       return;
     }
     if (!html) return;
-    return write(html, false, rememberUnaccepted);
+    const written = write(html, false, rememberUnaccepted);
+    if (written === void 0) {
+      injection.accepted?.();
+      return;
+    }
+    return written.then(() => {
+      injection.accepted?.();
+    });
   };
   const recoveryInjection = injection === void 0 ? void 0 : async () => {
     if (signal?.aborted) {
@@ -6097,11 +6699,18 @@ async function runStream(component, props, options, sink, resolved) {
   }
   if (pass.serial.length > 0) shell += serializeSuspenseSeeds(pass.serial, nonceAttr);
   if (pass.signals !== void 0) shell += serializeNativeSignalSeeds(pass.signals, nonceAttr);
+  if (options?.earlySignalBootstrap !== "external" && (injection?.streamedRenderer === true || pass.hasSignalControls || options?.independentHydration !== void 0)) {
+    shell += "<script " + STREAM_SCRIPT_ATTR + nonceAttr + ">" + streamedSignalBootstrapJs(options?.independentHydration !== void 0) + "</script>";
+  }
+  if (injection?.takeInitialSelections !== void 0) shell += injection.takeInitialSelections();
   const anyPending = stream.boundaries.size > 0;
   let sentViewTransitions = pass.vtCandidates;
   if (anyPending)
     shell += "<script " + STREAM_SCRIPT_ATTR + nonceAttr + ">" + streamRuntimeJs() + (sentViewTransitions ? streamViewTransitionRuntimeJs() : "") + "</script>";
   try {
+    if (injection?.streamedRenderer === true || pass.hasSignalControls || options?.independentHydration !== void 0) {
+      options?.onEarlyHydrationReady?.();
+    }
     const shellWrite = write(pass.vtCandidates ? vtSsrStrip(shell, pass.rawHtml) : shell);
     if (shellWrite !== void 0) await shellWrite;
   } catch (err) {
@@ -6432,10 +7041,8 @@ function renderToPipeableStream(entryComponent, props, options) {
     finishEnd();
   };
   let started = false;
-  const startRender = () => {
-    if (started) return;
-    started = true;
-    const renderOptions = { ...options, signal: controller.signal };
+  const beginRender = (preparedOptions) => {
+    const renderOptions = { ...preparedOptions, signal: controller.signal };
     const resolved = newResolvedMap(renderOptions);
     void runStream(
       component,
@@ -6472,6 +7079,18 @@ function renderToPipeableStream(entryComponent, props, options) {
       flushEnd();
     });
   };
+  const startRender = () => {
+    if (started) return;
+    started = true;
+    if (needsAutomaticSignalInjection(options)) {
+      void prepareAutomaticSignalInjection(options).then(beginRender, (error) => {
+        shellFailure = { error };
+        options?.onShellError?.(error);
+        options?.onError?.(error);
+        flushEnd();
+      });
+    } else beginRender(options);
+  };
   queueMicrotask(startRender);
   return {
     pipe(dest) {
@@ -6508,6 +7127,11 @@ function renderToReadableStream(entryComponent, props, options) {
     options ??= props;
     props = { value: entryComponent };
   }
+  if (needsAutomaticSignalInjection(options)) {
+    return prepareAutomaticSignalInjection(options).then(
+      (prepared) => renderToReadableStream(component, props, prepared)
+    );
+  }
   return new Promise((resolveShell, rejectShell) => {
     const encoder = new TextEncoder();
     const renderController = new AbortController();
@@ -6992,16 +7616,20 @@ export {
   addTransitionType,
   beginNativeReadScope,
   beginNativeReadWitness,
+  bindPresentationView,
   callWithReceiver,
   cloneElement,
   createContext,
   createElement,
+  createElementAt,
+  createElementFromConfig,
   createHostedServerSession,
   createPortal,
   createScopedElement,
   createScopedValue,
   descriptorChildren,
   enableNativeReadCollection,
+  enableServerSignalBindings,
   encodeAsyncIdentityString,
   endNativeReadScope,
   escapeAttr,
@@ -7054,6 +7682,11 @@ export {
   ssrArm,
   ssrAttr,
   ssrAttrs,
+  ssrBindingBlock,
+  ssrBindingChild,
+  ssrBindingClass,
+  ssrBindingHtml,
+  ssrBindingKey,
   ssrBlock,
   ssrCheckedAttr,
   ssrChild,
@@ -7085,6 +7718,9 @@ export {
   ssrSelectAttrs,
   ssrSelectScope,
   ssrSelectScopeSources,
+  ssrSignalControlAttrs,
+  ssrSignalControlValue,
+  ssrSignalValue,
   ssrSnapshotSpread,
   ssrSpread,
   ssrSpreadContent,