From f7547f6d770a2b2cdf4b39297bbef5f35e27c747 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 26 Oct 2026 18:15:20 +0000
Subject: [PATCH 01/16] fix(solid,web): draw an Errored fallback for a
 Loading's async failure, and adopt it (#4287)

Outside a server component, a <Loading> whose async read failed during a
streamed render settled its fragment blank, and the hydrating client
rendered the failed boundary from scratch: it asked again and showed the
loading fallback.

Server: the failing <Loading> now asks the enclosing <Errored> for its
outcome outside server components too, passing its own id. The Errored
answers only when that Loading is all of its content (its resolved markup
is the Loading's placeholder): its fallback is drawn into the fragment, or
inlined pre-flush, and the error is serialized at the Errored id. Deeper
in the content it answers nothing, as before. A rejected fragment's
template is marked `e`, and `$dfr` records the nodes it swaps in for it.

Client: inside a hydrated Errored's no-claim content run, a <Loading>
runs its content with its data adopted instead of waiting on its
fragment, so the Errored holds the client's own error and tracks the
content's inputs (#4273). A boundary that claimed its fallback and then
renders a rejected fragment fresh clears the nodes the swap put in first,
so nothing of the server's outcome is left beside the client's render.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015hPxMkC3jg3Uivh65gvaf2
---
 .changeset/errored-async-outcome-4287.md      |   6 +
 documentation/solid-2.0/12-ssr-http.md        |   2 +-
 packages/solid/src/client/hydration.ts        |  52 ++++---
 packages/solid/src/server/hydration.ts        |  16 +-
 packages/solid/src/server/signals.ts          |  32 +++-
 packages/solid/test/server/ssr-async.spec.ts  |  35 ++---
 packages/web/src/server.ts                    |  14 +-
 .../__artifacts__/async-cond-before-for.json  |   2 +-
 ...async-memo-element-4242-data-streamed.json |   2 +-
 ...o-element-4242-issue-errored-streamed.json |   2 +-
 ...element-4242-issue-streamed-reference.json |   2 +-
 ...sync-memo-element-4242-issue-streamed.json |   2 +-
 ...emo-element-4242-jsx-errored-streamed.json |   2 +-
 ...o-element-4242-jsx-streamed-reference.json |   2 +-
 .../async-memo-element-4242-jsx-streamed.json |   2 +-
 .../__artifacts__/async-settled-element.json  |   2 +-
 .../async-settled-fragment-root.json          |   2 +-
 .../__artifacts__/bare-client-late-final.json |   2 +-
 .../__artifacts__/bounded-streamed-text.json  |   2 +-
 ...lient-only-before-suspending-fragment.json |   2 +-
 .../client-only-before-suspending-route.json  |   2 +-
 .../__artifacts__/cond-component-prop.json    |   2 +-
 .../deferred-hole-before-siblings.json        |   2 +-
 .../deferred-settled-element.json             |   2 +-
 .../__artifacts__/document-shell-styled.json  |   2 +-
 .../dynamic-async-loading-3666-streamed.json  |   2 +-
 .../dynamic-component-parity-streamed.json    |   2 +-
 .../dynamic-fallback-stream.json              |   2 +-
 ...errored-loading-parked-rejection-4287.json |   5 +
 ...ored-loading-postflush-rejection-4287.json |   5 +
 .../errored-loading-preflush-rejection.json   |   2 +-
 ...tion-loading-postflush-rejection-4287.json |   5 +
 .../frame-live-document-loaded.json           |   2 +-
 .../frame-live-document-streamed.json         |   2 +-
 .../frame-live-document-switched.json         |   2 +-
 ...nonlive-document-3666-streamed-loaded.json |   2 +-
 ...nlive-document-3666-streamed-streamed.json |   2 +-
 .../__artifacts__/generic-hydration-ab.json   |   2 +-
 .../__artifacts__/generic-hydration-ba.json   |   2 +-
 .../http-primitives-streamed-loading.json     |   2 +-
 .../hybrid-memo-handoff-memo-generator.json   |   2 +-
 .../hybrid-memo-handoff-memo-promise.json     |   2 +-
 .../hybrid-memo-handoff-signal-generator.json |   2 +-
 .../hybrid-memo-handoff-signal-promise.json   |   2 +-
 .../hybrid-store-handoff-3574-generator.json  |   2 +-
 .../hybrid-store-handoff-3574-promise.json    |   2 +-
 .../late-boundary-after-done.json             |   2 +-
 .../__artifacts__/live-shell-source-3764.json |   6 +-
 .../loading-fallback-reactive-text.json       |   2 +-
 .../loading-fallback-ternary.json             |   2 +-
 .../__artifacts__/loading-on-boundary.json    |   2 +-
 .../__artifacts__/memo-live-resume.json       |   2 +-
 .../__artifacts__/nav-before-resume.json      |   2 +-
 .../onsettled-store-write-3950-reconcile.json |   2 +-
 .../onsettled-store-write-3950-splice.json    |   2 +-
 ...d-write-shell-beside-pending-boundary.json |   2 +-
 .../onsettled-write-show-streamed.json        |   2 +-
 .../__artifacts__/portal-before-siblings.json |   2 +-
 .../__artifacts__/projection-live-resume.json |   2 +-
 .../projection-repeat-stream.json             |   2 +-
 ...use-head-stylesheet-streamed-boundary.json |   2 +-
 .../__artifacts__/welcome-status-loaded.json  |   2 +-
 .../welcome-status-streamed.json              |   2 +-
 .../__artifacts__/write-before-resume.json    |   2 +-
 packages/web/test/harness/scenarios.tsx       | 137 ++++++++++++++++--
 .../errored-async-outcome-4287.spec.tsx       |  88 +++++++++++
 .../frame-fragment-error-outcome.spec.tsx     |  32 +++-
 .../server/ssr-async-rejection-3569.spec.tsx  |  19 +--
 ...ssr-fragment-rejection-stub-batch.spec.tsx |  11 +-
 packages/web/test/server/ssr-stream.spec.tsx  |  29 ++--
 70 files changed, 447 insertions(+), 153 deletions(-)
 create mode 100644 .changeset/errored-async-outcome-4287.md
 create mode 100644 packages/web/test/harness/__artifacts__/errored-loading-parked-rejection-4287.json
 create mode 100644 packages/web/test/harness/__artifacts__/errored-loading-postflush-rejection-4287.json
 create mode 100644 packages/web/test/harness/__artifacts__/errored-section-loading-postflush-rejection-4287.json
 create mode 100644 packages/web/test/hydration/errored-async-outcome-4287.spec.tsx

diff --git a/.changeset/errored-async-outcome-4287.md b/.changeset/errored-async-outcome-4287.md
new file mode 100644
index 000000000..068a76de4
--- /dev/null
+++ b/.changeset/errored-async-outcome-4287.md
@@ -0,0 +1,6 @@
+---
+"solid-js": patch
+"@solidjs/web": patch
+---
+
+An `<Errored>` around a `<Loading>` whose async read fails during a streamed render now shows its fallback in the server HTML outside server components too, and the client adopts it. Before, the boundary's HTML was empty until hydration (neither the loading nor the error fallback), and the hydrating client rendered the failed boundary from scratch: it asked again and showed the loading fallback. Now, when the `<Loading>` is all of the `<Errored>`'s content, the server draws the error fallback in its place (in the shell, or in the streamed fragment after the shell) and serializes the error at the `<Errored>`, so a client that hydrates after the failure arrived claims that markup and adopts its data without asking again, and recovers when the content's inputs change, as for any hydrated failure (#4273). A client that hydrated before the failure arrived renders it once, with nothing of the server's swap left beside it. With markup between the two boundaries the server still leaves the position blank and the client renders the failure (#4287).
diff --git a/documentation/solid-2.0/12-ssr-http.md b/documentation/solid-2.0/12-ssr-http.md
index f610017c2..17e3daefc 100644
--- a/documentation/solid-2.0/12-ssr-http.md
+++ b/documentation/solid-2.0/12-ssr-http.md
@@ -193,7 +193,7 @@ renderToStream(code, { onError });
 handleServerFunctionRequest(request, { onError });
 ```
 
-- **Called once per error object per `kind` per request, at first sight** (per render when no request is in scope — never once per process: an error object reused across requests is heard, and mapped, by each), with where the failure was met. A direct server-function call that throws during SSR inside an `<Errored>` is heard twice, as `server-function` and then as `render`, so `kind: "render"` alone tells you a render failed; the wire value is the first one the hook returned. `kind: "render"` — `fallback` (an `<Errored>` rendered its fallback; `boundary` is its hydration id and `boundaryPath` its component labels — where the error was **met** — while `ownerPath` is where it was **thrown**, the labels up the owner chain it escaped, when the compiler emitted them), `client` (a `<Loading>` fragment rejected, the client re-renders the subtree), `failed` (nothing contained it; the request fails — including a synchronous throw out of `renderToString` or `renderToStream`'s first pass, reported before it reaches the caller), `serialize` (a hydration value would not serialize and the render went on without it — reported for a render that passed `onError`, as seroval's own `onError` always was). `kind: "server-function"` — `thrown` (the body threw; `functionId`, and `direct: true` for an in-process call during SSR) or `channel` (a rejection or throw escaping through the result graph, the head already committed). `kind: "request"` is always `failed`: a failure that fails the request outside any render or server function the runtime reports (a middleware throw, a setup step), reported by the framework's request handler through `reportRequestFailure(error, event)`. A render failure, synchronous throws included, is reported as `render`, so a handler that catches one and passes it to `reportRequestFailure` adds nothing. It has no per-request tier, so only the ambient hook hears it. `event` is the request, when the failure happened inside one, and always for `kind: "request"`.
+- **Called once per error object per `kind` per request, at first sight** (per render when no request is in scope — never once per process: an error object reused across requests is heard, and mapped, by each), with where the failure was met. A direct server-function call that throws during SSR inside an `<Errored>` is heard twice, as `server-function` and then as `render`, so `kind: "render"` alone tells you a render failed; the wire value is the first one the hook returned. `kind: "render"` — `fallback` (an `<Errored>` rendered its fallback; `boundary` is its hydration id and `boundaryPath` its component labels — where the error was **met** — while `ownerPath` is where it was **thrown**, the labels up the owner chain it escaped, when the compiler emitted them), `client` (a `<Loading>` fragment rejected, the client re-renders the subtree — unless the `<Loading>` is all of an `<Errored>`'s content: that `<Errored>` draws its fallback into the fragment, reports `fallback`, and the hydrating client adopts it, [#4287](https://github.com/solidjs/solid/issues/4287)), `failed` (nothing contained it; the request fails — including a synchronous throw out of `renderToString` or `renderToStream`'s first pass, reported before it reaches the caller), `serialize` (a hydration value would not serialize and the render went on without it — reported for a render that passed `onError`, as seroval's own `onError` always was). `kind: "server-function"` — `thrown` (the body threw; `functionId`, and `direct: true` for an in-process call during SSR) or `channel` (a rejection or throw escaping through the result graph, the head already committed). `kind: "request"` is always `failed`: a failure that fails the request outside any render or server function the runtime reports (a middleware throw, a setup step), reported by the framework's request handler through `reportRequestFailure(error, event)`. A render failure, synchronous throws included, is reported as `render`, so a handler that catches one and passes it to `reportRequestFailure` adds nothing. It has no per-request tier, so only the ambient hook hears it. `event` is the request, when the failure happened inside one, and always for `kind: "request"`.
 - **The return is the wire value**: rendered into the fallback, serialized for hydration, sent as the RPC error. `undefined` leaves the default policy in place (generic outside dev, fidelity in dev). A returned value is the author's intent — like a `wrapInvocation` mapping — and is not sanitized again; `markSafeError` is not needed on it. Ignored for `failed` and `serialize`, which have no wire. One road a mapping does not reach: a rejected async source's serialized rejection is encoded the moment the source rejects, ahead of the boundary, and carries the default policy's value; the hydrating client renders from the boundary's record, which carries the mapping.
 - **Once means once across roads.** A direct server-function call that throws during SSR is met first by the invocation (`kind: "server-function"`, `direct: true`) and then by the `<Errored>` that contains it; the boundary reuses the verdict — the same replacement in the fallback and the record — and does not report again. A `<Loading>` re-pull recurring the same throw is the same object, the same verdict. The observe tier keeps the multi-event picture (an `"invocation"` record _and_ an `SSR_RENDER_ERROR_CONTAINED` finding) for consumers that want it.
 - **Two tiers, as `wrapInvocation` has.** Ambient: `configureServerErrors({ onError })`, once per process, registered on `globalThis` under a registered symbol so a bundled server build and an instrumented `--import`ed module share it — and the only tier that sees direct in-process calls. Per request, overriding it: `onError` on `renderToStream`/`renderToString`, and on `handleServerFunctionRequest` for the call it dispatches. A throwing hook is reported on the console and treated as silent. With no hook anywhere, a failure that fails the request goes to `console.error` — never silent. A synchronous render throw is the exception: it is rethrown to the caller, whose own handling (or `reportRequestFailure`) decides.
diff --git a/packages/solid/src/client/hydration.ts b/packages/solid/src/client/hydration.ts
index 73895fbe9..3521fc779 100644
--- a/packages/solid/src/client/hydration.ts
+++ b/packages/solid/src/client/hydration.ts
@@ -306,6 +306,9 @@ let _snapshotRootOwner: Owner | null = null;
 // The boundary owner whose resume window is open (null during a root pass,
 // which claims everything). Reached as `sharedConfig.isClaiming`.
 let _claimOwner: Owner | null = null;
+// The claim window over no owner: a hydrated `<Errored>`'s content run,
+// where nothing claims (hydratedCreateErrorBoundary).
+const NO_CLAIM = {} as Owner;
 function isClaiming(): boolean {
   if (!_claimOwner) return true;
   let owner: Owner | null = getOwner();
@@ -1293,9 +1296,7 @@ function hydratedCreateErrorBoundary<T, U>(
         // A later run claims nothing either way: claims are read only while
         // hydrating.
         () =>
-          _hydratingValue
-            ? hydrateWindow("", fn, undefined, ((o = getOwner()), {} as Owner))
-            : fn(),
+          _hydratingValue ? hydrateWindow("", fn, undefined, ((o = getOwner()), NO_CLAIM)) : fn(),
         (e, reset) => ((o = 0), fallback(e, reset))
       );
       // No fallback yet: the content ran clean. Hold the server's fallback
@@ -2853,7 +2854,18 @@ function hydratedCreateLoadingBoundary<T, U>(
       // A parked fragment has settled but not swapped: it waits like a pending one.
       const s = fr && typeof fr === "object" ? (fr.s === 1 && fragmentParked(id) ? 0 : fr.s) : 0;
 
-      if (s === 1 && !assetPromise && !fragmentSuperseded(id)) {
+      // Inside a hydrated `<Errored>`'s content run, which claims no DOM (the
+      // markup is the server's fallback for the failure, #4287), the
+      // fragment is never claimed: the content runs now with its data
+      // adopted, so the Errored holds the client's own error and tracks its
+      // inputs (#4273).
+      const unclaimed = _claimOwner === NO_CLAIM;
+      // Nothing else consumes a rejected `_fr` promise then — swallow it so
+      // a rejected fragment (error finalize or a client-hole handoff) doesn't
+      // surface as an unhandled rejection.
+      if (s === 2 || unclaimed) (fr as Promise<never>).catch?.(noop);
+
+      if (unclaimed || (s === 1 && !assetPromise && !fragmentSuperseded(id))) {
         // Fragment already settled and swapped in ($df ran before hydration):
         // the content is in the DOM, so hydrate straight through. The fallback
         // only hydrates when it is actually showing — rendering it here would
@@ -2895,13 +2907,9 @@ function hydratedCreateLoadingBoundary<T, U>(
 
       if (s === 1 || s === 2) {
         if (s === 2) {
-          // Rejected stream fragments swap to an empty template; any outer error fallback
-          // has to be created as fresh client DOM, not claimed from server markup.
-          // Nothing else consumes the settled-rejected `_fr` promise once this
-          // branch takes over — swallow it so a rejected fragment (error
-          // finalize or a client-hole handoff) doesn't surface as an
-          // unhandled rejection.
-          (fr as Promise<never>).catch?.(noop);
+          // Rejected stream fragments swap to an empty template (or, under a
+          // hydrated `<Errored>`, the fallback it claims — above); any outer
+          // error fallback here is created as fresh client DOM.
           // Observe: the fresh render is a "recovery" record; prod folds the
           // branch and `recover` with it.
           const resumeRejected = IS_OBSERVE
@@ -2930,6 +2938,12 @@ function hydratedCreateLoadingBoundary<T, U>(
       // for this resume to claim instead of holding it; if the swap already
       // arrived and was held awaiting a claimant, replay it now.
       claimFragment(id);
+      const hy = (globalThis as any)._$HY;
+      // Revealed ahead of its `_fr` settlement (two scripts on the wire; an
+      // async entry can run between them, #4074): the fallback is gone and
+      // the content is in the DOM, so render nothing until the resume
+      // adopts it.
+      const revealed = hy.v?.[id];
       waitAndResume(
         fr,
         shouldHydrate =>
@@ -2944,18 +2958,18 @@ function hydratedCreateLoadingBoundary<T, U>(
                 const assets = boundaryAssets(id);
                 assets ? waitAndResume(true, resume, assets) : resume(true);
               })
-            : IS_OBSERVE
-              ? recover(id, registeredAt, resume)
-              : resume(false),
+            : // Rendered fresh. A rejected fragment swapped in over the
+              // claimed fallback left its nodes — the server's outcome for
+              // the failure, which `$dfr` lists in the reveal record
+              // (#4287) — beside the range the fresh render takes: clear
+              // them first.
+              (revealed || hy.v?.[id]?.forEach?.((n: ChildNode) => n.remove()),
+              IS_OBSERVE ? recover(id, registeredAt, resume) : resume(false)),
         assetPromise,
         false,
         fragmentAbort(id)
       );
-      // Revealed ahead of its `_fr` settlement (two scripts on the wire; an
-      // async entry can run between them, #4074): the fallback is gone and
-      // the content is in the DOM, so render nothing until the resume
-      // adopts it.
-      return (globalThis as any)._$HY.v?.[id] ? undefined : fallback();
+      return revealed ? undefined : fallback();
     }
 
     if (assetPromise && !sharedConfig.has!(id)) {
diff --git a/packages/solid/src/server/hydration.ts b/packages/solid/src/server/hydration.ts
index f605daa11..94f8719f3 100644
--- a/packages/solid/src/server/hydration.ts
+++ b/packages/solid/src/server/hydration.ts
@@ -361,8 +361,12 @@ function ssrLoadingBoundary(
 
   // What the fragment carries for a failure once it is registered (its
   // channel owns the routing — see runLoadingPhase). Outside a server
-  // component: nothing — the blank the client twin renders fresh over, as
-  // always (`hydratedCreateLoadingBoundary`'s rejected arm). Inside one
+  // component (asked with this boundary's id, #4287): the fallback of an
+  // `<Errored>` this boundary is all the content of — drawn where the client
+  // twin draws it, its error serialized at the Errored id so the hydrating
+  // client adopts that markup; otherwise nothing — the blank the client
+  // twin renders fresh over (`hydratedCreateLoadingBoundary`'s rejected
+  // arm). Inside one
   // (frames-rulings 3.3, A0 corollary 4 inward — the position shows what the
   // SERVER rendered for the outcome, never a blank, never a client-invented
   // state; there is no twin): the nearest server `<Errored>`'s fallback for
@@ -375,10 +379,10 @@ function ssrLoadingBoundary(
   // hydration-free scope's; its head and asset registrations drop with the
   // error, as the error path drops them today.
   function errorOutcome(err: any): { value?: string; escaped?: { frame?: string } } | undefined {
-    if (!inServerComponentScope(o as any)) return undefined;
-    const rendered = parentHandler ? parentHandler(err, true) : undefined;
+    const scoped = inServerComponentScope(o as any);
+    const rendered = parentHandler ? parentHandler(err, scoped || id) : undefined;
     if (typeof rendered === "string") return { value: rendered };
-    return { value: plainFallback(), escaped: { frame: ctx.frameId } };
+    if (scoped) return { value: plainFallback(), escaped: { frame: ctx.frameId } };
   }
   // Settle the fragment with the failure. The server error hook hears of it
   // first (the `_fr` rejection and a transport sink's error chunk read the
@@ -412,7 +416,7 @@ function ssrLoadingBoundary(
       (err: any, handler, outcome) => {
         // The outcome question (see errorOutcome) is a `<Loading>`'s to pass
         // up: it owns no fallback for an error.
-        if (outcome) return handler ? handler(err, true) : undefined;
+        if (outcome !== undefined) return handler ? handler(err, outcome) : undefined;
         handledRenderError = err;
         if (done) {
           // Once the fragment is registered, its channel owns error routing:
diff --git a/packages/solid/src/server/signals.ts b/packages/solid/src/server/signals.ts
index 51dce3640..96c4f39b8 100644
--- a/packages/solid/src/server/signals.ts
+++ b/packages/solid/src/server/signals.ts
@@ -3704,9 +3704,11 @@ export function repeat<T>(
  * rendered, never a blank): the nearest server `<Errored>` answers with
  * its fallback as markup; a `<Loading>` passes the question up; a handler
  * that belongs to no server `<Errored>` answers `undefined` — the error
- * escapes the component.
+ * escapes the component. Outside a server component `outcome` is the
+ * asking `<Loading>`'s id, and an `<Errored>` answers only when that
+ * Loading is all of its content (#4287).
  */
-export type BoundaryErrorHandler = (err: any, outcome?: true) => string | undefined | void;
+export type BoundaryErrorHandler = (err: any, outcome?: true | string) => string | undefined | void;
 
 const ErrorContext: Context<BoundaryErrorHandler | null> = {
   id: Symbol("ErrorContext"),
@@ -3758,7 +3760,7 @@ export function runWithBoundaryErrorContext<T>(
   onError: (
     err: any,
     parentHandler: BoundaryErrorHandler | null,
-    outcome?: true
+    outcome?: true | string
   ) => string | undefined | void,
   context?: NonNullable<typeof sharedConfig.context>,
   boundaryId?: string
@@ -4108,6 +4110,8 @@ export function createErrorBoundary<T, U>(
   // children — re-running would recreate the async work from scratch, which
   // is pending again on every pass and can never settle (#2809 SSR loop).
   let pending: { t: string[]; h: Function[]; p: Promise<any>[] } | undefined;
+  // The content's last resolved markup (see renderOutcome).
+  let shown: any;
   // The client boundary is two computeds under `owner`: one runs `fn`, the
   // next flattens its result. A zero-arg function `fn` hands back — a nested
   // boundary's accessor, a function child — is unwrapped inside that second
@@ -4152,6 +4156,7 @@ export function createErrorBoundary<T, U>(
       resolved = resolveIn(() => ctx!.resolve(ctx!.escape(value)));
     }
     pending = resolved?.p?.length ? resolved : undefined;
+    shown = resolved;
     if (pending) {
       // Propagate the FINAL classification through the aggregate: with a
       // client hole in the set, the combined promise can never settle, and
@@ -4260,8 +4265,23 @@ export function createErrorBoundary<T, U>(
   // the error escapes the component as the frame's own error (the outward
   // face). A fallback still resolving (an async hole in it) has no finished
   // markup to answer with and escapes the same way.
-  const renderOutcome = (err: any): string | undefined => {
-    if (!ctx || !inServerComponentScope(owner as unknown as SSROwner)) return undefined;
+  // Outside a server component (`outcome` is the asking `<Loading>`'s id,
+  // #4287) this boundary answers only when that Loading's placeholder is
+  // all of its content: the fallback then lands where the client twin draws
+  // it, and the error serialized here lets it adopt that markup. Deeper in
+  // the content it answers nothing — the client renders the failure fresh.
+  const renderOutcome = (err: any, outcome: true | string): string | undefined => {
+    let t = shown && shown.t;
+    if (Array.isArray(t)) t = t[0];
+    if (
+      !ctx ||
+      (outcome === true
+        ? !inServerComponentScope(owner as unknown as SSROwner)
+        : typeof t !== "string" ||
+          !t.startsWith(`<template id="pl-${outcome}"`) ||
+          !t.endsWith(`<!--pl-${outcome}-->`))
+    )
+      return undefined;
     // Rendered from a resume loop, where the render context the compiled
     // template reads has long moved past this boundary's: restore it.
     const prevCtx = sharedConfig.context;
@@ -4294,7 +4314,7 @@ export function createErrorBoundary<T, U>(
         result = ctx
           ? runWithBoundaryErrorContext(owner, resolve, (err, _parent, outcome) => {
               if (err instanceof NotReadyError) throw err;
-              if (outcome) return renderOutcome(err);
+              if (outcome !== undefined) return renderOutcome(err, outcome);
               handled = true;
               result = handleError(err);
               throw err;
diff --git a/packages/solid/test/server/ssr-async.spec.ts b/packages/solid/test/server/ssr-async.spec.ts
index 71b4faad5..21f2b8541 100644
--- a/packages/solid/test/server/ssr-async.spec.ts
+++ b/packages/solid/test/server/ssr-async.spec.ts
@@ -1050,7 +1050,7 @@ describe("Loading SSR Async", () => {
       ).toBe(true);
     });
 
-    test("pre-flush Loading rejection rides the fragment channel, not the outer Errored (#2997)", async () => {
+    test("pre-flush Loading rejection rides the fragment channel with the outer Errored's fallback (#2997, #4287)", async () => {
       const { context, fragmentResults, fragmentErrors, fragmentSettles, serialized } =
         createMockSSRContext({
           fragmentFlushed: false
@@ -1093,30 +1093,27 @@ describe("Loading SSR Async", () => {
       await tick();
 
       // The fragment channel owns the error once the boundary registered:
-      // done(undefined, err) settles the fragment (pre-flush the renderer
-      // inlines the placeholder away and rejects `<key>_fr`; the client
-      // re-renders the subtree fresh and its Errored catches). The outer
-      // Errored's handler must NOT run at async time — its rendered fallback
-      // would have no consumer (the accessor pull is long gone), and the
-      // serialized error record it leaves at the boundary id sends the
-      // hydrating client claiming fallback DOM that was never emitted — the
-      // #2997 blank page.
-      expect(fallbackCalls).toBe(0);
-      expect(fragmentSettles).toEqual([{ key: "t000", value: undefined, error: fetchError }]);
+      // done(value, err) settles the fragment (pre-flush the renderer
+      // inlines the placeholder and rejects `<key>_fr`). The Loading is all
+      // of the outer Errored's content, so it is asked for its outcome: its
+      // fallback is the fragment's markup, and the error it serializes at
+      // its id is what the hydrating client adopts that markup with (#4287).
+      expect(fallbackCalls).toBe(1);
+      expect(fragmentSettles).toEqual([
+        { key: "t000", value: "OuterError: Async fetch failed", error: fetchError }
+      ]);
       expect(fragmentResults.size).toBe(0);
       expect(fragmentErrors.size).toBe(0);
       expect(
         [...serialized.values()].some(v => v instanceof Error && v.message === "Async fetch failed")
-      ).toBe(false);
+      ).toBe(true);
 
-      // A later re-creation of the Errored (re-pull) still claims the settled
-      // rejection synchronously — the pull is on the stack, so the fallback
-      // render has a consumer.
+      // A later re-pull of the Errored hands back that same fallback.
       expect(read(result)).toBe("OuterError: Async fetch failed");
       expect(fallbackCalls).toBe(1);
     });
 
-    test("outer Errored stays out of post-flush Loading rejection ownership", async () => {
+    test("outer Errored draws its fallback for a post-flush Loading rejection it is filled by (#4287)", async () => {
       const { context, fragmentResults, fragmentErrors, serialized } = createMockSSRContext({
         fragmentFlushed: true
       });
@@ -1157,14 +1154,14 @@ describe("Loading SSR Async", () => {
       d.reject(fetchError);
       await tick();
 
-      expect(fallbackCalls).toBe(0);
+      expect(fallbackCalls).toBe(1);
       expect(fragmentResults.size).toBe(1);
-      expect([...fragmentResults.values()][0]).toBeUndefined();
+      expect([...fragmentResults.values()][0]).toBe("OuterError: Async fetch failed");
       expect(fragmentErrors.size).toBe(1);
       expect([...fragmentErrors.values()][0]).toBe(fetchError);
       expect(
         [...serialized.values()].some(v => v instanceof Error && v.message === "Async fetch failed")
-      ).toBe(false);
+      ).toBe(true);
     });
 
     test("Loading with nested Errored resolves mixed success and error content", async () => {
diff --git a/packages/web/src/server.ts b/packages/web/src/server.ts
index f64ec7499..0b77cb18f 100644
--- a/packages/web/src/server.ts
+++ b/packages/web/src/server.ts
@@ -1669,7 +1669,9 @@ function isAttrName(prop: string): boolean {
 //   (`_$HY.v[id] = 1` — with the `id_fr` declaration the serializer already
 //   writes, this makes "which declared fragments are still outstanding" a
 //   pure record read for the runtime: no promise introspection, no DOM
-//   scan, valid across the pre-boot window), then announce it as
+//   scan, valid across the pre-boot window; for a rejected fragment's
+//   template, marked `e`, the record is the list of nodes it inserts, which
+//   a client boundary rendering the failure fresh clears, #4287), then announce it as
 //   `_$HY.fe(id, parent)` — the parent scopes consumers that need to look
 //   at what just landed (server-component boundaries adopt there) to the
 //   revealed fragment instead of the document. A marker that isn't in the
@@ -1702,7 +1704,7 @@ function isAttrName(prop: string): boolean {
 //   this script installed a listener in the same document.
 // - $dfg(id): group-style gate check; reveals a waiting group once all style counts hit zero.
 // - $dfj(ids): reveal a group in registration order, waiting if any member still has pending styles.
-const REPLACE_SCRIPT = `function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById("pl-"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!=="pl-"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById("pl-"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue==="pl-"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute("data-dfc"))&&(t._$dc=1,$dfc(k))}document.addEventListener("load",$dfe,!0);document.addEventListener("error",$dfe,!0)`;
+const REPLACE_SCRIPT = `function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById("pl-"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!=="pl-"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute("e")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById("pl-"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue==="pl-"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute("data-dfc"))&&(t._$dc=1,$dfc(k))}document.addEventListener("load",$dfe,!0);document.addEventListener("error",$dfe,!0)`;
 
 // Head patch runtime, emitted once alongside the first head-patch task:
 // - $dha(ops): apply patch ops to document.head — "t" sets the title (and
@@ -2387,6 +2389,10 @@ export function renderToStream(code, options = {}) {
     fragment(key, value, meta) {
       const deferActivation = !!meta.revealGroup;
       const styles = meta.styles;
+      // A rejected fragment's template is marked: its swap lists the nodes
+      // it inserts in the reveal record (`_$HY.v`), for a client boundary
+      // that renders the failure fresh to clear first (#4287).
+      const tpl = `<template id="${key}"${meta.error ? " e" : ""}>${value}</template>`;
       for (let i = 0; i < styles.inline.length; i++) {
         buffer.write(renderInlineStyle(styles.inline[i], nonce));
       }
@@ -2401,7 +2407,7 @@ export function renderToStream(code, options = {}) {
         // before the parser reaches anything written after the link, and $dfr
         // reads a missing template as a swap that already ran: the reveal
         // would be dropped and the boundary would stay on its fallback.
-        buffer.write(`<template id="${key}">${value}</template>`);
+        buffer.write(tpl);
         for (const entry of styles.links) {
           buffer.write(
             typeof entry === "string"
@@ -2410,7 +2416,7 @@ export function renderToStream(code, options = {}) {
           );
         }
       } else {
-        buffer.write(`<template id="${key}">${value}</template>`);
+        buffer.write(tpl);
         if (!deferActivation) {
           emitTask(`$df("${key}")`);
         }
diff --git a/packages/web/test/harness/__artifacts__/async-cond-before-for.json b/packages/web/test/harness/__artifacts__/async-cond-before-for.json
index 54e9d03ee..ca1c0eacc 100644
--- a/packages/web/test/harness/__artifacts__/async-cond-before-for.json
+++ b/packages/web/test/harness/__artifacts__/async-cond-before-for.json
@@ -1,5 +1,5 @@
 {
   "name": "async-cond-before-for",
   "shell": "<template id=\"pl-1\"></template><div _hk=10>loading</div><!--pl-1--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"1\"><h4 _hk=10001>shown</h4><!--!$--><div _hk=100100>a</div><div _hk=100110>b</div></template><script>($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[5]={value:\"shown\"});$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[4],!0);</script>"
+  "rest": "<template id=\"1\"><h4 _hk=10001>shown</h4><!--!$--><div _hk=100100>a</div><div _hk=100110>b</div></template><script>($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[5]={value:\"shown\"});$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/async-memo-element-4242-data-streamed.json b/packages/web/test/harness/__artifacts__/async-memo-element-4242-data-streamed.json
index 350679124..3e9fe4f2c 100644
--- a/packages/web/test/harness/__artifacts__/async-memo-element-4242-data-streamed.json
+++ b/packages/web/test/harness/__artifacts__/async-memo-element-4242-data-streamed.json
@@ -1,5 +1,5 @@
 {
   "name": "async-memo-element-4242-data-streamed",
   "shell": "<main _hk=5><template id=\"pl-6\"></template><i _hk=60 id=\"data-fallback\">loading</i><!--pl-6--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"2\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"3\"]=$R[7]=($R[8]=$R[2]()).p;_$HY.r[\"4\"]=$R[9]=($R[10]=$R[2]()).p;_$HY.r[\"6_fr\"]=$R[11]=($R[12]=$R[2]()).p;</script>",
-  "rest": "<script>($R[16]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[13]={name:\"Ada\",tags:$R[14]=[\"x\"],nested:$R[15]={t:\"\\x3Cb>\"}});</script><script>$R[16]($R[4],$R[17]={t:\"plain text\"});</script><script>$R[16]($R[6],$R[18]=[1,$R[19]={t:\"\\x3Ci>\",n:2},\"three\"]);</script><script>$R[16]($R[8],\"\\x3Cp>a string, not markup\\x3C/p>\");</script><template id=\"6\"><ul _hk=6000 id=\"data\"><li>Ada:x:&lt;b></li><li>plain text</li><li>3:&lt;i></li><li>&lt;p>a string, not markup&lt;/p></li><li>2026-10-24T00:00:00.000Z</li></ul><button _hk=6004 id=\"counter\">Count: <!--$-->0<!--/--></button></template><script>$R[16]($R[10],$R[20]=new Date(\"2026-10-24T00:00:00.000Z\"));$df(\"6\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[16]($R[12],!0);</script>"
+  "rest": "<script>($R[16]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[13]={name:\"Ada\",tags:$R[14]=[\"x\"],nested:$R[15]={t:\"\\x3Cb>\"}});</script><script>$R[16]($R[4],$R[17]={t:\"plain text\"});</script><script>$R[16]($R[6],$R[18]=[1,$R[19]={t:\"\\x3Ci>\",n:2},\"three\"]);</script><script>$R[16]($R[8],\"\\x3Cp>a string, not markup\\x3C/p>\");</script><template id=\"6\"><ul _hk=6000 id=\"data\"><li>Ada:x:&lt;b></li><li>plain text</li><li>3:&lt;i></li><li>&lt;p>a string, not markup&lt;/p></li><li>2026-10-24T00:00:00.000Z</li></ul><button _hk=6004 id=\"counter\">Count: <!--$-->0<!--/--></button></template><script>$R[16]($R[10],$R[20]=new Date(\"2026-10-24T00:00:00.000Z\"));$df(\"6\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[16]($R[12],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-errored-streamed.json b/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-errored-streamed.json
index 068fc19b2..256bf0331 100644
--- a/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-errored-streamed.json
+++ b/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-errored-streamed.json
@@ -1,5 +1,5 @@
 {
   "name": "async-memo-element-4242-issue-errored-streamed",
   "shell": "<template id=\"pl-0\"></template>outer<!--pl-0--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"000000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<script>_$HY.r[\"undefined_fr\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"undefined00000\"]=$R[7]=($R[8]=$R[2]()).p;</script><template id=\"0\"><!--!$-->caught:ASYNC_MEMO_ELEMENT</template><script>($R[10]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[9]=new Error(\"[ASYNC_MEMO_ELEMENT] An async memo resolved to rendered output (JSX, or a component's result), which cannot be serialized for hydration: the client would wait on a value that never arrives, and the boundary around it would never hydrate. Return data from the async memo and render the JSX from it in the component (`const user = createMemo(async () => fetchUser(id)); return \\x3CProfile user={user()} />`).\"));_$HY.r[\"0000\"]=$R[9];$df(\"0\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[11]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],!0);</script><template id=\"undefined\"><!--!$-->nested-41</template><script>$R[11]($R[8],\"nested-41\");$df(\"undefined\");</script><script>$R[11]($R[6],!0);</script>"
+  "rest": "<script>_$HY.r[\"undefined_fr\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"undefined00000\"]=$R[7]=($R[8]=$R[2]()).p;</script><template id=\"0\"><!--!$-->caught:ASYNC_MEMO_ELEMENT</template><script>($R[10]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[9]=new Error(\"[ASYNC_MEMO_ELEMENT] An async memo resolved to rendered output (JSX, or a component's result), which cannot be serialized for hydration: the client would wait on a value that never arrives, and the boundary around it would never hydrate. Return data from the async memo and render the JSX from it in the component (`const user = createMemo(async () => fetchUser(id)); return \\x3CProfile user={user()} />`).\"));_$HY.r[\"0000\"]=$R[9];$df(\"0\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[11]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],!0);</script><template id=\"undefined\"><!--!$-->nested-41</template><script>$R[11]($R[8],\"nested-41\");$df(\"undefined\");</script><script>$R[11]($R[6],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-streamed-reference.json b/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-streamed-reference.json
index b10575225..bd8804792 100644
--- a/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-streamed-reference.json
+++ b/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-streamed-reference.json
@@ -1,5 +1,5 @@
 {
   "name": "async-memo-element-4242-issue-streamed-reference",
   "shell": "<template id=\"pl-0\"></template>outer<!--pl-0--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"0000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"0\"> </template><script>($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[5]=new Error(\"[SERVER_RENDER_ERROR] the reference twin's server error\"));$df(\"0\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[1],$R[5]);</script>"
+  "rest": "<template id=\"0\" e> </template><script>($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[5]=new Error(\"[SERVER_RENDER_ERROR] the reference twin's server error\"));$df(\"0\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[1],$R[5]);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-streamed.json b/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-streamed.json
index 30d373347..34b89d568 100644
--- a/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-streamed.json
+++ b/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-streamed.json
@@ -1,5 +1,5 @@
 {
   "name": "async-memo-element-4242-issue-streamed",
   "shell": "<template id=\"pl-0\"></template>outer<!--pl-0--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"0000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<script>_$HY.r[\"undefined_fr\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"undefined000\"]=$R[7]=($R[8]=$R[2]()).p;</script><template id=\"0\"> </template><script>($R[10]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[9]=new Error(\"[ASYNC_MEMO_ELEMENT] An async memo resolved to rendered output (JSX, or a component's result), which cannot be serialized for hydration: the client would wait on a value that never arrives, and the boundary around it would never hydrate. Return data from the async memo and render the JSX from it in the component (`const user = createMemo(async () => fetchUser(id)); return \\x3CProfile user={user()} />`).\"));$df(\"0\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[10]($R[1],$R[9]);</script><template id=\"undefined\">nested-41</template><script>($R[11]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[8],\"nested-41\");$df(\"undefined\");</script><script>$R[11]($R[6],!0);</script>"
+  "rest": "<script>_$HY.r[\"undefined_fr\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"undefined000\"]=$R[7]=($R[8]=$R[2]()).p;</script><template id=\"0\" e> </template><script>($R[10]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[9]=new Error(\"[ASYNC_MEMO_ELEMENT] An async memo resolved to rendered output (JSX, or a component's result), which cannot be serialized for hydration: the client would wait on a value that never arrives, and the boundary around it would never hydrate. Return data from the async memo and render the JSX from it in the component (`const user = createMemo(async () => fetchUser(id)); return \\x3CProfile user={user()} />`).\"));$df(\"0\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[10]($R[1],$R[9]);</script><template id=\"undefined\">nested-41</template><script>($R[11]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[8],\"nested-41\");$df(\"undefined\");</script><script>$R[11]($R[6],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-errored-streamed.json b/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-errored-streamed.json
index 823d59d28..31cf10f93 100644
--- a/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-errored-streamed.json
+++ b/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-errored-streamed.json
@@ -1,5 +1,5 @@
 {
   "name": "async-memo-element-4242-jsx-errored-streamed",
   "shell": "<main _hk=1><template id=\"pl-2\"></template><i _hk=20 id=\"outer-fallback\">outer</i><!--pl-2--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\"><b _hk=20010 id=\"caught\">ASYNC_MEMO_ELEMENT</b></template><script>($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[5]=new Error(\"[ASYNC_MEMO_ELEMENT] An async memo resolved to rendered output (JSX, or a component's result), which cannot be serialized for hydration: the client would wait on a value that never arrives, and the boundary around it would never hydrate. Return data from the async memo and render the JSX from it in the component (`const user = createMemo(async () => fetchUser(id)); return \\x3CProfile user={user()} />`).\"));_$HY.r[\"2000\"]=$R[5];$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[7]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],!0);</script>"
+  "rest": "<template id=\"2\"><b _hk=20010 id=\"caught\">ASYNC_MEMO_ELEMENT</b></template><script>($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[5]=new Error(\"[ASYNC_MEMO_ELEMENT] An async memo resolved to rendered output (JSX, or a component's result), which cannot be serialized for hydration: the client would wait on a value that never arrives, and the boundary around it would never hydrate. Return data from the async memo and render the JSX from it in the component (`const user = createMemo(async () => fetchUser(id)); return \\x3CProfile user={user()} />`).\"));_$HY.r[\"2000\"]=$R[5];$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[7]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-streamed-reference.json b/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-streamed-reference.json
index 494086b3d..806bac710 100644
--- a/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-streamed-reference.json
+++ b/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-streamed-reference.json
@@ -1,5 +1,5 @@
 {
   "name": "async-memo-element-4242-jsx-streamed-reference",
   "shell": "<main _hk=1><template id=\"pl-2\"></template><i _hk=20 id=\"outer-fallback\">outer</i><!--pl-2--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\"> </template><script>$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[5]=new Error(\"[SERVER_RENDER_ERROR] the reference twin's server error\"));</script><script>$R[6]($R[4],$R[5]);</script>"
+  "rest": "<template id=\"2\" e> </template><script>$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[5]=new Error(\"[SERVER_RENDER_ERROR] the reference twin's server error\"));</script><script>$R[6]($R[4],$R[5]);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-streamed.json b/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-streamed.json
index a18ad4560..5705c20c0 100644
--- a/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-streamed.json
+++ b/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-streamed.json
@@ -1,5 +1,5 @@
 {
   "name": "async-memo-element-4242-jsx-streamed",
   "shell": "<main _hk=1><template id=\"pl-2\"></template><i _hk=20 id=\"outer-fallback\">outer</i><!--pl-2--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\"> </template><script>$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[5]=new Error(\"[ASYNC_MEMO_ELEMENT] An async memo resolved to rendered output (JSX, or a component's result), which cannot be serialized for hydration: the client would wait on a value that never arrives, and the boundary around it would never hydrate. Return data from the async memo and render the JSX from it in the component (`const user = createMemo(async () => fetchUser(id)); return \\x3CProfile user={user()} />`).\"));</script><script>$R[6]($R[4],$R[5]);</script>"
+  "rest": "<template id=\"2\" e> </template><script>$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[5]=new Error(\"[ASYNC_MEMO_ELEMENT] An async memo resolved to rendered output (JSX, or a component's result), which cannot be serialized for hydration: the client would wait on a value that never arrives, and the boundary around it would never hydrate. Return data from the async memo and render the JSX from it in the component (`const user = createMemo(async () => fetchUser(id)); return \\x3CProfile user={user()} />`).\"));</script><script>$R[6]($R[4],$R[5]);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/async-settled-element.json b/packages/web/test/harness/__artifacts__/async-settled-element.json
index 4edef7416..59d6ca3d6 100644
--- a/packages/web/test/harness/__artifacts__/async-settled-element.json
+++ b/packages/web/test/harness/__artifacts__/async-settled-element.json
@@ -1,5 +1,5 @@
 {
   "name": "async-settled-element",
   "shell": "<template id=\"pl-1\"></template><p _hk=10>loading</p><!--pl-1--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"1\"><div _hk=1000>Value: <!--$-->42<!--/--></div></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],42);$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
+  "rest": "<template id=\"1\"><div _hk=1000>Value: <!--$-->42<!--/--></div></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],42);$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/async-settled-fragment-root.json b/packages/web/test/harness/__artifacts__/async-settled-fragment-root.json
index b3604caa3..24454622c 100644
--- a/packages/web/test/harness/__artifacts__/async-settled-fragment-root.json
+++ b/packages/web/test/harness/__artifacts__/async-settled-fragment-root.json
@@ -1,5 +1,5 @@
 {
   "name": "async-settled-fragment-root",
   "shell": "<template id=\"pl-1\"></template><p _hk=10>loading</p><!--pl-1--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"1\">Count: <!--!$-->42<!--!$--> <span _hk=1001>after</span></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],42);$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
+  "rest": "<template id=\"1\">Count: <!--!$-->42<!--!$--> <span _hk=1001>after</span></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],42);$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/bare-client-late-final.json b/packages/web/test/harness/__artifacts__/bare-client-late-final.json
index 18a7e3691..6dc20e8dc 100644
--- a/packages/web/test/harness/__artifacts__/bare-client-late-final.json
+++ b/packages/web/test/harness/__artifacts__/bare-client-late-final.json
@@ -1,5 +1,5 @@
 {
   "name": "bare-client-late-final",
   "shell": "<template id=\"pl-2\"></template><p _hk=20>wait</p><!--pl-2--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\"> </template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"real\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[7]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[6]=new Error(\"client-only content (bare ssrSource: \\\"client\\\")\"));</script>"
+  "rest": "<template id=\"2\" e> </template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"real\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[7]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[6]=new Error(\"client-only content (bare ssrSource: \\\"client\\\")\"));</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/bounded-streamed-text.json b/packages/web/test/harness/__artifacts__/bounded-streamed-text.json
index 9a94984fb..b44464549 100644
--- a/packages/web/test/harness/__artifacts__/bounded-streamed-text.json
+++ b/packages/web/test/harness/__artifacts__/bounded-streamed-text.json
@@ -1,5 +1,5 @@
 {
   "name": "bounded-streamed-text",
   "shell": "<div _hk=1><span>before </span><!--$--><template id=\"pl-2\"></template><p _hk=20>loading</p><!--pl-2--><!--/--><span> tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\">Count: <!--!$-->42<!--!$--> <span _hk=2001>after</span></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],42);$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
+  "rest": "<template id=\"2\">Count: <!--!$-->42<!--!$--> <span _hk=2001>after</span></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],42);$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/client-only-before-suspending-fragment.json b/packages/web/test/harness/__artifacts__/client-only-before-suspending-fragment.json
index 548552b5a..a8951f8b5 100644
--- a/packages/web/test/harness/__artifacts__/client-only-before-suspending-fragment.json
+++ b/packages/web/test/harness/__artifacts__/client-only-before-suspending-fragment.json
@@ -1,5 +1,5 @@
 {
   "name": "client-only-before-suspending-fragment",
   "shell": "<template id=\"pl-2\"></template><i _hk=20>wait</i><!--pl-2--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\"><p _hk=2000>loaded</p></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"loaded\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
+  "rest": "<template id=\"2\"><p _hk=2000>loaded</p></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"loaded\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/client-only-before-suspending-route.json b/packages/web/test/harness/__artifacts__/client-only-before-suspending-route.json
index 36b974c40..f36bb55f7 100644
--- a/packages/web/test/harness/__artifacts__/client-only-before-suspending-route.json
+++ b/packages/web/test/harness/__artifacts__/client-only-before-suspending-route.json
@@ -1,5 +1,5 @@
 {
   "name": "client-only-before-suspending-route",
   "shell": "<template id=\"pl-1\"></template><i _hk=10>wait</i><!--pl-1--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"1_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"1\"><p _hk=1001>loaded</p></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"loaded\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[1],!0);</script>"
+  "rest": "<template id=\"1\"><p _hk=1001>loaded</p></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"loaded\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[1],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/cond-component-prop.json b/packages/web/test/harness/__artifacts__/cond-component-prop.json
index b9d173ef7..ed0ae4c20 100644
--- a/packages/web/test/harness/__artifacts__/cond-component-prop.json
+++ b/packages/web/test/harness/__artifacts__/cond-component-prop.json
@@ -1,5 +1,5 @@
 {
   "name": "cond-component-prop",
   "shell": "<div _hk=0><template id=\"pl-1\"></template><span _hk=10>wait</span><!--pl-1--></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"1_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"10011\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"1\"><section _hk=1000><em _hk=10012>badge-a</em></section></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"badge-a\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[1],!0);</script>"
+  "rest": "<template id=\"1\"><section _hk=1000><em _hk=10012>badge-a</em></section></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"badge-a\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[1],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/deferred-hole-before-siblings.json b/packages/web/test/harness/__artifacts__/deferred-hole-before-siblings.json
index 1348ebfb2..b84ca9b6c 100644
--- a/packages/web/test/harness/__artifacts__/deferred-hole-before-siblings.json
+++ b/packages/web/test/harness/__artifacts__/deferred-hole-before-siblings.json
@@ -1,5 +1,5 @@
 {
   "name": "deferred-hole-before-siblings",
   "shell": "<template id=\"pl-1\"></template><p _hk=10>loading</p><!--pl-1--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"1\"><div _hk=1000><!--$--><strong _hk=10020>2</strong><!--/--><!--$--><h4 _hk=10040>Title</h4><!--/--><span>tail</span></div></template><script>($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[5]=[\"x\",\"y\"]);$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[4],!0);</script>"
+  "rest": "<template id=\"1\"><div _hk=1000><!--$--><strong _hk=10020>2</strong><!--/--><!--$--><h4 _hk=10040>Title</h4><!--/--><span>tail</span></div></template><script>($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[5]=[\"x\",\"y\"]);$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/deferred-settled-element.json b/packages/web/test/harness/__artifacts__/deferred-settled-element.json
index 33c04d273..afa4603a7 100644
--- a/packages/web/test/harness/__artifacts__/deferred-settled-element.json
+++ b/packages/web/test/harness/__artifacts__/deferred-settled-element.json
@@ -1,5 +1,5 @@
 {
   "name": "deferred-settled-element",
   "shell": "<template id=\"pl-1\"></template><p _hk=10>loading</p><!--pl-1--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"1\"><div _hk=1000>Value: <!--$-->42<!--/--></div></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],42);$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
+  "rest": "<template id=\"1\"><div _hk=1000>Value: <!--$-->42<!--/--></div></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],42);$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/document-shell-styled.json b/packages/web/test/harness/__artifacts__/document-shell-styled.json
index dec281bef..d0686690f 100644
--- a/packages/web/test/harness/__artifacts__/document-shell-styled.json
+++ b/packages/web/test/harness/__artifacts__/document-shell-styled.json
@@ -1,6 +1,6 @@
 {
   "chunks": [
     "<html><head><link rel=\"stylesheet\" href=\"/styled-shell.css\"></head><body><div id=\"app-root\"><main _hk=0><button id=\"shell\">shell <!--$-->0<!--/--></button><!--$--><template id=\"pl-2\"></template><p _hk=20 id=\"waiting\">waiting</p><!--pl-2--><!--/--></main></div></body></html><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"2_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-    "<script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"late\");$dfs(\"2\",1,0);function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><template id=\"2\"><button _hk=20030 id=\"late\"><!--$-->late<!--/--> <!--$-->0<!--/--></button></template><link rel=\"stylesheet\" href=\"/styled-late.css\" data-dfc=\"2\"><script>$R[5]($R[1],!0);</script>"
+    "<script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"late\");$dfs(\"2\",1,0);function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><template id=\"2\"><button _hk=20030 id=\"late\"><!--$-->late<!--/--> <!--$-->0<!--/--></button></template><link rel=\"stylesheet\" href=\"/styled-late.css\" data-dfc=\"2\"><script>$R[5]($R[1],!0);</script>"
   ]
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/dynamic-async-loading-3666-streamed.json b/packages/web/test/harness/__artifacts__/dynamic-async-loading-3666-streamed.json
index 018f09c60..82b35be4d 100644
--- a/packages/web/test/harness/__artifacts__/dynamic-async-loading-3666-streamed.json
+++ b/packages/web/test/harness/__artifacts__/dynamic-async-loading-3666-streamed.json
@@ -1,5 +1,5 @@
 {
   "name": "dynamic-async-loading-3666-streamed",
   "shell": "<template id=\"pl-1\"></template><main _hk=10 id=\"fallback\">Loading…</main><!--pl-1--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"1_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"1\"><article _hk=10010 id=\"content\"><button _hk=10011 id=\"counter\">Count: <!--$-->0<!--/--></button></article></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"article\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[1],!0);</script>"
+  "rest": "<template id=\"1\"><article _hk=10010 id=\"content\"><button _hk=10011 id=\"counter\">Count: <!--$-->0<!--/--></button></article></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"article\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[1],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/dynamic-component-parity-streamed.json b/packages/web/test/harness/__artifacts__/dynamic-component-parity-streamed.json
index 1bd8e7092..6f8f8b142 100644
--- a/packages/web/test/harness/__artifacts__/dynamic-component-parity-streamed.json
+++ b/packages/web/test/harness/__artifacts__/dynamic-component-parity-streamed.json
@@ -1,5 +1,5 @@
 {
   "name": "dynamic-component-parity-streamed",
   "shell": "<main _hk=2><!--$--><section _hk=40 id=\"panel\"><h2>client</h2><!--$--><button _hk=42 id=\"panel-counter\"><!--$-->Panel<!--/-->: <!--$-->0<!--/--></button><!--/--></section><!--/--><!--$--><template id=\"pl-5\"></template><p _hk=50 class=\"fb\">shell-fallback</p><!--pl-5--><!--/--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"5_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"5000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"5\"><solid-frame data-fid=\"dynamic-component-parity/note-streamed\" data-fa=\"1xvb\" style=\"display:contents\"><article id=\"content\"><h1>note v1</h1><ul><!--slot:counter#0:start--><button _hk=sc-dynamic-component-parity/note-streamed-counter#0-0 id=\"note-counter\"><!--$-->Count<!--/-->: <!--$-->0<!--/--></button><!--slot:counter#0:end--></ul></article></solid-frame></template><script>($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],$R[5]=(self._$SC||(self._$SC={c:{},a:{},b:{},r(i,a){var c=this.c[i]||(this.c[i]=(p,b)=>self._$SC.impl(i,p,b));if(!a)return c;this.a[a]=i;this.reg&&this.reg(a,i);return this.b[a]||(this.b[a]=Object.assign(p=>c(p,()=>a),{[Symbol.for(\"solid.component-binding\")]:{component:c,address:a}}))}})).r(\"dynamic-component-parity/note-streamed\",\"dynamic-component-parity/note-streamed:1xvb\"));_$HY.r[\"sc:live\"]=$R[7]=($R[8]=(stream) => new ReadableStream({ start(controller) {\n\tstream.on({\n\t\tnext(value) {\n\t\t\ttry {\n\t\t\t\tcontroller.enqueue(value);\n\t\t\t} catch (_error) {}\n\t\t},\n\t\tthrow(value) {\n\t\t\tcontroller.error(value);\n\t\t},\n\t\treturn() {\n\t\t\ttry {\n\t\t\t\tcontroller.close();\n\t\t\t} catch (_error) {}\n\t\t}\n\t});\n} }))($R[9]=($R[10]=(live) => {\n\tconst buffer = [];\n\tconst listeners = [];\n\tlet alive = true;\n\tlet success = false;\n\tlet count = 0;\n\tconst internal = {\n\t\tflush(value, mode, x) {\n\t\t\tlive > 1 || buffer.push(value);\n\t\t\tfor (x = 0; x < count; x++) {\n\t\t\t\tconst listener = listeners[x];\n\t\t\t\tif (listener) listener[mode](value);\n\t\t\t}\n\t\t},\n\t\tup(listener, x, z, current) {\n\t\t\tfor (x = 0, z = buffer.length; x < z; x++) {\n\t\t\t\tcurrent = buffer[x];\n\t\t\t\tif (!alive && x === z - 1) listener[success ? \"return\" : \"throw\"](current);\n\t\t\t\telse listener.next(current);\n\t\t\t}\n\t\t},\n\t\ton(listener, temp = 0) {\n\t\t\tif (live > 1) throw new Error(\"Stream consumed\");\n\t\t\tlet subscribed = alive;\n\t\t\tif (alive) {\n\t\t\t\tfor (temp = 0; temp < count; temp++) if (!listeners[temp]) break;\n\t\t\t\tif (temp === count) count++;\n\t\t\t\tlisteners[temp] = listener;\n\t\t\t}\n\t\t\tinternal.up(listener);\n\t\t\tif (live) {\n\t\t\t\tlive = 2;\n\t\t\t\tbuffer.length = 0;\n\t\t\t}\n\t\t\treturn () => {\n\t\t\t\tif (alive && subscribed) {\n\t\t\t\t\tsubscribed = false;\n\t\t\t\t\tlisteners[temp] = void 0;\n\t\t\t\t\twhile (count > 0 && !listeners[count - 1]) count--;\n\t\t\t\t\tlisteners.length = count;\n\t\t\t\t}\n\t\t\t};\n\t\t}\n\t};\n\treturn {\n\t\t__SEROVAL_STREAM__: true,\n\t\ton(listener) {\n\t\t\treturn internal.on(listener);\n\t\t},\n\t\tnext(value) {\n\t\t\tif (alive) internal.flush(value, \"next\");\n\t\t},\n\t\tthrow(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"throw\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = false;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t},\n\t\treturn(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"return\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = true;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t}\n\t};\n})(1));_$HY.r[\"sc:slot:dynamic-component-parity/note-streamed:counter#0\"]=$R[11]=($R[12]=$R[2]()).p;$df(\"5\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);_$HY.r[\"sc:deps:dynamic-component-parity/note-streamed:0\"]=($R[13]={});</script><script>$R[6]($R[12],$R[14]={label:\"Count\"});$R[6]($R[1],!0);</script><script>$R[9].return(void 0);</script>"
+  "rest": "<template id=\"5\"><solid-frame data-fid=\"dynamic-component-parity/note-streamed\" data-fa=\"1xvb\" style=\"display:contents\"><article id=\"content\"><h1>note v1</h1><ul><!--slot:counter#0:start--><button _hk=sc-dynamic-component-parity/note-streamed-counter#0-0 id=\"note-counter\"><!--$-->Count<!--/-->: <!--$-->0<!--/--></button><!--slot:counter#0:end--></ul></article></solid-frame></template><script>($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],$R[5]=(self._$SC||(self._$SC={c:{},a:{},b:{},r(i,a){var c=this.c[i]||(this.c[i]=(p,b)=>self._$SC.impl(i,p,b));if(!a)return c;this.a[a]=i;this.reg&&this.reg(a,i);return this.b[a]||(this.b[a]=Object.assign(p=>c(p,()=>a),{[Symbol.for(\"solid.component-binding\")]:{component:c,address:a}}))}})).r(\"dynamic-component-parity/note-streamed\",\"dynamic-component-parity/note-streamed:1xvb\"));_$HY.r[\"sc:live\"]=$R[7]=($R[8]=(stream) => new ReadableStream({ start(controller) {\n\tstream.on({\n\t\tnext(value) {\n\t\t\ttry {\n\t\t\t\tcontroller.enqueue(value);\n\t\t\t} catch (_error) {}\n\t\t},\n\t\tthrow(value) {\n\t\t\tcontroller.error(value);\n\t\t},\n\t\treturn() {\n\t\t\ttry {\n\t\t\t\tcontroller.close();\n\t\t\t} catch (_error) {}\n\t\t}\n\t});\n} }))($R[9]=($R[10]=(live) => {\n\tconst buffer = [];\n\tconst listeners = [];\n\tlet alive = true;\n\tlet success = false;\n\tlet count = 0;\n\tconst internal = {\n\t\tflush(value, mode, x) {\n\t\t\tlive > 1 || buffer.push(value);\n\t\t\tfor (x = 0; x < count; x++) {\n\t\t\t\tconst listener = listeners[x];\n\t\t\t\tif (listener) listener[mode](value);\n\t\t\t}\n\t\t},\n\t\tup(listener, x, z, current) {\n\t\t\tfor (x = 0, z = buffer.length; x < z; x++) {\n\t\t\t\tcurrent = buffer[x];\n\t\t\t\tif (!alive && x === z - 1) listener[success ? \"return\" : \"throw\"](current);\n\t\t\t\telse listener.next(current);\n\t\t\t}\n\t\t},\n\t\ton(listener, temp = 0) {\n\t\t\tif (live > 1) throw new Error(\"Stream consumed\");\n\t\t\tlet subscribed = alive;\n\t\t\tif (alive) {\n\t\t\t\tfor (temp = 0; temp < count; temp++) if (!listeners[temp]) break;\n\t\t\t\tif (temp === count) count++;\n\t\t\t\tlisteners[temp] = listener;\n\t\t\t}\n\t\t\tinternal.up(listener);\n\t\t\tif (live) {\n\t\t\t\tlive = 2;\n\t\t\t\tbuffer.length = 0;\n\t\t\t}\n\t\t\treturn () => {\n\t\t\t\tif (alive && subscribed) {\n\t\t\t\t\tsubscribed = false;\n\t\t\t\t\tlisteners[temp] = void 0;\n\t\t\t\t\twhile (count > 0 && !listeners[count - 1]) count--;\n\t\t\t\t\tlisteners.length = count;\n\t\t\t\t}\n\t\t\t};\n\t\t}\n\t};\n\treturn {\n\t\t__SEROVAL_STREAM__: true,\n\t\ton(listener) {\n\t\t\treturn internal.on(listener);\n\t\t},\n\t\tnext(value) {\n\t\t\tif (alive) internal.flush(value, \"next\");\n\t\t},\n\t\tthrow(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"throw\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = false;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t},\n\t\treturn(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"return\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = true;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t}\n\t};\n})(1));_$HY.r[\"sc:slot:dynamic-component-parity/note-streamed:counter#0\"]=$R[11]=($R[12]=$R[2]()).p;$df(\"5\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);_$HY.r[\"sc:deps:dynamic-component-parity/note-streamed:0\"]=($R[13]={});</script><script>$R[6]($R[12],$R[14]={label:\"Count\"});$R[6]($R[1],!0);</script><script>$R[9].return(void 0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/dynamic-fallback-stream.json b/packages/web/test/harness/__artifacts__/dynamic-fallback-stream.json
index be1e88dde..792396a4a 100644
--- a/packages/web/test/harness/__artifacts__/dynamic-fallback-stream.json
+++ b/packages/web/test/harness/__artifacts__/dynamic-fallback-stream.json
@@ -1,5 +1,5 @@
 {
   "name": "dynamic-fallback-stream",
   "shell": "<div _hk=1><span>status </span><!--$--><template id=\"pl-2\"></template>preparing <!--!$-->42<!--!$-->% done<!--pl-2--><!--/--></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\"><strong _hk=2000>ready</strong></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"ready\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
+  "rest": "<template id=\"2\"><strong _hk=2000>ready</strong></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"ready\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/errored-loading-parked-rejection-4287.json b/packages/web/test/harness/__artifacts__/errored-loading-parked-rejection-4287.json
new file mode 100644
index 000000000..a76b96a13
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/errored-loading-parked-rejection-4287.json
@@ -0,0 +1,5 @@
+{
+  "name": "errored-loading-parked-rejection-4287",
+  "shell": "<div _hk=2><!--$--><template id=\"pl-3\"></template><i _hk=30>outer loading</i><!--pl-3--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"300200_fr\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"3_fr\"]=$R[7]=($R[8]=$R[2]()).p;</script>",
+  "rest": "<script>($R[10]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[9]=new Error(\"no user 7\"));_$HY.r[\"3002\"]=$R[9];</script><script>($R[11]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[6],!0);</script><template id=\"3\"><b _hk=3000>outer</b><p _hk=30030>failed: <!--$-->no user 7<!--/--></p></template><script>$R[11]($R[1],\"outer\");$df(\"3\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[11]($R[8],!0);</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/errored-loading-postflush-rejection-4287.json b/packages/web/test/harness/__artifacts__/errored-loading-postflush-rejection-4287.json
new file mode 100644
index 000000000..3b03ab1fc
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/errored-loading-postflush-rejection-4287.json
@@ -0,0 +1,5 @@
+{
+  "name": "errored-loading-postflush-rejection-4287",
+  "shell": "<div _hk=1><!--$--><template id=\"pl-200\"></template><i _hk=2000>loading</i><!--pl-200--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"200_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
+  "rest": "<template id=\"200\" e><p _hk=30>failed: <!--$-->no user 7<!--/--></p></template><script>($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[5]=new Error(\"no user 7\"));_$HY.r[\"2\"]=$R[5];$df(\"200\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[4],$R[5]);</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/errored-loading-preflush-rejection.json b/packages/web/test/harness/__artifacts__/errored-loading-preflush-rejection.json
index 78a10d880..18f5834aa 100644
--- a/packages/web/test/harness/__artifacts__/errored-loading-preflush-rejection.json
+++ b/packages/web/test/harness/__artifacts__/errored-loading-preflush-rejection.json
@@ -1,5 +1,5 @@
 {
   "name": "errored-loading-preflush-rejection",
-  "shell": "<div _hk=1><!--$--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"200_fr\"]=$R[3]=($R[4]=$R[2]()).p;($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[5]=new Error(\"boom\"));$R[6]($R[4],$R[5]);</script>",
+  "shell": "<div _hk=1><!--$--><p _hk=30>caught</p><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"200_fr\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"2\"]=$R[5]=new Error(\"boom\");($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[5]);$R[6]($R[4],$R[5]);</script>",
   "rest": ""
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/errored-section-loading-postflush-rejection-4287.json b/packages/web/test/harness/__artifacts__/errored-section-loading-postflush-rejection-4287.json
new file mode 100644
index 000000000..e5db53513
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/errored-section-loading-postflush-rejection-4287.json
@@ -0,0 +1,5 @@
+{
+  "name": "errored-section-loading-postflush-rejection-4287",
+  "shell": "<div _hk=1><!--$--><section _hk=200><h1>title</h1><!--$--><template id=\"pl-201\"></template><i _hk=2010>loading</i><!--pl-201--><!--/--></section><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"201_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
+  "rest": "<template id=\"201\" e> </template><script>($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[5]=new Error(\"no user 7\"));$df(\"201\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[4],$R[5]);</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/frame-live-document-loaded.json b/packages/web/test/harness/__artifacts__/frame-live-document-loaded.json
index d3ede6c6b..16b4f6ab1 100644
--- a/packages/web/test/harness/__artifacts__/frame-live-document-loaded.json
+++ b/packages/web/test/harness/__artifacts__/frame-live-document-loaded.json
@@ -1,5 +1,5 @@
 {
   "name": "frame-live-document-loaded",
   "shell": "<main _hk=1><template id=\"pl-2\"></template><p _hk=20 class=\"fb\">shell-fallback</p><!--pl-2--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"2_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2000\"]=$R[3]=($R[4]=$R[2]()).p;($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],$R[5]=(self._$SC||(self._$SC={c:{},a:{},b:{},r(i,a){var c=this.c[i]||(this.c[i]=(p,b)=>self._$SC.impl(i,p,b));if(!a)return c;this.a[a]=i;this.reg&&this.reg(a,i);return this.b[a]||(this.b[a]=Object.assign(p=>c(p,()=>a),{[Symbol.for(\"solid.component-binding\")]:{component:c,address:a}}))}})).r(\"frame-live-doc/room-loaded\",\"frame-live-doc/room-loaded:1xvb\"));_$HY.r[\"sc:live\"]=$R[7]=($R[8]=(stream) => new ReadableStream({ start(controller) {\n\tstream.on({\n\t\tnext(value) {\n\t\t\ttry {\n\t\t\t\tcontroller.enqueue(value);\n\t\t\t} catch (_error) {}\n\t\t},\n\t\tthrow(value) {\n\t\t\tcontroller.error(value);\n\t\t},\n\t\treturn() {\n\t\t\ttry {\n\t\t\t\tcontroller.close();\n\t\t\t} catch (_error) {}\n\t\t}\n\t});\n} }))($R[9]=($R[10]=(live) => {\n\tconst buffer = [];\n\tconst listeners = [];\n\tlet alive = true;\n\tlet success = false;\n\tlet count = 0;\n\tconst internal = {\n\t\tflush(value, mode, x) {\n\t\t\tlive > 1 || buffer.push(value);\n\t\t\tfor (x = 0; x < count; x++) {\n\t\t\t\tconst listener = listeners[x];\n\t\t\t\tif (listener) listener[mode](value);\n\t\t\t}\n\t\t},\n\t\tup(listener, x, z, current) {\n\t\t\tfor (x = 0, z = buffer.length; x < z; x++) {\n\t\t\t\tcurrent = buffer[x];\n\t\t\t\tif (!alive && x === z - 1) listener[success ? \"return\" : \"throw\"](current);\n\t\t\t\telse listener.next(current);\n\t\t\t}\n\t\t},\n\t\ton(listener, temp = 0) {\n\t\t\tif (live > 1) throw new Error(\"Stream consumed\");\n\t\t\tlet subscribed = alive;\n\t\t\tif (alive) {\n\t\t\t\tfor (temp = 0; temp < count; temp++) if (!listeners[temp]) break;\n\t\t\t\tif (temp === count) count++;\n\t\t\t\tlisteners[temp] = listener;\n\t\t\t}\n\t\t\tinternal.up(listener);\n\t\t\tif (live) {\n\t\t\t\tlive = 2;\n\t\t\t\tbuffer.length = 0;\n\t\t\t}\n\t\t\treturn () => {\n\t\t\t\tif (alive && subscribed) {\n\t\t\t\t\tsubscribed = false;\n\t\t\t\t\tlisteners[temp] = void 0;\n\t\t\t\t\twhile (count > 0 && !listeners[count - 1]) count--;\n\t\t\t\t\tlisteners.length = count;\n\t\t\t\t}\n\t\t\t};\n\t\t}\n\t};\n\treturn {\n\t\t__SEROVAL_STREAM__: true,\n\t\ton(listener) {\n\t\t\treturn internal.on(listener);\n\t\t},\n\t\tnext(value) {\n\t\t\tif (alive) internal.flush(value, \"next\");\n\t\t},\n\t\tthrow(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"throw\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = false;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t},\n\t\treturn(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"return\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = true;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t}\n\t};\n})(1));_$HY.r[\"sc:tiers\"]=$R[11]=[\"wire\"];_$HY.r[\"sc:slot:frame-live-doc/room-loaded:composer#0\"]=$R[12]=($R[13]=$R[2]()).p;_$HY.r[\"sc:deps:frame-live-doc/room-loaded:0\"]=($R[14]={});$R[6]($R[13],$R[15]={room:\"a\"});</script>",
-  "rest": "<template id=\"2\"><solid-frame data-fid=\"frame-live-doc/room-loaded\" data-fa=\"1xvb\" style=\"display:contents\"><article><h1><!--lh:0-->room v1<!--lh:/0--></h1><ul><!--slot:composer#0:start--><input _hk=sc-frame-live-doc/room-loaded-composer#0-0 class=\"draft\" value=\"\" placeholder=\"Message #a\"><!--slot:composer#0:end--></ul></article></solid-frame></template><script>$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[1],!0);</script><script>$R[9].return(void 0);</script>"
+  "rest": "<template id=\"2\"><solid-frame data-fid=\"frame-live-doc/room-loaded\" data-fa=\"1xvb\" style=\"display:contents\"><article><h1><!--lh:0-->room v1<!--lh:/0--></h1><ul><!--slot:composer#0:start--><input _hk=sc-frame-live-doc/room-loaded-composer#0-0 class=\"draft\" value=\"\" placeholder=\"Message #a\"><!--slot:composer#0:end--></ul></article></solid-frame></template><script>$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[1],!0);</script><script>$R[9].return(void 0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/frame-live-document-streamed.json b/packages/web/test/harness/__artifacts__/frame-live-document-streamed.json
index e6415111d..f23488a91 100644
--- a/packages/web/test/harness/__artifacts__/frame-live-document-streamed.json
+++ b/packages/web/test/harness/__artifacts__/frame-live-document-streamed.json
@@ -1,5 +1,5 @@
 {
   "name": "frame-live-document-streamed",
   "shell": "<main _hk=1><template id=\"pl-2\"></template><p _hk=20 class=\"fb\">shell-fallback</p><!--pl-2--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"2_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2000\"]=$R[3]=($R[4]=$R[2]()).p;($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],$R[5]=(self._$SC||(self._$SC={c:{},a:{},b:{},r(i,a){var c=this.c[i]||(this.c[i]=(p,b)=>self._$SC.impl(i,p,b));if(!a)return c;this.a[a]=i;this.reg&&this.reg(a,i);return this.b[a]||(this.b[a]=Object.assign(p=>c(p,()=>a),{[Symbol.for(\"solid.component-binding\")]:{component:c,address:a}}))}})).r(\"frame-live-doc/room-streamed\",\"frame-live-doc/room-streamed:1xvb\"));_$HY.r[\"sc:live\"]=$R[7]=($R[8]=(stream) => new ReadableStream({ start(controller) {\n\tstream.on({\n\t\tnext(value) {\n\t\t\ttry {\n\t\t\t\tcontroller.enqueue(value);\n\t\t\t} catch (_error) {}\n\t\t},\n\t\tthrow(value) {\n\t\t\tcontroller.error(value);\n\t\t},\n\t\treturn() {\n\t\t\ttry {\n\t\t\t\tcontroller.close();\n\t\t\t} catch (_error) {}\n\t\t}\n\t});\n} }))($R[9]=($R[10]=(live) => {\n\tconst buffer = [];\n\tconst listeners = [];\n\tlet alive = true;\n\tlet success = false;\n\tlet count = 0;\n\tconst internal = {\n\t\tflush(value, mode, x) {\n\t\t\tlive > 1 || buffer.push(value);\n\t\t\tfor (x = 0; x < count; x++) {\n\t\t\t\tconst listener = listeners[x];\n\t\t\t\tif (listener) listener[mode](value);\n\t\t\t}\n\t\t},\n\t\tup(listener, x, z, current) {\n\t\t\tfor (x = 0, z = buffer.length; x < z; x++) {\n\t\t\t\tcurrent = buffer[x];\n\t\t\t\tif (!alive && x === z - 1) listener[success ? \"return\" : \"throw\"](current);\n\t\t\t\telse listener.next(current);\n\t\t\t}\n\t\t},\n\t\ton(listener, temp = 0) {\n\t\t\tif (live > 1) throw new Error(\"Stream consumed\");\n\t\t\tlet subscribed = alive;\n\t\t\tif (alive) {\n\t\t\t\tfor (temp = 0; temp < count; temp++) if (!listeners[temp]) break;\n\t\t\t\tif (temp === count) count++;\n\t\t\t\tlisteners[temp] = listener;\n\t\t\t}\n\t\t\tinternal.up(listener);\n\t\t\tif (live) {\n\t\t\t\tlive = 2;\n\t\t\t\tbuffer.length = 0;\n\t\t\t}\n\t\t\treturn () => {\n\t\t\t\tif (alive && subscribed) {\n\t\t\t\t\tsubscribed = false;\n\t\t\t\t\tlisteners[temp] = void 0;\n\t\t\t\t\twhile (count > 0 && !listeners[count - 1]) count--;\n\t\t\t\t\tlisteners.length = count;\n\t\t\t\t}\n\t\t\t};\n\t\t}\n\t};\n\treturn {\n\t\t__SEROVAL_STREAM__: true,\n\t\ton(listener) {\n\t\t\treturn internal.on(listener);\n\t\t},\n\t\tnext(value) {\n\t\t\tif (alive) internal.flush(value, \"next\");\n\t\t},\n\t\tthrow(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"throw\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = false;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t},\n\t\treturn(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"return\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = true;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t}\n\t};\n})(1));_$HY.r[\"sc:tiers\"]=$R[11]=[\"wire\"];_$HY.r[\"sc:slot:frame-live-doc/room-streamed:composer#0\"]=$R[12]=($R[13]=$R[2]()).p;_$HY.r[\"sc:deps:frame-live-doc/room-streamed:0\"]=($R[14]={});$R[6]($R[13],$R[15]={room:\"a\"});</script>",
-  "rest": "<template id=\"2\"><solid-frame data-fid=\"frame-live-doc/room-streamed\" data-fa=\"1xvb\" style=\"display:contents\"><article><h1><!--lh:0-->room v1<!--lh:/0--></h1><ul><!--slot:composer#0:start--><input _hk=sc-frame-live-doc/room-streamed-composer#0-0 class=\"draft\" value=\"\" placeholder=\"Message #a\"><!--slot:composer#0:end--></ul></article></solid-frame></template><script>$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[1],!0);</script><script>$R[9].return(void 0);</script>"
+  "rest": "<template id=\"2\"><solid-frame data-fid=\"frame-live-doc/room-streamed\" data-fa=\"1xvb\" style=\"display:contents\"><article><h1><!--lh:0-->room v1<!--lh:/0--></h1><ul><!--slot:composer#0:start--><input _hk=sc-frame-live-doc/room-streamed-composer#0-0 class=\"draft\" value=\"\" placeholder=\"Message #a\"><!--slot:composer#0:end--></ul></article></solid-frame></template><script>$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[1],!0);</script><script>$R[9].return(void 0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/frame-live-document-switched.json b/packages/web/test/harness/__artifacts__/frame-live-document-switched.json
index d57330f72..a8ac8608f 100644
--- a/packages/web/test/harness/__artifacts__/frame-live-document-switched.json
+++ b/packages/web/test/harness/__artifacts__/frame-live-document-switched.json
@@ -1,5 +1,5 @@
 {
   "name": "frame-live-document-switched",
   "shell": "<main _hk=1><template id=\"pl-2\"></template><p _hk=20 class=\"fb\">shell-fallback</p><!--pl-2--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"2_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2000\"]=$R[3]=($R[4]=$R[2]()).p;($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],$R[5]=(self._$SC||(self._$SC={c:{},a:{},b:{},r(i,a){var c=this.c[i]||(this.c[i]=(p,b)=>self._$SC.impl(i,p,b));if(!a)return c;this.a[a]=i;this.reg&&this.reg(a,i);return this.b[a]||(this.b[a]=Object.assign(p=>c(p,()=>a),{[Symbol.for(\"solid.component-binding\")]:{component:c,address:a}}))}})).r(\"frame-live-doc/room-switched\",\"frame-live-doc/room-switched:1xvb\"));_$HY.r[\"sc:live\"]=$R[7]=($R[8]=(stream) => new ReadableStream({ start(controller) {\n\tstream.on({\n\t\tnext(value) {\n\t\t\ttry {\n\t\t\t\tcontroller.enqueue(value);\n\t\t\t} catch (_error) {}\n\t\t},\n\t\tthrow(value) {\n\t\t\tcontroller.error(value);\n\t\t},\n\t\treturn() {\n\t\t\ttry {\n\t\t\t\tcontroller.close();\n\t\t\t} catch (_error) {}\n\t\t}\n\t});\n} }))($R[9]=($R[10]=(live) => {\n\tconst buffer = [];\n\tconst listeners = [];\n\tlet alive = true;\n\tlet success = false;\n\tlet count = 0;\n\tconst internal = {\n\t\tflush(value, mode, x) {\n\t\t\tlive > 1 || buffer.push(value);\n\t\t\tfor (x = 0; x < count; x++) {\n\t\t\t\tconst listener = listeners[x];\n\t\t\t\tif (listener) listener[mode](value);\n\t\t\t}\n\t\t},\n\t\tup(listener, x, z, current) {\n\t\t\tfor (x = 0, z = buffer.length; x < z; x++) {\n\t\t\t\tcurrent = buffer[x];\n\t\t\t\tif (!alive && x === z - 1) listener[success ? \"return\" : \"throw\"](current);\n\t\t\t\telse listener.next(current);\n\t\t\t}\n\t\t},\n\t\ton(listener, temp = 0) {\n\t\t\tif (live > 1) throw new Error(\"Stream consumed\");\n\t\t\tlet subscribed = alive;\n\t\t\tif (alive) {\n\t\t\t\tfor (temp = 0; temp < count; temp++) if (!listeners[temp]) break;\n\t\t\t\tif (temp === count) count++;\n\t\t\t\tlisteners[temp] = listener;\n\t\t\t}\n\t\t\tinternal.up(listener);\n\t\t\tif (live) {\n\t\t\t\tlive = 2;\n\t\t\t\tbuffer.length = 0;\n\t\t\t}\n\t\t\treturn () => {\n\t\t\t\tif (alive && subscribed) {\n\t\t\t\t\tsubscribed = false;\n\t\t\t\t\tlisteners[temp] = void 0;\n\t\t\t\t\twhile (count > 0 && !listeners[count - 1]) count--;\n\t\t\t\t\tlisteners.length = count;\n\t\t\t\t}\n\t\t\t};\n\t\t}\n\t};\n\treturn {\n\t\t__SEROVAL_STREAM__: true,\n\t\ton(listener) {\n\t\t\treturn internal.on(listener);\n\t\t},\n\t\tnext(value) {\n\t\t\tif (alive) internal.flush(value, \"next\");\n\t\t},\n\t\tthrow(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"throw\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = false;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t},\n\t\treturn(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"return\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = true;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t}\n\t};\n})(1));_$HY.r[\"sc:tiers\"]=$R[11]=[\"wire\"];_$HY.r[\"sc:slot:frame-live-doc/room-switched:composer#0\"]=$R[12]=($R[13]=$R[2]()).p;_$HY.r[\"sc:deps:frame-live-doc/room-switched:0\"]=($R[14]={});$R[6]($R[13],$R[15]={room:\"a\"});</script>",
-  "rest": "<template id=\"2\"><solid-frame data-fid=\"frame-live-doc/room-switched\" data-fa=\"1xvb\" style=\"display:contents\"><article><h1><!--lh:0-->room v1<!--lh:/0--></h1><ul><!--slot:composer#0:start--><input _hk=sc-frame-live-doc/room-switched-composer#0-0 class=\"draft\" value=\"\" placeholder=\"Message #a\"><!--slot:composer#0:end--></ul></article></solid-frame></template><script>$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[1],!0);</script><script>$R[9].return(void 0);</script>"
+  "rest": "<template id=\"2\"><solid-frame data-fid=\"frame-live-doc/room-switched\" data-fa=\"1xvb\" style=\"display:contents\"><article><h1><!--lh:0-->room v1<!--lh:/0--></h1><ul><!--slot:composer#0:start--><input _hk=sc-frame-live-doc/room-switched-composer#0-0 class=\"draft\" value=\"\" placeholder=\"Message #a\"><!--slot:composer#0:end--></ul></article></solid-frame></template><script>$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[1],!0);</script><script>$R[9].return(void 0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/frame-nonlive-document-3666-streamed-loaded.json b/packages/web/test/harness/__artifacts__/frame-nonlive-document-3666-streamed-loaded.json
index c142f6607..8ed43883d 100644
--- a/packages/web/test/harness/__artifacts__/frame-nonlive-document-3666-streamed-loaded.json
+++ b/packages/web/test/harness/__artifacts__/frame-nonlive-document-3666-streamed-loaded.json
@@ -1,5 +1,5 @@
 {
   "name": "frame-nonlive-document-3666-streamed-loaded",
   "shell": "<main _hk=1><template id=\"pl-2\"></template><p _hk=20 class=\"fb\">shell-fallback</p><!--pl-2--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"2_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\"><solid-frame data-fid=\"frame-nonlive-doc/note-streamed-loaded\" data-fa=\"1xvb\" style=\"display:contents\"><article id=\"content\"><h1>note v1</h1><ul><!--slot:counter#0:start--><button _hk=sc-frame-nonlive-doc/note-streamed-loaded-counter#0-0 id=\"counter\"><!--$-->Count<!--/-->: <!--$-->0<!--/--></button><!--slot:counter#0:end--></ul></article></solid-frame></template><script>($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],$R[5]=(self._$SC||(self._$SC={c:{},a:{},b:{},r(i,a){var c=this.c[i]||(this.c[i]=(p,b)=>self._$SC.impl(i,p,b));if(!a)return c;this.a[a]=i;this.reg&&this.reg(a,i);return this.b[a]||(this.b[a]=Object.assign(p=>c(p,()=>a),{[Symbol.for(\"solid.component-binding\")]:{component:c,address:a}}))}})).r(\"frame-nonlive-doc/note-streamed-loaded\",\"frame-nonlive-doc/note-streamed-loaded:1xvb\"));_$HY.r[\"sc:live\"]=$R[7]=($R[8]=(stream) => new ReadableStream({ start(controller) {\n\tstream.on({\n\t\tnext(value) {\n\t\t\ttry {\n\t\t\t\tcontroller.enqueue(value);\n\t\t\t} catch (_error) {}\n\t\t},\n\t\tthrow(value) {\n\t\t\tcontroller.error(value);\n\t\t},\n\t\treturn() {\n\t\t\ttry {\n\t\t\t\tcontroller.close();\n\t\t\t} catch (_error) {}\n\t\t}\n\t});\n} }))($R[9]=($R[10]=(live) => {\n\tconst buffer = [];\n\tconst listeners = [];\n\tlet alive = true;\n\tlet success = false;\n\tlet count = 0;\n\tconst internal = {\n\t\tflush(value, mode, x) {\n\t\t\tlive > 1 || buffer.push(value);\n\t\t\tfor (x = 0; x < count; x++) {\n\t\t\t\tconst listener = listeners[x];\n\t\t\t\tif (listener) listener[mode](value);\n\t\t\t}\n\t\t},\n\t\tup(listener, x, z, current) {\n\t\t\tfor (x = 0, z = buffer.length; x < z; x++) {\n\t\t\t\tcurrent = buffer[x];\n\t\t\t\tif (!alive && x === z - 1) listener[success ? \"return\" : \"throw\"](current);\n\t\t\t\telse listener.next(current);\n\t\t\t}\n\t\t},\n\t\ton(listener, temp = 0) {\n\t\t\tif (live > 1) throw new Error(\"Stream consumed\");\n\t\t\tlet subscribed = alive;\n\t\t\tif (alive) {\n\t\t\t\tfor (temp = 0; temp < count; temp++) if (!listeners[temp]) break;\n\t\t\t\tif (temp === count) count++;\n\t\t\t\tlisteners[temp] = listener;\n\t\t\t}\n\t\t\tinternal.up(listener);\n\t\t\tif (live) {\n\t\t\t\tlive = 2;\n\t\t\t\tbuffer.length = 0;\n\t\t\t}\n\t\t\treturn () => {\n\t\t\t\tif (alive && subscribed) {\n\t\t\t\t\tsubscribed = false;\n\t\t\t\t\tlisteners[temp] = void 0;\n\t\t\t\t\twhile (count > 0 && !listeners[count - 1]) count--;\n\t\t\t\t\tlisteners.length = count;\n\t\t\t\t}\n\t\t\t};\n\t\t}\n\t};\n\treturn {\n\t\t__SEROVAL_STREAM__: true,\n\t\ton(listener) {\n\t\t\treturn internal.on(listener);\n\t\t},\n\t\tnext(value) {\n\t\t\tif (alive) internal.flush(value, \"next\");\n\t\t},\n\t\tthrow(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"throw\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = false;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t},\n\t\treturn(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"return\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = true;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t}\n\t};\n})(1));_$HY.r[\"sc:slot:frame-nonlive-doc/note-streamed-loaded:counter#0\"]=$R[11]=($R[12]=$R[2]()).p;$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);_$HY.r[\"sc:deps:frame-nonlive-doc/note-streamed-loaded:0\"]=($R[13]={});</script><script>$R[6]($R[12],$R[14]={label:\"Count\"});$R[6]($R[1],!0);</script><script>$R[9].return(void 0);</script>"
+  "rest": "<template id=\"2\"><solid-frame data-fid=\"frame-nonlive-doc/note-streamed-loaded\" data-fa=\"1xvb\" style=\"display:contents\"><article id=\"content\"><h1>note v1</h1><ul><!--slot:counter#0:start--><button _hk=sc-frame-nonlive-doc/note-streamed-loaded-counter#0-0 id=\"counter\"><!--$-->Count<!--/-->: <!--$-->0<!--/--></button><!--slot:counter#0:end--></ul></article></solid-frame></template><script>($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],$R[5]=(self._$SC||(self._$SC={c:{},a:{},b:{},r(i,a){var c=this.c[i]||(this.c[i]=(p,b)=>self._$SC.impl(i,p,b));if(!a)return c;this.a[a]=i;this.reg&&this.reg(a,i);return this.b[a]||(this.b[a]=Object.assign(p=>c(p,()=>a),{[Symbol.for(\"solid.component-binding\")]:{component:c,address:a}}))}})).r(\"frame-nonlive-doc/note-streamed-loaded\",\"frame-nonlive-doc/note-streamed-loaded:1xvb\"));_$HY.r[\"sc:live\"]=$R[7]=($R[8]=(stream) => new ReadableStream({ start(controller) {\n\tstream.on({\n\t\tnext(value) {\n\t\t\ttry {\n\t\t\t\tcontroller.enqueue(value);\n\t\t\t} catch (_error) {}\n\t\t},\n\t\tthrow(value) {\n\t\t\tcontroller.error(value);\n\t\t},\n\t\treturn() {\n\t\t\ttry {\n\t\t\t\tcontroller.close();\n\t\t\t} catch (_error) {}\n\t\t}\n\t});\n} }))($R[9]=($R[10]=(live) => {\n\tconst buffer = [];\n\tconst listeners = [];\n\tlet alive = true;\n\tlet success = false;\n\tlet count = 0;\n\tconst internal = {\n\t\tflush(value, mode, x) {\n\t\t\tlive > 1 || buffer.push(value);\n\t\t\tfor (x = 0; x < count; x++) {\n\t\t\t\tconst listener = listeners[x];\n\t\t\t\tif (listener) listener[mode](value);\n\t\t\t}\n\t\t},\n\t\tup(listener, x, z, current) {\n\t\t\tfor (x = 0, z = buffer.length; x < z; x++) {\n\t\t\t\tcurrent = buffer[x];\n\t\t\t\tif (!alive && x === z - 1) listener[success ? \"return\" : \"throw\"](current);\n\t\t\t\telse listener.next(current);\n\t\t\t}\n\t\t},\n\t\ton(listener, temp = 0) {\n\t\t\tif (live > 1) throw new Error(\"Stream consumed\");\n\t\t\tlet subscribed = alive;\n\t\t\tif (alive) {\n\t\t\t\tfor (temp = 0; temp < count; temp++) if (!listeners[temp]) break;\n\t\t\t\tif (temp === count) count++;\n\t\t\t\tlisteners[temp] = listener;\n\t\t\t}\n\t\t\tinternal.up(listener);\n\t\t\tif (live) {\n\t\t\t\tlive = 2;\n\t\t\t\tbuffer.length = 0;\n\t\t\t}\n\t\t\treturn () => {\n\t\t\t\tif (alive && subscribed) {\n\t\t\t\t\tsubscribed = false;\n\t\t\t\t\tlisteners[temp] = void 0;\n\t\t\t\t\twhile (count > 0 && !listeners[count - 1]) count--;\n\t\t\t\t\tlisteners.length = count;\n\t\t\t\t}\n\t\t\t};\n\t\t}\n\t};\n\treturn {\n\t\t__SEROVAL_STREAM__: true,\n\t\ton(listener) {\n\t\t\treturn internal.on(listener);\n\t\t},\n\t\tnext(value) {\n\t\t\tif (alive) internal.flush(value, \"next\");\n\t\t},\n\t\tthrow(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"throw\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = false;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t},\n\t\treturn(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"return\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = true;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t}\n\t};\n})(1));_$HY.r[\"sc:slot:frame-nonlive-doc/note-streamed-loaded:counter#0\"]=$R[11]=($R[12]=$R[2]()).p;$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);_$HY.r[\"sc:deps:frame-nonlive-doc/note-streamed-loaded:0\"]=($R[13]={});</script><script>$R[6]($R[12],$R[14]={label:\"Count\"});$R[6]($R[1],!0);</script><script>$R[9].return(void 0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/frame-nonlive-document-3666-streamed-streamed.json b/packages/web/test/harness/__artifacts__/frame-nonlive-document-3666-streamed-streamed.json
index 042a08bfc..076a48a41 100644
--- a/packages/web/test/harness/__artifacts__/frame-nonlive-document-3666-streamed-streamed.json
+++ b/packages/web/test/harness/__artifacts__/frame-nonlive-document-3666-streamed-streamed.json
@@ -1,5 +1,5 @@
 {
   "name": "frame-nonlive-document-3666-streamed-streamed",
   "shell": "<main _hk=1><template id=\"pl-2\"></template><p _hk=20 class=\"fb\">shell-fallback</p><!--pl-2--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"2_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\"><solid-frame data-fid=\"frame-nonlive-doc/note-streamed-streamed\" data-fa=\"1xvb\" style=\"display:contents\"><article id=\"content\"><h1>note v1</h1><ul><!--slot:counter#0:start--><button _hk=sc-frame-nonlive-doc/note-streamed-streamed-counter#0-0 id=\"counter\"><!--$-->Count<!--/-->: <!--$-->0<!--/--></button><!--slot:counter#0:end--></ul></article></solid-frame></template><script>($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],$R[5]=(self._$SC||(self._$SC={c:{},a:{},b:{},r(i,a){var c=this.c[i]||(this.c[i]=(p,b)=>self._$SC.impl(i,p,b));if(!a)return c;this.a[a]=i;this.reg&&this.reg(a,i);return this.b[a]||(this.b[a]=Object.assign(p=>c(p,()=>a),{[Symbol.for(\"solid.component-binding\")]:{component:c,address:a}}))}})).r(\"frame-nonlive-doc/note-streamed-streamed\",\"frame-nonlive-doc/note-streamed-streamed:1xvb\"));_$HY.r[\"sc:live\"]=$R[7]=($R[8]=(stream) => new ReadableStream({ start(controller) {\n\tstream.on({\n\t\tnext(value) {\n\t\t\ttry {\n\t\t\t\tcontroller.enqueue(value);\n\t\t\t} catch (_error) {}\n\t\t},\n\t\tthrow(value) {\n\t\t\tcontroller.error(value);\n\t\t},\n\t\treturn() {\n\t\t\ttry {\n\t\t\t\tcontroller.close();\n\t\t\t} catch (_error) {}\n\t\t}\n\t});\n} }))($R[9]=($R[10]=(live) => {\n\tconst buffer = [];\n\tconst listeners = [];\n\tlet alive = true;\n\tlet success = false;\n\tlet count = 0;\n\tconst internal = {\n\t\tflush(value, mode, x) {\n\t\t\tlive > 1 || buffer.push(value);\n\t\t\tfor (x = 0; x < count; x++) {\n\t\t\t\tconst listener = listeners[x];\n\t\t\t\tif (listener) listener[mode](value);\n\t\t\t}\n\t\t},\n\t\tup(listener, x, z, current) {\n\t\t\tfor (x = 0, z = buffer.length; x < z; x++) {\n\t\t\t\tcurrent = buffer[x];\n\t\t\t\tif (!alive && x === z - 1) listener[success ? \"return\" : \"throw\"](current);\n\t\t\t\telse listener.next(current);\n\t\t\t}\n\t\t},\n\t\ton(listener, temp = 0) {\n\t\t\tif (live > 1) throw new Error(\"Stream consumed\");\n\t\t\tlet subscribed = alive;\n\t\t\tif (alive) {\n\t\t\t\tfor (temp = 0; temp < count; temp++) if (!listeners[temp]) break;\n\t\t\t\tif (temp === count) count++;\n\t\t\t\tlisteners[temp] = listener;\n\t\t\t}\n\t\t\tinternal.up(listener);\n\t\t\tif (live) {\n\t\t\t\tlive = 2;\n\t\t\t\tbuffer.length = 0;\n\t\t\t}\n\t\t\treturn () => {\n\t\t\t\tif (alive && subscribed) {\n\t\t\t\t\tsubscribed = false;\n\t\t\t\t\tlisteners[temp] = void 0;\n\t\t\t\t\twhile (count > 0 && !listeners[count - 1]) count--;\n\t\t\t\t\tlisteners.length = count;\n\t\t\t\t}\n\t\t\t};\n\t\t}\n\t};\n\treturn {\n\t\t__SEROVAL_STREAM__: true,\n\t\ton(listener) {\n\t\t\treturn internal.on(listener);\n\t\t},\n\t\tnext(value) {\n\t\t\tif (alive) internal.flush(value, \"next\");\n\t\t},\n\t\tthrow(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"throw\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = false;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t},\n\t\treturn(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"return\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = true;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t}\n\t};\n})(1));_$HY.r[\"sc:slot:frame-nonlive-doc/note-streamed-streamed:counter#0\"]=$R[11]=($R[12]=$R[2]()).p;$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);_$HY.r[\"sc:deps:frame-nonlive-doc/note-streamed-streamed:0\"]=($R[13]={});</script><script>$R[6]($R[12],$R[14]={label:\"Count\"});$R[6]($R[1],!0);</script><script>$R[9].return(void 0);</script>"
+  "rest": "<template id=\"2\"><solid-frame data-fid=\"frame-nonlive-doc/note-streamed-streamed\" data-fa=\"1xvb\" style=\"display:contents\"><article id=\"content\"><h1>note v1</h1><ul><!--slot:counter#0:start--><button _hk=sc-frame-nonlive-doc/note-streamed-streamed-counter#0-0 id=\"counter\"><!--$-->Count<!--/-->: <!--$-->0<!--/--></button><!--slot:counter#0:end--></ul></article></solid-frame></template><script>($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],$R[5]=(self._$SC||(self._$SC={c:{},a:{},b:{},r(i,a){var c=this.c[i]||(this.c[i]=(p,b)=>self._$SC.impl(i,p,b));if(!a)return c;this.a[a]=i;this.reg&&this.reg(a,i);return this.b[a]||(this.b[a]=Object.assign(p=>c(p,()=>a),{[Symbol.for(\"solid.component-binding\")]:{component:c,address:a}}))}})).r(\"frame-nonlive-doc/note-streamed-streamed\",\"frame-nonlive-doc/note-streamed-streamed:1xvb\"));_$HY.r[\"sc:live\"]=$R[7]=($R[8]=(stream) => new ReadableStream({ start(controller) {\n\tstream.on({\n\t\tnext(value) {\n\t\t\ttry {\n\t\t\t\tcontroller.enqueue(value);\n\t\t\t} catch (_error) {}\n\t\t},\n\t\tthrow(value) {\n\t\t\tcontroller.error(value);\n\t\t},\n\t\treturn() {\n\t\t\ttry {\n\t\t\t\tcontroller.close();\n\t\t\t} catch (_error) {}\n\t\t}\n\t});\n} }))($R[9]=($R[10]=(live) => {\n\tconst buffer = [];\n\tconst listeners = [];\n\tlet alive = true;\n\tlet success = false;\n\tlet count = 0;\n\tconst internal = {\n\t\tflush(value, mode, x) {\n\t\t\tlive > 1 || buffer.push(value);\n\t\t\tfor (x = 0; x < count; x++) {\n\t\t\t\tconst listener = listeners[x];\n\t\t\t\tif (listener) listener[mode](value);\n\t\t\t}\n\t\t},\n\t\tup(listener, x, z, current) {\n\t\t\tfor (x = 0, z = buffer.length; x < z; x++) {\n\t\t\t\tcurrent = buffer[x];\n\t\t\t\tif (!alive && x === z - 1) listener[success ? \"return\" : \"throw\"](current);\n\t\t\t\telse listener.next(current);\n\t\t\t}\n\t\t},\n\t\ton(listener, temp = 0) {\n\t\t\tif (live > 1) throw new Error(\"Stream consumed\");\n\t\t\tlet subscribed = alive;\n\t\t\tif (alive) {\n\t\t\t\tfor (temp = 0; temp < count; temp++) if (!listeners[temp]) break;\n\t\t\t\tif (temp === count) count++;\n\t\t\t\tlisteners[temp] = listener;\n\t\t\t}\n\t\t\tinternal.up(listener);\n\t\t\tif (live) {\n\t\t\t\tlive = 2;\n\t\t\t\tbuffer.length = 0;\n\t\t\t}\n\t\t\treturn () => {\n\t\t\t\tif (alive && subscribed) {\n\t\t\t\t\tsubscribed = false;\n\t\t\t\t\tlisteners[temp] = void 0;\n\t\t\t\t\twhile (count > 0 && !listeners[count - 1]) count--;\n\t\t\t\t\tlisteners.length = count;\n\t\t\t\t}\n\t\t\t};\n\t\t}\n\t};\n\treturn {\n\t\t__SEROVAL_STREAM__: true,\n\t\ton(listener) {\n\t\t\treturn internal.on(listener);\n\t\t},\n\t\tnext(value) {\n\t\t\tif (alive) internal.flush(value, \"next\");\n\t\t},\n\t\tthrow(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"throw\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = false;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t},\n\t\treturn(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"return\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = true;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t}\n\t};\n})(1));_$HY.r[\"sc:slot:frame-nonlive-doc/note-streamed-streamed:counter#0\"]=$R[11]=($R[12]=$R[2]()).p;$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);_$HY.r[\"sc:deps:frame-nonlive-doc/note-streamed-streamed:0\"]=($R[13]={});</script><script>$R[6]($R[12],$R[14]={label:\"Count\"});$R[6]($R[1],!0);</script><script>$R[9].return(void 0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/generic-hydration-ab.json b/packages/web/test/harness/__artifacts__/generic-hydration-ab.json
index d314c994d..54e9caf93 100644
--- a/packages/web/test/harness/__artifacts__/generic-hydration-ab.json
+++ b/packages/web/test/harness/__artifacts__/generic-hydration-ab.json
@@ -2,7 +2,7 @@
   "shell": "<main _hk=1><h1>label:/a</h1><h2>/a</h2><!--$--><template id=\"pl-4\"></template><p _hk=40 class=\"fb a\">a-loading</p><!--pl-4--><!--/--><!--$--><template id=\"pl-5\"></template><p _hk=50 class=\"fb b\">b-loading</p><!--pl-5--><!--/--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"4_fr\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"4000\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"5_fr\"]=$R[7]=($R[8]=$R[2]()).p;_$HY.r[\"5000\"]=$R[9]=($R[10]=$R[2]()).p;</script>",
   "chunks": [
     "<script>($R[11]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[6],\"data:a\");</script>",
-    "<template id=\"4\"><section _hk=4001 class=\"a\"><span class=\"data\">data:a</span><span class=\"raw\">/a</span><span class=\"label\">label:/a</span><span class=\"shared\">shared:/a</span><ul><li _hk=400600>i0</li><li _hk=400610>i1</li></ul><button>b</button></section></template><script>$R[11]($R[1],\"shared:/a\");$df(\"4\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[11]($R[4],!0);</script>",
+    "<template id=\"4\"><section _hk=4001 class=\"a\"><span class=\"data\">data:a</span><span class=\"raw\">/a</span><span class=\"label\">label:/a</span><span class=\"shared\">shared:/a</span><ul><li _hk=400600>i0</li><li _hk=400610>i1</li></ul><button>b</button></section></template><script>$R[11]($R[1],\"shared:/a\");$df(\"4\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[11]($R[4],!0);</script>",
     "<template id=\"5\"><section _hk=5001 class=\"b\"><span class=\"data\">data:b</span><span class=\"raw\">/a</span><span class=\"label\">label:/a</span><span class=\"shared\">shared:/a</span><ul><li _hk=500600>i0</li><li _hk=500610>i1</li></ul><button>b</button></section></template><script>$R[11]($R[10],\"data:b\");$df(\"5\");</script><script>$R[11]($R[8],!0);</script>"
   ]
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/generic-hydration-ba.json b/packages/web/test/harness/__artifacts__/generic-hydration-ba.json
index 0544b2389..82a473c5b 100644
--- a/packages/web/test/harness/__artifacts__/generic-hydration-ba.json
+++ b/packages/web/test/harness/__artifacts__/generic-hydration-ba.json
@@ -2,7 +2,7 @@
   "shell": "<main _hk=1><h1>label:/a</h1><h2>/a</h2><!--$--><template id=\"pl-4\"></template><p _hk=40 class=\"fb a\">a-loading</p><!--pl-4--><!--/--><!--$--><template id=\"pl-5\"></template><p _hk=50 class=\"fb b\">b-loading</p><!--pl-5--><!--/--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"4_fr\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"4000\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"5_fr\"]=$R[7]=($R[8]=$R[2]()).p;_$HY.r[\"5000\"]=$R[9]=($R[10]=$R[2]()).p;</script>",
   "chunks": [
     "<script>($R[11]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[10],\"data:b\");</script>",
-    "<template id=\"5\"><section _hk=5001 class=\"b\"><span class=\"data\">data:b</span><span class=\"raw\">/a</span><span class=\"label\">label:/a</span><span class=\"shared\">shared:/a</span><ul><li _hk=500600>i0</li><li _hk=500610>i1</li></ul><button>b</button></section></template><script>$R[11]($R[1],\"shared:/a\");$df(\"5\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[11]($R[8],!0);</script>",
+    "<template id=\"5\"><section _hk=5001 class=\"b\"><span class=\"data\">data:b</span><span class=\"raw\">/a</span><span class=\"label\">label:/a</span><span class=\"shared\">shared:/a</span><ul><li _hk=500600>i0</li><li _hk=500610>i1</li></ul><button>b</button></section></template><script>$R[11]($R[1],\"shared:/a\");$df(\"5\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[11]($R[8],!0);</script>",
     "<template id=\"4\"><section _hk=4001 class=\"a\"><span class=\"data\">data:a</span><span class=\"raw\">/a</span><span class=\"label\">label:/a</span><span class=\"shared\">shared:/a</span><ul><li _hk=400600>i0</li><li _hk=400610>i1</li></ul><button>b</button></section></template><script>$R[11]($R[6],\"data:a\");$df(\"4\");</script><script>$R[11]($R[4],!0);</script>"
   ]
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/http-primitives-streamed-loading.json b/packages/web/test/harness/__artifacts__/http-primitives-streamed-loading.json
index fd2c289e7..0af0f6cd4 100644
--- a/packages/web/test/harness/__artifacts__/http-primitives-streamed-loading.json
+++ b/packages/web/test/harness/__artifacts__/http-primitives-streamed-loading.json
@@ -1,5 +1,5 @@
 {
   "name": "http-primitives-streamed-loading",
   "shell": "<template id=\"pl-1\"></template><p _hk=10>loading</p><!--pl-1--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"1\"><div _hk=1000><span>head</span> Value: <!--$-->42<!--/--> <span>tail</span></div></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],42);$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
+  "rest": "<template id=\"1\"><div _hk=1000><span>head</span> Value: <!--$-->42<!--/--> <span>tail</span></div></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],42);$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/hybrid-memo-handoff-memo-generator.json b/packages/web/test/harness/__artifacts__/hybrid-memo-handoff-memo-generator.json
index a8e314f28..f649b9dc6 100644
--- a/packages/web/test/harness/__artifacts__/hybrid-memo-handoff-memo-generator.json
+++ b/packages/web/test/harness/__artifacts__/hybrid-memo-handoff-memo-generator.json
@@ -1,5 +1,5 @@
 {
   "name": "hybrid-memo-handoff-memo-generator",
   "shell": "<section _hk=1><template id=\"pl-2\"></template><span _hk=20>loading</span><!--pl-2--></section><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\"><span _hk=2000>true:0</span></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"true:0\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
+  "rest": "<template id=\"2\"><span _hk=2000>true:0</span></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"true:0\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/hybrid-memo-handoff-memo-promise.json b/packages/web/test/harness/__artifacts__/hybrid-memo-handoff-memo-promise.json
index 769c4fc9a..e8372e21c 100644
--- a/packages/web/test/harness/__artifacts__/hybrid-memo-handoff-memo-promise.json
+++ b/packages/web/test/harness/__artifacts__/hybrid-memo-handoff-memo-promise.json
@@ -1,5 +1,5 @@
 {
   "name": "hybrid-memo-handoff-memo-promise",
   "shell": "<section _hk=1><template id=\"pl-2\"></template><span _hk=20>loading</span><!--pl-2--></section><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\"><span _hk=2000>true:0</span></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"true:0\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
+  "rest": "<template id=\"2\"><span _hk=2000>true:0</span></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"true:0\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/hybrid-memo-handoff-signal-generator.json b/packages/web/test/harness/__artifacts__/hybrid-memo-handoff-signal-generator.json
index d362b4273..9eaf541c1 100644
--- a/packages/web/test/harness/__artifacts__/hybrid-memo-handoff-signal-generator.json
+++ b/packages/web/test/harness/__artifacts__/hybrid-memo-handoff-signal-generator.json
@@ -1,5 +1,5 @@
 {
   "name": "hybrid-memo-handoff-signal-generator",
   "shell": "<section _hk=1><template id=\"pl-2\"></template><span _hk=20>loading</span><!--pl-2--></section><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\"><span _hk=2000>true:0</span></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"true:0\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
+  "rest": "<template id=\"2\"><span _hk=2000>true:0</span></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"true:0\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/hybrid-memo-handoff-signal-promise.json b/packages/web/test/harness/__artifacts__/hybrid-memo-handoff-signal-promise.json
index 75b5aaf48..ead6c3533 100644
--- a/packages/web/test/harness/__artifacts__/hybrid-memo-handoff-signal-promise.json
+++ b/packages/web/test/harness/__artifacts__/hybrid-memo-handoff-signal-promise.json
@@ -1,5 +1,5 @@
 {
   "name": "hybrid-memo-handoff-signal-promise",
   "shell": "<section _hk=1><template id=\"pl-2\"></template><span _hk=20>loading</span><!--pl-2--></section><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\"><span _hk=2000>true:0</span></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"true:0\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
+  "rest": "<template id=\"2\"><span _hk=2000>true:0</span></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"true:0\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/hybrid-store-handoff-3574-generator.json b/packages/web/test/harness/__artifacts__/hybrid-store-handoff-3574-generator.json
index a0b4279cb..ea30f1d35 100644
--- a/packages/web/test/harness/__artifacts__/hybrid-store-handoff-3574-generator.json
+++ b/packages/web/test/harness/__artifacts__/hybrid-store-handoff-3574-generator.json
@@ -1,5 +1,5 @@
 {
   "name": "hybrid-store-handoff-3574-generator",
   "shell": "<section _hk=1><template id=\"pl-2\"></template><span _hk=20>loading</span><!--pl-2--></section><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\"><span _hk=2000>true:0</span></template><script>($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[5]={ready:!0,count:0});$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[4],!0);</script>"
+  "rest": "<template id=\"2\"><span _hk=2000>true:0</span></template><script>($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[5]={ready:!0,count:0});$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/hybrid-store-handoff-3574-promise.json b/packages/web/test/harness/__artifacts__/hybrid-store-handoff-3574-promise.json
index 214e03825..54087369c 100644
--- a/packages/web/test/harness/__artifacts__/hybrid-store-handoff-3574-promise.json
+++ b/packages/web/test/harness/__artifacts__/hybrid-store-handoff-3574-promise.json
@@ -1,5 +1,5 @@
 {
   "name": "hybrid-store-handoff-3574-promise",
   "shell": "<section _hk=1><template id=\"pl-2\"></template><span _hk=20>loading</span><!--pl-2--></section><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\"><span _hk=2000>true:0</span></template><script>($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[5]={ready:!0,count:0});$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[4],!0);</script>"
+  "rest": "<template id=\"2\"><span _hk=2000>true:0</span></template><script>($R[6]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[5]={ready:!0,count:0});$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/late-boundary-after-done.json b/packages/web/test/harness/__artifacts__/late-boundary-after-done.json
index afe358194..2adb6e7e9 100644
--- a/packages/web/test/harness/__artifacts__/late-boundary-after-done.json
+++ b/packages/web/test/harness/__artifacts__/late-boundary-after-done.json
@@ -1,5 +1,5 @@
 {
   "name": "late-boundary-after-done",
   "shell": "<div _hk=2><span>lead </span><!--$--><template id=\"pl-40\"></template><p _hk=400>waiting</p><!--pl-40--><!--/--><span> tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1\"]=$R[3]=($R[4]=$R[2]()).p;($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],1);_$HY.r[\"40_fr\"]=$R[6]=($R[7]=$R[2]()).p;</script>",
-  "rest": "<template id=\"40\"><section _hk=40000>late content</section></template><script>$R[5]($R[4],\"late content\");$df(\"40\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[7],!0);</script>"
+  "rest": "<template id=\"40\"><section _hk=40000>late content</section></template><script>$R[5]($R[4],\"late content\");$df(\"40\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[7],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/live-shell-source-3764.json b/packages/web/test/harness/__artifacts__/live-shell-source-3764.json
index ebd146f00..3e15b7812 100644
--- a/packages/web/test/harness/__artifacts__/live-shell-source-3764.json
+++ b/packages/web/test/harness/__artifacts__/live-shell-source-3764.json
@@ -2,19 +2,19 @@
   "a": {
     "shell": "<template id=\"pl-1\"></template><!--pl-1--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
     "chunks": [
-      "<template id=\"1\"><ul _hk=10020 class=\"a\"><li>rows: <!--$-->2<!--/--></li></ul></template><script>($R[8]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[5]=[$R[6]={id:1},$R[7]={id:2}]);$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[8]($R[4],!0);</script>"
+      "<template id=\"1\"><ul _hk=10020 class=\"a\"><li>rows: <!--$-->2<!--/--></li></ul></template><script>($R[8]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[5]=[$R[6]={id:1},$R[7]={id:2}]);$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[8]($R[4],!0);</script>"
     ]
   },
   "b": {
     "shell": "<template id=\"pl-200\"></template><!--pl-200--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"200_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
     "chunks": [
-      "<template id=\"200\"><ul _hk=200000 class=\"b\"><li _hk=20000100>1</li><li _hk=20000110>2</li></ul></template><script>($R[8]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[5]=[$R[6]={id:1},$R[7]={id:2}]);$df(\"200\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[8]($R[4],!0);</script>"
+      "<template id=\"200\"><ul _hk=200000 class=\"b\"><li _hk=20000100>1</li><li _hk=20000110>2</li></ul></template><script>($R[8]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[5]=[$R[6]={id:1},$R[7]={id:2}]);$df(\"200\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[8]($R[4],!0);</script>"
     ]
   },
   "c": {
     "shell": "<h1 _hk=3>shell</h1><template id=\"pl-5\"></template><!--pl-5--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"2\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"5_fr\"]=$R[7]=($R[8]=$R[2]()).p;($R[12]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[9]=[$R[10]={id:1},$R[11]={id:2}]);$R[12]($R[4],\"shell\");</script>",
     "chunks": [
-      "<template id=\"5\"><ul _hk=5000 class=\"c\"><li>slow</li><li>rows: <!--$-->2<!--/--></li></ul></template><script>$R[12]($R[6],\"slow\");$df(\"5\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[12]($R[8],!0);</script>"
+      "<template id=\"5\"><ul _hk=5000 class=\"c\"><li>slow</li><li>rows: <!--$-->2<!--/--></li></ul></template><script>$R[12]($R[6],\"slow\");$df(\"5\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[12]($R[8],!0);</script>"
     ]
   }
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/loading-fallback-reactive-text.json b/packages/web/test/harness/__artifacts__/loading-fallback-reactive-text.json
index 84956f13e..802893719 100644
--- a/packages/web/test/harness/__artifacts__/loading-fallback-reactive-text.json
+++ b/packages/web/test/harness/__artifacts__/loading-fallback-reactive-text.json
@@ -1,5 +1,5 @@
 {
   "name": "loading-fallback-reactive-text",
   "shell": "<div _hk=1><h1>head </h1><!--$--><template id=\"pl-2\"></template>0<!--pl-2--><!--/--></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\">done</template><script>$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"done\");</script><script>$R[5]($R[4],!0);</script>"
+  "rest": "<template id=\"2\">done</template><script>$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"done\");</script><script>$R[5]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/loading-fallback-ternary.json b/packages/web/test/harness/__artifacts__/loading-fallback-ternary.json
index df4acb39c..f0a455645 100644
--- a/packages/web/test/harness/__artifacts__/loading-fallback-ternary.json
+++ b/packages/web/test/harness/__artifacts__/loading-fallback-ternary.json
@@ -1,5 +1,5 @@
 {
   "name": "loading-fallback-ternary",
   "shell": "<div _hk=1><!--$--><template id=\"pl-2\"></template>wait-a<!--pl-2--><!--/--><p>tail</p></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\"><p _hk=2000>L: <!--$-->ldata<!--/--></p></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"ldata\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
+  "rest": "<template id=\"2\"><p _hk=2000>L: <!--$-->ldata<!--/--></p></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"ldata\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/loading-on-boundary.json b/packages/web/test/harness/__artifacts__/loading-on-boundary.json
index 9f67027bf..0a732188e 100644
--- a/packages/web/test/harness/__artifacts__/loading-on-boundary.json
+++ b/packages/web/test/harness/__artifacts__/loading-on-boundary.json
@@ -1,5 +1,5 @@
 {
   "name": "loading-on-boundary",
   "shell": "<div _hk=1><p>shell</p><!--$--><template id=\"pl-2\"></template><em _hk=20>wait</em><!--pl-2--><!--/--></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\"><span _hk=2010>late</span><b _hk=2012>#<!--$-->lobby<!--/--></b></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"late\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
+  "rest": "<template id=\"2\"><span _hk=2010>late</span><b _hk=2012>#<!--$-->lobby<!--/--></b></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"late\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/memo-live-resume.json b/packages/web/test/harness/__artifacts__/memo-live-resume.json
index b48db3a29..b8d8e1324 100644
--- a/packages/web/test/harness/__artifacts__/memo-live-resume.json
+++ b/packages/web/test/harness/__artifacts__/memo-live-resume.json
@@ -1,5 +1,5 @@
 {
   "name": "memo-live-resume",
   "shell": "<template id=\"pl-1\"></template><p _hk=10>loading</p><!--pl-1--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=($R[0]={[$R[1]=Symbol.asyncIterator]:(($R[3]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n},$R[2]=((symbol, createPromise) => (stream) => () => {\n\tlet count = 0;\n\tlet doneAt = -1;\n\tlet isThrow = false;\n\tconst buffer = [];\n\tconst pending = [];\n\tconst internal = { finalize(i = 0, len = pending.length) {\n\t\tfor (; i < len; i++) pending[i].s({\n\t\t\tdone: true,\n\t\t\tvalue: void 0\n\t\t});\n\t} };\n\tstream.on({\n\t\tnext(value) {\n\t\t\tconst temp = pending.shift();\n\t\t\tif (temp) temp.s({\n\t\t\t\tdone: false,\n\t\t\t\tvalue\n\t\t\t});\n\t\t\tbuffer.push(value);\n\t\t},\n\t\tthrow(value) {\n\t\t\tconst temp = pending.shift();\n\t\t\tif (temp) temp.f(value);\n\t\t\tinternal.finalize();\n\t\t\tdoneAt = buffer.length;\n\t\t\tisThrow = true;\n\t\t\tbuffer.push(value);\n\t\t},\n\t\treturn(value) {\n\t\t\tconst temp = pending.shift();\n\t\t\tif (temp) temp.s({\n\t\t\t\tdone: true,\n\t\t\t\tvalue\n\t\t\t});\n\t\t\tinternal.finalize();\n\t\t\tdoneAt = buffer.length;\n\t\t\tbuffer.push(value);\n\t\t}\n\t});\n\tconst instance = {\n\t\t[symbol]() {\n\t\t\treturn instance;\n\t\t},\n\t\tnext() {\n\t\t\tif (doneAt === -1) {\n\t\t\t\tconst index = count++;\n\t\t\t\tif (index >= buffer.length) {\n\t\t\t\t\tconst temp = createPromise();\n\t\t\t\t\tpending.push(temp);\n\t\t\t\t\treturn temp.p;\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\tdone: false,\n\t\t\t\t\tvalue: buffer[index]\n\t\t\t\t};\n\t\t\t}\n\t\t\tif (count > doneAt) return {\n\t\t\t\tdone: true,\n\t\t\t\tvalue: void 0\n\t\t\t};\n\t\t\tconst index = count++;\n\t\t\tconst value = buffer[index];\n\t\t\tif (index !== doneAt) return {\n\t\t\t\tdone: false,\n\t\t\t\tvalue\n\t\t\t};\n\t\t\tif (isThrow) throw value;\n\t\t\treturn {\n\t\t\t\tdone: true,\n\t\t\t\tvalue\n\t\t\t};\n\t\t}\n\t};\n\treturn instance;\n})($R[1],$R[3])))($R[4]=($R[5]=(live) => {\n\tconst buffer = [];\n\tconst listeners = [];\n\tlet alive = true;\n\tlet success = false;\n\tlet count = 0;\n\tconst internal = {\n\t\tflush(value, mode, x) {\n\t\t\tlive > 1 || buffer.push(value);\n\t\t\tfor (x = 0; x < count; x++) {\n\t\t\t\tconst listener = listeners[x];\n\t\t\t\tif (listener) listener[mode](value);\n\t\t\t}\n\t\t},\n\t\tup(listener, x, z, current) {\n\t\t\tfor (x = 0, z = buffer.length; x < z; x++) {\n\t\t\t\tcurrent = buffer[x];\n\t\t\t\tif (!alive && x === z - 1) listener[success ? \"return\" : \"throw\"](current);\n\t\t\t\telse listener.next(current);\n\t\t\t}\n\t\t},\n\t\ton(listener, temp = 0) {\n\t\t\tif (live > 1) throw new Error(\"Stream consumed\");\n\t\t\tlet subscribed = alive;\n\t\t\tif (alive) {\n\t\t\t\tfor (temp = 0; temp < count; temp++) if (!listeners[temp]) break;\n\t\t\t\tif (temp === count) count++;\n\t\t\t\tlisteners[temp] = listener;\n\t\t\t}\n\t\t\tinternal.up(listener);\n\t\t\tif (live) {\n\t\t\t\tlive = 2;\n\t\t\t\tbuffer.length = 0;\n\t\t\t}\n\t\t\treturn () => {\n\t\t\t\tif (alive && subscribed) {\n\t\t\t\t\tsubscribed = false;\n\t\t\t\t\tlisteners[temp] = void 0;\n\t\t\t\t\twhile (count > 0 && !listeners[count - 1]) count--;\n\t\t\t\t\tlisteners.length = count;\n\t\t\t\t}\n\t\t\t};\n\t\t}\n\t};\n\treturn {\n\t\t__SEROVAL_STREAM__: true,\n\t\ton(listener) {\n\t\t\treturn internal.on(listener);\n\t\t},\n\t\tnext(value) {\n\t\t\tif (alive) internal.flush(value, \"next\");\n\t\t},\n\t\tthrow(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"throw\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = false;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t},\n\t\treturn(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"return\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = true;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t}\n\t};\n})())});_$HY.r[\"1_fr\"]=$R[6]=($R[7]=$R[3]()).p;</script>",
-  "rest": "<template id=\"1\"><div _hk=1000><span>idle</span><b>tail</b></div></template><script>$R[4].next(\"idle\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[8]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[7],!0);</script><script>$R[4].return(void 0);</script>"
+  "rest": "<template id=\"1\"><div _hk=1000><span>idle</span><b>tail</b></div></template><script>$R[4].next(\"idle\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[8]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[7],!0);</script><script>$R[4].return(void 0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/nav-before-resume.json b/packages/web/test/harness/__artifacts__/nav-before-resume.json
index 671cbc360..b36ccb3ba 100644
--- a/packages/web/test/harness/__artifacts__/nav-before-resume.json
+++ b/packages/web/test/harness/__artifacts__/nav-before-resume.json
@@ -1,7 +1,7 @@
 {
   "shell": "<main _hk=3><h1>title:/a</h1><h2>label:/a</h2><!--$--><template id=\"pl-6\"></template><p _hk=60>side-loading</p><!--pl-6--><!--/--><!--$--><section _hk=91><template id=\"pl-92\"></template><i _hk=920>a-loading</i><!--pl-92--></section><!--/--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"lib:side\"]=($R[0]={n:42});_$HY.r[\"0\"]=$R[1]=($R[2]=($R[3]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"6_fr\"]=$R[4]=($R[5]=$R[3]()).p;_$HY.r[\"6000\"]=$R[6]=($R[7]=$R[3]()).p;_$HY.r[\"90\"]=$R[8]=($R[9]=$R[3]()).p;_$HY.r[\"92_fr\"]=$R[10]=($R[11]=$R[3]()).p;($R[12]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[2],\"title:/a\");</script>",
   "chunks": [
-    "<template id=\"92\"><b _hk=92000>a-data</b></template><script>$R[12]($R[9],\"a-data\");$df(\"92\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[12]($R[11],!0);</script>",
+    "<template id=\"92\"><b _hk=92000>a-data</b></template><script>$R[12]($R[9],\"a-data\");$df(\"92\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[12]($R[11],!0);</script>",
     "<template id=\"6\"><aside _hk=6001>side-data</aside></template><script>$R[12]($R[7],\"side-data\");$df(\"6\");</script><script>$R[12]($R[5],!0);</script>"
   ]
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/onsettled-store-write-3950-reconcile.json b/packages/web/test/harness/__artifacts__/onsettled-store-write-3950-reconcile.json
index 402fdfbf8..5b62044e2 100644
--- a/packages/web/test/harness/__artifacts__/onsettled-store-write-3950-reconcile.json
+++ b/packages/web/test/harness/__artifacts__/onsettled-store-write-3950-reconcile.json
@@ -1,6 +1,6 @@
 {
   "shell": "<main _hk=1><template id=\"pl-2\"></template><p _hk=20>pending</p><!--pl-2--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
   "chunks": [
-    "<template id=\"2\"><ul _hk=2001><li _hk=200200>remove</li><li _hk=200210>keep</li></ul></template><script>($R[9]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[5]={items:$R[6]=[$R[7]={id:\"a\",label:\"remove\"},$R[8]={id:\"b\",label:\"keep\"}]});$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[9]($R[4],!0);</script>"
+    "<template id=\"2\"><ul _hk=2001><li _hk=200200>remove</li><li _hk=200210>keep</li></ul></template><script>($R[9]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[5]={items:$R[6]=[$R[7]={id:\"a\",label:\"remove\"},$R[8]={id:\"b\",label:\"keep\"}]});$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[9]($R[4],!0);</script>"
   ]
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/onsettled-store-write-3950-splice.json b/packages/web/test/harness/__artifacts__/onsettled-store-write-3950-splice.json
index 402fdfbf8..5b62044e2 100644
--- a/packages/web/test/harness/__artifacts__/onsettled-store-write-3950-splice.json
+++ b/packages/web/test/harness/__artifacts__/onsettled-store-write-3950-splice.json
@@ -1,6 +1,6 @@
 {
   "shell": "<main _hk=1><template id=\"pl-2\"></template><p _hk=20>pending</p><!--pl-2--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
   "chunks": [
-    "<template id=\"2\"><ul _hk=2001><li _hk=200200>remove</li><li _hk=200210>keep</li></ul></template><script>($R[9]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[5]={items:$R[6]=[$R[7]={id:\"a\",label:\"remove\"},$R[8]={id:\"b\",label:\"keep\"}]});$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[9]($R[4],!0);</script>"
+    "<template id=\"2\"><ul _hk=2001><li _hk=200200>remove</li><li _hk=200210>keep</li></ul></template><script>($R[9]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],$R[5]={items:$R[6]=[$R[7]={id:\"a\",label:\"remove\"},$R[8]={id:\"b\",label:\"keep\"}]});$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[9]($R[4],!0);</script>"
   ]
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/onsettled-write-shell-beside-pending-boundary.json b/packages/web/test/harness/__artifacts__/onsettled-write-shell-beside-pending-boundary.json
index e12ec3cb2..468624e08 100644
--- a/packages/web/test/harness/__artifacts__/onsettled-write-shell-beside-pending-boundary.json
+++ b/packages/web/test/harness/__artifacts__/onsettled-write-shell-beside-pending-boundary.json
@@ -1,5 +1,5 @@
 {
   "name": "onsettled-write-shell-beside-pending-boundary",
   "shell": "<div _hk=2><button disabled>send</button><p>nobody</p><!--$--><template id=\"pl-4\"></template><em _hk=40>wait</em><!--pl-4--><!--/--></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"1\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"4_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"4\"><span _hk=4000>late</span></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"late\");$df(\"4\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
+  "rest": "<template id=\"4\"><span _hk=4000>late</span></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"late\");$df(\"4\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/onsettled-write-show-streamed.json b/packages/web/test/harness/__artifacts__/onsettled-write-show-streamed.json
index e39acb4ab..05534fb52 100644
--- a/packages/web/test/harness/__artifacts__/onsettled-write-show-streamed.json
+++ b/packages/web/test/harness/__artifacts__/onsettled-write-show-streamed.json
@@ -1,5 +1,5 @@
 {
   "name": "onsettled-write-show-streamed",
   "shell": "<template id=\"pl-30\"></template><main _hk=300>Loading…</main><!--pl-30--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"30_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"30000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"30\"><main _hk=30002>Hello</main></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"Hello\");$df(\"30\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[1],!0);</script>"
+  "rest": "<template id=\"30\"><main _hk=30002>Hello</main></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"Hello\");$df(\"30\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[1],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/portal-before-siblings.json b/packages/web/test/harness/__artifacts__/portal-before-siblings.json
index 826e6d21a..d4bc225bc 100644
--- a/packages/web/test/harness/__artifacts__/portal-before-siblings.json
+++ b/packages/web/test/harness/__artifacts__/portal-before-siblings.json
@@ -1,5 +1,5 @@
 {
   "name": "portal-before-siblings",
   "shell": "<template id=\"pl-1\"></template><p _hk=10>loading</p><!--pl-1--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"1\"><div _hk=1000><span>lead </span><!--$--><!--/--><!--$--><h4 _hk=10030>head </h4><!--/--><span>srv</span><section></section></div></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"srv\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
+  "rest": "<template id=\"1\"><div _hk=1000><span>lead </span><!--$--><!--/--><!--$--><h4 _hk=10030>head </h4><!--/--><span>srv</span><section></section></div></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"srv\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[4],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/projection-live-resume.json b/packages/web/test/harness/__artifacts__/projection-live-resume.json
index 8aa37db41..393a3649e 100644
--- a/packages/web/test/harness/__artifacts__/projection-live-resume.json
+++ b/packages/web/test/harness/__artifacts__/projection-live-resume.json
@@ -1,5 +1,5 @@
 {
   "name": "projection-live-resume",
   "shell": "<template id=\"pl-1\"></template><p _hk=10>loading</p><!--pl-1--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=($R[0]={[$R[1]=Symbol.asyncIterator]:(($R[3]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n},$R[2]=((symbol, createPromise) => (stream) => () => {\n\tlet count = 0;\n\tlet doneAt = -1;\n\tlet isThrow = false;\n\tconst buffer = [];\n\tconst pending = [];\n\tconst internal = { finalize(i = 0, len = pending.length) {\n\t\tfor (; i < len; i++) pending[i].s({\n\t\t\tdone: true,\n\t\t\tvalue: void 0\n\t\t});\n\t} };\n\tstream.on({\n\t\tnext(value) {\n\t\t\tconst temp = pending.shift();\n\t\t\tif (temp) temp.s({\n\t\t\t\tdone: false,\n\t\t\t\tvalue\n\t\t\t});\n\t\t\tbuffer.push(value);\n\t\t},\n\t\tthrow(value) {\n\t\t\tconst temp = pending.shift();\n\t\t\tif (temp) temp.f(value);\n\t\t\tinternal.finalize();\n\t\t\tdoneAt = buffer.length;\n\t\t\tisThrow = true;\n\t\t\tbuffer.push(value);\n\t\t},\n\t\treturn(value) {\n\t\t\tconst temp = pending.shift();\n\t\t\tif (temp) temp.s({\n\t\t\t\tdone: true,\n\t\t\t\tvalue\n\t\t\t});\n\t\t\tinternal.finalize();\n\t\t\tdoneAt = buffer.length;\n\t\t\tbuffer.push(value);\n\t\t}\n\t});\n\tconst instance = {\n\t\t[symbol]() {\n\t\t\treturn instance;\n\t\t},\n\t\tnext() {\n\t\t\tif (doneAt === -1) {\n\t\t\t\tconst index = count++;\n\t\t\t\tif (index >= buffer.length) {\n\t\t\t\t\tconst temp = createPromise();\n\t\t\t\t\tpending.push(temp);\n\t\t\t\t\treturn temp.p;\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\tdone: false,\n\t\t\t\t\tvalue: buffer[index]\n\t\t\t\t};\n\t\t\t}\n\t\t\tif (count > doneAt) return {\n\t\t\t\tdone: true,\n\t\t\t\tvalue: void 0\n\t\t\t};\n\t\t\tconst index = count++;\n\t\t\tconst value = buffer[index];\n\t\t\tif (index !== doneAt) return {\n\t\t\t\tdone: false,\n\t\t\t\tvalue\n\t\t\t};\n\t\t\tif (isThrow) throw value;\n\t\t\treturn {\n\t\t\t\tdone: true,\n\t\t\t\tvalue\n\t\t\t};\n\t\t}\n\t};\n\treturn instance;\n})($R[1],$R[3])))($R[4]=($R[5]=(live) => {\n\tconst buffer = [];\n\tconst listeners = [];\n\tlet alive = true;\n\tlet success = false;\n\tlet count = 0;\n\tconst internal = {\n\t\tflush(value, mode, x) {\n\t\t\tlive > 1 || buffer.push(value);\n\t\t\tfor (x = 0; x < count; x++) {\n\t\t\t\tconst listener = listeners[x];\n\t\t\t\tif (listener) listener[mode](value);\n\t\t\t}\n\t\t},\n\t\tup(listener, x, z, current) {\n\t\t\tfor (x = 0, z = buffer.length; x < z; x++) {\n\t\t\t\tcurrent = buffer[x];\n\t\t\t\tif (!alive && x === z - 1) listener[success ? \"return\" : \"throw\"](current);\n\t\t\t\telse listener.next(current);\n\t\t\t}\n\t\t},\n\t\ton(listener, temp = 0) {\n\t\t\tif (live > 1) throw new Error(\"Stream consumed\");\n\t\t\tlet subscribed = alive;\n\t\t\tif (alive) {\n\t\t\t\tfor (temp = 0; temp < count; temp++) if (!listeners[temp]) break;\n\t\t\t\tif (temp === count) count++;\n\t\t\t\tlisteners[temp] = listener;\n\t\t\t}\n\t\t\tinternal.up(listener);\n\t\t\tif (live) {\n\t\t\t\tlive = 2;\n\t\t\t\tbuffer.length = 0;\n\t\t\t}\n\t\t\treturn () => {\n\t\t\t\tif (alive && subscribed) {\n\t\t\t\t\tsubscribed = false;\n\t\t\t\t\tlisteners[temp] = void 0;\n\t\t\t\t\twhile (count > 0 && !listeners[count - 1]) count--;\n\t\t\t\t\tlisteners.length = count;\n\t\t\t\t}\n\t\t\t};\n\t\t}\n\t};\n\treturn {\n\t\t__SEROVAL_STREAM__: true,\n\t\ton(listener) {\n\t\t\treturn internal.on(listener);\n\t\t},\n\t\tnext(value) {\n\t\t\tif (alive) internal.flush(value, \"next\");\n\t\t},\n\t\tthrow(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"throw\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = false;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t},\n\t\treturn(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"return\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = true;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t}\n\t};\n})())});_$HY.r[\"1_fr\"]=$R[6]=($R[7]=$R[3]()).p;</script>",
-  "rest": "<template id=\"1\"><div _hk=1000><span>idle</span><b>tail</b></div></template><script>$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[8]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[7],!0);$R[4].next($R[9]={items:$R[10]=[\"idle\"]});</script><script>$R[4].return(void 0);</script>"
+  "rest": "<template id=\"1\"><div _hk=1000><span>idle</span><b>tail</b></div></template><script>$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[8]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[7],!0);$R[4].next($R[9]={items:$R[10]=[\"idle\"]});</script><script>$R[4].return(void 0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/projection-repeat-stream.json b/packages/web/test/harness/__artifacts__/projection-repeat-stream.json
index 14eb9a35a..67e4ea735 100644
--- a/packages/web/test/harness/__artifacts__/projection-repeat-stream.json
+++ b/packages/web/test/harness/__artifacts__/projection-repeat-stream.json
@@ -1,5 +1,5 @@
 {
   "name": "projection-repeat-stream",
   "shell": "<template id=\"pl-1\"></template><p _hk=10>loading</p><!--pl-1--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=($R[0]={[$R[1]=Symbol.asyncIterator]:(($R[3]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n},$R[2]=((symbol, createPromise) => (stream) => () => {\n\tlet count = 0;\n\tlet doneAt = -1;\n\tlet isThrow = false;\n\tconst buffer = [];\n\tconst pending = [];\n\tconst internal = { finalize(i = 0, len = pending.length) {\n\t\tfor (; i < len; i++) pending[i].s({\n\t\t\tdone: true,\n\t\t\tvalue: void 0\n\t\t});\n\t} };\n\tstream.on({\n\t\tnext(value) {\n\t\t\tconst temp = pending.shift();\n\t\t\tif (temp) temp.s({\n\t\t\t\tdone: false,\n\t\t\t\tvalue\n\t\t\t});\n\t\t\tbuffer.push(value);\n\t\t},\n\t\tthrow(value) {\n\t\t\tconst temp = pending.shift();\n\t\t\tif (temp) temp.f(value);\n\t\t\tinternal.finalize();\n\t\t\tdoneAt = buffer.length;\n\t\t\tisThrow = true;\n\t\t\tbuffer.push(value);\n\t\t},\n\t\treturn(value) {\n\t\t\tconst temp = pending.shift();\n\t\t\tif (temp) temp.s({\n\t\t\t\tdone: true,\n\t\t\t\tvalue\n\t\t\t});\n\t\t\tinternal.finalize();\n\t\t\tdoneAt = buffer.length;\n\t\t\tbuffer.push(value);\n\t\t}\n\t});\n\tconst instance = {\n\t\t[symbol]() {\n\t\t\treturn instance;\n\t\t},\n\t\tnext() {\n\t\t\tif (doneAt === -1) {\n\t\t\t\tconst index = count++;\n\t\t\t\tif (index >= buffer.length) {\n\t\t\t\t\tconst temp = createPromise();\n\t\t\t\t\tpending.push(temp);\n\t\t\t\t\treturn temp.p;\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\tdone: false,\n\t\t\t\t\tvalue: buffer[index]\n\t\t\t\t};\n\t\t\t}\n\t\t\tif (count > doneAt) return {\n\t\t\t\tdone: true,\n\t\t\t\tvalue: void 0\n\t\t\t};\n\t\t\tconst index = count++;\n\t\t\tconst value = buffer[index];\n\t\t\tif (index !== doneAt) return {\n\t\t\t\tdone: false,\n\t\t\t\tvalue\n\t\t\t};\n\t\t\tif (isThrow) throw value;\n\t\t\treturn {\n\t\t\t\tdone: true,\n\t\t\t\tvalue\n\t\t\t};\n\t\t}\n\t};\n\treturn instance;\n})($R[1],$R[3])))($R[4]=($R[5]=(live) => {\n\tconst buffer = [];\n\tconst listeners = [];\n\tlet alive = true;\n\tlet success = false;\n\tlet count = 0;\n\tconst internal = {\n\t\tflush(value, mode, x) {\n\t\t\tlive > 1 || buffer.push(value);\n\t\t\tfor (x = 0; x < count; x++) {\n\t\t\t\tconst listener = listeners[x];\n\t\t\t\tif (listener) listener[mode](value);\n\t\t\t}\n\t\t},\n\t\tup(listener, x, z, current) {\n\t\t\tfor (x = 0, z = buffer.length; x < z; x++) {\n\t\t\t\tcurrent = buffer[x];\n\t\t\t\tif (!alive && x === z - 1) listener[success ? \"return\" : \"throw\"](current);\n\t\t\t\telse listener.next(current);\n\t\t\t}\n\t\t},\n\t\ton(listener, temp = 0) {\n\t\t\tif (live > 1) throw new Error(\"Stream consumed\");\n\t\t\tlet subscribed = alive;\n\t\t\tif (alive) {\n\t\t\t\tfor (temp = 0; temp < count; temp++) if (!listeners[temp]) break;\n\t\t\t\tif (temp === count) count++;\n\t\t\t\tlisteners[temp] = listener;\n\t\t\t}\n\t\t\tinternal.up(listener);\n\t\t\tif (live) {\n\t\t\t\tlive = 2;\n\t\t\t\tbuffer.length = 0;\n\t\t\t}\n\t\t\treturn () => {\n\t\t\t\tif (alive && subscribed) {\n\t\t\t\t\tsubscribed = false;\n\t\t\t\t\tlisteners[temp] = void 0;\n\t\t\t\t\twhile (count > 0 && !listeners[count - 1]) count--;\n\t\t\t\t\tlisteners.length = count;\n\t\t\t\t}\n\t\t\t};\n\t\t}\n\t};\n\treturn {\n\t\t__SEROVAL_STREAM__: true,\n\t\ton(listener) {\n\t\t\treturn internal.on(listener);\n\t\t},\n\t\tnext(value) {\n\t\t\tif (alive) internal.flush(value, \"next\");\n\t\t},\n\t\tthrow(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"throw\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = false;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t},\n\t\treturn(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"return\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = true;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t}\n\t};\n})())});_$HY.r[\"1_fr\"]=$R[6]=($R[7]=$R[3]()).p;</script>",
-  "rest": "<template id=\"1\"><ul _hk=1000><li _hk=100100><!--$-->1<!--/-->:<!--$-->one<!--/--></li></ul></template><script>$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[8]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[7],!0);$R[4].next($R[9]=[$R[10]={id:1,text:\"one\"}]);</script><script>$R[4].next($R[11]=[$R[12]=[$R[13]=[\"1\"],$R[14]={id:2,text:\"two\"}],$R[15]=[$R[16]=[\"length\"],2]]);</script><script>$R[4].next($R[17]=[$R[18]=[$R[19]=[\"2\"],$R[20]={id:3,text:\"three\"}],$R[21]=[$R[22]=[\"length\"],3]]);</script><script>$R[4].next($R[23]=[$R[24]=[$R[25]=[\"3\"],$R[26]={id:4,text:\"four\"}],$R[27]=[$R[28]=[\"length\"],4]]);</script><script>$R[4].next($R[29]=[$R[30]=[$R[31]=[\"4\"],$R[32]={id:5,text:\"five\"}],$R[33]=[$R[34]=[\"length\"],5]]);</script><script>$R[4].return(void 0);</script>"
+  "rest": "<template id=\"1\"><ul _hk=1000><li _hk=100100><!--$-->1<!--/-->:<!--$-->one<!--/--></li></ul></template><script>$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[8]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[7],!0);$R[4].next($R[9]=[$R[10]={id:1,text:\"one\"}]);</script><script>$R[4].next($R[11]=[$R[12]=[$R[13]=[\"1\"],$R[14]={id:2,text:\"two\"}],$R[15]=[$R[16]=[\"length\"],2]]);</script><script>$R[4].next($R[17]=[$R[18]=[$R[19]=[\"2\"],$R[20]={id:3,text:\"three\"}],$R[21]=[$R[22]=[\"length\"],3]]);</script><script>$R[4].next($R[23]=[$R[24]=[$R[25]=[\"3\"],$R[26]={id:4,text:\"four\"}],$R[27]=[$R[28]=[\"length\"],4]]);</script><script>$R[4].next($R[29]=[$R[30]=[$R[31]=[\"4\"],$R[32]={id:5,text:\"five\"}],$R[33]=[$R[34]=[\"length\"],5]]);</script><script>$R[4].return(void 0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/use-head-stylesheet-streamed-boundary.json b/packages/web/test/harness/__artifacts__/use-head-stylesheet-streamed-boundary.json
index c0a7480d6..863bd1cf5 100644
--- a/packages/web/test/harness/__artifacts__/use-head-stylesheet-streamed-boundary.json
+++ b/packages/web/test/harness/__artifacts__/use-head-stylesheet-streamed-boundary.json
@@ -1,5 +1,5 @@
 {
   "name": "use-head-stylesheet-streamed-boundary",
   "shell": "<div _hk=0><span>lead </span><!--$--><template id=\"pl-1\"></template><p _hk=10>waiting</p><!--pl-1--><!--/--><span> tail <!--$-->0<!--/--></span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"1_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"1\"><section _hk=1001>late styled</section></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"late styled\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[1],!0);</script>"
+  "rest": "<template id=\"1\"><section _hk=1001>late styled</section></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"late styled\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[5]($R[1],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/welcome-status-loaded.json b/packages/web/test/harness/__artifacts__/welcome-status-loaded.json
index 933816757..633044148 100644
--- a/packages/web/test/harness/__artifacts__/welcome-status-loaded.json
+++ b/packages/web/test/harness/__artifacts__/welcome-status-loaded.json
@@ -1,5 +1,5 @@
 {
   "name": "welcome-status-loaded",
   "shell": "<solid-frame data-fid=\"parity/welcome-loaded\" style=\"display:contents\"><section class=\"reply\"><!--slot:status#0:start--><div _hk=sc-parity/welcome-loaded-status#0-0 class=\"status\"><!--$--><span _hk=sc-parity/welcome-loaded-status#0-1000 class=\"meter\">¶ <!--$-->1<!--/--></span><!--/--><!--$--><template id=\"pl-sc-parity/welcome-loaded-status#0-2\"></template><template id=\"pl-sc-parity/welcome-loaded-status#0-20\"></template><span _hk=sc-parity/welcome-loaded-status#0-200 class=\"ticker\">…</span><!--pl-sc-parity/welcome-loaded-status#0-20--><!--pl-sc-parity/welcome-loaded-status#0-2--><!--/--></div><!--slot:status#0:end--></section></solid-frame><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"sc:live\"]=$R[0]=($R[1]=(stream) => new ReadableStream({ start(controller) {\n\tstream.on({\n\t\tnext(value) {\n\t\t\ttry {\n\t\t\t\tcontroller.enqueue(value);\n\t\t\t} catch (_error) {}\n\t\t},\n\t\tthrow(value) {\n\t\t\tcontroller.error(value);\n\t\t},\n\t\treturn() {\n\t\t\ttry {\n\t\t\t\tcontroller.close();\n\t\t\t} catch (_error) {}\n\t\t}\n\t});\n} }))($R[2]=($R[3]=(live) => {\n\tconst buffer = [];\n\tconst listeners = [];\n\tlet alive = true;\n\tlet success = false;\n\tlet count = 0;\n\tconst internal = {\n\t\tflush(value, mode, x) {\n\t\t\tlive > 1 || buffer.push(value);\n\t\t\tfor (x = 0; x < count; x++) {\n\t\t\t\tconst listener = listeners[x];\n\t\t\t\tif (listener) listener[mode](value);\n\t\t\t}\n\t\t},\n\t\tup(listener, x, z, current) {\n\t\t\tfor (x = 0, z = buffer.length; x < z; x++) {\n\t\t\t\tcurrent = buffer[x];\n\t\t\t\tif (!alive && x === z - 1) listener[success ? \"return\" : \"throw\"](current);\n\t\t\t\telse listener.next(current);\n\t\t\t}\n\t\t},\n\t\ton(listener, temp = 0) {\n\t\t\tif (live > 1) throw new Error(\"Stream consumed\");\n\t\t\tlet subscribed = alive;\n\t\t\tif (alive) {\n\t\t\t\tfor (temp = 0; temp < count; temp++) if (!listeners[temp]) break;\n\t\t\t\tif (temp === count) count++;\n\t\t\t\tlisteners[temp] = listener;\n\t\t\t}\n\t\t\tinternal.up(listener);\n\t\t\tif (live) {\n\t\t\t\tlive = 2;\n\t\t\t\tbuffer.length = 0;\n\t\t\t}\n\t\t\treturn () => {\n\t\t\t\tif (alive && subscribed) {\n\t\t\t\t\tsubscribed = false;\n\t\t\t\t\tlisteners[temp] = void 0;\n\t\t\t\t\twhile (count > 0 && !listeners[count - 1]) count--;\n\t\t\t\t\tlisteners.length = count;\n\t\t\t\t}\n\t\t\t};\n\t\t}\n\t};\n\treturn {\n\t\t__SEROVAL_STREAM__: true,\n\t\ton(listener) {\n\t\t\treturn internal.on(listener);\n\t\t},\n\t\tnext(value) {\n\t\t\tif (alive) internal.flush(value, \"next\");\n\t\t},\n\t\tthrow(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"throw\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = false;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t},\n\t\treturn(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"return\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = true;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t}\n\t};\n})(1));_$HY.r[\"sc:tiers\"]=$R[4]=[\"trace\"];_$HY.r[\"sc:deps:parity/welcome-loaded:0\"]=($R[5]={});_$HY.r[\"sc:slot:parity/welcome-loaded:status#0\"]=$R[6]=($R[7]=($R[8]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"sc-parity/welcome-loaded-status#0-1_fr\"]=$R[9]=($R[10]=$R[8]()).p;_$HY.r[\"sc-parity/welcome-loaded-status#0-20_fr\"]=$R[11]=($R[12]=$R[8]()).p;_$HY.r[\"sc-parity/welcome-loaded-status#0-2_fr\"]=$R[13]=($R[14]=$R[8]()).p;($R[22]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[7],$R[15]={progress:$R[16]=($R[17]=$R[8]()).p,stats:$R[18]=($R[19]=$R[8]()).p,usage:$R[20]={$tr:$R[21]=$R[3](),$ta:0}});$R[21].next($R[23]={state:\"thinking\",tokens:5,parts:1});$R[22]($R[17],\"writing\");$R[22]($R[10],!0);$R[22]($R[12],!0);</script>",
-  "rest": "<script>$R[21].next($R[24]=[$R[25]=[$R[26]=[\"state\"],\"done\"],$R[27]=[$R[28]=[\"tokens\"],9],$R[29]=[$R[30]=[\"parts\"],2]]);</script><script>$R[21].return(void 0);</script><script>$R[2].next($R[31]={r:$R[32]={\"slot:status#0\":$R[33]={kind:\"slot\",args:$R[34]={progress:\"streaming\",stats:$R[18],usage:$R[20]}}},fid:\"parity/welcome-loaded\"});</script><script>$R[22]($R[19],$R[35]={tokens:42,rate:7});</script><template id=\"sc-parity/welcome-loaded-status#0-2\"><span _hk=sc-parity/welcome-loaded-status#0-2000 class=\"done\"><!--$-->42<!--/--> tokens · <!--$-->7<!--/--> tok/s</span></template><script>$df(\"sc-parity/welcome-loaded-status#0-2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[22]($R[14],!0);</script><script>$R[2].return(void 0);</script>"
+  "rest": "<script>$R[21].next($R[24]=[$R[25]=[$R[26]=[\"state\"],\"done\"],$R[27]=[$R[28]=[\"tokens\"],9],$R[29]=[$R[30]=[\"parts\"],2]]);</script><script>$R[21].return(void 0);</script><script>$R[2].next($R[31]={r:$R[32]={\"slot:status#0\":$R[33]={kind:\"slot\",args:$R[34]={progress:\"streaming\",stats:$R[18],usage:$R[20]}}},fid:\"parity/welcome-loaded\"});</script><script>$R[22]($R[19],$R[35]={tokens:42,rate:7});</script><template id=\"sc-parity/welcome-loaded-status#0-2\"><span _hk=sc-parity/welcome-loaded-status#0-2000 class=\"done\"><!--$-->42<!--/--> tokens · <!--$-->7<!--/--> tok/s</span></template><script>$df(\"sc-parity/welcome-loaded-status#0-2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[22]($R[14],!0);</script><script>$R[2].return(void 0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/welcome-status-streamed.json b/packages/web/test/harness/__artifacts__/welcome-status-streamed.json
index ca4333790..0d55150b2 100644
--- a/packages/web/test/harness/__artifacts__/welcome-status-streamed.json
+++ b/packages/web/test/harness/__artifacts__/welcome-status-streamed.json
@@ -1,5 +1,5 @@
 {
   "name": "welcome-status-streamed",
   "shell": "<solid-frame data-fid=\"parity/welcome-streamed\" style=\"display:contents\"><section class=\"reply\"><!--slot:status#0:start--><div _hk=sc-parity/welcome-streamed-status#0-0 class=\"status\"><!--$--><span _hk=sc-parity/welcome-streamed-status#0-1000 class=\"meter\">¶ <!--$-->1<!--/--></span><!--/--><!--$--><template id=\"pl-sc-parity/welcome-streamed-status#0-2\"></template><template id=\"pl-sc-parity/welcome-streamed-status#0-20\"></template><span _hk=sc-parity/welcome-streamed-status#0-200 class=\"ticker\">…</span><!--pl-sc-parity/welcome-streamed-status#0-20--><!--pl-sc-parity/welcome-streamed-status#0-2--><!--/--></div><!--slot:status#0:end--></section></solid-frame><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"sc:live\"]=$R[0]=($R[1]=(stream) => new ReadableStream({ start(controller) {\n\tstream.on({\n\t\tnext(value) {\n\t\t\ttry {\n\t\t\t\tcontroller.enqueue(value);\n\t\t\t} catch (_error) {}\n\t\t},\n\t\tthrow(value) {\n\t\t\tcontroller.error(value);\n\t\t},\n\t\treturn() {\n\t\t\ttry {\n\t\t\t\tcontroller.close();\n\t\t\t} catch (_error) {}\n\t\t}\n\t});\n} }))($R[2]=($R[3]=(live) => {\n\tconst buffer = [];\n\tconst listeners = [];\n\tlet alive = true;\n\tlet success = false;\n\tlet count = 0;\n\tconst internal = {\n\t\tflush(value, mode, x) {\n\t\t\tlive > 1 || buffer.push(value);\n\t\t\tfor (x = 0; x < count; x++) {\n\t\t\t\tconst listener = listeners[x];\n\t\t\t\tif (listener) listener[mode](value);\n\t\t\t}\n\t\t},\n\t\tup(listener, x, z, current) {\n\t\t\tfor (x = 0, z = buffer.length; x < z; x++) {\n\t\t\t\tcurrent = buffer[x];\n\t\t\t\tif (!alive && x === z - 1) listener[success ? \"return\" : \"throw\"](current);\n\t\t\t\telse listener.next(current);\n\t\t\t}\n\t\t},\n\t\ton(listener, temp = 0) {\n\t\t\tif (live > 1) throw new Error(\"Stream consumed\");\n\t\t\tlet subscribed = alive;\n\t\t\tif (alive) {\n\t\t\t\tfor (temp = 0; temp < count; temp++) if (!listeners[temp]) break;\n\t\t\t\tif (temp === count) count++;\n\t\t\t\tlisteners[temp] = listener;\n\t\t\t}\n\t\t\tinternal.up(listener);\n\t\t\tif (live) {\n\t\t\t\tlive = 2;\n\t\t\t\tbuffer.length = 0;\n\t\t\t}\n\t\t\treturn () => {\n\t\t\t\tif (alive && subscribed) {\n\t\t\t\t\tsubscribed = false;\n\t\t\t\t\tlisteners[temp] = void 0;\n\t\t\t\t\twhile (count > 0 && !listeners[count - 1]) count--;\n\t\t\t\t\tlisteners.length = count;\n\t\t\t\t}\n\t\t\t};\n\t\t}\n\t};\n\treturn {\n\t\t__SEROVAL_STREAM__: true,\n\t\ton(listener) {\n\t\t\treturn internal.on(listener);\n\t\t},\n\t\tnext(value) {\n\t\t\tif (alive) internal.flush(value, \"next\");\n\t\t},\n\t\tthrow(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"throw\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = false;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t},\n\t\treturn(value) {\n\t\t\tif (alive) {\n\t\t\t\tinternal.flush(value, \"return\");\n\t\t\t\talive = false;\n\t\t\t\tsuccess = true;\n\t\t\t\tlisteners.length = 0;\n\t\t\t}\n\t\t}\n\t};\n})(1));_$HY.r[\"sc:tiers\"]=$R[4]=[\"trace\"];_$HY.r[\"sc:deps:parity/welcome-streamed:0\"]=($R[5]={});_$HY.r[\"sc:slot:parity/welcome-streamed:status#0\"]=$R[6]=($R[7]=($R[8]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"sc-parity/welcome-streamed-status#0-1_fr\"]=$R[9]=($R[10]=$R[8]()).p;_$HY.r[\"sc-parity/welcome-streamed-status#0-20_fr\"]=$R[11]=($R[12]=$R[8]()).p;_$HY.r[\"sc-parity/welcome-streamed-status#0-2_fr\"]=$R[13]=($R[14]=$R[8]()).p;($R[22]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[7],$R[15]={progress:$R[16]=($R[17]=$R[8]()).p,stats:$R[18]=($R[19]=$R[8]()).p,usage:$R[20]={$tr:$R[21]=$R[3](),$ta:0}});$R[21].next($R[23]={state:\"thinking\",tokens:5,parts:1});$R[22]($R[17],\"writing\");$R[22]($R[10],!0);$R[22]($R[12],!0);</script>",
-  "rest": "<script>$R[21].next($R[24]=[$R[25]=[$R[26]=[\"state\"],\"done\"],$R[27]=[$R[28]=[\"tokens\"],9],$R[29]=[$R[30]=[\"parts\"],2]]);</script><script>$R[21].return(void 0);</script><script>$R[2].next($R[31]={r:$R[32]={\"slot:status#0\":$R[33]={kind:\"slot\",args:$R[34]={progress:\"streaming\",stats:$R[18],usage:$R[20]}}},fid:\"parity/welcome-streamed\"});</script><script>$R[22]($R[19],$R[35]={tokens:42,rate:7});</script><template id=\"sc-parity/welcome-streamed-status#0-2\"><span _hk=sc-parity/welcome-streamed-status#0-2000 class=\"done\"><!--$-->42<!--/--> tokens · <!--$-->7<!--/--> tok/s</span></template><script>$df(\"sc-parity/welcome-streamed-status#0-2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[22]($R[14],!0);</script><script>$R[2].return(void 0);</script>"
+  "rest": "<script>$R[21].next($R[24]=[$R[25]=[$R[26]=[\"state\"],\"done\"],$R[27]=[$R[28]=[\"tokens\"],9],$R[29]=[$R[30]=[\"parts\"],2]]);</script><script>$R[21].return(void 0);</script><script>$R[2].next($R[31]={r:$R[32]={\"slot:status#0\":$R[33]={kind:\"slot\",args:$R[34]={progress:\"streaming\",stats:$R[18],usage:$R[20]}}},fid:\"parity/welcome-streamed\"});</script><script>$R[22]($R[19],$R[35]={tokens:42,rate:7});</script><template id=\"sc-parity/welcome-streamed-status#0-2\"><span _hk=sc-parity/welcome-streamed-status#0-2000 class=\"done\"><!--$-->42<!--/--> tokens · <!--$-->7<!--/--> tok/s</span></template><script>$df(\"sc-parity/welcome-streamed-status#0-2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[22]($R[14],!0);</script><script>$R[2].return(void 0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/write-before-resume.json b/packages/web/test/harness/__artifacts__/write-before-resume.json
index 4a1544f0d..3b839d915 100644
--- a/packages/web/test/harness/__artifacts__/write-before-resume.json
+++ b/packages/web/test/harness/__artifacts__/write-before-resume.json
@@ -1,6 +1,6 @@
 {
   "shell": "<main _hk=2><h1>title:/a</h1><h2>label:/a</h2><!--$--><template id=\"pl-5\"></template><p _hk=50>side-loading</p><!--pl-5--><!--/--><!--$--><template id=\"pl-6\"></template><p _hk=60>sync-loading</p><!--pl-6--><!--/--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"1\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"5_fr\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"5001\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"6_fr\"]=$R[7]=($R[8]=$R[2]()).p;_$HY.r[\"6000\"]=$R[9]=($R[10]=$R[2]()).p;($R[11]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"title:/a\");</script>",
   "chunks": [
-    "<template id=\"5\"><aside _hk=5002><span class=\"inner\">inner:/a</span><span class=\"data\">data:/a</span><span class=\"raw\">/a</span></aside></template><script>$R[11]($R[6],\"data:/a\");$df(\"5\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[11]($R[4],!0);</script><template id=\"6\"><nav _hk=6001><span class=\"gate\">static</span><span class=\"sync\">sync:/a</span></nav></template><script>$R[11]($R[10],\"static\");$df(\"6\");</script><script>$R[11]($R[8],!0);</script>"
+    "<template id=\"5\"><aside _hk=5002><span class=\"inner\">inner:/a</span><span class=\"data\">data:/a</span><span class=\"raw\">/a</span></aside></template><script>$R[11]($R[6],\"data:/a\");$df(\"5\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[11]($R[4],!0);</script><template id=\"6\"><nav _hk=6001><span class=\"gate\">static</span><span class=\"sync\">sync:/a</span></nav></template><script>$R[11]($R[10],\"static\");$df(\"6\");</script><script>$R[11]($R[8],!0);</script>"
   ]
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/scenarios.tsx b/packages/web/test/harness/scenarios.tsx
index a02d62298..73878cd1c 100644
--- a/packages/web/test/harness/scenarios.tsx
+++ b/packages/web/test/harness/scenarios.tsx
@@ -62,10 +62,8 @@ export type Scenario = {
   expectedText: string;
   /**
    * Override for the "streamed" replay mode. Needed where the two modes
-   * legitimately settle to different text — e.g. a live $df swap of a
-   * REJECTED fragment splices in the rejection template's single-space
-   * text node (@solidjs/web's rejection channel), which full-page-loaded
-   * hydration never renders.
+   * legitimately settle to different text. (A live $df swap of a REJECTED
+   * fragment no longer leaves its markup beside the fresh render, #4287.)
    */
   expectedTextStreamed?: string;
   /**
@@ -1505,6 +1503,98 @@ function PreflushRejection() {
   );
 }
 
+// ---------------------------------------------------------------------------
+// #4287: the same order with the read failing AFTER the shell flushed, the
+// async memo outside both boundaries. The server draws the Errored fallback
+// into the fragment and serializes the error at the Errored id; the client
+// adopts that fallback (no client ask, no loading flash) and, as for any
+// hydrated failure (#4273), recovers once the memo's input changes.
+let setPostflushKey!: (v: string) => void;
+let postflushClientAsks = 0;
+// The hydration dry run computes under a mock Promise: count real asks only.
+const RealPromise = Promise;
+export const postflushClientAskCount = () => postflushClientAsks;
+function PostflushRejection() {
+  const [key, setKey] = createSignal("u7");
+  setPostflushKey = setKey;
+  const user = createMemo(async (): Promise<string> => {
+    const k = key();
+    if (!isServer && Promise === RealPromise) postflushClientAsks++;
+    await sleep(5);
+    if (k === "u7") throw new Error("no user 7");
+    return k;
+  });
+  return (
+    <div>
+      <Errored fallback={(e: any) => <p>failed: {e().message}</p>}>
+        <Loading fallback={<i>loading</i>}>
+          <span>user:{user()}</span>
+        </Loading>
+      </Errored>
+      <span>tail</span>
+    </div>
+  );
+}
+
+// The same failure with markup between the Errored and the Loading: the
+// Loading's position is not the Errored's, so the server draws nothing there
+// (the client twin's fallback replaces the whole <section>) and the client
+// renders the failure fresh, then recovers.
+let setNestedKey!: (v: string) => void;
+function PostflushRejectionNested() {
+  const [key, setKey] = createSignal("u7");
+  setNestedKey = setKey;
+  const user = createMemo(async (): Promise<string> => {
+    const k = key();
+    await sleep(5);
+    if (k === "u7") throw new Error("no user 7");
+    return k;
+  });
+  return (
+    <div>
+      <Errored fallback={(e: any) => <p>failed: {e().message}</p>}>
+        <section>
+          <h1>title</h1>
+          <Loading fallback={<i>loading</i>}>
+            <span>user:{user()}</span>
+          </Loading>
+        </section>
+      </Errored>
+      <span>tail</span>
+    </div>
+  );
+}
+
+// The failure inside an outer <Loading> still pending when it lands: the
+// inner fragment parks in the outer one, which settles later carrying the
+// Errored fallback the server drew.
+function PostflushRejectionParked() {
+  const [key] = createSignal("u7");
+  const outer = createMemo(async () => {
+    await sleep(15);
+    return "outer";
+  });
+  const user = createMemo(async (): Promise<string> => {
+    const k = key();
+    await sleep(5);
+    if (k === "u7") throw new Error("no user 7");
+    return k;
+  });
+  return (
+    <div>
+      <Loading fallback={<i>outer loading</i>}>
+        <b>{outer()}</b>
+        <Errored fallback={(e: any) => <p>failed: {e().message}</p>}>
+          <Loading fallback={<i>loading</i>}>
+            <span>user:{user()}</span>
+          </Loading>
+        </Errored>
+      </Loading>
+      <span>tail</span>
+    </div>
+  );
+}
+
 // ---------------------------------------------------------------------------
 // #3414: a sync throw the SERVER catches, with a zero-arg fallback thunk
 // (`fallback={() => <Fallback />}`), inside an enclosing boundary. Errored
@@ -2817,9 +2907,6 @@ export const scenarios: Scenario[] = [
     App: BareClientLateFinal,
     async: true,
     expectedText: "widgettail",
-    // The live rejected swap splices the rejection template's single-space
-    // text node into the range (see expectedTextStreamed).
-    expectedTextStreamed: " widgettail",
     serverText: "wait"
   },
   {
@@ -2827,9 +2914,39 @@ export const scenarios: Scenario[] = [
     App: PreflushRejection,
     async: true,
     expectedText: "caughttail",
-    // Pre-flush the rejected boundary inlines to an empty region: neither
-    // fallback reaches the server HTML — only the static sibling.
-    serverText: "tail"
+    // Pre-flush the rejected boundary inlines the Errored fallback the
+    // server drew for it (#4287).
+    serverText: "caught tail"
+  },
+  {
+    name: "errored-section-loading-postflush-rejection-4287",
+    App: PostflushRejectionNested,
+    async: true,
+    expectedText: "failed: no user 7tail",
+    serverText: "title loading tail",
+    update: () => setNestedKey("u8"),
+    expectedTextAfterUpdate: "titleuser:u8tail"
+  },
+  {
+    name: "errored-loading-parked-rejection-4287",
+    App: PostflushRejectionParked,
+    async: true,
+    expectedText: "outerfailed: no user 7tail",
+    serverText: "outer loading tail failed: no user 7"
+    // No update pass: hydrated mid-stream, the memo re-asks on the outer
+    // boundary's resume (as it does on `next`), so the Errored holds the
+    // server's fallback until reset() rather than tracking the memo.
+  },
+  {
+    name: "errored-loading-postflush-rejection-4287",
+    App: PostflushRejection,
+    async: true,
+    expectedText: "failed: no user 7tail",
+    // Shell: the loading fallback; the fragment: the Errored fallback.
+    serverText: "loading tail failed: no user 7",
+    update: () => setPostflushKey("u8"),
+    expectedTextAfterUpdate: "user:u8tail",
+    stableSelector: "div"
   },
   {
     name: "errored-thunk-fallback-under-errored",
diff --git a/packages/web/test/hydration/errored-async-outcome-4287.spec.tsx b/packages/web/test/hydration/errored-async-outcome-4287.spec.tsx
new file mode 100644
index 000000000..f92c89876
--- /dev/null
+++ b/packages/web/test/hydration/errored-async-outcome-4287.spec.tsx
@@ -0,0 +1,88 @@
+/**
+ * @jsxImportSource @solidjs/web
+ * @vitest-environment jsdom
+ *
+ * #4287: `<Errored>` around a `<Loading>` whose content reads an async memo
+ * that rejects after the shell flushed. The server draws the Errored
+ * fallback into the fragment and serializes the error at the Errored id.
+ *
+ * - Hydrating after the failure arrived, the client adopts the server's
+ *   fallback node: no loading fallback, no new ask, and (#4273) it recovers
+ *   when the memo's input changes.
+ * - Hydrating before it arrived, the client renders the failure itself once
+ *   the fragment rejects, with nothing of the server's swap left beside it.
+ *
+ * Replays the parity harness artifact (test/server/hydration-harness.spec.tsx).
+ */
+import { describe, expect, test, vi } from "vitest";
+import { existsSync, readFileSync } from "node:fs";
+import { resolve, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+import { flush } from "solid-js";
+import { hydrate } from "@solidjs/web";
+import { scenarios, postflushClientAskCount } from "../harness/scenarios.jsx";
+
+const name = "errored-loading-postflush-rejection-4287";
+const file = resolve(
+  dirname(fileURLToPath(import.meta.url)),
+  `../harness/__artifacts__/${name}.json`
+);
+const scenario = scenarios.find(s => s.name === name)!;
+const sleep = (ms: number) => new Promise(r => setTimeout(r, ms));
+
+function applyChunk(container: HTMLDivElement, chunk: string, first: boolean) {
+  const scriptRe = /<script(?:[^>]*)>([\s\S]*?)<\/script>/g;
+  const scripts = [...chunk.matchAll(scriptRe)].map(m => m[1]);
+  const stripped = chunk.replace(scriptRe, "");
+  if (first) container.innerHTML = stripped;
+  else container.insertAdjacentHTML("beforeend", stripped);
+  for (const s of scripts) (0, eval)(s);
+}
+
+async function run(mode: "loaded" | "streamed") {
+  expect(existsSync(file)).toBe(true);
+  const { shell, rest } = JSON.parse(readFileSync(file, "utf-8"));
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  (globalThis as any)._$HY = { events: [], completed: new WeakSet(), r: {}, fe() {} };
+  const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
+  const asksBefore = postflushClientAskCount();
+  let dispose: (() => void) | undefined;
+  try {
+    applyChunk(container, shell, true);
+    if (mode === "loaded") applyChunk(container, rest, false);
+    const serverP = container.querySelector("p");
+    dispose = hydrate(() => <scenario.App />, container);
+    flush();
+    await sleep(10);
+    flush();
+    if (mode === "streamed") {
+      expect(container.textContent).toBe("loadingtail");
+      applyChunk(container, rest, false);
+    }
+    await sleep(30);
+    flush();
+    expect(container.textContent).toBe("failed: no user 7tail");
+    expect(container.querySelectorAll("p").length).toBe(1);
+    if (mode === "loaded") expect(container.querySelector("p")).toBe(serverP);
+    // The server's answer is used: nothing is asked again on the client.
+    expect(postflushClientAskCount()).toBe(asksBefore);
+
+    scenario.update!();
+    flush();
+    await sleep(30);
+    flush();
+    expect(container.textContent).toBe("user:u8tail");
+    expect(warn).not.toHaveBeenCalled();
+  } finally {
+    warn.mockRestore();
+    dispose?.();
+    await sleep(0);
+    container.remove();
+  }
+}
+
+describe("#4287: Errored over a Loading whose read fails after the shell", () => {
+  test("hydrated after the failure arrived: adopts the server's fallback", () => run("loaded"));
+  test("hydrated before the failure arrived: shows it once, no ask", () => run("streamed"));
+});
diff --git a/packages/web/test/server/frame-fragment-error-outcome.spec.tsx b/packages/web/test/server/frame-fragment-error-outcome.spec.tsx
index 4c4c027bd..2c85ac624 100644
--- a/packages/web/test/server/frame-fragment-error-outcome.spec.tsx
+++ b/packages/web/test/server/frame-fragment-error-outcome.spec.tsx
@@ -18,8 +18,10 @@
  *    the position keeps the boundary's own markup, its fallback.
  *
  * `_fr` still rejects (the client's dev diagnostic, c1), the keyed error
- * chunk still rides. Outside a server component nothing changes: the blank
- * the client twin renders fresh over.
+ * chunk still rides. Outside a server component an `<Errored>` answers only
+ * for a `<Loading>` that is all of its content (#4287): its fallback is
+ * drawn there and the error serialized at its id, for the client twin to
+ * adopt; deeper in its content the blank the client renders fresh over.
  */
 import { describe, expect, it } from "vitest";
 import vm from "node:vm";
@@ -64,7 +66,8 @@ const collectDocument = (code: () => any) =>
 /** Every `<template id=K>…</template>` of a document, by key. */
 function templates(html: string) {
   const out: Record<string, string> = {};
-  for (const m of html.matchAll(/<template id="([^"]+)">([\s\S]*?)<\/template>/g)) out[m[1]] = m[2];
+  for (const m of html.matchAll(/<template id="([^"]+)"(?: e)?>([\s\S]*?)<\/template>/g))
+    out[m[1]] = m[2];
   return out;
 }
 
@@ -251,7 +254,7 @@ describe("C12 (c) server half — a rejected server <Loading> inside a server co
       ]);
     });
 
-    it("outside a server component nothing changes: the blank the client twin renders fresh over", async () => {
+    it("outside a server component: the fallback of an <Errored> the <Loading> fills, for the client twin to adopt (#4287)", async () => {
       const App = () => {
         const value = lateReject("plain");
         return (
@@ -265,6 +268,27 @@ describe("C12 (c) server half — a rejected server <Loading> inside a server co
       const html = await collectDocument(() => <App />);
       const tpls = templates(html);
       const key = Object.keys(tpls).find(k => !k.startsWith("pl-"))!;
+      expect(tpls[key]).toContain("app-fallback");
+      // The error the client twin adopts the fallback with, at the Errored id.
+      expect(html).toContain(`_$HY.r["1"]=`);
+    });
+
+    it("outside a server component, deeper in the <Errored>'s content: the blank the client twin renders fresh over", async () => {
+      const App = () => {
+        const value = lateReject("plain");
+        return (
+          <Errored fallback={<em>app-fallback</em>}>
+            <section>
+              <Loading fallback={<i>loading</i>}>
+                <b>{value()}</b>
+              </Loading>
+            </section>
+          </Errored>
+        );
+      };
+      const html = await collectDocument(() => <App />);
+      const tpls = templates(html);
+      const key = Object.keys(tpls).find(k => !k.startsWith("pl-"))!;
       expect(tpls[key]).toBe(" ");
       expect(html).not.toContain("app-fallback");
     });
diff --git a/packages/web/test/server/ssr-async-rejection-3569.spec.tsx b/packages/web/test/server/ssr-async-rejection-3569.spec.tsx
index 8ef68b7f2..2874e03da 100644
--- a/packages/web/test/server/ssr-async-rejection-3569.spec.tsx
+++ b/packages/web/test/server/ssr-async-rejection-3569.spec.tsx
@@ -261,7 +261,7 @@ describe("#3569 (a) a bare child's rejection routes like a template hole's", ()
     expect(heard.map(h => h.context.handling)).toEqual(["client"]);
   });
 
-  test("await: under <Errored>, the bare shape still rejects the fragment without a boundary error record (#2997)", async () => {
+  test("await: under <Errored>, the bare shape rejects the fragment with the Errored's fallback drawn (#2997, #4287)", async () => {
     const { heard, onError } = recorder();
     const App = () => {
       const data = useLateReject();
@@ -282,14 +282,15 @@ describe("#3569 (a) a bare child's rejection routes like a template hole's", ()
     const html = (value as { value: string }).value;
     expect(bare(html)).toContain("<span>tail</span>");
     expect(html).toContain("fetch failed");
-    expect(bare(html)).not.toContain("caught");
-    // The memo's rejected flight ("0", created in App) + the fragment's
-    // `_fr` — and nothing else: the Errored carries no record, the server
-    // rendered no fallback DOM for it. (Unfixed, a third record "2" carried
-    // the error: the bare throw escalated to the parent handler, which
-    // serialized a fallback record for DOM that was never emitted.)
-    expect(hydrationRecordKeys(html).sort()).toEqual(["0", "200_fr"]);
-    expect(heard.map(h => h.context.handling)).toEqual(["client"]);
+    // The Loading is all of the Errored's content: its fallback is drawn
+    // at the Loading's position (#4287).
+    expect(bare(html)).toContain("caught");
+    // The memo's rejected flight ("0", created in App), the fragment's
+    // `_fr`, and the error at the Errored id ("2") for the fallback the
+    // server drew — the record the hydrating client adopts it with. The
+    // bare throw is routed once (#2997): the Errored reports it.
+    expect(hydrationRecordKeys(html).sort()).toEqual(["0", "2", "200_fr"]);
+    expect(heard.map(h => h.context.handling)).toEqual(["fallback"]);
   });
 
   test("the synchronous first pass is unchanged: a sync throw under <Loading> in <Errored> renders the parent's fallback", async () => {
diff --git a/packages/web/test/server/ssr-fragment-rejection-stub-batch.spec.tsx b/packages/web/test/server/ssr-fragment-rejection-stub-batch.spec.tsx
index 1f545b091..c9d51c5d5 100644
--- a/packages/web/test/server/ssr-fragment-rejection-stub-batch.spec.tsx
+++ b/packages/web/test/server/ssr-fragment-rejection-stub-batch.spec.tsx
@@ -18,7 +18,8 @@
  * the boundary catches first and the fragment resolves clean (that shape is
  * the serialized-race case in the sibling spec). An `<Errored>` OUTSIDE the
  * boundary does not help pre-shell: once the fragment is registered its
- * channel owns error routing (#2997), so `_fr` rejects all the same.
+ * channel owns error routing (#2997), so `_fr` rejects all the same (the
+ * region inlines the Errored's fallback, #4287).
  *
  * Detection as in the sibling spec: each test owns the process's
  * `unhandledRejection` listeners for its duration, so a leak fails THIS test.
@@ -116,7 +117,7 @@ describe("a fragment whose <key>_fr rejects while it waits in the pre-shell batc
     expectRoutedToClient(value, errors, "refused");
   });
 
-  test("the same read with an <Errored> OUTSIDE the <Loading> — the fragment channel still owns the error", async () => {
+  test("the same read with an <Errored> OUTSIDE the <Loading> — `_fr` still rejects, the Errored's fallback inlines", async () => {
     const { run, errors } = renderHeld(() => {
       const data = createMemo(async (): Promise<string> => {
         throw new Error("refused");
@@ -131,7 +132,11 @@ describe("a fragment whose <key>_fr rejects while it waits in the pre-shell batc
     });
     const { escaped, value } = await watchRejections(run);
     expect(messages(escaped)).toEqual([]);
-    expectRoutedToClient(value, errors, "refused");
+    const markup = stripScripts(value);
+    expect(markup).toMatch(/<span[^>]*>slow<\/span>/);
+    expect(markup).toMatch(/<!--\$--><p[^>]*>Error: refused<\/p><!--\/--><\/div>/);
+    expect(value).toContain(`new Error("refused")`);
+    expect(errors).toEqual(["refused"]);
   });
 
   test("a component body throwing synchronously on the retry pass, after its read resolved", async () => {
diff --git a/packages/web/test/server/ssr-stream.spec.tsx b/packages/web/test/server/ssr-stream.spec.tsx
index ce6faf5e7..02cda8d3f 100644
--- a/packages/web/test/server/ssr-stream.spec.tsx
+++ b/packages/web/test/server/ssr-stream.spec.tsx
@@ -453,11 +453,9 @@ describe("SSR Streaming — Basic Rendering", () => {
     // render memo throwing NotReadyError forever (the stream never completes)
     // and leaked a process-level unhandledRejection. The render now completes:
     // the fragment channel carries the error (`_fr` rejects with the payload)
-    // and the client re-renders the subtree fresh — re-importing the module
-    // and routing a repeat failure to its own Errored. The boundary id must
-    // NOT carry an error record (#2997): the server rendered no fallback DOM,
-    // so a record would derail the hydrating Errored into claiming markup
-    // that does not exist.
+    // and, the Loading being all of the Errored's content, the fragment is
+    // the Errored's fallback with the error recorded at the Errored id, for
+    // the hydrating client to adopt (#4287).
     const html = await renderComplete(
       () => (
         <Errored fallback={(e: any) => <span>err: {String(e()?.message || e())}</span>}>
@@ -472,11 +470,12 @@ describe("SSR Streaming — Basic Rendering", () => {
     // Error captured (it rides the rejected fragment), the streamed fragment
     // settled, and the shell did not get stuck on the placeholder.
     expect(html).toContain("lazy failed");
-    expect(rKeys).not.toContain("0");
+    expect(html).toMatch(/<span _hk=\d+>err: /);
+    expect(rKeys).toContain("0");
     expect(rKeys).toContain("000_fr");
   });
 
-  test("pre-flush rejection under Errored > Loading rejects the fragment without a boundary error record (#2997)", async () => {
+  test("pre-flush rejection under Errored > Loading rejects the fragment and draws the Errored fallback (#2997, #4287)", async () => {
     // Rejects before its first await — the rejection lands before the shell
     // can flush.
     function Child() {
@@ -498,17 +497,15 @@ describe("SSR Streaming — Basic Rendering", () => {
     ));
 
     const rKeys = hydrationRecordKeys(html);
-    // The fragment channel owns the error: `_fr` rejects (the client
-    // re-renders the subtree fresh and its Errored catches), and the memo's
-    // rejected flight is serialized for adoption. The Errored boundary id
-    // must NOT carry an error record — the server never rendered fallback
-    // DOM for it, so a record would make the hydrating client claim against
-    // markup that does not exist and derail hydration into a blank page.
+    // `_fr` rejects and the memo's rejected flight is serialized for
+    // adoption. The Loading is all of the Errored's content, so the server
+    // draws the Errored fallback at its position and records the error at
+    // the Errored id: the hydrating client adopts that fallback (#4287).
     expect(html).toContain("tail");
     expect(html).toContain("boom");
-    expect(rKeys.sort()).toEqual(["100000", "100_fr"]);
-    // The static sibling survives; neither fallback is server-rendered.
-    expect(html).not.toContain("caught");
+    expect(rKeys.sort()).toEqual(["1", "100000", "100_fr"]);
+    expect(html).toContain("caught");
+    expect(html).not.toContain("loading");
   });
 
   test("async memo — shell contains fallback, final has resolved value", async () => {

From 57c9c52aba5b1541e00615e7bdaf94d9c3b84c35 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 26 Oct 2026 20:58:48 +0000
Subject: [PATCH 02/16] fix(solid): serialize an Errored's error only when its
 fallback markup is sent

When a streamed <Loading> fails after the shell and asks the enclosing
<Errored> for its outcome, the fallback may hold an async hole that has
not resolved yet. renderOutcome then returns no markup (the fragment
settles as a plain rejection), but handleError had already serialized
the error at the Errored id. A client hydrating after the failure read
that record, claimed a fallback that was never sent, and went blank
with a hydration key miss.

The outcome path now defers the record and writes it only once the
fallback resolved to finished markup. Without it the client renders the
failure itself, as on `next`. Server-only; no client bytes.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_018LY7F9czoRqdMEvk2QwPr1
---
 packages/solid/src/server/signals.ts          | 14 +++--
 ...stflush-rejection-async-fallback-4287.json |  5 ++
 packages/web/test/harness/scenarios.tsx       | 46 ++++++++++++++++
 .../errored-async-outcome-4287.spec.tsx       | 54 +++++++++++++++++--
 4 files changed, 111 insertions(+), 8 deletions(-)
 create mode 100644 packages/web/test/harness/__artifacts__/errored-loading-postflush-rejection-async-fallback-4287.json

diff --git a/packages/solid/src/server/signals.ts b/packages/solid/src/server/signals.ts
index 96c4f39b8..353bf2385 100644
--- a/packages/solid/src/server/signals.ts
+++ b/packages/solid/src/server/signals.ts
@@ -4237,7 +4237,11 @@ export function createErrorBoundary<T, U>(
   // rendered here with the error and hydrates against the record (a
   // sanitized record under a fallback rendered from the original would
   // mismatch). See `ssrSanitizeError`.
-  const handleError = (err: any) => {
+  // `defer`: the outcome path serializes only once it has finished markup to
+  // send (`deferredWire`) — a record with no fallback behind it would have
+  // the client claim nodes that are not there.
+  let deferredWire: any;
+  const handleError = (err: any, defer?: boolean) => {
     if (fallbackSettled) return fallbackResult;
     reportContained(err);
     const wire = ssrSanitizeError(
@@ -4247,7 +4251,8 @@ export function createErrorBoundary<T, U>(
       ctx && ctx.errorPolicy,
       ctx && ctx._errorScope
     );
-    serializeError(wire);
+    if (defer) deferredWire = wire;
+    else serializeError(wire);
     fallbackResult = renderFallback(wire);
     fallbackSettled = true;
     return fallbackResult;
@@ -4264,7 +4269,7 @@ export function createErrorBoundary<T, U>(
   // the component (the app's, at t = 0 — a client twin) answers nothing, and
   // the error escapes the component as the frame's own error (the outward
   // face). A fallback still resolving (an async hole in it) has no finished
-  // markup to answer with and escapes the same way.
+  // markup to answer with and escapes the same way, serializing nothing.
   // Outside a server component (`outcome` is the asking `<Loading>`'s id,
   // #4287) this boundary answers only when that Loading's placeholder is
   // all of its content: the fallback then lands where the client twin draws
@@ -4287,8 +4292,9 @@ export function createErrorBoundary<T, U>(
     const prevCtx = sharedConfig.context;
     sharedConfig.context = ctx;
     try {
-      const resolved: any = ctx.resolve(ctx.escape(handleError(err)));
+      const resolved: any = ctx.resolve(ctx.escape(handleError(err, true)));
       if (!resolved || (resolved.h && resolved.h.length)) return undefined;
+      if (deferredWire) (serializeError(deferredWire), (deferredWire = undefined));
       const t = resolved.t;
       return Array.isArray(t) ? t[0] : t;
     } catch {
diff --git a/packages/web/test/harness/__artifacts__/errored-loading-postflush-rejection-async-fallback-4287.json b/packages/web/test/harness/__artifacts__/errored-loading-postflush-rejection-async-fallback-4287.json
new file mode 100644
index 000000000..c733b0f2c
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/errored-loading-postflush-rejection-async-fallback-4287.json
@@ -0,0 +1,5 @@
+{
+  "name": "errored-loading-postflush-rejection-async-fallback-4287",
+  "shell": "<div _hk=2><!--$--><template id=\"pl-300\"></template><i _hk=3000>loading</i><!--pl-300--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"300_fr\"]=$R[5]=($R[6]=$R[2]()).p;</script>",
+  "rest": "<template id=\"300\" e> </template><script>($R[8]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[7]=new Error(\"no user 7\"));$df(\"300\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[8]($R[6],$R[7]);</script><script>($R[9]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"HINT\");</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/scenarios.tsx b/packages/web/test/harness/scenarios.tsx
index 73878cd1c..d3d6d8d00 100644
--- a/packages/web/test/harness/scenarios.tsx
+++ b/packages/web/test/harness/scenarios.tsx
@@ -1536,6 +1536,43 @@ function PostflushRejection() {
   );
 }
 
+// The same failure with an async hole in the Errored fallback, still
+// pending when the Loading fails: the server has no finished fallback markup
+// to draw, so it serializes no error either (a record with no markup behind
+// it would make the client claim a fallback that is not there). The client
+// renders the failure itself, as it does on `next`.
+let setPostflushHoleKey!: (v: string) => void;
+function PostflushRejectionAsyncFallback() {
+  const [key, setKey] = createSignal("u7");
+  setPostflushHoleKey = setKey;
+  const user = createMemo(async (): Promise<string> => {
+    const k = key();
+    await sleep(5);
+    if (k === "u7") throw new Error("no user 7");
+    return k;
+  });
+  const hint = createMemo(async () => {
+    await sleep(20);
+    return "HINT";
+  });
+  return (
+    <div>
+      <Errored
+        fallback={(e: any) => (
+          <p>
+            failed: {e().message} {hint()}
+          </p>
+        )}
+      >
+        <Loading fallback={<i>loading</i>}>
+          <span>user:{user()}</span>
+        </Loading>
+      </Errored>
+      <span>tail</span>
+    </div>
+  );
+}
+
 // The same failure with markup between the Errored and the Loading: the
 // Loading's position is not the Errored's, so the server draws nothing there
 // (the client twin's fallback replaces the whole <section>) and the client
@@ -2937,6 +2974,15 @@ export const scenarios: Scenario[] = [
     // boundary's resume (as it does on `next`), so the Errored holds the
     // server's fallback until reset() rather than tracking the memo.
   },
+  {
+    name: "errored-loading-postflush-rejection-async-fallback-4287",
+    App: PostflushRejectionAsyncFallback,
+    async: true,
+    expectedText: "failed: no user 7 HINTtail",
+    serverText: "loading tail",
+    update: () => setPostflushHoleKey("u8"),
+    expectedTextAfterUpdate: "user:u8tail"
+  },
   {
     name: "errored-loading-postflush-rejection-4287",
     App: PostflushRejection,
diff --git a/packages/web/test/hydration/errored-async-outcome-4287.spec.tsx b/packages/web/test/hydration/errored-async-outcome-4287.spec.tsx
index f92c89876..c2de8cbef 100644
--- a/packages/web/test/hydration/errored-async-outcome-4287.spec.tsx
+++ b/packages/web/test/hydration/errored-async-outcome-4287.spec.tsx
@@ -11,6 +11,9 @@
  *   when the memo's input changes.
  * - Hydrating before it arrived, the client renders the failure itself once
  *   the fragment rejects, with nothing of the server's swap left beside it.
+ * - With an async hole in the fallback still pending when the Loading fails,
+ *   the server has no fallback markup to draw and serializes no error: the
+ *   client renders the failure itself instead of claiming a missing node.
  *
  * Replays the parity harness artifact (test/server/hydration-harness.spec.tsx).
  */
@@ -22,11 +25,10 @@ import { flush } from "solid-js";
 import { hydrate } from "@solidjs/web";
 import { scenarios, postflushClientAskCount } from "../harness/scenarios.jsx";
 
+const artifact = (name: string) =>
+  resolve(dirname(fileURLToPath(import.meta.url)), `../harness/__artifacts__/${name}.json`);
 const name = "errored-loading-postflush-rejection-4287";
-const file = resolve(
-  dirname(fileURLToPath(import.meta.url)),
-  `../harness/__artifacts__/${name}.json`
-);
+const file = artifact(name);
 const scenario = scenarios.find(s => s.name === name)!;
 const sleep = (ms: number) => new Promise(r => setTimeout(r, ms));
 
@@ -82,7 +84,51 @@ async function run(mode: "loaded" | "streamed") {
   }
 }
 
+async function runAsyncFallback(mode: "loaded" | "streamed") {
+  const name = "errored-loading-postflush-rejection-async-fallback-4287";
+  const file = artifact(name);
+  const scenario = scenarios.find(s => s.name === name)!;
+  expect(existsSync(file)).toBe(true);
+  const { shell, rest } = JSON.parse(readFileSync(file, "utf-8"));
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  (globalThis as any)._$HY = { events: [], completed: new WeakSet(), r: {}, fe() {} };
+  const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
+  let dispose: (() => void) | undefined;
+  try {
+    applyChunk(container, shell, true);
+    if (mode === "loaded") applyChunk(container, rest, false);
+    dispose = hydrate(() => <scenario.App />, container);
+    flush();
+    await sleep(10);
+    flush();
+    if (mode === "streamed") applyChunk(container, rest, false);
+    await sleep(40);
+    flush();
+    expect(container.textContent).toBe("failed: no user 7 HINTtail");
+    expect(container.querySelectorAll("p").length).toBe(1);
+
+    scenario.update!();
+    flush();
+    await sleep(30);
+    flush();
+    expect(container.textContent).toBe("user:u8tail");
+    expect(warn).not.toHaveBeenCalled();
+    // No fallback markup was sent, so no error record either.
+    expect(rest).not.toContain('_$HY.r["3"]');
+  } finally {
+    warn.mockRestore();
+    dispose?.();
+    await sleep(0);
+    container.remove();
+  }
+}
+
 describe("#4287: Errored over a Loading whose read fails after the shell", () => {
   test("hydrated after the failure arrived: adopts the server's fallback", () => run("loaded"));
   test("hydrated before the failure arrived: shows it once, no ask", () => run("streamed"));
+  test("fallback with a pending async hole, hydrated after the failure: renders it", () =>
+    runAsyncFallback("loaded"));
+  test("fallback with a pending async hole, hydrated before the failure: renders it", () =>
+    runAsyncFallback("streamed"));
 });

From e1366109d1f25a27a320603ebf17ebb3b2b6521a Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 26 Oct 2026 21:46:58 +0000
Subject: [PATCH 03/16] fix(solid,web): stream a parked Errored fallback once
 its async hole resolves (#4306)

An <Errored> whose fallback reads async data, around a <Loading> that
fails after the shell inside an outer <Loading> still pending, lost its
region: the outcome render met the fallback's pending hole, answered no
markup, and the parked fragment spliced a blank into the outer one while
its `_fr` resolved. The client claimed against the blank and showed
nothing there, with hydration warnings.

renderOutcome now answers a still-resolving fallback with a function
that waits out its holes and returns the finished markup, serializing
the error only then. The <Loading> calls it only while its fragment is
parked in an enclosing pending one (the registry's new `parked()` query
on the settle function), where nothing of the failure shows yet: the
outer fragment carries the fallback, or, if the outer settles first,
the inner fragment streams it when it lands. A failure in a region
already shown settles at once, as before. Server-only; no client bytes.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015hPxMkC3jg3Uivh65gvaf2
---
 .../errored-parked-async-outcome-4306.md      |  6 ++
 packages/solid/src/server/hydration.ts        | 62 ++++++++----
 packages/solid/src/server/shared.ts           |  7 +-
 packages/solid/src/server/signals.ts          | 46 ++++++---
 packages/web/src/server.ts                    |  9 +-
 ...-parked-rejection-async-fallback-4306.json |  5 +
 ...ed-rejection-late-async-fallback-4306.json |  5 +
 packages/web/test/harness/scenarios.tsx       | 61 ++++++++++++
 ...errored-parked-async-outcome-4306.spec.tsx | 95 +++++++++++++++++++
 9 files changed, 260 insertions(+), 36 deletions(-)
 create mode 100644 .changeset/errored-parked-async-outcome-4306.md
 create mode 100644 packages/web/test/harness/__artifacts__/errored-loading-parked-rejection-async-fallback-4306.json
 create mode 100644 packages/web/test/harness/__artifacts__/errored-loading-parked-rejection-late-async-fallback-4306.json
 create mode 100644 packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx

diff --git a/.changeset/errored-parked-async-outcome-4306.md b/.changeset/errored-parked-async-outcome-4306.md
new file mode 100644
index 000000000..f8c9e8b8c
--- /dev/null
+++ b/.changeset/errored-parked-async-outcome-4306.md
@@ -0,0 +1,6 @@
+---
+"solid-js": patch
+"@solidjs/web": patch
+---
+
+An `<Errored>` whose fallback reads async data, around a `<Loading>` that fails after the shell inside an outer `<Loading>` still pending, now streams its fallback. Before, the failure landed while the fallback's async read was still pending, so the server had no markup for it and the outer fragment arrived with the Errored region blank; the client hydrated against the blank with warnings and showed nothing there. Now a failure whose fragment is parked in a pending outer one (nothing of it shows yet) waits for the fallback to finish: the outer fragment carries it, or, when the outer settles first, the inner fragment streams it once it resolves. The error is serialized with it and the client claims the markup. A failure in a region already shown still settles at once, as before (#4306).
diff --git a/packages/solid/src/server/hydration.ts b/packages/solid/src/server/hydration.ts
index 94f8719f3..01847b088 100644
--- a/packages/solid/src/server/hydration.ts
+++ b/packages/solid/src/server/hydration.ts
@@ -179,7 +179,7 @@ function ssrLoadingBoundary(
   const timed = IS_DEV || observed;
   const discoveredAt = timed ? performance.now() : 0;
   let recorded = false;
-  let streamedOnError = false;
+  let streamedOnError: boolean | Promise<boolean> = false;
   let pendingRecord: (() => void) | undefined;
   const record = (outcome: BoundaryEvent["outcome"], streamed: boolean, error?: unknown) => {
     if (recorded) return;
@@ -378,10 +378,18 @@ function ssrLoadingBoundary(
   // Hydration ids inside the rendered fallback are the component's own
   // hydration-free scope's; its head and asset registrations drop with the
   // error, as the error path drops them today.
-  function errorOutcome(err: any): { value?: string; escaped?: { frame?: string } } | undefined {
+  // An `<Errored>` fallback still resolving answers with a function (see
+  // `renderOutcome`); waited for only while this fragment is parked in an
+  // enclosing pending one, where nothing of the failure shows yet and the
+  // enclosing fragment can carry the finished fallback (#4306). Elsewhere
+  // it is no markup: the fragment settles as a plain rejection now.
+  type Outcome = { value?: string; escaped?: { frame?: string } } | undefined;
+  function errorOutcome(err: any, wait?: boolean): Outcome | Promise<Outcome> {
     const scoped = inServerComponentScope(o as any);
     const rendered = parentHandler ? parentHandler(err, scoped || id) : undefined;
     if (typeof rendered === "string") return { value: rendered };
+    if (typeof rendered === "function" && wait && done!.parked?.())
+      return rendered().then(value => (value === undefined ? undefined : { value }));
     if (scoped) return { value: plainFallback(), escaped: { frame: ctx.frameId } };
   }
   // Settle the fragment with the failure. The server error hook hears of it
@@ -393,19 +401,24 @@ function ssrLoadingBoundary(
   // Whether the last failure's outcome was rendered by a server <Errored>
   // (its own finding names it; the "client re-renders" one would be wrong).
   let outcomeRendered = false;
-  function failFragment(err: any, report: boolean): boolean {
-    const outcome = errorOutcome(err);
-    outcomeRendered = !!outcome && outcome.value !== undefined && !outcome.escaped;
-    if (report && !outcomeRendered) {
-      reportServerError(
-        err,
-        { kind: "render", handling: "client", boundary: id },
-        o,
-        ctx.errorPolicy,
-        ctx._errorScope
-      );
-    }
-    return done!(outcome && outcome.value, err, outcome && outcome.escaped);
+  // With `wait`, answers a promise where the outcome is still resolving (see
+  // errorOutcome): the fragment settles when it lands.
+  function failFragment(err: any, report: boolean, wait?: boolean): boolean | Promise<boolean> {
+    const settle = (outcome: Outcome) => {
+      outcomeRendered = !!outcome && outcome.value !== undefined && !outcome.escaped;
+      if (report && !outcomeRendered) {
+        reportServerError(
+          err,
+          { kind: "render", handling: "client", boundary: id },
+          o,
+          ctx.errorPolicy,
+          ctx._errorScope
+        );
+      }
+      return done!(outcome && outcome.value, err, outcome && outcome.escaped);
+    };
+    const outcome = errorOutcome(err, wait);
+    return outcome instanceof Promise ? outcome.then(settle) : settle(outcome);
   }
 
   function runLoadingPhase<T>(render: () => T): T {
@@ -431,8 +444,9 @@ function ssrLoadingBoundary(
           // hydration before the fragment channel can engage. (Inside a
           // server component the nearest server `<Errored>` IS asked — for
           // its rendered outcome, not to route; see errorOutcome.)
-          streamedOnError = failFragment(err, true);
-          if (!outcomeRendered) reportRouted(err, "client");
+          streamedOnError = failFragment(err, true, true);
+          if (!(streamedOnError instanceof Promise) && !outcomeRendered)
+            reportRouted(err, "client");
           throw err;
         }
         // Synchronous discovery (no fragment yet): the enclosing Errored's
@@ -460,10 +474,16 @@ function ssrLoadingBoundary(
   // flushed — for that pre-shell case, and for a parent handler that itself
   // throws, route through the renderer's containment channel instead: the
   // request fails (onError + wind-down), the process survives.
-  function finalizeError(err: any) {
+  function finalizeError(err: any): void | Promise<void> {
     if (handledRenderError === err) {
       handledRenderError = undefined;
-      record("error", streamedOnError, err);
+      const settling = streamedOnError;
+      if (settling instanceof Promise)
+        return settling.then(streamed => {
+          if (!outcomeRendered) reportRouted(err, "client");
+          record("error", streamed, err);
+        });
+      record("error", settling, err);
       return;
     }
     if (done) {
@@ -737,7 +757,9 @@ function ssrLoadingBoundary(
         const streamed = done!(ret && Array.isArray(ret.t) ? ret.t[0] : ((ret && ret.t) as any));
         record("settled", streamed);
       } catch (err) {
-        finalizeError(err);
+        // A failure whose outcome is still resolving settles when it lands.
+        const settling = finalizeError(err);
+        if (settling) await settling;
       } finally {
         // The slot settles either way: on error, `done(undefined, err)` wrote
         // the fragment template and rejects `key_fr`, so the client error path
diff --git a/packages/solid/src/server/shared.ts b/packages/solid/src/server/shared.ts
index 91d38ab33..74de8f05a 100644
--- a/packages/solid/src/server/shared.ts
+++ b/packages/solid/src/server/shared.ts
@@ -42,12 +42,15 @@ export type HydrationContext = {
    * server component (no server `<Errored>` rendered an outcome for it) —
    * the renderer surfaces it as the frame's own error, the outward face;
    * `escaped.frame` names the component's frame where the channel needs it
-   * (the document face's `sc:live` op).
+   * (the document face's `sc:live` op). `parked`: whether settling now
+   * would park its markup in an enclosing pending fragment.
    */
   registerFragment: (
     v: string,
     options?: { revealGroup?: string }
-  ) => (v?: string, err?: any, escaped?: { frame?: string }) => boolean;
+  ) => ((v?: string, err?: any, escaped?: { frame?: string }) => boolean) & {
+    parked?: () => boolean;
+  };
   /**
    * @internal The frame id of the server component this context renders
    * inside, on the document face (set by the frames server runtime on the
diff --git a/packages/solid/src/server/signals.ts b/packages/solid/src/server/signals.ts
index 353bf2385..89dc79ee0 100644
--- a/packages/solid/src/server/signals.ts
+++ b/packages/solid/src/server/signals.ts
@@ -3708,7 +3708,9 @@ export function repeat<T>(
  * asking `<Loading>`'s id, and an `<Errored>` answers only when that
  * Loading is all of its content (#4287).
  */
-export type BoundaryErrorHandler = (err: any, outcome?: true | string) => string | undefined | void;
+export type BoundaryErrorHandler = (err: any, outcome?: true | string) => BoundaryOutcome;
+/** A rendered outcome; a function where it is still resolving (see renderOutcome). */
+export type BoundaryOutcome = string | (() => Promise<string | undefined>) | undefined | void;
 
 const ErrorContext: Context<BoundaryErrorHandler | null> = {
   id: Symbol("ErrorContext"),
@@ -3761,7 +3763,7 @@ export function runWithBoundaryErrorContext<T>(
     err: any,
     parentHandler: BoundaryErrorHandler | null,
     outcome?: true | string
-  ) => string | undefined | void,
+  ) => BoundaryOutcome,
   context?: NonNullable<typeof sharedConfig.context>,
   boundaryId?: string
 ): T {
@@ -4275,7 +4277,12 @@ export function createErrorBoundary<T, U>(
   // all of its content: the fallback then lands where the client twin draws
   // it, and the error serialized here lets it adopt that markup. Deeper in
   // the content it answers nothing — the client renders the failure fresh.
-  const renderOutcome = (err: any, outcome: true | string): string | undefined => {
+  // Asked by a `<Loading>` whose failure nothing shows yet (its fragment is
+  // parked in an enclosing pending one, #4306), a fallback still resolving
+  // answers with a function instead: called, it waits out the fallback's
+  // holes and answers with the finished markup (or `undefined`, a client
+  // hole or a failure in it), serializing the error only then.
+  const renderOutcome = (err: any, outcome: true | string): BoundaryOutcome => {
     let t = shown && shown.t;
     if (Array.isArray(t)) t = t[0];
     if (
@@ -4289,19 +4296,32 @@ export function createErrorBoundary<T, U>(
       return undefined;
     // Rendered from a resume loop, where the render context the compiled
     // template reads has long moved past this boundary's: restore it.
-    const prevCtx = sharedConfig.context;
-    sharedConfig.context = ctx;
-    try {
-      const resolved: any = ctx.resolve(ctx.escape(handleError(err, true)));
-      if (!resolved || (resolved.h && resolved.h.length)) return undefined;
+    const inCtx = (run: () => any) => {
+      const prevCtx = sharedConfig.context;
+      sharedConfig.context = ctx;
+      try {
+        return run();
+      } catch {
+      } finally {
+        sharedConfig.context = prevCtx;
+      }
+    };
+    const finish = (resolved: any) => {
+      if (!resolved || (resolved.h && resolved.h.length)) return;
       if (deferredWire) (serializeError(deferredWire), (deferredWire = undefined));
       const t = resolved.t;
       return Array.isArray(t) ? t[0] : t;
-    } catch {
-      return undefined;
-    } finally {
-      sharedConfig.context = prevCtx;
-    }
+    };
+    let resolved: any = inCtx(() => ctx.resolve(ctx.escape(handleError(err, true))));
+    if (outcome === true || !resolved || !resolved.h || !resolved.h.length) return finish(resolved);
+    return async () => {
+      while (resolved && resolved.p && resolved.p.length) {
+        if (resolved.p.some((p: any) => p.$clientHole)) return;
+        await Promise.all(resolved.p).catch(() => {});
+        resolved = inCtx(() => ctx.ssr(resolved.t, ...resolved.h));
+      }
+      return finish(resolved);
+    };
   };
   // `$lhSkip`: boundary machinery owns this position (see ssrLoadingBoundary)
   // — a live binding over the boundary's output would re-run resolve(),
diff --git a/packages/web/src/server.ts b/packages/web/src/server.ts
index 0b77cb18f..fa30284e7 100644
--- a/packages/web/src/server.ts
+++ b/packages/web/src/server.ts
@@ -2962,7 +2962,7 @@ export function renderToStream(code, options = {}) {
           (stubBatch ||= new Map()).set(key + "_fr", p);
         else write(key + "_fr", p);
       }
-      return (value, error, escaped) => {
+      const settle = (value, error, escaped) => {
         if (registry.has(key)) {
           const item = registry.get(key);
           registry.delete(key);
@@ -3051,6 +3051,13 @@ export function renderToStream(code, options = {}) {
         }
         return firstFlushed;
       };
+      // Whether settling now would park this fragment's markup in an
+      // enclosing pending one (above) — nothing of it would show yet (#4306).
+      settle.parked = () => {
+        for (const k of registry.keys()) if (k !== key && key.startsWith(k)) return true;
+        return false;
+      };
+      return settle;
     },
     revealFragments(groupOrKeys) {
       // Group reveal follows fragment registration order so visibility order
diff --git a/packages/web/test/harness/__artifacts__/errored-loading-parked-rejection-async-fallback-4306.json b/packages/web/test/harness/__artifacts__/errored-loading-parked-rejection-async-fallback-4306.json
new file mode 100644
index 000000000..fa7b48a2e
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/errored-loading-parked-rejection-async-fallback-4306.json
@@ -0,0 +1,5 @@
+{
+  "name": "errored-loading-parked-rejection-async-fallback-4306",
+  "shell": "<div _hk=3><!--$--><template id=\"pl-4\"></template><i _hk=40>outer loading</i><!--pl-4--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"2\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"400200_fr\"]=$R[7]=($R[8]=$R[2]()).p;_$HY.r[\"4_fr\"]=$R[9]=($R[10]=$R[2]()).p;</script>",
+  "rest": "<script>($R[12]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[11]=new Error(\"no user 7\"));</script><script>($R[13]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[6],\"HINT\");_$HY.r[\"4002\"]=$R[11];</script><script>$R[13]($R[8],!0);</script><template id=\"4\"><b _hk=4000>outer</b><p _hk=40030>failed: <!--$-->no user 7<!--/--> <!--$-->HINT<!--/--></p></template><script>$R[13]($R[1],\"outer\");$df(\"4\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[13]($R[10],!0);</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/errored-loading-parked-rejection-late-async-fallback-4306.json b/packages/web/test/harness/__artifacts__/errored-loading-parked-rejection-late-async-fallback-4306.json
new file mode 100644
index 000000000..5d2b27b4f
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/errored-loading-parked-rejection-late-async-fallback-4306.json
@@ -0,0 +1,5 @@
+{
+  "name": "errored-loading-parked-rejection-late-async-fallback-4306",
+  "shell": "<div _hk=3><!--$--><template id=\"pl-4\"></template><i _hk=40>outer loading</i><!--pl-4--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"2\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"400200_fr\"]=$R[7]=($R[8]=$R[2]()).p;_$HY.r[\"4_fr\"]=$R[9]=($R[10]=$R[2]()).p;</script>",
+  "rest": "<script>($R[12]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[11]=new Error(\"no user 7\"));</script><template id=\"4\"><b _hk=4000>outer</b><template id=\"pl-400200\"></template><i _hk=4002000>loading</i><!--pl-400200--></template><script>($R[13]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"outer\");$df(\"4\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[13]($R[10],!0);</script><script>$R[13]($R[6],\"HINT\");_$HY.r[\"4002\"]=$R[11];</script><template id=\"400200\" e><p _hk=40030>failed: <!--$-->no user 7<!--/--> <!--$-->HINT<!--/--></p></template><script>$df(\"400200\");</script><script>$R[12]($R[8],$R[11]);</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/scenarios.tsx b/packages/web/test/harness/scenarios.tsx
index d3d6d8d00..119db677d 100644
--- a/packages/web/test/harness/scenarios.tsx
+++ b/packages/web/test/harness/scenarios.tsx
@@ -1632,6 +1632,53 @@ function PostflushRejectionParked() {
   );
 }
 
+// #4306: the parked failure with an async hole in the Errored fallback,
+// still pending when the inner Loading fails. The failure waits out the
+// hole while parked (nothing of it shows yet): settled before the outer
+// Loading, the outer fragment carries the finished fallback; settled after
+// it (`late`), the outer fragment carries the inner placeholder and the
+// inner fragment streams the fallback once the hole lands. Either way the
+// client claims it. (No update pass, as for the plain-fallback parked
+// scenario above.)
+let parkedHoleAsks = 0;
+export const parkedHoleAskCount = () => parkedHoleAsks;
+function parkedRejectionAsyncFallback(late: boolean) {
+  return function PostflushRejectionParkedAsyncFallback() {
+    const outer = createMemo(async () => {
+      await sleep(15);
+      return "outer";
+    });
+    const user = createMemo(async (): Promise<string> => {
+      if (!isServer && Promise === RealPromise) parkedHoleAsks++;
+      await sleep(5);
+      throw new Error("no user 7");
+    });
+    const hint = createMemo(async () => {
+      await sleep(late ? 25 : 10);
+      return "HINT";
+    });
+    return (
+      <div>
+        <Loading fallback={<i>outer loading</i>}>
+          <b>{outer()}</b>
+          <Errored
+            fallback={(e: any) => (
+              <p>
+                failed: {e().message} {hint()}
+              </p>
+            )}
+          >
+            <Loading fallback={<i>loading</i>}>
+              <span>user:{user()}</span>
+            </Loading>
+          </Errored>
+        </Loading>
+        <span>tail</span>
+      </div>
+    );
+  };
+}
+
 // ---------------------------------------------------------------------------
 // #3414: a sync throw the SERVER catches, with a zero-arg fallback thunk
 // (`fallback={() => <Fallback />}`), inside an enclosing boundary. Errored
@@ -2974,6 +3021,20 @@ export const scenarios: Scenario[] = [
     // boundary's resume (as it does on `next`), so the Errored holds the
     // server's fallback until reset() rather than tracking the memo.
   },
+  {
+    name: "errored-loading-parked-rejection-async-fallback-4306",
+    App: parkedRejectionAsyncFallback(false),
+    async: true,
+    expectedText: "outerfailed: no user 7 HINTtail",
+    serverText: "outer loading tail failed: no user 7 HINT"
+  },
+  {
+    name: "errored-loading-parked-rejection-late-async-fallback-4306",
+    App: parkedRejectionAsyncFallback(true),
+    async: true,
+    expectedText: "outerfailed: no user 7 HINTtail",
+    serverText: "outer loading tail loading failed: no user 7 HINT"
+  },
   {
     name: "errored-loading-postflush-rejection-async-fallback-4287",
     App: PostflushRejectionAsyncFallback,
diff --git a/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx b/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx
new file mode 100644
index 000000000..7316f81c8
--- /dev/null
+++ b/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx
@@ -0,0 +1,95 @@
+/**
+ * @jsxImportSource @solidjs/web
+ * @vitest-environment jsdom
+ *
+ * #4306: `<Errored>` with an async hole in its fallback, around a
+ * `<Loading>` whose read fails after the shell, inside an outer `<Loading>`
+ * still pending when it fails. The failure waits out the fallback's hole
+ * while parked in the outer fragment, so the server sends the finished
+ * fallback (and the error record at the Errored id):
+ *
+ * - hole settled before the outer Loading: inside the outer fragment;
+ * - hole settled after it: the outer fragment carries the inner
+ *   placeholder, and the inner fragment streams the fallback.
+ *
+ * The client claims that markup in both replay orders, without warnings;
+ * hydrated after the stream it asks nothing again.
+ *
+ * Replays the parity harness artifacts (test/server/hydration-harness.spec.tsx).
+ */
+import { describe, expect, test, vi } from "vitest";
+import { existsSync, readFileSync } from "node:fs";
+import { resolve, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+import { flush } from "solid-js";
+import { hydrate } from "@solidjs/web";
+import { scenarios, parkedHoleAskCount } from "../harness/scenarios.jsx";
+
+const artifact = (name: string) =>
+  resolve(dirname(fileURLToPath(import.meta.url)), `../harness/__artifacts__/${name}.json`);
+const sleep = (ms: number) => new Promise(r => setTimeout(r, ms));
+
+function applyChunk(container: HTMLDivElement, chunk: string, first: boolean) {
+  const scriptRe = /<script(?:[^>]*)>([\s\S]*?)<\/script>/g;
+  const scripts = [...chunk.matchAll(scriptRe)].map(m => m[1]);
+  const stripped = chunk.replace(scriptRe, "");
+  if (first) container.innerHTML = stripped;
+  else container.insertAdjacentHTML("beforeend", stripped);
+  for (const s of scripts) (0, eval)(s);
+}
+
+async function run(name: string, mode: "loaded" | "streamed") {
+  const file = artifact(name);
+  const scenario = scenarios.find(s => s.name === name)!;
+  expect(existsSync(file)).toBe(true);
+  const { shell, rest } = JSON.parse(readFileSync(file, "utf-8"));
+  // The server sends the finished fallback and the error record with it.
+  expect(rest).toContain("HINT<!--/--></p>");
+  expect(rest).toContain('_$HY.r["4002"]');
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  (globalThis as any)._$HY = { events: [], completed: new WeakSet(), r: {}, fe() {} };
+  const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
+  const asksBefore = parkedHoleAskCount();
+  let dispose: (() => void) | undefined;
+  try {
+    applyChunk(container, shell, true);
+    if (mode === "loaded") applyChunk(container, rest, false);
+    const serverP = container.querySelector("p");
+    dispose = hydrate(() => <scenario.App />, container);
+    flush();
+    await sleep(10);
+    flush();
+    if (mode === "streamed") {
+      expect(container.textContent).toBe("outer loadingtail");
+      applyChunk(container, rest, false);
+    }
+    await sleep(50);
+    flush();
+    expect(container.textContent).toBe("outerfailed: no user 7 HINTtail");
+    expect(container.querySelectorAll("p").length).toBe(1);
+    if (mode === "loaded") expect(container.querySelector("p")).toBe(serverP);
+    // The server's answer is used: nothing is asked again. (Hydrated
+    // mid-stream, the memo re-asks on the outer boundary's resume, as for
+    // the parked failure with a plain fallback — see the scenario notes.)
+    expect(parkedHoleAskCount()).toBe(asksBefore + (mode === "streamed" ? 1 : 0));
+    expect(warn).not.toHaveBeenCalled();
+  } finally {
+    warn.mockRestore();
+    dispose?.();
+    await sleep(0);
+    container.remove();
+  }
+}
+
+const early = "errored-loading-parked-rejection-async-fallback-4306";
+const late = "errored-loading-parked-rejection-late-async-fallback-4306";
+
+describe("#4306: parked failure, Errored fallback with an async hole", () => {
+  test("hole settles before the outer Loading, hydrated after the stream", () =>
+    run(early, "loaded"));
+  test("hole settles before the outer Loading, hydrated mid-stream", () => run(early, "streamed"));
+  test("hole settles after the outer Loading, hydrated after the stream", () =>
+    run(late, "loaded"));
+  test("hole settles after the outer Loading, hydrated mid-stream", () => run(late, "streamed"));
+});

From e7cf2c818f995cb4fc17b3d23c87d7ff861aad92 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 26 Oct 2026 22:02:37 +0000
Subject: [PATCH 04/16] fix(solid,web): a failed Errored always waits for its
 fallback's async holes (#4306)

Per RULES-DERIVED D-18 (a swap to a fallback waits for the fallback to be
ready), the wait for an Errored fallback's async holes no longer depends
on the fragment being parked. A <Loading> that fails after the shell under
an <Errored> whose fallback is still resolving keeps its placeholder until
the finished fallback is ready, then streams it with the error record, in
the parked case (carried by the outer fragment while that is pending) and
the unparked one alike. The registry's `parked()` query is dropped.

#4303's async-fallback scenario now expects the server's finished fallback
and its record: a client hydrating after the failure arrived claims it and
asks nothing again. Server-only; no client bytes.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015hPxMkC3jg3Uivh65gvaf2
---
 .../errored-parked-async-outcome-4306.md      |  2 +-
 packages/solid/src/server/hydration.ts        | 10 ++--
 packages/solid/src/server/shared.ts           |  7 +--
 packages/solid/src/server/signals.ts          | 10 ++--
 packages/web/src/server.ts                    |  9 +---
 ...stflush-rejection-async-fallback-4287.json |  2 +-
 packages/web/test/harness/scenarios.tsx       | 18 ++++---
 .../errored-async-outcome-4287.spec.tsx       | 50 ++++++++++++++++---
 ...errored-parked-async-outcome-4306.spec.tsx |  4 +-
 9 files changed, 71 insertions(+), 41 deletions(-)

diff --git a/.changeset/errored-parked-async-outcome-4306.md b/.changeset/errored-parked-async-outcome-4306.md
index f8c9e8b8c..c8fea80af 100644
--- a/.changeset/errored-parked-async-outcome-4306.md
+++ b/.changeset/errored-parked-async-outcome-4306.md
@@ -3,4 +3,4 @@
 "@solidjs/web": patch
 ---
 
-An `<Errored>` whose fallback reads async data, around a `<Loading>` that fails after the shell inside an outer `<Loading>` still pending, now streams its fallback. Before, the failure landed while the fallback's async read was still pending, so the server had no markup for it and the outer fragment arrived with the Errored region blank; the client hydrated against the blank with warnings and showed nothing there. Now a failure whose fragment is parked in a pending outer one (nothing of it shows yet) waits for the fallback to finish: the outer fragment carries it, or, when the outer settles first, the inner fragment streams it once it resolves. The error is serialized with it and the client claims the markup. A failure in a region already shown still settles at once, as before (#4306).
+An `<Errored>` whose fallback reads async data, around a `<Loading>` that fails after the shell, now streams its fallback once that data is ready, and a client hydrating after it arrived claims it. Before, the failure landed while the fallback's read was still pending, so the server had no markup for it. On its own, the boundary swapped to a blank and the client rendered the failure itself, asking for the failed read again. Inside an outer `<Loading>` still pending, the outer fragment arrived with the Errored region blank, and the client hydrated against the blank with warnings and showed nothing there. Now the failure waits for the fallback, as a swap to a fallback waits for the fallback to be ready: the loading placeholder stays until the finished fallback replaces it (carried by the outer fragment when that is still pending), and the error is serialized with it (#4306).
diff --git a/packages/solid/src/server/hydration.ts b/packages/solid/src/server/hydration.ts
index 01847b088..b62c6f259 100644
--- a/packages/solid/src/server/hydration.ts
+++ b/packages/solid/src/server/hydration.ts
@@ -379,16 +379,16 @@ function ssrLoadingBoundary(
   // hydration-free scope's; its head and asset registrations drop with the
   // error, as the error path drops them today.
   // An `<Errored>` fallback still resolving answers with a function (see
-  // `renderOutcome`); waited for only while this fragment is parked in an
-  // enclosing pending one, where nothing of the failure shows yet and the
-  // enclosing fragment can carry the finished fallback (#4306). Elsewhere
-  // it is no markup: the fragment settles as a plain rejection now.
+  // `renderOutcome`): the failure waits for it, as a client swap to a
+  // fallback waits for the fallback to be ready (RULES-DERIVED D-18) — the
+  // placeholder stays until the finished fallback replaces it, or, parked
+  // in an enclosing pending fragment, that fragment carries it (#4306).
   type Outcome = { value?: string; escaped?: { frame?: string } } | undefined;
   function errorOutcome(err: any, wait?: boolean): Outcome | Promise<Outcome> {
     const scoped = inServerComponentScope(o as any);
     const rendered = parentHandler ? parentHandler(err, scoped || id) : undefined;
     if (typeof rendered === "string") return { value: rendered };
-    if (typeof rendered === "function" && wait && done!.parked?.())
+    if (typeof rendered === "function" && wait)
       return rendered().then(value => (value === undefined ? undefined : { value }));
     if (scoped) return { value: plainFallback(), escaped: { frame: ctx.frameId } };
   }
diff --git a/packages/solid/src/server/shared.ts b/packages/solid/src/server/shared.ts
index 74de8f05a..91d38ab33 100644
--- a/packages/solid/src/server/shared.ts
+++ b/packages/solid/src/server/shared.ts
@@ -42,15 +42,12 @@ export type HydrationContext = {
    * server component (no server `<Errored>` rendered an outcome for it) —
    * the renderer surfaces it as the frame's own error, the outward face;
    * `escaped.frame` names the component's frame where the channel needs it
-   * (the document face's `sc:live` op). `parked`: whether settling now
-   * would park its markup in an enclosing pending fragment.
+   * (the document face's `sc:live` op).
    */
   registerFragment: (
     v: string,
     options?: { revealGroup?: string }
-  ) => ((v?: string, err?: any, escaped?: { frame?: string }) => boolean) & {
-    parked?: () => boolean;
-  };
+  ) => (v?: string, err?: any, escaped?: { frame?: string }) => boolean;
   /**
    * @internal The frame id of the server component this context renders
    * inside, on the document face (set by the frames server runtime on the
diff --git a/packages/solid/src/server/signals.ts b/packages/solid/src/server/signals.ts
index 89dc79ee0..5d493c6b8 100644
--- a/packages/solid/src/server/signals.ts
+++ b/packages/solid/src/server/signals.ts
@@ -4277,11 +4277,11 @@ export function createErrorBoundary<T, U>(
   // all of its content: the fallback then lands where the client twin draws
   // it, and the error serialized here lets it adopt that markup. Deeper in
   // the content it answers nothing — the client renders the failure fresh.
-  // Asked by a `<Loading>` whose failure nothing shows yet (its fragment is
-  // parked in an enclosing pending one, #4306), a fallback still resolving
-  // answers with a function instead: called, it waits out the fallback's
-  // holes and answers with the finished markup (or `undefined`, a client
-  // hole or a failure in it), serializing the error only then.
+  // Asked by a `<Loading>` (outside a server component), a fallback still
+  // resolving answers with a function instead: called, it waits out the
+  // fallback's holes and answers with the finished markup (or `undefined`,
+  // a client hole or a failure in it), serializing the error only then
+  // (#4306).
   const renderOutcome = (err: any, outcome: true | string): BoundaryOutcome => {
     let t = shown && shown.t;
     if (Array.isArray(t)) t = t[0];
diff --git a/packages/web/src/server.ts b/packages/web/src/server.ts
index fa30284e7..0b77cb18f 100644
--- a/packages/web/src/server.ts
+++ b/packages/web/src/server.ts
@@ -2962,7 +2962,7 @@ export function renderToStream(code, options = {}) {
           (stubBatch ||= new Map()).set(key + "_fr", p);
         else write(key + "_fr", p);
       }
-      const settle = (value, error, escaped) => {
+      return (value, error, escaped) => {
         if (registry.has(key)) {
           const item = registry.get(key);
           registry.delete(key);
@@ -3051,13 +3051,6 @@ export function renderToStream(code, options = {}) {
         }
         return firstFlushed;
       };
-      // Whether settling now would park this fragment's markup in an
-      // enclosing pending one (above) — nothing of it would show yet (#4306).
-      settle.parked = () => {
-        for (const k of registry.keys()) if (k !== key && key.startsWith(k)) return true;
-        return false;
-      };
-      return settle;
     },
     revealFragments(groupOrKeys) {
       // Group reveal follows fragment registration order so visibility order
diff --git a/packages/web/test/harness/__artifacts__/errored-loading-postflush-rejection-async-fallback-4287.json b/packages/web/test/harness/__artifacts__/errored-loading-postflush-rejection-async-fallback-4287.json
index c733b0f2c..332ae5148 100644
--- a/packages/web/test/harness/__artifacts__/errored-loading-postflush-rejection-async-fallback-4287.json
+++ b/packages/web/test/harness/__artifacts__/errored-loading-postflush-rejection-async-fallback-4287.json
@@ -1,5 +1,5 @@
 {
   "name": "errored-loading-postflush-rejection-async-fallback-4287",
   "shell": "<div _hk=2><!--$--><template id=\"pl-300\"></template><i _hk=3000>loading</i><!--pl-300--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"300_fr\"]=$R[5]=($R[6]=$R[2]()).p;</script>",
-  "rest": "<template id=\"300\" e> </template><script>($R[8]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[7]=new Error(\"no user 7\"));$df(\"300\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[8]($R[6],$R[7]);</script><script>($R[9]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"HINT\");</script>"
+  "rest": "<script>($R[8]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[7]=new Error(\"no user 7\"));</script><script>($R[9]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"HINT\");_$HY.r[\"3\"]=$R[7];</script><template id=\"300\" e><p _hk=40>failed: <!--$-->no user 7<!--/--> <!--$-->HINT<!--/--></p></template><script>$df(\"300\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[8]($R[6],$R[7]);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/scenarios.tsx b/packages/web/test/harness/scenarios.tsx
index 119db677d..aaae82e4a 100644
--- a/packages/web/test/harness/scenarios.tsx
+++ b/packages/web/test/harness/scenarios.tsx
@@ -1537,21 +1537,26 @@ function PostflushRejection() {
 }
 
 // The same failure with an async hole in the Errored fallback, still
-// pending when the Loading fails: the server has no finished fallback markup
-// to draw, so it serializes no error either (a record with no markup behind
-// it would make the client claim a fallback that is not there). The client
-// renders the failure itself, as it does on `next`.
+// pending when the Loading fails: the failure waits for the fallback to be
+// ready (RULES-DERIVED D-18, #4306) — the loading placeholder stays until
+// the fragment swaps in the finished fallback, its error serialized with it
+// (serializing it before would make the client claim a fallback that is not
+// there). The client claims it, asking for neither read again.
 let setPostflushHoleKey!: (v: string) => void;
+let postflushHoleAsks = 0;
+export const postflushHoleAskCount = () => postflushHoleAsks;
 function PostflushRejectionAsyncFallback() {
   const [key, setKey] = createSignal("u7");
   setPostflushHoleKey = setKey;
   const user = createMemo(async (): Promise<string> => {
     const k = key();
+    if (!isServer && Promise === RealPromise) postflushHoleAsks++;
     await sleep(5);
     if (k === "u7") throw new Error("no user 7");
     return k;
   });
   const hint = createMemo(async () => {
+    if (!isServer && Promise === RealPromise) postflushHoleAsks++;
     await sleep(20);
     return "HINT";
   });
@@ -1634,7 +1639,7 @@ function PostflushRejectionParked() {
 
 // #4306: the parked failure with an async hole in the Errored fallback,
 // still pending when the inner Loading fails. The failure waits out the
-// hole while parked (nothing of it shows yet): settled before the outer
+// hole (as unparked, above): settled before the outer
 // Loading, the outer fragment carries the finished fallback; settled after
 // it (`late`), the outer fragment carries the inner placeholder and the
 // inner fragment streams the fallback once the hole lands. Either way the
@@ -3040,7 +3045,8 @@ export const scenarios: Scenario[] = [
     App: PostflushRejectionAsyncFallback,
     async: true,
     expectedText: "failed: no user 7 HINTtail",
-    serverText: "loading tail",
+    // Shell: the loading fallback; the fragment: the finished fallback.
+    serverText: "loading tail failed: no user 7 HINT",
     update: () => setPostflushHoleKey("u8"),
     expectedTextAfterUpdate: "user:u8tail"
   },
diff --git a/packages/web/test/hydration/errored-async-outcome-4287.spec.tsx b/packages/web/test/hydration/errored-async-outcome-4287.spec.tsx
index c2de8cbef..5b62c5ee2 100644
--- a/packages/web/test/hydration/errored-async-outcome-4287.spec.tsx
+++ b/packages/web/test/hydration/errored-async-outcome-4287.spec.tsx
@@ -12,8 +12,9 @@
  * - Hydrating before it arrived, the client renders the failure itself once
  *   the fragment rejects, with nothing of the server's swap left beside it.
  * - With an async hole in the fallback still pending when the Loading fails,
- *   the server has no fallback markup to draw and serializes no error: the
- *   client renders the failure itself instead of claiming a missing node.
+ *   the failure waits for the fallback (RULES-DERIVED D-18, #4306): the
+ *   loading placeholder stays until the fragment swaps in the finished
+ *   fallback with the error record, and the client claims it.
  *
  * Replays the parity harness artifact (test/server/hydration-harness.spec.tsx).
  */
@@ -23,7 +24,11 @@ import { resolve, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { flush } from "solid-js";
 import { hydrate } from "@solidjs/web";
-import { scenarios, postflushClientAskCount } from "../harness/scenarios.jsx";
+import {
+  scenarios,
+  postflushClientAskCount,
+  postflushHoleAskCount
+} from "../harness/scenarios.jsx";
 
 const artifact = (name: string) =>
   resolve(dirname(fileURLToPath(import.meta.url)), `../harness/__artifacts__/${name}.json`);
@@ -84,29 +89,60 @@ async function run(mode: "loaded" | "streamed") {
   }
 }
 
+// The stream after the shell, one script at a time (a template rides with
+// the script after it), as a browser parses it.
+const pieces = (rest: string) => rest.match(/[\s\S]*?<\/script>/g) ?? [rest];
+
 async function runAsyncFallback(mode: "loaded" | "streamed") {
   const name = "errored-loading-postflush-rejection-async-fallback-4287";
   const file = artifact(name);
   const scenario = scenarios.find(s => s.name === name)!;
   expect(existsSync(file)).toBe(true);
   const { shell, rest } = JSON.parse(readFileSync(file, "utf-8"));
+  // The failure waited for its fallback: the fragment carries it finished,
+  // and the error record at the Errored id with it (#4306).
+  expect(rest).toContain('_$HY.r["3"]');
+  expect(rest).toContain("HINT<!--/--></p></template>");
   const container = document.createElement("div");
   document.body.appendChild(container);
   (globalThis as any)._$HY = { events: [], completed: new WeakSet(), r: {}, fe() {} };
   const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
+  const asksBefore = postflushHoleAskCount();
   let dispose: (() => void) | undefined;
   try {
     applyChunk(container, shell, true);
     if (mode === "loaded") applyChunk(container, rest, false);
+    const serverP = container.querySelector("p");
     dispose = hydrate(() => <scenario.App />, container);
     flush();
     await sleep(10);
     flush();
-    if (mode === "streamed") applyChunk(container, rest, false);
+    if (mode === "streamed") {
+      // Between the failure and the hint landing the loading placeholder
+      // stays: nothing shows until the swap brings the finished fallback.
+      const seen: string[] = [container.textContent!];
+      for (const piece of pieces(rest)) {
+        applyChunk(container, piece, false);
+        flush();
+        await sleep(5);
+        flush();
+        seen.push(container.textContent!);
+      }
+      const swapped = seen.indexOf("failed: no user 7 HINTtail");
+      expect(swapped).toBeGreaterThan(1);
+      expect(new Set(seen.slice(0, swapped))).toEqual(new Set(["loadingtail"]));
+    }
     await sleep(40);
     flush();
     expect(container.textContent).toBe("failed: no user 7 HINTtail");
     expect(container.querySelectorAll("p").length).toBe(1);
+    if (mode === "loaded") expect(container.querySelector("p")).toBe(serverP);
+    // Hydrated after the failure, the server's answers are used: neither
+    // read is asked again. Hydrated before it, the client renders the
+    // failure itself once `_fr` rejects (as for the plain fallback), and
+    // that fresh read of `user` — a cycle after its error landed — retries
+    // it: one ask, during which the inner Loading shows its fallback again.
+    expect(postflushHoleAskCount()).toBe(asksBefore + (mode === "streamed" ? 1 : 0));
 
     scenario.update!();
     flush();
@@ -114,8 +150,6 @@ async function runAsyncFallback(mode: "loaded" | "streamed") {
     flush();
     expect(container.textContent).toBe("user:u8tail");
     expect(warn).not.toHaveBeenCalled();
-    // No fallback markup was sent, so no error record either.
-    expect(rest).not.toContain('_$HY.r["3"]');
   } finally {
     warn.mockRestore();
     dispose?.();
@@ -127,8 +161,8 @@ async function runAsyncFallback(mode: "loaded" | "streamed") {
 describe("#4287: Errored over a Loading whose read fails after the shell", () => {
   test("hydrated after the failure arrived: adopts the server's fallback", () => run("loaded"));
   test("hydrated before the failure arrived: shows it once, no ask", () => run("streamed"));
-  test("fallback with a pending async hole, hydrated after the failure: renders it", () =>
+  test("fallback with a pending async hole, hydrated after the failure: adopts it", () =>
     runAsyncFallback("loaded"));
-  test("fallback with a pending async hole, hydrated before the failure: renders it", () =>
+  test("fallback with a pending async hole, hydrated before the failure: placeholder until the swap", () =>
     runAsyncFallback("streamed"));
 });
diff --git a/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx b/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx
index 7316f81c8..7c88c0887 100644
--- a/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx
+++ b/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx
@@ -5,8 +5,8 @@
  * #4306: `<Errored>` with an async hole in its fallback, around a
  * `<Loading>` whose read fails after the shell, inside an outer `<Loading>`
  * still pending when it fails. The failure waits out the fallback's hole
- * while parked in the outer fragment, so the server sends the finished
- * fallback (and the error record at the Errored id):
+ * (RULES-DERIVED D-18), so the server sends the finished fallback (and the
+ * error record at the Errored id):
  *
  * - hole settled before the outer Loading: inside the outer fragment;
  * - hole settled after it: the outer fragment carries the inner

From d9a7a496ce026f7d28d190378122286894fe2f09 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 27 Oct 2026 02:29:06 +0000
Subject: [PATCH 05/16] fix(solid,web): a hydrated failure re-serves the
 server's error instead of asking again (#4287, #4306)

A client hydrating mid-stream asked again for an async memo whose server
read failed, and flashed back to the inner <Loading> fallback after the
failure showed: Errored > Loading > read, with the read failing after the
shell, unparked (the fragment rejects and the client renders the failure
fresh over the swapped-in Errored fallback) or parked in a pending outer
Loading (the outer resume runs the hydrated Errored's content, NO_CLAIM).

Both content runs read the shell memo a cycle after its error landed, and
a later tracked read retries an errored async node (PJ-R35). The retry
re-enters the hydration latch, which since f3da41e23 has taken every
re-entry for a dependency change ("re-entry is always invalidation-
driven"), and since b68a907de computes such a rerun at once for a shell
node outside the claim in progress: one real ask, the Loading fallback
for its duration. Before f3da41e23 the latch re-served the serialized
answer on every re-entry while hydrating, so the retry asked nothing.

Inside a hydrated failure's content run (NO_CLAIM) a latched rerun now
re-serves the server's answer, its error included, and arms nothing. A
rejected fragment's fresh render runs as such a content run when the swap
brought the outcome the server drew for the failure (the reveal record
lists its nodes); to make that list the outcome alone, a rejected
fragment with no outcome streams an empty template instead of a lone
space. Uncontained failures (no outcome) keep rendering fresh as before.

Tests: the #4287/#4306 hydration specs stream piece by piece with a clock
tick between pieces (the plain-fallback case only passed because no flush
ran between the error landing and the fresh read), assert 0 asks in both
modes and no flash back to a loading fallback, and cover the parked
plain-fallback scenario, which now has an ask counter and an update pass
(the Errored tracks the memo, #4273).

Size: 0 B on every CSR scenario (compiled floor 9,966 B); +65-71 B
minified on the hydrating scenarios.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015hPxMkC3jg3Uivh65gvaf2
---
 .changeset/hydrated-failure-no-reask.md       |   6 +
 packages/solid/src/client/hydration.ts        |  31 +++-
 packages/web/src/server.ts                    |  22 ++-
 ...element-4242-issue-streamed-reference.json |   2 +-
 ...sync-memo-element-4242-issue-streamed.json |   2 +-
 ...o-element-4242-jsx-streamed-reference.json |   2 +-
 .../async-memo-element-4242-jsx-streamed.json |   2 +-
 .../__artifacts__/bare-client-late-final.json |   2 +-
 ...tion-loading-postflush-rejection-4287.json |   2 +-
 packages/web/test/harness/scenarios.tsx       |  22 ++-
 .../errored-async-outcome-4287.spec.tsx       | 142 ++++++++++++++----
 ...errored-parked-async-outcome-4306.spec.tsx |  55 +++++--
 .../frame-fragment-error-outcome.spec.tsx     |   3 +-
 13 files changed, 220 insertions(+), 73 deletions(-)
 create mode 100644 .changeset/hydrated-failure-no-reask.md

diff --git a/.changeset/hydrated-failure-no-reask.md b/.changeset/hydrated-failure-no-reask.md
new file mode 100644
index 000000000..97bbc75d5
--- /dev/null
+++ b/.changeset/hydrated-failure-no-reask.md
@@ -0,0 +1,6 @@
+---
+"solid-js": patch
+"@solidjs/web": patch
+---
+
+A client hydrating mid-stream no longer asks again for an async read whose server answer was an error, nor flashes back to the `<Loading>` fallback after the failure showed (#4287, #4306). The content of a hydrated failure (a hydrated `<Errored>`'s content run, or a rejected fragment's fresh render over the `<Errored>` fallback the server drew) reads a shell memo a cycle after its error landed, and a later tracked read retries an errored async node; the serialized-value latch took that rerun for a client write and computed. Inside such a content run the rerun now re-serves the server's answer and arms nothing. A rejected fragment with no outcome streams an empty template (it was a lone space), so the nodes its swap lists are the server's outcome alone.
diff --git a/packages/solid/src/client/hydration.ts b/packages/solid/src/client/hydration.ts
index d09a7e718..36ad4e7c5 100644
--- a/packages/solid/src/client/hydration.ts
+++ b/packages/solid/src/client/hydration.ts
@@ -306,8 +306,11 @@ let _snapshotRootOwner: Owner | null = null;
 // The boundary owner whose resume window is open (null during a root pass,
 // which claims everything). Reached as `sharedConfig.isClaiming`.
 let _claimOwner: Owner | null = null;
-// The claim window over no owner: a hydrated `<Errored>`'s content run,
-// where nothing claims (hydratedCreateErrorBoundary).
+// The claim window over no owner: a hydrated failure's content run — a
+// hydrated `<Errored>`'s (hydratedCreateErrorBoundary), or a rejected
+// fragment's fresh render over the outcome the server drew for it
+// (resumeBoundaryHydration) — where nothing claims and what the content
+// reads is the server's failure (readSerializedOrCompute).
 const NO_CLAIM = {} as Owner;
 function isClaiming(): boolean {
   if (!_claimOwner) return true;
@@ -625,7 +628,9 @@ export function readHydratedValue(initP: any, refresh: () => void, options?: any
  * not deferred. Arming the takeover gate on that re-entry re-runs exactly
  * the diverged nodes against their live sources when hydration ends.
  * (Async settles commit through the adopted thenable without re-entering
- * the wrapper, so re-entry here is always invalidation-driven.)
+ * the wrapper, so re-entry here is invalidation-driven — save one: a later
+ * tracked read retries an errored async node (PJ-R35) with nothing changed.
+ * A hydrated failure's content run re-serves that one, below.)
  */
 const latchedOnce = new WeakSet<object>();
 
@@ -681,12 +686,17 @@ export function readSerializedOrCompute(compute: (prev: any) => any, prev: any,
     // A rerun outside the claim in progress by a node no pending boundary
     // holds: its section's hydration is over, so the rerun answers a client
     // write and computes, rather than re-adopting the server value until the
-    // page's last boundary resumes.
+    // page's last boundary resumes. Not inside a hydrated failure's content
+    // run (NO_CLAIM): a read there re-runs a node with nothing changed — a
+    // later tracked read retries an errored async node (PJ-R35) — and the
+    // server's answer, its error, is what the content shows. It re-serves
+    // that answer and arms nothing: no ask, no loading flash (#4287, #4306).
     if (options?.ssrSource !== "hybrid") {
       let p: Owner | null = o;
       while (p && !(p as any)._hp) p = p._parent;
-      if (!p && !(sharedConfig.hydrating && isClaiming())) return compute(prev);
-      armLiveTakeover(o);
+      if (!p && !(sharedConfig.hydrating && isClaiming())) {
+        if (_claimOwner !== NO_CLAIM) return compute(prev);
+      } else armLiveTakeover(o);
     }
   } else latchedOnce.add(o);
   const initP = sharedConfig.load!(o.id!);
@@ -2270,10 +2280,17 @@ function resumeBoundaryHydration(
       o
     );
   } else {
-    // The client renders the boundary fresh (recover): no claim.
+    // The client renders the boundary fresh (recover): no claim. Over the
+    // outcome the server drew for the failure (an `<Errored>` fallback the
+    // swap brought, listed in the reveal record, #4287) it is that
+    // failure's content run, as a hydrated `<Errored>`'s is (NO_CLAIM). A
+    // resume runs from a settled promise, never inside a claim window, so
+    // there is no claim owner to restore.
+    if ((globalThis as any)._$HY?.v?.[id]?.length) _claimOwner = NO_CLAIM;
     _hydratingValue = false;
     set();
     flush();
+    _claimOwner = null;
   }
   // Hydration mode is off once a boundary has resumed — whatever the flag
   // read before (a resume never runs inside a root's synchronous pass; the
diff --git a/packages/web/src/server.ts b/packages/web/src/server.ts
index 0b77cb18f..758190a55 100644
--- a/packages/web/src/server.ts
+++ b/packages/web/src/server.ts
@@ -3037,14 +3037,20 @@ export function renderToStream(code, options = {}) {
               // outcome — a server <Errored>'s fallback or the boundary's own
               // markup inside a server component (frames-rulings 3.3) — and
               // nothing outside one, where the client twin renders fresh over
-              // the blank.
-              sink.fragment(key, resolveSSRSelectValues(value !== undefined ? value : " "), {
-                styles,
-                revealGroup,
-                error: error
-                  ? ssrSanitizeError(error, null, undefined, undefined, errorScope)
-                  : error
-              });
+              // the blank: an empty template, so what its swap lists is the
+              // outcome alone (the client reads a listed outcome as the
+              // server's answer for the failure, #4287).
+              sink.fragment(
+                key,
+                resolveSSRSelectValues(value !== undefined ? value : error ? "" : " "),
+                {
+                  styles,
+                  revealGroup,
+                  error: error
+                    ? ssrSanitizeError(error, null, undefined, undefined, errorScope)
+                    : error
+                }
+              );
               item.resolve(error);
             }
           }
diff --git a/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-streamed-reference.json b/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-streamed-reference.json
index bd8804792..0543d7ef5 100644
--- a/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-streamed-reference.json
+++ b/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-streamed-reference.json
@@ -1,5 +1,5 @@
 {
   "name": "async-memo-element-4242-issue-streamed-reference",
   "shell": "<template id=\"pl-0\"></template>outer<!--pl-0--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"0000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"0\" e> </template><script>($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[5]=new Error(\"[SERVER_RENDER_ERROR] the reference twin's server error\"));$df(\"0\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[1],$R[5]);</script>"
+  "rest": "<template id=\"0\" e></template><script>($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[5]=new Error(\"[SERVER_RENDER_ERROR] the reference twin's server error\"));$df(\"0\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[1],$R[5]);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-streamed.json b/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-streamed.json
index 34b89d568..9549bf4a9 100644
--- a/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-streamed.json
+++ b/packages/web/test/harness/__artifacts__/async-memo-element-4242-issue-streamed.json
@@ -1,5 +1,5 @@
 {
   "name": "async-memo-element-4242-issue-streamed",
   "shell": "<template id=\"pl-0\"></template>outer<!--pl-0--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"0000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<script>_$HY.r[\"undefined_fr\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"undefined000\"]=$R[7]=($R[8]=$R[2]()).p;</script><template id=\"0\" e> </template><script>($R[10]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[9]=new Error(\"[ASYNC_MEMO_ELEMENT] An async memo resolved to rendered output (JSX, or a component's result), which cannot be serialized for hydration: the client would wait on a value that never arrives, and the boundary around it would never hydrate. Return data from the async memo and render the JSX from it in the component (`const user = createMemo(async () => fetchUser(id)); return \\x3CProfile user={user()} />`).\"));$df(\"0\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[10]($R[1],$R[9]);</script><template id=\"undefined\">nested-41</template><script>($R[11]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[8],\"nested-41\");$df(\"undefined\");</script><script>$R[11]($R[6],!0);</script>"
+  "rest": "<script>_$HY.r[\"undefined_fr\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"undefined000\"]=$R[7]=($R[8]=$R[2]()).p;</script><template id=\"0\" e></template><script>($R[10]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[9]=new Error(\"[ASYNC_MEMO_ELEMENT] An async memo resolved to rendered output (JSX, or a component's result), which cannot be serialized for hydration: the client would wait on a value that never arrives, and the boundary around it would never hydrate. Return data from the async memo and render the JSX from it in the component (`const user = createMemo(async () => fetchUser(id)); return \\x3CProfile user={user()} />`).\"));$df(\"0\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[10]($R[1],$R[9]);</script><template id=\"undefined\">nested-41</template><script>($R[11]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[8],\"nested-41\");$df(\"undefined\");</script><script>$R[11]($R[6],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-streamed-reference.json b/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-streamed-reference.json
index 806bac710..3a9f601df 100644
--- a/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-streamed-reference.json
+++ b/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-streamed-reference.json
@@ -1,5 +1,5 @@
 {
   "name": "async-memo-element-4242-jsx-streamed-reference",
   "shell": "<main _hk=1><template id=\"pl-2\"></template><i _hk=20 id=\"outer-fallback\">outer</i><!--pl-2--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\" e> </template><script>$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[5]=new Error(\"[SERVER_RENDER_ERROR] the reference twin's server error\"));</script><script>$R[6]($R[4],$R[5]);</script>"
+  "rest": "<template id=\"2\" e></template><script>$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[5]=new Error(\"[SERVER_RENDER_ERROR] the reference twin's server error\"));</script><script>$R[6]($R[4],$R[5]);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-streamed.json b/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-streamed.json
index 5705c20c0..eecb99e11 100644
--- a/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-streamed.json
+++ b/packages/web/test/harness/__artifacts__/async-memo-element-4242-jsx-streamed.json
@@ -1,5 +1,5 @@
 {
   "name": "async-memo-element-4242-jsx-streamed",
   "shell": "<main _hk=1><template id=\"pl-2\"></template><i _hk=20 id=\"outer-fallback\">outer</i><!--pl-2--></main><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\" e> </template><script>$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[5]=new Error(\"[ASYNC_MEMO_ELEMENT] An async memo resolved to rendered output (JSX, or a component's result), which cannot be serialized for hydration: the client would wait on a value that never arrives, and the boundary around it would never hydrate. Return data from the async memo and render the JSX from it in the component (`const user = createMemo(async () => fetchUser(id)); return \\x3CProfile user={user()} />`).\"));</script><script>$R[6]($R[4],$R[5]);</script>"
+  "rest": "<template id=\"2\" e></template><script>$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[5]=new Error(\"[ASYNC_MEMO_ELEMENT] An async memo resolved to rendered output (JSX, or a component's result), which cannot be serialized for hydration: the client would wait on a value that never arrives, and the boundary around it would never hydrate. Return data from the async memo and render the JSX from it in the component (`const user = createMemo(async () => fetchUser(id)); return \\x3CProfile user={user()} />`).\"));</script><script>$R[6]($R[4],$R[5]);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/bare-client-late-final.json b/packages/web/test/harness/__artifacts__/bare-client-late-final.json
index 6dc20e8dc..008beb7c7 100644
--- a/packages/web/test/harness/__artifacts__/bare-client-late-final.json
+++ b/packages/web/test/harness/__artifacts__/bare-client-late-final.json
@@ -1,5 +1,5 @@
 {
   "name": "bare-client-late-final",
   "shell": "<template id=\"pl-2\"></template><p _hk=20>wait</p><!--pl-2--><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"2\" e> </template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"real\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[7]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[6]=new Error(\"client-only content (bare ssrSource: \\\"client\\\")\"));</script>"
+  "rest": "<template id=\"2\" e></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"real\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[7]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[6]=new Error(\"client-only content (bare ssrSource: \\\"client\\\")\"));</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/errored-section-loading-postflush-rejection-4287.json b/packages/web/test/harness/__artifacts__/errored-section-loading-postflush-rejection-4287.json
index e5db53513..2afd45869 100644
--- a/packages/web/test/harness/__artifacts__/errored-section-loading-postflush-rejection-4287.json
+++ b/packages/web/test/harness/__artifacts__/errored-section-loading-postflush-rejection-4287.json
@@ -1,5 +1,5 @@
 {
   "name": "errored-section-loading-postflush-rejection-4287",
   "shell": "<div _hk=1><!--$--><section _hk=200><h1>title</h1><!--$--><template id=\"pl-201\"></template><i _hk=2010>loading</i><!--pl-201--><!--/--></section><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"201_fr\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
-  "rest": "<template id=\"201\" e> </template><script>($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[5]=new Error(\"no user 7\"));$df(\"201\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[4],$R[5]);</script>"
+  "rest": "<template id=\"201\" e></template><script>($R[6]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[5]=new Error(\"no user 7\"));$df(\"201\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[6]($R[4],$R[5]);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/scenarios.tsx b/packages/web/test/harness/scenarios.tsx
index aaae82e4a..6e152739d 100644
--- a/packages/web/test/harness/scenarios.tsx
+++ b/packages/web/test/harness/scenarios.tsx
@@ -1609,15 +1609,23 @@ function PostflushRejectionNested() {
 
 // The failure inside an outer <Loading> still pending when it lands: the
 // inner fragment parks in the outer one, which settles later carrying the
-// Errored fallback the server drew.
+// Errored fallback the server drew. Hydrated mid-stream, the outer resume
+// reads the memo a cycle after its error landed; the resume is hydration,
+// so that read re-serves the server's error instead of asking again, and
+// the Errored tracks the memo like any hydrated failure (#4273).
+let setParkedKey!: (v: string) => void;
+let parkedAsks = 0;
+export const parkedAskCount = () => parkedAsks;
 function PostflushRejectionParked() {
-  const [key] = createSignal("u7");
+  const [key, setKey] = createSignal("u7");
+  setParkedKey = setKey;
   const outer = createMemo(async () => {
     await sleep(15);
     return "outer";
   });
   const user = createMemo(async (): Promise<string> => {
     const k = key();
+    if (!isServer && Promise === RealPromise) parkedAsks++;
     await sleep(5);
     if (k === "u7") throw new Error("no user 7");
     return k;
@@ -1643,8 +1651,7 @@ function PostflushRejectionParked() {
 // Loading, the outer fragment carries the finished fallback; settled after
 // it (`late`), the outer fragment carries the inner placeholder and the
 // inner fragment streams the fallback once the hole lands. Either way the
-// client claims it. (No update pass, as for the plain-fallback parked
-// scenario above.)
+// client claims it, asking for nothing again.
 let parkedHoleAsks = 0;
 export const parkedHoleAskCount = () => parkedHoleAsks;
 function parkedRejectionAsyncFallback(late: boolean) {
@@ -3021,10 +3028,9 @@ export const scenarios: Scenario[] = [
     App: PostflushRejectionParked,
     async: true,
     expectedText: "outerfailed: no user 7tail",
-    serverText: "outer loading tail failed: no user 7"
-    // No update pass: hydrated mid-stream, the memo re-asks on the outer
-    // boundary's resume (as it does on `next`), so the Errored holds the
-    // server's fallback until reset() rather than tracking the memo.
+    serverText: "outer loading tail failed: no user 7",
+    update: () => setParkedKey("u8"),
+    expectedTextAfterUpdate: "outeruser:u8tail"
   },
   {
     name: "errored-loading-parked-rejection-async-fallback-4306",
diff --git a/packages/web/test/hydration/errored-async-outcome-4287.spec.tsx b/packages/web/test/hydration/errored-async-outcome-4287.spec.tsx
index 5b62c5ee2..6dc632a3e 100644
--- a/packages/web/test/hydration/errored-async-outcome-4287.spec.tsx
+++ b/packages/web/test/hydration/errored-async-outcome-4287.spec.tsx
@@ -10,7 +10,13 @@
  *   fallback node: no loading fallback, no new ask, and (#4273) it recovers
  *   when the memo's input changes.
  * - Hydrating before it arrived, the client renders the failure itself once
- *   the fragment rejects, with nothing of the server's swap left beside it.
+ *   the fragment rejects, with nothing of the server's swap left beside it,
+ *   and asks nothing again: that render reads the memo a cycle after its
+ *   error landed (a later tracked read retries an errored async node), but
+ *   a boundary's resume is hydration, so the memo re-serves the server's
+ *   error — no ask, no flash back to the loading fallback.
+ * - The same inside an outer `<Loading>` still pending when it fails: the
+ *   outer resume reads the memo, and re-serves its error too.
  * - With an async hole in the fallback still pending when the Loading fails,
  *   the failure waits for the fallback (RULES-DERIVED D-18, #4306): the
  *   loading placeholder stays until the fragment swaps in the finished
@@ -22,12 +28,13 @@ import { describe, expect, test, vi } from "vitest";
 import { existsSync, readFileSync } from "node:fs";
 import { resolve, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
-import { flush } from "solid-js";
+import { createRenderEffect, createRoot, createSignal, flush } from "solid-js";
 import { hydrate } from "@solidjs/web";
 import {
   scenarios,
   postflushClientAskCount,
-  postflushHoleAskCount
+  postflushHoleAskCount,
+  parkedAskCount
 } from "../harness/scenarios.jsx";
 
 const artifact = (name: string) =>
@@ -46,6 +53,42 @@ function applyChunk(container: HTMLDivElement, chunk: string, first: boolean) {
   for (const s of scripts) (0, eval)(s);
 }
 
+// An unrelated client write between stream pieces: the reactive clock moves
+// on, as it does on any live page, so a read after the failure landed is on
+// a later cycle than the failure.
+const [tick, setTick] = createSignal(0);
+createRoot(() => createRenderEffect(tick, () => {}));
+
+// The stream after the shell, one script at a time (a template rides with
+// the script after it), as a browser parses it — each piece followed by a
+// clock tick. Returns the text after every step.
+const pieces = (rest: string) => rest.match(/[\s\S]*?<\/script>/g) ?? [rest];
+async function stream(container: HTMLDivElement, rest: string) {
+  const seen: string[] = [container.textContent!];
+  for (const piece of pieces(rest)) {
+    applyChunk(container, piece, false);
+    flush();
+    await sleep(5);
+    setTick(tick() + 1);
+    flush();
+    seen.push(container.textContent!);
+  }
+  for (let i = 0; i < 8; i++) {
+    await sleep(5);
+    flush();
+    seen.push(container.textContent!);
+  }
+  return seen;
+}
+
+// Once the failure shows it stays: nothing flashes back to a loading state.
+function expectSteady(seen: string[], final: string, before: string[]) {
+  const at = seen.indexOf(final);
+  expect(at).toBeGreaterThan(0);
+  expect(new Set(seen.slice(0, at))).toEqual(new Set(before));
+  expect(new Set(seen.slice(at))).toEqual(new Set([final]));
+}
+
 async function run(mode: "loaded" | "streamed") {
   expect(existsSync(file)).toBe(true);
   const { shell, rest } = JSON.parse(readFileSync(file, "utf-8"));
@@ -63,10 +106,8 @@ async function run(mode: "loaded" | "streamed") {
     flush();
     await sleep(10);
     flush();
-    if (mode === "streamed") {
-      expect(container.textContent).toBe("loadingtail");
-      applyChunk(container, rest, false);
-    }
+    if (mode === "streamed")
+      expectSteady(await stream(container, rest), "failed: no user 7tail", ["loadingtail"]);
     await sleep(30);
     flush();
     expect(container.textContent).toBe("failed: no user 7tail");
@@ -89,10 +130,6 @@ async function run(mode: "loaded" | "streamed") {
   }
 }
 
-// The stream after the shell, one script at a time (a template rides with
-// the script after it), as a browser parses it.
-const pieces = (rest: string) => rest.match(/[\s\S]*?<\/script>/g) ?? [rest];
-
 async function runAsyncFallback(mode: "loaded" | "streamed") {
   const name = "errored-loading-postflush-rejection-async-fallback-4287";
   const file = artifact(name);
@@ -119,30 +156,21 @@ async function runAsyncFallback(mode: "loaded" | "streamed") {
     flush();
     if (mode === "streamed") {
       // Between the failure and the hint landing the loading placeholder
-      // stays: nothing shows until the swap brings the finished fallback.
-      const seen: string[] = [container.textContent!];
-      for (const piece of pieces(rest)) {
-        applyChunk(container, piece, false);
-        flush();
-        await sleep(5);
-        flush();
-        seen.push(container.textContent!);
-      }
-      const swapped = seen.indexOf("failed: no user 7 HINTtail");
-      expect(swapped).toBeGreaterThan(1);
-      expect(new Set(seen.slice(0, swapped))).toEqual(new Set(["loadingtail"]));
+      // stays: nothing shows until the swap brings the finished fallback,
+      // and it stays once it shows.
+      const seen = await stream(container, rest);
+      expect(seen.indexOf("failed: no user 7 HINTtail")).toBeGreaterThan(1);
+      expectSteady(seen, "failed: no user 7 HINTtail", ["loadingtail"]);
     }
     await sleep(40);
     flush();
     expect(container.textContent).toBe("failed: no user 7 HINTtail");
     expect(container.querySelectorAll("p").length).toBe(1);
     if (mode === "loaded") expect(container.querySelector("p")).toBe(serverP);
-    // Hydrated after the failure, the server's answers are used: neither
-    // read is asked again. Hydrated before it, the client renders the
-    // failure itself once `_fr` rejects (as for the plain fallback), and
-    // that fresh read of `user` — a cycle after its error landed — retries
-    // it: one ask, during which the inner Loading shows its fallback again.
-    expect(postflushHoleAskCount()).toBe(asksBefore + (mode === "streamed" ? 1 : 0));
+    // The server's answers are used: neither read is asked again — hydrated
+    // before the failure too, where the client renders it itself once `_fr`
+    // rejects and that render reads `user` a cycle after its error landed.
+    expect(postflushHoleAskCount()).toBe(asksBefore);
 
     scenario.update!();
     flush();
@@ -158,6 +186,58 @@ async function runAsyncFallback(mode: "loaded" | "streamed") {
   }
 }
 
+// Inside an outer Loading still pending when the read fails: the outer
+// fragment carries the Errored fallback; hydrated mid-stream, the outer
+// resume reads the memo (outside any claim — the Errored content claims
+// nothing) a cycle after its error landed.
+async function runParked(mode: "loaded" | "streamed") {
+  const name = "errored-loading-parked-rejection-4287";
+  const file = artifact(name);
+  const scenario = scenarios.find(s => s.name === name)!;
+  expect(existsSync(file)).toBe(true);
+  const { shell, rest } = JSON.parse(readFileSync(file, "utf-8"));
+  expect(rest).toContain('_$HY.r["3002"]');
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  (globalThis as any)._$HY = { events: [], completed: new WeakSet(), r: {}, fe() {} };
+  const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
+  const asksBefore = parkedAskCount();
+  let dispose: (() => void) | undefined;
+  try {
+    applyChunk(container, shell, true);
+    if (mode === "loaded") applyChunk(container, rest, false);
+    const serverP = container.querySelector("p");
+    dispose = hydrate(() => <scenario.App />, container);
+    flush();
+    await sleep(10);
+    flush();
+    if (mode === "streamed")
+      expectSteady(await stream(container, rest), "outerfailed: no user 7tail", [
+        "outer loadingtail"
+      ]);
+    await sleep(30);
+    flush();
+    expect(container.textContent).toBe("outerfailed: no user 7tail");
+    expect(container.querySelectorAll("p").length).toBe(1);
+    if (mode === "loaded") expect(container.querySelector("p")).toBe(serverP);
+    expect(parkedAskCount()).toBe(asksBefore);
+
+    // The Errored tracks the memo it adopted the failure of (#4273).
+    scenario.update!();
+    flush();
+    await sleep(30);
+    flush();
+    expect(container.textContent).toBe("outeruser:u8tail");
+    expect(parkedAskCount()).toBe(asksBefore + 1);
+    expect(warn).not.toHaveBeenCalled();
+  } finally {
+    warn.mockRestore();
+    dispose?.();
+    await sleep(0);
+    container.remove();
+  }
+}
+
 describe("#4287: Errored over a Loading whose read fails after the shell", () => {
   test("hydrated after the failure arrived: adopts the server's fallback", () => run("loaded"));
   test("hydrated before the failure arrived: shows it once, no ask", () => run("streamed"));
@@ -165,4 +245,8 @@ describe("#4287: Errored over a Loading whose read fails after the shell", () =>
     runAsyncFallback("loaded"));
   test("fallback with a pending async hole, hydrated before the failure: placeholder until the swap", () =>
     runAsyncFallback("streamed"));
+  test("inside a pending outer Loading, hydrated after the stream: adopts it", () =>
+    runParked("loaded"));
+  test("inside a pending outer Loading, hydrated mid-stream: no ask on the outer resume", () =>
+    runParked("streamed"));
 });
diff --git a/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx b/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx
index 7c88c0887..f7298142f 100644
--- a/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx
+++ b/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx
@@ -12,8 +12,10 @@
  * - hole settled after it: the outer fragment carries the inner
  *   placeholder, and the inner fragment streams the fallback.
  *
- * The client claims that markup in both replay orders, without warnings;
- * hydrated after the stream it asks nothing again.
+ * The client claims that markup in both replay orders, without warnings,
+ * and asks nothing again: hydrated mid-stream, the outer resume reads the
+ * memo a cycle after its error landed, and a resume re-serves the server's
+ * answer — no ask, no flash back to a loading fallback.
  *
  * Replays the parity harness artifacts (test/server/hydration-harness.spec.tsx).
  */
@@ -21,7 +23,7 @@ import { describe, expect, test, vi } from "vitest";
 import { existsSync, readFileSync } from "node:fs";
 import { resolve, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
-import { flush } from "solid-js";
+import { createRenderEffect, createRoot, createSignal, flush } from "solid-js";
 import { hydrate } from "@solidjs/web";
 import { scenarios, parkedHoleAskCount } from "../harness/scenarios.jsx";
 
@@ -38,7 +40,13 @@ function applyChunk(container: HTMLDivElement, chunk: string, first: boolean) {
   for (const s of scripts) (0, eval)(s);
 }
 
-async function run(name: string, mode: "loaded" | "streamed") {
+// An unrelated client write after each stream piece moves the reactive
+// clock on, as on any live page.
+const [tick, setTick] = createSignal(0);
+createRoot(() => createRenderEffect(tick, () => {}));
+const pieces = (rest: string) => rest.match(/[\s\S]*?<\/script>/g) ?? [rest];
+
+async function run(name: string, mode: "loaded" | "streamed", before: string[]) {
   const file = artifact(name);
   const scenario = scenarios.find(s => s.name === name)!;
   expect(existsSync(file)).toBe(true);
@@ -61,18 +69,33 @@ async function run(name: string, mode: "loaded" | "streamed") {
     await sleep(10);
     flush();
     if (mode === "streamed") {
-      expect(container.textContent).toBe("outer loadingtail");
-      applyChunk(container, rest, false);
+      const seen: string[] = [container.textContent!];
+      for (const piece of pieces(rest)) {
+        applyChunk(container, piece, false);
+        flush();
+        await sleep(5);
+        setTick(tick() + 1);
+        flush();
+        seen.push(container.textContent!);
+      }
+      for (let i = 0; i < 10; i++) {
+        await sleep(5);
+        flush();
+        seen.push(container.textContent!);
+      }
+      // Placeholders until the fallback shows, and it stays once it shows.
+      const at = seen.indexOf("outerfailed: no user 7 HINTtail");
+      expect(at).toBeGreaterThan(0);
+      expect(new Set(seen.slice(0, at))).toEqual(new Set(before));
+      expect(new Set(seen.slice(at))).toEqual(new Set(["outerfailed: no user 7 HINTtail"]));
     }
     await sleep(50);
     flush();
     expect(container.textContent).toBe("outerfailed: no user 7 HINTtail");
     expect(container.querySelectorAll("p").length).toBe(1);
     if (mode === "loaded") expect(container.querySelector("p")).toBe(serverP);
-    // The server's answer is used: nothing is asked again. (Hydrated
-    // mid-stream, the memo re-asks on the outer boundary's resume, as for
-    // the parked failure with a plain fallback — see the scenario notes.)
-    expect(parkedHoleAskCount()).toBe(asksBefore + (mode === "streamed" ? 1 : 0));
+    // The server's answer is used: nothing is asked again.
+    expect(parkedHoleAskCount()).toBe(asksBefore);
     expect(warn).not.toHaveBeenCalled();
   } finally {
     warn.mockRestore();
@@ -86,10 +109,14 @@ const early = "errored-loading-parked-rejection-async-fallback-4306";
 const late = "errored-loading-parked-rejection-late-async-fallback-4306";
 
 describe("#4306: parked failure, Errored fallback with an async hole", () => {
+  const outerLoading = ["outer loadingtail"];
   test("hole settles before the outer Loading, hydrated after the stream", () =>
-    run(early, "loaded"));
-  test("hole settles before the outer Loading, hydrated mid-stream", () => run(early, "streamed"));
+    run(early, "loaded", outerLoading));
+  test("hole settles before the outer Loading, hydrated mid-stream", () =>
+    run(early, "streamed", outerLoading));
   test("hole settles after the outer Loading, hydrated after the stream", () =>
-    run(late, "loaded"));
-  test("hole settles after the outer Loading, hydrated mid-stream", () => run(late, "streamed"));
+    run(late, "loaded", outerLoading));
+  // The outer fragment carries the inner placeholder until the hole lands.
+  test("hole settles after the outer Loading, hydrated mid-stream", () =>
+    run(late, "streamed", [...outerLoading, "outerloadingtail"]));
 });
diff --git a/packages/web/test/server/frame-fragment-error-outcome.spec.tsx b/packages/web/test/server/frame-fragment-error-outcome.spec.tsx
index 2c85ac624..9e84cea2c 100644
--- a/packages/web/test/server/frame-fragment-error-outcome.spec.tsx
+++ b/packages/web/test/server/frame-fragment-error-outcome.spec.tsx
@@ -289,7 +289,8 @@ describe("C12 (c) server half — a rejected server <Loading> inside a server co
       const html = await collectDocument(() => <App />);
       const tpls = templates(html);
       const key = Object.keys(tpls).find(k => !k.startsWith("pl-"))!;
-      expect(tpls[key]).toBe(" ");
+      // Empty: a rejected template carries the outcome alone (#4287).
+      expect(tpls[key]).toBe("");
       expect(html).not.toContain("app-fallback");
     });
   });

From 2b2990a7a79b36ceb49c2f39ba8c8e1c787c7c92 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 27 Oct 2026 02:42:35 +0000
Subject: [PATCH 06/16] fix(solid): a served source's arrival re-serves its
 dependents' answers instead of asking again

Hydrated mid-stream, an async shell memo `b` reading another, `a`, both
read only inside a streamed <Loading>, asked again when `a`'s server
answer arrived: the landing re-ran `b`, and the hydration latch took the
rerun for a client write (f3da41e23's "re-entry is always invalidation-
driven"; b68a907de computes it at once for a shell node). The server's
`b` was computed from that same `a`; nothing on the client diverged.

The latch now has one rule: a latched rerun inside hydration's own pass
over served answers (NO_CLAIM) re-serves its own answer and arms nothing.
That pass is a hydrated failure's content run (the Errored's, or a
rejected fragment's fresh render over the outcome the server drew, from
the previous commit) and, new here, a served answer's arrival:
readHydratedValue hands the runtime a thenable whose landing runs, with
the flush that carries it, under NO_CLAIM. The NO_CLAIM check moves to
the head of the latch rule, so in-claim and held reruns there re-serve
without arming a takeover too. Client writes still compute (the
write-before-resume, nav-before-resume and hydration-latch pins), and a
retry outside that pass still follows the client rule.

Tests: a parity scenario and spec for the b-reads-a shape (0 asks loaded
and streamed piece by piece with clock ticks, one real ask after a client
write to their input); both fail before this commit.

Size: 0 B on every CSR scenario (compiled floor 9,966 B); +19-27 B
minified on the hydrating scenarios over the previous commit.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015hPxMkC3jg3Uivh65gvaf2
---
 .../hydrated-source-arrival-no-reask.md       |  5 +
 packages/solid/src/client/hydration.ts        | 72 +++++++++-----
 .../__artifacts__/served-source-landing.json  |  5 +
 packages/web/test/harness/scenarios.tsx       | 43 ++++++++
 .../hydration/served-source-landing.spec.tsx  | 97 +++++++++++++++++++
 5 files changed, 197 insertions(+), 25 deletions(-)
 create mode 100644 .changeset/hydrated-source-arrival-no-reask.md
 create mode 100644 packages/web/test/harness/__artifacts__/served-source-landing.json
 create mode 100644 packages/web/test/hydration/served-source-landing.spec.tsx

diff --git a/.changeset/hydrated-source-arrival-no-reask.md b/.changeset/hydrated-source-arrival-no-reask.md
new file mode 100644
index 000000000..2cde1cf93
--- /dev/null
+++ b/.changeset/hydrated-source-arrival-no-reask.md
@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+A memo that adopted its server answer no longer asks again when the server's answer for one of its sources arrives mid-stream. Hydrated mid-stream, an async shell memo `b` reading another, `a`, re-ran when `a`'s server value landed, and the serialized-value latch took that rerun for a client write and computed `b`. The arrival of a served answer, with the flush that carries it, is now hydration's own pass (as a hydrated failure's content run is): a latched node re-running there re-serves its own answer and arms nothing. Only a client write makes it compute.
diff --git a/packages/solid/src/client/hydration.ts b/packages/solid/src/client/hydration.ts
index 36ad4e7c5..85f08a9b2 100644
--- a/packages/solid/src/client/hydration.ts
+++ b/packages/solid/src/client/hydration.ts
@@ -306,11 +306,12 @@ let _snapshotRootOwner: Owner | null = null;
 // The boundary owner whose resume window is open (null during a root pass,
 // which claims everything). Reached as `sharedConfig.isClaiming`.
 let _claimOwner: Owner | null = null;
-// The claim window over no owner: a hydrated failure's content run — a
-// hydrated `<Errored>`'s (hydratedCreateErrorBoundary), or a rejected
-// fragment's fresh render over the outcome the server drew for it
-// (resumeBoundaryHydration) — where nothing claims and what the content
-// reads is the server's failure (readSerializedOrCompute).
+// The claim window over no owner: hydration's own pass over served answers,
+// where nothing claims and a latched node re-serves its server answer
+// (readSerializedOrCompute) — a hydrated failure's content run (a hydrated
+// `<Errored>`'s, hydratedCreateErrorBoundary; a rejected fragment's fresh
+// render over the outcome the server drew for it, resumeBoundaryHydration),
+// and a served answer's arrival (`arrive`).
 const NO_CLAIM = {} as Owner;
 function isClaiming(): boolean {
   if (!_claimOwner) return true;
@@ -584,6 +585,22 @@ export function syncThenable(value: any) {
   };
 }
 
+/**
+ * The async runtime's landing of a served answer that was still in flight
+ * (readHydratedValue). The arrival and the flush that carries it, run here
+ * at once, are hydration's own pass (NO_CLAIM):
+ * a dependent that adopted its own server answer re-runs there because the
+ * server's answer for a source arrived, not because a client write diverged
+ * it, and re-serves its answer (readSerializedOrCompute). The landing runs
+ * from a settled promise, outside any claim window.
+ */
+const arrive = (f: any) => (x: any) => {
+  _claimOwner = NO_CLAIM;
+  f(x);
+  flush();
+  _claimOwner = null;
+};
+
 /**
  * Unwrap a serialized hydration map entry. Only call when the map HAS an
  * entry for this id — presence is the caller's decision (`sharedConfig.has`),
@@ -605,16 +622,20 @@ export function readHydratedValue(initP: any, refresh: () => void, options?: any
     // claim against placeholder DOM). Hand the async runtime a clean thenable
     // (the settled refs are stamped `s`/`v`, which the core would also
     // fast-adopt): the landing applies on the microtask after the walk.
-    if (hasLoadingWindow(options) && typeof initP.then === "function")
-      return { then: initP.then.bind(initP) };
-    if (initP.s === 2) {
-      // The stamp is the consumption: nothing ever `.then`s the serialized
-      // promise itself, so observe its rejection here or the deserialized
-      // record surfaces as an unhandled rejection (#2997).
-      if (typeof initP.then === "function") initP.then(undefined, noop);
-      throw initP.v;
+    if (!hasLoadingWindow(options)) {
+      if (initP.s === 2) {
+        // The stamp is the consumption: nothing ever `.then`s the serialized
+        // promise itself, so observe its rejection here or the deserialized
+        // record surfaces as an unhandled rejection (#2997).
+        initP.then?.(undefined, noop);
+        throw initP.v;
+      }
+      if (initP.s === 1) return initP.v;
     }
-    if (initP.s === 1) return initP.v;
+    // Still in flight (or a loading window's): the runtime lands it, its
+    // arrival marked (`arrive`).
+    if (typeof initP.then === "function")
+      return { then: (a: any, b: any) => initP.then(arrive(a), arrive(b)) };
   }
   return initP;
 }
@@ -686,17 +707,17 @@ export function readSerializedOrCompute(compute: (prev: any) => any, prev: any,
     // A rerun outside the claim in progress by a node no pending boundary
     // holds: its section's hydration is over, so the rerun answers a client
     // write and computes, rather than re-adopting the server value until the
-    // page's last boundary resumes. Not inside a hydrated failure's content
-    // run (NO_CLAIM): a read there re-runs a node with nothing changed — a
-    // later tracked read retries an errored async node (PJ-R35) — and the
-    // server's answer, its error, is what the content shows. It re-serves
-    // that answer and arms nothing: no ask, no loading flash (#4287, #4306).
-    if (options?.ssrSource !== "hybrid") {
+    // page's last boundary resumes. Never in hydration's own pass over
+    // served answers (NO_CLAIM): a source's server answer arriving, or a
+    // hydrated failure's content reading the node — a later tracked read
+    // retries an errored async node (PJ-R35) with nothing changed. No client
+    // write diverged it there: it re-serves its own answer, an error
+    // included, and arms nothing — no ask, no loading flash (#4287, #4306).
+    if (options?.ssrSource !== "hybrid" && _claimOwner !== NO_CLAIM) {
       let p: Owner | null = o;
       while (p && !(p as any)._hp) p = p._parent;
-      if (!p && !(sharedConfig.hydrating && isClaiming())) {
-        if (_claimOwner !== NO_CLAIM) return compute(prev);
-      } else armLiveTakeover(o);
+      if (!p && !(sharedConfig.hydrating && isClaiming())) return compute(prev);
+      armLiveTakeover(o);
     }
   } else latchedOnce.add(o);
   const initP = sharedConfig.load!(o.id!);
@@ -2285,8 +2306,9 @@ function resumeBoundaryHydration(
     // swap brought, listed in the reveal record, #4287) it is that
     // failure's content run, as a hydrated `<Errored>`'s is (NO_CLAIM). A
     // resume runs from a settled promise, never inside a claim window, so
-    // there is no claim owner to restore.
-    if ((globalThis as any)._$HY?.v?.[id]?.length) _claimOwner = NO_CLAIM;
+    // there is no claim owner to restore — an arrival's pass (`arrive`)
+    // that is still marked has had its flush, and does not cover this one.
+    _claimOwner = (globalThis as any)._$HY?.v?.[id]?.length ? NO_CLAIM : null;
     _hydratingValue = false;
     set();
     flush();
diff --git a/packages/web/test/harness/__artifacts__/served-source-landing.json b/packages/web/test/harness/__artifacts__/served-source-landing.json
new file mode 100644
index 000000000..b930cf9a5
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/served-source-landing.json
@@ -0,0 +1,5 @@
+{
+  "name": "served-source-landing",
+  "shell": "<div _hk=2><!--$--><template id=\"pl-3\"></template><i _hk=30>loading</i><!--pl-3--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"3_fr\"]=$R[5]=($R[6]=$R[2]()).p;</script>",
+  "rest": "<script>($R[7]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"k1\");</script><template id=\"3\"><span _hk=3000>b:<!--$-->k12<!--/--></span></template><script>$R[7]($R[4],\"k12\");$df(\"3\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[7]($R[6],!0);</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/scenarios.tsx b/packages/web/test/harness/scenarios.tsx
index 6e152739d..af3001556 100644
--- a/packages/web/test/harness/scenarios.tsx
+++ b/packages/web/test/harness/scenarios.tsx
@@ -1691,6 +1691,40 @@ function parkedRejectionAsyncFallback(late: boolean) {
   };
 }
 
+// ---------------------------------------------------------------------------
+// An async shell memo `b` reading another, `a`, both read only inside a
+// streamed <Loading>: hydrated mid-stream, `a`'s server answer arrives
+// first and re-runs `b`. Nothing on the client changed — the server's `b`
+// was computed from that same `a` — so `b` re-serves its own server answer
+// instead of asking again; a client write to their input still recomputes
+// both.
+let setServedSourceKey!: (v: string) => void;
+let servedSourceAsks = 0;
+export const servedSourceAskCount = () => servedSourceAsks;
+function ServedSourceLanding() {
+  const [key, setKey] = createSignal("k");
+  setServedSourceKey = setKey;
+  const a = createMemo(async () => {
+    const k = key();
+    await sleep(5);
+    return k + "1";
+  });
+  const b = createMemo(async () => {
+    const x = a();
+    if (!isServer && Promise === RealPromise) servedSourceAsks++;
+    await sleep(5);
+    return x + "2";
+  });
+  return (
+    <div>
+      <Loading fallback={<i>loading</i>}>
+        <span>b:{b()}</span>
+      </Loading>
+      <span>tail</span>
+    </div>
+  );
+}
+
 // ---------------------------------------------------------------------------
 // #3414: a sync throw the SERVER catches, with a zero-arg fallback thunk
 // (`fallback={() => <Fallback />}`), inside an enclosing boundary. Errored
@@ -3067,6 +3101,15 @@ export const scenarios: Scenario[] = [
     expectedTextAfterUpdate: "user:u8tail",
     stableSelector: "div"
   },
+  {
+    name: "served-source-landing",
+    App: ServedSourceLanding,
+    async: true,
+    expectedText: "b:k12tail",
+    serverText: "loading tail k12",
+    update: () => setServedSourceKey("j"),
+    expectedTextAfterUpdate: "b:j12tail"
+  },
   {
     name: "errored-thunk-fallback-under-errored",
     App: ErroredThunkFallbackUnderErrored,
diff --git a/packages/web/test/hydration/served-source-landing.spec.tsx b/packages/web/test/hydration/served-source-landing.spec.tsx
new file mode 100644
index 000000000..661819b6b
--- /dev/null
+++ b/packages/web/test/hydration/served-source-landing.spec.tsx
@@ -0,0 +1,97 @@
+/**
+ * @jsxImportSource @solidjs/web
+ * @vitest-environment jsdom
+ *
+ * An async shell memo `b` reading another, `a`, both read only inside a
+ * streamed `<Loading>`. Hydrated mid-stream, `a`'s server answer arrives
+ * before `b`'s and re-runs `b`: that rerun is the server's answer for a
+ * source arriving, not a client write, so `b` re-serves its own server
+ * answer — nothing is asked again, in either replay order. A client write
+ * to their input afterwards recomputes them (one real ask for `b`).
+ *
+ * Replays the parity harness artifact (test/server/hydration-harness.spec.tsx).
+ */
+import { describe, expect, test, vi } from "vitest";
+import { existsSync, readFileSync } from "node:fs";
+import { resolve, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+import { createRenderEffect, createRoot, createSignal, flush } from "solid-js";
+import { hydrate } from "@solidjs/web";
+import { scenarios, servedSourceAskCount } from "../harness/scenarios.jsx";
+
+const name = "served-source-landing";
+const file = resolve(
+  dirname(fileURLToPath(import.meta.url)),
+  `../harness/__artifacts__/${name}.json`
+);
+const scenario = scenarios.find(s => s.name === name)!;
+const sleep = (ms: number) => new Promise(r => setTimeout(r, ms));
+
+function applyChunk(container: HTMLDivElement, chunk: string, first: boolean) {
+  const scriptRe = /<script(?:[^>]*)>([\s\S]*?)<\/script>/g;
+  const scripts = [...chunk.matchAll(scriptRe)].map(m => m[1]);
+  const stripped = chunk.replace(scriptRe, "");
+  if (first) container.innerHTML = stripped;
+  else container.insertAdjacentHTML("beforeend", stripped);
+  for (const s of scripts) (0, eval)(s);
+}
+
+// An unrelated client write after each stream piece moves the reactive
+// clock on, as on any live page.
+const [tick, setTick] = createSignal(0);
+createRoot(() => createRenderEffect(tick, () => {}));
+const pieces = (rest: string) => rest.match(/[\s\S]*?<\/script>/g) ?? [rest];
+
+async function run(mode: "loaded" | "streamed") {
+  expect(existsSync(file)).toBe(true);
+  const { shell, rest } = JSON.parse(readFileSync(file, "utf-8"));
+  // The two answers arrive in separate scripts, `a`'s first.
+  expect(pieces(rest).length).toBeGreaterThan(1);
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  (globalThis as any)._$HY = { events: [], completed: new WeakSet(), r: {}, fe() {} };
+  const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
+  const asksBefore = servedSourceAskCount();
+  let dispose: (() => void) | undefined;
+  try {
+    applyChunk(container, shell, true);
+    if (mode === "loaded") applyChunk(container, rest, false);
+    dispose = hydrate(() => <scenario.App />, container);
+    flush();
+    await sleep(10);
+    flush();
+    if (mode === "streamed") {
+      expect(container.textContent).toBe("loadingtail");
+      for (const piece of pieces(rest)) {
+        applyChunk(container, piece, false);
+        flush();
+        await sleep(5);
+        setTick(tick() + 1);
+        flush();
+        expect(["loadingtail", "b:k12tail"]).toContain(container.textContent);
+      }
+    }
+    await sleep(30);
+    flush();
+    expect(container.textContent).toBe("b:k12tail");
+    expect(servedSourceAskCount()).toBe(asksBefore);
+
+    scenario.update!();
+    flush();
+    await sleep(30);
+    flush();
+    expect(container.textContent).toBe("b:j12tail");
+    expect(servedSourceAskCount()).toBe(asksBefore + 1);
+    expect(warn).not.toHaveBeenCalled();
+  } finally {
+    warn.mockRestore();
+    dispose?.();
+    await sleep(0);
+    container.remove();
+  }
+}
+
+describe("a served source's answer arriving does not re-ask its dependent", () => {
+  test("hydrated after the stream", () => run("loaded"));
+  test("hydrated mid-stream", () => run("streamed"));
+});

From 7ce40115db0358bf53b7fb72ac6e4b712f13ea65 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 27 Oct 2026 03:03:37 +0000
Subject: [PATCH 07/16] fix(solid): a served pass never swallows a client write

A served answer's arrival is hydration's own pass (NO_CLAIM): a latched
node re-running there re-serves its server answer. A client write
carried by that same flush must still make the node compute.

- Client writes already made (pending, unflushed) flush first, outside
  the pass (`servedPass`). The async runtime's landing flushes
  synchronously, and that flush would otherwise carry them.
- The pass covers only the flush round its served write lands in
  (`_servedAt = clock`). An effect's write runs in a later round of the
  same flush, and a latched node re-run there computes. The latch tests
  `clock > _servedAt`.

`@solidjs/signals` exports its flush-round counter (`clock`), an
internal live binding, at 0 B.

Landings cannot be coalesced into one pass per microtask batch without
changing signals. `asyncWrite` already flushes synchronously on every
landing (`schedule(); flush()`) at the #4308 head, so a served pass
adds no flush per landing. Its trailing `flush()` is a no-op after a
value landing.

Tests: in served-source-landing, a write before the flush and an
effect's write in the landing's flush both give the written value with
1 ask. Both fail on 2b2990a7a.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015hPxMkC3jg3Uivh65gvaf2
---
 .changeset/served-pass-client-write.md        |  6 ++
 packages/signals/src/core/index.ts            |  2 +-
 packages/signals/src/index.ts                 |  2 +
 packages/solid/src/client/hydration.ts        | 55 +++++++++--------
 .../__artifacts__/served-source-landing.json  |  4 +-
 packages/web/test/harness/scenarios.tsx       | 13 +++-
 .../hydration/served-source-landing.spec.tsx  | 59 ++++++++++++++++++-
 7 files changed, 111 insertions(+), 30 deletions(-)
 create mode 100644 .changeset/served-pass-client-write.md

diff --git a/.changeset/served-pass-client-write.md b/.changeset/served-pass-client-write.md
new file mode 100644
index 000000000..3ecf43688
--- /dev/null
+++ b/.changeset/served-pass-client-write.md
@@ -0,0 +1,6 @@
+---
+"solid-js": patch
+"@solidjs/signals": patch
+---
+
+A served answer's arrival during hydration no longer swallows a client write made in the same flush. Writes made before the arrival flush first, outside hydration's own pass, and a write made during it (an effect's, a later round of the flush) makes a node it reaches compute, so the node shows the written value instead of re-serving the server's answer. `@solidjs/signals` exports its internal flush-round counter (`clock`) for this.
diff --git a/packages/signals/src/core/index.ts b/packages/signals/src/core/index.ts
index b2060560c..7c0e40fd4 100644
--- a/packages/signals/src/core/index.ts
+++ b/packages/signals/src/core/index.ts
@@ -56,7 +56,7 @@ export {
   type QueueCallback
 } from "./scheduler.js";
 export type { InteractionRef, NavigationRef } from "./attribution-hooks.js";
-export { ROOT_ERROR_HOOK } from "./scheduler.js";
+export { ROOT_ERROR_HOOK, clock } from "./scheduler.js";
 export {
   configureClientErrors,
   type ClientErrorContext,
diff --git a/packages/signals/src/index.ts b/packages/signals/src/index.ts
index a42031baf..51ddf539f 100644
--- a/packages/signals/src/index.ts
+++ b/packages/signals/src/index.ts
@@ -38,6 +38,8 @@ export {
  * outside dev builds.
  */
 export { setConsoleFooter } from "./core/index.js";
+/** @internal The flush round counter (scheduler.ts): hydration's served pass tells its own round from a later one. */
+export { clock } from "./core/index.js";
 /** @internal The pre-write hook (`setWriteHook` in core/core.ts); the server-components client's deferred hydration. */
 /** @internal Plain-signal identities and the dev read watch (dependency edges; the server-components client). */
 export { setWriteHook, setSignalIdentities, setReadWatch, signalName } from "./core/index.js";
diff --git a/packages/solid/src/client/hydration.ts b/packages/solid/src/client/hydration.ts
index 85f08a9b2..0cbcccb5a 100644
--- a/packages/solid/src/client/hydration.ts
+++ b/packages/solid/src/client/hydration.ts
@@ -20,6 +20,7 @@ import {
   createRenderEffect as coreRenderEffect,
   createEffect as coreEffect,
   setSnapshotCapture,
+  clock,
   markSnapshotScope,
   releaseSnapshotScope,
   clearSnapshots,
@@ -311,7 +312,7 @@ let _claimOwner: Owner | null = null;
 // (readSerializedOrCompute) — a hydrated failure's content run (a hydrated
 // `<Errored>`'s, hydratedCreateErrorBoundary; a rejected fragment's fresh
 // render over the outcome the server drew for it, resumeBoundaryHydration),
-// and a served answer's arrival (`arrive`).
+// and a served answer's arrival (`servedPass`).
 const NO_CLAIM = {} as Owner;
 function isClaiming(): boolean {
   if (!_claimOwner) return true;
@@ -585,21 +586,29 @@ export function syncThenable(value: any) {
   };
 }
 
+// The flush round a served pass's served answer lands in.
+let _servedAt: number | undefined;
 /**
- * The async runtime's landing of a served answer that was still in flight
- * (readHydratedValue). The arrival and the flush that carries it, run here
- * at once, are hydration's own pass (NO_CLAIM):
- * a dependent that adopted its own server answer re-runs there because the
- * server's answer for a source arrived, not because a client write diverged
- * it, and re-serves its answer (readSerializedOrCompute). The landing runs
- * from a settled promise, outside any claim window.
+ * A served pass: `write(x)` lands a served answer — the server's answer for a
+ * node arriving (the async runtime writes it and flushes, synchronously),
+ * or a rejected fragment's fresh render over the outcome the server drew
+ * (the boundary's trigger) — and the flush round that carries it is
+ * hydration's own pass (NO_CLAIM). A node that adopted its own server answer
+ * re-runs there because the server's answer for something it reads arrived,
+ * not because a client write diverged it, and re-serves that answer
+ * (readSerializedOrCompute). No client write is swallowed: the ones already
+ * made flush first, outside the pass, and one made during it (an effect's)
+ * runs in a later round of the flush, past `_servedAt`, where a node it
+ * reaches computes. Runs from a settled promise, outside any claim window.
  */
-const arrive = (f: any) => (x: any) => {
+function servedPass(write: (x?: any) => void, x?: any) {
+  flush();
   _claimOwner = NO_CLAIM;
-  f(x);
+  _servedAt = clock;
+  write(x);
   flush();
-  _claimOwner = null;
-};
+  _claimOwner = _servedAt = undefined as any;
+}
 
 /**
  * Unwrap a serialized hydration map entry. Only call when the map HAS an
@@ -632,10 +641,12 @@ export function readHydratedValue(initP: any, refresh: () => void, options?: any
       }
       if (initP.s === 1) return initP.v;
     }
-    // Still in flight (or a loading window's): the runtime lands it, its
-    // arrival marked (`arrive`).
-    if (typeof initP.then === "function")
+    // Still in flight (or a loading window's): the runtime lands it, in a
+    // served pass for the node it lands.
+    if (typeof initP.then === "function") {
+      const arrive = (f: any) => (x: any) => servedPass(f, x);
       return { then: (a: any, b: any) => initP.then(arrive(a), arrive(b)) };
+    }
   }
   return initP;
 }
@@ -713,7 +724,9 @@ export function readSerializedOrCompute(compute: (prev: any) => any, prev: any,
     // retries an errored async node (PJ-R35) with nothing changed. No client
     // write diverged it there: it re-serves its own answer, an error
     // included, and arms nothing — no ask, no loading flash (#4287, #4306).
-    if (options?.ssrSource !== "hybrid" && _claimOwner !== NO_CLAIM) {
+    // A later round of an arrival's flush is past that pass (`servedPass`):
+    // an effect's write re-ran the node there.
+    if (options?.ssrSource !== "hybrid" && (_claimOwner !== NO_CLAIM || clock > _servedAt!)) {
       let p: Owner | null = o;
       while (p && !(p as any)._hp) p = p._parent;
       if (!p && !(sharedConfig.hydrating && isClaiming())) return compute(prev);
@@ -2304,15 +2317,9 @@ function resumeBoundaryHydration(
     // The client renders the boundary fresh (recover): no claim. Over the
     // outcome the server drew for the failure (an `<Errored>` fallback the
     // swap brought, listed in the reveal record, #4287) it is that
-    // failure's content run, as a hydrated `<Errored>`'s is (NO_CLAIM). A
-    // resume runs from a settled promise, never inside a claim window, so
-    // there is no claim owner to restore — an arrival's pass (`arrive`)
-    // that is still marked has had its flush, and does not cover this one.
-    _claimOwner = (globalThis as any)._$HY?.v?.[id]?.length ? NO_CLAIM : null;
+    // failure's content run, as a hydrated `<Errored>`'s is: a served pass.
     _hydratingValue = false;
-    set();
-    flush();
-    _claimOwner = null;
+    (globalThis as any)._$HY?.v?.[id]?.length ? servedPass(set) : (set(), flush());
   }
   // Hydration mode is off once a boundary has resumed — whatever the flag
   // read before (a resume never runs inside a root's synchronous pass; the
diff --git a/packages/web/test/harness/__artifacts__/served-source-landing.json b/packages/web/test/harness/__artifacts__/served-source-landing.json
index b930cf9a5..5ea0e061b 100644
--- a/packages/web/test/harness/__artifacts__/served-source-landing.json
+++ b/packages/web/test/harness/__artifacts__/served-source-landing.json
@@ -1,5 +1,5 @@
 {
   "name": "served-source-landing",
-  "shell": "<div _hk=2><!--$--><template id=\"pl-3\"></template><i _hk=30>loading</i><!--pl-3--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"3_fr\"]=$R[5]=($R[6]=$R[2]()).p;</script>",
-  "rest": "<script>($R[7]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"k1\");</script><template id=\"3\"><span _hk=3000>b:<!--$-->k12<!--/--></span></template><script>$R[7]($R[4],\"k12\");$df(\"3\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[7]($R[6],!0);</script>"
+  "shell": "<div _hk=4><!--$--><template id=\"pl-5\"></template><i _hk=50>loading</i><!--pl-5--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"2\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"5_fr\"]=$R[5]=($R[6]=$R[2]()).p;</script>",
+  "rest": "<script>($R[7]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"k1\");</script><template id=\"5\"><span _hk=5000>b:<!--$-->k12<!--/--></span></template><script>$R[7]($R[4],\"k12\");$df(\"5\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[7]($R[6],!0);</script>"
 }
\ No newline at end of file
diff --git a/packages/web/test/harness/scenarios.tsx b/packages/web/test/harness/scenarios.tsx
index af3001556..343d667c3 100644
--- a/packages/web/test/harness/scenarios.tsx
+++ b/packages/web/test/harness/scenarios.tsx
@@ -1697,24 +1697,33 @@ function parkedRejectionAsyncFallback(late: boolean) {
 // first and re-runs `b`. Nothing on the client changed — the server's `b`
 // was computed from that same `a` — so `b` re-serves its own server answer
 // instead of asking again; a client write to their input still recomputes
-// both.
+// both. `servedSourceControl.write` makes an effect on `a` write `extra`,
+// which `b` also reads, when `a` lands on the client: a client write in the
+// landing's own flush, which `b` must compute for. `servedSourceControl.b`
+// is `b`'s value as the client last committed it.
 let setServedSourceKey!: (v: string) => void;
 let servedSourceAsks = 0;
 export const servedSourceAskCount = () => servedSourceAsks;
+export const servedSourceControl = { write: false, b: "" };
 function ServedSourceLanding() {
   const [key, setKey] = createSignal("k");
+  const [extra, setExtra] = createSignal("");
   setServedSourceKey = setKey;
   const a = createMemo(async () => {
     const k = key();
     await sleep(5);
     return k + "1";
   });
+  createEffect(a, () => {
+    if (servedSourceControl.write) setExtra("x");
+  });
   const b = createMemo(async () => {
-    const x = a();
+    const x = a() + extra();
     if (!isServer && Promise === RealPromise) servedSourceAsks++;
     await sleep(5);
     return x + "2";
   });
+  createEffect(b, v => void (servedSourceControl.b = v));
   return (
     <div>
       <Loading fallback={<i>loading</i>}>
diff --git a/packages/web/test/hydration/served-source-landing.spec.tsx b/packages/web/test/hydration/served-source-landing.spec.tsx
index 661819b6b..6608f5846 100644
--- a/packages/web/test/hydration/served-source-landing.spec.tsx
+++ b/packages/web/test/hydration/served-source-landing.spec.tsx
@@ -9,6 +9,10 @@
  * answer — nothing is asked again, in either replay order. A client write
  * to their input afterwards recomputes them (one real ask for `b`).
  *
+ * The landing never swallows a client write: one made before it in the same
+ * flush, or one an effect makes in the landing's own flush, reaches `b`,
+ * which computes the written value (one real ask).
+ *
  * Replays the parity harness artifact (test/server/hydration-harness.spec.tsx).
  */
 import { describe, expect, test, vi } from "vitest";
@@ -17,7 +21,7 @@ import { resolve, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { createRenderEffect, createRoot, createSignal, flush } from "solid-js";
 import { hydrate } from "@solidjs/web";
-import { scenarios, servedSourceAskCount } from "../harness/scenarios.jsx";
+import { scenarios, servedSourceAskCount, servedSourceControl } from "../harness/scenarios.jsx";
 
 const name = "served-source-landing";
 const file = resolve(
@@ -91,7 +95,60 @@ async function run(mode: "loaded" | "streamed") {
   }
 }
 
+// Hydrated mid-stream with a client write in the flush that lands `a`:
+// `before` writes their input right after the script that settles `a`,
+// before that landing runs; `effect` has an effect on `a` write `extra`,
+// which `b` reads, inside the landing's flush.
+async function runWrite(kind: "before" | "effect") {
+  const { shell, rest } = JSON.parse(readFileSync(file, "utf-8"));
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  (globalThis as any)._$HY = { events: [], completed: new WeakSet(), r: {}, fe() {} };
+  const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
+  servedSourceControl.write = kind === "effect";
+  const asksBefore = servedSourceAskCount();
+  let dispose: (() => void) | undefined;
+  try {
+    applyChunk(container, shell, true);
+    dispose = hydrate(() => <scenario.App />, container);
+    flush();
+    await sleep(10);
+    flush();
+    const [first, ...others] = pieces(rest);
+    expect(first).not.toContain("k12");
+    applyChunk(container, first, false);
+    // `a`'s landing is queued: this write precedes it, in the same flush.
+    if (kind === "before") scenario.update!();
+    await sleep(20);
+    flush();
+    for (const piece of others) {
+      applyChunk(container, piece, false);
+      flush();
+      await sleep(5);
+      flush();
+    }
+    await sleep(30);
+    flush();
+    // `b` computed the written value. (The boundary claims the server's
+    // markup when it resumes after the write — its text stays the served
+    // `k12`, as it does without this pass; the value is the pin here.)
+    expect(servedSourceControl.b).toBe(kind === "before" ? "j12" : "k1x2");
+    expect(servedSourceAskCount()).toBe(asksBefore + 1);
+    expect(warn).not.toHaveBeenCalled();
+  } finally {
+    servedSourceControl.write = false;
+    warn.mockRestore();
+    dispose?.();
+    await sleep(0);
+    container.remove();
+  }
+}
+
 describe("a served source's answer arriving does not re-ask its dependent", () => {
   test("hydrated after the stream", () => run("loaded"));
   test("hydrated mid-stream", () => run("streamed"));
+  test("a client write before the landing, in its flush: computes the written value", () =>
+    runWrite("before"));
+  test("an effect's write in the landing's flush: computes the written value", () =>
+    runWrite("effect"));
 });

From fae03207b54579a1819f8203c1e67afaa06204d3 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 27 Oct 2026 03:23:14 +0000
Subject: [PATCH 08/16] perf(solid): golf the served-pass client code

This changes no behaviour. Client bytes over next go from about +130 B
to +58 B minified.

- A hydrated `<Errored>`'s content run and a served pass are one window
  kind: `_claimOwner = ~clock`, a window over no owner for the flush round
  it opened in. `~` keeps it truthy when clock is 0.
- That replaces both `NO_CLAIM` and `_servedAt`. The latch checks one
  thing, `_claimOwner !== ~clock`, and a later round of an arrival's flush
  (an effect's write) still computes. `isClaiming` reads a number as no
  owner, so nothing claims, as before.
- `servedPass` is curried (`servedPass(f)(x)`), so the arrival thenable
  is `initP.then(servedPass(a), servedPass(b))`.
- A resume clears the hydration flag once, before either branch. The
  fresh branch's own flush was redundant with the resume's trailing one.
  The outcome check reads `?.[0]` instead of `?.length`.

The pre-flush stays on both paths. Removing it makes the
write-before-landing test fail, and comparing only `_claimOwner` without
the round makes the effect-write test fail.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015hPxMkC3jg3Uivh65gvaf2
---
 packages/solid/src/client/hydration.ts | 121 ++++++++++++-------------
 1 file changed, 59 insertions(+), 62 deletions(-)

diff --git a/packages/solid/src/client/hydration.ts b/packages/solid/src/client/hydration.ts
index 0cbcccb5a..102582100 100644
--- a/packages/solid/src/client/hydration.ts
+++ b/packages/solid/src/client/hydration.ts
@@ -305,15 +305,14 @@ let _pendingBoundaries = 0;
 let _hydrationDone = false;
 let _snapshotRootOwner: Owner | null = null;
 // The boundary owner whose resume window is open (null during a root pass,
-// which claims everything). Reached as `sharedConfig.isClaiming`.
-let _claimOwner: Owner | null = null;
-// The claim window over no owner: hydration's own pass over served answers,
-// where nothing claims and a latched node re-serves its server answer
-// (readSerializedOrCompute) — a hydrated failure's content run (a hydrated
-// `<Errored>`'s, hydratedCreateErrorBoundary; a rejected fragment's fresh
-// render over the outcome the server drew for it, resumeBoundaryHydration),
-// and a served answer's arrival (`servedPass`).
-const NO_CLAIM = {} as Owner;
+// which claims everything). Reached as `sharedConfig.isClaiming`. Or no
+// owner, so nothing claims: `~clock`, a window over the flush round it
+// opened in, where a latched node re-serves its server answer
+// (readSerializedOrCompute) — hydration's own pass over served answers: a
+// hydrated `<Errored>`'s content run (hydratedCreateErrorBoundary) and the
+// round a served answer lands in (`servedPass`). Never 0: `~` maps every
+// round to a truthy number.
+let _claimOwner: Owner | number | null = null;
 function isClaiming(): boolean {
   if (!_claimOwner) return true;
   let owner: Owner | null = getOwner();
@@ -586,29 +585,27 @@ export function syncThenable(value: any) {
   };
 }
 
-// The flush round a served pass's served answer lands in.
-let _servedAt: number | undefined;
 /**
  * A served pass: `write(x)` lands a served answer — the server's answer for a
  * node arriving (the async runtime writes it and flushes, synchronously),
  * or a rejected fragment's fresh render over the outcome the server drew
  * (the boundary's trigger) — and the flush round that carries it is
- * hydration's own pass (NO_CLAIM). A node that adopted its own server answer
- * re-runs there because the server's answer for something it reads arrived,
- * not because a client write diverged it, and re-serves that answer
- * (readSerializedOrCompute). No client write is swallowed: the ones already
- * made flush first, outside the pass, and one made during it (an effect's)
- * runs in a later round of the flush, past `_servedAt`, where a node it
- * reaches computes. Runs from a settled promise, outside any claim window.
+ * hydration's own pass over served answers (`_claimOwner`, that round). A
+ * node that adopted its own server answer re-runs there because the
+ * server's answer for something it reads arrived, not because a client
+ * write diverged it, and re-serves that answer (readSerializedOrCompute).
+ * No client write is swallowed: the ones already made flush first, outside
+ * the pass, and one made during it (an effect's) runs in a later round of
+ * the flush, where a node it reaches computes. Runs from a settled promise,
+ * outside any claim window.
  */
-function servedPass(write: (x?: any) => void, x?: any) {
+const servedPass = (write: (x?: any) => void) => (x?: any) => {
   flush();
-  _claimOwner = NO_CLAIM;
-  _servedAt = clock;
+  _claimOwner = ~clock;
   write(x);
   flush();
-  _claimOwner = _servedAt = undefined as any;
-}
+  _claimOwner = null;
+};
 
 /**
  * Unwrap a serialized hydration map entry. Only call when the map HAS an
@@ -643,10 +640,8 @@ export function readHydratedValue(initP: any, refresh: () => void, options?: any
     }
     // Still in flight (or a loading window's): the runtime lands it, in a
     // served pass for the node it lands.
-    if (typeof initP.then === "function") {
-      const arrive = (f: any) => (x: any) => servedPass(f, x);
-      return { then: (a: any, b: any) => initP.then(arrive(a), arrive(b)) };
-    }
+    if (typeof initP.then === "function")
+      return { then: (a: any, b: any) => initP.then(servedPass(a), servedPass(b)) };
   }
   return initP;
 }
@@ -719,14 +714,15 @@ export function readSerializedOrCompute(compute: (prev: any) => any, prev: any,
     // holds: its section's hydration is over, so the rerun answers a client
     // write and computes, rather than re-adopting the server value until the
     // page's last boundary resumes. Never in hydration's own pass over
-    // served answers (NO_CLAIM): a source's server answer arriving, or a
-    // hydrated failure's content reading the node — a later tracked read
-    // retries an errored async node (PJ-R35) with nothing changed. No client
-    // write diverged it there: it re-serves its own answer, an error
-    // included, and arms nothing — no ask, no loading flash (#4287, #4306).
-    // A later round of an arrival's flush is past that pass (`servedPass`):
-    // an effect's write re-ran the node there.
-    if (options?.ssrSource !== "hybrid" && (_claimOwner !== NO_CLAIM || clock > _servedAt!)) {
+    // served answers (`_claimOwner` is `~clock`): a source's server answer
+    // arriving, or a hydrated failure's content reading the node — a later
+    // tracked read retries an errored async node (PJ-R35) with nothing
+    // changed. No client write diverged it there: it re-serves its own
+    // answer, an error included, and arms nothing — no ask, no loading flash
+    // (#4287, #4306). A served pass covers the round its answer lands in
+    // (`servedPass`): a later round of that flush is an effect's write
+    // re-running the node, which computes.
+    if (options?.ssrSource !== "hybrid" && _claimOwner !== ~clock) {
       let p: Owner | null = o;
       while (p && !(p as any)._hp) p = p._parent;
       if (!p && !(sharedConfig.hydrating && isClaiming())) return compute(prev);
@@ -1334,13 +1330,15 @@ function hydratedCreateErrorBoundary<T, U>(
       // The content's owner, until a fallback is built.
       let o: any;
       const read = coreErrorBoundary(
-        // While hydrating, a claim window over no owner: nothing under it
-        // claims. (`hydrateWindow` with no id or scope, hydration already on
+        // While hydrating, a claim window over no owner (`~clock`): nothing
+        // under it claims. (`hydrateWindow` with no id or scope, hydration already on
         // and the snapshot root marked above, only swaps the claim owner.)
         // A later run claims nothing either way: claims are read only while
         // hydrating.
         () =>
-          _hydratingValue ? hydrateWindow("", fn, undefined, ((o = getOwner()), NO_CLAIM)) : fn(),
+          _hydratingValue
+            ? hydrateWindow("", fn, undefined, ((o = getOwner()), ~clock as any))
+            : fn(),
         (e, reset) => ((o = 0), fallback(e, reset))
       );
       // No fallback yet: the content ran clean. Hold the server's fallback
@@ -2300,31 +2298,29 @@ function resumeBoundaryHydration(
     checkHydrationComplete();
     return;
   }
-  if (shouldHydrate) {
-    // A late resume claims against the root this boundary registered under
-    // (the captured `scope`), its subtree the snapshot and live scope for
-    // the window; the trigger re-runs the boundary's compute inside it.
-    hydrateWindow(
-      id,
-      () => {
-        set();
-        flush();
-      },
-      scope,
-      o
-    );
-  } else {
-    // The client renders the boundary fresh (recover): no claim. Over the
-    // outcome the server drew for the failure (an `<Errored>` fallback the
-    // swap brought, listed in the reveal record, #4287) it is that
-    // failure's content run, as a hydrated `<Errored>`'s is: a served pass.
-    _hydratingValue = false;
-    (globalThis as any)._$HY?.v?.[id]?.length ? servedPass(set) : (set(), flush());
-  }
   // Hydration mode is off once a boundary has resumed — whatever the flag
   // read before (a resume never runs inside a root's synchronous pass; the
-  // client-gated nodes the resume created compute in the flush below).
+  // client-gated nodes the resume created compute in the flush below). A
+  // claiming resume turns it on for its window alone.
   _hydratingValue = false;
+  shouldHydrate
+    ? // A late resume claims against the root this boundary registered under
+      // (the captured `scope`), its subtree the snapshot and live scope for
+      // the window; the trigger re-runs the boundary's compute inside it.
+      hydrateWindow(
+        id,
+        () => {
+          set();
+          flush();
+        },
+        scope,
+        o
+      )
+    : // The client renders the boundary fresh (recover): no claim. Over the
+      // outcome the server drew for the failure (an `<Errored>` fallback the
+      // swap brought, listed in the reveal record, #4287) it is that
+      // failure's content run, as a hydrated `<Errored>`'s is: a served pass.
+      ((globalThis as any)._$HY?.v?.[id]?.[0] ? servedPass(set) : set)();
   flush();
   checkHydrationComplete();
 }
@@ -2906,12 +2902,13 @@ function hydratedCreateLoadingBoundary<T, U>(
       // A parked fragment has settled but not swapped: it waits like a pending one.
       const s = fr && typeof fr === "object" ? (fr.s === 1 && fragmentParked(id) ? 0 : fr.s) : 0;
 
-      // Inside a hydrated `<Errored>`'s content run, which claims no DOM (the
+      // Inside a hydrated `<Errored>`'s content run (`~clock`, a window
+      // over no owner), which claims no DOM (the
       // markup is the server's fallback for the failure, #4287), the
       // fragment is never claimed: the content runs now with its data
       // adopted, so the Errored holds the client's own error and tracks its
       // inputs (#4273).
-      const unclaimed = _claimOwner === NO_CLAIM;
+      const unclaimed = _claimOwner === ~clock;
       // Nothing else consumes a rejected `_fr` promise then — swallow it so
       // a rejected fragment (error finalize or a client-hole handoff) doesn't
       // surface as an unhandled rejection.

From c376083597f8ee78f5bd5e6c887a146b76ac14c7 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 27 Oct 2026 05:37:46 +0000
Subject: [PATCH 09/16] fix(solid): a rejected fragment's fresh render claims
 what the server sent

Hydration never asks again for an answer the server sent. When a streamed
<Loading> fragment rejects with no outcome (no <Errored> on the server
could draw the failure: the one above it was already on the wire, or
there is none), the client still renders the fragment fresh, so the
graph under the boundary is created. Now every read in that render
claims its serialized record instead of asking again:
- a read the server resolved takes its value;
- a read whose record is an error throws that error (as the server
  serialized it: redacted unless markSafeError) to the nearest client
  boundary through the normal path, or is an uncaught error when there
  is none;
- only a read with no record at all computes (a truncated stream's refs
  are dropped from the registry).

How: a rejection (the server's, or the stream cut short) now resumes the
boundary with 0 rather than false, and resumeBoundaryHydration runs every
fresh render as a served pass (`servedPass(set, adopt)`), adopting
(`_hydratingValue`) only after a rejection. A superseded render and an
asset failure do not adopt. servedPass resets its state in a `finally`,
because an uncaught error leaves the flush by throwing. Recovery is a
real input change or a client boundary's reset(), as for any hydrated
failure (#4273).

Changed expectations:

async-memo-element-4242.spec.tsx, uncontained variants and their
`-reference` twins (the generic "server render error at this position"
path, so both change together; they still compare equal):
- runs: [] for the jsx shape. `outer` adopts the server's error and
  never runs. (The loaded-mode check used to expect the client to
  compute the element: "jsx-41Count: 1".) The issue shape keeps
  ["inner"]. That run is the fixture's own: the dry run's continuation
  escapes the mock Promise through a real timer and builds the inner
  slot, whose memo has no owner id to adopt by.
- halted: true, done: false (were false/true in loaded mode). The
  adopted error has no client boundary to reach (a <Loading> does not
  catch), so it is uncaught, as on any client render. The reactive
  system halts, and the halted resume never completes hydration.
- text "", afterClick undefined (were "jsx-41Count: 1"/"Count: 1", and
  "nested-41"). The element came from the errored memo, so it never
  renders and there is no counter to click.
- shown ["outer", ""] streamed, [""] loaded: the fallback, then nothing.

client-hydration.spec.ts, "rejected _fr resumes without hydrating
serialized children" -> "rejected _fr resumes fresh, adopting serialized
children": memo() 0 -> 7. The fresh DOM stays, but the serialized 7 is
the server's answer, so the client uses it rather than computing 0.

client-recovery-record.spec.ts (three tests): b.memo() 0 -> 7, for the
same reason. The recovery records are unchanged.

New: served-error-no-reask.spec.tsx with two parity-harness scenarios.
- nested-rejection-no-outcome: a shell <Errored> over a streamed outer
  <Loading> (a resolved read, a counter) and an inner <Loading> whose
  read fails on the server beside a read the server resolved. The inner
  fragment rejects with no outcome. The fresh render shows the server's
  error in the shell Errored, with 0 asks for either read. reset() asks
  once, and the recreated graph is live (the counter clicks).
- served-error-reread: a served error mid-hydration (a slow boundary
  still pending) stands with no ask. reset() is a real retry: one ask,
  and it recovers while hydration still runs.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015hPxMkC3jg3Uivh65gvaf2
---
 ...uncontained-failure-adopts-server-error.md |   5 +
 packages/solid/src/client/hydration.ts        |  57 ++++--
 packages/solid/test/client-hydration.spec.ts  |   5 +-
 .../solid/test/client-recovery-record.spec.ts |   8 +-
 .../nested-rejection-no-outcome.json          |   5 +
 .../__artifacts__/served-error-reread.json    |   5 +
 packages/web/test/harness/scenarios.tsx       | 118 +++++++++++
 .../async-memo-element-4242.spec.tsx          |  34 +++-
 .../hydration/served-error-no-reask.spec.tsx  | 187 ++++++++++++++++++
 9 files changed, 387 insertions(+), 37 deletions(-)
 create mode 100644 .changeset/uncontained-failure-adopts-server-error.md
 create mode 100644 packages/web/test/harness/__artifacts__/nested-rejection-no-outcome.json
 create mode 100644 packages/web/test/harness/__artifacts__/served-error-reread.json
 create mode 100644 packages/web/test/hydration/served-error-no-reask.spec.tsx

diff --git a/.changeset/uncontained-failure-adopts-server-error.md b/.changeset/uncontained-failure-adopts-server-error.md
new file mode 100644
index 000000000..9958dda8d
--- /dev/null
+++ b/.changeset/uncontained-failure-adopts-server-error.md
@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+Hydration never asks again for what the server sent, even when a streamed boundary's fragment rejects with no outcome (no `<Errored>` on the server could draw the failure). The client still renders that fragment fresh, so its graph is created, but every read in it now claims its serialized record: reads the server resolved take their values, and a read whose record is an error throws that error to the nearest client boundary, or is an uncaught error when there is none. Only reads with no record, such as those cut off by a truncated stream, compute. Recovery comes from a real input change or a boundary's `reset()`, as for any hydrated failure.
diff --git a/packages/solid/src/client/hydration.ts b/packages/solid/src/client/hydration.ts
index 102582100..07d55f741 100644
--- a/packages/solid/src/client/hydration.ts
+++ b/packages/solid/src/client/hydration.ts
@@ -588,8 +588,9 @@ export function syncThenable(value: any) {
 /**
  * A served pass: `write(x)` lands a served answer — the server's answer for a
  * node arriving (the async runtime writes it and flushes, synchronously),
- * or a rejected fragment's fresh render over the outcome the server drew
- * (the boundary's trigger) — and the flush round that carries it is
+ * or a boundary's fresh render (its trigger; `adopt`: hydrating, so what it
+ * creates adopts its server answer by id, claiming nothing) — and the
+ * flush round that carries it is
  * hydration's own pass over served answers (`_claimOwner`, that round). A
  * node that adopted its own server answer re-runs there because the
  * server's answer for something it reads arrived, not because a client
@@ -599,12 +600,18 @@ export function syncThenable(value: any) {
  * the flush, where a node it reaches computes. Runs from a settled promise,
  * outside any claim window.
  */
-const servedPass = (write: (x?: any) => void) => (x?: any) => {
+const servedPass = (write: (x?: any) => void, adopt?: boolean) => (x?: any) => {
   flush();
+  _hydratingValue = adopt!;
   _claimOwner = ~clock;
-  write(x);
-  flush();
-  _claimOwner = null;
+  // An uncaught error (no client boundary for a served error) leaves the
+  // flush by throwing: the pass still ends.
+  try {
+    write(x);
+    flush();
+  } finally {
+    _claimOwner = _hydratingValue = null as any;
+  }
 };
 
 /**
@@ -2288,7 +2295,7 @@ function resumeBoundaryHydration(
   id: string,
   set: () => void,
   release: () => boolean,
-  shouldHydrate = true
+  shouldHydrate: boolean | 0 = true
 ) {
   // Read before release(): releasing removes the boundaryScopes entry.
   const scope = sharedConfig.boundaryScopes?.get(id);
@@ -2316,11 +2323,15 @@ function resumeBoundaryHydration(
         scope,
         o
       )
-    : // The client renders the boundary fresh (recover): no claim. Over the
-      // outcome the server drew for the failure (an `<Errored>` fallback the
-      // swap brought, listed in the reveal record, #4287) it is that
-      // failure's content run, as a hydrated `<Errored>`'s is: a served pass.
-      ((globalThis as any)._$HY?.v?.[id]?.[0] ? servedPass(set) : set)();
+    : // The client renders the boundary fresh (recover): no claim, a served
+      // pass. After a rejection (0: the server's, or the stream cut short)
+      // the render adopts what the server sent by id, as a hydrated
+      // `<Errored>`'s content run does: the failing read's error included,
+      // thrown to the nearest client boundary — the outcome the server drew
+      // for it, if any (#4287), or an uncaught error — instead of asking
+      // again. What the server never sent (a truncated ref is dropped from
+      // the registry) computes.
+      servedPass(set, shouldHydrate === 0)();
   flush();
   checkHydrationComplete();
 }
@@ -2336,7 +2347,7 @@ function resumeBoundaryHydration(
 function recover(
   id: string,
   registeredAt: number,
-  resume: (shouldHydrate?: boolean) => void
+  resume: (shouldHydrate?: boolean | 0) => void
 ): void {
   if (registeredAt < 0 || !OBSERVE!.records.observed("recovery")) {
     resume(false);
@@ -2354,7 +2365,7 @@ function recover(
 function initBoundaryResume(
   o: Owner,
   id: string
-): [trigger: () => void, resume: (shouldHydrate?: boolean) => void, release: () => boolean] {
+): [trigger: () => void, resume: (shouldHydrate?: boolean | 0) => void, release: () => boolean] {
   _pendingBoundaries++;
   (o as any)._hp = 1;
   // Capture the current root's registry/gather pair for this boundary's
@@ -2714,9 +2725,9 @@ function fragmentAbort(id: string): Promise<never> {
 
 function waitAndResume(
   p: any,
-  resume: (shouldHydrate?: boolean) => void,
+  resume: (shouldHydrate?: boolean | 0) => void,
   assetPromise?: Promise<void>,
-  hydrateRejected = true,
+  hydrateRejected: boolean | 0 = true,
   abort?: Promise<never>
 ) {
   // Settle data and assets independently: an asset error must not be written
@@ -2724,7 +2735,7 @@ function waitAndResume(
   // its own hydrate semantics. (`p` may be an exotic thenable — coerce first.)
   // An abort promise (fragment truncation) races the data: its rejection
   // flows through the same rejected-state write as a server-sent rejection.
-  const data: Promise<boolean> = (
+  const data: Promise<boolean | 0> = (
     abort ? Promise.race([Promise.resolve(p), abort]) : Promise.resolve(p)
   ).then(
     () => {
@@ -2767,7 +2778,7 @@ function reportAssetFailure(err: any) {
 
 function scheduleResumeAfterAssets(
   id: string,
-  resume: (shouldHydrate?: boolean) => void,
+  resume: (shouldHydrate?: boolean | 0) => void,
   assetPromise?: Promise<void>
 ): boolean {
   sharedConfig.gather?.(id);
@@ -2954,7 +2965,7 @@ function hydratedCreateLoadingBoundary<T, U>(
           // branch and `recover` with it.
           waitAndResume(
             1,
-            IS_OBSERVE ? () => recover(id, registeredAt, resume) : () => resume(false),
+            IS_OBSERVE ? () => recover(id, registeredAt, () => resume(0)) : () => resume(0),
             assetPromise
           );
           return undefined;
@@ -2997,9 +3008,13 @@ function hydratedCreateLoadingBoundary<T, U>(
               // (#4287) — beside the range the fresh render takes: clear
               // them first.
               (revealed || hy.v?.[id]?.forEach?.((n: ChildNode) => n.remove()),
-              IS_OBSERVE ? recover(id, registeredAt, resume) : resume(false)),
+              IS_OBSERVE
+                ? recover(id, registeredAt, () => resume(shouldHydrate))
+                : resume(shouldHydrate)),
         assetPromise,
-        false,
+        // A rejection (the server's, or the stream cut short) resumes with 0:
+        // the fresh render adopts what the server sent (resumeBoundaryHydration).
+        0,
         fragmentAbort(id)
       );
       return revealed ? undefined : fallback();
diff --git a/packages/solid/test/client-hydration.spec.ts b/packages/solid/test/client-hydration.spec.ts
index 0ac7b06e9..b3c14725d 100644
--- a/packages/solid/test/client-hydration.spec.ts
+++ b/packages/solid/test/client-hydration.spec.ts
@@ -4697,7 +4697,7 @@ describe("Loading boundary: fragment registration channel (_fr)", () => {
     expect(memo()).toBe(99);
   });
 
-  test("rejected _fr resumes without hydrating serialized children", async () => {
+  test("rejected _fr resumes fresh, adopting serialized children", async () => {
     let rejectFr!: (e: any) => void;
     const frPromise: any = new Promise<boolean>((_, rej) => (rejectFr = rej));
     frPromise.s = 0;
@@ -4739,7 +4739,8 @@ describe("Loading boundary: fragment registration channel (_fr)", () => {
     await new Promise<void>(r => setTimeout(r, 50));
     flush();
 
-    expect(memo()).toBe(0);
+    // Fresh DOM, but the server's answer is used: hydration never refetches.
+    expect(memo()).toBe(7);
   });
 
   test("_fr with assets waits for both fragment and assets", async () => {
diff --git a/packages/solid/test/client-recovery-record.spec.ts b/packages/solid/test/client-recovery-record.spec.ts
index 3fd8e5ac6..677c02516 100644
--- a/packages/solid/test/client-recovery-record.spec.ts
+++ b/packages/solid/test/client-recovery-record.spec.ts
@@ -119,8 +119,8 @@ describe.skipIf(OBSERVE === undefined)("recovery record", () => {
     rejectFr(new Error("stream error"));
     await new Promise<void>(r => setTimeout(r, 20));
     flush();
-    // Fresh client DOM: the serialized 7 was never adopted.
-    expect(b.memo()).toBe(0);
+    // Fresh client DOM, the serialized 7 adopted: hydration never refetches.
+    expect(b.memo()).toBe(7);
     expect(records).toEqual([{ id: "t0", at: T0, waitedMs: 30, renderMs: RENDER_MS }]);
   });
 
@@ -133,7 +133,7 @@ describe.skipIf(OBSERVE === undefined)("recovery record", () => {
     const b = boundary();
     await new Promise<void>(r => setTimeout(r, 10));
     flush();
-    expect(b.memo()).toBe(0);
+    expect(b.memo()).toBe(7);
     // The rejection had already arrived when the boundary registered: the
     // clock did not move between registration and the recovery, so the
     // person saw no fallback — `waitedMs` is exactly 0.
@@ -163,7 +163,7 @@ describe.skipIf(OBSERVE === undefined)("recovery record", () => {
     const b = boundary();
     await new Promise<void>(r => setTimeout(r, 10));
     flush();
-    expect(b.memo()).toBe(0);
+    expect(b.memo()).toBe(7);
     // The runtime never read the clock: `registeredAt` is -1 with no listener.
     expect(performance.now).not.toHaveBeenCalled();
   });
diff --git a/packages/web/test/harness/__artifacts__/nested-rejection-no-outcome.json b/packages/web/test/harness/__artifacts__/nested-rejection-no-outcome.json
new file mode 100644
index 000000000..319a99a24
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/nested-rejection-no-outcome.json
@@ -0,0 +1,5 @@
+{
+  "name": "nested-rejection-no-outcome",
+  "shell": "<div _hk=1><!--$--><template id=\"pl-200\"></template><i _hk=2000>outer loading</i><!--pl-200--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"200003_fr\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"200_fr\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"200003000\"]=$R[7]=($R[8]=$R[2]()).p;_$HY.r[\"200003001\"]=$R[9]=($R[10]=$R[2]()).p;</script>",
+  "rest": "<template id=\"200\"><span _hk=200000>a</span><button _hk=200002 id=\"nested-rejection-count\">c0</button><template id=\"pl-200003\"></template><i _hk=2000030>inner loading</i><!--pl-200003--></template><script>($R[11]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[1],\"a\");$df(\"200\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[11]($R[6],!0);</script><script>$R[11]($R[8],\"b\");</script><template id=\"200003\" e></template><script>$df(\"200003\");($R[13]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[10],$R[12]=new Error(\"no user 7\"));</script><script>$R[13]($R[4],$R[12]);</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/served-error-reread.json b/packages/web/test/harness/__artifacts__/served-error-reread.json
new file mode 100644
index 000000000..eb035229a
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/served-error-reread.json
@@ -0,0 +1,5 @@
+{
+  "name": "served-error-reread",
+  "shell": "<div _hk=2><!--$--><template id=\"pl-300\"></template><i _hk=3000>loading</i><!--pl-300--><!--/--><!--$--><template id=\"pl-5\"></template><i _hk=50>slow loading</i><!--pl-5--><!--/--></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"5_fr\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"300_fr\"]=$R[7]=($R[8]=$R[2]()).p;</script>",
+  "rest": "<template id=\"300\" e><p _hk=40>failed: <!--$-->no user 7<!--/--></p></template><script>($R[10]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[9]=new Error(\"no user 7\"));_$HY.r[\"3\"]=$R[9];$df(\"300\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[10]($R[8],$R[9]);</script><template id=\"5\"><b _hk=5000>slow</b></template><script>($R[11]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"slow\");$df(\"5\");</script><script>$R[11]($R[6],!0);</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/scenarios.tsx b/packages/web/test/harness/scenarios.tsx
index 343d667c3..d6ccbfd99 100644
--- a/packages/web/test/harness/scenarios.tsx
+++ b/packages/web/test/harness/scenarios.tsx
@@ -1734,6 +1734,110 @@ function ServedSourceLanding() {
   );
 }
 
+// ---------------------------------------------------------------------------
+// Never refetch: a served error is the server's answer while hydration runs.
+// A shell memo `user` fails on the server after the shell flushed; an
+// <Errored> over a <Loading> reads it beside an unrelated signal `n`, and a
+// slow second <Loading> keeps hydration open after the failure shows. On
+// the client `user` resolves, so only a real ask recovers: the Errored's
+// reset() is one, mid-hydration too. A write to `n` re-runs the reader.
+let servedErrorAsks = 0;
+export const servedErrorAskCount = () => servedErrorAsks;
+export const servedErrorControl: { setN?: (v: number) => void; reset?: () => void } = {};
+function ServedErrorReread() {
+  const [n, setN] = createSignal(0);
+  servedErrorControl.setN = setN;
+  const user = createMemo(async (): Promise<string> => {
+    if (!isServer && Promise === RealPromise) servedErrorAsks++;
+    await sleep(5);
+    if (isServer) throw new Error("no user 7");
+    return "u7";
+  });
+  const slow = createMemo(async () => {
+    await sleep(isServer ? 60 : 1);
+    return "slow";
+  });
+  return (
+    <div>
+      <Errored
+        fallback={(e: any, reset: () => void) => (
+          (servedErrorControl.reset = reset),
+          (<p>failed: {e().message}</p>)
+        )}
+      >
+        <Loading fallback={<i>loading</i>}>
+          <span>{n() + ":" + user()}</span>
+        </Loading>
+      </Errored>
+      <Loading fallback={<i>slow loading</i>}>
+        <b>{slow()}</b>
+      </Loading>
+    </div>
+  );
+}
+
+// An uncontained failure the server cannot draw: an <Errored> in the shell
+// over a <Loading> that streamed its content (a resolved read `a`, a
+// counter), with a nested <Loading> whose read `user` fails after that,
+// beside a read `b` the server resolved. The Errored and the outer fragment
+// are already on the wire, so the inner fragment rejects with no outcome.
+// The client renders that fragment fresh, so its graph is created, but
+// every read claims what the server sent: `b` its value, `user` its error,
+// thrown to the nearest client boundary, the shell's Errored. No ask.
+// reset() asks, and the recreated graph is live.
+let nestedRejectionAsks = 0;
+let nestedRejectionSiblingAsks = 0;
+export const nestedRejectionAskCount = () => nestedRejectionAsks;
+export const nestedRejectionSiblingAskCount = () => nestedRejectionSiblingAsks;
+export const nestedRejectionControl: { reset?: () => void } = {};
+function NestedRejectionUser() {
+  const b = createMemo(async (): Promise<string> => {
+    if (!isServer && Promise === RealPromise) nestedRejectionSiblingAsks++;
+    await sleep(10);
+    return "b";
+  });
+  const user = createMemo(async (): Promise<string> => {
+    if (!isServer && Promise === RealPromise) nestedRejectionAsks++;
+    await sleep(20);
+    if (isServer) throw new Error("no user 7");
+    return "u7";
+  });
+  return (
+    <b>
+      {b()}
+      {user()}
+    </b>
+  );
+}
+function NestedRejection() {
+  const a = createMemo(async () => {
+    await sleep(5);
+    return "a";
+  });
+  const [count, setCount] = createSignal(0);
+  return (
+    <div>
+      <Errored
+        fallback={(e: any, reset: () => void) => (
+          (nestedRejectionControl.reset = reset),
+          (<p>failed: {e().message}</p>)
+        )}
+      >
+        <Loading fallback={<i>outer loading</i>}>
+          <span>{a()}</span>
+          <button id="nested-rejection-count" onClick={() => setCount(c => c + 1)}>
+            {"c" + count()}
+          </button>
+          <Loading fallback={<i>inner loading</i>}>
+            <NestedRejectionUser />
+          </Loading>
+        </Loading>
+      </Errored>
+      <span>tail</span>
+    </div>
+  );
+}
+
 // ---------------------------------------------------------------------------
 // #3414: a sync throw the SERVER catches, with a zero-arg fallback thunk
 // (`fallback={() => <Fallback />}`), inside an enclosing boundary. Errored
@@ -3110,6 +3214,20 @@ export const scenarios: Scenario[] = [
     expectedTextAfterUpdate: "user:u8tail",
     stableSelector: "div"
   },
+  {
+    name: "served-error-reread",
+    App: ServedErrorReread,
+    async: true,
+    expectedText: "failed: no user 7slow",
+    serverText: "loading slow loading failed: no user 7 slow"
+  },
+  {
+    name: "nested-rejection-no-outcome",
+    App: NestedRejection,
+    async: true,
+    expectedText: "failed: no user 7tail",
+    serverText: "outer loading tail a c0 inner loading"
+  },
   {
     name: "served-source-landing",
     App: ServedSourceLanding,
diff --git a/packages/web/test/hydration/async-memo-element-4242.spec.tsx b/packages/web/test/hydration/async-memo-element-4242.spec.tsx
index 19c587019..fa407f641 100644
--- a/packages/web/test/hydration/async-memo-element-4242.spec.tsx
+++ b/packages/web/test/hydration/async-memo-element-4242.spec.tsx
@@ -13,7 +13,10 @@
  *  - inside an `<Errored>`, the client hydrates the fallback the server
  *    rendered for the refusal and hydration completes;
  *  - uncontained, the client does exactly what it does for any other
- *    server render error at that position (the `-reference` twin);
+ *    server render error at that position (the `-reference` twin): the
+ *    rejected fragment's fresh render adopts the server's error instead of
+ *    asking again, and with no client boundary to catch it, it is an
+ *    uncaught error;
  *  - ordinary data lands, is adopted without the client recomputing it, and
  *    the page is interactive.
  */
@@ -207,15 +210,26 @@ describe("async memo resolving to rendered output (#4242) — hydration", () =>
           rejections: o.rejections.length
         });
         expect(comparable(outcome)).toEqual(comparable(reference));
-        if (mode === "loaded") {
-          // The fragment rejected and the client rendered the subtree
-          // itself: the element on screen, live.
-          expect(outcome.halted).toBe(false);
-          expect(outcome.done).toBe(true);
-          if (variant.shape === "jsx") {
-            expect(outcome.text).toBe("jsx-41Count: 1");
-            expect(outcome.afterClick).toBe("Count: 1");
-          } else expect(outcome.text).toBe("nested-41");
+        // The fragment rejected with no outcome: the client renders it
+        // fresh, adopting what the server sent — the memo's error, never
+        // asked for again (hydration never refetches). Nothing on the client
+        // catches it (a <Loading> does not), so it is an uncaught error, as
+        // on any client render: the reactive system halts, the element
+        // never renders (no counter to click), and the halted resume never
+        // completes hydration. Recovery is a real input change or a reset()
+        // of a client boundary, as for any hydrated failure (#4273).
+        for (const o of [outcome, reference]) {
+          // `outer` adopted the server's answer. The issue shape's `inner`
+          // run is the fixture's own: the hydration dry run of `outer` only
+          // subscribes, but its continuation waits on a real timer (the
+          // fixture's wait escapes the dry run's mock Promise) and builds
+          // the inner slot, whose memo has no owner id to hydrate by.
+          expect(o.runs).toEqual(variant.shape === "jsx" ? [] : ["inner"]);
+          expect(o.halted).toBe(true);
+          expect(o.done).toBe(false);
+          expect(o.text).toBe("");
+          expect(o.afterClick).toBe(undefined);
+          expect(o.shown).toEqual(mode === "streamed" ? ["outer", ""] : [""]);
         }
       });
     }
diff --git a/packages/web/test/hydration/served-error-no-reask.spec.tsx b/packages/web/test/hydration/served-error-no-reask.spec.tsx
new file mode 100644
index 000000000..d872440a8
--- /dev/null
+++ b/packages/web/test/hydration/served-error-no-reask.spec.tsx
@@ -0,0 +1,187 @@
+/**
+ * @jsxImportSource @solidjs/web
+ * @vitest-environment jsdom
+ *
+ * Never refetch on hydration: an error the server sent is the server's
+ * answer, and the hydrating client never asks again for it.
+ *
+ * - `nested-rejection-no-outcome`: a failure the server could not draw (the
+ *   inner fragment rejects with no outcome: the shell's `<Errored>` and the
+ *   outer fragment were already on the wire). The client renders the
+ *   fragment fresh, so its graph is created, but every read in it claims
+ *   what the server sent: the sibling read its value, the failed read its
+ *   error, thrown to the nearest client boundary, the shell's Errored. No
+ *   ask. reset() asks, and the recreated graph is live.
+ * - `served-error-reread`: mid-hydration (a slow boundary still pending)
+ *   the served error stands with no ask; the Errored's reset() is a real
+ *   retry, and asks and recovers right away, hydration still running.
+ *
+ * Replays the parity harness artifacts (test/server/hydration-harness.spec.tsx).
+ */
+import { describe, expect, test, vi } from "vitest";
+import { existsSync, readFileSync } from "node:fs";
+import { resolve, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+import { flush } from "solid-js";
+import { hydrate } from "@solidjs/web";
+import {
+  scenarios,
+  nestedRejectionAskCount,
+  nestedRejectionControl,
+  nestedRejectionSiblingAskCount,
+  servedErrorAskCount,
+  servedErrorControl
+} from "../harness/scenarios.jsx";
+
+const sleep = (ms: number) => new Promise(r => setTimeout(r, ms));
+const load = (name: string) => {
+  const file = resolve(
+    dirname(fileURLToPath(import.meta.url)),
+    `../harness/__artifacts__/${name}.json`
+  );
+  expect(existsSync(file)).toBe(true);
+  return {
+    ...(JSON.parse(readFileSync(file, "utf-8")) as { shell: string; rest: string }),
+    scenario: scenarios.find(s => s.name === name)!
+  };
+};
+
+function applyChunk(container: HTMLDivElement, chunk: string, first: boolean) {
+  const scriptRe = /<script(?:[^>]*)>([\s\S]*?)<\/script>/g;
+  const scripts = [...chunk.matchAll(scriptRe)].map(m => m[1]);
+  const stripped = chunk.replace(scriptRe, "");
+  if (first) container.innerHTML = stripped;
+  else container.insertAdjacentHTML("beforeend", stripped);
+  for (const s of scripts) (0, eval)(s);
+}
+// The stream after the shell, one script at a time (a template rides with
+// the script after it), as a browser parses it.
+const pieces = (rest: string) => rest.match(/[\s\S]*?<\/script>/g) ?? [rest];
+async function settle() {
+  for (let i = 0; i < 4; i++) {
+    await sleep(5);
+    flush();
+  }
+}
+
+async function withPage(
+  name: string,
+  body: (container: HTMLDivElement, rest: string) => Promise<void>
+) {
+  const { shell, rest, scenario } = load(name);
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  (globalThis as any)._$HY = { events: [], completed: new WeakSet(), r: {}, fe() {} };
+  const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
+  // A rejected record the stream settles before anything on the client
+  // reads it is reported unhandled; it is the server's error, nothing else.
+  const rejections: string[] = [];
+  const onRejection = (r: unknown) => void rejections.push(String(r));
+  process.on("unhandledRejection", onRejection);
+  let dispose: (() => void) | undefined;
+  try {
+    applyChunk(container, shell, true);
+    await body(container, rest);
+    // `body` hydrates; the harness disposes it.
+    dispose = (container as any).__dispose;
+    expect(warn).not.toHaveBeenCalled();
+    await sleep(5);
+    for (const r of rejections) expect(r).toBe("Error: no user 7");
+  } finally {
+    process.off("unhandledRejection", onRejection);
+    warn.mockRestore();
+    dispose?.();
+    await sleep(0);
+    container.remove();
+  }
+  void scenario;
+}
+function start(container: HTMLDivElement, App: () => any) {
+  (container as any).__dispose = hydrate(() => <App />, container);
+  flush();
+}
+
+describe("a failure the server could not draw: adopted, thrown to the nearest client boundary", () => {
+  const name = "nested-rejection-no-outcome";
+  for (const mode of ["loaded", "streamed"] as const)
+    test(`[${mode}] the shell's Errored shows the server's error, no ask; reset() asks`, () =>
+      withPage(name, async (container, rest) => {
+        const { scenario } = load(name);
+        const asks = nestedRejectionAskCount();
+        const siblingAsks = nestedRejectionSiblingAskCount();
+        if (mode === "loaded") applyChunk(container, rest, false);
+        start(container, scenario.App);
+        await settle();
+        if (mode === "streamed")
+          for (const piece of pieces(rest)) {
+            applyChunk(container, piece, false);
+            await settle();
+          }
+        await settle();
+        expect(container.textContent).toBe("failed: no user 7tail");
+        // The fresh render claimed what the server sent: its error for
+        // `user`, its value for `b`. Nothing is asked again.
+        expect(nestedRejectionAskCount()).toBe(asks);
+        expect(nestedRejectionSiblingAskCount()).toBe(siblingAsks);
+
+        nestedRejectionControl.reset!();
+        await settle();
+        await sleep(30);
+        await settle();
+        expect(nestedRejectionAskCount()).toBe(asks + 1);
+        expect(container.textContent).toBe("ac0bu7tail");
+        // The recreated graph is live.
+        container.querySelector<HTMLButtonElement>("#nested-rejection-count")!.click();
+        flush();
+        expect(container.textContent).toBe("ac1bu7tail");
+      }));
+});
+
+describe("a served error mid-hydration", () => {
+  const name = "served-error-reread";
+  test("mid-hydration: the server's error, no ask; reset() asks and recovers", () =>
+    withPage(name, async (container, rest) => {
+      const { scenario } = load(name);
+      const asks = servedErrorAskCount();
+      start(container, scenario.App);
+      await settle();
+      const all = pieces(rest);
+      // Up to the failure; the slow boundary is still pending.
+      let i = 0;
+      while (!container.textContent!.includes("failed")) {
+        applyChunk(container, all[i++], false);
+        await settle();
+      }
+      applyChunk(container, all[i++], false);
+      await settle();
+      expect(container.textContent).toBe("failed: no user 7slow loading");
+      expect((globalThis as any)._$HY.done).toBeFalsy();
+      expect(servedErrorAskCount()).toBe(asks);
+
+      // reset() is a real retry, mid-hydration too.
+      servedErrorControl.reset!();
+      await settle();
+      expect(servedErrorAskCount()).toBe(asks + 1);
+      expect(container.textContent).toBe("0:u7slow loading");
+
+      for (; i < all.length; i++) {
+        applyChunk(container, all[i], false);
+        await settle();
+      }
+      await settle();
+      expect(container.textContent).toBe("0:u7slow");
+      expect(servedErrorAskCount()).toBe(asks + 1);
+    }));
+
+  test("loaded: the server's error, no ask", () =>
+    withPage(name, async (container, rest) => {
+      const { scenario } = load(name);
+      const asks = servedErrorAskCount();
+      applyChunk(container, rest, false);
+      start(container, scenario.App);
+      await settle();
+      await settle();
+      expect(container.textContent).toBe("failed: no user 7slow");
+      expect(servedErrorAskCount()).toBe(asks);
+    }));
+});

From 22a6dd92ed66a319f8baeb7a8e8282cb76b6033a Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 27 Oct 2026 05:47:44 +0000
Subject: [PATCH 10/16] fix(web): a fresh render adopts only what the server
 answered, by aligned ids

The previous commit made a rejected fragment's fresh render adopt what
the server sent by id. That exposed two wrong-data cases.

Abandoned records. When a fragment fails on the server with nested reads
still pending, abandonSubtree settles those records to release seroval,
and they reached the client as `undefined`. The fresh render adopted
that `undefined` as the server's answer. The server now also unregisters
them: a record not yet on the wire is dropped from the stub batch, and
one already registered gets a `delete _$HY.r[id]` document task, queued
ahead of the `_fr` rejection that triggers the fresh render. The read then
has no record and computes. Frame sinks are untouched, since they have no
reader for these records. Server-only: 0 B on the client for this part.

Id alignment. The server spends a child id on every element's hydration
key. A non-claiming client render did not (getNextElement only read the
key while claiming), so in a fresh render every owner after an element
got a shifted id. It could miss its own record or take a sibling's. Now
getNextElement consumes the key whenever hydration is on, claiming or
not. A non-adopting fresh render runs with the flag off, so it is
unchanged. Hydratable-compiled bundles only.

Test: abandoned-sibling-computes (loaded and streamed). A <Loading>
holds a read `a`, a read `d` after an element, and a nested <Loading>
with a read `c` (50ms on the server). Its content throws on the server
once `a` lands, a render error that no record carries. The fragment
rejects with `c` still pending. The client shows "adc!an0tail": `a` and
`d` are adopted with 0 asks, `c` computes once and gets its own value,
and the counter clicks. Without the server change `c` shows "" (it
adopts `undefined`). Without the key change `d` asks.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015hPxMkC3jg3Uivh65gvaf2
---
 ...andoned-records-compute-on-fresh-render.md |  5 ++
 packages/web/src/client.ts                    | 13 ++--
 packages/web/src/server.ts                    | 18 ++++-
 .../abandoned-sibling-computes.json           |  5 ++
 packages/web/test/harness/scenarios.tsx       | 72 +++++++++++++++++++
 .../hydration/served-error-no-reask.spec.tsx  | 38 ++++++++++
 6 files changed, 143 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/abandoned-records-compute-on-fresh-render.md
 create mode 100644 packages/web/test/harness/__artifacts__/abandoned-sibling-computes.json

diff --git a/.changeset/abandoned-records-compute-on-fresh-render.md b/.changeset/abandoned-records-compute-on-fresh-render.md
new file mode 100644
index 000000000..2f41fa793
--- /dev/null
+++ b/.changeset/abandoned-records-compute-on-fresh-render.md
@@ -0,0 +1,5 @@
+---
+"@solidjs/web": patch
+---
+
+A streamed boundary that fails on the server can leave nested reads still pending. The server abandons those reads, and their records used to settle as `undefined`, which the client's fresh render of the failed fragment would then adopt as the server's answer. The server now unregisters abandoned records, so those reads compute on the client. The fresh render also spends an id on each element's hydration key, as the server did, so its reads line up with the server's records by id.
diff --git a/packages/web/src/client.ts b/packages/web/src/client.ts
index c17db49c9..a1e802bb9 100644
--- a/packages/web/src/client.ts
+++ b/packages/web/src/client.ts
@@ -2580,16 +2580,19 @@ export function hydrate(code, element, options = {}) {
 export function getNextElement(template?: () => Element): Element;
 
 export function getNextElement(template) {
-  let node,
-    key,
+  // The key is consumed whenever hydration is on, claiming or not: a
+  // rejected fragment's fresh render adopts its server answers by id, and
+  // the server spent one on this element, so ids after it line up.
+  let key = sharedConfig.hydrating && getHydrationKey(),
+    node,
     hydrating = isHydrating();
-  if (!hydrating || !(node = sharedConfig.registry.get((key = getHydrationKey())))) {
+  if (!hydrating || !(node = sharedConfig.registry.get(key))) {
     if (!template) {
       throw new Error(`Hydration Mismatch. Unable to find DOM nodes for hydration key: ${key}`);
     }
     // A key miss during the hydration walk is a real mismatch: fresh renders
-    // (portals, rejected fragments, post-hydration content) all run with the
-    // hydrating flag off, so there is no legitimate way to get here. The
+    // (portals, rejected fragments, post-hydration content) all run outside
+    // the claim, so there is no legitimate way to get here. The
     // detached element returned below keeps the render alive but never lands
     // in the document — without a report that reads as a silently frozen
     // page (solidjs/solid#3000).
diff --git a/packages/web/src/server.ts b/packages/web/src/server.ts
index 758190a55..e764bb8d7 100644
--- a/packages/web/src/server.ts
+++ b/packages/web/src/server.ts
@@ -2662,9 +2662,10 @@ export function renderToStream(code, options = {}) {
   // resume loops may be parked on promises that never settle), and pending
   // serialized values under the errored key would gate seroval's onDone the
   // same way. Settle both. Descendant `_fr` stubs resolve clean (not
-  // rejected) and abandoned data ids resolve undefined: the client re-renders
-  // the errored region fresh off the OUTER fragment's rejection, so nothing
-  // consumes these — a rejection would only raise unhandled-rejection noise.
+  // rejected) and abandoned data ids resolve undefined, and are unregistered
+  // on the client: it re-renders the errored region fresh off the OUTER
+  // fragment's rejection, so nothing consumes these — a rejection would only
+  // raise unhandled-rejection noise.
   //
   // A finding (`SSR_SUBTREE_ABANDONED`) when the discard took work with it —
   // nested fragments still rendering, serialized values still pending: the
@@ -2686,13 +2687,24 @@ export function renderToStream(code, options = {}) {
         fragments++;
       }
     }
+    const unregister = [];
     for (const [id, settle] of pendingSerialized) {
       if (id.startsWith(key)) {
         pendingSerialized.delete(id);
         settle();
         serialized++;
+        // Not yet on the wire: never registered. Otherwise the client drops
+        // it (below).
+        if (!stubBatch?.delete(id)) unregister.push(`delete _$HY.r[${JSON.stringify(id)}]`);
       }
     }
+    // The settle above only releases seroval: `undefined` is not the
+    // server's answer. The client renders this subtree fresh, adopting what
+    // the server sent by id, so an abandoned record must not be there to
+    // adopt: unregister it (a document task, ahead of the `_fr` rejection
+    // that triggers the fresh render) and the read computes. A frame sink
+    // has no reader for these records.
+    if (unregister.length && !options.sink) pushTask(unregister.join(";"));
     if ("_SOLID_OBSERVE_" && (fragments || serialized))
       emitFinding(
         {
diff --git a/packages/web/test/harness/__artifacts__/abandoned-sibling-computes.json b/packages/web/test/harness/__artifacts__/abandoned-sibling-computes.json
new file mode 100644
index 000000000..d2900804b
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/abandoned-sibling-computes.json
@@ -0,0 +1,5 @@
+{
+  "name": "abandoned-sibling-computes",
+  "shell": "<div _hk=0><!--$--><template id=\"pl-1\"></template><i _hk=10>loading</i><!--pl-1--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"1006_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1_fr\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"1000\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"1003\"]=$R[7]=($R[8]=$R[2]()).p;_$HY.r[\"1006000\"]=$R[9]=($R[10]=$R[2]()).p;</script>",
+  "rest": "<script>($R[11]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[8],\"d\");</script><template id=\"1\" e></template><script>$R[11]($R[6],\"a\");delete _$HY.r[\"1006000\"];$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[11]($R[10],void 0);$R[11]($R[1],!0);($R[13]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[4],$R[12]=new Error(\"server render\"));</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/scenarios.tsx b/packages/web/test/harness/scenarios.tsx
index d6ccbfd99..7b82632df 100644
--- a/packages/web/test/harness/scenarios.tsx
+++ b/packages/web/test/harness/scenarios.tsx
@@ -1838,6 +1838,71 @@ function NestedRejection() {
   );
 }
 
+// A sibling the server never finished: a <Loading> streams `a` (resolved at
+// 5ms) and `c` (50ms on the server), and its content throws on the server
+// once `a` lands, a render error no record carries. The fragment rejects
+// with `c` still pending, so the server abandons it. The client renders the
+// fragment fresh: `a` and `d` take the server's values (`d` sits after an
+// element, whose hydration key the server spent an id on: the fresh
+// render's ids must line up), and `c`, which has no answer from the
+// server, computes (an abandoned record is not the value `undefined`).
+// Nothing throws on the client, so the graph is live.
+const abandonedAsks = { a: 0, c: 0, d: 0 };
+export const abandonedSiblingAsks = () => ({ ...abandonedAsks });
+function AbandonedSiblingC() {
+  const c = createMemo(async () => {
+    if (!isServer && Promise === RealPromise) abandonedAsks.c++;
+    await sleep(isServer ? 50 : 1);
+    return "c";
+  });
+  return <b>{c()}</b>;
+}
+function AbandonedSiblingD() {
+  const d = createMemo(async () => {
+    if (!isServer && Promise === RealPromise) abandonedAsks.d++;
+    await sleep(2);
+    return "d";
+  });
+  return <u>{d()}</u>;
+}
+function AbandonedSiblingContent() {
+  const a = createMemo(async () => {
+    if (!isServer && Promise === RealPromise) abandonedAsks.a++;
+    await sleep(5);
+    return "a";
+  });
+  const [count, setCount] = createSignal(0);
+  return (
+    <>
+      <span>{a()}</span>
+      <AbandonedSiblingD />
+      <Loading fallback={<i>c loading</i>}>
+        <AbandonedSiblingC />
+      </Loading>
+      <em>
+        {(() => {
+          const v = a();
+          if (isServer) throw new Error("server render");
+          return "!" + v;
+        })()}
+      </em>
+      <button id="abandoned-sibling-count" onClick={() => setCount(n => n + 1)}>
+        {"n" + count()}
+      </button>
+    </>
+  );
+}
+function AbandonedSibling() {
+  return (
+    <div>
+      <Loading fallback={<i>loading</i>}>
+        <AbandonedSiblingContent />
+      </Loading>
+      <span>tail</span>
+    </div>
+  );
+}
+
 // ---------------------------------------------------------------------------
 // #3414: a sync throw the SERVER catches, with a zero-arg fallback thunk
 // (`fallback={() => <Fallback />}`), inside an enclosing boundary. Errored
@@ -3221,6 +3286,13 @@ export const scenarios: Scenario[] = [
     expectedText: "failed: no user 7slow",
     serverText: "loading slow loading failed: no user 7 slow"
   },
+  {
+    name: "abandoned-sibling-computes",
+    App: AbandonedSibling,
+    async: true,
+    expectedText: "adc!an0tail",
+    serverText: "loading tail"
+  },
   {
     name: "nested-rejection-no-outcome",
     App: NestedRejection,
diff --git a/packages/web/test/hydration/served-error-no-reask.spec.tsx b/packages/web/test/hydration/served-error-no-reask.spec.tsx
index d872440a8..9db3b9aeb 100644
--- a/packages/web/test/hydration/served-error-no-reask.spec.tsx
+++ b/packages/web/test/hydration/served-error-no-reask.spec.tsx
@@ -16,6 +16,13 @@
  *   the served error stands with no ask; the Errored's reset() is a real
  *   retry, and asks and recovers right away, hydration still running.
  *
+ * - `abandoned-sibling-computes`: a fragment fails on the server (a render
+ *   error, no record) while a nested read is still pending; the server
+ *   abandons that read. The fresh render takes the served values for the
+ *   reads the server finished (one after an element: the render's ids line
+ *   up with the server's) and computes only the abandoned one, which the
+ *   server never answered: one ask, its own value, a live graph.
+ *
  * Replays the parity harness artifacts (test/server/hydration-harness.spec.tsx).
  */
 import { describe, expect, test, vi } from "vitest";
@@ -26,6 +33,7 @@ import { flush } from "solid-js";
 import { hydrate } from "@solidjs/web";
 import {
   scenarios,
+  abandonedSiblingAsks,
   nestedRejectionAskCount,
   nestedRejectionControl,
   nestedRejectionSiblingAskCount,
@@ -185,3 +193,33 @@ describe("a served error mid-hydration", () => {
       expect(servedErrorAskCount()).toBe(asks);
     }));
 });
+
+describe("a read the server abandoned computes; served reads are adopted", () => {
+  const name = "abandoned-sibling-computes";
+  for (const mode of ["loaded", "streamed"] as const)
+    test(`[${mode}] one ask, for the abandoned read only`, () =>
+      withPage(name, async (container, rest) => {
+        const { scenario } = load(name);
+        const asks = abandonedSiblingAsks();
+        if (mode === "loaded") applyChunk(container, rest, false);
+        start(container, scenario.App);
+        await settle();
+        if (mode === "streamed")
+          for (const piece of pieces(rest)) {
+            applyChunk(container, piece, false);
+            await settle();
+          }
+        await settle();
+        expect(container.textContent).toBe("adc!an0tail");
+        const now = abandonedSiblingAsks();
+        // `a` and `d` are the server's answers (`d`'s id, after an element,
+        // lines up with the server's); `c` never got one, so it computes.
+        expect(now.a - asks.a).toBe(0);
+        expect(now.d - asks.d).toBe(0);
+        expect(now.c - asks.c).toBe(1);
+        expect((globalThis as any)._$HY.done).toBe(true);
+        container.querySelector<HTMLButtonElement>("#abandoned-sibling-count")!.click();
+        flush();
+        expect(container.textContent).toBe("adc!an1tail");
+      }));
+});

From c2e38f5f92ee06e5b2d5b735a10df4ae4f3156c8 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 27 Oct 2026 06:25:12 +0000
Subject: [PATCH 11/16] perf(solid): read the page's _$HY directly on the
 recover path

A recover only runs while hydrating, so the guarded globalThis read is dead
weight: -12 B minified on every hydrating and page scenario.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_018LY7F9czoRqdMEvk2QwPr1
---
 packages/solid/src/client/hydration.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/solid/src/client/hydration.ts b/packages/solid/src/client/hydration.ts
index 102582100..a3715b9f7 100644
--- a/packages/solid/src/client/hydration.ts
+++ b/packages/solid/src/client/hydration.ts
@@ -54,6 +54,8 @@ import { IS_DEV, IS_OBSERVE } from "./core.js";
 // enableHydration().
 import { hydrateStoreLike } from "./store-hydration.js";
 
+declare const _$HY: any;
+
 type HydrationSsrFields = {
   /**
    * Defer the SSR stream flush until this primitive's first value is
@@ -2320,7 +2322,8 @@ function resumeBoundaryHydration(
       // outcome the server drew for the failure (an `<Errored>` fallback the
       // swap brought, listed in the reveal record, #4287) it is that
       // failure's content run, as a hydrated `<Errored>`'s is: a served pass.
-      ((globalThis as any)._$HY?.v?.[id]?.[0] ? servedPass(set) : set)();
+      // A recover only runs while hydrating, so the page's `_$HY` exists.
+      (_$HY.v?.[id]?.[0] ? servedPass(set) : set)();
   flush();
   checkHydrationComplete();
 }

From 16cec07fbe345c50cffeea57d9907127c5cbfa8a Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 27 Oct 2026 06:59:48 +0000
Subject: [PATCH 12/16] test(web): #4316's parked late case and twin warnings
 under adopted fresh renders

With the fresh render adopting the server's records, the uncaught late
variant halts (no client boundary, as on the server) and hydration never
completes, as #4242's uncontained variants do. The parked twin parity now
compares warnings too: the streamed key miss it excluded no longer happens.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015hPxMkC3jg3Uivh65gvaf2
---
 ...errored-parked-async-outcome-4306.spec.tsx | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx b/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx
index 3239d3edf..169b4c25e 100644
--- a/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx
+++ b/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx
@@ -270,19 +270,17 @@ describe("#4316: the Errored fallback's own hole fails", () => {
 // the server's page is compared as text. Uncontained, the page halts on
 // the client's own rejection: the text it froze at is the client tree's
 // (the inner `<Loading>` shows its fallback, the twin's the outer's), so
-// what is compared is that it halted and on what. Warnings are this
-// variant's alone: the streamed twin with an `<Errored>` around a pending
-// read misses its fallback key while it hydrates the pending fragment —
-// the core's retry of the errored read, once the fragment releases, is
-// taken for a client write by readSerializedOrCompute's latched branch,
-// which refetches; #4319's served pass is what keeps that read latched.
+// what is compared is that it halted and on what. Warnings are compared
+// too: the streamed twin with an `<Errored>` around a pending read used to
+// miss its fallback key while it hydrated the pending fragment (the core's
+// retry of the errored read, once the fragment released, was taken for a
+// client write and refetched); the served pass keeps that read latched.
 describe("#4316: a fragment failing while parked in a pending fragment", () => {
   const comparable = (r: Outcome) => ({
     ...r,
     server: r.server === undefined ? undefined : textOfHtml(r.server),
     text: r.halted ? undefined : r.text,
-    uncaught: [...new Set(r.uncaught)],
-    warnings: undefined
+    uncaught: [...new Set(r.uncaught)]
   });
   for (const o of parkedFailures) {
     if (o.variant !== "inner") continue;
@@ -315,8 +313,16 @@ describe("#4316: a fragment failing while parked in a pending fragment", () => {
           expect(outcome.text).toBe("outercaught: no user 7tail");
           expect(outcome.halted).toBe(false);
           expect(outcome.uncaught).toEqual([]);
-        } else expect(outcome.uncaught).toContain("no user 7");
-        expect(outcome.done).toBe(true);
+          expect(outcome.done).toBe(true);
+        } else {
+          // Nothing on the client catches it: the fresh render adopts the
+          // server's error (no ask) and it is uncaught, as on the server, so
+          // reactivity halts and hydration never completes (as #4242's
+          // uncontained variants).
+          expect(outcome.uncaught).toContain("no user 7");
+          expect(outcome.halted).toBe(true);
+          expect(outcome.done).toBe(false);
+        }
       });
     }
   }

From 84160b35e9015f08b475449f3030fa5cf31cef7a Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 27 Oct 2026 08:17:17 +0000
Subject: [PATCH 13/16] fix(solid,web): a rejected fragment's fresh render
 creates Dynamic tags and mounts Portals

Review of #4319 found two regressions, both in a <Loading> whose server
render threw. Both are caused by c37608359: the adopting fresh render runs
with `sharedConfig.hydrating` on (servedPass sets `_hydratingValue =
adopt`, packages/solid/src/client/hydration.ts:605 at 57b692571) but
claims nothing. Before it, a fresh render ran with hydration off.

1. <Dynamic component="p"> threw "Hydration Mismatch. Unable to find DOM
   nodes for hydration key", and the page halted. staticElement
   (packages/web/src/index.ts:323-330) branches on the bare flag and calls
   getNextElement() with no template. Off the claim, getNextElement can
   only create from a template, so it threw. That has been the case since
   before the key change too. Fix: pass the create thunk. The key is spent
   (ids stay aligned) and the element is created, like a compiled template.
   This is the only template-less getNextElement caller. getHydrationKey
   has no other client callers.

2. <Portal> never mounted. Its content memo is `ssrSource: "client"`
   (packages/web/src/index.ts:155), so with hydration on it goes through
   withHydrationGate (hydration.ts:1174-1178), which writes
   setHydrated(true) right after creation. hydrateSignalLike calls
   markTopLevelSnapshotScope (hydration.ts:1191, 327-335). In the fresh
   render no window owned the snapshot root, so it marked the page root as
   a snapshot scope. The root's scope is released only by the `hydrating`
   setter (hydration.ts:1557-1564), and servedPass bypasses the setter. The
   scope stayed open, the gate write stayed held, and the gate memo never
   re-ran (confirmed: it ran once, with hydrated() false). Fix: an
   adopting servedPass sets `_snapshotRootOwner` for its duration, so the
   render opens no snapshot scope. That is a client render, as before
   c37608359. The rest of the gated nodes (the Portal anchor memo,
   index.ts:225) are fixed by the same change.

Sweep of the other sites that branch on the bare flag during such a
render. None breaks:
- clientOnly (index.ts:458/468) shows its fallback and swaps at
  hydration end;
- lazy (component.ts:188/276), the dynamic factory warm-up
  (dynamic.ts:173) and eager list mapping (flow.ts:106) are harmless or
  keep ids aligned;
- reclaimRegion (client.ts:1484) only acts on a connected parent whose
  tracked nodes are detached, which is the cleared fallback region here.

Nits:
- resumeBoundaryHydration runs checkHydrationComplete in a finally. An
  adopted error with no client boundary throws out of the render, but the
  boundary has resumed, so hydration completes. Updated: #4242's
  uncontained variants and twins, and #4316's late case (16cec07fb), now
  expect done true. halted stays true.
- getNextElement: the reviewer's trim (node read only while claiming,
  one `!node` test).

Tests (served-error-no-reask.spec.tsx; new scenarios
rejected-fragment-dynamic and rejected-fragment-portal, a server-only
render throw after the shell): loaded and streamed, the text is
"adyn!atail" / "a!aportaltail", hydration is done, and there are no
console errors. Before the fixes: "tail" (halted) and "a!atail" (no
portal).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015hPxMkC3jg3Uivh65gvaf2
---
 .changeset/fresh-render-dynamic-portal.md     |  6 ++
 packages/solid/src/client/hydration.ts        | 63 ++++++++++-------
 packages/web/src/client.ts                    |  6 +-
 packages/web/src/index.ts                     | 18 ++---
 .../rejected-fragment-dynamic.json            |  5 ++
 .../rejected-fragment-portal.json             |  5 ++
 packages/web/test/harness/scenarios.tsx       | 67 +++++++++++++++++++
 .../async-memo-element-4242.spec.tsx          |  9 +--
 ...errored-parked-async-outcome-4306.spec.tsx |  6 +-
 .../hydration/served-error-no-reask.spec.tsx  | 33 +++++++++
 10 files changed, 174 insertions(+), 44 deletions(-)
 create mode 100644 .changeset/fresh-render-dynamic-portal.md
 create mode 100644 packages/web/test/harness/__artifacts__/rejected-fragment-dynamic.json
 create mode 100644 packages/web/test/harness/__artifacts__/rejected-fragment-portal.json

diff --git a/.changeset/fresh-render-dynamic-portal.md b/.changeset/fresh-render-dynamic-portal.md
new file mode 100644
index 000000000..5010a5aa2
--- /dev/null
+++ b/.changeset/fresh-render-dynamic-portal.md
@@ -0,0 +1,6 @@
+---
+"solid-js": patch
+"@solidjs/web": patch
+---
+
+A boundary whose server render failed is rendered fresh on the client while adopting the server's records. Inside that render, a `<Dynamic>` tag now creates its element instead of throwing a hydration mismatch, and a `<Portal>` mounts. Hydration also completes when the adopted error has no client boundary to catch it.
diff --git a/packages/solid/src/client/hydration.ts b/packages/solid/src/client/hydration.ts
index 07d55f741..8366e6dda 100644
--- a/packages/solid/src/client/hydration.ts
+++ b/packages/solid/src/client/hydration.ts
@@ -602,7 +602,12 @@ export function syncThenable(value: any) {
  */
 const servedPass = (write: (x?: any) => void, adopt?: boolean) => (x?: any) => {
   flush();
-  _hydratingValue = adopt!;
+  // Adopting, hydration is on but nothing claims: the render is a client
+  // render, so it opens no snapshot scope either (the `hydrating` setter,
+  // which would release one, is bypassed here). A scope left open would hold
+  // every write made in it — a client-only node's gate (a <Portal>) never
+  // opening.
+  _hydratingValue = _snapshotRootOwner = adopt as any;
   _claimOwner = ~clock;
   // An uncaught error (no client boundary for a served error) leaves the
   // flush by throwing: the pass still ends.
@@ -610,7 +615,7 @@ const servedPass = (write: (x?: any) => void, adopt?: boolean) => (x?: any) => {
     write(x);
     flush();
   } finally {
-    _claimOwner = _hydratingValue = null as any;
+    _claimOwner = _hydratingValue = _snapshotRootOwner = null as any;
   }
 };
 
@@ -2310,30 +2315,36 @@ function resumeBoundaryHydration(
   // client-gated nodes the resume created compute in the flush below). A
   // claiming resume turns it on for its window alone.
   _hydratingValue = false;
-  shouldHydrate
-    ? // A late resume claims against the root this boundary registered under
-      // (the captured `scope`), its subtree the snapshot and live scope for
-      // the window; the trigger re-runs the boundary's compute inside it.
-      hydrateWindow(
-        id,
-        () => {
-          set();
-          flush();
-        },
-        scope,
-        o
-      )
-    : // The client renders the boundary fresh (recover): no claim, a served
-      // pass. After a rejection (0: the server's, or the stream cut short)
-      // the render adopts what the server sent by id, as a hydrated
-      // `<Errored>`'s content run does: the failing read's error included,
-      // thrown to the nearest client boundary — the outcome the server drew
-      // for it, if any (#4287), or an uncaught error — instead of asking
-      // again. What the server never sent (a truncated ref is dropped from
-      // the registry) computes.
-      servedPass(set, shouldHydrate === 0)();
-  flush();
-  checkHydrationComplete();
+  // An adopted error with no client boundary leaves the render by throwing
+  // (uncaught, as on any client render): this boundary has resumed all the
+  // same, so hydration still completes.
+  try {
+    shouldHydrate
+      ? // A late resume claims against the root this boundary registered under
+        // (the captured `scope`), its subtree the snapshot and live scope for
+        // the window; the trigger re-runs the boundary's compute inside it.
+        hydrateWindow(
+          id,
+          () => {
+            set();
+            flush();
+          },
+          scope,
+          o
+        )
+      : // The client renders the boundary fresh (recover): no claim, a served
+        // pass. After a rejection (0: the server's, or the stream cut short)
+        // the render adopts what the server sent by id, as a hydrated
+        // `<Errored>`'s content run does: the failing read's error included,
+        // thrown to the nearest client boundary — the outcome the server drew
+        // for it, if any (#4287), or an uncaught error — instead of asking
+        // again. What the server never sent (a truncated ref is dropped from
+        // the registry) computes.
+        servedPass(set, shouldHydrate === 0)();
+    flush();
+  } finally {
+    checkHydrationComplete();
+  }
 }
 
 /**
diff --git a/packages/web/src/client.ts b/packages/web/src/client.ts
index a1e802bb9..61c10f2bd 100644
--- a/packages/web/src/client.ts
+++ b/packages/web/src/client.ts
@@ -2584,9 +2584,9 @@ export function getNextElement(template) {
   // rejected fragment's fresh render adopts its server answers by id, and
   // the server spent one on this element, so ids after it line up.
   let key = sharedConfig.hydrating && getHydrationKey(),
-    node,
-    hydrating = isHydrating();
-  if (!hydrating || !(node = sharedConfig.registry.get(key))) {
+    hydrating = isHydrating(),
+    node = hydrating && sharedConfig.registry.get(key);
+  if (!node) {
     if (!template) {
       throw new Error(`Hydration Mismatch. Unable to find DOM nodes for hydration key: ${key}`);
     }
diff --git a/packages/web/src/index.ts b/packages/web/src/index.ts
index 06c0272a9..06c4f93eb 100644
--- a/packages/web/src/index.ts
+++ b/packages/web/src/index.ts
@@ -325,14 +325,16 @@ function staticElement(tag: string, props: any): JSX.Element {
   // CREATED (customized built-in / namespace), so they are read once here,
   // untracked — the DOM can't change either after creation — and then flow
   // through spread() like any attribute. Hydration claims the
-  // parser-namespaced node, so neither applies.
-  const el = hydrating
-    ? getNextElement()
-    : createElement(
-        tag,
-        untrack(() => props.is),
-        untrack(() => props.xmlns)
-      );
+  // parser-namespaced node, so neither applies — when it claims: a fresh
+  // render under hydration (a rejected fragment's, adopting by id) spends
+  // the key and creates, like a compiled template.
+  const create = () =>
+    createElement(
+      tag,
+      untrack(() => props.is),
+      untrack(() => props.xmlns)
+    );
+  const el = hydrating ? getNextElement(create) : create();
   spread(el, props);
   // Compiled JSX emits runHydrationEvents() after an element that carries
   // event handlers. Handlers bound through spread() here need the same call,
diff --git a/packages/web/test/harness/__artifacts__/rejected-fragment-dynamic.json b/packages/web/test/harness/__artifacts__/rejected-fragment-dynamic.json
new file mode 100644
index 000000000..bb7885ce0
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/rejected-fragment-dynamic.json
@@ -0,0 +1,5 @@
+{
+  "name": "rejected-fragment-dynamic",
+  "shell": "<div _hk=0><!--$--><template id=\"pl-1\"></template><i _hk=10>loading</i><!--pl-1--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"1_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
+  "rest": "<template id=\"1\" e></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"a\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[7]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[6]=new Error(\"server render\"));</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/rejected-fragment-portal.json b/packages/web/test/harness/__artifacts__/rejected-fragment-portal.json
new file mode 100644
index 000000000..bf0b62730
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/rejected-fragment-portal.json
@@ -0,0 +1,5 @@
+{
+  "name": "rejected-fragment-portal",
+  "shell": "<div _hk=0><!--$--><template id=\"pl-1\"></template><i _hk=10>loading</i><!--pl-1--><!--/--><section></section><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"1_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
+  "rest": "<template id=\"1\" e></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"a\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[7]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[6]=new Error(\"server render\"));</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/scenarios.tsx b/packages/web/test/harness/scenarios.tsx
index bc559d6df..b88031454 100644
--- a/packages/web/test/harness/scenarios.tsx
+++ b/packages/web/test/harness/scenarios.tsx
@@ -2137,6 +2137,59 @@ function AbandonedSibling() {
   );
 }
 
+// A fragment whose server render threw (no record carries it) is rendered
+// fresh on the client with hydration on, adopting by id and claiming
+// nothing. Element runtimes that pick claim-or-create on that flag alone
+// must create here: `<Dynamic component="p">` (staticElement) and a
+// `<Portal>` (its client-only gate) inside such a fragment.
+function ServerRenderThrows(props: { children: JSX.Element }) {
+  const a = createMemo(async () => {
+    await sleep(5);
+    return "a";
+  });
+  return (
+    <>
+      <span>{a()}</span>
+      {props.children}
+      <em>
+        {(() => {
+          const v = a();
+          if (isServer) throw new Error("server render");
+          return "!" + v;
+        })()}
+      </em>
+    </>
+  );
+}
+function RejectedDynamic() {
+  return (
+    <div>
+      <Loading fallback={<i>loading</i>}>
+        <ServerRenderThrows>
+          <Dynamic component="p">dyn</Dynamic>
+        </ServerRenderThrows>
+      </Loading>
+      <span>tail</span>
+    </div>
+  );
+}
+function RejectedPortal() {
+  const [host, setHost] = createSignal<HTMLElement>();
+  return (
+    <div>
+      <Loading fallback={<i>loading</i>}>
+        <ServerRenderThrows>
+          <Portal mount={host()}>
+            <b>portal</b>
+          </Portal>
+        </ServerRenderThrows>
+      </Loading>
+      <section ref={setHost} />
+      <span>tail</span>
+    </div>
+  );
+}
+
 // ---------------------------------------------------------------------------
 // #3414: a sync throw the SERVER catches, with a zero-arg fallback thunk
 // (`fallback={() => <Fallback />}`), inside an enclosing boundary. Errored
@@ -3520,6 +3573,20 @@ export const scenarios: Scenario[] = [
     expectedText: "failed: no user 7slow",
     serverText: "loading slow loading failed: no user 7 slow"
   },
+  {
+    name: "rejected-fragment-dynamic",
+    App: RejectedDynamic,
+    async: true,
+    expectedText: "adyn!atail",
+    serverText: "loading tail"
+  },
+  {
+    name: "rejected-fragment-portal",
+    App: RejectedPortal,
+    async: true,
+    expectedText: "a!aportaltail",
+    serverText: "loading tail"
+  },
   {
     name: "abandoned-sibling-computes",
     App: AbandonedSibling,
diff --git a/packages/web/test/hydration/async-memo-element-4242.spec.tsx b/packages/web/test/hydration/async-memo-element-4242.spec.tsx
index fa407f641..4e53cc3d7 100644
--- a/packages/web/test/hydration/async-memo-element-4242.spec.tsx
+++ b/packages/web/test/hydration/async-memo-element-4242.spec.tsx
@@ -215,9 +215,10 @@ describe("async memo resolving to rendered output (#4242) — hydration", () =>
         // asked for again (hydration never refetches). Nothing on the client
         // catches it (a <Loading> does not), so it is an uncaught error, as
         // on any client render: the reactive system halts, the element
-        // never renders (no counter to click), and the halted resume never
-        // completes hydration. Recovery is a real input change or a reset()
-        // of a client boundary, as for any hydrated failure (#4273).
+        // never renders (no counter to click). The boundary has resumed all
+        // the same, so hydration completes. Recovery is a real input change
+        // or a reset() of a client boundary, as for any hydrated failure
+        // (#4273).
         for (const o of [outcome, reference]) {
           // `outer` adopted the server's answer. The issue shape's `inner`
           // run is the fixture's own: the hydration dry run of `outer` only
@@ -226,7 +227,7 @@ describe("async memo resolving to rendered output (#4242) — hydration", () =>
           // the inner slot, whose memo has no owner id to hydrate by.
           expect(o.runs).toEqual(variant.shape === "jsx" ? [] : ["inner"]);
           expect(o.halted).toBe(true);
-          expect(o.done).toBe(false);
+          expect(o.done).toBe(true);
           expect(o.text).toBe("");
           expect(o.afterClick).toBe(undefined);
           expect(o.shown).toEqual(mode === "streamed" ? ["outer", ""] : [""]);
diff --git a/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx b/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx
index 169b4c25e..ae83729a3 100644
--- a/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx
+++ b/packages/web/test/hydration/errored-parked-async-outcome-4306.spec.tsx
@@ -317,11 +317,11 @@ describe("#4316: a fragment failing while parked in a pending fragment", () => {
         } else {
           // Nothing on the client catches it: the fresh render adopts the
           // server's error (no ask) and it is uncaught, as on the server, so
-          // reactivity halts and hydration never completes (as #4242's
-          // uncontained variants).
+          // reactivity halts; the boundary has resumed all the same, so
+          // hydration completes (as #4242's uncontained variants).
           expect(outcome.uncaught).toContain("no user 7");
           expect(outcome.halted).toBe(true);
-          expect(outcome.done).toBe(false);
+          expect(outcome.done).toBe(true);
         }
       });
     }
diff --git a/packages/web/test/hydration/served-error-no-reask.spec.tsx b/packages/web/test/hydration/served-error-no-reask.spec.tsx
index 9db3b9aeb..bb97e0e70 100644
--- a/packages/web/test/hydration/served-error-no-reask.spec.tsx
+++ b/packages/web/test/hydration/served-error-no-reask.spec.tsx
@@ -22,6 +22,10 @@
  *   reads the server finished (one after an element: the render's ids line
  *   up with the server's) and computes only the abandoned one, which the
  *   server never answered: one ask, its own value, a live graph.
+ * - `rejected-fragment-dynamic` / `rejected-fragment-portal`: the fresh
+ *   render runs with hydration on but claims nothing, so a `<Dynamic>` tag
+ *   and a `<Portal>` in it create their DOM (a `<Dynamic>` used to throw a
+ *   hydration mismatch there, a `<Portal>` never mounted).
  *
  * Replays the parity harness artifacts (test/server/hydration-harness.spec.tsx).
  */
@@ -223,3 +227,32 @@ describe("a read the server abandoned computes; served reads are adopted", () =>
         expect(container.textContent).toBe("adc!an1tail");
       }));
 });
+
+describe("element runtimes in a fresh render create, they claim nothing", () => {
+  for (const [name, text] of [
+    ["rejected-fragment-dynamic", "adyn!atail"],
+    ["rejected-fragment-portal", "a!aportaltail"]
+  ] as const)
+    for (const mode of ["loaded", "streamed"] as const)
+      test(`${name} [${mode}]`, () =>
+        withPage(name, async (container, rest) => {
+          const { scenario } = load(name);
+          const errors = vi.spyOn(console, "error").mockImplementation(() => {});
+          try {
+            if (mode === "loaded") applyChunk(container, rest, false);
+            start(container, scenario.App);
+            await settle();
+            if (mode === "streamed")
+              for (const piece of pieces(rest)) {
+                applyChunk(container, piece, false);
+                await settle();
+              }
+            await settle();
+            expect(container.textContent).toBe(text);
+            expect((globalThis as any)._$HY.done).toBe(true);
+            expect(errors).not.toHaveBeenCalled();
+          } finally {
+            errors.mockRestore();
+          }
+        }));
+});

From e99c2c182251bc4a201fef36b97d7ff1ce47d1a8 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 27 Oct 2026 08:41:54 +0000
Subject: [PATCH 14/16] perf(solid,web): one try/finally for a served pass that
 throws

servedPass's `finally` now runs checkHydrationComplete itself, after
resetting the pass state. resumeBoundaryHydration drops its own
try/finally: a boundary's fresh render is that resume, and its uncaught
error still completes hydration. Everywhere else a served pass's check is
a no-op: a landing comes when hydration is done, or while boundaries are
still pending.

getNextElement reads isHydrating() inline instead of through a variable
(the dev mismatch warning calls it again, dev only).

Behaviour is unchanged. It saves 8 B minified on every hydrating bundle
(5 B in the compiled ones).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015hPxMkC3jg3Uivh65gvaf2
---
 packages/solid/src/client/hydration.ts | 60 +++++++++++++-------------
 packages/web/src/client.ts             |  5 +--
 2 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/packages/solid/src/client/hydration.ts b/packages/solid/src/client/hydration.ts
index 8366e6dda..f6968903b 100644
--- a/packages/solid/src/client/hydration.ts
+++ b/packages/solid/src/client/hydration.ts
@@ -610,12 +610,16 @@ const servedPass = (write: (x?: any) => void, adopt?: boolean) => (x?: any) => {
   _hydratingValue = _snapshotRootOwner = adopt as any;
   _claimOwner = ~clock;
   // An uncaught error (no client boundary for a served error) leaves the
-  // flush by throwing: the pass still ends.
+  // flush by throwing: the pass still ends, and hydration still completes
+  // — a boundary's fresh render is its resume, done all the same. (Outside
+  // a resume the check is a no-op: hydration is done, or boundaries are
+  // pending.)
   try {
     write(x);
     flush();
   } finally {
     _claimOwner = _hydratingValue = _snapshotRootOwner = null as any;
+    checkHydrationComplete();
   }
 };
 
@@ -2315,36 +2319,30 @@ function resumeBoundaryHydration(
   // client-gated nodes the resume created compute in the flush below). A
   // claiming resume turns it on for its window alone.
   _hydratingValue = false;
-  // An adopted error with no client boundary leaves the render by throwing
-  // (uncaught, as on any client render): this boundary has resumed all the
-  // same, so hydration still completes.
-  try {
-    shouldHydrate
-      ? // A late resume claims against the root this boundary registered under
-        // (the captured `scope`), its subtree the snapshot and live scope for
-        // the window; the trigger re-runs the boundary's compute inside it.
-        hydrateWindow(
-          id,
-          () => {
-            set();
-            flush();
-          },
-          scope,
-          o
-        )
-      : // The client renders the boundary fresh (recover): no claim, a served
-        // pass. After a rejection (0: the server's, or the stream cut short)
-        // the render adopts what the server sent by id, as a hydrated
-        // `<Errored>`'s content run does: the failing read's error included,
-        // thrown to the nearest client boundary — the outcome the server drew
-        // for it, if any (#4287), or an uncaught error — instead of asking
-        // again. What the server never sent (a truncated ref is dropped from
-        // the registry) computes.
-        servedPass(set, shouldHydrate === 0)();
-    flush();
-  } finally {
-    checkHydrationComplete();
-  }
+  shouldHydrate
+    ? // A late resume claims against the root this boundary registered under
+      // (the captured `scope`), its subtree the snapshot and live scope for
+      // the window; the trigger re-runs the boundary's compute inside it.
+      hydrateWindow(
+        id,
+        () => {
+          set();
+          flush();
+        },
+        scope,
+        o
+      )
+    : // The client renders the boundary fresh (recover): no claim, a served
+      // pass. After a rejection (0: the server's, or the stream cut short)
+      // the render adopts what the server sent by id, as a hydrated
+      // `<Errored>`'s content run does: the failing read's error included,
+      // thrown to the nearest client boundary — the outcome the server drew
+      // for it, if any (#4287), or an uncaught error — instead of asking
+      // again. What the server never sent (a truncated ref is dropped from
+      // the registry) computes.
+      servedPass(set, shouldHydrate === 0)();
+  flush();
+  checkHydrationComplete();
 }
 
 /**
diff --git a/packages/web/src/client.ts b/packages/web/src/client.ts
index 61c10f2bd..57136d0b1 100644
--- a/packages/web/src/client.ts
+++ b/packages/web/src/client.ts
@@ -2584,8 +2584,7 @@ export function getNextElement(template) {
   // rejected fragment's fresh render adopts its server answers by id, and
   // the server spent one on this element, so ids after it line up.
   let key = sharedConfig.hydrating && getHydrationKey(),
-    hydrating = isHydrating(),
-    node = hydrating && sharedConfig.registry.get(key);
+    node = isHydrating() && sharedConfig.registry.get(key);
   if (!node) {
     if (!template) {
       throw new Error(`Hydration Mismatch. Unable to find DOM nodes for hydration key: ${key}`);
@@ -2596,7 +2595,7 @@ export function getNextElement(template) {
     // detached element returned below keeps the render alive but never lands
     // in the document — without a report that reads as a silently frozen
     // page (solidjs/solid#3000).
-    if ("_SOLID_DEV_" && hydrating) {
+    if ("_SOLID_DEV_" && isHydrating()) {
       hydrationKeyMisses++;
       console.warn(
         `Hydration key miss for "${key}": no server-rendered element carries this key` +

From 3abcc8bef4ed1a1d262cf8e935ab16783663a90c Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 27 Oct 2026 08:59:30 +0000
Subject: [PATCH 15/16] chore(size): raise the hydrating + store cap for #4319
 over #4314

Size-Exception accepted by the maintainer (2026-10-27): +34 B minified
over the recorded size on "app: hydrating + every store primitive family".

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015hPxMkC3jg3Uivh65gvaf2
---
 scripts/size/scenarios.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/size/scenarios.js b/scripts/size/scenarios.js
index ad288de0f..9da54e398 100644
--- a/scripts/size/scenarios.js
+++ b/scripts/size/scenarios.js
@@ -2648,8 +2648,9 @@ module.exports = [
     // Throwing cleanups no longer abort teardown (#4213, 2026-10-21, over next @ a2a5b6f8): 30.41 KB -> 30.42 KB, recorded minified 95,109 -> 95,268 B (+159 B), measured in CI at 30,403 B brotli. Every onCleanup and effect cleanup runs when one throws; the first error is rethrown by a root's dispose() or at the end of the flush. Size-Exception accepted by the maintainer (2026-10-21). Cap at measured + 10 B rounded up to 0.01 KB, never lowered; recorded minified = measured.
     // Keyed optimistic guess folds a correction (D-34, #4210, 2026-10-21, accepted by the maintainer 2026-10-22, re-measured over next @ db8241ce): 30.42 -> 30.66 KB, recorded minified 95,268 -> 95,837 B (+569 B, golfed from +694 B at the maintainer's request), measured locally (linux) at 30,642 B brotli: this scenario carries createOptimisticStore, so it pays for the fold itself (store/optimistic.ts `fold`, `foldedRead`, core `joinPassAt`); a keyed arrangement guess is recognized by its view's removed-keys set. Correctness: two overlapping writes on one keyed store no longer tear the store or remount the confirmed row. Cap at measured + 10 B rounded up to 0.01 KB; recorded minified = measured.
     // Off-screen fallback disposed in the pass that picks content (#4282 / #4268, 2026-10-26, over next @ fbd375d1): 30.66 KB -> 30.86 KB, recorded minified 95,837 -> 95,113 B (-724 B; +24 B over next), measured in CI at 30,847 B brotli. A re-armed Loading disposes a fallback its committed output does not show in that pass, so the fallback's pending render effects stop holding the frame. Size-Exception accepted by the maintainer (2026-10-26). Cap at measured + 10 B rounded up to 0.01 KB, never lowered; recorded minified = measured.
-    limit: "30.86 KB",
-    capMinified: 95113,
+    // A rejected fragment's fresh render claims what the server sent (#4319, 2026-10-27, over next @ 0090fe34): 30.86 KB -> 30.96 KB, recorded minified 95,113 -> 95,147 B (+34 B; +18 B over next, the rest #4314's), measured locally (linux) at 30,944 B brotli. The adopting fresh render resets its claim state in a try/finally and owns the snapshot root, so a served error no longer leaves stale claim state for the next hydrate and a Portal under a rejected boundary mounts. Correctness; Size-Exception accepted by the maintainer (2026-10-27). Cap at measured + 10 B rounded up to 0.01 KB, never lowered; recorded minified = measured; CI re-bases.
+    limit: "30.96 KB",
+    capMinified: 95147,
     alias
   },
   {

From 1a93303af00489e0305f96ba2e4a24e49fb9574a Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 27 Oct 2026 09:43:04 +0000
Subject: [PATCH 16/16] fix(solid,web): a rejected fragment's fresh render
 renders NoHydration and gates its stylesheets

The adopting fresh render (#4319) runs with sharedConfig.hydrating on but
claims nothing. Two readers took the bare flag for "claiming server DOM":

- NoHydration returned nothing, so its children vanished
  ("a!atail" instead of "anh!atail").
- gateHeadResource skipped the stylesheet reveal gate, so content the
  server never drew revealed before its sheet loaded.

Both now read isHydrating(), the claiming check. 0 B on every size
scenario.

The other bare readers stay: For's eager map, createUniqueId, the store,
memo and signal wrappers and the Loading wrapper spend or adopt ids the
server spent; clientOnly and Portal's tree marker defer through the
hydration-end gate; the lazy lookup reads the module cache; the head
flush and reclaimRegion never run inside the pass or are guarded on
connectivity. New scenarios pin NoHydration, clientOnly, For, a nested
Loading and a stylesheet inside a rejected fragment.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015hPxMkC3jg3Uivh65gvaf2
---
 packages/solid/src/client/hydration.ts        |   5 +-
 packages/web/src/client.ts                    |   6 +-
 .../rejected-fragment-client-only.json        |   5 +
 .../__artifacts__/rejected-fragment-for.json  |   5 +
 .../rejected-fragment-nested-loading.json     |   5 +
 .../rejected-fragment-nohydration.json        |   5 +
 .../rejected-fragment-stylesheet.json         |   5 +
 packages/web/test/harness/scenarios.tsx       | 113 +++++++++++++++++-
 .../hydration/served-error-no-reask.spec.tsx  |  51 +++++++-
 9 files changed, 191 insertions(+), 9 deletions(-)
 create mode 100644 packages/web/test/harness/__artifacts__/rejected-fragment-client-only.json
 create mode 100644 packages/web/test/harness/__artifacts__/rejected-fragment-for.json
 create mode 100644 packages/web/test/harness/__artifacts__/rejected-fragment-nested-loading.json
 create mode 100644 packages/web/test/harness/__artifacts__/rejected-fragment-nohydration.json
 create mode 100644 packages/web/test/harness/__artifacts__/rejected-fragment-stylesheet.json

diff --git a/packages/solid/src/client/hydration.ts b/packages/solid/src/client/hydration.ts
index 04ebfb782..4dc5ddb00 100644
--- a/packages/solid/src/client/hydration.ts
+++ b/packages/solid/src/client/hydration.ts
@@ -3078,7 +3078,10 @@ export function NoHydration(props: { children: SolidElement }): SolidElement {
   const o = createOwner();
   return runWithOwner(o, () => {
     setContext(NoHydrateContext, true);
-    if (sharedConfig.hydrating) return undefined as unknown as SolidElement;
+    // Claiming, not the bare flag: a rejected fragment's fresh render
+    // (adopting by id, claiming nothing) renders the children like any
+    // client render.
+    if (isHydrating()) return undefined as unknown as SolidElement;
     return props.children;
   }) as unknown as SolidElement;
 }
diff --git a/packages/web/src/client.ts b/packages/web/src/client.ts
index 57136d0b1..1e967ff4c 100644
--- a/packages/web/src/client.ts
+++ b/packages/web/src/client.ts
@@ -2234,10 +2234,12 @@ function gateHeadResource(props) {
       // errored) sheet must acquire synchronously — cached sheets add zero
       // wait, adopted server-emitted sheets never stall — and even a
       // settled promise costs a microtask through the async machinery.
-      // Hydrating content is already visible; the server gated its reveal.
+      // Claimed content is already visible; the server gated its reveal. A
+      // fresh render under hydration (a rejected fragment's) gates like any
+      // client render.
       if (
         gateable &&
-        !sharedConfig.hydrating &&
+        !isHydrating() &&
         entry.loadState === "pending" &&
         typeof waitAsset === "function"
       )
diff --git a/packages/web/test/harness/__artifacts__/rejected-fragment-client-only.json b/packages/web/test/harness/__artifacts__/rejected-fragment-client-only.json
new file mode 100644
index 000000000..d32207ef6
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/rejected-fragment-client-only.json
@@ -0,0 +1,5 @@
+{
+  "name": "rejected-fragment-client-only",
+  "shell": "<div _hk=0><!--$--><template id=\"pl-1\"></template><i _hk=10>loading</i><!--pl-1--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"1_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
+  "rest": "<template id=\"1\" e></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"a\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[7]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[6]=new Error(\"server render\"));</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/rejected-fragment-for.json b/packages/web/test/harness/__artifacts__/rejected-fragment-for.json
new file mode 100644
index 000000000..e5f6eed60
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/rejected-fragment-for.json
@@ -0,0 +1,5 @@
+{
+  "name": "rejected-fragment-for",
+  "shell": "<div _hk=0><!--$--><template id=\"pl-1\"></template><i _hk=10>loading</i><!--pl-1--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"1_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
+  "rest": "<template id=\"1\" e></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"a\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[7]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[6]=new Error(\"server render\"));</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/rejected-fragment-nested-loading.json b/packages/web/test/harness/__artifacts__/rejected-fragment-nested-loading.json
new file mode 100644
index 000000000..4eab1b54a
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/rejected-fragment-nested-loading.json
@@ -0,0 +1,5 @@
+{
+  "name": "rejected-fragment-nested-loading",
+  "shell": "<div _hk=1><!--$--><template id=\"pl-2\"></template><i _hk=20>loading</i><!--pl-2--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"0\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"20030_fr\"]=$R[3]=($R[4]=$R[2]()).p;_$HY.r[\"2_fr\"]=$R[5]=($R[6]=$R[2]()).p;_$HY.r[\"2000\"]=$R[7]=($R[8]=$R[2]()).p;</script>",
+  "rest": "<template id=\"2\" e></template><script>($R[9]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[8],\"a\");$df(\"2\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>$R[9]($R[4],!0);($R[11]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[6],$R[10]=new Error(\"server render\"));</script><script>$R[9]($R[1],\"n\");</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/rejected-fragment-nohydration.json b/packages/web/test/harness/__artifacts__/rejected-fragment-nohydration.json
new file mode 100644
index 000000000..89b5235ec
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/rejected-fragment-nohydration.json
@@ -0,0 +1,5 @@
+{
+  "name": "rejected-fragment-nohydration",
+  "shell": "<div _hk=0><!--$--><template id=\"pl-1\"></template><i _hk=10>loading</i><!--pl-1--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"1_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
+  "rest": "<template id=\"1\" e></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"a\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[7]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[6]=new Error(\"server render\"));</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/__artifacts__/rejected-fragment-stylesheet.json b/packages/web/test/harness/__artifacts__/rejected-fragment-stylesheet.json
new file mode 100644
index 000000000..77a9f5f35
--- /dev/null
+++ b/packages/web/test/harness/__artifacts__/rejected-fragment-stylesheet.json
@@ -0,0 +1,5 @@
+{
+  "name": "rejected-fragment-stylesheet",
+  "shell": "<div _hk=0><!--$--><template id=\"pl-1\"></template><i _hk=10>loading</i><!--pl-1--><!--/--><span>tail</span></div><script>(self.$R=self.$R||{})[\"\"]=[];_$HY.r[\"1_fr\"]=$R[0]=($R[1]=($R[2]=() => {\n\tconst resolver = {\n\t\tp: 0,\n\t\ts: 0,\n\t\tf: 0\n\t};\n\tresolver.p = new Promise((resolve, reject) => {\n\t\tresolver.s = resolve;\n\t\tresolver.f = reject;\n\t});\n\treturn resolver;\n})()).p;_$HY.r[\"1000\"]=$R[3]=($R[4]=$R[2]()).p;</script>",
+  "rest": "<template id=\"1\" e></template><script>($R[5]=(resolver, data) => {\n\tresolver.s(data);\n\tresolver.p.s = 1;\n\tresolver.p.v = data;\n})($R[4],\"a\");$df(\"1\");function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!==\"pl-\"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,(_$HY.v=_$HY.v||{})[e]=n.hasAttribute(\"e\")?[...n.content.childNodes]:1,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById(\"pl-\"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue===\"pl-\"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}function $dfe(e,t,k){(t=e.target)&&t.getAttribute&&!t._$dc&&(k=t.getAttribute(\"data-dfc\"))&&(t._$dc=1,$dfc(k))}document.addEventListener(\"load\",$dfe,!0);document.addEventListener(\"error\",$dfe,!0);</script><script>($R[7]=(resolver, data) => {\n\tresolver.f(data);\n\tresolver.p.s = 2;\n\tresolver.p.v = data;\n})($R[1],$R[6]=new Error(\"server render\"));</script>"
+}
\ No newline at end of file
diff --git a/packages/web/test/harness/scenarios.tsx b/packages/web/test/harness/scenarios.tsx
index b88031454..718fd4f80 100644
--- a/packages/web/test/harness/scenarios.tsx
+++ b/packages/web/test/harness/scenarios.tsx
@@ -37,7 +37,8 @@ import {
   For,
   Loading,
   Errored,
-  Repeat
+  Repeat,
+  NoHydration
 } from "solid-js";
 import {
   Portal,
@@ -2189,6 +2190,79 @@ function RejectedPortal() {
     </div>
   );
 }
+function RejectedNoHydration() {
+  return (
+    <div>
+      <Loading fallback={<i>loading</i>}>
+        <ServerRenderThrows>
+          <NoHydration>
+            <b>nh</b>
+          </NoHydration>
+        </ServerRenderThrows>
+      </Loading>
+      <span>tail</span>
+    </div>
+  );
+}
+const RejectedClientOnlyWidget = clientOnly(() => Promise.resolve({ default: () => <u>co</u> }));
+function RejectedClientOnly() {
+  return (
+    <div>
+      <Loading fallback={<i>loading</i>}>
+        <ServerRenderThrows>
+          <RejectedClientOnlyWidget fallback={<s>cf</s>} />
+        </ServerRenderThrows>
+      </Loading>
+      <span>tail</span>
+    </div>
+  );
+}
+function RejectedFor() {
+  return (
+    <div>
+      <Loading fallback={<i>loading</i>}>
+        <ServerRenderThrows>
+          <For each={["x", "y"]}>{v => <b>{v}</b>}</For>
+        </ServerRenderThrows>
+      </Loading>
+      <span>tail</span>
+    </div>
+  );
+}
+function RejectedSheetRoute() {
+  useHead({ tag: "link", props: { rel: "stylesheet", href: "/rejected-sheet.css" } });
+  return <b>css</b>;
+}
+function RejectedStylesheet() {
+  return (
+    <div>
+      <Loading fallback={<i>loading</i>}>
+        <ServerRenderThrows>
+          <RejectedSheetRoute />
+        </ServerRenderThrows>
+      </Loading>
+      <span>tail</span>
+    </div>
+  );
+}
+function RejectedNestedLoading() {
+  const n = createMemo(async () => {
+    await sleep(10);
+    return "n";
+  });
+  return (
+    <div>
+      <Loading fallback={<i>loading</i>}>
+        <ServerRenderThrows>
+          <Loading fallback={<i>inner</i>}>
+            <b>{n()}</b>
+          </Loading>
+        </ServerRenderThrows>
+      </Loading>
+      <span>tail</span>
+    </div>
+  );
+}
 
 // ---------------------------------------------------------------------------
 // #3414: a sync throw the SERVER catches, with a zero-arg fallback thunk
@@ -3587,6 +3661,43 @@ export const scenarios: Scenario[] = [
     expectedText: "a!aportaltail",
     serverText: "loading tail"
   },
+  {
+    name: "rejected-fragment-nohydration",
+    App: RejectedNoHydration,
+    async: true,
+    expectedText: "anh!atail",
+    serverText: "loading tail"
+  },
+  {
+    name: "rejected-fragment-client-only",
+    App: RejectedClientOnly,
+    async: true,
+    expectedText: "aco!atail",
+    serverText: "loading tail"
+  },
+  {
+    name: "rejected-fragment-for",
+    App: RejectedFor,
+    async: true,
+    expectedText: "axy!atail",
+    serverText: "loading tail"
+  },
+  {
+    name: "rejected-fragment-stylesheet",
+    App: RejectedStylesheet,
+    async: true,
+    // The fresh content waits for its sheet, which jsdom never loads here;
+    // served-error-no-reask.spec.tsx dispatches the load.
+    expectedText: "loadingtail",
+    serverText: "loading tail"
+  },
+  {
+    name: "rejected-fragment-nested-loading",
+    App: RejectedNestedLoading,
+    async: true,
+    expectedText: "an!atail",
+    serverText: "loading tail"
+  },
   {
     name: "abandoned-sibling-computes",
     App: AbandonedSibling,
diff --git a/packages/web/test/hydration/served-error-no-reask.spec.tsx b/packages/web/test/hydration/served-error-no-reask.spec.tsx
index bb97e0e70..51dad0def 100644
--- a/packages/web/test/hydration/served-error-no-reask.spec.tsx
+++ b/packages/web/test/hydration/served-error-no-reask.spec.tsx
@@ -22,10 +22,14 @@
  *   reads the server finished (one after an element: the render's ids line
  *   up with the server's) and computes only the abandoned one, which the
  *   server never answered: one ask, its own value, a live graph.
- * - `rejected-fragment-dynamic` / `rejected-fragment-portal`: the fresh
- *   render runs with hydration on but claims nothing, so a `<Dynamic>` tag
- *   and a `<Portal>` in it create their DOM (a `<Dynamic>` used to throw a
- *   hydration mismatch there, a `<Portal>` never mounted).
+ * - `rejected-fragment-dynamic` / `rejected-fragment-portal` /
+ *   `rejected-fragment-nohydration`: the fresh render runs with hydration on
+ *   but claims nothing, so a `<Dynamic>` tag, a `<Portal>` and a
+ *   `<NoHydration>` in it render their DOM (a `<Dynamic>` used to throw a
+ *   hydration mismatch there, a `<Portal>` never mounted, `<NoHydration>`
+ *   rendered nothing). `clientOnly`, `<For>` and a nested `<Loading>` pin
+ *   the same. `rejected-fragment-stylesheet`: its stylesheet gates the
+ *   reveal, as in any client render.
  *
  * Replays the parity harness artifacts (test/server/hydration-harness.spec.tsx).
  */
@@ -231,7 +235,11 @@ describe("a read the server abandoned computes; served reads are adopted", () =>
 describe("element runtimes in a fresh render create, they claim nothing", () => {
   for (const [name, text] of [
     ["rejected-fragment-dynamic", "adyn!atail"],
-    ["rejected-fragment-portal", "a!aportaltail"]
+    ["rejected-fragment-portal", "a!aportaltail"],
+    ["rejected-fragment-nohydration", "anh!atail"],
+    ["rejected-fragment-client-only", "aco!atail"],
+    ["rejected-fragment-for", "axy!atail"],
+    ["rejected-fragment-nested-loading", "an!atail"]
   ] as const)
     for (const mode of ["loaded", "streamed"] as const)
       test(`${name} [${mode}]`, () =>
@@ -256,3 +264,36 @@ describe("element runtimes in a fresh render create, they claim nothing", () =>
           }
         }));
 });
+
+describe("a fresh render's stylesheet gates its reveal, like any client render", () => {
+  const name = "rejected-fragment-stylesheet";
+  const href = "/rejected-sheet.css";
+  for (const mode of ["loaded", "streamed"] as const)
+    test(`[${mode}] the content waits for its sheet`, () =>
+      withPage(name, async (container, rest) => {
+        const { scenario } = load(name);
+        if (mode === "loaded") applyChunk(container, rest, false);
+        start(container, scenario.App);
+        await settle();
+        if (mode === "streamed")
+          for (const piece of pieces(rest)) {
+            applyChunk(container, piece, false);
+            await settle();
+          }
+        await settle();
+        // The server never drew this content, so nothing gated it there: the
+        // fresh render holds the reveal until the sheet loads (it revealed
+        // unstyled content when the gate read the bare hydration flag).
+        const link = document.head.querySelector(`link[href="${href}"]`) as HTMLLinkElement;
+        try {
+          expect(link.getAttribute("rel")).toBe("preload");
+          expect(container.textContent).toBe("loadingtail");
+          link.dispatchEvent(new Event("load"));
+          await settle();
+          expect(link.getAttribute("rel")).toBe("stylesheet");
+          expect(container.textContent).toBe("acss!atail");
+        } finally {
+          link.remove();
+        }
+      }));
+});