octane 0.6.2 → 0.7.0

package/dist/cjs/runtime.server.cjs

@@ -69,6 +69,7 @@ __export(runtime_server_exports, {
   injectStyle: () => injectStyle,
   invokeManualHook: () => invokeManualHook,
   isChildrenBlock: () => isChildrenBlock,
+  isRenderCall: () => isRenderCall,
   isValidElement: () => isValidElement,
   lazy: () => lazy,
   manualHook: () => manualHook,
@@ -157,6 +158,7 @@ __export(runtime_server_exports, {
   ssrText: () => ssrText,
   ssrTextPre: () => ssrTextPre,
   ssrTextSlot: () => ssrTextSlot,
+  ssrTextareaText: () => ssrTextareaText,
   ssrTextareaValue: () => ssrTextareaValue,
   ssrTextareaValueSources: () => ssrTextareaValueSources,
   ssrTry: () => ssrTry,
@@ -223,6 +225,7 @@ var import_native_read_seeds = require("./signals/native-read-seeds.cjs");
 var import_owner_context = require("./signals/owner-context.cjs");
 var import_query_attempt_observer = require("./signals/query-attempt-observer.cjs");
 var import_types = require("./signals/types.cjs");
+const __octaneDev = process.env.NODE_ENV !== "production";
 function isSignalHandle(value) {
   return (typeof value === "object" || typeof value === "function") && value !== null && value[import_types.SIGNAL_HANDLE] === true;
 }
@@ -455,7 +458,7 @@ function nextScopedCount(frame, slot, key) {
 }
 function scopeSuffix(frame) {
   const scope = ASYNC_SCOPE;
-  if (process.env.NODE_ENV !== "production" && !scope.startsWith(frame.asyncScope)) {
+  if (__octaneDev && !scope.startsWith(frame.asyncScope)) {
     throw new Error((0, import_error_codes_server_generated.formatServerError)(65));
   }
   return scope.slice(frame.asyncScope.length);
@@ -505,7 +508,7 @@ function withSsrElementContext(tag, location, render, forcedNamespace, htmlInteg
     childrenNamespace,
     location
   };
-  if (process.env.NODE_ENV !== "production" && SSR_NESTING_WARNINGS !== null && namespace === "html" && parent?.namespace === "html") {
+  if (__octaneDev && SSR_NESTING_WARNINGS !== null && namespace === "html" && parent?.namespace === "html") {
     const parentMessage = (0, import_html_tree_validation.invalidHtmlNestingWithParent)(
       semanticTag,
       parent.tag,
@@ -535,12 +538,12 @@ function withSsrElementContext(tag, location, render, forcedNamespace, htmlInteg
   }
 }
 function ssrElement(tag, location, render, htmlIntegrationPoint) {
-  if (process.env.NODE_ENV === "production" || SSR_NESTING_WARNINGS === null) return render();
+  if (!__octaneDev || SSR_NESTING_WARNINGS === null) return render();
   return withSsrElementContext(tag, location, render, void 0, htmlIntegrationPoint);
 }
 function ssrNestingText(value) {
   const text = ssrText(value);
-  if (process.env.NODE_ENV !== "production" && text !== "") {
+  if (__octaneDev && text !== "") {
     const parent = CURRENT_SSR_ELEMENT;
     if (parent !== null && parent.namespace === "html" && SSR_NESTING_WARNINGS !== null) {
       const message = (0, import_html_tree_validation.invalidHtmlTextNesting)(text, parent.tag, parent.location);
@@ -694,7 +697,7 @@ function copyElementConfig(config) {
   return props;
 }
 function finalizeElementDescriptor(descriptor) {
-  if (process.env.NODE_ENV !== "production") {
+  if (__octaneDev) {
     Object.freeze(descriptor.props);
     Object.freeze(descriptor);
   }
@@ -749,6 +752,9 @@ function createScopedValue(readElement) {
   };
   return scopedValueDescriptor(resolve);
 }
+function isRenderCall(scope) {
+  return scope === CURRENT_SCOPE && scope !== null;
+}
 function nativeCreateScopedValue(readElement) {
   return scopedValueDescriptor(createNativeServerScopedResolver(readElement));
 }
@@ -765,7 +771,7 @@ function scopedValueDescriptor(resolve) {
     "__octaneInvocationSite",
     SCOPED_VALUE_PROPERTIES.__octaneInvocationSite
   );
-  if (process.env.NODE_ENV !== "production") Object.freeze(descriptor);
+  if (__octaneDev) Object.freeze(descriptor);
   return descriptor;
 }
 function createScopedElement(type, props, readChildren, invocationSite) {
@@ -830,7 +836,7 @@ function createElementFromConfig(invocationSite, type, props, children) {
   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);
+    if (__octaneDev) Object.freeze(children);
   }
   const p = copyElementConfig(src);
   if (hasPositional) p.children = kids;
@@ -886,7 +892,7 @@ function ssrDeoptKey(item, index) {
 }
 function scopedSsrDeoptKey(path, item, index, key) {
   const explicit = isElementDescriptor(item) && item.key != null;
-  if (path.length === 0 && !explicit) return index;
+  if (path.length === 0) return explicit ? "k" + String(key) : index;
   return JSON.stringify([path, explicit ? "key" : "index", explicit ? String(key) : index]);
 }
 const SSR_DEOPT_KEY_STRINGIFY = JSON.stringify;
@@ -1418,7 +1424,7 @@ function ssrChildValue(v, scope, includeKeyedSingle, selfMarkItem = false) {
       for (let i = 0; i < preparedList.items.length; i++) {
         const item = preparedList.items[i];
         const key = preparedList.keys[i];
-        out += withAsyncIdentity("item", key, () => ssrChildValue(item, scope, false, true));
+        out += withSsrDeoptItem(key, i, () => ssrChildValue(item, scope, false, true));
       }
       return ssrBlock(out);
     });
@@ -1456,6 +1462,22 @@ function ssrChildTextPre(v, scope) {
   const content = ssrChildText(v, scope);
   return content.charCodeAt(0) === 10 ? "\n" + content : content;
 }
+function rejectTextareaChild(child) {
+  throw new Error((0, import_error_codes_server_generated.formatServerError)(336, (0, import_shared_value_helpers.describeTextareaChild)(child, isElementDescriptor)));
+}
+function ssrTextareaText(parts, textHoles) {
+  let probing = false;
+  for (const part of parts) if (probingDangerHtmlChild(part)) probing = true;
+  if (probing) return "";
+  let text = "";
+  for (let i = 0; i < parts.length; i++) {
+    let part = parts[i];
+    if (isSignalHandle(part)) part = readSignalBinding(part);
+    text += textHoles !== void 0 && textHoles.charCodeAt(i) === 116 ? part == null || part === false ? "" : String(part) : (0, import_shared_value_helpers.textareaChildText)(part, rejectTextareaChild);
+  }
+  const escaped = escapeHtml(text);
+  return escaped.charCodeAt(0) === 10 ? "\n" + escaped : escaped;
+}
 function ssrChildPre(v, scope) {
   const content = ssrChild(v, scope);
   return content.charCodeAt(0) === 10 ? "\n" + content : content;
@@ -1483,7 +1505,7 @@ function ssrHostElement(tag, props, children, scope, rawInner) {
     let hasInnerHTMLProp = false;
     const isCtlTag = semanticTag === "input" || semanticTag === "textarea" || semanticTag === "select";
     if (props != null) {
-      if (process.env.NODE_ENV !== "production") {
+      if (__octaneDev) {
         devValidateSsrAriaProps(props, semanticTag, namespace);
         devValidateSsrHostProps(props, semanticTag, namespace);
         devValidateSsrFormProps(semanticTag, props, children);
@@ -1534,6 +1556,8 @@ function ssrHostElement(tag, props, children, scope, rawInner) {
       inner = semanticTag === "script" ? escapeEntireInlineScriptContent(raw) : semanticTag === "style" ? escapeEntireInlineStyleContent(raw) : raw;
     } else if (rawInner !== void 0) {
       inner = rawInner;
+    } else if (hasChildren && semanticTag === "textarea" && namespace === "html") {
+      inner = escapeHtml((0, import_shared_value_helpers.textareaChildText)(children, rejectTextareaChild));
     } else if (hasChildren) {
       const rawText = semanticTag === "script" || semanticTag === "style" ? scriptDescriptorText(children) : null;
       if (rawText !== null) {
@@ -1571,7 +1595,7 @@ function ssrDeoptBlockChildren(children, scope) {
       for (let i = 0; i < preparedList.items.length; i++) {
         const item = preparedList.items[i];
         const key = preparedList.keys[i];
-        out += withAsyncIdentity("item", key, () => {
+        out += withSsrDeoptItem(key, i, () => {
           return serverDescNeedsBlocks(item) ? ssrChildValue(item, scope, false) : ssrDeoptItemContent(item, scope);
         });
       }
@@ -1627,23 +1651,62 @@ function ssrDeoptItemContent(value, scope) {
   return ssrBlock(ssrDescriptorContent(value, scope));
 }
 function ssrDescriptorContent(v, scope) {
+  SSR_DESCRIPTOR_TEXT_TAIL = false;
+  return ssrDescriptorPart(v, scope);
+}
+let SSR_DESCRIPTOR_TEXT_TAIL = false;
+function ssrDescriptorPart(v, scope) {
   if (v == null || v === false || v === true || v === "") return "";
-  if (typeof v === "object" && SERVER_HTML in v) return v[SERVER_HTML];
+  if (typeof v === "object" && SERVER_HTML in v) {
+    SSR_DESCRIPTOR_TEXT_TAIL = false;
+    return v[SERVER_HTML];
+  }
   if (Array.isArray(v)) {
     let out = "";
-    for (let i = 0; i < v.length; i++) out += ssrDescriptorContent(v[i], scope);
+    for (let i = 0; i < v.length; i++) out += ssrDescriptorPart(v[i], scope);
     return out;
   }
   if (typeof v === "object" && v.$$kind === import_runtime_tags.ELEMENT_TAG) {
     const d = v;
-    if (typeof d.type === "string") return ssrHostElement(d.type, d.props, d.children, scope);
-    return ssrComponentDescriptor(d, scope);
+    const html = typeof d.type === "string" ? ssrHostElement(d.type, d.props, d.children, scope) : ssrComponentDescriptor(d, scope);
+    SSR_DESCRIPTOR_TEXT_TAIL = false;
+    return html;
   }
   if (typeof v === "function") {
-    return ssrComponent(scope, v, {}, void 0, void 0, isChildrenBlock(v));
+    const html = ssrComponent(
+      scope,
+      v,
+      {},
+      void 0,
+      void 0,
+      isChildrenBlock(v)
+    );
+    SSR_DESCRIPTOR_TEXT_TAIL = false;
+    return html;
   }
   if (typeof v === "object") throw invalidChildError(v);
-  return escapeHtml(v);
+  const text = escapeHtml(v);
+  if (!SSR_DESCRIPTOR_TEXT_TAIL) {
+    SSR_DESCRIPTOR_TEXT_TAIL = true;
+    return text;
+  }
+  return ssrContentParsesComments() ? import_constants.TEXT_SEPARATOR + text : text;
+}
+const RAW_TEXT_CONTENT = /* @__PURE__ */ new Set([
+  "textarea",
+  "title",
+  "script",
+  "style",
+  "xmp",
+  "iframe",
+  "noembed",
+  "noframes",
+  "noscript",
+  "plaintext"
+]);
+function ssrContentParsesComments() {
+  const host = CURRENT_SSR_ELEMENT;
+  return host === null || host.namespace !== "html" || !RAW_TEXT_CONTENT.has(host.tag);
 }
 function ssrBlock(content) {
   return MARKERS ? import_constants.BLOCK_OPEN + content + import_constants.BLOCK_CLOSE : String(content);
@@ -1741,6 +1804,27 @@ function withAsyncListScope(kind, fn) {
   const occurrence = frame === null ? 0 : nextFrameOccurrence(frame, "@list:" + kind);
   return withAsyncIdentity("list:" + kind, occurrence, fn);
 }
+function withSsrDeoptItem(key, index, fn) {
+  const previousScope = ASYNC_SCOPE;
+  const previousSignalKeys = SIGNAL_LIST_KEYS;
+  ASYNC_SCOPE = previousScope + "|@item:" + asyncIdentityKey(key, false);
+  if (SERVER_SIGNAL_BINDINGS_POTENTIAL) {
+    SIGNAL_LIST_KEYS = {
+      parent: previousSignalKeys,
+      key,
+      mapped: false,
+      signalSite: void 0,
+      position: index,
+      values: null
+    };
+  }
+  try {
+    return fn();
+  } finally {
+    ASYNC_SCOPE = previousScope;
+    SIGNAL_LIST_KEYS = previousSignalKeys;
+  }
+}
 function ssrControl(siteKey, fn) {
   const frame = FRAME;
   const occurrence = frame === null ? 0 : nextFrameOccurrence(frame, "@control:" + siteKey);
@@ -1896,7 +1980,7 @@ function devValidateSsrHostProps(props, tag, namespace) {
   if (invalid !== void 0) console.error((0, import_host_property_diagnostics.invalidHostPropertiesWarning)(invalid, tag));
 }
 function ssrAttr(name, v, tag, namespace = "html") {
-  const dev = process.env.NODE_ENV !== "production";
+  const dev = __octaneDev;
   namespace = resolveAttributeNamespace(namespace);
   const isCustomTag = namespace === "html" && tag !== void 0 && tag.indexOf("-") !== -1;
   if (dev && !isCustomTag && tag !== void 0 && DEV_SSR_CUSTOM_HOST_DEPTH === 0) {
@@ -2020,7 +2104,7 @@ function ssrAttr(name, v, tag, namespace = "html") {
   return " " + name + '="' + escapeAttr((0, import_sanitize_url.sanitizeURLAttribute)(tag, name, s)) + '"';
 }
 function styleObjectToCss(obj) {
-  const dev = process.env.NODE_ENV !== "production";
+  const dev = __octaneDev;
   let out = "";
   for (const k in obj) {
     const val = obj[k];
@@ -2075,7 +2159,7 @@ function isAggregatedFormAttribute(tag, name) {
   return tag === "select" && name === "multiple";
 }
 function ssrAttrs(sources, tag, namespace = "html", skipFormControls = false, readStyle) {
-  const dev = process.env.NODE_ENV !== "production";
+  const dev = __octaneDev;
   namespace = resolveAttributeNamespace(namespace);
   const props = /* @__PURE__ */ new Map();
   let classMerges = null;
@@ -2261,7 +2345,7 @@ function ssrSnapshotSpread(obj, controlSite, deferStyle = false) {
 function ssrSpread(obj, tag, skipClass = false, namespace = "html", skipFormControls = false) {
   namespace = resolveAttributeNamespace(namespace);
   if (obj == null) return "";
-  if (process.env.NODE_ENV !== "production") {
+  if (__octaneDev) {
     devValidateSsrAriaProps(Object(obj), tag, namespace);
     devValidateSsrHostProps(Object(obj), tag, namespace);
   }
@@ -2335,9 +2419,10 @@ function finalPresentSource(sources) {
   }
   return [false, void 0];
 }
-function ssrChildrenSources(sources, renderFallback, scope) {
+function ssrChildrenSources(sources, renderFallback, scope, textarea = false) {
   const child = finalPresentSource(sources);
-  return child[0] ? ssrChildText(child[1], scope) : renderFallback();
+  if (!child[0]) return renderFallback();
+  return textarea ? ssrTextareaText([child[1]]) : ssrChildText(child[1], scope);
 }
 function ssrSpreadContent(snapshot, scope) {
   if (snapshot === null) return "";
@@ -2363,7 +2448,7 @@ function ssrVoidContent(tag, dangerSources, childrenSources) {
   return "";
 }
 function devValidateSsrFormProps(tag, props, children) {
-  if (process.env.NODE_ENV === "production" || SSR_NESTING_WARNINGS === null || CURRENT_SSR_ELEMENT === null || tag !== "input" && tag !== "textarea" && tag !== "select" && tag !== "option" && tag !== "form" && tag !== "button") {
+  if (!__octaneDev || SSR_NESTING_WARNINGS === null || CURRENT_SSR_ELEMENT === null || tag !== "input" && tag !== "textarea" && tag !== "select" && tag !== "option" && tag !== "form" && tag !== "button") {
     return;
   }
   for (const warning of (0, import_form_diagnostics.formAuthoringDiagnostics)(tag, props, children)) {
@@ -2371,7 +2456,7 @@ function devValidateSsrFormProps(tag, props, children) {
   }
 }
 function ssrFormAuthoringDiagnostics(tag, sources) {
-  if (process.env.NODE_ENV !== "production" && SSR_NESTING_WARNINGS !== null) {
+  if (__octaneDev && SSR_NESTING_WARNINGS !== null) {
     const props = /* @__PURE__ */ Object.create(null);
     for (const [name, value] of sources) props[name] = value;
     devValidateSsrFormProps(tag, props);
@@ -2389,7 +2474,7 @@ function ssrCheckedAttr(v) {
 }
 function ssrInputAttrs(sources) {
   const props = resolveFormControlSources(sources);
-  if (process.env.NODE_ENV !== "production") {
+  if (__octaneDev) {
     devValidateSsrFormProps("input", {
       value: unwrapSsrSignalControlValue(props.value),
       defaultValue: unwrapSsrSignalControlValue(props.defaultValue),
@@ -2478,7 +2563,7 @@ function ssrTextareaValue(v) {
 }
 function ssrTextareaValueSources(sources) {
   const props = resolveFormControlSources(sources);
-  if (process.env.NODE_ENV !== "production") {
+  if (__octaneDev) {
     devValidateSsrFormProps("textarea", {
       value: unwrapSsrSignalControlValue(props.value),
       defaultValue: unwrapSsrSignalControlValue(props.defaultValue)
@@ -2495,7 +2580,7 @@ const SELECT_STACK = [];
 function ssrSelectScope(value, defaultValue, multiple, children) {
   value = unwrapSsrSignalControlValue(value);
   defaultValue = unwrapSsrSignalControlValue(defaultValue);
-  if (process.env.NODE_ENV !== "production") {
+  if (__octaneDev) {
     devValidateSsrFormProps("select", { value, defaultValue, multiple });
   }
   const v = value != null ? value : defaultValue;
@@ -2540,7 +2625,7 @@ function ssrOptionValueSources(sources) {
   return value;
 }
 function ssrOption(value, attrs, content, complexAuthoredChildren = false) {
-  if (process.env.NODE_ENV !== "production" && SSR_NESTING_WARNINGS !== null) {
+  if (__octaneDev && SSR_NESTING_WARNINGS !== null) {
     if (/(?:^|\s)selected(?:\s|=|$)/i.test(attrs)) {
       devValidateSsrFormProps("option", { value, selected: true });
     }
@@ -2558,8 +2643,9 @@ function ssrOptionSelected(value, content) {
   if (value != null) {
     key = String(value);
   } else {
-    if (content.indexOf("<") !== -1) return "";
-    key = unescapeOptionText(content);
+    const text = content.indexOf(import_constants.TEXT_SEPARATOR) === -1 ? content : content.replaceAll(import_constants.TEXT_SEPARATOR, "");
+    if (text.indexOf("<") !== -1) return "";
+    key = unescapeOptionText(text);
   }
   if (scope.multi !== null) return scope.multi.has(key) ? " selected" : "";
   return scope.single === key ? " selected" : "";
@@ -3826,7 +3912,7 @@ function createContext(defaultValue) {
   ctx.$$kind = import_runtime_tags.CONTEXT_TAG;
   ctx.defaultValue = defaultValue;
   (0, import_context_identity.registerContext)(ctx);
-  if (process.env.NODE_ENV !== "production") {
+  if (__octaneDev) {
     (0, import_context_identity.defineRemovedContextMembers)(ctx);
   }
   return ctx;
@@ -4033,7 +4119,7 @@ function hasExternalHydrationOwner(thenable) {
   }
 }
 function use(usable, siteKey, directSite) {
-  if (process.env.NODE_ENV !== "production" && devMemoComputeDepth !== 0) {
+  if (__octaneDev && devMemoComputeDepth !== 0) {
     console.error(
       "Do not call use() inside a useMemo() factory. Cached factories can skip context or promise reads; call use() before useMemo() and memoize the returned value instead."
     );
@@ -4621,7 +4707,7 @@ function memoHookValue(input, compute, depsOrSlot, maybeSlot) {
   return rec.value;
 }
 function useMemo(compute, depsOrSlot, maybeSlot) {
-  if (process.env.NODE_ENV !== "production") {
+  if (__octaneDev) {
     devMemoComputeDepth++;
     try {
       return memoHookValue(compute, true, depsOrSlot, maybeSlot);
@@ -4677,8 +4763,8 @@ function useActionState(_action, initialState) {
 function useFormStatus() {
   return { pending: false, data: null, method: null, action: null };
 }
-function useOptimistic(state) {
-  return [state, NOOP];
+function useOptimistic(passthrough) {
+  return [passthrough, NOOP];
 }
 const MEMO_OWNER = /* @__PURE__ */ Symbol("memoOwner");
 const MEMO_MARKER_DESCRIPTOR = {
@@ -5428,6 +5514,33 @@ async function raceSettleGuards(work, timeoutMs, signal) {
     removeAbort?.();
   }
 }
+function isThrownKey(key) {
+  return key.charCodeAt(0) === 124 && key.startsWith("|throw#");
+}
+function isThrownWave(suspended) {
+  for (const { key } of suspended) if (!isThrownKey(key)) return false;
+  return true;
+}
+function isStalledWave(suspended, resolved) {
+  const seen = resolved.settledThrows;
+  if (seen === void 0) return false;
+  for (const { promise, key } of suspended) {
+    if (!isThrownKey(key) || !seen.has(promise)) return false;
+  }
+  return true;
+}
+const STALLED_RETRY_MAX_DELAY_MS = 100;
+function nextStalledRetryDelay(stall, timeoutMs, width) {
+  if (stall.waves === 0 || width < stall.width) {
+    stall.waves = 0;
+    stall.since = Date.now();
+    stall.width = width;
+  }
+  const waves = ++stall.waves;
+  const remainingMs = timeoutMs > 0 ? stall.since + timeoutMs - Date.now() : Number.POSITIVE_INFINITY;
+  if (remainingMs <= 0) return -1;
+  return Math.min(2 ** (waves - 1), STALLED_RETRY_MAX_DELAY_MS, remainingMs);
+}
 async function settleSuspended(suspended, resolved, timeoutMs, signal) {
   const pu = resolved.pu;
   pu.recreate ??= { strikes: 0, prevCreated: pu.created.size };
@@ -5444,11 +5557,17 @@ async function settleSuspended(suspended, resolved, timeoutMs, signal) {
         resolved.set(key, outcome);
         if (isPu) pu.resolvedT.set(promise, outcome);
       }
+      if (isThrownKey(key)) (resolved.settledThrows ??= /* @__PURE__ */ new Set()).add(promise);
     })
   );
   await raceSettleGuards(settleAll, timeoutMs, signal);
 }
 const yieldMacrotask = typeof setImmediate === "function" ? () => new Promise((resolve) => setImmediate(resolve)) : () => new Promise((resolve) => setTimeout(resolve, 0));
+function waveLanded(suspended, settlements) {
+  if (settlements.landed.size === 0) return false;
+  for (const { promise } of suspended) if (settlements.landed.has(promise)) return true;
+  return false;
+}
 async function recordStreamSettlement(settlements, recorder) {
   let outcome;
   try {
@@ -5468,35 +5587,53 @@ async function recordStreamSettlement(settlements, recorder) {
   if (recorder.batch && !resolved.pu.resolvedT.has(recorder.promise)) {
     resolved.pu.resolvedT.set(recorder.promise, outcome);
   }
+  if (recorder.thrown) (resolved.settledThrows ??= /* @__PURE__ */ new Set()).add(recorder.promise);
+  if (!recorder.thrown || !recorder.settledBefore) settlements.landed.add(recorder.promise);
   settlements.pending.delete(recorder.promise);
   if (recorder.wave === settlements.wave) settlements.wake?.();
 }
-async function settleFirstOfWave(suspended, resolved, timeoutMs, signal) {
+async function settleFirstOfWave(suspended, resolved, timeoutMs, signal, stall) {
   const pu = resolved.pu;
   pu.recreate ??= { strikes: 0, prevCreated: pu.created.size };
   const settlements = resolved.streamSettlements ??= {
     resolved,
     pending: /* @__PURE__ */ new Map(),
     wave: 0,
-    wake: null
+    wake: null,
+    landed: /* @__PURE__ */ new Set()
   };
   const wave = ++settlements.wave;
   let waiting = false;
+  let stale = 0;
   for (const { promise, key } of suspended) {
     if (resolved.has(key)) continue;
     let recorder = settlements.pending.get(promise);
     if (recorder === void 0) {
-      recorder = { promise, key, keys: null, batch: key.startsWith("|pu#"), wave };
+      const thrown = isThrownKey(key);
+      recorder = {
+        promise,
+        key,
+        keys: null,
+        batch: key.startsWith("|pu#"),
+        wave,
+        thrown,
+        settledBefore: thrown && resolved.settledThrows?.has(promise) === true && !settlements.landed.has(promise)
+      };
       settlements.pending.set(promise, recorder);
       void recordStreamSettlement(settlements, recorder);
     } else {
       if (key !== recorder.key) (recorder.keys ??= /* @__PURE__ */ new Set()).add(key);
       if (key.startsWith("|pu#")) recorder.batch = true;
+      if (recorder.thrown && !isThrownKey(key)) recorder.thrown = false;
       recorder.wave = wave;
     }
+    if (recorder.thrown && recorder.settledBefore) stale++;
     waiting = true;
   }
-  if (!waiting) return;
+  if (!waiting) {
+    stall.waves = 0;
+    return false;
+  }
   const first = new Promise((resolve) => {
     settlements.wake = resolve;
   });
@@ -5514,6 +5651,30 @@ async function settleFirstOfWave(suspended, resolved, timeoutMs, signal) {
     size = resolved.size;
   }
   signal?.throwIfAborted();
+  if (waveLanded(suspended, settlements)) {
+    stall.waves = 0;
+    return false;
+  }
+  const delayMs = nextStalledRetryDelay(stall, timeoutMs, stale);
+  if (delayMs < 0) throw new Error((0, import_error_codes_server_generated.formatServerError)(332, timeoutMs));
+  let timer;
+  const progress = new Promise((resolve) => {
+    timer = setTimeout(resolve, delayMs);
+    settlements.wake = () => {
+      if (waveLanded(suspended, settlements)) resolve();
+    };
+  });
+  try {
+    await raceSettleGuards(progress, 0, signal);
+  } finally {
+    clearTimeout(timer);
+    settlements.wake = null;
+  }
+  if (waveLanded(suspended, settlements)) {
+    stall.waves = 0;
+    return false;
+  }
+  return true;
 }
 function observeSuspenseWave(resolved, settled, next, boundaryProgress) {
   const pu = resolved.pu;
@@ -5560,7 +5721,7 @@ function observeSuspenseWave(resolved, settled, next, boundaryProgress) {
   }
   pu.batchDisabled = true;
   for (const { promise } of next) Promise.resolve(promise).then(NOOP, NOOP);
-  if (process.env.NODE_ENV !== "production") {
+  if (__octaneDev) {
     console.error(
       "octane SSR: use() thenables appear to be re-created on every render pass \u2014 promises created during an ancestor render and passed down (e.g. via props) get a fresh identity each pass, so their boundaries can never resolve by identity. Create the promise at its use() site, or hoist the creation out of render (the compiler caches analyzable inline creations automatically). Falling back to per-site replay for the rest of this render."
     );
@@ -5573,6 +5734,7 @@ async function runBuffered(component, props, options, nonceAttr, resolved) {
   const identifierPrefix = options?.identifierPrefix ?? "";
   let attempt = 0;
   let lastSettled = null;
+  const stall = { waves: 0, since: 0, width: 0 };
   for (; ; ) {
     signal?.throwIfAborted();
     let pass;
@@ -5592,12 +5754,26 @@ async function runBuffered(component, props, options, nonceAttr, resolved) {
     let jobs = pass.deferred;
     let pending = pass.suspended;
     for (; ; ) {
-      if (++attempt > MAX_SUSPENSE_PASSES) {
-        const err = new Error((0, import_error_codes_server_generated.formatServerError)(47, MAX_SUSPENSE_PASSES));
+      const stalled = isStalledWave(pending, resolved);
+      if (!stalled && ++attempt > MAX_SUSPENSE_PASSES) {
+        const err = new Error(
+          isThrownWave(pending) ? (0, import_error_codes_server_generated.formatServerError)(333, MAX_SUSPENSE_PASSES) : (0, import_error_codes_server_generated.formatServerError)(47, MAX_SUSPENSE_PASSES)
+        );
         options?.onError?.(err);
         throw err;
       }
       await settleSuspended(pending, resolved, timeoutMs, signal);
+      if (stalled) {
+        const delayMs = nextStalledRetryDelay(stall, timeoutMs, pending.length);
+        if (delayMs < 0) {
+          const err = new Error((0, import_error_codes_server_generated.formatServerError)(332, timeoutMs));
+          options?.onError?.(err);
+          throw err;
+        }
+        await raceSettleGuards(new Promise((resolve) => setTimeout(resolve, delayMs)), 0, signal);
+      } else {
+        stall.waves = 0;
+      }
       lastSettled = pending;
       if (jobs.length === 0 || !jobs.every((j) => j.frame.parent !== null)) break;
       const round = withStream(null, () => runDiscoveryRound(jobs, resolved, identifierPrefix));
@@ -5742,7 +5918,7 @@ async function prerenderToNodeStream(entryComponent, props, options) {
   }
   let resolved = options;
   if (options?.headChannel === "separate") {
-    if (process.env.NODE_ENV !== "production") {
+    if (__octaneDev) {
       console.error(
         "prerenderToNodeStream() streams one document and has no separate head channel; headChannel: 'separate' was ignored. Use prerender() for a split head."
       );
@@ -6725,6 +6901,7 @@ async function runStream(component, props, options, sink, resolved, cancelInject
   };
   const renderFullPass = () => {
     const boundaryKeys = /* @__PURE__ */ new Set();
+    resolved.streamSettlements?.landed.clear();
     const previousBoundaryKeys = stream.activePassBoundaryKeys;
     const previousReplay = stream.replay;
     stream.activePassBoundaryKeys = boundaryKeys;
@@ -6909,6 +7086,7 @@ async function runStream(component, props, options, sink, resolved, cancelInject
   let shellBoundaryKeys;
   let preShellSuspended = [];
   let retryWithoutSettling = false;
+  const stall = { waves: 0, since: 0, width: 0 };
   try {
     signal?.throwIfAborted();
     ({ pass, boundaryKeys: shellBoundaryKeys } = renderFullPass());
@@ -6920,17 +7098,20 @@ async function runStream(component, props, options, sink, resolved, cancelInject
         throw new Error((0, import_error_codes_server_generated.formatServerError)(34));
       }
       if (++rootAttempts > MAX_SUSPENSE_PASSES) {
-        throw new Error((0, import_error_codes_server_generated.formatServerError)(35, MAX_SUSPENSE_PASSES));
+        throw new Error(
+          isThrownWave(pass.suspended) ? (0, import_error_codes_server_generated.formatServerError)(335, MAX_SUSPENSE_PASSES) : (0, import_error_codes_server_generated.formatServerError)(35, MAX_SUSPENSE_PASSES)
+        );
       }
       const settledWave = pass.suspended;
-      if (!retryWithoutSettling) {
-        await settleFirstOfWave(settledWave, resolved, timeoutMs, signal);
+      if (!retryWithoutSettling && await settleFirstOfWave(settledWave, resolved, timeoutMs, signal, stall)) {
+        rootAttempts--;
       }
       ({ pass, boundaryKeys: shellBoundaryKeys } = renderFullPass());
       preShellSuspended = pass.suspended;
       retryWithoutSettling = observeSuspenseWave(resolved, settledWave, pass.suspended, false);
       signal?.throwIfAborted();
     }
+    stall.waves = 0;
     pruneStreamBoundariesAbsentFromShell(stream, shellBoundaryKeys);
   } catch (err) {
     try {
@@ -7051,11 +7232,13 @@ async function runStream(component, props, options, sink, resolved, cancelInject
         throw new Error((0, import_error_codes_server_generated.formatServerError)(36));
       }
       if (++attempt > MAX_SUSPENSE_PASSES) {
-        throw new Error((0, import_error_codes_server_generated.formatServerError)(48, MAX_SUSPENSE_PASSES));
+        throw new Error(
+          isThrownWave(suspended) ? (0, import_error_codes_server_generated.formatServerError)(334, MAX_SUSPENSE_PASSES) : (0, import_error_codes_server_generated.formatServerError)(48, MAX_SUSPENSE_PASSES)
+        );
       }
       const settledWave = suspended;
-      if (!retryWithoutSettling) {
-        await settleFirstOfWave(settledWave, resolved, timeoutMs, signal);
+      if (!retryWithoutSettling && await settleFirstOfWave(settledWave, resolved, timeoutMs, signal, stall)) {
+        attempt--;
       }
       pass = renderFullPass().pass;
       suspended = pass.suspended;
@@ -7088,7 +7271,10 @@ async function runStream(component, props, options, sink, resolved, cancelInject
           madeProgress = true;
         }
       }
-      if (madeProgress) attempt = 0;
+      if (madeProgress) {
+        attempt = 0;
+        stall.waves = 0;
+      }
       retryWithoutSettling = observeSuspenseWave(resolved, settledWave, suspended, madeProgress);
       const done = reachableDoneSegments();
       if (!sentViewTransitions && pass.vtCandidates && done.length > 0) {
@@ -7692,7 +7878,7 @@ function coerceHintHref(href) {
   return typeof href === "string" && href !== "" ? href : null;
 }
 function preload(href, options) {
-  if (process.env.NODE_ENV !== "production") {
+  if (__octaneDev) {
     const warning = (0, import_resource_hint_diagnostics.resourceHintWarning)("preload", href, options);
     if (warning !== null) console.error(warning);
   }
@@ -7706,7 +7892,7 @@ function preload(href, options) {
     if (as === "style" && HEAD.hints.has("sheet:" + value)) {
       const existing = HEAD.sheets?.get(value);
       if (existing === void 0 || !existing.html.startsWith("<style")) return;
-      if (process.env.NODE_ENV !== "production" && HEAD.hints.has("dev-inline-style:" + value)) {
+      if (__octaneDev && HEAD.hints.has("dev-inline-style:" + value)) {
         console.error(
           'A <style> resource with href "' + value + '" follows a stylesheet preload for the same href. Inline styles cannot consume a stylesheet preload; remove the preload or use a stylesheet link.'
         );
@@ -7736,7 +7922,7 @@ function preload(href, options) {
   );
 }
 function preinit(href, options) {
-  if (process.env.NODE_ENV !== "production") {
+  if (__octaneDev) {
     const warning = (0, import_resource_hint_diagnostics.resourceHintWarning)("preinit", href, options);
     if (warning !== null) console.error(warning);
   }
@@ -7769,7 +7955,7 @@ function preinit(href, options) {
   }
 }
 function preconnect(href, options) {
-  if (process.env.NODE_ENV !== "production") {
+  if (__octaneDev) {
     const warning = (0, import_resource_hint_diagnostics.resourceHintWarning)("preconnect", href, options);
     if (warning !== null) console.error(warning);
   }
@@ -7788,7 +7974,7 @@ function preconnect(href, options) {
   );
 }
 function prefetchDNS(href) {
-  if (process.env.NODE_ENV !== "production") {
+  if (__octaneDev) {
     const warning = (0, import_resource_hint_diagnostics.resourceHintWarning)("prefetchDNS", href, arguments[1], arguments.length > 1);
     if (warning !== null) console.error(warning);
   }
@@ -7814,7 +8000,7 @@ function resourceAttrs(attrs, tag) {
   return out;
 }
 function ssrStylesheetResource(attrs, invalidReason) {
-  if (process.env.NODE_ENV !== "production" && invalidReason !== void 0) {
+  if (__octaneDev && invalidReason !== void 0) {
     let conflict;
     if (invalidReason === "missing-href") {
       conflict = "requires a non-empty string `href`";
@@ -7847,13 +8033,13 @@ function ssrStyleResource(attrs, css, development) {
   if (HEAD === null || attrs == null) return "";
   const href = attrs.href;
   if (typeof href !== "string" || href === "") return "";
-  if (process.env.NODE_ENV !== "production" && development === true && /\s/.test(href)) {
+  if (__octaneDev && development === true && /\s/.test(href)) {
     console.error(
       'A <style> resource href must not contain whitespace because it identifies the style during hydration; received "' + href + '".'
     );
   }
   if (/<\/style/i.test(css)) {
-    if (process.env.NODE_ENV !== "production") {
+    if (__octaneDev) {
       console.error(
         'octane SSR: a <style href precedence> resource contains "</style" and cannot be serialized safely; the resource was skipped. Load it as a stylesheet link instead.'
       );
@@ -7862,7 +8048,7 @@ function ssrStyleResource(attrs, css, development) {
   }
   const key = "sheet:" + href;
   if (HEAD.hints.has(key)) return "";
-  if (process.env.NODE_ENV !== "production" && development === true) {
+  if (__octaneDev && development === true) {
     if (HEAD.hints.has("preload:style:" + href)) {
       console.error(
         'A <style> resource with href "' + href + '" follows a stylesheet preload for the same href. Inline styles cannot consume a stylesheet preload; remove the preload or use a stylesheet link.'
@@ -7891,7 +8077,7 @@ function ssrScriptResource(attrs) {
   return "";
 }
 function preloadModule(href, options) {
-  if (process.env.NODE_ENV !== "production") {
+  if (__octaneDev) {
     const warning = (0, import_resource_hint_diagnostics.resourceHintWarning)("preloadModule", href, options);
     if (warning !== null) console.error(warning);
   }
@@ -7911,7 +8097,7 @@ function preloadModule(href, options) {
   );
 }
 function preinitModule(href, options) {
-  if (process.env.NODE_ENV !== "production") {
+  if (__octaneDev) {
     const warning = (0, import_resource_hint_diagnostics.resourceHintWarning)("preinitModule", href, options);
     if (warning !== null) console.error(warning);
   }
@@ -7970,6 +8156,7 @@ function preinitModule(href, options) {
   injectStyle,
   invokeManualHook,
   isChildrenBlock,
+  isRenderCall,
   isValidElement,
   lazy,
   manualHook,
@@ -8058,6 +8245,7 @@ function preinitModule(href, options) {
   ssrText,
   ssrTextPre,
   ssrTextSlot,
+  ssrTextareaText,
   ssrTextareaValue,
   ssrTextareaValueSources,
   ssrTry,