@thomas.f/prnext 0.1.17-alpha → 0.1.18-alpha

package/runtime/app-prefetch-constants.mjs

@@ -0,0 +1,4 @@
+// Shared wire limits stay available without loading the optional PPR decoder.
+export const PARTIAL_PREFETCH_TYPE = 'application/x-prnext-ppr+json';
+export const PARTIAL_PREFETCH_BYTES = 768 * 1024;
+export const PARTIAL_PREFETCH_CACHE_BYTES = 2 * 1024 * 1024;

package/runtime/app-prefetch.mjs

@@ -1,8 +1,7 @@
 // Prefetch contains only prerendered segments. Request-dependent holes are
 // resolved by a fresh, authenticated navigation; they never enter this cache.
-export const PARTIAL_PREFETCH_TYPE = 'application/x-prnext-ppr+json';
-export const PARTIAL_PREFETCH_BYTES = 768 * 1024;
-export const PARTIAL_PREFETCH_CACHE_BYTES = 2 * 1024 * 1024;
+import { PARTIAL_PREFETCH_BYTES } from './app-prefetch-constants.mjs';
+export { PARTIAL_PREFETCH_TYPE, PARTIAL_PREFETCH_BYTES, PARTIAL_PREFETCH_CACHE_BYTES } from './app-prefetch-constants.mjs';
 
 export async function readPartialPrefetch(response) {
   const reader = response.body.getReader();

package/runtime/app-render-key.mjs

@@ -0,0 +1,5 @@
+// Local counters can repeat in independent prerender processes. Cached Flight
+// must not give different documents the same error/navigation reset identity.
+export function renderKeyFor(request, id) {
+  return JSON.stringify([new URL(request.originalUrl || request.url || 'http://localhost/').pathname, id]);
+}

package/runtime/app-render.mjs

@@ -1,6 +1,9 @@
+import {reportRequestError,acknowledgeRequestError} from './instrumentation.mjs';
+import {currentTraceparent} from './trace.mjs';
 import React from 'react';
+import { randomUUID, createHmac, randomBytes } from 'node:crypto';
 import diagnostics from '../compat/diagnostics.cjs';
-import { runtimeProfile } from './profile.mjs';
+import { rscResourceLimits } from './profile.mjs';
 import { fontPreloads } from './font-preload.mjs';
 import { advancedRoutingSources } from './app-routing-state.mjs';
 import { addBasePath, removeBasePath } from '../compat/paths.cjs';
@@ -29,6 +32,8 @@ import { isDraftRequest } from '../compat/draft.cjs';
 import { createRscLifecycle } from './rsc-lifecycle.mjs';
 import { trackRequestWork } from './request-work.mjs';
 import { createRscWorkWatchdog } from './rsc-work-watchdog.mjs';
+import {assertHtmlOnlyDocument} from './html-only.mjs';
+import {nodeHtmlReader,useNodeHtml} from './node-html-stream.mjs';
 
 installFetchCache();
 
@@ -38,6 +43,7 @@ const metadata = new WeakMap();
 const artifacts = new WeakMap();
 const edgeManifests = new WeakMap();
 const emptyManifest = Object.freeze({});
+const developmentAuthorizationSecret = randomBytes(32).toString('hex');
 let nextId = 0;
 const pending = new Map();
 const noop = () => {};
@@ -54,7 +60,7 @@ const ssrModuleLoaders = new Map();
 const ssrManifests = new WeakMap();
 const require = createRequire(import.meta.url);
 const flightDecoders = new Map();
-let htmlRuntime, recoveryRuntime, domRuntime;
+let htmlRuntime, recoveryRuntime, domRuntime, staticRuntime;
 async function renderProgressiveAppHtml(options) {
   htmlRuntime ??= await import('./app-stream-html.mjs');
   return htmlRuntime.renderProgressiveAppHtml(options);
@@ -108,7 +114,7 @@ function getWorker(production) {
     execArgv: ['--conditions=react-server'], stdout: true, stderr: true,
     // Production nursery policy; an explicit Node semi-space flag takes
     // precedence. This does not cap the old generation or process RSS.
-    ...(production ? { resourceLimits: { maxYoungGenerationSizeMb: runtimeProfile(process.env, production).youngGenerationMiB } } : {}),
+    resourceLimits:rscResourceLimits(process.env,production),
     env: { ...process.env, NODE_ENV: production ? 'production' : 'development' },
   });
   workers.set(production, current);
@@ -155,7 +161,7 @@ function getWorker(production) {
       request.reject(error);
     }
   }
