diff --git a/bench/module-cost/package.json b/bench/module-cost/package.json
index 96814e0e6e875..62bf806540248 100644
--- a/bench/module-cost/package.json
+++ b/bench/module-cost/package.json
@@ -12,6 +12,6 @@
   "devDependencies": {
     "rimraf": "6.0.1",
     "next": "workspace:*",
-    "playwright": "^1.40.0"
+    "playwright": "1.58.2"
   }
 }
diff --git a/crates/next-api/src/project.rs b/crates/next-api/src/project.rs
index 9d1f2048b5c64..2c18bf4d46e92 100644
--- a/crates/next-api/src/project.rs
+++ b/crates/next-api/src/project.rs
@@ -368,7 +368,7 @@ pub struct ProjectOptions {
     /// The version of Next.js that is running.
     pub next_version: RcStr,
 
-    /// Whether server-side HMR is enabled (--experimental-server-fast-refresh).
+    /// Whether server-side HMR is enabled (disabled with --no-server-fast-refresh).
     pub server_hmr: bool,
 }
 
@@ -960,7 +960,7 @@ pub struct Project {
     /// Whether to enable persistent caching
     is_persistent_caching_enabled: bool,
 
-    /// Whether server-side HMR is enabled (--experimental-server-fast-refresh).
+    /// Whether server-side HMR is enabled (disabled with --no-server-fast-refresh).
     server_hmr: bool,
 }
 