-  current.on('message', ({ id, type, token, chunk, byteOffset, byteLength, done, body, status, rscError, boundaryIndex, headers, error, staticParams, staticMetadata, navigation }) => {
+  current.on('message', ({ id, type, token, chunk, byteOffset, byteLength, done, body, status, rscError, boundaryIndex, headers, error, staticParams, staticMetadata, navigation, value }) => {
     if (type === 'work-responsive') { workWatchdog.ack(token); return; }
     const request = pending.get(id);
     if (!request || request.worker !== current) return;
@@ -164,6 +170,7 @@ function getWorker(production) {
     if (error?.retireWorker) {
       void lifecycle.terminate(new Error(error.message)).catch(error => console.error('[prnext] RSC worker termination failed:', error));
     }
+    if(type==='instrumentation-error'){if(typeof value==='string'&&value.length<=1024){request.reportedDigests??=new Set();if(request.reportedDigests.size<32)request.reportedDigests.add(value);}return;}
     if (request.cancelled && type !== 'settled') return;
     if (type === 'settled') {
       pending.delete(id); clearTimeout(request.timeout);
@@ -178,7 +185,7 @@ function getWorker(production) {
     }
     if (type === 'start') {
       if (chunk) request.channel.chunk(chunk, byteOffset, byteLength);
-      request.resolve({ body: request.channel.body, status: status || 200, rscError, boundaryIndex, headers });
+      request.resolve({ body: request.channel.body, status: status || 200, rscError, reportedDigests:request.reportedDigests??=new Set(), boundaryIndex, headers });
       if (!done) return;
     }
     if (type === 'chunk') {
@@ -202,6 +209,7 @@ function getWorker(production) {
     if (type === 'end' || done) request.channel.end();
     else if (error) {
       const failure = new Error(error.message);
+      if(error.instrumentationReported===true)failure.instrumentationReported=true;
       if (error.stack) failure.stack = error.stack;
       if (error.digest) failure.digest = error.digest;
       if ([400, 504].includes(error.statusCode)) failure.statusCode = error.statusCode;
@@ -217,7 +225,7 @@ function getWorker(production) {
       request.reject(new Error('Invalid App Router Flight response buffer'));
     } else {
       // ArrayBuffer overload: a view of the transferred allocation, no copy.
-      request.resolve({ body: Buffer.from(body), status: status || 200, rscError, boundaryIndex, headers, staticMetadata, navigation });
+      request.resolve({ body: Buffer.from(body), status: status || 200, rscError, reportedDigests:request.reportedDigests??=new Set(), boundaryIndex, headers, staticMetadata, navigation });
     }
     // Keep only settlement bookkeeping after sending the body. The
     // isolate can still be flushing cache writes after its terminal frame.
@@ -233,6 +241,10 @@ function getWorker(production) {
   current.unref();
   return current;
 }
+export async function prewarmAppRenderer(options){
+  flightDecoder(true);
+  await preloadAppRoutes([],options);
+}
 export async function preloadAppRoutes(files,options){
   const worker=getWorker(true),id=`preload-${++nextId}`;
   worker.ref();
@@ -252,6 +264,12 @@ export async function preloadAppRoutes(files,options){
 // incidental event-loop liveness or terminate unfinished application work.
 export async function drainAppRuntime() {
   while (pending.size) await Promise.all([...pending.values()].map(request => request.settled));
+  if(process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT||process.env.OTEL_EXPORTER_OTLP_ENDPOINT)await Promise.all([...workers.values()].map(worker=>new Promise(resolve=>{
+    const token=randomUUID();let timer;
+    const clean=()=>{clearTimeout(timer);worker.off('message',message);worker.off('exit',clean);resolve();};
+    const message=value=>{if(value.type==='telemetry-flushed'&&value.token===token)clean();};
+    worker.on('message',message);worker.once('exit',clean);timer=setTimeout(clean,3000);worker.postMessage({type:'telemetry-flush',token});
+  })));
   await closeAppRuntime();
 }
 
@@ -278,7 +296,8 @@ function requestDeadline(entry, lifecycle, id, hardTimeoutMs, delayMs) {
   }, delayMs);
 }
 
-export async function renderFlight(request, { softTimeoutMs, hardTimeoutMs, signal, deferFinalizer } = {}) {
+export async function renderFlight(request, { softTimeoutMs, hardTimeoutMs, signal, deferFinalizer, settleBeforeReturn = false } = {}) {
+  if(settleBeforeReturn&&request.stream)throw new Error('Streaming Flight must be consumed before waiting for settlement.');
   softTimeoutMs ??= request.cacheConfig?.maxDuration ? request.cacheConfig.maxDuration * 1000 : 25_000;
   hardTimeoutMs ??= request.cacheConfig?.maxDuration ? request.cacheConfig.maxDuration * 1000 : 28_000;
   const deadline = performance.now() + hardTimeoutMs;
@@ -304,7 +323,11 @@ export async function renderFlight(request, { softTimeoutMs, hardTimeoutMs, sign
     let settle;
     const settled = new Promise(resolve => { settle = resolve; });
     trackRequestWork(settled, signal, { deadline, supervised: true });
-    const entry = { worker: current, resolve, reject, operation: request.operation, lease, settle, settled };
+    // Build callers may close this isolate as soon as their last path returns.
+    // Its terminal Flight frame precedes after()/cache completion; keep that
+    // path outstanding until the worker acknowledges bounded settlement.
+    const resolveResult=settleBeforeReturn?value=>{void settled.then(()=>resolve(value));}:resolve;
+    const entry = { worker: current, resolve:resolveResult, reject, operation: request.operation, lease, settle, settled };
     const timeout = entry.timeout = requestDeadline(entry, lifecycle, id, hardTimeoutMs, Math.max(0, deadline - performance.now()));
     function cancel(reason) {
       if (entry.cancelled) return;
@@ -336,7 +359,7 @@ export async function renderFlight(request, { softTimeoutMs, hardTimeoutMs, sign
     pending.set(id, entry);
     try {
       const wire = { ...request, renderTimeoutMs: Math.min(softTimeoutMs, Math.max(1, deadline - performance.now())) };
-      if (request.action && deferFinalizer) {
+      if (request.cacheConfig?.runtime !== 'edge' && deferFinalizer) {
         wire.waitForResponse = true;
         deferFinalizer(() => { if (pending.has(id)) current.postMessage({ id, type: 'after-response' }); });
       }
@@ -395,15 +418,17 @@ export async function decodeFlight(body, clientModules = {}, distDir, { producti
   return decoder.createFromNodeStream(body instanceof ReadableStream ? Readable.fromWeb(body) : Readable.from([body]), serverConsumerManifest);
 }
 
-export async function renderHtml(tree, router, { timeoutMs = 25_000, formState = null, staticGeneration = false, nonce, strictMode = true } = {}) {
+export async function renderHtml(tree, router, { timeoutMs = 25_000, formState = null, staticGeneration = false, nonce, strictMode = true, htmlOnly = false, reportedDigests } = {}) {
   const abort = new AbortController();
   const timeout = setTimeout(() => abort.abort(appTimeoutError('HTML render', timeoutMs)), timeoutMs);
   let renderError;
   try {
     domRuntime ??= await import('react-dom/server');
-    const stream = await domRuntime.renderToReadableStream(React.createElement(strictMode ? React.StrictMode : React.Fragment, null, React.createElement(AppRouterProvider, { router, nonce }, appContent(tree))), {
+    const element = React.createElement(strictMode ? React.StrictMode : React.Fragment, null, React.createElement(AppRouterProvider, { router, nonce }, appContent(tree)));
+    const renderOptions = {
       nonce,
       signal: abort.signal, onError(error) {
+        if(!abort.signal.aborted){if(reportedDigests?.has(error?.digest))acknowledgeRequestError(error);else reportRequestError(error);}
         if (isDynamicBailout(error)) return error.digest;
         // Suspense can recover client SSR failures by emitting its fallback and
         // retrying in the browser. Static generation must still reject them:
@@ -413,9 +438,15 @@ export async function renderHtml(tree, router, { timeoutMs = 25_000, formState =
         return appErrorDigest(error);
       },
       formState,
-    });
-    const reader = stream.getReader();
+    };
+    let stream;
+    if (htmlOnly) {
+      staticRuntime ??= await import('react-dom/static');
+      stream = (await staticRuntime.prerender(element, renderOptions)).prelude;
+    } else if(!useNodeHtml())stream = await domRuntime.renderToReadableStream(element, renderOptions);
+    const reader = stream ? stream.getReader() : await nodeHtmlReader(element,renderOptions);
     const chunks = [];
+    const decoder = new TextDecoder();
     let length = 0;
     try {
       for (;;) {
@@ -428,12 +459,15 @@ export async function renderHtml(tree, router, { timeoutMs = 25_000, formState =
           await reader.cancel(error);
           throw error;
         }
-        chunks.push(Buffer.from(value));
+        // Decode each owned chunk once instead of copying every byte into
+        // per-chunk Buffers and a second aggregate Buffer before stringifying.
+        chunks.push(decoder.decode(value,{stream:true}));
       }
     } finally { reader.releaseLock(); }
     if (abort.signal.aborted) throw abort.signal.reason;
     if (renderError) throw renderError;
-    return Buffer.concat(chunks, length).toString('utf8');
+    chunks.push(decoder.decode());
+    return chunks.join('');
   } catch (error) {
     if (abort.signal.aborted && abort.signal.reason?.statusCode === 504) throw abort.signal.reason;
     throw error;
@@ -452,9 +486,12 @@ export function completeAppHtml(html, flight, route = {}) {
   }
   const styles = fontPreloads(route.fonts, route.nonce) + (route.css || []).map(href => `<link rel="stylesheet" href="${escapeHtml(href)}">`).join('');
   if (styles) html = beforeClosingTag(html, 'head', styles);
-  const payload = `<script id="__PRNEXT_FLIGHT__" type="application/octet-stream">${flight.toString('base64')}</script>`;
-  const bootstrap = route.client ? `<script type="module"${route.nonce ? ` nonce="${escapeHtml(route.nonce)}"` : ''} src="${escapeHtml(route.client)}"></script>` : '';
-  html = beforeClosingTag(html, 'body', `${payload}${bootstrap}`);
+  if (route.htmlOnly) assertHtmlOnlyDocument(html, route.pattern);
+  else {
+    const payload = `<script id="__PRNEXT_FLIGHT__" type="application/octet-stream">${flight.toString('base64')}</script>`;
+    const bootstrap = route.client ? `<script type="module"${route.nonce ? ` nonce="${escapeHtml(route.nonce)}"` : ''} src="${escapeHtml(route.client)}"></script>` : '';
+    html = beforeClosingTag(html, 'body', `${payload}${bootstrap}`);
+  }
   if (!html.startsWith('<!DOCTYPE html>')) html = `<!DOCTYPE html>${html}`;
   if (Buffer.byteLength(html) > MAX_RESPONSE_BYTES) throw new Error('Response exceeds the 16 MiB PRNext limit');
   return html;
@@ -462,13 +499,15 @@ export function completeAppHtml(html, flight, route = {}) {
 
 const devStaticChecks = new Map();
 
+import { differentialFlight } from './flight-delta.mjs';
 export async function renderAppPage(options) {
   const response = await renderAppPageInner(options);
   if (options.method !== 'POST' && response.headers?.location) response.headers.location = addBasePath(response.headers.location, options.manifest?.config?.basePath || '');
-  return response;
+  return differentialFlight(response, options);
 }
 
 async function renderAppPageInner({ modulePath, route = {}, manifest = {}, distDir = path.dirname(path.dirname(modulePath)), url = 'http://localhost/', originalUrl, params = {}, method = 'GET', headers = {}, routingRequestHeaders, routingResolver, body = '', production = process.env.NODE_ENV === 'production', stream = false, signal, deferFinalizer }) {
+  if (route.htmlOnly) return { status:409, headers:{'content-type':'text/plain; charset=utf-8','cache-control':'private, no-store','x-prnext-document-navigation':'1'}, body:Buffer.from('This HTML-only page requires its prerendered document.') };
   let clientModules = manifest.app?.clientModules || emptyManifest;
   if (route.cacheConfig?.runtime === 'edge') {
     let edge = !manifest.dev && edgeManifests.get(clientModules);
@@ -482,8 +521,8 @@ async function renderAppPageInner({ modulePath, route = {}, manifest = {}, distD
     clientModules = edge;
   }
   const responseHeaders = { 'cache-control': 'private, no-cache, no-store, max-age=0', vary: 'RSC' };
-  const request = { modulePath, routePattern: route.pattern, cacheConfig: route.cacheConfig, css: route.css || [], fonts: route.fonts || [], nonce: scriptNonce(headers), basePath: manifest.config?.basePath || '', trailingSlash: manifest?.config?.trailingSlash || false, skipTrailingSlashRedirect: manifest?.config?.skipTrailingSlashRedirect || false, url, originalUrl, params, method, headers, clientModules, production,
-    distDir, strictMode: manifest.config?.reactStrictMode !== false, cacheComponents: manifest.config?.cacheComponents, cacheLife: manifest.config?.cacheLife, cacheHandlers: manifest.config?.cacheHandlers, cacheHandler: manifest.config?.cacheHandler, cacheMaxMemorySize: manifest.config?.cacheMaxMemorySize, serverActions: manifest.config?.serverActions, previewModeId: manifest.previewModeId, actions: manifest.app?.actions || emptyManifest, actionKey: manifest.app?.actionKey };
+  const request = { modulePath, routePattern: route.pattern, cacheConfig: route.cacheConfig, css: route.css || [], cssScopes: route.cssScopes || [], fonts: route.fonts || [], nonce: scriptNonce(headers), basePath: manifest.config?.basePath || '', trailingSlash: manifest?.config?.trailingSlash || false, skipTrailingSlashRedirect: manifest?.config?.skipTrailingSlashRedirect || false, url, originalUrl, params, method, headers, clientModules, production,
+    distDir, traceparent:currentTraceparent(), instrumentation:manifest.instrumentation, strictMode: manifest.config?.reactStrictMode !== false, cacheComponents: manifest.config?.cacheComponents, navigationCache: manifest.config?.navigationCache, authorizationSecret: production ? manifest.app?.actionKey : developmentAuthorizationSecret, partialPrefetching: manifest.config?.partialPrefetching, cacheLife: manifest.config?.cacheLife, cacheHandlers: manifest.config?.cacheHandlers, cacheHandler: manifest.config?.cacheHandler, cacheMaxMemorySize: manifest.config?.cacheMaxMemorySize, serverActions: manifest.config?.serverActions, previewModeId: manifest.previewModeId, actions: manifest.app?.actions || emptyManifest, actionKey: manifest.app?.actionKey };
   if (route.parallel) {
     request.routingResolver = routingResolver;
     request.skipProxyUrlNormalize = manifest.config?.skipProxyUrlNormalize;
@@ -515,6 +554,26 @@ async function renderAppPageInner({ modulePath, route = {}, manifest = {}, distD
     }
   }
   const header = name => Object.entries(headers).find(([key]) => key.toLowerCase() === name)?.[1];
+  if (request.partialPrefetching && manifest.app?.actionKey) {
+    // Preview identity includes authorization, but exposes no cookie material or
+    // guessable credential hash. A changed login cannot reveal an old preview.
+    responseHeaders['x-prnext-ppr-id'] = 'stage:' + createHmac('sha256', manifest.app.actionKey)
+      .update(JSON.stringify([manifest.cacheId, route.id, originalUrl || url, header('cookie') || '', header('authorization') || ''])).digest('hex');
+  }
+  const prefetchStage = header('x-prnext-prefetch-stage');
+  if (request.partialPrefetching && method === 'GET' && header('rsc') === '1' && header('x-prnext-prefetch') === '1' && ['shell', 'prefetch'].includes(prefetchStage)) {
+    const requirement = route.cacheConfig?.ensureStatic;
+    const staticOnly = ['prefetch', 'navigation'].includes(requirement) || prefetchStage === 'shell' && requirement === 'shell';
+    if (!staticOnly) {
+      const rendered = await renderFlight({ ...request, navigationStage: prefetchStage }, { signal, deferFinalizer });
+      if (rendered.status !== 200 || rendered.navigation || !responseHeaders['x-prnext-ppr-id']) return { status: 204, headers: responseHeaders, body: Buffer.alloc(0) };
+      const value = { version: 1, id: responseHeaders['x-prnext-ppr-id'], flight: rendered.body.toString('base64'), keys: [], unknownParams: false,
+        router: { pathname: new URL(originalUrl || url).pathname, search: new URL(originalUrl || url).search, params, basePath: request.basePath } };
+      const bytes = Buffer.from(JSON.stringify(value));
+      if (bytes.length > PARTIAL_PREFETCH_BYTES) return { status: 204, headers: responseHeaders, body: Buffer.alloc(0) };
+      return { status: 200, headers: { ...responseHeaders, 'content-type': PARTIAL_PREFETCH_TYPE }, body: bytes };
+    }
+  }
   if (method === 'POST') {
     const id = header('next-action');
     if (id && !Object.hasOwn(request.actions, id)) return { status: 404, headers: responseHeaders, body: Buffer.from('Unknown Server Action') };
@@ -526,19 +585,20 @@ async function renderAppPageInner({ modulePath, route = {}, manifest = {}, distD
     request.action = { id, contentType: header('content-type'), body: bytes };
   }
   if (!manifest.dev && request.cacheComponents && (route.ppr || route.pprFallback) && ['GET', 'HEAD'].includes(method) &&
+      !(request.partialPrefetching && header('rsc') === '1' && header('x-prnext-prefetch') !== '1' && !['shell', 'prefetch', 'navigation'].includes(route.cacheConfig?.ensureStatic)) &&
       !request.nonce && !(route.parallel && header('x-prnext-router-state')) && !isDraftRequest(request)) {
     const pathname = staticPath(route.pattern, new URL(url).pathname).path;
     const generic = route.pprGeneric?.find(item => Object.entries(item.params).every(([name, value]) => JSON.stringify(params[name]) === JSON.stringify(value)));
     const filename = (!originalUrl ? route.ppr?.[pathname] : undefined) || generic?.file;
     if (filename || route.pprFallback) {
       const artifact = await partialArtifact({ request, route, manifest, filename, identity: filename === generic?.file ? filename : `${pathname}:${originalUrl ? new URL(originalUrl).pathname : ''}`, signal,
-        regenerate: async build => (await import('./app-static.mjs')).prerenderAppRoute({ modulePath, route, manifest, distDir, production,
+        regenerate: async build => (await import('./app-static.mjs')).prerenderAppRoute({ modulePath, route, manifest, distDir, production, renderMode:'isr',
           path: build?.generic?.path || pathname, originalUrl: build?.generic ? undefined : originalUrl,
           params: build?.generic?.params || params, partialParams: build?.generic?.unknown }),
       });
-      if (!artifact.dynamic) return renderPartialAppPage({ request, route, artifact, responseHeaders, stream, signal, rsc: header('rsc') === '1', prefetch: header('x-prnext-prefetch') === '1', knownPrefetch: header('x-prnext-prefetch-known'),
+      if (!artifact.dynamic) return renderPartialAppPage({ request, route, artifact, responseHeaders, stream, signal, deferFinalizer, rsc: header('rsc') === '1', prefetch: header('x-prnext-prefetch') === '1', knownPrefetch: header('x-prnext-prefetch-known'),
         concrete: artifact.generic ? (continuationSignal => partialArtifact({ request, route, manifest, identity: `concrete:${pathname}:${originalUrl ? new URL(originalUrl).pathname : ''}`, signal: continuationSignal,
-          regenerate: async () => (await import('./app-static.mjs')).prerenderAppRoute({ modulePath, route, manifest, distDir, production, path: pathname, originalUrl, params, seed: artifact }),
+          regenerate: async () => (await import('./app-static.mjs')).prerenderAppRoute({ modulePath, route, manifest, distDir, production, renderMode:'isr', path: pathname, originalUrl, params, seed: artifact }),
         })) : undefined });
     }
   }
@@ -588,7 +648,7 @@ async function renderAppPageInner({ modulePath, route = {}, manifest = {}, distD
   let html, model, recovery = false;
   try {
     model = await decodeFlight(result.body, clientModules, distDir, { production });
-    html = await renderHtml(model.tree, model.router, { timeoutMs: route.cacheConfig?.maxDuration ? route.cacheConfig.maxDuration * 1000 : undefined, formState: model.formState, nonce: request.nonce, strictMode: manifest.config?.reactStrictMode !== false });
+    html = await renderHtml(model.tree, model.router, { timeoutMs: route.cacheConfig?.maxDuration ? route.cacheConfig.maxDuration * 1000 : undefined, formState: model.formState, reportedDigests:result.reportedDigests, nonce: request.nonce, strictMode: manifest.config?.reactStrictMode !== false });
   } catch (error) {
     if (error?.statusCode === 504) throw error;
     const navigation = navigationResponse(error);
@@ -601,14 +661,14 @@ async function renderAppPageInner({ modulePath, route = {}, manifest = {}, distD
     recovery = true;
   }
   const { body: flight, status } = result;
-  html = completeAppHtml(html, flight, { ...route, nonce: request.nonce, ...(recovery ? { css: [], fonts: [] } : {}) });
+  html = completeAppHtml(html, flight, { ...route, css: model?.css ?? route.css, nonce: request.nonce, ...(recovery ? { css: [], fonts: [] } : {}) });
   // A Flight error inside Suspense need not fail the HTML shell. Only shell
   // failure selects 500 for an ordinary GET; action/navigation statuses remain.
   const htmlStatus = result.rscError && status === 500 && ['GET', 'HEAD'].includes(method) ? 200 : status;
   return { status: recovery ? route.parallel && status === 404 ? 404 : 500 : htmlStatus, headers: { ...responseHeaders, 'content-type': 'text/html; charset=utf-8' }, body: Buffer.from(html) };
 }
 
-async function renderPartialAppPage({ request, route, artifact, responseHeaders, stream, signal, rsc, concrete, prefetch, knownPrefetch }) {
+async function renderPartialAppPage({ request, route, artifact, responseHeaders, stream, signal, deferFinalizer, rsc, concrete, prefetch, knownPrefetch }) {
   const keys = [...partialKeyMap(artifact.keyScopes, request.params, removeBasePath(new URL(request.url).pathname, request.basePath))];
   const partialRequest = { ...request, partialFlight: artifact.flight, ...(keys.length ? { partialKeys: keys } : {}) };
   const headers = { ...artifact.headers, ...responseHeaders, 'x-prnext-prerender': artifact.complete ? 'complete' : 'partial', 'content-type': rsc ? 'text/x-component; charset=utf-8' : 'text/html; charset=utf-8' };
@@ -631,7 +691,7 @@ async function renderPartialAppPage({ request, route, artifact, responseHeaders,
       return { status: resolved.status || 200, headers: resolved.headers || {}, body: streaming
         ? new ReadableStream({ start(controller) { controller.enqueue(bytes); controller.close(); } }) : bytes };
     }
-    return renderFlight({ ...partialRequest, partialFlight: resolved.flight || artifact.flight, stream: streaming }, { signal: continuationSignal });
+    return renderFlight({ ...partialRequest, partialFlight: resolved.flight || artifact.flight, stream: streaming }, { signal: continuationSignal, deferFinalizer });
   }
   if (rsc) {
     const result = await continueFlight(signal, stream);

package/runtime/app-routing.mjs

@@ -7,6 +7,7 @@ import { pathToFileURL } from 'node:url';
 import { currentRequest, runRequestContext } from '../compat/headers.cjs';
 import { staticParams } from '../compat/static-generation.cjs';
 import { appRoutePlan } from './app-route-plan.mjs';
+import { navigationAuthorization } from '../compat/navigation-authorization.cjs';
 
 import { matchAppPattern, createAppMatcher, readRouterState } from './app-routing-state.mjs';
 export { matchAppPattern, readRouterState, advancedRoutingSources } from './app-routing-state.mjs';
@@ -51,6 +52,9 @@ function selectedSegments(chain, params) {
 
 /** Parallel slots retain their original Flight children on soft navigation. */
 export function createAdvancedTree(entry, request, searchParams) {
+  function ScopedLayoutSlot(props) {
+    return React.createElement(entry.LayoutSlot, { ...props, authorizationKey: navigationAuthorization(currentRequest(), request.authorizationSecret || request.actionKey, request.navigationCache?.authCookies) });
+  }
   const pathname = removeBasePath(new URL(request.url).pathname, request.basePath || '');
   const matchCurrent = createAppMatcher(pathname);
   const old = readRouterState(request), slots = {}, activeParams = { ...request.params };
@@ -166,7 +170,7 @@ export function createAdvancedTree(entry, request, searchParams) {
     }
   }
   function slot(node, owner, name) {
-    const key = registerKey(`${scope(owner)}::${name}`, owner, `${owner.path}::`, `::${name}`, ['id']);
+    const key = registerKey(`${scope(owner)}::${name}`, owner, `${owner.path}::`, `::${name}`, ['id', 'activityKey', 'authorizationKey']);
     const previous = old?.slots[key];
     let selected = rebuild && previous ? savedBranch(node, previous) : firstCandidate(node);
     if (rebuild && previous && !selected) { invalid = true; return { tree: null, segments: [] }; }
@@ -202,7 +206,10 @@ export function createAdvancedTree(entry, request, searchParams) {
         metadataSelections.set(saved.node.path, saved);
         if (name === 'children' && owner === root) rootPage = saved;
       }
-      return { tree: React.createElement(entry.LayoutSlot, { key, id: key, preserve: true }), segments: null };
+      let tree = React.createElement(ScopedLayoutSlot, { key, id: key, preserve: true, activityKey: previous.branch });
+      const context = request.routingContexts?.get(previous.url);
+      if (context && request.renderRoutingBranch) tree = request.renderRoutingBranch(tree, context);
+      return { tree, segments: null };
     }
     if (!selected) {
       // Find the nearest default whose route prefix contains the destination.
@@ -224,13 +231,16 @@ export function createAdvancedTree(entry, request, searchParams) {
     slots[key] = { branch: selected.node.path + (selected.default ? '#default' : ''), url: selectedURL, source: sourceURL(owner, previous), accessUrl: selected.accessUrl || accessURL(selectedURL, previous) };
     if (name === 'children' && owner === root) rootPage = selected;
     let selectedTree = renderPath(selected.chain, selected, 0, name === 'children' && owner === node);
-    const context = request.routingContexts?.get(selectedURL);
-    if (context && request.renderRoutingBranch) selectedTree = request.renderRoutingBranch(selectedTree, context);
     if(request.instantValidation && name!=='children'){
       const instant=selected.node.config?.page?.instant ?? selected.chain.findLast(item=>item.config?.layout?.instant!==undefined)?.config.layout.instant;
       if(instantEnabled(instant,request.production)) instantTrees.push({path:(owner.path || '/')+' @'+name,tree:selectedTree});
     }
-    return { tree: React.createElement(entry.LayoutSlot, { key, id: key, preserve: false }, selectedTree), segments: selected.default ? [] : selectedSegments(selected.chain.slice(node === owner ? 1 : 0), selected.params) };
+    const retainedLayout = selected.chain.find(item => item !== owner && item.files.layout);
+    const activityKey = retainedLayout ? scope(retainedLayout) : JSON.stringify([slots[key].branch, slots[key].url]);
+    let tree = React.createElement(ScopedLayoutSlot, { key, id: key, preserve: false, activityKey }, selectedTree);
+    const context = request.routingContexts?.get(selectedURL);
+    if (context && request.renderRoutingBranch) tree = request.renderRoutingBranch(tree, context);
+    return { tree, segments: selected.default ? [] : selectedSegments(selected.chain.slice(node === owner ? 1 : 0), selected.params) };
   }
   function renderPath(chain, selection, index, skipOwner) {
     const node = chain[index];
@@ -245,7 +255,7 @@ export function createAdvancedTree(entry, request, searchParams) {
         : React.createElement(Page, { ...props, key: registerKey(`${node.path}:${JSON.stringify(selection.params)}`, node, `${node.path}:`, '', undefined, selection.params) });
     } else children = null;
     if (skipOwner) return children;
-    const childKey = registerKey(`${key}::children`, node, `${node.path}::`, '::children', ['id']);
+    const childKey = registerKey(`${key}::children`, node, `${node.path}::`, '::children', ['id', 'activityKey', 'activityPreserve', 'authorizationKey']);
     const previousChild = old?.slots[childKey];
     const preserveChild = !!previousChild && !rebuild && (interceptOwners.has(node.path) || (selection.scaffold && index === chain.length - 1));
     if (rebuild && previousChild && previousChild.branch !== selection.node.path + (selection.default ? '#default' : '')) {
@@ -263,7 +273,10 @@ export function createAdvancedTree(entry, request, searchParams) {
       const saved = savedBranch(node, previousChild);
       if (saved) metadataSelections.set(saved.node.path, saved);
     }
-    children = React.createElement(entry.LayoutSlot, { key: childKey, id: childKey, preserve: preserveChild }, preserveChild ? null : children);
+    const nextLayout = chain.slice(index + 1).some(child => child.files.layout);
+    const activityKey = nextLayout ? `${chain[index + 1].path}:${JSON.stringify(scopedParams(chain[index + 1]))}` : JSON.stringify([slots[childKey].branch, slots[childKey].url]);
+    const activityPreserve = !!(rebuild && previousChild && previousChild.branch !== selection.node.path + (selection.default ? '#default' : ''));
+    children = React.createElement(ScopedLayoutSlot, { key: childKey, id: childKey, preserve: preserveChild, activityKey, activityPreserve }, preserveChild ? null : children);
     const selected = { children: selection.default ? [] : selectedSegments(chain.slice(index + 1), selection.params) };
     if (preserveChild) selected.children = null;
     const parallel = {};
@@ -279,8 +292,8 @@ export function createAdvancedTree(entry, request, searchParams) {
   }
   function wrap(node, children, parallel, selected, key, params, templateSegments, selectionNode) {
     if (node.files.loading) children = React.createElement(React.Suspense, { fallback: React.createElement(component(node.files.loading, 'loading')) }, children);
-    if (node.files.error) children = React.createElement(entry.ErrorBoundary, { key: registerKey(`error:${key}`, node, `error:${node.path}::`), errorComponent: component(node.files.error, 'error'), resetKey: request.renderKey }, children);
-    if (node.files.notFound || node === root) children = React.createElement(entry.NavigationBoundary, { key: registerKey(`navigation:${key}`, node, `navigation:${node.path}::`), resetKey: request.renderKey,
+    if (node.files.error) children = React.createElement(entry.ErrorBoundary, { key: registerKey(`error:${key}`, node, `error:${node.path}::`, '', ['resetKey']), errorComponent: component(node.files.error, 'error'), resetKey: request.renderKey }, children);
+    if (node.files.notFound || node === root) children = React.createElement(entry.NavigationBoundary, { key: registerKey(`navigation:${key}`, node, `navigation:${node.path}::`, '', ['resetKey']), resetKey: request.renderKey,
       notFound: node.files.notFound ? React.createElement(component(node.files.notFound, 'not-found')) : React.createElement('h1', null, '404: This page could not be found.') }, children);
     if (node.files.template) children = React.createElement(component(node.files.template, 'template'), { key: registerKey(selected.children?.join('/') || key, selectionNode || node, `${node.path}::`, '', undefined, scopedParams(node), templateSegments) }, children);
     if (node.files.layout) {

package/runtime/app-static.mjs

@@ -1,3 +1,4 @@
+import {currentTraceparent} from './trace.mjs';
 import path from 'node:path';
 import { addBasePath, removeBasePath } from '../compat/paths.cjs';
 import { renderFlight, decodeFlight, renderHtml, completeAppHtml } from './app-render.mjs';
@@ -12,12 +13,13 @@ export function requestOptions(options) {
   const canonical = new URL('http://prnext.local');
   canonical.pathname = new URL(options.path || options.url || '/', canonical).pathname;
   return { modulePath: options.modulePath, distDir: options.distDir || path.dirname(path.dirname(options.modulePath)),
-    routePattern: route.pattern, cacheConfig: route.cacheConfig || {}, css: route.css || [], fonts: route.fonts || [], production: options.production ?? true,
+    ...(options.renderMode==='isr'?{runtimeInstrumentation:true,instrumentation:options.manifest?.instrumentation,traceparent:currentTraceparent(),revalidateReason:options.revalidateReason}:{}),
+    routePattern: route.pattern, cacheConfig: route.cacheConfig || {}, css: route.css || [], cssScopes: route.cssScopes || [], fonts: route.fonts || [], production: options.production ?? true,
     url: canonical.href, originalUrl: options.originalUrl ? new URL(new URL(options.originalUrl).pathname, canonical).href : undefined,
     partialParams: options.partialParams, basePath: options.manifest?.config?.basePath || '', trailingSlash: options.manifest?.config?.trailingSlash || false, skipTrailingSlashRedirect: options.manifest?.config?.skipTrailingSlashRedirect || false, params: options.params || {}, method: 'GET', headers: {},
     ...(options.seed ? { partialFlight: options.seed.flight, partialKeys: [...partialKeyMap(options.seed.keyScopes, options.params, removeBasePath(canonical.pathname, options.manifest?.config?.basePath || ''))] } : {}),
     clientModules: options.manifest?.app?.clientModules || {},
-    cacheComponents: options.manifest?.config?.cacheComponents, cacheLife: options.manifest?.config?.cacheLife, cacheHandlers: options.manifest?.config?.cacheHandlers, cacheHandler: options.manifest?.config?.cacheHandler, cacheMaxMemorySize: options.manifest?.config?.cacheMaxMemorySize,
+    cacheComponents: options.manifest?.config?.cacheComponents, navigationCache: options.manifest?.config?.navigationCache, partialPrefetching: options.manifest?.config?.partialPrefetching, cacheLife: options.manifest?.config?.cacheLife, cacheHandlers: options.manifest?.config?.cacheHandlers, cacheHandler: options.manifest?.config?.cacheHandler, cacheMaxMemorySize: options.manifest?.config?.cacheMaxMemorySize,
     actions: options.manifest?.app?.actions || {}, actionKey: options.manifest?.app?.actionKey };
 }
 
@@ -29,11 +31,12 @@ export async function prerenderAppRoute(options) {
   const request = requestOptions(options);
   const mode = request.cacheConfig.dynamic || 'auto';
   if (request.cacheConfig.runtime === 'edge' || mode === 'force-dynamic' || (request.cacheConfig.revalidate === 0 && mode !== 'force-static')) {
+    if (request.cacheConfig.ensureStatic === 'navigation') throw new Error(`Route ${request.routePattern}: ensureStatic='navigation' conflicts with request-time rendering configuration.`);
     return { dynamic: true, reason: request.cacheConfig.runtime === 'edge' ? 'runtime: edge' : mode === 'force-dynamic' ? 'dynamic: force-dynamic' : 'revalidate: 0' };
   }
   try {
-    const partial = request.cacheComponents === true && mode === 'auto';
-    const result = await renderFlight({ ...request, staticGeneration: { mode, partial } });
+    const partial = request.cacheComponents === true && mode === 'auto' && request.cacheConfig.ensureStatic !== 'navigation';
+    const result = await renderFlight({ ...request, staticGeneration: { mode, partial } },{settleBeforeReturn:true});
     return await runRequestContext({ ...request, phase: 'render', staticGeneration: { mode } }, async () => {
       const context = currentRequest();
       try {
@@ -61,21 +64,28 @@ export async function prerenderAppRoute(options) {
             }
             html = completeAppHtml(shell.shell, result.body, { ...options.route, css: [], fonts: [] });
           } else {
-            html = completeAppHtml(await renderHtml(model.tree, model.router, { timeoutMs: options.route?.cacheConfig?.maxDuration ? options.route.cacheConfig.maxDuration * 1000 : undefined, staticGeneration: true, strictMode: options.manifest?.config?.reactStrictMode !== false }), result.body, options.route);
+            html = completeAppHtml(await renderHtml(model.tree, model.router, { timeoutMs: options.route?.cacheConfig?.maxDuration ? options.route.cacheConfig.maxDuration * 1000 : undefined, staticGeneration: true, strictMode: options.manifest?.config?.reactStrictMode !== false, htmlOnly:options.route?.htmlOnly === true }), result.body, { ...options.route, css:model.css ?? options.route?.css });
           }
         }
-        if (staticMetadata(context)?.externalCache) return { dynamic: true, reason: 'External cache handlers require validation on every request' };
-        return { body: html, flight: result.body, ...staticMetadata(context), generatedAt: Date.now(),
+        if (staticMetadata(context)?.externalCache) {
+          if (request.cacheConfig.ensureStatic === 'navigation') throw new Error(`Route ${request.routePattern}: external cache validation prevents guaranteed static navigation output.`);
+          return { dynamic: true, reason: 'External cache handlers require validation on every request' };
+        }
+        return { body: html, ...(options.route?.htmlOnly ? {} : { flight:result.body }), ...staticMetadata(context), generatedAt: Date.now(),
           status: result.status, headers: { ...result.headers, ...(result.headers?.location ? { location: addBasePath(result.headers.location, request.basePath) } : {}), 'content-type': 'text/html; charset=utf-8' } };
       } finally { await flushCacheWork(context); }
     });
   } catch (error) {
-    if (error.code === 'PRNEXT_DYNAMIC_SERVER_USAGE' && mode === 'auto') return { dynamic: true, reason: error.dynamicReason || error.message };
+    if (error.code === 'PRNEXT_DYNAMIC_SERVER_USAGE' && mode === 'auto') {
+      if (request.cacheConfig.ensureStatic === 'navigation') throw new Error(`Route ${request.routePattern}: ensureStatic='navigation' requires static server output; ${error.dynamicReason || error.message}.`, { cause: error });
+      return { dynamic: true, reason: error.dynamicReason || error.message };
+    }
     throw error;
   }
 }
 
 export async function renderAppIsrPage(options) {
+  if (options.route?.htmlOnly) throw new Error(`htmlOnly route ${options.route.pattern} cannot use ISR or request-time regeneration.`);
   const rendered = await prerenderAppRoute(options);
   if (rendered.dynamic) return { status: 200, headers: {}, body: [],
     isr: { dynamic: true, revalidate: 0, htmlLength: 0, dataLength: 0, tags: [], paths: [] } };

package/runtime/app-stream-html.mjs

@@ -1,3 +1,4 @@
+import {reportRequestError,acknowledgeRequestError} from './instrumentation.mjs';
 import { htmlEnvelope } from './html-envelope.mjs';
 import React from 'react';
 import { fontPreloads } from './font-preload.mjs';
@@ -12,55 +13,9 @@ import { addBasePath } from '../compat/paths.cjs';
 import { renderAppRecoveryShell } from './app-recovery.mjs';
 import { partialModel } from './app-partial-model.mjs';
 import { streamSelector } from './stream-select.mjs';
+import {nodeHtmlReader,useNodeHtml} from './node-html-stream.mjs';
 
-// The SSR decoder and HTML bootstrap share each Flight allocation. Unlike
-// ReadableStream.tee(), this tap stops reading when the HTML consumer stalls.
-// Before a document shell exists, at most the overall 16 MiB response limit can
-// accumulate: an async root layout may need the complete model to produce it.
-function flightTap(source) {
-  const reader = source.getReader();
-  const queue = [];
-  let bytes = 0;
-  let done = false;
-  let failure;
-  let outputStarted = false;
-  let wakeData;
-  let wakeSpace;
-  const finish = error => {
-    done = true; failure = error;
-    wakeData?.(); wakeData = undefined;
-    wakeSpace?.(); wakeSpace = undefined;
-  };
-  const cancel = async reason => { finish(reason); await reader.cancel(reason).catch(() => {}); };
-  const body = new ReadableStream({
-    async pull(controller) {
-      try {
-        while (!done && outputStarted && bytes >= 128 * 1024) await new Promise(resolve => { wakeSpace = resolve; });
-        if (done) { if (failure) controller.error(failure); else controller.close(); return; }
-        const next = await reader.read();
-        if (next.done) { finish(); controller.close(); return; }
-        queue.push(next.value); bytes += next.value.byteLength;
-        wakeData?.(); wakeData = undefined;
-        controller.enqueue(next.value);
-      } catch (error) { finish(error); controller.error(error); }
-    },
-    cancel,
-  }, { highWaterMark: 0 });
-  return {
-    body, cancel,
-    startOutput() { outputStarted = true; },
-    async next() {
-      while (!queue.length && !done) await new Promise(resolve => { wakeData = resolve; });
-      if (queue.length) {
-        const value = queue.shift(); bytes -= value.byteLength;
-        wakeSpace?.(); wakeSpace = undefined;
-        return { value, done: false };
-      }
-      if (failure) throw failure;
-      return { done: true };
-    },
-  };
-}
+import {flightTap} from './flight-tap.mjs';
 
 export async function renderProgressiveAppHtml({ result, request, route, responseHeaders, decodeFlight, signal, timeoutMs, partial }) {
   timeoutMs ??= route?.cacheConfig?.maxDuration ? route.cacheConfig.maxDuration * 1000 : 25_000;
@@ -92,6 +47,7 @@ export async function renderProgressiveAppHtml({ result, request, route, respons
       onError(error) {
         if (isDynamicBailout(error)) return error.digest;
         if (combinedSignal.aborted) return error?.digest;
+        if(result.reportedDigests?.has(error?.digest))acknowledgeRequestError(error);else reportRequestError(error);
         const navigation = navigationResponse(error);
         if (navigation) {
           if (committed) control = navigation;
@@ -104,8 +60,9 @@ export async function renderProgressiveAppHtml({ result, request, route, respons
     const element = React.createElement(request.strictMode !== false ? React.StrictMode : React.Fragment, null, React.createElement(AppRouterProvider, { router: resumedModel.router, nonce: request.nonce }, appContent(resumedModel.tree)));
     // React owns and mutates its opaque continuation during resume. Parsed
     // artifacts can be shared, but each HTML request needs its own continuation.
-    const html = partial ? await resume(element, structuredClone(partial.postponed), renderOptions) : await renderToReadableStream(element, renderOptions);
-    reader = html.getReader();
+    reader = !partial&&request.cacheConfig?.runtime!=='edge'&&useNodeHtml()
+      ? await nodeHtmlReader(element,renderOptions)
+      : (partial ? await resume(element, structuredClone(partial.postponed), renderOptions) : await renderToReadableStream(element, renderOptions)).getReader();
     const decoder = new TextDecoder();
     let prefix = partial?.shell || '';
     let htmlDone = false;
@@ -116,13 +73,13 @@ export async function renderProgressiveAppHtml({ result, request, route, respons
       const next = await reader.read();
       if (next.done) { htmlDone = true; prefix += decoder.decode(); break; }
       prefix += decoder.decode(next.value, { stream: true });
-      if (Buffer.byteLength(prefix) > MAX_RESPONSE_BYTES) throw new Error('HTML shell exceeds the 16 MiB PRNext limit');
+      if (Buffer.byteLength(prefix) > MAX_RESPONSE_BYTES) throw Object.assign(new Error('HTML shell exceeds the 16 MiB PRNext limit'),{code:'PRNEXT_RESPONSE_TOO_LARGE'});
     }
     if (renderError) throw renderError;
     if (!/<html(?:\s|>)/i.test(prefix) || !/<body(?:\s|>)/i.test(prefix) || !/<\/head>/i.test(prefix)) {
       throw Object.assign(new Error('App Router root layout must render <html>, <head> and <body> elements'), { code: 'PRNEXT_INVALID_ROOT_LAYOUT' });
     }
-    const styles = fontPreloads(route.fonts, request.nonce) + (route.css || []).map(href => `<link rel="stylesheet" href="${escapeHtml(href)}">`).join('');
+    const styles = fontPreloads(route.fonts, request.nonce) + (model.css ?? route.css ?? []).map(href => `<link rel="stylesheet" href="${escapeHtml(href)}">`).join('');
     if (styles && !partial) prefix = prefix.replace(/<\/head>/i, `${styles}</head>`);
     tap.startOutput();
     committed = true;
@@ -183,7 +140,7 @@ export async function renderProgressiveAppHtml({ result, request, route, respons
     return { status, headers: { ...responseHeaders, ...result.headers, 'content-type': 'text/html; charset=utf-8' }, body, cancel };
   } catch (error) {
     if (!committed && !combinedSignal.aborted && error?.statusCode !== 504 &&
-        error?.code !== 'PRNEXT_INVALID_ROOT_LAYOUT' && !isDynamicBailout(error) && (!navigationResponse(error) || (route.parallel && navigationResponse(error).status === 404))) {
+        error?.code !== 'PRNEXT_INVALID_ROOT_LAYOUT' && error?.code !== 'PRNEXT_RESPONSE_TOO_LARGE' && !isDynamicBailout(error) && (!navigationResponse(error) || (route.parallel && navigationResponse(error).status === 404))) {
       try {
         // Next emits an empty document after a shell failure. The original
         // Flight stream still carries the failing subtree to client boundaries;