diff --git a/crates/next-core/src/next_import_map.rs b/crates/next-core/src/next_import_map.rs
index 573c374c64fae..8dfb95eb91037 100644
--- a/crates/next-core/src/next_import_map.rs
+++ b/crates/next-core/src/next_import_map.rs
@@ -71,7 +71,16 @@ pub async fn get_next_client_import_map(
     .await?;
 
     match &ty {
-        ClientContextType::Pages { .. } => {}
+        ClientContextType::Pages { .. } => {
+            // Resolve next/error to the ESM entry point so the bundler can
+            // tree-shake the error-boundary dependency chain from Pages
+            // Router bundles that only use the default Error component.
+            insert_exact_alias_or_js(
+                &mut import_map,
+                rcstr!("next/error"),
+                request_to_import_mapping(project_path.clone(), rcstr!("next/dist/api/error")),
+            );
+        }
         ClientContextType::App { app_dir } => {
             // Keep in sync with file:///./../../../packages/next/src/lib/needs-experimental-react.ts
             let taint = *next_config.enable_taint().await?;
@@ -404,6 +413,7 @@ pub async fn get_next_edge_import_map(
             rcstr!("next/app") => rcstr!("next/dist/api/app"),
             rcstr!("next/document") => rcstr!("next/dist/api/document"),
             rcstr!("next/dynamic") => rcstr!("next/dist/api/dynamic"),
+            rcstr!("next/error") => rcstr!("next/dist/api/error"),
             rcstr!("next/form") => rcstr!("next/dist/api/form"),
             rcstr!("next/head") => rcstr!("next/dist/api/head"),
             rcstr!("next/headers") => rcstr!("next/dist/api/headers"),
@@ -953,6 +963,7 @@ async fn apply_vendored_react_aliases_server(
     if react_condition == "server" {
         // This is used in the server runtime to import React Server Components.
         alias.extend(fxindexmap! {
+            rcstr!("next/error") => rcstr!("next/dist/api/error.react-server"),
             rcstr!("next/navigation") => rcstr!("next/dist/api/navigation.react-server"),
             rcstr!("next/link") => rcstr!("next/dist/client/app-dir/link.react-server"),
         });
@@ -983,6 +994,7 @@ async fn rsc_aliases(
     if ty.should_use_react_server_condition() {
         // This is used in the server runtime to import React Server Components.
         alias.extend(fxindexmap! {
+            rcstr!("next/error") => rcstr!("next/dist/api/error.react-server"),
             rcstr!("next/navigation") => rcstr!("next/dist/api/navigation.react-server"),
             rcstr!("next/link") => rcstr!("next/dist/client/app-dir/link.react-server"),
         });
diff --git a/crates/next-core/src/pages_structure.rs b/crates/next-core/src/pages_structure.rs
index 3c05755771fa1..9957f236c8c18 100644
--- a/crates/next-core/src/pages_structure.rs
+++ b/crates/next-core/src/pages_structure.rs
@@ -298,7 +298,7 @@ async fn get_pages_structure_for_root_directory(
         PagesStructureItem::new(
             pages_path.join("_error")?,
             page_extensions,
-            Some(next_package.join("error.js")?),
+            Some(next_package.join("dist/pages/_error.js")?),
             error_router_path.clone(),
             error_router_path,
         )
diff --git a/crates/next-custom-transforms/src/transforms/react_server_components.rs b/crates/next-custom-transforms/src/transforms/react_server_components.rs
index 4ee1c2671612e..91ab3478b4977 100644
--- a/crates/next-custom-transforms/src/transforms/react_server_components.rs
+++ b/crates/next-custom-transforms/src/transforms/react_server_components.rs
@@ -678,6 +678,7 @@ impl ReactServerComponentValidator {
                         "useFormState",
                     ],
                 ),
+                (atom!("next/error").into(), vec!["unstable_catchError"]),
                 (
                     atom!("next/navigation").into(),
                     vec![
diff --git a/crates/next-napi-bindings/src/next_api/project.rs b/crates/next-napi-bindings/src/next_api/project.rs
index 9fd58ba767e41..809bf16ac1ca1 100644
--- a/crates/next-napi-bindings/src/next_api/project.rs
+++ b/crates/next-napi-bindings/src/next_api/project.rs
@@ -212,7 +212,7 @@ pub struct NapiProjectOptions {
     /// The version of Next.js that is running.
     pub next_version: RcStr,
 
-    /// Whether server-side HMR is enabled (--experimental-server-fast-refresh).
+    /// Whether server-side HMR is enabled (disabled with --no-server-fast-refresh).
     pub server_hmr: Option<bool>,
 }
 
diff --git a/crates/next-napi-bindings/src/next_api/utils.rs b/crates/next-napi-bindings/src/next_api/utils.rs
index 75add6798cceb..dd6f47c8b5bef 100644
--- a/crates/next-napi-bindings/src/next_api/utils.rs
+++ b/crates/next-napi-bindings/src/next_api/utils.rs
@@ -98,6 +98,12 @@ pub fn root_task_dispose(
     Ok(())
 }
 
+/// [Peeks] at the [`Issue`] held by the given source and returns it as a [`PlainDiagnostic`].
+/// It does not [consume] any [`Issue`]s held by the source.
+///
+/// [Peeks]: turbo_tasks::CollectiblesSource::peek_collectibles
+/// [`Issue`]: turbopack_core::issue::Issue
+/// [consume]: turbo_tasks::CollectiblesSource::take_collectibles
 pub async fn get_issues<T: Send>(
     source: OperationVc<T>,
     filter: Vc<IssueFilter>,
@@ -107,10 +113,11 @@ pub async fn get_issues<T: Send>(
     ))
 }
 
-/// Reads the [turbopack_core::diagnostics::Diagnostic] held
-/// by the given source and returns it as a
-/// [turbopack_core::diagnostics::PlainDiagnostic]. It does
-/// not consume any Diagnostics held by the source.
+/// [Peeks] at the [`Diagnostic`]s held by the given source and returns it as a [`PlainDiagnostic`].
+/// It does not [consume] any [`Diagnostic`]s held by the source.
+///
+/// [Peeks]: turbo_tasks::CollectiblesSource::peek_collectibles
+/// [consume]: turbo_tasks::CollectiblesSource::take_collectibles
 pub async fn get_diagnostics<T: Send>(
     source: OperationVc<T>,
 ) -> Result<Arc<Vec<ReadRef<PlainDiagnostic>>>> {
diff --git a/crates/next-taskless/src/constants.rs b/crates/next-taskless/src/constants.rs
index 102ad8b317caa..9df8fb2a291e8 100644
--- a/crates/next-taskless/src/constants.rs
+++ b/crates/next-taskless/src/constants.rs
@@ -70,10 +70,13 @@ pub const NODE_EXTERNALS: [&str; 68] = [
     "zlib",
 ];
 
-/// List of node.js internals that are supported by edge runtime.
-/// If anything Node.js builtin module apart from these these imports are
-/// used and user does not provide alias for the polyfill, a runtime error will be thrown.
-/// See https://vercel.com/docs/functions/runtimes/edge-runtime#compatible-node.js-modules
+/// The Node.js built-in modules that are supported by edge runtime.
+///
+/// If any Node.js builtin module apart from these these imports are used and the user does not
+/// provide an alias for it (i.e. a polyfill), a runtime error will be thrown.
+///
+/// See <https://vercel.com/docs/functions/runtimes/edge-runtime#compatible-node.js-modules>
+//
 // SAFETY: This has to be sorted alphabetically since we are doing binary search on it
 pub const EDGE_NODE_EXTERNALS: [&str; 7] = [
     "assert",
diff --git a/lerna.json b/lerna.json
index 2782b547bf6e5..c459ae6782fbc 100644
--- a/lerna.json
+++ b/lerna.json
@@ -15,5 +15,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "16.2.0-canary.100"
+  "version": "16.2.0-canary.101"
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 88a07ea296fad..336f6a24e9c0d 100644
--- a/package.json
+++ b/package.json
@@ -255,8 +255,8 @@
     "octokit": "3.1.0",
     "outdent": "0.8.0",
     "pixrem": "5.0.0",
-    "playwright": "1.48.0",
-    "playwright-chromium": "1.48.0",
+    "playwright": "1.58.2",
+    "playwright-chromium": "1.58.2",
     "postcss": "8.4.31",
     "postcss-nested": "4.2.1",
     "postcss-pseudoelements": "5.0.0",
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index d19d4c4454fe9..8a62eed4e619c 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "keywords": [
     "react",
     "next",
diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
index eadc89fa4e5c0..d104f53e1b8ba 100644
--- a/packages/eslint-config-next/package.json
+++ b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "description": "ESLint configuration used by Next.js.",
   "license": "MIT",
   "repository": {
@@ -12,7 +12,7 @@
     "dist"
   ],
   "dependencies": {
-    "@next/eslint-plugin-next": "16.2.0-canary.100",
+    "@next/eslint-plugin-next": "16.2.0-canary.101",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-import-resolver-typescript": "^3.5.2",
     "eslint-plugin-import": "^2.32.0",
diff --git a/packages/eslint-plugin-internal/package.json b/packages/eslint-plugin-internal/package.json
index 47adb3ce1d9fc..752847d480b84 100644
--- a/packages/eslint-plugin-internal/package.json
+++ b/packages/eslint-plugin-internal/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@next/eslint-plugin-internal",
   "private": true,
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "description": "ESLint plugin for working on Next.js.",
   "exports": {
     ".": "./src/eslint-plugin-internal.js"
diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
index bf120e204cc25..72a86eb161729 100644
--- a/packages/eslint-plugin-next/package.json
+++ b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/font/package.json b/packages/font/package.json
index 01e51898bb234..905088ba35aab 100644
--- a/packages/font/package.json
+++ b/packages/font/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@next/font",
   "private": true,
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"
diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
index 0732fe54ad072..99331e926f2c0 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",
diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
index 3be2bf4fdc8b0..41c6863d78f88 100644
--- a/packages/next-codemod/package.json
+++ b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/packages/next-env/package.json b/packages/next-env/package.json
index 11b62b0d471f4..b768fec592615 100644
--- a/packages/next-env/package.json
+++ b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index 716333f13109b..9642e6ae23829 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-playwright/package.json b/packages/next-playwright/package.json
index d49854095f84c..0f82a72aadfb4 100644
--- a/packages/next-playwright/package.json
+++ b/packages/next-playwright/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/playwright",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-playwright"
@@ -26,6 +26,7 @@
     }
   },
   "devDependencies": {
+    "@playwright/test": "1.58.2",
     "typescript": "5.9.2"
   }
 }
diff --git a/packages/next-playwright/src/index.ts b/packages/next-playwright/src/index.ts
index 9c568ab7438dc..da5bf342892d5 100644
--- a/packages/next-playwright/src/index.ts
+++ b/packages/next-playwright/src/index.ts
@@ -74,11 +74,14 @@ export async function instant<T>(
   // navigation-testing-lock.ts, which acquires the in-memory navigation lock.
   const { hostname } = new URL(resolveURL(page, options))
   await step('Acquire Instant Lock', () =>
-    page
-      .context()
-      .addCookies([
-        { name: INSTANT_COOKIE, value: '[0]', domain: hostname, path: '/' },
-      ])
+    page.context().addCookies([
+      {
+        name: INSTANT_COOKIE,
+        value: JSON.stringify([0, `p${Math.random()}`]),
+        domain: hostname,
+        path: '/',
+      },
+    ])
   )
   try {
     return await fn()
diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
index 1e873d269a85b..07696cf566df2 100644
--- a/packages/next-plugin-storybook/package.json
+++ b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"
diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
index 00fe35514a736..1fd79bdf47357 100644
--- a/packages/next-polyfill-module/package.json
+++ b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",
diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
index 4c511bbd4dc97..073530b7712d3 100644
--- a/packages/next-polyfill-nomodule/package.json
+++ b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",
diff --git a/packages/next-routing/package.json b/packages/next-routing/package.json
index 0876c55f4e4eb..919dbf5d2a130 100644
--- a/packages/next-routing/package.json
+++ b/packages/next-routing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/routing",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-rspack/package.json b/packages/next-rspack/package.json
index 035c41438c984..84a6cf97d1570 100644
--- a/packages/next-rspack/package.json
+++ b/packages/next-rspack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next-rspack",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-rspack"
diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
index 182cba9c2780b..e7cb81f99011e 100644
--- a/packages/next-swc/package.json
+++ b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "private": true,
   "files": [
     "native/"
@@ -16,8 +16,9 @@
     "build-native-wasi": "npx --package=@napi-rs/cli@3.0.0-alpha.45 napi build --platform --target wasm32-wasip1-threads -p next-napi-bindings --cwd ../../ --output-dir packages/next-swc/native --no-default-features",
     "build-wasm": "wasm-pack build ../../crates/wasm --scope=next",
     "cache-build-native": "[ -d native ] && echo $(ls native)",
-    "rust-check-fmt": "cd ../..; cargo fmt -- --check",
     "rust-check-clippy": "cargo clippy --workspace --all-targets -- -D warnings -A deprecated",
+    "rust-check-doc": "RUSTDOCFLAGS='-Zunstable-options --output-format=json' cargo doc --no-deps --workspace",
+    "rust-check-fmt": "cd ../..; cargo fmt -- --check",
     "rust-check-napi": "cargo check -p next-napi-bindings",
     "test-cargo-unit": "cargo nextest run --workspace --exclude next-napi-bindings --exclude turbo-tasks-macros --cargo-profile release-with-assertions-no-lto --no-fail-fast"
   },
diff --git a/packages/next-swc/turbo.jsonc b/packages/next-swc/turbo.jsonc
index 546655503ea78..36fced8ad2368 100644
--- a/packages/next-swc/turbo.jsonc
+++ b/packages/next-swc/turbo.jsonc
@@ -136,9 +136,14 @@
       "outputs": ["native/*.node", "native/index.d.ts"],
     },
     "rust-check": {
-      "dependsOn": ["rust-check-fmt", "rust-check-clippy", "rust-check-napi"],
+      "dependsOn": [
+        "rust-check-clippy",
+        "rust-check-doc",
+        "rust-check-fmt",
+        "rust-check-napi",
+      ],
     },
-    "rust-check-fmt": {
+    "rust-check-clippy": {
       "inputs": [
         "../../.cargo/**",
         "../../crates/**",
@@ -148,9 +153,8 @@
         "../../.github/workflows/build_and_deploy.yml",
         "../../rust-toolchain.toml",
       ],
-      "cache": false,
     },
-    "rust-check-clippy": {
+    "rust-check-doc": {
       "inputs": [
         "../../.cargo/**",
         "../../crates/**",
@@ -161,6 +165,18 @@
         "../../rust-toolchain.toml",
       ],
     },
+    "rust-check-fmt": {
+      "inputs": [
+        "../../.cargo/**",
+        "../../crates/**",
+        "../../turbopack/crates/**",
+        "../../**/Cargo.toml",
+        "../../**/Cargo.lock",
+        "../../.github/workflows/build_and_deploy.yml",
+        "../../rust-toolchain.toml",
+      ],
+      "cache": false,
+    },
     "rust-check-napi": {
       "inputs": [
         "../../.cargo/**",
diff --git a/packages/next/error.d.ts b/packages/next/error.d.ts
index 100590d637d4d..1c621105395a4 100644
--- a/packages/next/error.d.ts
+++ b/packages/next/error.d.ts
@@ -1,3 +1,3 @@
-import Error from './dist/pages/_error'
-export * from './dist/pages/_error'
+import Error from './dist/api/error'
+export * from './dist/api/error'
 export default Error
diff --git a/packages/next/error.js b/packages/next/error.js
index 899cd04662710..63681f93e0b5a 100644
--- a/packages/next/error.js
+++ b/packages/next/error.js
@@ -1 +1,9 @@
 module.exports = require('./dist/pages/_error')
+
+// Keep the catch-error graph lazy so default Error consumers do not load it.
+Object.defineProperty(module.exports, 'unstable_catchError', {
+  enumerable: true,
+  get() {
+    return require('./dist/client/components/catch-error').unstable_catchError
+  },
+})
diff --git a/packages/next/errors.json b/packages/next/errors.json
index 0d5837e008f04..71bf011edbd97 100644
--- a/packages/next/errors.json
+++ b/packages/next/errors.json
@@ -1133,5 +1133,9 @@
   "1132": "Route %s used \\`draftMode()\\` inside \\`generateStaticParams\\`. This is not supported because \\`generateStaticParams\\` runs at build time without an HTTP request. Read more: https://nextjs.org/docs/messages/next-dynamic-api-wrong-context",
   "1133": "createSearchParamsFromClient should not be called inside generateStaticParams.",
   "1134": "Route %s used \\`headers()\\` inside \\`generateStaticParams\\`. This is not supported because \\`generateStaticParams\\` runs at build time without an HTTP request. Read more: https://nextjs.org/docs/messages/next-dynamic-api-wrong-context",
-  "1135": "\"use cache\" cannot be used outside of App Router. Expected a WorkUnitStore."
+  "1135": "\"use cache\" cannot be used outside of App Router. Expected a WorkUnitStore.",
+  "1136": "Page \"%s\" cannot use both \\`export const unstable_dynamicStaleTime\\` and \\`export const unstable_instant\\`.",
+  "1137": "\"%s\" cannot use \\`export const unstable_dynamicStaleTime\\`. This config is only supported in page files, not layouts.",
+  "1138": "`unstable_retry()` can only be used in the App Router. Use `reset()` in the Pages Router.",
+  "1139": "`unstable_catchError` can only be used in Client Components."
 }
diff --git a/packages/next/package.json b/packages/next/package.json
index b40a8bb539f0d..a37c642f87e65 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -97,7 +97,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "16.2.0-canary.100",
+    "@next/env": "16.2.0-canary.101",
     "@swc/helpers": "0.5.15",
     "baseline-browser-mapping": "^2.9.19",
     "caniuse-lite": "^1.0.30001579",
@@ -161,13 +161,13 @@
     "@modelcontextprotocol/sdk": "1.18.1",
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/triples": "1.2.0",
-    "@next/font": "16.2.0-canary.100",
-    "@next/polyfill-module": "16.2.0-canary.100",
-    "@next/polyfill-nomodule": "16.2.0-canary.100",
-    "@next/react-refresh-utils": "16.2.0-canary.100",
-    "@next/swc": "16.2.0-canary.100",
+    "@next/font": "16.2.0-canary.101",
+    "@next/polyfill-module": "16.2.0-canary.101",
+    "@next/polyfill-nomodule": "16.2.0-canary.101",
+    "@next/react-refresh-utils": "16.2.0-canary.101",
+    "@next/swc": "16.2.0-canary.101",
     "@opentelemetry/api": "1.6.0",
-    "@playwright/test": "1.51.1",
+    "@playwright/test": "1.58.2",
     "@rspack/core": "1.6.7",
     "@storybook/addon-a11y": "8.6.0",
     "@storybook/addon-essentials": "8.6.0",
diff --git a/packages/next/src/api/error.react-server.ts b/packages/next/src/api/error.react-server.ts
new file mode 100644
index 0000000000000..333f4671f8420
--- /dev/null
+++ b/packages/next/src/api/error.react-server.ts
@@ -0,0 +1,7 @@
+export function unstable_catchError(): never {
+  throw new Error(
+    '`unstable_catchError` can only be used in Client Components.'
+  )
+}
+
+export type { ErrorInfo } from '../client/components/error-boundary'
diff --git a/packages/next/src/api/error.ts b/packages/next/src/api/error.ts
new file mode 100644
index 0000000000000..acd4f8a763669
--- /dev/null
+++ b/packages/next/src/api/error.ts
@@ -0,0 +1,6 @@
+// Pages Router only
+export { default } from '../pages/_error'
+export * from '../pages/_error'
+
+export { unstable_catchError } from '../client/components/catch-error'
+export type { ErrorInfo } from '../client/components/error-boundary'
diff --git a/packages/next/src/bin/next.ts b/packages/next/src/bin/next.ts
index f21e69ea27581..d08775192b38d 100755
--- a/packages/next/src/bin/next.ts
+++ b/packages/next/src/bin/next.ts
@@ -313,10 +313,7 @@ program
     '--experimental-https-ca, <path>',
     'Path to a HTTPS certificate authority file.'
   )
-  .option(
-    '--experimental-server-fast-refresh',
-    'Enable experimental server-side Fast Refresh.'
-  )
+  .option('--no-server-fast-refresh', 'Disable server-side Fast Refresh')
   .option(
     '--experimental-upload-trace, <traceUrl>',
     'Reports a subset of the debugging trace to a remote HTTP URL. Includes sensitive data.'
diff --git a/packages/next/src/build/analysis/get-page-static-info.ts b/packages/next/src/build/analysis/get-page-static-info.ts
index d86e0e6510d7c..67b1c9387b942 100644
--- a/packages/next/src/build/analysis/get-page-static-info.ts
+++ b/packages/next/src/build/analysis/get-page-static-info.ts
@@ -691,6 +691,23 @@ export async function getAppPageStaticInfo({
     )
   }
 
+  // Prevent unstable_dynamicStaleTime in layouts.
+  if ('unstable_dynamicStaleTime' in config) {
+    const isLayout = /\/layout\.[^/]+$/.test(pageFilePath)
+    if (isLayout) {
+      throw new Error(
+        `"${page}" cannot use \`export const unstable_dynamicStaleTime\`. This config is only supported in page files, not layouts.`
+      )
+    }
+  }
+
+  // Prevent combining unstable_dynamicStaleTime and unstable_instant.
+  if ('unstable_dynamicStaleTime' in config && 'unstable_instant' in config) {
+    throw new Error(
+      `Page "${page}" cannot use both \`export const unstable_dynamicStaleTime\` and \`export const unstable_instant\`.`
+    )
+  }
+
   return {
     type: PAGE_TYPES.APP,
     rsc,
diff --git a/packages/next/src/build/create-compiler-aliases.ts b/packages/next/src/build/create-compiler-aliases.ts
index acb8fc59c5741..a258469fc5f79 100644
--- a/packages/next/src/build/create-compiler-aliases.ts
+++ b/packages/next/src/build/create-compiler-aliases.ts
@@ -202,6 +202,7 @@ export function createServerOnlyClientOnlyAliases(
 
 export function createNextApiEsmAliases() {
   const mapping = {
+    error: 'next/dist/api/error',
     head: 'next/dist/api/head',
     image: 'next/dist/api/image',
     constants: 'next/dist/api/constants',
@@ -237,6 +238,7 @@ export function createAppRouterApiAliases(isServerOnlyLayer: boolean) {
   }
 
   if (isServerOnlyLayer) {
+    mapping['error'] = 'next/dist/api/error.react-server'
     mapping['navigation'] = 'next/dist/api/navigation.react-server'
     mapping['link'] = 'next/dist/client/app-dir/link.react-server'
   }
diff --git a/packages/next/src/build/segment-config/app/app-segment-config.ts b/packages/next/src/build/segment-config/app/app-segment-config.ts
index 84169de8961ee..6f8dde47af09d 100644
--- a/packages/next/src/build/segment-config/app/app-segment-config.ts
+++ b/packages/next/src/build/segment-config/app/app-segment-config.ts
@@ -145,6 +145,13 @@ const AppSegmentConfigSchema = z.object({
    */
   unstable_instant: InstantConfigSchema.optional(),
 
+  /**
+   * The stale time for dynamic responses in seconds.
+   * Controls how long the client-side router cache retains dynamic page data.
+   * Pages only — not allowed in layouts.
+   */
+  unstable_dynamicStaleTime: z.number().int().nonnegative().optional(),
+
   /**
    * The preferred region for the page.
    */
@@ -188,6 +195,11 @@ export function parseAppSegmentConfig(
               message: `Invalid unstable_instant value ${JSON.stringify(ctx.data)} on "${route}", must be an object with \`prefetch: "static"\` or \`prefetch: "runtime"\`, or \`false\`. Read more at https://nextjs.org/docs/messages/invalid-instant-configuration`,
             }
           }
+          case 'unstable_dynamicStaleTime': {
+            return {
+              message: `Invalid unstable_dynamicStaleTime value ${JSON.stringify(ctx.data)} on "${route}", must be a non-negative number`,
+            }
+          }
           default:
         }
       }
@@ -242,6 +254,13 @@ export type AppSegmentConfig = {
    */
   unstable_instant?: Instant
 
+  /**
+   * The stale time for dynamic responses in seconds.
+   * Controls how long the client-side router cache retains dynamic page data.
+   * Pages only — not allowed in layouts.
+   */
+  unstable_dynamicStaleTime?: number
+
   /**
    * The preferred region for the page.
    */
diff --git a/packages/next/src/build/swc/generated-native.d.ts b/packages/next/src/build/swc/generated-native.d.ts
index 4ae6b55464ef8..006e7cbb987c3 100644
--- a/packages/next/src/build/swc/generated-native.d.ts
+++ b/packages/next/src/build/swc/generated-native.d.ts
@@ -256,7 +256,7 @@ export interface NapiProjectOptions {
   isPersistentCachingEnabled: boolean
   /** The version of Next.js that is running. */
   nextVersion: RcStr
-  /** Whether server-side HMR is enabled (--experimental-server-fast-refresh). */
+  /** Whether server-side HMR is enabled (disabled with --no-server-fast-refresh). */
   serverHmr?: boolean
 }
 /** [NapiProjectOptions] with all fields optional. */
diff --git a/packages/next/src/build/webpack/plugins/next-types-plugin/index.ts b/packages/next/src/build/webpack/plugins/next-types-plugin/index.ts
index 437a54038e24b..66a8f15a3aab8 100644
--- a/packages/next/src/build/webpack/plugins/next-types-plugin/index.ts
+++ b/packages/next/src/build/webpack/plugins/next-types-plugin/index.ts
@@ -72,6 +72,7 @@ checkFields<Diff<{
   config?: {}
   generateStaticParams?: Function
   unstable_instant?: InstantConfigForTypeCheckInternal
+  unstable_dynamicStaleTime?: number
   revalidate?: RevalidateRange<TEntry> | false
   dynamic?: 'auto' | 'force-dynamic' | 'error' | 'force-static'
   dynamicParams?: boolean
diff --git a/packages/next/src/cli/next-dev.ts b/packages/next/src/cli/next-dev.ts
index 8178d20c736b6..b268e7af60e8d 100644
--- a/packages/next/src/cli/next-dev.ts
+++ b/packages/next/src/cli/next-dev.ts
@@ -55,7 +55,7 @@ export type NextDevOptions = {
   experimentalUploadTrace?: string
   experimentalNextConfigStripTypes?: boolean
   experimentalCpuProf?: boolean
-  experimentalServerFastRefresh?: boolean
+  serverFastRefresh?: boolean
 }
 
 type PortSource = 'cli' | 'default' | 'env'
@@ -249,7 +249,7 @@ const nextDev = async (
 
   const enabledFeatures = Object.fromEntries(
     Object.entries({
-      experimentalServerFastRefresh: options.experimentalServerFastRefresh,
+      serverFastRefreshDisabled: options.serverFastRefresh === false,
       experimentalCpuProf: options.experimentalCpuProf,
     }).filter(([_, value]) => value)
   )
@@ -269,7 +269,7 @@ const nextDev = async (
     allowRetry,
     isDev: true,
     hostname: host,
-    experimentalServerFastRefresh: options.experimentalServerFastRefresh,
+    serverFastRefresh: options.serverFastRefresh,
   }
 
   const startServerPath = require.resolve('../server/lib/start-server')
diff --git a/packages/next/src/client/components/builtin/global-error.tsx b/packages/next/src/client/components/builtin/global-error.tsx
index 652ccab051748..df806a89f3c3a 100644
--- a/packages/next/src/client/components/builtin/global-error.tsx
+++ b/packages/next/src/client/components/builtin/global-error.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import React from 'react'
-import { HandleISRError } from '../handle-isr-error'
+import { handleISRError } from '../handle-isr-error'
 import { errorStyles, errorThemeCss, WarningIcon } from './error-styles'
 
 export type GlobalErrorComponent = React.ComponentType<{
@@ -18,13 +18,14 @@ function DefaultGlobalError({ error }: { error: any }) {
     ? 'A server error occurred. Reload to try again.'
     : 'Reload to try again, or go back.'
 
+  handleISRError({ error })
+
   return (
     <html id="__next_error__">
       <head>
         <style dangerouslySetInnerHTML={{ __html: errorThemeCss }} />
       </head>
       <body>
-        <HandleISRError error={error} />
         <div style={errorStyles.container}>
           <div style={errorStyles.card}>
             <WarningIcon />
diff --git a/packages/next/src/client/components/catch-error.tsx b/packages/next/src/client/components/catch-error.tsx
new file mode 100644
index 0000000000000..a4e150fecdaa7
--- /dev/null
+++ b/packages/next/src/client/components/catch-error.tsx
@@ -0,0 +1,221 @@
+'use client'
+
+import type { ErrorInfo } from './error-boundary'
+import type { AppRouterInstance } from '../../shared/lib/app-router-context.shared-runtime'
+
+import React, { startTransition, useContext } from 'react'
+
+import { useUntrackedPathname } from './navigation-untracked'
+import { isNextRouterError } from './is-next-router-error'
+import { handleHardNavError } from './nav-failure-handler'
+import { handleISRError } from './handle-isr-error'
+import { isBot } from '../../shared/lib/router/utils/is-bot'
+import { AppRouterContext } from '../../shared/lib/app-router-context.shared-runtime'
+import { RouterContext as PagesRouterContext } from '../../shared/lib/router-context.shared-runtime'
+
+const isBotUserAgent =
+  typeof window !== 'undefined' && isBot(window.navigator.userAgent)
+
+type UserProps = Record<string, any>
+
+type CatchErrorProps<P extends UserProps> = {
+  pathname: string | null
+  isPagesRouter: boolean
+  fallback: React.ComponentType<{
+    props: Omit<P, 'children'>
+    errorInfo: ErrorInfo
+  }>
+  props: Omit<P, 'children'>
+  children: React.ReactNode
+}
+
+type CatchErrorState = {
+  error: Error | null
+  previousPathname: string | null
+}
+
+// This is forked from error-boundary.
+// TODO: Extend it instead of forking to easily sync the behavior?
+class CatchError<P extends UserProps> extends React.Component<
+  CatchErrorProps<P>,
+  { error: Error | null; previousPathname: string | null }
+> {
+  declare context: AppRouterInstance | null
+  static contextType = AppRouterContext
+  // `unstable_catchError()` is parsed as an HOC-style name and displays as
+  // a label (<name> [unstable_catchError]) in DevTools.
+  static displayName = 'unstable_catchError(Next.CatchError)'
+
+  constructor(props: CatchErrorProps<P>) {
+    super(props)
+    this.state = {
+      error: null,
+      previousPathname: this.props.pathname,
+    }
+  }
+
+  static getDerivedStateFromError(error: Error) {
+    if (isNextRouterError(error)) {
+      // Re-throw if an expected internal Next.js router error occurs
+      // this means it should be handled by a different boundary (such as a NotFound boundary in a parent segment)
+      throw error
+    }
+
+    return { error }
+  }
+
+  static getDerivedStateFromProps(
+    props: CatchErrorProps<UserProps>,
+    state: CatchErrorState
+  ): CatchErrorState | null {
+    const { error } = state
+
+    // if we encounter an error while
+    // a navigation is pending we shouldn't render
+    // the error boundary and instead should fallback
+    // to a hard navigation to attempt recovering
+    if (process.env.__NEXT_APP_NAV_FAIL_HANDLING) {
+      if (error && handleHardNavError(error)) {
+        // clear error so we don't render anything
+        return {
+          error: null,
+          previousPathname: props.pathname,
+        }
+      }
+    }
+
+    /**
+     * Handles reset of the error boundary when a navigation happens.
+     * Ensures the error boundary does not stay enabled when navigating to a new page.
+     * Approach of setState in render is safe as it checks the previous pathname and then overrides
+     * it as outlined in https://react.dev/reference/react/useState#storing-information-from-previous-renders
+     */
+    if (props.pathname !== state.previousPathname && state.error) {
+      return {
+        error: null,
+        previousPathname: props.pathname,
+      }
+    }
+    return {
+      error: state.error,
+      previousPathname: props.pathname,
+    }
+  }
+
+  reset = () => {
+    this.setState({ error: null })
+  }
+
+  unstable_retry = () => {
+    if (this.props.isPagesRouter) {
+      throw new Error(
+        '`unstable_retry()` can only be used in the App Router. Use `reset()` in the Pages Router.'
+      )
+    }
+
+    startTransition(() => {
+      this.context?.refresh()
+      this.reset()
+    })
+  }
+
+  // Explicit type is needed to avoid the generated `.d.ts` having a wide return type that could be specific to the `@types/react` version.
+  render(): React.ReactNode {
+    //When it's bot request, segment level error boundary will keep rendering the children,
+    // the final error will be caught by the root error boundary and determine wether need to apply graceful degrade.
+    if (this.state.error && !isBotUserAgent) {
+      handleISRError({ error: this.state.error })
+
+      return (
+        <this.props.fallback
+          props={this.props.props}
+          errorInfo={{
+            error: this.state.error,
+            reset: this.reset,
+            unstable_retry: this.unstable_retry,
+          }}
+        />
+      )
+    }
+
+    return this.props.children
+  }
+}
+
+/**
+ * `unstable_catchError` is a counterpart to `error.js` that provides a granular
+ * control of error boundaries at the component level. It provides the `ErrorInfo`
+ * including `unstable_retry` for error recovery.
+ *
+ * Pass a Component-like fallback function that receives the props and `ErrorInfo`.
+ * The props omit `children` intentionally as it is the "fallback" of the error and
+ * is not expected to render the children.
+ *
+ * This API is must be used inside the client module graph and cannot be imported
+ * in `server-only` environments like proxy, instrumentation, etc.
+ *
+ * @example
+ * ```tsx
+ * // CustomErrorBoundary.tsx
+ * 'use client'
+ * import { unstable_catchError, type ErrorInfo } from 'next/error'
+ *
+ * function CustomErrorBoundary(props: Props, errorInfo: ErrorInfo) {
+ *   return ...
+ * }
+ *
+ * export default unstable_catchError(CustomErrorBoundary)
+ *
+ * // page.tsx
+ * 'use client'
+ * import CustomErrorBoundary from './CustomErrorBoundary'
+ *
+ * export default function Page() {
+ *   return (
+ *     <CustomErrorBoundary>
+ *       ...
+ *     </CustomErrorBoundary>
+ *   )
+ * }
+ * ```
+ */
+export function unstable_catchError<P extends UserProps>(
+  fallback: (
+    // children is omitted by design as the error fallback component is the "fallback"
+    // for the children when an error occurs.
+    props: Omit<P, 'children'>,
+    errorInfo: ErrorInfo
+  ) => React.ReactNode
+): React.ComponentType<P> {
+  // Create Fallback component from the closure of `unstable_catchError`.
+  const Fallback = ({
+    props,
+    errorInfo,
+  }: {
+    props: Omit<P, 'children'>
+    errorInfo: ErrorInfo
+  }) => fallback(props, errorInfo)
+
+  // Rename to match the user component name for DevTools.
+  Fallback.displayName = fallback.name || 'CatchErrorFallback'
+
+  return ({ children, ...props }: P) => {
+    // When we're rendering the missing params shell, this will return null. This
+    // is because we won't be rendering any not found boundaries or error
+    // boundaries for the missing params shell. When this runs on the client
+    // (where these errors can occur), we will get the correct pathname.
+    const pathname = useUntrackedPathname()
+    const isPagesRouter = useContext(PagesRouterContext) !== null
+
+    return (
+      <CatchError
+        pathname={pathname}
+        isPagesRouter={isPagesRouter}
+        fallback={Fallback}
+        props={props}
+      >
+        {children}
+      </CatchError>
+    )
+  }
+}
diff --git a/packages/next/src/client/components/error-boundary.tsx b/packages/next/src/client/components/error-boundary.tsx
index ebe8a212236c5..86628315e9405 100644
--- a/packages/next/src/client/components/error-boundary.tsx
+++ b/packages/next/src/client/components/error-boundary.tsx
@@ -4,7 +4,7 @@ import React, { startTransition, type JSX } from 'react'
 import { useUntrackedPathname } from './navigation-untracked'
 import { isNextRouterError } from './is-next-router-error'
 import { handleHardNavError } from './nav-failure-handler'
-import { HandleISRError } from './handle-isr-error'
+import { handleISRError } from './handle-isr-error'
 import { isBot } from '../../shared/lib/router/utils/is-bot'
 import {
   AppRouterContext,
@@ -14,11 +14,13 @@ import {
 const isBotUserAgent =
   typeof window !== 'undefined' && isBot(window.navigator.userAgent)
 
-export type ErrorComponent = React.ComponentType<{
+export type ErrorInfo = {
   error: Error
   reset: () => void
   unstable_retry: () => void
-}>
+}
+
+export type ErrorComponent = React.ComponentType<ErrorInfo>
 
 export interface ErrorBoundaryProps {
   children?: React.ReactNode
@@ -116,9 +118,10 @@ export class ErrorBoundaryHandler extends React.Component<
     //When it's bot request, segment level error boundary will keep rendering the children,
     // the final error will be caught by the root error boundary and determine wether need to apply graceful degrade.
     if (this.state.error && !isBotUserAgent) {
+      handleISRError({ error: this.state.error })
+
       return (
         <>
-          <HandleISRError error={this.state.error} />
           {this.props.errorStyles}
           {this.props.errorScripts}
           <this.props.errorComponent
@@ -156,6 +159,7 @@ export function ErrorBoundary({
   // boundaries for the missing params shell. When this runs on the client
   // (where these errors can occur), we will get the correct pathname.
   const pathname = useUntrackedPathname()
+
   if (errorComponent) {
     return (
       <ErrorBoundaryHandler
diff --git a/packages/next/src/client/components/handle-isr-error.tsx b/packages/next/src/client/components/handle-isr-error.tsx
index 7f9cf86a24d27..d92279e9140d4 100644
--- a/packages/next/src/client/components/handle-isr-error.tsx
+++ b/packages/next/src/client/components/handle-isr-error.tsx
@@ -8,7 +8,7 @@ const workAsyncStorage =
 // if we are revalidating we want to re-throw the error so the
 // function crashes so we can maintain our previous cache
 // instead of caching the error page
-export function HandleISRError({ error }: { error: any }) {
+export function handleISRError({ error }: { error: any }) {
   if (workAsyncStorage) {
     const store = workAsyncStorage.getStore()
     if (store?.isStaticGeneration) {
@@ -18,6 +18,4 @@ export function HandleISRError({ error }: { error: any }) {
       throw error
     }
   }
-
-  return null
 }
diff --git a/packages/next/src/client/components/router-reducer/create-initial-router-state.ts b/packages/next/src/client/components/router-reducer/create-initial-router-state.ts
index 93ff5e97ecca7..ffd29066412e0 100644
--- a/packages/next/src/client/components/router-reducer/create-initial-router-state.ts
+++ b/packages/next/src/client/components/router-reducer/create-initial-router-state.ts
@@ -14,6 +14,10 @@ import {
   writeStaticStageResponseIntoCache,
 } from '../segment-cache/cache'
 import { FetchStrategy } from '../segment-cache/types'
+import {
+  UnknownDynamicStaleTime,
+  computeDynamicStaleAt,
+} from '../segment-cache/bfcache'
 import { decodeStaticStage } from './fetch-server-response'
 import { discoverKnownRoute } from '../segment-cache/optimistic-routes'
 import type { NormalizedSearch } from '../segment-cache/cache-key'
@@ -41,6 +45,7 @@ export function createInitialRouterState({
     l: initialStaticStageByteLength,
     h: initialHeadVaryParams,
     p: initialRuntimePrefetchStream,
+    d: initialDynamicStaleTimeSeconds,
   } = initialRSCPayload
 
   // When initialized on the server, the canonical URL is provided as an array of parts.
@@ -87,7 +92,11 @@ export function createInitialRouterState({
     navigatedAt,
     initialRouteTree,
     initialSeedData,
-    initialHead
+    initialHead,
+    computeDynamicStaleAt(
+      navigatedAt,
+      initialDynamicStaleTimeSeconds ?? UnknownDynamicStaleTime
+    )
   )
 
   // The following only applies in the browser (location !== null) since neither
diff --git a/packages/next/src/client/components/router-reducer/fetch-server-response.ts b/packages/next/src/client/components/router-reducer/fetch-server-response.ts
index 99dc181e94965..411cc61c5c3d7 100644
--- a/packages/next/src/client/components/router-reducer/fetch-server-response.ts
+++ b/packages/next/src/client/components/router-reducer/fetch-server-response.ts
@@ -25,7 +25,6 @@ import {
   RSC_CONTENT_TYPE_HEADER,
   NEXT_HMR_REFRESH_HEADER,
   NEXT_DID_POSTPONE_HEADER,
-  NEXT_ROUTER_STALE_TIME_HEADER,
   NEXT_HTML_REQUEST_ID_HEADER,
   NEXT_REQUEST_ID_HEADER,
 } from '../app-router-headers'
@@ -43,6 +42,7 @@ import { getDeploymentId } from '../../../shared/lib/deployment-id'
 import { getNavigationBuildId } from '../../navigation-build-id'
 import { NEXT_NAV_DEPLOYMENT_ID_HEADER } from '../../../lib/constants'
 import { stripIsPartialByte } from '../segment-cache/cache'
+import { UnknownDynamicStaleTime } from '../segment-cache/bfcache'
 
 const createFromReadableStream =
   createFromReadableStreamBrowser as (typeof import('react-server-dom-webpack/client.browser'))['createFromReadableStream']
@@ -81,7 +81,7 @@ type SpaFetchServerResponseResult = {
   couldBeIntercepted: boolean
   supportsPerSegmentPrefetching: boolean
   postponed: boolean
-  staleTime: number
+  dynamicStaleTime: number
   staticStageData: StaticStageData | null
   runtimePrefetchStream: ReadableStream<Uint8Array> | null
   responseHeaders: Headers
@@ -196,13 +196,6 @@ export async function fetchServerResponse(
     const contentType = res.headers.get('content-type') || ''
     const interception = !!res.headers.get('vary')?.includes(NEXT_URL)
     const postponed = !!res.headers.get(NEXT_DID_POSTPONE_HEADER)
-    const staleTimeHeaderSeconds = res.headers.get(
-      NEXT_ROUTER_STALE_TIME_HEADER
-    )
-    const staleTime =
-      staleTimeHeaderSeconds !== null
-        ? parseInt(staleTimeHeaderSeconds, 10) * 1000
-        : -1
     let isFlightResponse = contentType.startsWith(RSC_CONTENT_TYPE_HEADER)
 
     if (process.env.NODE_ENV === 'production') {
@@ -289,7 +282,11 @@ export async function fetchServerResponse(
       couldBeIntercepted: interception,
       supportsPerSegmentPrefetching: flightResponse.S,
       postponed,
-      staleTime,
+      // The dynamicStaleTime is only present in the response body when
+      // a page exports unstable_dynamicStaleTime and this is a dynamic render.
+      // When absent (UnknownDynamicStaleTime), the client falls back to the
+      // global DYNAMIC_STALETIME_MS. The value is in seconds.
+      dynamicStaleTime: flightResponse.d ?? UnknownDynamicStaleTime,
       staticStageData,
       runtimePrefetchStream: flightResponse.p ?? null,
       responseHeaders: res.headers,
diff --git a/packages/next/src/client/components/router-reducer/ppr-navigations.ts b/packages/next/src/client/components/router-reducer/ppr-navigations.ts
index 25c58e670d2cf..c58235bee6167 100644
--- a/packages/next/src/client/components/router-reducer/ppr-navigations.ts
+++ b/packages/next/src/client/components/router-reducer/ppr-navigations.ts
@@ -53,8 +53,9 @@ import {
   readFromBFCacheDuringRegularNavigation,
   writeToBFCache,
   writeHeadToBFCache,
+  updateBFCacheEntryStaleAt,
+  computeDynamicStaleAt,
 } from '../segment-cache/bfcache'
-import { DYNAMIC_STALETIME_MS } from './reducers/navigate-reducer'
 
 // This is yet another tree type that is used to track pending promises that
 // need to be fulfilled once the dynamic data is received. The terminal nodes of
@@ -132,7 +133,8 @@ export function createInitialCacheNodeForHydration(
   navigatedAt: number,
   initialTree: RouteTree,
   seedData: CacheNodeSeedData | null,
-  seedHead: HeadData
+  seedHead: HeadData,
+  seedDynamicStaleAt: number
 ): NavigationTask {
   // Create the initial cache node tree, using the data embedded into the
   // HTML document.
@@ -147,6 +149,7 @@ export function createInitialCacheNodeForHydration(
     FreshnessPolicy.Hydration,
     seedData,
     seedHead,
+    seedDynamicStaleAt,
     false,
     accumulation
   )
@@ -193,6 +196,7 @@ export function startPPRNavigation(
   freshness: FreshnessPolicy,
   seedData: CacheNodeSeedData | null,
   seedHead: HeadData | null,
+  seedDynamicStaleAt: number,
   isSamePageNavigation: boolean,
   accumulation: NavigationRequestAccumulation
 ): NavigationTask | null {
@@ -214,6 +218,7 @@ export function startPPRNavigation(
     didFindRootLayout,
     seedData,
     seedHead,
+    seedDynamicStaleAt,
     isSamePageNavigation,
     parentNeedsDynamicRequest,
     oldRootRefreshState,
@@ -233,6 +238,7 @@ function updateCacheNodeOnNavigation(
   didFindRootLayout: boolean,
   seedData: CacheNodeSeedData | null,
   seedHead: HeadData | null,
+  seedDynamicStaleAt: number,
   isSamePageNavigation: boolean,
   parentNeedsDynamicRequest: boolean,
   oldRootRefreshState: RefreshState,
@@ -290,6 +296,7 @@ function updateCacheNodeOnNavigation(
       freshness,
       seedData,
       seedHead,
+      seedDynamicStaleAt,
       parentNeedsDynamicRequest,
       accumulation
     )
@@ -356,7 +363,8 @@ function updateCacheNodeOnNavigation(
       seedRsc,
       newMetadataVaryPath,
       seedHead,
-      freshness
+      freshness,
+      seedDynamicStaleAt
     )
     newCacheNode = result.cacheNode
     needsDynamicRequest = result.needsDynamicRequest
@@ -486,6 +494,7 @@ function updateCacheNodeOnNavigation(
         childDidFindRootLayout,
         seedDataChild ?? null,
         seedHeadChild,
+        seedDynamicStaleAt,
         isSamePageNavigation,
         parentNeedsDynamicRequest || needsDynamicRequest,
         oldRootRefreshState,
@@ -600,6 +609,7 @@ function createCacheNodeOnNavigation(
   freshness: FreshnessPolicy,
   seedData: CacheNodeSeedData | null,
   seedHead: HeadData | null,
+  seedDynamicStaleAt: number,
   parentNeedsDynamicRequest: boolean,
   accumulation: NavigationRequestAccumulation
 ): NavigationTask {
@@ -625,7 +635,8 @@ function createCacheNodeOnNavigation(
     seedRsc,
     newMetadataVaryPath,
     seedHead,
-    freshness
+    freshness,
+    seedDynamicStaleAt
   )
   const newCacheNode = result.cacheNode
   const needsDynamicRequest = result.needsDynamicRequest
@@ -661,6 +672,7 @@ function createCacheNodeOnNavigation(
         freshness,
         seedDataChild ?? null,
         seedHead,
+        seedDynamicStaleAt,
         parentNeedsDynamicRequest || needsDynamicRequest,
         accumulation
       )
@@ -882,7 +894,8 @@ function createCacheNodeForSegment(
   seedRsc: React.ReactNode | null,
   metadataVaryPath: PageVaryPath | null,
   seedHead: HeadData | null,
-  freshness: FreshnessPolicy
+  freshness: FreshnessPolicy,
+  dynamicStaleAt: number
 ): { cacheNode: CacheNode; needsDynamicRequest: boolean } {
   // Construct a new CacheNode using data from the BFCache, the client's
   // Segment Cache, or seeded from a server response.
@@ -905,29 +918,23 @@ function createCacheNodeForSegment(
   // the BFCache.
   switch (freshness) {
     case FreshnessPolicy.Default: {
-      // When experimental.staleTimes.dynamic config is set, we read from the
-      // BFCache even during regular navigations. (This is not a recommended API
-      // with Cache Components, but it's supported for backwards compatibility.
-      // Use cacheLife instead.)
-
-      // This outer check isn't semantically necessary; even if the configured
-      // stale time is 0, the bfcache will return null, because any entry would
-      // have immediately expired. Just an optimization.
-      if (DYNAMIC_STALETIME_MS > 0) {
-        const bfcacheEntry = readFromBFCacheDuringRegularNavigation(
-          now,
-          tree.varyPath
-        )
-        if (bfcacheEntry !== null) {
-          return {
-            cacheNode: createCacheNode(
-              bfcacheEntry.rsc,
-              bfcacheEntry.prefetchRsc,
-              bfcacheEntry.head,
-              bfcacheEntry.prefetchHead
-            ),
-            needsDynamicRequest: false,
-          }
+      // Check BFCache during regular navigations. The entry's staleAt
+      // determines whether it's still fresh. This is used when
+      // staleTimes.dynamic is configured globally or when a page exports
+      // unstable_dynamicStaleTime for per-page control.
+      const bfcacheEntry = readFromBFCacheDuringRegularNavigation(
+        now,
+        tree.varyPath
+      )
+      if (bfcacheEntry !== null) {
+        return {
+          cacheNode: createCacheNode(
+            bfcacheEntry.rsc,
+            bfcacheEntry.prefetchRsc,
+            bfcacheEntry.head,
+            bfcacheEntry.prefetchHead
+          ),
+          needsDynamicRequest: false,
         }
       }
       break
@@ -953,9 +960,23 @@ function createCacheNodeForSegment(
       const prefetchRsc = null
       const head = isPage ? seedHead : null
       const prefetchHead = null
-      writeToBFCache(now, tree.varyPath, rsc, prefetchRsc, head, prefetchHead)
+      writeToBFCache(
+        now,
+        tree.varyPath,
+        rsc,
+        prefetchRsc,
+        head,
+        prefetchHead,
+        dynamicStaleAt
+      )
       if (isPage && metadataVaryPath !== null) {
-        writeHeadToBFCache(now, metadataVaryPath, head, prefetchHead)
+        writeHeadToBFCache(
+          now,
+          metadataVaryPath,
+          head,
+          prefetchHead,
+          dynamicStaleAt
+        )
       }
       return {
         cacheNode: createCacheNode(rsc, prefetchRsc, head, prefetchHead),
@@ -1180,9 +1201,23 @@ function createCacheNodeForSegment(
   // Skip BFCache writes for optimistic navigations since they are transient
   // and will be replaced by the canonical navigation.
   if (freshness !== FreshnessPolicy.Gesture) {
-    writeToBFCache(now, tree.varyPath, rsc, prefetchRsc, head, prefetchHead)
+    writeToBFCache(
+      now,
+      tree.varyPath,
+      rsc,
+      prefetchRsc,
+      head,
+      prefetchHead,
+      dynamicStaleAt
+    )
     if (isPage && metadataVaryPath !== null) {
-      writeHeadToBFCache(now, metadataVaryPath, head, prefetchHead)
+      writeHeadToBFCache(
+        now,
+        metadataVaryPath,
+        head,
+        prefetchHead,
+        dynamicStaleAt
+      )
     }
   }
 
@@ -1583,10 +1618,14 @@ async function fetchMissingDynamicData(
         seed: null,
       }
     }
+    const now = Date.now()
+
     const seed = convertServerPatchToFullTree(
+      now,
       task.route,
       result.flightData,
-      result.renderedSearch
+      result.renderedSearch,
+      result.dynamicStaleTime
     )
 
     // If the navigation lock is active, wait for it to be released before
@@ -1596,8 +1635,6 @@ async function fetchMissingDynamicData(
       await waitForNavigationLock()
     }
 
-    const now = Date.now()
-
     if (routeCacheEntry !== null && result.staticStageData !== null) {
       const { response: staticStageResponse, isResponsePartial } =
         result.staticStageData
@@ -1653,11 +1690,16 @@ async function fetchMissingDynamicData(
         })
     }
 
+    // result.dynamicStaleTime is in seconds (from the server's `d` field).
+    // Convert to an absolute timestamp using the centralized helper.
+    const dynamicStaleAt = computeDynamicStaleAt(now, result.dynamicStaleTime)
+
     const didReceiveUnknownParallelRoute = writeDynamicDataIntoNavigationTask(
       task,
       seed.routeTree,
       seed.data,
       seed.head,
+      dynamicStaleAt,
       result.debugInfo
     )
 
@@ -1685,11 +1727,19 @@ function writeDynamicDataIntoNavigationTask(
   serverRouteTree: RouteTree,
   dynamicData: CacheNodeSeedData | null,
   dynamicHead: HeadData,
+  dynamicStaleAt: number,
   debugInfo: Array<any> | null
 ): boolean {
   if (task.status === NavigationTaskStatus.Pending && dynamicData !== null) {
     task.status = NavigationTaskStatus.Fulfilled
     finishPendingCacheNode(task.node, dynamicData, dynamicHead, debugInfo)
+
+    // Update the BFCache entry's staleAt for this segment with the value
+    // from the dynamic response. This applies the per-page
+    // unstable_dynamicStaleTime if set, or the default DYNAMIC_STALETIME_MS.
+    // We only update segments that received dynamic data — static segments
+    // are unaffected.
+    updateBFCacheEntryStaleAt(serverRouteTree.varyPath, dynamicStaleAt)
   }
 
   const taskChildren = task.children
@@ -1740,6 +1790,7 @@ function writeDynamicDataIntoNavigationTask(
                 serverRouteTreeChild,
                 dynamicDataChild,
                 dynamicHead,
+                dynamicStaleAt,
                 debugInfo
               )
             if (childDidReceiveUnknownParallelRoute) {
diff --git a/packages/next/src/client/components/router-reducer/reducers/refresh-reducer.ts b/packages/next/src/client/components/router-reducer/reducers/refresh-reducer.ts
index b742da8f63692..8256d91f67803 100644
--- a/packages/next/src/client/components/router-reducer/reducers/refresh-reducer.ts
+++ b/packages/next/src/client/components/router-reducer/reducers/refresh-reducer.ts
@@ -11,7 +11,10 @@ import {
 import { invalidateSegmentCacheEntries } from '../../segment-cache/cache'
 import { hasInterceptionRouteInCurrentTree } from './has-interception-route-in-current-tree'
 import { FreshnessPolicy } from '../ppr-navigations'
-import { invalidateBfCache } from '../../segment-cache/bfcache'
+import {
+  invalidateBfCache,
+  UnknownDynamicStaleTime,
+} from '../../segment-cache/bfcache'
 
 export function refreshReducer(
   state: ReadonlyReducerState,
@@ -63,13 +66,17 @@ export function refreshDynamicData(
   // TODO: Eventually we will store this type directly on the state object
   // instead of reconstructing it on demand. Part of a larger series of
   // refactors to unify the various tree types that the client deals with.
+  const now = Date.now()
+  // TODO: Store the dynamic stale time on the top-level state so it's known
+  // during restores and refreshes.
   const refreshSeed = convertServerPatchToFullTree(
+    now,
     currentFlightRouterState,
     null,
-    currentRenderedSearch
+    currentRenderedSearch,
+    UnknownDynamicStaleTime
   )
 
-  const now = Date.now()
   const navigateType = 'replace'
   return navigateToKnownRoute(
     now,
diff --git a/packages/next/src/client/components/router-reducer/reducers/restore-reducer.ts b/packages/next/src/client/components/router-reducer/reducers/restore-reducer.ts
index bc53333c10b48..b2b0ae03a4f67 100644
--- a/packages/next/src/client/components/router-reducer/reducers/restore-reducer.ts
+++ b/packages/next/src/client/components/router-reducer/reducers/restore-reducer.ts
@@ -16,6 +16,7 @@ import {
   completeTraverseNavigation,
   convertServerPatchToFullTree,
 } from '../../segment-cache/navigation'
+import { UnknownDynamicStaleTime } from '../../segment-cache/bfcache'
 
 export function restoreReducer(
   state: ReadonlyReducerState,
@@ -44,14 +45,18 @@ export function restoreReducer(
     extractPathFromFlightRouterState(treeToRestore) ?? restoredUrl.pathname
 
   const now = Date.now()
+  // TODO: Store the dynamic stale time on the top-level state so it's known
+  // during restores and refreshes.
   const accumulation: NavigationRequestAccumulation = {
     separateRefreshUrls: null,
     scrollRef: null,
   }
   const restoreSeed = convertServerPatchToFullTree(
+    now,
     treeToRestore,
     null,
-    renderedSearch
+    renderedSearch,
+    UnknownDynamicStaleTime
   )
   const task = startPPRNavigation(
     now,
@@ -64,6 +69,7 @@ export function restoreReducer(
     FreshnessPolicy.HistoryTraversal,
     null,
     null,
+    restoreSeed.dynamicStaleAt,
     false,
     accumulation
   )
diff --git a/packages/next/src/client/components/router-reducer/reducers/server-action-reducer.ts b/packages/next/src/client/components/router-reducer/reducers/server-action-reducer.ts
index 77dfea089bb9e..6bcbc7cd38b68 100644
--- a/packages/next/src/client/components/router-reducer/reducers/server-action-reducer.ts
+++ b/packages/next/src/client/components/router-reducer/reducers/server-action-reducer.ts
@@ -68,7 +68,10 @@ import {
 import { isExternalURL } from '../../app-router-utils'
 import { FreshnessPolicy } from '../ppr-navigations'
 import { processFetch } from '../fetch-server-response'
-import { invalidateBfCache } from '../../segment-cache/bfcache'
+import {
+  invalidateBfCache,
+  UnknownDynamicStaleTime,
+} from '../../segment-cache/bfcache'
 
 const createFromFetch =
   createFromFetchBrowser as (typeof import('react-server-dom-webpack/client.browser'))['createFromFetch']
@@ -437,12 +440,16 @@ export function serverActionReducer(
         // subset of the data needed to render the new page, we'll initiate a
         // new fetch, like we would for a normal navigation.
         const redirectCanonicalUrl = createHrefFromUrl(redirectUrl)
+        const now = Date.now()
+        // TODO: Store the dynamic stale time on the top-level state so it's
+        // known during restores and refreshes.
         const redirectSeed = convertServerPatchToFullTree(
+          now,
           currentFlightRouterState,
           flightData,
-          flightDataRenderedSearch
+          flightDataRenderedSearch,
+          UnknownDynamicStaleTime
         )
-        const now = Date.now()
 
         // Learn the route pattern so we can predict it for future navigations.
         const metadataVaryPath = redirectSeed.metadataVaryPath
diff --git a/packages/next/src/client/components/segment-cache/bfcache.ts b/packages/next/src/client/components/segment-cache/bfcache.ts
index 80073942ed4d2..4daa897283596 100644
--- a/packages/next/src/client/components/segment-cache/bfcache.ts
+++ b/packages/next/src/client/components/segment-cache/bfcache.ts
@@ -1,4 +1,25 @@
+import { DYNAMIC_STALETIME_MS } from '../router-reducer/reducers/navigate-reducer'
 import type { SegmentVaryPath } from './vary-path'
+
+/**
+ * Sentinel value indicating that no per-page dynamic stale time was provided.
+ * When this is the dynamicStaleTime, the default DYNAMIC_STALETIME_MS is used.
+ */
+export const UnknownDynamicStaleTime = -1
+
+/**
+ * Converts a dynamic stale time (in seconds, as sent by the server in the `d`
+ * field of the Flight response) to an absolute staleAt timestamp. When the
+ * value is unknown, falls back to the global DYNAMIC_STALETIME_MS.
+ */
+export function computeDynamicStaleAt(
+  now: number,
+  dynamicStaleTimeSeconds: number
+): number {
+  return dynamicStaleTimeSeconds !== UnknownDynamicStaleTime
+    ? now + dynamicStaleTimeSeconds * 1000
+    : now + DYNAMIC_STALETIME_MS
+}
 import {
   setInCacheMap,
   getFromCacheMap,
@@ -6,7 +27,6 @@ import {
   type CacheMap,
   createCacheMap,
 } from './cache-map'
-import { DYNAMIC_STALETIME_MS } from '../router-reducer/reducers/navigate-reducer'
 
 export type BFCacheEntry = {
   rsc: React.ReactNode | null
@@ -16,6 +36,12 @@ export type BFCacheEntry = {
 
   ref: UnknownMapEntry | null
   size: number
+  // The time at which this data was received. Used to compute the stale time
+  // for dynamic prefetches (which use STATIC_STALETIME_MS instead of
+  // DYNAMIC_STALETIME_MS). Stored explicitly because staleAt may be
+  // overridden by a per-page unstable_dynamicStaleTime, which would break
+  // any reverse calculation from staleAt.
+  navigatedAt: number
   staleAt: number
   version: number
 }
@@ -37,7 +63,8 @@ export function writeToBFCache(
   rsc: React.ReactNode,
   prefetchRsc: React.ReactNode,
   head: React.ReactNode,
-  prefetchHead: React.ReactNode
+  prefetchHead: React.ReactNode,
+  dynamicStaleAt: number
 ): void {
   if (typeof window === 'undefined') {
     return
@@ -60,9 +87,12 @@ export function writeToBFCache(
     // entirely and use memory pressure events instead.
     size: 100,
 
+    navigatedAt: now,
+
     // A back/forward navigation will disregard the stale time. This field is
-    // only relevant when staleTimes.dynamic is enabled.
-    staleAt: now + DYNAMIC_STALETIME_MS,
+    // only relevant when staleTimes.dynamic is enabled or unstable_dynamicStaleTime
+    // is exported by a page.
+    staleAt: dynamicStaleAt,
     version: currentBfCacheVersion,
   }
   const isRevalidation = false
@@ -73,10 +103,38 @@ export function writeHeadToBFCache(
   now: number,
   varyPath: SegmentVaryPath,
   head: React.ReactNode,
-  prefetchHead: React.ReactNode
+  prefetchHead: React.ReactNode,
+  dynamicStaleAt: number
 ): void {
   // Read the special "segment" that represents the head data.
-  writeToBFCache(now, varyPath, head, prefetchHead, null, null)
+  writeToBFCache(now, varyPath, head, prefetchHead, null, null, dynamicStaleAt)
+}
+
+/**
+ * Update the staleAt of an existing BFCache entry. Used after a dynamic
+ * response arrives with a per-page stale time from `unstable_dynamicStaleTime`.
+ * The per-page value is authoritative — it overrides whatever staleAt was set
+ * by the default DYNAMIC_STALETIME_MS.
+ */
+export function updateBFCacheEntryStaleAt(
+  varyPath: SegmentVaryPath,
+  newStaleAt: number
+): void {
+  if (typeof window === 'undefined') {
+    return
+  }
+  const isRevalidation = false
+  // Read with staleness bypass (-1) so we can update even stale entries
+  const entry = getFromCacheMap(
+    -1,
+    currentBfCacheVersion,
+    bfcacheMap,
+    varyPath,
+    isRevalidation
+  )
+  if (entry !== null) {
+    entry.staleAt = newStaleAt
+  }
 }
 
 export function readFromBFCache(
diff --git a/packages/next/src/client/components/segment-cache/cache.ts b/packages/next/src/client/components/segment-cache/cache.ts
index 2a7f39697a4b3..5c52bec3921eb 100644
--- a/packages/next/src/client/components/segment-cache/cache.ts
+++ b/packages/next/src/client/components/segment-cache/cache.ts
@@ -99,15 +99,12 @@ import {
   normalizeFlightData,
   prepareFlightRouterStateForRequest,
 } from '../../flight-data-helpers'
-import {
-  DYNAMIC_STALETIME_MS,
-  STATIC_STALETIME_MS,
-} from '../router-reducer/reducers/navigate-reducer'
+import { STATIC_STALETIME_MS } from '../router-reducer/reducers/navigate-reducer'
 import { pingVisibleLinks } from '../links'
 import { PAGE_SEGMENT_KEY } from '../../../shared/lib/segment'
 import { FetchStrategy } from './types'
 import { createPromiseWithResolvers } from '../../../shared/lib/promise-with-resolvers'
-import { readFromBFCacheDuringRegularNavigation } from './bfcache'
+import { readFromBFCache, UnknownDynamicStaleTime } from './bfcache'
 import { discoverKnownRoute, matchKnownRoute } from './optimistic-routes'
 import { convertServerPatchToFullTree, type NavigationSeed } from './navigation'
 import { getNavigationBuildId } from '../../navigation-build-id'
@@ -951,23 +948,20 @@ export function attemptToFulfillDynamicSegmentFromBFCache(
   // regular navigation.
   const varyPath = tree.varyPath
 
-  // The stale time for dynamic prefetches (default: 5 mins) is different from
-  // the stale time for regular navigations (default: 0 secs). We adjust the
-  // current timestamp to account for the difference.
-  const adjustedCurrentTime = now - STATIC_STALETIME_MS + DYNAMIC_STALETIME_MS
-  const bfcacheEntry = readFromBFCacheDuringRegularNavigation(
-    adjustedCurrentTime,
-    varyPath
-  )
+  // Read from the BFCache without expiring it (pass -1). We check freshness
+  // ourselves using navigatedAt, because the BFCache's staleAt may have been
+  // overridden by a per-page unstable_dynamicStaleTime and can't be used to
+  // derive the original request time.
+  const bfcacheEntry = readFromBFCache(varyPath)
   if (bfcacheEntry !== null) {
-    // Fulfill the prefetch using the bfcache entry.
-
-    // As explained above, the stale time of this prefetch entry is different
-    // than the one for the bfcache. Calculate when it was originally requested
-    // by subtracting the stale time used by the bfcache.
-    const requestedAt = bfcacheEntry.staleAt - DYNAMIC_STALETIME_MS
-    // Now add the stale time used by dynamic prefetches.
-    const dynamicPrefetchStaleAt = requestedAt + STATIC_STALETIME_MS
+    // The stale time for dynamic prefetches (default: 5 mins) is different
+    // from the stale time for regular navigations (default: 0 secs). Use
+    // navigatedAt to compute the correct expiry for prefetch purposes.
+    const dynamicPrefetchStaleAt =
+      bfcacheEntry.navigatedAt + STATIC_STALETIME_MS
+    if (now > dynamicPrefetchStaleAt) {
+      return null
+    }
 
     const pendingSegment = upgradeToPendingSegment(segment, FetchStrategy.Full)
     const isPartial = false
@@ -992,14 +986,13 @@ export function attemptToUpgradeSegmentFromBFCache(
   tree: RouteTree
 ): FulfilledSegmentCacheEntry | null {
   const varyPath = tree.varyPath
-  const adjustedCurrentTime = now - STATIC_STALETIME_MS + DYNAMIC_STALETIME_MS
-  const bfcacheEntry = readFromBFCacheDuringRegularNavigation(
-    adjustedCurrentTime,
-    varyPath
-  )
+  const bfcacheEntry = readFromBFCache(varyPath)
   if (bfcacheEntry !== null) {
-    const requestedAt = bfcacheEntry.staleAt - DYNAMIC_STALETIME_MS
-    const dynamicPrefetchStaleAt = requestedAt + STATIC_STALETIME_MS
+    const dynamicPrefetchStaleAt =
+      bfcacheEntry.navigatedAt + STATIC_STALETIME_MS
+    if (now > dynamicPrefetchStaleAt) {
+      return null
+    }
     const pendingSegment = upgradeToPendingSegment(
       createDetachedSegmentCacheEntry(now),
       FetchStrategy.Full
@@ -2292,9 +2285,12 @@ export async function fetchSegmentPrefetchesUsingDynamicRequest(
       return null
     }
     const navigationSeed = convertServerPatchToFullTree(
+      now,
       dynamicRequestTree,
       flightDatas,
-      renderedSearch
+      renderedSearch,
+      // Not needed for prefetch responses; pass unknown to use the default.
+      UnknownDynamicStaleTime
     )
     fulfilledEntries = writeDynamicRenderResponseIntoCache(
       now,
@@ -2395,9 +2391,11 @@ function writeDynamicTreeResponseIntoCache(
   // enabled everywhere. Tree prefetches should never include segment data.  We
   // can delete it. Leaving for a subsequent PR.
   const navigationSeed = convertServerPatchToFullTree(
+    now,
     flightRouterState,
     normalizedFlightDataResult,
-    renderedSearch
+    renderedSearch,
+    UnknownDynamicStaleTime
   )
   const buildId =
     response.headers.get(NEXT_NAV_DEPLOYMENT_ID_HEADER) ?? serverData.b
@@ -2921,9 +2919,11 @@ export function writeStaticStageResponseIntoCache(
     return
   }
   const navigationSeed = convertServerPatchToFullTree(
+    now,
     baseTree,
     flightDatas,
-    renderedSearch
+    renderedSearch,
+    UnknownDynamicStaleTime
   )
   writeDynamicRenderResponseIntoCache(
     now,
@@ -2979,9 +2979,11 @@ export async function processRuntimePrefetchStream(
     return null
   }
   const navigationSeed = convertServerPatchToFullTree(
+    now,
     baseTree,
     flightDatas,
-    renderedSearch
+    renderedSearch,
+    UnknownDynamicStaleTime
   )
 
   return {
diff --git a/packages/next/src/client/components/segment-cache/navigation-testing-lock.ts b/packages/next/src/client/components/segment-cache/navigation-testing-lock.ts
index fa3abedf6e98d..806308a4f32a6 100644
--- a/packages/next/src/client/components/segment-cache/navigation-testing-lock.ts
+++ b/packages/next/src/client/components/segment-cache/navigation-testing-lock.ts
@@ -5,11 +5,6 @@
  * during instant navigation captures, and owns all cookie state
  * transitions (pending → captured-MPA, pending → captured-SPA).
  *
- * The cookie value is a JSON array:
- *   [0]        — pending (waiting to capture)
- *   [1, null]  — captured MPA page load
- *   [1, { from, to }] — captured SPA navigation (from/to route trees)
- *
  * External actors (Playwright, devtools) set [0] to start a lock scope
  * and delete the cookie to end one. Next.js writes captured values.
  * The CookieStore handler distinguishes them by value: pending = external,
@@ -22,17 +17,30 @@ import { refreshOnInstantNavigationUnlock } from '../use-action-queue'
 
 type InstantNavCookieState = 'pending' | 'mpa' | 'spa'
 
+type InstantCookie =
+  // pending (waiting to capture)
+  | [captured: 0, id: string]
+  // captured MPA page load
+  | [captured: 1, id: string, state: null]
+  // captured SPA navigation (from/to route trees)
+  | [
+      captured: 1,
+      id: string,
+      state: { from: FlightRouterState; to: FlightRouterState | null },
+    ]
+
 function parseCookieValue(raw: string): InstantNavCookieState {
   try {
     const parsed = JSON.parse(raw)
-    if (Array.isArray(parsed) && parsed.length >= 2) {
-      return parsed[1] === null ? 'mpa' : 'spa'
+    if (Array.isArray(parsed) && parsed.length >= 3) {
+      const rawState = parsed[2]
+      return rawState === null ? 'mpa' : 'spa'
     }
   } catch {}
   return 'pending'
 }
 
-function writeCookieValue(value: unknown[]): void {
+function writeCookieValue(value: InstantCookie): void {
   if (typeof cookieStore === 'undefined') {
     return
   }
@@ -101,7 +109,7 @@ export function startListeningForInstantNavigationCookie(): void {
         })
       }
 
-      writeCookieValue([1, null])
+      writeCookieValue([1, `c${Math.random()}`, null])
       acquireLock()
     }
 
@@ -151,7 +159,7 @@ export function transitionToCapturedSPA(
   toTree: FlightRouterState | null
 ): void {
   if (process.env.__NEXT_EXPOSE_TESTING_API) {
-    writeCookieValue([1, { from: fromTree, to: toTree }])
+    writeCookieValue([1, `c${Math.random()}`, { from: fromTree, to: toTree }])
   }
 }
 
@@ -164,7 +172,7 @@ export function updateCapturedSPAToTree(
   toTree: FlightRouterState
 ): void {
   if (process.env.__NEXT_EXPOSE_TESTING_API) {
-    writeCookieValue([1, { from: fromTree, to: toTree }])
+    writeCookieValue([1, `c${Math.random()}`, { from: fromTree, to: toTree }])
   }
 }
 
diff --git a/packages/next/src/client/components/segment-cache/navigation.ts b/packages/next/src/client/components/segment-cache/navigation.ts
index 0b0ce955dc8f0..f64ba5eff6879 100644
--- a/packages/next/src/client/components/segment-cache/navigation.ts
+++ b/packages/next/src/client/components/segment-cache/navigation.ts
@@ -38,6 +38,7 @@ import type { AppRouterState } from '../router-reducer/router-reducer-types'
 import { ScrollBehavior } from '../router-reducer/router-reducer-types'
 import { computeChangedPath } from '../router-reducer/compute-changed-path'
 import { isJavaScriptURLString } from '../../lib/javascript-url'
+import { UnknownDynamicStaleTime, computeDynamicStaleAt } from './bfcache'
 
 /**
  * Navigate to a new URL, using the Segment Cache to construct a response.
@@ -258,6 +259,7 @@ export function navigateToKnownRoute(
     freshnessPolicy,
     navigationSeed.data,
     navigationSeed.head,
+    navigationSeed.dynamicStaleAt,
     isSamePageNavigation,
     accumulation
   )
@@ -314,6 +316,7 @@ function navigateUsingPrefetchedRouteTree(
     metadataVaryPath: route.metadata.varyPath as any,
     data: null,
     head: null,
+    dynamicStaleAt: computeDynamicStaleAt(now, UnknownDynamicStaleTime),
   }
   return navigateToKnownRoute(
     now,
@@ -406,6 +409,7 @@ async function navigateToUnknownRoute(
     renderedSearch,
     couldBeIntercepted,
     supportsPerSegmentPrefetching,
+    dynamicStaleTime,
     staticStageData,
     runtimePrefetchStream,
     responseHeaders,
@@ -416,9 +420,11 @@ async function navigateToUnknownRoute(
   // different, we'll need to massage the data a bit. Create FlightRouterState
   // tree that simulates what we'd receive as the result of a prefetch.
   const navigationSeed = convertServerPatchToFullTree(
+    now,
     currentFlightRouterState,
     flightData,
-    renderedSearch
+    renderedSearch,
+    dynamicStaleTime
   )
 
   // Learn the route pattern so we can predict it for future navigations.
@@ -736,12 +742,15 @@ export type NavigationSeed = {
   metadataVaryPath: PageVaryPath | null
   data: CacheNodeSeedData | null
   head: HeadData | null
+  dynamicStaleAt: number
 }
 
 export function convertServerPatchToFullTree(
+  now: number,
   currentTree: FlightRouterState,
   flightData: Array<NormalizedFlightData> | null,
-  renderedSearch: string
+  renderedSearch: string,
+  dynamicStaleTimeSeconds: number
 ): NavigationSeed {
   // During a client navigation or prefetch, the server sends back only a patch
   // for the parts of the tree that have changed.
@@ -806,6 +815,7 @@ export function convertServerPatchToFullTree(
     data: baseData,
     renderedSearch,
     head,
+    dynamicStaleAt: computeDynamicStaleAt(now, dynamicStaleTimeSeconds),
   }
 }
 
diff --git a/packages/next/src/next-devtools/dev-overlay/components/instant-navs/instant-nav-cookie.ts b/packages/next/src/next-devtools/dev-overlay/components/instant-navs/instant-nav-cookie.ts
index 3ffe218f6bfbf..66232d4e5e961 100644
--- a/packages/next/src/next-devtools/dev-overlay/components/instant-navs/instant-nav-cookie.ts
+++ b/packages/next/src/next-devtools/dev-overlay/components/instant-navs/instant-nav-cookie.ts
@@ -30,14 +30,15 @@ export type InstantNavCookieData =
 function parseCookieValue(raw: string): InstantNavCookieData {
   try {
     const parsed = JSON.parse(raw)
-    if (Array.isArray(parsed) && parsed.length >= 2) {
-      if (parsed[1] === null) {
+    if (Array.isArray(parsed) && parsed.length >= 3) {
+      const rawState = parsed[2]
+      if (rawState === null) {
         return { state: 'mpa' }
       }
-      // SPA capture: parsed[1] is { from, to }
-      if (typeof parsed[1] === 'object' && parsed[1] !== null) {
-        const fromTree: FlightRouterState = parsed[1].from ?? ['', {}]
-        const toTree: FlightRouterState | null = parsed[1].to ?? null
+      // SPA capture: rawState is { from, to }
+      if (typeof rawState === 'object' && rawState !== null) {
+        const fromTree: FlightRouterState = rawState.from ?? ['', {}]
+        const toTree: FlightRouterState | null = rawState.to ?? null
         return { state: 'spa', fromTree, toTree }
       }
       return { state: 'spa', fromTree: ['', {}], toTree: null }
diff --git a/packages/next/src/next-devtools/dev-overlay/components/instant-navs/instant-navs-panel.tsx b/packages/next/src/next-devtools/dev-overlay/components/instant-navs/instant-navs-panel.tsx
index 856c119f77526..1cb9b906cce44 100644
--- a/packages/next/src/next-devtools/dev-overlay/components/instant-navs/instant-navs-panel.tsx
+++ b/packages/next/src/next-devtools/dev-overlay/components/instant-navs/instant-navs-panel.tsx
@@ -44,7 +44,7 @@ export function InstantNavsPanel() {
     if (typeof cookieStore !== 'undefined') {
       cookieStore.set({
         name: COOKIE_NAME,
-        value: '[0]',
+        value: JSON.stringify([0, `p${Math.random()}`]),
         path: '/',
       })
     }
@@ -55,7 +55,7 @@ export function InstantNavsPanel() {
     if (typeof cookieStore !== 'undefined') {
       cookieStore.set({
         name: COOKIE_NAME,
-        value: '[0]',
+        value: JSON.stringify([0, `p${Math.random()}`]),
         path: '/',
       })
     }
diff --git a/packages/next/src/server/app-render/app-render.tsx b/packages/next/src/server/app-render/app-render.tsx
index 361c85e54fdb4..2f2c48b05e7eb 100644
--- a/packages/next/src/server/app-render/app-render.tsx
+++ b/packages/next/src/server/app-render/app-render.tsx
@@ -260,7 +260,10 @@ import {
   createValidationBoundaryTracking,
   type ValidationBoundaryTracking,
 } from './instant-validation/boundary-tracking'
-import type { InstantSample } from '../../build/segment-config/app/app-segment-config'
+import type {
+  AppSegmentConfig,
+  InstantSample,
+} from '../../build/segment-config/app/app-segment-config'
 import { ResponseCookies } from '../web/spec-extension/cookies'
 import { isInstantValidationError } from './instant-validation/instant-validation-error'
 
@@ -431,6 +434,48 @@ function parseRequestHeaders(
   }
 }
 
+/**
+ * Walks the loader tree to find the minimum `unstable_dynamicStaleTime` exported by
+ * any page module. Returns null if no page exports the config.
+ *
+ * This only reads static exports from page modules — it does not render any
+ * server components, so it's cheap to call.
+ *
+ * TODO: Move this to the prefetch hints file so we don't have to walk the
+ * tree on every render.
+ */
+async function getDynamicStaleTime(tree: LoaderTree): Promise<number | null> {
+  const { page, parallelRoutes } = parseLoaderTree(tree)
+
+  let result: number | null = null
+
+  // Only pages (not layouts) can export unstable_dynamicStaleTime.
+  if (typeof page !== 'undefined') {
+    const pageMod = await page[0]()
+    if (
+      pageMod &&
+      typeof (pageMod as AppSegmentConfig).unstable_dynamicStaleTime ===
+        'number'
+    ) {
+      const value = (pageMod as AppSegmentConfig).unstable_dynamicStaleTime!
+      result = result !== null ? Math.min(result, value) : value
+    }
+  }
+
+  const childPromises: Promise<number | null>[] = []
+  for (const parallelRouteKey in parallelRoutes) {
+    childPromises.push(getDynamicStaleTime(parallelRoutes[parallelRouteKey]))
+  }
+  const childResults = await Promise.all(childPromises)
+  for (const childResult of childResults) {
+    if (childResult !== null) {
+      result = result !== null ? Math.min(result, childResult) : childResult
+    }
+  }
+
+  return result
+}
+
 function createNotFoundLoaderTree(loaderTree: LoaderTree): LoaderTree {
   const components = loaderTree[2]
   const hasGlobalNotFound = !!components['global-not-found']
@@ -668,6 +713,20 @@ async function generateDynamicRSCPayload(
     baseResponse.p = options.runtimePrefetchStream
   }
 
+  // Include the per-page dynamic stale time from unstable_dynamicStaleTime, but only
+  // for dynamic renders (not prerenders/static generation). The client treats
+  // its presence as authoritative.
+  // TODO: Move this to the prefetch hints file so we don't have to walk the
+  // tree on every render.
+  if (!workStore.isStaticGeneration) {
+    const dynamicStaleTime = await getDynamicStaleTime(
+      ctx.componentMod.routeModule.userland.loaderTree
+    )
+    if (dynamicStaleTime !== null) {
+      baseResponse.d = dynamicStaleTime
+    }
+  }
+
   return baseResponse
 }
 
@@ -1789,6 +1848,14 @@ async function getRSCPayload(
     s: staleTimeIterable,
     l: staticStageByteLengthPromise,
     p: runtimePrefetchStream,
+    // Include the per-page dynamic stale time from unstable_dynamicStaleTime, but
+    // only for dynamic renders. The client treats its presence as
+    // authoritative.
+    // TODO: Move this to the prefetch hints file so we don't have to walk
+    // the tree on every render.
+    d: !workStore.isStaticGeneration
+      ? ((await getDynamicStaleTime(tree)) ?? undefined)
+      : undefined,
   })
 }
 
diff --git a/packages/next/src/server/app-render/create-component-tree.tsx b/packages/next/src/server/app-render/create-component-tree.tsx
index 1464944205521..3b9ff10615f46 100644
--- a/packages/next/src/server/app-render/create-component-tree.tsx
+++ b/packages/next/src/server/app-render/create-component-tree.tsx
@@ -357,6 +357,48 @@ async function createComponentTreeInternal(
     }
   }
 
+  // Read unstable_dynamicStaleTime from page modules (not layouts) and track it on
+  // the store's stale field. This affects the segment cache stale time via
+  // the StaleTimeIterable.
+  if (
+    isPage &&
+    typeof layoutOrPageMod?.unstable_dynamicStaleTime === 'number'
+  ) {
+    const pageStaleTime = layoutOrPageMod.unstable_dynamicStaleTime
+    const workUnitStore = workUnitAsyncStorage.getStore()
+
+    if (workUnitStore) {
+      switch (workUnitStore.type) {
+        case 'prerender':
+        case 'prerender-runtime':
+        case 'prerender-legacy':
+        case 'prerender-ppr':
+          if (workUnitStore.stale > pageStaleTime) {
+            workUnitStore.stale = pageStaleTime
+          }
+          break
+        case 'request':
+          if (
+            workUnitStore.stale === undefined ||
+            workUnitStore.stale > pageStaleTime
+          ) {
+            workUnitStore.stale = pageStaleTime
+          }
+          break
+        // createComponentTree is not called for these stores:
+        case 'cache':
+        case 'private-cache':
+        case 'prerender-client':
+        case 'validation-client':
+        case 'unstable-cache':
+        case 'generate-static-params':
+          break
+        default:
+          workUnitStore satisfies never
+      }
+    }
+  }
+
   const isStaticGeneration = workStore.isStaticGeneration
 
   // Assume the segment we're rendering contains only partial data if PPR is
diff --git a/packages/next/src/server/dev/hot-reloader-turbopack.ts b/packages/next/src/server/dev/hot-reloader-turbopack.ts
index b9e250b716a66..f20f40bd5b70f 100644
--- a/packages/next/src/server/dev/hot-reloader-turbopack.ts
+++ b/packages/next/src/server/dev/hot-reloader-turbopack.ts
@@ -309,7 +309,7 @@ export async function createHotReloaderTurbopack(
   distDir: string,
   resetFetch: () => void,
   lockfile: Lockfile | undefined,
-  experimentalServerFastRefresh?: boolean
+  serverFastRefresh?: boolean
 ): Promise<NextJsHotReloaderInterface> {
   const dev = true
   const buildId = 'development'
@@ -413,7 +413,7 @@ export async function createHotReloaderTurbopack(
         opts.nextConfig
       ),
       nextVersion: process.env.__NEXT_VERSION as string,
-      serverHmr: experimentalServerFastRefresh,
+      serverHmr: serverFastRefresh,
     },
     {
       memoryLimit: opts.nextConfig.experimental?.turbopackMemoryLimit,
@@ -616,9 +616,7 @@ export async function createHotReloaderTurbopack(
     //   - Middleware
     //   - App Router route handlers (route.ts)
     const usesServerHmr =
-      experimentalServerFastRefresh &&
-      isAppPage &&
-      writtenEndpoint.type !== 'edge'
+      serverFastRefresh && isAppPage && writtenEndpoint.type !== 'edge'
 
     const filesToDelete: string[] = []
     for (const file of serverPaths) {
@@ -1840,7 +1838,7 @@ export async function createHotReloaderTurbopack(
     process.exit(1)
   })
 
-  if (experimentalServerFastRefresh) {
+  if (serverFastRefresh) {
     serverHmrSubscriptions = setupServerHmr(project, {
       clear: async () => {
         // Clear Node's require cache of all Turbopack-built modules
diff --git a/packages/next/src/server/lib/router-server.ts b/packages/next/src/server/lib/router-server.ts
index a7d76c77444c8..80f1fbe757564 100644
--- a/packages/next/src/server/lib/router-server.ts
+++ b/packages/next/src/server/lib/router-server.ts
@@ -48,7 +48,7 @@ import { normalizedAssetPrefix } from '../../shared/lib/normalized-asset-prefix'
 import { NEXT_PATCH_SYMBOL } from './patch-fetch'
 import type { ServerInitResult } from './render-server'
 import { filterInternalHeaders } from './server-ipc/utils'
-import { blockCrossSite } from './router-utils/block-cross-site'
+import { blockCrossSiteDEV } from './router-utils/block-cross-site-dev'
 import { traceGlobals } from '../../trace/shared'
 import { NoFallbackError } from '../../shared/lib/no-fallback-error.external'
 import {
@@ -90,7 +90,7 @@ export async function initialize(opts: {
   keepAliveTimeout?: number
   customServer?: boolean
   experimentalHttpsServer?: boolean
-  experimentalServerFastRefresh?: boolean
+  serverFastRefresh?: boolean
   startServerSpan?: Span
   quiet?: boolean
 }): Promise<ServerInitResult> {
@@ -179,7 +179,7 @@ export async function initialize(opts: {
         port: opts.port,
         onDevServerCleanup: opts.onDevServerCleanup,
         resetFetch,
-        experimentalServerFastRefresh: opts.experimentalServerFastRefresh,
+        serverFastRefresh: opts.serverFastRefresh,
       })
     )
 
@@ -355,7 +355,7 @@ export async function initialize(opts: {
       // handle hot-reloader first
       if (development) {
         if (
-          blockCrossSite(
+          blockCrossSiteDEV(
             req,
             res,
             development.config.allowedDevOrigins,
@@ -815,7 +815,7 @@ export async function initialize(opts: {
 
       if (opts.dev && development && req.url) {
         if (
-          blockCrossSite(
+          blockCrossSiteDEV(
             req,
             socket,
             development.config.allowedDevOrigins,
diff --git a/packages/next/src/server/lib/router-utils/block-cross-site.ts b/packages/next/src/server/lib/router-utils/block-cross-site-dev.ts
similarity index 78%
rename from packages/next/src/server/lib/router-utils/block-cross-site.ts
rename to packages/next/src/server/lib/router-utils/block-cross-site-dev.ts
index 92d41bd82e071..cae55a1dd7e24 100644
--- a/packages/next/src/server/lib/router-utils/block-cross-site.ts
+++ b/packages/next/src/server/lib/router-utils/block-cross-site-dev.ts
@@ -31,7 +31,7 @@ function warnOrBlockRequest(
   return true
 }
 
-function isInternalDevEndpoint(req: IncomingMessage): boolean {
+function isInternalEndpoint(req: IncomingMessage): boolean {
   if (!req.url) return false
 
   try {
@@ -50,7 +50,7 @@ function isInternalDevEndpoint(req: IncomingMessage): boolean {
   }
 }
 
-export const blockCrossSite = (
+export const blockCrossSiteDEV = (
   req: IncomingMessage,
   res: ServerResponse | Duplex,
   allowedDevOrigins: string[] | undefined,
@@ -70,9 +70,10 @@ export const blockCrossSite = (
   }
 
   // only process internal URLs/middleware
-  if (!isInternalDevEndpoint(req)) {
+  if (!isInternalEndpoint(req)) {
     return false
   }
+
   // block non-cors request from cross-site e.g. script tag on
   // different host
   if (
@@ -82,20 +83,20 @@ export const blockCrossSite = (
     return warnOrBlockRequest(res, undefined, mode)
   }
 
-  // ensure websocket requests from allowed origin
+  // ensure websocket requests are only fulfilled from allowed origin
   const rawOrigin = req.headers['origin']
-
-  if (rawOrigin && rawOrigin !== 'null') {
-    const parsedOrigin = parseUrl(rawOrigin)
-
-    if (parsedOrigin) {
-      const originLowerCase = parsedOrigin.hostname.toLowerCase()
-
-      if (!isCsrfOriginAllowed(originLowerCase, allowedOrigins)) {
-        return warnOrBlockRequest(res, originLowerCase, mode)
-      }
-    }
-  }
-
-  return false
+  const parsedOrigin =
+    rawOrigin && rawOrigin !== 'null' ? parseUrl(rawOrigin) : rawOrigin
+
+  const originLowerCase =
+    parsedOrigin === undefined || typeof parsedOrigin === 'string'
+      ? parsedOrigin
+      : parsedOrigin.hostname.toLowerCase()
+
+  // Allow requests with no origin since those are just GET requests from same-site
+  return (
+    originLowerCase !== undefined &&
+    !isCsrfOriginAllowed(originLowerCase, allowedOrigins) &&
+    warnOrBlockRequest(res, originLowerCase, mode)
+  )
 }
diff --git a/packages/next/src/server/lib/router-utils/setup-dev-bundler.ts b/packages/next/src/server/lib/router-utils/setup-dev-bundler.ts
index 175283970ba79..ce081907e2e14 100644
--- a/packages/next/src/server/lib/router-utils/setup-dev-bundler.ts
+++ b/packages/next/src/server/lib/router-utils/setup-dev-bundler.ts
@@ -117,7 +117,7 @@ export type SetupOpts = {
   port: number
   onDevServerCleanup: ((listener: () => Promise<void>) => void) | undefined
   resetFetch: () => void
-  experimentalServerFastRefresh?: boolean
+  serverFastRefresh?: boolean
 }
 
 export interface DevRoutesManifest {
@@ -241,7 +241,7 @@ async function startWatcher(
           distDir,
           resetFetch,
           lockfile,
-          opts.experimentalServerFastRefresh
+          opts.serverFastRefresh
         )
       })()
     : await (async () => {
diff --git a/packages/next/src/server/lib/start-server.ts b/packages/next/src/server/lib/start-server.ts
index 633ccf4a43f2e..eb60970010e87 100644
--- a/packages/next/src/server/lib/start-server.ts
+++ b/packages/next/src/server/lib/start-server.ts
@@ -129,7 +129,7 @@ export interface StartServerOptions {
   keepAliveTimeout?: number
   // this is dev-server only
   selfSignedCertificate?: SelfSignedCertificate
-  experimentalServerFastRefresh?: boolean
+  serverFastRefresh?: boolean
 }
 
 export async function getRequestHandlers({
@@ -142,7 +142,7 @@ export async function getRequestHandlers({
   minimalMode,
   keepAliveTimeout,
   experimentalHttpsServer,
-  experimentalServerFastRefresh,
+  serverFastRefresh,
   quiet,
 }: {
   dir: string
@@ -154,7 +154,7 @@ export async function getRequestHandlers({
   minimalMode?: boolean
   keepAliveTimeout?: number
   experimentalHttpsServer?: boolean
-  experimentalServerFastRefresh?: boolean
+  serverFastRefresh?: boolean
   quiet?: boolean
 }): ReturnType<typeof initialize> {
   return initialize({
@@ -167,7 +167,7 @@ export async function getRequestHandlers({
     server,
     keepAliveTimeout,
     experimentalHttpsServer,
-    experimentalServerFastRefresh,
+    serverFastRefresh,
     startServerSpan,
     quiet,
   })
@@ -188,7 +188,7 @@ export async function startServer(
     allowRetry,
     keepAliveTimeout,
     selfSignedCertificate,
-    experimentalServerFastRefresh,
+    serverFastRefresh,
   } = serverOptions
   let { port } = serverOptions
 
@@ -489,7 +489,7 @@ export async function startServer(
           minimalMode,
           keepAliveTimeout,
           experimentalHttpsServer: !!selfSignedCertificate,
-          experimentalServerFastRefresh,
+          serverFastRefresh,
         })
         requestHandler = initResult.requestHandler
         upgradeHandler = initResult.upgradeHandler
diff --git a/packages/next/src/server/typescript/rules/config.ts b/packages/next/src/server/typescript/rules/config.ts
index 88d1de7abcbfc..ad58b9c349f1a 100644
--- a/packages/next/src/server/typescript/rules/config.ts
+++ b/packages/next/src/server/typescript/rules/config.ts
@@ -156,6 +156,17 @@ const API_DOCS: Record<
     // `getSemanticDiagnosticsForExportVariableStatement` below, and only provide hover a tooltip + autocomplete.
     insertText: 'unstable_instant = { prefetch: "static" };',
   },
+  unstable_dynamicStaleTime: {
+    description: `Controls how long the client-side router cache retains dynamic page data (in seconds). Pages only — not allowed in layouts. Cannot be combined with \`unstable_instant\`.`,
+    link: '(docs coming soon)',
+    type: 'number',
+    isValid: (value: string) => {
+      return Number(value.replace(/_/g, '')) >= 0
+    },
+    getHint: (value: any) => {
+      return `Set the dynamic stale time to \`${value}\` seconds.`
+    },
+  },
 }
 
 type FullAppSegmentConfig = Required<AppSegmentConfig>
diff --git a/packages/next/src/shared/lib/app-router-types.ts b/packages/next/src/shared/lib/app-router-types.ts
index 1591d1574bd40..650bd824050c4 100644
--- a/packages/next/src/shared/lib/app-router-types.ts
+++ b/packages/next/src/shared/lib/app-router-types.ts
@@ -314,6 +314,14 @@ export type InitialRSCPayload = {
   l?: Promise<number>
   /** runtimePrefetchStream — Embedded runtime prefetch Flight stream. */
   p?: ReadableStream<Uint8Array>
+  /**
+   * dynamicStaleTime — Per-page BFCache stale time in seconds, from
+   * `unstable_dynamicStaleTime`. Only included for dynamic renders. Controls
+   * how long the client router cache retains dynamic navigation data. This is
+   * distinct from the `s` field, which controls segment cache (prefetch)
+   * staleness.
+   */
+  d?: number
 }
 
 // Response from `createFromFetch` for normal rendering
@@ -336,6 +344,14 @@ export type NavigationFlightResponse = {
   h: VaryParamsThenable | null
   /** runtimePrefetchStream — Embedded runtime prefetch Flight stream. */
   p?: ReadableStream<Uint8Array>
+  /**
+   * dynamicStaleTime — Per-page BFCache stale time in seconds, from
+   * `unstable_dynamicStaleTime`. Only included for dynamic renders. Controls
+   * how long the client router cache retains dynamic navigation data. This is
+   * distinct from the `s` field, which controls segment cache (prefetch)
+   * staleness.
+   */
+  d?: number
 }
 
 // Response from `createFromFetch` for server actions. Action's flight data can be null
diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
index 2a7a049047cb0..393d33d1ad15d 100644
--- a/packages/react-refresh-utils/package.json
+++ b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/packages/third-parties/package.json b/packages/third-parties/package.json
index 8c910a4cc2e84..3b518f291ab96 100644
--- a/packages/third-parties/package.json
+++ b/packages/third-parties/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/third-parties",
-  "version": "16.2.0-canary.100",
+  "version": "16.2.0-canary.101",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/third-parties"
@@ -26,7 +26,7 @@
     "third-party-capital": "1.0.20"
   },
   "devDependencies": {
-    "next": "16.2.0-canary.100",
+    "next": "16.2.0-canary.101",
     "outdent": "0.8.0",
     "prettier": "2.5.1",
     "typescript": "5.9.2"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 580dade7dfd83..32b3826042405 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -460,11 +460,11 @@ importers:
         specifier: 5.0.0
         version: 5.0.0
       playwright:
-        specifier: 1.48.0
-        version: 1.48.0
+        specifier: 1.58.2
+        version: 1.58.2
       playwright-chromium:
-        specifier: 1.48.0
-        version: 1.48.0
+        specifier: 1.58.2
+        version: 1.58.2
       postcss:
         specifier: 8.4.31
         version: 8.4.31
@@ -668,7 +668,7 @@ importers:
         version: 0.554.0(react@19.3.0-canary-5e9eedb5-20260312)
       next:
         specifier: 16.0.8
-        version: 16.0.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8)
+        version: 16.0.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8)
       next-themes:
         specifier: ^0.4.6
         version: 0.4.6(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)
@@ -726,16 +726,16 @@ importers:
     dependencies:
       fumadocs-core:
         specifier: 15.7.12
-        version: 15.7.12(@types/react@19.2.10)(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)
+        version: 15.7.12(@types/react@19.2.10)(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)
       fumadocs-mdx:
         specifier: 11.10.0
-        version: 11.10.0(fumadocs-core@15.7.12(@types/react@19.2.10)(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312))(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react@19.3.0-canary-5e9eedb5-20260312)
+        version: 11.10.0(fumadocs-core@15.7.12(@types/react@19.2.10)(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312))(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react@19.3.0-canary-5e9eedb5-20260312)
       fumadocs-ui:
         specifier: 15.7.12
-        version: 15.7.12(@types/react-dom@19.2.3(@types/react@19.2.10))(@types/react@19.2.10)(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(tailwindcss@4.1.13)
+        version: 15.7.12(@types/react-dom@19.2.3(@types/react@19.2.10))(@types/react@19.2.10)(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(tailwindcss@4.1.13)
       next:
         specifier: 15.5.8
-        version: 15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8)
+        version: 15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8)
       react:
         specifier: npm:react@19.3.0-canary-5e9eedb5-20260312
         version: 19.3.0-canary-5e9eedb5-20260312
@@ -831,8 +831,8 @@ importers:
         specifier: workspace:*
         version: link:../../packages/next
       playwright:
-        specifier: ^1.40.0
-        version: 1.48.0
+        specifier: 1.58.2
+        version: 1.58.2
       rimraf:
         specifier: 6.0.1
         version: 6.0.1
@@ -1017,7 +1017,7 @@ importers:
   packages/eslint-config-next:
     dependencies:
       '@next/eslint-plugin-next':
-        specifier: 16.2.0-canary.100
+        specifier: 16.2.0-canary.101
         version: link:../eslint-plugin-next
       eslint:
         specifier: '>=9.0.0'
@@ -1094,7 +1094,7 @@ importers:
   packages/next:
     dependencies:
       '@next/env':
-        specifier: 16.2.0-canary.100
+        specifier: 16.2.0-canary.101
         version: link:../next-env
       '@swc/helpers':
         specifier: 0.5.15
@@ -1219,26 +1219,26 @@ importers:
         specifier: 1.2.0
         version: 1.2.0
       '@next/font':
-        specifier: 16.2.0-canary.100
+        specifier: 16.2.0-canary.101
         version: link:../font
       '@next/polyfill-module':
-        specifier: 16.2.0-canary.100
+        specifier: 16.2.0-canary.101
         version: link:../next-polyfill-module
       '@next/polyfill-nomodule':
-        specifier: 16.2.0-canary.100
+        specifier: 16.2.0-canary.101
         version: link:../next-polyfill-nomodule
       '@next/react-refresh-utils':
-        specifier: 16.2.0-canary.100
+        specifier: 16.2.0-canary.101
         version: link:../react-refresh-utils
       '@next/swc':
-        specifier: 16.2.0-canary.100
+        specifier: 16.2.0-canary.101
         version: link:../next-swc
       '@opentelemetry/api':
         specifier: 1.6.0
         version: 1.6.0
       '@playwright/test':
-        specifier: 1.51.1
-        version: 1.51.1
+        specifier: 1.58.2
+        version: 1.58.2
       '@rspack/core':
         specifier: 1.6.7
         version: 1.6.7(@swc/helpers@0.5.15)
@@ -1412,7 +1412,7 @@ importers:
         version: 3.0.0
       axe-playwright:
         specifier: 2.0.3
-        version: 2.0.3(playwright@1.51.1)
+        version: 2.0.3(playwright@1.58.2)
       babel-loader:
         specifier: 10.0.0
         version: 10.0.0(@babel/core@7.26.10)(webpack@5.98.0(@swc/core@1.11.24(@swc/helpers@0.5.15))(esbuild@0.25.9))
@@ -1872,11 +1872,10 @@ importers:
         version: 0.7.3
 
   packages/next-playwright:
-    dependencies:
-      '@playwright/test':
-        specifier: '>=1.0.0'
-        version: 1.51.1
     devDependencies:
+      '@playwright/test':
+        specifier: 1.58.2
+        version: 1.58.2
       typescript:
         specifier: 5.9.2
         version: 5.9.2
@@ -1956,7 +1955,7 @@ importers:
         version: 1.0.20
     devDependencies:
       next:
-        specifier: 16.2.0-canary.100
+        specifier: 16.2.0-canary.101
         version: link:../next
       outdent:
         specifier: 0.8.0
@@ -2040,8 +2039,8 @@ importers:
         specifier: ^2.0.5
         version: 2.0.5
       playwright-chromium:
-        specifier: 1.48.0
-        version: 1.48.0
+        specifier: 1.58.2
+        version: 1.58.2
       split2:
         specifier: ^4.2.0
         version: 4.2.0
@@ -5032,8 +5031,8 @@ packages:
     resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==}
     engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
 
-  '@playwright/test@1.51.1':
-    resolution: {integrity: sha512-nM+kEaTSAoVlXmMPH10017vn3FSiFqr/bh4fKg9vmAdMfd9SDqRZNvPSiAHADc/itWak+qPvMPZQOPwCBW7k7Q==}
+  '@playwright/test@1.58.2':
+    resolution: {integrity: sha512-akea+6bHYBBfA9uQqSYmlJXn61cTa+jbO87xVLCWbTqbWadRVmhxlXATaOjOgcBaWU4ePo0wB41KMFv3o35IXA==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -15032,13 +15031,8 @@ packages:
     resolution: {integrity: sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==}
     engines: {node: '>=8'}
 
-  playwright-chromium@1.48.0:
-    resolution: {integrity: sha512-jPFKhB4+zGEcAwc+h1mTLa8L08Rb+FwGKFqd/o7mWSGyxAtwBu5R4QxSG/a8KcHbewOj4DLBUVVK2N/uKrYmiQ==}
-    engines: {node: '>=18'}
-    hasBin: true
-
-  playwright-core@1.48.0:
-    resolution: {integrity: sha512-RBvzjM9rdpP7UUFrQzRwR8L/xR4HyC1QXMzGYTbf1vjw25/ya9NRAVnXi/0fvFopjebvyPzsmoK58xxeEOaVvA==}
+  playwright-chromium@1.58.2:
+    resolution: {integrity: sha512-SCoQ3hjBs7FfO46CoOtgAUg77BuYwCni1bzQgm47IUyLBTipnGkLxLnaUNRKXvPYO4hAyt8++Z6wVShVnhrzmw==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -15047,13 +15041,13 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  playwright@1.48.0:
-    resolution: {integrity: sha512-qPqFaMEHuY/ug8o0uteYJSRfMGFikhUysk8ZvAtfKmUK3kc/6oNl/y3EczF8OFGYIi/Ex2HspMfzYArk6+XQSA==}
+  playwright-core@1.58.2:
+    resolution: {integrity: sha512-yZkEtftgwS8CsfYo7nm0KE8jsvm6i/PTgVtB8DL726wNf6H2IMsDuxCpJj59KDaxCtSnrWan2AeDqM7JBaultg==}
     engines: {node: '>=18'}
     hasBin: true
 
-  playwright@1.51.1:
-    resolution: {integrity: sha512-kkx+MB2KQRkyxjYPc3a0wLZZoDczmppyGJIvQ43l+aZihkaVvmu/21kiyaHeHjiFxjxNNFnUncKmcGIyOojsaw==}
+  playwright@1.58.2:
+    resolution: {integrity: sha512-vA30H8Nvkq/cPBnNw4Q8TWz1EJyqgpuinBcHET0YVJVFldr8JDNiU9LaWAE1KqSkRYazuaBhTpB5ZzShOezQ6A==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -22595,9 +22589,9 @@ snapshots:
 
   '@pkgr/core@0.1.1': {}
 
-  '@playwright/test@1.51.1':
+  '@playwright/test@1.58.2':
     dependencies:
-      playwright: 1.51.1
+      playwright: 1.58.2
 
   '@polka/url@1.0.0-next.11': {}
 
@@ -23949,7 +23943,7 @@ snapshots:
       jest-serializer-html: 7.1.0
       jest-watch-typeahead: 2.2.2(jest@29.7.0(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu))(babel-plugin-macros@3.1.0))
       nyc: 15.1.0
-      playwright: 1.48.0
+      playwright: 1.58.2
       storybook: 8.6.0(prettier@3.6.2)
     transitivePeerDependencies:
       - '@swc/helpers'
@@ -25615,14 +25609,14 @@ snapshots:
       axe-core: 4.10.0
       mustache: 4.2.0
 
-  axe-playwright@2.0.3(playwright@1.51.1):
+  axe-playwright@2.0.3(playwright@1.58.2):
     dependencies:
       '@types/junit-report-builder': 3.0.2
       axe-core: 4.10.0
       axe-html-reporter: 2.2.11(axe-core@4.10.0)
       junit-report-builder: 5.1.1
       picocolors: 1.1.1
-      playwright: 1.51.1
+      playwright: 1.58.2
 
   axios@0.26.1:
     dependencies:
@@ -29628,7 +29622,7 @@ snapshots:
   fsevents@2.3.3:
     optional: true
 
-  fumadocs-core@15.7.12(@types/react@19.2.10)(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312):
+  fumadocs-core@15.7.12(@types/react@19.2.10)(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312):
     dependencies:
       '@formatjs/intl-localematcher': 0.6.1
       '@orama/orama': 3.1.13
@@ -29649,20 +29643,20 @@ snapshots:
       unist-util-visit: 5.0.0
     optionalDependencies:
       '@types/react': 19.2.10
-      next: 15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8)
+      next: 15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8)
       react: 19.3.0-canary-5e9eedb5-20260312
       react-dom: 19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312)
     transitivePeerDependencies:
       - supports-color
 
-  fumadocs-mdx@11.10.0(fumadocs-core@15.7.12(@types/react@19.2.10)(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312))(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react@19.3.0-canary-5e9eedb5-20260312):
+  fumadocs-mdx@11.10.0(fumadocs-core@15.7.12(@types/react@19.2.10)(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312))(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react@19.3.0-canary-5e9eedb5-20260312):
     dependencies:
       '@mdx-js/mdx': 3.1.1
       '@standard-schema/spec': 1.0.0
       chokidar: 4.0.3
       esbuild: 0.25.9
       estree-util-value-to-estree: 3.5.0
-      fumadocs-core: 15.7.12(@types/react@19.2.10)(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)
+      fumadocs-core: 15.7.12(@types/react@19.2.10)(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)
       js-yaml: 4.1.0
       lru-cache: 11.2.1
       picocolors: 1.1.1
@@ -29674,12 +29668,12 @@ snapshots:
       unist-util-visit: 5.0.0
       zod: 4.1.13
     optionalDependencies:
-      next: 15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8)
+      next: 15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8)
       react: 19.3.0-canary-5e9eedb5-20260312
     transitivePeerDependencies:
       - supports-color
 
-  fumadocs-ui@15.7.12(@types/react-dom@19.2.3(@types/react@19.2.10))(@types/react@19.2.10)(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(tailwindcss@4.1.13):
+  fumadocs-ui@15.7.12(@types/react-dom@19.2.3(@types/react@19.2.10))(@types/react@19.2.10)(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(tailwindcss@4.1.13):
     dependencies:
       '@radix-ui/react-accordion': 1.2.12(@types/react-dom@19.2.3(@types/react@19.2.10))(@types/react@19.2.10)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)
       '@radix-ui/react-collapsible': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.10))(@types/react@19.2.10)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)
@@ -29692,7 +29686,7 @@ snapshots:
       '@radix-ui/react-slot': 1.2.3(@types/react@19.2.10)(react@19.3.0-canary-5e9eedb5-20260312)
       '@radix-ui/react-tabs': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.10))(@types/react@19.2.10)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)
       class-variance-authority: 0.7.1
-      fumadocs-core: 15.7.12(@types/react@19.2.10)(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)
+      fumadocs-core: 15.7.12(@types/react@19.2.10)(next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8))(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)
       lodash.merge: 4.6.2
       next-themes: 0.4.6(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)
       postcss-selector-parser: 7.1.0
@@ -29703,7 +29697,7 @@ snapshots:
       tailwind-merge: 3.3.1
     optionalDependencies:
       '@types/react': 19.2.10
-      next: 15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8)
+      next: 15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8)
       tailwindcss: 4.1.13
     transitivePeerDependencies:
       - '@mixedbread/sdk'
@@ -31659,7 +31653,7 @@ snapshots:
       jest-process-manager: 0.4.0(debug@4.1.1)
       jest-runner: 29.7.0
       nyc: 15.1.0
-      playwright-core: 1.48.0
+      playwright-core: 1.51.1
       rimraf: 3.0.2
       uuid: 8.3.2
     transitivePeerDependencies:
@@ -34031,7 +34025,7 @@ snapshots:
 
   next-tick@1.0.0: {}
 
-  next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8):
+  next@15.5.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8):
     dependencies:
       '@next/env': 15.5.8
       '@swc/helpers': 0.5.15
@@ -34050,7 +34044,7 @@ snapshots:
       '@next/swc-win32-arm64-msvc': 15.5.7
       '@next/swc-win32-x64-msvc': 15.5.7
       '@opentelemetry/api': 1.9.0
-      '@playwright/test': 1.51.1
+      '@playwright/test': 1.58.2
       babel-plugin-react-compiler: 0.0.0-experimental-1371fcb-20260227
       sass: 1.77.8
       sharp: 0.34.4
@@ -34058,7 +34052,7 @@ snapshots:
       - '@babel/core'
       - babel-plugin-macros
 
-  next@16.0.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8):
+  next@16.0.8(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@0.0.0-experimental-1371fcb-20260227)(react-dom@19.3.0-canary-5e9eedb5-20260312(react@19.3.0-canary-5e9eedb5-20260312))(react@19.3.0-canary-5e9eedb5-20260312)(sass@1.77.8):
     dependencies:
       '@next/env': 16.0.8
       '@swc/helpers': 0.5.15
@@ -34077,7 +34071,7 @@ snapshots:
       '@next/swc-win32-arm64-msvc': 16.0.8
       '@next/swc-win32-x64-msvc': 16.0.8
       '@opentelemetry/api': 1.9.0
-      '@playwright/test': 1.51.1
+      '@playwright/test': 1.58.2
       babel-plugin-react-compiler: 0.0.0-experimental-1371fcb-20260227
       sass: 1.77.8
       sharp: 0.34.4
@@ -35128,23 +35122,17 @@ snapshots:
     dependencies:
       find-up: 3.0.0
 
-  playwright-chromium@1.48.0:
+  playwright-chromium@1.58.2:
     dependencies:
-      playwright-core: 1.48.0
-
-  playwright-core@1.48.0: {}
+      playwright-core: 1.58.2
 
   playwright-core@1.51.1: {}
 
-  playwright@1.48.0:
-    dependencies:
-      playwright-core: 1.48.0
-    optionalDependencies:
-      fsevents: 2.3.2
+  playwright-core@1.58.2: {}
 
-  playwright@1.51.1:
+  playwright@1.58.2:
     dependencies:
-      playwright-core: 1.51.1
+      playwright-core: 1.58.2
     optionalDependencies:
       fsevents: 2.3.2
 
diff --git a/test/development/acceptance-app/rsc-build-errors.test.ts b/test/development/acceptance-app/rsc-build-errors.test.ts
index b78e2a7bebfd8..38fe9d50484c8 100644
--- a/test/development/acceptance-app/rsc-build-errors.test.ts
+++ b/test/development/acceptance-app/rsc-build-errors.test.ts
@@ -256,6 +256,66 @@ describe('Error overlay - RSC build errors', () => {
     })
   }
 
+  it('should error when unstable_catchError from next/error is used in a server component', async () => {
+    await using sandbox = await createSandbox(
+      next,
+      new Map([
+        [
+          'app/page.js',
+          outdent`
+            import { unstable_catchError } from 'next/error'
+
+            export default function Page() {
+              return 'Hello world'
+            }
+          `,
+        ],
+      ])
+    )
+
+    const { session } = sandbox
+    await session.waitForRedbox()
+    expect(await session.getRedboxSource()).toInclude(
+      'You\'re importing a component that needs `unstable_catchError`. This React Hook only works in a Client Component. To fix, mark the file (or its parent) with the `"use client"` directive.'
+    )
+  })
+
+  test.each([
+    ['middleware.js', 'export function middleware() {}'],
+    ['proxy.js', 'export function proxy() {}'],
+    ['instrumentation.js', 'export function register() {}'],
+  ])(
+    'should error when unstable_catchError from next/error is imported in %s',
+    async (entryFile, exportCode) => {
+      await using sandbox = await createSandbox(
+        next,
+        new Map([
+          [
+            'app/page.js',
+            outdent`
+              export default function Page() {
+                return 'Hello world'
+              }
+            `,
+          ],
+          [
+            entryFile,
+            outdent`
+              import { unstable_catchError } from 'next/error'
+              ${exportCode}
+            `,
+          ],
+        ])
+      )
+
+      const { session } = sandbox
+      await session.waitForRedbox()
+      expect(await session.getRedboxSource()).toInclude(
+        'You\'re importing a component that needs `unstable_catchError`. This React Hook only works in a Client Component. To fix, mark the file (or its parent) with the `"use client"` directive.'
+      )
+    }
+  )
+
   it('should allow to use and handle rsc poisoning server-only', async () => {
     await using sandbox = await createSandbox(
       next,
diff --git a/test/development/app-dir/enabled-features-trace/enabled-features-trace.test.ts b/test/development/app-dir/enabled-features-trace/enabled-features-trace.test.ts
index b94a17b58397d..33f5c8d6fd490 100644
--- a/test/development/app-dir/enabled-features-trace/enabled-features-trace.test.ts
+++ b/test/development/app-dir/enabled-features-trace/enabled-features-trace.test.ts
@@ -8,7 +8,7 @@ import { parseTraceFile } from '../../../lib/parse-trace-file'
 describe('enabled features in trace', () => {
   const { next, isNextDev } = nextTestSetup({
     files: __dirname,
-    startArgs: ['--experimental-server-fast-refresh'],
+    startArgs: ['--no-server-fast-refresh'],
   })
 
   if (!isNextDev) {
@@ -37,9 +37,9 @@ describe('enabled features in trace', () => {
 
     const startDevServerEvent = startDevServerEvents![0]
     expect(startDevServerEvent.tags).toBeDefined()
-    expect(
-      startDevServerEvent.tags!['feature.experimentalServerFastRefresh']
-    ).toBe(true)
+    expect(startDevServerEvent.tags!['feature.serverFastRefreshDisabled']).toBe(
+      true
+    )
   })
 
   it('should denormalize inherited enabled features during upload', async () => {
@@ -99,16 +99,14 @@ describe('enabled features in trace', () => {
     const compilePathEvent = traces.find((e: any) => e.name === 'compile-path')
     const renderPathEvent = traces.find((e: any) => e.name === 'render-path')
 
-    // Both should have inherited feature.experimentalServerFastRefresh from their parent
+    // Both should have inherited feature.serverFastRefreshDisabled from their parent
     expect(compilePathEvent).toBeDefined()
-    expect(compilePathEvent.tags['feature.experimentalServerFastRefresh']).toBe(
+    expect(compilePathEvent.tags['feature.serverFastRefreshDisabled']).toBe(
       true
     )
 
     expect(renderPathEvent).toBeDefined()
-    expect(renderPathEvent.tags['feature.experimentalServerFastRefresh']).toBe(
-      true
-    )
+    expect(renderPathEvent.tags['feature.serverFastRefreshDisabled']).toBe(true)
   })
 })
 
diff --git a/test/development/app-dir/instant-navs-devtools/instant-navs-devtools.test.ts b/test/development/app-dir/instant-navs-devtools/instant-navs-devtools.test.ts
index 82fb93cd8e92e..5792beccc3be5 100644
--- a/test/development/app-dir/instant-navs-devtools/instant-navs-devtools.test.ts
+++ b/test/development/app-dir/instant-navs-devtools/instant-navs-devtools.test.ts
@@ -3,7 +3,7 @@ import { retry, toggleDevToolsIndicatorPopover } from 'next-test-utils'
 import { Playwright } from 'next-webdriver'
 
 describe('instant-nav-panel', () => {
-  const { next } = nextTestSetup({
+  const { isNextDev, isTurbopack, next } = nextTestSetup({
     files: __dirname,
   })
 
@@ -14,12 +14,19 @@ describe('instant-nav-panel', () => {
     await new Promise((resolve) =>
       setTimeout(
         resolve,
-        // MENU_DURATION_MS
-        200
+        // MENU_DURATION_MS + some flakiness buffer
+        200 + 50
       )
     )
   }
 
+  async function waitForInstantModeCookie(browser: Playwright): Promise<void> {
+    await retry(async () => {
+      const cookie = await browser.eval(() => document.cookie)
+      expect(cookie).toMatch(/next-instant-navigation-testing=[^;]+/)
+    })
+  }
+
   async function clearInstantModeCookie(browser: Playwright) {
     await browser.eval(() => {
       document.cookie = 'next-instant-navigation-testing=; path=/; max-age=0'
@@ -32,6 +39,7 @@ describe('instant-nav-panel', () => {
 
   async function clickStartClientNav(browser: Playwright) {
     await browser.elementByCssInstant('[data-instant-nav-client]').click()
+    await waitForInstantModeCookie(browser)
   }
 
   async function getInstantNavPanelText(browser: Playwright): Promise<string> {
@@ -84,6 +92,11 @@ describe('instant-nav-panel', () => {
   })
 
   it('should show client nav state after clicking Start and navigating', async () => {
+    const targetPage = '/target-page/my-post?search=foo'
+    if (isNextDev && !isTurbopack) {
+      // warmup target page compilation before clicking Start, to avoid extra flakiness.
+      void next.render(targetPage).catch(() => {})
+    }
     const browser = await next.browser('/')
     await clearInstantModeCookie(browser)
     await browser.waitForElementByCss('[data-testid="home-title"]')
@@ -94,10 +107,7 @@ describe('instant-nav-panel', () => {
     await clickStartClientNav(browser)
 
     // Cookie should now be set
-    await retry(async () => {
-      const cookie = await browser.eval(() => document.cookie)
-      expect(cookie).toContain('next-instant-navigation-testing=')
-    })
+    await waitForInstantModeCookie(browser)
 
     // Panel should show client-nav-waiting state
     await retry(async () => {
@@ -107,9 +117,9 @@ describe('instant-nav-panel', () => {
     })
 
     // Navigate to target page via SPA (use eval to bypass overlay pointer interception)
-    await browser.eval(() => {
-      document.querySelector<HTMLAnchorElement>('#link-to-target')!.click()
-    })
+    await browser.eval((page) => {
+      document.querySelector<HTMLAnchorElement>(`[href="${page}"]`)!.click()
+    }, targetPage)
 
     // Panel should transition to client-nav state
     await retry(async () => {
@@ -124,6 +134,11 @@ describe('instant-nav-panel', () => {
   })
 
   it('should show loading skeleton during SPA navigation after clicking Start', async () => {
+    const targetPage = '/target-page/my-post?search=foo'
+    if (isNextDev && !isTurbopack) {
+      // warmup target page compilation before clicking Start, to avoid extra flakiness.
+      void next.render(targetPage).catch(() => {})
+    }
     const browser = await next.browser('/')
     await clearInstantModeCookie(browser)
     await browser.waitForElementByCss('[data-testid="home-title"]')
@@ -134,9 +149,9 @@ describe('instant-nav-panel', () => {
     await clickStartClientNav(browser)
 
     // Navigate to target page via SPA (use eval to bypass overlay pointer interception)
-    await browser.eval(() => {
-      document.querySelector<HTMLAnchorElement>('#link-to-target')!.click()
-    })
+    await browser.eval((page) => {
+      document.querySelector<HTMLAnchorElement>(`[href="${page}"]`)!.click()
+    }, targetPage)
 
     // The data fetching skeleton should be visible (dynamic content is locked).
     // Use a longer timeout because dev mode needs to compile the target page.
diff --git a/test/development/app-dir/server-hmr/server-hmr.test.ts b/test/development/app-dir/server-hmr/server-hmr.test.ts
index 84e81a4db71c0..d3cad766240c7 100644
--- a/test/development/app-dir/server-hmr/server-hmr.test.ts
+++ b/test/development/app-dir/server-hmr/server-hmr.test.ts
@@ -5,7 +5,6 @@ import { retry } from 'next-test-utils'
 describe('server-hmr', () => {
   const { next, isTurbopack, isNextDev } = nextTestSetup({
     files: __dirname,
-    startArgs: ['--experimental-server-fast-refresh'],
   })
 
   // Server HMR is a Turbopack-only feature, only available in dev mode
diff --git a/test/development/basic/allowed-dev-origins.test.ts b/test/development/basic/allowed-dev-origins.test.ts
index ee010875400ee..136cc600bc510 100644
--- a/test/development/basic/allowed-dev-origins.test.ts
+++ b/test/development/basic/allowed-dev-origins.test.ts
@@ -116,7 +116,8 @@ describe.each([['', '/docs']])(
               const script = document.createElement('script')
               script.src = "${next.url}/_next/static/chunks/pages/_app.js"
               
-              script.onerror = (err) => {
+              script.onerror = (error) => {
+                console.error('script error', error)
                 statusEl.innerText = 'error'
               }
               script.onload = () => {
@@ -126,7 +127,13 @@ describe.each([['', '/docs']])(
             })()`
 
           // ensure direct port with mismatching port is blocked
-          const browser = await webdriver(`http://127.0.0.1:${port}`, '/about')
+          const browser = await webdriver(
+            `http://127.0.0.1:${port}`,
+            '/about',
+            {
+              permissions: ['local-network-access'],
+            }
+          )
           await browser.eval(scriptSnippet)
 
           await retry(async () => {
@@ -136,6 +143,7 @@ describe.each([['', '/docs']])(
           })
 
           // ensure different host is blocked
+          // Requires local-network-access permission to send a request to next.url
           await browser.get(`https://example.vercel.sh/`)
           await browser.eval(scriptSnippet)
 
@@ -145,7 +153,11 @@ describe.each([['', '/docs']])(
             )
           })
 
-          expect(next.cliOutput).toContain('Cross origin request detected from')
+          expect(next.cliOutput).toContain(
+            // We're not sending an Origin header
+            // TODO: redundant spacing
+            'Cross origin request detected  to'
+          )
         } finally {
           server.close()
         }
@@ -361,6 +373,56 @@ describe.each([['', '/docs']])(
           server.close()
         }
       })
+
+      it('blocks cross-site requests from privacy-sensitive origins', async () => {
+        const server = http.createServer((req, res) => {
+          res.appendHeader('Content-Security-Policy', 'sandbox allow-scripts')
+          res.end(`
+            <html>
+              <head>
+                <title>testing cross-site privacy-sensitive</title> 
+              </head>
+              <body>
+                <script>
+                  (() => {
+                    const statusEl = document.createElement('p')
+                    statusEl.id = 'status'
+                    document.querySelector('body').appendChild(statusEl)
+        
+                    const ws = new WebSocket("${next.url}/_next/webpack-hmr")
+                    
+                    ws.addEventListener('error', (err) => {
+                      statusEl.innerText = 'error'
+                    })
+                    ws.addEventListener('open', () => {
+                      statusEl.innerText = 'connected'
+                    })
+                  })()
+                </script>
+              </body>
+            </html>
+          `)
+        })
+
+        const port = await findPort()
+        await new Promise<void>((res) => {
+          server.listen(port, () => res())
+        })
+
+        try {
+          const browser = await webdriver(`http://127.0.0.1:${port}`, '/')
+
+          await retry(async () => {
+            expect(await browser.elementByCss('#status').text()).toBe('error')
+          })
+        } finally {
+          await new Promise<void>((res) => {
+            server.close(() => {
+              res()
+            })
+          })
+        }
+      })
     })
   }
 )
diff --git a/test/e2e/app-dir/catch-error/app/client-component/catch-error-wrapper.tsx b/test/e2e/app-dir/catch-error/app/client-component/catch-error-wrapper.tsx
new file mode 100644
index 0000000000000..e5b75997081dd
--- /dev/null
+++ b/test/e2e/app-dir/catch-error/app/client-component/catch-error-wrapper.tsx
@@ -0,0 +1,24 @@
+'use client'
+
+import type { ErrorInfo } from 'next/error'
+import { unstable_catchError } from 'next/error'
+
+export function ErrorFallback(
+  props: { title: string },
+  { error, reset, unstable_retry }: ErrorInfo
+) {
+  return (
+    <>
+      <p id="error-boundary-message">{error.message}</p>
+      <p id="error-boundary-title">{props.title}</p>
+      <button id="reset" onClick={() => reset()}>
+        Reset
+      </button>
+      <button id="retry" onClick={() => unstable_retry()}>
+        Retry
+      </button>
+    </>
+  )
+}
+
+export default unstable_catchError(ErrorFallback)
diff --git a/test/e2e/app-dir/catch-error/app/client-component/layout.tsx b/test/e2e/app-dir/catch-error/app/client-component/layout.tsx
new file mode 100644
index 0000000000000..27d5f60e5fe81
--- /dev/null
+++ b/test/e2e/app-dir/catch-error/app/client-component/layout.tsx
@@ -0,0 +1,5 @@
+import ErrorWrapper from './catch-error-wrapper'
+
+export default function Layout({ children }: { children: React.ReactNode }) {
+  return <ErrorWrapper title="client-catch-error">{children}</ErrorWrapper>
+}
diff --git a/test/e2e/app-dir/catch-error/app/client-component/page.tsx b/test/e2e/app-dir/catch-error/app/client-component/page.tsx
new file mode 100644
index 0000000000000..a7801e4f117be
--- /dev/null
+++ b/test/e2e/app-dir/catch-error/app/client-component/page.tsx
@@ -0,0 +1,20 @@
+'use client'
+
+import { useState } from 'react'
+
+export default function Page() {
+  const [clicked, setClicked] = useState(false)
+  if (clicked) {
+    throw new Error('this is a test')
+  }
+  return (
+    <button
+      id="error-trigger-button"
+      onClick={() => {
+        setClicked(true)
+      }}
+    >
+      Trigger Error!
+    </button>
+  )
+}
diff --git a/test/e2e/app-dir/catch-error/app/layout.tsx b/test/e2e/app-dir/catch-error/app/layout.tsx
new file mode 100644
index 0000000000000..dbce4ea8e3aeb
--- /dev/null
+++ b/test/e2e/app-dir/catch-error/app/layout.tsx
@@ -0,0 +1,11 @@
+export default function RootLayout({
+  children,
+}: {
+  children: React.ReactNode
+}) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/e2e/app-dir/catch-error/app/server-component/catch-error-wrapper.tsx b/test/e2e/app-dir/catch-error/app/server-component/catch-error-wrapper.tsx
new file mode 100644
index 0000000000000..e3879f6facf01
--- /dev/null
+++ b/test/e2e/app-dir/catch-error/app/server-component/catch-error-wrapper.tsx
@@ -0,0 +1,23 @@
+'use client'
+import type { ErrorInfo } from 'next/error'
+import { unstable_catchError } from 'next/error'
+
+export function ErrorFallback(
+  props: { title: string },
+  { error, reset, unstable_retry }: ErrorInfo
+) {
+  return (
+    <>
+      <p id="error-boundary-message">{error.message}</p>
+      <p id="error-boundary-title">{props.title}</p>
+      <button id="reset" onClick={() => reset()}>
+        Reset
+      </button>
+      <button id="retry" onClick={() => unstable_retry()}>
+        Retry
+      </button>
+    </>
+  )
+}
+
+export default unstable_catchError(ErrorFallback)
diff --git a/test/e2e/app-dir/catch-error/app/server-component/layout.tsx b/test/e2e/app-dir/catch-error/app/server-component/layout.tsx
new file mode 100644
index 0000000000000..adb332c85bd48
--- /dev/null
+++ b/test/e2e/app-dir/catch-error/app/server-component/layout.tsx
@@ -0,0 +1,7 @@
+import ErrorWrapper from './catch-error-wrapper'
+
+export default function Layout({ children }: { children: React.ReactNode }) {
+  // A prop can be passed from the RSC to the error component
+  const title = 'server-catch-error'
+  return <ErrorWrapper title={title}>{children}</ErrorWrapper>
+}
diff --git a/test/e2e/app-dir/catch-error/app/server-component/page.tsx b/test/e2e/app-dir/catch-error/app/server-component/page.tsx
new file mode 100644
index 0000000000000..b01e63ef3bdf3
--- /dev/null
+++ b/test/e2e/app-dir/catch-error/app/server-component/page.tsx
@@ -0,0 +1,23 @@
+import { Suspense } from 'react'
+import { connection } from 'next/server'
+
+export default function Page() {
+  return (
+    <Suspense>
+      <PageImpl />
+    </Suspense>
+  )
+}
+
+let hasThrown = false
+
+async function PageImpl() {
+  await connection()
+
+  if (!hasThrown) {
+    hasThrown = true
+    throw new Error('this is a test')
+  }
+
+  return <p id="recover">Recovered</p>
+}
diff --git a/test/e2e/app-dir/catch-error/catch-error-react-compiler.test.ts b/test/e2e/app-dir/catch-error/catch-error-react-compiler.test.ts
new file mode 100644
index 0000000000000..d5df42b9f5775
--- /dev/null
+++ b/test/e2e/app-dir/catch-error/catch-error-react-compiler.test.ts
@@ -0,0 +1,113 @@
+import { nextTestSetup } from 'e2e-utils'
+
+describe('app-dir - unstable_catchError with react compiler', () => {
+  const { next, isNextDev } = nextTestSetup({
+    files: __dirname,
+    nextConfig: {
+      reactCompiler: true,
+    },
+    dependencies: {
+      'babel-plugin-react-compiler': 'latest',
+    },
+  })
+
+  it('should recover Client Component error after reset', async () => {
+    const browser = await next.browser('/client-component')
+
+    // Try triggering and resetting a few times in a row
+    for (let i = 0; i < 5; i++) {
+      await browser
+        .elementByCss('#error-trigger-button')
+        .click()
+        .waitForElementByCss('#error-boundary-message')
+
+      expect(await browser.elementByCss('#error-boundary-message').text()).toBe(
+        'this is a test'
+      )
+
+      await browser
+        .elementByCss('#reset')
+        .click()
+        .waitForElementByCss('#error-trigger-button')
+
+      expect(await browser.elementByCss('#error-trigger-button').text()).toBe(
+        'Trigger Error!'
+      )
+    }
+  })
+
+  it('should recover Client Component error after unstable_retry', async () => {
+    const browser = await next.browser('/client-component')
+
+    // Try triggering and retrying a few times in a row
+    for (let i = 0; i < 5; i++) {
+      await browser
+        .elementByCss('#error-trigger-button')
+        .click()
+        .waitForElementByCss('#error-boundary-message')
+
+      expect(await browser.elementByCss('#error-boundary-message').text()).toBe(
+        'this is a test'
+      )
+
+      await browser
+        .elementByCss('#retry')
+        .click()
+        .waitForElementByCss('#error-trigger-button')
+
+      expect(await browser.elementByCss('#error-trigger-button').text()).toBe(
+        'Trigger Error!'
+      )
+    }
+  })
+
+  it('should recover Server Component error after unstable_retry', async () => {
+    const browser = await next.browser('/server-component')
+
+    expect(await browser.elementByCss('#error-boundary-message').text()).toBe(
+      isNextDev
+        ? 'this is a test'
+        : 'An error occurred in the Server Components render. The specific message is omitted in production builds to avoid leaking sensitive details. A digest property is included on this error instance which may provide additional details about the nature of the error.'
+    )
+
+    await browser.elementByCss('#retry').click().waitForElementByCss('#recover')
+
+    expect(await browser.elementByCss('#recover').text()).toBe('Recovered')
+  })
+
+  it('should recover after reset on Pages Router', async () => {
+    const browser = await next.browser('/pages-router')
+
+    await browser
+      .elementByCss('#pages-trigger')
+      .click()
+      .waitForElementByCss('#pages-error-message')
+
+    expect(await browser.elementByCss('#pages-error-message').text()).toBe(
+      'this is a pages test'
+    )
+
+    await browser.eval(`document.getElementById('pages-reset')?.click()`)
+    await browser.waitForElementByCss('#pages-trigger')
+
+    expect(await browser.elementByCss('#pages-trigger').text()).toBe(
+      'Trigger Error!'
+    )
+  })
+
+  it('should throw when unstable_retry is called on Pages Router', async () => {
+    const browser = await next.browser('/pages-router')
+
+    await browser
+      .elementByCss('#pages-trigger')
+      .click()
+      .waitForElementByCss('#pages-error-message')
+
+    await browser.eval(`document.getElementById('pages-retry')?.click()`)
+    await browser.waitForElementByCss('#pages-retry-error')
+
+    expect(await browser.elementByCss('#pages-retry-error').text()).toBe(
+      '`unstable_retry()` can only be used in the App Router. Use `reset()` in the Pages Router.'
+    )
+  })
+})
diff --git a/test/e2e/app-dir/catch-error/catch-error.test.ts b/test/e2e/app-dir/catch-error/catch-error.test.ts
new file mode 100644
index 0000000000000..d3f9ad36ae6fd
--- /dev/null
+++ b/test/e2e/app-dir/catch-error/catch-error.test.ts
@@ -0,0 +1,107 @@
+import { nextTestSetup } from 'e2e-utils'
+
+describe('app-dir - unstable_catchError', () => {
+  const { next, isNextDev } = nextTestSetup({
+    files: __dirname,
+  })
+
+  it('should recover Client Component error after reset', async () => {
+    const browser = await next.browser('/client-component')
+
+    // Try triggering and resetting a few times in a row
+    for (let i = 0; i < 5; i++) {
+      await browser
+        .elementByCss('#error-trigger-button')
+        .click()
+        .waitForElementByCss('#error-boundary-message')
+
+      expect(await browser.elementByCss('#error-boundary-message').text()).toBe(
+        'this is a test'
+      )
+
+      await browser
+        .elementByCss('#reset')
+        .click()
+        .waitForElementByCss('#error-trigger-button')
+
+      expect(await browser.elementByCss('#error-trigger-button').text()).toBe(
+        'Trigger Error!'
+      )
+    }
+  })
+
+  it('should recover Client Component error after unstable_retry', async () => {
+    const browser = await next.browser('/client-component')
+
+    // Try triggering and retrying a few times in a row
+    for (let i = 0; i < 5; i++) {
+      await browser
+        .elementByCss('#error-trigger-button')
+        .click()
+        .waitForElementByCss('#error-boundary-message')
+
+      expect(await browser.elementByCss('#error-boundary-message').text()).toBe(
+        'this is a test'
+      )
+
+      await browser
+        .elementByCss('#retry')
+        .click()
+        .waitForElementByCss('#error-trigger-button')
+
+      expect(await browser.elementByCss('#error-trigger-button').text()).toBe(
+        'Trigger Error!'
+      )
+    }
+  })
+
+  it('should recover Server Component error after unstable_retry', async () => {
+    const browser = await next.browser('/server-component')
+
+    expect(await browser.elementByCss('#error-boundary-message').text()).toBe(
+      isNextDev
+        ? 'this is a test'
+        : 'An error occurred in the Server Components render. The specific message is omitted in production builds to avoid leaking sensitive details. A digest property is included on this error instance which may provide additional details about the nature of the error.'
+    )
+
+    await browser.elementByCss('#retry').click().waitForElementByCss('#recover')
+
+    expect(await browser.elementByCss('#recover').text()).toBe('Recovered')
+  })
+
+  it('should recover after reset on Pages Router', async () => {
+    const browser = await next.browser('/pages-router')
+
+    await browser
+      .elementByCss('#pages-trigger')
+      .click()
+      .waitForElementByCss('#pages-error-message')
+
+    expect(await browser.elementByCss('#pages-error-message').text()).toBe(
+      'this is a pages test'
+    )
+
+    await browser.eval(`document.getElementById('pages-reset')?.click()`)
+    await browser.waitForElementByCss('#pages-trigger')
+
+    expect(await browser.elementByCss('#pages-trigger').text()).toBe(
+      'Trigger Error!'
+    )
+  })
+
+  it('should throw when unstable_retry is called on Pages Router', async () => {
+    const browser = await next.browser('/pages-router')
+
+    await browser
+      .elementByCss('#pages-trigger')
+      .click()
+      .waitForElementByCss('#pages-error-message')
+
+    await browser.eval(`document.getElementById('pages-retry')?.click()`)
+    await browser.waitForElementByCss('#pages-retry-error')
+
+    expect(await browser.elementByCss('#pages-retry-error').text()).toBe(
+      '`unstable_retry()` can only be used in the App Router. Use `reset()` in the Pages Router.'
+    )
+  })
+})
diff --git a/test/e2e/app-dir/catch-error/pages/pages-router.tsx b/test/e2e/app-dir/catch-error/pages/pages-router.tsx
new file mode 100644
index 0000000000000..82c5b8c4a3dec
--- /dev/null
+++ b/test/e2e/app-dir/catch-error/pages/pages-router.tsx
@@ -0,0 +1,60 @@
+import { useState } from 'react'
+import { unstable_catchError, type ErrorInfo } from 'next/error'
+
+function ErrorFallback(
+  { clearError }: { clearError: () => void },
+  { error, reset, unstable_retry }: ErrorInfo
+) {
+  const [retryError, setRetryError] = useState<string | null>(null)
+
+  return (
+    <>
+      <p id="pages-error-message">{error.message}</p>
+      <button
+        id="pages-reset"
+        onClick={() => {
+          clearError()
+          reset()
+        }}
+      >
+        Reset
+      </button>
+      <button
+        id="pages-retry"
+        onClick={() => {
+          try {
+            unstable_retry()
+          } catch (error) {
+            setRetryError((error as Error).message)
+          }
+        }}
+      >
+        Retry
+      </button>
+      {retryError ? <p id="pages-retry-error">{retryError}</p> : null}
+    </>
+  )
+}
+
+const ErrorBoundary = unstable_catchError(ErrorFallback)
+
+function ErrorThrower({ shouldThrow }: { shouldThrow: boolean }) {
+  if (shouldThrow) {
+    throw new Error('this is a pages test')
+  }
+
+  return null
+}
+
+export default function Page() {
+  const [shouldThrow, setShouldThrow] = useState(false)
+
+  return (
+    <ErrorBoundary clearError={() => setShouldThrow(false)}>
+      <button id="pages-trigger" onClick={() => setShouldThrow(true)}>
+        Trigger Error!
+      </button>
+      <ErrorThrower shouldThrow={shouldThrow} />
+    </ErrorBoundary>
+  )
+}
diff --git a/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/dynamic-stale-10/page.tsx b/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/dynamic-stale-10/page.tsx
new file mode 100644
index 0000000000000..7bbc8d161ace1
--- /dev/null
+++ b/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/dynamic-stale-10/page.tsx
@@ -0,0 +1,19 @@
+import { Suspense } from 'react'
+import { connection } from 'next/server'
+
+export const unstable_dynamicStaleTime = 10
+
+async function Content() {
+  await connection()
+  return (
+    <div id="dynamic-stale-10-content">Dynamic content (stale time 10s)</div>
+  )
+}
+
+export default function Page() {
+  return (
+    <Suspense fallback="Loading...">
+      <Content />
+    </Suspense>
+  )
+}
diff --git a/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/dynamic-stale-60/page.tsx b/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/dynamic-stale-60/page.tsx
new file mode 100644
index 0000000000000..11b4b6b837e51
--- /dev/null
+++ b/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/dynamic-stale-60/page.tsx
@@ -0,0 +1,19 @@
+import { Suspense } from 'react'
+import { connection } from 'next/server'
+
+export const unstable_dynamicStaleTime = 60
+
+async function Content() {
+  await connection()
+  return (
+    <div id="dynamic-stale-60-content">Dynamic content (stale time 60s)</div>
+  )
+}
+
+export default function Page() {
+  return (
+    <Suspense fallback="Loading...">
+      <Content />
+    </Suspense>
+  )
+}
diff --git a/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/layout.tsx b/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/layout.tsx
new file mode 100644
index 0000000000000..c9a0e0bfb8fdb
--- /dev/null
+++ b/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/layout.tsx
@@ -0,0 +1,3 @@
+export default function Layout({ children }: { children: React.ReactNode }) {
+  return children
+}
diff --git a/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/page.tsx b/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/page.tsx
new file mode 100644
index 0000000000000..a0d8c8355eaf9
--- /dev/null
+++ b/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/page.tsx
@@ -0,0 +1,30 @@
+import { LinkAccordion } from '../../components/link-accordion'
+
+export default function Page() {
+  return (
+    <>
+      <p>
+        This page tests per-page dynamic stale time configuration via{' '}
+        <code>export const unstable_dynamicStaleTime</code>.
+      </p>
+      <ul>
+        <li>
+          <LinkAccordion href="/per-page-config/dynamic-stale-60">
+            Dynamic page with stale time of 60 seconds
+          </LinkAccordion>
+        </li>
+        <li>
+          <LinkAccordion href="/per-page-config/dynamic-stale-10">
+            Dynamic page with stale time of 10 seconds
+          </LinkAccordion>
+        </li>
+        <li>
+          <LinkAccordion href="/per-page-config/parallel-slots">
+            Parallel routes with slots having different stale times (60s and
+            15s)
+          </LinkAccordion>
+        </li>
+      </ul>
+    </>
+  )
+}
diff --git a/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/parallel-slots/@slotA/page.tsx b/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/parallel-slots/@slotA/page.tsx
new file mode 100644
index 0000000000000..e3f7ff1698da7
--- /dev/null
+++ b/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/parallel-slots/@slotA/page.tsx
@@ -0,0 +1,17 @@
+import { Suspense } from 'react'
+import { connection } from 'next/server'
+
+export const unstable_dynamicStaleTime = 60
+
+async function Content() {
+  await connection()
+  return <div id="slot-a-content">Slot A content (stale time 60s)</div>
+}
+
+export default function Page() {
+  return (
+    <Suspense fallback="Loading slot A...">
+      <Content />
+    </Suspense>
+  )
+}
diff --git a/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/parallel-slots/@slotB/page.tsx b/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/parallel-slots/@slotB/page.tsx
new file mode 100644
index 0000000000000..f500f083220ea
--- /dev/null
+++ b/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/parallel-slots/@slotB/page.tsx
@@ -0,0 +1,17 @@
+import { Suspense } from 'react'
+import { connection } from 'next/server'
+
+export const unstable_dynamicStaleTime = 15
+
+async function Content() {
+  await connection()
+  return <div id="slot-b-content">Slot B content (stale time 15s)</div>
+}
+
+export default function Page() {
+  return (
+    <Suspense fallback="Loading slot B...">
+      <Content />
+    </Suspense>
+  )
+}
diff --git a/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/parallel-slots/layout.tsx b/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/parallel-slots/layout.tsx
new file mode 100644
index 0000000000000..b85446d92ddf7
--- /dev/null
+++ b/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/parallel-slots/layout.tsx
@@ -0,0 +1,17 @@
+export default function Layout({
+  children,
+  slotA,
+  slotB,
+}: {
+  children: React.ReactNode
+  slotA: React.ReactNode
+  slotB: React.ReactNode
+}) {
+  return (
+    <div>
+      {children}
+      {slotA}
+      {slotB}
+    </div>
+  )
+}
diff --git a/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/parallel-slots/page.tsx b/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/parallel-slots/page.tsx
new file mode 100644
index 0000000000000..c17431379f962
--- /dev/null
+++ b/test/e2e/app-dir/segment-cache/staleness/app/per-page-config/parallel-slots/page.tsx
@@ -0,0 +1,3 @@
+export default function Page() {
+  return null
+}
diff --git a/test/e2e/app-dir/segment-cache/staleness/segment-cache-per-page-dynamic-stale-time.test.ts b/test/e2e/app-dir/segment-cache/staleness/segment-cache-per-page-dynamic-stale-time.test.ts
new file mode 100644
index 0000000000000..39f3467dcbc6a
--- /dev/null
+++ b/test/e2e/app-dir/segment-cache/staleness/segment-cache-per-page-dynamic-stale-time.test.ts
@@ -0,0 +1,352 @@
+import { nextTestSetup } from 'e2e-utils'
+import type * as Playwright from 'playwright'
+import { createRouterAct } from 'router-act'
+
+describe('segment cache (per-page dynamic stale time)', () => {
+  const { next, isNextDev } = nextTestSetup({
+    files: __dirname,
+  })
+  if (isNextDev) {
+    test('disabled in development', () => {})
+    return
+  }
+
+  async function startBrowserWithFakeClock(url: string) {
+    let page!: Playwright.Page
+    const startDate = Date.now()
+
+    const browser = await next.browser(url, {
+      async beforePageLoad(p: Playwright.Page) {
+        page = p
+        await page.clock.install()
+        await page.clock.setFixedTime(startDate)
+      },
+    })
+
+    const act = createRouterAct(page)
+
+    return { browser, page, act, startDate }
+  }
+
+  it('reuses dynamic data within the per-page stale time window', async () => {
+    const { browser, page, act, startDate } =
+      await startBrowserWithFakeClock('/per-page-config')
+
+    // Navigate to the dynamic page with unstable_dynamicStaleTime = 60
+    await act(
+      async () => {
+        const toggle = await browser.elementByCss(
+          'input[data-link-accordion="/per-page-config/dynamic-stale-60"]'
+        )
+        await toggle.click()
+        const link = await browser.elementByCss(
+          'a[href="/per-page-config/dynamic-stale-60"]'
+        )
+        await link.click()
+      },
+      {
+        includes: 'Dynamic content (stale time 60s)',
+      }
+    )
+    expect(await browser.elementById('dynamic-stale-60-content').text()).toBe(
+      'Dynamic content (stale time 60s)'
+    )
+
+    // Go back to the starting page
+    await browser.back()
+
+    // Advance to 59 seconds. The per-page stale time is 60s (which overrides
+    // the global staleTimes.dynamic of 30s), so the data should still be fresh.
+    await page.clock.setFixedTime(startDate + 59 * 1000)
+
+    await act(async () => {
+      const link = await browser.elementByCss(
+        'a[href="/per-page-config/dynamic-stale-60"]'
+      )
+      await link.click()
+      expect(await browser.elementById('dynamic-stale-60-content').text()).toBe(
+        'Dynamic content (stale time 60s)'
+      )
+    }, 'no-requests')
+
+    // Go back again
+    await browser.back()
+
+    // Advance to 60 seconds. The data is now stale, so a new request
+    // should be made.
+    await page.clock.setFixedTime(startDate + 60 * 1000)
+
+    await act(
+      async () => {
+        const link = await browser.elementByCss(
+          'a[href="/per-page-config/dynamic-stale-60"]'
+        )
+        await link.click()
+      },
+      { includes: 'Dynamic content (stale time 60s)' }
+    )
+    expect(await browser.elementById('dynamic-stale-60-content').text()).toBe(
+      'Dynamic content (stale time 60s)'
+    )
+  })
+
+  it('back/forward navigation always reuses BFCache regardless of stale time', async () => {
+    const { browser, page, act, startDate } =
+      await startBrowserWithFakeClock('/per-page-config')
+
+    // Navigate to the dynamic page with unstable_dynamicStaleTime = 60
+    await act(
+      async () => {
+        const toggle = await browser.elementByCss(
+          'input[data-link-accordion="/per-page-config/dynamic-stale-60"]'
+        )
+        await toggle.click()
+        const link = await browser.elementByCss(
+          'a[href="/per-page-config/dynamic-stale-60"]'
+        )
+        await link.click()
+      },
+      {
+        includes: 'Dynamic content (stale time 60s)',
+      }
+    )
+    expect(await browser.elementById('dynamic-stale-60-content').text()).toBe(
+      'Dynamic content (stale time 60s)'
+    )
+
+    // Go back to the starting page
+    await browser.back()
+
+    // Advance time well past the 60s stale time
+    await page.clock.setFixedTime(startDate + 120 * 1000)
+
+    // Use browser.forward() to go forward. Back/forward navigation should
+    // always reuse the BFCache, regardless of stale time.
+    await act(async () => {
+      await browser.forward()
+      expect(await browser.elementById('dynamic-stale-60-content').text()).toBe(
+        'Dynamic content (stale time 60s)'
+      )
+    }, 'no-requests')
+  })
+
+  it('two dynamic pages with different stale times behave independently', async () => {
+    const { browser, page, act, startDate } =
+      await startBrowserWithFakeClock('/per-page-config')
+
+    // Navigate to the dynamic page with unstable_dynamicStaleTime = 60
+    await act(
+      async () => {
+        const toggle = await browser.elementByCss(
+          'input[data-link-accordion="/per-page-config/dynamic-stale-60"]'
+        )
+        await toggle.click()
+        const link = await browser.elementByCss(
+          'a[href="/per-page-config/dynamic-stale-60"]'
+        )
+        await link.click()
+      },
+      {
+        includes: 'Dynamic content (stale time 60s)',
+      }
+    )
+    expect(await browser.elementById('dynamic-stale-60-content').text()).toBe(
+      'Dynamic content (stale time 60s)'
+    )
+
+    // Go back to the starting page
+    await browser.back()
+
+    // Navigate to the dynamic page with unstable_dynamicStaleTime = 10
+    await act(
+      async () => {
+        const toggle = await browser.elementByCss(
+          'input[data-link-accordion="/per-page-config/dynamic-stale-10"]'
+        )
+        await toggle.click()
+        const link = await browser.elementByCss(
+          'a[href="/per-page-config/dynamic-stale-10"]'
+        )
+        await link.click()
+      },
+      {
+        includes: 'Dynamic content (stale time 10s)',
+      }
+    )
+    expect(await browser.elementById('dynamic-stale-10-content').text()).toBe(
+      'Dynamic content (stale time 10s)'
+    )
+
+    // Go back to the starting page
+    await browser.back()
+
+    // Advance to 11 seconds. The 10s page should be stale, but the 60s page
+    // should still be fresh.
+    await page.clock.setFixedTime(startDate + 11 * 1000)
+
+    // Navigate to the 10s page — should be stale, triggering a new request
+    await act(
+      async () => {
+        const link = await browser.elementByCss(
+          'a[href="/per-page-config/dynamic-stale-10"]'
+        )
+        await link.click()
+      },
+      { includes: 'Dynamic content (stale time 10s)' }
+    )
+    expect(await browser.elementById('dynamic-stale-10-content').text()).toBe(
+      'Dynamic content (stale time 10s)'
+    )
+
+    // Go back to the starting page
+    await browser.back()
+
+    // Navigate to the 60s page — should still be fresh, no new request
+    await act(async () => {
+      const link = await browser.elementByCss(
+        'a[href="/per-page-config/dynamic-stale-60"]'
+      )
+      await link.click()
+      expect(await browser.elementById('dynamic-stale-60-content').text()).toBe(
+        'Dynamic content (stale time 60s)'
+      )
+    }, 'no-requests')
+  })
+
+  it('per-page value overrides global staleTimes.dynamic regardless of direction', async () => {
+    // The global staleTimes.dynamic is 30s. This test verifies that a per-page
+    // value of 10s (smaller) causes the data to expire sooner, and a per-page
+    // value of 60s (larger) causes the data to last longer.
+    const { browser, page, act, startDate } =
+      await startBrowserWithFakeClock('/per-page-config')
+
+    // Navigate to the 10s page
+    await act(
+      async () => {
+        const toggle = await browser.elementByCss(
+          'input[data-link-accordion="/per-page-config/dynamic-stale-10"]'
+        )
+        await toggle.click()
+        const link = await browser.elementByCss(
+          'a[href="/per-page-config/dynamic-stale-10"]'
+        )
+        await link.click()
+      },
+      { includes: 'Dynamic content (stale time 10s)' }
+    )
+
+    await browser.back()
+
+    // At 11s the 10s page should be stale, even though the global default
+    // is 30s. This proves a smaller per-page value overrides the global.
+    await page.clock.setFixedTime(startDate + 11 * 1000)
+
+    await act(
+      async () => {
+        const link = await browser.elementByCss(
+          'a[href="/per-page-config/dynamic-stale-10"]'
+        )
+        await link.click()
+      },
+      { includes: 'Dynamic content (stale time 10s)' }
+    )
+
+    await browser.back()
+
+    // Now navigate to the 60s page
+    await act(
+      async () => {
+        const toggle = await browser.elementByCss(
+          'input[data-link-accordion="/per-page-config/dynamic-stale-60"]'
+        )
+        await toggle.click()
+        const link = await browser.elementByCss(
+          'a[href="/per-page-config/dynamic-stale-60"]'
+        )
+        await link.click()
+      },
+      { includes: 'Dynamic content (stale time 60s)' }
+    )
+
+    await browser.back()
+
+    // At 42s from the 60s page's navigation (11s + 31s), the data should
+    // still be fresh — the per-page value of 60s overrides the global 30s.
+    await page.clock.setFixedTime(startDate + 42 * 1000)
+
+    await act(async () => {
+      const link = await browser.elementByCss(
+        'a[href="/per-page-config/dynamic-stale-60"]'
+      )
+      await link.click()
+      expect(await browser.elementById('dynamic-stale-60-content').text()).toBe(
+        'Dynamic content (stale time 60s)'
+      )
+    }, 'no-requests')
+  })
+
+  it('with parallel routes, uses the minimum stale time across all slots', async () => {
+    const { browser, page, act, startDate } =
+      await startBrowserWithFakeClock('/per-page-config')
+
+    // Navigate to a page with parallel routes: slot A has
+    // unstable_dynamicStaleTime = 60, slot B has
+    // unstable_dynamicStaleTime = 15. The effective stale time should be
+    // min(60, 15) = 15.
+    await act(
+      async () => {
+        const toggle = await browser.elementByCss(
+          'input[data-link-accordion="/per-page-config/parallel-slots"]'
+        )
+        await toggle.click()
+        const link = await browser.elementByCss(
+          'a[href="/per-page-config/parallel-slots"]'
+        )
+        await link.click()
+      },
+      {
+        includes: 'Slot A content',
+      }
+    )
+    expect(await browser.elementById('slot-a-content').text()).toBe(
+      'Slot A content (stale time 60s)'
+    )
+    expect(await browser.elementById('slot-b-content').text()).toBe(
+      'Slot B content (stale time 15s)'
+    )
+
+    await browser.back()
+
+    // At 14s both slots should still be fresh (min is 15s)
+    await page.clock.setFixedTime(startDate + 14 * 1000)
+
+    await act(async () => {
+      const link = await browser.elementByCss(
+        'a[href="/per-page-config/parallel-slots"]'
+      )
+      await link.click()
+      expect(await browser.elementById('slot-a-content').text()).toBe(
+        'Slot A content (stale time 60s)'
+      )
+      expect(await browser.elementById('slot-b-content').text()).toBe(
+        'Slot B content (stale time 15s)'
+      )
+    }, 'no-requests')
+
+    await browser.back()
+
+    // At 16s the data should be stale because slot B's stale time (15s)
+    // has elapsed.
+    await page.clock.setFixedTime(startDate + 16 * 1000)
+
+    await act(
+      async () => {
+        const link = await browser.elementByCss(
+          'a[href="/per-page-config/parallel-slots"]'
+        )
+        await link.click()
+      },
+      { includes: 'Slot A content' }
+    )
+  })
+})
diff --git a/test/e2e/use-router-with-rewrites/use-router-with-rewrites.test.ts b/test/e2e/use-router-with-rewrites/use-router-with-rewrites.test.ts
index 62617ac6deb67..b8a8d14262988 100644
--- a/test/e2e/use-router-with-rewrites/use-router-with-rewrites.test.ts
+++ b/test/e2e/use-router-with-rewrites/use-router-with-rewrites.test.ts
@@ -1,4 +1,5 @@
 import { nextTestSetup } from 'e2e-utils'
+import { retry } from 'next-test-utils'
 
 describe('use-router-with-rewrites', () => {
   const { next } = nextTestSetup({
@@ -68,30 +69,33 @@ describe('use-router-with-rewrites', () => {
       const browser = await next.browser('/rewrite-to-same-segment/0')
       await browser.elementById('router-push').click()
 
+      await retry(async () => {
+        expect(await browser.elementByCss('p').text()).toBe('1')
+      })
       const url = new URL(await browser.url())
       expect(url.pathname + url.search).toBe('/rewrite-to-same-segment/1')
-
-      expect(await browser.elementByCss('p').text()).toBe('1')
     })
 
     it('should preserve current pathname when using useRouter.replace with rewrites on dynamic route', async () => {
       const browser = await next.browser('/rewrite-to-same-segment/0')
       await browser.elementById('router-replace').click()
 
+      await retry(async () => {
+        expect(await browser.elementByCss('p').text()).toBe('2')
+      })
       const url = new URL(await browser.url())
       expect(url.pathname + url.search).toBe('/rewrite-to-same-segment/2')
-
-      expect(await browser.elementByCss('p').text()).toBe('2')
     })
 
     it('should preserve current pathname when using Link with rewrites on dynamic route', async () => {
       const browser = await next.browser('/rewrite-to-same-segment/0')
       await browser.elementByCss('a').click()
 
+      await retry(async () => {
+        expect(await browser.elementByCss('p').text()).toBe('3')
+      })
       const url = new URL(await browser.url())
       expect(url.pathname + url.search).toBe('/rewrite-to-same-segment/3')
-
-      expect(await browser.elementByCss('p').text()).toBe('3')
     })
   })
 })
diff --git a/test/integration/dynamic-routing/test/index.test.ts b/test/integration/dynamic-routing/test/index.test.ts
index 89d486c61816a..b89fcf32fab1a 100644
--- a/test/integration/dynamic-routing/test/index.test.ts
+++ b/test/integration/dynamic-routing/test/index.test.ts
@@ -17,6 +17,7 @@ import {
   check,
   getRedboxHeader,
   normalizeManifest,
+  retry,
 } from 'next-test-utils'
 import cheerio from 'cheerio'
 
@@ -245,11 +246,12 @@ function runTests({ dev }) {
 
       await browser.eval('window.beforeNav = 1')
       await browser.elementByCss(`#${id}`).click()
-      await check(() => browser.eval('window.location.pathname'), pathname)
 
-      expect(JSON.parse(await browser.elementByCss('#query').text())).toEqual(
-        navQuery
-      )
+      await retry(async () => {
+        expect(JSON.parse(await browser.elementByCss('#query').text())).toEqual(
+          navQuery
+        )
+      })
       expect(await browser.eval('window.location.pathname')).toBe(pathname)
       expect(await browser.eval('window.location.hash')).toBe(hash)
       expect(
diff --git a/test/lib/browsers/playwright.ts b/test/lib/browsers/playwright.ts
index cca74133c8a08..dbd80182139dc 100644
--- a/test/lib/browsers/playwright.ts
+++ b/test/lib/browsers/playwright.ts
@@ -12,6 +12,7 @@ import {
   Locator,
   Request as PlaywrightRequest,
   Response as PlaywrightResponse,
+  BrowserContextOptions,
 } from 'playwright'
 import path from 'path'
 
@@ -19,10 +20,13 @@ type EventType = 'request' | 'response'
 
 type PageLog = { source: string; message: string; args: unknown[] }
 
+export type Permissions = BrowserContextOptions['permissions']
+
 let page: Page
 let browser: Browser | undefined
 let context: BrowserContext | undefined
 let contextHasJSEnabled: boolean = true
+let contextPermissions: Permissions = undefined
 let pageLogs: Array<Promise<PageLog> | PageLog> = []
 let websocketFrames: Array<{ payload: string | Buffer }> = []
 
@@ -167,7 +171,8 @@ export class Playwright<TCurrent = undefined> {
     javaScriptEnabled: boolean,
     ignoreHTTPSErrors: boolean,
     headless: boolean,
-    userAgent: string | undefined
+    userAgent: string | undefined,
+    permissions: Permissions
   ) {
     let device
 
@@ -182,7 +187,13 @@ export class Playwright<TCurrent = undefined> {
     }
 
     if (browser) {
-      if (contextHasJSEnabled !== javaScriptEnabled) {
+      if (
+        contextHasJSEnabled !== javaScriptEnabled ||
+        // Even triggers on same set of permissions, but we don't want to deal
+        // with the complexity of diffing them, so we just always recreate the
+        // context when permissions are set.
+        contextPermissions !== permissions
+      ) {
         // If we have switched from having JS enable/disabled we need to recreate the context.
         await teardown(this.teardownTracing.bind(this))
         await context?.close()
@@ -192,8 +203,10 @@ export class Playwright<TCurrent = undefined> {
           ignoreHTTPSErrors,
           ...(userAgent ? { userAgent } : {}),
           ...device,
+          permissions,
         })
         contextHasJSEnabled = javaScriptEnabled
+        contextPermissions = permissions
       }
       return
     }
@@ -205,6 +218,7 @@ export class Playwright<TCurrent = undefined> {
       ignoreHTTPSErrors,
       ...(userAgent ? { userAgent } : {}),
       ...device,
+      permissions,
     })
     contextHasJSEnabled = javaScriptEnabled
   }
@@ -214,14 +228,16 @@ export class Playwright<TCurrent = undefined> {
     await page?.close()
   }
 
-  async launchBrowser(browserName: string, launchOptions: Record<string, any>) {
+  async launchBrowser(
+    browserName: string,
+    launchOptions: { headless: boolean }
+  ) {
     if (browserName === 'safari') {
       return await webkit.launch(launchOptions)
     } else if (browserName === 'firefox') {
       return await firefox.launch({
         ...launchOptions,
         firefoxUserPrefs: {
-          ...launchOptions.firefoxUserPrefs,
           // The "fission.webContentIsolationStrategy" pref must be
           // set to 1 on Firefox due to the bug where a new history
           // state is pushed on a page reload.
@@ -231,9 +247,13 @@ export class Playwright<TCurrent = undefined> {
         },
       })
     } else {
+      let launchArgs: string[] = []
+      if (!launchOptions.headless) {
+        launchArgs.push('--auto-open-devtools-for-tabs')
+      }
       return await chromium.launch({
-        devtools: !launchOptions.headless,
         ...launchOptions,
+        args: launchArgs,
         ignoreDefaultArgs: ['--disable-back-forward-cache'],
       })
     }
diff --git a/test/lib/next-webdriver.ts b/test/lib/next-webdriver.ts
index c136a641f5bf5..8be60416ee029 100644
--- a/test/lib/next-webdriver.ts
+++ b/test/lib/next-webdriver.ts
@@ -1,6 +1,7 @@
 import { debugPrint, getFullUrl } from 'next-test-utils'
 import os from 'os'
 import {
+  Permissions,
   Playwright,
   PlaywrightNavigationWaitUntil,
 } from './browsers/playwright'
@@ -48,6 +49,7 @@ if (typeof afterAll === 'function') {
 }
 
 export interface WebdriverOptions {
+  permissions?: Permissions
   /**
    * whether to wait for React hydration to finish
    */
@@ -121,6 +123,7 @@ export default async function webdriver(
     extraHTTPHeaders,
     locale,
     disableJavaScript,
+    permissions,
     ignoreHTTPSErrors,
     headless,
     cpuThrottleRate,
@@ -141,7 +144,8 @@ export default async function webdriver(
     Boolean(ignoreHTTPSErrors),
     // allow headless to be overwritten for a particular test
     typeof headless !== 'undefined' ? headless : !!process.env.HEADLESS,
-    userAgent
+    userAgent,
+    permissions
   )
   ;(global as any).browserName = browserName
 
diff --git a/turbopack/crates/turbo-tasks-backend/src/backing_storage.rs b/turbopack/crates/turbo-tasks-backend/src/backing_storage.rs
index 8c200a108f575..188f35304d640 100644
--- a/turbopack/crates/turbo-tasks-backend/src/backing_storage.rs
+++ b/turbopack/crates/turbo-tasks-backend/src/backing_storage.rs
@@ -37,13 +37,12 @@ pub trait BackingStorage: BackingStorageSealed {
     ///
     /// This typically means that we'll restart the process or `turbo-tasks` soon with a fresh
     /// database. If this happens, there's no point in writing anything else to disk, or flushing
-    /// during [`KeyValueDatabase::shutdown`].
+    /// during [`TurboTasksBackend::stop`].
     ///
-    /// This can be implemented by calling [`invalidate_db`] with
-    /// the database's non-versioned base path.
-    ///
-    /// [`KeyValueDatabase::shutdown`]: crate::database::key_value_database::KeyValueDatabase::shutdown
-    /// [`invalidate_db`]: crate::database::db_invalidation::invalidate_db
+    /// [`TurboTasksBackend::stop`]: turbo_tasks::backend::Backend::stop
+    //
+    // This can be implemented by calling `database::db_invalidation::invalidate_db` with the
+    // database's non-versioned base path.
     fn invalidate(&self, reason_code: &str) -> Result<()>;
 }
 
diff --git a/turbopack/crates/turbo-tasks-bytes/src/bytes.rs b/turbopack/crates/turbo-tasks-bytes/src/bytes.rs
index 5aec326a99646..08c31138bc65b 100644
--- a/turbopack/crates/turbo-tasks-bytes/src/bytes.rs
+++ b/turbopack/crates/turbo-tasks-bytes/src/bytes.rs
@@ -48,9 +48,10 @@ impl Deref for Bytes {
     }
 }
 
-/// Types that implement From<X> for Bytes {}
-/// Unfortunately, we cannot just use the more generic `Into<Bytes>` without
-/// running afoul of the `From<X> for X` base case, causing conflicting impls.
+/// Types that `impl From<CustomType> for Bytes {}`
+///
+/// Unfortunately, we cannot just use the more generic `Into<Bytes>` without running afoul of the
+/// `From<X> for X` base case, causing conflicting impls.
 pub trait IntoBytes: Into<CBytes> {}
 impl IntoBytes for &'static [u8] {}
 impl IntoBytes for &'static str {}
diff --git a/turbopack/crates/turbo-tasks-fs/src/embed/dir.rs b/turbopack/crates/turbo-tasks-fs/src/embed/dir.rs
index 726e6a3bec5d0..fec70cfe25033 100644
--- a/turbopack/crates/turbo-tasks-fs/src/embed/dir.rs
+++ b/turbopack/crates/turbo-tasks-fs/src/embed/dir.rs
@@ -25,17 +25,17 @@ pub fn directory_from_include_dir(
     Vc::upcast(EmbeddedFileSystem::new(name, dir))
 }
 
-/// Returns an embedded [Vc<Box<dyn FileSystem>>] for the given path.
+/// Returns an embedded [`Vc<Box<dyn FileSystem>>`][FileSystem] for the given path.
 ///
-/// This will embed a directory's content into the binary and
-/// create an [Vc<EmbeddedFileSystem>].
+/// This will embed a directory's content into the binary and create an
+/// [`Vc<EmbeddedFileSystem>`][EmbeddedFileSystem].
 ///
-/// If you enable the `dynamic_embed_contents` feature, calling
-/// the macro will return a [Vc<DiskFileSystem>].
+/// If you enable the `dynamic_embed_contents` feature, calling the macro will return a
+/// [`Vc<DiskFileSystem>`][DiskFileSystem].
 ///
-/// This enables dynamic linking (and hot reloading) of embedded files/dirs.
-/// A binary built with `dynamic_embed_contents` enabled is **is not portable**,
-/// only the directory path will be embedded into the binary.
+/// This enables dynamic linking (and hot reloading) of embedded files/dirs. A binary built with
+/// `dynamic_embed_contents` enabled is **is not portable**, only the directory path will be
+/// embedded into the binary.
 #[macro_export]
 macro_rules! embed_directory {
     ($name:tt, $path:tt) => {{        // make sure the path contains `$CARGO_MANIFEST_DIR`
diff --git a/turbopack/crates/turbo-tasks-fs/src/lib.rs b/turbopack/crates/turbo-tasks-fs/src/lib.rs
index 8f88e2ce74ed3..da76f3e663045 100644
--- a/turbopack/crates/turbo-tasks-fs/src/lib.rs
+++ b/turbopack/crates/turbo-tasks-fs/src/lib.rs
@@ -91,19 +91,6 @@ use crate::{
 };
 pub use crate::{read_glob::ReadGlobResult, virtual_fs::VirtualFileSystem};
 
-/// A (somewhat arbitrary) filename limit that we should try to keep output file names below.
-///
-/// For the sake of consistency, this is a fixed constant that is likely to be safe across all
-/// platforms.
-///
-/// Different operating systems have different limits on file name and file path. See
-/// [`validate_path_length`] for details. Because this only accounts for a single path segment, and
-/// not the total path length, this cannot not guarantee a full file path is safe.
-///
-/// To ensure file names are kept within this limit, call
-/// [`FileSystemPath::truncate_file_name_with_hash`].
-pub const MAX_SAFE_FILE_NAME_LENGTH: usize = 200;
-
 /// Validate the path, returning the valid path, a modified-but-now-valid path, or bailing with an
 /// error.
 ///
@@ -1553,9 +1540,8 @@ impl FileSystemPath {
         FileSystemPath { fs, path }
     }
 
-    /// Adds a subpath to the current path. The /-separate path argument might
-    /// contain ".." or "." segments, but it must not leave the root of the
-    /// filesystem.
+    /// Adds a subpath to the current path. The /-separated `path` argument might contain ".." or
+    /// "." segments, but it must not leave the root of the filesystem.
     pub fn join(&self, path: &str) -> Result<Self> {
         if let Some(path) = join_path(&self.path, path) {
             Ok(Self::new_normalized(self.fs, path.into()))
@@ -1568,7 +1554,7 @@ impl FileSystemPath {
         }
     }
 
-    /// Adds a suffix to the filename. [path] must not contain `/`.
+    /// Adds a suffix to the filename. `path` must not contain `/`.
     pub fn append(&self, path: &str) -> Result<Self> {
         if path.contains('/') {
             bail!(
@@ -1583,12 +1569,12 @@ impl FileSystemPath {
         ))
     }
 
-    /// Adds a suffix to the basename of the filename. [appending] must not
-    /// contain `/`. Extension will stay intact.
+    /// Adds a suffix to the basename of the file path. `appending` must not contain `/`. The [file
+    /// extension][FileSystemPath::extension] will stay intact.
     pub fn append_to_stem(&self, appending: &str) -> Result<Self> {
         if appending.contains('/') {
             bail!(
-                "FileSystemPath(\"{}\").append_to_stem(\"{}\") must not append '/'",
+                "FileSystemPath({:?}).append_to_stem({:?}) must not append '/'",
                 self.path,
                 appending,
             )
@@ -1628,14 +1614,15 @@ impl FileSystemPath {
         None
     }
 
-    /// DETERMINISM: Result is in random order. Either sort result or do not depend
-    /// on the order.
+    /// DETERMINISM: Result is in random order. Either sort the result or do not depend on the
+    /// order.
     pub fn read_glob(&self, glob: Vc<Glob>) -> Vc<ReadGlobResult> {
         read_glob(self.clone(), glob)
     }
 
-    // Tracks all files and directories matching the glob
-    // Follows symlinks as though they were part of the original hierarchy.
+    // Tracks all files and directories matching the glob using the filesystem watcher. Follows
+    // symlinks as though they were part of the original hierarchy. The returned [`Vc`] will be
+    // invalidated if a file or directory changes.
     pub fn track_glob(&self, glob: Vc<Glob>, include_dot_files: bool) -> Vc<Completion> {
         track_glob(self.clone(), glob, include_dot_files)
     }
@@ -2046,7 +2033,7 @@ pub enum LinkContent {
     ///
     /// We don't use the [`FileSystemPath`] to store the target, because the [`FileSystemPath`] is
     /// always normalized. In [`FileSystemPath::write_symbolic_link_dir`] we need to compare
-    /// `target` with the value returned by [`sys::fs::read_link`].
+    /// `target` with the value returned by [`std::fs::read_link`].
     Link {
         target: RcStr,
         link_type: LinkType,
diff --git a/turbopack/crates/turbo-tasks-fs/src/rope.rs b/turbopack/crates/turbo-tasks-fs/src/rope.rs
index 43025424427ee..7745fe703eab6 100644
--- a/turbopack/crates/turbo-tasks-fs/src/rope.rs
+++ b/turbopack/crates/turbo-tasks-fs/src/rope.rs
@@ -159,8 +159,8 @@ impl<T: Into<Bytes>> From<T> for Rope {
 impl RopeBuilder {
     /// Push owned bytes into the Rope.
     ///
-    /// If possible use [push_static_bytes] or `+=` operation instead, as they
-    /// will create a reference to shared memory instead of cloning the bytes.
+    /// If possible, use [`RopeBuilder::push_static_bytes`] or `+=` operation instead. That will
+    /// create a reference to shared memory instead of cloning the bytes.
     pub fn push_bytes(&mut self, bytes: &[u8]) {
         if bytes.is_empty() {
             return;
@@ -414,7 +414,7 @@ impl DeterministicHash for RopeBytesOnlyHash<'_> {
 /// [`Rope::to_bytes`] instead would be easier, but would require copying to an intermediate buffer.
 ///
 /// This len + bytes format is similar to how bincode would normally encode a `&[u8]`:
-/// https://docs.rs/bincode/latest/bincode/spec/index.html#collections
+/// <https://docs.rs/bincode/latest/bincode/spec/index.html#collections>
 impl Encode for Rope {
     fn encode<E: Encoder>(&self, encoder: &mut E) -> Result<(), EncodeError> {
         self.length.encode(encoder)?;
@@ -882,7 +882,7 @@ impl BufRead for RopeReader<'_> {
 }
 
 impl<'a> Stream for RopeReader<'a> {
-    /// This is efficiently streamable into a [`Hyper::Body`] if each item is cloned into an owned
+    /// This is efficiently streamable into a `Hyper::Body` if each item is cloned into an owned
     /// `Bytes` instance.
     type Item = Result<&'a Bytes>;
 
diff --git a/turbopack/crates/turbo-tasks-fs/src/util.rs b/turbopack/crates/turbo-tasks-fs/src/util.rs
index 2247ee577e66b..7042ea001f205 100644
--- a/turbopack/crates/turbo-tasks-fs/src/util.rs
+++ b/turbopack/crates/turbo-tasks-fs/src/util.rs
@@ -8,9 +8,9 @@ use turbo_tasks::ResolvedVc;
 
 use crate::{DiskFileSystem, FileSystemPath};
 
-/// Converts a disk access Result<T> into a Result<Some<T>>, where a NotFound
-/// error results in a None value. This is purely to reduce boilerplate code
-/// comparing NotFound errors against all other errors.
+/// Converts a disk access `Result<T>` into a `Result<Some<T>>`, where a [`ErrorKind::NotFound`] (or
+/// [`ErrorKind::InvalidFilename`]) error results in a [`None`] value. This is purely to reduce
+/// boilerplate code comparing [`ErrorKind::NotFound`] errors against all other errors.
 pub fn extract_disk_access<T>(value: io::Result<T>, path: &Path) -> Result<Option<T>> {
     match value {
         Ok(v) => Ok(Some(v)),
diff --git a/turbopack/crates/turbo-tasks-hash/src/lib.rs b/turbopack/crates/turbo-tasks-hash/src/lib.rs
index 5d0fc41a21f5b..c1ccc3257d9c3 100644
--- a/turbopack/crates/turbo-tasks-hash/src/lib.rs
+++ b/turbopack/crates/turbo-tasks-hash/src/lib.rs
@@ -24,11 +24,17 @@ pub enum HashAlgorithm {
     Xxh3Hash64Base40,
     /// xxh3 128-bit hash encoded as a 25-character base40 string (0-9 a-z _ - ~ .)
     Xxh3Hash128Base40,
-    /// Used for https://nextjs.org/docs/app/guides/content-security-policy#enabling-sri
+    /// Used for [Subresource Integrity (SRI)][sri].
+    ///
+    /// [sri]: https://nextjs.org/docs/app/guides/content-security-policy#enabling-sri
     Sha256Base64,
-    /// Used for https://nextjs.org/docs/app/guides/content-security-policy#enabling-sri
+    /// Used for [Subresource Integrity (SRI)][sri].
+    ///
+    /// [sri]: https://nextjs.org/docs/app/guides/content-security-policy#enabling-sri
     Sha384Base64,
-    /// Used for https://nextjs.org/docs/app/guides/content-security-policy#enabling-sri
+    /// Used for [Subresource Integrity (SRI)][sri].
+    ///
+    /// [sri]: https://nextjs.org/docs/app/guides/content-security-policy#enabling-sri
     Sha512Base64,
 }
 
diff --git a/turbopack/crates/turbo-tasks/function.md b/turbopack/crates/turbo-tasks/function.md
index f96b22784418b..bff5dd9146a65 100644
--- a/turbopack/crates/turbo-tasks/function.md
+++ b/turbopack/crates/turbo-tasks/function.md
@@ -28,7 +28,7 @@ The `#[turbo_tasks::function]` macro **rewrites the arguments and return values*
 - Method arguments of **`&self`** are **rewritten to `self: Vc<Self>`**.
 
 [`ResolvedVc<T>`]: crate::ResolvedVc
-[`FromTaskInput`]: crate::FromTaskInput
+[`FromTaskInput`]: crate::task::FromTaskInput
 
 ### Return Type Rewrite Rules
 
diff --git a/turbopack/crates/turbo-tasks/src/parallel.rs b/turbopack/crates/turbo-tasks/src/parallel.rs
index 084750e671dc8..4837bf3d3f632 100644
--- a/turbopack/crates/turbo-tasks/src/parallel.rs
+++ b/turbopack/crates/turbo-tasks/src/parallel.rs
@@ -2,7 +2,8 @@
 //!
 //! This avoid the problem of sleeping threads with mimalloc when using rayon in combination with
 //! tokio. It also avoid having multiple thread pools.
-//! see also https://pwy.io/posts/mimalloc-cigarette/
+//!
+//! See also: <https://pwy.io/posts/mimalloc-cigarette/>
 
 use crate::{
     scope::scope_and_block,
diff --git a/turbopack/crates/turbo-tasks/src/scope.rs b/turbopack/crates/turbo-tasks/src/scope.rs
index 300578ab83b13..9ff99a36caee6 100644
--- a/turbopack/crates/turbo-tasks/src/scope.rs
+++ b/turbopack/crates/turbo-tasks/src/scope.rs
@@ -155,10 +155,10 @@ pub struct Scope<'scope, 'env: 'scope, R: Send + 'env> {
     handle: Handle,
     turbo_tasks: Option<Arc<dyn TurboTasksApi>>,
     span: Span,
-    /// Invariance over 'env, to make sure 'env cannot shrink,
-    /// which is necessary for soundness.
+    /// Invariance over 'env, to make sure 'env cannot shrink, which is necessary for soundness.
     ///
-    /// see https://doc.rust-lang.org/src/std/thread/scoped.rs.html#12-29
+    /// See the comment in the stdlib implementation:
+    /// <https://github.com/rust-lang/rust/blob/3b1b0ef4d8/library/std/src/thread/scoped.rs#L12-L33>
     env: PhantomData<&'env mut &'env ()>,
 }
 
diff --git a/turbopack/crates/turbopack-core/src/asset.rs b/turbopack/crates/turbopack-core/src/asset.rs
index 6cde33444f904..e802b0816d63a 100644
--- a/turbopack/crates/turbopack-core/src/asset.rs
+++ b/turbopack/crates/turbopack-core/src/asset.rs
@@ -8,20 +8,26 @@ use turbo_tasks_hash::{HashAlgorithm, Xxh3Hash64Hasher};
 
 use crate::version::{VersionedAssetContent, VersionedContent};
 
-/// An asset. It also forms a graph when following [Asset::references].
+/// A file or intermediate result containing content as a [`Rope`] or a symlink.
+///
+/// This is a supertrait for [`Source`], [`OutputAsset`], and [`OutputChunk`].
+///
+/// [`Rope`]: turbo_tasks_fs::rope::Rope
+/// [`Source`]: crate::source::Source
+/// [`OutputAsset`]: crate::output::OutputAsset
+/// [`OutputChunk`]: crate::chunk::OutputChunk
 #[turbo_tasks::value_trait]
 pub trait Asset {
-    /// The content of the [Asset].
     #[turbo_tasks::function]
     fn content(self: Vc<Self>) -> Vc<AssetContent>;
 
-    /// The content of the [Asset] alongside its version.
+    /// The content of the `Asset` alongside its version.
     #[turbo_tasks::function]
     fn versioned_content(self: Vc<Self>) -> Result<Vc<Box<dyn VersionedContent>>> {
         Ok(Vc::upcast(VersionedAssetContent::new(self.content())))
     }
 
-    /// Hash of the content of the [Asset]
+    /// Hash of the content of the `Asset`.
     #[turbo_tasks::function]
     fn content_hash(self: Vc<Self>, algorithm: HashAlgorithm) -> Vc<Option<RcStr>> {
         self.content().content_hash(algorithm)
diff --git a/turbopack/crates/turbopack-core/src/chunk/mod.rs b/turbopack/crates/turbopack-core/src/chunk/mod.rs
index e8ef1d3f4d994..9d1352fbb3ada 100644
--- a/turbopack/crates/turbopack-core/src/chunk/mod.rs
+++ b/turbopack/crates/turbopack-core/src/chunk/mod.rs
@@ -202,25 +202,25 @@ pub struct Chunks(Vec<ResolvedVc<Box<dyn Chunk>>>);
 
 #[turbo_tasks::value_impl]
 impl Chunks {
-    /// Creates a new empty [Vc<Chunks>].
     #[turbo_tasks::function]
     pub fn empty() -> Vc<Self> {
         Vc::cell(vec![])
     }
 }
 
-/// A [Chunk] group chunk items together into something that will become an [OutputAsset].
-/// It usually contains multiple chunk items.
-// TODO This could be simplified to and merged with [OutputChunk]
+/// Groups chunk items together into something that will become an [`OutputAsset`]. It usually
+/// contains multiple chunk items.
+///
+/// [`OutputAsset`]: crate::output::OutputAsset
+//
+// TODO: This could be simplified to and merged with OutputChunk
 #[turbo_tasks::value_trait]
 pub trait Chunk: OutputAssetsReference {
     #[turbo_tasks::function]
     fn ident(self: Vc<Self>) -> Vc<AssetIdent>;
+
     #[turbo_tasks::function]
     fn chunking_context(self: Vc<Self>) -> Vc<Box<dyn ChunkingContext>>;
-    // fn path(self: Vc<Self>) -> Vc<FileSystemPath> {
-    //     self.ident().path()
-    // }
 
     #[turbo_tasks::function]
     fn chunk_items(self: Vc<Self>) -> Vc<ChunkItems> {
diff --git a/turbopack/crates/turbopack-core/src/diagnostics/mod.rs b/turbopack/crates/turbopack-core/src/diagnostics/mod.rs
index ccc695dd50359..cfc82df59b71a 100644
--- a/turbopack/crates/turbopack-core/src/diagnostics/mod.rs
+++ b/turbopack/crates/turbopack-core/src/diagnostics/mod.rs
@@ -49,16 +49,13 @@ pub struct DiagnosticPayload(
     #[bincode(with = "turbo_bincode::indexmap")] pub FxIndexMap<RcStr, RcStr>,
 );
 
-/// An arbitrary payload can be used to analyze, diagnose
-/// Turbopack's behavior.
+/// An arbitrary payload can be used to analyze, diagnose Turbopack's behavior.
 #[turbo_tasks::value_trait]
 pub trait Diagnostic {
-    /// [NOTE]: Pseudo-reserved; this is not being used currently.
-    /// The `type` of the diagnostics that can be used selectively filtered by
-    /// consumers. For example, this could be `telemetry`, or
-    /// `slow_perf_event`, or something else. This is not strongly typed
-    /// though; since consumer or implementation may need to define own
-    /// category.
+    /// **NOTE:** Pseudo-reserved; this is not being used currently. The `type` of the diagnostics
+    /// that can be used selectively filtered by consumers. For example, this could be `telemetry`,
+    /// or `slow_perf_event`, or something else. This is not strongly typed though; since consumer
+    /// or implementation may need to define own category.
     #[turbo_tasks::function]
     fn category(&self) -> Vc<RcStr>;
     /// Name of the specific diagnostic event.
@@ -113,8 +110,7 @@ where
     }
 }
 
-/// A list of diagnostics captured with
-/// [`DiagnosticsVc::peek_diagnostics_with_path`] and
+/// A list of diagnostics captured with [`DiagnosticContextExt::peek_diagnostics`] and
 #[derive(Debug)]
 #[turbo_tasks::value]
 pub struct CapturedDiagnostics {
diff --git a/turbopack/crates/turbopack-core/src/environment.rs b/turbopack/crates/turbopack-core/src/environment.rs
index 30351f3726cf9..d8ea95cdacb7c 100644
--- a/turbopack/crates/turbopack-core/src/environment.rs
+++ b/turbopack/crates/turbopack-core/src/environment.rs
@@ -35,7 +35,7 @@ pub enum ChunkLoading {
     Edge,
     /// CommonJS in Node.js
     NodeJs,
-    /// <script> and <link> tags in the browser
+    /// `<script>` and `<link>` tags in the browser
     Dom,
 }
 
diff --git a/turbopack/crates/turbopack-core/src/issue/mod.rs b/turbopack/crates/turbopack-core/src/issue/mod.rs
index 773d65ffeaa13..842cb7663dd15 100644
--- a/turbopack/crates/turbopack-core/src/issue/mod.rs
+++ b/turbopack/crates/turbopack-core/src/issue/mod.rs
@@ -405,8 +405,7 @@ impl IssueFilter {
     }
 }
 
-/// A list of issues captured with [`Issue::peek_issues_with_path`] and
-/// [`Issue::take_issues`].
+/// A list of issues captured with [`CollectibleIssuesExt::peek_issues`].
 #[turbo_tasks::value(shared)]
 #[derive(Debug)]
 pub struct CapturedIssues {
@@ -414,26 +413,7 @@ pub struct CapturedIssues {
     tracer: ResolvedVc<DelegatingImportTracer>,
 }
 
-#[turbo_tasks::value_impl]
-impl CapturedIssues {
-    #[turbo_tasks::function]
-    pub fn is_empty(&self) -> Vc<bool> {
-        Vc::cell(self.is_empty_ref())
-    }
-}
-
 impl CapturedIssues {
-    /// Returns true if there are no issues.
-    pub fn is_empty_ref(&self) -> bool {
-        self.issues.is_empty()
-    }
-
-    /// Returns the number of issues.
-    #[allow(clippy::len_without_is_empty)]
-    pub fn len(&self) -> usize {
-        self.issues.len()
-    }
-
     /// Returns an iterator over the issues.
     pub fn iter(&self) -> impl Iterator<Item = ResolvedVc<Box<dyn Issue>>> + '_ {
         self.issues.iter().copied()
@@ -976,14 +956,13 @@ fn hash_plain_issue(issue: &PlainIssue, hasher: &mut Xxh3Hash64Hasher, full: boo
 }
 
 impl PlainIssue {
-    /// We need deduplicate issues that can come from unique paths, but
-    /// represent the same underlying problem. Eg, a parse error for a file
-    /// that is compiled in both client and server contexts.
+    /// We need deduplicate issues that can come from unique paths, but represent the same
+    /// underlying problem. E.g., a parse error for a file that is compiled in both client and
+    /// server contexts.
     ///
-    /// Passing [full] will also hash any sub-issues and processing paths. While
-    /// useful for generating exact matching hashes, it's possible for the
-    /// same issue to pass from multiple processing paths, making for overly
-    /// verbose logging.
+    /// Passing `full` will also hash any sub-issues and processing paths. While useful for
+    /// generating exact matching hashes, it's possible for the same issue to pass from multiple
+    /// processing paths, making for overly verbose logging.
     pub fn internal_hash_ref(&self, full: bool) -> u64 {
         let mut hasher = Xxh3Hash64Hasher::new();
         hash_plain_issue(self, &mut hasher, full);
diff --git a/turbopack/crates/turbopack-core/src/module.rs b/turbopack/crates/turbopack-core/src/module.rs
index c667a1868e90b..870281799141a 100644
--- a/turbopack/crates/turbopack-core/src/module.rs
+++ b/turbopack/crates/turbopack-core/src/module.rs
@@ -13,13 +13,15 @@ pub enum StyleType {
 #[derive(Hash, Debug, Copy, Clone)]
 #[turbo_tasks::value(shared)]
 pub enum ModuleSideEffects {
-    /// Analysis determined that the module evaluation is side effect free
-    /// the module may still be side effectful based on its imports.
+    /// Analysis determined that the module evaluation is free of side effects. The module may still
+    /// have side effects based on its imports.
     ///
     /// This module might not be chunked after Turbopack performed a global analysis on the module
     /// graph.
     ModuleEvaluationIsSideEffectFree,
-    /// Is known to be side effect free either due to static analysis or some kind of configuration.
+    /// Is known to be free of side effects either due to static analysis or some kind of
+    /// configuration.
+    ///
     /// ```js
     /// "use turbopack no side effects"
     /// ```
@@ -31,28 +33,30 @@ pub enum ModuleSideEffects {
     SideEffectful,
 }
 
-/// A module. This usually represents parsed source code, which has references
-/// to other modules.
+/// A module. This usually represents parsed source code, which has references to other modules.
 #[turbo_tasks::value_trait]
 pub trait Module {
-    /// The identifier of the [Module]. It's expected to be unique and capture
-    /// all properties of the [Module].
+    /// The identifier of the [`Module`]. It's expected to be unique and capture all properties of
+    /// the [`Module`].
     #[turbo_tasks::function]
     fn ident(&self) -> Vc<AssetIdent>;
 
-    /// The identifier of the [Module] as string. It's expected to be unique and capture
-    /// all properties of the [Module].
+    /// The identifier of the [`Module`] as string. It's expected to be unique and capture all
+    /// properties of the [`Module`].
     #[turbo_tasks::function]
     fn ident_string(self: Vc<Self>) -> Vc<RcStr> {
         self.ident().to_string()
     }
 
-    /// The source of the [Module].
+    /// The source of the [`Module`].
     #[turbo_tasks::function]
     fn source(&self) -> Vc<OptionSource>;
 
-    /// Other [Module]s or [OutputAsset]s referenced from this [Module].
-    // TODO refactor to avoid returning [OutputAsset]s here
+    /// Other [`Module`]s or [`OutputAsset`]s referenced from this [`Module`].
+    ///
+    /// [`OutputAsset`]: crate::output::OutputAsset
+    //
+    // TODO: refactor to avoid returning OutputAssets here
     #[turbo_tasks::function]
     fn references(self: Vc<Self>) -> Vc<ModuleReferences> {
         ModuleReferences::empty()
@@ -64,7 +68,10 @@ pub trait Module {
         Vc::cell(false)
     }
 
-    /// Returns true if the module is marked as side effect free in package.json or by other means.
+    /// Returns `true` if the module is marked as [free of side effects in
+    /// `package.json`][packagejson] or by other means.
+    ///
+    /// [packagejson]: https://webpack.js.org/guides/tree-shaking/#mark-the-file-as-side-effect-free
     #[turbo_tasks::function]
     fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects>;
 }
diff --git a/turbopack/crates/turbopack-core/src/output.rs b/turbopack/crates/turbopack-core/src/output.rs
index f6368badf2e3f..f15294207896a 100644
--- a/turbopack/crates/turbopack-core/src/output.rs
+++ b/turbopack/crates/turbopack-core/src/output.rs
@@ -14,7 +14,7 @@ pub struct OptionOutputAsset(Option<ResolvedVc<Box<dyn OutputAsset>>>);
 
 #[turbo_tasks::value_trait]
 pub trait OutputAssetsReference {
-    /// References to other [OutputAsset]s from this [OutputAssetReference].
+    /// References to other [`OutputAsset`]s from this [`OutputAssetsReference`].
     #[turbo_tasks::function]
     fn references(self: Vc<Self>) -> Vc<OutputAssetsWithReferenced> {
         OutputAssetsWithReferenced {
diff --git a/turbopack/crates/turbopack-core/src/reference/mod.rs b/turbopack/crates/turbopack-core/src/reference/mod.rs
index 8c0ee6bd304d0..884dc8c592d93 100644
--- a/turbopack/crates/turbopack-core/src/reference/mod.rs
+++ b/turbopack/crates/turbopack-core/src/reference/mod.rs
@@ -75,14 +75,13 @@ impl ModuleReference for SingleModuleReference {
 
 #[turbo_tasks::value_impl]
 impl SingleModuleReference {
-    /// Create a new [Vc<SingleModuleReference>] that resolves to the given
-    /// asset.
+    /// Create a new instance that resolves to the given asset.
     #[turbo_tasks::function]
     pub fn new(asset: ResolvedVc<Box<dyn Module>>, description: RcStr) -> Vc<Self> {
         Self::cell(SingleModuleReference { asset, description })
     }
 
-    /// The [Vc<Box<dyn Asset>>] that this reference resolves to.
+    /// The [`Vc<Box<dyn Module>>`][Module] that this reference resolves to.
     #[turbo_tasks::function]
     pub fn asset(&self) -> Vc<Box<dyn Module>> {
         *self.asset
@@ -155,14 +154,13 @@ impl ModuleReference for SingleOutputAssetReference {
 
 #[turbo_tasks::value_impl]
 impl SingleOutputAssetReference {
-    /// Create a new [Vc<SingleOutputAssetReference>] that resolves to the given
-    /// asset.
+    /// Create a new `Vc<SingleOutputAssetReference>` that resolves to the given asset.
     #[turbo_tasks::function]
     pub fn new(asset: ResolvedVc<Box<dyn OutputAsset>>, description: RcStr) -> Vc<Self> {
         Self::cell(SingleOutputAssetReference { asset, description })
     }
 
-    /// The [Vc<Box<dyn Asset>>] that this reference resolves to.
+    /// The [`Vc<Box<dyn OutputAsset>>`][OutputAsset] that this reference resolves to.
     #[turbo_tasks::function]
     pub fn asset(&self) -> Vc<Box<dyn OutputAsset>> {
         *self.asset
@@ -233,11 +231,10 @@ impl TracedModuleReference {
     }
 }
 
-/// Aggregates all primary [Module]s referenced by an [Module]. [AssetReference]
-/// This does not include transitively references [Module]s, only includes
-/// primary [Module]s referenced.
+/// Aggregates all primary [`Module`]s referenced by an [`Module`]. This does not include
+/// transitively references [`Module`]s, only includes primary [`Module`]s referenced.
 ///
-/// [Module]: crate::module::Module
+/// [`Module`]: crate::module::Module
 #[turbo_tasks::function]
 pub async fn primary_referenced_modules(module: Vc<Box<dyn Module>>) -> Result<Vc<Modules>> {
     let mut set = HashSet::new();
diff --git a/turbopack/crates/turbopack-core/src/reference_type.rs b/turbopack/crates/turbopack-core/src/reference_type.rs
index 5aad24089fbbb..83f84a1d20041 100644
--- a/turbopack/crates/turbopack-core/src/reference_type.rs
+++ b/turbopack/crates/turbopack-core/src/reference_type.rs
@@ -351,9 +351,9 @@ impl Display for ReferenceType {
 }
 
 impl ReferenceType {
-    /// Returns true if this reference type is internal. This will be used in
-    /// combination with [`ModuleRuleCondition::Internal`] to determine if a
-    /// rule should be applied to an internal asset/reference.
+    /// Returns `true` if this reference type is internal. This is used by
+    /// `turbopack::module_options::module_rule::ModuleRule::new_internal` to determine if a rule
+    /// should be applied to an internal reference.
     pub fn is_internal(&self) -> bool {
         matches!(
             self,
diff --git a/turbopack/crates/turbopack-core/src/resolve/alias_map.rs b/turbopack/crates/turbopack-core/src/resolve/alias_map.rs
index 4c11cbd439a70..3ff630ab1de9f 100644
--- a/turbopack/crates/turbopack-core/src/resolve/alias_map.rs
+++ b/turbopack/crates/turbopack-core/src/resolve/alias_map.rs
@@ -17,7 +17,7 @@ use turbo_tasks::{
 
 use crate::resolve::pattern::Pattern;
 
-/// A map of [`AliasPattern`]s to the [`Template`]s they resolve to.
+/// A map of [`AliasPattern`]s as keys implemented using [`PatriciaMap`].
 ///
 /// If a pattern has a wildcard character (*) within it, it will capture any
 /// number of characters, including path separators. The result of the capture
@@ -578,7 +578,10 @@ where
     }
 }
 
-/// An alias pattern.
+/// An alias pattern commonly used for import paths. This should support [the functionality used in
+/// Typescript's tsconfig file][tsconfig].
+///
+/// [tsconfig]: https://www.typescriptlang.org/tsconfig/#paths
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
 pub enum AliasPattern {
     /// Will match an exact string.
diff --git a/turbopack/crates/turbopack-core/src/resolve/options.rs b/turbopack/crates/turbopack-core/src/resolve/options.rs
index a8bbb95247880..043af0f55abd4 100644
--- a/turbopack/crates/turbopack-core/src/resolve/options.rs
+++ b/turbopack/crates/turbopack-core/src/resolve/options.rs
@@ -658,8 +658,8 @@ pub struct ResolveOptions {
 
 #[turbo_tasks::value_impl]
 impl ResolveOptions {
-    /// Returns a new [Vc<ResolveOptions>] with its import map extended to
-    /// include the given import map.
+    /// Returns a new `Vc<ResolveOptions>` with its import map extended to include the given import
+    /// map.
     #[turbo_tasks::function]
     pub async fn with_extended_import_map(
         self: Vc<Self>,
@@ -677,8 +677,8 @@ impl ResolveOptions {
         Ok(resolve_options.cell())
     }
 
-    /// Returns a new [Vc<ResolveOptions>] with its fallback import map extended
-    /// to include the given import map.
+    /// Returns a new `Vc<ResolveOptions>` with its fallback import map extended to include the
+    /// given import map.
     #[turbo_tasks::function]
     pub async fn with_extended_fallback_import_map(
         self: Vc<Self>,
diff --git a/turbopack/crates/turbopack-core/src/resolve/remap.rs b/turbopack/crates/turbopack-core/src/resolve/remap.rs
index 3cc87a786b9aa..7d28032dd3fb4 100644
--- a/turbopack/crates/turbopack-core/src/resolve/remap.rs
+++ b/turbopack/crates/turbopack-core/src/resolve/remap.rs
@@ -45,7 +45,9 @@ pub enum SubpathValue {
     /// allow remapping based on certain predefined conditions. Eg, if using
     /// ESM import syntax, the `import` condition allows you to remap to a
     /// file that uses ESM syntax.
-    /// Node defines several conditions in https://nodejs.org/api/packages.html#conditional-exports
+    ///
+    /// Node defines several conditions in
+    /// <https://nodejs.org/api/packages.html#conditional-exports>
     /// TODO: Should this use an enum of predefined keys?
     Conditional(Vec<(RcStr, SubpathValue)>),
 
diff --git a/turbopack/crates/turbopack-core/src/source.rs b/turbopack/crates/turbopack-core/src/source.rs
index d45ac4f797731..373738b2cee09 100644
--- a/turbopack/crates/turbopack-core/src/source.rs
+++ b/turbopack/crates/turbopack-core/src/source.rs
@@ -3,8 +3,11 @@ use turbo_tasks::{ResolvedVc, Vc};
 
 use crate::{asset::Asset, ident::AssetIdent};
 
-/// (Unparsed) Source Code. Source Code is processed into [Module]s by the
-/// [AssetContext]. All [Source]s have content and an identifier.
+/// Unparsed input source code. Source code is processed into [`Module`]s by the [`AssetContext`].
+/// All `Source`s have content and an identifier.
+///
+/// [`Module`]: crate::module::Module
+/// [`AssetContext`]: crate::context::AssetContext
 #[turbo_tasks::value_trait]
 pub trait Source: Asset {
     /// The identifier of the [Source]. It's expected to be unique and capture
diff --git a/turbopack/crates/turbopack-core/src/source_map/mod.rs b/turbopack/crates/turbopack-core/src/source_map/mod.rs
index f1bf685ddc2f5..5b1cd3c1ad89d 100644
--- a/turbopack/crates/turbopack-core/src/source_map/mod.rs
+++ b/turbopack/crates/turbopack-core/src/source_map/mod.rs
@@ -48,16 +48,8 @@ pub trait GenerateSourceMap {
     }
 }
 
-/// Implements the source map specification as either a decoded or sectioned sourcemap.
-///
-/// - A "decoded" map represents a source map as if it was came out of a JSON
-/// decode.
-/// - A "sectioned" source map is a tree of many [SourceMap]
-/// covering regions of an output file.
-///
-/// The distinction between the source map spec's [sourcemap::Index] and our
-/// [SourceMap::Sectioned] is whether the sections are represented with Vcs
-/// pointers.
+/// Implements the source map specification as a [decoded][`DecodedMap`] sourcemap. A "decoded" map
+/// represents a source map as if it was came out of a JSON decode.
 #[turbo_tasks::value(shared, cell = "new", eq = "manual")]
 #[derive(Debug)]
 pub struct SourceMap {
@@ -236,12 +228,10 @@ impl TryInto<swc_sourcemap::RawToken> for Token {
 }
 
 impl SourceMap {
-    /// Creates a new SourceMap::Decoded Vc out of a [RegularMap] instance.
     fn new_regular(map: RegularMap) -> Self {
         Self::new_decoded(DecodedMap::Regular(map))
     }
 
-    /// Creates a new SourceMap::Decoded Vc out of a [DecodedMap] instance.
     fn new_decoded(map: DecodedMap) -> Self {
         SourceMap {
             map: Arc::new(CrateMapWrapper(map)),
diff --git a/turbopack/crates/turbopack-core/src/source_pos.rs b/turbopack/crates/turbopack-core/src/source_pos.rs
index c2be88f55333c..c367fe7e4f2e9 100644
--- a/turbopack/crates/turbopack-core/src/source_pos.rs
+++ b/turbopack/crates/turbopack-core/src/source_pos.rs
@@ -52,7 +52,7 @@ impl SourcePos {
     /// Line terminators are the classic "\n", "\r", "\r\n" (which counts as
     /// a single terminator), and JSON LINE/PARAGRAPH SEPARATORs.
     ///
-    /// See https://tc39.es/ecma262/multipage/ecmascript-language-lexical-grammar.html#sec-line-terminators
+    /// See <https://tc39.es/ecma262/multipage/ecmascript-language-lexical-grammar.html#sec-line-terminators>
     pub fn update(&mut self, code: &[u8]) {
         // JS source text is interpreted as UCS-2, which is basically UTF-16 with less
         // restrictions. We cannot iterate UTF-8 bytes here, 2-byte UTF-8 octets
diff --git a/turbopack/crates/turbopack-core/src/version.rs b/turbopack/crates/turbopack-core/src/version.rs
index 00a800c48eebf..787090ca8ee19 100644
--- a/turbopack/crates/turbopack-core/src/version.rs
+++ b/turbopack/crates/turbopack-core/src/version.rs
@@ -13,10 +13,15 @@ use crate::asset::AssetContent;
 #[turbo_tasks::value(transparent)]
 pub struct OptionVersionedContent(Option<ResolvedVc<Box<dyn VersionedContent>>>);
 
-/// The content of an [Asset] alongside its version.
+/// The content of an [`Asset`] alongside its version, returned by [`Asset::versioned_content`].
+///
+/// [`Asset`]: crate::asset::Asset
+/// [`Asset::versioned_content`]: crate::asset::Asset::versioned_content
 #[turbo_tasks::value_trait]
 pub trait VersionedContent {
-    /// The content of the [Asset].
+    /// The content of the [`Asset`].
+    ///
+    /// [`Asset`]: crate::asset::Asset
     #[turbo_tasks::function]
     fn content(self: Vc<Self>) -> Vc<AssetContent>;
 
@@ -85,7 +90,7 @@ impl VersionedContent for VersionedAssetContent {
 #[turbo_tasks::value_impl]
 impl VersionedAssetContent {
     #[turbo_tasks::function]
-    /// Creates a new [Vc<VersionedAssetContent>] from a [Vc<FileContent>].
+    /// Creates a new instance from a [`Vc<AssetContent>`][AssetContent].
     pub async fn new(asset_content: Vc<AssetContent>) -> Result<Vc<Self>> {
         let asset_content = asset_content.await?;
         Ok(Self::cell(VersionedAssetContent { asset_content }))
diff --git a/turbopack/crates/turbopack-create-test-app/src/test_app_builder.rs b/turbopack/crates/turbopack-create-test-app/src/test_app_builder.rs
index c892019e55147..747b3c17682e1 100644
--- a/turbopack/crates/turbopack-create-test-app/src/test_app_builder.rs
+++ b/turbopack/crates/turbopack-create-test-app/src/test_app_builder.rs
@@ -48,9 +48,8 @@ pub enum EffectMode {
     None,
     /// As a direct `useEffect` hook in the component's body.
     Hook,
-    /// Rendering an <Effect /> client-side component that has the `useEffect`
-    /// hook instead. Good for testing React Server Components, as they can't
-    /// use `useEffect` hooks directly.
+    /// Rendering an `<Effect />` client-side component that has the `useEffect` hook instead. Good
+    /// for testing React Server Components, as they can't use `useEffect` hooks directly.
     Component,
 }
 
diff --git a/turbopack/crates/turbopack-css/src/asset.rs b/turbopack/crates/turbopack-css/src/asset.rs
index ad9536bd65fbb..cd16127bb1f7a 100644
--- a/turbopack/crates/turbopack-css/src/asset.rs
+++ b/turbopack/crates/turbopack-css/src/asset.rs
@@ -30,10 +30,12 @@ use crate::{
     },
 };
 
+/// A global CSS module. Notably not a `.module.css` module, which is [`EcmascriptCssModule`]
+/// instead.
+///
+/// [`EcmascriptCssModule`]: crate::EcmascriptCssModule
 #[turbo_tasks::value]
 #[derive(Clone)]
-/// A global CSS asset. Notably not a `.module.css` module, which is [`EcmascriptCssModule`]
-/// instead.
 pub struct CssModule {
     source: ResolvedVc<Box<dyn Source>>,
     asset_context: ResolvedVc<Box<dyn AssetContext>>,
diff --git a/turbopack/crates/turbopack-css/src/module_asset.rs b/turbopack/crates/turbopack-css/src/module_asset.rs
index 4e9f2acd17516..747775ace1566 100644
--- a/turbopack/crates/turbopack-css/src/module_asset.rs
+++ b/turbopack/crates/turbopack-css/src/module_asset.rs
@@ -36,9 +36,12 @@ use crate::{
     references::{compose::CssModuleComposeReference, internal::InternalCssAssetReference},
 };
 
+/// A [CSS Module, as in `.module.css`][spec]. For a global CSS module, see [`CssModule`].
+///
+/// [spec]: https://github.com/css-modules/css-modules
+/// [`CssModule`]: crate::CssModule
 #[turbo_tasks::value]
 #[derive(Clone)]
-/// A CSS Module asset, as in `.module.css`. For a global CSS module, see [`CssModule`].
 pub struct EcmascriptCssModule {
     pub source: ResolvedVc<Box<dyn Source>>,
     pub asset_context: ResolvedVc<Box<dyn AssetContext>>,
diff --git a/turbopack/crates/turbopack-dev-server/src/source/combined.rs b/turbopack/crates/turbopack-dev-server/src/source/combined.rs
index b6799d0004b7a..6cb1e5e6d3087 100644
--- a/turbopack/crates/turbopack-dev-server/src/source/combined.rs
+++ b/turbopack/crates/turbopack-dev-server/src/source/combined.rs
@@ -8,10 +8,7 @@ use crate::source::{
     route_tree::{RouteTree, RouteTrees},
 };
 
-/// Combines multiple [ContentSource]s by trying all content sources in order.
-///
-/// The content source which responds with the most specific response (that is
-/// not a [ContentSourceContent::NotFound]) will be returned.
+/// Combines multiple [`ContentSource`]s by [merging][RouteTrees::merge] [`RouteTree`]s.
 #[turbo_tasks::value(shared)]
 pub struct CombinedContentSource {
     pub sources: Vec<ResolvedVc<Box<dyn ContentSource>>>,
diff --git a/turbopack/crates/turbopack-dev-server/src/source/conditional.rs b/turbopack/crates/turbopack-dev-server/src/source/conditional.rs
deleted file mode 100644
index 92e3ae972fcc3..0000000000000
--- a/turbopack/crates/turbopack-dev-server/src/source/conditional.rs
+++ /dev/null
@@ -1,165 +0,0 @@
-use anyhow::Result;
-use turbo_rcstr::{RcStr, rcstr};
-use turbo_tasks::{Completion, ResolvedVc, State, Vc};
-use turbopack_core::introspect::{Introspectable, IntrospectableChildren};
-
-use crate::source::{
-    ContentSource, ContentSourceContent, ContentSourceData, ContentSourceDataVary,
-    ContentSourceSideEffect, ContentSources, GetContentSourceContent,
-    route_tree::{MapGetContentSourceContent, RouteTree, RouteTrees},
-};
-
-/// Combines two [ContentSource]s like the [CombinedContentSource], but only
-/// allows to serve from the second source when the first source has
-/// successfully served something once.
-///
-/// This is a laziness optimization when the content of the second source can
-/// only be reached via references from the first source.
-///
-/// For example, we use that in the content source that handles SSR rendering of
-/// pages. Here HTML and "other assets" are in different content sources. So we
-/// use this source to only serve (and process) "other assets" when the HTML was
-/// served once.
-#[turbo_tasks::value(serialization = "none", eq = "manual", cell = "new")]
-pub struct ConditionalContentSource {
-    activator: ResolvedVc<Box<dyn ContentSource>>,
-    action: ResolvedVc<Box<dyn ContentSource>>,
-    activated: State<bool>,
-}
-
-#[turbo_tasks::value_impl]
-impl ConditionalContentSource {
-    #[turbo_tasks::function]
-    pub fn new(
-        activator: ResolvedVc<Box<dyn ContentSource>>,
-        action: ResolvedVc<Box<dyn ContentSource>>,
-    ) -> Vc<Self> {
-        ConditionalContentSource {
-            activator,
-            action,
-            activated: State::new(false),
-        }
-        .cell()
-    }
-}
-
-#[turbo_tasks::value_impl]
-impl ContentSource for ConditionalContentSource {
-    #[turbo_tasks::function]
-    async fn get_routes(self: ResolvedVc<Self>) -> Result<Vc<RouteTree>> {
-        let this = self.await?;
-        Ok(if !*this.activated.get() {
-            this.activator.get_routes().map_routes(Vc::upcast(
-                ConditionalContentSourceMapper { source: self }.cell(),
-            ))
-        } else {
-            Vc::<RouteTrees>::cell(vec![
-                this.activator.get_routes().to_resolved().await?,
-                this.action.get_routes().to_resolved().await?,
-            ])
-            .merge()
-        })
-    }
-
-    #[turbo_tasks::function]
-    fn get_children(&self) -> Vc<ContentSources> {
-        Vc::cell(vec![self.activator, self.action])
-    }
-}
-
-#[turbo_tasks::value]
-struct ConditionalContentSourceMapper {
-    source: ResolvedVc<ConditionalContentSource>,
-}
-
-#[turbo_tasks::value_impl]
-impl MapGetContentSourceContent for ConditionalContentSourceMapper {
-    #[turbo_tasks::function]
-    fn map_get_content(
-        &self,
-        get_content: ResolvedVc<Box<dyn GetContentSourceContent>>,
-    ) -> Vc<Box<dyn GetContentSourceContent>> {
-        Vc::upcast(
-            ActivateOnGetContentSource {
-                source: self.source,
-                get_content,
-            }
-            .cell(),
-        )
-    }
-}
-
-#[turbo_tasks::value_impl]
-impl Introspectable for ConditionalContentSource {
-    #[turbo_tasks::function]
-    fn ty(&self) -> Vc<RcStr> {
-        Vc::cell(rcstr!("conditional content source"))
-    }
-
-    #[turbo_tasks::function]
-    fn details(&self) -> Vc<RcStr> {
-        Vc::cell(if *self.activated.get() {
-            rcstr!("activated")
-        } else {
-            rcstr!("not activated")
-        })
-    }
-
-    #[turbo_tasks::function]
-    fn title(&self) -> Result<Vc<RcStr>> {
-        if let Some(activator) = ResolvedVc::try_sidecast::<Box<dyn Introspectable>>(self.activator)
-        {
-            Ok(activator.title())
-        } else {
-            Ok(Vc::<RcStr>::default())
-        }
-    }
-
-    #[turbo_tasks::function]
-    fn children(&self) -> Result<Vc<IntrospectableChildren>> {
-        Ok(Vc::cell(
-            [
-                ResolvedVc::try_sidecast::<Box<dyn Introspectable>>(self.activator)
-                    .map(|i| (rcstr!("activator"), i)),
-                ResolvedVc::try_sidecast::<Box<dyn Introspectable>>(self.action)
-                    .map(|i| (rcstr!("action"), i)),
-            ]
-            .into_iter()
-            .flatten()
-            .collect(),
-        ))
-    }
-}
-
-#[turbo_tasks::value(serialization = "none", eq = "manual", cell = "new")]
-struct ActivateOnGetContentSource {
-    source: ResolvedVc<ConditionalContentSource>,
-    get_content: ResolvedVc<Box<dyn GetContentSourceContent>>,
-}
-
-#[turbo_tasks::value_impl]
-impl GetContentSourceContent for ActivateOnGetContentSource {
-    #[turbo_tasks::function]
-    fn vary(&self) -> Vc<ContentSourceDataVary> {
-        self.get_content.vary()
-    }
-
-    #[turbo_tasks::function]
-    async fn get(
-        self: ResolvedVc<Self>,
-        path: RcStr,
-        data: ContentSourceData,
-    ) -> Result<Vc<ContentSourceContent>> {
-        turbo_tasks::emit(ResolvedVc::upcast::<Box<dyn ContentSourceSideEffect>>(self));
-        Ok(self.await?.get_content.get(path, data))
-    }
-}
-
-#[turbo_tasks::value_impl]
-impl ContentSourceSideEffect for ActivateOnGetContentSource {
-    #[turbo_tasks::function]
-    async fn apply(&self) -> Result<Vc<Completion>> {
-        self.source.await?.activated.set(true);
-        Ok(Completion::new())
-    }
-}
diff --git a/turbopack/crates/turbopack-dev-server/src/source/mod.rs b/turbopack/crates/turbopack-dev-server/src/source/mod.rs
index 2d1bbf21a5620..d759ec3118241 100644
--- a/turbopack/crates/turbopack-dev-server/src/source/mod.rs
+++ b/turbopack/crates/turbopack-dev-server/src/source/mod.rs
@@ -1,12 +1,11 @@
 pub mod asset_graph;
 pub mod combined;
-pub mod conditional;
 pub mod headers;
 pub mod issue_context;
 pub mod lazy_instantiated;
 pub mod query;
 pub mod request;
-pub(crate) mod resolve;
+pub mod resolve;
 pub mod route_tree;
 pub mod router;
 pub mod static_assets;
@@ -62,17 +61,16 @@ impl Version for ProxyResult {
     }
 }
 
-/// A functor to receive the actual content of a content source result.
+/// Receives the actual content for a [`ContentSource`].
 #[turbo_tasks::value_trait]
 pub trait GetContentSourceContent {
-    /// Specifies data requirements for the get function. Restricting data
-    /// passed allows to cache the get method.
+    /// Specifies data requirements for the [`get`][Self::get] function. Restricting data passed
+    /// allows improved caching of the [`get`][Self::get] method.
     #[turbo_tasks::function]
     fn vary(self: Vc<Self>) -> Vc<ContentSourceDataVary> {
         ContentSourceDataVary::default().cell()
     }
 
-    /// Get the content
     #[turbo_tasks::function]
     fn get(self: Vc<Self>, path: RcStr, data: ContentSourceData) -> Vc<ContentSourceContent>;
 }
@@ -88,8 +86,8 @@ pub struct StaticContent {
 }
 
 #[turbo_tasks::value(shared)]
-// TODO add Dynamic variant in future to allow streaming and server responses
-/// The content of a result that is returned by a content source.
+/// The content of a result that is returned by [`GetContentSourceContent::get`].
+// TODO: add a `Dynamic` variant in future to allow streaming and server responses
 pub enum ContentSourceContent {
     NotFound,
     Static(ResolvedVc<StaticContent>),
@@ -156,12 +154,10 @@ impl HeaderList {
     }
 }
 
-/// Additional info passed to the ContentSource. It was extracted from the http
-/// request.
+/// Additional info passed to the [`ContentSource`]. It was extracted from the http request.
 ///
 /// Note that you might not receive information that has not been requested via
-/// `ContentSource::vary()`. So make sure to request all information that's
-/// needed.
+/// [`GetContentSourceContent::vary`]. So make sure to request all information that's needed.
 #[derive(
     PartialEq,
     Eq,
@@ -263,7 +259,8 @@ impl ContentSourceDataFilter {
     }
 
     /// Merges the filtering to get a filter that covers both filters. Works on
-    /// Option<DataFilter> where None is considers as empty filter.
+    /// [`Option<ContentSourceDataFilter>`][ContentSourceDataFilter] where [`None`] behaves as a
+    /// no-op empty filter.
     pub fn extend_options(
         this: &mut Option<ContentSourceDataFilter>,
         other: &Option<ContentSourceDataFilter>,
@@ -305,9 +302,9 @@ impl ContentSourceDataFilter {
     }
 }
 
-/// Describes additional information that need to be sent to requests to
-/// ContentSource. By sending these information ContentSource responses are
-/// cached-keyed by them and they can access them.
+/// Describes additional information that need to be sent to requests to [`ContentSource`]. By
+/// sending these information [`ContentSource`] responses are cached-keyed by them and they can
+/// access them.
 #[turbo_tasks::value(shared)]
 #[derive(Debug, Default, Clone, Hash)]
 pub struct ContentSourceDataVary {
@@ -327,8 +324,8 @@ pub struct ContentSourceDataVary {
 }
 
 impl ContentSourceDataVary {
-    /// Merges two vary specification to create a combination of both that cover
-    /// all information requested by either one
+    /// Merges two vary specification to create a combination of both that cover all information
+    /// requested by either one
     pub fn extend(&mut self, other: &ContentSourceDataVary) {
         let ContentSourceDataVary {
             method,
@@ -353,8 +350,7 @@ impl ContentSourceDataVary {
         ContentSourceDataFilter::extend_options(headers, &other.headers);
     }
 
-    /// Returns true if `self` at least contains all values that the
-    /// argument would contain.
+    /// Returns true if `self` at least contains all values that the argument would contain.
     pub fn fulfills(&self, other: &ContentSourceDataVary) -> bool {
         // All fields must be used!
         let ContentSourceDataVary {
diff --git a/turbopack/crates/turbopack-dev-server/src/source/resolve.rs b/turbopack/crates/turbopack-dev-server/src/source/resolve.rs
index 4a7691b2c21ad..3f4ecbee2735a 100644
--- a/turbopack/crates/turbopack-dev-server/src/source/resolve.rs
+++ b/turbopack/crates/turbopack-dev-server/src/source/resolve.rs
@@ -21,9 +21,8 @@ use crate::source::{
     route_tree::RouteTree,
 };
 
-/// The result of [`resolve_source_request`]. Similar to a
-/// `ContentSourceContent`, but without the `Rewrite` variant as this is taken
-/// care in the function.
+/// The result of [`resolve_source_request`]. Similar to a [`ContentSourceContent`], but without the
+/// [`Rewrite`][ContentSourceContent::Rewrite] variant, as this is taken care in the function.
 #[turbo_tasks::value(serialization = "none", shared)]
 pub enum ResolveSourceRequestResult {
     NotFound,
@@ -62,14 +61,22 @@ fn get_content_source_content_get_operation(
     get_content.get(path, data)
 }
 
-/// Resolves a [SourceRequest] within a [super::ContentSource], returning the
-/// corresponding content.
+/// Resolves a [`SourceRequest`] within a [`ContentSource`], returning the corresponding content.
 ///
-/// This function is the boundary of consistency. All invoked methods should be
-/// invoked strongly consistent. This ensures that all requests serve the latest
-/// version of the content. We don't make resolve_source_request strongly
-/// consistent as we want get_routes and get to be independent consistent and
-/// any side effect in get should not wait for recomputing of get_routes.
+/// Matches the first [`ContentSourceContent`] in the [`RouteTree`] returned by
+/// [`ContentSource::get_routes`] that does not generate [`ContentSourceContent::Next`].
+///
+/// *In the future*, this function may be used at the boundary of consistency. All invoked methods
+/// should be read using [strong consistency][OperationVc::read_strongly_consistent]. This ensures
+/// that all requests serve the latest version of the content.
+///
+/// If this function is not called/read with strong consistency, [`ContentSource::get_routes`] would
+/// be allowed to be independently consistent. Side effects should not need to wait for
+/// recomputation of [`ContentSource::get_routes`].
+///
+/// TODO: The callers of this function now read this operation using strong consistency. This may
+/// have re-introduced performance issues that were solved in
+/// <https://github.com/vercel/turborepo/pull/5360>.
 #[turbo_tasks::function(operation)]
 pub async fn resolve_source_request(
     source: OperationVc<Box<dyn ContentSource>>,
diff --git a/turbopack/crates/turbopack-dev-server/src/source/route_tree.rs b/turbopack/crates/turbopack-dev-server/src/source/route_tree.rs
index 24732968d97ef..28d36ffffb4eb 100644
--- a/turbopack/crates/turbopack-dev-server/src/source/route_tree.rs
+++ b/turbopack/crates/turbopack-dev-server/src/source/route_tree.rs
@@ -39,17 +39,16 @@ impl BaseSegment {
     }
 }
 
-/// This struct allows to cell a list of RouteTrees and merge them into one.
+/// This struct allows to cell a list of [`RouteTree`]s and merge them into one.
 ///
-/// This can't be a single method `fn merge(Vec<Vc<RouteTree>>)` as this would
-/// lead to creating new tasks over and over. A celled list leads to task reuse
-/// and faster operation.
+/// This can't be a single method `fn merge(Vec<Vc<RouteTree>>)` as this would lead to creating new
+/// tasks over and over. A celled list leads to task reuse and faster operation.
 #[turbo_tasks::value(transparent)]
 pub struct RouteTrees(Vec<ResolvedVc<RouteTree>>);
 
 #[turbo_tasks::value_impl]
 impl RouteTrees {
-    /// Merges the list of RouteTrees into one RouteTree.
+    /// Merges the list of [`RouteTree`]s into one [`RouteTree`].
     #[turbo_tasks::function]
     pub async fn merge(&self) -> Result<Vc<RouteTree>> {
         let trees = &self.0;
diff --git a/turbopack/crates/turbopack-dev-server/src/source/wrapping_source.rs b/turbopack/crates/turbopack-dev-server/src/source/wrapping_source.rs
index 38aa1b7d94d33..ecad29c48aa49 100644
--- a/turbopack/crates/turbopack-dev-server/src/source/wrapping_source.rs
+++ b/turbopack/crates/turbopack-dev-server/src/source/wrapping_source.rs
@@ -7,23 +7,21 @@ use crate::source::{
     GetContentSourceContents, Rewrite, RewriteType,
 };
 
-/// A ContentSourceProcessor handles the final processing of an eventual
-/// [ContentSourceContent].
+/// Handles the final processing of an eventual [`ContentSourceContent`].
 ///
-/// Used in conjunction with [WrappedGetContentSourceContent], this allows a
-/// [ContentSource] implementation to easily register a final process step over
-/// some inner ContentSource's fully resolved [ContentSourceResult] and
-/// [ContentSourceContent].
+/// Used in conjunction with [`WrappedGetContentSourceContent`], this allows a [`ContentSource`]
+/// implementation to easily register a final process step over some inner [`ContentSource`]'s fully
+/// resolved [`ContentSourceContent`].
+///
+/// [`ContentSource`]: crate::source::ContentSource
 #[turbo_tasks::value_trait]
 pub trait ContentSourceProcessor {
     #[turbo_tasks::function]
     fn process(self: Vc<Self>, content: Vc<ContentSourceContent>) -> Vc<ContentSourceContent>;
 }
 
-/// A WrappedGetContentSourceContent simply wraps the get_content of a
-/// [ContentSourceResult], allowing us to process whatever
-/// [ContentSourceContent] it would have returned.
-
+/// Wraps the `get_content` of a [`GetContentSourceContent`], allowing us to
+/// [post-process][ContentSourceProcessor] whatever [`ContentSourceContent`] it returns.
 #[turbo_tasks::value]
 pub struct WrappedGetContentSourceContent {
     inner: ResolvedVc<Box<dyn GetContentSourceContent>>,
diff --git a/turbopack/crates/turbopack-ecmascript/src/analyzer/graph.rs b/turbopack/crates/turbopack-ecmascript/src/analyzer/graph.rs
index ace0f000097dd..9f0c89c97d5bf 100644
--- a/turbopack/crates/turbopack-ecmascript/src/analyzer/graph.rs
+++ b/turbopack/crates/turbopack-ecmascript/src/analyzer/graph.rs
@@ -356,8 +356,11 @@ impl DeclUsage {
 #[derive(Debug)]
 pub struct VarGraph {
     pub values: FxHashMap<Id, VarMeta>,
-    /// Map FreeVar names to their Id to facilitate lookups into [values]
-    /// Doesn't necessarily contain every FreeVar, just those who have non trivial values.
+
+    /// Map [`JsValue::FreeVar`] names to their [`Id`] to facilitate lookups into [`Self::values`].
+    ///
+    /// Doesn't necessarily contain every [`FreeVar`][JsValue::FreeVar], just those who have
+    /// non-trivial values.
     pub free_var_ids: FxHashMap<Atom, Id>,
 
     pub effects: Vec<Effect>,
@@ -381,8 +384,6 @@ impl VarGraph {
     }
 }
 
-/// You should use same [Mark] for this function and
-/// [swc_ecma_transforms_base::resolver::resolver_with_mark]
 pub fn create_graph(
     m: &Program,
     eval_context: &EvalContext,
@@ -417,16 +418,22 @@ pub fn create_graph(
 /// A context used for assembling the evaluation graph.
 #[derive(Debug)]
 pub struct EvalContext {
+    /// Should be the same [`Mark`] used by [`swc_core::ecma::transforms::base::resolver`].
     pub(crate) unresolved_mark: Mark,
+    /// Should be the same [`Mark`] used by [`swc_core::ecma::transforms::base::resolver`].
     pub(crate) top_level_mark: Mark,
     pub(crate) imports: ImportMap,
     pub(crate) force_free_values: Arc<FxHashSet<Id>>,
 }
 
 impl EvalContext {
-    /// Produce a new [EvalContext] from a [Program]. If you wish to support
-    /// webpackIgnore or turbopackIgnore comments, you must pass those in,
-    /// since the AST does not include comments by default.
+    /// Produce a new [`EvalContext`] from a [`Program`].
+    ///
+    /// If you wish to support `webpackIgnore` or `turbopackIgnore` comments, you must pass those
+    /// in, since the AST does not include comments by default.
+    ///
+    /// You should use the same `unresolved_mark` and `top_level_mark` [Mark] values for this
+    /// context that you passed to [`swc_core::ecma::transforms::base::resolver`].
     pub fn new(
         module: Option<&Program>,
         unresolved_mark: Mark,
diff --git a/turbopack/crates/turbopack-ecmascript/src/analyzer/mod.rs b/turbopack/crates/turbopack-ecmascript/src/analyzer/mod.rs
index b5c7f8162b748..a3c5df54e92f2 100644
--- a/turbopack/crates/turbopack-ecmascript/src/analyzer/mod.rs
+++ b/turbopack/crates/turbopack-ecmascript/src/analyzer/mod.rs
@@ -379,9 +379,10 @@ impl Display for LogicalProperty {
 }
 
 /// TODO: Use `Arc`
+///
 /// There are 4 kinds of values: Leaves, Nested, Operations, and Placeholders
-/// (see [JsValueMetaKind] for details). Values are processed in two phases:
-/// - Analyze phase: We convert AST into [JsValue]s. We don't have contextual information so we need
+/// (see `JsValueMetaKind` for details). Values are processed in two phases:
+/// - Analyze phase: We convert AST into `JsValue`s. We don't have contextual information so we need
 ///   to insert placeholders to represent that.
 /// - Link phase: We try to reduce a value to a constant value. The link phase has 5 substeps that
 ///   are executed on each node in the graph depth-first. When a value is modified, we need to visit
diff --git a/turbopack/crates/turbopack-ecmascript/src/json_source_transform.rs b/turbopack/crates/turbopack-ecmascript/src/json_source_transform.rs
index aa93edfc800ee..c8233e7b3227f 100644
--- a/turbopack/crates/turbopack-ecmascript/src/json_source_transform.rs
+++ b/turbopack/crates/turbopack-ecmascript/src/json_source_transform.rs
@@ -24,7 +24,7 @@ use crate::utils::inline_source_map_comment;
 ///   { a } from './data.json'`). This matches webpack's historical behavior.
 ///
 /// For JSON files larger than 10KB, we use `JSON.parse()` for better performance.
-/// See: https://v8.dev/blog/cost-of-javascript-2019#json
+/// See: <https://v8.dev/blog/cost-of-javascript-2019#json>
 #[turbo_tasks::value]
 pub struct JsonSourceTransform {
     /// If true, generate spec-compliant ESM with only an esm default export.
diff --git a/turbopack/crates/turbopack-ecmascript/src/side_effect_optimization/facade/module.rs b/turbopack/crates/turbopack-ecmascript/src/side_effect_optimization/facade/module.rs
index a4171158179e7..989e17f61af15 100644
--- a/turbopack/crates/turbopack-ecmascript/src/side_effect_optimization/facade/module.rs
+++ b/turbopack/crates/turbopack-ecmascript/src/side_effect_optimization/facade/module.rs
@@ -33,7 +33,9 @@ use crate::{
 
 /// A module derived from an original ecmascript module that contains all
 /// the reexports from that module and also reexports the locals from
-/// [EcmascriptModuleLocalsModule].
+/// [`EcmascriptModuleLocalsModule`].
+///
+/// [`EcmascriptModuleLocalsModule`]: crate::side_effect_optimization::locals::module::EcmascriptModuleLocalsModule
 #[turbo_tasks::value]
 pub struct EcmascriptModuleFacadeModule {
     module: ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>,
diff --git a/turbopack/crates/turbopack-ecmascript/src/side_effect_optimization/locals/module.rs b/turbopack/crates/turbopack-ecmascript/src/side_effect_optimization/locals/module.rs
index 2b747359d7b87..ca4f6420bd6a2 100644
--- a/turbopack/crates/turbopack-ecmascript/src/side_effect_optimization/locals/module.rs
+++ b/turbopack/crates/turbopack-ecmascript/src/side_effect_optimization/locals/module.rs
@@ -28,9 +28,11 @@ use crate::{
     },
 };
 
-/// A module derived from an original ecmascript module that only contains the
-/// local declarations, but excludes all reexports. These reexports are exposed
-/// from [EcmascriptModuleFacadeModule] instead.
+/// A module derived from an original ecmascript module that only contains the local declarations,
+/// but excludes all reexports. These reexports are exposed from [`EcmascriptModuleFacadeModule`]
+/// instead.
+///
+/// [`EcmascriptModuleFacadeModule`]: crate::side_effect_optimization::facade::module::EcmascriptModuleFacadeModule
 #[turbo_tasks::value]
 pub struct EcmascriptModuleLocalsModule {
     pub module: ResolvedVc<EcmascriptModuleAsset>,
diff --git a/turbopack/crates/turbopack-env/src/dotenv.rs b/turbopack/crates/turbopack-env/src/dotenv.rs
index 4423d0bcb4879..f5aee40b2c0b2 100644
--- a/turbopack/crates/turbopack-env/src/dotenv.rs
+++ b/turbopack/crates/turbopack-env/src/dotenv.rs
@@ -6,8 +6,9 @@ use turbo_tasks_fs::FileSystemPath;
 
 use crate::TryDotenvProcessEnv;
 
-/// Loads a series of dotenv files according to the precedence rules set by
-/// https://nextjs.org/docs/app/building-your-application/configuring/environment-variables#environment-variable-load-order
+/// Loads a series of dotenv files according to the [precedence rules set by Next.js][precedence].
+///
+/// [precedence]: https://nextjs.org/docs/app/building-your-application/configuring/environment-variables#environment-variable-load-order
 #[turbo_tasks::function]
 pub async fn load_env(project_path: FileSystemPath) -> Result<Vc<Box<dyn ProcessEnv>>> {
     let env: Vc<Box<dyn ProcessEnv>> = Vc::upcast(CommandLineProcessEnv::new());
diff --git a/turbopack/crates/turbopack-node/src/process_pool/mod.rs b/turbopack/crates/turbopack-node/src/process_pool/mod.rs
index e3d584dffff7b..ca4726578a481 100644
--- a/turbopack/crates/turbopack-node/src/process_pool/mod.rs
+++ b/turbopack/crates/turbopack-node/src/process_pool/mod.rs
@@ -523,15 +523,14 @@ impl ProcessArgs {
     }
 }
 
-/// A pool of Node.js workers operating on [entrypoint] with specific [cwd] and
-/// [env].
+/// A pool of Node.js workers operating on an `entrypoint` with specific `cwd` and `env`.
 ///
-/// The pool will spawn processes when needed and reuses old ones. It will never
-/// spawn more then a certain number of concurrent processes. This is specified
-/// with the `concurrency` argument in the constructor.
+/// The pool will spawn processes when needed and reuses old ones. It will never spawn more then a
+/// certain number of concurrent processes. This is specified with the `concurrency` argument in the
+/// constructor.
 ///
-/// The worker will *not* use the env of the parent process by default. All env
-/// vars need to be provided to make the execution as pure as possible.
+/// The worker will *not* use the `env` of the parent process by default. All environment variables
+/// need to be provided to make the execution as pure as possible.
 #[turbo_tasks::value(cell = "new", serialization = "none", eq = "manual", shared)]
 pub struct ChildProcessPool {
     cwd: PathBuf,
diff --git a/turbopack/crates/turbopack-resolve/src/resolve_options_context.rs b/turbopack/crates/turbopack-resolve/src/resolve_options_context.rs
index d05349c3e164d..d6625bf78d580 100644
--- a/turbopack/crates/turbopack-resolve/src/resolve_options_context.rs
+++ b/turbopack/crates/turbopack-resolve/src/resolve_options_context.rs
@@ -14,22 +14,22 @@ use turbopack_core::{
 
 #[derive(Default, Debug, Clone, TraceRawVcs, PartialEq, Eq, NonLocalValue, Encode, Decode)]
 pub enum TsConfigHandling {
-    /// Ignore tsconfig and jsconfig files
+    /// Ignore tsconfig and jsconfig files.
     Disabled,
     #[default]
-    /// Find corresponding tsconfig files based on the location of the file
+    /// Find corresponding tsconfig files based on the location of the file.
     ContextFile,
-    /// Use the provided config file for all files (if it exists, otherwise fall back to
-    /// ContextFile)
+    /// Use the provided config file for all files if it exists, otherwise fall back to the
+    /// [`Self::ContextFile`] behavior.
     Fixed(FileSystemPath),
 }
 
 #[turbo_tasks::value(shared)]
 #[derive(Default, Clone)]
 pub struct ResolveOptionsContext {
-    /// 1. override options.node_externals and
-    /// 2. append environment.resolve_conditions
-    /// 3. override options.extensions
+    /// - Overrides `options.node_externals`
+    /// - Appends `environment.resolve_conditions`
+    /// - Overrides `options.extensions`
     pub emulate_environment: Option<ResolvedVc<Environment>>,
     pub enable_types: bool,
     pub enable_typescript: bool,
@@ -93,8 +93,8 @@ impl ResolveOptionsContext {
         Ok(Self::cell(clone))
     }
 
-    /// Returns a new [Vc<ResolveOptionsContext>] with its import map extended
-    /// to include the given import map.
+    /// Returns a new [`Vc<ResolveOptionsContext>`][Self] with its import map extended to include
+    /// the given import map.
     #[turbo_tasks::function]
     pub async fn with_extended_import_map(
         self: Vc<Self>,
@@ -112,8 +112,8 @@ impl ResolveOptionsContext {
         Ok(resolve_options_context.cell())
     }
 
-    /// Returns a new [Vc<ResolveOptionsContext>] with its fallback import map
-    /// extended to include the given import map.
+    /// Returns a new [`Vc<ResolveOptionsContext>`][Self] with its fallback import map extended to
+    /// include the given import map.
     #[turbo_tasks::function]
     pub async fn with_extended_fallback_import_map(
         self: Vc<Self>,
diff --git a/turbopack/crates/turbopack-trace-utils/src/exit.rs b/turbopack/crates/turbopack-trace-utils/src/exit.rs
index 140224da1dc43..1a247c5f3079c 100644
--- a/turbopack/crates/turbopack-trace-utils/src/exit.rs
+++ b/turbopack/crates/turbopack-trace-utils/src/exit.rs
@@ -35,13 +35,12 @@ impl<T: Send + 'static> ExitGuard<T> {
 
 type BoxExitFuture = Pin<Box<dyn Future<Output = ()> + Send + 'static>>;
 
-/// The singular global ExitHandler. This is primarily used to ensure
-/// `ExitHandler::listen` is only called once.
+/// The singular global ExitHandler. This is primarily used to ensure `ExitHandler::listen` is only
+/// called once.
 ///
-/// The global handler is intentionally not exposed, so that APIs that depend on
-/// exit behavior are required to take the `ExitHandler`. This ensures that the
-/// `ExitHandler` is configured before these APIs are run, and that these
-/// consumers can be used with a callback (e.g. a mock) instead.
+/// The global handler is intentionally not exposed, so that APIs that depend on exit behavior are
+/// required to take the `ExitHandler`. This ensures that the `ExitHandler` is configured before
+/// these APIs are run, and that these consumers can be used with a callback (e.g. a mock) instead.
 static GLOBAL_EXIT_HANDLER: OnceLock<Arc<ExitHandler>> = OnceLock::new();
 
 pub struct ExitHandler {
@@ -49,19 +48,16 @@ pub struct ExitHandler {
 }
 
 impl ExitHandler {
-    /// Waits for `SIGINT` using [`tokio::signal::ctrl_c`], and exits the
-    /// process with exit code `0` after running any futures scheduled with
-    /// [`ExitHandler::on_exit`].
+    /// Waits for `SIGINT` using [`tokio::signal::ctrl_c`], and exits the process with exit code `0`
+    /// after running any futures scheduled with [`ExitHandler::on_exit`].
     ///
-    /// As this uses global process signals, this must only be called once, and
-    /// will panic if called multiple times. Use this when you own the
-    /// process (e.g. `turbopack-cli`).
+    /// As this uses global process signals, this must only be called once, and will panic if called
+    /// multiple times. Use this when you own the process (e.g. `turbopack-cli`).
     ///
-    /// If you don't own the process (e.g. you're called as a library, such as
-    /// in `next-swc`), use [`ExitHandler::new_trigger`] instead.
+    /// If you don't own the process (e.g. you're called as a library, such as in `next-swc`), use
+    /// [`ExitHandler::new_receiver`] instead.
     ///
-    /// This may listen for other signals, like `SIGTERM` or `SIGPIPE` in the
-    /// future.
+    /// This may listen for other signals, like `SIGTERM` or `SIGPIPE` in the future.
     pub fn listen() -> &'static Arc<ExitHandler> {
         let (handler, receiver) = Self::new_receiver();
         if GLOBAL_EXIT_HANDLER.set(handler).is_err() {
@@ -77,15 +73,13 @@ impl ExitHandler {
         GLOBAL_EXIT_HANDLER.get().expect("value is set")
     }
 
-    /// Creates an [`ExitHandler`] that can be manually controlled with an
-    /// [`ExitReceiver`].
+    /// Creates an [`ExitHandler`] that can be manually controlled with an [`ExitReceiver`].
     ///
-    /// This does not actually exit the process or listen for any signals. If
-    /// you'd like that behavior, use [`ExitHandler::listen`].
+    /// This does not actually exit the process or listen for any signals. If you'd like that
+    /// behavior, use [`ExitHandler::listen`].
     ///
-    /// Because this API has no global side-effects and can be called many times
-    /// within the same process, it is possible to use it to provide a mock
-    /// [`ExitHandler`] inside unit tests.
+    /// Because this API has no global side-effects and can be called many times within the same
+    /// process, it is possible to use it to provide a mock [`ExitHandler`] inside unit tests.
     pub fn new_receiver() -> (Arc<ExitHandler>, ExitReceiver) {
         let (tx, rx) = mpsc::unbounded_channel();
         (Arc::new(ExitHandler { tx }), ExitReceiver { rx })
@@ -93,9 +87,8 @@ impl ExitHandler {
 
     /// Register this given [`Future`] to run upon process exit.
     ///
-    /// As there are many ways for a process be killed that are outside of a
-    /// process's own control (e.g. `SIGKILL` or `SIGSEGV`), this API is
-    /// provided on a best-effort basis.
+    /// As there are many ways for a process be killed that are outside of a process's own control
+    /// (e.g. `SIGKILL` or `SIGSEGV`), this API is provided on a best-effort basis.
     pub fn on_exit(&self, fut: impl Future<Output = ()> + Send + 'static) {
         // realistically, this error case can only happen with the `new_receiver` API.
         self.tx
@@ -110,16 +103,14 @@ pub struct ExitReceiver {
 }
 
 impl ExitReceiver {
-    /// Call this when the process exits to run the futures scheduled via
-    /// [`ExitHandler::on_exit`].
+    /// Call this when the process exits to run the futures scheduled via [`ExitHandler::on_exit`].
     ///
-    /// As this is intended to be used in a library context, this does not exit
-    /// the process. It is expected that the process will not exit until
-    /// this async method finishes executing.
+    /// As this is intended to be used in a library context, this does not exit the process. It is
+    /// expected that the process will not exit until this async method finishes executing.
     ///
-    /// Additional work can be scheduled using [`ExitHandler::on_exit`] even
-    /// while this is running, and it will execute before this function
-    /// finishes. Work attempted to be scheduled after this finishes will panic.
+    /// Additional work can be scheduled using [`ExitHandler::on_exit`] even while this is running,
+    /// and it will execute before this function finishes. Work attempted to be scheduled after this
+    /// finishes will panic.
     pub async fn run_exit_handler(mut self) {
         let mut set = JoinSet::new();
         while let Ok(fut) = self.rx.try_recv() {
diff --git a/turbopack/crates/turbopack-trace-utils/src/raw_trace.rs b/turbopack/crates/turbopack-trace-utils/src/raw_trace.rs
index 923d9677cbd83..a0c724573c40b 100644
--- a/turbopack/crates/turbopack-trace-utils/src/raw_trace.rs
+++ b/turbopack/crates/turbopack-trace-utils/src/raw_trace.rs
@@ -49,8 +49,8 @@ fn get_id<S: Subscriber + for<'a> LookupSpan<'a>>(
         .id
 }
 
-/// A tracing layer that writes raw trace data to a writer. The data format is
-/// defined by [FullTraceRow].
+/// A tracing layer that writes raw trace data to a writer. We store data using the [`TraceRow`],
+/// serialized with [`postcard`].
 pub struct RawTraceLayer<S: Subscriber + for<'a> LookupSpan<'a>> {
     trace_writer: TraceWriter,
     start: Instant,
diff --git a/turbopack/crates/turbopack-trace-utils/src/trace_writer.rs b/turbopack/crates/turbopack-trace-utils/src/trace_writer.rs
index 3979787e7a131..e6f86a7f3bb1d 100644
--- a/turbopack/crates/turbopack-trace-utils/src/trace_writer.rs
+++ b/turbopack/crates/turbopack-trace-utils/src/trace_writer.rs
@@ -48,10 +48,10 @@ impl TraceWriter {
     /// This is a non-blocking writer that writes a file in a background thread.
     /// This is inspired by tracing-appender non_blocking, but has some
     /// differences:
-    /// * It allows writing an owned Vec<u8> instead of a reference, so avoiding additional
+    /// * It allows writing an owned [`Vec<u8>`] instead of a reference, so avoiding additional
     ///   allocation.
     /// * It uses an unbounded channel to avoid slowing down the application at all (memory) cost.
-    /// * It issues less writes by buffering the data into chunks of WRITE_BUFFER_SIZE, when
+    /// * It issues less writes by buffering the data into chunks of `WRITE_BUFFER_SIZE`, when
     ///   possible.
     pub fn new<W: Write + Send + 'static>(mut writer: W) -> (Self, TraceWriterGuard) {
         let (data_tx, data_rx) = unbounded::<Option<TraceInfoBuffer>>();
diff --git a/turbopack/crates/turbopack/src/module_options/module_options_context.rs b/turbopack/crates/turbopack/src/module_options/module_options_context.rs
index 1aadc94c4404c..c262d1b078920 100644
--- a/turbopack/crates/turbopack/src/module_options/module_options_context.rs
+++ b/turbopack/crates/turbopack/src/module_options/module_options_context.rs
@@ -121,32 +121,54 @@ impl WebpackLoaderBuiltinConditionSet for EmptyWebpackLoaderBuiltinConditionSet
     }
 }
 
-/// The kind of decorators transform to use.
-/// [TODO]: might need bikeshed for the name (Ecma)
+/// The kind of ECMAScript class decorators transform to use.
+///
+/// TODO: might need bikeshed for the name (Ecma)
 #[derive(Clone, PartialEq, Eq, Debug, TraceRawVcs, NonLocalValue, Encode, Decode)]
 pub enum DecoratorsKind {
-    Legacy,
+    /// Enables the syntax and behavior of the modern [stage 3 proposal]. This is the recommended
+    /// transform with JavaScript or [TypeScript 5.0][ts5] or later.
+    ///
+    /// [stage 3 proposal]: https://github.com/tc39/proposal-decorators
+    /// [ts5]: https://devblogs.microsoft.com/typescript/announcing-typescript-5-0/#differences-with-experimental-legacy-decorators
     Ecma,
+
+    /// Enables the legacy class decorator syntax and behavior, as it was defined during the [stage
+    /// 1 proposal].
+    ///
+    /// This is the same as setting [`jsx.transform.legacyDecorator` in SWC][swc].
+    ///
+    /// This option exists for compatibility with the TypeScript compiler's legacy
+    /// `--experimentalDecorators` feature.
+    ///
+    /// [stage 1 proposal]: https://github.com/wycats/javascript-decorators/blob/e1bf8d41bfa2591d9/README.md
+    /// [swc]: https://swc.rs/docs/configuration/compilation#jsctransformlegacydecorator
+    Legacy,
 }
 
-/// Configuration options for the decorators transform.
+/// Configuration for the ECMAScript class decorators transform.
+///
+/// This is not part of TypeScript transform. It can be used with or without TypeScript.
 ///
-/// This is not part of Typescript transform: while there are typescript
-/// specific transforms (legay decorators), there is an ecma decorator transform
-/// as well for the JS.
+/// There is a [legacy TypeScript-specific transform][DecoratorsKind::Legacy] available for when
+/// decorators are used with TypeScript.
 #[turbo_tasks::value(shared)]
 #[derive(Default, Clone, Debug)]
 pub struct DecoratorsOptions {
     pub decorators_kind: Option<DecoratorsKind>,
-    /// Option to control whether to emit decorator metadata.
-    /// (https://www.typescriptlang.org/tsconfig#emitDecoratorMetadata)
-    /// This'll be applied only if `decorators_type` and
-    /// `enable_typescript_transform` is enabled.
+    /// Option to control whether to [emit decorator metadata]. This will be applied only when
+    /// using [`DecoratorsKind::Legacy`].
+    ///
+    /// [emit decorator metadata]: https://www.typescriptlang.org/tsconfig#emitDecoratorMetadata
     pub emit_decorators_metadata: bool,
-    /// Mimic babel's `decorators.decoratorsBeforeExport` option.
-    /// This'll be applied only if `decorators_type` is enabled.
-    /// ref: https://github.com/swc-project/swc/blob/d4ebb5e6efbed0758f25e46e8f74d7c47ec6cb8f/crates/swc_ecma_parser/src/lib.rs#L327
-    /// [TODO]: this option is not actively being used currently.
+    /// Mimic [Babel's `decorators.decoratorsBeforeExport` option][babel]. This'll be applied only
+    /// if `decorators_type` is enabled.
+    ///
+    /// TODO: this option is not currently used.
+    ///
+    /// Ref: <https://github.com/swc-project/swc/blob/d4ebb5e6efbed0/crates/swc_ecma_parser/src/lib.rs#L327>
+    ///
+    /// [babel]: https://babeljs.io/docs/babel-plugin-proposal-decorators#decoratorsbeforeexport
     pub decorators_before_export: bool,
     pub use_define_for_class_fields: bool,
 }
diff --git a/turbopack/packages/devlow-bench/package.json b/turbopack/packages/devlow-bench/package.json
index 2358382d0ef91..2c2776792b317 100644
--- a/turbopack/packages/devlow-bench/package.json
+++ b/turbopack/packages/devlow-bench/package.json
@@ -48,7 +48,7 @@
     "minimist": "^1.2.8",
     "picocolors": "1.0.1",
     "pidusage-tree": "^2.0.5",
-    "playwright-chromium": "1.48.0",
+    "playwright-chromium": "1.58.2",
     "split2": "^4.2.0",
     "tree-kill": "^1.2.2"
   }
diff --git a/turbopack/packages/devlow-bench/src/browser.ts b/turbopack/packages/devlow-bench/src/browser.ts
index f7ef8c4b6862b..74e4910e24afa 100644
--- a/turbopack/packages/devlow-bench/src/browser.ts
+++ b/turbopack/packages/devlow-bench/src/browser.ts
@@ -348,7 +348,7 @@ export async function newBrowserSession(options: {
 }): Promise<BrowserSession> {
   const browser = await chromium.launch({
     headless: options.headless ?? process.env.HEADLESS !== 'false',
-    devtools: true,
+    args: options.headless ? undefined : ['--auto-open-devtools-for-tabs'],
     timeout: 60000,
   })
   const context = await browser.newContext({